diff --git a/DATA/uploads/README b/DATA/uploads/README
new file mode 100644
index 0000000000..dccd572a96
--- /dev/null
+++ b/DATA/uploads/README
@@ -0,0 +1,3 @@
+$CVSHeader$
+
+This directory is used as temporary storage for file uploads.
diff --git a/LICENSE b/LICENSE
index f3a1a61036..1ea40576cc 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,9 +1,9 @@
 
                                      WeBWorK                                    
                          Online Homework Delivery System                        
-                                   Version 2.0                                  
+                                   Version 2.5.0+                                 
 
-                    Copyright 2000-2003, The WeBWorK Project                    
+                    Copyright 2000-2011, The WeBWorK Project                    
                               All rights reserved.                              
 
     This program is free software; you can redistribute it and/or modify
diff --git a/README b/README
index 0d0dc492e7..58b27413e9 100644
--- a/README
+++ b/README
@@ -1,15 +1,10 @@
-
-                                     WeBWorK                                    
+                                        WeBWorK                                    
                          Online Homework Delivery System                        
-                                   Version 2.0                                  
+                                   Version 2.5.0
+                        Branch: system/tags/rel-2-5-0/webwork2
 
-                    Copyright 2000-2003, The WeBWorK Project                    
+	          http://webwork.maa.org/wiki/Release_notes_for_WeBWorK_2.5.0
+                    Copyright 2000-2011, The WeBWorK Project
+                             http://webwork.maa.org
                               All rights reserved.                              
 
-Some important information should go here. For example:
-
-	DESCRIPTION
-	REQUIREMENTS
-	INSTALLATION
-	CONFIGURATION
-	USE
diff --git a/bin/NPL-update b/bin/NPL-update
new file mode 100755
index 0000000000..19f6f44946
--- /dev/null
+++ b/bin/NPL-update
@@ -0,0 +1,765 @@
+#!/usr/bin/perl
+
+# This is the script formerly known as loadDB2.  It is used to update
+# the database when it comes to the National Problem Library (NPL).
+# This should be run after doing a cvs checkout or update for the NPL
+# files.
+
+# In order for this script to work:
+#   1) The NPL downloaded to your machine (the .pg files)
+#   2) The environment variable WEBWORK_ROOT needs to be 
+#      correctly defined (as with other scripts here).
+#   3) Configuration for the NPL in global.conf needs to be
+#      done (basically just setting the path to the NPL files.
+
+#use strict;
+use File::Find;
+use File::Basename;
+use Cwd;
+use DBI;
+
+ #(maximum varchar length is 255 for mysql version < 5.0.3.  
+ #You can increase path length to  4096 for mysql > 5.0.3)
+
+BEGIN {
+        die "WEBWORK_ROOT not found in environment.\n"
+                unless exists $ENV{WEBWORK_ROOT};
+}
+
+### Data for creating the database tables
+
+@create_tables = (
+['NPL-DBsubject', '
+	DBsubject_id int(15) NOT NULL auto_increment,
+	name varchar(127) NOT NULL,
+	KEY DBsubject (name),
+	PRIMARY KEY (DBsubject_id)
+'],
+['NPL-DBchapter', '
+	DBchapter_id int(15) NOT NULL auto_increment,
+	name varchar(127) NOT NULL,
+	DBsubject_id int(15) DEFAULT 0 NOT NULL,
+	KEY DBchapter (name),
+	KEY (DBsubject_id),
+	PRIMARY KEY (DBchapter_id)
+'],
+['NPL-DBsection', '
+	DBsection_id int(15) NOT NULL auto_increment,
+	name varchar(255) NOT NULL,
+	DBchapter_id int(15) DEFAULT 0 NOT NULL,
+	KEY DBsection (name),
+	KEY (DBchapter_id),
+	PRIMARY KEY (DBsection_id)
+'],
+['NPL-author', '
+	author_id int (15) NOT NULL auto_increment,
+	institution tinyblob,
+	lastname varchar (100) NOT NULL,
+	firstname varchar (100) NOT NULL,
+	email varchar (255),
+	KEY author (lastname, firstname),
+	PRIMARY KEY (author_id)
+'],
+['NPL-path', '
+	path_id int(15) NOT NULL auto_increment,
+	path varchar(255) NOT NULL,
+	machine varchar(127),
+	user varchar(127),
+	KEY (path),
+	PRIMARY KEY (path_id)
+'],
+['NPL-pgfile', '
+	pgfile_id int(15) NOT NULL auto_increment,
+	DBsection_id int(15) NOT NULL,
+	author_id int(15),
+	institution tinyblob,
+	path_id int(15) NOT NULL,
+	filename varchar(255) NOT NULL,
+	PRIMARY KEY (pgfile_id)
+'],
+['NPL-keyword', '
+	keyword_id int(15) NOT NULL auto_increment,
+	keyword varchar(65) NOT NULL,
+	KEY (keyword),
+	PRIMARY KEY (keyword_id)
+'],
+['NPL-pgfile-keyword', '
+	pgfile_id int(15) DEFAULT 0 NOT NULL,
+	keyword_id int(15) DEFAULT 0 NOT NULL,
+	KEY pgfile_keyword (keyword_id, pgfile_id),
+	KEY pgfile (pgfile_id)
+'],
+['NPL-textbook', '
+	textbook_id int (15) NOT NULL auto_increment,
+	title varchar (255) NOT NULL,
+	edition int (3) DEFAULT 0 NOT NULL,
+	author varchar (63) NOT NULL,
+	publisher varchar (127),
+	isbn char (15),
+	pubdate varchar (27),
+	PRIMARY KEY (textbook_id)
+'],
+['NPL-chapter', '
+	chapter_id int (15) NOT NULL auto_increment,
+	textbook_id int (15),
+	number int(3),
+	name varchar(127) NOT NULL,
+	page int(4),
+	KEY (textbook_id, name),
+	KEY (number),
+	PRIMARY KEY (chapter_id)
+'],
+['NPL-section', '
+	section_id int(15) NOT NULL auto_increment,
+	chapter_id int (15),
+	number int(3),
+	name varchar(127) NOT NULL,
+	page int(4),
+	KEY (chapter_id, name),
+	KEY (number),
+	PRIMARY KEY section (section_id)
+'],
+['NPL-problem', '
+	problem_id int(15) NOT NULL auto_increment,
+	section_id int(15),
+	number int(4) NOT NULL,
+	page int(4),
+	#KEY (page, number),
+	KEY (section_id),
+	PRIMARY KEY (problem_id)
+'],
+['NPL-pgfile-problem', '
+	pgfile_id int(15) DEFAULT 0 NOT NULL,
+	problem_id int(15) DEFAULT 0 NOT NULL,
+	PRIMARY KEY (pgfile_id, problem_id)
+']);
+
+### End of database data
+
+# Get database connection
+
+use lib "$ENV{WEBWORK_ROOT}/lib";
+use WeBWorK::CourseEnvironment;
+
+my $ce = new WeBWorK::CourseEnvironment({webwork_dir=>$ENV{WEBWORK_ROOT}});
+my $dbh = DBI->connect(
+        $ce->{database_dsn},
+        $ce->{database_username},
+        $ce->{database_password},
+        {
+                PrintError => 0,
+                RaiseError => 1,
+        },
+);
+
+my $passwd = $ce->{database_password};
+my $user = $ce->{database_username};
+my $libraryRoot = $ce->{problemLibrary}->{root};
+my $verbose = 0;
+my $cnt2 = 0;
+
+$| = 1; # autoflush output
+
+sub dbug {
+	my $msg = shift;
+	my $insignificance = shift || 2;
+	print $msg if($verbose>=$insignificance);
+}
+
+## Resetting the database tables.
+#  First take care of tables which are no longer used
+
+$dbh->do("DROP TABLE IF EXISTS `NPL-institution`");
+$dbh->do("DROP TABLE IF EXISTS `NPL-pgfile-institution`");
+
+for my $tableinfo (@create_tables) {
+    my $tabname = $tableinfo->[0];
+    my $tabinit = $tableinfo->[1];
+	my $query = "DROP TABLE IF EXISTS `$tabname`";
+	$dbh->do($query);
+	$query = "CREATE TABLE `$tabname` ( $tabinit )";
+	$dbh->do($query);
+}
+
+print "Mysql database reinitialized.\n";
+
+# From pgfile
+## DBchapter('Limits and Derivatives')
+## DBsection('Calculating Limits using the Limit Laws')
+## Date('6/3/2002')
+## Author('Tangan Gao')
+## Institution('csulb')
+## TitleText1('Calculus Early Transcendentals')
+## EditionText1('4')
+## AuthorText1('Stewart')
+## Section1('2.3')
+## Problem1('7')
+#
+# The database structure is in the file create_tables2.sql and its ER-graph is 
+#    the file wwdb_er_graph.pdf. 
+
+my ($name,$pgfile,$pgpath);
+
+#### First read in textbook information
+
+if(open(IN, "$libraryRoot/Textbooks")) {
+	print "Reading in textbook data from Textbooks in the library $libraryRoot.\n";
+	my %textinfo = ( TitleText => '', EditionText =>'', AuthorText=>'');
+	my $bookid = undef;
+	while (my $line = <IN>) {
+		$line =~ s|#*$||;
+		if($line =~ /^\s*(.*?)\s*>>>\s*(.*?)\s*$/) { # Should have chapter or section information
+			my $chapsec = $1;
+			my $title = $2;
+			if($chapsec=~ /(\d+)\.(\d+)/) { # We have a section
+				if(defined($bookid)) {
+					my $query = "SELECT chapter_id FROM `NPL-chapter` WHERE textbook_id = \"$bookid\" AND number = \"$1\"";
+					my $chapid = $dbh->selectrow_array($query);
+					if(defined($chapid)) {
+						$query = "SELECT section_id FROM `NPL-section` WHERE chapter_id = \"$chapid\" AND name = \"$title\"";
+						my $sectid = $dbh->selectrow_array($query);
+						if (!defined($sectid)) {
+							$dbh->do("INSERT INTO `NPL-section`
+					VALUES(
+						\"\",
+						\"$chapid\",
+						\"$2\",
+						\"$title\",
+						\"\"
+					)"
+								);
+							dbug "INSERT INTO section VALUES(\"\", \"$chapid\", \"$2\", \"$title\", \"\" )\n";
+						}
+					} else {
+						print "Cannot enter section $chapsec because textbook information is missing the chapter entry\n";
+					}
+				} else {
+					print "Cannot enter section $chapsec because textbook information is incomplete\n";
+				}
+			} else { # We have a chapter entry
+				if(defined($bookid)) {
+					my $query = "SELECT chapter_id FROM `NPL-chapter` WHERE textbook_id = \"$bookid\" AND number = \"$chapsec\"";
+					my $chapid = $dbh->selectrow_array($query);
+					if (!defined($chapid)) {
+						$dbh->do("INSERT INTO `NPL-chapter`
+					VALUES(
+						\"\",
+						\"$bookid\",
+						\"".$chapsec."\",
+						\"$title\",
+						\"\"
+					)"
+							);
+						$chapid = $dbh->selectrow_array($query);
+
+						# Add dummy section entry for problems tagged to the chapter
+						# without a section
+						$query = "SELECT section_id FROM `NPL-section` WHERE chapter_id = \"$chapid\" AND number = -1";
+						my $sectid = $dbh->selectrow_array($query);
+						if (!defined($sectid)) {
+							$dbh->do("INSERT INTO `NPL-section`
+						VALUES(
+							\"\",
+							\"$chapid\",
+							\"-1\",
+							\"\",
+							\"\"
+						)"
+								);
+						dbug "INSERT INTO section VALUES(\"\", \"$chapid\", \"-1\", \"\", \"\" )\n";
+						}
+					}
+				} else {
+					print "Cannot enter chapter $chapsec because textbook information is incomplete\n";
+				}
+			}
+		} elsif($line =~ /^\s*(TitleText|EditionText|AuthorText)\(\s*'(.*?)'\s*\)/) {
+			# Textbook information, maybe new
+			my $type = $1;
+			if(defined($textinfo{$type})) { # signals new text
+				%textinfo = ( TitleText => undef, 
+							  EditionText =>undef, 
+							  AuthorText=> undef);
+				$textinfo{$type} = $2;
+				$bookid = undef;
+			} else {
+				$textinfo{$type} = $2;
+				if(defined($textinfo{TitleText}) and 
+				   defined($textinfo{AuthorText}) and 
+				   defined($textinfo{EditionText})) {
+					my $query = "SELECT textbook_id FROM `NPL-textbook` WHERE title = \"$textinfo{TitleText}\" AND edition = \"$textinfo{EditionText}\" AND author=\"$textinfo{AuthorText}\"";
+					$bookid = $dbh->selectrow_array($query);
+					if (!defined($bookid)) {
+						$dbh->do("INSERT INTO `NPL-textbook`
+					VALUES(
+						\"\",
+						\"$textinfo{TitleText}\",
+						\"$textinfo{EditionText}\",
+						\"$textinfo{AuthorText}\",
+						\"\",
+						\"\",
+						\"\"
+					)"
+							);
+						dbug "INSERT INTO textbook VALUES( \"\", \"$textinfo{TitleText}\", \"$textinfo{EditionText}\", \"$textinfo{AuthorText}\", \"\", \"\", \"\" )\n";
+						$bookid = $dbh->selectrow_array($query);
+					}
+				}
+			}
+		}
+	}
+	close(IN);
+} else{
+	print "Textbooks file was not found in library $libraryRoot. If the path to the problem library doesn't seem
+	correct, make modifications in webwork2/conf/global.conf (\$problemLibrary{root}).  If that is correct then
+	updating from cvs should download the Textbooks file.\n";
+}
+
+print "Converting data from tagged pgfiles into mysql.\n";
+print "Number of files processed:\n";
+
+#### Now search for tagged problems
+#recursive search for all pg files
+
+find({ wanted => \&pgfiles, follow_fast=> 1}, $libraryRoot);
+
+sub kwtidy {
+	my $s = shift;
+	$s =~ s/\W//g;
+	$s =~ s/_//g;
+	$s = lc($s);
+	return($s);
+}
+
+sub keywordcleaner {
+	my $string = shift;
+	my @spl1 = split /,/, $string;
+	my @spl2 = map(kwtidy($_), @spl1);
+	return(@spl2);
+}
+
+# Save on passing these values around
+my %textinfo;
+
+# Initialize, if needed more text-info information;
+sub maybenewtext {
+	my $textno = shift;
+	return if defined($textinfo{$textno});
+	# So, not defined yet
+	$textinfo{$textno} = { title => '', author =>'', edition =>'',
+						   section => '', chapter =>'', problems => [] };
+}
+
+# process each file returned by the find command.
+sub pgfiles {
+	my $name = $File::Find::name;
+	my ($subject, $chapter, $section, $date, $institution, $author, $text);
+	my ($edition, $textauthor, $textsection, $textproblem, $tagged);
+	%textinfo=();
+	my @textproblems = (-1);
+	if ($name =~ /pg$/) {
+		$pgfile = basename($name);
+		$pgpath = dirname($name);
+		$cnt2++;
+		printf("%6d", $cnt2) if(($cnt2 % 100) == 0);
+		print "\n" if(($cnt2 % 1000) == 0);
+		$pgpath =~ s|^$libraryRoot/||;
+		open(IN,"$name") or die "can not open $name: $!";
+		$tagged = 0;
+		while (<IN>) {
+		SWITCH: {
+				if (/\bKEYWORDS\((.*)\)/i) {
+					@keyword = keywordcleaner($1);
+					last SWITCH;
+				}
+				if (/\bDBsubject\s*\(\s*'?(.*?)'?\s*\)/) {
+					$subject = $1;
+					$subject =~ s/'/\'/g;
+					last SWITCH;
+				}
+				if (/\bDBchapter\s*\(\s*'?(.*?)'?\s*\)/) {
+					$chapter = $1;
+					$chapter =~ s/'/\'/g;
+					$tagged = 1;
+					last SWITCH;
+				}
+				if (/\bDBsection\s*\(\s*'?(.*?)'?\s*\)/) {
+					$section = $1;
+					$section =~ s/'/\'/g;
+					last SWITCH;
+				}
+				if (/\bDate\s*\(\s*'(.*?)'\s*\)/) {
+					$date = $1;
+					$date =~ s/'/\'/g;
+					last SWITCH;
+				}
+				if (/\bInstitution\s*\(\s*'(.*?)'\s*\)/) {
+					$institution = $1;
+					$institution =~ s/'/\'/g;
+					last SWITCH;
+				}
+				if (/\bAuthor\(\s*'?(.*?)'?\s*\)/) {
+					$author = $1;
+					$author =~ s/'/\'/g;
+					last SWITCH;
+				}
+				if (/\bTitleText(\d+)\(\s*'?(.*?)'?\s*\)/) {
+					$textno = $1;
+					$text = $2;
+					$text =~ s/'/\'/g;
+					if ($text =~ /\S/) {
+						maybenewtext($textno);
+						$textinfo{$textno}->{title} = $text;
+					}
+					last SWITCH;
+				}
+				if (/\bEditionText(\d+)\(\s*'?(.*?)'?\s*\)/) {
+					$textno = $1;	
+					$edition = $2;
+					$edition =~ s/'/\'/g;
+					if ($edition =~ /\S/) {
+						maybenewtext($textno);
+						$textinfo{$textno}->{edition} = $edition;
+					}
+					last SWITCH;
+				}
+				if (/\bAuthorText(\d+)\(\s*'?(.*?)'?\s*\)/) {
+					$textno = $1;
+					$textauthor = $2;
+					$textauthor =~ s/'/\'/g;
+					if ($textauthor =~ /\S/) {
+						maybenewtext($textno);
+						$textinfo{$textno}->{author} = $textauthor;
+					}
+					last SWITCH;
+				}
+				if (/\bSection(\d+)\(\s*'?(.*?)'?\s*\)/) {
+					$textno = $1;
+					$textsection = $2;
+					$textsection =~ s/'/\'/g;
+					if ($textsection =~ /\S/) {
+						maybenewtext($textno);
+						if ($textsection =~ /(\d*?)\.(\d*)/) {
+							$textinfo{$textno}->{chapter} = $1;
+							$textinfo{$textno}->{section} = $2;
+						} else {
+							$textinfo{$textno}->{chapter} = $textsection;
+							$textinfo{$textno}->{section} = -1;
+						}
+
+					}
+					last SWITCH;
+				}
+				if (/\bProblem(\d+)\(\s*(.*?)\s*\)/) {
+					$textno = $1;
+					$textproblem = $2;
+					$textproblem =~ s/\D/ /g;
+					@textproblems = split /\s+/, $textproblem;
+					@textproblems = grep { $_ =~ /\S/ } @textproblems;
+					if (scalar(@textproblems) or defined($textinfo{$textno})) {
+						@textproblems = (-1) unless(scalar(@textproblems));
+						maybenewtext($textno);
+						$textinfo{$textno}->{problems} = \@textproblems;
+					}
+					#print "$textproblem\n" if ($textproblem !~ /^[\s\d]+$/);
+					#		$textproblem =~ s/'/\'/g;
+					last SWITCH;
+				}
+			}
+		}						#end of SWITCH and while
+		if ($tagged and $chapter eq 'ZZZ-Inserted Text') {
+			$tagged=0;
+		}
+		if ($tagged) {
+			#
+			# kludge to fix the omission of a subject field
+			unless($subject) {
+				if ($text =~ /precalculus/i) {
+					$subject = "Precalculus";
+				} elsif ($text =~ /calculus/i) {
+					$subject = "Calculus";
+				} elsif ($text =~ /linear/i) {
+					$subject = "Linear Algebra";
+				} elsif ($text =~ /algebra/i) {
+					$subject = "Algebra";
+				} elsif ($text =~ /statistic/i) {
+					$subject = "Statistics";
+				} elsif ($text =~ /financial/i) {
+					$subject = "Financial Mathematics";
+				} else {
+					$subject = "Misc";
+				}
+			}
+			# From the pgfile we just looked at,
+			## DBchapter('Limits and Derivatives') 		in $chapter
+			## DBsection('Calculating Limits using the Limit Laws') in $section
+			## Date('6/3/2002') 				in $date
+			## Author('Tangan Gao') 				in $author
+			## Institution('csulb') 				in $institution
+			## TitleText1('Calculus Early Transcendentals')	in $text
+			## EditionText1('4') 				in $edition
+			## AuthorText1('Stewart') 				in $textauthor
+			## Section1('2.3') 					in $textsection
+			## Problem1('7') 					in $textproblem
+			#
+			# The database structure is in the file create_tables2.sql and its ER-graph
+			#    is the file wwdb_er_graph.pdf. Insert, in order, into the tables
+			#    in that file.
+			#
+
+			#selectrow_array returns first field of first row in scalar context or undef 
+			# undef for failure also, $dbh->{RaiseError} = 1 should catch that case.
+			#
+			# DBsubject table
+			#
+			$query = "SELECT DBsubject_id FROM `NPL-DBsubject` WHERE name = \"$subject\"";
+			my $DBsubject_id = $dbh->selectrow_array($query);
+			if (!defined($DBsubject_id)) {
+				$dbh->do(
+						 "INSERT INTO `NPL-DBsubject`
+					VALUES(
+						\"\",
+						\"$subject\"
+					)"
+						);
+				dbug "INSERT INTO DBsubject VALUES(\"\",\"$subject\")\n";
+				$DBsubject_id = $dbh->selectrow_array($query);
+			}
+
+			# DBchapter table
+			#
+			$query = "SELECT DBchapter_id FROM `NPL-DBchapter` WHERE name = \"$chapter\" and DBsubject_id = $DBsubject_id";
+			my $DBchapter_id = $dbh->selectrow_array($query);  
+			if (!defined($DBchapter_id)) {
+				$dbh->do("INSERT INTO `NPL-DBchapter` 
+					VALUES(
+						\"\",
+						\"$chapter\",
+						\"$DBsubject_id\"
+					)"
+						);
+				dbug "INSERT INTO DBchapter VALUES(  \"\", \"$chapter\", \"$DBsubject_id\)\n";
+				$DBchapter_id = $dbh->selectrow_array($query);
+			}
+
+			# DBsection table
+			#
+			$query = "SELECT DBsection_id FROM `NPL-DBsection` WHERE name = \"$section\" AND DBchapter_id = $DBchapter_id";
+			my $DBsection_id = $dbh->selectrow_array($query);
+			if (!defined($DBsection_id)) {
+				$dbh->do("INSERT INTO `NPL-DBsection`
+					VALUES(
+						\"\",
+						\"$section\",
+						\"$DBchapter_id\"
+					)"
+						);
+				dbug "INSERT INTO DBsection VALUES( \"\", \"$section\", \"$DBchapter_id\", \"$DBsubject_id\" )\n";
+				$DBsection_id = $dbh->selectrow_array($query);
+			}
+
+			# author table
+			#
+			$author =~ /(.*?)\s(\w+)\s*$/;
+			my $firstname = $1;
+			my $lastname = $2;
+			#remove leading and trailing spaces from firstname, which includes any middle name too.
+			$firstname =~ s/^\s*//;
+			$firstname =~ s/\s*$//;
+			$query = "SELECT author_id FROM `NPL-author` WHERE lastname = \"$lastname\" AND firstname=\"$firstname\"";
+			my $author_id = $dbh->selectrow_array($query);
+			if (!defined($author_id)) {
+				$dbh->do("INSERT INTO `NPL-author`
+					VALUES(
+						\"\",
+						\"$institution\",
+						\"$lastname\",
+						\"$firstname\",
+						\"\"
+					)"
+						);
+				dbug "INSERT INTO author VALUES( \"\", \"$institution\", \"$lastname\", \"$firstname\", \"\" )\n";
+				$author_id = $dbh->selectrow_array($query);
+			}
+
+			# path table
+			#
+			$query = "SELECT path_id FROM `NPL-path` WHERE path = \"$pgpath\"";
+			my $path_id = $dbh->selectrow_array($query);
+			if (!defined($path_id)) {
+				$dbh->do("INSERT INTO `NPL-path`
+					VALUES(
+						\"\",
+						\"$pgpath\",
+						\"\",
+						\"\"
+					)"
+						);
+				dbug "INSERT INTO path VALUES( \"\", \"$path\", \"\", \"\" )\n";
+				$path_id = $dbh->selectrow_array($query);
+			}
+
+			# pgfile table
+			#
+			my $pgfile_id;
+			$dbh->do("INSERT INTO `NPL-pgfile`
+					VALUES(
+						\"\",
+						\"$DBsection_id\",
+						\"$author_id\",
+						\"$institution\",
+						\"$path_id\",
+						\"$pgfile\"
+					)"
+					);
+			dbug "INSERT INTO pgfile VALUES( \"\", \"$DBsection_id\", \"$author_id\", \"$institution\", \"$path_id\", \"$pgfile\", \"\" )\n";
+			$query = "SELECT pgfile_id FROM `NPL-pgfile` WHERE filename = \"$pgfile\" and path_id=$path_id";
+			$pgfile_id = $dbh->selectrow_array($query);
+
+			# keyword table, and problem_keyword many-many table
+			#
+			foreach my $keyword (@keyword) {
+				$keyword =~ s/[\'\"]//g;
+				$query = "SELECT keyword_id FROM `NPL-keyword` WHERE keyword = \"$keyword\"";
+				my $keyword_id = $dbh->selectrow_array($query);
+				if (!defined($keyword_id)) {
+					$dbh->do("INSERT INTO `NPL-keyword`
+						VALUES(
+							\"\",
+							\"$keyword\"
+						)"
+							);
+					dbug "INSERT INTO keyword VALUES( \"\", \"$keyword\")\n";
+					$keyword_id = $dbh->selectrow_array($query);
+				}
+
+				$query = "SELECT pgfile_id FROM `NPL-pgfile-keyword` WHERE keyword_id = \"$keyword_id\" and pgfile_id=\"$pgfile_id\"";
+				my $ok = $dbh->selectrow_array($query);
+				if (!defined($ok)) {
+					$dbh->do("INSERT INTO `NPL-pgfile-keyword`
+						VALUES(
+							\"$pgfile_id\",
+							\"$keyword_id\"
+						)"
+							);
+					dbug "INSERT INTO pgfile_keyword VALUES( \"$pgfile_id\", \"$keyword_id\" )\n";
+				}
+			}					#end foreach keyword
+
+			# Textbook section
+			# problem table contains textbook problems
+			#
+			for my $textno (keys %textinfo) {
+				my $texthashref = $textinfo{$textno};
+
+				# textbook table
+				#
+				$text = $texthashref->{title};
+				$edition = $texthashref->{edition};
+				$textauthor = $texthashref->{author};
+				next unless($text and $textauthor);
+				my $chapnum = $texthashref->{chapter};
+				my $secnum = $texthashref->{section};
+				$query = "SELECT textbook_id FROM `NPL-textbook` WHERE title = \"$text\" AND edition = \"$edition\" AND author=\"$textauthor\"";
+				my $textbook_id = $dbh->selectrow_array($query);
+				if (!defined($textbook_id)) {
+					$dbh->do("INSERT INTO `NPL-textbook`
+					VALUES(
+						\"\",
+						\"$text\",
+						\"$edition\",
+						\"$textauthor\",
+						\"\",
+						\"\",
+						\"\"
+					)"
+							);
+					dbug "INSERT INTO textbook VALUES( \"\", \"$text\", \"$edition\", \"$textauthor\", \"\", \"\", \"\" )\n";
+					dbug "\nLate add into NPL-textbook \"$text\", \"$edition\", \"$textauthor\"\n", 1;
+					$textbook_id = $dbh->selectrow_array($query);
+				}
+
+				# chapter weak table of textbook
+				#
+				$query = "SELECT chapter_id FROM `NPL-chapter` WHERE textbook_id = \"$textbook_id\" AND number = \"$chapnum\"";
+				my $chapter_id = $dbh->selectrow_array($query);
+				if (!defined($chapter_id)) {
+					$dbh->do("INSERT INTO `NPL-chapter`
+					VALUES(
+						\"\",
+						\"$textbook_id\",
+						\"".$chapnum."\",
+						\"$chapter\",
+						\"\"
+					)"
+							);
+					dbug "\nLate add into NPL-textchapter \"$text\", \"$edition\", \"$textauthor\", $chapnum $chapter from $name\n", 1;
+					dbug "INSERT INTO chapter VALUES(\"\", \"$textbook_id\", \"".$chapnum."\", \"$chapter\", \"\" )\n";
+					$chapter_id = $dbh->selectrow_array($query);
+				}
+
+				# section weak table of textbook
+				#
+				$section = '' if ($secnum < 0);
+				$query = "SELECT section_id FROM `NPL-section` WHERE chapter_id = \"$chapter_id\" AND number = \"$secnum\"";
+				my $section_id = $dbh->selectrow_array($query);
+				if (!defined($section_id)) {
+					$dbh->do("INSERT INTO `NPL-section`
+					VALUES(
+						\"\",
+						\"$chapter_id\",
+						\"$secnum\",
+						\"$section\",
+						\"\"
+					)"
+							);
+					dbug "INSERT INTO section VALUES(\"\", \"$textbook_id\", \"$secnum\", \"$section\", \"\" )\n";
+					dbug "\nLate add into NPL-textsection \"$text\", \"$edition\", \"$textauthor\", $secnum $section from $name\n", 1;
+					$section_id = $dbh->selectrow_array($query);
+				}
+
+				@textproblems = @{$texthashref->{problems}};
+				for my $tp (@textproblems) {
+					$query = "SELECT problem_id FROM `NPL-problem` WHERE section_id = \"$section_id\" AND number = \"$tp\"";
+					my $problem_id = $dbh->selectrow_array($query);
+					if (!defined($problem_id)) {
+						$dbh->do("INSERT INTO `NPL-problem`
+					VALUES(
+						\"\",
+						\"$section_id\",
+						\"$tp\",
+						\"\"
+					)"
+								);
+						dbug "INSERT INTO problem VALUES( \"\", \"$section_id\", \"$tp\", \"\" )\n";
+						$problem_id = $dbh->selectrow_array($query);
+					}
+
+					# pgfile_problem table associates pgfiles with textbook problems
+					#
+					$query = "SELECT problem_id FROM `NPL-pgfile-problem` WHERE problem_id = \"$problem_id\" AND pgfile_id = \"$pgfile_id\"";
+					my $pg_problem_id = $dbh->selectrow_array($query);  
+					if (!defined($pg_problem_id)) {
+						$dbh->do("INSERT INTO `NPL-pgfile-problem`
+					VALUES(
+						\"$pgfile_id\",
+						\"$problem_id\"
+					)"
+								);
+						dbug "INSERT INTO pgfile_problem VALUES( \"$pgfile_id\", \"$problem_id\" )\n";
+					}
+				}
+
+				#reset tag vars, they may not match the next text/file
+				$date =""; $textauthor=""; $textsection="";
+				$chapter=""; $section="";
+			}
+		}
+		close(IN) or die "can not close: $!";
+	}
+}
+
+
+$dbh->disconnect;
+
+print "\nDone.\n";
diff --git a/bin/PSH.pm b/bin/PSH.pm
deleted file mode 100644
index 15d703f392..0000000000
--- a/bin/PSH.pm
+++ /dev/null
@@ -1,329 +0,0 @@
-package PSH;
-
-use vars '$it';
-
-$PSH::VERSION = '0.7';
-
-#use strict; ##use only for testing !!!!!!!!
-
-sub welcome {
-    print STDOUT "Welcome to psh $PSH::VERSION by Jenda\@Krynicky.cz\nRunning under Perl $]\n\n";
-}
-
-$PSH::allowsystem = 1;
-%PSH::specials = ();
-
-eval {require 'PSH.config'};
- print STDERR "Error in psh.config : $@\n" if ($@ and $@ !~ /^Can't locate PSH.config in \@INC/i);
-$@='';
-
-sub Exec {
-    my $line = shift;
-    if ($PSH::allowsystem) {
-        if ($line =~ s/>\s*$//) {
-            ${$PSH::package.'::it'}= `$line`;
-        } else {
-            $line =~ /^(.*?)(?:\s(.*))?$/;
-            my $cmd;
-            if (defined ($cmd = $PSH::alias{lc $1})) {
-                ${$PSH::package.'::it'}=system( $cmd.' '.$2 );
-            } else {
-                ${$PSH::package.'::it'}=system( $line );
-            }
-        }
-    } else {
-        print STDOUT "Disallowed by the script!\n";
-    }
-}
-
-sub specials {
-    return if @_ % 2; # I need even number of parameters
-    my ($char,$fun);
-    while (defined($char = shift)) {
-        $fun = shift;
-        if ($fun) {
-            $PSH::specials{$char} = $fun;
-        } else {
-            delete $PSH::specials{$char};
-        }
-    }
-    $PSH::specials = join('|', map {"\Q$_\E"} keys %PSH::specials);
-}
-
-$PSH::specials{'!'} = \&PSH::Exec;
-
-sub prompt {
-    my $prompt = shift || 'perl';
-    my $eval = shift;
-    $PSH::specials = join('|', map {"\Q$_\E"} keys %PSH::specials); # just for sure
-    local $it='';
-    my $command='';
-    local ($PSH::package, $PSH::filename, $PSH::ln) = caller;
-    ${$PSH::package.'::it'}='';
-#    print "called from $PSH::package\n";
-    print STDOUT "$prompt\$ ";
-
-    my $line;
-    while (defined ($line = <STDIN>)) {
-        if (!$command and $line =~ /^$/) {
-            print STDOUT "$prompt\$ ";
-        } elsif (!$command and $PSH::specials and $line =~ /^\s*($PSH::specials)\s*/ and $PSH::specials{$1}) {
-            $line =~ s/^\s*($PSH::specials)\s*(.*)$/$2/o;
-            ${$PSH::package.'::it'}= &{$PSH::specials{$1}}($line);
-            print STDOUT "\n$prompt\$ ";
-        } elsif ($line =~ /^\?$/) {
-            PSH::help();
-            print STDOUT "\n$prompt\$ ";
-
-        } elsif (!$command and $line =~ /^<<(.*)$/) {
-            my $eoc = $1;
-            print STDOUT "$prompt($eoc)\$ ";
-            while (defined ($line = <STDIN>)) {
-                last if $line =~ /^\Q$eoc\E\s*$/;
-                $command .=$line;
-                print STDOUT "$prompt($eoc)\$ ";
-            }
-            if ($eval) {
-                ${$PSH::package.'::it'} = &$eval($command);
-            } else {
-                ${$PSH::package.'::it'} = eval "package $PSH::package;\n".$command;
-            }
-            $command = '';
-            print STDOUT "\nERROR: $@\n" if $@;
-            print STDOUT "\n$prompt\$ ";
-        } elsif ($line =~ s/;$//) {
-            if ($eval) {
-                ${$PSH::package.'::it'} = &$eval($command.$line);
-            } else {
-                ${$PSH::package.'::it'} = eval "package $PSH::package;\n".$command.$line;
-            }
-            $command = '';
-            print STDOUT "\nERROR: $@\n" if $@;
-            print STDOUT "\n$prompt\$ ";
-        } else {
-            $command .= $line;
-            print STDOUT "$prompt> ";
-        }
-    }
-    return ${$PSH::package.'::it'};
-}
-
-sub PSH::help {
-            print STDOUT <<"*END*";
-Commands starting by ! are passed to the command prompt.
-If the line ends by >, the output of the command is redirected to
-variable \$it. If you want to catch both STDOUT and STDERR use this:
-
- perl\$ ! command 2>&1 >
-
-All other commands are suposed to be a perl code.
-
-The code to be evaluated may be entered in two ways
-or use something like heredoc
-
-If the first line in a new command starts with <<, the rest of the line
-is considered as the heredoc delimiter. As long as you do not enter a
-line containing only those characters, the lines are only appended into
-a variable. As soon as you close the heredoc, the code is evaluated.
-
-Otherwise the code you enter is evaluated as soon as you enter a line
-finished by a semicolon.
-
-The value of the last command may be found in \$it.
-
-You may exit this "shell" by either "exit;" or CTRL+Z.
-Please keep in mind that "exit;" will close the whole script, while
-CTRL+Z will only close the prompt and the script will continue runing!
-
-Therefore you should use "exit;" with caution.
-
-psh $PSH::VERSION by Jenda\@Krynicky.cz
-*END*
-}
-
-"I am an excellent programmer"; # A required file must return a true value ;-)
-
-__END__
-
-=head1 NAME
-
-PSH - perl shell
-
-Version 0.7
-
-=head1 SYNOPSIS
-
- use PSH;
- ...
- PSH::prompt;
-
-=head1 DESCRIPTION
-
-This module provides a "perl command prompt" facility for your program.
-You may do some processing and then simply call PSH::prompt to allow
-the user to finish the task if something went wrong by calling the functions
-of your program.
-
-I use it for example at the end of the Golem (peoplemeter data processing software)
-import script. Sometimes I get not only the new data, but also some
-repairs of old ones and sometimes some stage of import fails.
-This perl prompt at the end of the script allows me to fix such problems "by hand".
-
-=head2 Usage
-
-This module provides two functions, PSH::prompt and PSH::welcome.
-The first prints the "perl$" prompt, waits for user interaction and executes the entered
-commands. The user then closes the prompt by pressing CTRL-D (Unix/Mac) or CTRL-Z (Windoze).
-
-All commands are processed in the same package from which PSH::prompt was
-called. You may access all global or local() variables, but of course not
-my() variables.
-
-The call to PSH::prompt returns the value of the last executed statement.
-
-
-Since version 0.4 you may pass two parameters to PSH::prompt :
-
- PSH::prompt [$prompttext, [ \&evalsub ] ]
-
-The first sets the prompt used by the module, the second sets the function used
-to evaluate the code you entered. Default is
-
- PSH::prompt 'perl', \&eval;
-
-The second function prints out the version info.
-
-=head2 Prompt
-
-Commands starting by ! are passed to the command prompt,
-If the line ends by >, the output of the command is redirected to
-variable $it. If you want to catch both STDOUT and STDERR use this:
-
- perl$ ! command 2>&1 >
-
-All other commands are supposed to be a perl code.
-
-The code to be evaluated may be entered in two ways
-or use something like heredoc
-
-If the first line in a new command starts with <<, the rest of the line
-is considered as the heredoc delimiter. As long as you do not enter a
-line containing only those characters, the lines are only appended into
-a variable. As soon as you close the heredoc, the code is evaluated.
-
-Otherwise the code you enter is evaluated as soon as you enter a line
-finished by a semicolon.
-
-The value of the last command may be found in $it.
-
-You may exit this "shell" by either "exit;" or CTRL+Z.
-Please keep in mind that "exit;" will close the whole script, while
-CTRL+Z will only close the prompt and the script will continue running!
-
-Therefore you should use "exit;" with caution.
-
-=head2 PSH.config
-
-In the same directory as PSH.pm may be also file PSH.config.
-This file will be "required" whenever you use PSH. You may add some
-function definitions and variables there.
-
-Please keep in mind that this file is required in PSH package so
-the variables and functions you define therein are in this package by default!
-
-Also keep in mind that this file is require()d!
-The last statement in this file MUST return a true value!!!
-And there must be some command in the file! At least
-
-    1;
-
-You should not do any changes to PSH.pm cause it would
-be quite hard to upgrade then. If possible, do the necessary personalization
-through PSH.config. If you find something that would be useful for other people,
-or something you cannot do from within PSH.config, contact me.
-I'm always open to suggestions and additions :-)
-
-=head2 Options and settings
-
- $PSH::allowsystem = should the prompt allow executing system
- commands through "! command" ? Default = yes.
-
- %PSH::alias = a hash of aliases for commands.
-  Every time you enter a line starting with an exclamation mark,
-  the first word is looked up in this hash and if a match is found,
-  this word is replaced by the value from the hash.
-  All keys in this hash should be lowercase, the match is case-insensitive.
-
-  You will probably want to populate this hash according to macros in
-  your preferred shell or OS. On my pages you may find examples for
-  reading doskey macros and applications registered to Windoze.
-
- %PSH::specials = a hash of specials
-  This hash allows you to install additional special characters
-  similar to "!". If PSH sees a special character (a key from
-  this hash), it calls the specified function for that character
-  (the value). Actually it doesn't have to be a character :-)
-
-  Default : $PSH::specials{'!'} = \&PSH::Exec;
-
-  You should not modify this hash directly, you'd better use function
-  PSH::specials :
-
-   PSH::specials '^' => \&foo;
-   PSH::specials '!' => undef;
-
-  Otherwise the change may be ignored !
-
-=head2 Example
-
-    use PSH;
-    END {PSH::prompt unless $OK}
-    $do->some('processing) or die "Error : $do->{error}!\n";
-    some(more->commands) or die "Error : some went wrong!\n";
-    $OK=1;
-    __END__
-
-This will allow the user to do some by-hand cleansing if an error occures.
-
-    use PSH;
-    PSH::prompt 'hello', sub {print $_[0]};
-
-=head2 Ussage example
-
- perl$ print 45+6;
- 51
- perl$ print 12
- perl>  + 15;
- 27
- perl$ sub Foo {
- perl>  print "Foo called\n";
-
- ERROR: Missing right bracket at (eval 3) line 5, at end of line
- syntax error at (eval 3) line 5, at EOF
-
- perl$ sub Foo {
- perl>  print "Foo called\n"; #
- perl> };
-
- perl$ Foo;
- Foo called
-
- perl$ <<END
- perl(END)$ sub Bar {
- perl(END)$  my $arg = shift;
- perl(END)$  print "Bar called with ($arg)\n";
- perl(END)$ }
- perl(END)$ END
-
- perl$ Bar(45);
- Bar called with (45)
-
- perl$ ^Z
-
- c:\>
-
-=head2 AUTHOR
-
-Jenda@Krynicky.cz
-
-=cut
diff --git a/bin/addcourse b/bin/addcourse
index a3c4876d91..89cddcc3b9 100755
--- a/bin/addcourse
+++ b/bin/addcourse
@@ -1,8 +1,8 @@
 #!/usr/bin/env perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/bin/addcourse,v 1.20 2006/12/09 03:29:56 sh002i 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
@@ -21,154 +21,260 @@ addcourse - add a course
 
 =head1 SYNOPSIS
 
- addcourse [B<--users>=I<FILE> [B<--professors>=I<USERID>[,I<USERID>]...] ]
- [B<--templates>=I<DIR>] I<COURSEID>
+ addcourse [options] COURSEID
 
 =head1 DESCRIPTION
 
-Add a course to the courses directory. The required directories will be
-created. Optionally, a database can be populated with users and the
-F<templates> directory can be populated with the contents of another directory.
-Also, one or more users can be granted professor privileges.
+Add a course to the courses directory. The required directories will be created.
+Optionally, a database can be populated with users. Also, one or more users can
+be granted professor privileges.
 
 =head1 OPTIONS
 
 =over
 
+=item B<--db-layout>=I<LAYOUT>
+
+The specified database layout will be used in place of the default specified in
+F<global.conf>.
+
 =item B<--users>=I<FILE>
 
 The users listed in the comma-separated text file I<FILE> will be added to the
-user list of the new course.
+user list of the new course. The format of this file is the same as user lists
+exported from WeBWorK.
 
 =item B<--professors>=I<USERID>[,I<USERID>]...
 
 Each I<USERID>, if it is present in the new course's user list, will be granted
 professor privileges (i.e. a permission level of 10). Requires B<--users>.
 
-=item B<--templates>=I<DIR>
+=item B<--templates-from>=I<COURSEID>
 
-The contents of the directory I<DIR> will be copied to the F<templates>
-directory of the new course.
+If specified, the contents of the specified course's templates directory are
+used to populate the new course's templates directory.
 
 =item I<COURSEID>
 
 The name of the course to create.
 
+=back
+
 =cut
 
+BEGIN {
+	# hide arguments (there could be passwords there!)
+	$0 = "$0";
+}
+
 use strict;
 use warnings;
-use FindBin;
 use Getopt::Long;
-use lib "$FindBin::Bin/../lib";
+
+
+BEGIN {
+	die "WEBWORK_ROOT not found in environment.\n"
+		unless exists $ENV{WEBWORK_ROOT};
+	  my $webwork_dir = $ENV{WEBWORK_ROOT};
+	  print "addcourse:  WeBWorK root directory set to $webwork_dir\n";
+
+	# link to WeBWorK code libraries
+      eval "use lib '$webwork_dir/lib'"; die $@ if $@;
+      eval "use WeBWorK::CourseEnvironment"; die $@ if $@;
+
+		
+}
+
+our $webwork_dir = $ENV{WEBWORK_ROOT};
+
+
+BEGIN { $main::VERSION = "2.4"; }  #hack to set version
+
+
+
+
+# link to WeBWorK code libraries
+eval "use lib '$webwork_dir/lib'"; die $@ if $@;
+eval "use WeBWorK::CourseEnvironment"; die $@ if $@;
+
+#################################################################
+# The folloinwg code reads global.conf and extracts the remaining configuration
+# variables. There is no need to modify it.
+#################################################################
+
+# link to WeBWorK code libraries
+eval "use lib '$webwork_dir/lib'"; die $@ if $@;
+eval "use WeBWorK::CourseEnvironment"; die $@ if $@;
+
+# grab course environment (by reading webwork2/conf/global.conf)
+my $ce = new WeBWorK::CourseEnvironment({ webwork_dir => $webwork_dir });
+
+#  set important configuration variables (from global.conf)
+
+my $webwork_url = $ce->{webwork_url};                    # e.g.  /webwork2
+my $pg_dir = $ce->{pg_dir};                              # e.g.  /opt/webwork/pg         
+
+#################################################################
+# report server setup when child process starts up -- for example when restarting the server
+#################################################################
+print "addcourse:  WeBWorK server is starting\n";
+print "addcourse:  WeBWorK root directory set to $webwork_dir in webwork2/conf/webwork.apache2-config\n";
+print "addcourse:  The following locations and urls are set in webwork2/conf/global.conf\n";
+print "addcourse:  PG root directory set to $pg_dir\n";
+print "addcourse:  WeBWorK server userID is ", $ce->{server_userID}, "\n";
+print "addcourse:  WeBWorK server groupID is ", $ce->{server_groupID}, "\n";
+print "addcourse:  The webwork url on this site is ", $ce->{server_root_url},"$webwork_url\n";
+
+
+# link to PG code libraries
+eval "use lib '$pg_dir/lib'"; die $@ if $@;
+
+eval q{
 use WeBWorK::CourseEnvironment;
 use WeBWorK::DB;
-use WeBWorK::Utils qw/readFile cryptPassword/;
+use WeBWorK::File::Classlist;
+use WeBWorK::Utils qw(runtime_use readFile cryptPassword);
+use WeBWorK::Utils::CourseManagement qw(addCourse deleteCourse listCourses);
+}; die $@ if $@;
 
 sub usage {
-	print STDERR "$0 [--users=FILE [--professors=USERID[,USERID]...] ]\n";
-	print STDERR "[--templates=DIR] COURSEID\n";
+	print STDERR "usage: $0 [options] COURSEID\n";
+	print STDERR "Options:\n";
+	print STDERR "  [--db-layout=LAYOUT]\n";
+	print STDERR "  [--users=FILE [--professors=USERID[,USERID]...] ]\n";
 	exit;
 }
 
+sub usage_error {
+	print STDERR "$0: @_\n";
+	usage();
+}
+
+my $dbLayout = "";
+my $sql_host = "";
+my $sql_port = "";
+my $sql_user = "";
+my $sql_pass = "";
+my $sql_db = "";
+my $sql_wwhost = "";
+my $globalUserID = "";
 my $users = "";
 my @professors = ();
-my $templates = "";
+my $templates_from = "";
+
+##### get command-line options #####
 
 GetOptions(
+	"db-layout=s" => \$dbLayout,
+	"sql-host=s" => \$sql_host,
+	"sql-port=s" => \$sql_port,
+	"sql-user=s" => \$sql_user,
+	"sql-pass=s" => \$sql_pass,
+	"sql-db=s" => \$sql_db,
+	"sql-wwhost=s" => \$sql_wwhost,
+	"global-user=s" => \$globalUserID,
 	"users=s" => \$users,
 	"professors=s" => \@professors,
-	"templates=s" => \$templates,
+	"templates-from=s" => \$templates_from,
 );
 my %professors = map { $_ => 1 } map { split /,/ } @professors;
 my $courseID = shift;
 
-#print "users=$users\n";
-#print "professors=@professors\n";
-#print "templates=$templates\n";
-#print "courseID=$courseID\n";
+##### perform sanity checks #####
 
-unless ($ENV{WEBWORK_ROOT}) {
-	die "WEBWORK_ROOT not found in environment.\n";
+usage_error("must specify COURSEID.") unless $courseID;
+
+# bring up a minimal course environment
+$ce = WeBWorK::CourseEnvironment->new({
+	webwork_dir => $ENV{WEBWORK_ROOT},
+	courseName => $courseID
+});
+
+if ($dbLayout) {
+	die "Database layout $dbLayout does not exist in the course environment.",
+			" (It must be defined in global.conf.)\n"
+		unless exists $ce->{dbLayouts}->{$dbLayout};
+} else {
+	# use default value
+	$dbLayout = $ce->{dbLayoutName};
 }
 
-unless ($courseID) {
-	print STDERR "$0: must specify COURSEID.\n";
-	usage();
-};
+usage_error("can't specify --professors without also specifying --users.")
+	if @professors and not $users;
 
-if (@professors and not $users) {
-	print STDERR "$0: can't specify --professors without also specifying --users.\n";
-	usage();
-}
+##### set up parameters to pass to addCourse() #####
 
-# bring up a minimal course environment
-my $ce = WeBWorK::CourseEnvironment->new($ENV{WEBWORK_ROOT}, "FAKE_URL_ROOT",
-	"FAKE_PG_ROOT", $courseID);
-
-# collect some data
-my $coursesDir = $ce->{webworkDirs}->{courses};
-my $courseDir = "$coursesDir/$courseID";
-
-# create course directory
-#print "mkdir $courseDir\n";
-#mkdir $courseDir or die "Failed to create course directory: $!\n";
-
-# populate it with some subdirectories
-my @subDirs = sort values %{ $ce->{courseDirs} };
-foreach my $subDir (@subDirs) {
-	print "mkdir $subDir\n";
-	mkdir "$subDir"
-		or die "Failed to create course directory $subDir: $!\n";
-}
+my %courseOptions = ( dbLayoutName => $dbLayout );
+
+# this is kinda left over from when we had 'gdbm' and 'sql' database layouts
+# below this line, we would grab values from getopt and put them in this hash
+# but for now the hash can remain empty
+my %dbOptions;
 
+my @users;
 if ($users) {
-	# import users - much of this code is burgled from UserList.pm
+	# this is a hack to create records without bringing up a DB object
+	#my $db = WeBWorK::DB->new($ce->{dbLayouts}->{$dbLayout});
+	my $userClass = $ce->{dbLayouts}->{$dbLayout}->{user}->{record};
+	my $passwordClass = $ce->{dbLayouts}->{$dbLayout}->{password}->{record};
+	my $permissionClass = $ce->{dbLayouts}->{$dbLayout}->{permission}->{record};
+	
+	runtime_use($userClass);
+	runtime_use($passwordClass);
+	runtime_use($permissionClass);
 	
-	my $db = WeBWorK::DB->new($ce);
-	my @contents = split /\n/, readFile($users);
+	# Default status is enrolled -- fetch abbreviation for enrolled
+	my $default_status_abbrev = $ce->{statuses}->{Enrolled}->{abbrevs}->[0];
 	
-	foreach my $string (@contents) {
-		$string =~ s/^\s+//;
-		$string =~ s/\s+$//;
-		my (
-			$student_id, $last_name, $first_name, $status, $comment,
-			$section, $recitation, $email_address, $user_id
-		) = split /\s*,\s*/, $string;
+	# default permission level
+	my $default_permission_level = $ce->{default_permission_level};
+	
+	my @classlist = parse_classlist($users);
+	foreach my $record (@classlist) {
+		my %record = %$record;
+		my $user_id = $record{user_id};
 		
-		my $User = $db->newUser;
-		$User->user_id($user_id);
-		$User->first_name($first_name);
-		$User->last_name($last_name);
-		$User->email_address($email_address);
-		$User->student_id($student_id);
-		$User->status($status);
-		$User->section($section);
-		$User->recitation($recitation);
-		$User->comment($comment);
+		# set default status is status field is "empty"
+		$record{status} = $default_status_abbrev
+			unless defined $record{status} and $record{status} ne "";
 		
-		my $PermissionLevel = $db->newPermissionLevel;
-		$PermissionLevel->user_id($user_id);
-		if (exists $professors{$user_id}) {
-			$PermissionLevel->permission(10);
-		} else {
-			$PermissionLevel->permission(0);
+		# set password from student ID if password field is "empty"
+		if (not defined $record{password} or $record{password} eq "") {
+			if (defined $record{student_id} and $record{student_id} ne "") {
+				# crypt the student ID and use that
+				$record{password} = cryptPassword($record{student_id});
+			} else {
+				# an empty password field in the database disables password login
+				$record{password} = "";
+			}
 		}
 		
-		my $Password = $db->newPassword;
-		$Password->user_id($user_id);
-		$Password->password(cryptPassword($student_id));
+		# set default permission level if pedefault_permission_levelrmission level is "empty"
+		if (not defined $record{status} and $record{status} ne "") {
+			if (exists $professors{$user_id}) {
+				$record{permission} = $ce->{userRoles}{professor}; # FIXME hardcoded role name is bad
+			} else {
+				$record{permission} = $default_permission_level;
+			}
+		}
 		
-		$db->addUser($User);
-		$db->addPermissionLevel($PermissionLevel);
-		$db->addPassword($Password);
+		my $User = $userClass->new(%record);
+		my $PermissionLevel = $permissionClass->new(user_id => $user_id, permission => $record{permission});
+		my $Password = $passwordClass->new(user_id => $user_id, password => $record{password});
 		
-		if (exists $professors{$user_id}) {
-			print "add professor $user_id\n";
+		if (exists $record{permission}) {
+			$PermissionLevel->permission($record{permission});
 			delete $professors{$user_id};
-		} else {
-			print "add user $user_id\n";
+		} elsif (exists $professors{$user_id}) {
+			$PermissionLevel->permission(10);
+			delete $professors{$user_id};
+		}
+		
+		if (exists $record{password}) {
+			$Password->password($record{password});
 		}
+		
+		push @users, [ $User, $Password, $PermissionLevel ];
 	}
 	
 	if (my @ids = keys %professors) {
@@ -176,27 +282,29 @@ if ($users) {
 	}
 }
 
-if ($templates) {
-	unless (-d "$courseDir/templates") {
-		warn "$courseDir/templates: not found, creating:\n";
-		print "mkdir $courseDir/templates\n";
-		mkdir "$courseDir/templates"
-			or die "Failed to mkdir $courseDir/templates: $!\n";
-	}
-	print "copy $templates/* -> $courseDir/templates\n";
-	system "/bin/cp -r $templates/* $courseDir/templates/"
-		and die "Failed to copy $templates/* to $courseDir/templates: $!\n";
+my %optional_arguments;
+if ($templates_from ne "") {
+	$optional_arguments{templatesFrom} = $templates_from;
 }
 
-=head1 BUGS
-
-Databases are created using the database layout specified in the global
-configuration file (F<global.conf>), which requires users to temporarily modify
-their system's configuration in order to create a course with a nonstandard
-database layout.
+##### call addCourse(), handle errors #####
+
+eval {
+	addCourse(
+		courseID      => $courseID,
+		ce            => $ce,
+		courseOptions => \%courseOptions,
+		dbOptions     => \%dbOptions,
+		users         => \@users,
+		%optional_arguments,
+	);
+};
 
-Also, some database drivers are unable to create storage for their data. The
-GDBM backend can do this, but the SQL backend cannot (currently).
+if ($@) {
+	my $error = $@;
+	print STDERR "$error\n";
+	exit;
+}
 
 =head1 AUTHOR
 
diff --git a/bin/check_latex.tex b/bin/check_latex.tex
new file mode 100644
index 0000000000..e3c3e04f12
--- /dev/null
+++ b/bin/check_latex.tex
@@ -0,0 +1,76 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% WeBWorK Online Homework Delivery System
+% Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+% $CVSHeader: webwork2/bin/check_latex.tex,v 1.2 2004/10/06 21:09:33 gage 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
+% Free Software Foundation; either version 2, or (at your option) any later
+% version, or (b) the "Artistic License" which comes with this package.
+% 
+% This program is distributed in the hope that it will be useful, but WITHOUT
+% ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+% FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+% Artistic License for more details.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\documentclass[10pt,dvips]{amsart}
+\usepackage{amsmath,amsfonts,amssymb,multicol}
+\usepackage[pdftex]{graphicx}
+\usepackage[active,textmath,displaymath]{preview}  % needed for dvipng
+\usepackage{epstopdf} % needed for eps graphics in CAPA
+\usepackage{epsf}   
+\usepackage{epsfig}   % needed for eps graphics in CAPA
+\usepackage{pslatex}
+
+
+\pagestyle{plain}
+\textheight 9in
+\oddsidemargin = -0.42in
+\evensidemargin = -0.42in
+\textwidth= 7.28in
+\columnsep = .25in
+\columnseprule = .4pt
+\def\endline{\bigskip\hrule width \hsize height 0.8pt }
+\newcommand{\lt}{<}
+\newcommand{\gt}{>}
+\newcommand{\less}{<}
+\newcommand{\grt}{>}
+
+% BEGIN capa tex macros
+
+\newcommand{\capa}{{\sl C\kern-.10em\raise-.00ex\hbox{\rm A}\kern-.22em%
+{\sl P}\kern-.14em\kern-.01em{\rm A}}}
+  
+\newenvironment{choicelist}
+{\begin{list}{}
+	{\setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}
+	\setlength{\topsep}{0.05in}\setlength{\itemsep}{0.022in}
+	\setlength{\parsep}{0in}\setlength{\belowdisplayskip}{0.04in}
+	\setlength{\abovedisplayskip}{0.05in}
+	\setlength{\abovedisplayshortskip}{-0.04in}
+	\setlength{\belowdisplayshortskip}{0.04in}}
+	}
+{\end{list}}
+
+% END capa tex macros 
+
+\begin{document}
+\voffset=-0.8in
+\newpage
+\setcounter{page}{1}
+\begin{multicols}{2}
+\columnwidth=\linewidth
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+Testing the LaTeX set up for WeBWorK.
+%{\includegraphics[width = 3.5 in]{prob03av8.pdf}}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\end{multicols}
+\vfill
+\end{document}
diff --git a/bin/check_modules.pl b/bin/check_modules.pl
new file mode 100755
index 0000000000..6dc265a2e6
--- /dev/null
+++ b/bin/check_modules.pl
@@ -0,0 +1,167 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+my @applicationsList = qw(
+	mkdir
+	mv
+	mysql
+	tar
+	gzip
+	latex
+	pdflatex
+	dvipng
+	tth
+	giftopnm
+	ppmtopgm
+	pnmtops
+	pnmtopng
+	pngtopnm
+);
+
+my @apache1ModulesList = qw(
+	Apache
+	Apache::Constants 
+	Apache::Cookie
+	Apache::Log
+	Apache::Request
+);
+
+my @apache2ModulesList = qw(
+	Apache2::Request
+	Apache2::Cookie
+	Apache2::ServerRec
+	Apache2::ServerUtil
+);
+
+my @modulesList = qw(
+	Benchmark
+	Carp
+	CGI
+	Data::Dumper
+	Data::UUID 
+	Date::Format
+	Date::Parse
+	DateTime
+	DBD::mysql
+	DBI
+	Digest::MD5
+	Email::Address
+	Errno
+	Exception::Class
+	File::Copy
+	File::Find
+	File::Path
+	File::Spec
+	File::stat
+	File::Temp
+	GD
+	Getopt::Long
+	Getopt::Std
+	HTML::Entities
+	HTML::Tagset
+	IO::File
+	Iterator
+	Iterator::Util
+	Locale::Maketext::Lexicon
+	Locale::Maketext::Simple
+	Mail::Sender
+	MIME::Base64
+	Net::IP
+	Net::LDAPS
+	Net::SMTP
+	Opcode
+	PadWalker
+	PHP::Serialization
+	Pod::Usage
+	Pod::WSDL
+	Safe
+	Scalar::Util
+	SOAP::Lite 
+	Socket
+	SQL::Abstract
+	String::ShellQuote
+	Text::Wrap
+	Tie::IxHash
+	Time::HiRes
+	Time::Zone
+	URI::Escape
+	UUID::Tiny
+	XML::Parser
+	XML::Parser::EasyTree
+	XML::Writer
+	XMLRPC::Lite
+);
+
+# modules used by disabled code
+#	RQP::Render (RQP)
+#	SOAP::Lite (PG::Remote)
+
+my $apache_version = shift @ARGV;
+unless (defined $apache_version and $apache_version =~ /^apache[12]$/) {
+	warn "invalid apache version specified -- assuming apache2\n";
+	warn "usage: $0 { apache1 | apache2 }\n";
+	sleep 1;
+	$apache_version = "apache2";
+}
+
+if ($apache_version eq "apache1") {
+	push @modulesList, @apache1ModulesList;
+} elsif ($apache_version eq "apache2") {
+	push @modulesList, @apache2ModulesList;
+}
+
+my @PATH = split(/:/, $ENV{PATH});
+check_apps(@applicationsList);
+
+check_modules(@modulesList);
+
+sub check_apps {
+	my @applicationsList = @_;
+	print "\nChecking your \$PATH for executables required by WeBWorK...\n";
+#	print "\$PATH=", shift @PATH, "\n";    # this throws away the first item -- usually /bin
+        print "\$PATH=";
+	print join ("\n", map("      $_", @PATH)), "\n\n";
+	
+	foreach my $app (@applicationsList)  {
+		my $found = which($app);
+		if ($found) {
+			print "   $app found at $found\n";
+		} else {
+			print "** $app not found in \$PATH\n";
+		}
+	}
+}
+
+sub which {
+	my $app = shift;
+	foreach my $path (@PATH) {
+		return "$path/$app" if -e "$path/$app";
+	}
+}
+
+sub check_modules {
+	my @modulesList = @_;
+	
+	print "\nChecking your \@INC for modules required by WeBWorK...\n";
+	my @inc = @INC;
+	print "\@INC=";
+	print join ("\n", map("     $_", @inc)), "\n\n";
+	
+	foreach my $module (@modulesList)  {
+		eval "use $module";
+		if ($@) {
+			my $file = $module;
+			$file =~ s|::|/|g;
+			$file .= ".pm";
+			if ($@ =~ /Can't locate $file in \@INC/) {
+				print "** $module not found in \@INC\n";
+			} else {
+				print "** $module found, but failed to load: $@";
+			}
+		} else {
+			print "   $module found and loaded\n";
+		}
+	}
+}
diff --git a/bin/convert-functions.pl b/bin/convert-functions.pl
new file mode 100755
index 0000000000..f2ad857525
--- /dev/null
+++ b/bin/convert-functions.pl
@@ -0,0 +1,262 @@
+#! /usr/bin/perl
+
+#
+# Usage:  convert-functions [-t | --test] [-q | --quiet] filename [filename ...]
+#
+#  If the filename is '-', act as a filter (read from stdin and write to stdout),
+#  otherwise, each file is read and modified.
+#
+#  If --test is specified, then no output is written, but you just see what changes
+#    would have been made.
+#
+#  If --quiet is specified, the conversions are not printed out
+#    (but the file names still are)
+#
+
+#
+#  The functions to be converted and their parameter lists.
+#
+#  The hash key is the original function name, and the value is an array of two or three items:
+#    The first is the name of the routine it is being mapped to
+#    The second is an array that tells how to map the original functions parameters to the
+#      new functions hash list (see below)
+#    The third is an optional hash of parameters that are always passed to the new routine
+#
+#  The values in the array of arguments have several special interpretations:
+#    A value listed as "undef" will be passed to the new routine as a plain argument (not as
+#      part of the hash).
+#    An entry of the form name[n] (where n is a number) will be put in position n of an array
+#      reference whose key is name in the hash passed to the new routine.  (E.g., "limits[0]"
+#      puts the argument in that position of the original argument list into the first entry
+#      of limits=>[n,m] in the hash.)  The default value for the array hash is given by
+#      the variable $default{name}, e.g. $default{limits} = ['$funcLLimitDefault','$funcULimitDefault'].
+#   An entry of '@' means make the rest of the parameters into an array reference and pass them
+#      as the first parameter to the new routine.
+#
+#   Any extra parameters from the original routine are passed verbatim to the new one.
+#
+
+%function = (
+  std_num_cmp             => ['num_cmp',[undef,'relTol','format','zeroLevel','zeroLevelTol']],
+  std_num_cmp_abs         => ['num_cmp',[undef,'tol','format'],{tolType=>'absolute'}],
+  std_num_cmp_list        => ['num_cmp',['relTol','format','@']],
+  std_num_cmp_abs_list    => ['num_cmp',['tol','format','@'],{tolType=>'absolute'}],
+
+  arith_num_cmp           => ['num_cmp',[undef,'relTol','format','zeroLevel','zeroLevelTol'],{mode=>'arith'}],
+  arith_num_cmp_abs       => ['num_cmp',[undef,'tol','format'],{mode=>'arith',tolType=>'absolute'}],
+  arith_num_cmp_list      => ['num_cmp',['relTol','format','@'],{mode=>'arith'}],
+  arith_num_cmp_abs_list  => ['num_cmp',['tol','format','@'],{mode=>'arith',tolType=>'absolute'}],
+
+  strict_num_cmp          => ['num_cmp',[undef,'relTol','format','zeroLevel','zeroLevelTol'],{mode=>'strict'}],
+  strict_num_cmp_abs      => ['num_cmp',[undef,'tol','format'],{mode=>'strict',tolType=>'absolute'}],
+  strict_num_cmp_list     => ['num_cmp',['relTol','format','@'],{mode=>'strict'}],
+  strict_num_cmp_abs_list => ['num_cmp',['tol','format','@'],{mode=>'strict',tolType=>'absolute'}],
+
+  frac_num_cmp            => ['num_cmp',[undef,'relTol','format','zeroLevel','zeroLevelTol'],{mode=>'frac'}],
+  frac_num_cmp_abs        => ['num_cmp',[undef,'tol','format'],{mode=>'frac',tolType=>'absolute'}],
+  frac_num_cmp_list       => ['num_cmp',['relTol','format','@'],{mode=>'frac'}],
+  frac_num_cmp_abs_list   => ['num_cmp',['tol','format','@'],{mode=>'frac',tolType=>'absolute'}],
+
+  std_num_str_cmp         =>
+    ['num_cmp',[undef,'strings','relTol','format','zeroLevel','zeroLevelTol']],
+
+  function_cmp  =>
+    ['fun_cmp',[undef,'vars','limits[0]','limits[1]','relTol','numPoints','zeroLevel','zeroLevelTol']],
+
+  function_cmp_up_to_constant =>
+    ['fun_cmp',[undef,'vars','limits[0]','limits[1]','relTol','numPoints','maxConstantOfIntegration',
+      'zeroLevel','zeroLevelTol'],{mode=>'antider'}],
+
+  function_cmp_abs =>
+    [fun_cmp,[undef,'vars','limits[0]','limits[1]','tol','numPoints'],{tolType=>'absolute'}],
+
+  function_cmp_up_to_constant_abs =>
+    [fun_cmp,[undef,'vars','limits[0]','limits[1]','tol','numPoints','maxConstantOfIntegration'],
+     {mode=>'antider',tolType=>'absolute'}],
+
+  multivar_function_cmp => ['fun_cmp',[undef,'vars']],
+  
+  std_str_cmp               => ['str_cmp',[]],
+  std_str_cmp_list          => ['str_cmp',['@']],
+  std_cs_str_cmp            => ['str_cmp',[],{filters=>['trim_whitespace','compress_whitespace']}],
+  std_cs_str_cmp_list       => ['str_cmp',['@'],{filters=>['trim_whitespace','compress_whitespace']}],
+  strict_str_cmp            => ['str_cmp',[],{filters=>['trim_whitespace']}],
+  strict_str_cmp_list       => ['str_cmp',['@'],{filters=>['trim_whitespace']}],
+  unordered_str_cmp         => ['str_cmp',[],{filters=>['remove_whitespace','ignore_order','ignore_case']}],
+  unordered_str_cmp_list    => ['str_cmp',['@'],{filters=>['remove_whitespace','ignore_order','ignore_case']}],
+  unordered_cs_str_cmp      => ['str_cmp',[],{filters=>['remove_whitespace','ignore_order']}],
+  unordered_cs_str_cmp_list => ['str_cmp',['@'],{filters=>['remove_whitespace','ignore_order']}],
+  ordered_str_cmp           => ['str_cmp',[],{filters=>['remove_whitespace','ignore_case']}],
+  ordered_str_cmp_list      => ['str_cmp',['@'],{filters=>['remove_whitespace','ignore_case']}],
+  ordered_cs_str_cmp        => ['str_cmp',[],{filters=>['remove_whitespace']}],
+  ordered_cs_str_cmp_list   => ['str_cmp',['@'],{filters=>['remove_whitespace']}],
+  
+);
+
+#numerical_compare_with_units() needs to be handled by hand -- but there are very few uses.
+
+$default{limits} = ['$funcLLimitDefault','$funcULimitDefault'];
+
+#
+#  Make a patter from all the names (we sort be length of the names, to 
+#  make sure prefixes appear later in the list).
+#
+$pattern = join("|",sort byName keys(%function));
+
+sub byName {
+  return $a <=> $b if length($a) == length($b);
+  return length($b) <=> length($a);
+}
+
+#
+#  Remove leading and trailing spaces
+#
+sub trim {
+  my $s = shift;
+  $s =~ s/(^\s+|\s+$)//g;
+  return $s;
+}
+
+#
+#  Remove leading comment lines
+#
+sub trimComments {
+  my $s = shift;
+  $s =~ s/^(\s*#.*?(\n|$))*//;
+	    return $s;
+}
+
+
+#
+#  Command-line options and internal state parameters
+#
+$testing = 0;  # true if not writing output files
+$quiet = 0;    # true if not printing changed function calls
+$changed = 0;  # true if we have changes a function in the current file
+
+#
+#  Read the contents of a file, and search through it for the functions
+#  above.  Then modify the argument lists to use hashes rather than
+#  direct parameter lists.
+#
+sub Process {
+  my @lines;
+  if ($file eq "-") {
+    @lines = <>;
+    open(PGFILE,">&STDOUT");  # redirect this to STDOUT
+  } elsif ($file eq "--test" || $file eq "-t") {
+    $testing = 1; return;
+  } elsif ($file eq "--quiet" || $file eq "-q") {
+    $quiet = 1; return;
+  } else {
+    print stderr "\n" if $changed;
+    print stderr "Converting: $file\n";
+    open(PGFILE,$file) || warn "Can't read '$file': $!";
+    @lines = <PGFILE>; close(PGFILE);
+    open(PGFILE,$testing? ">/dev/null": ">$file");
+  }
+  $changed = 0;
+
+  my $file = join("",@lines);
+  $file =~ s/\&beginproblem(\(\))?/beginproblem()/gm;  # remove unneeded ampersands
+  $file =~ s/\&ANS\(/ANS\(/gm;  # remove unneeded ampersands
+  $file =~ s/ANS\( */ANS\(/gm;  # remove unneeded spaces
+  my @parts = split(/($pattern)/o,$file);
+#
+#  Because of the parentheses around the pattern above, split returns the pattern
+#  as well as the stuff it separates.  So @parts contains stuff, first function,
+#  args and more stuff, next function, etc.
+#
+  print PGFILE shift(@parts);
+  while (my $f = shift(@parts)) {
+    my ($args,$rest) = GetArgs(shift(@parts));
+    unless ($args) {print $f,$rest; next};  # skip it if doesn't look like an actual call
+    print PGFILE HandleFunction($f,$function{$f},$args),$rest;
+  }
+}
+
+#
+#  Convert the list of arguments to appropriate hash values
+#  (taking into account the interpretations given above
+#  for the special entries in the list).
+#  Don't include empty parameters (I don't think this should be a problem).
+#  Return the modified function call with the new name and hash
+#
+sub HandleFunction {
+  my $original = shift; my $f = shift; my $args = shift;
+  my @names = @{$f->[1]}; my @args = @{$args};
+  my ($name,$value);
+  #
+  #  Get the fixed options needed for this function
+  #
+  my %options = %{$f->[2] || {}};
+  foreach my $id (keys(%options)) {
+    if (ref($options{$id}) eq 'ARRAY') {
+      $options{$id} = '["'.join('","',@{$options{$id}}).'"]';
+    } else {
+      $options{$id} = '"'.$options{$id}.'"';
+    }
+  }
+  #
+  #  Process the list of arguments supplied by the user
+  #    (treating special cases properly)
+  #
+  my @options = (); my @params = ();
+  while (my ($name,$value) = (shift(@names),shift(@args))) {
+    last unless defined $value;
+    unless ($name) {push(@params,$value); next}
+    if ($name eq '@') {push(@params,'['.join(',',$value,@args).']'); @args = (); last}
+    if ($name =~ s/\[(\d+)\]$//) {
+      $options{$name} = $default{$name} unless defined $options{$name};
+      $options{$name}[$1] = $value; next;
+    }
+    $options{$name} = $value unless $value eq '""' || $value eq "''";
+  }
+  #
+  #  Add the hash values to the new argument list
+  #
+  while (($name,$value) = each %options) {
+    $value = '['.join(',',@{$options{$name}}).']' if ref($value) eq 'ARRAY';
+    push(@options,"$name=>$value");
+  }
+  #
+  #  Create the new function and display it
+  #
+  my $F = $f->[0].'('.join(', ',@params,@options,@args).')';
+  unless ($quiet) {
+    print stderr "   $original(",join(',',@{$args}),") -> $F\n";
+    $changed = 1;
+  }
+  return $F;
+}
+
+#
+#  Get the argument list for the function, respecting quotation marks,
+#  nested parentheses, and so on.  Remove comments that might be
+#  nested within a multi-line function call.
+#
+sub GetArgs {
+  my $text = shift;
+  my @args = (); my $parenCount = 0; my $arg = "";
+  return (undef,$text) unless $text =~ s/^\s*\(//; # remove leading spaces and opening paren
+  $text = trimComments($text);
+  while ($text =~ s/^((?:"(?:\\.|[^\"])*"|'(?:\\.|[^\'])*'|\\.|[^\\])*?)([(){}\[\],\n])//) {
+    if ($2 eq '(' || $2 eq '[' || $2 eq '{') {$parenCount++; $arg .= $1.$2; next}
+    if ($2 eq ')' && $parenCount == 0) {$arg .= $1; push(@args,trim($arg)); last}
+    if ($2 eq ')' || $2 eq ']' || $2 eq '}') {$parenCount--; $arg .= $1.$2; next}
+    if ($2 eq "\n") {$arg .= $1; $text = trimComments($text); next}
+    if ($parenCount == 0) {
+      push(@args,trim($arg.$1)); $arg = "";
+      $text = trimComments($text);
+    } else {$arg .= $1.$2}
+  }
+  $text =~ s/^ +//; # remove unneeded leading spaces
+  return(\@args,$text);
+}
+
+#
+#  Process each file
+#
+push(@ARGV,"-") if (scalar(@ARGV) == 0);
+foreach $file (@ARGV) {print Process($file)}
+print stderr "\n";
diff --git a/bin/convert_fun_in_dir.sh b/bin/convert_fun_in_dir.sh
new file mode 100755
index 0000000000..98a00bc751
--- /dev/null
+++ b/bin/convert_fun_in_dir.sh
@@ -0,0 +1 @@
+find . -name "*.pg" -exec convert-functions.pl {} ';' 
diff --git a/bin/delcourse b/bin/delcourse
new file mode 100755
index 0000000000..6c5a18a3d2
--- /dev/null
+++ b/bin/delcourse
@@ -0,0 +1,183 @@
+#!/usr/bin/env perl
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/bin/delcourse,v 1.4 2006/01/25 23:13:45 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+=head1 NAME
+
+delcourse - delete a course
+
+=head1 SYNOPSIS
+
+ delcourse [options] COURSEID
+
+=head1 DESCRIPTION
+
+Delete a course, including its database and course directory.
+
+=head1 OPTIONS
+
+=over
+
+=item I<COURSEID>
+
+The name of the course to delete.
+
+=back
+
+If the course's database layout is sql, the following options are valid:
+
+=over
+
+=item B<--sql-host>=I<HOST>
+
+Specifies the hostname of the SQL server on the course database resides. If not
+specified, the default for your RDBMS will be used.
+
+=item B<--sql-port>=I<PORT>
+
+Specifies the port of the SQL server on the course database resides. If not
+specified, the default for your RDBMS will be used.
+
+=item B<--sql-user>=I<USER>
+
+Specifies the username to use when connecting to the SQL server to delete the
+course database. This user must have CREATE, DELETE, FILE, INSERT, SELECT, and
+UPDATE privileges, WITH GRANT OPTION.
+
+=item B<--sql-pass>=I<PASS>
+
+Specifies the password to use when connecting to the SQL server.
+
+=item B<--sql-db>=I<DBNAME>
+
+Specifies the name of the database to delete. (This is usually
+"webwork_COURSENAME", but can be overridden by changing the database layout in
+F<global.conf>.)
+
+=back
+
+=cut
+
+BEGIN {
+	# hide arguments (there could be passwords there!)
+	$0 = "$0";
+}
+
+use strict;
+use warnings;
+use Getopt::Long;
+
+BEGIN {
+	die "WEBWORK_ROOT not found in environment.\n"
+		unless exists $ENV{WEBWORK_ROOT};
+
+	die "PG_ROOT not found in environment.\n"
+		unless exists $ENV{PG_ROOT};
+
+	# This prevents some spurious warning.
+	$main::VERSION = "2.4";
+}
+
+use lib "$ENV{WEBWORK_ROOT}/lib";
+use lib "$ENV{PG_ROOT}/lib";
+
+use WeBWorK::CourseEnvironment;
+use WeBWorK::DB;
+use WeBWorK::Utils qw(runtime_use readFile cryptPassword);
+use WeBWorK::Utils::CourseManagement qw(addCourse deleteCourse listCourses);
+
+sub usage {
+	print STDERR "usage: $0 [options] COURSEID\n";
+	print STDERR "Options:\n";
+	print STDERR "  for \"sql\" database layout:\n";
+	print STDERR "    [--sql-host=HOST] [--sql-port=port]\n";
+	print STDERR "    --sql-user=USER --sql-pass=PASS\n";
+	print STDERR "    --sql-db=DBNAME\n";
+	exit;
+}
+
+sub usage_error {
+	print STDERR "$0: @_\n";
+	usage();
+}
+
+my $sql_host = "";
+my $sql_port = "";
+my $sql_user = "";
+my $sql_pass = "";
+my $sql_db = "";
+
+##### get command-line options #####
+
+GetOptions(
+	"sql-host=s" => \$sql_host,
+	"sql-port=s" => \$sql_port,
+	"sql-user=s" => \$sql_user,
+	"sql-pass=s" => \$sql_pass,
+	"sql-db=s" => \$sql_db,
+);
+my $courseID = shift;
+
+##### perform sanity checks #####
+
+usage_error("must specify COURSEID.") unless $courseID;
+
+# bring up a minimal course environment
+my $ce = WeBWorK::CourseEnvironment->new({
+	webwork_dir => $ENV{WEBWORK_ROOT},
+	courseName => $courseID,
+});
+
+my $dbLayout = $ce->{dbLayoutName};
+
+if ($dbLayout eq "sql") {
+	usage_error("must specify --sql-user.")   unless $sql_user;
+	usage_error("must specify --sql-pass.")   unless $sql_pass;
+	usage_error("must specify --sql-db.")     unless $sql_db;
+}
+
+##### set up parameters to pass to deleteCourse() #####
+
+my %dbOptions;
+if ($dbLayout eq "sql") {
+	$dbOptions{host}     = $sql_host if $sql_host ne "";
+	$dbOptions{port}     = $sql_port if $sql_port ne "";
+	$dbOptions{username} = $sql_user;
+	$dbOptions{password} = $sql_pass;
+	$dbOptions{database} = $sql_db;
+}
+
+##### call deleteCourse(), handle errors #####
+
+eval {
+	deleteCourse(
+		courseID      => $courseID,
+		ce            => $ce,
+		dbOptions     => \%dbOptions,
+	);
+};
+
+if ($@) {
+	my $error = $@;
+	print STDERR "$error\n";
+	exit;
+}
+
+=head1 AUTHOR
+
+Written by Sam Hathaway, hathaway at users.sourceforge.net.
+
+=cut
diff --git a/bin/gif2eps b/bin/gif2eps
deleted file mode 100755
index 44102f5a1e..0000000000
--- a/bin/gif2eps
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
-# 
-# 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
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-# 
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-# This script wraps system-dependant calls to several netpbm utilities.
-# In order to use this script, set the NETPBM variable below to the
-# directory which contains giftopnm, ppmtopgm, and pnmtops.
-
-NETPBM=/usr/local/bin
-
-# If you wish to set the paths to each utility separately, i.e. if they
-# are in different locations, do so below:
-
-GIFTOPNM=$NETPBM/giftopnm;
-PPMTOPGM=$NETPBM/ppmtopgm;
-PNMTOPS=$NETPBM/pnmtops;
-
-# There should be no need for customization beyond this point.
-
-umask 022
-cat $1 | $GIFTOPNM | $PPMTOPGM | $PNMTOPS -noturn 2>/dev/null > $2
-
-# CODER NOTE:
-# We used to use `pnmdepth 1' instead of ppmtopgm as it creates a
-# monochrome image (1 bit) rather than a greyscale image (8 bits).
-# However, this was causing improper display of some sort in PDFs.
diff --git a/bin/hash2sql b/bin/hash2sql
deleted file mode 100755
index e2484cbcb7..0000000000
--- a/bin/hash2sql
+++ /dev/null
@@ -1,183 +0,0 @@
-#!/usr/bin/env perl
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
-# 
-# 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
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-# 
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-=head1 NAME
-
-hash2sql - copies data from a course using a hash-based database (without global tables)
-to a course using an sql-based database (with global tables).
-
-=cut
-
-use strict;
-use warnings;
-use FindBin;
-use lib "$FindBin::Bin/../lib";
-use WeBWorK::CourseEnvironment;
-use WeBWorK::DB;
-use WeBWorK::DB::Utils qw(findDefaults);
-
-sub main(@) {
-	my ($hashCourse, $sqlCourse) = @_;
-	
-	unless ($ENV{WEBWORK_ROOT}) {
-		die "WEBWORK_ROOT not found in environment.\n";
-	}
-	
-	unless ($hashCourse and $sqlCourse) {
-		die "usage: $0 hashCourse sqlCourse\n";
-	}
-	
-	my $hashCE = WeBWorK::CourseEnvironment->new($ENV{WEBWORK_ROOT}, "", "", $hashCourse);
-	my $hashDB = WeBWorK::DB->new($hashCE);
-	
-	my $sqlCE = WeBWorK::CourseEnvironment->new($ENV{WEBWORK_ROOT}, "", "", $sqlCourse);
-	my $sqlDB = WeBWorK::DB->new($sqlCE);
-	
-	# get names of global record classes
-	my $globalSetClass = $sqlCE->{dbLayout}->{set}->{record};
-	my $globalProblemClass = $sqlCE->{dbLayout}->{problem}->{record};
-	
-	# get non-key, global field names
-	my @setFields = getNonKeyFields($sqlCE->{dbLayout}->{set}->{record});
-	my @problemFields = getNonKeyFields($sqlCE->{dbLayout}->{problem}->{record});
-	
-	# hash to store all sets
-	my %allSets;
-	
-	# populate user, password, permission, and key tables
-	print "\n---------- adding users: ----------\n\n";
-	
-	foreach my $userID ($hashDB->listUsers()) {
-		print "adding user $userID:";
-		$sqlDB->addUser($hashDB->getUser($userID));
-		
-		my $Password = $hashDB->getPassword($userID);
-		if ($Password) {
-			print " +password";
-			$sqlDB->addPassword($Password);
-		} else {
-			print " -password";
-		}
-		
-		my $PermissionLevel = $hashDB->getPermissionLevel($userID);
-		if ($PermissionLevel) {
-			print " +permissionLevel";
-			$sqlDB->addPermissionLevel($PermissionLevel);
-		} else {
-			print " -permissionLevel";
-		}
-		
-		my $Key = $hashDB->getKey($userID);
-		if ($Key) {
-			print " +key";
-			$sqlDB->addKey($Key) if $Key;
-		} else {
-			print " -key";
-		}
-		
-		print "\n";
-		
-		# also get the names of all sets
-		foreach my $setID ($hashDB->listUserSets($userID)) {
-			$allSets{$setID}++;
-		}
-	}
-	
-	print "\n---------- found these sets: ----------\n\n";
-	
-	print join(" ", keys %allSets), "\n";
-	
-	print "\n---------- determining set defaults: ----------\n\n";
-	
-	foreach my $setID (keys %allSets) {
-		print "processing set $setID.\n";
-		# get a consensus view for each set
-		my @setUserIDs = $hashDB->listSetUsers($setID);
-		my @UserSets = map { $hashDB->getUserSet($_, $setID) } @setUserIDs;
-		my $GlobalSet = findDefaults($globalSetClass, @UserSets);
-		print "adding global set record.\n";
-		$sqlDB->addGlobalSet($GlobalSet);
-
-		# remove default values from each user set
-		# and store into sql db.
-		foreach my $UserSet (@UserSets) {
-			foreach my $field (@setFields) {
-				if ($UserSet->$field() eq $GlobalSet->$field()) {
-					$UserSet->$field(undef);
-				}
-			}
-			print "adding user set for user ", $UserSet->user_id, ".\n";
-			$sqlDB->addUserSet($UserSet);
-		}
-		
-		# get all problems in this set
-		my %allProblems;
-		foreach my $userID ($hashDB->listSetUsers($setID)) {
-			foreach my $problemID ($hashDB->listUserProblems($userID, $setID)) {
-				$allProblems{$problemID}++;
-			}
-		}
-		
-		print "\n----- found these problems in set $setID: ----\n\n";
-		
-		print join(" ", keys %allProblems), "\n";
-		
-	print "\n----- determining defaults for problems in set $setID: -----\n\n";
-	
-		# get a consensus for each problem in this set
-		foreach my $problemID (keys %allProblems) {
-			print "determining defaults for problem $problemID.\n";
-			my @problemUserIDs = $hashDB->listProblemUsers($setID, $problemID);
-			my @UserProblems;
-			print "getting user problem for user:";
-			foreach (@problemUserIDs) {
-				print " $_";
-				my $UserProblem = $hashDB->getUserProblem($_, $setID, $problemID);
-				unless (defined $UserProblem) {
-					print "(UNDEFINED!)";
-					next;
-				}
-				push @UserProblems, $UserProblem;
-			}
-			print "\n";
-			my $GlobalProblem = findDefaults($globalProblemClass, @UserProblems);
-			print "adding global problem record.\n";
-			$sqlDB->addGlobalProblem($GlobalProblem);
-			
-			# remove defaults from each user problem
-			foreach my $UserProblem (@UserProblems) {
-				foreach my $field (@problemFields) {
-					if ($UserProblem->$field() eq $GlobalProblem->$field()) {
-						$UserProblem->$field(undef);
-					}
-				}
-				print "adding user problem for user ", $UserProblem->user_id, ".\n";
-				$sqlDB->addUserProblem($UserProblem);
-			}
-		}
-	}
-}
-
-sub getNonKeyFields($) {
-	my ($Record) = @_;
-	
-	my %fields = map { $_ => {} } $Record->FIELDS();
-	delete $fields{$_} foreach $Record->KEYFIELDS();
-	return keys %fields;
-}
-
-main(@ARGV);
diff --git a/bin/integrity_check.pl b/bin/integrity_check.pl
new file mode 100644
index 0000000000..69bf341075
--- /dev/null
+++ b/bin/integrity_check.pl
@@ -0,0 +1,58 @@
+#!/usr/bin/env perl
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/bin/wwdb_upgrade,v 1.17 2007/08/13 22:59:50 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+use strict;
+use warnings;
+use Getopt::Std;
+use Data::Dumper;
+
+BEGIN {
+	die "WEBWORK_ROOT not found in environment.\n"
+		unless exists $ENV{WEBWORK_ROOT};
+}
+
+use lib "$ENV{WEBWORK_ROOT}/lib";
+use WeBWorK::CourseEnvironment;
+use WeBWorK::Utils::CourseIntegrityCheck;
+use WeBWorK;
+
+our ($opt_v);
+getopts("v");
+
+if ($opt_v) {
+	$WeBWorK::Debug::Enabled = 1;
+} else {
+	$WeBWorK::Debug::Enabled = 0;
+}
+
+
+my $courseName = "tmp_course";
+
+my $ce = new WeBWorK::CourseEnvironment(
+               {webwork_dir=>$ENV{WEBWORK_ROOT},
+                courseName=> $courseName               
+               });
+
+
+print "ce ready $ce";
+
+my $CIchecker = new WeBWorK::Utils::CourseIntegrityCheck($ce);
+
+my $return = $CIchecker->checkCourseDirectories();
+
+print "result $return";
+1;
\ No newline at end of file
diff --git a/bin/mkhtmldocs b/bin/mkhtmldocs
deleted file mode 100755
index 5ad1998376..0000000000
--- a/bin/mkhtmldocs
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env perl
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
-# 
-# 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
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-# 
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-=head1 NAME
-
-mkhtmldocs - use pod2html to generate HTML documentation
-
-=cut
-
-use strict;
-use warnings;
-use FindBin;
-
-# set this to the URL of the htdocs/doc directory.
-use constant DOC_BASE => "/webwork2_files/doc";
-# FIXME: this should probably be read from global.conf.
-
-sub main(@) {
-	my $force = @_ && $_[0] eq "-f";
-	
-	my $lib = "$FindBin::Bin/../lib";
-	my $htdocs = "$FindBin::Bin/../htdocs";
-	my $doc = "$htdocs/doc";
-	my $htmlroot = DOC_BASE;
-	
-	my @modules = `find $lib -name "*.pm"`;
-	foreach my $module (@modules) {
-		chomp $module;
-		
-		my $docfile = $module;
-		$docfile =~ s/^$lib/$doc/;
-		$docfile =~ s/\.pm$/.html/;
-		
-		next if not $force and -e $docfile and (stat $docfile)[9] >= (stat $module)[9];
-		
-		my ($docdir) = $docfile =~ m|^(.*)/|;
-		unless (-e $docdir) {
-			print "creating missing directory $docdir\n";
-			system "mkdir -p $docdir"
-				and die "mkdir failed: $!\n";
-		}
-		
-		print "generating documentation for module $module\n";
-		system "pod2html --htmlroot=$htmlroot --podroot=$lib --infile=$module --outfile=$docfile"
-			and die "pod2html failed: $!\n";
-	}
-}
-
-main(@ARGV);
diff --git a/bin/newpassword b/bin/newpassword
new file mode 100755
index 0000000000..60c40818db
--- /dev/null
+++ b/bin/newpassword
@@ -0,0 +1,103 @@
+#!/usr/bin/env perl
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/bin/newpassword,v 1.3 2006/01/25 23:13:45 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+=head1 NAME
+
+newpassword - change a users password
+
+=head1 SYNOPSIS
+
+ newpassword COURSEID USERID NEWPASSWORD
+
+=head1 DESCRIPTION
+
+Change the password for a user.
+
+=head1 ARGUMENTS
+
+=over
+
+=item I<COURSEID>
+
+The name of the course.
+
+=item I<USERID>
+
+The login name of the user you will change the password for.
+
+=item I<NEWPASSWORD>
+
+The new password.
+
+=back
+
+=cut
+
+BEGIN {
+	# hide arguments (there could be passwords there!)
+	$0 = "$0";
+}
+
+use strict;
+use warnings;
+
+BEGIN {
+	die "WEBWORK_ROOT not found in environment.\n"
+		unless exists $ENV{WEBWORK_ROOT};
+}
+
+use lib "$ENV{WEBWORK_ROOT}/lib";
+use WeBWorK::CourseEnvironment;
+use WeBWorK::DB;
+use WeBWorK::Utils qw(runtime_use readFile cryptPassword);
+
+if((scalar(@ARGV) != 3)) {
+  print "\nSyntax is: newpassword CourseID User NewPassword";
+  print "\n    (e.g.  newpassword MAT_123 jjones abracadabra\n\n";
+  exit();
+}
+
+##### get command-line options #####
+
+my $courseID = shift;
+my $user = shift;
+my $newP = shift;
+
+##### main function #####
+
+sub dopasswd {
+  my ($db, $user, $newpass) = @_;
+  my $passwordRecord = eval {$db->getPassword($user)};
+  die "Can't get password for user |$user| $@" if $@ or not defined($passwordRecord);
+  my $cryptedPassword = cryptPassword($newP);
+  $passwordRecord->password($cryptedPassword);
+  eval {$db->putPassword($passwordRecord) };
+  if ($@) {
+    die "Errors $@ ";
+  }
+}
+
+# bring up a minimal course environment
+my $ce = WeBWorK::CourseEnvironment->new({
+	webwork_dir => $ENV{WEBWORK_ROOT},
+	courseName => $courseID
+});
+
+my $db = new WeBWorK::DB($ce->{dbLayout});
+
+dopasswd($db, $user, $newP);
+print "Changed password for $user in $courseID\n";
diff --git a/bin/timing b/bin/old_scripts/timing
similarity index 91%
rename from bin/timing
rename to bin/old_scripts/timing
index 30e403a180..b44e004f55 100755
--- a/bin/timing
+++ b/bin/old_scripts/timing
@@ -1,8 +1,8 @@
 #!/usr/bin/env perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/bin/timing,v 1.5 2006/01/25 23:13:45 sh002i 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
diff --git a/bin/old_scripts/ww-update-config b/bin/old_scripts/ww-update-config
new file mode 100755
index 0000000000..d1d82f9646
--- /dev/null
+++ b/bin/old_scripts/ww-update-config
@@ -0,0 +1,43 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+my $cvs_header_line = '\$' . 'CVSHeader';
+
+foreach my $arg (@ARGV) {
+	my ($conf_file, $dist_file);
+	
+	if ($arg =~ /^(.*)\.dist$/) {
+		$conf_file = $1;
+		$dist_file = $arg;
+	} else {
+		$conf_file = $arg;
+		$dist_file = "$arg.dist";
+	}
+	
+	my $conf_version = cvs_version($conf_file)
+		or die "couldn't find CVS version in $conf_file\n";
+	my $dist_version = cvs_version($dist_file)
+		or die "couldn't find CVS version in $dist_file\n";
+	
+	if ($conf_version eq $dist_version) {
+		print "$conf_file is up-to-date at version $conf_version.\n";
+		next;
+	}
+	
+	#print "conf_version=$conf_version dist_version=$dist_version\n";
+	system "cvs diff -r '$conf_version' -r '$dist_version' '$dist_file'"
+		. "| patch '$conf_file'";
+}
+
+sub cvs_version {
+	my ($file) = @_;
+	open my $fh, "<", $file or die "couldn't open $file for reading: $!\n";
+	my $line;
+	while (my $line = <$fh>) {
+		if ($line =~ /$cvs_header_line.*?(1(?:\.\d+)+)/) {
+			return $1;
+		}
+	}
+}
diff --git a/bin/old_scripts/wwaddindexing b/bin/old_scripts/wwaddindexing
new file mode 100755
index 0000000000..a258d7edfa
--- /dev/null
+++ b/bin/old_scripts/wwaddindexing
@@ -0,0 +1,137 @@
+#!/usr/bin/env perl
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/bin/wwaddindexing,v 1.3 2006/01/25 23:13:45 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+=head1 NAME
+
+wwaddindexing - add indices to an existing sql_single course.
+
+=head1 SYNOPSIS
+
+ wwaddindexing COURSEID
+
+=head1 DESCRIPTION
+
+Adds indices to the course named COURSEID. The course must use the sql_single
+database layout.
+
+=cut
+
+BEGIN {
+	# hide arguments (there could be passwords there!)
+	$0 = "$0";
+}
+
+use strict;
+use warnings;
+use DBI;
+
+BEGIN {
+	die "WEBWORK_ROOT not found in environment.\n"
+		unless exists $ENV{WEBWORK_ROOT};
+}
+
+use lib "$ENV{WEBWORK_ROOT}/lib";
+use WeBWorK::CourseEnvironment;
+use WeBWorK::DB;
+use WeBWorK::Utils qw/runtime_use/;
+use WeBWorK::Utils::CourseManagement qw/dbLayoutSQLSources/;
+
+sub usage {
+	print STDERR "usage: $0 COURSEID \n";
+	exit;
+}
+
+sub usage_error {
+	print STDERR "$0: @_\n";
+	usage();
+}
+
+# get command-line options
+my ($courseID) = @ARGV;
+
+# perform sanity check
+usage_error("must specify COURSEID.") unless $courseID and $courseID ne "";
+
+# bring up a minimal course environment
+my $ce = WeBWorK::CourseEnvironment->new({
+	webwork_dir => $ENV{WEBWORK_ROOT},
+	courseName => $courseID,
+});
+
+# make sure the course actually uses the 'sql_single' layout
+usage_error("$courseID: does not use 'sql_single' database layout.")
+	unless $ce->{dbLayoutName} eq "sql_single";
+
+# get database layout source data
+my %sources = dbLayoutSQLSources($ce->{dbLayout});
+
+foreach my $source (keys %sources) {
+	my %source = %{$sources{$source}};
+	my @tables = @{$source{tables}};
+	my $username = $source{username};
+	my $password = $source{password};
+	
+	my $dbh = DBI->connect($source, $username, $password);
+	
+	foreach my $table (@tables) {
+		# this stuff straight out of sql_single.pm
+		my %table = %{ $ce->{dbLayout}{$table} };
+		my %params = %{ $table{params} };
+		
+		my $source = $table{source};
+		my $tableOverride = $params{tableOverride};
+		my $recordClass = $table{record};
+		
+		runtime_use($recordClass);
+		my @fields = $recordClass->FIELDS;
+		my @keyfields = $recordClass->KEYFIELDS;
+		
+		if (exists $params{fieldOverride}) {
+			my %fieldOverride = %{ $params{fieldOverride} };
+			foreach my $field (@fields) {
+				$field = $fieldOverride{$field} if exists $fieldOverride{$field};
+			}
+		}
+		
+		my @fieldList;
+		foreach my $start (0 .. $#keyfields) {
+			my $line = "ADD INDEX ( ";
+			$line .= join(", ", map { "`$_`(16)" } @keyfields[$start .. $#keyfields]);
+			$line .= " )";
+			push @fieldList, $line;
+		}
+		my $fieldString = join(", ", @fieldList);
+		
+		my $tableName = $tableOverride || $table;
+		my $stmt = "ALTER TABLE `$tableName` $fieldString;";
+		
+		unless ($dbh->do($stmt)) {
+			die "An error occured while trying to modify the course database.\n",
+				"It is possible that the course database is in an inconsistent state.\n",
+				"The DBI error message was:\n\n",
+				$dbh->errstr, "\n";
+		}
+	}
+	
+	$dbh->disconnect;
+}
+
+=head1 AUTHOR
+
+Written by Sam Hathaway, hathaway at users.sourceforge.net.
+
+=cut
diff --git a/bin/old_scripts/wwdb_addgw b/bin/old_scripts/wwdb_addgw
new file mode 100755
index 0000000000..939bbf7c94
--- /dev/null
+++ b/bin/old_scripts/wwdb_addgw
@@ -0,0 +1,395 @@
+#!/usr/bin/perl -w
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/bin/wwdb_addgw,v 1.3 2006/01/25 23:13:45 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+# 
+# wwdb_addgw
+#   update webwork database tables to add fields for the gateway module
+#
+# by Gavin LaRose <glarose@umich.edu>
+#
+=head1 NAME
+
+wwdb_addgw - convert SQL databases for WeBWorK 2 to add gateway fields.
+
+=head1 SYNOPSIS
+
+ wwdb_addgw [-h] [sql|sql_single]
+
+=head1 DESCRIPTION
+
+Adds fields to the set and set_user tables in the WeBWorK mysql databases 
+that are required for the gateway module.  The script prompts for which 
+courses to modify.  Adding gateway database fields to existing courses 
+should have no effect on those courses, even if they are running under a
+non-gateway aware version of the WeBWorK system.
+
+If C<-h> is provided, the script hides the mysql admin password.
+
+C<sql> or C<sql_single> gives the default WeBWorK database format.  If 
+omitted, the script assumes sql_single and prompts to be sure.
+
+=cut
+
+use strict;
+use DBI;
+
+# this is necessary on some systems
+system("stty erase ");
+
+my $source = 'DBI:mysql';
+
+# fields to add to the set and set_user tables
+my %addFields = ( 'assignment_type' => 'text',
+		  'attempts_per_version' => 'integer',
+		  'time_interval' => 'integer',
+		  'versions_per_interval' => 'integer',
+		  'version_time_limit' => 'integer',
+		  'version_creation_time' => 'bigint',
+		  'problem_randorder' => 'integer',
+		  'version_last_attempt_time' => 'bigint', );
+
+# process input data
+my $hidepw = 0;
+my $dbtype = 'sql_single';
+while ( $_ = shift(@ARGV) ) {
+    if ( /^-h$/ ) {
+	$hidepw = 1;
+    } elsif ( /^-/ ) {
+	die("Unknown input flag $_.\nUsage: wwdb_addgw [-h] sql|sql_single\n");
+    } else {
+	if ( $_ eq 'sql' || $_ eq 'sql_single' ) {
+	    $dbtype = $_;
+	} else {
+	    die("Unknown argument $_.\nUsage: wwdb_addgw [-h] " .
+		"sql|sql_single\n");
+	}
+    }
+}
+
+printHdr( $dbtype );
+
+# get database information
+my ( $admin, $adminpw );
+( $admin, $adminpw, $dbtype ) = getDBInfo( $hidepw, $dbtype );
+
+# connect to database, if we're in sql_single mode; this lets us easily
+# get a list of courses to work with.  in sql mode, it's harder b/c I can't
+# get DBI->data_sources('mysql') to work on my system, so we prompt for 
+# those separately.  if we're in sql single mode, $dbh is a place holder,
+# because we have to do the database connects in the subroutines to connect
+# to each different database
+my $dbh = '';
+if ( $dbtype eq 'sql_single' ) {
+    $dbh = DBI->connect("$source:webwork", $admin, $adminpw) or
+	die( $DBI::errstr );
+}
+
+# get courses list
+my @courses = getCourses( $dbtype, $dbh );
+
+# now $course{coursename} = format (sql or sql_single)
+
+# do update
+my ( $doneRef, $skipRef ) = updateCourses( $dbtype, $dbh, \@courses, 
+					   $admin, $adminpw );
+$dbh->disconnect() if ( $dbh );
+
+# all done
+confirmUpdate( $dbtype, $doneRef, $skipRef );
+
+# end of main
+#-------------------------------------------------------------------------------
+# subroutines
+
+sub printHdr { 
+    print <<eoh;
+---------------------------------------------------------------------------
+wwdb_addgw: update WeBWorK SQL databases to include fields required for a 
+            Gateway aware WeBWorK installation.
+
+set default WeBWorK database type to $dbtype.
+---------------------------------------------------------------------------
+eoh
+    return 1;
+}
+
+sub getDBInfo {
+    my $hide = shift();
+    my $type = shift();
+
+    print "mySQL administrator login name [root] > ";
+    my $admin = <STDIN>;
+    chomp( $admin );
+    $admin = 'root' if ( ! $admin );
+
+    print "mySQL login password for $admin > ";
+    system("stty -echo") if ( $hide );
+    my $passwd = <STDIN>;
+    if ( $hide ) { system("stty echo"); print "\n"; }
+    chomp( $passwd );
+    die("Error: no password provided\n") if ( ! $passwd );
+
+    print "WeBWorK database type (sql or sql_single) [$type] > ";
+    my $dbtype = <STDIN>;
+    chomp( $dbtype );
+    $dbtype = $type if ( ! $dbtype );
+
+    return( $admin, $passwd, $dbtype );
+}
+
+sub getCourses {
+    my ( $dbtype, $dbh ) = @_;
+
+    my %courses = ();
+
+# get a course list
+    if ( $dbtype eq 'sql' ) {
+	print "courses to update (enter comma separated) > ";
+	my $crslist = <STDIN>;
+	chomp($crslist);
+	my @crslist = split(/,\s*/, $crslist);
+	die("Error: no courses specified\n") if ( ! @crslist );
+	foreach ( @crslist ) { $courses{$_} = 1; }
+
+    } else {
+	my $cmd = 'show tables';
+	my $st = $dbh->prepare( $cmd ) or die( $dbh->errstr() );
+	$st->execute() or die( $st->errstr() );
+	my $rowRef = $st->fetchall_arrayref();
+	foreach my $r ( @$rowRef ) {
+	    $_ = $r->[0];
+	    #my ($crs, $tbl) = ( /^([^_]+)_(.*)$/ );  # this fails on courses with underscores in their names
+	    my  ($crs) = (/^(.*)_key$/);  # match the key table
+	    $courses{$crs} = 1 if ( defined( $crs ) );
+	}
+	die("Error: found now sql_single WeBWorK courses\n") if ( ! %courses );
+    }
+
+# confirm this is correct
+    print "\nList of courses to update:\n";
+    my %nummap = orderedList( %courses );
+    printclist( sort keys( %courses ) );
+    print "Enter # to edit name, d# to delete from update list, or [cr] to " .
+	"continue.\n > ";
+    my $resp = <STDIN>;
+    chomp($resp);
+    while ( $resp ) {
+	if ( $resp =~ /^\d+$/ ) {
+	    print "  old course name $nummap{$resp}; new > ";
+	    delete( $courses{$nummap{$resp}} );
+	    my $newname = <STDIN>;
+	    chomp($newname);
+	    $courses{ $newname } = 1;
+	} elsif ( $resp =~ /^d(\d+)$/ ) {
+	    $resp = $1;
+	    delete( $courses{$nummap{$resp}} );
+	} else {
+	    print "unrecognized response: $resp.\n";
+	}
+	%nummap = orderedList( %courses );
+	print "Current list of courses to update:\n";
+	printclist( sort keys( %courses ) );
+	print "Enter #, d# or [cr] > ";  
+        chomp( $resp = <STDIN> );
+    }
+
+    my @courses = sort( keys %courses );
+    if ( @courses ) {
+	return @courses;
+    } else {
+	die("Error: no courses left to update.\n");
+    }
+}
+
+sub orderedList {
+    my %hash = @_;
+    my $i=1;
+    my %nummap = ();
+    foreach ( sort( keys( %hash ) ) ) {
+	$nummap{ $i } = $_;
+	$i++;
+    }
+    return %nummap;
+}
+
+sub printclist {
+    my @list = @_;
+
+# assumes a 75 column screen
+
+    my $i = 1;
+    if ( @list <= 3 ) {
+	foreach ( @list ) { print "  $i. $_\n"; $i++ }
+    } else {
+	while ( @list >= $i ) {
+	    printf("  %2d. %-19s", $i, $list[$i-1]);
+	    printf("  %2d. %-19s", ($i+1), $list[$i]) if ( @list >= ($i+1) );
+	    printf("  %2d. %-19s", ($i+2), $list[$i+1]) if ( @list >= ($i+2) );
+	    print "\n";
+	    $i+=3;
+	}
+    }
+    return 1;
+}
+
+sub updateCourses {
+    my ( $dbtype, $dbh, $crsRef, $admin, $adminpw ) = @_;
+
+    my @done = ();
+    my @skipped = ();
+
+# give some sense of progress
+    select STDOUT; $| = 1;    # unbuffer output
+    print "doing update for $dbtype databases.\n";
+
+# list of added fields to check for classes that don't need updating
+    my @newFields = keys( %addFields );
+
+    foreach my $crs ( @$crsRef ) {
+	print "updating $crs.\n";
+	my $colRef;
+
+	if ( $dbtype eq 'sql' ) {
+    # we need to get a database handle first
+	    $dbh = DBI->connect("$source:webwork_$crs", $admin, $adminpw) or
+		die( $DBI::errstr );
+
+    # now get a list of columns from the set table to check to see if 
+    # we need an update
+	    my $cmd = "show columns from set_not_a_keyword";
+	    my $st = $dbh->prepare( $cmd ) or die( $dbh->errstr() );
+	    $st->execute();
+	    $colRef = $st->fetchall_arrayref();
+
+	} else {
+    # for sql_single we already have a database handle; get the set table
+    # columns and proceed
+	    my $cmd = "show columns from `${crs}_set`";
+	    print "$cmd\n";
+	    my $st = $dbh->prepare( $cmd ) or die( $dbh->errstr() );
+	    $st->execute();
+	    $colRef = $st->fetchall_arrayref();
+	}
+
+    # now, do we have the columns we need already?
+	my $doneAlready = 0;
+	foreach my $cols ( @$colRef ) {
+	    if ( inList( $cols->[0], @newFields  ) ) {
+		$doneAlready = 1;
+		last;
+	    }
+	}
+	if ( $doneAlready ) {
+	    push( @skipped, $crs );
+	    next;
+	} else {
+
+    # do update for course
+	    my ( $cmd1, $cmd2 );
+	    if ( $dbtype eq 'sql' ) {
+		$cmd1 = 'alter table set_not_a_keyword add column';
+		$cmd2 = 'alter table set_user add column';
+	    } else {
+		$cmd1 = "alter table `${crs}_set` add column";
+		$cmd2 = "alter table `${crs}_set_user` add column";
+	    }
+
+	    foreach my $f ( keys %addFields ) {
+	    print "$cmd1 $f $addFields{$f}\n";
+		my $st = $dbh->prepare( "$cmd1 $f $addFields{$f}" ) or 
+                    die( $dbh->errstr() );
+		$st->execute() or die( $st->errstr() );
+	    }
+
+	    foreach my $f ( keys %addFields ) {
+	    print "$cmd2 $f $addFields{$f}\n";
+		my $st = $dbh->prepare( "$cmd2 $f $addFields{$f}" ) or 
+		    die( $dbh->errstr() );
+		$st->execute() or die( $st->errstr() );
+	    }
+
+	    push( @done, $crs );
+	}
+    # if we're doing sql databases, disconnect from this courses' database
+	$dbh->disconnect() if ( $dbtype eq 'sql' );
+
+    }  # end loop through courses
+    print "\n";
+
+    return( \@done, \@skipped );
+}
+
+sub inList {
+    my $v = shift();
+    foreach ( @_ ) { return 1 if ( $v eq $_ ); }
+    return 0;
+}
+
+sub confirmUpdate {
+    my ( $dbtype, $doneRef, $skipRef ) = @_;
+
+    my $s1 = "updated $dbtype courses: ";
+    my $s2 = "courses not needing updates were skipped: ";
+    my $l1 = length($s1);
+    my $l2 = length($s2);
+
+    my $crsList= (@$doneRef) ? join(', ', @$doneRef) : '';
+    my $skpList= (@$skipRef) ? join(', ', @$skipRef) : '';
+    my $crsString = ( $crsList ) ? 
+	$s1 . hangIndent( $l1, 75, $l1, "$crsList.") . "\n" : '';
+    my $skpString = ( $skpList ) ? 
+	$s2 . hangIndent( $l1, 75, $l2, "$skpList." ) : '';
+
+    print <<eot;
+---------------------------------------------------------------------------
+done.
+$crsString$skpString
+
+eot
+}
+
+sub hangIndent {
+    my ( $hang, $width, $shorten, $text ) = @_;
+# pre:  $hang and $width are numbers, $hang < $width; $text is a string
+#       if $shorten, the first line is shortened by $shorten
+# post: $text is reformatted to have maximum width $width and a hanging
+#       indent of $hang each line after the first; the reformatted text
+#       is returned
+    my $htext = '';
+    my $line = '';
+    my $indent = ($shorten ? $shorten : 0);
+    my $ldr = ' 'x$hang;
+
+    if ( $indent + length($text) < $width ) {
+        $htext = $text;
+    } else {
+        foreach ( split(/\s+/, $text ) ) {
+            if ( $indent + length($line) + length($_) >= $width ) {
+                $htext .= $line . "\n$ldr";
+                $line = "$_ ";
+                $indent = $hang;
+            } else {
+                $line .= "$_ ";
+            }
+        }
+        $htext .= $line if ( $line );
+    }
+    $htext =~ s/\n$ldr$//;
+    return $htext;
+}
+
+# end of script
+#-------------------------------------------------------------------------------
diff --git a/bin/old_scripts/wwdb_check b/bin/old_scripts/wwdb_check
new file mode 100755
index 0000000000..a624523058
--- /dev/null
+++ b/bin/old_scripts/wwdb_check
@@ -0,0 +1,1023 @@
+#!/usr/bin/env perl
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/bin/wwdb_check,v 1.7 2006/08/14 17:23:56 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+=head1 NAME
+
+wwdb_check - check the schema of an existing WeBWorK database
+
+=head1 SYNOPSIS
+
+ wwdb_check [-nv] [ COURSE ... ]
+
+=head1 DESCRIPTION
+
+Scans an existing WeBWorK database to verify that its structure is correct for
+version 0 of the database structure. Version 0 refers to the last version before
+automatic database upgrading was added to WeBWorK. This utility should be run
+once after upgrading webwork from version 2.2.x to version 2.3.0.
+
+Once any inconsistencies are fixed using this utility, F<wwdb_upgrade> should be
+run to affect automatic database upgrades to the database version appropriate
+for the current version of WeBWorK.
+
+If no courses are listed on the command line, all courses are checked. Checks
+for the following:
+
+=over
+
+=item *
+
+Make sure that the appropriate tables exist for each course.
+
+=item *
+
+Make sure that the proper columns exist in each table.
+
+=item *
+
+Verify that the proper column type is in use for each column.
+
+=back
+
+=head1 OPTIONS
+
+=over
+
+=item -n
+
+Don't offer to fix problems, just report them.
+
+=item -v
+
+Verbose output.
+
+=back
+
+=cut
+
+use strict;
+use warnings;
+use Getopt::Std;
+use DBI;
+use Data::Dumper;
+
+BEGIN {
+	die "WEBWORK_ROOT not found in environment.\n"
+		unless exists $ENV{WEBWORK_ROOT};
+}
+
+use lib "$ENV{WEBWORK_ROOT}/lib";
+use WeBWorK::CourseEnvironment;
+use WeBWorK::Utils qw/runtime_use/;
+use WeBWorK::Utils::CourseManagement qw/listCourses/;
+
+our ($opt_n, $opt_v);
+getopts("nv");
+
+my $noop = sub {};
+
+if ($opt_n) {
+	*maybe_add_table = $noop;
+	*maybe_add_field = $noop;
+	*maybe_change_field = $noop;
+} else {
+	*maybe_add_table = \&ask_add_table;
+	*maybe_add_field = \&ask_add_field;
+	*maybe_change_field = \&ask_change_field;
+}
+
+if ($opt_v) {
+	$| = 1;
+	*verbose = sub { print STDERR @_ };
+} else {
+	*verbose = $noop;
+}
+
+use constant DB_VERSION => 0;
+
+# a random coursename we can grab back out later
+#my @chars = ('A'..'Z','a'..'z','0'..'9');
+#my $random_courseID = join("", map { $chars[rand(@chars)] } 1..16);
+# fixed courseID for "version zero table data"
+my $random_courseID = "6SC36NukknC3IT3M";
+
+my $ce = WeBWorK::CourseEnvironment->new({
+	webwork_dir => $ENV{WEBWORK_ROOT},
+	courseName => $random_courseID,
+});
+
+my $dbh = DBI->connect(
+	$ce->{database_dsn},
+	$ce->{database_username},
+	$ce->{database_password},
+	{
+		PrintError => 0,
+		RaiseError => 1,
+	},
+);
+
+=for comment
+
+ %ww_table_data = (
+	 $table => {
+		 sql_name => "SQL name for this field, probably contains $random_courseID",
+		 field_order => [ ... ],
+		 keyfield_order => [ ... ],
+		 fields => {
+			 $field => {
+				 sql_name => "SQL name for this field, possibly overridden",
+				 sql_type => "type for this field, from SQL_TYPES in record class",
+				 is_keyfield => "boolean, whether or not this field is a keyfield",
+			 },
+			 ...
+		 },
+	 },
+	 ...
+ );
+
+=cut
+
+# get table data for the current version of webwork
+#my %ww_table_data = get_ww_table_data();
+#$Data::Dumper::Indent = 1;
+#print Dumper(\%ww_table_data);
+#exit;
+# get static table data for version zero of the database
+my %ww_table_data = get_version_zero_ww_table_data();
+
+my %sql_tables = get_sql_tables();
+
+if (exists $sql_tables{dbupgrade}) {
+	print "A 'dbupgrade' table exists in this database. This suggests that this database may already be upgraded beyond db_version 0. If this is the case, running this utility is not necessary. This utility is only needed to make sure that databases are set up correctly to enter into the automatic upgrade regimen.\n";
+	exit unless ask_permission("Go ahead with table checks?", 0);
+	delete $sql_tables{dbupgrade};
+}
+
+my @ww_courses = @ARGV;
+@ww_courses = listCourses($ce) if not @ww_courses;
+
+foreach my $ww_course_name (@ww_courses) {
+	my $ce2 = WeBWorK::CourseEnvironment->new({
+		webwork_dir => $ENV{WEBWORK_ROOT},
+		courseName => $ww_course_name,
+	});
+	
+	my @diffs = compare_dbLayouts($ce, $ce2);
+	if (@diffs) {
+		print "\nThe database layout for course '$ww_course_name' differs from the generic database layout in global.conf. Here's how:\n\n";
+		print map("* $_\n", @diffs), "\n";
+		next unless ask_permission("Check course '$ww_course_name'?", 0);
+	}
+	
+	print "\nChecking tables for course '$ww_course_name'\n";
+	
+	foreach my $ww_table_name (keys %ww_table_data) {
+		if ($ce2->{dbLayout}{$ww_table_name}{params}{non_native}) {
+			verbose("skipping table $ww_table_name for course $ww_course_name -- not a native table.\n");
+		} else {
+			check_table($ww_course_name, $ww_table_name);
+		}
+	}
+}
+
+my $qualifier = @ARGV ? " selected" : "";
+print "\nDone checking course tables.\n";
+print "The following tables exist in the database but are not associated with any$qualifier course:\n\n";
+print join("\n", sort keys %sql_tables), "\n\n";
+
+exit;
+
+################################################################################
+
+sub get_ww_table_data {
+	my %result;
+	
+	foreach my $table (keys %{$ce->{dbLayout}}) {
+		my $record_class = $ce->{dbLayout}{$table}{record};
+		runtime_use $record_class;
+		
+		my @fields = $record_class->FIELDS;
+		my @types = $record_class->SQL_TYPES;
+		my @keyfields = $record_class->KEYFIELDS;
+		my %keyfields; @keyfields{@keyfields} = ();
+		
+		my %field_data;
+		
+		foreach my $i (0..$#fields) {
+			my $field = $fields[$i];
+			my $field_sql = $ce->{dbLayout}{$table}{params}{fieldOverride}{$field};
+			$field_data{$field}{sql_name} = $field_sql || $field;
+			
+			my $type = $types[$i];
+			$field_data{$field}{sql_type} = $type;
+			
+			$field_data{$field}{is_keyfield} = exists $keyfields{$field};
+		}
+		
+		$result{$table}{fields} = \%field_data;
+		$result{$table}{field_order} = \@fields;
+		$result{$table}{keyfield_order} = \@keyfields;
+		
+		my $table_sql = $ce->{dbLayout}{$table}{params}{tableOverride};
+		$result{$table}{sql_name} = $table_sql || $table;
+	}
+	
+	return %result;
+}
+
+sub get_sql_tables {
+	my $sql_tables_ref = $dbh->selectcol_arrayref("SHOW TABLES");
+	my %sql_tables; @sql_tables{@$sql_tables_ref} = ();
+	
+	return %sql_tables;
+}
+
+################################################################################
+
+sub check_table {
+	my ($ww_course_name, $ww_table_name) = @_;
+	my $sql_table_name = get_sql_table_name($ww_table_data{$ww_table_name}{sql_name}, $ww_course_name);
+	
+	verbose("\nChecking '$ww_table_name' table (SQL table '$sql_table_name')\n");
+	
+	if (exists $sql_tables{$sql_table_name}) {
+		check_fields($ww_course_name, $ww_table_name, $sql_table_name);
+		delete $sql_tables{$sql_table_name};
+	} else {
+		print "$sql_table_name: table missing\n";
+		my $ww_table_rec = $ww_table_data{$ww_table_name};
+		if (maybe_add_table($ww_course_name, $ww_table_name)) {
+			check_fields($ww_course_name, $ww_table_name, $sql_table_name);
+			delete $sql_tables{$sql_table_name};
+		}
+	}
+}
+
+sub ask_add_table {
+	my ($ww_course_name, $ww_table_name) = @_;
+	my $ww_table_rec = $ww_table_data{$ww_table_name};
+	my $sql_table_name = get_sql_table_name($ww_table_rec->{sql_name}, $ww_course_name);
+	
+	my $stmt = create_table_stmt($ww_table_rec, $sql_table_name);
+	
+	print "\nI can add this table to the database with the following SQL statement:\n";
+	print "$stmt\n\n";
+	print "If this is an upgraded installation, it is possible that '$ww_course_name' is an old GDBM course. If this is the case, you should probably not add this table, as it won't be used.\n";
+	return 0 unless ask_permission("Add table '$sql_table_name'?");
+	
+	return unless do_handle_error($dbh, $stmt);
+	print "Added table '$sql_table_name'.\n\n";
+	
+	return 1;
+}
+
+sub create_table_stmt {
+	my ($ww_table_rec, $sql_table_name) = @_;
+	
+	#print Dumper($ww_table_rec);
+	
+	my @field_list;
+	
+	# generate a column specification for each field
+	my @fields = @{$ww_table_rec->{field_order}};
+	foreach my $field (@fields) {
+		my $ww_field_rec = $ww_table_rec->{fields}{$field};
+		my $sql_field_name = $ww_field_rec->{sql_name};
+		my $sql_field_type = $ww_field_rec->{sql_type};
+		
+		push @field_list, "`$sql_field_name` $sql_field_type";
+	}
+	
+	# generate an INDEX specification for each all possible sets of keyfields (i.e. 0+1+2, 1+2, 2)
+	my @keyfields = @{$ww_table_rec->{keyfield_order}};
+	foreach my $start (0 .. $#keyfields) {
+		my @index_components;
+		
+		foreach my $component (@keyfields[$start .. $#keyfields]) {
+			my $ww_field_rec = $ww_table_rec->{fields}{$component};
+			my $sql_field_name = $ww_field_rec->{sql_name};
+			my $sql_field_type = $ww_field_rec->{sql_type};
+			my $length_specifier = ($sql_field_type =~ /int/i) ? "" : "(16)";
+			push @index_components, "`$sql_field_name`$length_specifier";
+		}
+		
+		my $index_string = join(", ", @index_components);
+		push @field_list, "INDEX ( $index_string )";
+	}
+	
+	my $field_string = join(", ", @field_list);
+	my $create_stmt = "CREATE TABLE `$sql_table_name` ( $field_string )";
+	
+	return $create_stmt;
+}
+
+################################################################################
+
+sub check_fields {
+	my ($ww_course_name, $ww_table_name, $sql_table_name) = @_;
+	
+	my $describe_data = $dbh->selectall_hashref("DESCRIBE `$sql_table_name`", 1);
+	
+	foreach my $ww_field_name (@{$ww_table_data{$ww_table_name}{field_order}}) {
+		my $ww_field_rec = $ww_table_data{$ww_table_name}{fields}{$ww_field_name};
+		my $sql_field_name = $ww_field_rec->{sql_name};
+		my $sql_field_rec = $describe_data->{$sql_field_name};
+		
+		verbose("Checking '$ww_field_name' field (SQL field '$sql_table_name.$sql_field_name')\n");
+		
+		#print "$sql_table_name.$sql_field_name:\n";
+		#print Dumper($ww_field_rec);
+		#print Dumper($sql_field_rec);
+		
+		if (defined $sql_field_rec) {
+			my ($sql_base_type) = $sql_field_rec->{Type} =~ /^([^(]*)/;
+			#print $sql_field_rec->{Type}, " => $sql_base_type\n";
+			
+			my $needs_fixing = 0;
+			if ($ww_field_name eq "psvn") {
+				
+				unless ("int" eq lc($sql_base_type)) {
+					$needs_fixing = 1;
+					print "$sql_table_name.$sql_field_name: type should be 'int' but appears to be '",
+						 lc($sql_base_type), "'\n";
+				}
+				
+				unless (lc($sql_field_rec->{Extra}) =~ /\bauto_increment\b/) {
+					$needs_fixing = 1;
+					print "$sql_table_name.$sql_field_name: extra should contain 'auto_increment' but appears to be '",
+						lc($sql_field_rec->{Extra}), "'\n";
+				}
+				
+				# FIXME instead of checking this, figure out how to use "SHOW INDEXES FROM `$sql_table_name`"
+				#unless ("pri" eq lc($sql_field_rec->{Key})) {
+				#	$needs_fixing = 1;
+				#	print "$sql_table_name.$sql_field_name: key should be 'pri' but appears to be '",
+				#		lc($sql_field_rec->{Key}), "'\n";
+				#}
+				
+			} else {
+				
+				unless (lc($ww_field_rec->{sql_type}) eq lc($sql_base_type)) {
+					$needs_fixing = 1;
+					print "$sql_table_name.$sql_field_name: type should be '", lc($ww_field_rec->{sql_type}),
+						"' but appears to be '", lc($sql_base_type), "'\n";
+				}
+				
+				# FIXME instead of checking this, figure out how to use "SHOW INDEXES FROM `$sql_table_name`"
+				#unless ( $ww_field_rec->{is_keyfield} == (lc($sql_field_rec->{Key}) eq "mul") ) {
+				#	$needs_fixing = 1;
+				#	print "$sql_table_name.$sql_field_name: key should be '",
+				#		($ww_field_rec->{is_keyfield} ? "mul" : ""), "' but appears to be '",
+				#		lc($sql_field_rec->{Key}), "'\n";
+				#}
+			}
+			
+			$needs_fixing and maybe_change_field($ww_course_name, $ww_table_name, $ww_field_name, $sql_base_type);
+			
+		} else {
+			print "$sql_table_name.$sql_field_name: field missing\n";
+			maybe_add_field($ww_course_name, $ww_table_name, $ww_field_name);
+		}
+	}
+}
+
+sub ask_add_field {
+	my ($ww_course_name, $ww_table_name, $ww_field_name) = @_;
+	my $ww_table_rec = $ww_table_data{$ww_table_name};
+	my $sql_table_name = get_sql_table_name($ww_table_rec->{sql_name}, $ww_course_name);
+	my $sql_field_name = $ww_table_rec->{fields}{$ww_field_name}{sql_name};
+	
+	my $stmt = add_field_stmt($ww_table_rec, $ww_field_name, $sql_table_name);
+	
+	print "\nI can add this field to the database with the following SQL statement:\n";
+	print "$stmt\n\n";
+	return 0 unless ask_permission("Add field '$sql_table_name.$sql_field_name'?");
+	
+	return unless do_handle_error($dbh, $stmt);
+	print "Added field '$sql_field_name'.\n\n";
+	
+	return 0;
+}
+
+sub add_field_stmt {
+	my ($ww_table_rec, $ww_field_name, $sql_table_name) = @_;
+	my $sql_field_name = $ww_table_rec->{fields}{$ww_field_name}{sql_name};
+	my $sql_field_type = $ww_table_rec->{fields}{$ww_field_name}{sql_type};
+	my $location_modifier = get_location_modifier($ww_table_rec, $ww_field_name);
+	
+	return "ALTER TABLE `$sql_table_name` ADD COLUMN `$sql_field_name` $sql_field_type $location_modifier";
+}
+
+sub get_location_modifier {
+	my ($ww_table_rec, $ww_field_name) = @_;
+	
+	my $field_index = -1;
+	
+	for (my $i = 0; $i < @{$ww_table_rec->{field_order}}; $i++) {
+		if ($ww_table_rec->{field_order}[$i] eq $ww_field_name) {
+			$field_index = $i;
+			last;
+		}
+	}
+	
+	if ($field_index < 0) {
+		die "field '$ww_field_name' not found in field_order (shouldn't happen!)";
+	} elsif ($field_index > 0) {
+		my $ww_prev_field_name = $ww_table_rec->{field_order}[$field_index-1];
+		my $sql_prev_field_name = $ww_table_rec->{fields}{$ww_prev_field_name}{sql_name};
+		return "AFTER `$sql_prev_field_name`";
+	} else {
+		return "FIRST";
+	}
+}
+
+sub ask_change_field {
+	my ($ww_course_name, $ww_table_name, $ww_field_name, $sql_curr_base_type) = @_;
+	my $ww_table_rec = $ww_table_data{$ww_table_name};
+	my $sql_table_name = get_sql_table_name($ww_table_rec->{sql_name}, $ww_course_name);
+	my $sql_field_name = $ww_table_rec->{fields}{$ww_field_name}{sql_name};
+	
+	my @stmts = change_field_stmts($ww_table_rec, $ww_field_name, $sql_table_name, $sql_curr_base_type);
+	
+	my $pl = @stmts == 1 ? "" : "s";
+	print "\nI can change this field with the following SQL statement$pl:\n";
+	print map("$_\n", @stmts), "\n";
+	return 0 unless ask_permission("Change field '$sql_table_name.$sql_field_name'?");
+	
+	foreach my $stmt (@stmts) {
+		return unless do_handle_error($dbh, $stmt);
+	}
+	print "Changed field '$sql_field_name'.\n\n";
+	
+	return 0;
+}
+
+sub change_field_stmts {
+	my ($ww_table_rec, $ww_field_name, $sql_table_name, $sql_curr_base_type) = @_;
+	my $sql_field_name = $ww_table_rec->{fields}{$ww_field_name}{sql_name};
+	my $sql_field_type = $ww_table_rec->{fields}{$ww_field_name}{sql_type};
+	
+	if ($sql_curr_base_type =~ /text/i and $sql_field_type =~ /int/i) {
+		return (
+			"ALTER TABLE `$sql_table_name` CHANGE COLUMN `$sql_field_name` `$sql_field_name` VARCHAR(255)",
+			"ALTER TABLE `$sql_table_name` CHANGE COLUMN `$sql_field_name` `$sql_field_name` $sql_field_type",
+		);
+	} else {
+		return "ALTER TABLE `$sql_table_name` CHANGE COLUMN `$sql_field_name` `$sql_field_name` $sql_field_type";
+	}
+}
+
+################################################################################
+
+sub get_sql_table_name {
+	my ($template, $course_name) = @_;
+	
+	$template =~ s/$random_courseID/$course_name/g;
+	return $template;
+}
+
+sub ask_permission {
+	my ($prompt, $default) = @_;
+	
+	$default = 1 if not defined $default;
+	my $options = $default ? "[Y/n]" : "[y/N]";
+	
+	while (1) {
+		print "$prompt $options ";
+		my $resp = <STDIN>;
+		chomp $resp;
+		return $default if $resp eq "";
+		return 1 if lc $resp eq "y";
+		return 0 if lc $resp eq "n";
+		$prompt = 'Please enter "y" or "n".';
+	}
+}
+
+# no error => returns true
+# error, user says continue => returns false
+# error, user says don't continue => returns undef
+# error, user says exit => exits
+sub do_handle_error {
+	my ($dbh, $stmt) = @_;
+	
+	eval { $dbh->do($stmt) };
+	if ($@) {
+		print "SQL statment failed. Here is the error message: $@\n";
+		return ask_permission("Continue?", 1);
+	} else {
+		return 1;
+	}
+}
+
+sub compare_dbLayouts {
+	my ($ce1, $ce2) = @_;
+	
+	my $dbLayout1 = $ce1->{dbLayoutName};
+	my $dbLayout2 = $ce2->{dbLayoutName};
+	#warn "Generic: '$dbLayout1' this course: '$dbLayout2'.\n";
+	
+	# simplisic check for now
+	if ($dbLayout1 ne $dbLayout2) {
+		return "\$dbLayoutName differs. Generic: '$dbLayout1' this course: '$dbLayout2'. (If you've created"
+		. " a modified version of the '$dbLayout1' database layout for use with this course, it's probably"
+		. " OK to check this course anyway. Just be sure that any fixes this program proposes are"
+		. " appropriate given your modifications.)";
+	}
+	
+	return ();
+}
+
+################################################################################
+
+sub get_version_zero_ww_table_data {
+	return (
+	  'problem_user' => {
+		'fields' => {
+		  'problem_seed' => {
+			'is_keyfield' => '',
+			'sql_type' => 'INT',
+			'sql_name' => 'problem_seed'
+		  },
+		  'status' => {
+			'is_keyfield' => '',
+			'sql_type' => 'TEXT',
+			'sql_name' => 'status'
+		  },
+		  'max_attempts' => {
+			'is_keyfield' => '',
+			'sql_type' => 'INT',
+			'sql_name' => 'max_attempts'
+		  },
+		  'value' => {
+			'is_keyfield' => '',
+			'sql_type' => 'INT',
+			'sql_name' => 'value'
+		  },
+		  'last_answer' => {
+			'is_keyfield' => '',
+			'sql_type' => 'TEXT',
+			'sql_name' => 'last_answer'
+		  },
+		  'source_file' => {
+			'is_keyfield' => '',
+			'sql_type' => 'TEXT',
+			'sql_name' => 'source_file'
+		  },
+		  'set_id' => {
+			'is_keyfield' => 1,
+			'sql_type' => 'BLOB',
+			'sql_name' => 'set_id'
+		  },
+		  'problem_id' => {
+			'is_keyfield' => 1,
+			'sql_type' => 'INT',
+			'sql_name' => 'problem_id'
+		  },
+		  'num_incorrect' => {
+			'is_keyfield' => '',
+			'sql_type' => 'INT',
+			'sql_name' => 'num_incorrect'
+		  },
+		  'num_correct' => {
+			'is_keyfield' => '',
+			'sql_type' => 'INT',
+			'sql_name' => 'num_correct'
+		  },
+		  'attempted' => {
+			'is_keyfield' => '',
+			'sql_type' => 'INT',
+			'sql_name' => 'attempted'
+		  },
+		  'user_id' => {
+			'is_keyfield' => 1,
+			'sql_type' => 'BLOB',
+			'sql_name' => 'user_id'
+		  }
+		},
+		'keyfield_order' => [
+		  'user_id',
+		  'set_id',
+		  'problem_id'
+		],
+		'field_order' => [
+		  'user_id',
+		  'set_id',
+		  'problem_id',
+		  'source_file',
+		  'value',
+		  'max_attempts',
+		  'problem_seed',
+		  'status',
+		  'attempted',
+		  'last_answer',
+		  'num_correct',
+		  'num_incorrect'
+		],
+		'sql_name' => '6SC36NukknC3IT3M_problem_user'
+	  },
+	  'permission' => {
+		'fields' => {
+		  'permission' => {
+			'is_keyfield' => '',
+			'sql_type' => 'INT',
+			'sql_name' => 'permission'
+		  },
+		  'user_id' => {
+			'is_keyfield' => 1,
+			'sql_type' => 'BLOB',
+			'sql_name' => 'user_id'
+		  }
+		},
+		'keyfield_order' => [
+		  'user_id'
+		],
+		'field_order' => [
+		  'user_id',
+		  'permission'
+		],
+		'sql_name' => '6SC36NukknC3IT3M_permission'
+	  },
+	  'key' => {
+		'fields' => {
+		  'timestamp' => {
+			'is_keyfield' => '',
+			'sql_type' => 'TEXT',
+			'sql_name' => 'timestamp'
+		  },
+		  'user_id' => {
+			'is_keyfield' => 1,
+			'sql_type' => 'BLOB',
+			'sql_name' => 'user_id'
+		  },
+		  'key' => {
+			'is_keyfield' => '',
+			'sql_type' => 'TEXT',
+			'sql_name' => 'key_not_a_keyword'
+		  }
+		},
+		'keyfield_order' => [
+		  'user_id'
+		],
+		'field_order' => [
+		  'user_id',
+		  'key',
+		  'timestamp'
+		],
+		'sql_name' => '6SC36NukknC3IT3M_key'
+	  },
+	  'password' => {
+		'fields' => {
+		  'password' => {
+			'is_keyfield' => '',
+			'sql_type' => 'TEXT',
+			'sql_name' => 'password'
+		  },
+		  'user_id' => {
+			'is_keyfield' => 1,
+			'sql_type' => 'BLOB',
+			'sql_name' => 'user_id'
+		  }
+		},
+		'keyfield_order' => [
+		  'user_id'
+		],
+		'field_order' => [
+		  'user_id',
+		  'password'
+		],
+		'sql_name' => '6SC36NukknC3IT3M_password'
+	  },
+	  'problem' => {
+		'fields' => {
+		  'problem_id' => {
+			'is_keyfield' => 1,
+			'sql_type' => 'INT',
+			'sql_name' => 'problem_id'
+		  },
+		  'max_attempts' => {
+			'is_keyfield' => '',
+			'sql_type' => 'INT',
+			'sql_name' => 'max_attempts'
+		  },
+		  'value' => {
+			'is_keyfield' => '',
+			'sql_type' => 'INT',
+			'sql_name' => 'value'
+		  },
+		  'source_file' => {
+			'is_keyfield' => '',
+			'sql_type' => 'TEXT',
+			'sql_name' => 'source_file'
+		  },
+		  'set_id' => {
+			'is_keyfield' => 1,
+			'sql_type' => 'BLOB',
+			'sql_name' => 'set_id'
+		  }
+		},
+		'keyfield_order' => [
+		  'set_id',
+		  'problem_id'
+		],
+		'field_order' => [
+		  'set_id',
+		  'problem_id',
+		  'source_file',
+		  'value',
+		  'max_attempts'
+		],
+		'sql_name' => '6SC36NukknC3IT3M_problem'
+	  },
+	  'user' => {
+		'fields' => {
+		  'email_address' => {
+			'is_keyfield' => '',
+			'sql_type' => 'TEXT',
+			'sql_name' => 'email_address'
+		  },
+		  'student_id' => {
+			'is_keyfield' => '',
+			'sql_type' => 'TEXT',
+			'sql_name' => 'student_id'
+		  },
+		  'comment' => {
+			'is_keyfield' => '',
+			'sql_type' => 'TEXT',
+			'sql_name' => 'comment'
+		  },
+		  'status' => {
+			'is_keyfield' => '',
+			'sql_type' => 'TEXT',
+			'sql_name' => 'status'
+		  },
+		  'recitation' => {
+			'is_keyfield' => '',
+			'sql_type' => 'TEXT',
+			'sql_name' => 'recitation'
+		  },
+		  'section' => {
+			'is_keyfield' => '',
+			'sql_type' => 'TEXT',
+			'sql_name' => 'section'
+		  },
+		  'user_id' => {
+			'is_keyfield' => 1,
+			'sql_type' => 'BLOB',
+			'sql_name' => 'user_id'
+		  },
+		  'last_name' => {
+			'is_keyfield' => '',
+			'sql_type' => 'TEXT',
+			'sql_name' => 'last_name'
+		  },
+		  'first_name' => {
+			'is_keyfield' => '',
+			'sql_type' => 'TEXT',
+			'sql_name' => 'first_name'
+		  }
+		},
+		'keyfield_order' => [
+		  'user_id'
+		],
+		'field_order' => [
+		  'user_id',
+		  'first_name',
+		  'last_name',
+		  'email_address',
+		  'student_id',
+		  'status',
+		  'section',
+		  'recitation',
+		  'comment'
+		],
+		'sql_name' => '6SC36NukknC3IT3M_user'
+	  },
+	  'set_user' => {
+		'fields' => {
+		  'version_time_limit' => {
+			'is_keyfield' => '',
+			'sql_type' => 'INT',
+			'sql_name' => 'version_time_limit'
+		  },
+		  'set_header' => {
+			'is_keyfield' => '',
+			'sql_type' => 'TEXT',
+			'sql_name' => 'set_header'
+		  },
+		  'psvn' => {
+			'is_keyfield' => '',
+			'sql_type' => 'INT NOT NULL PRIMARY KEY AUTO_INCREMENT',
+			'sql_name' => 'psvn'
+		  },
+		  'hardcopy_header' => {
+			'is_keyfield' => '',
+			'sql_type' => 'TEXT',
+			'sql_name' => 'hardcopy_header'
+		  },
+		  'version_creation_time' => {
+			'is_keyfield' => '',
+			'sql_type' => 'BIGINT',
+			'sql_name' => 'version_creation_time'
+		  },
+		  'open_date' => {
+			'is_keyfield' => '',
+			'sql_type' => 'BIGINT',
+			'sql_name' => 'open_date'
+		  },
+		  'problem_randorder' => {
+			'is_keyfield' => '',
+			'sql_type' => 'INT',
+			'sql_name' => 'problem_randorder'
+		  },
+		  'versions_per_interval' => {
+			'is_keyfield' => '',
+			'sql_type' => 'INT',
+			'sql_name' => 'versions_per_interval'
+		  },
+		  'version_last_attempt_time' => {
+			'is_keyfield' => '',
+			'sql_type' => 'BIGINT',
+			'sql_name' => 'version_last_attempt_time'
+		  },
+		  'time_interval' => {
+			'is_keyfield' => '',
+			'sql_type' => 'INT',
+			'sql_name' => 'time_interval'
+		  },
+		  'set_id' => {
+			'is_keyfield' => 1,
+			'sql_type' => 'BLOB',
+			'sql_name' => 'set_id'
+		  },
+		  'visible' => {
+			'is_keyfield' => '',
+			'sql_type' => 'INT',
+			'sql_name' => 'visible'
+		  },
+		  'assignment_type' => {
+			'is_keyfield' => '',
+			'sql_type' => 'TEXT',
+			'sql_name' => 'assignment_type'
+		  },
+		  'due_date' => {
+			'is_keyfield' => '',
+			'sql_type' => 'BIGINT',
+			'sql_name' => 'due_date'
+		  },
+		  'answer_date' => {
+			'is_keyfield' => '',
+			'sql_type' => 'BIGINT',
+			'sql_name' => 'answer_date'
+		  },
+		  'user_id' => {
+			'is_keyfield' => 1,
+			'sql_type' => 'BLOB',
+			'sql_name' => 'user_id'
+		  },
+		  'attempts_per_version' => {
+			'is_keyfield' => '',
+			'sql_type' => 'INT',
+			'sql_name' => 'attempts_per_version'
+		  }
+		},
+		'keyfield_order' => [
+		  'user_id',
+		  'set_id'
+		],
+		'field_order' => [
+		  'user_id',
+		  'set_id',
+		  'psvn',
+		  'set_header',
+		  'hardcopy_header',
+		  'open_date',
+		  'due_date',
+		  'answer_date',
+		  'visible',
+		  'assignment_type',
+		  'attempts_per_version',
+		  'time_interval',
+		  'versions_per_interval',
+		  'version_time_limit',
+		  'version_creation_time',
+		  'problem_randorder',
+		  'version_last_attempt_time'
+		],
+		'sql_name' => '6SC36NukknC3IT3M_set_user'
+	  },
+	  'set' => {
+		'fields' => {
+		  'version_last_attempt_time' => {
+			'is_keyfield' => '',
+			'sql_type' => 'BIGINT',
+			'sql_name' => 'version_last_attempt_time'
+		  },
+		  'version_time_limit' => {
+			'is_keyfield' => '',
+			'sql_type' => 'INT',
+			'sql_name' => 'version_time_limit'
+		  },
+		  'versions_per_interval' => {
+			'is_keyfield' => '',
+			'sql_type' => 'INT',
+			'sql_name' => 'versions_per_interval'
+		  },
+		  'time_interval' => {
+			'is_keyfield' => '',
+			'sql_type' => 'INT',
+			'sql_name' => 'time_interval'
+		  },
+		  'set_header' => {
+			'is_keyfield' => '',
+			'sql_type' => 'TEXT',
+			'sql_name' => 'set_header'
+		  },
+		  'set_id' => {
+			'is_keyfield' => 1,
+			'sql_type' => 'BLOB',
+			'sql_name' => 'set_id'
+		  },
+		  'hardcopy_header' => {
+			'is_keyfield' => '',
+			'sql_type' => 'TEXT',
+			'sql_name' => 'hardcopy_header'
+		  },
+		  'visible' => {
+			'is_keyfield' => '',
+			'sql_type' => 'INT',
+			'sql_name' => 'visible'
+		  },
+		  'version_creation_time' => {
+			'is_keyfield' => '',
+			'sql_type' => 'BIGINT',
+			'sql_name' => 'version_creation_time'
+		  },
+		  'due_date' => {
+			'is_keyfield' => '',
+			'sql_type' => 'BIGINT',
+			'sql_name' => 'due_date'
+		  },
+		  'assignment_type' => {
+			'is_keyfield' => '',
+			'sql_type' => 'TEXT',
+			'sql_name' => 'assignment_type'
+		  },
+		  'open_date' => {
+			'is_keyfield' => '',
+			'sql_type' => 'BIGINT',
+			'sql_name' => 'open_date'
+		  },
+		  'answer_date' => {
+			'is_keyfield' => '',
+			'sql_type' => 'BIGINT',
+			'sql_name' => 'answer_date'
+		  },
+		  'attempts_per_version' => {
+			'is_keyfield' => '',
+			'sql_type' => 'INT',
+			'sql_name' => 'attempts_per_version'
+		  },
+		  'problem_randorder' => {
+			'is_keyfield' => '',
+			'sql_type' => 'INT',
+			'sql_name' => 'problem_randorder'
+		  }
+		},
+		'keyfield_order' => [
+		  'set_id'
+		],
+		'field_order' => [
+		  'set_id',
+		  'set_header',
+		  'hardcopy_header',
+		  'open_date',
+		  'due_date',
+		  'answer_date',
+		  'visible',
+		  'assignment_type',
+		  'attempts_per_version',
+		  'time_interval',
+		  'versions_per_interval',
+		  'version_time_limit',
+		  'version_creation_time',
+		  'problem_randorder',
+		  'version_last_attempt_time'
+		],
+		'sql_name' => '6SC36NukknC3IT3M_set'
+	  }
+	);
+}
diff --git a/bin/old_scripts/wwdb_init b/bin/old_scripts/wwdb_init
new file mode 100755
index 0000000000..955aa1fab0
--- /dev/null
+++ b/bin/old_scripts/wwdb_init
@@ -0,0 +1,198 @@
+#!/usr/bin/env perl
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright ? 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader$
+# 
+# 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+use strict;
+use warnings;
+use Getopt::Std;
+use DBI;
+use Data::Dumper;
+
+BEGIN {
+	die "WEBWORK_ROOT not found in environment.\n"
+		unless exists $ENV{WEBWORK_ROOT};
+}
+
+use lib "$ENV{WEBWORK_ROOT}/lib";
+use WeBWorK::CourseEnvironment;
+use WeBWorK::Utils qw/runtime_use/;
+
+
+our ($opt_v);
+getopts("v");
+
+if ($opt_v) {
+	$| = 1;
+	*verbose = sub { print STDERR @_ };
+} else {
+	*verbose = sub {};
+}
+
+# global variables, hah hah.
+my ($dbh, %sql_tables);
+
+################################################################################
+
+my $i = -1;
+our @DB_VERSIONS;
+
+$DB_VERSIONS[++$i]{desc} = "is the initial version of database, identical to database structure in WeBWorK 2.2.x.";
+
+$DB_VERSIONS[++$i]{desc} = "adds dbupgrade table to facilitate automatic database upgrades.";
+$DB_VERSIONS[  $i]{global_code} = sub {
+	$dbh->do("CREATE TABLE `dbupgrade` (`name` VARCHAR(255) NOT NULL PRIMARY KEY, `value` TEXT)");
+	$dbh->do("INSERT INTO `dbupgrade` (`name`, `value`) VALUES (?, ?)", {}, "db_version", 1);
+	$sql_tables{dbupgrade} = ();
+};
+
+
+$DB_VERSIONS[++$i]{desc} = "adds depths table to keep track of dvipng depth information.";
+$DB_VERSIONS[  $i]{global_code} = sub {
+	$dbh->do("CREATE TABLE depths (md5 CHAR(33) NOT NULL, depth SMALLINT, PRIMARY KEY (md5))");
+	$sql_tables{depths} = ();
+};
+
+$DB_VERSIONS[++$i]{desc} = "adds locations, location_addresses, set_locations and set_locations_user tables to database, and add restrict_ip to set and set_user.";
+$DB_VERSIONS[  $i]{global_code} = sub {
+	$dbh->do("CREATE TABLE locations (location_id TINYBLOB NOT NULL, description TEXT, PRIMARY KEY (location_id(1000)))");
+	$dbh->do("CREATE TABLE location_addresses (location_id TINYBLOB NOT NULL, ip_mask TINYBLOB NOT NULL, PRIMARY KEY (location_id(500),ip_mask(500)))");
+};
+
+our $THIS_DB_VERSION = $i;
+
+################################################################################
+
+my $ce = WeBWorK::CourseEnvironment->new({
+	webwork_dir => $ENV{WEBWORK_ROOT},
+});
+
+$dbh = DBI->connect(
+	$ce->{database_dsn},
+	$ce->{database_username},
+	$ce->{database_password},
+	{
+		PrintError => 0,
+		RaiseError => 1,
+	},
+);
+
+{
+	verbose("Obtaining dbupgrade lock...\n");
+	my ($lock_status) = $dbh->selectrow_array("SELECT GET_LOCK('dbupgrade', 10)");
+	if (not defined $lock_status) {
+		print "Couldn't obtain lock because an error occurred.\n";
+		exit 2;
+	}
+	if ($lock_status) {
+		verbose("Got lock.\n");
+	} else {
+		print "Timed out while waiting for lock.\n";
+		exit 2;
+	}
+}
+
+%sql_tables = get_sql_tables();
+
+my $db_version = 0;
+
+
+verbose("Initial db_version is $db_version\n");
+
+if ($db_version > $THIS_DB_VERSION) {
+	print "db_version is $db_version, but the current database version is only $THIS_DB_VERSION. This database was probably used with a newer version of WeBWorK.\n";
+	exit;
+}
+
+while ($db_version < $THIS_DB_VERSION) {
+	$db_version++;
+	unless (upgrade_to_version($db_version)) {
+		print "\nUpgrading from version ".($db_version-1)." to $db_version failed.\n\n";
+		unless (ask_permission("Ignore this error and go on to the next version?", 0)) {
+			exit 3;
+		}
+	}
+	set_db_version($db_version);
+}
+
+print "\nDatabase is up-to-date at version $db_version.\n";
+
+END {
+	verbose("Releasing dbupgrade lock...\n");
+	my ($lock_status) = $dbh->selectrow_array("SELECT RELEASE_LOCK('dbupgrade')");
+	if (not defined $lock_status) {
+		print "Couldn't release lock because the lock does not exist.\n";
+		exit 2;
+	}
+	if ($lock_status) {
+		verbose("Released lock.\n");
+	} else {
+		print "Couldn't release lock because the lock is not held by this thread.\n";
+		exit 2;
+	}
+}
+
+################################################################################
+
+sub get_sql_tables {
+	my $sql_tables_ref = $dbh->selectcol_arrayref("SHOW TABLES");
+	my %sql_tables; @sql_tables{@$sql_tables_ref} = ();
+	
+	return %sql_tables;
+}
+
+sub set_db_version {
+	my $vers = shift;
+	$dbh->do("UPDATE `dbupgrade` SET `value`=? WHERE `name`='db_version'", {}, $vers);
+}
+
+sub upgrade_to_version {
+	my $vers = shift;
+	my %info = %{$DB_VERSIONS[$vers]};
+	
+	print "\nUpgrading database from version " . ($vers-1) . " to $vers...\n";
+	my $desc = $info{desc} || "has no description.";
+	print "(Version $vers $desc)\n";
+	
+	if (exists $info{global_code}) {
+		eval { $info{global_code}->() };
+		if ($@) {
+			print "\nAn error occured while running the system upgrade code for version $vers:\n";
+			print "$@";
+			return 0 unless ask_permission("Ignore this error and keep going?", 0);
+		}
+	}
+	print "Done.\n";
+	return 1;
+}
+
+################################################################################
+
+sub ask_permission {
+	my ($prompt, $default) = @_;
+	
+	$default = 1 if not defined $default;
+	my $options = $default ? "[Y/n]" : "[y/N]";
+	
+	while (1) {
+		print "$prompt $options ";
+		my $resp = <STDIN>;
+		chomp $resp;
+		return $default if $resp eq "";
+		return 1 if lc $resp eq "y";
+		return 0 if lc $resp eq "n";
+		$prompt = 'Please enter "y" or "n".';
+	}
+}
\ No newline at end of file
diff --git a/bin/old_scripts/wwdb_upgrade b/bin/old_scripts/wwdb_upgrade
new file mode 100755
index 0000000000..9a4b6ac859
--- /dev/null
+++ b/bin/old_scripts/wwdb_upgrade
@@ -0,0 +1,49 @@
+#!/usr/bin/env perl
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/bin/wwdb_upgrade,v 1.16 2007/07/22 05:24:20 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+use strict;
+use warnings;
+use Getopt::Std;
+use Data::Dumper;
+
+BEGIN {
+	die "WEBWORK_ROOT not found in environment.\n"
+		unless exists $ENV{WEBWORK_ROOT};
+}
+
+use lib "$ENV{WEBWORK_ROOT}/lib";
+use WeBWorK::CourseEnvironment;
+use WeBWorK::Utils::DBUpgrade;
+
+our ($opt_v);
+getopts("v");
+
+if ($opt_v) {
+	$WeBWorK::Debug::Enabled = 1;
+} else {
+	$WeBWorK::Debug::Enabled = 0;
+}
+
+my $ce = new WeBWorK::CourseEnvironment({webwork_dir=>$ENV{WEBWORK_ROOT}});
+
+my $upgrader = new WeBWorK::Utils::DBUpgrade(
+	ce => $ce,
+	verbose_sub => sub { print STDERR @_ },
+);
+
+$upgrader->do_upgrade;
+
diff --git a/bin/pg-append-textbook-tags b/bin/pg-append-textbook-tags
new file mode 100755
index 0000000000..009ab087c9
--- /dev/null
+++ b/bin/pg-append-textbook-tags
@@ -0,0 +1,115 @@
+#!/usr/bin/env perl
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/bin/pg-append-textbook-tags,v 1.1 2007/10/17 16:56:16 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+# 
+# Contributed by W.H. Freeman; Bedford, Freeman, and Worth Publishing Group.
+################################################################################
+
+use strict;
+use warnings;
+
+use IO::File;
+use Data::Dumper;# $Data::Dumper::Indent = 0;
+use Getopt::Long;
+
+BEGIN {
+	die "WEBWORK_ROOT not found in environment.\n"
+		unless exists $ENV{WEBWORK_ROOT};
+}
+
+use lib "$ENV{WEBWORK_ROOT}/lib";
+use WeBWorK::NPL qw/read_tags format_tags/;
+
+sub main {
+	my ($new_tags, @files) = @_;
+	$new_tags = { textbooks=>[$new_tags] };
+	foreach my $file (@files) {
+		add_tags_to_file($new_tags, $file);
+	}
+}
+
+sub add_tags_to_file {
+	my ($new_tags, $file) = @_;
+	
+	my $pgfile = new IO::File($file, '+<:utf8') or do {
+		warn "Failed to open file $file for editing: $!\n";
+		warn "New tags will not be written to this file.\n";
+		return;
+	};
+	
+	my $old_tags = {};
+	read_tags($pgfile, $old_tags, 1); # 1==extra_editing_info
+	my $pos = $old_tags->{_pos};
+	my $rest = $old_tags->{_rest};
+	my $maxtextbook = $old_tags->{_maxtextbook};
+	print "pos=$pos maxtextbook=$maxtextbook\n";
+	
+	my @tagstrings = format_tags($new_tags, $maxtextbook+1);
+	
+	seek $pgfile, $pos, 0;
+	foreach my $string (@tagstrings) {
+		$string =~ s/^/## /gm;
+		print $pgfile "$string\n";
+	}
+	print $pgfile $rest;
+}
+
+my %o;
+GetOptions(\%o,
+	"title=s",
+	"edition=s",
+	"author=s",
+	"chapter=s",
+	"section=s",
+	"problem=s",
+);
+main(\%o, @ARGV);
+
+__END__
+
+=head1 NAME
+
+pg-append-text-tags -- Add textbook tags to a PG file.
+
+=head1 SYNOPSIS
+
+	pg-append-text-tags file1.pg file2.pg --author=Rogawski \
+	--title='Calculus: Early Transcendentals' --edition=1 \
+	--chapter=3 --section=1 --problem=11,13
+
+=head1 DESCRIPTION
+
+This script appends metadata tags for a new textbook to one or more PG files.
+Tags are given as switches on the command line:
+
+	--title=STRING
+	--edition=STRING
+	--author=STRING
+	--chapter=STRING
+	--section=STRING
+	--problem=STRING
+
+More than one problem can be specified for B<--problem> by passing a
+comma-separated list.
+
+=head1 LIMITATIONS
+
+Only adds tags for a new textbook, can't rewrite existing tags, can't remove
+tags.
+
+At some point I will write Tie::PGFile, which will allow direct editing of tags
+just by modifying a hash, and that will fix all of these problems. :)
+
+=cut
diff --git a/bin/pg-find-tags b/bin/pg-find-tags
new file mode 100755
index 0000000000..1cd81486bc
--- /dev/null
+++ b/bin/pg-find-tags
@@ -0,0 +1,110 @@
+#!/usr/bin/env perl
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/bin/pg-find-tags,v 1.1 2007/10/17 16:56:16 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+# 
+# Contributed by W.H. Freeman; Bedford, Freeman, and Worth Publishing Group.
+################################################################################
+
+use strict;
+use warnings;
+
+use Data::Dumper;# $Data::Dumper::Indent = 0;
+use File::Find;
+use Getopt::Long;
+use IO::Handle;
+
+BEGIN {
+	die "WEBWORK_ROOT not found in environment.\n"
+		unless exists $ENV{WEBWORK_ROOT};
+}
+
+use lib "$ENV{WEBWORK_ROOT}/lib";
+use WeBWorK::NPL qw/gen_find_tags/;
+
+sub main {
+	my ($pattern, @paths) = @_;
+	my $oldfh = select(STDERR); $|=1; select(STDOUT); $|=1; select($oldfh);
+	my $wanted = gen_find_tags($pattern, \&report);
+	find({ wanted=>$wanted, no_chdir=>1, }, @paths);
+}
+
+sub report {
+	my ($name, $tags) = @_;
+	print "$name\n";
+}
+
+my %o;
+GetOptions(\%o,
+	"DESCRIPTION=s",
+	"KEYWORDS=s",
+	"DBsubject=s",
+	"DBchapter=s",
+	"DBsection=s",
+	"Date=s",
+	"Institution=s",
+	"Author=s",
+	"title=s",
+	"edition=s",
+	"author=s",
+	"chapter=s",
+	"section=s",
+	"problem=s",
+);
+main(\%o, @ARGV);
+
+__END__
+
+=head1 NAME
+
+pg-find-tags - Search for PG files that contain the specified metadata tags.
+
+=head1 SYNOPSIS
+
+	pg-find-tags ~/MyLibrary /ww/OtherLibrary --author=Rogawski --edition=1
+
+=head1 DESCRIPTION
+
+Recusively searches the paths given for PG files containing all of the specified
+tags. Output is the path to each matching file. Legal tags are as follows:
+
+B<Global fields:>
+
+	--DESCRIPTION=STRING
+	--KEYWORDS=STRING
+	--DBsubject=STRING
+	--DBchapter=STRING
+	--DBsection=STRING
+	--Date=STRING
+	--Institution=STRING
+	--Author=STRING
+
+B<Text-specific fields:>
+
+	--title=STRING
+	--edition=STRING
+	--author=STRING
+	--chapter=STRING
+	--section=STRING
+	--problem=STRING
+
+If multiple text-specific fields are given, then all must match for a single
+textbook.
+
+=head1 LIMITATIONS
+
+Doesn't support full boolean searches, and it probably should. Can only match on
+full strings, so you can't match on a single keyword, for example.
+
+=cut
diff --git a/bin/pg-pull b/bin/pg-pull
new file mode 100755
index 0000000000..143d3a3fe2
--- /dev/null
+++ b/bin/pg-pull
@@ -0,0 +1,284 @@
+#!/usr/bin/env perl
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/bin/pg-pull,v 1.3 2007/10/22 20:32:38 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+# 
+# Contributed by W.H. Freeman; Bedford, Freeman, and Worth Publishing Group.
+################################################################################
+
+# Assemble a new problem library consisting of the specified PG files and any required
+# auxiliary files (i.e. images).
+# 
+# Auxiliary files must be specified in the (unofficial) UsesAuxiliaryFiles(...) tag.
+# It is assumed that auxiliary files don't depend on further auxiliary files.
+# This will be true <100% of the time.
+# 
+# Also, right now this script always uses the FIRST textbook entry in generating
+# the new file's path and name. Eventually, a --match-text switch will make the
+# script useful for files with multiple text tags.
+
+use strict;
+use warnings;
+
+use Data::Dumper;
+use File::Path;
+use File::Spec;
+use File::Copy;
+use Getopt::Long;
+use IO::File;
+
+BEGIN {
+	die "WEBWORK_ROOT not found in environment.\n"
+		unless exists $ENV{WEBWORK_ROOT};
+}
+
+use lib "$ENV{WEBWORK_ROOT}/lib";
+use WeBWorK::NPL qw/read_textbooks read_tags/;
+
+my %o;
+my %textbooks;
+my %seen_paths;
+
+sub main {
+	my (@files) = @_;
+	my $oldfh = select(STDERR); $|=1; select(STDOUT); $|=1; select($oldfh);
+	
+	if (defined $o{help}) {
+		print usage();
+		exit;
+	}
+	
+	my $dest_lib = $o{'dest-lib'};
+	# using the last argument as dest-lib is too confusing
+	#$dest_lib = pop @files unless defined $dest_lib;
+	die "dest-lib not specified.\n" . usage() unless defined $dest_lib;
+	
+	die "no files specified (perhaps you meant to use --stdin?)\n" . usage()
+		unless @files or $o{stdin};
+	
+	if ($o{'orig-paths'} and not defined $o{'src-lib'}) {
+		die "--src-lib must be specified with --orig-paths.\n", usage();
+	}
+	
+	if (defined $o{'src-lib'} and not $o{'orig-paths'}) {
+		warn "ignoring --src-lib since --orig-paths was not specified.\n";
+	}
+	
+	if ($o{'orig-paths'}) {
+		if (defined $o{textbooks}) {
+			warn "ignoring --textbooks since --orig-paths was specified.\n";
+		}
+	} else {
+		if (defined $o{textbooks}) {
+			get_texts($o{textbooks});
+		} else {
+			warn "No Textbooks file specified -- directories will not be named.\n";
+		}
+	}
+	
+	my $getfile;
+	if ($o{stdin}) {
+		$getfile = sub { if (defined ($_=<STDIN>)) { chomp; $_ } else { () } };
+	} else {
+		my $i = 0;
+		$getfile = sub { defined $files[$i] ? $files[$i++] : () };
+	}
+	
+	while (defined (my $file = &$getfile)) {
+		#print "file=$file\n";
+		process_file($file);
+	}
+}
+
+sub get_texts {
+	my $textbooks = shift;
+	my @textbooks;
+	
+	open my $fh, '<', $textbooks or die "$textbooks: $!\n";
+	read_textbooks($fh, \@textbooks);
+	close $fh;
+	
+	foreach my $textbook (@textbooks) {
+		$textbooks{$textbook->{'_author'}}{$textbook->{'_title'}}{$textbook->{'_edition'}} = $textbook;
+	}
+}
+
+sub process_file {
+	my $file = shift;
+	
+	# ignoring volume here because we don't care about w32
+	(undef, my ($dir, $name)) = File::Spec->splitpath($file);
+	#print "  dir=$dir\n";
+	#print "  name=$name\n";
+	
+	my %tags;
+	read_tags($file, \%tags);
+	#print Dumper(\%tags);
+	
+	my ($target_dir_rel, $target_name);
+	if ($o{'orig-paths'}) {
+		$target_dir_rel = File::Spec->abs2rel($dir, $o{'src-lib'});
+		$target_name = $name;
+	} else {
+		($target_dir_rel, $target_name) = tags_to_path(\%tags, '.pg', $file);
+	}
+	
+	if ($o{'check-names'} and $name ne $target_name) {
+		warn "$file: name will be changed to $target_name\n";
+	}
+	
+	my $target_dir = File::Spec->catdir($o{'dest-lib'}, $target_dir_rel);
+	
+	my @files = ($target_name);
+	push @files, @{$tags{UsesAuxiliaryFiles}} if defined $tags{UsesAuxiliaryFiles};
+	
+	#print "mkpath $target_dir\n" if $o{pretend} or $o{verbose};
+	mkpath($target_dir) unless $o{pretend};
+	
+	foreach my $curr (@files) {
+		my $src = File::Spec->catpath(undef, $dir, $curr);
+		my $dest = File::Spec->catpath(undef, $target_dir, $curr);
+		print "copy $src $dest\n" if $o{pretend} or $o{verbose};
+		copy($src, $dest) unless $o{pretend};
+	}
+}
+
+sub tags_to_path {
+	my ($tags, $ext, $file) = @_;
+	
+	# FIXME here is where we'd put in textbook matching
+	my $text = $tags->{textbooks}[0];
+	unless (defined $text) {
+		warn "$file: no textbook tags\n";
+		return;
+	}
+	my %text = %$text;
+	
+	if (not defined $text{author}
+			or not defined $text{title}
+			or not defined $text{edition}
+			or not defined $text{chapter}
+			or not defined $text{section}
+			or not defined $text{problem}
+			or @{$text{problem}} == 0) {
+		warn "$file: incomplete textbook tags\n";
+		return;
+	}
+	
+	my $chapter_name = $text{chapter};
+	my $chapsec_name = "$text{chapter}.$text{section}";
+	
+	if (defined $o{textbooks}) {
+		my $text_names = $textbooks{$text{author}}{$text{title}}{$text{edition}};
+		if (defined $text_names) {
+			my %text_names = %$text_names;
+
+			if (defined $text_names{$text{chapter}}) {
+				$chapter_name .= sissy_filename(" $text_names{$text{chapter}}")
+			} else {
+				warn "$file: no chapter name for $text{chapter}";
+			}
+
+			if (defined $text_names{"$text{chapter}.$text{section}"}) {
+				$chapsec_name .= sissy_filename(" $text_names{qq|$text{chapter}.$text{section}|}");
+			} else {
+				warn "$file: no section name for $text{chapter}.$text{section}";
+			}
+		} else {
+			warn "$file: can't find text $text{author}/$text{title}/$text{edition} in Textbooks file -- directories will be unnamed\n";
+		}
+	}
+	
+	my $ex_name = "$text{chapter}.$text{section}.$text{problem}[0]";
+	$ex_name .= '+' if @{$text{problem}} > 1;
+	
+	#print "  chapter_name=$chapter_name\n";
+	#print "  chapsec_name=$chapsec_name\n";
+	#print "  ex_name=$ex_name\n";
+	
+	# make sure path hasn't been seen before
+	my $dir = File::Spec->catdir($chapter_name, $chapsec_name);
+	my $partA = $ex_name;
+	$partA .= $o{suffix} if defined $o{suffix};
+	my $partB = $ext;
+	my $uniq = unique_name($dir, $partA, $partB);
+	
+	#print "  partA=$partA\n";
+	#print "  uniq=$uniq\n";
+	#print "  partB=$partB\n";
+	
+	return $dir, "$partA$uniq$partB";
+}
+
+sub unique_name {
+	my ($dir, $partA, $partB) = @_;
+	my $whole = File::Spec->catpath(undef, $dir, "$partA$partB");
+	my $uniq = '';
+	if (exists $seen_paths{$whole}) {
+		my $i = 2;
+		do {
+			$uniq = "~$i";
+			$whole = File::Spec->catpath(undef, $dir, "$partA$uniq$partB");
+		} while (exists $seen_paths{$whole});
+	}
+	$seen_paths{$whole} = ();
+	return $uniq;
+}
+
+#sub find_macro_file {
+#	my ($name, $ref_by) = @_;
+#	my (undef,$ref_by_dir,undef) = File::Spec->splitpath($ref_by);
+#	my $ref_by_dir_rel = File::Spec->abs2rel($ref_by_dir, $o{'src-lib'});
+#	my @dirs = File::Spec->splitdir($ref_by_dir_rel);
+#	while (1) {
+#		my $dir = File::Spec->catdir(@dirs);
+#		my $file = File::Spec->catfile(${'src-lib'}, $dir, $name);
+#		return $file if -f $file;
+#		pop @dirs;
+#	}
+#}
+
+sub sissy_filename {
+	my $string = shift;
+	$string =~ s/:/-/g;
+	$string =~ s/[<>\"\/\/|?*]/_/g;
+	$string =~ s/\s+/_/g;
+	return $string;
+}
+
+sub usage {
+	return "USAGE:\n"
+		. "$0 [OPTIONS] --dest-lib=PATH [--textbooks=PATH] [--suffix=STRING] files...\n"
+		. "$0 [OPTIONS] --dest-lib=PATH --orig-paths --src-lib=PATH files...\n"
+		. "Options:\n"
+		. "\t--stdin\n"
+		. "\t--pretend\n"
+		. "\t--verbose\n"
+		. "\t--check-names\n"
+		;
+}
+
+GetOptions(\%o,
+	'textbooks=s',
+	'dest-lib=s',
+	'orig-paths',
+	'src-lib=s',
+	'stdin',
+	'suffix=s',
+	'pretend',
+	'verbose',
+	'check-names',
+	'help',
+);
+main(@ARGV);
diff --git a/bin/png2eps b/bin/png2eps
deleted file mode 100755
index ed1a3ebeac..0000000000
--- a/bin/png2eps
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
-# 
-# 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
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-# 
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-# This script wraps system-dependant calls to several netpbm utilities.
-# In order to use this script, set the NETPBM variable below to the
-# directory which contains giftopnm, ppmtopgm, and pnmtops.
-
-NETPBM=/usr/local/bin
-
-# If you wish to set the paths to each utility separately, i.e. if they
-# are in different locations, do so below:
-
-PNGTOPNM=$NETPBM/pngtopnm;
-PPMTOPGM=$NETPBM/ppmtopgm;
-PNMTOPS=$NETPBM/pnmtops;
-
-# There should be no need for customization beyond this point.
-
-umask 022
-cat $1 | $PNGTOPNM | $PPMTOPGM | $PNMTOPS -noturn 2>/dev/null > $2
-
-# CODER NOTE:
-# We used to use `pnmdepth 1' instead of ppmtopgm as it creates a
-# monochrome image (1 bit) rather than a greyscale image (8 bits).
-# However, this was causing improper display of some sort in PDFs.
diff --git a/bin/readURClassList.pl b/bin/readURClassList.pl
new file mode 100755
index 0000000000..d354022212
--- /dev/null
+++ b/bin/readURClassList.pl
@@ -0,0 +1,250 @@
+#!/usr/bin/env perl
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright � 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/bin/readURClassList.pl,v 1.2.2.1 2007/08/13 22:53:39 sh0$
+#
+# 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+## readURClassList
+##
+## This is a specific routine for reading class lists which come from the registrar's
+## office at the Univ of Rochester and producing a classlist file usable by WeBWorK
+
+## It can be used as a sample script for creating similar scripts for othert schools.
+
+## IT IS ASSUMED THAT THE REGISTRAR'S LIST IS DELIMITED WITH SEMICOLONS (;)
+
+## Takes three parameters.
+
+## First, the full file name of the Registrar's class list file with the header
+##	material stripped off.  The format for this file is
+## 46246;26661017;   ;EASTON, KEVIN LAWRENCE        ;01;09;OPT;BS ;400 ;  ;keaston@mail.rochester.edu
+## 46246;26611026;   ;ECKEL, GRETCHEN ANNA          ;01;09;BIO;BA ;400 ;  ;geckel@mail.rochester.edu
+## 46246;26672985;   ;FLYER, JOHANNA GABRIELLE      ;01;09;UNC;BA ;400 ;  ;jflyer@mail.rochester.edu
+## 46246;23932114;   ;GALVAN, NESTOR YAMIL          ;01;08;ECE;BS ;400 ;  ;ngalvan@mail.rochester.edu
+## 46246;26603063;   ;GARCIA, HENRY ALEXANDER       ;01;09;BBC;BS ;400 ;  ;hgarcia@mail.rochester.edu
+
+## Second, the full file name of the output WeBWorK classlist file
+
+## Third, the name of the section, e.g. Pizer or "Pizer MWF" or "" (blank).
+##   For example classlist files from multiple sections can be concatonated into
+##   one large classlist file for a whole multisection course
+##
+## NOTE:  Be very careful.  The registrar's file may get corrupted by e-mail.
+
+
+require 5.000;
+
+
+$0 =~ s|.*/||;
+if (@ARGV != 3)  {
+	print "\n usage: $0 registrar's-list outputfile  sectionName\n
+     e.g. readURClassList.pl  ClassRoster.txt mth140A.lst 'Pizer MWF9'\n\n" ;
+	exit(0);
+}
+
+my ($infile, $outfile, $section) = @ARGV;
+
+open(REGLIST, "$infile") || die "can't open $infile: $!\n";
+open(OURLIST, ">$outfile")
+    || die "can't write $outfile: $!\n";
+
+while (<REGLIST>) {
+    chomp;
+    next unless($_=~/\w/);	        ## skip blank lines
+    s/;$/; /;				## make last field non empty
+    my @regArray=split(/;/);		## get fields from registrar's file
+
+    foreach (@regArray) {		## clean 'em up!
+	($_) = m/^\s*(.*?)\s*$/;        ## (remove leading and trailing spaces)
+    }
+
+  ## extract the relevant fields
+
+   my($crn, $id, $grade, $name, $school, $gradyear,
+      $major, $degree, $hours, $status, $login )
+     = @regArray;
+
+	## Hack.  The login comes as a complete email address.  Remove the @ and following sysbols.
+
+	$login =~ s/@.*//;
+
+
+  ## massage the data a bit
+
+    my($lname, $fname) = ($name =~ /^(.*),\s*(.*)$/);
+    if ($login =~/\w/) {$email = "$login".'@mail.rochester.edu';}
+    else
+		{
+		$email= " ";
+		$login = $id;
+	}
+	$status = 'C' unless (defined $status and $status =~/\w/);
+  ## dump it in our classArray format
+  ## our format is: $id, $lname, $fname, $status, 'comment ', $dept, $course, $section,
+  ## $hours, $crn, $year, $semester, $school, $gradyear, $major, $degree, $email, $login
+
+  ## At the U of R 'comment' is blank
+  ## At present only $id, $lname, $fname, $status, $email, $section, $recitation and $login are used by WeBWorK
+
+    my @classArray=($id, $lname, $fname, $status, ' ', $section, ' ',$email, $login);
+
+  ## and print that sucker!
+
+    print OURLIST join(',', @classArray) , "\n";
+}
+  close(OURLIST);
+
+  ## arrange the columns nicely
+
+   &columnPrint("$outfile","$outfile");
+   
+   
+   
+sub columnPrint {
+
+# Takes two parameters.  The first is the filename of the
+# delimited input file.  The second is the name of the
+# output file (these names may be the same).  The permissions
+# and group of the output file will be the same as the
+# input file
+
+# Takes any delimited (with \$DELIM delimiters) file and adds
+# extra space if necessary to the fields so that all columns line up.
+# The widest field in any column will contain exactly 2 spaces at the
+# end of the (non space characters 0f the) field. For example
+# ",a very long field entry  ," at one extreme and  ",  ," at the other
+#
+    my($inFileName,$outFileName)=@_;
+    my($line);
+
+    my ($permission, $gid) = (stat($inFileName))[2,5];
+    $permission =  ($permission & 0777);    ##get rid of file type stuff
+
+    open(INFILE,"$inFileName") or wwerror("$0","can't open $inFileName for reading");
+    my @inFile=<INFILE>;
+    close(INFILE);
+
+    &createFile($outFileName, $permission, $gid);
+
+    my @outFile = &columnArrayArrange(@inFile);
+
+    open(OUTFILE,">$outFileName")   or wwerror("$0","can't open $outFileName for writing");
+    foreach $line (@outFile) {print OUTFILE $line;}
+    close(OUTFILE);
+}
+   
+sub columnArrayArrange  {
+
+## takes as a parameter a delimited array
+## (such as you would get by reading in a delimited file)
+## where each element is a line from a delimited file.
+
+# Outputs an array which adds
+# extra space if necessary to the fields so that all columns line up.
+# The widest field in any column will contain exactly 1 spaces at the
+# end of the (non space characters of the) field. For example
+# ",a very long field entry ," at one extreme and  ", ," at the other
+
+    my @inFile=@_;
+    my($i,$tempFileName,$datString,$line);
+    my @outFile =();
+    my(@fieldLength,@datArray);
+    $i=1;
+
+    @fieldLength=&getFieldLengths(\@inFile);
+    foreach $line (@inFile)   {    ## read through file array and get field lengths
+        unless ($line =~ /\S/)  {next;}    ## skip blank lines
+        chomp $line;
+        @datArray=&getRecord($line);
+        for ($i=0; $i <=$#datArray; $i++) {
+            $datArray[$i].=(" " x ($fieldLength[$i]+1-length("$datArray[$i]")));
+        }
+        $datString=join(',',@datArray);
+        push @outFile , "$datString\n";
+    }
+    @outFile;
+}
+
+sub createFile {
+    my ($fileName, $permission, $numgid) = @_;
+
+    open(TEMPCREATEFILE, ">$fileName") ||
+      warn " Can't open $fileName";
+    my @stat = stat TEMPCREATEFILE;
+    close(TEMPCREATEFILE);
+
+    ## if the owner of the file is running this script (e.g. when the file is first created)
+    ## set the permissions and group correctly
+    if ($< == $stat[4]) {
+        my $tmp = chmod($permission,$fileName) or
+          warn "Can't do chmod($permission, $fileName)";
+        chown(-1,$numgid,$fileName)  or
+          warn "Can't do chown($numgid, $fileName)";
+    }
+}
+
+sub getFieldLengths {
+
+    ## takes as a parameter the  reference to a delimited array
+    ## (such as you would get by reading in a delimited file)
+    ## where each element is a line from a delimited file.
+    ## returns an array which holds
+    ## the maximum field lengths in the file.
+
+    my ($datFileArray_ref)=@_;
+    my($i);
+    my(@datArray,@fieldLength,@datFileArray, $line);
+    @fieldLength=();
+    @datFileArray=@$datFileArray_ref;
+
+    foreach $line (@datFileArray)   {    ## read through file and get field lengths
+        unless ($line =~ /\S/)  {next;}  ## skip blank lines
+        chomp $line;
+        @datArray=&getRecord($line);
+        for ($i=0; $i <=$#datArray; $i++) {
+            $fieldLength[$i] = 0 unless defined $fieldLength[$i];
+            $fieldLength[$i]=&max(length("$datArray[$i]"),$fieldLength[$i]);
+        }
+    }
+    return (@fieldLength);
+}
+
+
+
+sub getRecord
+
+        #       Takes a delimited line as a parameter and returns an
+        #       array.  Note that all white space is removed.  If the
+        #       last field is empty, the last element of the returned
+        #       array is also empty (unlike what the perl split command
+        #       would return).  E.G. @lineArray=&getRecord(\$delimitedLine).
+        {
+    my $DELIM = ',';
+        my($line) = $_[0];
+        my(@lineArray);
+        $line.='A';                                     # add 'A' to end of line so that
+                                                        # last field is never empty
+        @lineArray = split(/\s*${DELIM}\s*/,$line);
+        $lineArray[$#lineArray] =~s/\s*A$//;            # remove spaces and the 'A' from last element
+        $lineArray[0] =~s/^\s*//;                       # remove white space from first element
+        @lineArray;
+        }
+sub max  {  ## find the max element of array
+    my $out = $_[0];
+    my $num;
+    foreach $num (@_) {
+        if ((defined $num) and ($num > $out)) {$out = $num;}
+    }
+    $out;
+}
diff --git a/bin/remove_stale_images b/bin/remove_stale_images
new file mode 100755
index 0000000000..bb2aac50f5
--- /dev/null
+++ b/bin/remove_stale_images
@@ -0,0 +1,287 @@
+#!/usr/bin/env perl
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/bin/remove_stale_images,v 1.7 2008/06/24 22:54:03 gage 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+=head1 NAME
+
+remove_stale_images - remove old dvipng images
+
+=head1 SYNOPSIS
+
+ remove_stale_images ARGUMENTS
+
+=head1 DESCRIPTION
+
+Remove old dvipng images.
+
+=head1 ARGUMENTS
+
+=over
+
+Arguments are optional.
+
+  --help         prints the usage message
+  --delete       delete selected images
+  --remove       same as --delete
+  --report       just report information about image dates
+
+  --days=E       final date for images considered is E days ago
+                   E can be a decimal.  E defaults to 7 days ago
+                   for deleting, and now for reporting
+  --access-dates use last-accessed date, the default
+  --modify-dates use last-modified date (probably the creation date)
+
+  --from=D       start deleting D days ago; D can be a decimal
+                   defaulting at the beginning of time
+
+
+You can also just specify E at the end of the command line.
+
+To get a status report on all of your images, use
+
+  remove_stale_images
+
+To remove all which have not been accessed in the past 10 days, use
+
+  remove_stale_images --delete --days=10
+
+=cut
+
+use strict;
+use warnings;
+use Getopt::Long;
+use Pod::Usage;
+use File::Find;
+use DBI;
+
+BEGIN {
+	die "WEBWORK_ROOT not found in environment.\n"
+		unless exists $ENV{WEBWORK_ROOT};
+}
+
+use lib "$ENV{WEBWORK_ROOT}/lib";
+use WeBWorK::CourseEnvironment;
+use WeBWorK::Utils qw(runtime_use readFile);
+
+use constant ACCESSED => 8;
+use constant MODIFIED => 9;
+
+my $now = time();
+my $which = ACCESSED;
+
+##### global variables to hold information from the find
+
+my $num_removed = 0;
+my %kept = ();
+my %days=();
+my %week=();
+my %depths=();
+my $grandtotal=0;
+my $depthConnection;
+
+##### get command-line options #####
+
+my $start = $now; # way too big, but definitely before the beginning of the epoch
+my $end = -1;
+my $help = 0;
+my $deloption = 0;
+my $reportoption = 0;
+my $modifydate = 0;
+my $accessdate = 0;
+
+GetOptions('from=s' => \$start,
+           'days=s' => \$end,
+	   'delete|remove' => \$deloption,
+	   'report' => \$reportoption,
+	   'modify-dates' => \$modifydate,
+	   'access-dates' => \$accessdate,
+           'help' => \$help) or pod2usage(1);
+
+pod2usage(1) if $help;
+
+$reportoption = 1 if(not $deloption);
+
+if($modifydate and $accessdate) {
+  print "You cannot specify using both access dates and modify dates\n";
+  pod2usage(1);
+}
+
+## now fix up type
+my $type = $accessdate ? ACCESSED : MODIFIED;
+
+if(scalar(@ARGV)>0) {
+  if(scalar(@ARGV)>1) {
+    print "Too many arguments given\n";
+    pod2usage(1);
+  }
+  $end = $ARGV[0];
+}
+
+$end = 7 if($end == -1 and $deloption);
+
+if($start<= $end) {
+  print "The start time must be greater than the end length\n";
+  exit();
+}
+## Fix up the start and end times
+
+$start = $now - 24*60*60*$start;
+$end = $now - 24*60*60*$end;
+
+##### "wanted" function for find #####
+
+sub wanted {
+  if(-f $File::Find::name and $File::Find::name =~ /\.png$/) {
+    my @stat = stat(_);
+
+    if($deloption) {
+      my $fullmd5 = $File::Find::name;
+      if(length($_) > (4+32)) { # this is an old style path
+	$fullmd5 = $_;
+	$fullmd5 =~ s/\.png$//;
+      } else {
+	$fullmd5 =~ s|.*/([^/]+)/([^/]+)$|$1$2|;
+	$fullmd5 =~ s/\.png$//;
+      }
+      if($stat[$type]<$start or $stat[$type]>$end) {
+	$kept{$fullmd5} = '';
+	if($depthConnection) { # hold dvipng depths
+		my $fetchdepth = $depthConnection->selectall_arrayref("
+			SELECT depth FROM depths WHERE md5=\"$fullmd5\"");
+		my $fetchdepthval = $fetchdepth->[0]->[0];
+		$depths{$fullmd5} = $fetchdepthval if($fetchdepthval);
+	}
+      } else {
+        my $result = unlink($File::Find::name);
+        if($result) {
+          $num_removed++;
+          return();
+        } else {
+          # If you don't have permissions to delete a file, you will probably
+          # mess up the permissions on the equation cache
+          die "Tried, but could not remove $File::Find::name\n";
+        }
+      }
+    }
+
+    if($reportoption) {
+      return() if(not $deloption and ($stat[$type]<$start or $stat[$type]>$end));
+      my $lapse = $now - $stat[$type];
+      my $val = int(($lapse)/(60*60*24));
+      $val = " ".$val if($val<10);
+      $val = " ".$val if($val<100);
+      if(defined($days{$val})) {$days{$val} += 1;} else {$days{$val} = 1;}
+      $val = int($val/7);
+      if(defined($week{$val})) {$week{$val} += 1;} else {$week{$val} = 1;}
+      $grandtotal++;
+    }
+
+  }
+}
+
+##### reporting function #####
+
+sub count_report {
+  my $j;
+  print "Days\n";
+  for $j (sort {$a <=> $b} keys(%days)) {
+    print "$j  $days{$j}\n";
+  }
+
+  print "\nWeeks\n";
+  for $j (sort {$a <=> $b} keys(%week)) {
+    print " $j  $week{$j}\n";
+  }
+
+  print "\nTotal: $grandtotal\n";
+}
+
+##### main function #####
+
+
+# bring up a minimal course environment
+my $ce = WeBWorK::CourseEnvironment->new({ webwork_dir => $ENV{WEBWORK_ROOT} });
+
+my $dirHead = $ce->{webworkDirs}->{equationCache};
+my $cachePath = $ce->{webworkFiles}->{equationCacheDB};
+my $tmpdir = $ce->{webworkDirs}->{tmp};
+my $tmpfile = "$tmpdir/equationcache.tmp";
+
+# Prepare to handle depths database table
+my $alignType = $ce->{pg}->{displayModeOptions}->{images}->{dvipng_align};
+if($alignType eq 'mysql' and $deloption) {
+	my $dbinfo = $ce->{pg}->{displayModeOptions}->{images}->{dvipng_depth_db};
+	$depthConnection = DBI->connect_cached(
+		$dbinfo->{dbsource},
+		$dbinfo->{user},
+		$dbinfo->{passwd},
+		{ PrintError => 0, RaiseError => 1 },
+	);
+	print "Could not make database connection for dvipng image depths.\n" unless defined $depthConnection;
+}
+
+find({wanted => \&wanted, follow_fast => 1}, $dirHead);
+
+print "Removed $num_removed images.\n\n" if($deloption);
+count_report() if($reportoption);
+
+
+# For depth database, empty it and insert only values for the images
+# we kept.
+my $ent;
+if($depthConnection) { # clean out database and put back in good values
+	$depthConnection->do("TRUNCATE depths");
+	for my $ent (keys %depths) {
+		$depthConnection->do("INSERT INTO `depths` VALUES(
+			\"$ent\", \"$depths{$ent}\")");
+	}
+}
+
+## The rest is updating the equation cache if we deleted images and there is a cache
+exit() unless($deloption and $num_removed);
+exit() unless ($cachePath); 
+print "Updating the equation cache\n";
+my ($perms, $uid, $groupID) = (stat $cachePath)[2,4,5]; #Get values from current cache file
+my $cachevalues = readFile($cachePath);
+my @cachelines = split "\n", $cachevalues;
+for $ent (@cachelines) {
+  chomp($ent);
+  my $entmd5 = $ent;
+  $entmd5 =~ s/^(\S+)\s+(\S+)\s+.*$/$1$2/;
+  if(defined($kept{$entmd5})) {
+    $kept{$entmd5} = $ent;
+  }
+}
+
+#print "Temp file $tmpfile\n";
+#print "Cache file had group $groupID and perms $perms\n";
+open(OUTF, ">$tmpfile") or die "Could not write to temp file $tmpfile";
+for $ent (keys %kept) {
+  if($kept{$ent}) {
+    print OUTF $kept{$ent}."\n";
+  } else {print "could not find $ent\n";}
+}
+close(OUTF);
+rename($tmpfile, $cachePath);
+# hopefully, either we are superuser and this works, or we are
+# the web server in which case it wasn't needed
+chmod $perms, $cachePath;
+chown $uid, $groupID, $cachePath;
+
+
+
+
+1;
diff --git a/bin/timing_log_check.pl b/bin/timing_log_check.pl
new file mode 100755
index 0000000000..2340876ec9
--- /dev/null
+++ b/bin/timing_log_check.pl
@@ -0,0 +1,108 @@
+#!/usr/bin/perl
+
+# This script reads the timing log and outputs timing information including
+# the number and per cent of accesses taking various amount of time.
+# It can give you a rough idea of how well your server id performing.
+# If you have a large timing log, it can tale awhile for the script to complete processing.
+
+# To run the script, cd to the WeBWorK logs directory (usually /opt/webwork/webwork2/logs)
+# and enter the command: timing_log_check.pl 
+
+# Note that this assumes perl is locates in /usr/bin/perl (check with the command "which perl")
+# and /opt/webwork/webwork2/bin/ is in your path.
+
+  open(PGFILE,'timing.log') || warn "Can't read timing.log: $!";
+  my @lines = <PGFILE>; close(PGFILE);
+
+  my $under0point1sec = 0;
+  my $under0point2sec = 0;
+  my $under0point5sec = 0;
+  my $under1sec = 0;
+  my $under2sec = 0;
+  my $under3sec = 0;
+  my $under4sec = 0;  
+  my $under5sec = 0;
+  my $under10sec = 0;
+  my $over10sec = 0;
+  my $nonvalid = 0;
+  my $line;
+  my $count = 0;
+  my $time = 0;
+  
+  foreach $line (@lines) {
+  	$count++;
+  	$line =~ /runTime = (\d+\.\d+) sec/;
+  	$time = $1;
+  	if ($time < 0.1){
+  		$under0point1sec++;
+  	}
+  	elsif ($time < 0.2){
+  		$under0point2sec++;
+  	}
+  	elsif ($time < 0.5){
+  		$under0point5sec++;
+  	}
+  	elsif ($time < 1.0){
+  		$under1sec++;
+  	}
+  	elsif ($time < 2.0){
+  		$under2sec++;
+  	}  	
+  	elsif ($time < 3.0){
+  		$under3sec++;
+  	}  	
+  	elsif ($time < 4.0){
+  		$under4sec++;
+  	}  	
+  	elsif ($time < 5.0){
+  		$under5sec++;
+  	}  	
+  	elsif ($time < 10.0){
+  		$under10sec++;
+  	}   	
+  	elsif ($time >= 10.0){
+  		$over10sec++;
+  	}  	
+  	else {
+      $nonvalid++;
+    }  
+  }
+  my $percent_under0point1sec = 0;
+  my $percent_under0point2sec = 0;
+  my $percent_under0point5sec = 0;
+  my $percent_under1sec = 0;
+  my $percent_under2sec = 0;
+  my $percent_under3sec = 0;
+  my $percent_under4sec = 0;  
+  my $percent_under5sec = 0;
+  my $percent_under10sec = 0;
+  my $percent_over10sec = 0;
+  my $percent_nonvalid = 0;  
+  
+  $percent_under0point1sec = (int($under0point1sec/$count*1000 +.5))/10;
+  $percent_under0point2sec = (int($under0point2sec/$count*1000 +.5))/10;
+  $percent_under0point5sec = (int($under0point5sec/$count*1000 +.5))/10;
+  $percent_under1sec = (int($under1sec/$count*1000 +.5))/10;
+  $percent_under2sec = (int($under2sec/$count*1000 +.5))/10;      
+  $percent_under3sec = (int($under3sec/$count*1000 +.5))/10;     
+  $percent_under4sec = (int($under4sec/$count*1000 +.5))/10;
+  $percent_under5sec = (int($under5sec/$count*1000 +.5))/10;
+  $percent_under10sec = (int($under10sec/$count*1000 +.5))/10;
+  $percent_over10sec = (int($over10sec/$count*1000 +.5))/10;
+  $percent_nonvalid = (int($nonvalid/$count*1000 +.5))/10;
+
+  
+  print "count = $count\n";
+  print "under 0.1 seconds = $under0point1sec: ${percent_under0point1sec}%\n";   	
+  print "between 0.1 and 0.2 seconds = $under0point2sec: ${percent_under0point2sec}%\n"; 
+  print "between 0.2 and 0.5 seconds = $under0point5sec: ${percent_under0point5sec}%\n";
+  print "between 0.5 and 1.0 seconds = $under1sec: ${percent_under1sec}%\n"; 
+  print "between 1.0 and 2.0 seconds = $under2sec: ${percent_under2sec}%\n";
+  print "between 2.0 and 3.0 seconds = $under3sec: ${percent_under3sec}%\n";
+  print "between 3.0 and 4.0 seconds = $under4sec: ${percent_under4sec}%\n";
+  print "between 4.0 and 5.0 seconds = $under5sec: ${percent_under5sec}%\n";
+  print "between 5.0 and 10.0 seconds = $under10sec: ${percent_under10sec}%\n";
+  print "over 10.0 seconds = $over10sec: ${percent_over10sec}%\n";
+  print "non valid response = $nonvalid: ${percent_nonvalid}%\n";
+
+exit(0);
\ No newline at end of file
diff --git a/bin/wwapache2ctl.dist b/bin/wwapache2ctl.dist
new file mode 100755
index 0000000000..53b561ff32
--- /dev/null
+++ b/bin/wwapache2ctl.dist
@@ -0,0 +1,110 @@
+#!/bin/sh
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/bin/wwapache2ctl.dist,v 1.3 2007/08/13 22:59:50 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+# This is a wrapper for the apachectl utility suitable for use when doing
+# development on the WeBWorK 2 system. This setup allows each developer to run
+# an independent Apache server under their own UID, using their own working copy
+# of the WeBWorK code.
+
+################################################################################
+# Configuration
+################################################################################
+
+# The path to the Apache binary
+HTTPD=/usr/local/apache2/bin/httpd
+
+# The path to your personal webwork2 directory
+WEBWORKROOT=$HOME/webwork2
+
+# If you're sharing files with systems being run by other users, uncomment this
+#umask 2
+
+# if you want to use SSL, uncomment this line
+#SSL=-DSSL
+
+# Change these only if you need to customize the locations
+PID=$WEBWORKROOT/logs/httpd2.pid
+CONFIG_GLOBAL=$WEBWORKROOT/conf/global.conf
+CONFIG_DATABASE=$WEBWORKROOT/conf/database.conf
+CONFIG_DEVEL=$WEBWORKROOT/conf/devel.apache2-config
+CONFIG_DEVEL_SITE=$WEBWORKROOT/conf/devel-site.apache2-config
+CONFIG_WEBWORK=$WEBWORKROOT/conf/webwork.apache2-config
+CONFIG_THISFILE=$WEBWORKROOT/bin/wwapache2ctl
+
+################################################################################
+# Implementation
+################################################################################
+
+usage() {
+	echo "$0 { start | stop | restart | graceful | configtest }"
+}
+
+checkpid() {
+	if [ ! -e $PID ]; then
+		echo "$PID: not found. (Perhaps the server is not running?)"
+		exit
+	fi
+}
+
+checknopid() {
+	if [ -e $PID ]; then
+		echo "$PID: exists. (Perhaps the server is already running?)"
+		exit
+	fi
+}
+
+checkconfs() {
+	for conf in "$@"; do
+		checkconf "$conf"
+	done
+}
+
+checkconf() {
+	if [ $1.dist -nt $1 ]; then
+		echo "WARNING: "`basename $1.dist`" is newer than "`basename $1`": UPDATE "`basename $1`"!"
+	fi
+}
+
+case $1 in
+	start)
+		checknopid
+		checkconfs "$CONFIG_GLOBAL" "$CONFIG_DATABASE" "$CONFIG_DEVEL" "$CONFIG_DEVEL_SITE" "$CONFIG_WEBWORK" "$CONFIG_THISFILE"
+		mkdir -pv "$WEBWORKROOT"/run # hack for httpd.mm
+		"$HTTPD" $SSL -d "$WEBWORKROOT" -f "$CONFIG_DEVEL"
+		;;
+	stop)
+		checkpid
+		kill -TERM `cat "$PID"`
+		rm -f "$PID"
+		;;
+	restart)
+		checkpid
+		checkconfs "$CONFIG_GLOBAL" "$CONFIG_DATABASE" "$CONFIG_DEVEL" "$CONFIG_DEVEL_SITE" "$CONFIG_WEBWORK" "$CONFIG_THISFILE"
+		kill -HUP `cat "$PID"`
+		;;
+	graceful)
+		checkpid
+		checkconfs "$CONFIG_GLOBAL" "$CONFIG_DATABASE" "$CONFIG_DEVEL" "$CONFIG_DEVEL_SITE" "$CONFIG_WEBWORK" "$CONFIG_THISFILE"
+		kill -USR1 `cat "$PID"`
+		;;
+	configtest)
+		"$HTTPD" $SSL -d "$WEBWORKROOT" -f "$CONFIG_DEVEL" -t
+		;;
+	*)
+		usage
+		;;
+esac
diff --git a/bin/wwapachectl.dist b/bin/wwapachectl.dist
index a955a35906..9175ba6a8d 100755
--- a/bin/wwapachectl.dist
+++ b/bin/wwapachectl.dist
@@ -1,8 +1,8 @@
 #!/bin/sh
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/bin/wwapachectl.dist,v 1.17 2006/05/31 18:25:18 sh002i 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
@@ -15,12 +15,39 @@
 # Artistic License for more details.
 ################################################################################
 
-# Set the following values to correspond to your local configuration
+# This is a wrapper for the apachectl utility suitable for use when doing
+# development on the WeBWorK 2 system. This setup allows each developer to run
+# an independent Apache server under their own UID, using their own working copy
+# of the WeBWorK code.
+
+################################################################################
+# Configuration
+################################################################################
+
+# The path to the Apache binary
 HTTPD=/usr/local/sbin/httpd
-WEBWORKROOT=/home/yourname/webwork-modperl
 
-CONFIG=$WEBWORKROOT/conf/httpd-wwmp.conf
+# The path to your personal webwork2 directory
+WEBWORKROOT=$HOME/webwork2
+
+# If you're sharing files with systems being run by other users, uncomment this
+#umask 2
+
+# if you want to use SSL, uncomment this line
+#SSL=-DSSL
+
+# Change these only if you need to customize the locations
 PID=$WEBWORKROOT/logs/httpd.pid
+CONFIG_GLOBAL=$WEBWORKROOT/conf/global.conf
+CONFIG_DATABASE=$WEBWORKROOT/conf/database.conf
+CONFIG_DEVEL=$WEBWORKROOT/conf/devel.apache-config
+CONFIG_DEVEL_SITE=$WEBWORKROOT/conf/devel-site.apache-config
+CONFIG_WEBWORK=$WEBWORKROOT/conf/webwork.apache-config
+CONFIG_THISFILE=$WEBWORKROOT/bin/wwapachectl
+
+################################################################################
+# Implementation
+################################################################################
 
 usage() {
 	echo "$0 { start | stop | restart | graceful | configtest }"
@@ -40,25 +67,41 @@ checknopid() {
 	fi
 }
 
+checkconfs() {
+	for conf in "$@"; do
+		checkconf "$conf"
+	done
+}
+
+checkconf() {
+	if [ $1.dist -nt $1 ]; then
+		echo "WARNING: "`basename $1.dist`" is newer than "`basename $1`": UPDATE "`basename $1`"!"
+	fi
+}
+
 case $1 in
 	start)
 		checknopid
-		"${HTTPD}" -f "${CONFIG}"
+		checkconfs "$CONFIG_GLOBAL" "$CONFIG_DATABASE" "$CONFIG_DEVEL" "$CONFIG_DEVEL_SITE" "$CONFIG_WEBWORK" "$CONFIG_THISFILE"
+		mkdir -pv "$WEBWORKROOT"/run # hack for httpd.mm
+		"$HTTPD" -f "$CONFIG_DEVEL" -d "$WEBWORKROOT" "$SSL"
 		;;
 	stop)
 		checkpid
-		kill -TERM `cat "${PID}"`
+		kill -TERM `cat "$PID"`
 		;;
 	restart)
 		checkpid
-		kill -HUP `cat "${PID}"`
+		checkconfs "$CONFIG_GLOBAL" "$CONFIG_DATABASE" "$CONFIG_DEVEL" "$CONFIG_DEVEL_SITE" "$CONFIG_WEBWORK" "$CONFIG_THISFILE"
+		kill -HUP `cat "$PID"`
 		;;
 	graceful)
 		checkpid
-		kill -USR1 `cat "${PID}"`
+		checkconfs "$CONFIG_GLOBAL" "$CONFIG_DATABASE" "$CONFIG_DEVEL" "$CONFIG_DEVEL_SITE" "$CONFIG_WEBWORK" "$CONFIG_THISFILE"
+		kill -USR1 `cat "$PID"`
 		;;
 	configtest)
-		"${HTTPD}" -t -f "${CONFIG}"
+		"$HTTPD" -t -f "$CONFIG_DEVEL" -d "$WEBWORKROOT" "$SSL"
 		;;
 	*)
 		usage
diff --git a/bin/wwdb b/bin/wwdb
index 45485f318c..834fadf86d 100755
--- a/bin/wwdb
+++ b/bin/wwdb
@@ -1,8 +1,8 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/bin/wwdb,v 1.13 2006/01/25 23:13:45 sh002i 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
@@ -17,109 +17,111 @@
 
 =head1 NAME
 
-wwdb - command-line interface to the WeBWorK databases (WWDBv2).
+wwdb - export and import webwork databases.
+
+=head1 SYNOPSIS
+
+ wwdb [-f] course { import | export } file [table ...]
+
+=head1 DESCRIPTION
+
+Exports data from a course database to an XML file, or imports data from an XML
+file to a course database. Optionally restrict which tables are imported or
+exported and specify a duplicate policy.
+
+=head1 OPTIONS
+
+=over
+
+=item -f
+
+Overwite duplicate records.
+
+=item course
+
+Course to use for import or export.
+
+=item { import | export }
+
+Specify action -- export or import data.
+
+=item file
+
+XML file to write to (in the case of export) or read from (in the case of
+import).
+
+=item [table ...]
+
+If specified, only the listed tables will be imported or exported.
+
+=back
 
 =cut
 
 use strict;
 use warnings;
-use FindBin;
-use lib "$FindBin::Bin/../lib";
-use WeBWorK::ContentGenerator; # for cook_args
+use Getopt::Std;
+
+BEGIN {
+	die "WEBWORK_ROOT not found in environment.\n"
+		unless exists $ENV{WEBWORK_ROOT};
+}
+
+use lib "$ENV{WEBWORK_ROOT}/lib";
 use WeBWorK::CourseEnvironment;
 use WeBWorK::DB;
+use WeBWorK::Utils::DBImportExport qw/listTables dbExport dbImport/;
 
-# Command line syntax
-# 
-# wwdb course command [ argument ... ]
-# 
-# Commands correspond to the functions of WeBWorK::DB. Arguments are either
-# strings or records. To represent records, use the following syntax:
-# 
-#         {id="sh002i" first_name="Sam" last_name="Hathaway"}
-# 
-# You'll have to protect arguments like this from your shell by enclosing them
-# in single quotes.
-# 
-# The special string \undef represents an undefined value. You'll have to
-# protect this from your shell as well. Use \\undef or '\undef'.
-
-sub main(@) {
-	my ($course, $command, @arguments) = @_;
-	
-	unless ($course and $command) {
-		die "usage: $0 course command [arguments ...]\n";
-	}
-	
-	my $ce = WeBWorK::CourseEnvironment->new($ENV{WEBWORK_ROOT}, "", "", $course);
-	my $db = WeBWorK::DB->new($ce);
-	
-	if ($command eq "dumpDB") {
-		print $db->$command("set_user");
-		exit;
-	}
-	
-	die "$command: unsupported command.\n"
-		unless $db->can($command);
-	
-	my ($verb, $noun) = $command =~ m/^(list|add|get|put|delete)(.*?)s?$/;
-	
-	my $type = "WeBWorK::DB::Record::";
-	if ($noun =~ m/^Global(User)?(Set|Problem)$/) {
-		$type .= "$1$2";
-	} else {
-		$type .= $noun;
-	}
-	
-	foreach (@arguments) {
-		if (m/^\\undef$/) {
-			$_ = undef;
-		} elsif (m/^{(.*)}$/) {
-			$_ = string2record($type, $1);
-		}
-	}
-	
-	my @result = $db->$command(@arguments);
-	
-	if ($verb eq "list") {
-		print join("\n", @result), "\n";
-	} elsif ($verb eq "add") {
-		print "result: $result[0]\n";
-	} elsif ($verb eq "get") {
-		if (defined $result[0]) {
-			print "{", record2string($result[0]), "}\n";
-		} else {
-			print join("/", @arguments), ": record not found\n";
-		}
-	} elsif ($verb eq "put") {
-		print "result: $result[0]\n";
-	} elsif ($verb eq "delete") {
-		print "result: $result[0]\n";
-	}
+sub usage {
+	print STDERR "usage: $0 [-f] course { import | export } file [table ...]\n";
+	print STDERR "tables: ", join(" ", listTables()), "\n";
+	exit 1;
 }
 
-sub string2record($$) {
-	my ($type, $string) = @_;
-	my %hash = WeBWorK::ContentGenerator::cook_args($string);
-	my $record = $type->new(%hash);
-	return $record;
-}
+our $opt_f;
+getopts("f");
+
+my ($course, $command, $file, @tables) = @ARGV;
+
+usage() unless $course and $command and $file;
+
+my $ce = WeBWorK::CourseEnvironment->new({
+	webwork_dir => $ENV{WEBWORK_ROOT},
+	courseName => $course,
+});
 
-sub record2string($) {
-	my ($record) = @_;
-	my $string;
-	foreach my $key ($record->FIELDS()) {
-		my $value = $record->$key();
-		if (defined $value) {
-			$value =~ s/"/\\"/g;
-			$value = "\"$value\"";
-		} else {
-			$value = "NULL";
-		}
-		$string .= "$key=$value ";
+my $db = WeBWorK::DB->new($ce->{dbLayout});
+
+my @errors;
+
+if ($command eq "export") {
+	my $fh;
+	if ($file eq "-") {
+		$fh = *STDOUT;
+	} else {
+		open $fh, ">", $file or die "failed to open file '$file' for writing: $!\n";
 	}
-	chop $string;
-	return $string;
+	@errors = dbExport(
+		db => $db,
+		xml => $fh,
+		tables => \@tables,
+	);
+	close $fh;
+} elsif ($command eq "import") {
+	my $conflict = ($opt_f ? "replace" : "skip");
+	open my $fh, "<", $file or die "failed to open file '$file' for writing: $!\n";
+	@errors = dbImport(
+		db => $db,
+		xml => $fh,
+		tables => \@tables,
+		conflict => $conflict,
+	);
+	close $fh;
+} else {
+	die "$command: unrecognized command.\n";
 }
 
-main(@ARGV);
+if (@errors) {
+	warn "The following errors occured:\n", map { "* $_\n" } @errors;
+	exit 1;
+}
diff --git a/bin/wwsh b/bin/wwsh
index aa1352625f..2afdcf2159 100755
--- a/bin/wwsh
+++ b/bin/wwsh
@@ -1,8 +1,8 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl -d
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/bin/wwsh,v 1.10 2006/05/31 01:07:25 gage 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
@@ -21,45 +21,38 @@ wwdb - command-line interface to the WeBWorK libraries.
 
 =cut
 
-use strict;
-use warnings;
-use FindBin;
-use lib "$FindBin::Bin";
-use PSH;
-use lib "$FindBin::Bin/../lib";
-use WeBWorK::CourseEnvironment;
-use WeBWorK::DB;
+use Data::Dumper;
 
-sub main(@) {
-	my ($course, $cmd) = @_;
-	
+BEGIN {
+	DB::parse_options("NonStop=1");
 	unless ($ENV{WEBWORK_ROOT}) {
 		die "WEBWORK_ROOT not found in environment.\n";
 	}
-	
-	unless ($course) {
-		die "usage: $0 course\n";
-	}
-	
-	our $ce = WeBWorK::CourseEnvironment->new($ENV{WEBWORK_ROOT}, "", "", $course);
-	our $db = WeBWorK::DB->new($ce);
-	(undef) = $db; # placate warnings
-	
-	if ($cmd) {
-		no warnings;
-		no strict;
-		eval $cmd;
-		die $@ if $@;
-		use strict;
-		use warnings;
-	} else {
-		print <<'EOF';
+}
+
+use lib "$ENV{WEBWORK_ROOT}/lib";
+use WeBWorK::CourseEnvironment;
+use WeBWorK::DB;
+
+our $ce;
+our $db;
+
+my $courseID = shift @ARGV;
+unless ($courseID) {
+	die "usage: $0 courseID\n";
+}
+
+$ce = WeBWorK::CourseEnvironment->new({
+	webwork_dir => $ENV{WEBWORK_ROOT},
+	courseName => $courseID,
+});
+$db = WeBWorK::DB->new($ce->{dbLayout});
+
+print <<'EOF';
 wwsh - The WeBWorK Shell
 Available objects: $ce (WeBWorK::CourseEnvironment)
                    $db (WeBWorK::DB)
+Available modules: Data::Dumper
 EOF
-		PSH::prompt();
-	}
-}
 
-main(@ARGV);
+DB::parse_options("NonStop=0");
diff --git a/clients/README b/clients/README
new file mode 100644
index 0000000000..9c490b7bdc
--- /dev/null
+++ b/clients/README
@@ -0,0 +1,73 @@
+2010.05.11
+
+At this point renderProblem.pl is the most up to date and works with BBedit to 
+to send a local file to an xmlserver (mod_xmlrpc) to be rendered.  In addition the returned'
+file's question form action url is pointed to the same server with the path ending in xml2html.
+This allows one to enter answers and test whether they work.  
+
+There were changes to webwork2/lib/WebworkWebservice.pm to make it work with Apache2.  
+There were also changes to webwork2/lib/WeBWorK/URLpath.pm  and a new 
+module webwork2/lib/WeBWorK/ContentGenerator/xmlViaHTTP.pm
+
+The webwork_xmplrp_client and webwork_soap_client.pl have not been updated, but may still work.
+
+to do:
+    •add facilities for inspecting libraries via xmlrpc and html2xml links
+    •figure out how to automate the configuration of these xmlrpc files
+         Apache2::ServerUtil should do this??  but I can't figure out how.
+    •I suspect that auxiliary html files and applets don't work yet.
+    
+    I'm pretty sure that there is no security checking to insure that only appropriate 
+    people have access to the xmlrpc webservice.
+##############################################################################################
+
+
+These test clients will process these two commands:
+
+./webwork_xmlrpc_client.pl renderProblem  input.txt >foo.txt
+./webwork_xmlrpc_client.pl listLibraries
+or
+
+./webwork_soap_client.pl renderProblem  input.txt >foo.txt
+./webwork_soap_client.pl listLibraries
+
+
+You may need to adjust some hardwired parameters in the scripts so that
+you are pointed at the correct servers. :-)
+
+The scripts hello_world_xmlrpc.pl and hello_world_soap.pl  take no arguments
+and can be used to test the connection with the chosen servers.
+
+The scripts renderProblem.pl and renderProblem_rawoutput.pl are versions of the 
+xmlrpc_xmlrp_client which can be used as filters.  The were designed to be used with
+bbedit (Mac editor) to send a PG problem file of to a webservice to be rendered.
+
+The renderProblem_rawoutput version decodes the xml response and prints it as perl structures
+through "less".
+
+The renderProblem.pl pipes the HTML part of the response through safari (other browsers could
+be used) for viewing. This is usually what is wanted for testing.  Currently the error recovery
+is minimal, so error messages sent from the server may totally confuse the client (which
+will probably report a bad result type). The resulting web page is live and pointed
+to a responder at webhost.math.rochester.edu.  When that server is working you can
+actually submit an answer and have it evaluated.  It's a very old, tired PC running 
+Frontier as a server, so be patient with it. :-)
+
+
+checkProblem.pl will take a problem source, send it to the webserver for checking
+and record the result in a log file.  It is very similar to renderProblem.pl.
+
+check_problems_in_dir.sh will apply checkProblem.pl to all .pg problems found
+underneath the current directory in which the command is executed.  I've used
+it to check  all the problems in a directory for warning errors.  There are more
+subtle checks that could be made, such as checking to see that correct
+answers work. 
+
+Typically one downloads a problem library from the SVN 
+and then uses check_problems_in_dir.sh to walk through it.  By modifying
+checkProblems and webwork_xmlrpc_inc.pl one could have the HTML version
+of each problem dumped to a text file, or by changing the DISPLAYMODE to 
+"tex" instead of image one could dump the TeX version of each file.
+
+
+-- Mike Gage 1/1/2007
diff --git a/clients/bad_input.txt b/clients/bad_input.txt
new file mode 100644
index 0000000000..bf7d8d8d1e
--- /dev/null
+++ b/clients/bad_input.txt
@@ -0,0 +1,108 @@
+##DESCRIPTION
+##  A very simple first problem
+##ENDDESCRIPTION
+##KEYWORDS('algebra')
+DOCUMENT();        # This should be the first executable line in the problem.
+loadMacros(
+"PG.pl",
+"PGbasicmacros.pl",
+"PGchoicemacros.pl",
+"PGanswermacros.pl",
+"PGauxiliaryFunctions.pl"
+);
+
+TEXT(&beginproblem);
+$showPartialCorrectAnswers = 1;
+$a = random(-10,-1,1);
+$b = random(1,11,1);
+$c = random(1,11,1);
+$d = random(1,11,1);
+
+
+=123;
+
+#warn "foobar";
+
+#DEBUG_MESSAGE("this is a debuggin message.");
+
+#WARN_MESSAGE("this is a warning message.");
+
+BEGIN_TEXT
+$PAR
+displayMode  is $displayMode $BR
+$PAR
+This problem demonstrates how you enter numerical answers into WeBWorK. $PAR
+Evaluate the expression \(3($a )($b -$c -2($d ))\):
+
+ \{ ans_rule(10) \}
+
+$BR
+END_TEXT
+$ans = 3*($a)*($b-$c-2*($d));
+
+&ANS(strict_num_cmp($ans));
+
+BEGIN_TEXT
+
+In the case above you need to enter a number, since we're testing whether you can multiply
+out these numbers. (You can use a calculator if you want.) 
+$PAR
+For most problems, you will be able to get WeBWorK to
+do some of the work for you.  For example
+$BR
+Calculate ($a) * ($b): \{ ans_rule()\}
+$BR
+END_TEXT
+$ans = $a*$b;
+
+&ANS(std_num_cmp($ans));
+
+BEGIN_TEXT
+The asterisk is what most computers use to denote multiplication and you can use this with WeBWorK. 
+But WeBWorK will also allow use to use  a space to denote multiplication.
+You can either \($a * $b\) or \{$a*$b\} or even \($a \ $b\).  All will work. Try them.  
+$PAR
+Now try calculating the sine of 45 degrees ( that's sine of pi over 4 in radians
+and numerically sin(pi/4) equals \{1/sqrt(2)\} or, more precisely,  \(1/\sqrt{2} \) ).  
+You can enter this as  sin(pi/4) , as 
+sin(3.1415926/4), as 1/sqrt(2), as 2**(-.5), etc. This is because WeBWorK knows about 
+functions like sin  and sqrt (square root). (Note: exponents
+can be indicated by either a "caret" or **). Try it.$BR  \( \sin(\pi/4) = \) \{ ans_rule(20) \}$PAR
+ Here's the 
+\{
+htmlLink(qq!http://webwork.math.rochester.edu/webwork_system_html/docs/docs/pglanguage/availablefunctions.html!,"list 
+of the functions") \}
+ which WeBWorK understands.   WeBWorK ALWAYS uses radian mode for trig functions. 
+ $PAR
+END_TEXT
+
+&ANS( std_num_cmp(sin(3.1415926/4)) );
+BEGIN_TEXT
+You can also use juxtaposition to denote multiplication. E.g. enter \( 2\sin(3\pi/2) \).
+You can enter this as 2*sin(3*pi/2) or more simply as 2sin(3pi/2).  Try it: $BR 
+\{ ans_rule(20) \}$PAR
+
+END_TEXT
+
+$pi = 4*atan(1);
+&ANS( std_num_cmp(2*sin(3*$pi/2)) );
+
+BEGIN_TEXT
+Sometimes you need to use ( )'s to make your meaning clear. E.g. 1/2+3 is 3.5, but  1/(2+3) is .2 Why?
+Try entering both and use the ${LQ}Preview${RQ} button below to see the difference.  In addition to
+( )'s, you can also use [ ]'s and $LB ${RB}'s.  $BR
+\{ ans_rule(20) \}$PAR
+END_TEXT
+
+&ANS( std_num_cmp(.2));
+
+BEGIN_TEXT
+You can always try to enter answers and let WeBWorK do the calculating. 
+WeBWorK will tell you if the problem requires a strict numerical answer. 
+The way we use WeBWorK in this class there is no penalty for getting an answer wrong.  What counts
+is that you get the answer right eventually (before the due date).  For complicated answers,
+you should use the ${LQ}Preview${RQ} button to check for syntax errors and also to check that the answer
+you enter is really what you think it is.
+END_TEXT
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/clients/checkProblem.pl b/clients/checkProblem.pl
new file mode 100755
index 0000000000..5a60b6cee6
--- /dev/null
+++ b/clients/checkProblem.pl
@@ -0,0 +1,577 @@
+#!/usr/bin/perl -w
+
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/clients/renderProblem.pl,v 1.4 2010/05/11 15:44:05 gage 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+=head1 NAME
+
+webwork2/clients/renderProblem.pl
+
+This script will take a file and send it to a WeBWorK daemon webservice
+to have it rendered.  The result is split into the basic HTML rendering
+and evaluation of answers and then passed to a browser for printing.
+
+The formatting allows the browser presentation to be interactive with the 
+daemon running the script webwork2/lib/renderViaXMLRPC.pm
+
+Rembember to configure the local output file and display command !!!!!!!!
+
+=cut
+
+use strict;
+use warnings;
+
+
+
+##################################################
+#  configuration section for client
+##################################################
+
+# Use address to WeBWorK code library where WebworkClient.pm is located.
+use lib '/opt/webwork/webwork2/lib';
+#use Crypt::SSLeay;  # needed for https
+use WebworkClient;
+
+
+#############################################
+# Configure
+#############################################
+
+ ############################################################
+# configure the local output file and display command !!!!!!!!
+ ############################################################
+ 
+use constant LOG_FILE => '/opt/webwork/libraries/t/bad_problems.txt';
+
+use constant DISPLAYMODE   => 'images'; #  jsMath  is another possibilities.
+
+ # Path to a temporary file for storing the output of renderProblem.pl
+# use constant  TEMPOUTPUTFILE   => '/Users/gage/Desktop/renderProblemOutput.html'; 
+ 
+ # Command line for displaying the temporary file in a browser.
+ #use constant  DISPLAY_COMMAND  => 'open -a firefox ';   #browser opens tempoutputfile above
+ # use constant  DISPLAY_COMMAND  => "open -a 'Google Chrome' ";
+   use constant DISPLAY_COMMAND => " less ";   # display tempoutputfile with less
+ ############################################################
+ 
+ my $use_site;
+ $use_site = 'test_webwork';    # select a rendering site 
+ #$use_site = 'local';           # select a rendering site 
+ #$use_site = 'rochester_test';  # select a rendering site 
+ 
+ 
+ ############################################################
+ 
+# To configure the target webwork server
+# two URLs are required
+# 1. $XML_URL   http://test.webwork.maa.org/mod_xmlrpc
+#    points to the Webservice.pm and Webservice/RenderProblem modules
+#    Is used by the client to send the original XML request to the webservice
+#
+# 2. $FORM_ACTION_URL      http:http://test.webwork.maa.org/webwork2/html2xml
+#    points to the renderViaXMLRPC.pm module.
+#
+#     This url is placed as form action url when the rendered HTML from the original
+#     request is returned to the client from Webservice/RenderProblem. The client
+#     reorganizes the XML it receives into an HTML page (with a WeBWorK form) and 
+#     pipes it through a local browser.
+#
+#     The browser uses this url to resubmit the problem (with answers) via the standard
+#     HTML webform used by WeBWorK to the renderViaXMLRPC.pm handler.  
+#
+#     This renderViaXMLRPC.pm handler acts as an intermediary between the browser 
+#     and the webservice.  It interprets the HTML form sent by the browser, 
+#     rewrites the form data in XML format, submits it to the WebworkWebservice.pm 
+#     which processes it and sends the the resulting HTML back to renderViaXMLRPC.pm
+#     which in turn passes it back to the browser.
+# 3.  The second time a problem is submitted renderViaXMLRPC.pm receives the WeBWorK form 
+#     submitted directly by the browser.  
+#     The renderViaXMLRPC.pm translates the WeBWorK form, has it processes by the webservice
+#     and returns the result to the browser. 
+#     The The client renderProblem.pl script is no longer involved.
+# 4.  Summary: renderProblem.pl is only involved in the first round trip
+#     of the submitted problem.  After that the communication is  between the browser and
+#     renderViaXMLRPC using HTML forms and between renderViaXMLRPC and the WebworkWebservice.pm
+#     module using XML_RPC.
+# 5.  The XML_PASSWORD is defined on the site.  In future versions a more secure password method
+#     may be implemented.  This is sufficient to keep out robots.
+# 6.  The course "daemon_course" must be a course that has been created on the server or an error will
+#     result. A different name can be used but the course must exist on the server.
+
+
+our ( $XML_URL,$FORM_ACTION_URL, $XML_PASSWORD, $XML_COURSE);
+if ($use_site eq 'local') {
+# the rest can work!!
+	$XML_URL      =  'http://localhost:80';
+	$FORM_ACTION_URL  =  'http://localhost:80/webwork2/html2xml';
+	$XML_PASSWORD     =  'xmlwebwork';
+	$XML_COURSE       =  'daemon_course';
+} elsif ($use_site eq 'rochester_test') {  
+	
+	$XML_URL      =  'http://128.151.231.2';
+	$FORM_ACTION_URL  =  'http://128.151.231.2/webwork2/html2xml';
+ 	$XML_PASSWORD     = 'xmlwebwork';
+ 	$XML_COURSE       = 'daemon_course';
+	
+} elsif ($use_site eq 'test_webwork') {
+
+	$XML_URL      =  'https://test.webwork.maa.org';
+	$FORM_ACTION_URL  =  'https://test.webwork.maa.org/webwork2/html2xml';
+	$XML_PASSWORD     = 'xmlwebwork';
+	$XML_COURSE       = 'daemon_course';
+
+}
+
+##################################################
+#  END configuration section for client
+##################################################
+
+
+
+
+our @COMMANDS = qw( listLibraries    renderProblem  ); #listLib  readFile tex2pdf 
+
+
+##################################################
+# end configuration section
+##################################################
+
+
+
+our $xmlrpc_client = new WebworkClient;
+
+##################################################
+# input/output section
+##################################################
+
+
+$xmlrpc_client->url($XML_URL);
+$xmlrpc_client->{form_action_url}= $FORM_ACTION_URL;
+$xmlrpc_client->{displayMode}   = DISPLAYMODE();
+$xmlrpc_client->{user}          = 'xmluser';
+$xmlrpc_client->{password}      = $XML_PASSWORD;
+$xmlrpc_client->{course}        = $XML_COURSE;
+
+our $source = '';
+our $output;
+our $return_string;
+if (@ARGV) {
+	local(*FH);
+	open(FH, ">>".LOG_FILE()) || die "Can't open log file ". LOG_FILE();
+	$source = (defined $ARGV[0]) ? `cat $ARGV[0]` : '' ;
+    $xmlrpc_client->encodeSource($source);
+	if ( $xmlrpc_client->xmlrpcCall('renderProblem') )    {
+	        $output = $xmlrpc_client->{output};
+		if (defined($output->{flags}->{error_flag}) and $output->{flags}->{error_flag} ) {
+			$return_string = "0\t $ARGV[0] has errors\n";
+		} elsif (defined($output->{errors}) and $output->{errors} ){
+			$return_string = "0\t $ARGV[0] has syntax errors\n";
+		} else {
+			# 
+			if (defined($output->{flags}->{DEBUG_messages}) ) {
+				my @debug_messages = @{$output->{flags}->{DEBUG_messages}};
+				$return_string .= (pop @debug_messages ) ||'' ; #avoid error if array was empty
+				if (@debug_messages) {
+					$return_string .= join(" ", @debug_messages);
+		} else {
+					$return_string = "";
+		}
+			}
+			if (defined($output->{flags}->{WARNING_messages}) ) {
+				my @warning_messages = @{$output->{flags}->{WARNING_messages}};
+				$return_string .= (pop @warning_messages)||''; #avoid error if array was empty
+					$@=undef;
+				if (@warning_messages) {
+					$return_string .= join(" ", @warning_messages);
+	} else {
+					$return_string = "";
+				}
+	}
+			$return_string = "0\t ".$return_string."\n" if $return_string;   # add a 0 if there was an warning or debug message.
+		}
+		unless ($return_string) {
+			$return_string = "1\t $ARGV[0] is ok\n";
+		}
+	} else {
+		
+		$return_string = "0\t $ARGV[0] has undetermined errors -- could not be read perhaps?\n";
+	}
+	print FH $return_string;
+	close(FH);
+} else {
+    print "0 $ARGV[0]  something went wrong -- could not render file\n";
+	print STDERR "Useage: ./checkProblem.pl    [file_name]\n";
+	print STDERR "For example: ./checkProblem.pl    input.txt\n";
+	print STDERR "Output is sent to the log file: ",LOG_FILE();
+	
+}
+
+
+##################################################
+# XMLRPC client -- 
+# the code below is identical between renderProblem.pl and renderViaXMLRPC.pm????
+# and has been included in WebworkClient.pm
+##################################################
+
+# package WeBWorK::ContentGenerator::renderViaXMLRPC_client;
+# 
+# use Crypt::SSLeay;  # needed for https
+# use XMLRPC::Lite;
+# use MIME::Base64 qw( encode_base64 decode_base64);
+# 
+# use constant  TRANSPORT_METHOD => 'XMLRPC::Lite';
+# use constant  REQUEST_CLASS    => 'WebworkXMLRPC';  # WebworkXMLRPC is used for soap also!!
+# use constant  REQUEST_URI      => 'mod_xmlrpc';
+# 
+# sub new {
+# 	my $self = {
+# 		output   		=> '',
+# 		encodedSource 	=> '',
+# 		url             => '',
+# 		password        => '',
+# 		course          => '',
+# 		displayMode     => '',
+# 		inputs_ref      => {		 AnSwEr0001 => '',
+# 				 					 AnSwEr0002 => '',
+# 				 					 AnSwEr0003 => '',
+# 		},
+# 	};
+# 
+# 	bless $self;
+# }
+# 
+# 
+# our $result;
+# 
+# ##################################################
+# # Utilities -- 
+# #    this code is identical between renderProblem.pl and renderViaXMLRPC.pm
+# ##################################################
+# 
+# sub xmlrpcCall {
+# 	my $self        = shift;
+# 	my $command     = shift;
+# 	$command        = 'listLibraries' unless $command;
+# 
+# 	  my $requestResult = TRANSPORT_METHOD
+# 			-> proxy($self->{url}.'/'.REQUEST_URI);
+#      
+# 	  my $input = $self->setInputTable();
+# 	  local( $result);
+# 	  # use eval to catch errors
+# 	  eval { $result = $requestResult->call(REQUEST_CLASS.'.'.$command,$input) };
+# 	  if ($@) {
+# 	  	print STDERR "There were a lot of errors for $command\n" ;
+# 	  	print STDERR "Errors: \n $@\n End Errors\n" ;
+# 	  	return 0 #failure
+# 	  }
+# 	  	  
+# 	  unless (ref($result) and $result->fault) {    	
+# 	  	my $rh_result = $result->result();
+# 	    #print STDERR pretty_print_rh($rh_result);
+# 		$self->{output} = $rh_result; #$self->formatRenderedProblem($rh_result);
+# 		return 1; # success
+# 
+# 	  } else {
+# 		$self->{output} = 'Error from server: '. join( ",\n ",
+# 		  $result->faultcode,
+# 		  $result->faultstring);
+# 		return 0; #failure
+# 	  }
+# }
+#   
+# sub encodeSource {
+# 	my $self = shift;
+# 	my $source = shift;
+# 	$self->{encodedSource} =encode_base64($source);
+# }
+# sub url {
+# 	my $self = shift;
+# 	my $new_url = shift;
+# 	$self->{url} = $new_url if defined($new_url) and $new_url =~ /\S/;
+# 	$self->{url};
+# }
+# sub pretty_print {    # provides html output -- NOT a method
+#     my $r_input = shift;
+#     my $level = shift;
+#     $level = 4 unless defined($level);
+#     $level--;
+#     return '' unless $level > 0;  # only print three levels of hashes (safety feature)
+#     my $out = '';
+#     if ( not ref($r_input) ) {
+#     	$out = $r_input if defined $r_input;    # not a reference
+#     	$out =~ s/</&lt;/g  ;  # protect for HTML output
+#     } elsif ("$r_input" =~/hash/i) {  # this will pick up objects whose '$self' is hash and so works better than ref($r_iput).
+# 	    local($^W) = 0;
+# 	    
+# 		$out .= "$r_input " ."<TABLE border = \"2\" cellpadding = \"3\" BGCOLOR = \"#FFFFFF\">";
+# 		
+# 		
+# 		foreach my $key ( sort ( keys %$r_input )) {
+# 			$out .= "<tr><TD> $key</TD><TD>=&gt;</td><td>&nbsp;".pretty_print($r_input->{$key}) . "</td></tr>";
+# 		}
+# 		$out .="</table>";
+# 	} elsif (ref($r_input) eq 'ARRAY' ) {
+# 		my @array = @$r_input;
+# 		$out .= "( " ;
+# 		while (@array) {
+# 			$out .= pretty_print(shift @array, $level) . " , ";
+# 		}
+# 		$out .= " )";
+# 	} elsif (ref($r_input) eq 'CODE') {
+# 		$out = "$r_input";
+# 	} else {
+# 		$out = $r_input;
+# 		$out =~ s/</&lt;/g; # protect for HTML output
+# 	}
+# 	
+# 	return $out." ";
+# }
+# 
+# sub setInputTable_for_listLib {
+# 	my $self = shift;
+# 	my $out = {
+# 		pw          =>   $self->{password},
+# 		set         =>   'set0',
+# 		library_name =>  'Library',
+# 		command      =>  'all',
+# 	};
+# 
+# 	$out;
+# }
+# sub setInputTable {
+# 	my $self = shift;
+# 	my $out = {
+# 		pw          =>   $self->{password},
+# 		library_name =>  'Library',
+# 		command      =>  'renderProblem',
+# 		answer_form_submitted   => 1,
+# 		course                  => $self->{course},
+# 		extra_packages_to_load  => [qw( AlgParserWithImplicitExpand Expr
+# 		                                ExprWithImplicitExpand AnswerEvaluator
+# 		                                AnswerEvaluatorMaker 
+# 		)],
+# 		mode                    => $self->{displayMode},
+# 		modules_to_evaluate     => [ qw( 
+# Exporter
+# DynaLoader								
+# GD
+# WWPlot
+# Fun
+# Circle
+# Label								
+# PGrandom
+# Units
+# Hermite
+# List								
+# Match
+# Multiple
+# Select							
+# AlgParser
+# AnswerHash							
+# Fraction
+# VectorField							
+# Complex1
+# Complex							
+# MatrixReal1 Matrix							
+# Distributions
+# Regression
+# 
+# 		)], 
+# 		envir                   => $self->environment(),
+# 		problem_state           => {
+# 		
+# 			num_of_correct_ans  => 0,
+# 			num_of_incorrect_ans => 4,
+# 			recorded_score       => 1.0,
+# 		},
+# 		source                   => $self->{encodedSource},  #base64 encoded
+# 		
+# 		
+# 		
+# 	};
+# 
+# 	$out;
+# }
+# 
+# sub environment {
+# 	my $self = shift;
+# 	my $envir = {
+# 		answerDate  => '4014438528',
+# 		CAPA_Graphics_URL=>'http://webwork-db.math.rochester.edu/capa_graphics/',
+# 		CAPA_GraphicsDirectory =>'/ww/webwork/CAPA/CAPA_Graphics/',
+# 		CAPA_MCTools=>'/ww/webwork/CAPA/CAPA_MCTools/',
+# 		CAPA_Tools=>'/ww/webwork/CAPA/CAPA_Tools/',
+# 		cgiDirectory=>'Not defined',
+# 		cgiURL => 'Not defined',
+# 		classDirectory=> 'Not defined',
+# 		courseName=>'Not defined',
+# 		courseScriptsDirectory=>'not defined',
+# 		displayMode=>$self->{displayMode},
+# 		dueDate=> '4014438528',
+# 		effectivePermissionLevel => 10,
+# 		externalGif2EpsPath=>'not defined',
+# 		externalPng2EpsPath=>'not defined',
+# 		externalTTHPath=>'/usr/local/bin/tth',
+# 		fileName=>'set0/prob1a.pg',
+# 		formattedAnswerDate=>'6/19/00',
+# 		formattedDueDate=>'6/19/00',
+# 		formattedOpenDate=>'6/19/00',
+# 		functAbsTolDefault=> 0.0000001,
+# 		functLLimitDefault=>0,
+# 		functMaxConstantOfIntegration=> 1000000000000.0,
+# 		functNumOfPoints=> 5,
+# 		functRelPercentTolDefault=> 0.000001,
+# 		functULimitDefault=>1,
+# 		functVarDefault=> 'x',
+# 		functZeroLevelDefault=> 0.000001,
+# 		functZeroLevelTolDefault=>0.000001,
+# 		htmlDirectory =>'not defined',
+# 		htmlURL =>'not defined',
+# 		inputs_ref => $self->{inputs_ref},
+# 		macroDirectory=>'not defined',
+# 		numAbsTolDefault=>0.0000001,
+# 		numFormatDefault=>'%0.13g',
+# 		numOfAttempts=> 0,
+# 		numRelPercentTolDefault => 0.0001,
+# 		numZeroLevelDefault =>0.000001,
+# 		numZeroLevelTolDefault =>0.000001,
+# 		openDate=> '3014438528',
+# 		permissionLevel =>10,
+# 		PRINT_FILE_NAMES_FOR => [ 'gage'],
+# 		probFileName => 'set0/prob1a.pg',
+# 		problemSeed  => 1234,
+# 		problemValue =>1,
+# 		probNum => 13,
+# 		psvn => 54321,
+# 		psvn=> 54321,
+# 		questionNumber => 1,
+# 		scriptDirectory => 'Not defined',
+# 		sectionName => 'Gage',
+# 		sectionNumber => 1,
+# 		sessionKey=> 'Not defined',
+# 		setNumber =>'not defined',
+# 		studentLogin =>'gage',
+# 		studentName => 'Mike Gage',
+# 		tempDirectory => 'not defined',
+# 		templateDirectory=>'not defined',
+# 		tempURL=>'not defined',
+# 		webworkDocsURL => 'not defined',
+# 		
+# 		showHints => 1,               # extra options -- usually passed from the input form
+# 		showSolutions => 1,
+# 		
+# 	};
+# 	$envir;
+# };
+# 
+# sub formatAnswerRow {
+# 	my $self = shift;
+# 	my $rh_answer = shift;
+# 	my $problemNumber = shift;
+# 	my $answerString  = $rh_answer->{original_student_ans}||'&nbsp;';
+# 	my $correctAnswer = $rh_answer->{correct_ans}||'';
+# 	my $ans_message   = $rh_answer->{ans_message}||'';
+# 	my $score         = ($rh_answer->{score}) ? 'Correct' : 'Incorrect';
+# 	my $row = qq{
+# 		<tr>
+# 		    <td>
+# 				Prob: $problemNumber
+# 			</td>
+# 			<td>
+# 				$answerString
+# 			</td>
+# 			<td>
+# 			    $score
+# 			</td>
+# 			<td>
+# 				Correct answer is $correctAnswer
+# 			</td>
+# 			<td>
+# 				<i>$ans_message</i>
+# 			</td>
+# 		</tr>\n
+# 	};
+# 	$row;
+# }
+# 	
+# sub formatRenderedProblem {
+# 	my $self 			  = shift;
+# 	my $rh_result         = $self->{output};  # wrap problem in formats
+# 	my $problemText       = decode_base64($rh_result->{text});
+# 	my $rh_answers        = $rh_result->{answers};
+# 	my $encodedSource     = $self->{encodedSource}||'foobar';
+# 	my $warnings          = '';
+# 	if ( defined ($rh_result->{WARNINGS}) and $rh_result->{WARNINGS} ){
+# 		$warnings = "<div style=\"background-color:pink\">
+# 		             <p >WARNINGS</p><p>".decode_base64($rh_result->{WARNINGS})."</p></div>";
+# 	}
+# 	#warn "keys: ", join(" | ", sort keys %{$rh_result });
+# 	my $debug_messages = $rh_result->{flags}->{DEBUG_messages} ||     [];
+#     $debug_messages = join("<br/>\n", @{  $debug_messages }    );
+#     my $internal_debug_messages = $rh_result->{internal_debug_messages} || [];
+#     $internal_debug_messages = join("<br/>\n", @{ $internal_debug_messages  } );
+# 	# collect answers
+# 	my $answerTemplate    = q{<hr>ANSWERS <table border="3" align="center">};
+# 	my $problemNumber     = 1;
+#     foreach my $key (sort  keys %{$rh_answers}) {
+#     	$answerTemplate  .= $self->formatAnswerRow($rh_answers->{$key}, $problemNumber++);
+#     }
+# 	$answerTemplate      .= q{</table> <hr>};
+# 
+# 	my $FULL_URL = $self->url;
+# 	my $FORM_ACTION_URL  =  "$FULL_URL/webwork2/html2xml";
+# 	my $problemTemplate = <<ENDPROBLEMTEMPLATE;
+# <html>
+# <head>
+# <base href="$FULL_URL">
+# <title>WeBWorK Editor using host $HOSTNAME</title>
+# </head>
+# <body>
+# 		    $answerTemplate
+# 		    <form action="$FORM_ACTION_URL" method="post">
+# 			$problemText
+# 	       <input type="hidden" name="answersSubmitted" value="1"> 
+# 	       <input type="hidden" name="problemAddress" value="probSource"> 
+# 	       <input type="hidden" name="problemSource" value="$encodedSource"> 
+# 	       <input type="hidden" name="problemSeed" value="1234"> 
+# 	       <input type="hidden" name="pathToProblemFile" value="foobar">
+# 	       <p><input type="submit" name="submit" value="submit answers"></p>
+# 	     </form>
+# <HR>
+# <h3> Warning section </h3>
+# $warnings
+# <h3>
+# Debug message section
+# </h3>
+# $debug_messages
+# <h3>
+# internal errors
+# </h3>
+# $internal_debug_messages
+# 
+# </body>
+# </html>
+# 
+# ENDPROBLEMTEMPLATE
+# 
+# 
+# 
+# 	$problemTemplate;
+# }
+# 
+
+1;
diff --git a/clients/check_problems_in_dir.sh b/clients/check_problems_in_dir.sh
new file mode 100755
index 0000000000..3be228fd9b
--- /dev/null
+++ b/clients/check_problems_in_dir.sh
@@ -0,0 +1 @@
+find . -name "*.pg" -exec /opt/webwork/webwork2/clients/checkProblem.pl {} ';'
diff --git a/clients/hello_world_soap_client.pl b/clients/hello_world_soap_client.pl
new file mode 100755
index 0000000000..3b669c673b
--- /dev/null
+++ b/clients/hello_world_soap_client.pl
@@ -0,0 +1,25 @@
+#!/usr/bin/perl -w
+
+
+use SOAP::Lite;
+my $soap = SOAP::Lite
+#-> uri('http://math.webwork.rochester.edu/WebworkXMLRPC')
+#-> proxy('https://math.webwork.rochester.edu/mod_soap/WebworkWebservice');
+-> uri('http://localhost/WebworkXMLRPC')
+-> proxy('http://localhost/mod_soap/WebworkWebservice');
+
+#-> uri('https://devel.webwork.rochester.edu:8002/WebworkXMLRPC')
+#-> proxy('https://devel.webwork.rochester.edu:8002/mod_soap/WebworkWebservice');
+
+
+my $result = $soap->hi();
+
+unless ($result->fault) {
+	print $result->result();
+} else {
+	print join ', ',
+  	$result->faultcode,
+  	$result->faultstring;
+}
+
+
diff --git a/clients/hello_world_xmlrpc_client.pl b/clients/hello_world_xmlrpc_client.pl
new file mode 100755
index 0000000000..200f34dbd8
--- /dev/null
+++ b/clients/hello_world_xmlrpc_client.pl
@@ -0,0 +1,20 @@
+#!/usr/bin/perl -w
+
+#
+use XMLRPC::Lite;
+  my $soap = XMLRPC::Lite
+   # -> proxy('https://math.webwork.rochester.edu/mod_xmlrpc/');
+   #-> proxy('https://devel.webwork.rochester.edu:8002/mod_xmlrpc/');
+    -> proxy('http://localhost/mod_xmlrpc/');
+  
+	
+  my $result = $soap->call("WebworkXMLRPC.hi");
+  
+
+  unless ($result->fault) {
+    print $result->result(),"\n";
+  } else {
+    print join ', ',
+      $result->faultcode,
+      $result->faultstring;
+  }
diff --git a/clients/input.txt b/clients/input.txt
new file mode 100644
index 0000000000..592526419b
--- /dev/null
+++ b/clients/input.txt
@@ -0,0 +1,99 @@
+##DESCRIPTION
+##  A very simple first problem
+##ENDDESCRIPTION
+##KEYWORDS('algebra')
+DOCUMENT();        # This should be the first executable line in the problem.
+loadMacros(
+"PG.pl",
+"PGbasicmacros.pl",
+"PGchoicemacros.pl",
+"PGanswermacros.pl",
+"PGauxiliaryFunctions.pl"
+);
+
+TEXT(&beginproblem);
+$showPartialCorrectAnswers = 1;
+$a = random(-10,-1,1);
+$b = random(1,11,1);
+$c = random(1,11,1);
+$d = random(1,11,1);
+
+BEGIN_TEXT
+$PAR
+displayMode  is $displayMode $BR
+$PAR
+This problem demonstrates how you enter numerical answers into WeBWorK. $PAR
+Evaluate the expression \(3($a )($b -$c -2($d ))\):
+
+ \{ ans_rule(10) \}
+
+$BR
+END_TEXT
+$ans = 3*($a)*($b-$c-2*($d));
+
+&ANS(strict_num_cmp($ans));
+
+BEGIN_TEXT
+
+In the case above you need to enter a number, since we're testing whether you can multiply
+out these numbers. (You can use a calculator if you want.) 
+$PAR
+For most problems, you will be able to get WeBWorK to
+do some of the work for you.  For example
+$BR
+Calculate ($a) * ($b): \{ ans_rule()\}
+$BR
+END_TEXT
+$ans = $a*$b;
+
+&ANS(std_num_cmp($ans));
+
+BEGIN_TEXT
+The asterisk is what most computers use to denote multiplication and you can use this with WeBWorK. 
+But WeBWorK will also allow use to use  a space to denote multiplication.
+You can either \($a * $b\) or \{$a*$b\} or even \($a \ $b\).  All will work. Try them.  
+$PAR
+Now try calculating the sine of 45 degrees ( that's sine of pi over 4 in radians
+and numerically sin(pi/4) equals \{1/sqrt(2)\} or, more precisely,  \(1/\sqrt{2} \) ).  
+You can enter this as  sin(pi/4) , as 
+sin(3.1415926/4), as 1/sqrt(2), as 2**(-.5), etc. This is because WeBWorK knows about 
+functions like sin  and sqrt (square root). (Note: exponents
+can be indicated by either a "caret" or **). Try it.$BR  \( \sin(\pi/4) = \) \{ ans_rule(20) \}$PAR
+ Here's the 
+\{
+htmlLink(qq!http://webwork.math.rochester.edu/webwork_system_html/docs/docs/pglanguage/availablefunctions.html!,"list 
+of the functions") \}
+ which WeBWorK understands.   WeBWorK ALWAYS uses radian mode for trig functions. 
+ $PAR
+END_TEXT
+
+&ANS( std_num_cmp(sin(3.1415926/4)) );
+BEGIN_TEXT
+You can also use juxtaposition to denote multiplication. E.g. enter \( 2\sin(3\pi/2) \).
+You can enter this as 2*sin(3*pi/2) or more simply as 2sin(3pi/2).  Try it: $BR 
+\{ ans_rule(20) \}$PAR
+
+END_TEXT
+
+$pi = 4*atan(1);
+&ANS( std_num_cmp(2*sin(3*$pi/2)) );
+
+BEGIN_TEXT
+Sometimes you need to use ( )'s to make your meaning clear. E.g. 1/2+3 is 3.5, but  1/(2+3) is .2 Why?
+Try entering both and use the ${LQ}Preview${RQ} button below to see the difference.  In addition to
+( )'s, you can also use [ ]'s and $LB ${RB}'s.  $BR
+\{ ans_rule(20) \}$PAR
+END_TEXT
+
+&ANS( std_num_cmp(.2));
+
+BEGIN_TEXT
+You can always try to enter answers and let WeBWorK do the calculating. 
+WeBWorK will tell you if the problem requires a strict numerical answer. 
+The way we use WeBWorK in this class there is no penalty for getting an answer wrong.  What counts
+is that you get the answer right eventually (before the due date).  For complicated answers,
+you should use the ${LQ}Preview${RQ} button to check for syntax errors and also to check that the answer
+you enter is really what you think it is.
+END_TEXT
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/clients/renderProblem.pl b/clients/renderProblem.pl
new file mode 100755
index 0000000000..09d7f7ff47
--- /dev/null
+++ b/clients/renderProblem.pl
@@ -0,0 +1,552 @@
+#!/usr/bin/perl -w
+
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/clients/renderProblem.pl,v 1.4 2010/05/11 15:44:05 gage 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+=head1 NAME
+
+webwork2/clients/renderProblem.pl
+
+This script will take a file and send it to a WeBWorK daemon webservice
+to have it rendered.  The result is split into the basic HTML rendering
+and evaluation of answers and then passed to a browser for printing.
+
+The formatting allows the browser presentation to be interactive with the 
+daemon running the script webwork2/lib/renderViaXMLRPC.pm
+
+Rembember to configure the local output file and display command !!!!!!!!
+
+=cut
+
+use strict;
+use warnings;
+
+
+
+##################################################
+#  configuration section for client
+##################################################
+
+# Use address to WeBWorK code library where WebworkClient.pm is located.
+use lib '/opt/webwork/webwork2/lib';
+#use Crypt::SSLeay;  # needed for https
+use WebworkClient;
+
+
+#############################################
+# Configure
+#############################################
+
+ ############################################################
+# configure the local output file and display command !!!!!!!!
+ ############################################################
+ 
+ # Path to a temporary file for storing the output of renderProblem.pl
+ use constant  TEMPOUTPUTFILE   => '/Users/gage/Desktop/renderProblemOutput.html'; 
+ 
+ # Command line for displaying the temporary file in a browser.
+ use constant  DISPLAY_COMMAND  => 'open -a firefox ';   #browser opens tempoutputfile above
+ # use constant  DISPLAY_COMMAND  => "open -a 'Google Chrome' ";
+
+ ############################################################
+ 
+ my $use_site;
+ $use_site = 'test_webwork';    # select a rendering site 
+ #$use_site = 'local';           # select a rendering site 
+ #$use_site = 'rochester_test';  # select a rendering site 
+ 
+ 
+ ############################################################
+ 
+# To configure the target webwork server
+# two URLs are required
+# 1. $XML_URL   http://test.webwork.maa.org/mod_xmlrpc
+#    points to the Webservice.pm and Webservice/RenderProblem modules
+#    Is used by the client to send the original XML request to the webservice
+#
+# 2. $FORM_ACTION_URL      http:http://test.webwork.maa.org/webwork2/html2xml
+#    points to the renderViaXMLRPC.pm module.
+#
+#     This url is placed as form action url when the rendered HTML from the original
+#     request is returned to the client from Webservice/RenderProblem. The client
+#     reorganizes the XML it receives into an HTML page (with a WeBWorK form) and 
+#     pipes it through a local browser.
+#
+#     The browser uses this url to resubmit the problem (with answers) via the standard
+#     HTML webform used by WeBWorK to the renderViaXMLRPC.pm handler.  
+#
+#     This renderViaXMLRPC.pm handler acts as an intermediary between the browser 
+#     and the webservice.  It interprets the HTML form sent by the browser, 
+#     rewrites the form data in XML format, submits it to the WebworkWebservice.pm 
+#     which processes it and sends the the resulting HTML back to renderViaXMLRPC.pm
+#     which in turn passes it back to the browser.
+# 3.  The second time a problem is submitted renderViaXMLRPC.pm receives the WeBWorK form 
+#     submitted directly by the browser.  
+#     The renderViaXMLRPC.pm translates the WeBWorK form, has it processes by the webservice
+#     and returns the result to the browser. 
+#     The The client renderProblem.pl script is no longer involved.
+# 4.  Summary: renderProblem.pl is only involved in the first round trip
+#     of the submitted problem.  After that the communication is  between the browser and
+#     renderViaXMLRPC using HTML forms and between renderViaXMLRPC and the WebworkWebservice.pm
+#     module using XML_RPC.
+# 5.  The XML_PASSWORD is defined on the site.  In future versions a more secure password method
+#     may be implemented.  This is sufficient to keep out robots.
+# 6.  The course "daemon_course" must be a course that has been created on the server or an error will
+#     result. A different name can be used but the course must exist on the server.
+
+
+our ( $XML_URL,$FORM_ACTION_URL, $XML_PASSWORD, $XML_COURSE);
+if ($use_site eq 'local') {
+# the rest can work!!
+	$XML_URL      =  'http://localhost:80';
+	$FORM_ACTION_URL  =  'http://localhost:80/webwork2/html2xml';
+	$XML_PASSWORD     =  'xmlwebwork';
+	$XML_COURSE       =  'daemon_course';
+} elsif ($use_site eq 'rochester_test') {  
+	
+	$XML_URL      =  'http://128.151.231.2';
+	$FORM_ACTION_URL  =  'http://128.151.231.2/webwork2/html2xml';
+ 	$XML_PASSWORD     = 'xmlwebwork';
+ 	$XML_COURSE       = 'daemon_course';
+	
+} elsif ($use_site eq 'test_webwork') {
+
+	$XML_URL      =  'https://test.webwork.maa.org';
+	$FORM_ACTION_URL  =  'https://test.webwork.maa.org/webwork2/html2xml';
+	$XML_PASSWORD     = 'xmlwebwork';
+	$XML_COURSE       = 'daemon_course';
+
+}
+
+##################################################
+#  END configuration section for client
+##################################################
+
+
+
+use constant DISPLAYMODE   => 'images'; #  jsMath  is another possibilities.
+
+
+our @COMMANDS = qw( listLibraries    renderProblem  ); #listLib  readFile tex2pdf 
+
+
+##################################################
+# end configuration section
+##################################################
+
+
+
+our $xmlrpc_client = new WebworkClient;
+
+##################################################
+# input/output section
+##################################################
+
+
+our $source;
+our $rh_result;
+# filter mode  main code
+
+undef $/;
+$source   = <>; #slurp input
+$/ =1;
+$xmlrpc_client->encodeSource($source);
+$xmlrpc_client->url($XML_URL);
+$xmlrpc_client->{form_action_url}= $FORM_ACTION_URL;
+$xmlrpc_client->{displayMode}   = DISPLAYMODE();
+$xmlrpc_client->{user}          = 'xmluser';
+$xmlrpc_client->{password}      = $XML_PASSWORD;
+$xmlrpc_client->{course}        = $XML_COURSE;
+
+#xmlrpcCall('renderProblem');
+our $output;
+if ( $xmlrpc_client->xmlrpcCall('renderProblem') )    {
+
+	$output = $xmlrpc_client->formatRenderedProblem;
+} else {
+	$output = $xmlrpc_client->{output};  # error report
+}
+
+
+
+
+local(*FH);
+open(FH, '>'.TEMPOUTPUTFILE) or die "Can't open file ".TEMPOUTPUTFILE()." for writing";
+print FH $output;
+close(FH);
+
+system(DISPLAY_COMMAND().TEMPOUTPUTFILE());
+
+##################################################
+# end input/output section
+##################################################
+
+
+##################################################
+# XMLRPC client -- 
+# the code below is identical between renderProblem.pl and renderViaXMLRPC.pm????
+# and has been included in WebworkClient.pm
+##################################################
+
+# package WeBWorK::ContentGenerator::renderViaXMLRPC_client;
+# 
+# use Crypt::SSLeay;  # needed for https
+# use XMLRPC::Lite;
+# use MIME::Base64 qw( encode_base64 decode_base64);
+# 
+# use constant  TRANSPORT_METHOD => 'XMLRPC::Lite';
+# use constant  REQUEST_CLASS    => 'WebworkXMLRPC';  # WebworkXMLRPC is used for soap also!!
+# use constant  REQUEST_URI      => 'mod_xmlrpc';
+# 
+# sub new {
+# 	my $self = {
+# 		output   		=> '',
+# 		encodedSource 	=> '',
+# 		url             => '',
+# 		password        => '',
+# 		course          => '',
+# 		displayMode     => '',
+# 		inputs_ref      => {		 AnSwEr0001 => '',
+# 				 					 AnSwEr0002 => '',
+# 				 					 AnSwEr0003 => '',
+# 		},
+# 	};
+# 
+# 	bless $self;
+# }
+# 
+# 
+# our $result;
+# 
+# ##################################################
+# # Utilities -- 
+# #    this code is identical between renderProblem.pl and renderViaXMLRPC.pm
+# ##################################################
+# 
+# sub xmlrpcCall {
+# 	my $self        = shift;
+# 	my $command     = shift;
+# 	$command        = 'listLibraries' unless $command;
+# 
+# 	  my $requestResult = TRANSPORT_METHOD
+# 			-> proxy($self->{url}.'/'.REQUEST_URI);
+#      
+# 	  my $input = $self->setInputTable();
+# 	  local( $result);
+# 	  # use eval to catch errors
+# 	  eval { $result = $requestResult->call(REQUEST_CLASS.'.'.$command,$input) };
+# 	  if ($@) {
+# 	  	print STDERR "There were a lot of errors for $command\n" ;
+# 	  	print STDERR "Errors: \n $@\n End Errors\n" ;
+# 	  	return 0 #failure
+# 	  }
+# 	  	  
+# 	  unless (ref($result) and $result->fault) {    	
+# 	  	my $rh_result = $result->result();
+# 	    #print STDERR pretty_print_rh($rh_result);
+# 		$self->{output} = $rh_result; #$self->formatRenderedProblem($rh_result);
+# 		return 1; # success
+# 
+# 	  } else {
+# 		$self->{output} = 'Error from server: '. join( ",\n ",
+# 		  $result->faultcode,
+# 		  $result->faultstring);
+# 		return 0; #failure
+# 	  }
+# }
+#   
+# sub encodeSource {
+# 	my $self = shift;
+# 	my $source = shift;
+# 	$self->{encodedSource} =encode_base64($source);
+# }
+# sub url {
+# 	my $self = shift;
+# 	my $new_url = shift;
+# 	$self->{url} = $new_url if defined($new_url) and $new_url =~ /\S/;
+# 	$self->{url};
+# }
+# sub pretty_print {    # provides html output -- NOT a method
+#     my $r_input = shift;
+#     my $level = shift;
+#     $level = 4 unless defined($level);
+#     $level--;
+#     return '' unless $level > 0;  # only print three levels of hashes (safety feature)
+#     my $out = '';
+#     if ( not ref($r_input) ) {
+#     	$out = $r_input if defined $r_input;    # not a reference
+#     	$out =~ s/</&lt;/g  ;  # protect for HTML output
+#     } elsif ("$r_input" =~/hash/i) {  # this will pick up objects whose '$self' is hash and so works better than ref($r_iput).
+# 	    local($^W) = 0;
+# 	    
+# 		$out .= "$r_input " ."<TABLE border = \"2\" cellpadding = \"3\" BGCOLOR = \"#FFFFFF\">";
+# 		
+# 		
+# 		foreach my $key ( sort ( keys %$r_input )) {
+# 			$out .= "<tr><TD> $key</TD><TD>=&gt;</td><td>&nbsp;".pretty_print($r_input->{$key}) . "</td></tr>";
+# 		}
+# 		$out .="</table>";
+# 	} elsif (ref($r_input) eq 'ARRAY' ) {
+# 		my @array = @$r_input;
+# 		$out .= "( " ;
+# 		while (@array) {
+# 			$out .= pretty_print(shift @array, $level) . " , ";
+# 		}
+# 		$out .= " )";
+# 	} elsif (ref($r_input) eq 'CODE') {
+# 		$out = "$r_input";
+# 	} else {
+# 		$out = $r_input;
+# 		$out =~ s/</&lt;/g; # protect for HTML output
+# 	}
+# 	
+# 	return $out." ";
+# }
+# 
+# sub setInputTable_for_listLib {
+# 	my $self = shift;
+# 	my $out = {
+# 		pw          =>   $self->{password},
+# 		set         =>   'set0',
+# 		library_name =>  'Library',
+# 		command      =>  'all',
+# 	};
+# 
+# 	$out;
+# }
+# sub setInputTable {
+# 	my $self = shift;
+# 	my $out = {
+# 		pw          =>   $self->{password},
+# 		library_name =>  'Library',
+# 		command      =>  'renderProblem',
+# 		answer_form_submitted   => 1,
+# 		course                  => $self->{course},
+# 		extra_packages_to_load  => [qw( AlgParserWithImplicitExpand Expr
+# 		                                ExprWithImplicitExpand AnswerEvaluator
+# 		                                AnswerEvaluatorMaker 
+# 		)],
+# 		mode                    => $self->{displayMode},
+# 		modules_to_evaluate     => [ qw( 
+# Exporter
+# DynaLoader								
+# GD
+# WWPlot
+# Fun
+# Circle
+# Label								
+# PGrandom
+# Units
+# Hermite
+# List								
+# Match
+# Multiple
+# Select							
+# AlgParser
+# AnswerHash							
+# Fraction
+# VectorField							
+# Complex1
+# Complex							
+# MatrixReal1 Matrix							
+# Distributions
+# Regression
+# 
+# 		)], 
+# 		envir                   => $self->environment(),
+# 		problem_state           => {
+# 		
+# 			num_of_correct_ans  => 0,
+# 			num_of_incorrect_ans => 4,
+# 			recorded_score       => 1.0,
+# 		},
+# 		source                   => $self->{encodedSource},  #base64 encoded
+# 		
+# 		
+# 		
+# 	};
+# 
+# 	$out;
+# }
+# 
+# sub environment {
+# 	my $self = shift;
+# 	my $envir = {
+# 		answerDate  => '4014438528',
+# 		CAPA_Graphics_URL=>'http://webwork-db.math.rochester.edu/capa_graphics/',
+# 		CAPA_GraphicsDirectory =>'/ww/webwork/CAPA/CAPA_Graphics/',
+# 		CAPA_MCTools=>'/ww/webwork/CAPA/CAPA_MCTools/',
+# 		CAPA_Tools=>'/ww/webwork/CAPA/CAPA_Tools/',
+# 		cgiDirectory=>'Not defined',
+# 		cgiURL => 'Not defined',
+# 		classDirectory=> 'Not defined',
+# 		courseName=>'Not defined',
+# 		courseScriptsDirectory=>'not defined',
+# 		displayMode=>$self->{displayMode},
+# 		dueDate=> '4014438528',
+# 		effectivePermissionLevel => 10,
+# 		externalGif2EpsPath=>'not defined',
+# 		externalPng2EpsPath=>'not defined',
+# 		externalTTHPath=>'/usr/local/bin/tth',
+# 		fileName=>'set0/prob1a.pg',
+# 		formattedAnswerDate=>'6/19/00',
+# 		formattedDueDate=>'6/19/00',
+# 		formattedOpenDate=>'6/19/00',
+# 		functAbsTolDefault=> 0.0000001,
+# 		functLLimitDefault=>0,
+# 		functMaxConstantOfIntegration=> 1000000000000.0,
+# 		functNumOfPoints=> 5,
+# 		functRelPercentTolDefault=> 0.000001,
+# 		functULimitDefault=>1,
+# 		functVarDefault=> 'x',
+# 		functZeroLevelDefault=> 0.000001,
+# 		functZeroLevelTolDefault=>0.000001,
+# 		htmlDirectory =>'not defined',
+# 		htmlURL =>'not defined',
+# 		inputs_ref => $self->{inputs_ref},
+# 		macroDirectory=>'not defined',
+# 		numAbsTolDefault=>0.0000001,
+# 		numFormatDefault=>'%0.13g',
+# 		numOfAttempts=> 0,
+# 		numRelPercentTolDefault => 0.0001,
+# 		numZeroLevelDefault =>0.000001,
+# 		numZeroLevelTolDefault =>0.000001,
+# 		openDate=> '3014438528',
+# 		permissionLevel =>10,
+# 		PRINT_FILE_NAMES_FOR => [ 'gage'],
+# 		probFileName => 'set0/prob1a.pg',
+# 		problemSeed  => 1234,
+# 		problemValue =>1,
+# 		probNum => 13,
+# 		psvn => 54321,
+# 		psvn=> 54321,
+# 		questionNumber => 1,
+# 		scriptDirectory => 'Not defined',
+# 		sectionName => 'Gage',
+# 		sectionNumber => 1,
+# 		sessionKey=> 'Not defined',
+# 		setNumber =>'not defined',
+# 		studentLogin =>'gage',
+# 		studentName => 'Mike Gage',
+# 		tempDirectory => 'not defined',
+# 		templateDirectory=>'not defined',
+# 		tempURL=>'not defined',
+# 		webworkDocsURL => 'not defined',
+# 		
+# 		showHints => 1,               # extra options -- usually passed from the input form
+# 		showSolutions => 1,
+# 		
+# 	};
+# 	$envir;
+# };
+# 
+# sub formatAnswerRow {
+# 	my $self = shift;
+# 	my $rh_answer = shift;
+# 	my $problemNumber = shift;
+# 	my $answerString  = $rh_answer->{original_student_ans}||'&nbsp;';
+# 	my $correctAnswer = $rh_answer->{correct_ans}||'';
+# 	my $ans_message   = $rh_answer->{ans_message}||'';
+# 	my $score         = ($rh_answer->{score}) ? 'Correct' : 'Incorrect';
+# 	my $row = qq{
+# 		<tr>
+# 		    <td>
+# 				Prob: $problemNumber
+# 			</td>
+# 			<td>
+# 				$answerString
+# 			</td>
+# 			<td>
+# 			    $score
+# 			</td>
+# 			<td>
+# 				Correct answer is $correctAnswer
+# 			</td>
+# 			<td>
+# 				<i>$ans_message</i>
+# 			</td>
+# 		</tr>\n
+# 	};
+# 	$row;
+# }
+# 	
+# sub formatRenderedProblem {
+# 	my $self 			  = shift;
+# 	my $rh_result         = $self->{output};  # wrap problem in formats
+# 	my $problemText       = decode_base64($rh_result->{text});
+# 	my $rh_answers        = $rh_result->{answers};
+# 	my $encodedSource     = $self->{encodedSource}||'foobar';
+# 	my $warnings          = '';
+# 	if ( defined ($rh_result->{WARNINGS}) and $rh_result->{WARNINGS} ){
+# 		$warnings = "<div style=\"background-color:pink\">
+# 		             <p >WARNINGS</p><p>".decode_base64($rh_result->{WARNINGS})."</p></div>";
+# 	}
+# 	#warn "keys: ", join(" | ", sort keys %{$rh_result });
+# 	my $debug_messages = $rh_result->{flags}->{DEBUG_messages} ||     [];
+#     $debug_messages = join("<br/>\n", @{  $debug_messages }    );
+#     my $internal_debug_messages = $rh_result->{internal_debug_messages} || [];
+#     $internal_debug_messages = join("<br/>\n", @{ $internal_debug_messages  } );
+# 	# collect answers
+# 	my $answerTemplate    = q{<hr>ANSWERS <table border="3" align="center">};
+# 	my $problemNumber     = 1;
+#     foreach my $key (sort  keys %{$rh_answers}) {
+#     	$answerTemplate  .= $self->formatAnswerRow($rh_answers->{$key}, $problemNumber++);
+#     }
+# 	$answerTemplate      .= q{</table> <hr>};
+# 
+# 	my $FULL_URL = $self->url;
+# 	my $FORM_ACTION_URL  =  "$FULL_URL/webwork2/html2xml";
+# 	my $problemTemplate = <<ENDPROBLEMTEMPLATE;
+# <html>
+# <head>
+# <base href="$FULL_URL">
+# <title>WeBWorK Editor using host $HOSTNAME</title>
+# </head>
+# <body>
+# 		    $answerTemplate
+# 		    <form action="$FORM_ACTION_URL" method="post">
+# 			$problemText
+# 	       <input type="hidden" name="answersSubmitted" value="1"> 
+# 	       <input type="hidden" name="problemAddress" value="probSource"> 
+# 	       <input type="hidden" name="problemSource" value="$encodedSource"> 
+# 	       <input type="hidden" name="problemSeed" value="1234"> 
+# 	       <input type="hidden" name="pathToProblemFile" value="foobar">
+# 	       <p><input type="submit" name="submit" value="submit answers"></p>
+# 	     </form>
+# <HR>
+# <h3> Warning section </h3>
+# $warnings
+# <h3>
+# Debug message section
+# </h3>
+# $debug_messages
+# <h3>
+# internal errors
+# </h3>
+# $internal_debug_messages
+# 
+# </body>
+# </html>
+# 
+# ENDPROBLEMTEMPLATE
+# 
+# 
+# 
+# 	$problemTemplate;
+# }
+# 
+
+1;
diff --git a/clients/renderProblem_rawoutput.pl b/clients/renderProblem_rawoutput.pl
new file mode 100755
index 0000000000..a081b6e7d3
--- /dev/null
+++ b/clients/renderProblem_rawoutput.pl
@@ -0,0 +1,592 @@
+#!/usr/bin/perl -w
+
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/clients/renderProblem.pl,v 1.4 2010/05/11 15:44:05 gage 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+=head1 NAME
+
+webwork2/clients/renderProblem.pl
+
+This script will take a file and send it to a WeBWorK daemon webservice
+to have it rendered.  The result is split into the basic HTML rendering
+and evaluation of answers and then passed to a browser for printing.
+
+The formatting allows the browser presentation to be interactive with the 
+daemon running the script webwork2/lib/renderViaXMLRPC.pm
+
+Rembember to configure the local output file and display command !!!!!!!!
+
+=cut
+
+use strict;
+use warnings;
+
+
+
+##################################################
+#  configuration section for client
+##################################################
+
+# Use address to WeBWorK code library where WebworkClient.pm is located.
+use lib '/opt/webwork/webwork2/lib';
+#use Crypt::SSLeay;  # needed for https
+use WebworkClient;
+
+
+#############################################
+# Configure
+#############################################
+
+ ############################################################
+# configure the local output file and display command !!!!!!!!
+ ############################################################
+ 
+ # Path to a temporary file for storing the output of renderProblem.pl
+ use constant  TEMPOUTPUTFILE   => '/Users/gage/Desktop/renderProblemOutput.html'; 
+ 
+ # Command line for displaying the temporary file in a browser.
+ #use constant  DISPLAY_COMMAND  => 'open -a firefox ';   #browser opens tempoutputfile above
+ # use constant  DISPLAY_COMMAND  => "open -a 'Google Chrome' ";
+   use constant DISPLAY_COMMAND => " less ";   # display tempoutputfile with less
+ ############################################################
+ 
+ my $use_site;
+ $use_site = 'test_webwork';    # select a rendering site 
+ #$use_site = 'local';           # select a rendering site 
+ #$use_site = 'rochester_test';  # select a rendering site 
+ 
+ 
+ ############################################################
+ 
+# To configure the target webwork server
+# two URLs are required
+# 1. $XML_URL   http://test.webwork.maa.org/mod_xmlrpc
+#    points to the Webservice.pm and Webservice/RenderProblem modules
+#    Is used by the client to send the original XML request to the webservice
+#
+# 2. $FORM_ACTION_URL      http:http://test.webwork.maa.org/webwork2/html2xml
+#    points to the renderViaXMLRPC.pm module.
+#
+#     This url is placed as form action url when the rendered HTML from the original
+#     request is returned to the client from Webservice/RenderProblem. The client
+#     reorganizes the XML it receives into an HTML page (with a WeBWorK form) and 
+#     pipes it through a local browser.
+#
+#     The browser uses this url to resubmit the problem (with answers) via the standard
+#     HTML webform used by WeBWorK to the renderViaXMLRPC.pm handler.  
+#
+#     This renderViaXMLRPC.pm handler acts as an intermediary between the browser 
+#     and the webservice.  It interprets the HTML form sent by the browser, 
+#     rewrites the form data in XML format, submits it to the WebworkWebservice.pm 
+#     which processes it and sends the the resulting HTML back to renderViaXMLRPC.pm
+#     which in turn passes it back to the browser.
+# 3.  The second time a problem is submitted renderViaXMLRPC.pm receives the WeBWorK form 
+#     submitted directly by the browser.  
+#     The renderViaXMLRPC.pm translates the WeBWorK form, has it processes by the webservice
+#     and returns the result to the browser. 
+#     The The client renderProblem.pl script is no longer involved.
+# 4.  Summary: renderProblem.pl is only involved in the first round trip
+#     of the submitted problem.  After that the communication is  between the browser and
+#     renderViaXMLRPC using HTML forms and between renderViaXMLRPC and the WebworkWebservice.pm
+#     module using XML_RPC.
+# 5.  The XML_PASSWORD is defined on the site.  In future versions a more secure password method
+#     may be implemented.  This is sufficient to keep out robots.
+# 6.  The course "daemon_course" must be a course that has been created on the server or an error will
+#     result. A different name can be used but the course must exist on the server.
+
+
+our ( $XML_URL,$FORM_ACTION_URL, $XML_PASSWORD, $XML_COURSE);
+if ($use_site eq 'local') {
+# the rest can work!!
+	$XML_URL      =  'http://localhost:80';
+	$FORM_ACTION_URL  =  'http://localhost:80/webwork2/html2xml';
+	$XML_PASSWORD     =  'xmlwebwork';
+	$XML_COURSE       =  'daemon_course';
+} elsif ($use_site eq 'rochester_test') {  
+	
+	$XML_URL      =  'http://128.151.231.2';
+	$FORM_ACTION_URL  =  'http://128.151.231.2/webwork2/html2xml';
+ 	$XML_PASSWORD     = 'xmlwebwork';
+ 	$XML_COURSE       = 'daemon_course';
+	
+} elsif ($use_site eq 'test_webwork') {
+
+	$XML_URL      =  'https://test.webwork.maa.org';
+	$FORM_ACTION_URL  =  'https://test.webwork.maa.org/webwork2/html2xml';
+	$XML_PASSWORD     = 'xmlwebwork';
+	$XML_COURSE       = 'daemon_course';
+
+}
+
+##################################################
+#  END configuration section for client
+##################################################
+
+
+
+use constant DISPLAYMODE   => 'images'; #  jsMath  is another possibilities.
+
+
+our @COMMANDS = qw( listLibraries    renderProblem  ); #listLib  readFile tex2pdf 
+
+
+##################################################
+# end configuration section
+##################################################
+
+
+
+our $xmlrpc_client = new WebworkClient;
+
+##################################################
+# input/output section
+##################################################
+
+
+our $source;
+our $rh_result;
+# filter mode  main code
+
+undef $/;
+$source   = <>; #slurp input
+$/ =1;
+$xmlrpc_client->encodeSource($source);
+$xmlrpc_client->url($XML_URL);
+$xmlrpc_client->{form_action_url}= $FORM_ACTION_URL;
+$xmlrpc_client->{displayMode}   = DISPLAYMODE();
+$xmlrpc_client->{user}          = 'xmluser';
+$xmlrpc_client->{password}      = $XML_PASSWORD;
+$xmlrpc_client->{course}        = $XML_COURSE;
+
+#xmlrpcCall('renderProblem');
+our $output;
+if ( $xmlrpc_client->xmlrpcCall('renderProblem') )    {
+    $output = "1\n";
+	$output = pretty_print( $xmlrpc_client->{output} );
+} else {
+    $output = "0\n";
+	$output = $xmlrpc_client->{output};  # error report
+}
+
+
+
+local(*FH);
+open(FH, '>'.TEMPOUTPUTFILE) or die "Can't open file ".TEMPOUTPUTFILE()." for writing";
+print FH $output;
+close(FH);
+
+system(DISPLAY_COMMAND().TEMPOUTPUTFILE());
+
+##################################################
+# end input/output section
+##################################################
+
+sub pretty_print { 
+    shift if UNIVERSAL::isa($_[0] => __PACKAGE__);
+	my $rh = shift;
+	my $indent = shift || 0;
+	my $out = "";
+	my $type = ref($rh);
+
+	if (defined($type) and $type) {
+		$out .= " type = $type; ";
+	} elsif (! defined($rh )) {
+		$out .= " type = UNDEFINED; ";
+	}
+	return $out." " unless defined($rh);
+	
+	if ( ref($rh) =~/HASH/ or "$rh" =~/HASH/ ) {
+	    $out .= "{\n";
+	    $indent++;
+ 		foreach my $key (sort keys %{$rh})  {
+ 			$out .= "  "x$indent."$key => " . pretty_print( $rh->{$key}, $indent ) . "\n";
+ 		}
+ 		$indent--;
+ 		$out .= "\n"."  "x$indent."}\n";
+
+ 	} elsif (ref($rh)  =~  /ARRAY/ or "$rh" =~/ARRAY/) {
+ 	    $out .= " ( ";
+ 		foreach my $elem ( @{$rh} )  {
+ 		 	$out .= pretty_print($elem, $indent);
+ 		
+ 		}
+ 		$out .=  " ) \n";
+	} elsif ( ref($rh) =~ /SCALAR/ ) {
+		$out .= "scalar reference ". ${$rh};
+	} elsif ( ref($rh) =~/Base64/ ) {
+		$out .= "base64 reference " .$$rh;
+	} else {
+		$out .=  $rh;
+	}
+	
+	return $out." ";
+}
+
+##################################################
+# XMLRPC client -- 
+# the code below is identical between renderProblem.pl and renderViaXMLRPC.pm????
+# and has been included in WebworkClient.pm
+##################################################
+
+# package WeBWorK::ContentGenerator::renderViaXMLRPC_client;
+# 
+# use Crypt::SSLeay;  # needed for https
+# use XMLRPC::Lite;
+# use MIME::Base64 qw( encode_base64 decode_base64);
+# 
+# use constant  TRANSPORT_METHOD => 'XMLRPC::Lite';
+# use constant  REQUEST_CLASS    => 'WebworkXMLRPC';  # WebworkXMLRPC is used for soap also!!
+# use constant  REQUEST_URI      => 'mod_xmlrpc';
+# 
+# sub new {
+# 	my $self = {
+# 		output   		=> '',
+# 		encodedSource 	=> '',
+# 		url             => '',
+# 		password        => '',
+# 		course          => '',
+# 		displayMode     => '',
+# 		inputs_ref      => {		 AnSwEr0001 => '',
+# 				 					 AnSwEr0002 => '',
+# 				 					 AnSwEr0003 => '',
+# 		},
+# 	};
+# 
+# 	bless $self;
+# }
+# 
+# 
+# our $result;
+# 
+# ##################################################
+# # Utilities -- 
+# #    this code is identical between renderProblem.pl and renderViaXMLRPC.pm
+# ##################################################
+# 
+# sub xmlrpcCall {
+# 	my $self        = shift;
+# 	my $command     = shift;
+# 	$command        = 'listLibraries' unless $command;
+# 
+# 	  my $requestResult = TRANSPORT_METHOD
+# 			-> proxy($self->{url}.'/'.REQUEST_URI);
+#      
+# 	  my $input = $self->setInputTable();
+# 	  local( $result);
+# 	  # use eval to catch errors
+# 	  eval { $result = $requestResult->call(REQUEST_CLASS.'.'.$command,$input) };
+# 	  if ($@) {
+# 	  	print STDERR "There were a lot of errors for $command\n" ;
+# 	  	print STDERR "Errors: \n $@\n End Errors\n" ;
+# 	  	return 0 #failure
+# 	  }
+# 	  	  
+# 	  unless (ref($result) and $result->fault) {    	
+# 	  	my $rh_result = $result->result();
+# 	    #print STDERR pretty_print_rh($rh_result);
+# 		$self->{output} = $rh_result; #$self->formatRenderedProblem($rh_result);
+# 		return 1; # success
+# 
+# 	  } else {
+# 		$self->{output} = 'Error from server: '. join( ",\n ",
+# 		  $result->faultcode,
+# 		  $result->faultstring);
+# 		return 0; #failure
+# 	  }
+# }
+#   
+# sub encodeSource {
+# 	my $self = shift;
+# 	my $source = shift;
+# 	$self->{encodedSource} =encode_base64($source);
+# }
+# sub url {
+# 	my $self = shift;
+# 	my $new_url = shift;
+# 	$self->{url} = $new_url if defined($new_url) and $new_url =~ /\S/;
+# 	$self->{url};
+# }
+# sub pretty_print {    # provides html output -- NOT a method
+#     my $r_input = shift;
+#     my $level = shift;
+#     $level = 4 unless defined($level);
+#     $level--;
+#     return '' unless $level > 0;  # only print three levels of hashes (safety feature)
+#     my $out = '';
+#     if ( not ref($r_input) ) {
+#     	$out = $r_input if defined $r_input;    # not a reference
+#     	$out =~ s/</&lt;/g  ;  # protect for HTML output
+#     } elsif ("$r_input" =~/hash/i) {  # this will pick up objects whose '$self' is hash and so works better than ref($r_iput).
+# 	    local($^W) = 0;
+# 	    
+# 		$out .= "$r_input " ."<TABLE border = \"2\" cellpadding = \"3\" BGCOLOR = \"#FFFFFF\">";
+# 		
+# 		
+# 		foreach my $key ( sort ( keys %$r_input )) {
+# 			$out .= "<tr><TD> $key</TD><TD>=&gt;</td><td>&nbsp;".pretty_print($r_input->{$key}) . "</td></tr>";
+# 		}
+# 		$out .="</table>";
+# 	} elsif (ref($r_input) eq 'ARRAY' ) {
+# 		my @array = @$r_input;
+# 		$out .= "( " ;
+# 		while (@array) {
+# 			$out .= pretty_print(shift @array, $level) . " , ";
+# 		}
+# 		$out .= " )";
+# 	} elsif (ref($r_input) eq 'CODE') {
+# 		$out = "$r_input";
+# 	} else {
+# 		$out = $r_input;
+# 		$out =~ s/</&lt;/g; # protect for HTML output
+# 	}
+# 	
+# 	return $out." ";
+# }
+# 
+# sub setInputTable_for_listLib {
+# 	my $self = shift;
+# 	my $out = {
+# 		pw          =>   $self->{password},
+# 		set         =>   'set0',
+# 		library_name =>  'Library',
+# 		command      =>  'all',
+# 	};
+# 
+# 	$out;
+# }
+# sub setInputTable {
+# 	my $self = shift;
+# 	my $out = {
+# 		pw          =>   $self->{password},
+# 		library_name =>  'Library',
+# 		command      =>  'renderProblem',
+# 		answer_form_submitted   => 1,
+# 		course                  => $self->{course},
+# 		extra_packages_to_load  => [qw( AlgParserWithImplicitExpand Expr
+# 		                                ExprWithImplicitExpand AnswerEvaluator
+# 		                                AnswerEvaluatorMaker 
+# 		)],
+# 		mode                    => $self->{displayMode},
+# 		modules_to_evaluate     => [ qw( 
+# Exporter
+# DynaLoader								
+# GD
+# WWPlot
+# Fun
+# Circle
+# Label								
+# PGrandom
+# Units
+# Hermite
+# List								
+# Match
+# Multiple
+# Select							
+# AlgParser
+# AnswerHash							
+# Fraction
+# VectorField							
+# Complex1
+# Complex							
+# MatrixReal1 Matrix							
+# Distributions
+# Regression
+# 
+# 		)], 
+# 		envir                   => $self->environment(),
+# 		problem_state           => {
+# 		
+# 			num_of_correct_ans  => 0,
+# 			num_of_incorrect_ans => 4,
+# 			recorded_score       => 1.0,
+# 		},
+# 		source                   => $self->{encodedSource},  #base64 encoded
+# 		
+# 		
+# 		
+# 	};
+# 
+# 	$out;
+# }
+# 
+# sub environment {
+# 	my $self = shift;
+# 	my $envir = {
+# 		answerDate  => '4014438528',
+# 		CAPA_Graphics_URL=>'http://webwork-db.math.rochester.edu/capa_graphics/',
+# 		CAPA_GraphicsDirectory =>'/ww/webwork/CAPA/CAPA_Graphics/',
+# 		CAPA_MCTools=>'/ww/webwork/CAPA/CAPA_MCTools/',
+# 		CAPA_Tools=>'/ww/webwork/CAPA/CAPA_Tools/',
+# 		cgiDirectory=>'Not defined',
+# 		cgiURL => 'Not defined',
+# 		classDirectory=> 'Not defined',
+# 		courseName=>'Not defined',
+# 		courseScriptsDirectory=>'not defined',
+# 		displayMode=>$self->{displayMode},
+# 		dueDate=> '4014438528',
+# 		effectivePermissionLevel => 10,
+# 		externalGif2EpsPath=>'not defined',
+# 		externalPng2EpsPath=>'not defined',
+# 		externalTTHPath=>'/usr/local/bin/tth',
+# 		fileName=>'set0/prob1a.pg',
+# 		formattedAnswerDate=>'6/19/00',
+# 		formattedDueDate=>'6/19/00',
+# 		formattedOpenDate=>'6/19/00',
+# 		functAbsTolDefault=> 0.0000001,
+# 		functLLimitDefault=>0,
+# 		functMaxConstantOfIntegration=> 1000000000000.0,
+# 		functNumOfPoints=> 5,
+# 		functRelPercentTolDefault=> 0.000001,
+# 		functULimitDefault=>1,
+# 		functVarDefault=> 'x',
+# 		functZeroLevelDefault=> 0.000001,
+# 		functZeroLevelTolDefault=>0.000001,
+# 		htmlDirectory =>'not defined',
+# 		htmlURL =>'not defined',
+# 		inputs_ref => $self->{inputs_ref},
+# 		macroDirectory=>'not defined',
+# 		numAbsTolDefault=>0.0000001,
+# 		numFormatDefault=>'%0.13g',
+# 		numOfAttempts=> 0,
+# 		numRelPercentTolDefault => 0.0001,
+# 		numZeroLevelDefault =>0.000001,
+# 		numZeroLevelTolDefault =>0.000001,
+# 		openDate=> '3014438528',
+# 		permissionLevel =>10,
+# 		PRINT_FILE_NAMES_FOR => [ 'gage'],
+# 		probFileName => 'set0/prob1a.pg',
+# 		problemSeed  => 1234,
+# 		problemValue =>1,
+# 		probNum => 13,
+# 		psvn => 54321,
+# 		psvn=> 54321,
+# 		questionNumber => 1,
+# 		scriptDirectory => 'Not defined',
+# 		sectionName => 'Gage',
+# 		sectionNumber => 1,
+# 		sessionKey=> 'Not defined',
+# 		setNumber =>'not defined',
+# 		studentLogin =>'gage',
+# 		studentName => 'Mike Gage',
+# 		tempDirectory => 'not defined',
+# 		templateDirectory=>'not defined',
+# 		tempURL=>'not defined',
+# 		webworkDocsURL => 'not defined',
+# 		
+# 		showHints => 1,               # extra options -- usually passed from the input form
+# 		showSolutions => 1,
+# 		
+# 	};
+# 	$envir;
+# };
+# 
+# sub formatAnswerRow {
+# 	my $self = shift;
+# 	my $rh_answer = shift;
+# 	my $problemNumber = shift;
+# 	my $answerString  = $rh_answer->{original_student_ans}||'&nbsp;';
+# 	my $correctAnswer = $rh_answer->{correct_ans}||'';
+# 	my $ans_message   = $rh_answer->{ans_message}||'';
+# 	my $score         = ($rh_answer->{score}) ? 'Correct' : 'Incorrect';
+# 	my $row = qq{
+# 		<tr>
+# 		    <td>
+# 				Prob: $problemNumber
+# 			</td>
+# 			<td>
+# 				$answerString
+# 			</td>
+# 			<td>
+# 			    $score
+# 			</td>
+# 			<td>
+# 				Correct answer is $correctAnswer
+# 			</td>
+# 			<td>
+# 				<i>$ans_message</i>
+# 			</td>
+# 		</tr>\n
+# 	};
+# 	$row;
+# }
+# 	
+# sub formatRenderedProblem {
+# 	my $self 			  = shift;
+# 	my $rh_result         = $self->{output};  # wrap problem in formats
+# 	my $problemText       = decode_base64($rh_result->{text});
+# 	my $rh_answers        = $rh_result->{answers};
+# 	my $encodedSource     = $self->{encodedSource}||'foobar';
+# 	my $warnings          = '';
+# 	if ( defined ($rh_result->{WARNINGS}) and $rh_result->{WARNINGS} ){
+# 		$warnings = "<div style=\"background-color:pink\">
+# 		             <p >WARNINGS</p><p>".decode_base64($rh_result->{WARNINGS})."</p></div>";
+# 	}
+# 	#warn "keys: ", join(" | ", sort keys %{$rh_result });
+# 	my $debug_messages = $rh_result->{flags}->{DEBUG_messages} ||     [];
+#     $debug_messages = join("<br/>\n", @{  $debug_messages }    );
+#     my $internal_debug_messages = $rh_result->{internal_debug_messages} || [];
+#     $internal_debug_messages = join("<br/>\n", @{ $internal_debug_messages  } );
+# 	# collect answers
+# 	my $answerTemplate    = q{<hr>ANSWERS <table border="3" align="center">};
+# 	my $problemNumber     = 1;
+#     foreach my $key (sort  keys %{$rh_answers}) {
+#     	$answerTemplate  .= $self->formatAnswerRow($rh_answers->{$key}, $problemNumber++);
+#     }
+# 	$answerTemplate      .= q{</table> <hr>};
+# 
+# 	my $FULL_URL = $self->url;
+# 	my $FORM_ACTION_URL  =  "$FULL_URL/webwork2/html2xml";
+# 	my $problemTemplate = <<ENDPROBLEMTEMPLATE;
+# <html>
+# <head>
+# <base href="$FULL_URL">
+# <title>WeBWorK Editor using host $HOSTNAME</title>
+# </head>
+# <body>
+# 		    $answerTemplate
+# 		    <form action="$FORM_ACTION_URL" method="post">
+# 			$problemText
+# 	       <input type="hidden" name="answersSubmitted" value="1"> 
+# 	       <input type="hidden" name="problemAddress" value="probSource"> 
+# 	       <input type="hidden" name="problemSource" value="$encodedSource"> 
+# 	       <input type="hidden" name="problemSeed" value="1234"> 
+# 	       <input type="hidden" name="pathToProblemFile" value="foobar">
+# 	       <p><input type="submit" name="submit" value="submit answers"></p>
+# 	     </form>
+# <HR>
+# <h3> Warning section </h3>
+# $warnings
+# <h3>
+# Debug message section
+# </h3>
+# $debug_messages
+# <h3>
+# internal errors
+# </h3>
+# $internal_debug_messages
+# 
+# </body>
+# </html>
+# 
+# ENDPROBLEMTEMPLATE
+# 
+# 
+# 
+# 	$problemTemplate;
+# }
+# 
+
+1;
diff --git a/clients/webwork_soap_client.pl b/clients/webwork_soap_client.pl
new file mode 100755
index 0000000000..5f0bc7a1cd
--- /dev/null
+++ b/clients/webwork_soap_client.pl
@@ -0,0 +1,278 @@
+#!/usr/bin/perl -w
+
+use SOAP::Lite;
+	
+#  configuration section
+use constant  HOSTURL  =>  'localhost'; 
+use constant  HOSTPORT =>  80;
+use constant  TRANSPORT_METHOD => 'SOAP::Lite';
+use constant  REQUEST_CLASS =>'WebworkXMLRPC';  # WebworkXMLRPC is used for soap also!!
+use constant  REQUEST_URI   =>'mod_soap';
+
+my @COMMANDS = qw( listLibraries    renderProblem  ); #listLib  readFile tex2pdf
+
+# $pg{displayModes} = [
+# 	"plainText",     # display raw TeX for math expressions
+# 	"formattedText", # format math expressions using TtH
+# 	"images",        # display math expressions as images generated by dvipng
+# 	"jsMath",        # render TeX math expressions on the client side using jsMath
+# 	"asciimath",     # render TeX math expressions on the client side using ASCIIMathML
+# ];
+use constant DISPLAYMODE   => 'images';
+
+# end configuration section
+use MIME::Base64 qw( encode_base64 decode_base64);
+
+
+print STDERR "inputs are ", join (" | ", @ARGV), "\n";
+our $source;
+
+if (@ARGV) {
+    my $command = $ARGV[0];
+    
+    warn "executing WebworkXMLRPC.$command";
+    $source = (defined $ARGV[1]) ? `cat $ARGV[1]` : '' ;
+	xmlrpcCall($command);
+
+
+} else {
+
+	print STDERR "Useage: ./webwork_soap_client.pl command   inputs\n";
+	print STDERR "For example: ./webwork_soap_client renderProblem   input.txt\n";
+	print STDERR "For example: ./webwork_soap_client listLibraries   \n";
+	print STDERR "Commands are: ", join(" ", @COMMANDS), "\n";
+	
+}
+
+
+
+sub xmlrpcCall {
+	my $command = shift;
+	$command   = 'listLibraries' unless $command;
+
+	  my $requestResult = TRANSPORT_METHOD
+	        ->uri('http://'.HOSTURL.':'.HOSTPORT.'/'.REQUEST_CLASS)
+			-> proxy('http://'.HOSTURL.':'.HOSTPORT.'/'.REQUEST_URI);
+		
+	  my $test = [3,4,5,6];     
+	  my $input = setInputTable();
+	  print "displayMode=",$input->{envir}->{displayMode},"\n";
+	  local( $result);
+	  # use eval to catch errors
+	  eval { $result = $requestResult->call("$command",$input) };
+	  print STDERR "There were a lot of errors\n" if $@;
+	  print "Errors: \n $@\n End Errors\n" if $@;
+	
+	  print "result is|", ref($result),"|";
+	
+	  unless (ref($result) and $result->fault) {
+	  
+	  	if (ref($result->result())=~/HASH/ and defined($result->result()->{text}) ) {
+	  		$result->result()->{text} = decode_base64($result->result()->{text});
+	  	}
+		print  pretty_print_rh($result->result()),"\n";  #$result->result()
+	  } else {
+		print 'oops ', join ', ',
+		  $result->faultcode,
+		  $result->faultstring;
+	  }
+}
+  
+sub source {
+	encode_base64($source);
+}
+sub pretty_print_rh { 
+    shift if UNIVERSAL::isa($_[0] => __PACKAGE__);
+	my $rh = shift;
+	my $indent = shift || 0;
+	my $out = "";
+	my $type = ref($rh);
+
+	if (defined($type) and $type) {
+		$out .= " type = $type; ";
+	} elsif (! defined($rh )) {
+		$out .= " type = UNDEFINED; ";
+	}
+	return $out." " unless defined($rh);
+	
+	if ( ref($rh) =~/HASH/ or "$rh" =~/HASH/ ) {
+	    $out .= "{\n";
+	    $indent++;
+ 		foreach my $key (sort keys %{$rh})  {
+ 			$out .= "  "x$indent."$key => " . pretty_print_rh( $rh->{$key}, $indent ) . "\n";
+ 		}
+ 		$indent--;
+ 		$out .= "\n"."  "x$indent."}\n";
+
+ 	} elsif (ref($rh)  =~  /ARRAY/ or "$rh" =~/ARRAY/) {
+ 	    $out .= " ( ";
+ 		foreach my $elem ( @{$rh} )  {
+ 		 	$out .= pretty_print_rh($elem, $indent);
+ 		
+ 		}
+ 		$out .=  " ) \n";
+	} elsif ( ref($rh) =~ /SCALAR/ ) {
+		$out .= "scalar reference ". ${$rh};
+	} elsif ( ref($rh) =~/Base64/ ) {
+		$out .= "base64 reference " .$$rh;
+	} else {
+		$out .=  $rh;
+	}
+	
+	return $out." ";
+}
+
+sub setInputTable_for_listLib {
+	$out = {
+		#password    =>  'geometry',
+		pw          =>   'geometry',
+		set         =>   'set0',
+		library_name =>  'rochesterLibrary',
+		command      =>  'all',
+	};
+
+	$out;
+}
+sub setInputTable {
+	$out = {
+		#password    =>  'geometry',
+		pw          =>   'geometry',
+		set         =>   'set0',
+		library_name =>  'rochesterLibrary',
+		command      =>  'all',
+		answer_form_submitted   => 1,
+		course                  => 'daemon_course',
+		extra_packages_to_load  => [qw( AlgParserWithImplicitExpand Expr
+		                                ExprWithImplicitExpand AnswerEvaluator
+		                                AnswerEvaluatorMaker 
+		)],
+		mode                    => 'HTML_dpng',
+		modules_to_evaluate     => [ qw( 
+Exporter
+
+DynaLoader
+
+								
+GD
+WWPlot
+Fun
+Circle
+Label
+
+								
+PGrandom
+Units
+Hermite
+
+List
+
+								
+Match
+Multiple
+Select
+
+								
+AlgParser
+
+AnswerHash
+
+								
+Fraction
+VectorField
+
+								
+Complex1
+Complex
+
+								
+MatrixReal1 Matrix
+
+								
+Distributions
+
+Regression
+
+		)], 
+		envir                   => environment(),
+		problem_state           => {
+		
+			num_of_correct_ans  => 2,
+			num_of_incorrect_ans => 4,
+			recorded_score       => 1.0,
+		},
+		source                   => source(),  #base64 encoded
+		
+		
+		
+	};
+
+	$out;
+}
+
+sub environment {
+	my $envir = {
+		answerDate  => '4014438528',
+		CAPA_Graphics_URL=>'http://webwork-db.math.rochester.edu/capa_graphics/',
+		CAPA_GraphicsDirectory =>'/ww/webwork/CAPA/CAPA_Graphics/',
+		CAPA_MCTools=>'/ww/webwork/CAPA/CAPA_MCTools/',
+		CAPA_Tools=>'/ww/webwork/CAPA/CAPA_Tools/',
+		cgiDirectory=>'Not defined',
+		cgiURL => 'Not defined',
+		classDirectory=> 'Not defined',
+		courseName=>'Not defined',
+		courseScriptsDirectory=>'/ww/webwork/system/courseScripts/',
+		displayMode=>DISPLAYMODE,
+		dueDate=> '4014438528',
+		externalGif2EpsPath=>'not defined',
+		externalPng2EpsPath=>'not defined',
+		externalTTHPath=>'/usr/local/bin/tth',
+		fileName=>'set0/prob1a.pg',
+		formattedAnswerDate=>'6/19/00',
+		formattedDueDate=>'6/19/00',
+		formattedOpenDate=>'6/19/00',
+		functAbsTolDefault=> 0.0000001,
+		functLLimitDefault=>0,
+		functMaxConstantOfIntegration=> 1000000000000.0,
+		functNumOfPoints=> 5,
+		functRelPercentTolDefault=> 0.000001,
+		functULimitDefault=>1,
+		functVarDefault=> 'x',
+		functZeroLevelDefault=> 0.000001,
+		functZeroLevelTolDefault=>0.000001,
+		htmlDirectory =>'/ww/webwork/courses/gage_course/html/',
+		htmlURL =>'http://webwork-db.math.rochester.edu/gage_course/',
+		inputs_ref => {
+				 AnSwEr1 => '',
+				 AnSwEr2 => '',
+				 AnSwEr3 => '',
+		},
+		macroDirectory=>'/ww/webwork/courses/gage_course/templates/macros/',
+		numAbsTolDefault=>0.0000001,
+		numFormatDefault=>'%0.13g',
+		numOfAttempts=> 0,
+		numRelPercentTolDefault => 0.0001,
+		numZeroLevelDefault =>0.000001,
+		numZeroLevelTolDefault =>0.000001,
+		openDate=> '3014438528',
+		PRINT_FILE_NAMES_FOR => [ 'gage'],
+		probFileName => 'set0/prob1a.pg',
+		problemSeed  => 1234,
+		problemValue =>1,
+		probNum => 13,
+		psvn => 54321,
+		psvn=> 54321,
+		questionNumber => 1,
+		scriptDirectory => 'Not defined',
+		sectionName => 'Gage',
+		sectionNumber => 1,
+		sessionKey=> 'Not defined',
+		setNumber =>'MAAtutorial',
+		studentLogin =>'gage',
+		studentName => 'Mike Gage',
+		tempDirectory => '/ww/htdocs/tmp/gage_course/',
+		templateDirectory=>'/ww/webwork/courses/gage_course/templates/',
+		tempURL=>'http://webwork-db.math.rochester.edu/tmp/gage_course/',
+		webworkDocsURL => 'http://webwork.math.rochester.edu/webwork_gage_system_html',
+	};
+	$envir;
+};
\ No newline at end of file
diff --git a/clients/webwork_xmlrpc_client.pl b/clients/webwork_xmlrpc_client.pl
new file mode 100755
index 0000000000..dea4d2b0a5
--- /dev/null
+++ b/clients/webwork_xmlrpc_client.pl
@@ -0,0 +1,366 @@
+#!/usr/bin/perl -w
+
+=pod
+
+This script will take a command and an input 
+file.
+
+It will list available libraries, list the contents of libraries
+or render the input file.
+
+All of this is done by contacting the webservice.
+
+
+
+=cut
+
+use feature ":5.10";
+use XMLRPC::Lite;
+use MIME::Base64 qw( encode_base64 decode_base64);
+
+#  configuration section
+use constant  PROTOCOL         =>  'http';   # or 'http';
+use constant  HOSTURL          =>  'localhost'; 
+use constant  HOSTPORT         =>  '80';  # or 80
+use constant  TRANSPORT_METHOD => 'XMLRPC::Lite';
+use constant  REQUEST_CLASS    =>'WebworkXMLRPC';  # WebworkXMLRPC is used for soap also!!
+use constant  REQUEST_URI      =>'mod_xmlrpc';
+use constant  TEMPOUTPUTFILE   => '/Users/gage/Desktop/renderProblemOutput.html';
+use constant  COURSENAME           => 'gage_course';
+
+my $credential_path = ".ww_credentials";
+eval{require $credential_path};
+if ($@ ) {
+print STDERR <<EOF;
+Can't find file .ww_credentials:
+Place a file with that name and containing this information in the current directory
+%credentials = (
+        userID          => "my login name for the webwork course",
+        password        => "my password ",
+        courseID        => "the name of the webwork course",
+)
+---------------------------------------------------------
+EOF
+die;
+}
+
+
+# print "credentials: ", join(" | ", %credentials), "\n";
+
+my @COMMANDS = qw( listLibraries    renderProblem   listLib  readFile tex2pdf );
+
+# $pg{displayModes} = [
+# 	"plainText",     # display raw TeX for math expressions
+# 	"formattedText", # format math expressions using TtH
+# 	"images",        # display math expressions as images generated by dvipng
+# 	"jsMath",        # render TeX math expressions on the client side using jsMath
+# 	"asciimath",     # render TeX math expressions on the client side using ASCIIMathML
+# ];
+use constant DISPLAYMODE   => 'images';
+
+
+# end configuration section
+
+our $courseName = $credentials{courseID};
+
+print STDERR "inputs are ", join (" | ", @ARGV), "\n";
+our $source;
+
+if (@ARGV) {
+    my $command = $ARGV[0];
+    my $result;
+    print  "executing WebworkXMLRPC.$command \n\n-----------------------\n\n";
+    given($command) {
+    	when ('renderProblem') { if ( defined $ARGV[1])  {
+    								if (-r $ARGV[1] ) {
+    									$source = `cat $ARGV[1]`;
+    									xmlrpcCall($command);
+    								} else {
+    									print STDERR  "Can't read source file $ARGV[1]\n";
+    								}
+    							  } else {
+    							      print STDERR "Useage: ./webwork_xmlrpc_client.pl command   <file_name>\n";
+    							  }
+    	}
+    	when ('listLibraries') {$result = xmlrpcCall($command);
+    							if (defined($result) ) {
+    								print STDOUT "The  libraries available in course $courseName are:\n\t ", join("\n\t ", @$result), "\n";
+    							} else {
+    								print STDOUT "No libraries available for course $courseName\n";
+    							}
+    	}
+    	when ('listLib')       {listLib( @ARGV );}
+    	when ('readFile')      {print STDERR "Command $command not yet implemented\n"}
+    	when ('tex2pdf')       {print STDERR "Command $command not yet implemented\n"}
+    }
+
+
+} else {
+
+	print STDERR "Useage: ./webwork_xmlrpc_client.pl command   [file_name]\n";
+	print STDERR "For example: ./webwork_xmlrpc_client.pl renderProblem   <source file: e.g.  input.txt, bad_input.txt \n";
+	print STDERR "For example: ./webwork_xmlrpc_client.pl  listLibraries   \n";
+	print STDERR "For example: ./webwork_xmlrpc_client.pl listLib all \n";
+	print STDERR "For example: ./webwork_xmlrpc_client.pl listLib setsOnly \n";
+	print STDERR "For example: ./webwork_xmlrpc_client.pl listLib listSet <setID: e.g. set0> \n";
+	print STDERR "Commands are: ", join(" ", @COMMANDS), "\n";
+	
+}
+
+
+
+sub xmlrpcCall {
+	my $command = shift;
+	my $input   = shift||{};
+	$command   = 'listLibraries' unless defined $command;
+    my $std_input = standard_input();
+    $input = {%$std_input, %$input};  # concatenate and override standard_input 
+    
+    # print "new input is ", pretty_print_rh($input);
+    
+	  my $requestResult = TRANSPORT_METHOD
+	        #->uri('http://'.HOSTURL.':'.HOSTPORT.'/'.REQUEST_CLASS)
+			-> proxy(PROTOCOL.'://'.HOSTURL.':'.HOSTPORT.'/'.REQUEST_URI);
+		
+	  # my $test = [3,4,5,6];     
+
+	  # print "displayMode=",$input->{envir}->{displayMode},"\n";
+	  local( $result);
+	  # use eval to catch errors
+	  eval { $result = $requestResult->call(REQUEST_CLASS.'.'.$command,$input) };
+	  print STDERR "There were a lot of errors\n" if $@;
+	  print "Errors: \n $@\n End Errors\n" if $@;
+	
+	  print "result is <|", ref($result),"|>\n";
+	
+	  unless (ref($result) and $result->fault) {
+	  
+	  	if (ref($result->result())=~/HASH/ and defined($result->result()->{text}) ) {
+	  		$result->result()->{text} = decode_base64($result->result()->{text});
+	  	}
+		print  pretty_print_rh($result->result()),"\n";  #$result->result()
+		return $result->result();
+	  } else {
+		print 'oops ', join ', ',
+		  $result->faultcode, 
+		  $result->faultstring;
+		  return undef;
+	  }
+}
+  
+sub source {
+	return "" unless $source;
+	return encode_base64($source);
+}
+sub listLib {
+	my @ARGS = @_;
+	#print "args for listLib are ", join(" ", @ARGS), "\n";
+	given($ARGS[1]) { 
+		when ("all") { $input = {		pw          	 =>   'xmluser',
+										password    	 =>   $credentials{password},
+        								user        	 =>   $credentials{userID},
+        								courseID    	 =>   $credentials{courseID},
+        								command     	 =>   'all',
+        						};
+        			   xmlrpcCall("listLib", $input);
+        			}
+        when ('dirOnly') { $input = {		pw          	 =>   'xmluser',
+										password    	 =>   $credentials{password},
+        								user        	 =>   $credentials{userID},
+        								courseID    	 =>   $credentials{courseID},
+        								command     	 =>   'dirOnly',
+        						};
+        			   		xmlrpcCall("listLib", $input);
+        				}
+        when('files') 	{ if ($ARGS[2]  ) { 
+    							my $dirPath = $ARGS[2];     
+								$input = {		pw          	 =>   'xmluser',
+												password    	 =>   $credentials{password},
+												user        	 =>   $credentials{userID},
+												courseID    	 =>   $credentials{courseID},
+												command     	 =>   'files',
+												dirPath          =>   $dirPath,
+											};
+								xmlrpcCall("listLib", $input);
+							} else {
+								print STDERR "Usage:  webwork_xmlrpc_client listLib files  <path to directory >\n"
+							}
+							
+        				}
+
+	
+	
+	
+		default {print "The possible arguments for listLib are:".  
+		                "\n\t all -- print all paths". 
+		                "\n\t dirOnly -- print only directories".
+		                "\n\t files <path_to_directory> -- print .pg files in the given directory \n" 
+		}
+	}
+}
+sub pretty_print_rh { 
+    shift if UNIVERSAL::isa($_[0] => __PACKAGE__);
+	my $rh = shift;
+	my $indent = shift || 0;
+	my $out = "";
+	my $type = ref($rh);
+
+	if (defined($type) and $type) {
+		$out .= " type = $type; ";
+	} elsif (! defined($rh )) {
+		$out .= " type = UNDEFINED; ";
+	}
+	return $out." " unless defined($rh);
+	
+	if ( ref($rh) =~/HASH/ or "$rh" =~/HASH/ ) {
+	    $out .= "{\n";
+	    $indent++;
+ 		foreach my $key (sort keys %{$rh})  {
+ 			$out .= "  "x$indent."$key => " . pretty_print_rh( $rh->{$key}, $indent ) . "\n";
+ 		}
+ 		$indent--;
+ 		$out .= "\n"."  "x$indent."}\n";
+
+ 	} elsif (ref($rh)  =~  /ARRAY/ or "$rh" =~/ARRAY/) {
+ 	    $out .= " ( ";
+ 		foreach my $elem ( @{$rh} )  {
+ 		 	$out .= pretty_print_rh($elem, $indent);
+ 		
+ 		}
+ 		$out .=  " ) \n";
+	} elsif ( ref($rh) =~ /SCALAR/ ) {
+		$out .= "scalar reference ". ${$rh};
+	} elsif ( ref($rh) =~/Base64/ ) {
+		$out .= "base64 reference " .$$rh;
+	} else {
+		$out .=  $rh;
+	}
+	
+	return $out." ";
+}
+
+
+sub standard_input {
+	$out = {
+		pw            			=>   'xmluser',
+		password      			=>   $credentials{password},
+		userID          		=>   $credentials{userID},
+		set               		=>   'set0',
+		library_name 			=>  'Library',
+		command      			=>  'all',
+		answer_form_submitted   => 1,
+		courseID                 => $credentials{courseID},,
+		extra_packages_to_load  => [qw( AlgParserWithImplicitExpand Expr
+		                                ExprWithImplicitExpand AnswerEvaluator
+		                                AnswerEvaluatorMaker 
+		)],
+		mode                    => DISPLAYMODE(),
+		modules_to_evaluate     => [ qw( 
+Exporter
+DynaLoader								
+GD
+WWPlot
+Fun
+Circle
+Label								
+PGrandom
+Units
+Hermite
+List								
+Match
+Multiple
+Select							
+AlgParser
+AnswerHash							
+Fraction
+VectorField							
+Complex1
+Complex							
+MatrixReal1 Matrix							
+Distributions
+Regression
+
+		)], 
+		envir                   => environment(),
+		problem_state           => {
+		
+			num_of_correct_ans  => 2,
+			num_of_incorrect_ans => 4,
+			recorded_score       => 1.0,
+		},
+		source                   => source(),  #base64 encoded
+		
+		
+		
+	};
+
+	$out;
+}
+
+sub environment {
+	my $envir = {
+		answerDate  => '4014438528',
+		CAPA_Graphics_URL=>'http://webwork-db.math.rochester.edu/capa_graphics/',
+		CAPA_GraphicsDirectory =>'/ww/webwork/CAPA/CAPA_Graphics/',
+		CAPA_MCTools=>'/ww/webwork/CAPA/CAPA_MCTools/',
+		CAPA_Tools=>'/ww/webwork/CAPA/CAPA_Tools/',
+		cgiDirectory=>'Not defined',
+		cgiURL => 'Not defined',
+		classDirectory=> 'Not defined',
+		courseName=>'Not defined',
+		courseScriptsDirectory=>'/ww/webwork/system/courseScripts/',
+		displayMode=>DISPLAYMODE,
+		dueDate=> '4014438528',
+		externalGif2EpsPath=>'not defined',
+		externalPng2EpsPath=>'not defined',
+		externalTTHPath=>'/usr/local/bin/tth',
+		fileName=>'set0/prob1a.pg',
+		formattedAnswerDate=>'6/19/00',
+		formattedDueDate=>'6/19/00',
+		formattedOpenDate=>'6/19/00',
+		functAbsTolDefault=> 0.0000001,
+		functLLimitDefault=>0,
+		functMaxConstantOfIntegration=> 1000000000000.0,
+		functNumOfPoints=> 5,
+		functRelPercentTolDefault=> 0.000001,
+		functULimitDefault=>1,
+		functVarDefault=> 'x',
+		functZeroLevelDefault=> 0.000001,
+		functZeroLevelTolDefault=>0.000001,
+		htmlDirectory =>'/ww/webwork/courses/gage_course/html/',
+		htmlURL =>'http://webwork-db.math.rochester.edu/gage_course/',
+		inputs_ref => {
+				 AnSwEr1 => '',
+				 AnSwEr2 => '',
+				 AnSwEr3 => '',
+		},
+		macroDirectory=>'/ww/webwork/courses/gage_course/templates/macros/',
+		numAbsTolDefault=>0.0000001,
+		numFormatDefault=>'%0.13g',
+		numOfAttempts=> 0,
+		numRelPercentTolDefault => 0.0001,
+		numZeroLevelDefault =>0.000001,
+		numZeroLevelTolDefault =>0.000001,
+		openDate=> '3014438528',
+		PRINT_FILE_NAMES_FOR => [ 'gage'],
+		probFileName => 'set0/prob1a.pg',
+		problemSeed  => 1234,
+		problemValue =>1,
+		probNum => 13,
+		psvn => 54321,
+		psvn=> 54321,
+		questionNumber => 1,
+		scriptDirectory => 'Not defined',
+		sectionName => 'Gage',
+		sectionNumber => 1,
+		sessionKey=> 'Not defined',
+		setNumber =>'MAAtutorial',
+		studentLogin =>'gage',
+		studentName => 'Mike Gage',
+		tempDirectory => '/ww/htdocs/tmp/gage_course/',
+		templateDirectory=>'/ww/webwork/courses/gage_course/templates/',
+		tempURL=>'http://webwork-db.math.rochester.edu/tmp/gage_course/',
+		webworkDocsURL => 'http://webwork.math.rochester.edu/webwork_gage_system_html',
+	};
+	$envir;
+};
diff --git a/conf/database.conf.dist b/conf/database.conf.dist
new file mode 100644
index 0000000000..5a4d19a95c
--- /dev/null
+++ b/conf/database.conf.dist
@@ -0,0 +1,312 @@
+#!perl
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/conf/database.conf.dist,v 1.38 2007/08/13 22:59:51 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+=head1 NAME
+
+database.conf - define standard database layouts
+
+=head1 SYNOPSIS
+
+In global.conf:
+
+ include "conf/database.conf";
+ *dbLayout = $dbLayouts{layoutName};
+
+=head1 DESCRIPTION
+
+This file contains definitions for the commonly-used database layouts. Database
+layouts consist of all the information necessary to describe how to access data
+used by WeBWorK. For more information on the format of a database layout,
+consult the documentation for the WeBWorK::DB module.
+
+A database layout is selected from the list of possible layouts by adding a
+line like the one below to the F<global.conf> or F<course.conf> file.
+
+ $dbLayoutName = "layoutName";
+ *dbLayout = $dbLayouts{$dbLayoutName};
+
+=cut
+
+%dbLayouts = (); # layouts are added to this hash below
+
+=head2 THE SQL_SINGLE DATABASE LAYOUT
+
+The C<sql_single> layout is similar to the C<sql> layout, excpet that it uses a
+single database for all courses. This is accomplised by prefixing each table
+name with the name of the course. The names and passwords of these accounts are
+given as parameters to each table in the layout.
+
+ username     the username to use when connecting to the database
+ password     the password to use when connecting to the database
+
+Be default, username is "webworkRead" and password is "". It is not recommended
+that you use only a non-empty password to secure database access. Most RDBMSs
+allow IP-based authorization as well. As the system administrator, IT IS YOUR
+RESPONSIBILITY TO SECURE DATABASE ACCESS.
+
+Don't confuse the account information above with the accounts of the users of a
+course. This is a system-wide account which allow WeBWorK to talk to the
+database server.
+
+Other parameters that can be given are as follows:
+
+ tableOverride  an alternate name to use when referrring to the table (used
+                when a table name is a resereved word)
+ fieldOverride  a hash mapping WeBWorK field names to alternate names to use
+                when referring to those fields (used when one or more field
+				names are reserved words)
+ debug          if true, SQL statments are printed before being executed
+
+=cut
+
+# params common to all tables
+my %sqlParams = (
+	username => $database_username,
+	password => $database_password,
+	debug    => $database_debug,
+	# kinda hacky, but needed for table dumping
+	mysql_path     => $externalPrograms{mysql},
+	mysqldump_path => $externalPrograms{mysqldump},
+);
+
+$dbLayouts{sql_single} = {
+        locations => {
+                record => "WeBWorK::DB::Record::Locations",
+                schema => "WeBWorK::DB::Schema::NewSQL::Std",
+                driver => "WeBWorK::DB::Driver::SQL",
+                source => $database_dsn,
+                params => { %sqlParams,
+                        non_native => 1,
+                },
+        },
+        location_addresses => {
+                record => "WeBWorK::DB::Record::LocationAddresses",
+                schema => "WeBWorK::DB::Schema::NewSQL::Std",
+                driver => "WeBWorK::DB::Driver::SQL",
+                source => $database_dsn,
+                params => { %sqlParams,
+                        non_native => 1,
+                },
+        },
+        depths => {
+				record => "WeBWorK::DB::Record::Depths",
+				schema => "WeBWorK::DB::Schema::NewSQL::Std",
+				driver => "WeBWorK::DB::Driver::SQL",
+				source => $database_dsn,
+				params => { %sqlParams,
+					non_native => 1,
+		},
+	},
+	password => {
+		record => "WeBWorK::DB::Record::Password",
+		schema => "WeBWorK::DB::Schema::NewSQL::Std",
+		driver => "WeBWorK::DB::Driver::SQL",
+		source => $database_dsn,
+		params => { %sqlParams,
+			tableOverride => "${courseName}_password",
+		},
+	},
+	permission => {
+		record => "WeBWorK::DB::Record::PermissionLevel",
+		schema => "WeBWorK::DB::Schema::NewSQL::Std",
+		driver => "WeBWorK::DB::Driver::SQL",
+		source => $database_dsn,
+		params => { %sqlParams,
+			tableOverride => "${courseName}_permission",
+		},
+	},
+	key => {
+		record => "WeBWorK::DB::Record::Key",
+		schema => "WeBWorK::DB::Schema::NewSQL::Std",
+		driver => "WeBWorK::DB::Driver::SQL",
+		source => $database_dsn,
+		params => { %sqlParams,
+			tableOverride => "${courseName}_key",
+			fieldOverride => { key => "key_not_a_keyword" },
+		},
+	},
+	user => {
+		record => "WeBWorK::DB::Record::User",
+		schema => "WeBWorK::DB::Schema::NewSQL::Std",
+		driver => "WeBWorK::DB::Driver::SQL",
+		source => $database_dsn,
+		params => { %sqlParams,
+			tableOverride => "${courseName}_user",
+		},
+	},
+	set => {
+		record => "WeBWorK::DB::Record::Set",
+		schema => "WeBWorK::DB::Schema::NewSQL::Std",
+		driver => "WeBWorK::DB::Driver::SQL",
+		source => $database_dsn,
+		params => { %sqlParams,
+			tableOverride => "${courseName}_set",
+			fieldOverride => { visible => "published" }, # for compatibility -- visible was originally called published
+		},
+	},
+	set_user => {
+		record => "WeBWorK::DB::Record::UserSet",
+		schema => "WeBWorK::DB::Schema::NewSQL::NonVersioned",
+		driver => "WeBWorK::DB::Driver::SQL",
+		source => $database_dsn,
+		params => { %sqlParams,
+			tableOverride => "${courseName}_set_user",
+			fieldOverride => { visible => "published" }, # for compatibility -- visible was originally called published
+		},
+	},
+	set_merged => {
+		record => "WeBWorK::DB::Record::UserSet",
+		schema => "WeBWorK::DB::Schema::NewSQL::Merge",
+		driver => "WeBWorK::DB::Driver::SQL",
+		source => $database_dsn,
+		depend => [qw/set_user set/],
+		params => { %sqlParams,
+			non_native => 1,
+			merge      => [qw/set_user set/],
+		},
+	},
+	set_version => {
+		record => "WeBWorK::DB::Record::SetVersion",
+		schema => "WeBWorK::DB::Schema::NewSQL::Versioned",
+		driver => "WeBWorK::DB::Driver::SQL",
+		source => $database_dsn,
+		params => { %sqlParams,
+			non_native => 1,
+			tableOverride => "${courseName}_set_user",
+			fieldOverride => { visible => "published" }, # for compatibility -- visible was originally called published
+
+		},
+	},
+	set_version_merged => {
+		record => "WeBWorK::DB::Record::SetVersion",
+		schema => "WeBWorK::DB::Schema::NewSQL::Merge",
+		driver => "WeBWorK::DB::Driver::SQL",
+		source => $database_dsn,
+		depend => [qw/set_version set_user set/],
+		params => { %sqlParams,
+			non_native => 1,
+			merge      => [qw/set_version set_user set/],
+		},
+	},
+        set_locations => {
+                record => "WeBWorK::DB::Record::SetLocations",
+                schema => "WeBWorK::DB::Schema::NewSQL::Std",
+                driver => "WeBWorK::DB::Driver::SQL",
+                source => $database_dsn,
+                params => { %sqlParams,
+                        tableOverride => "${courseName}_set_locations"
+                },
+        },
+        set_locations_user => {
+                record => "WeBWorK::DB::Record::UserSetLocations",
+                schema => "WeBWorK::DB::Schema::NewSQL::Std",
+                driver => "WeBWorK::DB::Driver::SQL",
+                source => $database_dsn,
+                params => { %sqlParams,
+                        tableOverride => "${courseName}_set_locations_user"
+                },
+        },
+	problem => {
+		record => "WeBWorK::DB::Record::Problem",
+		schema => "WeBWorK::DB::Schema::NewSQL::Std",
+		driver => "WeBWorK::DB::Driver::SQL",
+		source => $database_dsn,
+		params => { %sqlParams,
+			tableOverride => "${courseName}_problem"
+		},
+	},
+	problem_user => {
+		record => "WeBWorK::DB::Record::UserProblem",
+		schema => "WeBWorK::DB::Schema::NewSQL::NonVersioned",
+		driver => "WeBWorK::DB::Driver::SQL",
+		source => $database_dsn,
+		params => { %sqlParams,
+			tableOverride => "${courseName}_problem_user"
+		},
+	},
+	problem_merged => {
+		record => "WeBWorK::DB::Record::UserProblem",
+		schema => "WeBWorK::DB::Schema::NewSQL::Merge",
+		driver => "WeBWorK::DB::Driver::SQL",
+		source => $database_dsn,
+		depend => [qw/problem_user problem/],
+		params => { %sqlParams,
+			non_native => 1,
+			merge      => [qw/problem_user problem/],
+		},
+	},
+	problem_version => {
+		record => "WeBWorK::DB::Record::ProblemVersion",
+		schema => "WeBWorK::DB::Schema::NewSQL::Versioned",
+		driver => "WeBWorK::DB::Driver::SQL",
+		source => $database_dsn,
+		params => { %sqlParams,
+			non_native => 1,
+			tableOverride => "${courseName}_problem_user",
+		},
+	},
+	problem_version_merged => {
+		record => "WeBWorK::DB::Record::ProblemVersion",
+		schema => "WeBWorK::DB::Schema::NewSQL::Merge",
+		driver => "WeBWorK::DB::Driver::SQL",
+		source => $database_dsn,
+		depend => [qw/problem_version problem_user problem/],
+		params => { %sqlParams,
+			non_native => 1,
+			merge      => [qw/problem_version problem_user problem/],
+		},
+	},
+	setting => {
+		record => "WeBWorK::DB::Record::Setting",
+		schema => "WeBWorK::DB::Schema::NewSQL::Std",
+		driver => "WeBWorK::DB::Driver::SQL",
+		source => $database_dsn,
+		params => { %sqlParams,
+			tableOverride => "${courseName}_setting"
+		},
+	},
+};
+
+
+=head1 DATABASE LAYOUT METADATA
+
+=over
+
+=item @dbLayout_order
+
+Database layouts listed in this array will be displayed first, in the order
+specified, wherever database layouts are listed. (For example, in the "Add
+Course" tool.) Other layouts are listed after these.
+
+=cut
+
+@dbLayout_order = qw/sql_single sql_moodle/;
+
+=item %dbLayout_descr
+
+Hash mapping database layout names to textual descriptions.
+
+=cut
+
+%dbLayout_descr = (
+	sql_single => "Uses a single SQL database to record WeBWorK data for all courses using this layout. This is the recommended layout for new courses.",
+#	sql_moodle => "Simiar to sql_single, but uses a Moodle database for user, password, and permission information. This layout should be used for courses used with wwmoodle.",
+);
+
+=back
+
+=cut
diff --git a/conf/httpd-wwmp-header.conf.dist b/conf/devel-site.apache-config.dist
similarity index 65%
rename from conf/httpd-wwmp-header.conf.dist
rename to conf/devel-site.apache-config.dist
index 98fb7941b3..a48bd07574 100644
--- a/conf/httpd-wwmp-header.conf.dist
+++ b/conf/devel-site.apache-config.dist
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/conf/devel-site.apache-config.dist,v 1.7 2006/09/01 14:16:36 sh002i 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
@@ -14,21 +14,23 @@
 # Artistic License for more details.
 ################################################################################
 
-# This file contains apache configuration directives that should be suitable for
-# any WeBWorK 2 development installation. http-wwmp.conf.dist expects to find
-# this file at /path/to/webwork-modperl/conf/httpd-wwmp-header.conf. Simply
-# copying this file to that location should suffice.
+# This file contains the site-specific (but user-independent) directives used
+# in the configuration of Apache servers for WeBWorK development. See the file
+# devel.apache-config for more information.
+# 
+# Configure this file to match your main Apache configuration file, usually
+# apache.conf or httpd.conf. This file ships configured use on the host
+# devel.webwork.rochester.edu.
 
-### Section 1: Global Environment
-ServerType standalone
-ServerRoot /usr/local
+################################################################################
+# Section 1: Global Environment
+################################################################################
 
+ServerType standalone
+#ServerRoot /usr/local
 ResourceConfig /dev/null
 AccessConfig /dev/null
-
 Timeout 300
-
-# Whether or not to allow persistent connections
 KeepAlive On
 MaxKeepAliveRequests 100
 KeepAliveTimeout 15
@@ -36,39 +38,45 @@ KeepAliveTimeout 15
 # Dynamic Shared Object (DSO) Support
 # Note: The order in which modules are loaded is important.  Don't change
 # the order below without expert advice.
-LoadModule mmap_static_module libexec/apache/mod_mmap_static.so
-LoadModule vhost_alias_module libexec/apache/mod_vhost_alias.so
-LoadModule env_module         libexec/apache/mod_env.so
-LoadModule config_log_module  libexec/apache/mod_log_config.so
-LoadModule mime_magic_module  libexec/apache/mod_mime_magic.so
-LoadModule mime_module        libexec/apache/mod_mime.so
-LoadModule negotiation_module libexec/apache/mod_negotiation.so
-LoadModule status_module      libexec/apache/mod_status.so
-LoadModule info_module        libexec/apache/mod_info.so
-LoadModule includes_module    libexec/apache/mod_include.so
-LoadModule autoindex_module   libexec/apache/mod_autoindex.so
-LoadModule dir_module         libexec/apache/mod_dir.so
-LoadModule cgi_module         libexec/apache/mod_cgi.so
-LoadModule asis_module        libexec/apache/mod_asis.so
-LoadModule imap_module        libexec/apache/mod_imap.so
-LoadModule action_module      libexec/apache/mod_actions.so
-LoadModule speling_module     libexec/apache/mod_speling.so
-LoadModule userdir_module     libexec/apache/mod_userdir.so
-LoadModule alias_module       libexec/apache/mod_alias.so
-LoadModule rewrite_module     libexec/apache/mod_rewrite.so
-LoadModule access_module      libexec/apache/mod_access.so
-LoadModule auth_module        libexec/apache/mod_auth.so
-LoadModule anon_auth_module   libexec/apache/mod_auth_anon.so
-LoadModule db_auth_module     libexec/apache/mod_auth_db.so
-LoadModule digest_module      libexec/apache/mod_digest.so
-LoadModule proxy_module       libexec/apache/libproxy.so
-LoadModule cern_meta_module   libexec/apache/mod_cern_meta.so
-LoadModule expires_module     libexec/apache/mod_expires.so
-LoadModule headers_module     libexec/apache/mod_headers.so
-LoadModule usertrack_module   libexec/apache/mod_usertrack.so
-LoadModule unique_id_module   libexec/apache/mod_unique_id.so
-LoadModule setenvif_module    libexec/apache/mod_setenvif.so
-LoadModule perl_module        libexec/apache/libperl.so
+LoadModule mmap_static_module /usr/local/libexec/apache/mod_mmap_static.so
+LoadModule vhost_alias_module /usr/local/libexec/apache/mod_vhost_alias.so
+LoadModule env_module         /usr/local/libexec/apache/mod_env.so
+LoadModule define_module      /usr/local/libexec/apache/mod_define.so
+LoadModule config_log_module  /usr/local/libexec/apache/mod_log_config.so
+LoadModule mime_magic_module  /usr/local/libexec/apache/mod_mime_magic.so
+LoadModule mime_module        /usr/local/libexec/apache/mod_mime.so
+LoadModule negotiation_module /usr/local/libexec/apache/mod_negotiation.so
+LoadModule status_module      /usr/local/libexec/apache/mod_status.so
+LoadModule info_module        /usr/local/libexec/apache/mod_info.so
+LoadModule includes_module    /usr/local/libexec/apache/mod_include.so
+LoadModule autoindex_module   /usr/local/libexec/apache/mod_autoindex.so
+LoadModule dir_module         /usr/local/libexec/apache/mod_dir.so
+LoadModule cgi_module         /usr/local/libexec/apache/mod_cgi.so
+LoadModule asis_module        /usr/local/libexec/apache/mod_asis.so
+LoadModule imap_module        /usr/local/libexec/apache/mod_imap.so
+LoadModule action_module      /usr/local/libexec/apache/mod_actions.so
+LoadModule speling_module     /usr/local/libexec/apache/mod_speling.so
+LoadModule userdir_module     /usr/local/libexec/apache/mod_userdir.so
+LoadModule alias_module       /usr/local/libexec/apache/mod_alias.so
+LoadModule rewrite_module     /usr/local/libexec/apache/mod_rewrite.so
+LoadModule access_module      /usr/local/libexec/apache/mod_access.so
+LoadModule auth_module        /usr/local/libexec/apache/mod_auth.so
+LoadModule anon_auth_module   /usr/local/libexec/apache/mod_auth_anon.so
+LoadModule db_auth_module     /usr/local/libexec/apache/mod_auth_db.so
+LoadModule digest_module      /usr/local/libexec/apache/mod_digest.so
+LoadModule proxy_module       /usr/local/libexec/apache/libproxy.so
+LoadModule cern_meta_module   /usr/local/libexec/apache/mod_cern_meta.so
+LoadModule expires_module     /usr/local/libexec/apache/mod_expires.so
+LoadModule headers_module     /usr/local/libexec/apache/mod_headers.so
+LoadModule usertrack_module   /usr/local/libexec/apache/mod_usertrack.so
+LoadModule log_forensic_module /usr/local/libexec/apache/mod_log_forensic.so
+LoadModule unique_id_module   /usr/local/libexec/apache/mod_unique_id.so
+LoadModule setenvif_module    /usr/local/libexec/apache/mod_setenvif.so
+<IfDefine SSL>
+LoadModule ssl_module         /usr/local/libexec/apache/libssl.so
+</IfDefine>
+LoadModule perl_module        /usr/local/libexec/apache/libperl.so
+LoadModule php4_module        /usr/local/libexec/apache/libphp4.so
 
 #  Reconstruction of the complete module list from all available modules
 #  (static and shared ones) to achieve correct module execution order.
@@ -77,6 +85,7 @@ ClearModuleList
 AddModule mod_mmap_static.c
 AddModule mod_vhost_alias.c
 AddModule mod_env.c
+AddModule mod_define.c
 AddModule mod_log_config.c
 AddModule mod_mime_magic.c
 AddModule mod_mime.c
@@ -104,25 +113,32 @@ AddModule mod_cern_meta.c
 AddModule mod_expires.c
 AddModule mod_headers.c
 AddModule mod_usertrack.c
+AddModule mod_log_forensic.c
 AddModule mod_unique_id.c
 AddModule mod_so.c
 AddModule mod_setenvif.c
+<IfDefine SSL>
+AddModule mod_ssl.c
+</IfDefine>
 AddModule mod_perl.c
+AddModule mod_php4.c
 
 ExtendedStatus On
 
-### Section 2: 'Main' server configuration
-ServerName webwork-dev.math.rochester.edu
+################################################################################
+# Section 2: 'Main' server configuration
+################################################################################
+
+ServerName devel.webwork.rochester.edu
+UseCanonicalName Off
 
 <Directory />
     Options FollowSymLinks
     AllowOverride None
 </Directory>
 
-#
 # DirectoryIndex: Name of the file or files to use as a pre-written HTML
 # directory index.  Separate multiple entries with spaces.
-#
 <IfModule mod_dir.c>
     <IfModule mod_php3.c>
         <IfModule mod_php4.c>
@@ -151,8 +167,6 @@ AccessFileName .htaccess
     Satisfy All
 </Files>
 
-UseCanonicalName Off
-
 <IfModule mod_mime.c>
     TypesConfig /usr/local/etc/apache/mime.types
 </IfModule>
@@ -195,34 +209,28 @@ ServerSignature On
         Allow from all
     </Directory>
 
-    # The same rules about trailing "/" apply to ScriptAlias directives as to
-    # Alias.
-    ScriptAlias /cgi-bin/ "/usr/local/www/cgi-bin/"
-
-    <Directory "/usr/local/www/cgi-bin">
-        AllowOverride None
-        Options None
-        Order allow,deny
-        Allow from all
-    </Directory>
+#    # The same rules about trailing "/" apply to ScriptAlias directives as to
+#    # Alias.
+#    ScriptAlias /cgi-bin/ "/usr/local/www/cgi-bin/"
+#
+#    <Directory "/usr/local/www/cgi-bin">
+#        AllowOverride None
+#        Options None
+#        Order allow,deny
+#        Allow from all
+#    </Directory>
 
 </IfModule>
 
-# Redirect old-URI new-URL
-
 # Directives controlling the display of server-generated directory listings.
 <IfModule mod_autoindex.c>
 
-    #
     # FancyIndexing is whether you want fancy directory indexing or standard
-    #
     IndexOptions FancyIndexing
 
-    #
     # AddIcon* directives tell the server which icon to show for different
     # files or filename extensions.  These are only displayed for
     # FancyIndexed directories.
-    #
     AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip
 
     AddIconByType (TXT,/icons/text.gif) text/*
@@ -267,9 +275,7 @@ ServerSignature On
     IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t
 </IfModule>
 
-#
 # Document types.
-#
 <IfModule mod_mime.c>
 
     #
@@ -368,16 +374,43 @@ ServerSignature On
     BrowserMatch "JDK/1\.0" force-response-1.0
 </IfModule>
 
-#<Location /server-status>
-#    SetHandler server-status
-#    Order deny,allow
-#    Deny from all
-#    Allow from .math.rochester.edu
-#</Location>
-
-#<Location /server-info>
-#    SetHandler server-info
-#    Order deny,allow
-#    Deny from all
-#    Allow from .math.rochester.edu
-#</Location>
+<Location /server-status>
+    SetHandler server-status
+    Order allow,deny
+    Allow from all
+</Location>
+
+<Location /server-info>
+    SetHandler server-info
+    Order allow,deny
+    Allow from all
+</Location>
+
+<Location /perl-status>
+    SetHandler perl-script
+    PerlHandler Apache::Status
+    PerlSetVar StatusOptionsAll On
+    Order allow,deny
+    Allow from all
+</Location>
+
+<IfDefine SSL>
+    AddType application/x-x509-ca-cert .crt
+    AddType application/x-pkcs7-crl    .crl
+</IfDefine>
+
+<IfModule mod_ssl.c>
+    SSLPassPhraseDialog  builtin
+    
+    SSLSessionCache         dbm:run/ssl_scache
+    SSLSessionCacheTimeout  300
+    
+    SSLMutex  file:run/ssl_mutex
+    
+    SSLRandomSeed startup builtin
+    SSLRandomSeed connect builtin
+    
+    #sam# label this as an apache1 log
+    SSLLog      logs/httpd-ssl.log
+    SSLLogLevel info
+</IfModule>
diff --git a/conf/devel-site.apache2-config.dist b/conf/devel-site.apache2-config.dist
new file mode 100644
index 0000000000..c800554ea1
--- /dev/null
+++ b/conf/devel-site.apache2-config.dist
@@ -0,0 +1,1133 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# $CVSHeader: webwork2/conf/devel-site.apache2-config.dist,v 1.3 2006/08/03 16:13:48 sh002i Exp $
+################################################################################
+
+# This file contains the site-specific (but user-independent) directives used
+# in the configuration of Apache servers for WeBWorK development. See the file
+# devel.apache-config for more information.
+# 
+# Configure this file to match your main Apache configuration file, usually
+# apache.conf or httpd.conf. This file is based on the slightly-modified
+# httpd.conf as installed on devel.webwork.rochester.edu.
+
+#
+# Based upon the NCSA server configuration files originally by Rob McCool.
+#
+# This is the main Apache server configuration file.  It contains the
+# configuration directives that give the server its instructions.
+# See <URL:http://httpd.apache.org/docs/2.0/> for detailed information about
+# the directives.
+#
+# Do NOT simply read the instructions in here without understanding
+# what they do.  They're here only as hints or reminders.  If you are unsure
+# consult the online docs. You have been warned.  
+#
+# The configuration directives are grouped into three basic sections:
+#  1. Directives that control the operation of the Apache server process as a
+#     whole (the 'global environment').
+#  2. Directives that define the parameters of the 'main' or 'default' server,
+#     which responds to requests that aren't handled by a virtual host.
+#     These directives also provide default values for the settings
+#     of all virtual hosts.
+#  3. Settings for virtual hosts, which allow Web requests to be sent to
+#     different IP addresses or hostnames and have them handled by the
+#     same Apache server process.
+#
+# Configuration and logfile names: If the filenames you specify for many
+# of the server's control files begin with "/" (or "drive:/" for Win32), the
+# server will use that explicit path.  If the filenames do *not* begin
+# with "/", the value of ServerRoot is prepended -- so "logs/foo.log"
+# with ServerRoot set to "/usr/local/apache2" will be interpreted by the
+# server as "/usr/local/apache2/logs/foo.log".
+#
+
+### Section 1: Global Environment
+#
+# The directives in this section affect the overall operation of Apache,
+# such as the number of concurrent requests it can handle or where it
+# can find its configuration files.
+#
+
+#
+# ServerRoot: The top of the directory tree under which the server's
+# configuration, error, and log files are kept.
+#
+# NOTE!  If you intend to place this on an NFS (or otherwise network)
+# mounted filesystem then please read the LockFile documentation (available
+# at <URL:http://httpd.apache.org/docs/2.0/mod/mpm_common.html#lockfile>);
+# you will save yourself a lot of trouble.
+#
+# Do NOT add a slash at the end of the directory path.
+#
+#ww# passed in when httpd is started (-d)
+#ServerRoot "/usr/local/apache2"
+
+#
+# The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
+#
+<IfModule !mpm_winnt.c>
+<IfModule !mpm_netware.c>
+#LockFile logs/accept.lock
+</IfModule>
+</IfModule>
+
+#
+# ScoreBoardFile: File used to store internal server process information.
+# If unspecified (the default), the scoreboard will be stored in an
+# anonymous shared memory segment, and will be unavailable to third-party
+# applications.
+# If specified, ensure that no two invocations of Apache share the same
+# scoreboard file. The scoreboard file MUST BE STORED ON A LOCAL DISK.
+#
+<IfModule !mpm_netware.c>
+<IfModule !perchild.c>
+#ScoreBoardFile logs/apache_runtime_status
+</IfModule>
+</IfModule>
+
+
+#
+# PidFile: The file in which the server should record its process
+# identification number when it starts.
+#
+<IfModule !mpm_netware.c>
+#ww# don't clobber apache1 pidfile
+#PidFile logs/httpd.pid
+PidFile logs/httpd2.pid
+</IfModule>
+
+#
+# Timeout: The number of seconds before receives and sends time out.
+#
+Timeout 300
+
+#
+# KeepAlive: Whether or not to allow persistent connections (more than
+# one request per connection). Set to "Off" to deactivate.
+#
+KeepAlive On
+
+#
+# MaxKeepAliveRequests: The maximum number of requests to allow
+# during a persistent connection. Set to 0 to allow an unlimited amount.
+# We recommend you leave this number high, for maximum performance.
+#
+MaxKeepAliveRequests 100
+
+#
+# KeepAliveTimeout: Number of seconds to wait for the next request from the
+# same client on the same connection.
+#
+KeepAliveTimeout 15
+
+##
+## Server-Pool Size Regulation (MPM specific)
+## 
+
+# prefork MPM
+# StartServers: number of server processes to start
+# MinSpareServers: minimum number of server processes which are kept spare
+# MaxSpareServers: maximum number of server processes which are kept spare
+# MaxClients: maximum number of server processes allowed to start
+# MaxRequestsPerChild: maximum number of requests a server process serves
+<IfModule prefork.c>
+StartServers         5
+MinSpareServers      5
+MaxSpareServers     10
+MaxClients         150
+MaxRequestsPerChild  0
+</IfModule>
+
+# worker MPM
+# StartServers: initial number of server processes to start
+# MaxClients: maximum number of simultaneous client connections
+# MinSpareThreads: minimum number of worker threads which are kept spare
+# MaxSpareThreads: maximum number of worker threads which are kept spare
+# ThreadsPerChild: constant number of worker threads in each server process
+# MaxRequestsPerChild: maximum number of requests a server process serves
+<IfModule worker.c>
+StartServers         2
+MaxClients         150
+MinSpareThreads     25
+MaxSpareThreads     75 
+ThreadsPerChild     25
+MaxRequestsPerChild  0
+</IfModule>
+
+# perchild MPM
+# NumServers: constant number of server processes
+# StartThreads: initial number of worker threads in each server process
+# MinSpareThreads: minimum number of worker threads which are kept spare
+# MaxSpareThreads: maximum number of worker threads which are kept spare
+# MaxThreadsPerChild: maximum number of worker threads in each server process
+# MaxRequestsPerChild: maximum number of connections per server process
+<IfModule perchild.c>
+NumServers           5
+StartThreads         5
+MinSpareThreads      5
+MaxSpareThreads     10
+MaxThreadsPerChild  20
+MaxRequestsPerChild  0
+</IfModule>
+
+# WinNT MPM
+# ThreadsPerChild: constant number of worker threads in the server process
+# MaxRequestsPerChild: maximum  number of requests a server process serves
+<IfModule mpm_winnt.c>
+ThreadsPerChild 250
+MaxRequestsPerChild  0
+</IfModule>
+
+# BeOS MPM
+# StartThreads: how many threads do we initially spawn?
+# MaxClients:   max number of threads we can have (1 thread == 1 client)
+# MaxRequestsPerThread: maximum number of requests each thread will process
+<IfModule beos.c>
+StartThreads               10
+MaxClients                 50
+MaxRequestsPerThread       10000
+</IfModule>    
+
+# NetWare MPM
+# ThreadStackSize: Stack size allocated for each worker thread
+# StartThreads: Number of worker threads launched at server startup
+# MinSpareThreads: Minimum number of idle threads, to handle request spikes
+# MaxSpareThreads: Maximum number of idle threads
+# MaxThreads: Maximum number of worker threads alive at the same time
+# MaxRequestsPerChild: Maximum  number of requests a thread serves. It is 
+#                      recommended that the default value of 0 be set for this
+#                      directive on NetWare.  This will allow the thread to 
+#                      continue to service requests indefinitely.                          
+<IfModule mpm_netware.c>
+ThreadStackSize      65536
+StartThreads           250
+MinSpareThreads         25
+MaxSpareThreads        250
+MaxThreads            1000
+MaxRequestsPerChild      0
+MaxMemFree             100
+</IfModule>
+
+# OS/2 MPM
+# StartServers: Number of server processes to maintain
+# MinSpareThreads: Minimum number of idle threads per process, 
+#                  to handle request spikes
+# MaxSpareThreads: Maximum number of idle threads per process
+# MaxRequestsPerChild: Maximum number of connections per server process
+<IfModule mpmt_os2.c>
+StartServers           2
+MinSpareThreads        5
+MaxSpareThreads       10
+MaxRequestsPerChild    0
+</IfModule>
+
+#
+# Listen: Allows you to bind Apache to specific IP addresses and/or
+# ports, instead of the default. See also the <VirtualHost>
+# directive.
+#
+# Change this to Listen on specific IP addresses as shown below to 
+# prevent Apache from glomming onto all bound IP addresses (0.0.0.0)
+#
+#Listen 12.34.56.78:80
+#ww# set in devel.apache2-config
+#Listen 0.0.0.0:80
+#Listen [::]:80
+
+#
+# Dynamic Shared Object (DSO) Support
+#
+# To be able to use the functionality of a module which was built as a DSO you
+# have to place corresponding `LoadModule' lines at this location so the
+# directives contained in it are actually available _before_ they are used.
+# Statically compiled modules (those listed by `httpd -l') do not need
+# to be loaded here.
+#
+# Example:
+# LoadModule foo_module modules/mod_foo.so
+#
+#ww# prepend /usr/local/apache2 to each path here
+#ww# some unneeded modules commented out
+#ww#LoadModule auth_anon_module /usr/local/apache2/modules/mod_auth_anon.so
+#ww#LoadModule auth_dbm_module /usr/local/apache2/modules/mod_auth_dbm.so
+#ww#LoadModule auth_digest_module /usr/local/apache2/modules/mod_auth_digest.so
+LoadModule file_cache_module /usr/local/apache2/modules/mod_file_cache.so
+LoadModule cache_module /usr/local/apache2/modules/mod_cache.so
+LoadModule disk_cache_module /usr/local/apache2/modules/mod_disk_cache.so
+LoadModule ext_filter_module /usr/local/apache2/modules/mod_ext_filter.so
+LoadModule include_module /usr/local/apache2/modules/mod_include.so
+LoadModule deflate_module /usr/local/apache2/modules/mod_deflate.so
+LoadModule mime_magic_module /usr/local/apache2/modules/mod_mime_magic.so
+LoadModule cern_meta_module /usr/local/apache2/modules/mod_cern_meta.so
+LoadModule expires_module /usr/local/apache2/modules/mod_expires.so
+LoadModule headers_module /usr/local/apache2/modules/mod_headers.so
+LoadModule usertrack_module /usr/local/apache2/modules/mod_usertrack.so
+LoadModule unique_id_module /usr/local/apache2/modules/mod_unique_id.so
+#ww#LoadModule proxy_module /usr/local/apache2/modules/mod_proxy.so
+#ww#LoadModule proxy_connect_module /usr/local/apache2/modules/mod_proxy_connect.so
+#ww#LoadModule proxy_ftp_module /usr/local/apache2/modules/mod_proxy_ftp.so
+#ww#LoadModule proxy_http_module /usr/local/apache2/modules/mod_proxy_http.so
+<IfDefine SSL>
+LoadModule ssl_module /usr/local/apache2/modules/mod_ssl.so
+</IfDefine>
+#ww#LoadModule dav_module /usr/local/apache2/modules/mod_dav.so
+LoadModule asis_module /usr/local/apache2/modules/mod_asis.so
+LoadModule info_module /usr/local/apache2/modules/mod_info.so
+#ww#LoadModule suexec_module /usr/local/apache2/modules/mod_suexec.so
+#ww#LoadModule cgi_module /usr/local/apache2/modules/mod_cgi.so
+#ww#LoadModule cgid_module /usr/local/apache2/modules/mod_cgid.so
+#ww#LoadModule dav_fs_module /usr/local/apache2/modules/mod_dav_fs.so
+LoadModule vhost_alias_module /usr/local/apache2/modules/mod_vhost_alias.so
+LoadModule imap_module /usr/local/apache2/modules/mod_imap.so
+LoadModule actions_module /usr/local/apache2/modules/mod_actions.so
+LoadModule speling_module /usr/local/apache2/modules/mod_speling.so
+LoadModule userdir_module /usr/local/apache2/modules/mod_userdir.so
+LoadModule rewrite_module /usr/local/apache2/modules/mod_rewrite.so
+LoadModule perl_module /usr/local/apache2/modules/mod_perl.so
+LoadModule apreq_module /usr/local/apache2/modules/mod_apreq2.so
+
+#
+# ExtendedStatus controls whether Apache will generate "full" status
+# information (ExtendedStatus On) or just basic information (ExtendedStatus
+# Off) when the "server-status" handler is called. The default is Off.
+#
+#ExtendedStatus On
+
+### Section 2: 'Main' server configuration
+#
+# The directives in this section set up the values used by the 'main'
+# server, which responds to any requests that aren't handled by a
+# <VirtualHost> definition.  These values also provide defaults for
+# any <VirtualHost> containers you may define later in the file.
+#
+# All of these directives may appear inside <VirtualHost> containers,
+# in which case these default settings will be overridden for the
+# virtual host being defined.
+#
+
+<IfModule !mpm_winnt.c>
+<IfModule !mpm_netware.c>
+#
+# If you wish httpd to run as a different user or group, you must run
+# httpd as root initially and it will switch.  
+#
+# User/Group: The name (or #number) of the user/group to run httpd as.
+#  . On SCO (ODT 3) use "User nouser" and "Group nogroup".
+#  . On HPUX you may not be able to use shared memory as nobody, and the
+#    suggested workaround is to create a user www and use that user.
+#  NOTE that some kernels refuse to setgid(Group) or semctl(IPC_SET)
+#  when the value of (unsigned)Group is above 60000; 
+#  don't use Group #-1 on these systems!
+#
+#ww# set in devel.apache2-config
+#User nobody
+#Group #-1
+</IfModule>
+</IfModule>
+
+#
+# ServerAdmin: Your address, where problems with the server should be
+# e-mailed.  This address appears on some server-generated pages, such
+# as error documents.  e.g. admin@your-domain.com
+#
+#ww# set in devel.apache2-config
+#ServerAdmin you@example.com
+
+#
+# ServerName gives the name and port that the server uses to identify itself.
+# This can often be determined automatically, but we recommend you specify
+# it explicitly to prevent problems during startup.
+#
+# If this is not set to valid DNS name for your host, server-generated
+# redirections will not work.  See also the UseCanonicalName directive.
+#
+# If your host doesn't have a registered DNS name, enter its IP address here.
+# You will have to access it by its address anyway, and this will make 
+# redirections work in a sensible way.
+#
+#ServerName www.example.com:80
+
+#
+# UseCanonicalName: Determines how Apache constructs self-referencing 
+# URLs and the SERVER_NAME and SERVER_PORT variables.
+# When set "Off", Apache will use the Hostname and Port supplied
+# by the client.  When set "On", Apache will use the value of the
+# ServerName directive.
+#
+UseCanonicalName Off
+
+#
+# DocumentRoot: The directory out of which you will serve your
+# documents. By default, all requests are taken from this directory, but
+# symbolic links and aliases may be used to point to other locations.
+#
+DocumentRoot "/usr/local/apache2/htdocs"
+
+#
+# Each directory to which Apache has access can be configured with respect
+# to which services and features are allowed and/or disabled in that
+# directory (and its subdirectories). 
+#
+# First, we configure the "default" to be a very restrictive set of 
+# features.  
+#
+<Directory />
+    Options FollowSymLinks
+    AllowOverride None
+</Directory>
+
+#
+# Note that from this point forward you must specifically allow
+# particular features to be enabled - so if something's not working as
+# you might expect, make sure that you have specifically enabled it
+# below.
+#
+
+#
+# This should be changed to whatever you set DocumentRoot to.
+#
+<Directory "/usr/local/apache2/htdocs">
+
+#
+# Possible values for the Options directive are "None", "All",
+# or any combination of:
+#   Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
+#
+# Note that "MultiViews" must be named *explicitly* --- "Options All"
+# doesn't give it to you.
+#
+# The Options directive is both complicated and important.  Please see
+# http://httpd.apache.org/docs/2.0/mod/core.html#options
+# for more information.
+#
+    Options Indexes FollowSymLinks
+
+#
+# AllowOverride controls what directives may be placed in .htaccess files.
+# It can be "All", "None", or any combination of the keywords:
+#   Options FileInfo AuthConfig Limit Indexes
+#
+    AllowOverride None
+
+#
+# Controls who can get stuff from this server.
+#
+    Order allow,deny
+    Allow from all
+
+</Directory>
+
+#
+# UserDir: The name of the directory that is appended onto a user's home
+# directory if a ~user request is received.
+#
+#ww# don't need userdirs
+#UserDir public_html
+
+#
+# Control access to UserDir directories.  The following is an example
+# for a site where these directories are restricted to read-only.
+#
+#<Directory /home/*/public_html>
+#    AllowOverride FileInfo AuthConfig Limit Indexes
+#    Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
+#    <Limit GET POST OPTIONS PROPFIND>
+#        Order allow,deny
+#        Allow from all
+#    </Limit>
+#    <LimitExcept GET POST OPTIONS PROPFIND>
+#        Order deny,allow
+#        Deny from all
+#    </LimitExcept>
+#</Directory>
+
+#
+# DirectoryIndex: sets the file that Apache will serve if a directory
+# is requested.
+#
+# The index.html.var file (a type-map) is used to deliver content-
+# negotiated documents.  The MultiViews Option can be used for the 
+# same purpose, but it is much slower.
+#
+DirectoryIndex index.html index.html.var
+
+#
+# AccessFileName: The name of the file to look for in each directory
+# for additional configuration directives.  See also the AllowOverride 
+# directive.
+#
+AccessFileName .htaccess
+
+#
+# The following lines prevent .htaccess and .htpasswd files from being 
+# viewed by Web clients. 
+#
+<FilesMatch "^\.ht">
+    Order allow,deny
+    Deny from all
+</FilesMatch>
+
+#
+# TypesConfig describes where the mime.types file (or equivalent) is
+# to be found.
+#
+#ww# need full path
+#TypesConfig conf/mime.types
+TypesConfig /usr/local/apache2/conf/mime.types
+
+#
+# DefaultType is the default MIME type the server will use for a document
+# if it cannot otherwise determine one, such as from filename extensions.
+# If your server contains mostly text or HTML documents, "text/plain" is
+# a good value.  If most of your content is binary, such as applications
+# or images, you may want to use "application/octet-stream" instead to
+# keep browsers from trying to display binary files as though they are
+# text.
+#
+DefaultType text/plain
+
+#
+# The mod_mime_magic module allows the server to use various hints from the
+# contents of the file itself to determine its type.  The MIMEMagicFile
+# directive tells the module where the hint definitions are located.
+#
+<IfModule mod_mime_magic.c>
+    #ww# need full path
+    #MIMEMagicFile conf/magic
+    MIMEMagicFile /usr/local/apache2/conf/magic
+</IfModule>
+
+#
+# HostnameLookups: Log the names of clients or just their IP addresses
+# e.g., www.apache.org (on) or 204.62.129.132 (off).
+# The default is off because it'd be overall better for the net if people
+# had to knowingly turn this feature on, since enabling it means that
+# each client request will result in AT LEAST one lookup request to the
+# nameserver.
+#
+HostnameLookups Off
+
+#
+# EnableMMAP: Control whether memory-mapping is used to deliver
+# files (assuming that the underlying OS supports it).
+# The default is on; turn this off if you serve from NFS-mounted 
+# filesystems.  On some systems, turning it off (regardless of
+# filesystem) can improve performance; for details, please see
+# http://httpd.apache.org/docs/2.0/mod/core.html#enablemmap
+#
+#EnableMMAP off
+
+#
+# EnableSendfile: Control whether the sendfile kernel support is 
+# used  to deliver files (assuming that the OS supports it).
+# The default is on; turn this off if you serve from NFS-mounted 
+# filesystems.  Please see
+# http://httpd.apache.org/docs/2.0/mod/core.html#enablesendfile
+#
+#EnableSendfile off
+
+#
+# ErrorLog: The location of the error log file.
+# If you do not specify an ErrorLog directive within a <VirtualHost>
+# container, error messages relating to that virtual host will be
+# logged here.  If you *do* define an error logfile for a <VirtualHost>
+# container, that host's errors will be logged there and not here.
+#
+#sam# name this specifically for apache2
+#ErrorLog logs/error_log
+ErrorLog logs/httpd2-error.log
+
+#
+# LogLevel: Control the number of messages logged to the error_log.
+# Possible values include: debug, info, notice, warn, error, crit,
+# alert, emerg.
+#
+LogLevel warn
+#LogLevel debug
+
+#
+# The following directives define some format nicknames for use with
+# a CustomLog directive (see below).
+#
+LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+LogFormat "%h %l %u %t \"%r\" %>s %b" common
+LogFormat "%{Referer}i -> %U" referer
+LogFormat "%{User-agent}i" agent
+
+# You need to enable mod_logio.c to use %I and %O
+#LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
+
+#
+# The location and format of the access logfile (Common Logfile Format).
+# If you do not define any access logfiles within a <VirtualHost>
+# container, they will be logged here.  Contrariwise, if you *do*
+# define per-<VirtualHost> access logfiles, transactions will be
+# logged therein and *not* in this file.
+#
+#ww# use combined format instead (below)
+#CustomLog logs/access_log common
+
+#
+# If you would like to have agent and referer logfiles, uncomment the
+# following directives.
+#
+#CustomLog logs/referer_log referer
+#CustomLog logs/agent_log agent
+
+#
+# If you prefer a single logfile with access, agent, and referer information
+# (Combined Logfile Format) you can use the following directive.
+#
+#ww# use combined format instead
+#ww# name this specifically for apache2
+#CustomLog logs/access_log combined
+CustomLog logs/httpd2-access.log combined
+
+#
+# ServerTokens
+# This directive configures what you return as the Server HTTP response
+# Header. The default is 'Full' which sends information about the OS-Type
+# and compiled in modules.
+# Set to one of:  Full | OS | Minor | Minimal | Major | Prod
+# where Full conveys the most information, and Prod the least.
+#
+ServerTokens Full
+
+#
+# Optionally add a line containing the server version and virtual host
+# name to server-generated pages (internal error documents, FTP directory 
+# listings, mod_status and mod_info output etc., but not CGI generated 
+# documents or custom error documents).
+# Set to "EMail" to also include a mailto: link to the ServerAdmin.
+# Set to one of:  On | Off | EMail
+#
+ServerSignature On
+
+#
+# Aliases: Add here as many aliases as you need (with no limit). The format is 
+# Alias fakename realname
+#
+# Note that if you include a trailing / on fakename then the server will
+# require it to be present in the URL.  So "/icons" isn't aliased in this
+# example, only "/icons/".  If the fakename is slash-terminated, then the 
+# realname must also be slash terminated, and if the fakename omits the 
+# trailing slash, the realname must also omit it.
+#
+# We include the /icons/ alias for FancyIndexed directory listings.  If you
+# do not use FancyIndexing, you may comment this out.
+#
+Alias /icons/ "/usr/local/apache2/icons/"
+
+<Directory "/usr/local/apache2/icons">
+    Options Indexes MultiViews
+    AllowOverride None
+    Order allow,deny
+    Allow from all
+</Directory>
+
+#
+# This should be changed to the ServerRoot/manual/.  The alias provides
+# the manual, even if you choose to move your DocumentRoot.  You may comment
+# this out if you do not care for the documentation.
+#
+AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|ru))?(/.*)?$ "/usr/local/apache2/manual$1"
+
+<Directory "/usr/local/apache2/manual">
+    Options Indexes
+    AllowOverride None
+    Order allow,deny
+    Allow from all
+
+    <Files *.html>
+        SetHandler type-map
+    </Files>
+
+    SetEnvIf Request_URI ^/manual/(de|en|es|fr|ja|ko|ru)/ prefer-language=$1
+    RedirectMatch 301 ^/manual(?:/(de|en|es|fr|ja|ko|ru)){2,}(/.*)?$ /manual/$1$2
+</Directory>
+
+#
+# ScriptAlias: This controls which directories contain server scripts.
+# ScriptAliases are essentially the same as Aliases, except that
+# documents in the realname directory are treated as applications and
+# run by the server when requested rather than as documents sent to the client.
+# The same rules about trailing "/" apply to ScriptAlias directives as to
+# Alias.
+#
+#ww# don't need cgi dir
+#ScriptAlias /cgi-bin/ "/usr/local/apache2/cgi-bin/"
+
+<IfModule mod_cgid.c>
+#
+# Additional to mod_cgid.c settings, mod_cgid has Scriptsock <path>
+# for setting UNIX socket for communicating with cgid.
+#
+#Scriptsock            logs/cgisock
+</IfModule>
+
+#
+# "/usr/local/apache2/cgi-bin" should be changed to whatever your ScriptAliased
+# CGI directory exists, if you have that configured.
+#
+#ww# don't need cgi dir
+#<Directory "/usr/local/apache2/cgi-bin">
+#    AllowOverride None
+#    Options None
+#    Order allow,deny
+#    Allow from all
+#</Directory>
+
+#
+# Redirect allows you to tell clients about documents which used to exist in
+# your server's namespace, but do not anymore. This allows you to tell the
+# clients where to look for the relocated document.
+# Example:
+# Redirect permanent /foo http://www.example.com/bar
+
+#
+# Directives controlling the display of server-generated directory listings.
+#
+
+#
+# IndexOptions: Controls the appearance of server-generated directory
+# listings.
+#
+IndexOptions FancyIndexing VersionSort
+
+#
+# AddIcon* directives tell the server which icon to show for different
+# files or filename extensions.  These are only displayed for
+# FancyIndexed directories.
+#
+AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip
+
+AddIconByType (TXT,/icons/text.gif) text/*
+AddIconByType (IMG,/icons/image2.gif) image/*
+AddIconByType (SND,/icons/sound2.gif) audio/*
+AddIconByType (VID,/icons/movie.gif) video/*
+
+AddIcon /icons/binary.gif .bin .exe
+AddIcon /icons/binhex.gif .hqx
+AddIcon /icons/tar.gif .tar
+AddIcon /icons/world2.gif .wrl .wrl.gz .vrml .vrm .iv
+AddIcon /icons/compressed.gif .Z .z .tgz .gz .zip
+AddIcon /icons/a.gif .ps .ai .eps
+AddIcon /icons/layout.gif .html .shtml .htm .pdf
+AddIcon /icons/text.gif .txt
+AddIcon /icons/c.gif .c
+AddIcon /icons/p.gif .pl .py
+AddIcon /icons/f.gif .for
+AddIcon /icons/dvi.gif .dvi
+AddIcon /icons/uuencoded.gif .uu
+AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl
+AddIcon /icons/tex.gif .tex
+AddIcon /icons/bomb.gif core
+
+AddIcon /icons/back.gif ..
+AddIcon /icons/hand.right.gif README
+AddIcon /icons/folder.gif ^^DIRECTORY^^
+AddIcon /icons/blank.gif ^^BLANKICON^^
+
+#
+# DefaultIcon is which icon to show for files which do not have an icon
+# explicitly set.
+#
+DefaultIcon /icons/unknown.gif
+
+#
+# AddDescription allows you to place a short description after a file in
+# server-generated indexes.  These are only displayed for FancyIndexed
+# directories.
+# Format: AddDescription "description" filename
+#
+#AddDescription "GZIP compressed document" .gz
+#AddDescription "tar archive" .tar
+#AddDescription "GZIP compressed tar archive" .tgz
+
+#
+# ReadmeName is the name of the README file the server will look for by
+# default, and append to directory listings.
+#
+# HeaderName is the name of a file which should be prepended to
+# directory indexes. 
+ReadmeName README.html
+HeaderName HEADER.html
+
+#
+# IndexIgnore is a set of filenames which directory indexing should ignore
+# and not include in the listing.  Shell-style wildcarding is permitted.
+#
+IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t
+
+#
+# DefaultLanguage and AddLanguage allows you to specify the language of 
+# a document. You can then use content negotiation to give a browser a 
+# file in a language the user can understand.
+#
+# Specify a default language. This means that all data
+# going out without a specific language tag (see below) will 
+# be marked with this one. You probably do NOT want to set
+# this unless you are sure it is correct for all cases.
+#
+# * It is generally better to not mark a page as 
+# * being a certain language than marking it with the wrong
+# * language!
+#
+# DefaultLanguage nl
+#
+# Note 1: The suffix does not have to be the same as the language
+# keyword --- those with documents in Polish (whose net-standard
+# language code is pl) may wish to use "AddLanguage pl .po" to
+# avoid the ambiguity with the common suffix for perl scripts.
+#
+# Note 2: The example entries below illustrate that in some cases 
+# the two character 'Language' abbreviation is not identical to 
+# the two character 'Country' code for its country,
+# E.g. 'Danmark/dk' versus 'Danish/da'.
+#
+# Note 3: In the case of 'ltz' we violate the RFC by using a three char
+# specifier. There is 'work in progress' to fix this and get
+# the reference data for rfc1766 cleaned up.
+#
+# Catalan (ca) - Croatian (hr) - Czech (cs) - Danish (da) - Dutch (nl)
+# English (en) - Esperanto (eo) - Estonian (et) - French (fr) - German (de)
+# Greek-Modern (el) - Hebrew (he) - Italian (it) - Japanese (ja)
+# Korean (ko) - Luxembourgeois* (ltz) - Norwegian Nynorsk (nn)
+# Norwegian (no) - Polish (pl) - Portugese (pt)
+# Brazilian Portuguese (pt-BR) - Russian (ru) - Swedish (sv)
+# Simplified Chinese (zh-CN) - Spanish (es) - Traditional Chinese (zh-TW)
+#
+AddLanguage ca .ca
+AddLanguage cs .cz .cs
+AddLanguage da .dk
+AddLanguage de .de
+AddLanguage el .el
+AddLanguage en .en
+AddLanguage eo .eo
+AddLanguage es .es
+AddLanguage et .et
+AddLanguage fr .fr
+AddLanguage he .he
+AddLanguage hr .hr
+AddLanguage it .it
+AddLanguage ja .ja
+AddLanguage ko .ko
+AddLanguage ltz .ltz
+AddLanguage nl .nl
+AddLanguage nn .nn
+AddLanguage no .no
+AddLanguage pl .po
+AddLanguage pt .pt
+AddLanguage pt-BR .pt-br
+AddLanguage ru .ru
+AddLanguage sv .sv
+AddLanguage zh-CN .zh-cn
+AddLanguage zh-TW .zh-tw
+
+#
+# LanguagePriority allows you to give precedence to some languages
+# in case of a tie during content negotiation.
+#
+# Just list the languages in decreasing order of preference. We have
+# more or less alphabetized them here. You probably want to change this.
+#
+LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW
+
+#
+# ForceLanguagePriority allows you to serve a result page rather than
+# MULTIPLE CHOICES (Prefer) [in case of a tie] or NOT ACCEPTABLE (Fallback)
+# [in case no accepted languages matched the available variants]
+#
+ForceLanguagePriority Prefer Fallback
+
+#
+# Commonly used filename extensions to character sets. You probably
+# want to avoid clashes with the language extensions, unless you
+# are good at carefully testing your setup after each change.
+# See http://www.iana.org/assignments/character-sets for the
+# official list of charset names and their respective RFCs.
+#
+AddCharset ISO-8859-1  .iso8859-1  .latin1
+AddCharset ISO-8859-2  .iso8859-2  .latin2 .cen
+AddCharset ISO-8859-3  .iso8859-3  .latin3
+AddCharset ISO-8859-4  .iso8859-4  .latin4
+AddCharset ISO-8859-5  .iso8859-5  .latin5 .cyr .iso-ru
+AddCharset ISO-8859-6  .iso8859-6  .latin6 .arb
+AddCharset ISO-8859-7  .iso8859-7  .latin7 .grk
+AddCharset ISO-8859-8  .iso8859-8  .latin8 .heb
+AddCharset ISO-8859-9  .iso8859-9  .latin9 .trk
+AddCharset ISO-2022-JP .iso2022-jp .jis
+AddCharset ISO-2022-KR .iso2022-kr .kis
+AddCharset ISO-2022-CN .iso2022-cn .cis
+AddCharset Big5        .Big5       .big5
+# For russian, more than one charset is used (depends on client, mostly):
+AddCharset WINDOWS-1251 .cp-1251   .win-1251
+AddCharset CP866       .cp866
+AddCharset KOI8-r      .koi8-r .koi8-ru
+AddCharset KOI8-ru     .koi8-uk .ua
+AddCharset ISO-10646-UCS-2 .ucs2
+AddCharset ISO-10646-UCS-4 .ucs4
+AddCharset UTF-8       .utf8
+
+# The set below does not map to a specific (iso) standard
+# but works on a fairly wide range of browsers. Note that
+# capitalization actually matters (it should not, but it
+# does for some browsers).
+#
+# See http://www.iana.org/assignments/character-sets
+# for a list of sorts. But browsers support few.
+#
+AddCharset GB2312      .gb2312 .gb 
+AddCharset utf-7       .utf7
+AddCharset utf-8       .utf8
+AddCharset big5        .big5 .b5
+AddCharset EUC-TW      .euc-tw
+AddCharset EUC-JP      .euc-jp
+AddCharset EUC-KR      .euc-kr
+AddCharset shift_jis   .sjis
+
+#
+# AddType allows you to add to or override the MIME configuration
+# file mime.types for specific file types.
+#
+#AddType application/x-tar .tgz
+#
+# AddEncoding allows you to have certain browsers uncompress
+# information on the fly. Note: Not all browsers support this.
+# Despite the name similarity, the following Add* directives have nothing
+# to do with the FancyIndexing customization directives above.
+#
+#AddEncoding x-compress .Z
+#AddEncoding x-gzip .gz .tgz
+#
+# If the AddEncoding directives above are commented-out, then you
+# probably should define those extensions to indicate media types:
+#
+AddType application/x-compress .Z
+AddType application/x-gzip .gz .tgz
+
+#
+# AddHandler allows you to map certain file extensions to "handlers":
+# actions unrelated to filetype. These can be either built into the server
+# or added with the Action directive (see below)
+#
+# To use CGI scripts outside of ScriptAliased directories:
+# (You will also need to add "ExecCGI" to the "Options" directive.)
+#
+#AddHandler cgi-script .cgi
+
+#
+# For files that include their own HTTP headers:
+#
+#AddHandler send-as-is asis
+
+#
+# For server-parsed imagemap files:
+#
+#AddHandler imap-file map
+
+#
+# For type maps (negotiated resources):
+# (This is enabled by default to allow the Apache "It Worked" page
+#  to be distributed in multiple languages.)
+#
+AddHandler type-map var
+
+#
+# Filters allow you to process content before it is sent to the client.
+#
+# To parse .shtml files for server-side includes (SSI):
+# (You will also need to add "Includes" to the "Options" directive.)
+#
+#AddType text/html .shtml
+#AddOutputFilter INCLUDES .shtml
+
+#
+# Action lets you define media types that will execute a script whenever
+# a matching file is called. This eliminates the need for repeated URL
+# pathnames for oft-used CGI file processors.
+# Format: Action media/type /cgi-script/location
+# Format: Action handler-name /cgi-script/location
+#
+
+#
+# Customizable error responses come in three flavors:
+# 1) plain text 2) local redirects 3) external redirects
+#
+# Some examples:
+#ErrorDocument 500 "The server made a boo boo."
+#ErrorDocument 404 /missing.html
+#ErrorDocument 404 "/cgi-bin/missing_handler.pl"
+#ErrorDocument 402 http://www.example.com/subscription_info.html
+#
+
+#
+# Putting this all together, we can internationalize error responses.
+#
+# We use Alias to redirect any /error/HTTP_<error>.html.var response to
+# our collection of by-error message multi-language collections.  We use 
+# includes to substitute the appropriate text.
+#
+# You can modify the messages' appearance without changing any of the
+# default HTTP_<error>.html.var files by adding the line:
+#
+#   Alias /error/include/ "/your/include/path/"
+#
+# which allows you to create your own set of files by starting with the
+# /usr/local/apache2/error/include/ files and copying them to /your/include/path/, 
+# even on a per-VirtualHost basis.  The default include files will display
+# your Apache version number and your ServerAdmin email address regardless
+# of the setting of ServerSignature.
+#
+# The internationalized error documents require mod_alias, mod_include
+# and mod_negotiation.  To activate them, uncomment the following 30 lines.
+
+#    Alias /error/ "/usr/local/apache2/error/"
+#
+#    <Directory "/usr/local/apache2/error">
+#        AllowOverride None
+#        Options IncludesNoExec
+#        AddOutputFilter Includes html
+#        AddHandler type-map var
+#        Order allow,deny
+#        Allow from all
+#        LanguagePriority en cs de es fr it ja ko nl pl pt-br ro sv tr
+#        ForceLanguagePriority Prefer Fallback
+#    </Directory>
+#
+#    ErrorDocument 400 /error/HTTP_BAD_REQUEST.html.var
+#    ErrorDocument 401 /error/HTTP_UNAUTHORIZED.html.var
+#    ErrorDocument 403 /error/HTTP_FORBIDDEN.html.var
+#    ErrorDocument 404 /error/HTTP_NOT_FOUND.html.var
+#    ErrorDocument 405 /error/HTTP_METHOD_NOT_ALLOWED.html.var
+#    ErrorDocument 408 /error/HTTP_REQUEST_TIME_OUT.html.var
+#    ErrorDocument 410 /error/HTTP_GONE.html.var
+#    ErrorDocument 411 /error/HTTP_LENGTH_REQUIRED.html.var
+#    ErrorDocument 412 /error/HTTP_PRECONDITION_FAILED.html.var
+#    ErrorDocument 413 /error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
+#    ErrorDocument 414 /error/HTTP_REQUEST_URI_TOO_LARGE.html.var
+#    ErrorDocument 415 /error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
+#    ErrorDocument 500 /error/HTTP_INTERNAL_SERVER_ERROR.html.var
+#    ErrorDocument 501 /error/HTTP_NOT_IMPLEMENTED.html.var
+#    ErrorDocument 502 /error/HTTP_BAD_GATEWAY.html.var
+#    ErrorDocument 503 /error/HTTP_SERVICE_UNAVAILABLE.html.var
+#    ErrorDocument 506 /error/HTTP_VARIANT_ALSO_VARIES.html.var
+
+
+#
+# The following directives modify normal HTTP response behavior to
+# handle known problems with browser implementations.
+#
+BrowserMatch "Mozilla/2" nokeepalive
+BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0
+BrowserMatch "RealPlayer 4\.0" force-response-1.0
+BrowserMatch "Java/1\.0" force-response-1.0
+BrowserMatch "JDK/1\.0" force-response-1.0
+
+#
+# The following directive disables redirects on non-GET requests for
+# a directory that does not include the trailing slash.  This fixes a 
+# problem with Microsoft WebFolders which does not appropriately handle 
+# redirects for folders with DAV methods.
+# Same deal with Apple's DAV filesystem and Gnome VFS support for DAV.
+#
+BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully
+BrowserMatch "MS FrontPage" redirect-carefully
+BrowserMatch "^WebDrive" redirect-carefully
+BrowserMatch "^WebDAVFS/1.[0123]" redirect-carefully
+BrowserMatch "^gnome-vfs" redirect-carefully
+BrowserMatch "^XML Spy" redirect-carefully
+BrowserMatch "^Dreamweaver-WebDAV-SCM1" redirect-carefully
+
+#
+# Allow server status reports generated by mod_status,
+# with the URL of http://servername/server-status
+# Change the ".example.com" to match your domain to enable.
+#
+<Location /server-status>
+    SetHandler server-status
+    Order deny,allow
+    Deny from all
+    Allow from localhost
+</Location>
+
+#
+# Allow remote server configuration reports, with the URL of
+#  http://servername/server-info (requires that mod_info.c be loaded).
+# Change the ".example.com" to match your domain to enable.
+#
+<Location /server-info>
+    SetHandler server-info
+    Order deny,allow
+    Deny from all
+    Allow from localhost
+</Location>
+
+#ww# add mod_perl status handler
+<Location /perl-status>
+    SetHandler perl-script
+    PerlResponseHandler Apache2::Status
+    PerlSetVar StatusOptionsAll On
+    Order deny,allow
+    Deny from all
+    Allow from localhost
+</Location>
+
+#
+# Bring in additional module-specific configurations
+#
+<IfModule mod_ssl.c>
+    #ww# not bothering with this file
+    #Include conf/devel-site-ssl.apache2-config
+    
+    SSLRandomSeed startup builtin
+    SSLRandomSeed connect builtin
+    
+    AddType application/x-x509-ca-cert .crt
+    AddType application/x-pkcs7-crl    .crl
+    
+    SSLPassPhraseDialog  builtin
+    
+    SSLSessionCache         dbm:run/ssl_scache2
+    SSLSessionCacheTimeout  300
+    SSLMutex  file:run/ssl_mutex2
+    
+    SSLEngine On
+    SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
+    SSLCertificateFile /usr/local/etc/apache/ssl.crt/server.crt
+    SSLCertificateKeyFile /usr/local/etc/apache/ssl.key/server.key
+</IfModule>
+
+### Section 3: Virtual Hosts
+#
+# VirtualHost: If you want to maintain multiple domains/hostnames on your
+# machine you can setup VirtualHost containers for them. Most configurations
+# use only name-based virtual hosts so the server doesn't need to worry about
+# IP addresses. This is indicated by the asterisks in the directives below.
+#
+# Please see the documentation at 
+# <URL:http://httpd.apache.org/docs/2.0/vhosts/>
+# for further details before you try to setup virtual hosts.
+#
+# You may use the command line option '-S' to verify your virtual host
+# configuration.
+
+#
+# Use name-based virtual hosting.
+#
+#NameVirtualHost *:80
+
+#
+# VirtualHost example:
+# Almost any Apache directive may go into a VirtualHost container.
+# The first VirtualHost section is used for requests without a known
+# server name.
+#
+#<VirtualHost *:80>
+#    ServerAdmin webmaster@dummy-host.example.com
+#    DocumentRoot /www/docs/dummy-host.example.com
+#    ServerName dummy-host.example.com
+#    ErrorLog logs/dummy-host.example.com-error_log
+#    CustomLog logs/dummy-host.example.com-access_log common
+#</VirtualHost>
diff --git a/conf/devel.apache-config.dist b/conf/devel.apache-config.dist
new file mode 100644
index 0000000000..ae9873432c
--- /dev/null
+++ b/conf/devel.apache-config.dist
@@ -0,0 +1,111 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork-modperl/conf/devel.apache-config.dist,v 1.12 2007/08/13 22:59:51 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+# This is an Apache configuration file suitable for use when doing development
+# on the WeBWorK 2 system. This setup allows each developer to run an
+# independent Apache server under their own UID, using their own working copy of
+# the WeBWorK code. The configuration is split into three parts:
+# 
+# The first part is a site-specific (but user-indepenent) file named
+# devel-site.apache-config. It contains directives that are common to all
+# development servers on the same host. The site administrator can chose to
+# maintain a single copy of this file and have all developers reference it in a
+# central location.
+# 
+# The second part is the stock webwork.apache-config file that is used for
+# normal installations. Customize this file, setting the $webwork_url,
+# $webwork_dir, $pg_dir, etc. appropriatly for your development server.
+# 
+# The third part is this file. It contains the user-specific directives that are
+# specific to each developer's server.
+
+################################################################################
+# Include site-specific configuration
+################################################################################
+
+Include /path/to/webwork2/conf/devel-site.apache-config
+
+################################################################################
+# Include WeBWorK configuration
+################################################################################
+
+Include /path/to/webwork2/conf/webwork.apache-config
+
+################################################################################
+# Perform user-specific configuration
+################################################################################
+
+<Perl>
+
+my $user_name  = (getpwuid $>)[0];
+my $group_name = (getgrgid $))[0];
+my $host_name  = Apache->server->server_hostname;
+
+# The server will run as the user who starts it.
+$User  = $user_name;
+$Group = $group_name;
+
+# It will listen on a port equal to the UID of the user who starts it +7000.
+# This effectively picks a port between 8000 and 8999 since UID's are >=1000.
+$Port  = $> + 7000;
+
+# Email address of server administator.
+$ServerAdmin = "$user_name\@$host_name";
+
+# Locations of some files.
+$LockFile = "$WeBWorK::SeedCE{webwork_dir}/logs/httpd.lock";
+$PidFile  = "$WeBWorK::SeedCE{webwork_dir}/logs/httpd.pid";
+$ErrorLog = "$WeBWorK::SeedCE{webwork_dir}/logs/httpd-error.log";
+
+# Control the number of child processes and how long they stick around.
+$StartServers        = 2;
+$MinSpareServers     = 2;
+$MaxSpareServers     = 2;
+$MaxClients          = 5;
+$MaxRequestsPerChild = 100;
+
+# The document root doesn't really matter, but it has to be set, so we set it to
+# the htdocs directory.
+$DocumentRoot = $WeBWorK::SeedCE{webwork_htdocs_dir};
+
+# You may want to add access control to prevent interlopers from monkeying with
+# your development system. This is a really good idea, since there could
+# potentially be security holes in the code. Create a file named .htpasswd in
+# the conf containing accounts for those allowed to access your development
+# system:
+# 
+#     htpasswd -c .htpasswd user-name
+
+#$Location{"/"} = {
+#	AuthType     => "Basic",
+#	AuthName     => "\"$user_name's WeBWorK development system\"", # ' requires extra ""
+#	AuthUserFile => "$WeBWorK::SeedCE{webwork_dir}/conf/.htpasswd",
+#	Require      => "valid-user",
+#};
+
+</Perl>
+
+<IfDefine SSL>
+    SSLEngine On
+    SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
+    SSLCertificateFile /usr/local/etc/apache/ssl.crt/server.crt
+    SSLCertificateKeyFile /usr/local/etc/apache/ssl.key/server.key
+</IfDefine>
+
+################################################################################
+# Stick any local additions down here
+################################################################################
+
diff --git a/conf/devel.apache2-config.dist b/conf/devel.apache2-config.dist
new file mode 100644
index 0000000000..6e245c6416
--- /dev/null
+++ b/conf/devel.apache2-config.dist
@@ -0,0 +1,76 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/conf/devel.apache2-config.dist,v 1.2 2006/08/03 16:14:55 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+# This is an Apache configuration file suitable for use when doing development
+# on the WeBWorK 2 system. This setup allows each developer to run an
+# independent Apache server under their own UID, using their own working copy of
+# the WeBWorK code. The configuration is split into three parts:
+# 
+# The first part is a site-specific (but user-indepenent) file named
+# devel-site.apache-config. It contains directives that are common to all
+# development servers on the same host. The site administrator can chose to
+# maintain a single copy of this file and have all developers reference it in a
+# central location.
+# 
+# The second part is the stock webwork.apache-config file that is used for
+# normal installations. Customize this file, setting the $webwork_url,
+# $webwork_dir, $pg_dir, etc. appropriatly for your development server.
+# 
+# The third part is this file. It contains the user-specific directives that are
+# specific to each developer's server.
+
+################################################################################
+# Include site-specific configuration
+################################################################################
+
+Include /path/to/webwork2/conf/devel-site.apache2-config
+
+################################################################################
+# Include WeBWorK configuration
+################################################################################
+
+Include /path/to/webwork2/conf/webwork.apache2-config
+
+################################################################################
+# Perform user-specific configuration
+################################################################################
+
+<Perl>
+
+use Apache2::ServerUtil;
+use Apache2::ServerRec;
+
+my $user_name  = (getpwuid $>)[0];
+my $group_name = (getgrgid $))[0];
+my $host_name  = Apache2::ServerUtil->server->server_hostname;
+
+# The server will run as the user who starts it.
+$User  = $user_name;
+$Group = $group_name;
+
+# It will listen on a port equal to the UID of the user who starts it +8000.
+# This effectively picks a port between 9000 and 9999 since UID's are >=1000.
+$Listen = "0.0.0.0:" . ($>+8000);
+
+# Email address of server administator.
+$ServerAdmin = "$user_name\@$host_name";
+
+</Perl>
+
+################################################################################
+# Stick any local additions down here
+################################################################################
+
diff --git a/conf/gdbm.conf.dist b/conf/gdbm.conf.dist
deleted file mode 100644
index 59422d4454..0000000000
--- a/conf/gdbm.conf.dist
+++ /dev/null
@@ -1,105 +0,0 @@
-#!perl
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
-# 
-# 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
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-# 
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-=head1 NAME
-
-gdbm.conf - defines database layout for WeBWorK 1.x compatible GDBM databases.
-
-=head1 SYNOPSIS
-
-In global.conf (or course.conf):
-
- include "conf/gdbm.conf";
-
-=head1 DESCRIPTION
-
-This layout uses the traditional WeBWorK 1.x database format, using the GDBM
-file format. Use this layout if you wish to share courses between WeBWorK 1.x
-and WeBWorK 2.
-
-The C<globalUserID> parameter given for the C<set> and C<problem> tables denotes
-the ID of the user that the GlobalTableEmulator will use to store data for the
-C<set> and C<problem> tables. This is set to "professor" by default, but should
-be overridden on a course-by-course basis to the ID of the professor who is most
-likely to be involved in creating new problem sets. Sets which have not been
-assigned to any users will only be visible to the selected user when logging
-into WeBWorK 1.x.
-
-Use the following code to override these values in each course's course.conf
-file:
-
- $dbLayout{set}->{params}->{globalUserID} = "some_user";
- $dbLayout{problem}->{params}->{globalUserID} = "some_user";
-
-=cut
-
-%dbLayout = (
-	password => {
-		record => "WeBWorK::DB::Record::Password",
-		schema => "WeBWorK::DB::Schema::Auth1Hash",
-		driver => "WeBWorK::DB::Driver::GDBM",
-		source => "$courseDirs{auth_DATA}/$courseName\_password_DB",
-	},
-	permission => {
-		record => "WeBWorK::DB::Record::PermissionLevel",
-		schema => "WeBWorK::DB::Schema::Auth1Hash",
-		driver => "WeBWorK::DB::Driver::GDBM",
-		source => "$courseDirs{auth_DATA}/$courseName\_permissions_DB",
-	},
-	key => {
-		record => "WeBWorK::DB::Record::Key",
-		schema => "WeBWorK::DB::Schema::Auth1Hash",
-		driver => "WeBWorK::DB::Driver::GDBM",
-		source => "$courseDirs{auth_DATA}/keys",
-	},
-	user => {
-		record => "WeBWorK::DB::Record::User",
-		schema => "WeBWorK::DB::Schema::Classlist1Hash",
-		driver => "WeBWorK::DB::Driver::GDBM",
-		source => "$courseDirs{DATA}/$courseName\_classlist_DB",
-	},
-	set => {
-		record => "WeBWorK::DB::Record::Set",
-		schema => "WeBWorK::DB::Schema::GlobalTableEmulator",
-		driver => "WeBWorK::DB::Driver::Null",
-	},
-	set_user => {
-		record => "WeBWorK::DB::Record::UserSet",
-		schema => "WeBWorK::DB::Schema::WW1Hash",
-		driver => "WeBWorK::DB::Driver::GDBM",
-		source => "$courseDirs{DATA}/$courseName\_webwork_DB",
-		params => { psvnLength => 5 },
-	},
-	problem => {
-		record => "WeBWorK::DB::Record::Problem",
-		schema => "WeBWorK::DB::Schema::GlobalTableEmulator",
-		driver => "WeBWorK::DB::Driver::Null",
-	},
-	problem_user => {
-		record => "WeBWorK::DB::Record::UserProblem",
-		schema => "WeBWorK::DB::Schema::WW1Hash",
-		driver => "WeBWorK::DB::Driver::GDBM",
-		source => "$courseDirs{DATA}/$courseName\_webwork_DB",
-		params => { psvnLength => 5 },
-	},
-);
-
-# These lines should be overridden in course.conf
-$dbLayout{set}->{params}->{globalUserID} = "professor";
-$dbLayout{problem}->{params}->{globalUserID} = "professor";
-
-1;
diff --git a/conf/global.conf.dist b/conf/global.conf.dist
index 22892a17be..49727da403 100644
--- a/conf/global.conf.dist
+++ b/conf/global.conf.dist
@@ -1,8 +1,8 @@
 #!perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/conf/global.conf.dist,v 1.225 2010/05/18 18:03:31 apizer 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
@@ -19,198 +19,777 @@
 # requests. Values may be overwritten by the course.conf for a specific course.
 # All package variables set in this file are added to the course environment.
 # If you wish to set a variable here but omit it from the course environment,
-# use the "my" keyword. The following variables are available to this file:
-#
-#         $webworkRoot    directory that contains the WeBWorK distribution
-#         $webworkURL     base URL handled by Apache::WeBWorK
-#         $pgRoot         directory that contains the PG distribution
-#         $courseName     name of the course being used
-
-################################################################################
-# WeBWorK settings
-################################################################################
-
-%webworkDirs = (
-	root          => "$webworkRoot",
-	DATA          => "$webworkRoot/DATA",
-	uploadCache   => "$webworkRoot/DATA/uploads",
-	bin           => "$webworkRoot/bin",
-	conf          => "$webworkRoot/conf",
-	courses       => "$webworkRoot/courses",
-	htdocs        => "$webworkRoot/htdocs",
-	htdocs_temp   => "$webworkRoot/htdocs/tmp",
-	equationCache => "$webworkRoot/htdocs/tmp/equations",
-	lib           => "$webworkRoot/lib",
-	logs          => "$webworkRoot/logs",
-	macros        => "$pgRoot/macros",
-	tmp           => "$webworkRoot/tmp",
-);
+# use the "my" keyword. The $webwork_dir variable is set in the WeBWorK Apache
+# configuration file (webwork.apache-config) and is available for use here. In
+# addition, the $courseName variable holds the name of the current course.
+
+################################################################################
+# Seed variables
+################################################################################
+
+# Set these variables to correspond to your configuration and preferences. You
+# will need to restart the webserver to reset the variables in this section.
+
+# URL of WeBWorK handler. If WeBWorK is to be on the web server root, use "". Note 
+# that using "" may not work so we suggest sticking with "/webwork2".
+$webwork_url         = "/webwork2";
+
+
+$server_root_url   = "";  # e.g.  http://webwork.yourschool.edu
+$server_userID     = "";  # e.g.  www-data    
+$server_groupID    = "";  # e.g.  wwdata
+
+
+# In the apache configuration file (often called httpd.conf) you will find
+# User wwadmin   --- this is the $server_userID -- of course it may be wwhttpd or some other name
+# Group wwdata   --- this is the $server_groupID -- this will have different names also
+
+# Root directory of PG.
+$pg_dir              = "/opt/webwork/pg";
+
+# URL and path to htdocs directory.
+# Uncomment the second line below when using litetpd
+$webwork_htdocs_url  = "/webwork2_files";
+$webwork_htdocs_dir  = "$webwork_dir/htdocs";
+
+# URL and path to courses directory.
+$webwork_courses_url = "/webwork2_course_files";
+$webwork_courses_dir = "/opt/webwork/courses"; #(a typical place to put the course directory
+
+################################################################################
+# Paths to external programs 
+################################################################################
+
+# system utilities
+$externalPrograms{mv}    = "/bin/mv";
+$externalPrograms{cp}    = "/bin/cp";
+$externalPrograms{rm}    = "/bin/rm";
+$externalPrograms{mkdir} = "/bin/mkdir";
+$externalPrograms{tar}   = "/bin/tar";
+$externalPrograms{gzip}  = "/bin/gzip";
+
+# equation rendering/hardcopy utiltiies
+$externalPrograms{latex}    = "/usr/bin/latex";
+$externalPrograms{pdflatex} = "/usr/bin/pdflatex --shell-escape";
+$externalPrograms{dvipng}   = "/usr/bin/dvipng";
+$externalPrograms{tth}      = "/usr/bin/tth";
+
+####################################################
+# NetPBM - basic image manipulation utilities
+# Most sites only need to configure $netpbm_prefix.
+####################################################
+my $netpbm_prefix = "/usr/bin";
+$externalPrograms{giftopnm} = "$netpbm_prefix/giftopnm";
+$externalPrograms{ppmtopgm} = "$netpbm_prefix/ppmtopgm";
+$externalPrograms{pnmtops}  = "$netpbm_prefix/pnmtops";
+$externalPrograms{pnmtopng} = "$netpbm_prefix/pnmtopng";
+$externalPrograms{pngtopnm} = "$netpbm_prefix/pngtopnm";
+
+# url checker
+$externalPrograms{checkurl} = "/usr/bin/lwp-request -d -mHEAD "; # or "/usr/local/bin/w3c -head "
+
+# image conversions utiltiies
+# the source file is given on stdin, and the output expected on stdout.
+$externalPrograms{gif2eps} = "$externalPrograms{giftopnm} | $externalPrograms{ppmtopgm} | $externalPrograms{pnmtops} -noturn 2>/dev/null";
+$externalPrograms{png2eps} = "$externalPrograms{pngtopnm} | $externalPrograms{ppmtopgm} | $externalPrograms{pnmtops} -noturn 2>/dev/null";
+$externalPrograms{gif2png} = "$externalPrograms{giftopnm} | $externalPrograms{pnmtopng}";
+
+# mysql clients
+$externalPrograms{mysql}     = "/usr/bin/mysql";
+$externalPrograms{mysqldump} = "/usr/bin/mysqldump";
+
+################################################################################
+# Mail settings
+################################################################################
+
+# Mail sent by the PG system and the mail merge and feedback modules will be
+# sent via this SMTP server.
+$mail{smtpServer}            = 'mail.yourschool.edu';
+
+# When connecting to the above server, WeBWorK will send this address in the
+# MAIL FROM command. This has nothing to do with the "From" address on the mail
+# message. It can really be anything, but some mail servers require it contain
+# a valid mail domain, or at least be well-formed.
+$mail{smtpSender}            = 'webwork@yourserver.yourschool.edu';
+
+# Seconds to wait before timing out when connecting to the SMTP server.
+$mail{smtpTimeout}           = 30;
+
+# AllowedRecipients defines addresses that the PG system is allowed to send mail
+# to. this prevents subtle PG exploits. This should be set in course.conf to the
+# addresses of professors of each course. Sending mail from the PG system (i.e.
+# questionaires, essay questions) will fail if this is not set somewhere (either
+# here or in course.conf).
+$mail{allowedRecipients}     = [
+	#'prof1@yourserver.yourdomain.edu',
+	#'prof2@yourserver.yourdomain.edu',
+];
+
+# By default, feeback is sent to all users who have permission to
+# receive_feedback. If this list is non-empty, feedback is also sent to the
+# addresses specified here.
+# 
+# * If you want to disable feedback altogether, leave this empty and set
+#   submit_feeback => $nobody in %permissionLevels below. This will cause the
+#   feedback button to go away as well.
+# 
+# * If you want to send email ONLY to addresses in this list, set
+#   receive_feedback => $nobody in %permissionLevels below.
+# 
+# It's often useful to set this in the course.conf to change the behavior of
+# feedback for a specific course.
+# 
+# Items in this list may be bare addresses, or RFC822 mailboxes, like:
+#   'Joe User <joe.user@example.com>'
+# The advantage of this form is that the resulting email will include the name
+# of the recipient in the "To" field of the email.
+# 
+$mail{feedbackRecipients}    = [
+	#'prof1@yourserver.yourdomain.edu',
+	#'prof2@yourserver.yourdomain.edu',
+];
+
+# Feedback subject line -- the following escape sequences are recognized:
+# 
+#   %c = course ID
+#   %u = user ID
+#   %s = set ID
+#   %p = problem ID
+#   %x = section
+#   %r = recitation
+#   %% = literal percent sign
+# 
+
+$mail{feedbackSubjectFormat} = "[WWfeedback] course:%c user:%u set:%s prob:%p sec:%x rec:%r";
+
+# feedbackVerbosity:
+#  0: send only the feedback comment and context link
+#  1: as in 0, plus user, set, problem, and PG data
+#  2: as in 1, plus the problem environment (debugging data)
+$mail{feedbackVerbosity}     = 1;
+
+# Defines the size of the Mail Merge editor window
+# FIXME: should this be here? it's UI, not mail
+# FIXME: replace this with the auto-size method that TWiki uses
+$mail{editor_window_rows}    = 15;
+$mail{editor_window_columns} = 100;
+
+###################################################
+# Customizing the action of the "Email your instructor" button
+###################################################
+
+# Use this to customize the text of the feedback button.
+$feedback_button_name = "Email instructor";
+
+# If this value is true, feedback will only be sent to users with the same
+# section as the user initiating the feedback.
+$feedback_by_section = 0;
+
+# If the variable below is set to a non-empty value (i.e. in course.conf), WeBWorK's usual
+# email feedback mechanism  will be replaced with a link to the given URL.
+# See also $feedback_button_name, above.
+
+$courseURLs{feedbackURL} = "";
+
+# If the variable below is set to a non-empty value (i.e. in course.conf), 
+# WeBWorK's usual email feedback mechanism  will be replaced with a link to the given URL and
+# a POST request with information about the problem including the HTML rendering
+# of the problem will be sent to that URL.
+# See also $feedback_button_name, above.
+
+#$courseURLs{feedbackFormURL} = "http://www.mathnerds.com/MathNerds/mmn/SDS/askQuestion.aspx";  #"http://www.tipjar.com/cgi-bin/test";
+$courseURLs{feedbackFormURL} = "";
+
+################################################################################
+# Theme
+################################################################################
+
+$defaultTheme = "math2";
+$defaultThemeTemplate = "system";
+
+################################################################################
+# Language
+################################################################################
+
+$language = "en";   # tr = turkish,  en=english
+
+################################################################################
+# System-wide locations (directories and URLs)
+################################################################################
+
+# The root directory, set by webwork_root variable in Apache configuration.
+$webworkDirs{root}          = "$webwork_dir";
+
+# Location of system-wide data files.
+$webworkDirs{DATA}          = "$webworkDirs{root}/DATA";
+
+# Used for temporary storage of uploaded files.
+$webworkDirs{uploadCache}   = "$webworkDirs{DATA}/uploads";
+
+# Location of utility programs.
+$webworkDirs{bin}           = "$webworkDirs{root}/bin";
+
+# Location of configuration files, templates, snippets, etc.
+$webworkDirs{conf}          = "$webworkDirs{root}/conf";
+
+# Location of theme templates.
+$webworkDirs{templates}     = "$webworkDirs{conf}/templates";
+
+# Location of course directories.
+$webworkDirs{courses}       = "$webwork_courses_dir" || "$webworkDirs{root}/courses";
+
+# Contains log files.
+$webworkDirs{logs}          = "$webworkDirs{root}/logs";
+
+# Contains non-web-accessible temporary files, such as TeX working directories.
+$webworkDirs{tmp}           = "$webworkDirs{root}/tmp";
+
+# The (absolute) destinations of symbolic links that are OK for the FileManager to follow.
+#   (any subdirectory of these is a valid target for a symbolic link.)
+# For example:
+#    $webworkDirs{valid_symlinks} = ["$webworkDirs{courses}/modelCourse/templates","/ww2/common/sets"];
+$webworkDirs{valid_symlinks}   = [];
+
+################################################################################
+##### The following locations are web-accessible.
+################################################################################
+
+# The root URL (usually /webwork2), set by <Location> in Apache configuration.
+$webworkURLs{root}          = "$webwork_url";
+
+# Location of system-wide web-accessible files, such as equation images, and
+# help files.
+$webworkDirs{htdocs}        = "$webwork_htdocs_dir" || "$webworkDirs{root}/htdocs";
+$webworkURLs{htdocs}        = "$webwork_htdocs_url";
+
+# Location of web-accessible temporary files, such as equation images.
+$webworkDirs{htdocs_temp}   = "$webworkDirs{htdocs}/tmp";
+$webworkURLs{htdocs_temp}   = "$webworkURLs{htdocs}/tmp";
+
+# Location of cached equation images.
+$webworkDirs{equationCache} = "$webworkDirs{htdocs_temp}/equations";
+$webworkURLs{equationCache} = "$webworkURLs{htdocs_temp}/equations";
+
+# Contains context-sensitive help files.
+$webworkDirs{local_help}    = "$webworkDirs{htdocs}/helpFiles";
+$webworkURLs{local_help}    = "$webworkURLs{htdocs}/helpFiles";
+
+# URL of general WeBWorK documentation.
+$webworkURLs{docs}          = "http://webwork.maa.org";
+
+# URL of WeBWorK Bugzilla database.
+$webworkURLs{bugReporter}   = "http://bugs.webwork.maa.org/enter_bug.cgi";
+
+# Location of CSS
+# $webworkURLs{stylesheet}    = "$webworkURLs{htdocs}/css/${defaultTheme}.css";
+# this is never used -- changing the theme from the config panel
+# doesn't appear to reset the theme in time?
+# It's better to refer directly to the .css file in the system.template
+# <link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/css/math.css"/>
+
+# Location of jsMath script, used for the jsMath display mode.
+$webworkURLs{jsMath}        = "$webworkURLs{htdocs}/jsMath/jsMath-ww.js";
+
+# Location of MathJax script, used for the MathJax display mode.
+$webworkURLs{MathJax}       = "$webworkURLs{htdocs}/mathjax/MathJax.js?config=TeX-AMS_HTML-full";
+
+# Location of Tabber script, used to generate tabbed widgets.
+$webworkURLs{tabber}		= "$webworkURLs{htdocs}/js/tabber.js";
+
+# Location of ASCIIMathML script, used for the asciimath display mode.
+$webworkURLs{asciimath}     = "$webworkURLs{htdocs}/ASCIIMathML/ASCIIMathML.js";
+
+# Location of LaTeXMathML script, used for the LaTeXMathML display mode.
+$webworkURLs{LaTeXMathML}   = "$webworkURLs{htdocs}/LaTeXMathML/LaTeXMathML.js";
+
+################################################################################
+# Defaults for course-specific locations (directories and URLs)
+################################################################################
+
+# The root directory of the current course. (The ID of the current course is
+# available in $courseName.)
+$courseDirs{root}        = "$webworkDirs{courses}/$courseName";
+
+# Location of course-specific data files.
+$courseDirs{DATA}        = "$courseDirs{root}/DATA";
+
+# Location of course HTML files, passed to PG.
+$courseDirs{html}        = "$courseDirs{root}/html";
+$courseURLs{html}        = "$webwork_courses_url/$courseName";
+
+# Location of course image files, passed to PG.
+$courseDirs{html_images} = "$courseDirs{html}/images";
+
+# Location of web-accessible, course-specific temporary files, like static and
+# dynamically-generated PG graphics.
+$courseDirs{html_temp}   = "$courseDirs{html}/tmp";
+$courseURLs{html_temp}   = "$courseURLs{html}/tmp";
+
+# Location of course-specific logs, like the transaction log.
+$courseDirs{logs}        = "$courseDirs{root}/logs";
+
+# Location of scoring files.
+$courseDirs{scoring}     = "$courseDirs{root}/scoring";
+
+# Location of PG templates and set definition files.
+$courseDirs{templates}   = "$courseDirs{root}/templates";
+
+# Location of course-specific macro files.
+$courseDirs{macros}      = "$courseDirs{templates}/macros";
+
+# Location of mail-merge templates.
+$courseDirs{email}       = "$courseDirs{templates}/email";
+
+# Location of temporary editing files.
+$courseDirs{tmpEditFileDir}  = "$courseDirs{templates}/tmpEdit";
+
+
+# mail merge status directory
+$courseDirs{mailmerge}   = "$courseDirs{DATA}/mailmerge";
+
+################################################################################
+# System-wide files
+################################################################################
+
+# Location of this file.
+$webworkFiles{environment}                      = "$webworkDirs{conf}/global.conf";
+
+# Flat-file database used to protect against MD5 hash collisions. TeX equations
+# are hashed to determine the name of the image file. There is a tiny chance of
+# a collision between two TeX strings. This file allows for that. However, this
+# is slow, so most people chose not to worry about it. Set this to "" if you
+# don't want to use the equation cache file.
+$webworkFiles{equationCacheDB}                  = ""; # "$webworkDirs{DATA}/equationcache";
+
+################################################################################
+# Hardcopy snippets are used in constructing a TeX file for hardcopy output.
+# They should contain TeX code unless otherwise noted.
+################################################################################
+# The preamble is the first thing in the TeX file.
+$webworkFiles{hardcopySnippets}{preamble}       = "$webworkDirs{conf}/snippets/hardcopyPreamble.tex";
+
+# The setHeader preceeds each set in hardcopy output. It is a PG file.
+# This is the default file which is used if a specific files is not selected
+$webworkFiles{hardcopySnippets}{setHeader}      = "$webworkDirs{conf}/snippets/setHeader.pg";  # hardcopySetHeader.pg",
+#$webworkFiles{hardcopySnippets}{setHeader}     = "$courseDirs{templates}/ASimpleHardCopyHeaderFile.pg"; # An alternate default header file
+
+# The problem divider goes between problems.
+$webworkFiles{hardcopySnippets}{problemDivider} = "$webworkDirs{conf}/snippets/hardcopyProblemDivider.tex";
+
+# The set footer goes after each set. Is is a PG file.
+$webworkFiles{hardcopySnippets}{setFooter}      = "$webworkDirs{conf}/snippets/hardcopySetFooter.pg";
+
+# The set divider goes between sets (in multiset output).
+$webworkFiles{hardcopySnippets}{setDivider}     = "$webworkDirs{conf}/snippets/hardcopySetDivider.tex";
+
+# The user divider does between users (in multiuser output).
+$webworkFiles{hardcopySnippets}{userDivider}    = "$webworkDirs{conf}/snippets/hardcopyUserDivider.tex";
+
+# The postabmle is the last thing in the TeX file.
+$webworkFiles{hardcopySnippets}{postamble}      = "$webworkDirs{conf}/snippets/hardcopyPostamble.tex";
+
+##### Screen snippets are used when displaying problem sets on the screen.
+
+# The set header is displayed on the problem set page. It is a PG file.
+# This is the default file which is used if a specific files is not selected
+#$webworkFiles{screenSnippets}{setHeader}        = "$webworkDirs{conf}/snippets/setHeader.pg"; # screenSetHeader.pg"
+$webworkFiles{screenSnippets}{setHeader}       = "$courseDirs{templates}/ASimpleScreenHeaderFile.pg"; # An alternate default header file
+
+# A PG template for creation of new problems.
+$webworkFiles{screenSnippets}{blankProblem}    = "$webworkDirs{conf}/snippets/blankProblem2.pg"; # screenSetHeader.pg"
+
+# A site info  "message of the day" file
+$webworkFiles{site_info}                       = "$webworkDirs{htdocs}/site_info.txt";
+
+################################################################################
+# Course-specific files
+################################################################################
 
-%webworkFiles = (
-	environment        => "$webworkDirs{conf}/global.conf",
-	hardcopySnippets   => {
-		preamble       => "$webworkDirs{conf}/snippets/hardcopyPreamble.tex",
-		setHeader      => "$webworkDirs{conf}/snippets/hardcopySetHeader.pg",
-		problemDivider => "$webworkDirs{conf}/snippets/hardcopyProblemDivider.tex",
-		setFooter      => "$webworkDirs{conf}/snippets/hardcopySetFooter.pg",
-		setDivider     => "$webworkDirs{conf}/snippets/hardcopySetDivider.tex",
-		userDivider    => "$webworkDirs{conf}/snippets/hardcopyUserDivider.tex",
-		postamble      => "$webworkDirs{conf}/snippets/hardcopyPostamble.tex",
+# The course configuration file.
+$courseFiles{environment} = "$courseDirs{root}/course.conf";
+
+# The course simple configuration file (holds web-based configuratoin).
+$courseFiles{simpleConfig} = "$courseDirs{root}/simple.conf";
+
+# File contents are displayed after login, on the problem sets page. Path given
+# here is relative to the templates directory.
+$courseFiles{course_info} = "course_info.txt";
+
+# File contents are displayed on the login page. Path given here is relative to
+# the templates directory.
+$courseFiles{login_info}  = "login_info.txt";
+
+# Additional library buttons can be added to the Library Browser (SetMaker.pm)
+# by adding the libraries you want to the following line.  For each key=>value
+# in the list, if a directory (or link to a directory) with name 'key' appears
+# in the templates directory, then a button with name 'value' will be placed at
+# the top of the problem browser.  (No button will appear if there is no
+# directory or link with the given name in the templates directory.)  For
+# example,
+# 
+#     $courseFiles{problibs} = {rochester => "Rochester", asu => "ASU"};
+# 
+# would add two buttons, one for the Rochester library and one for the ASU
+# library, provided templates/rochester and templates/asu exists either as 
+# subdirectories or links to other directories. The "NPL Directory" button
+# activated below gives access to all the directories in the National 
+# Problem Library.
+# 
+$courseFiles{problibs}    = {
+	Library          => "NPL Directory",
+# 	rochesterLibrary => "Rochester",
+# 	unionLibrary     =>"Union",
+# 	asuLibrary       => "Arizona State",
+# 	dcdsLibrary      => "Detroit CDS",
+# 	dartmouthLibrary => "Dartmouth",
+# 	indianaLibrary   => "Indiana",
+# 	osuLibrary       => "Ohio State",	
+#   capaLibrary      => "CAPA",
+};
+
+################################################################################
+# Status system
+################################################################################
+
+# This is the default status given to new students and students with invalid
+# or missing statuses.
+$default_status = "Enrolled";
+
+# The first abbreviation in the abbreviations list is the canonical
+# abbreviation, and will be used when setting the status value in a user record
+# or an exported classlist file.
+# 
+# Results are undefined if more than one status has the same abbreviation.
+# 
+# The four behaviors that are controlled by status are:
+#   allow_course_access   => is this user allowed to log in?
+#   include_in_assignment => is this user included when assigning as set to "all" users?
+#   include_in_stats      => is this user included in statistical reports?
+#   include_in_email      => is this user included in emails sent to the class?
+#   include_in_scoring    => is this user included in score reports?
+
+%statuses = (
+	Enrolled => {
+		abbrevs => [qw/ C c current enrolled /],
+		behaviors => [qw/ allow_course_access include_in_assignment include_in_stats include_in_email include_in_scoring /],
 	},
-	screenSnippets => {
-		setHeader => "$webworkDirs{conf}/snippets/setHeader.pg",
+	Audit => {
+		abbrevs => [qw/ A a audit /],
+		behaviors => [qw/ allow_course_access include_in_assignment include_in_stats include_in_email /],
 	},
-	logs => {
-		timing         => "$webworkDirs{logs}/timing.log",
+	Drop => {
+		abbrevs => [qw/ D d drop withdraw /],
+		behaviors => [qw/  /],
+	},
+	Proctor => { 
+		abbrevs => [qw/ P p proctor /],
+		behaviors => [qw/  /],
 	},
-	equationCacheDB => "$webworkDirs{DATA}/equationcache",
-);
-
-%webworkURLs = (
-	root          => "$webworkURLRoot",
-	home          => "/webwork2_files/index.html",
-	htdocs        => "/webwork2_files",
-	htdocs_temp   => "/webwork2_files/tmp",
-	equationCache => "/webwork2_files/tmp/equations",
-	docs          => "http://webhost.math.rochester.edu/webworkdocs/docs",
-	oldProf       => "/webwork-old/profLogin.pl",
 );
 
 ################################################################################
-# Default course-specific settings
+# Database options
 ################################################################################
 
-my $courseRoot = "$webworkDirs{courses}/$courseName";
-%courseDirs = (
-	root        => "$courseRoot",
-	DATA        => "$courseRoot/DATA",
-	auth_DATA   => "$courseRoot/DATA/.auth",
-	html        => "$courseRoot/html",
-	html_images => "$courseRoot/html/images",
-	html_temp   => "$courseRoot/html/tmp",
-	logs        => "$courseRoot/logs",
-	scoring     => "$courseRoot/scoring",
-	templates   => "$courseRoot/templates",
-	macros      => "$courseRoot/templates/macros",
-	email       => "$courseRoot/templates/email",
-);
+# these variables are used by database.conf. we define them here so that editing
+# database.conf isn't necessary.
 
-%courseFiles = (
-	environment => "$courseDirs{root}/course.conf",
-	motd        => "$courseDirs{root}/motd.txt",
-	logs => {
-		answer_log  => "$courseDirs{logs}/answer_log",
-	},	
-	course_info => "$courseDirs{root}/course_info.txt",
-	login_info  => "$courseDirs{root}/login_info.txt",
-);
+# required permissions
+# GRANT SELECT ON webwork.* TO webworkRead@localhost IDENTIFIED BY 'passwordRO';
+# GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, ALTER, DROP, INDEX, LOCK TABLES ON webwork.* TO webworkWrite@localhost IDENTIFIED BY 'passwordRW';
 
-# quick hack to fix transaction logging. blah.
-$webworkFiles{logs}->{transaction}    = "$courseDirs{logs}/transaction.log";
-$webworkFiles{logs}->{pastAnswerList} = "$courseDirs{logs}/past_answers.log";
+$database_dsn = "dbi:mysql:webwork";
+$database_username = "webworkWrite";
+$database_password = "";
+$database_debug = 0;
 
-my $courseURLRoot = "$webworkURLs{htdocs}/courses/$courseName";
-%courseURLs = (
-	root      => "$courseURLRoot",
-	html      => "$courseURLRoot",
-	html_temp => "$courseURLRoot/tmp",
-);
+# Variables for sql_moodle database layout.
+$moodle_dsn = "dbi:mysql:moodle";
+$moodle_username = $database_username;
+$moodle_password = $database_password;
+$moodle_table_prefix = "mdl_";
+$moodle17 = 0;
+
+# Several database are defined in the file conf/database.conf and stored in the
+# hash %dbLayouts.
+include "conf/database.conf";
+
+# Select the default database layout. This can be overridden in the course.conf
+# file of a particular course. The only database layout supported in WW 2.1.4
+# and up is "sql_single".
+$dbLayoutName = "sql_single";
+
+# This sets the symbol "dbLayout" as an alias for the selected database layout.
+*dbLayout     = $dbLayouts{$dbLayoutName};
 
 ################################################################################
-# Other site-specific options
-################################################################################
-
-%mail = (
-	smtpServer => "mail.math.rochester.edu",
-	smtpSender => "webwork\@math.rochester.edu",
-	# allowedRecipients defines addresses that the PG system is allowed to
-	# send mail to. this prevents subtle PG exploits. This should be set
-	# in course.conf to the addresses of professors of each course. Sending
-	# mail from the PG system (i.e. questionaires, essay questions) will
-	# fail if this is not set somewhere (either here or in course.conf).
-	#allowedRecipients => [
-	#	"yourname\@host.yourdomain.edu",
-	#],
-	# if defined, feedbackRecipients overrides the list of recipients for
-	# feedback email. It's appropriate to set this in the course.conf for
-	# specific courses, but probably not in global.conf. if not defined,
-	# mail is sent to all professors and TAs for a given course
-	#feedbackRecipients => [
-	#	"prof1\@host.yourdomain.edu",
-	#	"prof2\@host.yourdomain.edu",
-	#],
-	# feedbackVerbosity:
-	#  0: send only the feedback comment and context link
-	#  1: as in 0, plus user, set, problem, and PG data
-	#  2: as in 1, plus the problem environment (debugging data)
-	feedbackVerbosity      => 1,
-	editor_window_rows     => 15,
-	editor_window_columns  => 100,
-);
+# Problem library options
+################################################################################
 
-%externalPrograms = (
-	mkdir    => "/bin/mkdir",
-	tth      => "/usr/local/bin/tth",
-	pdflatex => "/usr/local/bin/pdflatex",
-	latex    => "/usr/local/bin/latex",
-	#dvipng   => "/usr/local/bin/dvipng -mode ljfivemp -D600 -Q6 -x1000.5 -bgTransparent",
-	dvipng   => "/usr/local/bin/dvipng",
-	gif2eps  => "$webworkDirs{bin}/gif2eps",
-	png2eps  => "$webworkDirs{bin}/png2eps",
-	gif2png  => "$webworkDirs{bin}/gif2png",
-);
+# For configuration instructions, see:
+# http://webwork.maa.org/wiki/National_Problem_Library
+# The directory containing the natinal problem library files. Set to "" if no problem
+# library is installed.
+$problemLibrary{root}        = "";
+
+# Problem Library version
+# Version 1 is in use.  Version 2 will be released soon.
+$problemLibrary{version} = "2";
+
+# Problem Library SQL database connection information
+$problemLibrary_db = {
+        dbsource => $database_dsn,
+        user     => $database_username,
+        passwd   => $database_password,
+};
 
 ################################################################################
-# Frontend options 
+# Logs
 ################################################################################
 
-%templates = (
-	system => "$webworkDirs{conf}/templates/ur.template",
-);
+# FIXME: take logs out of %webworkFiles/%courseFiles and give them their own
+# top-level hash.
+
+# Logs data about how long it takes to process problems. (Do not confuse this
+# with the /other/ timing log which can be set by WeBWorK::Timing and is used
+# for benchmarking system performance in general. At some point, this timing
+# mechanism will be deprecated in favor of the WeBWorK::Timing mechanism.)
+$webworkFiles{logs}{timing}         = "$webworkDirs{logs}/timing.log";
+
+# Logs courses created via the web-based Course Administration module.
+$webworkFiles{logs}{hosted_courses} = "$webworkDirs{logs}/hosted_courses.log";
+
+# The transaction log contains data from each recorded answer submission. This
+# is useful if the database becomes corrupted.
+$webworkFiles{logs}{transaction}    = "$webworkDirs{logs}/${courseName}_transaction.log";
+
+# The answer log stores a history of all users' submitted answers.
+$courseFiles{logs}{answer_log}      = "$courseDirs{logs}/answer_log";
+
+# Log logins.
+$courseFiles{logs}{login_log}       = "$courseDirs{logs}/login.log";
+
+# Log for almost every click.  By default it is the empty string, which
+# turns this log off.  If you want it turned on, we suggest
+#                "$courseDirs{logs}/activity.log"
+# When turned on, this log can get quite large.
+$courseFiles{logs}{activity_log} = '';
 
 ################################################################################
-# Database options
+# Site defaults (FIXME: what other things could be "site defaults"?)
+################################################################################
+
+# Set the default timezone of courses on this server. To get a list of valid
+# timezones, run:
+# 
+#     perl -MDateTime::TimeZone -e 'print join "\n", DateTime::TimeZone::all_names'
+# 
+# To get a list of valid timezone "links" (deprecated names), run:
+# 
+#     perl -MDateTime::TimeZone -e 'print join "\n", DateTime::TimeZone::links'
+# 
+# If left blank, the system timezone will be used. This is usually what you
+# want. You might want to set this if your server is NOT in the same timezone as
+# your school. If just a few courses are in a different timezone, set this in
+# course.conf for the affected courses instead.
+# 
+$siteDefaults{timezone} = "America/New_York";
+
+# The default_templates_course is used by default to create a new course.
+# The contents of the templates directory are copied from this course
+# to the new course being created.
+$siteDefaults{default_templates_course} ="modelCourse";
+
+################################################################################
+# Authentication system
 ################################################################################
 
-# Several database layouts are defined in separate environment files. Select the
-# one which should be used by all courses by default, and include it. This can
-# be overridden by including a difference environment file in the course.conf of
-# a particular course.
+# FIXME This mechanism is a little awkward and probably should be merged with
+# the dblayout selection system somehow.
+
+# Select the authentication module to use for normal logins.
+# 
+# If this value is a string, the given authentication module will be used
+# regardless of the database layout. If it is a hash, the database layout name
+# will be looked up in the hash and the resulting value will be used as the
+# authentication module. The special hash key "*" is used if no entry for the
+# current database layout is found.
+# 
+$authen{user_module} = {
+	sql_moodle => "WeBWorK::Authen::Moodle",
+	# sql_ldap   => "WeBWorK::Authen::LDAP",
+	"*" => "WeBWorK::Authen",
+};
 
-# Include sql.conf to specify a database layout for use with an SQL server.
-#include "conf/sql.conf";
+# Select the authentication module to use for proctor logins.
+# 
+# A string or a hash is accepted, as above.
+# 
+$authen{proctor_module} = "WeBWorK::Authen::Proctor";
 
-# Include gdbm.conf to specify a database layout for WeBWorK 1.x compatible GDBM
-# databases. Use this layout if you wish to share courses between WeBWorK 1.x
-# and WeBWorK 2.
-include "conf/gdbm.conf";
+# Options for particular authentication modules
 
-# Please read the documentation in the file that you chose to include, as there
-# are layout-specific options that must be configured.
+# $authen{moodle_options} = {
+# 	dsn => $moodle_dsn,
+# 	username => $moodle_username,
+# 	password => $moodle_password,
+# 	table_prefix => $moodle_table_prefix,
+# 	moodle17 => $moodle17,
+# };
+
+$authen{ldap_options} = {
+	# hosts to attempt to connect to, in order. For example:
+	#   auth.myschool.edu             -- uses LDAP scheme and port 389
+	#   ldap://auth.myschool.edu:666  -- non-standard port
+	#   ldaps://auth.myschool.edu     -- uses LDAPS scheme and port 636
+	#   ldaps://auth.myschool.edu:389 -- SSL on non-SSL port
+	#   Edit the host(s) below:
+	net_ldap_hosts => [
+		"ldaps://auth1.myschool.edu",
+		"ldaps://auth2.myschool.edu",
+	],
+	# connection options
+	net_ldap_options => {
+		timeout => 30,
+		version => 3,
+	},
+	# base to use when searching for user's DN
+	# Edit the data below:
+	net_ldap_base => "ou=people,dc=myschool,dc=edu",
+	
+        # Use a Bind account if set to 1
+        bindAccount => 0,
+
+        searchDN => "cn=search,DC=youredu,DC=edu",
+        bindPassword =>  "password",
+
+	# The LDAP module searches for a DN whose RDN matches the username
+	# entered by the user. The net_ldap_rdn setting tells the LDAP
+	# backend what part of your LDAP schema you want to use as the RDN.
+	# The correct value for net_ldap_rdn will depend on your LDAP setup.
+	# 
+	# Uncomment this line if you use Active Directory.
+	#net_ldap_rdn => "sAMAccountName",
+	#
+	# Uncomment this line if your schema uses uid as an RDN.
+	#net_ldap_rdn => "uid",
+	#
+	# By default, net_ldap_rdn is set to "sAMAccountName".
+
+	# If failover = "all", then all LDAP failures will be checked
+	# against the WeBWorK database. If failover = "local", then only
+	# users who don't exist in LDAP will be checked against the WeBWorK
+	# database. If failover = 0, then no attempts will be checked
+	# against the WeBWorK database. failover = 1 is equivalent to
+	# failover = "all".
+	failover => "all",
+};
 
 ################################################################################
 # Authorization system
 ################################################################################
 
-# This lets you specify a minimum permission level needed to perform certain
-# actions.  In the current system, >=10 will allow a professor to perform the
-# action, >=5 will allow a TA to, and >=0 will allow a student to perform an
-# action (almost never what you want).
-my $ta = 5;
-my $professor = 10;
+# this section lets you define which groups of users can perform which actions.
+
+# this hash maps a numeric permission level to the name of a role. the number
+# assigned to a role is significant -- roles with higher numbers are considered
+# "more privileged", and are included when that role is listed for a privilege
+# below.
+# 
+%userRoles = (
+	guest => -5,
+	student => 0,
+	login_proctor => 2,
+	grade_proctor => 3,
+	ta => 5,
+	professor => 10,
+);
+
+# this hash maps operations to the roles that are allowed to perform those
+# operations. the role listed and any role with a higher permission level (in
+# the %userRoles hash) will be allowed to perform the operation. If the role
+# is undefined, no users will be allowed to perform the operation.
+# 
 %permissionLevels = (
-	become_student                 => $professor,
-	access_instructor_tools        => $ta,
-	create_and_delete_problem_sets => $professor,
-	modify_problem_sets            => $professor,
-	assign_problem_sets            => $professor,
-	modify_student_data            => $professor,
-	score_sets                     => $professor,
-	send_mail					   => $professor,
-	modify_classlist_files         => $professor,
-	modify_set_def_files           => $professor,
+	login                          => "guest",
+	report_bugs                    => "ta",
+	submit_feedback                => "student",
+	change_password                => "student",
+	change_email_address           => "student",
+	
+	proctor_quiz_login             => "login_proctor",
+	proctor_quiz_grade             => "grade_proctor",
+	view_proctored_tests           => "student",
+	view_hidden_work               => "ta",
+	
+	view_multiple_sets             => "ta",
+	view_unopened_sets             => "ta",
+	view_hidden_sets               => "ta",
+	view_answers                   => "ta",
+	view_ip_restricted_sets        => "ta",
+	
+	become_student                 => "professor",
+	access_instructor_tools        => "ta",
+	score_sets                     => "professor",
+	send_mail                      => "professor",
+	receive_feedback               => "ta",
+	
+	create_and_delete_problem_sets => "professor",
+	assign_problem_sets            => "professor",
+	modify_problem_sets            => "professor",
+	modify_student_data            => "professor",
+	modify_classlist_files         => "professor",
+	modify_set_def_files           => "professor",
+	modify_scoring_files           => "professor",
+	modify_problem_template_files  => "professor",
+	manage_course_files            => "professor",
+	
+	create_and_delete_courses      => "professor",
+	fix_course_databases           => "professor",
+	
+	##### Behavior of the interactive problem processor #####
+	
+	show_correct_answers_before_answer_date         => "ta",
+	show_solutions_before_answer_date               => "ta",
+	avoid_recording_answers                         => "ta",
+	# Below this level, old answers are never initially shown
+	can_show_old_answers_by_default                 => "student",
+	# at this level, we look at showOldAnswers for default value
+	# even after the due date
+	can_always_use_show_old_answers_default         => "professor",
+	check_answers_before_open_date                  => "ta",
+	check_answers_after_open_date_with_attempts     => "ta",
+	check_answers_after_open_date_without_attempts  => "guest",
+	check_answers_after_due_date                    => "guest",
+	check_answers_after_answer_date                 => "guest",
+	create_new_set_version_when_acting_as_student   => undef,
+	print_path_to_problem                           => "professor", # see "Special" PG environment variables
+	record_set_version_answers_when_acting_as_student => undef,
+	record_answers_when_acting_as_student           => undef,
+	# "record_answers_when_acting_as_student" takes precedence
+	# over the following for professors acting as students:
+	record_answers_before_open_date                 => undef,
+	record_answers_after_open_date_with_attempts    => "student",
+	record_answers_after_open_date_without_attempts => undef,
+	record_answers_after_due_date                   => undef,
+	record_answers_after_answer_date                => undef,
+	dont_log_past_answers                           => "professor",
+	# does the user get to see a dump of the problem?
+	view_problem_debugging_info                     => "ta",
+	
+	##### Behavior of the Hardcopy Processor #####
+	
+	download_hardcopy_multiuser  => "ta",
+	download_hardcopy_multiset   => "ta",
+	download_hardcopy_view_errors =>"professor",
+	download_hardcopy_format_pdf => "guest",
+	download_hardcopy_format_tex => "ta",
 );
 
+# This is the default permission level given to new students and students with
+# invalid or missing permission levels.
+$default_permission_level = $userRoles{student};
+
 ################################################################################
 # Session options
 ################################################################################
@@ -219,10 +798,10 @@ my $professor = 10;
 $sessionKeyTimeout = 60*30;
 
 # $sessionKeyLength defines the length (in characters) of the session key
-$sessionKeyLength = 40;
+$sessionKeyLength = 32;
 
 # @sessionKeyChars lists the legal session key characters
-@sessionKeyChars = ('A'..'Z', 'a'..'z', '0'..'9', '.', '^', '/', '!', '*');
+@sessionKeyChars = ('A'..'Z', 'a'..'z', '0'..'9');
 
 # Practice users are users who's names start with $practiceUser
 # (you can comment this out to remove practice user support)
@@ -234,88 +813,271 @@ $practiceUserPrefix = "practice";
 # password.  Come to think of it, why do we even have this?!
 #$debugPracticeUser = "practice666";
 
+# Option for gateway tests; $gatewayGracePeriod is the time in seconds
+# after the official due date during which we'll still grade the test
+$gatewayGracePeriod = 120;
+
 ################################################################################
-# PG translation options
+# PG subsystem options
 ################################################################################
 
-%pg = (
-	# options for various renderers
-	renderers => {
-		"WeBWorK::PG::Remote" => {
-			proxy => "http://localhost:21000/RenderD"
-		}
-	},
-	# currently selected renderer
-	renderer => "WeBWorK::PG::Local",
-	#renderer => "WeBWorK::PG::Remote",
-	# directories used by PG
-	directories => {
-		# directories used only by PG
-		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
-	specialPGEnvironmentVars => {
-		PRINT_FILE_NAMES_FOR   => [ qw(gage apizer voloshin lr003k professor) ],
-		CAPA_Tools             => "$courseDirs{macros}/CAPA_Tools/", 
-		CAPA_MCTools           => "$courseDirs{macros}/CAPA_MCTools/",  
-		CAPA_Graphics_URL      => "$courseDirs{html}/CAPA_Graphics/",   
-		CAPA_GraphicsDirectory => "$courseDirs{html}CAPA_Graphics/", 
-	},
-	# modules lists module names and the packages each contains
-	modules => [
-		[qw(DynaLoader)],
-		[qw(Exporter)],
-		[qw(GD)],
-		
-		[qw(AlgParser AlgParserWithImplicitExpand Expr ExprWithImplicitExpand)],
-		[qw(AnswerHash AnswerEvaluator)],
-		[qw(WWPlot)], # required by Circle (and others)
-		[qw(Circle)],
-		[qw(Complex)],
-		[qw(Complex1)],
-		[qw(Distributions)],
-		[qw(Fraction)],
-		[qw(Fun)],
-		[qw(Hermite)],
-		[qw(Label)],
-		[qw(List)],
-		[qw(Match)],
-		[qw(MatrixReal1)], # required by Matrix
-		[qw(Matrix)],
-		[qw(Multiple)],
-		[qw(PGrandom)],
-		[qw(Regression)],
-		[qw(Select)],
-		[qw(Units)],
-		[qw(VectorField)],
-	],
-	# defaults used by answer evaluators
-	ansEvalDefaults => {
-		functAbsTolDefault            => .001,
-		functLLimitDefault            => .0000001,
-		functMaxConstantOfIntegration => 1E8,
-		functNumOfPoints              => 3,
-		functRelPercentTolDefault     => .1,
-		functULimitDefault            => .9999999,
-		functVarDefault               => "x",
-		functZeroLevelDefault         => 1E-14,
-		functZeroLevelTolDefault      => 1E-12,
-		numAbsTolDefault              => .001,
-		numFormatDefault              => "",
-		numRelPercentTolDefault       => .1,
-		numZeroLevelDefault           => 1E-14,
-		numZeroLevelTolDefault        => 1E-12,
+# List of enabled display modes. Comment out any modes you don't wish to make
+# available for use.
+$pg{displayModes} = [
+#	"plainText",     # display raw TeX for math expressions
+#	"formattedText", # format math expressions using TtH
+	"images",        # display math expressions as images generated by dvipng
+	"jsMath",        # render TeX math expressions on the client side using jsMath
+#	"MathJax",       # render TeX math expressions on the client side using MathJax --- we strongly recommend people install and use MathJax
+#	"asciimath",     # render TeX math expressions on the client side using ASCIIMathML
+#	"LaTeXMathML",   # render TeX math expressions on the client side using LaTeXMathML
+];
+
+#### Default settings for the PG translator
+
+# Default display mode. Should be listed above (uncomment only one).
+$pg{options}{displayMode}        = "images";
+#$pg{options}{displayMode}        = "jsMath";
+#$pg{options}{displayMode}        = "MathJax";
+
+# The default grader to use, if a problem doesn't specify.
+$pg{options}{grader}             = "avg_problem_grader";
+
+# Fill in answer blanks with the student's last answer by default?
+$pg{options}{showOldAnswers}     = 1;
+
+# Show correct answers (when allowed) by default?
+$pg{options}{showCorrectAnswers} = 0;
+
+# Show hints (when allowed) by default?
+$pg{options}{showHints}          = 0;
+
+# Show solutions (when allowed) by default?
+$pg{options}{showSolutions}      = 0;
+
+# Display the "Entered" column which automatically shows the evaluated student answer, e.g. 1 if student input is sin(pi/2).
+# If this is set to 0, e.g. to save space in the response area, the student can still see their evaluated answer by hovering
+# the mouse pointer over the typeset version of their answer
+$pg{options}{showEvaluatedAnswers}      = 1;
+
+# Catch translation warnings internally by default? (We no longer need to do
+# this, since there is a global warnings handler. So this should be off.)
+$pg{options}{catchWarnings}      = 0;
+
+# decorations for correct input blanks -- apparently you can't define and name attribute collections in a .css file
+$pg{options}{correct_answer} = "{border-width:2;border-style:solid;border-color:#8F8}"; #matches resultsWithOutError class in math2.css
+
+# decorations for incorrect input blanks
+$pg{options}{incorrect_answer} = "{border-width:2;border-style:solid;border-color:#F55}"; #matches resultsWithError class in math2.css
+
+##### Currently-selected renderer
+
+# Only the local renderer is supported in this version.
+$pg{renderer} = "WeBWorK::PG::Local";
+
+# The remote renderer connects to an XML-RPC PG rendering server.
+#$pg{renderer} = "WeBWorK::PG::Remote";
+
+##### Renderer-dependent options
+
+# The remote renderer has one option:
+$pg{renderers}{"WeBWorK::PG::Remote"} = {
+	# The "proxy" server to connect to for remote rendering.
+	proxy => "http://localhost:21000/RenderD",
+};
+
+##### Settings for various display modes
+
+# "images" mode has several settings:
+$pg{displayModeOptions}{images} = {
+	# Determines the method used to align images in output. Can be
+	# "baseline", "absmiddle", or "mysql".
+	dvipng_align => 'mysql', 
+
+	# If mysql is chosen, this information indicates which database contains the
+	# 'depths' table. Since 2.3.0, the depths table is kept in the main webwork
+	# database. (If you are upgrading from an earlier version of webwork, and
+	# used the mysql method in the past, you should move your existing 'depths'
+	# table to the main database.)
+	dvipng_depth_db => {
+		dbsource => $database_dsn,
+		user     => $database_username,
+		passwd   => $database_password,
 	},
-);
+};
+
+$pg{displayModeOptions}{jsMath} = {
+	reportMissingFonts => 0,       # set to 1 to allow the missing font message
+	missingFontMessage => undef,   # set to an HTML string to replace the missing font message
+	noImageFonts => 0,             # set to 1 if you didn't install the jsMath image fonts
+	processDoubleClicks => 1,      # set to 0 to disable double-click on math to get TeX source
+};
+
+##### Directories used by PG
+
+# The root of the PG directory tree (from pg_root in Apache config).
+$pg{directories}{root}   = "$pg_dir";
+$pg{directories}{lib}    = "$pg{directories}{root}/lib";
+$pg{directories}{macros} = "$pg{directories}{root}/macros";
+
+#
+#  The macro file search path.  Each directory in this list is seached
+#  (in this order) by loadMacros() when it looks for a .pl file.
+#
+$pg{directories}{macrosPath} = [
+   ".",                     # search the problem file's directory
+   $courseDirs{macros},
+   $pg{directories}{macros},
+   "$courseDirs{templates}/Library/macros/Union",
+   "$courseDirs{templates}/Library/macros/Michigan",
+   "$courseDirs{templates}/Library/macros/CollegeOfIdaho",
+   "$courseDirs{templates}/Library/macros/FortLewis",
+   "$courseDirs{templates}/Library/macros/TCNJ",
+   "$courseDirs{templates}/Library/macros/NAU",
+   "$courseDirs{templates}/Library/macros/Dartmouth",
+];
+
+# The applet search path. If a full URL is given, it is used unmodified. If an
+# absolute path is given, the URL of the local server is prepended to it.
+# 
+# For example, if an item is "/math/applets",
+# and the local server is  "https://math.yourschool.edu",
+# then the URL "https://math.yourschool.edu/math/applets" will be used.
+# 
+
+$pg{directories}{appletPath} = [    # paths to search for applets (requires full url)
+	"$webworkURLs{htdocs}/applets",
+	"$webworkURLs{htdocs}/applets/geogebra_stable",
+	"$courseURLs{html}/applets",  
+	"$webworkURLs{htdocs}/applets/Xgraph",
+	"$webworkURLs{htdocs}/applets/PointGraph",
+	"$webworkURLs{htdocs}/applets/Xgraph",
+	"$webworkURLs{htdocs}/applets/liveJar",
+	"$webworkURLs{htdocs}/applets/Image_and_Cursor_All",
+	
+];
+
+##### "Special" PG environment variables. (Stuff that doesn't fit in anywhere else.)
+
+# Users for whom to print the file name of the PG file being processed.
+$pg{specialPGEnvironmentVars}{PRINT_FILE_NAMES_FOR} = [ "professor", ];  
+   # ie file paths are printed for 'gage'
+$pg{specialPGEnvironmentVars}{PRINT_FILE_NAMES_PERMISSION_LEVEL} = $userRoles{ $permissionLevels{print_path_to_problem} }; 
+   # (file paths are also printed for anyone with this permission or higher)
+
+# Locations of CAPA resources. (Only necessary if you need to use converted CAPA
+# problems.)
+$pg{specialPGEnvironmentVars}{CAPA_Tools}             = "/opt/webwork/libraries/CAPA/CAPA_Tools/",
+$pg{specialPGEnvironmentVars}{CAPA_MCTools}           = "/opt/webwork/libraries/CAPA/CAPA_MCTools/",
+$pg{specialPGEnvironmentVars}{CAPA_GraphicsDirectory} = "$webworkDirs{htdocs}/CAPA_Graphics/",
+$pg{specialPGEnvironmentVars}{CAPA_Graphics_URL}      = "$webworkURLs{htdocs}/CAPA_Graphics/",
+
+# Size in pixels of dynamically-generated images, i.e. graphs.
+$pg{specialPGEnvironmentVars}{onTheFlyImageSize}      = 400,
+ 
+# To disable the Parser-based versions of num_cmp and fun_cmp, and use the
+# original versions instead, set this value to 1.
+$pg{specialPGEnvironmentVars}{useOldAnswerMacros} = 0;
+
+# Strings to insert at the start and end of the body of a problem
+#  (at beginproblem() and ENDDOCUMENT) in various modes.  More display modes
+#  can be added if different behaviours are desired (e.g., HTML_dpng,
+#  HTML_asciimath, etc.).  These parts are not used in the Library browser.
+
+$pg{specialPGEnvironmentVars}{problemPreamble} = { TeX => '', HTML=> '' };
+$pg{specialPGEnvironmentVars}{problemPostamble} = { TeX => '', HTML=>'' };
+
+# To have the problem body indented and boxed, uncomment:
+
+ $pg{specialPGEnvironmentVars}{problemPreamble}{HTML} = '<BLOCKQUOTE>
+     <TABLE BORDER=1 CELLSPACING=1 CELLPADDING=15 BGCOLOR=#E8E8E8><TR><TD>'; 
+ $pg{specialPGEnvironmentVars}{problemPostamble}{HTML} = '</TD></TR></TABLE>
+     </BLOCKQUOTE>';
+
+##### PG modules to load
+
+# The first item of each list is the module to load. The remaining items are
+# additional packages to import.
+
+${pg}{modules} = [
+	[qw(DynaLoader)],
+	[qw(Exporter)],
+	[qw(GD)],
+	
+	[qw(AlgParser AlgParserWithImplicitExpand Expr ExprWithImplicitExpand utf8)],
+	[qw(AnswerHash AnswerEvaluator)],
+	[qw(WWPlot)], # required by Circle (and others)
+	[qw(Circle)],
+	[qw(Complex)],
+	[qw(Complex1)],
+	[qw(Distributions)],
+	[qw(Fraction)],
+	[qw(Fun)],
+	[qw(Hermite)],
+	[qw(Inequalities::common)],
+	[qw(Label)],
+	[qw(LimitedPolynomial)],
+	[qw(ChoiceList)],
+	[qw(Match)],
+	[qw(MatrixReal1)], # required by Matrix
+	[qw(Matrix)],
+	[qw(Multiple)],
+	[qw(PGrandom)],
+	[qw(Regression)],
+	[qw(Select)],
+	[qw(Units)],
+	[qw(VectorField)],
+	[qw(Parser Value)],
+	[qw(Parser::Legacy)],
+#	[qw(SaveFile)],
+#   [qw(Chromatic)], # for Northern Arizona graph problems 
+#                    #  -- follow instructions at libraries/nau_problib/lib/README to install
+    [qw(Applet FlashApplet JavaApplet CanvasApplet)],
+	[qw(PGcore PGalias PGresource PGloadfiles PGanswergroup PGresponsegroup  Tie::IxHash)],
+];
+
+##### Problem creation defaults
+
+# The default weight (also called value) of a problem to use when using the 
+# Library Browser, Problem Editor or Hmwk Sets Editor to add problems to a set
+# or when this value is left blank in an imported set definition file.
+$problemDefaults{value} = 1;  
+
+# The default max_attempts for a problem to use when using the 
+# Library Browser, Problem Editor or Hmwk Sets Editor to add problems to a set
+# or when this value is left blank in an imported set definition file.  Note that 
+# setting this to -1 gives students unlimited attempts.
+$problemDefaults{max_attempts} = -1;   
+
+##### Answer evaluatior defaults
+
+$pg{ansEvalDefaults} = {
+	functAbsTolDefault            => .001,
+	functLLimitDefault            => .0000001,
+	functMaxConstantOfIntegration => 1E8,
+	functNumOfPoints              => 3,
+	functRelPercentTolDefault     => .1,
+	functULimitDefault            => .9999999,
+	functVarDefault               => "x",
+	functZeroLevelDefault         => 1E-14,
+	functZeroLevelTolDefault      => 1E-12,
+	numAbsTolDefault              => .001,
+	numFormatDefault              => "",
+	numRelPercentTolDefault       => .1,
+	numZeroLevelDefault           => 1E-14,
+	numZeroLevelTolDefault        => 1E-12,
+	useBaseTenLog                 => 0,
+	defaultDisplayMatrixStyle     => "[s]",  # left delimiter, middle line delimiters, right delimiter
+	reducedScoringPeriod          => 0,	# Length of Reduced Credit Period (formally Reduced Scoring Period) in minutes
+	reducedScoringValue			  => 1,	# A number in [0,1]. Students will be informed of the value as a percentage
+};
+
+################################################################################
+# Compatibility
+################################################################################
+
+# Define the old names for the various "root" variables.
+$webworkRoot    = $webworkDirs{root};
+$webworkURLRoot = $webworkURLs{root};
+$pgRoot         = $pg{directories}{root};
+
diff --git a/conf/httpd-wwmp.conf.dist b/conf/httpd-wwmp.conf.dist
deleted file mode 100644
index 7aae2a4b67..0000000000
--- a/conf/httpd-wwmp.conf.dist
+++ /dev/null
@@ -1,113 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
-# 
-# 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
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-# 
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-# The best way to turn this into a working webwork server config file is to do
-# a global find/replace on the following strings:
-#	!WEBWORK_ROOT! -> the root of your personal webwork-modperl tree
-#	!WEBWORK_USER! -> your user name
-#	!WEBWORK_PORT! -> the port on which you want to run this server
-#	                  (please use 10000 + your UID)
-#	!PG_ROOT! -> the root of your personal pg tree
-# 
-# After those find/replace operations, you should edit the access control
-# statements at the bottom of this file.
-
-Include !WEBWORK_ROOT!/conf/httpd-wwmp-header.conf
-
-Port !WEBWORK_PORT!
-User !WEBWORK_USER!
-Group !WEBWORK_USER!
-
-ServerAdmin !WEBWORK_USER!@localhost
-
-LockFile !WEBWORK_ROOT!/logs/httpd.lock
-PidFile !WEBWORK_ROOT!/logs/httpd.pid
-ErrorLog !WEBWORK_ROOT!/logs/error.log
-
-# On systems that use it, ScoreBoardFile must be different for different
-# invocations of Apache.  webwork-dev doens't appear to be one of those
-# systems.
-#ScoreBoardFile /var/run/httpd.scoreboard
-
-PerlFreshRestart On
-<Location /webwork2>
-    SetHandler perl-script
-    PerlHandler Apache::WeBWorK
-
-    PerlSetVar webwork_root !WEBWORK_ROOT!
-    PerlSetVar pg_root !PG_ROOT!
-    <Perl>
-	use lib '!WEBWORK_ROOT!/lib';
-	use lib '!PG_ROOT!/lib';
-    </Perl>
-</Location>
-
-# We're limiting the number of children because we'll be running a lot and
-# don't want to bog the development box down.
-StartServers 2
-MinSpareServers 2
-MaxSpareServers 2
-MaxClients 150
-# How "old" a child is allowed to get.  0 for unlimited requests
-# Pick a low number -- you're bound to screw something up, right?
-MaxRequestsPerChild 100 
-
-# This DocumentRoot doesn't actually make a lot of sense.  In a
-# WeBWorK mod_perl system, there is no static document root, but the
-# DocumentRoot does have to exist, and not have a subdirectory
-# named "webwork2".  It suffices.
-DocumentRoot "!WEBWORK_ROOT!/htdocs"
-
-# This alias, however, is important.
-Alias /webwork2_files/ !WEBWORK_ROOT!/htdocs/
-
-# This should match the DocumentRoot
-<Directory "!WEBWORK_ROOT!/htdocs">
-    Options Indexes FollowSymLinks MultiViews
-    AllowOverride None
-    Order allow,deny
-    Allow from all
-</Directory>
-
-# Possible forms of access limitation (edit to taste)
-
-# The developer maintains a personal htpasswd file
-#<Location />
-#	AuthType Basic
-#	AuthName "!WEBWORK_USER!'s WeBWorK development system"
-#	AuthUserFile !WEBWORK_ROOT!/conf/htpasswd
-#	Require valid-user
-#</Location>
-
-# There is a site-wide htpasswd file somewhere, with all developers in it
-#<Location />
-#	AuthType Basic
-#	AuthName "!WEBWORK_USER!'s WeBWorK development system"
-#	AuthUserFile /path/to/site/htpasswd/file
-#	Require valid-user
-#</Location>
-
-# You have mod_pam_auth and would like to authenticate against your /etc/passwd   
-# file.  (NOTE: It is a good idea to use Digest authentication instead of Basic,  
-# even though this limits your choice of browsers, because of the heightened      
-# sensitivity of normal system passwords.)
-#<Location />
-#	AuthType Digest
-#	AuthName "!WEBWORK_USER!'s WeBWorK development system"
-#	AuthPAM_Enabled on
-#	Require valid-user
-##	Require group wwdev
-#</Location>
diff --git a/conf/snippets/blankProblem.pg b/conf/snippets/blankProblem.pg
new file mode 100644
index 0000000000..092880cc51
--- /dev/null
+++ b/conf/snippets/blankProblem.pg
@@ -0,0 +1,25 @@
+DOCUMENT();
+
+# Load whatever macros you need for the problem
+loadMacros("PG.pl",
+           "PGbasicmacros.pl",
+           "PGchoicemacros.pl",
+           "PGanswermacros.pl",
+           "PGauxiliaryFunctions.pl",
+           "PGgraphmacros.pl",
+          );
+ 
+## Do NOT show partial correct answers
+$showPartialCorrectAnswers = 0;
+TEXT(beginproblem());
+
+BEGIN_TEXT
+
+Enter a value for \(\pi\)
+
+\{ans_rule()\}
+END_TEXT
+
+ANS(num_cmp(3.14159));
+
+ENDDOCUMENT();
diff --git a/conf/snippets/blankProblem2.pg b/conf/snippets/blankProblem2.pg
new file mode 100644
index 0000000000..0750434b70
--- /dev/null
+++ b/conf/snippets/blankProblem2.pg
@@ -0,0 +1,72 @@
+##DESCRIPTION
+##  Algebra problem: true or false for inequality 
+##ENDDESCRIPTION
+
+##KEYWORDS('algebra', 'inequality', 'fraction')
+
+## DBsubject('Algebra')
+## DBchapter('Fundamentals')
+## DBsection('Real Numbers')
+## Date('6/3/2002')
+## Author('')
+## Institution('')
+## TitleText1('Precalculus')
+## EditionText1('3')
+## AuthorText1('Stewart, Redlin, Watson')
+## Section1('1.1')
+## Problem1('22')
+
+########################################################################
+
+DOCUMENT();      
+
+loadMacros(
+   "PGstandard.pl",     # Standard macros for PG language
+   "MathObjects.pl",
+   #"source.pl",        # allows code to be displayed on certain sites.
+   #"PGcourse.pl",      # Customization file for the course
+);
+
+# Print problem number and point value (weight) for the problem
+TEXT(beginproblem());
+
+# Show which answers are correct and which ones are incorrect
+$showPartialCorrectAnswers = 1;
+
+##############################################################
+#
+#  Setup
+#
+#
+Context("Numeric");
+
+$pi = Real("pi");
+
+##############################################################
+#
+#  Text
+#
+#
+
+Context()->texStrings;
+BEGIN_TEXT
+
+
+Enter a value for \(\pi\)
+
+\{$pi->ans_rule\}
+END_TEXT
+Context()->normalStrings;
+
+##############################################################
+#
+#  Answers
+#
+#
+
+ANS($pi->with(tolerance=>.0001)->cmp);
+# relative tolerance --3.1412 is incorrect but 3.1413 is correct
+# default tolerance is .01 or one percent.
+
+
+ENDDOCUMENT();        
diff --git a/conf/snippets/hardcopyPostamble.tex b/conf/snippets/hardcopyPostamble.tex
index 8f38ece2d7..7bff985e02 100644
--- a/conf/snippets/hardcopyPostamble.tex
+++ b/conf/snippets/hardcopyPostamble.tex
@@ -1,7 +1,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % WeBWorK Online Homework Delivery System
-% Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-% $CVSHeader$
+% Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+% $CVSHeader: webwork2/conf/snippets/hardcopyPostamble.tex,v 1.2 2003/12/09 01:12:29 sh002i 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
diff --git a/conf/snippets/hardcopyPreamble.tex b/conf/snippets/hardcopyPreamble.tex
index 72eb2815e7..a6ca721a74 100644
--- a/conf/snippets/hardcopyPreamble.tex
+++ b/conf/snippets/hardcopyPreamble.tex
@@ -1,7 +1,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % WeBWorK Online Homework Delivery System
-% Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-% $CVSHeader$
+% Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+% $CVSHeader: webwork2/conf/snippets/hardcopyPreamble.tex,v 1.3 2005/09/17 20:12:01 gage 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
@@ -18,7 +18,9 @@
 \documentclass[10pt,dvips]{amsart}
 \usepackage{amsmath,amsfonts,amssymb,multicol}
 \usepackage[pdftex]{graphicx}
+\usepackage{epstopdf}  % allows use of eps files with pdftex
 \usepackage{epsf}
+\usepackage{epsfig}
 \usepackage{pslatex}
 \pagestyle{plain}
 \textheight 9in
diff --git a/conf/snippets/hardcopyProblemDivider.tex b/conf/snippets/hardcopyProblemDivider.tex
index 1d292a87c5..6d13dbdae4 100644
--- a/conf/snippets/hardcopyProblemDivider.tex
+++ b/conf/snippets/hardcopyProblemDivider.tex
@@ -1,7 +1,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % WeBWorK Online Homework Delivery System
-% Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-% $CVSHeader$
+% Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+% $CVSHeader: webwork2/conf/snippets/hardcopyProblemDivider.tex,v 1.3 2004/06/24 21:10:50 dpvc 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
@@ -14,6 +14,8 @@
 % Artistic License for more details.
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\bigskip
+\medskip
+\goodbreak
 \hrule
-\bigskip
+\nobreak
+\smallskip
diff --git a/conf/snippets/hardcopySetDivider.tex b/conf/snippets/hardcopySetDivider.tex
index 9783036ff5..8315d5777c 100644
--- a/conf/snippets/hardcopySetDivider.tex
+++ b/conf/snippets/hardcopySetDivider.tex
@@ -1,7 +1,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % WeBWorK Online Homework Delivery System
-% Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-% $CVSHeader$
+% Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+% $CVSHeader: webwork2/conf/snippets/hardcopySetDivider.tex,v 1.4 2004/07/07 11:35:34 gage 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
@@ -16,8 +16,8 @@
 
 \end{multicols}   % close off the columns from the set above
 
-\newpage
-
+\newpage%
+\setcounter{page}{1}% 
 \begin{multicols}{2}
 \columnwidth=\linewidth % reopen the columns for the following set
 
diff --git a/conf/snippets/hardcopySetFooter.pg b/conf/snippets/hardcopySetFooter.pg
index a1bb246f6a..b3cfb96c4f 100644
--- a/conf/snippets/hardcopySetFooter.pg
+++ b/conf/snippets/hardcopySetFooter.pg
@@ -1,19 +1,3 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
-# 
-# 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
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-# 
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
 # 
 # hardcopySetFooter.pg - generic hardcopy set footer file
 # 
@@ -27,7 +11,7 @@ loadMacros(
 BEGIN_TEXT
 $BEGIN_ONE_COLUMN
 
-\noindent {\tiny Generated by the WeBWorK system \copyright WeBWorK Team, Department of Mathematics, University of Rochester}
+\noindent {\tiny Generated by \copyright WeBWorK, http://webwork.maa.org, Mathematical Association of America}
 
 $END_ONE_COLUMN
 END_TEXT
diff --git a/conf/snippets/hardcopySetHeader.pg b/conf/snippets/hardcopySetHeader.pg
index 1729ce19f9..7a357d2d13 100644
--- a/conf/snippets/hardcopySetHeader.pg
+++ b/conf/snippets/hardcopySetHeader.pg
@@ -1,44 +1,71 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
-# 
-# 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
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-# 
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-##Problem set header for WW_Prob_Lib1 Summer 2000
-
-DOCUMENT();        # This should be the first executable line in the problem.
-
-loadMacros("PG.pl",
-           "PGbasicmacros.pl"
-);
-
+DOCUMENT();
 
-$dateTime = $formattedDueDate;
-$sectionNumber = protect_underbar($sectionNumber);
-$setNumber = protect_underbar($setNumber);
-$course = protect_underbar(WW_Prob_Lib1);
+loadMacros(
+	"PG.pl",
+	"PGbasicmacros.pl",
+);
 
-BEGIN_TEXT
-$BEGIN_ONE_COLUMN
+TEXT($BEGIN_ONE_COLUMN);
 
+TEXT(MODES(TeX =>EV3(<<'EOT'),HTML=>"",Latex2HTML=>""));
 \noindent {\large \bf $studentName}
 \hfill
-\noindent {\large \bf $course $sectionNumber Summer 2000}
+\noindent {\large \bf MTH 161  $sectionNumber   Fall 2003}
 \par
-\noindent Sample WeBWorK problems. \hfill WeBWorK assignment $setNumber due $dateTime.
+
+EOT
+
+BEGIN_TEXT
+
+$BBOLD WeBWorK  assignment number  $setNumber  is due :  $formattedDueDate. $EBOLD
+
+$PAR
+The 
+(* home page *)
+\{ 
+#htmlLink(qq!http://www.math.rochester.edu/courses/161/home/!,"home
+page") 
+\} 
+for the course contains the syllabus, grading policy and other
+information.  
+$PAR
+END_TEXT
+
+##################
+# EDIT BELOW HERE
+##################
+BEGIN_TEXT
+$HR
+$PAR
+This file is /conf/snippets/hardcopySetHeader.pg   you can use it as 
+a model for creating files which introduce each problem set.
+$PAR
+$HR
+END_TEXT
+##################
+# EDIT ABOVE HERE
+##################
+BEGIN_TEXT
+The primary purpose of WeBWorK is to let you know that you are getting the correct answer or to alert
+you if you are making some kind of mistake. Usually you can attempt a problem as many times as you want before
+the due date.  However, if you are having trouble figuring out your error, you should
+consult the book, or ask a fellow student, one of the TA's or
+your professor for help.  Don't spend a lot of time guessing -- it's not very efficient or effective.
+$PAR
+Give 4 or 5  significant digits for (floating point) numerical answers.
+For most problems when entering numerical answers, you can if you wish
+enter elementary expressions such as \( 2\wedge3 \) instead of 8, \( sin(3*pi/2) \)instead
+of -1, \( e\wedge (ln(2)) \) instead of 2,
+\( (2+tan(3))*(4-sin(5))\wedge6-7/8 \) instead of 27620.3413, etc.
+ Here's the 
+\{ htmlLink(qq!http://webwork.math.rochester.edu/docs/docs/pglanguage/availableFunctions.html!,"list of the functions") \}
+ which WeBWorK understands.
+$PAR
+You can use the Feedback button on each problem
+page to send e-mail to the professors. 
+
 
 $END_ONE_COLUMN
 END_TEXT
 
 ENDDOCUMENT();        # This should be the last executable line in the problem.
-
diff --git a/conf/snippets/hardcopyUserDivider.tex b/conf/snippets/hardcopyUserDivider.tex
index 806014bda2..c24101aca1 100644
--- a/conf/snippets/hardcopyUserDivider.tex
+++ b/conf/snippets/hardcopyUserDivider.tex
@@ -1,7 +1,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % WeBWorK Online Homework Delivery System
-% Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-% $CVSHeader$
+% Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+% $CVSHeader: webwork2/conf/snippets/hardcopyUserDivider.tex,v 1.3 2004/07/07 11:35:34 gage 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
@@ -16,7 +16,7 @@
 
 \end{multicols}   % close off the columns from the set above
 
-\newpage
-
+\newpage%
+\setcounter{page}{1}% 
 \begin{multicols}{2}
 \columnwidth=\linewidth % reopen the columns for the following set
diff --git a/conf/snippets/screenSetHeader.pg b/conf/snippets/screenSetHeader.pg
index 2fd0bf7f5e..10ef39eb2a 100644
--- a/conf/snippets/screenSetHeader.pg
+++ b/conf/snippets/screenSetHeader.pg
@@ -1,19 +1,3 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
-# 
-# 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
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-# 
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
 DOCUMENT();
 
 # Load whatever macros you need for the problem
@@ -31,14 +15,18 @@ $showPartialCorrectAnswers = 0;
 BEGIN_TEXT
 $BR
 
-Give 4 or 5  significant digits for (floating point) numerical answers.For most
-problems when entering numerical answers, you can if you wish enter elementary
-expressions such as 2^3 instead of 8, sin(3pi/2) instead of -1, e^(ln(2))
-instead of 2, (2+tan(3))*(4-sin(5))^6-7/8 instead of 27620.3413, etc. Here's
-the
-\{ htmlLink(qq!http://webwork.math.rochester.edu/webwork_system_html/docs/docs/pglanguage/availablefunctions.html!,"list of the functions") \}
-which WeBWorK understands.
 
+Give 4 or 5  significant digits for (floating point) numerical answers.
+For most problems when entering numerical answers, you can if you wish
+enter elementary expressions such as \( 2\wedge3 \) instead of 8, \( sin(3*pi/2)
+\)instead
+of -1, \( e\wedge (ln(2)) \) instead of 2,
+\( (2+tan(3))*(4-sin(5))\wedge6-7/8 \) instead of 27620.3413, etc.
+
+Here's the 
+\{
+htmlLink(qq!http://webwork.math.rochester.edu/webwork_system_html/docs/docs/pglanguage/availablefunctions.html!,"list of the functions") \}
+which WeBWorK understands.
 $PAR
 END_TEXT
 
diff --git a/conf/snippets/setHeader.pg b/conf/snippets/setHeader.pg
index 49370453b3..35267ae018 100644
--- a/conf/snippets/setHeader.pg
+++ b/conf/snippets/setHeader.pg
@@ -1,87 +1,88 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
-# 
-# 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
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-# 
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
+# ASimpleCombinedHeaderFile.pg
+# This header file can be used for both the screen and hardcopy output
+
 
 DOCUMENT();
 
 loadMacros(
 	"PG.pl",
 	"PGbasicmacros.pl",
-	"PGchoicemacros.pl",
-	"PGanswermacros.pl"
+
 );
 
 TEXT($BEGIN_ONE_COLUMN);
 
-TEXT(MODES(TeX =>EV3(<<'EOT'),HTML=>"",Latex2HTML=>""));
+####################################################
+#
+# The item below printed out only when a hardcopy is made.
+#
+####################################################
+
+
+
+TEXT(MODES(TeX =>EV3(<<'EOT'),HTML=>""));
+
 \noindent {\large \bf $studentName}
 \hfill
-\noindent {\large \bf MTH 143  $sectionNumber   Spring 2003}
+{\large \bf {\{protect_underbar($courseName)\}}}
+% Uncomment the line below if this course has sections. Note that this is a comment in TeX mode since this is only processed by LaTeX
+%   {\large \bf { Section: \{protect_underbar($sectionName)\} } }
 \par
+\noindent{\large \bf {Assignment \{protect_underbar($setNumber)\}  due $formatedDueDate}}
+\par\noindent \bigskip
+% Uncomment and edit the line below if this course has a web page. Note that this is a comment in TeX mode.
+%See the course web page for information http://yoururl/yourcourse
 
 EOT
 
-BEGIN_TEXT
+####################################################
+#
+# End of hardcopy only output.
+#
+####################################################
 
-$BBOLD WeBWorK  assignment number  $setNumber  is due :  $formattedDueDate. $EBOLD
 
-$PAR
-(This is early Friday morning, so it needs to be done THURSDAY night!)
-Remember to get this done early! 
-$PAR
-The \{ htmlLink(qq!http://www.math.rochester.edu/courses/143/home/!,"home page") \} 
-for the course contains the syllabus, grading policy, and other information.  
-$PAR
-END_TEXT
+####################################################
+#
+# The items below are printed out only when set is displayed on screen
+# 
+####################################################
+TEXT(MODES(TeX =>"",HTML=>EV3(<<'EOT')));
 
-##################
-# EDIT BELOW HERE
-##################
-BEGIN_TEXT
+$BBOLD WeBWorK  Assignment \{ protect_underbar($setNumber) \}  is due :  $formattedDueDate. $EBOLD
 $PAR
+Here's the list of 
+\{ htmlLink(qq!http://webwork.maa.org/wiki/Available_Functions!,"functions and symbols") \}
+ which WeBWorK understands.
+$BR
+EOT
 
+####################################################
+# Uncomment and edit the lines below if this course has a web page. Note that this is comment in Perl mode. 
+# IMPORTANT: Make sure the EOT at the bottom is at the beginning of a line with no spaces preceeding it.
+#TEXT(MODES(TeX =>"",HTML=>EV3(<<'EOT')));
+#See the course web page for information \{ htmlLink(qq!http://yoururl/yourcourse!,"your course name") \}
+#EOT
+####################################################
+
+####################################################
+#
+# End of screen only output.
+#
+####################################################
+
+####################################################
+#
+# Anything between the BEGIN_TEXT AND END_TEXT lines
+# will be printed in both screen and hardcopy output
+#
+####################################################
 
-
-$PAR
-END_TEXT
-##################
-# EDIT ABOVE HERE
-##################
 BEGIN_TEXT
-The primary purpose of WeBWorK is to let you know that you are getting the correct answer or to alert
-you if you are making some kind of mistake. Usually you can attempt a problem as many times as you want before
-the due date.  However, if you are having trouble figuring out your error, you should
-consult the book, or ask a fellow student, one of the TA's or
-your professor for help.  Don't spend a lot of time guessing -- it's not very efficient or effective.
-$PAR
-Give 4 or 5  significant digits for (floating point) numerical answers.
-For most problems when entering numerical answers, you can if you wish
-enter elementary expressions such as \( 2\wedge3 \) instead of 8, \( sin(3*pi/2) \)instead
-of -1, \( e\wedge (ln(2)) \) instead of 2,
-\( (2+tan(3))*(4-sin(5))\wedge6-7/8 \) instead of 27620.3413, etc.
- Here's the 
-\{ htmlLink(qq!http://webwork.math.rochester.edu/docs/docs/pglanguage/availableFunctions.html!,"list of the functions") \}
- which WeBWorK understands.
-$PAR
-You can use the Feedback button on each problem
-page to send e-mail to the professors. 
 
-
-$END_ONE_COLUMN
 END_TEXT
 
-ENDDOCUMENT();        # This should be the last executable line in the problem.
 
+TEXT($END_ONE_COLUMN);
 
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/conf/sql.conf.dist b/conf/sql.conf.dist
deleted file mode 100644
index 60f716afe9..0000000000
--- a/conf/sql.conf.dist
+++ /dev/null
@@ -1,120 +0,0 @@
-#!perl
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
-# 
-# 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
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-# 
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-=head1 NAME
-
-sql.conf - defines database layout for use with an SQL server.
-
-=head1 SYNOPSIS
-
-In global.conf (or course.conf):
-
- include "conf/sql.conf";
-
-=head1 DESCRIPTION
-
-The SQL database layout uses an SQL database server to store the tables of the
-WeBWorK database. The SQL driver uses two SQL accounts, a read only and a
-read-write account. The read-only account must have C<SELECT> access, and the
-read-write account needs C<SELECT>, C<INSERT>, C<UPDATE>, and C<DELETE> access.
-The names and passwords of these accounts are given as parameters to each table
-in the layout.
-
- usernameRO     the name of the read-only account
- usernameRW     the name of the read-write account
- passwordRO     the password for the read-only account
- passwordRW     the password for the read-write account
-
-Don't confuse these accounts with the accounts of the users of a course. These
-are system-wide accounts which allow WeBWorK to talk to the database server.
-
-FIXME: the way the SQL account information is handled should be changed. It
-shouldn't be in the course environment. (We should do the same thing that we
-did with the "SECRET" in WeBWorK::Constants.
-
-=cut
-
-my %sqlParams = (
-	usernameRO => "webworkRead",
-	passwordRO => "zaqwsxcderfv",
-	usernameRW => "webworkWrite",
-	passwordRW => "qwerfdsazxcv",
-	debug => 0,
-);
-
-%dbLayout = (
-	password => {
-		record => "WeBWorK::DB::Record::Password",
-		schema => "WeBWorK::DB::Schema::SQL",
-		driver => "WeBWorK::DB::Driver::SQL",
-		source => "dbi:mysql:webwork_$courseName",
-		params => { %sqlParams },
-	},
-	permission => {
-		record => "WeBWorK::DB::Record::PermissionLevel",
-		schema => "WeBWorK::DB::Schema::SQL",
-		driver => "WeBWorK::DB::Driver::SQL",
-		source => "dbi:mysql:webwork_$courseName",
-		params => { %sqlParams },
-	},
-	key => {
-		record => "WeBWorK::DB::Record::Key",
-		schema => "WeBWorK::DB::Schema::SQL",
-		driver => "WeBWorK::DB::Driver::SQL",
-		source => "dbi:mysql:webwork_$courseName",
-		params => {
-			%sqlParams,
-			tableOverride => "key_not_a_keyword",
-			fieldOverride => { key => "key_not_a_keyword" },
-		},
-	},
-	user => {
-		record => "WeBWorK::DB::Record::User",
-		schema => "WeBWorK::DB::Schema::SQL",
-		driver => "WeBWorK::DB::Driver::SQL",
-		source => "dbi:mysql:webwork_$courseName",
-		params => { %sqlParams },
-	},
-	set => {
-		record => "WeBWorK::DB::Record::Set",
-		schema => "WeBWorK::DB::Schema::SQL",
-		driver => "WeBWorK::DB::Driver::SQL",
-		source => "dbi:mysql:webwork_$courseName",
-		params => { %sqlParams, tableOverride => "set_not_a_keyword" },
-	},
-	set_user => {
-		record => "WeBWorK::DB::Record::UserSet",
-		schema => "WeBWorK::DB::Schema::SQL",
-		driver => "WeBWorK::DB::Driver::SQL",
-		source => "dbi:mysql:webwork_$courseName",
-		params => { %sqlParams },
-	},
-	problem => {
-		record => "WeBWorK::DB::Record::Problem",
-		schema => "WeBWorK::DB::Schema::SQL",
-		driver => "WeBWorK::DB::Driver::SQL",
-		source => "dbi:mysql:webwork_$courseName",
-		params => { %sqlParams },
-	},
-	problem_user => {
-		record => "WeBWorK::DB::Record::UserProblem",
-		schema => "WeBWorK::DB::Schema::SQL",
-		driver => "WeBWorK::DB::Driver::SQL",
-		source => "dbi:mysql:webwork_$courseName",
-		params => { %sqlParams },
-	},
-);
diff --git a/conf/templates/barebones.template b/conf/templates/barebones.template
deleted file mode 100644
index f9f67f4bdc..0000000000
--- a/conf/templates/barebones.template
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html
-	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-	SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<!--
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
-# 
-# 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
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-# 
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
--->
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
- <head>
-  <title>WeBWorK - <!--#title--></title>
-  <!--#head-->
-
-  <style type="text/css">
-   <!--
-	table.attemptResults {
-		border-style: outset; 
-		border-width: 1px; 
-		margin: 0px 10pt; 
-		border-spacing: 1px;
-		float: left
-	}
-	
-	table.attemptResults td,table.attemptResults th {
-		border-style: inset; 
-		border-width: 1px; 
-		text-align: center; 
-		width: 15ex
-	}
-	
-	div.problemHeader {
-   		float: left
-	}
-	
-	div.problem {
-		clear: both; 
-	}
-   //-->
-  </style>
- </head>
- <body>
-  <table width="100%" cellpadding="10" cellspacing="0" border="1">
-   <tr valign="top">
-    <td align="left" rowspan="2">
-     <img src="/webwork2_files/images/webwork_square.gif" height="64" width="66" /><br />
-     <hr />
-     
-     <div>
-      <small>
-            <a href="http://webwork3.math.rochester.edu/bugzilla/enter_bug.cgi?product=WeBWorK%20mod_perl" target = "_bugzilla"> Report bugs</a>
-            <hr />
-       <!--#links-->
-      </small>
-     </div>
-<!--#if can="links"-->
-<!--#if can="siblings"-->
-     <hr />
-<!--#endif-->
-<!--#endif-->
-     <div>
-      <small>
-       <!--#siblings-->
-      </small>
-     </div>
-
-    </td>
-    <!--#if can="path"-->
-    <td valign="bottom" style="border-right: none">
-     <!--#path style="text" image="/webwork2_files/images/right_arrow.png" text=" > "-->
-    </td>
-    <!--#endif-->
-    <!--#if loggedin="1"-->
-     <td valign="bottom" align="right" style="border-left: none">
-     <!--#loginstatus-->
-    </td>
-    <!--#endif-->
-   </tr>
-   <tr valign="top">
-<!--#if warnings="1"-->
-    <td 
-    <!--#if loggedin="1"-->
-    colspan="2" 
-    <!--#endif-->
-    bgcolor="#ffcccc">
-<!--#else-->
-    <td 
-    <!--#if loggedin="1"-->
-    colspan="2"
-    <!--#endif-->
-    >
-<!--#endif-->
-     <div align="center">
-      <!--#nav style="text" imagesuffix=".png" separator=" | "-->
-     </div>
-     <table width="100%" cellpadding="10" cellspacing="0" border="0">
-      <tr valign="top">
-       <td>
-        <h1 style="font-size: 14pt"><!--#title--></h1>
-	<!--#if submiterror="1"-->
-	 <p><em style="color: red"><!--#submiterror--></em></p>
-	<!--#endif-->	
-        <!--#body-->
-       </td>
-       <td>
-        <!--#info-->
-       </td>
-      </tr>
-     </table>
-    </td>
-   </tr>
-  </table>
- </body>
-</html>
diff --git a/conf/templates/classic.template b/conf/templates/classic.template
deleted file mode 100644
index 755694e7c1..0000000000
--- a/conf/templates/classic.template
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html
-	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-	SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<!--
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
-# 
-# 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
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-# 
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
--->
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
- <head>
-  <title>WeBWorK - <!--#title--></title>
-  <!--#head-->
-  
-  <style type="text/css">
-   <!--
-	table.attemptResults {
-		border-style: solid; 
-		border-width: 1px; 
-		background-color: #cccccc; 
-		margin: 0px 10pt; 
-		border-spacing: 0px;
-		float: left
-	}
-	
-	table.attemptResults td,table.attemptResults th {
-		border-style: solid; 
-		border-width: 1px; 
-		text-align: center; 
-		width: 15ex
-	}
-	
-	div.problemHeader {
-   		float: left
-	}
-	
-	div.problem {
-		clear: both; 
-	}
-   //-->
-  </style>
- </head>
- <body <!--#if warnings="1"-->bgcolor="#ffcccc"<!--#else-->bgcolor="#efefef"<!--#endif-->>
-  <table border="0" width="100%">
-   <tr>
-    <td align="center">
-     <!--#nav style="images" imagesuffix=".gif" separator=" "-->
-    </td>
-    <td align="right">
-     <h1>WeBWorK <em>2.0</em></h1>
-    </td>
-    <td width="70">
-     <img src="/webwork2_files/images/webwork_square.gif" height="64" width="66" />
-    </td>
-   </tr>
-  </table>
-  <hr>
-  <h1 style="font-size: 14pt"><!--#title--></h1>
-  
-  <table width="100%" cellpadding="10" cellspacing="0" border="0">
-   <tr valign="top">
-    <td>
-     <!--#body-->
-    </td>
-    <td>
-     <!--#info-->
-    </td>
-   </tr>
-  </table>
-    
-  <hr />
-    
-  <table border="0" width="100%">
-   <tr>
-    <h4>Links</h4>
-    <td align="left" valign="bottom"><!--#links--></td>
-    <td align="right" valign="bottom"><!--#loginstatus--></td>
-   </tr>
-  </table>
- </body>
-</html>
diff --git a/conf/templates/dgage/gateway.template b/conf/templates/dgage/gateway.template
new file mode 100755
index 0000000000..1281f1e645
--- /dev/null
+++ b/conf/templates/dgage/gateway.template
@@ -0,0 +1,100 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!--
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/conf/templates/math/gateway.template,v 1.11 2007/03/29 19:48:57 glarose 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<meta http-equiv="Pragma" content="no-cache"/>
+<meta http-equiv="expires" content="Wed, 21 Dec 2005 00:00:01 GMT"/>
+<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/css/math.css"/>
+<!-- [gateway] since the left-side menus are gone, don't indent the main content area -->
+<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/css/gateway.css"/>
+<title><!--#path style="text" text=" : " textonly="1"--></title>
+<!--#head-->
+<script language="javascript" type="text/javascript" 
+  src="<!--#url type="webwork" name="htdocs"-->/js/gateway.js"></script>
+</head>
+<body bgcolor="white">
+<div id="masthead">
+	<div id="loginstatus">
+		<!--#loginstatus-->
+	</div>
+	<div id="logo">
+		<img src="<!--#url type="webwork" name="htdocs"-->/images/webwork_rectangle.png" alt="WeBWorK" height="51" width="267" />
+	</div>
+</div>
+<hr class="for-broken-browsers"/>
+<div id="big-wrapper">
+	<div id="breadcrumbs">
+		<!--#path style="text" text=" &#x2192; "-->
+	</div>
+	<div id="content">
+		
+		<!--#if can="info"-->
+		<!--<div id="page-info">-->
+			<!--<div class="info-box" id="fisheye">-->
+				<!--#info-->
+			<!--</div>-->
+		<!--</div>-->
+		<!--#endif-->
+		
+		<!-- [gateway] removed nav button to go up -->
+		
+		<!--#if can="title"-->
+		<h1><!--#title--></h1>
+		<!--#endif-->
+		
+		<!--#if can="message"-->
+			<div class="Message">
+				<!--#message-->
+			</div>
+		<!--#endif-->
+
+		<!--#if can="body"-->
+		<div class="Body">
+			<!--#body-->
+		</div>
+		<!--#endif-->
+		
+		<!--#if warnings="1"-->
+		<hr>
+		<div class="Warnings">
+			<!--#warnings-->
+		</div>
+		<!--#endif-->
+		
+		<!--#if can="message"-->
+			<div class="Message">
+				<!--#message-->
+			</div>
+		<!--#endif-->
+		
+	</div> <!-- content -->
+	<hr class="for-broken-browsers"/>
+	<div id="footer">
+		<p id="last-modified">Page generated at <!--#timestamp--></p>
+		<div id="copyright">
+			WeBWorK &#169; 2000-2007 <a href="http://openwebwork.sf.net/">The WeBWorK Project</a>
+		</div>
+	</div>
+	<!-- [gateway] removed left sidebar -->
+</div> <!-- big-wrapper -->
+
+</body>
+</html>
diff --git a/conf/templates/dgage/system.template b/conf/templates/dgage/system.template
new file mode 100755
index 0000000000..39460df231
--- /dev/null
+++ b/conf/templates/dgage/system.template
@@ -0,0 +1,128 @@
+<!DOCTYPE html
+	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<!--
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/conf/templates/math/system.template,v 1.11 2008/10/09 02:18:37 gage 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+-->
+
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/css/dgage.css"/>
+<title><!--#path style="text" text=" : " textonly="1"--></title>
+<!--#head-->
+</head>
+<body bgcolor="white" onload="if (typeof(initializeWWquestion) == 'function') {initializeWWquestion()}">
+
+<div id="site-navigation">
+		<!--#if can="links"-->
+			    <!--#links-->
+			    <!--#endif-->
+		      <!--#if can="siblings"-->
+			      <!--#siblings-->
+		      <!--#endif-->
+		      <!--#if can="options"-->
+		      <ul>
+		        <li>
+			        <h2>Display Options</h2>
+			        <!--#options-->
+			      </li>
+		      </ul>
+		      <!--#endif-->
+</div>
+<hr class="for-broken-browsers"/>
+<div id="big-wrapper">
+<div id="masthead">
+	<div id="logo">
+                <a href="http://webwork.maa.org"><img src="<!--#url type="webwork" name="htdocs"-->/images/webwork_rectangle.png" alt="WeBWorK" height="51" width="267" /></a>&nbsp;
+                <a href="http://www.maa.org"><img src="<!--#url type="webwork" name="htdocs"-->/images/maa_logo.png" alt="MAA" height="51" width="449" /></a>
+	</div>
+	<div id="loginstatus">
+		<!--#loginstatus-->
+	</div>
+</div>
+<div style="clear:both;"></div>
+	<div id="breadcrumbs">
+		<!--#path style="text" text=" &#x2192; "-->
+	</div>
+	<div id="content" >
+
+			<!--#if can="title"-->
+				<span style="font-size:larger; color:#00F; float:left;  width:60%;   "><!--#title--></span>
+			<!--#endif-->
+			<!--#if can="message"-->
+				<span class="Message" style=" float:right; width:40%; right:0;">
+					<!--#message-->
+				</span>
+			<!--#endif-->
+
+		    <hr style="clear:both"/>
+       		<!--#if can="info"-->
+			  <!--  styles could be different for different pages so they are not set here -->
+				<!--#info-->
+		    <!--#endif-->
+			
+		<!--#if can="nav"-->
+		<div class="Nav">
+			<!--#nav style="images" imageprefix="/webwork2_files/images/nav" imagesuffix=".gif" separator="  "-->
+		</div>
+		<!--#endif-->
+		
+	    <!--#if can="body"-->
+				<!--#if warnings="1"-->
+				  <div class="Body" style="background-color:#ffcccc">
+				  <p style="font-size:larger">
+				  Warning -- there may be something wrong with this question. Please inform your instructor
+				  including the warning messages below.
+				  </p>
+				<!--#else-->
+				  <div class="Body" style="background-color:#ffffff">
+				<!--#endif-->
+				
+				<!--#body-->
+				</div>
+			<!--#endif-->
+		
+		<!--#if warnings="1"-->
+		
+		<hr/>
+		<div class="Warnings">
+			<!--#warnings-->
+		</div>
+		<!--#endif-->
+		
+		<!--#if can="message"-->
+			<div class="Message">
+				<!--#message-->
+			</div>
+		<!--#endif-->
+		
+	
+	<hr class="for-broken-browsers"/>
+	<div id="footer">
+		<p id="last-modified">Page generated at <!--#timestamp--></p>
+		<div id="copyright">
+			WeBWorK &#169; 2000-2007 <a href="http://openwebwork.sf.net/">The WeBWorK Project</a>
+		</div>
+	</div>
+
+</div><!--content-->
+</div> <!-- big-wrapper -->
+</body>
+</html>
diff --git a/conf/templates/math/gateway.template b/conf/templates/math/gateway.template
new file mode 100644
index 0000000000..aa34b1dab5
--- /dev/null
+++ b/conf/templates/math/gateway.template
@@ -0,0 +1,100 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!--
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/conf/templates/math/gateway.template,v 1.11 2007/03/29 19:48:57 glarose 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<meta http-equiv="Pragma" content="no-cache"/>
+<meta http-equiv="expires" content="Wed, 21 Dec 2005 00:00:01 GMT"/>
+<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/css/math.css"/>
+<!-- [gateway] since the left-side menus are gone, don't indent the main content area -->
+<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/css/gateway.css"/>
+<title><!--#path style="text" text=" : " textonly="1"--></title>
+<!--#head-->
+<script language="javascript" type="text/javascript" 
+  src="<!--#url type="webwork" name="htdocs"-->/js/gateway.js"></script>
+</head>
+<body bgcolor="white">
+<div id="masthead">
+	<div id="loginstatus">
+		<!--#loginstatus-->
+	</div>
+	<div id="logo">
+		<img src="<!--#url type="webwork" name="htdocs"-->/images/webwork_rectangle.png" alt="WeBWorK" height="51" width="267" />
+	</div>
+</div>
+<hr class="for-broken-browsers"/>
+<div id="big-wrapper">
+	<div id="breadcrumbs">
+		<!--#path style="text" text=" &#x2192; "-->
+	</div>
+	<div id="content">
+		
+		<!--#if can="info"-->
+		<!--<div id="page-info">-->
+			<!--<div class="info-box" id="fisheye">-->
+				<!--#info-->
+			<!--</div>-->
+		<!--</div>-->
+		<!--#endif-->
+		
+		<!-- [gateway] removed nav button to go up -->
+		
+		<!--#if can="title"-->
+		<h1><!--#title--></h1>
+		<!--#endif-->
+		
+		<!--#if can="message"-->
+			<div class="Message">
+				<!--#message-->
+			</div>
+		<!--#endif-->
+
+		<!--#if can="body"-->
+		<div class="Body">
+			<!--#body-->
+		</div>
+		<!--#endif-->
+		
+		<!--#if warnings="1"-->
+		<hr>
+		<div class="Warnings">
+			<!--#warnings-->
+		</div>
+		<!--#endif-->
+		
+		<!--#if can="message"-->
+			<div class="Message">
+				<!--#message-->
+			</div>
+		<!--#endif-->
+		
+	</div> <!-- content -->
+	<hr class="for-broken-browsers"/>
+	<div id="footer">
+		<p id="last-modified">Page generated at <!--#timestamp--></p>
+		<div id="copyright">
+			WeBWorK &#169; 1996-2011 <a href="http://webwork.maa.org/">The WeBWorK Project</a>
+		</div>
+	</div>
+	<!-- [gateway] removed left sidebar -->
+</div> <!-- big-wrapper -->
+
+</body>
+</html>
diff --git a/conf/templates/math/math.css b/conf/templates/math/math.css
new file mode 100644
index 0000000000..ec0c946e31
--- /dev/null
+++ b/conf/templates/math/math.css
@@ -0,0 +1,504 @@
+/* WeBWorK Online Homework Delivery System
+ * Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+ * $CVSHeader: webwork2/htdocs/css/math.css,v 1.12 2008/03/04 15:43:44 sh002i 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
+ * Free Software Foundation; either version 2, or (at your option) any later
+ * version, or (b) the "Artistic License" which comes with this package.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+ * Artistic License for more details.
+ */
+
+/* --- Standard elements ---------------------------------------------------- */
+
+body {
+	background: white;
+	color: black;
+	margin: .5em .5em 0 .5em; /* MSIE ignores bottom margin; Gecko doesn't */
+	padding: 0;
+	font-family: Times, serif;
+	min-width: 25em;
+}
+
+h1, h2, h3, h4, h5, h6 {
+	font-family: "Trebuchet MS", "Arial", "Helvetica", sans-serif;
+	/* FIXME "You have no background-color with your color" */
+	color: #225;
+	background: transparent;
+}
+h1 { font-size: 170%; }
+h2 { font-size: 140%; padding-bottom: 0; margin-bottom: .5ex }
+h3 { font-size: 120%; }
+h4 { font-size: 110%; }
+h5 { font-size: 105%; }
+h6 { font-size: 105%; } 
+
+a:link { color: #00e; background-color: inherit; }
+a:visited { color: #808; background-color: inherit; }
+
+/* --- Miscellaneous classes ---------------------------------------------- */
+
+/* show only to CSS-ignorant browsers */
+.for-broken-browsers { display: none }
+
+/* for hiding floats from Netscape 4.x */
+.float-left { float: left; }
+.float-right { float: right; }
+
+/* --- Compound titles (class) ---------------------------------------------- */
+
+/* WeBWorK is not using this, but it might be nice to have it around later */
+
+/* "Split" title, with main heading left-aligned above a horizontal line,
+ * and subheading right-aligned below the line. Usage:
+ *
+ * <h1 class="compound">Alumni Newsletter</h1>
+ * <h2 class="compound">Spring '00</h2>
+ */
+
+/*h1.compound {
+	border-bottom: 1px solid #559;
+	text-align: left;
+	padding: .5ex 0 0 0;
+	margin: 0;
+}
+h2.compound { float: right; margin: 0; padding: 0 }*/
+
+/* --- Info box (class) ----------------------------------------------------- */
+
+/* FIXME as a quick hack, the info() escape outputs a DIV with this class.
+ * don't let the placement of these styles fool you -- <div style="info-box">
+ * is output by WeBWorK! */
+
+/* Common style for a small box to hold supplemental info; typically this
+ * box will appear in a sidebar.  Sample usage:
+ *
+ * <div class="info-box">
+ *   <h2>Announcements</h2>
+ *   <ul>
+ *     <li>foo</li>
+ *   </ul>
+ *   <a class="more" href="bar">Older announcements...</a>
+ * </div>
+ */
+
+.info-box {
+	border: 1px solid #559;
+	/* FIXME: these aren't valid CSS, but they sure look nice :-P */
+	border-radius-topright: 1.5ex; border-radius-topleft: 1.5ex;
+	-moz-border-radius-topright: 1.5ex; -moz-border-radius-topleft: 1.5ex;
+	margin-bottom: 1ex; 
+	margin-top: 0;
+	overflow: hidden;
+}
+.info-box h2,
+.info-box h3,
+.info-box h4,
+.info-box h5,
+.info-box h6 {
+	/* FIXME: these aren't valid CSS, but they sure look nice :-P */
+	border-radius-topright: 1.5ex; border-radius-topleft: 1.5ex;
+	-moz-border-radius-topright: 1.5ex; -moz-border-radius-topleft: 1.5ex;
+	border-bottom: 1px solid #559;
+	font-size: 100%;
+	text-align: center;
+	background: #88d;
+	color: white;
+	margin: 0;
+	padding: 0 .5em 0 .5em;
+}
+.info-box h2 a,
+.info-box h3 a,
+.info-box h4 a,
+.info-box h5 a,
+.info-box h6 a {
+	color: #fff;
+	background: inherit;
+}
+.info-box ul,
+.info-box ol {
+	margin: 1ex .5em 1ex 0;
+	padding-left: 3.5em;
+	font-size: 80%;
+}
+.info-box dl {
+	margin: 1ex .5em 1ex 1ex;
+	padding: 0;
+	font-size: 80%;
+}
+.info-box li,
+.info-box dt {
+	margin: 0 0 .5ex 0;
+	padding: 0;
+	line-height: 2.2ex;
+}
+.info-box dt { font-weight: bold }
+.info-box dd {
+	margin: 0 0 .5ex 1em;
+	padding: 0;
+	line-height: 2.2ex;
+}
+.info-box dd p {
+	margin-top: 0;
+}
+.info-box a.more {
+	float: right;
+	font-size: 80%;
+	font-style: italic;
+	margin-bottom: 1ex;
+	margin-right: .5em;
+}
+
+.Message {
+background-color:#ddd;
+}
+/* --- Fisheye view (id) ---------------------------------------------------- */
+
+/* The "fisheye" view: a hierarchical view of the website to show the 
+ * user where they are in the document hierarchy.  Provides more "lateral" 
+ * information than breadcrumbs, but not as much as a full sitemap. To 
+ * appear within the #site-navigation div.  Inherits many of its attributes 
+ * from class info-box, and overrides some.
+ */
+
+#mini-sitemap,
+#fisheye {
+	font-family: "Trebuchet MS", "Arial", "Helvetica", sans-serif;
+	padding: 0 0 1ex 0;
+}
+#mini-sitemap a,
+#fisheye a {
+	text-decoration: none;
+}
+#mini-sitemap a:hover,
+#fisheye a:hover {
+	text-decoration: underline;
+}
+#mini-sitemap li,
+#fisheye li {
+	line-height: 2.5ex;
+	margin: 0;
+}
+#mini-sitemap ul,
+#fisheye ul {
+	font-size: 90%;
+	list-style-type: none;
+	margin: 0 .1em .3ex .3em;
+	padding: 0;
+}
+#mini-sitemap ul ul,
+#fisheye ul ul {
+	font-size: 90%;
+	margin-left: 0;
+}
+#mini-sitemap ul li,
+#fisheye ul li {
+	font-weight: bold;
+}
+#mini-sitemap ul ul ul,
+#fisheye ul ul ul {
+	font-size: 95%;
+	margin-left: .3em;
+	padding-left: .5em;
+	border-left: 1px dotted gray;
+}
+#mini-sitemap ul ul li a.active,
+#fisheye ul ul li a.active {
+	font-weight: bold;
+	color: black;
+	background-color: inherit;
+}
+#mini-sitemap ul ul ul li,
+#fisheye ul ul ul li {
+	font-weight: normal;
+}
+#mini-sitemap ul ul ul ul,
+#fisheye ul ul ul ul {
+	font-size: 90%;
+}
+#mini-sitemap ul ul ul ul ul,
+#fisheye ul ul ul ul ul {
+	font-size: 90%;
+}
+
+/* --- Common layout elements for documents using templates ----------------- */
+
+/* The "masthead" of our document that tells users what site they're on.
+ * It contains a logo-ish title and some basic site navigation.  The
+ * masthead should appear at the top of the page, but we're not positioning
+ * it absolutely because we can't know its height in advance.  Therefore this 
+ * element should be placed at the very top of the <body> of our HTML document.
+ */
+#masthead {
+	font-family: "Trebuchet MS", "Arial", "Helvetica", sans-serif;
+	font-size: 100%;
+	margin: 0;
+	padding: 0;
+	color: #fff;
+	border: 1px solid #000;
+	background-color: #038;
+	/* [ww] we could have some sort of spider web image here. */
+	/*background-image: url("/images/mandel-wide.jpg");*/
+	background-repeat: repeat-x;
+	background-position: top left;
+}
+#masthead a {
+	/* FIXME "You have no background-color with your color" */
+	color: #fff;
+	background: transparent;
+}
+/* [ww] since this is a logo and not text, we need borders that are the same
+ * width all the way around. after we find a nice background image, we can
+ * turn these back on. */
+/*#masthead #logo { padding: .5ex .2em .1ex .5em }*/
+#masthead #logo { padding: .5ex }
+/* [ww] don't need these -- logo itself an image */
+/*#masthead #logo h1 {
+	background-image: none;
+	background-color: transparent;
+	font-size: 100%;
+	font-weight: normal;
+	padding: 0;
+	margin: 0;
+	white-space: nowrap;
+	line-height: 1.9ex;
+}*/
+/*#masthead #logo h2 {
+	background-color: transparent;
+	background-image: none;
+	font-weight: bold;
+	font-size: 210%;
+	line-height: 1.9ex;
+	margin: 0;
+	padding: 0;
+}*/
+/* [ww] instead of a search form, we want the loginstatus there */
+/*#masthead form {*/
+#masthead #loginstatus {
+	float: right;
+	padding: 0;
+	margin: 1ex .5em .1ex .1em;
+	font-size: smaller;
+}
+#masthead #loginstatus #Nav {
+	padding: 1ex;
+}
+
+/* "big-wrapper" contains everything other than the masthead.  It's merely 
+ * a relatively positioned div that allows us to use absolute positioning
+ * on elements within it -- and because it's relatively positioned,
+ * absolutely positioned objects *stay* within it.
+ */
+#big-wrapper {
+	position: relative;
+	top: 1ex;
+	width: 100%;
+	min-width: 18em;
+	margin: 0;
+	border: 0;
+}
+
+/*
+ * A simple list of "breadcrumbs" showing a path of links from the root of
+ * the site's hierarchy to our present location.  We are not positioning
+ * this element absolutely, because we don't know in advance how tall it
+ * will be, and we might want to place content under it.  So when coding
+ * our HTML document, we'll probably want to include this element right
+ * before the main content.
+ */
+
+#breadcrumbs {
+	margin-left: 10.4em;
+	margin-right: 0;
+	padding: 0 .4em;
+	border: 1px solid #559;
+	background: #88d;
+	color: #fff;
+	text-align: left; 
+	font-size: 100%;
+	font-family: "Trebuchet MS", "Arial", sans-serif;
+}
+#breadcrumbs a {
+	font-size: 100%;
+	white-space: nowrap;
+	background-color: inherit;
+	color: #fff;
+	text-decoration: none;
+}
+#breadcrumbs a.active { font-weight: bold; }
+#breadcrumbs a:hover { text-decoration: underline; }
+
+
+/* For the more CSS-compliant browsers, we'd like to provide site-wide
+ * navigation links (e.g., a mini site map) to appear in a column along
+ * the left side of the page, just below the masthead.  This column is
+ * absolutely positioned, so that ideally we should be able to include its
+ * contents anywhere within the body of our HTML documents.  However, we 
+ * probably want to include this data at the END of our documents -- after
+ * the main content -- so that it doesn't interfere with document flow in 
+ * browsers that don't understand CSS (e.g., lynx) -- or in browsers for
+ * which we've disabled CSS via some hack (e.g. Netscape Navigator 4.x).
+ *
+ * We consider this meta-information to be non-essential; it is NOT part of
+ * the content, and may not be displayed in some circumstances.
+ */
+#site-navigation {
+	position: absolute;
+	left: 0;
+	top: 0;
+	margin: 0;
+	padding: 0;
+	width: 9.8em;
+}
+
+/* The primary information content of the document, excluding masthead and
+ * site navigation.  We want to leave a wide left margin to prevent overlap
+ * with our site map, which will be displayed on the left-hand side of the
+ * screen.
+ */
+#content {
+	margin: .5em 0 0 10.4em;
+	padding: 0 0 0 0;
+	font-family: "Times", serif;
+	/* border-left: 1px dotted #bbf; */
+}
+#content h1 { margin: .4ex 0; } /* for crappy MSIE */
+
+
+#footer {
+	/* white-space: nowrap; */
+	clear: both;
+	/* border-top: 1px solid #559; */
+	margin: 0 .5em .2ex 10.4em;
+	padding: 0;
+	font-family: "Trebuchet MS", "Arial", "Helvetica", sans-serif;
+}
+#copyright { font-size: 75%; margin: 0;}
+#last-modified {
+	clear: both;
+	font-family: "Trebuchet MS", "Arial", "Helvetica", sans-serif;
+	font-size: 75%;
+	background-color: inherit;
+	color: #444;
+	margin: 1ex 0 0 0;
+	padding: 0;
+	border-bottom: 1px solid #559;
+}
+
+/* --- WeBWorK classes ------------------------------------------------------ */
+
+/* These classes are emitted by WeBWorK code and should appear in ANY WeBWorK
+ * template. they need not be implemented the same way in each template though.
+ * (These are mostly copied from ur.css right atm.)
+ */
+
+/* the info escape emits a DIV with this id. (note that the same DIV has class
+ * "info-box" which is given above in the "template styles" section. Regardless,
+ * it is emitted by WW code in ProblemSet.pl (not in system.template) ! */
+#InfoPanel {
+	font-size: smaller;
+	float: right;
+	width: 40%;
+	overflow: auto;
+	margin-right: -1px;
+	background-color: #fff;
+}
+
+/* tables used for laying out form fields shouldn't have a border */
+table.FormLayout { border: 0; }
+table.FormLayout tr { vertical-align: top; }
+table.FormLayout th.LeftHeader { text-align: right; white-space: nowrap; }
+table.FormLayout tr.ButtonRow { text-align: left; }
+table.FormLayout tr.ButtonRowCenter { text-align: center; }
+
+/* for problems which are rendered by themselves, e.g., by Set Maker */
+div.RenderSolo { background-color: #E0E0E0; color: black; }
+div.AuthorComment { background-color: #00E0E0; color: black; }
+
+/* minimal style for lists of links (generated by the links escape) */
+/*ul.LinksMenu { list-style: none; margin-left: 0; padding-left: 0; }*/
+/*ul.LinksMenu ul { list-style: none; margin-left: 0.5em; padding-left: 0; }*/
+
+/* background styles for success and failure messages */
+div.WarningMessage { background-color: #ffcccc; padding: 3px 3px 3px 3px; }
+div.ResultsWithoutError { color: inherit; background-color: #8F8; } /* green */
+div.ResultsWithError { color: #C33; background-color: inherit; } /* red */
+div.ResultsAlert { color: #F60; background-color: inherit; } /* orange */
+
+/* styles used by WeBWorK::HTML::ScrollingRecordList */
+div.ScrollingRecordList { padding: 1em; white-space: nowrap; border: thin solid gray; }
+div.ScrollingRecordList select.ScrollingRecordList { width: 99%; }
+
+/* wraps the View Options form (generated by &optionsMacro) */
+/* FIXME: can't this style information just go in div.Options above? */
+div.viewOptions { font-size: small }
+
+/* messages, attempt results, answer previews, etc. go in this DIV */
+/* this used to be "float:left", but that was suspected of causing MSIE peekaboo bug */
+div.problemHeader {}
+
+/* styles for the attemptResults table */
+table.attemptResults {
+	border-style: outset; 
+	border-width: 1px; 
+	margin: 0px 10pt; 
+	border-spacing: 1px;
+}
+table.attemptResults td,
+table.attemptResults th {
+	border-style: inset; 
+	border-width: 1px; 
+	text-align: center; 
+	/*width: 15ex;*/ /* this was erroniously commented out with "#" */
+	padding: 2px 5px 2px 5px;
+	color: inherit;
+	background-color: #DDDDDD;
+}
+/* override above settings in tables used to display ans_array results */
+table.attemptResults td td,
+table.attemptResults td th,
+table.ArrayLayout td {
+	border-style: none; 
+	border-width: 0px; 
+	padding: 0px;
+}
+table.attemptResults td.Message {
+   text-align: left; 
+   padding: 2px 5px 2px 5px;
+   width: auto;
+}
+.attemptResultsSummary { font-style: italic; }
+.parsehilight { color: inherit; background-color: yellow; }
+
+/* the problem TEXT itself does in this box */
+/* we used to make this a grey box, but surprise, MSIE is bug-ridden. */
+div.problem {  }
+
+/* jsMath emits this class when appropriate math fonts aren't available */
+div.NoFontMessage {
+	padding: 10px;
+	border-style: solid;
+	border-width: 3px;
+	border-color: #DD0000;
+	color: inherit;
+	background-color: #FFF8F8;
+	width: 75%;
+	text-align: left;
+	margin: 10px auto 10px 12%;
+}
+
+/* text colors for visible and hidden sets */
+font.visible   { font-style: normal; font-weight: normal; color: #000000; background-color: inherit; } /* black */
+font.hidden { font-style: italic; font-weight: normal; color: #aaaaaa; background-color: inherit; } /* light grey */
+
+/* styles used when editing a temporary file */
+.temporaryFile { font-style: italic; color: #F60; background-color: inherit; }
+
+/* text colors for Auditing, Current, and Dropped students */
+.Audit { font-style: normal; color: purple; background-color: inherit; }
+.Enrolled { font-weight: normal; color: black; background-color: inherit; }
+.Drop { font-style: italic; color: gray; background-color: inherit; }
diff --git a/conf/templates/math/system.template b/conf/templates/math/system.template
new file mode 100644
index 0000000000..b193a1e038
--- /dev/null
+++ b/conf/templates/math/system.template
@@ -0,0 +1,132 @@
+<!DOCTYPE html
+	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<!--
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/conf/templates/math/system.template,v 1.11 2008/10/09 02:18:37 gage 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+-->
+
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/css/math.css"/>
+<title><!--#path style="text" text=" : " textonly="1"--></title>
+<!--#head-->
+</head>
+<body bgcolor="white" onload="if (typeof(initializeWWquestion) == 'function') {initializeWWquestion()}">
+
+<div id="site-navigation">
+		<!--#if can="links"-->
+			    <!--#links-->
+			    <!--#endif-->
+		      <!--#if can="siblings"-->
+			      <!--#siblings-->
+		      <!--#endif-->
+		      <!--#if can="options"-->
+		      <ul>
+		        <li>
+			        <h2>Display Options</h2>
+			        <!--#options-->
+			      </li>
+		      </ul>
+		      <!--#endif-->
+</div>
+<hr class="for-broken-browsers"/>
+<div id="big-wrapper">
+<div id="masthead">
+	<div id="loginstatus">
+		<!--#loginstatus-->
+    </div>
+	<div id="logo">
+                <a href="http://webwork.maa.org"><img src="<!--#url type="webwork" name="htdocs"-->/images/webwork_rectangle.png" alt="WeBWorK" height="51" width="267" /></a>&nbsp;
+                <a href="http://www.maa.org"><img src="<!--#url type="webwork" name="htdocs"-->/images/maa_logo.png" alt="MAA" height="51" width="449" /></a>
+	</div>
+ </div>
+ <div style="clear:both;"></div>
+	<div id="breadcrumbs">
+		<!--#path style="text" text=" &#x2192; "-->
+	</div>
+	<div id="content" >
+
+			<!--#if can="title"-->
+				<span style="font-size:larger; color:#00F; float:left;  width:60%;   "><!--#title--></span>
+			<!--#endif-->
+			<!--#if can="message"-->
+				<span class="Message" style=" float:right; width:40%; right:0;">
+					<!--#message-->
+				</span>
+			<!--#endif-->
+
+		    <hr style="clear:both"/>
+       		<!--#if can="info"-->
+			  <!--  styles could be different for different pages so they are not set here -->
+				<!--#info-->
+		    <!--#endif-->
+			
+		<!--#if can="nav"-->
+		<div class="Nav">
+			<!--#nav style="images" imageprefix="/webwork2_files/images/nav" imagesuffix=".gif" separator="  "-->
+		</div>
+		<!--#endif-->
+		<!--#if can="post_header_text"-->
+			<!--#post_header_text-->
+			<hr style="clear:both"/>
+		<!--#endif-->
+
+	    <!--#if can="body"-->
+				<!--#if warnings="1"-->
+				  <div class="Body" style="background-color:#ffcccc">
+				  <p style="font-size:larger">
+				  Warning -- there may be something wrong with this question. Please inform your instructor
+				  including the warning messages below.
+				  </p>
+				<!--#else-->
+				  <div class="Body" style="background-color:#ffffff">
+				<!--#endif-->
+				
+				<!--#body-->
+				</div>
+			<!--#endif-->
+		
+		<!--#if warnings="1"-->
+		
+		<hr/>
+		<div class="Warnings">
+			<!--#warnings-->
+		</div>
+		<!--#endif-->
+		
+		<!--#if can="message"-->
+			<div class="Message">
+				<!--#message-->
+			</div>
+		<!--#endif-->
+		
+	
+	<hr class="for-broken-browsers"/>
+	<div id="footer">
+		<p id="last-modified">Page generated at <!--#timestamp--></p>
+		<div id="copyright">
+			WeBWorK &#169; 1996-2011 <a href="http://webwork.maa.org/">The WeBWorK Project</a>
+		</div>
+	</div>
+
+</div><!--content-->
+</div> <!-- big-wrapper -->
+</body>
+</html>
diff --git a/conf/templates/math2/gateway.template b/conf/templates/math2/gateway.template
new file mode 100644
index 0000000000..665663ea62
--- /dev/null
+++ b/conf/templates/math2/gateway.template
@@ -0,0 +1,100 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!--
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/conf/templates/math2/gateway.template,v 1.1.2.1 2008/06/24 17:17:36 gage 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<meta http-equiv="Pragma" content="no-cache"/>
+<meta http-equiv="expires" content="Wed, 21 Dec 2005 00:00:01 GMT"/>
+<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/css/math.css"/>
+<!-- [gateway] since the left-side menus are gone, don't indent the main content area -->
+<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/css/gateway.css"/>
+<title><!--#path style="text" text=" : " textonly="1"--></title>
+<!--#head-->
+<script language="javascript" type="text/javascript" 
+  src="<!--#url type="webwork" name="htdocs"-->/js/gateway.js"></script>
+</head>
+<body bgcolor="white">
+<div id="masthead">
+	<div id="loginstatus">
+		<!--#loginstatus-->
+	</div>
+	<div id="logo">
+		<img src="<!--#url type="webwork" name="htdocs"-->/images/webwork_rectangle.png" alt="WeBWorK" height="51" width="267" />
+	</div>
+</div>
+<hr class="for-broken-browsers"/>
+<div id="big-wrapper">
+	<div id="breadcrumbs">
+		<!--#path style="text" text=" &#x2192; "-->
+	</div>
+	<div id="content">
+		
+		<!--#if can="info"-->
+		<!--<div id="page-info">-->
+			<!--<div class="info-box" id="fisheye">-->
+				<!--#info-->
+			<!--</div>-->
+		<!--</div>-->
+		<!--#endif-->
+		
+		<!-- [gateway] removed nav button to go up -->
+		
+		<!--#if can="title"-->
+		<h1><!--#title--></h1>
+		<!--#endif-->
+		
+		<!--#if can="message"-->
+			<div class="Message">
+				<!--#message-->
+			</div>
+		<!--#endif-->
+
+		<!--#if can="body"-->
+		<div class="Body">
+			<!--#body-->
+		</div>
+		<!--#endif-->
+		
+		<!--#if warnings="1"-->
+		<hr>
+		<div class="Warnings">
+			<!--#warnings-->
+		</div>
+		<!--#endif-->
+		
+		<!--#if can="message"-->
+			<div class="Message">
+				<!--#message-->
+			</div>
+		<!--#endif-->
+		
+	</div> <!-- content -->
+	<hr class="for-broken-browsers"/>
+	<div id="footer">
+		<p id="last-modified">Page generated at <!--#timestamp--></p>
+		<div id="copyright">
+			WeBWorK &#169; 1996-2011 <a href="http://webwork.maa.org/">The WeBWorK Project</a>
+		</div>
+	</div>
+	<!-- [gateway] removed left sidebar -->
+</div> <!-- big-wrapper -->
+
+</body>
+</html>
diff --git a/conf/templates/math2/math2.css b/conf/templates/math2/math2.css
new file mode 100644
index 0000000000..255417681f
--- /dev/null
+++ b/conf/templates/math2/math2.css
@@ -0,0 +1,727 @@
+/* WeBWorK Online Homework Delivery System
+ * Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+ * $CVSHeader: webwork2/conf/templates/math2/math2.css,v 1.1.2.1 2008/06/24 17:17:36 gage 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
+ * Free Software Foundation; either version 2, or (at your option) any later
+ * version, or (b) the "Artistic License" which comes with this package.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+ * Artistic License for more details.
+ */
+
+/* --- Standard elements ---------------------------------------------------- */
+
+body {
+	background: white;
+	color: black;
+	margin: .5em .5em 0 .5em; /* MSIE ignores bottom margin; Gecko doesn't */
+	padding: 0;
+	font-family: "Times", serif;
+	min-width: 25em;
+}
+
+h1, h2, h3, h4, h5, h6 {
+	font-family: "Trebuchet MS", "Arial", "Helvetica", sans-serif;
+	/* FIXME "You have no background-color with your color" */
+	color: #225;
+	background: transparent;
+}
+h1 { font-size: 170%; }
+h2 { font-size: 140%; padding-bottom: 0; margin-bottom: .5ex }
+h3 { font-size: 120%; }
+h4 { font-size: 110%; }
+h5 { font-size: 105%; }
+h6 { font-size: 105%; } 
+
+a:link { color: #00e; background-color: inherit; }
+a:visited { color: #808; background-color: inherit; }
+
+/* --- Miscellaneous classes ---------------------------------------------- */
+
+/* show only to CSS-ignorant browsers */
+.for-broken-browsers { display: none }
+
+/* for hiding floats from Netscape 4.x */
+.float-left { float: left; }
+.float-right { float: right; }
+
+/* --- Compound titles (class) ---------------------------------------------- */
+
+/* WeBWorK is not using this, but it might be nice to have it around later */
+
+/* "Split" title, with main heading left-aligned above a horizontal line,
+ * and subheading right-aligned below the line. Usage:
+ *
+ * <h1 class="compound">Alumni Newsletter</h1>
+ * <h2 class="compound">Spring '00</h2>
+ */
+
+/*h1.compound {
+	border-bottom: 1px solid #559;
+	text-align: left;
+	padding: .5ex 0 0 0;
+	margin: 0;
+}
+h2.compound { float: right; margin: 0; padding: 0 }*/
+
+/* --- Info box (class) ----------------------------------------------------- */
+
+/* FIXME as a quick hack, the info() escape outputs a DIV with this class.
+ * don't let the placement of these styles fool you -- <div style="info-box">
+ * is output by WeBWorK! */
+
+/* Common style for a small box to hold supplemental info; typically this
+ * box will appear in a sidebar.  Sample usage:
+ *
+ * <div class="info-box">
+ *   <h2>Announcements</h2>
+ *   <ul>
+ *     <li>foo</li>
+ *   </ul>
+ *   <a class="more" href="bar">Older announcements...</a>
+ * </div>
+ */
+
+.info-box {
+	border: 1px solid #559;
+	/* FIXME: these aren't valid CSS, but they sure look nice :-P */
+	border-radius-topright: 1.5ex; border-radius-topleft: 1.5ex;
+	-moz-border-radius-topright: 1.5ex; -moz-border-radius-topleft: 1.5ex;
+	margin-bottom: 1ex; 
+	margin-top: 0;
+	overflow: hidden;
+}
+.info-box h2,
+.info-box h3,
+.info-box h4,
+.info-box h5,
+.info-box h6 {
+	/* FIXME: these aren't valid CSS, but they sure look nice :-P */
+	border-radius-topright: 1.5ex; border-radius-topleft: 1.5ex;
+	-moz-border-radius-topright: 1.5ex; -moz-border-radius-topleft: 1.5ex;
+	border-bottom: 1px solid #559;
+	font-size: 100%;
+	text-align: center;
+	background: #88d;
+	color: white;
+	margin: 0;
+	padding: 0 .5em 0 .5em;
+}
+.info-box h2 a,
+.info-box h3 a,
+.info-box h4 a,
+.info-box h5 a,
+.info-box h6 a {
+	color: #fff;
+	background: inherit;
+}
+.info-box ul,
+.info-box ol {
+	margin: 1ex .5em 1ex 0;
+	padding-left: 3.5em;
+	font-size: 80%;
+}
+.info-box dl {
+	margin: 1ex .5em 1ex 1ex;
+	padding: 0;
+	font-size: 80%;
+}
+.info-box li,
+.info-box dt {
+	margin: 0 0 .5ex 0;
+	padding: 0;
+	line-height: 2.2ex;
+}
+.info-box dt { font-weight: bold }
+.info-box dd {
+	margin: 0 0 .5ex 1em;
+	padding: 0;
+	line-height: 2.2ex;
+}
+.info-box dd p {
+	margin-top: 0;
+}
+.info-box a.more {
+	float: right;
+	font-size: 80%;
+	font-style: italic;
+	margin-bottom: 1ex;
+	margin-right: .5em;
+}
+
+.Message {
+background-color:#ddd;
+clear: both;
+}
+/* --- Fisheye view (id) ---------------------------------------------------- */
+
+/* The "fisheye" view: a hierarchical view of the website to show the 
+ * user where they are in the document hierarchy.  Provides more "lateral" 
+ * information than breadcrumbs, but not as much as a full sitemap. To 
+ * appear within the #site-navigation div.  Inherits many of its attributes 
+ * from class info-box, and overrides some.
+ */
+
+#mini-sitemap,
+#fisheye {
+	font-family: "Trebuchet MS", "Arial", "Helvetica", serif;
+	padding: 0 0 1ex 0;
+}
+#mini-sitemap a,
+#fisheye a {
+	text-decoration: none;
+}
+#mini-sitemap a:hover,
+#fisheye a:hover {
+	text-decoration: underline;
+}
+#mini-sitemap li,
+#fisheye li {
+	line-height: 2.5ex;
+	margin: 0;
+}
+#mini-sitemap ul,
+#fisheye ul {
+	font-size: 90%;
+	list-style-type: none;
+	margin: 0 .1em .3ex .3em;
+	padding: 0;
+}
+#mini-sitemap ul ul,
+#fisheye ul ul {
+	font-size: 90%;
+	margin-left: 0;
+}
+#mini-sitemap ul li,
+#fisheye ul li {
+	font-weight: bold;
+}
+#mini-sitemap ul ul ul,
+#fisheye ul ul ul {
+	font-size: 95%;
+	margin-left: .3em;
+	padding-left: .5em;
+	border-left: 1px dotted gray;
+}
+#mini-sitemap ul ul li a.active,
+#fisheye ul ul li a.active {
+	font-weight: bold;
+	color: black;
+	background-color: inherit;
+}
+#mini-sitemap ul ul ul li,
+#fisheye ul ul ul li {
+	font-weight: normal;
+}
+#mini-sitemap ul ul ul ul,
+#fisheye ul ul ul ul {
+	font-size: 90%;
+}
+#mini-sitemap ul ul ul ul ul,
+#fisheye ul ul ul ul ul {
+	font-size: 90%;
+}
+
+/* --- Common layout elements for documents using templates ----------------- */
+
+/* The "masthead" of our document that tells users what site they're on.
+ * It contains a logo-ish title and some basic site navigation.  The
+ * masthead should appear at the top of the page, but we're not positioning
+ * it absolutely because we can't know its height in advance.  Therefore this 
+ * element should be placed at the very top of the <body> of our HTML document.
+ */
+#masthead {
+	font-family: "Trebuchet MS", "Arial", "Helvetica", serif;
+	font-size: 100%;
+	margin: 0;
+	padding: 0;
+	color: #fff;
+	border: 1px solid #000;
+	background-color: #038;
+	/* [ww] we could have some sort of spider web image here. */
+	/*background-image: url("/images/mandel-wide.jpg");*/
+	background-repeat: repeat-x;
+	background-position: top left;
+}
+#masthead a {
+	/* FIXME "You have no background-color with your color" */
+	color: #fff;
+	background: transparent;
+}
+/* [ww] since this is a logo and not text, we need borders that are the same
+ * width all the way around. after we find a nice background image, we can
+ * turn these back on. */
+/*#masthead #logo { padding: .5ex .2em .1ex .5em }*/
+#masthead #logo { padding: 1ex }
+/* [ww] don't need these -- logo itself an image */
+/*#masthead #logo h1 {
+	background-image: none;
+	background-color: transparent;
+	font-size: 100%;
+	font-weight: normal;
+	padding: 0;
+	margin: 0;
+	white-space: nowrap;
+	line-height: 1.9ex;
+}*/
+/*#masthead #logo h2 {
+	background-color: transparent;
+	background-image: none;
+	font-weight: bold;
+	font-size: 210%;
+	line-height: 1.9ex;
+	margin: 0;
+	padding: 0;
+}*/
+/* [ww] instead of a search form, we want the loginstatus there */
+/*#masthead form {*/
+#masthead #loginstatus {
+	float: right;
+	padding: 0;
+	margin: 1ex .5em .1ex .1em;
+	font-size: smaller;
+}
+#masthead #loginstatus #Nav {
+	padding: 1ex;
+}
+
+/* "big-wrapper" contains everything other than the masthead.  It's merely 
+ * a relatively positioned div that allows us to use absolute positioning
+ * on elements within it -- and because it's relatively positioned,
+ * absolutely positioned objects *stay* within it.
+ */
+#big-wrapper {
+	position: relative;
+	top: 1ex;
+	width: 100%;
+	min-width: 18em;
+	margin: 0;
+	border: 0;
+}
+
+/*
+ * A simple list of "breadcrumbs" showing a path of links from the root of
+ * the site's hierarchy to our present location.  We are not positioning
+ * this element absolutely, because we don't know in advance how tall it
+ * will be, and we might want to place content under it.  So when coding
+ * our HTML document, we'll probably want to include this element right
+ * before the main content.
+ */
+
+#breadcrumbs {
+	margin-left: 10.4em;
+	margin-right: 0;
+	padding: 0 .4em;
+	border: 1px solid #559;
+	background: #88d;
+	color: #fff;
+	text-align: left; 
+	font-size: 100%;
+	font-family: "Trebuchet MS", "Arial", serif;
+}
+#breadcrumbs a {
+	font-size: 100%;
+	white-space: nowrap;
+	background-color: inherit;
+	color: #fff;
+	text-decoration: none;
+}
+#breadcrumbs a.active { font-weight: bold; }
+#breadcrumbs a:hover { text-decoration: underline; }
+
+
+/* For the more CSS-compliant browsers, we'd like to provide site-wide
+ * navigation links (e.g., a mini site map) to appear in a column along
+ * the left side of the page, just below the masthead.  This column is
+ * absolutely positioned, so that ideally we should be able to include its
+ * contents anywhere within the body of our HTML documents.  However, we 
+ * probably want to include this data at the END of our documents -- after
+ * the main content -- so that it doesn't interfere with document flow in 
+ * browsers that don't understand CSS (e.g., lynx) -- or in browsers for
+ * which we've disabled CSS via some hack (e.g. Netscape Navigator 4.x).
+ *
+ * We consider this meta-information to be non-essential; it is NOT part of
+ * the content, and may not be displayed in some circumstances.
+ */
+#site-navigation {
+	position: absolute;
+	left: 0;
+	top: 0;
+	margin: 0;
+	padding: 0;
+	width: 9.8em;
+}
+
+/* The primary information content of the document, excluding masthead and
+ * site navigation.  We want to leave a wide left margin to prevent overlap
+ * with our site map, which will be displayed on the left-hand side of the
+ * screen.
+ */
+#content {
+	margin: .5em 0 0 10.4em;
+	padding: 0 0 0 0;
+	font-family: "Times", serif;
+	/* border-left: 1px dotted #bbf; */
+}
+#content h1 { margin: .4ex 0; } /* for crappy MSIE */
+
+
+#footer {
+	/* white-space: nowrap; */
+	clear: both;
+	/* border-top: 1px solid #559; */
+	margin: 0 .5em .2ex 10.4em;
+	padding: 0;
+	font-family: "Trebuchet MS", "Arial", "Helvetica", serif;
+}
+#copyright { font-size: 75%; margin: 0;}
+#last-modified {
+	clear: both;
+	font-family: "Trebuchet MS", "Arial", "Helvetica", sans-serif;
+	font-size: 75%;
+	background-color: inherit;
+	color: #444;
+	margin: 1ex 0 0 0;
+	padding: 0;
+	border-bottom: 1px solid #559;
+}
+
+/* --- WeBWorK classes ------------------------------------------------------ */
+
+/* These classes are emitted by WeBWorK code and should appear in ANY WeBWorK
+ * template. they need not be implemented the same way in each template though.
+ * (These are mostly copied from ur.css right atm.)
+ */
+
+/* the info escape emits a DIV with this id. (note that the same DIV has class
+ * "info-box" which is given above in the "template styles" section. Regardless,
+ * it is emitted by WW code in ProblemSet.pl (not in system.template) ! */
+#InfoPanel {
+    font-size:100%;
+	float: right;
+	width: 100%;
+	max-width:400px;
+	overflow: auto;
+	margin-right: -1px;
+	background-color: #fff;
+}
+#InfoPanel ol {
+	font-size:100%;
+}
+
+/* tables used for laying out form fields shouldn't have a border */
+table.FormLayout { border: 0; }
+table.FormLayout tr { vertical-align: top; }
+table.FormLayout th.LeftHeader { text-align: right; white-space: nowrap; }
+table.FormLayout tr.ButtonRow { text-align: left; }
+table.FormLayout tr.ButtonRowCenter { text-align: center; }
+
+/* for problems which are rendered by themselves, e.g., by Set Maker */
+div.RenderSolo { background-color: #E0E0E0; color: black; }
+div.AuthorComment { background-color: #00E0E0; color: black; }
+
+/* minimal style for lists of links (generated by the links escape) */
+/*ul.LinksMenu { list-style: none; margin-left: 0; padding-left: 0; }*/
+/*ul.LinksMenu ul { list-style: none; margin-left: 0.5em; padding-left: 0; }*/
+
+/* background styles for success and failure messages */
+div.WarningMessage { background-color: #ffcccc; padding: 3px 3px 3px 3px; }
+div.ResultsWithoutError { color: inherit; background-color: #8F8; } /* green */
+div.ResultsWithError { color: #C33; background-color: inherit; } /* red */
+div.ResultsAlert { color: #F60; background-color: inherit; } /* orange */
+label.WarningMessage { background-color: #FF9494; padding: 3px 3px 3px 3px; }
+label.ResultsWithoutError { color: inherit; background-color: #8F8; } /* green */
+label.ResultsWithError { color: #FF9494; background-color: inherit; } /* error red, from http://www.colourlovers.com/color/FF9494/error_red*/
+label.ResultsAlert { color: #F60; background-color: inherit; } /* orange */
+span.WarningMessage { background-color: #FF9494; padding: 3px 3px 3px 3px; }
+span.ResultsWithoutError { color: inherit; background-color: #8F8; } /* green */
+span.ResultsWithError { color: #C33; background-color: inherit; } /* error red, from http://www.colourlovers.com/color/FF9494/error_red*/
+span.ResultsAlert { color: #F60; background-color: inherit; } /* orange */
+span.correct { color: inherit; background-color: #8F8; } /* green */
+span.incorrect { color: #FF9494; background-color: inherit; } /* red */
+input.correct   { color:inherit; background-color: #8F8; } /* green */
+input.incorrect { color;inherit; background-color: #FF9494; } /* red */
+
+/* styles used by WeBWorK::HTML::ScrollingRecordList */
+div.ScrollingRecordList { padding: 1em; white-space: nowrap; border: thin solid gray; }
+div.ScrollingRecordList select.ScrollingRecordList { width: 99%; }
+
+/* wraps the View Options form (generated by &optionsMacro) */
+/* FIXME: can't this style information just go in div.Options above? */
+div.viewOptions { font-size: small }
+
+/* messages, attempt results, answer previews, etc. go in this DIV */
+/* this used to be "float:left", but that was suspected of causing MSIE peekaboo bug */
+div.problemHeader {}
+
+/* styles for the attemptResults table */
+table.attemptResults {
+	border-style: outset; 
+	border-width: 1px; 
+	margin: 0px 10pt; 
+	border-spacing: 1px;
+}
+table.attemptResults td,
+table.attemptResults th {
+	border-style: inset; 
+	border-width: 1px; 
+	text-align: center; 
+	/*width: 15ex;*/ /* this was erroniously commented out with "#" */
+	padding: 2px 5px 2px 5px;
+	color: inherit;
+	background-color: #DDDDDD;
+}
+/* override above settings in tables used to display ans_array results */
+table.attemptResults td td,
+table.attemptResults td th,
+table.ArrayLayout td {
+	border-style: none; 
+	border-width: 0px; 
+	padding: 0px;
+}
+table.attemptResults td.Message {
+   text-align: left; 
+   padding: 2px 5px 2px 5px;
+   width: auto;
+}
+.attemptResultsSummary { font-style: italic; }
+.parsehilight { color: inherit; background-color: yellow; }
+
+/* the problem TEXT itself goes in this box */
+/* we used to make this a grey box, but surprise, MSIE is bug-ridden. */
+div.problem {  }
+
+/* jsMath emits this class when appropriate math fonts aren't available */
+div.NoFontMessage {
+	padding: 10px;
+	border-style: solid;
+	border-width: 3px;
+	border-color: #DD0000;
+	color: inherit;
+	background-color: #FFF8F8;
+	width: 75%;
+	text-align: left;
+	margin: 10px auto 10px 12%;
+}
+
+/* text colors for visible and hidden sets */
+font.visible   { font-style: normal; font-weight: normal; color: #000000; background-color: inherit; } /* black */
+font.hidden { font-style: italic; font-weight: normal; color: #aaaaaa; background-color: inherit; } /* light grey */
+
+/* styles used when editing a temporary file */
+.temporaryFile { font-style: italic; color: #F60; background-color: inherit; }
+
+/* text colors for Auditing, Current, and Dropped students */
+.Audit { font-style: normal; color: purple; background-color: inherit; }
+.Enrolled { font-weight: normal; color: black; background-color: inherit; }
+.Drop { font-style: italic; color: gray; background-color: inherit; }
+
+/*Styles for the login form*/
+
+#login_form input {
+	margin-top: 7px;
+}
+
+#login_form label{
+	margin-right: 2px;
+}
+
+#login_form #pswd_label{
+	margin-right: 4px;
+}
+
+#login_form #rememberme{
+	margin-left: 75px;
+}
+
+/*Styles for the edit forms, found on the homework sets editor page*/
+
+.edit_form  input,select{
+	margin-top: 5px;
+}
+
+.edit_form label, .edit_form span{
+	margin-left: 40px;
+}
+
+.edit_form label.radio_label{
+	margin-left: 0px;
+}
+
+.edit_form  span#filter_err_msg{
+	display: none;
+}
+
+/*Styles for the classlist editor page*/
+
+.set_table{
+	margin-right: 5px;
+}
+
+.set_table td{
+	padding-right: 5px;
+}
+
+.set_table th{
+	text-align: center;
+	padding-right: 5px;
+	padding-left: 5px;
+}
+
+.set_table label{
+	margin-left: 0px;
+}
+
+/*General styles, for elements such as table captions input buttons, columns, etc.*/
+
+table caption{
+	font-weight: bold;
+	text-decoration: underline;
+}
+
+.button_input{
+	margin-right: 5px;
+	margin-left: 5px;
+}
+
+.column {
+	float: left;
+	width: 50%;
+	height: 22%;
+	overflow: hidden;
+	margin-top: 10px;
+}
+
+.info-wrapper{
+	float: right;
+	min-height: 100px;
+	width: 40%;
+	overflow: hidden;
+	margin-left: 5px;
+}
+
+a.nav_button{
+	color: black;
+	background-color: #DDDDDD;
+	text-decoration: none;
+	text-align: center;
+	font-size: 15px;
+	padding: 1px 6px 1px 6px;
+	margin: 2px;
+	border-style: outset;
+}
+
+a.nav_button:hover{
+	background-color: #EEEEEE;
+	border-color: #00ADEE;
+}
+
+a.nav_button:active{
+	border-style: inset;
+}
+
+span.gray_button{
+	color: black;
+	background-color: #DDDDDD;
+	text-decoration: none;
+	text-align: center;
+	font-size: 15px;
+	padding: 1px 6px 1px 6px;
+	margin: 2px;
+	border-style: outset;
+	opacity: 0.3;
+}
+
+#none{
+	/*Please do not do anything with elements with id "none"*/
+}
+
+/*Styles for the PGProblemEditor Page*/
+
+#editor{
+	background-color: #FFFFFF;
+}
+
+#editor #source_and_options{
+	float: left;
+	width: 50%;
+}
+
+#editor #problemContents_label{
+	text-align: center;
+	font-weight: bold;
+	text-decoration: underline;
+	margin-left: 30%;
+}
+
+#editor #problemContents_id{
+	width: 100%;
+	height: 50%;
+}
+
+#editor .editor_form{
+	margin-left: 40px;
+}
+
+#editor #form_div{
+	/*float: left;*/
+	width: 100%;
+}
+
+/*Styles specifically for the problem viewer*/
+
+#problem_viewer_form{
+	margin-left: 10px;
+	float: left;
+	width: 45%;
+	height: 100%;
+	border-left: solid;
+	border-width: 1px;
+}
+
+#problem_viewer_form>h3{
+	margin-left: 37%;
+}
+
+#problem_viewer_form #viewer_span{
+	margin-left: 10%;
+}
+
+#problem_viewer_form #reload_button{
+	margin-left: 20%;
+	margin-top: 5%;
+}
+
+#problem_viewer_form #problem_viewer{
+	width: 60%;
+	background-color: #E8E8E8;
+	margin-left: 20%;
+	margin-top: 5%;
+	padding: 1px;
+}
+
+#problem_viewer_form #problem_viewer_content{
+	border-style: solid;
+	padding: 5%;
+	border-width: 1px;
+}
+
+#problem_viewer_form #viewer_note{
+	margin-top: 10%;
+	margin-left: 10%;
+	margin-right: 10%;
+}
+
+/*These are styles for the tables of problem sets*/
+
+table.problem_set_table th{
+	padding-right: 30px;
+}
+
+table.problem_set_table td{
+	padding-right: 30px;
+}
\ No newline at end of file
diff --git a/conf/templates/math2/system.template b/conf/templates/math2/system.template
new file mode 100644
index 0000000000..8e0250716d
--- /dev/null
+++ b/conf/templates/math2/system.template
@@ -0,0 +1,213 @@
+<!DOCTYPE html
+	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<!--
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/conf/templates/math2/system.template,v 1.1.2.3 2008/06/26 14:59:23 gage 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+-->
+<!--
+	Now altered to carry out most of the output operations in Problem.pm, as well as call general output subroutines.
+	-ghe3
+-->
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<link rel="shortcut icon" href="<!--#url type="webwork" name="htdocs"-->/images/favicon.ico"/>
+<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/css/math2.css"/>
+<!--#if can="output_tabber_JS"-->
+	<!--#output_tabber_JS-->
+<!--#endif-->
+<!--#if can="output_coloring_JS"-->
+	<!--#output_coloring_JS-->
+<!--#endif-->
+<title><!--#path style="text" text=" : " textonly="1"--></title>
+<!--#head-->
+</head>
+<body bgcolor="white" onload="if (typeof(initializeWWquestion) == 'function') {initializeWWquestion()}">
+<div id="masthead">
+	<div id="loginstatus">
+		<!--#loginstatus-->
+
+	</div>
+	<div id="logo">
+                <a href="http://webwork.maa.org"><img src="<!--#url type="webwork" name="htdocs"-->/images/webwork_rectangle.png" alt="image link to webwork main web site" height="51" width="267" /></a>&nbsp;
+                <a href="http://www.maa.org"><img src="<!--#url type="webwork" name="htdocs"-->/images/maa_logo.png" alt="image link to MAA (Mathematical Association of America) main web site" height="51" width="449" /></a>
+	</div>
+</div>
+<hr class="for-broken-browsers"/>
+<div id="big-wrapper">
+	<div id="breadcrumbs">
+		<!--#path style="text" text=" &#x2192; "-->
+	</div>
+	<div id="content" >
+            <span style="font-size:larger; color:#00F; float:left;  width:60%;   ">
+			<!--#if can="title"-->
+				<!--#title-->
+			<!--#endif-->
+			<!--#if can="nav"-->
+			    &nbsp;&nbsp;&nbsp;
+				<!--#nav style="buttons" imageprefix="/webwork2_files/images/nav" imagesuffix=".gif" separator="  "-->
+			
+		    <!--#endif-->
+            </span>
+			<!--#if can="message"-->
+				<span class="Message" style=" float:right; width:40%; right:0;">
+					<!--#message-->
+				</span>
+			<!--#endif-->
+
+		    <hr style="clear:both"/>
+	
+       		<!--#if can="info"-->
+			  <!--  styles could be different for different pages so they are not set here -->
+				<!--#info-->
+		    <!--#endif-->
+
+			<!--#if can="post_header_text"-->
+				<!--#post_header_text-->
+				<hr style="clear:both"/>
+			<!--#endif-->
+
+<!--			      ==============BEGIN BODY OF PROBLEM===============      -->
+			<!--#if warnings="1"-->
+				  <div class="Body" style="background-color:#ffcccc">
+				  <p style="font-size:larger">
+				  Warning -- there may be something wrong with this question. Please inform your instructor
+				  including the warning messages below.
+				  </p>
+				  </div>
+			<!--#else-->
+				 <!--#if can="output_problem_body"--> 
+			        <!-- ==== in this case print body parts --ELSE-- print entire body -->		
+					  <div class="Body" style="background-color:#ffffff">
+						<!--#if can="output_JS"-->
+							<!--#output_JS-->
+						<!--#endif-->
+		
+						<!--#if can="output_custom_edit_message"-->
+							<!--#output_custom_edit_message-->
+						<!--#endif-->
+						<!--#if can="output_summary"-->
+								<!--#output_summary-->
+							</div>
+						<!--#endif-->
+						
+						<!--#if can="output_hidden_info"-->
+							<!--#output_hidden_info-->
+						<!--#endif-->
+						
+						<!--#if can="output_form_start"-->
+							<!--#output_form_start-->
+							<!--#if can="output_problem_body" can="output_message" can="output_editorLink"-->
+								<div class="problem">
+									<!--#if can="output_problem_body"-->
+										<!--#output_problem_body-->
+									<!--#endif-->
+									<!--#if can="output_message"-->
+										<!--#output_message-->
+									<!--#endif-->
+									<!--#if can="output_editorLink"-->
+										<!--#output_editorLink-->
+									<!--#endif-->
+								</div>
+							<!--#endif-->
+							<!--#if can="output_checkboxes" can="output_submit_buttons"-->
+								<p>
+									<!--#if can="output_checkboxes"-->
+										<!--#output_checkboxes-->
+									<!--#endif-->
+									<!--#if can="output_submit_buttons"-->
+										<!--#output_submit_buttons-->
+									<!--#endif-->
+								</p>
+							<!--#endif-->
+							<!--#if can="output_score_summary"-->
+								<div class="scoreSummary">
+									<!--#output_score_summary-->
+								</div>
+							<!--#endif-->
+							<!--#if can="output_misc"-->
+								<!--#output_misc-->
+							<!--#endif-->
+							</form>
+						<!--#endif-->
+					  </div>
+
+				<!--#else-->
+				<!-- ==== couldn't print body parts so we'll print entire body -->	
+						  <div class="Body" style="background-color:#ffffff">
+						  <!--#body-->
+						  </div>
+				<!--#endif-->
+
+			<!--#endif-->  
+<!--			      ==============END BODY OF PROBLEM===============      -->
+			<!--#if can="output_past_answer_button" can="output_email_instructor"-->
+				<div class="problemFooter">
+					<!--#if can="output_past_answer_button"-->
+						<!--#output_past_answer_button-->
+					<!--#endif-->
+					<!--#if can="output_email_instructor"-->
+						<!--#output_email_instructor-->
+					<!--#endif-->
+				</div>
+			<!--#endif-->
+		
+		<!--#if warnings="1"-->
+		
+		<hr/>
+		<div class="Warnings">
+			<!--#warnings-->
+		</div>
+		<!--#endif-->
+		
+		<!--#if can="message"-->
+			<div class="Message">
+				<!--#message-->
+			</div>
+		<!--#endif-->
+	
+	<hr class="for-broken-browsers"/>
+	<div id="footer">
+		<!-- <p id="last-modified">Page generated at <!--#timestamp--></p>
+		<div id="copyright">
+			WeBWorK &#169; 1996-2011 <a href="http://webwork.maa.org/">The WeBWorK Project</a>
+		</div> -->
+		<!--#footer-->
+	</div>
+	<div id="site-navigation">
+		<!--#if can="links"-->
+		<div class="info-box" id="fisheye">
+			<!--#links-->
+		</div>
+		<!--#endif-->
+		<!--#if can="siblings"-->
+			<!--#siblings-->
+		<!--#endif-->
+		<!--#if can="options"-->
+		<div class="info-box" id="fisheye">
+			<!--#options-->
+		</div>
+		<!--#endif-->
+	</div>
+
+</div><!--content-->
+</div> <!-- big-wrapper -->
+
+</body>
+</html>
diff --git a/conf/templates/math3/gateway.template b/conf/templates/math3/gateway.template
new file mode 100644
index 0000000000..36c1af18e5
--- /dev/null
+++ b/conf/templates/math3/gateway.template
@@ -0,0 +1,100 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!--
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/conf/templates/math3/gateway.template,v 1.1.2.1 2008/06/24 17:17:36 gage 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<meta http-equiv="Pragma" content="no-cache"/>
+<meta http-equiv="expires" content="Wed, 21 Dec 2005 00:00:01 GMT"/>
+<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/css/math.css"/>
+<!-- [gateway] since the left-side menus are gone, don't indent the main content area -->
+<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/css/gateway.css"/>
+<title><!--#path style="text" text=" : " textonly="1"--></title>
+<!--#head-->
+<script language="javascript" type="text/javascript" 
+  src="<!--#url type="webwork" name="htdocs"-->/js/gateway.js"></script>
+</head>
+<body bgcolor="white">
+<div id="masthead">
+	<div id="loginstatus">
+		<!--#loginstatus-->
+	</div>
+	<div id="logo">
+		<img src="<!--#url type="webwork" name="htdocs"-->/images/webwork_rectangle.png" alt="WeBWorK" height="51" width="267" />
+	</div>
+</div>
+<hr class="for-broken-browsers"/>
+<div id="big-wrapper">
+	<div id="breadcrumbs">
+		<!--#path style="text" text=" &#x2192; "-->
+	</div>
+	<div id="content">
+		
+		<!--#if can="info"-->
+		<!--<div id="page-info">-->
+			<!--<div class="info-box" id="fisheye">-->
+				<!--#info-->
+			<!--</div>-->
+		<!--</div>-->
+		<!--#endif-->
+		
+		<!-- [gateway] removed nav button to go up -->
+		
+		<!--#if can="title"-->
+		<h1><!--#title--></h1>
+		<!--#endif-->
+		
+		<!--#if can="message"-->
+			<div class="Message">
+				<!--#message-->
+			</div>
+		<!--#endif-->
+
+		<!--#if can="body"-->
+		<div class="Body">
+			<!--#body-->
+		</div>
+		<!--#endif-->
+		
+		<!--#if warnings="1"-->
+		<hr>
+		<div class="Warnings">
+			<!--#warnings-->
+		</div>
+		<!--#endif-->
+		
+		<!--#if can="message"-->
+			<div class="Message">
+				<!--#message-->
+			</div>
+		<!--#endif-->
+		
+	</div> <!-- content -->
+	<hr class="for-broken-browsers"/>
+	<div id="footer">
+		<p id="last-modified">Page generated at <!--#timestamp--></p>
+		<div id="copyright">
+			WeBWorK &#169; 2000-2007 <a href="http://openwebwork.sf.net/">The WeBWorK Project</a>
+		</div>
+	</div>
+	<!-- [gateway] removed left sidebar -->
+</div> <!-- big-wrapper -->
+
+</body>
+</html>
diff --git a/conf/templates/math3/math3.css b/conf/templates/math3/math3.css
new file mode 100644
index 0000000000..3b14bade45
--- /dev/null
+++ b/conf/templates/math3/math3.css
@@ -0,0 +1,755 @@
+/* WeBWorK Online Homework Delivery System
+ * Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+ * $CVSHeader: webwork2/conf/templates/math2/math2.css,v 1.1.2.1 2008/06/24 17:17:36 gage 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
+ * Free Software Foundation; either version 2, or (at your option) any later
+ * version, or (b) the "Artistic License" which comes with this package.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+ * Artistic License for more details.
+ */
+
+/* --- Standard elements ---------------------------------------------------- */
+
+body {
+	background: white;
+	color: black;
+	margin: .5em .5em 0 .5em; /* MSIE ignores bottom margin; Gecko doesn't */
+	padding: 0;
+	font-family: "Arial", sans-serif;
+	min-width: 25em;
+}
+
+h1, h2, h3, h4, h5, h6 {
+	font-family: "Trebuchet MS", "Arial", "Helvetica", sans-serif;
+	/* FIXME "You have no background-color with your color" */
+	color: #225;
+	background: transparent;
+}
+h1 { font-size: 170%; }
+h2 { font-size: 140%; padding-bottom: 0; margin-bottom: .5ex }
+h3 { font-size: 120%; }
+h4 { font-size: 110%; }
+h5 { font-size: 105%; }
+h6 { font-size: 105%; } 
+
+a:link { color: #00e; background-color: inherit; }
+a:visited { color: #808; background-color: inherit; }
+
+/* --- Miscellaneous classes ---------------------------------------------- */
+
+/* show only to CSS-ignorant browsers */
+.for-broken-browsers { display: none }
+
+/* for hiding floats from Netscape 4.x */
+.float-left { float: left; }
+.float-right { float: right; }
+
+/* --- Compound titles (class) ---------------------------------------------- */
+
+/* WeBWorK is not using this, but it might be nice to have it around later */
+
+/* "Split" title, with main heading left-aligned above a horizontal line,
+ * and subheading right-aligned below the line. Usage:
+ *
+ * <h1 class="compound">Alumni Newsletter</h1>
+ * <h2 class="compound">Spring '00</h2>
+ */
+
+/*h1.compound {
+	border-bottom: 1px solid #559;
+	text-align: left;
+	padding: .5ex 0 0 0;
+	margin: 0;
+}
+h2.compound { float: right; margin: 0; padding: 0 }*/
+
+/* --- Info box (class) ----------------------------------------------------- */
+
+/* FIXME as a quick hack, the info() escape outputs a DIV with this class.
+ * don't let the placement of these styles fool you -- <div style="info-box">
+ * is output by WeBWorK! */
+
+/* Common style for a small box to hold supplemental info; typically this
+ * box will appear in a sidebar.  Sample usage:
+ *
+ * <div class="info-box">
+ *   <h2>Announcements</h2>
+ *   <ul>
+ *     <li>foo</li>
+ *   </ul>
+ *   <a class="more" href="bar">Older announcements...</a>
+ * </div>
+ */
+
+.info-box {
+	border: 1px solid #559;
+	/* FIXME: these aren't valid CSS, but they sure look nice :-P */
+	border-radius-topright: 1.5ex; border-radius-topleft: 1.5ex;
+	-moz-border-radius-topright: 1.5ex; -moz-border-radius-topleft: 1.5ex;
+	margin-bottom: 1ex; 
+	margin-top: 0;
+	overflow: hidden;
+}
+.info-box h2,
+.info-box h3,
+.info-box h4,
+.info-box h5,
+.info-box h6 {
+	/* FIXME: these aren't valid CSS, but they sure look nice :-P */
+	border-radius-topright: 1.5ex; border-radius-topleft: 1.5ex;
+	-moz-border-radius-topright: 1.5ex; -moz-border-radius-topleft: 1.5ex;
+	border-bottom: 1px solid #559;
+	font-size: 100%;
+	text-align: center;
+	background: #88d;
+	color: white;
+	margin: 0;
+	padding: 0 .5em 0 .5em;
+}
+.info-box h2 a,
+.info-box h3 a,
+.info-box h4 a,
+.info-box h5 a,
+.info-box h6 a {
+	color: #fff;
+	background: inherit;
+}
+.info-box ul,
+.info-box ol {
+	margin: 1ex .5em 1ex 0;
+	padding-left: 3.5em;
+	font-size: 80%;
+}
+.info-box dl {
+	margin: 1ex .5em 1ex 1ex;
+	padding: 0;
+	font-size: 80%;
+}
+.info-box li,
+.info-box dt {
+	margin: 0 0 .5ex 0;
+	padding: 0;
+	line-height: 2.2ex;
+}
+.info-box dt { font-weight: bold }
+.info-box dd {
+	margin: 0 0 .5ex 1em;
+	padding: 0;
+	line-height: 2.2ex;
+}
+.info-box dd p {
+	margin-top: 0;
+}
+.info-box a.more {
+	float: right;
+	font-size: 80%;
+	font-style: italic;
+	margin-bottom: 1ex;
+	margin-right: .5em;
+}
+
+.Message {
+background-color:#ddd;
+clear: both;
+}
+/* --- Fisheye view (id) ---------------------------------------------------- */
+
+/* The "fisheye" view: a hierarchical view of the website to show the 
+ * user where they are in the document hierarchy.  Provides more "lateral" 
+ * information than breadcrumbs, but not as much as a full sitemap. To 
+ * appear within the #site-navigation div.  Inherits many of its attributes 
+ * from class info-box, and overrides some.
+ */
+
+#mini-sitemap,
+#fisheye {
+	font-family: "Trebuchet MS", "Arial", "Helvetica", sans-serif;
+	padding: 0 0 1ex 0;
+}
+#mini-sitemap a,
+#fisheye a {
+	text-decoration: none;
+}
+#mini-sitemap a:hover,
+#fisheye a:hover {
+	text-decoration: underline;
+}
+#mini-sitemap li,
+#fisheye li {
+	line-height: 2.5ex;
+	margin: 0;
+}
+#mini-sitemap ul,
+#fisheye ul {
+	font-size: 90%;
+	list-style-type: none;
+	margin: 0 .1em .3ex .3em;
+	padding: 0;
+}
+#mini-sitemap ul ul,
+#fisheye ul ul {
+	font-size: 90%;
+	margin-left: 0;
+}
+#mini-sitemap ul li,
+#fisheye ul li {
+	font-weight: bold;
+}
+#mini-sitemap ul ul ul,
+#fisheye ul ul ul {
+	font-size: 95%;
+	margin-left: .3em;
+	padding-left: .5em;
+	border-left: 1px dotted gray;
+}
+#mini-sitemap ul ul li a.active,
+#fisheye ul ul li a.active {
+	font-weight: bold;
+	color: black;
+	background-color: inherit;
+}
+#mini-sitemap ul ul ul li,
+#fisheye ul ul ul li {
+	font-weight: normal;
+}
+#mini-sitemap ul ul ul ul,
+#fisheye ul ul ul ul {
+	font-size: 90%;
+}
+#mini-sitemap ul ul ul ul ul,
+#fisheye ul ul ul ul ul {
+	font-size: 90%;
+}
+
+/* --- Common layout elements for documents using templates ----------------- */
+
+/* The "masthead" of our document that tells users what site they're on.
+ * It contains a logo-ish title and some basic site navigation.  The
+ * masthead should appear at the top of the page, but we're not positioning
+ * it absolutely because we can't know its height in advance.  Therefore this 
+ * element should be placed at the very top of the <body> of our HTML document.
+ */
+#masthead {
+	font-family: "Trebuchet MS", "Arial", "Helvetica", sans-serif;
+	font-size: 100%;
+	margin: 0;
+	padding: 0;
+	color: #fff;
+	border: 1px solid #000;
+	background-color: #038;
+	/* [ww] we could have some sort of spider web image here. */
+	/*background-image: url("/images/mandel-wide.jpg");*/
+	background-repeat: repeat-x;
+	background-position: top left;
+}
+#masthead a {
+	/* FIXME "You have no background-color with your color" */
+	color: #fff;
+	background: transparent;
+}
+/* [ww] since this is a logo and not text, we need borders that are the same
+ * width all the way around. after we find a nice background image, we can
+ * turn these back on. */
+/*#masthead #logo { padding: .5ex .2em .1ex .5em }*/
+#masthead #logo { padding: 1ex }
+/* [ww] don't need these -- logo itself an image */
+/*#masthead #logo h1 {
+	background-image: none;
+	background-color: transparent;
+	font-size: 100%;
+	font-weight: normal;
+	padding: 0;
+	margin: 0;
+	white-space: nowrap;
+	line-height: 1.9ex;
+}*/
+/*#masthead #logo h2 {
+	background-color: transparent;
+	background-image: none;
+	font-weight: bold;
+	font-size: 210%;
+	line-height: 1.9ex;
+	margin: 0;
+	padding: 0;
+}*/
+/* [ww] instead of a search form, we want the loginstatus there */
+/*#masthead form {*/
+
+/*Absolute positioning*/
+
+#loginstatus {
+	color: white;
+	position: absolute;
+	top: -75px;
+	left: 1170px;
+	width: 150px;
+	float: right;
+	text-align: center;
+	padding: 0;
+	margin: 1ex .5em .1ex .1em;
+	font-size: smaller;
+}
+
+/*Relative Positioning*/
+
+/*#loginstatus {
+	color: white;
+	position: relative;
+	top: -140px;
+	left: 470px;
+	width: 150px;
+	text-align: center;
+	padding: 0;
+	margin: 1ex .5em .1ex .1em;
+	font-size: smaller;
+}*/
+
+
+#loginstatus a{
+	color: white;
+}
+
+#loginstatus #Nav {
+	padding: 1ex;
+}
+
+/* "big-wrapper" contains everything other than the masthead.  It's merely 
+ * a relatively positioned div that allows us to use absolute positioning
+ * on elements within it -- and because it's relatively positioned,
+ * absolutely positioned objects *stay* within it.
+ */
+#big-wrapper {
+	position: relative;
+	top: 1ex;
+	width: 100%;
+	min-width: 18em;
+	margin: 0;
+	border: 0;
+}
+
+/*
+ * A simple list of "breadcrumbs" showing a path of links from the root of
+ * the site's hierarchy to our present location.  We are not positioning
+ * this element absolutely, because we don't know in advance how tall it
+ * will be, and we might want to place content under it.  So when coding
+ * our HTML document, we'll probably want to include this element right
+ * before the main content.
+ */
+
+#breadcrumbs {
+	margin-left: 10.4em;
+	margin-right: 0;
+	padding: 0 .4em;
+	border: 1px solid #559;
+	background: #88d;
+	color: #fff;
+	text-align: left; 
+	font-size: 100%;
+	font-family: "Trebuchet MS", "Arial", sans-serif;
+}
+#breadcrumbs a {
+	font-size: 100%;
+	white-space: nowrap;
+	background-color: inherit;
+	color: #fff;
+	text-decoration: none;
+}
+#breadcrumbs a.active { font-weight: bold; }
+#breadcrumbs a:hover { text-decoration: underline; }
+
+
+/* For the more CSS-compliant browsers, we'd like to provide site-wide
+ * navigation links (e.g., a mini site map) to appear in a column along
+ * the left side of the page, just below the masthead.  This column is
+ * absolutely positioned, so that ideally we should be able to include its
+ * contents anywhere within the body of our HTML documents.  However, we 
+ * probably want to include this data at the END of our documents -- after
+ * the main content -- so that it doesn't interfere with document flow in 
+ * browsers that don't understand CSS (e.g., lynx) -- or in browsers for
+ * which we've disabled CSS via some hack (e.g. Netscape Navigator 4.x).
+ *
+ * We consider this meta-information to be non-essential; it is NOT part of
+ * the content, and may not be displayed in some circumstances.
+ */
+#site-navigation {
+	position: absolute;
+	left: 0;
+	top: 0;
+	margin: 0;
+	padding: 0;
+	width: 9.8em;
+}
+
+/* The primary information content of the document, excluding masthead and
+ * site navigation.  We want to leave a wide left margin to prevent overlap
+ * with our site map, which will be displayed on the left-hand side of the
+ * screen.
+ */
+#content {
+	margin: .5em 0 0 10.4em;
+	padding: 0 0 0 0;
+	font-family: "Arial", sans-serif;
+	/* border-left: 1px dotted #bbf; */
+}
+#content h1 { margin: .4ex 0; } /* for crappy MSIE */
+
+
+#footer {
+	/* white-space: nowrap; */
+	clear: both;
+	/* border-top: 1px solid #559; */
+	margin: 0 .5em .2ex 10.4em;
+	padding: 0;
+	font-family: "Trebuchet MS", "Arial", "Helvetica", sans-serif;
+}
+#copyright { font-size: 75%; margin: 0;}
+#last-modified {
+	clear: both;
+	font-family: "Trebuchet MS", "Arial", "Helvetica", sans-serif;
+	font-size: 75%;
+	background-color: inherit;
+	color: #444;
+	margin: 1ex 0 0 0;
+	padding: 0;
+	border-bottom: 1px solid #559;
+}
+
+/* --- WeBWorK classes ------------------------------------------------------ */
+
+/* These classes are emitted by WeBWorK code and should appear in ANY WeBWorK
+ * template. they need not be implemented the same way in each template though.
+ * (These are mostly copied from ur.css right atm.)
+ */
+
+/* the info escape emits a DIV with this id. (note that the same DIV has class
+ * "info-box" which is given above in the "template styles" section. Regardless,
+ * it is emitted by WW code in ProblemSet.pl (not in system.template) ! */
+#InfoPanel {
+    font-size:100%;
+	float: right;
+	max-width: 400px;
+	overflow: auto;
+	/*margin-right: -1px;*/
+	background-color: #fff;
+}
+#InfoPanel ol {
+	font-size:100%;
+}
+
+/* tables used for laying out form fields shouldn't have a border */
+table.FormLayout { border: 0; }
+table.FormLayout tr { vertical-align: top; }
+table.FormLayout th.LeftHeader { text-align: right; white-space: nowrap; }
+table.FormLayout tr.ButtonRow { text-align: left; }
+table.FormLayout tr.ButtonRowCenter { text-align: center; }
+
+/* for problems which are rendered by themselves, e.g., by Set Maker */
+div.RenderSolo { background-color: #E0E0E0; color: black; }
+div.AuthorComment { background-color: #00E0E0; color: black; }
+
+/* minimal style for lists of links (generated by the links escape) */
+/*ul.LinksMenu { list-style: none; margin-left: 0; padding-left: 0; }*/
+/*ul.LinksMenu ul { list-style: none; margin-left: 0.5em; padding-left: 0; }*/
+
+/* background styles for success and failure messages */
+div.WarningMessage { background-color: #FF9494; padding: 3px 3px 3px 3px; }
+div.ResultsWithoutError { color: inherit; background-color: #8F8; } /* green */
+div.ResultsWithError { color: #FF9494; background-color: inherit; } /* error red, from http://www.colourlovers.com/color/FF9494/error_red*/
+div.ResultsAlert { color: #F60; background-color: inherit; } /* orange */
+label.WarningMessage { background-color: #FF9494; padding: 3px 3px 3px 3px; }
+label.ResultsWithoutError { color: inherit; background-color: #8F8; } /* green */
+label.ResultsWithError { color: #FF9494; background-color: inherit; } /* error red, from http://www.colourlovers.com/color/FF9494/error_red*/
+label.ResultsAlert { color: #F60; background-color: inherit; } /* orange */
+span.WarningMessage { background-color: #FF9494; padding: 3px 3px 3px 3px; }
+span.ResultsWithoutError { color: inherit; background-color: #8F8; } /* green */
+span.ResultsWithError { color: #FF9494; background-color: inherit; } /* error red, from http://www.colourlovers.com/color/FF9494/error_red*/
+span.ResultsAlert { color: #F60; background-color: inherit; } /* orange */
+span.correct { color: inherit; background-color: #8F8; } /* green */
+span.incorrect { color: #FF9494; background-color: inherit; } /* red */
+input.correct   { color:inherit; background-color: #8F8; } /* green */
+input.incorrect { color;inherit; background-color: #FF9494; } /* red */
+
+/* styles used by WeBWorK::HTML::ScrollingRecordList */
+div.ScrollingRecordList { padding: 1em; white-space: nowrap; border: thin solid gray; }
+div.ScrollingRecordList select.ScrollingRecordList { width: 99%; }
+
+/* wraps the View Options form (generated by &optionsMacro) */
+/* FIXME: can't this style information just go in div.Options above? */
+div.viewOptions { font-size: small }
+
+/* messages, attempt results, answer previews, etc. go in this DIV */
+/* this used to be "float:left", but that was suspected of causing MSIE peekaboo bug */
+div.problemHeader {}
+
+/* styles for the attemptResults table */
+table.attemptResults {
+	border-style: outset; 
+	border-width: 1px; 
+	margin: 0px 10pt; 
+	border-spacing: 1px;
+}
+table.attemptResults td,
+table.attemptResults th {
+	border-style: inset; 
+	border-width: 1px; 
+	text-align: center; 
+	/*width: 15ex;*/ /* this was erroniously commented out with "#" */
+	padding: 2px 5px 2px 5px;
+	color: inherit;
+	background-color: #DDDDDD;
+}
+/* override above settings in tables used to display ans_array results */
+table.attemptResults td td,
+table.attemptResults td th,
+table.ArrayLayout td {
+	border-style: none; 
+	border-width: 0px; 
+	padding: 0px;
+}
+table.attemptResults td.Message {
+   text-align: left; 
+   padding: 2px 5px 2px 5px;
+   width: auto;
+}
+.attemptResultsSummary { font-style: italic; }
+.parsehilight { color: inherit; background-color: yellow; }
+
+/* the problem TEXT itself goes in this box */
+/* we used to make this a grey box, but surprise, MSIE is bug-ridden. */
+div.problem {  }
+
+/* jsMath emits this class when appropriate math fonts aren't available */
+div.NoFontMessage {
+	padding: 10px;
+	border-style: solid;
+	border-width: 3px;
+	border-color: #DD0000;
+	color: inherit;
+	background-color: #FFF8F8;
+	width: 75%;
+	text-align: left;
+	margin: 10px auto 10px 12%;
+}
+
+/* text colors for visible and hidden sets */
+font.visible   { font-style: normal; font-weight: normal; color: #000000; background-color: inherit; } /* black */
+font.hidden { font-style: italic; font-weight: normal; color: #aaaaaa; background-color: inherit; } /* light grey */
+
+/* styles used when editing a temporary file */
+.temporaryFile { font-style: italic; color: #F60; background-color: inherit; }
+
+/* text colors for Auditing, Current, and Dropped students */
+.Audit { font-style: normal; color: purple; background-color: inherit; }
+.Enrolled { font-weight: normal; color: black; background-color: inherit; }
+.Drop { font-style: italic; color: gray; background-color: inherit; }
+
+/*Styles for the login form*/
+
+#login_form input {
+	margin-top: 7px;
+}
+
+#login_form label{
+	margin-right: 2px;
+}
+
+#login_form #pswd_label{
+	margin-right: 4px;
+}
+
+#login_form #rememberme{
+	margin-left: 75px;
+}
+
+/*Styles for the edit forms, found on the homework sets editor page*/
+
+.edit_form  input,select{
+	margin-top: 5px;
+}
+
+.edit_form label, .edit_form span{
+	margin-left: 40px;
+}
+
+.edit_form label.radio_label{
+	margin-left: 0px;
+}
+
+.edit_form  span#filter_err_msg{
+	display: none;
+}
+
+/*Styles for the classlist editor page*/
+
+.set_table{
+	margin-right: 5px;
+}
+
+.set_table td{
+	padding-right: 5px;
+}
+
+.set_table th{
+	text-align: center;
+	padding-right: 5px;
+	padding-left: 5px;
+}
+
+.set_table label{
+	margin-left: 0px;
+}
+
+/*General styles, for elements such as table captions input buttons, columns, etc.*/
+
+table caption{
+	font-weight: bold;
+	text-decoration: underline;
+}
+
+.button_input{
+	margin-right: 5px;
+	margin-left: 5px;
+}
+
+.column {
+	float: left;
+	width: 50%;
+	height: 22%;
+	overflow: hidden;
+	margin-top: 10px;
+}
+
+.info-wrapper{
+	float: right;
+	min-height: 100px;
+	width: 40%;
+	overflow: hidden;
+	margin-left: 5px;
+}
+
+a.nav_button{
+	color: black;
+	background-color: #DDDDDD;
+	text-decoration: none;
+	text-align: center;
+	font-size: 15px;
+	padding: 1px 6px 1px 6px;
+	margin: 2px;
+	border-style: outset;
+}
+
+a.nav_button:hover{
+	background-color: #EEEEEE;
+	border-color: #00ADEE;
+}
+
+a.nav_button:active{
+	border-style: inset;
+}
+
+span.gray_button{
+	color: black;
+	background-color: #DDDDDD;
+	text-decoration: none;
+	text-align: center;
+	font-size: 15px;
+	padding: 1px 6px 1px 6px;
+	margin: 2px;
+	border-style: outset;
+	opacity: 0.3;
+}
+
+#none{
+	/*Please do not do anything with elements with id "none"*/
+}
+
+/*Styles for the PGProblemEditor Page*/
+
+#editor{
+	background-color: #FFFFFF;
+}
+
+#editor #source_and_options{
+	float: left;
+	width: 50%;
+}
+
+#editor #problemContents_label{
+	text-align: center;
+	font-weight: bold;
+	text-decoration: underline;
+	margin-left: 30%;
+}
+
+#editor #problemContents_id{
+	width: 100%;
+	height: 50%;
+}
+
+#editor .editor_form{
+	margin-left: 40px;
+}
+
+#editor #form_div{
+	/*float: left;*/
+	width: 100%;
+}
+
+/*Styles specifically for the problem viewer*/
+
+#problem_viewer_form{
+	margin-left: 10px;
+	float: left;
+	width: 45%;
+	height: 100%;
+	border-left: solid;
+	border-width: 1px;
+}
+
+#problem_viewer_form>h3{
+	margin-left: 37%;
+}
+
+#problem_viewer_form #viewer_span{
+	margin-left: 10%;
+}
+
+#problem_viewer_form #reload_button{
+	margin-left: 20%;
+	margin-top: 5%;
+}
+
+#problem_viewer_form #problem_viewer{
+	width: 60%;
+	background-color: #E8E8E8;
+	margin-left: 20%;
+	margin-top: 5%;
+	padding: 1px;
+}
+
+#problem_viewer_form #problem_viewer_content{
+	border-style: solid;
+	padding: 5%;
+	border-width: 1px;
+}
+
+#problem_viewer_form #viewer_note{
+	margin-top: 10%;
+	margin-left: 10%;
+	margin-right: 10%;
+}
+
+/*These are styles for the tables of problem sets*/
+
+table.problem_set_table th{
+	padding-right: 30px;
+}
+
+table.problem_set_table td{
+	padding-right: 30px;
+}
\ No newline at end of file
diff --git a/conf/templates/math3/system.template b/conf/templates/math3/system.template
new file mode 100644
index 0000000000..04a73960ff
--- /dev/null
+++ b/conf/templates/math3/system.template
@@ -0,0 +1,213 @@
+<!DOCTYPE html
+	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<!--
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/conf/templates/math3/system.template,v 1.2 2008/06/26 19:46:02 gage 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+-->
+<!--
+	Now altered to carry out most of the output operations in Problem.pm, as well as call general output subroutines.
+	-ghe3
+-->
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<link rel="shortcut icon" href="<!--#url type="webwork" name="htdocs"-->/images/favicon.ico"/>
+<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/css/math3.css"/>
+<!--#if can="output_tabber_JS"-->
+	<!--#output_tabber_JS-->
+<!--#endif-->
+<!--#if can="output_coloring_JS"-->
+	<!--#output_coloring_JS-->
+<!--#endif-->
+<title><!--#path style="text" text=" : " textonly="1"--></title>
+<!--#head-->
+</head>
+<body bgcolor="white" onload="if (typeof(initializeWWquestion) == 'function') {initializeWWquestion()}">
+<div id="masthead">
+	<div id="loginstatus">
+		<!--#loginstatus-->
+
+	</div>
+	<div id="logo">
+                <a href="http://webwork.maa.org"><img src="<!--#url type="webwork" name="htdocs"-->/images/webwork_rectangle.png" alt="image link to webwork main web site" height="51" width="267" /></a>&nbsp;
+                <a href="http://www.maa.org"><img src="<!--#url type="webwork" name="htdocs"-->/images/maa_logo.png" alt="image link to MAA (Mathematical Association of America) main web site" height="51" width="449" /></a>
+	</div>
+</div>
+<hr class="for-broken-browsers"/>
+<div id="big-wrapper">
+	<div id="breadcrumbs">
+		<!--#path style="text" text=" &#x2192; "-->
+	</div>
+	<div id="content" >
+            <span style="font-size:larger; color:#00F; float:left;  width:60%;   ">
+			<!--#if can="title"-->
+				<!--#title-->
+			<!--#endif-->
+			<!--#if can="nav"-->
+			    &nbsp;&nbsp;&nbsp;
+				<!--#nav style="buttons" imageprefix="/webwork2_files/images/nav" imagesuffix=".gif" separator="  "-->
+			
+		    <!--#endif-->
+            </span>
+			<!--#if can="message"-->
+				<span class="Message" style=" float:right; width:40%; right:0;">
+					<!--#message-->
+				</span>
+			<!--#endif-->
+
+		    <hr style="clear:both"/>
+	
+       		<!--#if can="info"-->
+			  <!--  styles could be different for different pages so they are not set here -->
+				<!--#info-->
+		    <!--#endif-->
+
+			<!--#if can="post_header_text"-->
+				<!--#post_header_text-->
+				<hr style="clear:both"/>
+			<!--#endif-->
+
+<!--			      ==============BEGIN BODY OF PROBLEM===============      -->
+			<!--#if warnings="1"-->
+				  <div class="Body" style="background-color:#ff0000">
+				  <p style="font-size:larger">
+				  Warning -- there may be something wrong with this question. Please inform your instructor
+				  including the warning messages below.
+				  </p>
+				  </div>
+			<!--#else-->
+				 <!--#if can="output_problem_body"--> 
+			        <!-- ==== in this case print body parts --ELSE-- print entire body -->		
+					  <div class="Body" style="background-color:#ffffff">
+						<!--#if can="output_JS"-->
+							<!--#output_JS-->
+						<!--#endif-->
+		
+						<!--#if can="output_custom_edit_message"-->
+							<!--#output_custom_edit_message-->
+						<!--#endif-->
+						<!--#if can="output_summary"-->
+								<!--#output_summary-->
+							</div>
+						<!--#endif-->
+						
+						<!--#if can="output_hidden_info"-->
+							<!--#output_hidden_info-->
+						<!--#endif-->
+						
+						<!--#if can="output_form_start"-->
+							<!--#output_form_start-->
+							<!--#if can="output_problem_body" can="output_message" can="output_editorLink"-->
+								<div class="problem">
+									<!--#if can="output_problem_body"-->
+										<!--#output_problem_body-->
+									<!--#endif-->
+									<!--#if can="output_message"-->
+										<!--#output_message-->
+									<!--#endif-->
+									<!--#if can="output_editorLink"-->
+										<!--#output_editorLink-->
+									<!--#endif-->
+								</div>
+							<!--#endif-->
+							<!--#if can="output_checkboxes" can="output_submit_buttons"-->
+								<p>
+									<!--#if can="output_checkboxes"-->
+										<!--#output_checkboxes-->
+									<!--#endif-->
+									<!--#if can="output_submit_buttons"-->
+										<!--#output_submit_buttons-->
+									<!--#endif-->
+								</p>
+							<!--#endif-->
+							<!--#if can="output_score_summary"-->
+								<div class="scoreSummary">
+									<!--#output_score_summary-->
+								</div>
+							<!--#endif-->
+							<!--#if can="output_misc"-->
+								<!--#output_misc-->
+							<!--#endif-->
+							</form>
+						<!--#endif-->
+					  </div>
+
+				<!--#else-->
+				<!-- ==== couldn't print body parts so we'll print entire body -->	
+						  <div class="Body" style="background-color:#ffffff">
+						  <!--#body-->
+						  </div>
+				<!--#endif-->
+
+			<!--#endif-->  
+<!--			      ==============END BODY OF PROBLEM===============      -->
+			<!--#if can="output_past_answer_button" can="output_email_instructor"-->
+				<div class="problemFooter">
+					<!--#if can="output_past_answer_button"-->
+						<!--#output_past_answer_button-->
+					<!--#endif-->
+					<!--#if can="output_email_instructor"-->
+						<!--#output_email_instructor-->
+					<!--#endif-->
+				</div>
+			<!--#endif-->
+		
+		<!--#if warnings="1"-->
+		
+		<hr/>
+		<div class="Warnings">
+			<!--#warnings-->
+		</div>
+		<!--#endif-->
+		
+		<!--#if can="message"-->
+			<div class="Message">
+				<!--#message-->
+			</div>
+		<!--#endif-->
+	
+	<hr class="for-broken-browsers"/>
+	<div id="footer">
+		<!-- <p id="last-modified">Page generated at <!--#timestamp--></p>
+		<div id="copyright">
+			WeBWorK &#169; 1996-2011 <a href="http://webwork.maa.org/">The WeBWorK Project</a>
+		</div> -->
+		<!--#footer-->
+	</div>
+	<div id="site-navigation">
+		<!--#if can="links"-->
+		<div class="info-box" id="fisheye">
+			<!--#links-->
+		</div>
+		<!--#endif-->
+		<!--#if can="siblings"-->
+			<!--#siblings-->
+		<!--#endif-->
+		<!--#if can="options"-->
+		<div class="info-box" id="fisheye">
+			<!--#options-->
+		</div>
+		<!--#endif-->
+	</div>
+
+</div><!--content-->
+</div> <!-- big-wrapper -->
+
+</body>
+</html>
diff --git a/conf/templates/moodle/system.template b/conf/templates/moodle/system.template
new file mode 100644
index 0000000000..9e268ac2c4
--- /dev/null
+++ b/conf/templates/moodle/system.template
@@ -0,0 +1,122 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!--
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/conf/templates/moodle/system.template,v 1.1 2006/06/26 23:23:35 dpvc 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/css/moodle.css"/>
+<title><!--#path style="text" text=" : " textonly="1"--></title>
+<!--#head-->
+</head>
+<body>
+<script src="<!--#url type="webwork" name="htdocs"-->/css/moodle.js"></script>
+<div id="fullPage">
+
+<div id="masthead" class="moodleIgnore">
+	<div id="loginstatus">
+		<!--#loginstatus-->
+	</div>
+	<div id="logo">
+		<img src="<!--#url type="webwork" name="htdocs"-->/images/webwork_rectangle.png" alt="WeBWorK" height="51" width="267" />
+	</div>
+</div>
+<hr class="for-broken-browsers"/>
+<div id="big-wrapper">
+	<div id="site-navigation">
+		<!--#if can="links"-->
+		<div class="moodleIgnore">
+		<div class="info-box" id="fisheye">
+			<h2>Main Menu</h2>
+			<!--#links-->
+		</div>
+		</div>
+		<!--#endif-->
+		<!--#if can="siblings"-->
+			<!--#siblings-->
+		<!--#endif-->
+		<!--#if can="options"-->
+		<div class="info-box" id="fisheye">
+			<h2>Display Options</h2>
+			<!--#options-->
+		</div>
+		<!--#endif-->
+	</div>
+	<div id="breadcrumbs" class="moodleIgnore">
+		<!--#path style="text" text=" &#x2192; "-->
+	</div>
+	<div id="content">
+		<!--#if can="info"-->
+		<!--<div id="page-info">-->
+			<!--<div class="info-box" id="fisheye">-->
+				<!--#info-->
+			<!--</div>-->
+		<!--</div>-->
+		<!--#endif-->
+		
+		<!--#if can="nav"-->
+		<div class="Nav">
+			<!--#nav style="images" imageprefix="/webwork2_files/images/nav" imagesuffix=".gif" separator="  "-->
+		</div>
+		<!--#endif-->
+		
+		<!--#if can="title"-->
+		<h1><!--#title--></h1>
+		<!--#endif-->
+		
+		<!--#if can="message"-->
+			<div class="Message">
+				<!--#message-->
+			</div>
+		<!--#endif-->
+
+		<!--#if can="body"-->
+		<div class="Body">
+			<!--#body-->
+		</div>
+		<!--#endif-->
+		
+		<!--#if warnings="1"-->
+		<hr>
+		<div class="Warnings">
+			<!--#warnings-->
+		</div>
+		<!--#endif-->
+		
+		<!--#if can="message"-->
+			<div class="Message">
+				<!--#message-->
+			</div>
+		<!--#endif-->
+
+	</div> <!-- content -->
+	<div class="moodleIgnore">
+	<hr class="for-broken-browsers"/>
+	<div id="footer">
+		<p id="last-modified">Page generated at <!--#timestamp--></p>
+		<div id="copyright">
+			WeBWorK &#169; 2000-2007 <a href="http://openwebwork.sf.net/">The WeBWorK Project</a>
+		</div>
+	</div>
+	</div>
+</div> <!-- big-wrapper -->
+<div style="clear:both"></div>
+</div> <!-- fullPage -->
+<script>ww.Init()</script>
+</body>
+</html>
diff --git a/conf/templates/system.template b/conf/templates/system.template
deleted file mode 100644
index 7d7c8687ae..0000000000
--- a/conf/templates/system.template
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html
-	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-	SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<!--
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
-# 
-# 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
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-# 
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
--->
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
- <head>
-  <title>WeBWorK - <!--#title--></title>
-  <style type="text/css"><!--
-   a:link { color: red }
-   a:active { color: white }
-   a:visited { color: silver }
-  --></style>
- </head>
- <body style="margin: 0px">
-  <table style="width: 100%; padding: 0px; margin: 0px" cellspacing="0">
-   <tr>
-    <td style="color: white; background-color: darkblue; padding: 0px; margin: 0px">
-     <img src="/webwork_files/images/webwork_square.png" height="64" width="66" />
-    </td>
-    <td style="color: white; background-color: darkblue; padding: 0px; margin: 0px">
-     <h1 style="text-align: center; font-size: 20pt">WeBWorK II</h1>
-     <!--#path style="image" image="webwork_files/images/right_arrow.png" text=" > "-->
-    </td>
-   </tr>
-   <tr>
-    <td style="white-space: nowrap; color: white; background-color: darkblue; width: 66px">
-     <div><!--#quicklinks--></div>
-     <div><!--#siblings--></div>
-    </td>
-    <td style="color: black; background-color: white; padding-left: 2em; padding-right: 2em">
-     <div style="text-align: center">
-      <!--#nav style="image" imagesuffix=".png"-->
-     </div>
-     <h1><!--#title--></h1>
-     <!--#body-->
-    </td>
-   </tr>
-  </table>
- </body>
diff --git a/conf/templates/test/system.template b/conf/templates/test/system.template
new file mode 100644
index 0000000000..e3d54e1fd4
--- /dev/null
+++ b/conf/templates/test/system.template
@@ -0,0 +1,99 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<!--
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/conf/templates/test/system.template,v 1.2 2006/01/25 23:13:49 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+-->
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
+<head>
+<title>WeBWorK Test Template</title>
+<style type="text/css">
+div.test_box { border: 1px solid black }
+</style>
+<!--#head-->
+</head>
+<body>
+
+<h1>help</h1>
+<div class="test_box">
+<!--#help-->
+</div>
+
+<h1>links</h1>
+<div class="test_box">
+<!--#links-->
+</div>
+
+<h1>siblings</h1>
+<div class="test_box">
+<!--#siblings-->
+</div>
+
+<h1>options</h1>
+<div class="test_box">
+<!--#options-->
+</div>
+
+<h1>path</h1>
+<div class="test_box">
+<!--#path style="text" text=" > "-->
+</div>
+
+<h1>loginstatus</h1>
+<div class="test_box">
+<!--#loginstatus-->
+</div>
+
+<h1>nav</h1>
+<div class="test_box">
+<!--#nav style="images" imageprefix="/webwork2_files/images/nav" imagesuffix=".gif" separator="  "-->
+</div>
+
+<h1>title</h1>
+<div class="test_box">
+<!--#title-->
+</div>
+
+<h1>message</h1>
+<p>used for addmessage/addgoodmessae/addbadmessage... displayed at top and bottom of page in ur.template.</p>
+<div class="test_box">
+<!--#message-->
+</div>
+
+<h1>body</h1>
+<div class="test_box">
+<!--#body-->
+</div>
+
+<h1>warnings</h1>
+<div class="test_box">
+<!--#warnings-->
+</div>
+
+<h1>info</h1>
+<div class="test_box">
+<!--#info-->
+</div>
+
+<h1>timestamp</h1>
+<div class="test_box">
+<!--#timestamp-->
+</div>
+
+</body>
+</html>
diff --git a/conf/templates/union/gateway.template b/conf/templates/union/gateway.template
new file mode 100644
index 0000000000..57c9d1b64a
--- /dev/null
+++ b/conf/templates/union/gateway.template
@@ -0,0 +1,279 @@
+<!DOCTYPE html
+	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<!--
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2006 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/conf/templates/ur/gateway.template,v 1.2 2006/01/25 23:13:49 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+-->
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
+<head>
+<title><!--#path style="text" text=" : " textonly="1"--></title>
+<!--#head-->
+<style type="text/css" media="all">@import "<!--#url type="webwork" name="stylesheet"-->";</style>
+
+<style type="text/css">
+/******************/
+/* gateway styles */
+/******************/
+
+.LoginStatus {position:absolute; right:0px; top:-.5em}
+
+div.gwMessage { background-color:#dddddd; color: black; }
+div.gwTiming { 
+	background-color:#EECCCC;
+	color: black; 
+	padding: .5em 2em;
+	float: right;
+}
+div.gwTiming form {margin:0px}
+div.gwWarning { background-color:#ffffdd; color: black; }
+
+span.resultsWithError {
+   background-color: #ffcccc;
+   color: black;
+   padding: 1px 2em;
+   margin-left: 1em;
+}
+span.resultsWithoutError {
+   background-color: #66ff99;
+   color: black;
+   padding: 1px 2em;
+   margin-left: 1em;
+}
+
+div.gwCorrect {
+   background-color: #66ff99;
+   color: black;
+   padding: 1px 2em;
+   margin-left: 1em;
+}
+div.gwIncorrect {
+   background-color: #ff9999;
+   color: black;
+   padding: 1px 2em;
+   margin-left: 1em;
+}
+
+div.gwProblem {
+	clear: both; 
+	background-color: white;
+	color: black;
+	padding: 1em 2em;
+	border-top-style: solid; border-bottom-style: solid;
+	border-width: 2px; border-color: #DDBBBB;
+}
+hr {display: none}
+.div.gwProblem hr {display:block}
+
+div.gwSoln {
+/*	background-color: #e0e0ff; */
+	background-color: transparent;
+	color: black;
+/* 	padding: 2px; */,
+/* 	border: dashed black 1px; */
+}
+div.gwSoln b { color: navy; }
+
+p.gwPreview { 
+	font-size: smaller;
+	text-align: right; 
+	margin-top: 0px;
+	margin-bottom: 0px;
+}
+
+table.gwAttemptResults {
+	border-width: 0px;
+}
+table.gwAttemptResults td.label { 
+	font-weight: bold; 
+	background-color: transparent;
+	color: navy;
+}
+table.gwAttemptResults td.output {
+        padding: 2px;
+	border: solid black 1px;
+	background-color: #eeeeee;
+}
+
+</style>
+<script language="javascript" type="text/javascript">
+function jumpTo(ref) {  // scrolling javascript function
+    if ( ref ) {
+        var pn = ref - 1; // we start anchors at 1, not zero
+        if ( navigator.appName == "Netscape" && 
+             parseFloat(navigator.appVersion) < 5 ) {
+            var xpos = document.anchors[pn].x;
+            var ypos = document.anchors[pn].y;
+        } else {
+            var xpos = document.anchors[pn].offsetLeft;
+            var ypos = document.anchors[pn].offsetTop;
+        }
+        if ( window.scrollTo == null ) { // cover for anyone
+            window.scroll(xpos,ypos);    //   lacking js1.2
+        } else {
+            window.scrollTo(xpos,ypos);
+        }
+    }
+    return false; // prevent link from being followed
+}
+
+// timer for gateway 
+var theTime = -1;      // -1 before we've initialized
+var alerted = -1;      // -1 = no alert set; 1 = 1st alert set
+                       // this shouldn't really be needed
+
+function runtimer() {
+// aesthetically this is displeasing: we're assuming that the 
+// ContentGenerator will put the appropriate form elements in that
+// page for us to manipulate.  even with error checking, it seems sort
+// of odd.
+    if ( document.gwtimer == null ) {  // no timer
+        return;
+    } else {
+        var tm = document.gwtimer.gwtime;
+        var st = document.gwtimer.gwpagetimeleft.value;
+
+        if ( st == 0 ) {                  // no time limit
+            return;
+        } else {
+            if ( theTime == -1 ) {
+                theTime = st;
+                tm.value = toMinSec(theTime);
+                setTimeout("runtimer()", 1000);  // 1000 ms = 1 sec
+            } else if ( theTime == 0 && alerted != 3 ) {
+	        alert("* You are out of time! *");
+		alerted = 3;
+	    } else if ( alerted != 3 ) {
+	        theTime--;
+                tm.value = toMinSec(theTime);
+                setTimeout("runtimer()", 1000);  // 1000 ms = 1 sec
+		if ( theTime == 35 && alerted != 2 ) { // time is in seconds
+		    alert("* You have only about 30 seconds to complete " +
+		          "this assignment.  Press Grade very soon! *\n" +
+			  "* The timer stops while this alert box is open. *");
+		    alerted = 2;
+		    theTime -= 5;
+                } else if ( theTime == 75 && alerted != 1) {
+		    alert("* You have only about a minute left " +
+		          "to complete this assignment! *\n" +
+			  "* The timer stops while this alert box is open. *");
+                    alerted = 1;
+		    theTime -= 5;
+                }
+            }
+        }
+    }
+}
+function toMinSec(t) {
+// convert to min:sec
+    mn = Math.floor(t/60);
+    sc = t - 60*mn;
+    if ( mn < 10 && mn > -1 ) {
+        mn = "0" + mn;
+    }
+    if ( sc < 10 ) {
+        sc = "0" + sc;
+    }
+    return mn + ":" + sc;
+}
+</script>
+</head>
+<body onload="runtimer();">
+<table width="100%" cellpadding="10" cellspacing="0" border="0">
+	<tr valign="top">
+<!-- removed left sidebar -->
+		<!--#if can="info"-->
+		<td class="TopPanel" colspan="2">
+		<!--#else-->
+		<td class="TopPanel" >
+		<!--#endif-->
+		    <div style="position:relative; width:100%;">
+				<!--#if can="path"-->
+				<span class="Path">
+					<!--#path style="text" image="/webwork2_files/images/right_arrow.png" text=" > "-->
+				</span>
+				<!--#endif-->
+				
+				<!--#if loggedin="1"-->
+					<!--#if can="loginstatus"-->
+					
+					<span class="LoginStatus">			
+						
+						<!--#loginstatus-->
+					</span>
+					<!--#endif-->
+				<!--#endif-->
+			</div>
+		</td>
+	</tr>
+	<tr valign="top">
+		<!--#if warnings="1"-->
+		<td class="ContentPanelError" bgcolor="#ffcccc">
+		<!--#else-->
+		<td class="ContentPanel" bgcolor="#ffffff">
+		<!--#endif-->	
+<!-- removed nav button to go up -->
+			<!--#if can="title"-->
+			<div class="Title">
+				<!--#title-->
+			</div>
+			<!--#endif-->
+			<!--#if can="message"-->
+				<div class="Message">
+					<!--#message-->
+				</div>
+			<!--#endif-->
+
+			<!--#if can="submiterror"-->
+				<div class="SubmitError">
+					<!--#submiterror-->
+				</div>
+			<!--#endif-->
+			<!--#if can="body"-->
+			<div class="Body">
+				<!--#body-->
+			</div>
+			<!--#endif-->
+			<!--#if warnings="1"-->
+			<hr>
+			<div class="Warnings">
+				<!--#warnings-->
+			</div>
+			<!--#endif-->
+			<!--#if can="message"-->
+				<div class="Message">
+					<!--#message-->
+				</div>
+			<!--#endif-->
+		</td>
+		<!--#if can="info"-->
+		<td class="InfoPanel">
+			<div class="Info">
+				<!--#info-->
+			</div>
+		</td>
+		<!--#endif-->
+ 	</tr>
+ 	<tr>
+ 	    <td class = "Timestamp", colspan=3>
+ 	        Updated: <!--#timestamp-->
+ 	    </td>
+ 	</tr>
+</table>
+</body>
+</html>
diff --git a/conf/templates/union/system.template b/conf/templates/union/system.template
new file mode 100644
index 0000000000..25e214f11c
--- /dev/null
+++ b/conf/templates/union/system.template
@@ -0,0 +1,163 @@
+<!DOCTYPE html
+	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<!--
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/conf/templates/union/system.template,v 1.1 2007/08/29 12:15:16 dpvc 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+-->
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
+<head>
+<title><!--#path style="text" text=" : " textonly="1"--></title>
+<!--#head-->
+<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/css/union.css"/>
+</head>
+<body bgcolor="white" onload="if (typeof(initializeWWquestion) == 'function') {initializeWWquestion()}">
+<table width="100%" cellpadding="10" cellspacing="0" border="0">
+  <tr valign="top">
+    <td align="left" valign="top" rowspan="2" class="LeftPanel">
+      <a href="http://webwork.math.rochester.edu">
+        <img src="/webwork2_files/images/webwork_square.gif" alt="WeBWorK" height="64" width="66" border="0" /><!
+      ></a>
+      <br />
+
+      <!--#if loggedin="1"-->
+	<!--#if can="links"-->
+	  <hr />
+	  <div class="Links">
+	    <!--#links-->
+	  </div>
+	  <!--#if can="siblings"-->
+	    <hr />
+	  <!--#endif-->
+	<!--#endif-->
+	<div class="Siblings">
+	  <!--#siblings-->
+	</div>
+	<!--#if can="options"-->
+	  <div class="Options">
+	    <!--#options-->
+	  </div>
+	<!--#endif-->
+      <!--#endif-->
+    </td>
+    <!--#if can="info"-->
+      <td class="TopPanel" colspan="2">
+    <!--#else-->
+      <td class="TopPanel">
+    <!--#endif-->
+        <table border="0" cellpadding="0" cellspacing="0" width="100%">
+	<tr>
+
+          <!--#if can="path"-->
+	    <td align="left" class="TopPanel" nowrap>
+            <span class="Path">
+	      <!--#path style="text" image="/webwork2_files/images/right_arrow.png" text=" > "-->
+	    </span>
+	    </td>
+          <!--#endif-->
+
+	  <!--#if can="time_left"-->
+	    <td align="center" class="TopPanel" width="100%" nowrap>
+	    <span class="TimeLeft">
+	      <!--#time_left-->
+	    </span>
+	    </td>
+	  <!--#endif-->
+
+          <!--#if loggedin="1"-->
+	    <!--#if can="loginstatus"-->
+	      <td align="right" class="TopPanel" nowrap>
+	      <span class="LoginStatus">	
+	        <!--#loginstatus-->
+	      </span>
+	      </td>
+	    <!--#endif-->
+          <!--#endif-->
+
+        </tr>
+	</table>
+      </td>
+  </tr>
+
+  <tr valign="top">
+    <!--#if warnings="1"-->
+      <td class="ContentPanelError" bgcolor="#ffcccc">
+     <!--#else-->
+      <td class="ContentPanel" bgcolor="#ffffff">
+    <!--#endif-->	
+	<!--#if can="nav"-->
+	  <div class="Nav">
+	    <!--#nav style="images" imageprefix="/webwork2_files/images/nav" imagesuffix=".gif" separator="  "-->
+	  </div>
+	<!--#endif-->
+	<!--#if can="title"-->
+	  <div class="Title">
+	    <!--#title-->
+	  </div>
+	<!--#endif-->
+	<!--#if can="message"-->
+	  <div class="Message">
+	    <!--#message-->
+	  </div>
+	<!--#endif-->
+
+	<!--#if can="submiterror"-->
+	  <div class="SubmitError">
+	    <!--#submiterror-->
+	  </div>
+	<!--#endif-->
+	<!--#if can="post_header_text"-->
+		<!--#post_header_text-->
+		<hr style="clear:both"/>
+	<!--#endif-->
+	<!--#if can="body"-->
+	  <div class="Body">
+	    <!--#body-->
+	  </div>
+	<!--#endif-->
+	<!--#if warnings="1"-->
+	  <hr>
+	  <div class="Warnings">
+	    <!--#warnings-->
+	  </div>
+	<!--#endif-->
+	<!--#if can="message"-->
+	  <div class="Message">
+	    <!--#message-->
+	  </div>
+	<!--#endif-->
+      </td>
+
+    <!--#if can="info"-->
+      <td class="InfoPanel">
+	<div class="Info">
+	  <!--#info-->
+	</div>
+      </td>
+    <!--#endif-->
+  </tr>
+
+  <tr>
+    <td class="Timestamp", colspan="3">
+      Updated: <!--#timestamp-->
+    </td>
+  </tr>
+
+</table>
+</body>
+</html>
diff --git a/conf/templates/union/union.css b/conf/templates/union/union.css
new file mode 100644
index 0000000000..6f9512ef53
--- /dev/null
+++ b/conf/templates/union/union.css
@@ -0,0 +1,190 @@
+/******************************************************************************/
+/* union.css classes: These classes appear in ur.template and are NOT
+ * emitted by WeBWorK code. They need only appear in this template. */
+
+body { margin: 0px; }
+
+/* left table cell, contains logo and menus */
+td.LeftPanel { background-color: #660033; color: white; white-space: nowrap; width: 8em; zoom: 1; }
+td.LeftPanel ul { zoom: 1; margin-left: 0em}
+td.LeftPanel ul ul ul li { margin-left: .5em}
+td.LeftPanel a:link,
+td.LeftPanel a:visited { color: #EEBBBB; }
+
+div.Logo {  }
+div.Links { font-size: small; }
+div.Links ul { list-style: none; margin-left: 0; padding-left: 0; }
+div.Links ul ul { list-style: none; margin-left: 0.5em; padding-left: 0; }
+div.Siblings { font-size: small; }
+div.Siblings ul { list-style: none; margin-left: 0; padding-left: 0; }
+div.Siblings ul ul { list-style: none; margin-left: 0.5em; padding-left: 0; }
+div.Options { font-size: small; }
+
+/* top table cell, contains login message and path */
+td.TopPanel { background-color: #660033; color: white; height: 1; }
+td.TopPanel a:link,
+td.TopPanel a:visited { color: #EEBBBB; }
+
+.Path {  }
+
+.LoginStatus { text-align: right; font-size: small;}
+
+.TimeLeft { font-size: small; }
+.LittleTimeLeft { font-size: small; color: #FF7777; font-weight: bold; margin: 3px}
+.TimeLeftReload { font-size: small; color: #EEBBBB; font-style: italic; }
+td.Timestamp { text-align: left;  font-size: small; font-style: italic; }
+
+/* main content panel, contains body */
+td.ContentPanel { background-color: white; color: black; }
+td.ContentPanel a:link,
+td.ContentPanel a:visited { color: blue; }
+td.ContentPanel a:active { color: red; }
+
+td.SetMakerPanel { background-color: #DDDDDD; color: black; width: 50%; padding: 3px; }
+
+div.Nav {  }
+div.Title { font-size: 16pt; padding-bottom: 5px; }
+div.SubmitError { color: red; font-style: italic; }
+div.Message { font-style: italic; }
+div.Body {  }
+div.Warnings {  }
+
+/* contains info */
+td.InfoPanel { background-color: #DDDDDD; color: black; width: 40%; }
+td.InfoPanel a:link,
+td.InfoPanel a:visited { color: blue; }
+td.InfoPanel a:active { color: red; }
+div.Info {  }
+
+/******************************************************************************/
+/* WeBWorK classes: These classes are emitted by WeBWorK code and should
+ * appear in ANY WeBWorK template. */
+
+/* tables used for laying out form fields shouldn't have a border */
+table.FormLayout { border: 0; }
+table.FormLayout tr { vertical-align: top; }
+table.FormLayout th.LeftHeader { text-align: right; white-space: nowrap; }
+table.FormLayout tr.ButtonRow { text-align: left; }
+table.FormLayout tr.ButtonRowCenter { text-align: center; }
+
+
+/* for problems which are rendered by themselves, e.g., by Set Maker */
+div.RenderSolo { background-color: #E0E0E0; color: black; padding: 5px; }
+div.AuthorComment { background-color: #00E0E0; color: black; }
+
+/* minimal style for lists of links (generated by the links escape) */
+/* ul.LinksMenu    { list-style: none; margin: 0 0 0 0.5em; padding: 0; }*/
+/* ul.LinksMenu ul { list-style: none; margin: 0 0 0 0.5em; padding: 0; }*/
+
+a.HelpLink { border: 0px; }
+a.HelpLink img { vertical-align: -5px; margin: 1px 2px; border: 0px; }
+
+/* background colors for success and failure messages */
+div.WarningMessage { background-color: #ffcccc; padding: 3px 3px 3px 3px; }
+div.ResultsWithoutError {
+   margin-right: 6px; margin-left: 6px;
+   border-color: #009900; border-style: solid; border-width: 1px;
+   text-align: center; font-weight: bold; font-style: italic;
+   margin-right: 6px; margin-left: 6px;
+   background-color: #99ffAA;
+   padding: 3px 3px 3px 10px;
+} /* light green */
+div.ResultsWithError {
+   margin-right: 6px; margin-left: 6px;
+   border-color: #CC0000; border-style: solid; border-width: 1px;
+   text-align: center; font-weight: bold; font-style: italic;
+   background-color: #ffcccc;
+   padding: 3px 3px 3px 10px;
+} /* light red */
+div.ResultsAlert {
+   margin-right: 6px; margin-left: 6px;
+   border-color: #CCCC00; border-style: solid; border-width: 1px;
+   text-align: center; font-weight: bold; font-style: italic;
+   background-color: #ffffcc;
+   padding: 3px 3px 3px 10px;
+} /* light yellow */
+
+/* styles used by WeBWorK::HTML::ScrollingRecordList */
+div.ScrollingRecordList { padding: 1em; white-space: nowrap; border: thin solid gray; }
+div.ScrollingRecordList select.ScrollingRecordList { width: 99%; }
+
+/* wraps the View Options form (generated by &optionsMacro) */
+/* FIXME: can't this style information just go in div.Options above? */
+div.viewOptions  { border: thin groove; background-color: #882848;
+		   line-height: 75%; margin: .5ex; margin-top: 2ex;
+		   padding: 1ex; align: left; }
+
+.viewChoices { margin: 5px 0px 5px 5px; }
+.viewChoices input {margin-top: 0px}
+
+
+/* messages, attempt results, answer previews, etc. go in this DIV */
+/* this used to be "float:left", but that was suspected of causing MSIE peekaboo bug */
+
+div.problemHeader {}
+
+/* styles for the attemptResults table */
+table.attemptResults {
+	border-style: outset; 
+	border-width: 1px; 
+#	margin: 0px auto 10pt auto;
+	margin: 0px 10pt;
+	border-spacing: 1px;
+}
+table.attemptResults td,
+table.attemptResults th {
+	border-style: inset; 
+	border-width: 1px; 
+	text-align: center;
+	padding: 2px 5px;
+	background-color: #DDDDDD;
+}
+/* override above settings in tables used to display ans_array results */
+table.attemptResults td td,
+table.attemptResults td th,
+table.ArrayLayout td {
+	border-style: none; 
+	border-width: 0px; 
+	padding: 0px;
+}
+table.attemptResults td.Message { text-align: left; width: auto; }
+.attemptResultsSummary { font-style:italic; }
+
+.parsehilight { background-color:yellow; }
+
+/* the problem TEXT itself does in this box */
+div.problem {
+  clear: both; padding: 0 5px; color: black;
+  border-top-style: solid; border-bottom-style: solid;
+  border-width: 2px; border-color: #DDBBBB;
+}
+
+/* jsMath emits this class when appropriate math fonts aren't available */
+div.NoFontMessage {
+	padding: 10;
+	border-style: solid;
+	border-width:3px;
+	border-color: #DD0000;
+	background-color: #FFF8F8;
+	width: 75%;
+	text-align: left;
+	margin: 10px auto 10px 12%;
+}
+										     
+/* text colors for visible and hidden sets */
+font.visible   { font-style: normal; font-weight: normal; color: #000000; } /* black */
+font.hidden { font-style: italic; font-weight: normal; color: #aaaaaa; } /* light grey */
+
+/* styles used when editing a temporary file */
+.temporaryFile {
+   margin-right: 6px; margin-left: 6px;
+   border-color: #AA6600; border-style: solid; border-width: 1px;
+   text-align: center; font-style: italic;
+   background-color: #FFBB88;
+   padding: 3px 3px 3px 10px;
+}
+
+/* text colors for Auditing, Current, and Dropped students */
+.Audit { font-style: normal; color: purple; }
+.Enrolled { font-weight: normal; color: black; }
+.Drop { font-style: italic; color: grey; }
diff --git a/conf/templates/ur.template b/conf/templates/ur.template
deleted file mode 100644
index 1b4d32af8b..0000000000
--- a/conf/templates/ur.template
+++ /dev/null
@@ -1,152 +0,0 @@
-<!DOCTYPE html
-	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-	SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<!--
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader: webwork-modperl/conf/templates/ur.template,v 1.5 2003/12/09 01:12:29 sh002i 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
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-# 
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
--->
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
- <head>
-  <title>WeBWorK - <!--#title--></title>
-  <!--#head-->
-
-  <style type="text/css">
-   <!--
-	body  {
-		margin: 0px;
-	}
-	table.attemptResults {
-		border-style: outset; 
-		border-width: 1px; 
-		margin: 0px 10pt; 
-		border-spacing: 1px;
-	}
-	table.attemptResults td,table.attemptResults th {
-		border-style: inset; 
-		border-width: 1px; 
-		text-align: center; 
-		width: 15ex
-	}
-	div.problemHeader {
-   		float: left
-	}
-	div.problem {
-		clear: both; 
-	}
-	p.emphasis {
-		font-style:italic;
-	}
-	.edgebox {
-		background-color: #123567;
-		color: white;
-	}
-	.edgebox a:link,a:visited {
-		color: #FF9933;
-	}
-   //-->
-  </style>
- </head>
- <body>
-  <table width="100%" cellpadding="10" cellspacing="0" border="0">
-   <tr valign="top">
-    <td align="left" rowspan="2" class="edgebox">
-     <img src="/webwork2_files/images/webwork_square.gif" height="64"
-width="66" /><br />
-     <hr />
-     <div>
-      <small>
-       <a href="http://webwork3.math.rochester.edu/bugzilla/enter_bug.cgi?product=WeBWorK%20mod_perl" target = "_bugzilla"> Report bugs</a>
-      </small>
-     </div>
-<!--#if loggedin="1"-->
-     <hr />
-     <div>
-      <small>
-       <!--#links-->
-      </small>
-     </div>
-<!--#if can="links"-->
-<!--#if can="siblings"-->
-     <hr />
-<!--#endif-->
-<!--#endif-->
-     <div>
-      <small>
-       <!--#siblings-->
-      </small>
-     </div>
-<!--#if can="options"-->
-	 <div>
-	  <small>
-	   <!--#options-->
-	  </small>
-<!--#endif-->
-	 </div>
-<!--#endif-->
-    </td>
-    <!--#if can="path"-->
-    <td valign="bottom" class="edgebox">
-     <!--#path style="text" image="/webwork2_files/images/right_arrow.png" text=" > "-->
-    </td>
-    <!--#endif-->
-    <!--#if loggedin="1"-->
-     <td valign="bottom" align="right" class="edgebox">
-     <!--#loginstatus-->
-    </td>
-    <!--#endif-->
-   </tr>
-   <tr valign="top">
-<!--#if warnings="1"-->
-    <td 
-    <!--#if loggedin="1"-->
-    colspan="2" 
-    <!--#endif-->
-    bgcolor="#ffcccc">
-<!--#else-->
-    <td 
-    <!--#if loggedin="1"-->
-    colspan="2"
-    <!--#endif-->
-    bgcolor="#ffffff">
-<!--#endif-->
-     <div align="left">
-      <!--#nav style="images" imageprefix="/webwork2_files/images/nav" imagesuffix=".gif" separator="  "-->
-     </div>
-     <table width="100%" cellpadding="10" cellspacing="0" border="0">
-      <tr valign="top">
-       <td>
-        <h1 style="font-size: 14pt"><!--#title--></h1>
-	<!--#if submiterror="1"-->
-	 <p><em style="color: red"><!--#submiterror--></em></p>
-	<!--#endif-->
-        <!--#body-->
-       </td>
-       <td>
-        <!--#info-->
-       </td>
-      </tr>
-     </table>
-     <!--#if warnings="1"-->
-      <hr>
-      <div class="warnings"><!--#warnings--></div>
-     <!--#endif-->
-    </td>
-   </tr>
-  </table>
- </body>
-</html>
diff --git a/conf/templates/ur/gateway.template b/conf/templates/ur/gateway.template
new file mode 100644
index 0000000000..2ab3899790
--- /dev/null
+++ b/conf/templates/ur/gateway.template
@@ -0,0 +1,367 @@
+<!DOCTYPE html
+	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<!--
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/conf/templates/ur/gateway.template,v 1.2 2006/01/25 23:13:49 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+-->
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
+<head>
+<title><!--#path style="text" text=" : " textonly="1"--></title>
+<!--#head-->
+<style type="text/css">
+
+/********************/
+/* template classes */
+/********************/
+
+body { margin: 0px; }
+
+/* left table cell, contains logo and menus */
+td.LeftPanel { background-color: #003366; color: white; white-space: nowrap; width: 1em; }
+td.LeftPanel a:link,
+td.LeftPanel a:visited { color: #FF9933; }
+
+div.Logo {  }
+div.Links { font-size: small; }
+div.Siblings { font-size: small; }
+div.Options { font-size: small; }
+
+/* top table cell, contains login message and path */
+td.TopPanel { background-color: #003366; color: white; height: 1; }
+td.TopPanel a:link,
+td.TopPanel a:visited { color: #FF9933; }
+
+
+*.LoginStatus { text-align: right; font-size: small; position:absolute; right: 0; }
+td.Timestamp   { text-align: left;  font-size: small; font-style: italic; }
+
+*.Path {  }
+
+/* main content panel, contains body */
+td.ContentPanel { background-color: white; color: black; }
+td.ContentPanel a:link,
+td.ContentPanel a:visited { color: blue; }
+td.ContentPanel a:active { color: red; }
+
+/* contains info */
+td.InfoPanel { background-color: #DDDDDD; color: black; width: 15% }
+td.InfoPanel a:link,
+td.InfoPanel a:visited { color: blue; }
+td.InfoPanel a:active { color: red; }
+
+div.Info {  }
+div.Nav {  }
+div.Title { font-size: 16pt; }
+div.SubmitError { color: red; font-style: italic; }
+div.Message { font-style: italic; }
+div.Body {  }
+div.Warnings {  }
+
+/* background colors for success and failure messages */
+div.ResultsWithoutError { background-color: #66ff99 } /* light green */
+div.ResultsWithError    { background-color: #ffcccc } /* light red */
+
+/* text colors for visible and hidden sets */
+font.visible   { font-style: normal; font-weight: bold;   color: #000000; } /* black */
+font.hidden { font-style: italic; font-weight: normal; color: #aaaaaa; } /* light grey */
+
+/* text colors for Auditing, Current, and Dropped students */
+div.Audit	{ font-style: normal;	color: black; }
+div.Enrolled	{ font-weight: bold;	color: black; }
+div.Drop	{ font-style: italic;	color: grey; }
+
+/*******************/
+/* general classes */
+/*******************/
+
+p.emphasis { font-style:italic; }
+
+/************************/
+/* new standard classes */
+/************************/
+
+/* tables used for laying out form fields shouldn't have a border */
+table.FormLayout { border: 0; }
+table.FormLayout tr { vertical-align: top; }
+table.FormLayout th.LeftHeader { text-align: right; white-space: nowrap; }
+table.FormLayout tr.ButtonRow { text-align: left; }
+table.FormLayout tr.ButtonRowCenter { text-align: center; }
+
+/* for problems which are rendered by themselves, e.g., by Set Maker */
+div.RenderSolo { background-color: #E0E0E0; color: black; }
+
+/* minimal style for lists of links (generated by the links escape) */
+ul.LinksMenu { list-style: none; margin-left: 0; padding-left: 0; }
+ul.LinksMenu ul { list-style: none; margin-left: 0.5em; padding-left: 0; }
+
+/*************************/
+/* WeBWorK::HTML widgets */
+/*************************/
+
+/* WeBWorK::HTML::ScrollingRecordList */
+div.ScrollingRecordList { padding: 1em; white-space: nowrap; border: thin solid gray; }
+div.ScrollingRecordList select.ScrollingRecordList { width: 99%; }
+
+/*************************************************************************/
+/* classes used in Problem.pm (replace these with new standard classes?) */
+/*************************************************************************/
+
+table.attemptResults {
+	border-style: outset; 
+	border-width: 1px; 
+	margin: 0px 10pt; 
+	border-spacing: 1px;
+}
+table.attemptResults td,
+table.attemptResults th {
+	border-style: inset; 
+	border-width: 1px; 
+	text-align: center; 
+	width: 15ex;
+	background-color: #DDDDDD;
+}
+div.problemHeader { float: left; }
+div.problem { clear: both; background-color: #E0E0E0; color: black; }
+.parsehilight { background-color:yellow; }
+
+</style>
+
+<style type="text/css">
+/******************/
+/* gateway styles */
+/******************/
+
+div.gwMessage { background-color:#dddddd; color: black; }
+div.gwTiming { 
+	background-color:#ddddff; 
+	color: black; 
+	margin-top: 10px;
+	margin-bottom: 0px;
+}
+div.gwWarning { background-color:#ffffdd; color: black; }
+
+span.resultsWithError { background-color: #ffcccc; color: black; }
+span.resultsWithoutError { background-color: #66ff99; color: black; }
+div.gwCorrect { background-color: #66ff99; color: black; }
+div.gwIncorrect { background-color: #ff9999; color: black; }
+
+div.gwProblem {
+	clear: both; 
+	background-color: #E0E0E0; 
+	color: black;
+	padding: 3px;
+	border: solid black 1px;
+}
+div.gwSoln {
+/*	background-color: #e0e0ff; */
+	background-color: transparent;
+	color: black;
+/* 	padding: 2px; */,
+/* 	border: dashed black 1px; */
+}
+div.gwSoln b { color: navy; }
+
+p.gwPreview { 
+	font-size: smaller;
+	text-align: right; 
+	margin-top: 0px;
+	margin-bottom: 0px;
+}
+
+table.gwAttemptResults {
+	border-width: 0px;
+}
+table.gwAttemptResults td.label { 
+	font-weight: bold; 
+	background-color: transparent;
+	color: navy;
+}
+table.gwAttemptResults td.output {
+        padding: 2px;
+	border: solid black 1px;
+	background-color: #eeeeee;
+}
+
+</style>
+<script language="javascript" type="text/javascript">
+function jumpTo(ref) {  // scrolling javascript function
+    if ( ref ) {
+        var pn = ref - 1; // we start anchors at 1, not zero
+        if ( navigator.appName == "Netscape" && 
+             parseFloat(navigator.appVersion) < 5 ) {
+            var xpos = document.anchors[pn].x;
+            var ypos = document.anchors[pn].y;
+        } else {
+            var xpos = document.anchors[pn].offsetLeft;
+            var ypos = document.anchors[pn].offsetTop;
+        }
+        if ( window.scrollTo == null ) { // cover for anyone
+            window.scroll(xpos,ypos);    //   lacking js1.2
+        } else {
+            window.scrollTo(xpos,ypos);
+        }
+    }
+    return false; // prevent link from being followed
+}
+
+// timer for gateway 
+var theTime = -1;      // -1 before we've initialized
+var alerted = -1;      // -1 = no alert set; 1 = 1st alert set
+                       // this shouldn't really be needed
+
+function runtimer() {
+// aesthetically this is displeasing: we're assuming that the 
+// ContentGenerator will put the appropriate form elements in that
+// page for us to manipulate.  even with error checking, it seems sort
+// of odd.
+    if ( document.gwtimer == null ) {  // no timer
+        return;
+    } else {
+        var tm = document.gwtimer.gwtime;
+        var st = document.gwtimer.gwpagetimeleft.value;
+
+        if ( st == 0 ) {                  // no time limit
+            return;
+        } else {
+            if ( theTime == -1 ) {
+                theTime = st;
+                tm.value = toMinSec(theTime);
+                setTimeout("runtimer()", 1000);  // 1000 ms = 1 sec
+            } else if ( theTime == 0 && alerted != 3 ) {
+	        alert("* You are out of time! *");
+		alerted = 3;
+	    } else if ( alerted != 3 ) {
+	        theTime--;
+                tm.value = toMinSec(theTime);
+                setTimeout("runtimer()", 1000);  // 1000 ms = 1 sec
+		if ( theTime == 35 && alerted != 2 ) { // time is in seconds
+		    alert("* You have only about 30 seconds to complete " +
+		          "this assignment.  Press Grade very soon! *\n" +
+			  "* The timer stops while this alert box is open. *");
+		    alerted = 2;
+		    theTime -= 5;
+                } else if ( theTime == 75 && alerted != 1) {
+		    alert("* You have only about a minute left " +
+		          "to complete this assignment! *\n" +
+			  "* The timer stops while this alert box is open. *");
+                    alerted = 1;
+		    theTime -= 5;
+                }
+            }
+        }
+    }
+}
+function toMinSec(t) {
+// convert to min:sec
+    mn = Math.floor(t/60);
+    sc = t - 60*mn;
+    if ( mn < 10 && mn > -1 ) {
+        mn = "0" + mn;
+    }
+    if ( sc < 10 ) {
+        sc = "0" + sc;
+    }
+    return mn + ":" + sc;
+}
+</script>
+</head>
+<body onload="runtimer();">
+<table width="100%" cellpadding="10" cellspacing="0" border="0">
+	<tr valign="top">
+<!-- removed left sidebar -->
+		<!--#if can="info"-->
+		<td class="TopPanel" colspan="2">
+		<!--#else-->
+		<td class="TopPanel" >
+		<!--#endif-->
+		    <div style="position:relative; width:100%;">
+				<!--#if can="path"-->
+				<span class="Path">
+					<!--#path style="text" image="/webwork2_files/images/right_arrow.png" text=" > "-->
+				</span>
+				<!--#endif-->
+				
+				<!--#if loggedin="1"-->
+					<!--#if can="loginstatus"-->
+					
+					<span class="LoginStatus">			
+						
+						<!--#loginstatus-->
+					</span>
+					<!--#endif-->
+				<!--#endif-->
+			</div>
+		</td>
+	</tr>
+	<tr valign="top">
+		<!--#if warnings="1"-->
+		<td class="ContentPanelError" bgcolor="#ffcccc">
+		<!--#else-->
+		<td class="ContentPanel" bgcolor="#ffffff">
+		<!--#endif-->	
+<!-- removed nav button to go up -->
+			<!--#if can="title"-->
+			<div class="Title">
+				<!--#title-->
+			</div>
+			<!--#endif-->
+			<!--#if can="message"-->
+				<div class="Message">
+					<!--#message-->
+				</div>
+			<!--#endif-->
+
+			<!--#if can="submiterror"-->
+				<div class="SubmitError">
+					<!--#submiterror-->
+				</div>
+			<!--#endif-->
+			<!--#if can="body"-->
+			<div class="Body">
+				<!--#body-->
+			</div>
+			<!--#endif-->
+			<!--#if warnings="1"-->
+			<hr>
+			<div class="Warnings">
+				<!--#warnings-->
+			</div>
+			<!--#endif-->
+			<!--#if can="message"-->
+				<div class="Message">
+					<!--#message-->
+				</div>
+			<!--#endif-->
+		</td>
+		<!--#if can="info"-->
+		<td class="InfoPanel">
+			<div class="Info">
+				<!--#info-->
+			</div>
+		</td>
+		<!--#endif-->
+ 	</tr>
+ 	<tr>
+ 	    <td class = "Timestamp", colspan=3>
+ 	        Updated: <!--#timestamp-->
+ 	    </td>
+ 	</tr>
+</table>
+</body>
+</html>
diff --git a/conf/templates/ur/system.template b/conf/templates/ur/system.template
new file mode 100644
index 0000000000..a95b2d78e9
--- /dev/null
+++ b/conf/templates/ur/system.template
@@ -0,0 +1,148 @@
+<!DOCTYPE html
+	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<!--
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/conf/templates/ur/system.template,v 1.4 2007/08/13 22:59:52 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+-->
+
+
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
+<head>
+<title><!--#path style="text" text=" : " textonly="1"--></title>
+<!--#head-->
+<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/css/ur.css"/>
+</head>
+<body bgcolor="white" onload="if (typeof(initializeWWquestion) == 'function') {initializeWWquestion()}">
+<table width="100%" cellpadding="10" cellspacing="0" border="0">
+	<tr valign="top">
+		<td align="left" valign="top" rowspan="2" class="LeftPanel">
+                     <a href="http://webwork.math.rochester.edu">
+			<img src="/webwork2_files/images/webwork_square.gif" alt="WeBWorK" height="64" width="66" />
+                     </a>
+			<span style="position:relative;top: -44px; right: -10px">
+				<!--#help--> 
+			</span>
+			<br />
+			
+			<!--
+			<hr />
+			<div class="Logo">				
+				<a href="http://webwork3.math.rochester.edu/bugzilla/enter_bug.cgi?product=WeBWorK%20mod_perl" target="bugzillaPage">Report bugs</a>
+			</div>
+			-->
+			<!--#if loggedin="1"-->
+			<hr />
+			<div class="Links">
+				<!--#links-->
+			</div>
+			<!--#if can="links"-->
+			<!--#if can="siblings"-->
+			<hr />
+			<!--#endif-->
+			<!--#endif-->
+			<div class="Siblings">
+				<!--#siblings-->
+			</div>
+			<!--#if can="options"-->
+			<div class="Options">
+				<!--#options-->
+			</div>
+			<!--#endif-->
+			<!--#endif-->
+		</td>
+		<!--#if can="info"-->
+		<td class="TopPanel" colspan="2">
+		<!--#else-->
+		<td class="TopPanel" >
+		<!--#endif-->
+			<table cellpadding="0" cellspacing="0" border="0" width="100%">
+				<tr valign="top">
+					<td class="TopPanel">
+						<!--#if can="path"-->
+						<span class="Path"><!--#path style="text" image="/webwork2_files/images/right_arrow.png" text=" > "--></span>
+						<!--#endif-->
+					</td>
+					<td class="TopPanel" align="right" nowrap>
+						<!--#if can="loginstatus"-->
+						<span class="LoginStatus"><!--#loginstatus--></span>
+						<!--#endif-->
+					</td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+	<tr valign="top">
+		<!--#if warnings="1"-->
+		<td class="ContentPanelError" bgcolor="#ffcccc">
+		<!--#else-->
+		<td class="ContentPanel" bgcolor="#ffffff">
+		<!--#endif-->	
+			<!--#if can="nav"-->
+			<div class="Nav">
+				<!--#nav style="images" imageprefix="/webwork2_files/images/nav" imagesuffix=".gif" separator="  "-->
+			</div>
+			<!--#endif-->
+			<!--#if can="title"-->
+			<div class="Title">
+				<!--#title-->
+			</div>
+			<!--#endif-->
+			<!--#if can="message"-->
+				<div class="Message">
+					<!--#message-->
+				</div>
+			<!--#endif-->
+			<!--#if can="post_header_text"-->
+				<!--#post_header_text-->
+				<hr style="clear:both"/>
+			<!--#endif-->
+
+			<!--#if can="body"-->
+			<div class="Body">
+				<!--#body-->
+			</div>
+			<!--#endif-->
+			<!--#if warnings="1"-->
+			<hr>
+			<div class="Warnings">
+				<!--#warnings-->
+			</div>
+			<!--#endif-->
+			<!--#if can="message"-->
+				<div class="Message">
+					<!--#message-->
+				</div>
+			<!--#endif-->
+		</td>
+		<!--#if can="info"-->
+		<td class="InfoPanel">
+			<!--<div class="Info">-->
+				<!--#info-->
+			<!--</div>-->
+		</td>
+		<!--#endif-->
+ 	</tr>
+ 	<tr>
+ 	    <td class = "Timestamp", colspan=3>
+ 	        Updated: <!--#timestamp-->
+ 	    </td>
+ 	</tr>
+</table>
+</body>
+
+</html>
diff --git a/conf/templates/ur/ur.css b/conf/templates/ur/ur.css
new file mode 100644
index 0000000000..ce86f16821
--- /dev/null
+++ b/conf/templates/ur/ur.css
@@ -0,0 +1,162 @@
+/******************************************************************************/
+/* ur.template classes: These classes appear in ur.template and are NOT
+ * emitted by WeBWorK code. They need only appear in this template. */
+
+body { margin: 0px; }
+
+/* left table cell, contains logo and menus */
+td.LeftPanel { background-color: #003366; color: white; white-space: nowrap; width: 1em; }
+td.LeftPanel a:link,
+td.LeftPanel a:visited { color: #FF9933; }
+
+div.Logo {  }
+div.Links { font-size: small; }
+div.Links ul { list-style: none; margin-left: 0; padding-left: 0; }
+div.Links ul ul { list-style: none; margin-left: 0.5em; padding-left: 0; }
+
+/* we used to say "height: 10em; overflow: auto" here, but it caused 
+ * problems for mozilla. so we're back to having a looong siblings list 
+ * for the time being. :-( */
+div.Siblings { font-size: small; }
+div.Siblings ul { list-style: none; margin-left: 0; padding-left: 0; }
+div.Siblings ul ul { list-style: none; margin-left: 0.5em; padding-left: 0; }
+div.Options { font-size: small; }
+
+/* top table cell, contains login message and path */
+td.TopPanel { background-color: #003366; color: white; height: 1; }
+td.TopPanel a:link,
+td.TopPanel a:visited { color: #FF9933; }
+
+.Path {  }
+
+/*.LoginStatus { text-align: right; font-size: small; position:absolute; top: 0; right: 0; }*/
+.LoginStatus { text-align: right; font-size: small; }
+td.Timestamp   { text-align: left;  font-size: small; font-style: italic; }
+
+/* (should have ContentPanelError here) */
+
+/* main content panel, contains body */
+td.ContentPanel { background-color: white; color: black; }
+td.ContentPanel a:link,
+td.ContentPanel a:visited { color: blue; }
+td.ContentPanel a:active { color: red; }
+
+div.Nav {  }
+div.Title { font-size: 16pt; }
+div.Message { font-style: italic; }
+div.SubmitError { color: red; font-style: italic; }
+div.Body {  }
+div.Warnings {  }
+
+/* (shuld have Message here) */
+
+/* contains info */
+/* FIXME: this is erroniously used by SetMaker.pm. */
+td.InfoPanel { background-color: #DDDDDD; color: black; width: 30% }
+td.InfoPanel h2 { font-size: 120% }
+td.InfoPanel a:link,
+td.InfoPanel a:visited { color: blue; }
+td.InfoPanel a:active { color: red; }
+
+div.Info {  }
+
+/******************************************************************************/
+/* WeBWorK classes: These classes are emitted by WeBWorK code and should
+ * appear in ANY WeBWorK template. */
+
+/* the info escape emits a DIV with this class and id. */
+.info-box {  }
+#InfoPanel { font-size: smaller; }
+
+/* tables used for laying out form fields shouldn't have a border */
+table.FormLayout { border: 0; }
+table.FormLayout tr { vertical-align: top; }
+table.FormLayout th.LeftHeader { text-align: right; white-space: nowrap; }
+table.FormLayout tr.ButtonRow { text-align: left; }
+table.FormLayout tr.ButtonRowCenter { text-align: center; }
+
+/* for problems which are rendered by themselves, e.g., by Set Maker */
+div.RenderSolo { background-color: #E0E0E0; color: black; }
+div.AuthorComment { background-color: #00E0E0; color: black; }
+
+/* minimal style for lists of links (generated by the links escape) */
+/*ul.LinksMenu { list-style: none; margin-left: 0; padding-left: 0; }*/
+/*ul.LinksMenu ul { list-style: none; margin-left: 0.5em; padding-left: 0; }*/
+
+/* background styles for success and failure messages */
+div.ResultsWithoutError { background-color: #66ff99 } /* light green */
+div.ResultsWithError { background-color: #ffcccc } /* light red */
+div.ResultsAlert { background-color: yellow } /* yellow */
+
+/* styles used by WeBWorK::HTML::ScrollingRecordList */
+div.ScrollingRecordList { padding: 1em; white-space: nowrap; border: thin solid gray; }
+div.ScrollingRecordList select.ScrollingRecordList { width: 99%; }
+
+/* wraps the View Options form (generated by &optionsMacro) */
+/* FIXME: can't this style information just go in div.Options above? */
+div.viewOptions { border: thin groove; padding: 1ex; margin: 2ex; align: left; }
+
+/* messages, attempt results, answer previews, etc. go in this DIV */
+/* this used to be "float:left", but that was suspected of causing MSIE peekaboo bug */
+div.problemHeader {}
+
+/* styles for the attemptResults table */
+table.attemptResults {
+	border-style: outset; 
+	border-width: 1px; 
+	margin: 0px 10pt; 
+	border-spacing: 1px;
+}
+table.attemptResults td,
+table.attemptResults th {
+	border-style: inset; 
+	border-width: 1px; 
+	text-align: center; 
+#	width: 15ex;
+	padding: 2px 5px 2px 5px;
+	background-color: #DDDDDD;
+}
+/* override above settings in tables used to display ans_array results */
+table.attemptResults td td,
+table.attemptResults td th,
+table.ArrayLayout td {
+	border-style: none; 
+	border-width: 0px; 
+	padding: 0px;
+}
+table.attemptResults td.Message {
+   text-align: left; 
+   padding: 2px 5px 2px 5px;
+   width: auto;
+}
+.attemptResultsSummary { font-style:italic; }
+.parsehilight { background-color:yellow; }
+
+/* the problem TEXT itself goes in this box */
+/* we used to make this a grey box, but surprise, MSIE is bug-ridden. */
+div.problem {  }
+
+/* jsMath emits this class when appropriate math fonts aren't available */
+div.NoFontMessage {
+	padding: 10px;
+	border-style: solid;
+	border-width: 3px;
+	border-color: #DD0000;
+	color: inherit;
+	background-color: #FFF8F8;
+	width: 75%;
+	text-align: left;
+	margin: 10px auto 10px 12%;
+}
+
+/* text colors for visible and hidden sets */
+font.visible   { font-style: normal; font-weight: normal; color: #000000; background-color: inherit; } /* black */
+font.hidden { font-style: italic; font-weight: normal; color: #aaaaaa; background-color: inherit; } /* light grey */
+
+/* styles used when editing a temporary file */
+.temporaryFile {  background-color: #ff9900 ; font-style: italic; }
+
+/* text colors for Auditing, Current, and Dropped students */
+.Audit { font-style: normal; color: purple; background-color: inherit; }
+.Enrolled { font-weight: normal; color: black; background-color: inherit; }
+.Drop { font-style: italic; color: gray; background-color: inherit; }
diff --git a/conf/webwork.apache-config.dist b/conf/webwork.apache-config.dist
new file mode 100644
index 0000000000..1440f7094b
--- /dev/null
+++ b/conf/webwork.apache-config.dist
@@ -0,0 +1,197 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/conf/webwork.apache-config.dist,v 1.23 2008/06/24 22:54:04 gage 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+# This file configures Apache to handle requests for WeBWorK. To install WeBWorK
+# support in your Apache configuration, add the following line to the end of
+# your Apache configuration file (usually apache.conf or httpd.conf):
+# 
+#     Include /path/to/webwork.apache-config
+# 
+# Customize the variables below to match your WeBWorK installation.
+
+# Uncomment the ScriptAliasMatch to allow access to show-source.cgi
+# This allows the "show source" button to work for demonstration "courses"
+# See for example Davide Cervone's Knoxville lectures on math objects
+
+#ScriptAliasMatch /webwork2_course_files/([^/]*)/show-source.cgi/(.*) /opt/webwork/courses/$1/html/show-source.cgi/$2
+
+
+<Perl>
+
+# Set this variable to the path to your WeBWorK installation.
+my $webwork_dir = "/opt/webwork/webwork2";
+
+# Cache this value for use by other scripts not necessarily in the Apache2 hierarchy
+# Different scripts use different locations :-)
+
+$ENV{WEBWORK_ROOT} = $webwork_dir;
+$WeBWorK::SeedCE{webwork_dir} = $webwork_dir;
+$WeBWorK::Constants::WEBWORK_DIRECTORY = $webwork_dir;
+
+# This code reads global.conf and extracts the remaining configuration
+# variables. There is no need to modify it.
+eval "use lib '$webwork_dir/lib'"; die $@ if $@;
+eval "use WeBWorK::CourseEnvironment"; die $@ if $@;
+my $ce = new WeBWorK::CourseEnvironment({ webwork_dir => $webwork_dir });
+my $webwork_url = $ce->{webwork_url};
+my $pg_dir = $ce->{pg_dir};
+my $webwork_htdocs_url = $ce->{webwork_htdocs_url};
+my $webwork_htdocs_dir = $ce->{webwork_htdocs_dir};
+my $webwork_courses_url = $ce->{webwork_courses_url};
+my $webwork_courses_dir = $ce->{webwork_courses_dir};
+eval "use lib '$pg_dir/lib'"; die $@ if $@;
+
+require Apache::WeBWorK; # force compilation of pretty much everything
+
+
+# At this point, the following configuration variables should be present for use
+# in wiring WeBWorK into Apache:
+# 
+#     $webwork_url            The base URL handled by Apache::WeBWorK.
+#     $webwork_dir            The path to the base webwork2 directory.
+#     $pg_dir                 The path to the base pg directory.
+#     
+#     $webwork_htdocs_url     The base URL of the WeBWorK htdocs directory.
+#     $webwork_htdocs_dir     The path to the WeBWorK htdocs directory.
+#     
+#     $webwork_courses_url    The base URL of the WeBWorK courses directory.
+#     $webwork_courses_dir    The path to the WeBWorK courses directory.
+
+# Define the location that is handled by the Apache::WeBWorK module, and tell
+# Perl where to find the libraries Apache::WeBWorK needs to run.
+# 
+$Location{$webwork_url} = {
+	SetHandler => "perl-script",
+	PerlHandler => "Apache::WeBWorK",
+};
+
+# Provide access to system-wide resources.
+# 
+push @Alias, [ $webwork_htdocs_url => $webwork_htdocs_dir ];
+# make sure old alias is available even if we use lighttpd
+push @Alias, [ "/webwork2_files" => $webwork_htdocs_dir ];
+$Directory{$webwork_htdocs_dir} = {
+	Order => "allow,deny",
+	Allow => "from all",
+	Options => "FollowSymLinks",
+	AllowOverride => "none",
+};
+
+# Provide access to course-specific resources.
+# 
+push @AliasMatch, [ "$webwork_courses_url/([^/]*)/(.*)", "$webwork_courses_dir/\$1/html/\$2" ];
+$Directory{"$webwork_courses_dir/*/html"} = {
+	Order => "allow,deny",
+	Allow => "from all",
+	Options => "FollowSymLinks",
+	AllowOverride => "none",
+};
+
+# If WeBWorK is on the root, exempt the static directories from being handled
+# by Apache::WeBWorK.
+# 
+if ($webwork_url eq "") {
+	$Location{$webwork_courses_url} = { SetHandler => "none" };
+	$Location{$webwork_htdocs_url} = { SetHandler => "none" };
+}
+
+
+# The following stanzas can be uncommented to enable various experimental
+# WeBWorK web services. These are still in testing and have not been audited
+# for security.
+
+# uncomment the line below if you use the XMLRPC, RQP, or SOAP installations below
+
+$ENV{WEBWORK_ROOT} = $webwork_dir;
+
+$PerlConfig .= <<EOF;
+# ##### Sam's WeBWorK::Request-based XML-RPC testbed #####
+# #
+# #PerlModule WeBWorK::RPC
+# #<Location /webwork2_rpc>
+# #	SetHandler perl-script
+# #	PerlHandler Apache::XMLRPC::Lite
+# #	PerlSetVar dispatch_to "WeBWorK::RPC WeBWorK::RPC::CourseManagement"
+# #</Location>
+# 
+# ########## XMLRPC installation ##########
+# # 
+# #PerlModule WebworkWebservice
+# #<Location /mod_xmlrpc>
+# #	SetHandler perl-script
+# #	PerlHandler Apache::XMLRPC::Lite
+# #	PerlSetVar dispatch_to "WebworkXMLRPC"
+# #	PerlSetVar options "compress_threshold => 10000"
+# #	Order Allow,Deny
+# #	Allow from All
+# #</Location>
+# 
+# ##########  RQP installation ##########
+# # 
+# #PerlModule RQP
+# ##<Location /rqp>
+# ##	SetHandler perl-script
+# ##	PerlHandler Apache::SOAP
+# ##	PerlSetVar dispatch_to "RQP"
+# ##	PerlSetVar options "compress_threshold => 10000"
+# ##	Order Allow,Deny
+# ##	Allow from All
+# ##</Location>
+# #<Location /rqp>
+# #	SetHandler perl-script
+# #	PerlHandler MySOAP
+# #	Order Allow,Deny
+# #	Allow from All
+# #</Location>
+# 
+# ########## SOAP installation ##########
+# # 
+# #PerlModule WebworkWebservice
+# #<Location /mod_soap>
+# #	SetHandler perl-script
+# #	PerlHandler Apache::SOAP
+# #	PerlSetVar dispatch_to "WebworkXMLRPC" 
+# #	PerlSetVar options "compress_threshold => 10000"
+# #	Order Allow,Deny
+# #	Allow from All
+# #</Location>
+# 
+# PerlModule WebworkSOAP
+
+# #WEBWORK SOAP CONFIGURATION
+# <Location /webwork2_rpc>
+#         PerlHandler Apache::SOAP
+#         SetHandler perl-script
+#         PerlSetVar dispatch_to "WebworkSOAP"
+#         PerlSetVar options "compress_threshold => 10000"
+#         Order Allow,Deny
+#         Allow from All
+# </Location>
+
+# #WEBWORK SOAP WSDL HANDLER :: TO BE REPLACED WITH A FILE FOR PRODUCTION SERVERS
+# <Location /webwork2_wsdl>
+#         PerlSetVar dispatch_to "WebworkSOAP::WSDL"
+#         PerlSetVar options "compress_threshold => 10000"
+#         PerlHandler WebworkSOAP::WSDL
+#         SetHandler perl-script
+#         Order Allow,Deny
+#         Allow from All
+# </Location>
+
+EOF
+
+</Perl>
+
diff --git a/conf/webwork.apache2-config.dist b/conf/webwork.apache2-config.dist
new file mode 100644
index 0000000000..7923823b1e
--- /dev/null
+++ b/conf/webwork.apache2-config.dist
@@ -0,0 +1,217 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2010 The WeBWorK Project, http://openwebwork.sf.net/
+# 
+# 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+# This file configures Apache to handle requests for WeBWorK. To install WeBWorK
+# support in your Apache configuration, add the following line to the end of
+# your Apache configuration file (usually apache.conf or httpd.conf):
+# 
+#     Include /path/to/webwork.apache2-config
+# 
+# Customize the variable $webwork_dir below to match the location of your
+# WeBWorK installation.
+# 
+# ATTENTION APACHE 2.2 USERS: There is a bug in mod_perl 2.0.2 that prevents the
+#                             FollowSymlinksOption from working when specified
+#                             in a <Perl> section. See below for workaround.
+
+
+# Uncomment the ScriptAliasMatch to allow access to show-source.cgi
+# This allows the "show source" button to work for demonstration "courses"
+# See for example Davide Cervone's Knoxville lectures on math objects
+# It requires that a show-source.cgi script be customized and placed in 
+# the myCourse/html  directory of the course
+# The "show source" button is most useful for webwork "courses" used to train new authors
+# It is not desirable to expose the code of regular homework questions to students
+
+ScriptAliasMatch /webwork2_course_files/([^/]*)/show-source.cgi/(.*) /opt/webwork/courses/$1/html/show-source.cgi/$2
+
+
+
+PerlModule mod_perl2
+
+<Perl>
+
+#################################################################
+# Set this variable to the path to your WeBWorK installation.
+#################################################################
+
+my $webwork_dir = "/opt/webwork/webwork2";
+# Cache this value for use by other scripts not necessarily in the Apache2 hierarchy
+# Different scripts use different locations :-)
+
+$ENV{WEBWORK_ROOT} = $webwork_dir;
+$WeBWorK::SeedCE{webwork_dir} = $webwork_dir;
+$WeBWorK::Constants::WEBWORK_DIRECTORY = $webwork_dir;
+
+
+#################################################################
+# The following code reads global.conf and extracts the remaining configuration
+# variables. There is no need to modify it.
+#################################################################
+
+# link to WeBWorK code libraries
+eval "use lib '$webwork_dir/lib'"; die $@ if $@;
+eval "use WeBWorK::CourseEnvironment"; die $@ if $@;
+
+# grab course environment (by reading webwork2/conf/global.conf)
+my $ce = new WeBWorK::CourseEnvironment({ webwork_dir => $webwork_dir });
+
+#  set important configuration variables (from global.conf)
+
+my $webwork_url = $ce->{webwork_url};                    # e.g.  /webwork2
+my $pg_dir = $ce->{pg_dir};                              # e.g.  /opt/webwork/pg         
+my $webwork_htdocs_url = $ce->{webwork_htdocs_url};      # e.g.  /webwork2_files
+my $webwork_htdocs_dir = $ce->{webwork_htdocs_dir};      # e.g.  /opt/webwork/webwork2/htdocs
+my $webwork_courses_url = $ce->{webwork_courses_url};    # e.g.  /webwork2_course_files
+my $webwork_courses_dir = $ce->{webwork_courses_dir};    # e.g.  /opt/webwork/courses
+
+
+#################################################################
+# report server setup when child process starts up -- for example when restarting the server
+#################################################################
+print "webwork.apache2-config:  WeBWorK server is starting\n";
+print "webwork.apache2-config:  WeBWorK root directory set to $webwork_dir in webwork2/conf/webwork.apache2-config\n";
+print "webwork.apache2-config:  The following locations and urls are set in webwork2/conf/global.conf\n";
+print "webwork.apache2-config:  PG root directory set to $pg_dir\n";
+print "webwork.apache2-config:  WeBWorK server userID is ", $ce->{server_userID}, "\n";
+print "webwork.apache2-config:  WeBWorK server groupID is ", $ce->{server_groupID}, "\n";
+print "webwork.apache2-config:  The webwork url on this site is ", $ce->{server_root_url},"$webwork_url\n";
+
+
+# link to PG code libraries
+eval "use lib '$pg_dir/lib'"; die $@ if $@;
+
+require Apache::WeBWorK; # force compilation of pretty much everything
+
+
+# At this point, the following configuration variables should be present for use
+# in wiring WeBWorK into Apache:
+# 
+#     $webwork_url            The base URL handled by Apache::WeBWorK.
+#     $webwork_dir            The path to the base webwork2 directory.
+#     $pg_dir                 The path to the base pg directory.
+#     
+#     $webwork_htdocs_url     The base URL of the WeBWorK htdocs directory.
+#     $webwork_htdocs_dir     The path to the WeBWorK htdocs directory.
+#     
+#     $webwork_courses_url    The base URL of the WeBWorK courses directory.
+#     $webwork_courses_dir    The path to the WeBWorK courses directory.
+
+# Define the location that is handled by the Apache::WeBWorK module, and tell
+# Perl where to find the libraries Apache::WeBWorK needs to run.
+# 
+$Location{$webwork_url} = {
+	SetHandler => "perl-script",
+	PerlHandler => "Apache::WeBWorK",
+};
+
+# Provide access to system-wide resources.
+# 
+push @Alias, [ $webwork_htdocs_url => $webwork_htdocs_dir ];
+$Directory{$webwork_htdocs_dir} = {
+	Order => "allow,deny",
+	Allow => "from all",
+	# APACHE 2.2 USERS: comment out the following line.
+	Options => "FollowSymLinks",
+	AllowOverride => "none",
+};
+
+# Provide access to course-specific resources.
+# 
+push @AliasMatch, [ "$webwork_courses_url/([^/]*)/(.*)", "$webwork_courses_dir/\$1/html/\$2" ];
+$Directory{"$webwork_courses_dir/*/html"} = {
+	Order => "allow,deny",
+	Allow => "from all",
+	# APACHE 2.2 USERS: comment out the following line.
+	Options => "FollowSymLinks",
+	AllowOverride => "none",
+};
+
+# If WeBWorK is on the root, exempt the static directories from being handled
+# by Apache::WeBWorK.
+# 
+if ($webwork_url eq "") {
+	$Location{$webwork_courses_url} = { SetHandler => "none" };
+	$Location{$webwork_htdocs_url} = { SetHandler => "none" };
+}
+
+</Perl>
+
+####################################################################
+# WebworkSOAP handlers (for integration with moodle)
+####################################################################
+ PerlModule WebworkSOAP
+
+ # WEBWORK SOAP CONFIGURATION
+ <Location /webwork2_rpc>
+         PerlHandler Apache2::SOAP
+         SetHandler perl-script
+         PerlSetVar dispatch_to "WebworkSOAP"
+         PerlSetVar options "compress_threshold => 10000"
+         Order Allow,Deny
+         Allow from All
+ </Location>
+
+####################################################################
+# WebworkSOAP WSDL HANDLER :: TO BE REPLACED WITH A FILE FOR PRODUCTION SERVERS
+####################################################################
+ <Location /webwork2_wsdl>
+         PerlSetVar dispatch_to "WebworkSOAP::WSDL"
+         PerlSetVar options "compress_threshold => 10000"
+         PerlHandler WebworkSOAP::WSDL
+         SetHandler perl-script
+         Order Allow,Deny
+         Allow from All
+ </Location>
+
+
+####################################################################
+# WebworkWebservice handlers -- for integration with external editor
+####################################################################
+
+
+########### WebworkWebservice XMLRPC handler ##########
+
+PerlModule WebworkWebservice
+
+<Location /mod_xmlrpc>
+	SetHandler perl-script
+	PerlHandler Apache::XMLRPC::Lite
+	PerlSetVar dispatch_to "WebworkXMLRPC"
+	PerlSetVar options "compress_threshold => 10000"
+	Order Allow,Deny
+	Allow from All
+</Location>
+
+
+
+########## WebworkWebservice SOAP handler ##########
+
+#PerlModule WebworkWebservice
+#
+#<Location /mod_soap>
+#	SetHandler perl-script
+#	PerlHandler Apache::SOAP
+#	PerlSetVar dispatch_to "WebworkXMLRPC" 
+#	PerlSetVar options "compress_threshold => 10000"
+#	Order Allow,Deny
+#	Allow from All
+#</Location>
+
+####################################################################
+# WebworkSOAP  "bridge2" handler 
+####################################################################
+
+# Include /opt/webwork/wwqs/conf/problemserver.apache-config
\ No newline at end of file
diff --git a/courses.dist/adminClasslist.lst b/courses.dist/adminClasslist.lst
new file mode 100644
index 0000000000..5d92c29c58
--- /dev/null
+++ b/courses.dist/adminClasslist.lst
@@ -0,0 +1,3 @@
+# $Id: adminClasslist.lst,v 1.2 2009-06-26 00:58:52 gage Exp $
+# Field order: student_id,last_name,first_name,status,comment,section,recitation,email_address,user_id,password,permission
+admin,Administrator,,C,,,,,admin,.bxpcera4I/bg,10
diff --git a/courses.dist/defaultClasslist.lst b/courses.dist/defaultClasslist.lst
new file mode 100644
index 0000000000..23709b5863
--- /dev/null
+++ b/courses.dist/defaultClasslist.lst
@@ -0,0 +1,12 @@
+# $Id: defaultClasslist.lst,v 1.1 2006-09-05 16:27:37 sh002i Exp $
+# Field order: student_id,last_name,first_name,status,comment,section,recitation,email_address,user_id,password,permission
+practice1,Practice1,,C,,,,,practice1,,-5
+practice2,Practice2,,C,,,,,practice2,,-5
+practice3,Practice3,,C,,,,,practice3,,-5
+practice4,Practice4,,C,,,,,practice4,,-5
+practice5,Practice5,,C,,,,,practice5,,-5
+practice6,Practice6,,C,,,,,practice6,,-5
+practice7,Practice7,,C,,,,,practice7,,-5
+practice8,Practice8,,C,,,,,practice8,,-5
+practice9,Practice9,,C,,,,,practice9,,-5
+professor,Professor,,C,,,,,professor,dmU8ES4L.64VU,10
diff --git a/courses.dist/modelCourse/course.conf b/courses.dist/modelCourse/course.conf
new file mode 100644
index 0000000000..1cbba28993
--- /dev/null
+++ b/courses.dist/modelCourse/course.conf
@@ -0,0 +1,90 @@
+#!perl
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# 
+# 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+# This file is used to override the global WeBWorK course environment for
+# requests to this course. All package variables set in this file are added to
+# the course environment. If you wish to set a variable here but omit it from
+# the course environment,  use the "my" keyword. Commonly changed configuration
+# options are noted below.
+
+# Database Layout (global value typically defined in global.conf)
+# 
+# Several database are defined in the file conf/database.conf and stored in the
+# hash %dbLayouts.
+# 
+# The database layout is always set here, since one should be able to change the
+# default value in global.conf without disrupting existing courses.
+# 
+# global.conf values:
+# 	$dbLayoutName = 'sql_single';
+# 	*dbLayout = $dbLayouts{$dbLayoutName};
+
+$dbLayoutName = 'sql_single';
+*dbLayout = $dbLayouts{$dbLayoutName};
+
+# Global User ID (global value typically defined in database.conf)
+# 
+# The globalUserID parameter given for the set and problem tables denotes the ID
+# of the user that the GlobalTableEmulator will use to store data for the set
+# and problem tables.
+# 
+# If a course will be used under WeBWorK 1.x, this value should be overridden on
+# a course-by-course basis to the ID of the professor who is most likely to be
+# involved in creating new problem sets. Sets which have not been assigned will
+# only be visible to this user when logging into WeBWorK 1.x.
+# 
+# The global user ID is always set here, since one should be able to change the
+# default value in database.conf without disrupting existing courses.
+# 
+# global.conf values:
+# 	$dbLayouts{gdbm}->{set}->{params}->{globalUserID} = 'global_user';
+# 	$dbLayouts{gdbm}->{problem}->{params}->{globalUserID} = 'global_user';
+
+$dbLayouts{gdbm}->{set}->{params}->{globalUserID} = 'global_user';
+$dbLayouts{gdbm}->{problem}->{params}->{globalUserID} = 'global_user';
+
+# Allowed Mail Recipients (global value typically not defined)
+# 
+# Defines addresses to which the PG system is allowed to send mail. This should
+# probably be set to the addresses of professors of this course. Sending mail
+# from the PG system (i.e. questionaires, essay questions) will fail if this is
+# not set.
+# 
+# global.conf values:
+# 	$mail{allowedRecipients} = ['gage@math.rochester.edu'];
+
+$mail{allowedRecipients} = ['gage@math.rochester.edu'];
+
+# Feedback Mail Recipients (global value typically not defined)
+# 
+# Defines recipients for feedback mail. If not defined, mail is sent to all
+# instructors and TAs.
+# 
+# global.conf values:
+# 	$mail{feedbackRecipients} = ['gage@math.rochester.edu'];
+
+
+
+
+# Users for whom to label problems with the PG file name (global value typically "professor")
+# 
+# For users in this list, PG will display the source file name when rendering a problem.
+# 
+# global.conf values:
+# 	$pg{specialPGEnvironmentVars}{PRINT_FILE_NAMES_FOR} = ['gage', 'apizer', 'sh002i', 'professor'];
+
+$pg{specialPGEnvironmentVars}{PRINT_FILE_NAMES_FOR} = ['global_user', 'toenail', 'sam', 'apizer', 'gage'];
+
diff --git a/courses.dist/modelCourse/hide_directory b/courses.dist/modelCourse/hide_directory
new file mode 100644
index 0000000000..2ba4632298
--- /dev/null
+++ b/courses.dist/modelCourse/hide_directory
@@ -0,0 +1,4 @@
+
+Place a file named "hide_directory" in a course or other directory
+and it will not show up in the courses list on the WeBWorK home page.
+It will still appear in the Course Administration listing.
diff --git a/courses.dist/modelCourse/templates/ASimpleCombinedHeaderFile.pg b/courses.dist/modelCourse/templates/ASimpleCombinedHeaderFile.pg
new file mode 100644
index 0000000000..35267ae018
--- /dev/null
+++ b/courses.dist/modelCourse/templates/ASimpleCombinedHeaderFile.pg
@@ -0,0 +1,88 @@
+# ASimpleCombinedHeaderFile.pg
+# This header file can be used for both the screen and hardcopy output
+
+
+DOCUMENT();
+
+loadMacros(
+	"PG.pl",
+	"PGbasicmacros.pl",
+
+);
+
+TEXT($BEGIN_ONE_COLUMN);
+
+####################################################
+#
+# The item below printed out only when a hardcopy is made.
+#
+####################################################
+
+
+
+TEXT(MODES(TeX =>EV3(<<'EOT'),HTML=>""));
+
+\noindent {\large \bf $studentName}
+\hfill
+{\large \bf {\{protect_underbar($courseName)\}}}
+% Uncomment the line below if this course has sections. Note that this is a comment in TeX mode since this is only processed by LaTeX
+%   {\large \bf { Section: \{protect_underbar($sectionName)\} } }
+\par
+\noindent{\large \bf {Assignment \{protect_underbar($setNumber)\}  due $formatedDueDate}}
+\par\noindent \bigskip
+% Uncomment and edit the line below if this course has a web page. Note that this is a comment in TeX mode.
+%See the course web page for information http://yoururl/yourcourse
+
+EOT
+
+####################################################
+#
+# End of hardcopy only output.
+#
+####################################################
+
+
+####################################################
+#
+# The items below are printed out only when set is displayed on screen
+# 
+####################################################
+TEXT(MODES(TeX =>"",HTML=>EV3(<<'EOT')));
+
+$BBOLD WeBWorK  Assignment \{ protect_underbar($setNumber) \}  is due :  $formattedDueDate. $EBOLD
+$PAR
+Here's the list of 
+\{ htmlLink(qq!http://webwork.maa.org/wiki/Available_Functions!,"functions and symbols") \}
+ which WeBWorK understands.
+$BR
+EOT
+
+####################################################
+# Uncomment and edit the lines below if this course has a web page. Note that this is comment in Perl mode. 
+# IMPORTANT: Make sure the EOT at the bottom is at the beginning of a line with no spaces preceeding it.
+#TEXT(MODES(TeX =>"",HTML=>EV3(<<'EOT')));
+#See the course web page for information \{ htmlLink(qq!http://yoururl/yourcourse!,"your course name") \}
+#EOT
+####################################################
+
+####################################################
+#
+# End of screen only output.
+#
+####################################################
+
+####################################################
+#
+# Anything between the BEGIN_TEXT AND END_TEXT lines
+# will be printed in both screen and hardcopy output
+#
+####################################################
+
+BEGIN_TEXT
+
+END_TEXT
+
+
+TEXT($END_ONE_COLUMN);
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/courses.dist/modelCourse/templates/ASimpleHardCopyHeaderFile.pg b/courses.dist/modelCourse/templates/ASimpleHardCopyHeaderFile.pg
new file mode 100644
index 0000000000..aae91a7408
--- /dev/null
+++ b/courses.dist/modelCourse/templates/ASimpleHardCopyHeaderFile.pg
@@ -0,0 +1,36 @@
+# ASimpleHardCopyHeaderFile.pg
+# This file can be used as a simple Hard Copy Header file which is processed by LaTeX. 
+# Do not use it as a Screen Header file which is processed by html
+
+
+DOCUMENT();
+
+loadMacros(
+"PG.pl",
+"PGbasicmacros.pl",
+
+);
+
+
+BEGIN_TEXT
+$BEGIN_ONE_COLUMN
+\noindent {\large \bf $studentName}
+\hfill
+{\large \bf {\{protect_underbar($courseName)\}}}
+% Uncomment the line below if this course has sections. Note that this is a comment in TeX mode since this is only processed by LaTeX
+%   {\large \bf { Section: \{protect_underbar($sectionName)\} } }
+\par
+\noindent{\large \bf {Assignment \{protect_underbar($setNumber)\}  due $formatedDueDate}}
+\par\noindent \bigskip
+% Uncomment and edit the line below if this course has a web page. Note that this is a comment in TeX mode.
+% See the course web page for information http://yoururl/yourcourse
+
+
+$END_ONE_COLUMN
+END_TEXT
+
+ENDDOCUMENT();
+
+
+
+
diff --git a/courses.dist/modelCourse/templates/ASimpleScreenHeaderFile.pg b/courses.dist/modelCourse/templates/ASimpleScreenHeaderFile.pg
new file mode 100644
index 0000000000..34a2fff901
--- /dev/null
+++ b/courses.dist/modelCourse/templates/ASimpleScreenHeaderFile.pg
@@ -0,0 +1,27 @@
+##ASimpleScreenHeaderFile.pg
+
+DOCUMENT();
+
+loadMacros(
+"PG.pl",
+"PGbasicmacros.pl",
+
+);
+
+BEGIN_TEXT
+$BBOLD WeBWorK  Assignment \{ protect_underbar($setNumber) \}  is due :  $formattedDueDate. $EBOLD
+$PAR
+Here's the list of 
+\{ htmlLink(qq!http://webwork.maa.org/wiki/Available_Functions!,"functions and symbols") \}
+ that WeBWorK understands.
+END_TEXT
+
+
+# Uncomment and edit the lines below if this course has a web page. Note that this is comment in Perl mode.
+#BEGIN_TEXT
+#$PAR 
+#See the course web page for information \{ htmlLink(qq!http://yoururl/yourcourse!,"your course name") \}
+#END_TEXT
+
+ENDDOCUMENT();
+
diff --git a/courses.dist/modelCourse/templates/course_info.txt b/courses.dist/modelCourse/templates/course_info.txt
new file mode 100644
index 0000000000..69b888d207
--- /dev/null
+++ b/courses.dist/modelCourse/templates/course_info.txt
@@ -0,0 +1,3 @@
+this information is written in the file:
+
+[coursesDirectory]/courseName/templates/course_info.txt
diff --git a/courses.dist/modelCourse/templates/demoCourse.lst b/courses.dist/modelCourse/templates/demoCourse.lst
new file mode 100644
index 0000000000..87452facf5
--- /dev/null
+++ b/courses.dist/modelCourse/templates/demoCourse.lst
@@ -0,0 +1,9 @@
+practice1 ,PRACTICE1 ,JANE   ,C , , , ,                    ,practice1, ,-5   
+practice2 ,PRACTICE2 ,JANE   ,C , , , ,                    ,practice2, ,-5   
+practice3 ,PRACTICE3 ,JANE   ,C , , , ,                    ,practice3, ,-5   
+practice4 ,PRACTICE4 ,JANE   ,C , , , ,                    ,practice4, ,-5   
+practice5 ,PRACTICE5 ,JANE   ,C , , , ,                    ,practice5, ,-5   
+practice6 ,PRACTICE6 ,JANE   ,C , , , ,                    ,practice6, ,-5   
+practice7 ,PRACTICE7 ,JANE   ,C , , , ,                    ,practice7, ,-5   
+practice8 ,PRACTICE8 ,JANE   ,C , , , ,                    ,practice8, ,-5   
+practice9 ,PRACTICE9 ,JANE   ,C , , , ,                    ,practice9, ,-5   
diff --git a/courses.dist/modelCourse/templates/email/welcome.msg b/courses.dist/modelCourse/templates/email/welcome.msg
new file mode 100644
index 0000000000..3db7f1a075
--- /dev/null
+++ b/courses.dist/modelCourse/templates/email/welcome.msg
@@ -0,0 +1,23 @@
+##  template for a Welcome message to be emailed to class (delete this line)
+From: teacher@somewhere.edu (Jan Teacher)
+Reply-To: teacher@somewhere.edu
+Subject: online homework for Math 123
+Message:
+    Hi $FN,
+
+Your course is at
+	http://somewhere.edu/webwork2/JT_123
+
+Your login name is $LOGIN and your initial password is $SID
+
+You should change your password, once you have logged in, by clicking on the
+password/email link in the upper left.  After entering your new password,
+press the Change User Options button to save your change.
+
+Some help pages about WeBWorK are at URL
+	http://webwork.maa.org/wiki/Category:Students
+
+Have fun.
+
+Take care,
+TJ
diff --git a/courses.dist/modelCourse/templates/set0.def b/courses.dist/modelCourse/templates/set0.def
new file mode 100644
index 0000000000..4d35f48af9
--- /dev/null
+++ b/courses.dist/modelCourse/templates/set0.def
@@ -0,0 +1,14 @@
+setNumber=0
+openDate = 1/7/00 at 6:00am
+dueDate = 1/20/09 at 6:00am
+answerDate = 1/21/09 at 6:00am
+paperHeaderFile = set0/paperHeaderFile0.pg
+screenHeaderFile = set0/screenHeaderFile0.pg
+problemList =
+set0/prob1.pg,    0
+set0/prob1a.pg,   0
+set0/prob1b.pg,   0
+set0/prob2.pg,   0
+set0/prob3.pg,   0
+set0/prob4/prob4.pg,   0
+set0/prob5.pg,   0
diff --git a/courses.dist/modelCourse/templates/set0/paperHeaderFile0.pg b/courses.dist/modelCourse/templates/set0/paperHeaderFile0.pg
new file mode 100644
index 0000000000..9a353ac92f
--- /dev/null
+++ b/courses.dist/modelCourse/templates/set0/paperHeaderFile0.pg
@@ -0,0 +1,29 @@
+##Problem set header for set 0
+
+&DOCUMENT;
+
+loadMacros(
+"PG.pl",
+"PGbasicmacros.pl",
+"PGchoicemacros.pl",
+"PGanswermacros.pl"
+);
+
+$dateTime = $formatedDueDate;
+
+TEXT(EV2(<<EOT));
+$BEGIN_ONE_COLUMN
+\noindent {\large \bf $studentName}
+\hfill
+{\large \bf {\{protect_underbar($courseName)\}}}
+\par
+\noindent{\large \bf {Assignment \{protect_underbar($setNumber)\}  due $formatedDueDate}}
+\par\noindent
+This first set (set 0) is designed to acquaint you with using WeBWorK. 
+{\bf Your score on this set will not be counted toward your final grade.}
+\par
+\noindent You may need to give 4 or 5 significant digits for some (floating point) numerical answers in order to have them accepted by the computer.
+$END_ONE_COLUMN
+EOT
+
+&ENDDOCUMENT;
diff --git a/courses.dist/modelCourse/templates/set0/prob1.pg b/courses.dist/modelCourse/templates/set0/prob1.pg
new file mode 100644
index 0000000000..894cf83040
--- /dev/null
+++ b/courses.dist/modelCourse/templates/set0/prob1.pg
@@ -0,0 +1,114 @@
+##DESCRIPTION
+##  A very simple first problem
+##ENDDESCRIPTION
+
+# this is a comment. i just added it. nifty!
+
+##KEYWORDS('algebra')
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+"PG.pl",
+"PGbasicmacros.pl",
+"PGchoicemacros.pl",
+"PGanswermacros.pl",
+"PGauxiliaryFunctions.pl"
+);
+
+TEXT(beginproblem());
+$showPartialCorrectAnswers = 1;
+
+$a = random(-10,-1,1);
+$b = random(1,11,1);
+$c = random(1,11,1);
+$d = random(1,11,1);
+
+BEGIN_TEXT
+This problem demonstrates how you enter numerical answers into WeBWorK. $PAR
+Evaluate the expression \(3($a )($b -$c -2($d ))\):
+ \{ ans_rule(10) \}
+$BR
+
+END_TEXT
+
+
+$ans = 3*($a)*($b-$c-2*($d));
+
+ANS(strict_num_cmp($ans));
+
+BEGIN_TEXT
+In the case above you need to enter a number, since we're testing whether you can multiply
+out these numbers. (You can use a calculator if you want.) 
+$PAR
+For most problems, you will be able to get WeBWorK to
+do some of the work for you.  For example
+$BR
+Calculate ($a) * ($b): \{ ans_rule()\}
+$BR
+
+END_TEXT
+
+
+$ans = $a*$b;
+
+ANS(std_num_cmp($ans));
+
+BEGIN_TEXT
+
+The asterisk is what most computers use to denote multiplication and you can use this with WeBWorK. 
+But WeBWorK will also allow you to use a space to denote multiplication.
+You can either \($a * $b\) or \{$a*$b\} or even \($a \ $b\).  All will work. Try them.  
+$PAR
+Now try calculating the sine of 45 degrees ( that's sine of pi over 4 in radians
+and numerically sin(pi/4) equals \{1/sqrt(2)\} or, more precisely,  \(1/\sqrt{2} \) ).  
+You can enter this as  sin(pi/4) , as 
+sin(3.1415926/4), as 1/sqrt(2), as 2**(-.5), etc. This is because WeBWorK knows about 
+functions like sin  and sqrt (square root). (Note: exponents
+can be indicated by either a "caret" or **). Try it.$BR  \( \sin(\pi/4) = \) \{ ans_rule(20) \}$PAR
+
+ Here's the 
+\{ htmlLink(qq!http://webwork.maa.org/wiki/Mathematical_notation_recognized_by_WeBWorK!,"list of the functions") \}
+ which WeBWorK understands.   WeBWorK ALWAYS uses radian mode for trig functions. 
+ $PAR
+
+END_TEXT
+
+ANS( std_num_cmp(sin(3.1415926/4)) );
+
+BEGIN_TEXT
+
+You can also use juxtaposition to denote multiplication. E.g. enter \( 2\sin(3\pi/2) \).
+You can enter this as 2*sin(3*pi/2) or more simply as 2sin(3pi/2).  Try it: $BR 
+\{ ans_rule(20) \}$PAR
+
+END_TEXT
+
+$pi = 4*atan(1);
+ANS( std_num_cmp(2*sin(3*$pi/2)) );
+
+BEGIN_TEXT
+
+Sometimes you need to use ( )'s to make your meaning clear. E.g. 1/2+3 is 3.5, but  1/(2+3) is .2 Why?
+Try entering both and use the ${LQ}Preview${RQ} button below to see the difference.  In addition to
+( )'s, you can also use [ ]'s and $LB ${RB}'s.  $BR
+\{ ans_rule(20) \}$PAR
+
+
+END_TEXT
+
+ANS( std_num_cmp(.2));
+
+BEGIN_TEXT
+
+You can always try to enter answers and let WeBWorK do the calculating. 
+WeBWorK will tell you if the problem requires a strict numerical answer. 
+The way we use WeBWorK in this class there is no penalty for getting an answer wrong.  What counts
+is that you get the answer right eventually (before the due date).  For complicated answers,
+you should use the ${LQ}Preview${RQ} button to check for syntax errors and also to check that the answer
+you enter is really what you think it is.
+
+
+END_TEXT
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/courses.dist/modelCourse/templates/set0/prob1a.pg b/courses.dist/modelCourse/templates/set0/prob1a.pg
new file mode 100644
index 0000000000..a862e59377
--- /dev/null
+++ b/courses.dist/modelCourse/templates/set0/prob1a.pg
@@ -0,0 +1,58 @@
+##DESCRIPTION
+##  sample of entering functions as answers
+##ENDDESCRIPTION
+
+##KEYWORDS('functions')
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+	"PGbasicmacros.pl",
+	"PGchoicemacros.pl",
+	"PGanswermacros.pl",
+	"PGauxiliaryFunctions.pl"
+);
+
+TEXT(beginproblem());
+$showPartialCorrectAnswers = 1;
+
+
+BEGIN_TEXT
+This problem demonstrates how you enter function answers into WeBWorK. $PAR
+First enter the function \(\sin\; x\). When entering the function, you should enter
+sin(x), but WeBWorK will also accept sin x or even sinx. If you remember your trig 
+identities, sin(x) = -cos(x+pi/2) and WeBWorK will accept this or any other function 
+equal to sin(x), 
+e.g. sin(x) +sin(x)**2+cos(x)**2-1
+$BR\{ans_rule(35) \}
+
+END_TEXT
+
+$ans = "sin(x)";
+ANS(function_cmp($ans));
+
+BEGIN_TEXT
+$PAR
+We said you should enter sin(x) even though WeBWorK will also accept sin x or even sinx because you
+are less likely to make a mistake.  Try entering sin(2x) without the parentheses and you may be surprised
+at what you get. Use the Preview button to see what you get.  WeBWorK will evaluate functions (such
+as sin) before doing anything else, so sin 2x means first apply sin which gives sin(2) and then
+mutiple by x.  Try it.
+$BR\{ans_rule(35) \}
+
+END_TEXT
+
+
+$ans = "sin(2*x)";
+ANS(function_cmp($ans));
+
+TEXT(EV2(<<EOT));
+$PAR Now enter the function \(2\cos t\).  Note this is a function of \( t\) and not \( x\). Try entering
+2cos x and see what happens. 
+$BR \{ans_rule(35) \}
+EOT
+
+$ans = "2*cos(t)";
+ANS(function_cmp($ans,'t'));
+
+ENDDOCUMENT();        # This should be the last executable line the problem.
diff --git a/courses.dist/modelCourse/templates/set0/prob1b.pg b/courses.dist/modelCourse/templates/set0/prob1b.pg
new file mode 100644
index 0000000000..d1de6b1c09
--- /dev/null
+++ b/courses.dist/modelCourse/templates/set0/prob1b.pg
@@ -0,0 +1,106 @@
+##DESCRIPTION
+##  help for leaning precedence
+##ENDDESCRIPTION
+
+##KEYWORDS('functions')
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+"PG.pl",
+"PGbasicmacros.pl",
+"PGchoicemacros.pl",
+"PGanswermacros.pl",
+"PGauxiliaryFunctions.pl"
+);
+
+TEXT(beginproblem());
+$showPartialCorrectAnswers = 1;
+
+
+BEGIN_TEXT
+This problem will help you learn the rules of precedence, i.e. the order in which
+mathematical operations are performed. You can use parentheses (and also square brackets
+[ ] and/or curly braces $LB $RB) if you want to change the normal way operations work.$PAR
+
+So first let us review the normal way operations are performed.$PAR
+
+The rules are simple.  Exponentiation is always done before multiplication 
+and division and multiplication and division are always done before addition 
+and subtraction. (Mathematically we say exponentiation takes precedence over 
+multiplication and division, etc.). For example what is 1+2*3? $BR
+\{ ans_rule(25) \}
+END_TEXT
+
+$ans = 7;
+ANS(std_num_cmp($ans));
+
+
+BEGIN_TEXT
+$BR and what is \( 2\cdot 3^2 \)? $BR
+\{ ans_rule(25) \}
+END_TEXT
+
+$ans = 2*3**2;
+ANS(std_num_cmp($ans));
+
+BEGIN_TEXT
+
+$BR
+Now sometime you want to force things to be done in a different way. This is
+what parentheses are used for.  The rule is: whatever is enclosed in 
+parentheses is done before anything else (and things in the inner most
+parentheses are done first). 
+
+For example how do you enter \[ \frac {1+\sin(3)}{2+\tan(4)}\quad ? \] Hint: this is a good place to use
+[ ]'s and also to use the ${LQ}Preview${RQ} button. $BR
+\{ ans_rule(25) \}
+END_TEXT
+
+$ans = (1+sin(3))/(2+tan(4)) ;
+ANS(std_num_cmp($ans));
+
+BEGIN_TEXT
+$BR
+Here are some more examples:
+
+(1+3)9 =36, (2*3)**2 = 6**2 = 36, 3**(2*2) = 3**4 = 81, (2+3)**2 = 5**2 = 25, 3**(2+2) = 3**4 = 81
+
+$BR
+(Here we have used ** to denote exponentiation and you can also use this instead of a ${LQ}caret${RQ} if you want).  Try entering some of these and use the "Preview" button to see the result.  The "correct"
+result for this answer blank is 36, but by using the ${LQ}Preview${RQ} button, you can enter whatever 
+you want and use WeBWorK as a hand calculator.$BR
+\{ ans_rule(25) \}
+
+END_TEXT
+
+$ans =36;
+
+ANS(std_num_cmp($ans));
+
+BEGIN_TEXT
+$BR
+
+There is one other thing to be careful of.  Multiplication and division have the 
+same precedence and there are no universal rules as to which should be done first.
+For example, what does 2/3*4 mean?  (Note that / is the "division symbol", which 
+is usually written as a line with two dots, but unfortunately, this "line with
+two dots" symbol is not on computer keyboards. Don't think of / as the horizontal
+line in a fraction. Ask yourself what 1/2/2 should mean.) WeBWorK and most other
+computers read things from left to right, i.e. 2/3*4 means (2/3)*4 or 8/3, IT DOES 
+NOT MEAN 2/12.  Some computers may do operations from right to left.  If you 
+want 2/(3*4) = 2/12, you have to use parentheses.  The same thing happens with
+addition and subtraction. 1-3+2 = 0 but 1-(3+2) = -4. This is one case where using
+parentheses even if they are not needed might be a good idea, e.g. write (2/3)*4
+even though you could write 2/3*4. This is also a case where previewing your answer
+can save you a lot a grief since you will be able to see what you entered. 
+
+$BR
+Enter 2/3*4 and use the Preview button to see what you get.$BR
+\{ ans_rule(25) \}
+END_TEXT
+
+$ans = 8/3;
+ANS(std_num_cmp($ans));
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/courses.dist/modelCourse/templates/set0/prob1c.pg b/courses.dist/modelCourse/templates/set0/prob1c.pg
new file mode 100644
index 0000000000..a0fa3c8896
--- /dev/null
+++ b/courses.dist/modelCourse/templates/set0/prob1c.pg
@@ -0,0 +1,15 @@
+
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+	"PG.pl",
+	"PGbasicmacros.pl",
+	"PGchoicemacros.pl",
+	"PGanswermacros.pl",
+	"PGauxiliaryFunctions.pl"
+);
+
+TEXT("Hello world");
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/courses.dist/modelCourse/templates/set0/prob2.pg b/courses.dist/modelCourse/templates/set0/prob2.pg
new file mode 100644
index 0000000000..45346fbf96
--- /dev/null
+++ b/courses.dist/modelCourse/templates/set0/prob2.pg
@@ -0,0 +1,72 @@
+##DESCRIPTION
+##  sample true-false question
+##ENDDESCRIPTION
+
+##KEYWORDS('true-false')
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+"PG.pl",
+"PGbasicmacros.pl",
+"PGchoicemacros.pl",
+"PGanswermacros.pl",
+"PGauxiliaryFunctions.pl"
+);
+
+TEXT(beginproblem());
+$showPartialCorrectAnswers = 1;
+
+TEXT(EV2(<<EOT));
+This problem demonstrates a WeBWorK True/False question. $PAR
+Enter a T or an F in each answer space below
+to indicate whether the corresponding statement is true or
+false.$BR
+You must get all of the answers correct to receive credit.
+$BR
+EOT
+
+## First we set up our variables.
+$a = random(1,5,1);
+$b = random(6,10,1);
+$c = random(-10,-1,1);
+$d = random(-10,-1,1);
+$e = random(1,10,1);
+
+$questStr1 = EV2(" \(-$a \lt -$b\)");
+$ansStr1 = "F";
+$questStr2 = EV2(" \($c \leq $c\)");
+$ansStr2 = "T";
+$questStr3 = EV2(" \($d \lt $d\)");
+$ansStr3 = "F";
+$questStr4 = EV2(" \(\pi \geq 3.1416\)");
+$ansStr4 = "F";
+$questStr5 = EV2(" \($e-1 \leq $e\)");
+$ansStr5 = "T";
+
+@questions =( $questStr1,$questStr2,$questStr3,$questStr4,$questStr5);
+@answers =( $ansStr1,$ansStr2,$ansStr3,$ansStr4,$ansStr5);
+
+## Now choose randomly 4  questions out of the 5 question strings above.
+
+@slice = NchooseK(scalar(@questions),4);
+
+## Next we output the 4 chosen questions.  #match_
+TEXT(
+&match_questions_list(@questions[@slice])
+);
+
+ANS(str_cmp([ @answers[@slice] ] ));
+TEXT(<<EOT);
+$PAR Notice that if one of your answers is wrong then, in this problem, WeBWorK will tell you which
+parts are wrong and which parts are right.  This is the behavior for most problems, but for true/false 
+or multiple choice questions
+WeBWorK will usually only tell you whether or not all the answers are correct.
+It won't tell you which ones are wrong.  The idea is to encourage you to think rather than to just try guessing.
+$PAR 
+In every case all of the
+answers must be correct before you get credit for the problem.
+
+
+EOT
+ENDDOCUMENT();        # This should be the last executable line in the problem.
\ No newline at end of file
diff --git a/courses.dist/modelCourse/templates/set0/prob3.pg b/courses.dist/modelCourse/templates/set0/prob3.pg
new file mode 100644
index 0000000000..6d8618321e
--- /dev/null
+++ b/courses.dist/modelCourse/templates/set0/prob3.pg
@@ -0,0 +1,78 @@
+##DESCRIPTION
+##  sample matching problem
+##ENDDESCRIPTION
+
+##KEYWORDS('sample')
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+"PG.pl",
+"PGbasicmacros.pl",
+"PGchoicemacros.pl",
+"PGanswermacros.pl",
+"PGauxiliaryFunctions.pl"
+);
+
+TEXT(beginproblem());
+$showPartialCorrectAnswers = 0;
+
+
+$a = random(-10,10,1);
+$b = random(1,3,1);
+$c = abs($a);
+#$indextag = abs(($a < 0) -2)
+if ($a <0) {$sgn  = "+";} else 	{$sgn  = "-";}
+#$sgn = choose(indextag,"+","-")
+## If e.g. $a = -3, write |x+3| instead of |x--3|
+## Write an ifThenElse macro
+$questStr1 = EV2(" \(x\) is less than $a" );
+$ansStr1 = EV2(" \(x \lt $a\)");
+$questStr2 =EV2( " \(x\) is any real number" );
+$ansStr2 = EV2(" \(-\infty \lt x \lt \infty\)");
+$questStr3 = EV2(" \(x\) is greater than $a" );
+$ansStr3 = EV2(" \($a \lt x\)");
+$questStr4 = EV2(" \(x\) is less than or equal to $a" );
+$ansStr4 = EV2(" \(x \leq $a\)");
+$questStr5 = EV2(" \(x\) is greater than or equal to $a");
+$ansStr5 = EV2(" \(x \geq $a\)");
+$questStr6 = EV2(" The distance from \(x\) to $a is less than or equal to $b");
+$ansStr6 = EV2(" \(|x $sgn $c| \leq $b\)");
+$questStr7 = EV2(" The distance from \(x\) to $a is more than $b");
+$ansStr7 = EV2(" \(|x $sgn $c| \gt $b\)");
+
+@questions =( $questStr1,$questStr2,$questStr3,$questStr4,$questStr5,$questStr6,$questStr7);
+@answers =( $ansStr1,$ansStr2,$ansStr3,$ansStr4,$ansStr5,$ansStr6,$ansStr7);
+
+# Now randomize the questions:
+@slice = &NchooseK(7,5);
+@shuffle = &shuffle(scalar(@slice));
+################################################################################
+
+TEXT(EV2(<<EOT));
+This problem demonstrates a WeBWorK Matching question. $PAR
+Match the statements defined below with the letters labeling their
+equivalent expressions.	$BR
+You must get all of the answers correct to receive credit.
+$BR
+EOT
+TEXT(
+&match_questions_list(@questions[@slice]),
+&OL(@answers[@slice[@shuffle]])
+);
+ANS( str_cmp([ @ALPHABET[&invert(@shuffle)] ] ) );
+     ##the correct answers are obtained by applying
+     ##the inverse (adjoint) permutation to the captions.
+
+TEXT(<<EOT);
+For this problem WeBWorK only tells you that all your answers are correct or that at least one is wrong. 
+This makes the problem harder and is usually used only for T/F and matching questions.  
+The idea is to encourage you to think rather than to just try guessing.
+$PAR
+If you are having trouble reading the mathematics on the screen, this means that you are using "text" mode.  
+If you are using Netscape or MSIE then you can get an easier to read version of the equations by returning to the 
+problem list page (use the button at the top of this page) and choosing "formatted-text" or "typeset" instead 
+of "text". Sometimes there is a 15-20 second delay in viewing a problem in "typeset" mode the first time.
+EOT
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
\ No newline at end of file
diff --git a/courses.dist/modelCourse/templates/set0/prob4/1-55141.gif b/courses.dist/modelCourse/templates/set0/prob4/1-55141.gif
new file mode 100644
index 0000000000..8cea562d40
Binary files /dev/null and b/courses.dist/modelCourse/templates/set0/prob4/1-55141.gif differ
diff --git a/courses.dist/modelCourse/templates/set0/prob4/1-65474.gif b/courses.dist/modelCourse/templates/set0/prob4/1-65474.gif
new file mode 100644
index 0000000000..8fea5b6289
Binary files /dev/null and b/courses.dist/modelCourse/templates/set0/prob4/1-65474.gif differ
diff --git a/courses.dist/modelCourse/templates/set0/prob4/1-75352.gif b/courses.dist/modelCourse/templates/set0/prob4/1-75352.gif
new file mode 100644
index 0000000000..606d238a33
Binary files /dev/null and b/courses.dist/modelCourse/templates/set0/prob4/1-75352.gif differ
diff --git a/courses.dist/modelCourse/templates/set0/prob4/1-79226.gif b/courses.dist/modelCourse/templates/set0/prob4/1-79226.gif
new file mode 100644
index 0000000000..1e85ab3d10
Binary files /dev/null and b/courses.dist/modelCourse/templates/set0/prob4/1-79226.gif differ
diff --git a/courses.dist/modelCourse/templates/set0/prob4/2-11287.gif b/courses.dist/modelCourse/templates/set0/prob4/2-11287.gif
new file mode 100644
index 0000000000..905ef42987
Binary files /dev/null and b/courses.dist/modelCourse/templates/set0/prob4/2-11287.gif differ
diff --git a/courses.dist/modelCourse/templates/set0/prob4/2-63428.gif b/courses.dist/modelCourse/templates/set0/prob4/2-63428.gif
new file mode 100644
index 0000000000..e6b270eb20
Binary files /dev/null and b/courses.dist/modelCourse/templates/set0/prob4/2-63428.gif differ
diff --git a/courses.dist/modelCourse/templates/set0/prob4/2-68382.gif b/courses.dist/modelCourse/templates/set0/prob4/2-68382.gif
new file mode 100644
index 0000000000..445423d474
Binary files /dev/null and b/courses.dist/modelCourse/templates/set0/prob4/2-68382.gif differ
diff --git a/courses.dist/modelCourse/templates/set0/prob4/2-96187.gif b/courses.dist/modelCourse/templates/set0/prob4/2-96187.gif
new file mode 100644
index 0000000000..6eef7ea92c
Binary files /dev/null and b/courses.dist/modelCourse/templates/set0/prob4/2-96187.gif differ
diff --git a/courses.dist/modelCourse/templates/set0/prob4/3-18387.gif b/courses.dist/modelCourse/templates/set0/prob4/3-18387.gif
new file mode 100644
index 0000000000..3e603b5ab1
Binary files /dev/null and b/courses.dist/modelCourse/templates/set0/prob4/3-18387.gif differ
diff --git a/courses.dist/modelCourse/templates/set0/prob4/3-44144.gif b/courses.dist/modelCourse/templates/set0/prob4/3-44144.gif
new file mode 100644
index 0000000000..37faf77fcf
Binary files /dev/null and b/courses.dist/modelCourse/templates/set0/prob4/3-44144.gif differ
diff --git a/courses.dist/modelCourse/templates/set0/prob4/3-55459.gif b/courses.dist/modelCourse/templates/set0/prob4/3-55459.gif
new file mode 100644
index 0000000000..3abf599754
Binary files /dev/null and b/courses.dist/modelCourse/templates/set0/prob4/3-55459.gif differ
diff --git a/courses.dist/modelCourse/templates/set0/prob4/3-69221.gif b/courses.dist/modelCourse/templates/set0/prob4/3-69221.gif
new file mode 100644
index 0000000000..76adf97ee8
Binary files /dev/null and b/courses.dist/modelCourse/templates/set0/prob4/3-69221.gif differ
diff --git a/courses.dist/modelCourse/templates/set0/prob4/prob4.pg b/courses.dist/modelCourse/templates/set0/prob4/prob4.pg
new file mode 100644
index 0000000000..d0384ba476
--- /dev/null
+++ b/courses.dist/modelCourse/templates/set0/prob4/prob4.pg
@@ -0,0 +1,99 @@
+##DESCRIPTION
+##  Goal: Identify that a line represents an increasing, decreasing or constant function
+##  or is not the graph of a function (when the line is vertical).
+##  Contains an introduction explaining the importance of linear (affine) functions.
+##ENDDESCRIPTION
+
+##KEYWORDS('graphs')
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+"PG.pl",
+"PGbasicmacros.pl",
+"PGchoicemacros.pl",
+"PGanswermacros.pl",
+"PGauxiliaryFunctions.pl"
+);
+
+TEXT(beginproblem());
+$showPartialCorrectAnswers = 0;
+
+
+$pictSet = random(1,3,1);  #there are three sets of graphs
+
+$pictNum = random(1,4,1);  #each set has 4 graphs the numbers are below
+
+@pictID = (
+"1-55141.gif",
+"1-79226.gif",
+"1-75352.gif",
+"1-65474.gif",
+"2-96187.gif",
+"2-11287.gif",
+"2-68382.gif",
+"2-63428.gif",
+"3-44144.gif",
+"3-69221.gif",
+"3-18387.gif",
+"3-55459.gif"
+);
+
+sub pictIndex{    # this gives offsets into @pictID -- I was too laxy to do multidimensional arrays
+	my ($i,$j)=@_;
+	return(($i-1)*4+$j-1 )
+	}
+	
+@question = ();
+@answer =();
+
+TEXT(
+
+ qq! This problem demonstrates a WeBWorK problem involving graphics. $PAR
+ The simplest functions are the linear (or affine) functions ---
+  the functions whose graphs are 
+ a straight line. They are important because many functions (the so-called
+ differentiable functions) ${LQ}locally$RQ look like straight lines.
+  (${LQ}locally$RQ means that 
+ if we zoom in and look at the function at very powerful magnification 
+ it will look like a straight line.)  $PAR
+ !,
+ "Enter the letter of the graph of the function which corresponds to 
+   each statement. $BR"
+ );
+ 
+qa(~~@question,~~@answer,
+"The graph of the line is increasing",
+@pictID[&pictIndex($pictSet,1)],
+"The graph of the line is decreasing",
+@pictID[&pictIndex($pictSet,2)],
+"The graph of the line is constant",
+@pictID[&pictIndex($pictSet,3)],
+"The graph of the line is not the graph of a function",
+@pictID[&pictIndex($pictSet,4)],
+);
+
+@slice = 0..3;							# select an ordered subset of the questions and answers
+@shuffle = &shuffle(scalar(@slice));    # create a permutation of the right length
+@images =  @answer[@slice[@shuffle]];   # create a permuted list of the answers
+@captions =@ALPHABET[0..3];             # the caption letters are always in order
+
+TEXT(
+&match_questions_list(@question[@slice]),
+&imageRow(~~@images,~~@captions)
+);
+
+ANS(std_str_cmp_list( @ALPHABET[&invert(@shuffle ) ] ) );
+
+TEXT(EV2(<<EOT));
+This is another problem where you aren't told if some of your answers are right. (With
+matching questions and true false questions, this is the standard behavior -- otherwise
+it is too easy to guess your way to the answer without learning anything.)
+$PAR
+If you are having a hard time seeing the picture clearly, click on the picture.  It will
+expand to a larger picture on its own page so that you can inspect it more closely.
+$PAR
+Some problems display a link to a web page where you can get additional information 
+or a hint:\{ htmlLink(alias("testing.html"),"Hint")\}
+EOT
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/courses.dist/modelCourse/templates/set0/prob5.pg b/courses.dist/modelCourse/templates/set0/prob5.pg
new file mode 100644
index 0000000000..6faa34b7e1
--- /dev/null
+++ b/courses.dist/modelCourse/templates/set0/prob5.pg
@@ -0,0 +1,44 @@
+##DESCRIPTION
+##  practice problem
+##ENDDESCRIPTION
+
+##KEYWORDS('sample')
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+"PG.pl",
+"PGbasicmacros.pl",
+"PGchoicemacros.pl",
+"PGanswermacros.pl",
+"PGauxiliaryFunctions.pl"
+);
+
+TEXT(beginproblem());
+$showPartialCorrectAnswers = 0;
+
+
+$a = random(100,200,1);
+$b = random(250,350,1);
+$c = random(-31,-3,1);
+TEXT(EV2(<<EOT));
+This problem demonstrates a WeBWorK question that requires you to enter a number or a fraction. $PAR
+Evaluate the expression \(\frac{|$a-$b|}{|$c|}\).  Give your answer in decimal notation
+correct to three decimal places or give your answer as a fraction.
+$BR $BR \{ANS_RULE(1,10) \}
+$BR
+EOT
+$ans = abs($a-$b)/abs($c);
+ANS(arith_num_cmp($ans));
+TEXT(<<EOT);
+$PAR
+Now that you have finished you can use the "Prob. List" button at the top of the page
+to return to the problem list page.  You'll see that the problems you have done have been
+labeled as correct or incorrect, so you can go back and do problems you skipped or couldn't
+get right the first time.  Once you have done a problem correctly it is ALWAYS listed as correct
+even if you go back and do it incorrectly later.  This means you can use WeBWorK to review
+course material without any danger of changing your grade.
+
+EOT
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/courses.dist/modelCourse/templates/set0/screenHeaderFile0.pg b/courses.dist/modelCourse/templates/set0/screenHeaderFile0.pg
new file mode 100644
index 0000000000..391c7c0cc5
--- /dev/null
+++ b/courses.dist/modelCourse/templates/set0/screenHeaderFile0.pg
@@ -0,0 +1,45 @@
+##Screen set header for set 0, Fall 1998
+
+&DOCUMENT;
+
+loadMacros(
+"PG.pl",
+"PGbasicmacros.pl",
+"PGchoicemacros.pl",
+"PGanswermacros.pl"
+);
+
+
+
+BEGIN_TEXT;
+WeBWorK assignment number $setNumber is due $formatedDueDate.
+ 
+$PAR
+This first problem set (set 0) is designed to acquaint you with using WeBWorK.
+YOUR SCORE ON THIS SET WILL NOT BE COUNTED TOWARD YOUR FINAL GRADE.
+In addition to doing the screen problems, practice getting a hard copy print out of the 
+problem set.  You probably won't need it for this problem set, but you may in the future.
+
+$PAR
+The primary purpose of WeBWorK is to let you know if you are getting the right answer or to alert
+you if you get the wrong answer. Usually you can attempt a problem as many times as you want before
+the due date.  However, if you are having trouble figuring out your error, you should
+consult the book, or ask a fellow student, one of the TA's or
+your professor for help.  Don't spend a lot of time guessing -- it's not very efficient or effective.
+$PAR
+
+You can use the Feedback button on each problem
+page to send e-mail to the professors. 
+$PAR
+Give 4 or 5  significant digits for (floating point) numerical answers.
+For most problems when entering numerical answers, you can if you wish
+enter elementary expressions such as 2^3 instead of 8, sin(3pi/2) instead
+of -1, e^(ln(2)) instead of 2,
+(2+tan(3))*(4-sin(5))^6-7/8 instead of 27620.3413, etc. 
+
+Here's the list of 
+\{ htmlLink(qq!http://webwork.maa.org/wiki/Available_Functions!,"functions and symbols") \}
+ that WeBWorK understands.
+END_TEXT
+
+&ENDDOCUMENT;
diff --git a/courses.dist/modelCourse/templates/setDemo.def b/courses.dist/modelCourse/templates/setDemo.def
new file mode 100644
index 0000000000..528c8176b6
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setDemo.def
@@ -0,0 +1,27 @@
+setNumber=Demo
+openDate = 1/10/98 at 6:00am
+dueDate = 1/1/06 at 2:00am
+answerDate = 1/1/06 at 2:00am
+paperHeaderFile = setDemo/paperHeaderFile1.pg
+screenHeaderFile = setDemo/screenHeaderFile1.pg
+
+problemList =
+
+setDemo/srw1_9_4.pg,            1
+setDemo/limits.pg,              1
+setDemo/s2_2_1.pg,              1
+setDemo/c4s5p2.pg,              1
+setDemo/sample_units_ans.pg,    1
+
+setDemo/prob0837.pg,            1
+setDemo/nsc2s10p2.pg,           1
+setDemo/prob5.pg,               1
+setDemo/prob6b.pg,              1
+setDemo/sample_myown_ans.pg,    1
+ 
+
+
+
+
+
+
diff --git a/courses.dist/modelCourse/templates/setDemo/c4s5p2.pg b/courses.dist/modelCourse/templates/setDemo/c4s5p2.pg
new file mode 100644
index 0000000000..9adac50e0e
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setDemo/c4s5p2.pg
@@ -0,0 +1,50 @@
+#DESCRIPTION
+#KEYOWRDS('integrals', 'substitution')
+# Integrals - \int_0^{$x1}  x(x^2 ?{$a})^5 dx
+# Substitution
+#ENDDESCRIPTION
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros("PGbasicmacros.pl",
+           "PGchoicemacros.pl",
+           "PGanswermacros.pl",
+			"PGauxiliaryFunctions.pl"
+);
+
+TEXT(beginproblem());
+$showPartialCorrectAnswers = 1;
+
+$n = random(3,6,1);
+$n1 = $n-1;
+
+BEGIN_TEXT
+Find \[ F(x) =  \int  x^{$n1}\cos(x^{$n}) \; dx \]
+Give a specific function for \( F(x) \). $BR $BR
+
+F(x) = \{ans_rule(45)\}
+END_TEXT
+
+$ans = "sin(x^$n)/$n";
+ANS(function_cmp_up_to_constant($ans ));
+
+#$ans = "sin(x^$n)/$n + c";  # c is the constant of integration which
+                            # is a free parameter. It can be adjusted
+                            # to match the student's answer.
+#ANS( fun_cmp($ans, params => ['c'] ) );
+$a1= random(-9,-1,1);
+$b1= random(0,9,1);
+
+BEGIN_TEXT
+$BR $BR
+Evaluate \[ F(x) =  \int_{$a1}^{$b1} x^{$n1}\cos(x^{$n}) \; dx \]
+$BR 
+\{ans_rule(50)\}
+END_TEXT
+
+$ans = (sin($b1**$n) - sin($a1**$n))/$n;
+
+&ANS(num_cmp($ans ));
+
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/courses.dist/modelCourse/templates/setDemo/calc.html b/courses.dist/modelCourse/templates/setDemo/calc.html
new file mode 100644
index 0000000000..1056894e8f
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setDemo/calc.html
@@ -0,0 +1,57 @@
+<HTML>
+<HEAD>
+<TITLE>The JavaScript Source:  Calculators:  Basic</TITLE>
+<META HTTP-EQUIV="The JavaScript Source" CONTENT="no-cache">
+<META NAME="description" CONTENT="This is a very simple calculator, all done with javascript. Just click the numbers and the operators and use the "=" button to calculate! This is a neat example of the LIMITLESS (!) powers of JavaScript.">
+</HEAD>
+
+<BODY BGCOLOR=#ffffff vlink=#0000ff>
+
+<P>
+
+
+I took this calculator straight from the web at <A HREF="http://javascriptsource.com">javascriptsource.com</A>
+<P>
+
+This is a very simple calculator, 
+all done with javascript. 
+Just click the numbers and
+the operators and use the "=" button to calculate! 
+
+<CENTER>
+<FORM NAME="Calc">
+<TABLE BORDER=4>
+<TR>
+<TD>
+<INPUT TYPE="text"   NAME="Input" Size="16">
+<br>
+</TD>
+</TR>
+<TR>
+<TD>
+<INPUT TYPE="button" NAME="one"   VALUE="  1  " OnClick="Calc.Input.value += '1'">
+<INPUT TYPE="button" NAME="two"   VALUE="  2  " OnCLick="Calc.Input.value += '2'">
+<INPUT TYPE="button" NAME="three" VALUE="  3  " OnClick="Calc.Input.value += '3'">
+<INPUT TYPE="button" NAME="plus"  VALUE="  +  " OnClick="Calc.Input.value += ' + '">
+<br>
+<INPUT TYPE="button" NAME="four"  VALUE="  4  " OnClick="Calc.Input.value += '4'">
+<INPUT TYPE="button" NAME="five"  VALUE="  5  " OnCLick="Calc.Input.value += '5'">
+<INPUT TYPE="button" NAME="six"   VALUE="  6  " OnClick="Calc.Input.value += '6'">
+<INPUT TYPE="button" NAME="minus" VALUE="  -  " OnClick="Calc.Input.value += ' - '">
+<br>
+<INPUT TYPE="button" NAME="seven" VALUE="  7  " OnClick="Calc.Input.value += '7'">
+<INPUT TYPE="button" NAME="eight" VALUE="  8  " OnCLick="Calc.Input.value += '8'">
+<INPUT TYPE="button" NAME="nine"  VALUE="  9  " OnClick="Calc.Input.value += '9'">
+<INPUT TYPE="button" NAME="times" VALUE="  x  " OnClick="Calc.Input.value += ' * '">
+<br>
+<INPUT TYPE="button" NAME="clear" VALUE="  c  " OnClick="Calc.Input.value = ''">
+<INPUT TYPE="button" NAME="zero"  VALUE="  0  " OnClick="Calc.Input.value += '0'">
+<INPUT TYPE="button" NAME="DoIt"  VALUE="  =  " OnClick="Calc.Input.value = eval(Calc.Input.value)">
+<INPUT TYPE="button" NAME="div"   VALUE="  /  " OnClick="Calc.Input.value += ' / '">
+<br>
+</TD>
+</TR>
+</TABLE>
+</FORM>
+</CENTER>
+</body></html>
diff --git a/courses.dist/modelCourse/templates/setDemo/josephus.pg b/courses.dist/modelCourse/templates/setDemo/josephus.pg
new file mode 100644
index 0000000000..0cfeb57af3
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setDemo/josephus.pg
@@ -0,0 +1,206 @@
+&DOCUMENT();
+loadMacros("PGbasicmacros.pl",
+           "PGchoicemacros.pl",
+           "PGanswermacros.pl",
+); 
+# define function to be evaluated
+
+HEADER_TEXT(<<EOF);
+<script LANGUAGE="JavaScript">
+
+function joeGame(n, k, m){
+this.people = n
+this.skip = k
+this.keep = m
+this.list = new Array(n)
+for (var i=0; i<n; i++) {
+	this.list[i] = 0
+	}
+}
+
+var currentGame = new joeGame(10,0,0)
+
+function joeth(n, k, s) {
+var x = k*s
+while (x > n) {
+	x = Math.floor(( k*(x-n) - 1.0 )/ (k-1.0) )
+	}
+return(x)
+}
+
+function playGame() {
+
+var newN = parseInt(document.gameForm.peopleNumField.value)
+var newK = parseInt(document.gameForm.skipNumField.value)
+
+var suff = new String("th")
+
+var s
+var n = newN
+var k = newK
+var numRows = Math.floor(n/20)
+var numLeft = n - 20*numRows
+
+if (!newN || !newK) {
+	alert ("Enter some data.")
+	document.gameForm.peopleNumField.focus()
+	}
+else
+	{
+
+currentGame = new joeGame(n, k, 1)
+
+for (var s=1; s<=currentGame.people; s++){
+	currentGame.list[s-1] = joeth(n, k, s)
+	}
+
+if ((newK % 10) == 1) {
+	if ((newK == 1) || (newK > 20)) {
+		suff = "st" 
+	}
+	else {
+		suff="th"
+		}
+} 
+else 	{
+	if ((newK % 10) == 2){
+		if ((newK == 2) || (newK > 20)) {
+			suff = "nd" 
+		} 
+		else {
+			suff="th"
+			}
+	}
+	else	{
+		if ((newK % 10) == 3){
+			if ((newK == 3) || (newK > 20)) {
+				suff = "rd" }
+		else {
+			suff="th"
+			}
+		}
+	}
+}
+
+parent.gameStatus.document.clear()
+parent.gameStatus.document.write("<H2> The Josephus Game </H2>")
+parent.gameStatus.document.write("<FONT SIZE=2> Playing the Josephus Game with <B>" + 
+     document.gameForm.peopleNumField.value + "</B> people, ")
+parent.gameStatus.document.write(" eliminating every <B>" + 
+     document.gameForm.skipNumField.value + "</B><SUP>" + suff + "</SUP> person, leaves ")
+parent.gameStatus.document.write(" person <U><B>" + currentGame.list[n-1] + "</B></U> as the last survivor. ")
+parent.gameStatus.document.write("<P>The entire elimination order is <BR><BR>")
+
+for (var d=0; d<numRows; d++) {
+	parent.gameStatus.document.write("<TABLE BORDER=1> \n <TR> <TH> Order Eliminated </TH>")
+  	for (var k=1; k<=20; k++) {
+		parent.gameStatus.document.write(" <TD> " + (20*d + k) + " </TD> ")
+		}
+  	parent.gameStatus.document.write("</TR> \n <TR> <TH> Person Eliminated </TH> ")
+
+  	for (k=0; k<20; k++) {
+		parent.gameStatus.document.write(" <TD> " + currentGame.list[20*d+k] + " </TD> ")
+		}
+  	parent.gameStatus.document.write("</TR> \n </TABLE> <BR>")
+	}
+if (numLeft > 0) {
+	parent.gameStatus.document.write("<TABLE BORDER=1> \n <TR> <TH> Order Eliminated</TH>")
+  	for (var k=1; k<=numLeft; k++) {
+		parent.gameStatus.document.write(" <TD> " + (20*d + k) + " </TD> ")
+		}
+  	parent.gameStatus.document.write("</TR> \n <TR> <TH> Person Eliminated </TH> ")
+
+  	for (k=0; k<numLeft; k++) {
+		parent.gameStatus.document.write(" <TD> " + currentGame.list[20*d+k] + " </TD> ")
+		}
+  	parent.gameStatus.document.write("</TR> \n </TABLE> <BR></FONT>")
+	}
+	}
+	parent.gameStatus.document.close()
+}
+
+
+function clearStuff(){
+parent.gameStatus.document.open()
+parent.gameStatus.document.clear()
+parent.gameStatus.document.location = "gamestart.html"
+parent.gameStatus.document.close()
+document.gameForm.peopleNumField.focus()
+currentGame.people = 10
+currentGame.skip = 0
+currentGame.keep = 0
+for (var i=0; i++; i<currentGame.people) {
+	currentGame.list[i] = 0
+	}
+}
+
+
+function main() {
+parent.gameStatus.document.open()
+playGame()
+parent.gameStatus.document.close()
+}
+
+</script>
+
+
+EOF
+
+
+TEXT(beginproblem());
+TEXT(MODES(
+TeX	 		=>	'',
+Latex2HTML	=> "\begin{rawhtml} <NOSCRIPT> This problem requires that Java
+ 				Script be enabled </NOSCRIPT> \end{rawhtml}",
+HTML		=> "<NOSCRIPT> This problem requires that Java Script be 
+				enabled </NOSCRIPT>"
+));
+
+BEGIN_TEXT
+$PAR
+This problem illustrates how you can embed JavaScript code in a WeBWorK example
+to create an interactive homework problem that could never be provided by a text book.
+Stolen from Doug Ensley and mathDL.
+http://www.mathdl.org/offsite.html?page=http://www.ship.edu/~deensl/mathdl/Joseph.html&content_id=41520
+END_TEXT
+
+BEGIN_TEXT
+<script>
+    document.main();
+</script>
+END_TEXT
+TEXT(<<EOF);
+<form NAME="gameForm" onReset="clearStuff()">
+<table CELLSPACING=10 CELLPADDING=10 >
+<tr VALIGN=TOP>
+<td>
+<table>
+<tr>
+<th><i>n</i> =&nbsp;</th>
+
+<td><input TYPE="text" NAME="peopleNumField" SIZE=5></td>
+</tr>
+
+<tr>
+<th><i>k</i> =&nbsp;</th>
+
+<td><input TYPE="text" NAME="skipNumField" SIZE=5></td>
+</tr>
+</table>
+<input TYPE="button" NAME="playButton" VALUE="Start" 
+    onClick="playGame()"><input TYPE="reset" NAME="resetButton" VALUE="Clear All"></td>
+
+<td WIDTH="200"><font size=-1>Set the parameters and press <b>Start</b>
+to see the elimination order when you start with <b><i>n</i></b> people
+and eliminate every <b><i>k</i></b><sup>th</sup> one.</font></td>
+</tr>
+</table>
+
+<p></form>
+EOF
+$ans =3;
+
+ANS(num_cmp($ans,reltol=>1,format =>"%0.14g") );  #We are allowing 1 percent error for the answer.
+
+			
+ENDDOCUMENT();
\ No newline at end of file
diff --git a/courses.dist/modelCourse/templates/setDemo/limits.pg b/courses.dist/modelCourse/templates/setDemo/limits.pg
new file mode 100644
index 0000000000..61b42252e7
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setDemo/limits.pg
@@ -0,0 +1,90 @@
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+	"PGbasicmacros.pl",
+	"PGchoicemacros.pl",
+	"PGanswermacros.pl",
+	"PGgraphmacros.pl",
+	"PGauxiliaryFunctions.pl"
+);
+
+TEXT(&beginproblem);
+$showPartialCorrectAnswers = 1;
+
+$a=random(-3,3,1);
+$b=random(-2,3,1);
+$c=random(-3,2,1);
+$m1=random(-1,1,0.5);
+$m2=($b - $a)/2;
+$m3=($c - $b - 1)/2;
+$m4=random(-1,1,0.5);
+@slice = NchooseK(3,3);
+
+@colors = ("blue", "red", "green");
+@sc = @colors[@slice];  #scrambled colors
+@sa = ('A','B','C')[@slice];
+
+$f1 = FEQ("${m1}(x+1) + $a for x in [-2,-1) using color:$sc[0] and weight:2");
+$f2 = FEQ("${m2}(x-1) + $b for x in (-1,1) using color=$sc[0] and weight:2");
+$f3 = FEQ("${m3}(x-3) + $c for x in [1,3) using color=$sc[0] and weight=2");
+$f4 = FEQ("1+$a for x in [-1,-1] using color=$sc[0] and weight=2");
+$f5 = FEQ("${m4}(x-3) + $c for x in (3,4] using color=$sc[0] and weight=2");
+
+$graph = init_graph(-3,-6,5,6,'axes'=>[0,0],'grid'=>[8,12]);
+
+($f1Ref,$f2Ref,$f3Ref,$f4Ref,$f5Ref) = plot_functions($graph,$f1,$f2,$f3,$f4,$f5);
+
+BEGIN_TEXT
+Let F be the function below.$PAR
+If you are having a hard time seeing the picture clearly, click on the picture.  It will expand to a larger picture on its own page so that you can inspect it more clearly.$PAR
+END_TEXT
+
+TEXT(image( insertGraph($graph), height=>200, width=>200 ));
+
+BEGIN_TEXT
+$BR
+$BR
+Evaluate each of the following expressions.  $PAR
+Note:  Enter 'DNE' if the limit does not exist or is not defined. $PAR
+
+a) \( \lim_{x \to -1^-} F(x) \) = \{ans_rule(4)\}
+$PAR
+
+b) \( \lim_{x \to -1^+} F(x) \) = \{ans_rule(4)\}
+$PAR
+
+c) \( \lim_{x \to -1} F(x) \) = \{ans_rule(4)\}
+$PAR
+
+d) \( F(-1) \) = \{ans_rule(4)\}
+$PAR
+
+e) \( \lim_{x \to 1^-} F(x) \) = \{ans_rule(4)\}
+$PAR
+
+f) \( \lim_{x \to 1^+} F(x) \) = \{ans_rule(4)\}
+$PAR
+
+g) \( \lim_{x \to 1} F(x) \) = \{ans_rule(4)\}
+$PAR
+
+h) \( \lim_{x \to 3} F(x) \) = \{ans_rule(4)\}
+$PAR
+
+i) \( F(3) \) = \{ans_rule(4)\}
+$PAR
+
+END_TEXT
+
+$ap1 = 1 + $a;
+$bp1 = 1 + $b;
+
+# limits at -1
+ANS(num_cmp( [ $a, $a, $a, $ap1] , strings => ['DNE'] ))  ;
+# limits at 1
+ANS(num_cmp( [ $b, $bp1,'DNE'] , strings => ['DNE'] ))  ;
+# limits at 3
+ANS(num_cmp( [ $c, 'DNE' ] , strings => ['DNE'] ))  ;
+
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
\ No newline at end of file
diff --git a/courses.dist/modelCourse/templates/setDemo/liteApplet1.pg b/courses.dist/modelCourse/templates/setDemo/liteApplet1.pg
new file mode 100644
index 0000000000..7a8cc4c075
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setDemo/liteApplet1.pg
@@ -0,0 +1,68 @@
+DOCUMENT();
+
+loadMacros("PGbasicmacros.pl",
+           "PGchoicemacros.pl",
+           "PGanswermacros.pl",
+); 
+
+$showPartialCorrectAnswers = 1;
+TEXT(beginproblem());
+
+# The link to the java applet is hard wired to use the java applet
+# served from the University of Rochester WeBWorK machine.
+# It is possible to set this up so that the java applet is served
+# from any machine
+# For details use the Feedback button to contact the authors of WeBWorK
+
+BEGIN_TEXT
+This is  a lite applet designed by Frank Wattenberg.
+$BR
+\{htmlLink( '/webwork2_course_files/demoCourse/live_map_instructions.html ', 
+'Instructions for using the map',' target="intro" ' )\}
+$HR
+END_TEXT
+$appletText = 
+appletLink(
+q! archive="/courses/system_html/applets/Image_and_Cursor_All/Image_and_Cursor.jar" 
+code="Image_and_Cursor" width = 500 height = 458
+!,
+q!Your browser does not support Java, so nothing is displayed.
+   <param name = "applet_width" value = "500">
+   <param name = "applet_height" value = "458">
+   <param name = "image_width" value = "351">
+   <param name = "image_height" value = "378">
+   <param name = "backdrop_filename" value = "/courses/system_html/applets/Image_and_Cursor_All/AF-MAP.JPG">
+   <param name = "display_placement" value = "1">
+   <param name = "display_sw" value = "0">
+!
+);
+sub  dist {
+    my $ra_pt1 = shift;
+    my $ra_pt2 =shift;
+    my $conversion        = 300 /(145 - 72);  # number of km per pixel
+   return $conversion* sqrt( ($ra_pt1->[0] - $ra_pt2->[0])**2 + ($ra_pt1->[1] - $ra_pt2->[1])**2);
+}
+
+$kandahar          = [132,101];
+$kabul                = [209,185];
+$mazur_e_sharif = [170, 243];
+$shindand          = [46,  155];
+
+$questions = EV3(
+"$PAR   How far  is it from Kandahar to Kabul? " , ans_rule(30),
+" $PAR  How far  is it from Kabul to Mazar-e-Sharif? ", ans_rule(30),
+" $PAR   How far  is it from Kandahar to Shindand? "  , ans_rule(30),
+);
+#TEXT(
+#begintable(2),
+#row( $appletText, $questions),
+#endtable()
+#);
+TEXT($appletText, $questions);
+ANS(num_cmp(dist($kandahar,$kabul),           reltol => 3,   units=>'km'));
+ANS(num_cmp(dist($kabul, $mazur_e_sharif), reltol => 3,   units=>'km'));
+ANS(num_cmp(dist($kandahar,$shindand),      reltol => 3,  units=>'km'));
+
+
+			
+ENDDOCUMENT();
\ No newline at end of file
diff --git a/courses.dist/modelCourse/templates/setDemo/liteApplet2.pg b/courses.dist/modelCourse/templates/setDemo/liteApplet2.pg
new file mode 100644
index 0000000000..6f251df90e
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setDemo/liteApplet2.pg
@@ -0,0 +1,74 @@
+DOCUMENT();
+
+loadMacros("PGbasicmacros.pl",
+           "PGchoicemacros.pl",
+           "PGanswermacros.pl",
+); 
+
+$showPartialCorrectAnswers = 1;
+TEXT(beginproblem());
+
+
+BEGIN_TEXT
+This is  a lite applet designed by Frank Wattenberg.
+$BR
+\{htmlLink( '/webwork2_course_files/demoCourse/live_map_instructions.html ', 
+'Instructions for using the map',' target="intro" ' )\}
+$HR
+END_TEXT
+TEXT(
+appletLink(
+q! archive="/courses/system_html/applets/Image_and_Cursor_All/Image_and_Cursor.jar" 
+code="Image_and_Cursor" width = 500 height = 458
+!,
+q!Your browser does not support Java, so nothing is displayed.
+   <param name = "applet_width" value = "500">
+   <param name = "applet_height" value = "458">
+   <param name = "image_width" value = "351">
+   <param name = "image_height" value = "378">
+   <param name = "backdrop_filename" value = "/courses/system_html/applets/Image_and_Cursor_All/AF-MAP.JPG">
+   <param name = "display_placement" value = "1">
+   <param name = "display_sw" value = "0">
+!
+),
+);
+sub  dist {
+    my $ra_pt1 = shift;
+    my $ra_pt2 =shift;
+   $conversion        = 300 /(145 - 72);  # number of km per pixel
+   return $conversion * sqrt( ($ra_pt1->[0] - $ra_pt2->[0])**2 + ($ra_pt1->[1] - $ra_pt2->[1])**2);
+}
+@cities               = (
+  { name => 'Kandahar',             location =>   [132,101] },
+  { name => 'Kabul',                   location =>   [209,185] },
+  { name => 'Mazur e Sharif',     location =>    [170, 243] },
+  { name => 'Shindand',             location =>    [46,  155] },
+  { name => 'Zaranj',                  location =>    [39, 93] }
+);
+@index  = NchooseK(scalar(@cities), 3 );
+sub cityName {
+     my $index = shift ;
+    $cities[$index -1]->{name};
+}
+sub cityLoc {
+    my $index = shift;
+    $cities[$index-1]->{location};
+}
+
+$conversion        = 300 /(145 - 72);  # number of km per pixel
+BEGIN_TEXT
+$PAR
+How far  is it from  \{cityName($index[1])\} to \{cityName($index[2])\}? \{ans_rule(30)\}
+$PAR  
+How far  is it from  \{cityName($index[1])\} to \{cityName($index[3])\}? \{ans_rule(30)\}
+$PAR  
+How far  is it from \{cityName($index[2])\}  to \{cityName($index[3])\}? \{ans_rule(30)\}
+END_TEXT
+
+ANS(num_cmp(dist(cityLoc($index[1]),cityLoc($index[2])),  reltol=>3,          units=>'km'));
+ANS(num_cmp(dist(cityLoc($index[2]), cityLoc($index[2])),  reltol=>3,         units=>'km'));
+ANS(num_cmp(dist(cityLoc($index[2]),cityLoc($index[2])),   reltol=>3,         units=>'km'));
+
+
+			
+ENDDOCUMENT();
\ No newline at end of file
diff --git a/courses.dist/modelCourse/templates/setDemo/nsc2s10p2.pg b/courses.dist/modelCourse/templates/setDemo/nsc2s10p2.pg
new file mode 100644
index 0000000000..93bbc266e5
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setDemo/nsc2s10p2.pg
@@ -0,0 +1,67 @@
+#DESCRIPTION
+# Identify the graphs of the function and the derivative
+#ENDDESCRIPTION
+
+#KEYWORDS('derivatives', 'graphs')
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+	"PGbasicmacros.pl",
+	"PGchoicemacros.pl",
+	"PGanswermacros.pl",
+	"PGauxiliaryFunctions.pl",
+	"PGgraphmacros.pl"
+);
+
+TEXT(beginproblem());
+$showPartialCorrectAnswers = 0;
+
+$a=random(0, 6.3, .1);
+$b=random(1.1, 1.5, .1);
+
+$dom = 4;
+@slice = NchooseK(3,3);
+
+@colors = ("blue", "red", "black");
+@sc = @colors[@slice];  #scrambled colors
+@sa = ('A','B','C')[@slice];
+
+
+$f = "sin($a+$b*cos(x)) for x in <-$dom,$dom> using color:$sc[0] and weight:2";
+$fp = "cos($a+$b*cos(x))*(-$b)*sin(x)   for x in <-$dom,$dom> using color=$sc[1] and weight:2";
+$fpp = " -sin($a+$b*cos(x))*$b*$b*sin(x)*sin(x) + cos($a+$b*cos(x))*(-$b)*cos(x) for x in <-$dom,$dom> using color=$sc[2] and weight=2";
+
+$graph = init_graph(-4,-4,4,4,'axes'=>[0,0],'grid'=>[8,8]);
+
+($fRef,$fpRef,$fppRef) = plot_functions( $graph,
+               $f,$fp,$fpp
+                           );
+
+# create labels
+
+$label_point=-0.75;
+$label_f = new Label ( $label_point,&{$fRef->rule}($label_point),$sa[0],"$sc[0]",'left')        ;
+        # NOTE: $fRef->rule is a reference to the subroutine which calculates the
+        # function.  It was defined in the output of plot_functions. It is used here
+        # to calculate the y value of the label corresponding to the function,
+        # and below to find the y values for the labels corresponding to the
+        # first and second derivatives.
+
+$label_fp = new Label ( $label_point,&{$fpRef->rule}($label_point),$sa[1],"$sc[1]",'left')      ;
+$label_fpp = new Label ( $label_point,&{$fppRef->rule}($label_point),$sa[2],"$sc[2]",'left');
+
+# insert the labels into the graph
+
+$graph->lb($label_f,$label_fp,$label_fpp);
+
+BEGIN_TEXT
+\{ image(insertGraph($graph))\}$BR
+Identify the graphs A (blue), B( red) and C (green) as the graphs of a function and its
+derivatives:$PAR
+\{ans_rule(4)\} is the graph of the function $PAR
+\{ans_rule(4)\} is the graph of the function's first derivative $PAR
+\{ans_rule(4)\} is the graph of the function's second derivative $PAR
+END_TEXT
+ANS(std_str_cmp_list( @sa ) );
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/courses.dist/modelCourse/templates/setDemo/paperHeaderFile1.pg b/courses.dist/modelCourse/templates/setDemo/paperHeaderFile1.pg
new file mode 100644
index 0000000000..eb04aff8e2
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setDemo/paperHeaderFile1.pg
@@ -0,0 +1,31 @@
+##Problem set header for set 0, Spring 1999
+
+&DOCUMENT;
+
+loadMacros(
+"PG.pl",
+"PGbasicmacros.pl",
+"PGchoicemacros.pl",
+"PGanswermacros.pl"
+);
+
+$dateTime = $formatedDueDate;
+
+TEXT(EV2(<<EOT));
+$BEGIN_ONE_COLUMN
+\noindent {\large \bf $studentName}
+\hfill
+\noindent {\large \bf MAA Minicourse San Diego January 2002}
+\par
+\noindent{\large \bf Homework Set $setNumber  due $dateTime}\par
+
+\noindent This is a demonstration set designed to show you some types of questions 
+that can be asked using WeBWorK. 
+
+\par
+\noindent You may need to give 4 or 5 significant digits for some (floating point) 
+numerical answers in order to have them accepted by the computer.
+$END_ONE_COLUMN
+EOT
+
+&ENDDOCUMENT;
diff --git a/courses.dist/modelCourse/templates/setDemo/prob0837.pg b/courses.dist/modelCourse/templates/setDemo/prob0837.pg
new file mode 100644
index 0000000000..62e556e756
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setDemo/prob0837.pg
@@ -0,0 +1,66 @@
+DOCUMENT(); 
+
+loadMacros( "PGbasicmacros.pl",
+	             "PGauxiliaryFunctions.pl",
+	             "PGchoicemacros.pl",
+	             "PGanswermacros.pl",
+	             "PGgraphmacros.pl",
+	             "PG_CAPAmacros.pl"
+);
+	 
+TEXT(beginproblem());
+	
+# machine translated from CAPA.  
+# This is probaly not a good model for elegant PG code.	
+## **************************************
+## 
+## Projectile motion.
+## By F. Wolfs, WOLFS@NSRL31.NSRL.Rochester.edu
+## No unauthorized commercial use
+## Imported Files
+## ${CAPA_Tools}Problem
+## ${CAPA_GraphicsDirectory}Gtype08/prob37.eps
+## Values needing defined:
+## prob_val (number, e.g. /LET prob_val=1)
+## prob_try (number, e.g. /LET prob_try=5)
+## 
+## Last modified 07/08/97
+## by: Patrick D. Freivald, patrick@freivald.org
+## 
+## **************************************
+## 
+$L = random( 2.0   , 10.0   , 0.2   )   ;  
+$h = random( 0.5   , 0.5 * $L   , 0.1   )   ;  
+$Theta = random( 35.0   , 60.0   , 1.0   )   ;  
+$v0_sq = $smallg * $L /  ( 2.0 * cos( $Theta * $degrad   ) * cos( $Theta * $degrad   ) * ( tan( $Theta * $degrad   )  - $h /  $L    )    )   ;  
+$v0 = pow( $v0_sq   , 0.5   )   ;  
+## 
+CAPA_import( " ${CAPA_Tools}Problem " );   
+TEXT(CAPA_EV (<<'END_OF_TEXT'));
+A basketball player throws the ball at a \{  spf( $Theta    , "%0.0f" ) \}\{ $deg_u \} angle above the horizontal to a hoop which is located a horizontal distance \{ CAPA_tex( '/*L/*'  , 'L'  )  \} = \{  spf( $L    , "%0.1f" ) \} \{ $m_u \} from the point of release and at a height \{ CAPA_tex( '/*h/*'  , 'h'  )  \} = \{  spf( $h    , "%0.1f" ) \} \{ $m_u \} above it.  What is the required speed if the basketball is to reach the hoop?
+\{ CAPA_web( ''  , '\noindent {\centerline{\epsfxsize = 2.4 in \epsffile{${CAPA_GraphicsDirectory}Gtype08/prob37.eps}}}'  , '<img src = ${CAPA_Graphics_URL}Gtype08/prob37.gif align=center width=275>'  )  \}
+END_OF_TEXT
+
+## 
+
+TEXT("$BR$BR",ans_rule(30),"$BR");
+ANS( CAPA_ans( $v0   , 'format' => "%0.2e" , 'sig' => '3 PLUS 13', 'reltol' => 1   ,  'wgt' => $prob_val    ,  'tries' => $prob_try    ,  'unit' => 'm/s'    ) ); 
+ENDDOCUMENT();
+#####################
+
+###Error: $smallg not defined in this file
+###Error: $degrad not defined in this file
+###Error: $degrad not defined in this file
+###Error: $degrad not defined in this file
+###Error: $deg_u not defined in this file
+###Error: $m_u not defined in this file
+###Error: $m_u not defined in this file
+###Error: $prob_val not defined in this file
+###Error: $prob_try not defined in this file
+
+#####################
+
+
+#################################################
+## Processing time =  0 secs ( 0.56 usr  0.00 sys =  0.56 cpu)
+#################################################
diff --git a/courses.dist/modelCourse/templates/setDemo/prob5.pg b/courses.dist/modelCourse/templates/setDemo/prob5.pg
new file mode 100644
index 0000000000..7cf8acb646
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setDemo/prob5.pg
@@ -0,0 +1,138 @@
+&DOCUMENT();
+loadMacros("PGbasicmacros.pl",
+           "PGchoicemacros.pl",
+           "PGanswermacros.pl",
+); 
+######################################################### 
+# allow the student to change the seed for this problem.
+
+$newProblemSeed = ( defined( ${$inputs_ref}{'newProblemSeed'} ) )?  ${$inputs_ref}{'newProblemSeed'} : $problemSeed;
+$PG_random_generator->srand($newProblemSeed);
+BEGIN_TEXT
+To see a different version of the problem change
+the problem seed and press the 'Submit Answer' button below.$PAR Problem Seed:
+\{  MODES(
+TeX			=>	qq! Change the problem seed to change the problem:$problemSeed!,
+Latex2HTML	=>	qq! Change the problem seed to change the problem:
+    \begin{rawhtml}
+    <INPUT NAME="newProblemSeed" VALUE = "$newProblemSeed" SIZE = "10">
+    \end{rawhtml}!,
+HTML		=>	qq! <INPUT NAME="newProblemSeed" VALUE = "$newProblemSeed" SIZE = "10">!
+)
+\}
+END_TEXT
+#########################################################
+# define function to be evaluated
+$a= random(1,3,1);
+$b= random(-4,4,.1);
+$c = random(-4,4,1);
+$x0=random(-2,2,1);
+$function = FEQ(" ${a}x^2+${b}x +$c ");
+sub fp {   # define a subroutine to calculate the derivative
+	my $x = shift;
+	2*$a*$x+$b;
+}
+$ans = fp($x0);
+HEADER_TEXT(<<EOF);
+<SCRIPT LANGUAGE="JavaScript">
+<!-- This script and many more are available online from -->
+<!-- The JavaScript Source!! http://javascriptsource.com -->
+
+<!-- Begin
+
+function func(x) {
+return( $a*Math.pow(x,2) + $b*x +$c );}
+
+// End 
+ -->
+</SCRIPT>
+
+EOF
+
+
+TEXT(beginproblem());
+TEXT(MODES(
+TeX	 		=>	'',
+Latex2HTML	=> "\begin{rawhtml} <NOSCRIPT> This problem requires that Java
+ 				Script be enabled </NOSCRIPT> \end{rawhtml}",
+HTML		=> "<NOSCRIPT> This problem requires that Java Script be 
+				enabled </NOSCRIPT>"
+));
+
+BEGIN_TEXT
+$PAR
+This problem illustrates how you can embed JavaScript code in a WeBWorK example
+to create an interactive homework problem that could never be provided by a text book.
+$PAR
+WeBWorK can use existing $BBOLD JavaScript$EBOLD  and $BBOLD Java $EBOLD code to augment its capabilities.
+$HR
+$PAR
+By typing any value x into the left hand window and pressing the --f--\(>\) button 
+you can determine the value of f(x). 
+$PAR
+Using this 'oracle' function, calculate the derivative of \( f \) at x=$x0.
+$PAR
+\(f'($x0) =\) \{ans_rule(20) \}  You can use a 
+\{htmlLink(alias('calc.html'), "calculator" ,q!TARGET = "calculator"!) \}
+
+$PAR
+END_TEXT
+
+$javaScript =<<ENDOFSCRIPT;
+<CENTER>
+<TABLE BORDER=4>
+<TR>
+<TD>
+<INPUT TYPE="text"   NAME="Input1"  Value = "$x0" Size="20">
+</TD>
+<TD>
+<INPUT TYPE="button" VALUE="---f-->"  
+            OnClick="this.form.Output1.value=func(this.form.Input1.value)">
+</TD>
+<TD>
+<INPUT TYPE="text"   NAME="Output1"   Size="20">
+</TD>
+</TR>
+<TR>
+<TD>
+<INPUT TYPE="text"   NAME="Input2"  Value = "$x0" Size="20">
+</TD>
+<TD>
+<INPUT TYPE="button" VALUE="---f-->"  
+            OnClick="this.form.Output2.value=func(this.form.Input2.value)">
+</TD>
+<TD>
+<INPUT TYPE="text"   NAME="Output2"   Size="20">
+</TD>
+</TR>
+<TR>
+<TD>
+<INPUT TYPE="text"   NAME="Input3"  Value = "$x0" Size="20">
+</TD>
+<TD>
+<INPUT TYPE="button" VALUE="---f-->"  
+            OnClick="this.form.Output3.value=func(this.form.Input3.value)">
+</TD>
+<TD>
+<INPUT TYPE="text"   NAME="Output3"   Size="20">
+</TD>
+</TR>
+</TABLE>
+
+</CENTER>
+ENDOFSCRIPT
+
+TEXT(M3(
+     " \fbox{ The java Script calculator was displayed here
+             }",
+     "\begin{rawhtml} $javaScript \end{rawhtml}",
+      $javaScript
+      ));
+
+
+
+ANS(std_num_cmp($ans,1,"%0.14g") );  #We are allowing 1 percent error for the answer.
+
+			
+&ENDDOCUMENT;
+
diff --git a/courses.dist/modelCourse/templates/setDemo/prob6b.pg b/courses.dist/modelCourse/templates/setDemo/prob6b.pg
new file mode 100644
index 0000000000..74a2fd86f4
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setDemo/prob6b.pg
@@ -0,0 +1,88 @@
+DOCUMENT();
+
+loadMacros("PGbasicmacros.pl",
+           "PGchoicemacros.pl",
+           "PGanswermacros.pl",
+); 
+#<<<######################################################### 
+# allow the student to change the seed for this problem.
+
+$newProblemSeed = ( defined( ${$inputs_ref}{'newProblemSeed'} ) )?  
+${$inputs_ref}{'newProblemSeed'} : $problemSeed;
+$PG_random_generator->srand($newProblemSeed);
+BEGIN_TEXT
+To see a different version of the problem change
+the problem seed and press the 'Submit Answer' button below.$PAR Problem Seed:
+\{  MODES(
+TeX			=>	qq! Change the problem seed to change the problem:$problemSeed!,
+Latex2HTML	=>	qq! Change the problem seed to change the problem:
+    \begin{rawhtml}
+    <INPUT NAME="newProblemSeed" VALUE = "$newProblemSeed" SIZE = "10">
+    \end{rawhtml}!,
+HTML		=>	qq! <INPUT NAME="newProblemSeed" VALUE = "$newProblemSeed" SIZE = "10">!
+)
+\}
+END_TEXT
+#########################################################>>>
+$p = random(2,9,1);  # multiplier
+$p2 = ( $p % 2 == 0) ? 2*$p : $p;
+
+TEXT(beginproblem());
+
+# The link to the java applet is hard wired to use the java applet
+# served from the University of Rochester WeBWorK machine.
+# It is possible to set this up so that the java applet is served
+# from any machine
+# For details use the Feedback button to contact the authors of WeBWorK
+
+BEGIN_TEXT
+This problem requires a browser capable of running Java.
+
+$PAR
+This problem illustrates how you can Java applets in a WeBWorK example.
+$PAR
+This polar coordinate grapher was  constructed at the Mathematics Department
+of The Johns Hopkins University and the applet is being served from their computer.
+$PAR
+WeBWorK can use existing $BBOLD JavaScript$EBOLD  and $BBOLD Java $EBOLD code to 
+augment its capabilities.
+$HR
+END_TEXT
+TEXT(MODES(
+TeX 		=> 	"\fbox{The Johns Hopkins University Mathematics Department's 
+				polar graph plotting applet goes here}",
+HTML 		=> qq{
+	<APPLET CODE="PolarApplet/PolarApplet.class" WIDTH="250" HEIGHT="350"
+	CODEBASE="http://xena.mat.jhu.edu/vander/stable/">
+	<PARAM NAME="tmin" VALUE="0">
+	<PARAM NAME="tmax" VALUE="2*pi">
+	<PARAM NAME="showcartesian" VALUE="no">
+	<PARAM NAME="showinterval" VALUE="YES">
+	</APPLET>
+}, 
+Latex2HTML => qq!\begin{rawhtml}
+	<APPLET CODE="PolarApplet/PolarApplet.class" WIDTH="250" HEIGHT="350"
+	CODEBASE="http://xena.mat.jhu.edu/vander/stable/">
+	<PARAM NAME="tmin" VALUE="0">
+	<PARAM NAME="tmax" VALUE="2*pi">
+	<PARAM NAME="showcartesian" VALUE="no">
+	<PARAM NAME="showinterval" VALUE="YES">
+	</APPLET>\end{rawhtml} 
+!
+));
+
+BEGIN_TEXT
+$PAR
+For what value of \( k \) does the graph of \( r = \cos(kt) \) look 
+like a rose with $p2 petals?
+$BR
+\(k = \) \{ ans_rule(20) \} ;
+
+$PAR
+
+END_TEXT
+
+ANS(num_cmp($p) );
+			
+ENDDOCUMENT();
+
diff --git a/courses.dist/modelCourse/templates/setDemo/s2_2_1.pg b/courses.dist/modelCourse/templates/setDemo/s2_2_1.pg
new file mode 100644
index 0000000000..eee730ee7d
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setDemo/s2_2_1.pg
@@ -0,0 +1,56 @@
+##DESCRIPTION
+##KEYWORDS('derivatives')
+##  Find a derivative of a polynomial, evaluate it at a point
+##ENDDESCRIPTION
+
+DOCUMENT();        # This should be the first executable line in the problem.
+loadMacros(
+	"PGbasicmacros.pl",
+	"PGchoicemacros.pl",
+	"PGanswermacros.pl",
+	"PGauxiliaryFunctions.pl"
+);
+
+TEXT(&beginproblem);
+$showPartialCorrectAnswers = 1;
+
+$a1 = random(2,7,1);
+$b1 = random(2,12,1);
+$c1 = random(1,40,1);
+$x1 = random(1,5,1);
+$deriv1 = 2*$a1*$x1-$b1;
+$funct1 = "2*$a1*x-$b1";
+
+BEGIN_TEXT
+If \( f(x) =  $a1 x^2 - $b1 x -$c1 \), find \( f'( x ) \).
+$BR $BR \{ans_rule(48) \}
+$BR
+END_TEXT
+
+$ans = $funct1;
+&ANS(fun_cmp($ans));
+
+$a1_2 = 2*$a1;
+&SOLUTION(EV3(<<'EOT'));
+$SOL $BR
+In general the derivative of \( x^n \) is \( nx^{n-1} \). Using this (and the 
+basic sum and constant multiple rules) we find the derivative of $BR
+\(${a1}x^2 - ${b1}x -$c1 \quad \) is $BR \( ${a1_2}x - $b1 \).$BR $BR
+EOT
+
+BEGIN_TEXT
+Find \( f'( $x1 ) \).
+$BR $BR \{ans_rule(48) \}
+$BR $BR
+END_TEXT
+
+$ans = $deriv1;
+&ANS(num_cmp($ans));
+
+&SOLUTION(EV3(<<'EOT'));
+$SOL $BR
+To find the derivative we just have to evaluate \( f'( x ) \) at 
+\( x = $x1) \), i.e.  \( ${a1_2}\cdot$x1 - $b1 \) or $ans.
+EOT
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/courses.dist/modelCourse/templates/setDemo/sample_myown_ans.pg b/courses.dist/modelCourse/templates/setDemo/sample_myown_ans.pg
new file mode 100644
index 0000000000..8153a8f3e9
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setDemo/sample_myown_ans.pg
@@ -0,0 +1,86 @@
+DOCUMENT();
+
+loadMacros(
+	"PGbasicmacros.pl",
+	"PGchoicemacros.pl",
+	"PGanswermacros.pl"
+);
+
+TEXT(&beginproblem);
+$showPartialCorrectAnswers = 1;
+ 
+BEGIN_TEXT
+ This problem demonstrates how you can write your own procedure to check answers.  
+ The procedure is embedded right in the problem. If you wanted to use it for several 
+ problems, you could put it in a file similar to "PGanswermacros.pl" and load it into
+ the problem.
+ 
+ This problem asks you to enter a palindrome, a word, number, or phrase that is the same 
+ when read backwards or forward.  For example, madam or Hannah.  For us a standard
+ palindrome will ignore spaces and case, but a strict palindrome will not. So e.g. Hannah
+ is a standard but not a strict palindrome.  We will write a test for both types.  $BR $BR
+ Enter a standard palindrome such as "Hannah", "1234321", or "Mom". $BR
+ This uses std${US}palindrome${US}test $BR
+ \{ans_rule(60) \}
+END_TEXT
+
+ 
+$std_palindrome_test = sub {
+    my $in = shift @_;
+    my $normalizedCorrectAnswer =  "There are many correct answers, e.g. Hannah";
+    $in =~ s|~~s+||g;      # remove all spaces       
+                          ## use ~~ inplace of perl's backslash in problems
+    $in = uc $in;          # Make letters uppercase  
+                          ## use ~~ inplace of perl's backslash in problems
+    my $reverse = reverse $in;
+    my $correctQ = ($in eq $reverse) ? 1: 0;
+    my $ansMsg = '';
+    unless ($in =~ m|~~S|) {
+        $correctQ = 0;
+        $ansMsg = 'An empty string is not accepted as a palindrome';
+    }    
+    my $rh_answer = new AnswerHash( score  => $correctQ,
+	     correct_ans  	=> 	$normalizedCorrectAnswer,
+	     student_ans  	=> 	$in,
+	     ans_message   	=> 	$ansMsg,
+		 type		   	=> 	'custom'
+    );
+    $rh_answer;
+   
+};
+
+ANS($std_palindrome_test);
+
+
+BEGIN_TEXT;
+$PAR
+Now enter a strict palindrome such as "1234321", or "mom". $BR
+This uses strict${US}palindrome${US}test $BR
+\{ans_rule(60) \}
+END_TEXT
+
+$strict_palindrome_test = sub {
+    my $in = shift @_;
+    my $normalizedCorrectAnswer =  "There are many correct answers, e.g. HannaH";
+    $in =~ s/~~s*$//;        # remove trailing whitespace ## use ~~ inplace of perl's backslash in problems
+    $in =~ s/^~~s*//;        # remove initial spaces      ## use ~~ inplace of perl's backslash in problems
+    my $reverse = reverse $in;
+    my $correctQ = ($in eq $reverse) ? 1: 0;
+    my $ansMsg = '';
+    unless ($in =~ m|~~S|) {
+        $correctQ = 0;
+        $ansMsg = 'An empty string is not accepted as a palindrome';
+    }    
+    
+    my $rh_answer = {score  => $correctQ,
+     correct_ans  => $normalizedCorrectAnswer,
+     student_ans  => $in,
+     ans_message   => $ansMsg,
+	type		   => 'custom'
+    };
+    $rh_answer;
+};
+    
+ANS($strict_palindrome_test);
+
+ENDDOCUMENT();
\ No newline at end of file
diff --git a/courses.dist/modelCourse/templates/setDemo/sample_units_ans.pg b/courses.dist/modelCourse/templates/setDemo/sample_units_ans.pg
new file mode 100644
index 0000000000..4cc2074e80
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setDemo/sample_units_ans.pg
@@ -0,0 +1,41 @@
+DOCUMENT();
+loadMacros( "PGbasicmacros.pl",
+	        "PGauxiliaryFunctions.pl",
+	        "PGchoicemacros.pl",
+	        "PGanswermacros.pl",
+);
+
+TEXT(beginproblem());
+
+$showPartialCorrectAnswers = 1;
+$showHint =0;
+
+$fx = random( 2.1, 6.0   , 0.1)   ; 
+$fy = random( 3.1, 8.0   , 0.1)   ;   
+$ansxy = sqrt($fx * $fx  + $fy * $fy); 
+$anscm = $ansxy*100;  
+
+BEGIN_TEXT
+This problem demonstrates how WeBWorK handles 
+numerical answers involving units.  WeBWorK can handle all units that
+are used in elementary physics courses.
+See \{ htmlLink("http://webwork.maa.org/wiki/Units","answers with units") \}  
+for more details. $PAR
+
+Two perpendicular sides of a triangle are $fx m and
+$fy m long respectively.  
+What is the length of the third side of the triangle? $BR$BR
+You can answer this in terms of m's, cm's, km's, in's, ft, etc. but you must enter the units. $BR$BR
+Check "Show Hint" and then "Submit Answer" if you don't remember the Pythagorean theorem.
+END_TEXT
+
+HINT(EV3(<<'EOT'));
+Remembering the Pythagorean theorem \( A^2 +B^2 = C^2 \), you can enter
+sqrt(${fx}${CARET}2 + ${fy}${CARET}2) m or  \{spf($ansxy, "%0.2f" )\} m or  \{spf($anscm, "%0.2f" )\} cm or ...
+EOT
+
+BEGIN_TEXT
+\{ans_rule(40) \}
+END_TEXT
+ANS(num_cmp("$ansxy", units => 'm'));
+ENDDOCUMENT()
diff --git a/courses.dist/modelCourse/templates/setDemo/screenHeaderFile1.pg b/courses.dist/modelCourse/templates/setDemo/screenHeaderFile1.pg
new file mode 100644
index 0000000000..6df115aab1
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setDemo/screenHeaderFile1.pg
@@ -0,0 +1,77 @@
+##Screen set header for set 0, Fall 1998
+
+&DOCUMENT;
+
+loadMacros(
+"PG.pl",
+"PGbasicmacros.pl",
+"PGchoicemacros.pl",
+"PGanswermacros.pl"
+);
+
+
+
+BEGIN_TEXT
+This is a demonstration set designed to illustrate the range of types of questions which  can be asked using WeBWorK rather than to illustrate a typical calculus problem set.
+
+$PAR
+$BBOLD 1. Simple numerical problem. $EBOLD A simple problem requiring a numerical answer.  It illustrates how one can allow WeBWorK to calculate answers from formulas (e.g. an answer such as sqrt(3^2 +4^2) can be entered instead of the answer 5.).  It also shows
+an example of feedback on the correctness of each answer, rather than grading the entire problem.
+$PAR
+$BBOLD 2. Graphs and limits. $EBOLD The graph in this example is constructed on the fly.   From the graph a student is supposed to determine the values and limits of the function at various points.  The immediate feedback on this problem is particularly useful, since students often make unconcious mistakes.
+$PAR
+$BBOLD 3. Derivatives. $EBOLD An example of checking answers which are formulas, rather than numbers.
+$PAR
+$BBOLD 4. Anti-derivatives. $EBOLD This example will accept any anti-derivative, adjusting for the fact that the answer is only defined up to a constant.
+$PAR
+$BBOLD 5. Answers with units.    $EBOLD  Try entering the answer to this question in meters (m)  and also centimeters (cm).
+$PAR
+$BBOLD 6. A physics example. $EBOLD Includes a static picture.  
+$PAR
+$BBOLD 7. More graphics. $EBOLD An example of on-the-fly graphics.  Select the graph of f, it's derivative and it's second derivatives.
+$PAR
+$BBOLD 8. JavaScript example. $EBOLD I'm particularly fond of this example.  The computer provides an "oracle" function: give it  a number \(x\) and it will provide you with the value \(f(x)\) of the function at \(x\).  Using this, calculate the value of the derivative of \(f\) at 2. (i.e. \(f'(2)\) ).  Students are forced to use the Newton quotient, since there are no formulas to work with.  I don't think this problem could be asked as written homework.
+$PAR
+$BBOLD 9. Java example.    $EBOLD  This gives an example of incorporating a java applet which can be used experimentally to determine answers for WeBWorK questions.  This example is of historical interest since it comes from the first site after Rochester, Johns Hopkins University, to use WeBWorK.  It currently gives an example of what happens when a WeBWorK problem called an applet residing on a server that no longer exists.
+$PAR
+$BBOLD 10. Palindrome. $EBOLD  To answer this problem enter any palindrome.  This problem illustrates the power of the "answer-evaluator" model.  For each problem the problem designer writes a function which accepts a student's answer and produces a 0 or 1 (for incorrect or correct).  Usually this is done by comparing with an answer given by the problem designer, but in this case the function checks if the answer is the same forward and backward.
+$PAR
+END_TEXT
+
+
+
+BEGIN_TEXT
+$HR
+
+Use this box  to give information about this problem
+set.  Typical information might include some of these facts:
+$PAR
+WeBWorK assignment number $setNumber is due on : $formatedDueDate.
+
+
+$PAR
+The primary purpose of WeBWorK is to let you know if you are getting the right answer or to alert
+you if you get the wrong answer. Usually you can attempt a problem as many times as you want before
+the due date.  However, if you are having trouble figuring out your error, you should
+consult the book, or ask a fellow student, one of the TA's or
+your professor for help.  Don't spend a lot of time guessing -- it's not very efficient or effective.
+$PAR
+
+You can use the Feedback button on each problem
+page to send e-mail to the professors. 
+$PAR
+Give 4 or 5  significant digits for (floating point) numerical answers.
+For most problems when entering numerical answers, you can if you wish
+enter elementary expressions such as 2^3 instead of 8, sin(3*pi/2) instead
+of -1, e^(ln(2)) instead of 2,
+(2+tan(3))*(4-sin(5))^6-7/8 instead of 27620.3413, etc.
+$PAR 
+ Here's the 
+\{ htmlLink(qq!http://webwork.maa.org/wiki/Available_Functions!,"list of the functions") \}
+ which WeBWorK understands. 
+
+Along with the \{htmlLink(qq!http://webwork.maa.org/wiki/Units!, "list of units")\} which WeBWorK understands.  This can be useful in 
+physics problems.
+END_TEXT
+
+ENDDOCUMENT();
\ No newline at end of file
diff --git a/courses.dist/modelCourse/templates/setDemo/srw1_9_4.pg b/courses.dist/modelCourse/templates/setDemo/srw1_9_4.pg
new file mode 100644
index 0000000000..03f9e5a2fa
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setDemo/srw1_9_4.pg
@@ -0,0 +1,112 @@
+##DESCRIPTION
+##  find distance between two points, find coordinates of the midpoint of
+##  a line segment connecting them
+##ENDDESCRIPTION
+
+##KEYWORDS('algebra', 'coordinate geometry', 'distance', 'midpoint')
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+"PG.pl",
+"PGbasicmacros.pl",
+"PGchoicemacros.pl",
+"PGanswermacros.pl",
+"PGauxiliaryFunctions.pl"
+);
+
+TEXT(&beginproblem);
+
+$showPartialCorrectAnswers = 1;
+
+#install_problem_grader(~~&std_problem_grader);    ##uncomment to use std grader
+#install_problem_grader(~~&custom_problem_grader);  ##uncomment to use custom grader
+
+
+$x1 = random(1,5,1);
+$y1 = random(-5,-1,1);
+$x2 = random(-10,-3,1);
+$y2 = random(-9,-2,1);
+$len1 = sqrt(($x1-$x2)**2 + ($y1-$y2)**2);
+$midx = ($x1+$x2)/2;
+$midy = ($y1+$y2)/2;
+
+BEGIN_TEXT
+Consider the two points \( ($x1 ,$y1 )\) and \( ($x2 ,$y2 )\).
+The distance between them is:$BR
+\{ans_rule(30) \}
+$BR
+END_TEXT
+
+$ans = $len1;
+&ANS(std_num_cmp($ans));
+
+BEGIN_TEXT
+The x co-ordinate of the midpoint of the line
+segment that joins them is:\{ans_rule(20) \}
+$BR
+END_TEXT
+$ans = $midx;
+&ANS(std_num_cmp($ans));
+
+BEGIN_TEXT
+The y co-ordinate of the midpoint of the line segment that joins them is:
+\{ans_rule(20) \}
+$BR
+END_TEXT
+$ans = $midy;
+&ANS(std_num_cmp($ans));
+
+
+sub custom_problem_grader {
+	my $rh_evaluated_answers = shift;
+	my $rh_problem_state = shift;
+	my %form_options = @_;
+	my %evaluated_answers = %{$rh_evaluated_answers};
+	#  The hash $rh_evaluated_answers typically contains: 
+	#      'answer1' => 34, 'answer2'=> 'Mozart', etc.
+	
+	# By default the  old problem state is simply passed back out again.
+	my %problem_state = %$rh_problem_state;
+	
+ 	
+ 	# %form_options might include
+ 	# The user login name 
+ 	# The permission level of the user
+ 	# The studentLogin name for this psvn.
+ 	# Whether the form is asking for a refresh or is submitting a new answer.
+ 	
+ 	# initial setup of the answer
+ 	my	$total=0; 
+ 	my %problem_result = ( score => 0,
+ 						   errors => '',
+ 						   type => 'custom_problem_grader',
+ 						   msg => 'Part 1 is worth 50% and parts 2 and 3 are worth 25% each.',
+ 						 );
+
+    # Return unless answers have been submitted
+    unless ($form_options{answers_submitted} == 1) {
+ 		return(~~%problem_result,~~%problem_state);
+ 	}
+ 	# Answers have been submitted -- process them.
+ 	
+	$total += .5*($evaluated_answers{'AnSwEr1'}->{score});
+	$total += .25*($evaluated_answers{'AnSwEr2'}->{score});
+	$total += .25*($evaluated_answers{'AnSwEr3'}->{score});
+
+
+	$problem_result{score} = $total; 
+	# increase recorded score if the current score is greater.
+	$problem_state{recorded_score} = $problem_result{score} if $problem_result{score} > $problem_state{recorded_score};
+	
+	
+    $problem_state{num_of_correct_ans}++ if $total == 1;
+	$problem_state{num_of_incorrect_ans}++ if $total < 1 ;
+	(~~%problem_result, ~~%problem_state);
+
+}
+
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
+
+
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial.def b/courses.dist/modelCourse/templates/setMAAtutorial.def
new file mode 100644
index 0000000000..37b52ee624
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setMAAtutorial.def
@@ -0,0 +1,23 @@
+openDate = 1/10/97 at 6:00am
+dueDate = 1/1/05 at 2:00am
+answerDate = 1/1/05 at 2:00am
+paperHeaderFile = setMAAtutorial/MAAtutorialSetHeader.pg
+screenHeaderFile = setMAAtutorial/MAAtutorialSetHeader.pg
+problemList =
+setMAAtutorial/hello.pg,   1
+setMAAtutorial/standardexample.pg,   1
+setMAAtutorial/simplemultiplechoiceexample.pg,  1
+setMAAtutorial/multiplechoiceexample.pg,   1
+setMAAtutorial/matchinglistexample.pg,   1
+setMAAtutorial/truefalseexample.pg,    1
+setMAAtutorial/popuplistexample.pg,    1
+setMAAtutorial/ontheflygraphicsexample1.pg,    1
+setMAAtutorial/ontheflygraphicsexample2.pg,    1
+setMAAtutorial/staticgraphicsexample/staticgraphicsexample.pg,      1
+setMAAtutorial/hermitegraphexample.pg,         1
+setMAAtutorial/htmllinksexample/htmllinksexample.pg,           1
+setMAAtutorial/javascriptexample1.pg,    1
+setMAAtutorial/javascriptexample2.pg,    1
+setMAAtutorial/vectorfieldexample.pg,			1
+setMAAtutorial/conditionalquestionexample.pg,   1
+setMAAtutorial/javaappletexample.pg,    1
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/MAAtutorialSetHeader.pg b/courses.dist/modelCourse/templates/setMAAtutorial/MAAtutorialSetHeader.pg
new file mode 100644
index 0000000000..610ded5be0
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/MAAtutorialSetHeader.pg
@@ -0,0 +1,102 @@
+DOCUMENT();
+
+loadMacros(
+	"PGbasicmacros.pl",
+	"PGchoicemacros.pl",
+	"PGanswermacros.pl"
+);
+
+TEXT($BEGIN_ONE_COLUMN);
+
+TEXT(MODES(TeX =>EV3(<<'EOT'), HTML=>"", Latex2HTML=>"" ));
+\noindent {\large \bf $studentName}
+\hfill
+\noindent {\large \bf MAA Minicourse New Orleans January 2001}
+\par
+\noindent WeBWorK assignment number \{ protect_underbar($setNumber) \} due $formattedDueDate;.
+\hrule
+EOT
+
+
+##################
+# EDIT BELOW HERE
+##################
+
+BEGIN_TEXT
+$BR
+$BR
+Welcome to the MAA short course on $BBOLD WeBWorK $EBOLD.
+$PAR
+Here is a synopsis of the tutorial examples presented in this set. They have been designed for learning the PG language, and are not necessarily the best questions to use for mathematics instruction.
+$PAR
+$BBOLD 1. Hello world example: $EBOLD Illustrates the basic structure of a PG problem.
+$PAR
+$BBOLD 2. Standard example:   $EBOLD This covers what you need to know to ask the majority of the questions you would want to ask in a calculus course.  Problems with text answers, numerical answers and answers involving expressions are covered.
+$PAR
+$BBOLD 3. Simple multiple choice example: $EBOLD Uses lists(arrays) to implement a multiple choice question.
+$PAR
+$BBOLD 4. Multiple choice example: $EBOLD Uses the multiple choice object to implement a multiple choice question.
+$PAR 
+$BBOLD 5. Matching list example: $EBOLD
+$PAR
+$BBOLD 6. True/false example:  $EBOLD
+$PAR
+$BBOLD 7. Pop-up true/false example: $EBOLD Answers are chosen from a pop-up list.
+$PAR
+$BBOLD 8. On-the-fly graphics example 1: $EBOLD The graphs are regenerated each time you press the submit button
+$PAR
+$BBOLD 9. On-the-fly-graphics example 2: $EBOLD -- Adds some randomization to the first example.
+$PAR
+$BBOLD 10. Static graphics example: $EBOLD Presents graphs created on a separate application (e.g. Mathematica) and saved.
+$PAR
+$BBOLD 11. Hermite graph example: $EBOLD A particularly useful way of generating predictable graphs by specifying the value and first derivative of a function at each point.  Piecewise linear graphs are also included in this example.
+$PAR
+$BBOLD 12. HTML links example: $EBOLD Shows how to link other web resources to your WeBWorK problem.
+$PAR
+$BBOLD 13. JavaScript example 1: $EBOLD An example which takes advantage of this interactive media! This one requires students to calculate the derivative of a function from the definition.
+$PAR
+$BBOLD 14. JavaScript example 2: $EBOLD A variant of the previous example that generates the example function as a cubic spline so that students can't read the javaScript code to find out the answer.
+$PAR
+$BBOLD 15. Vector field example $EBOLD Generates vector field graphs on-the-fly.
+$PAR
+$BBOLD 16. Conditional question example: $EBOLD Illustrates how you can create a problem which  first asks an easy question, and once that has been answered correctly, follows up with a more involved question on the same material.
+$PAR
+$BBOLD 17 Java applet example: $EBOLD A preliminary example of how to include Java applets in WeBWorK problems.
+$HR
+END_TEXT
+
+##################
+# EDIT ABOVE HERE
+##################
+BEGIN_TEXT
+The primary purpose of WeBWorK is to let you know if you are getting the right answer or to alert
+you if you get the wrong answer. Usually you can attempt a problem as many times as you want before
+the due date.  However, if you are having trouble figuring out your error, you should
+consult the book, or ask a fellow student, one of the TA's or
+your professor for help.  Don't spend a lot of time guessing -- it's not very efficient or effective.
+The computer has NO CLUE about WHY your answer is wrong. Computers are good at checking,
+but for help go to a human.
+
+$PAR
+Give 4 or 5  significant digits for (floating point) numerical answers.
+For most problems when entering numerical answers, you can if you wish
+enter elementary expressions such as \( 2\wedge3 \) instead of 8, \( sin(3*pi/2) \)instead
+of -1, \( e\wedge (ln(2)) \) instead of 2,
+\( (2+tan(3))*(4-sin(5))\wedge6-7/8 \) instead of 27620.3413, etc.
+$PAR
+ Here's the 
+\{ htmlLink(qq!http://webwork.maa.org/wiki/Available_Functions!,"list of the functions") \}
+ which WeBWorK understands. 
+
+Along with the \{htmlLink(qq!http://webwork.maa.org/wiki/Units!, "list of units")\} which WeBWorK understands.  This can be useful in 
+physics problems.
+$PAR
+You can use the Feedback button on each problem
+page to send e-mail to the professors. 
+
+
+$END_ONE_COLUMN
+END_TEXT
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
+
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/conditionalquestionexample.pg b/courses.dist/modelCourse/templates/setMAAtutorial/conditionalquestionexample.pg
new file mode 100644
index 0000000000..affe1f9138
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/conditionalquestionexample.pg
@@ -0,0 +1,83 @@
+DOCUMENT();
+loadMacros(
+        "PGbasicmacros.pl",
+        "PGchoicemacros.pl",
+        "PGanswermacros.pl"
+);
+TEXT(beginproblem(), $BR,$BBOLD, "Conditional questions example", $EBOLD, $BR,$BR);
+$showPartialCorrectAnswers = 1;
+
+$a1 = random(3,25,1);
+$b1 = random(2,27,1);
+$x1 = random(-11,11,1);
+$a2 = $a1+5;
+
+BEGIN_TEXT
+If \( f(x) = $a1 x + $b1  \), find \( f'( $x1 ) \).
+$BR $BR \{NAMED_ANS_RULE('first_answer',10) \}
+$BR
+END_TEXT
+
+
+
+$ans_eval1 = num_cmp($a1);       
+NAMED_ANS(first_answer => $ans_eval1);                                  
+
+# Using named answers allows for more control.  Any unique label can be
+# used for an answer.    
+# (see http://webwork.math.rochester.edu/docs/docs/pglanguage/pgreference/managinganswers.html
+# for more details on answer evaluator formats and on naming answers
+# so that you can  refer to them later.  Look also at the pod documentation in
+# PG.pl and PGbasicmacros.pl  which you can also reach at
+# http://webwork.math.rochester.edu/docs/techdescription/pglanguage/index.html)
+                                  
+# Check to see that the first answer was answered correctly.  If it was then we
+# will ask further questions.
+$first_Answer = $inputs_ref->{first_answer};  # We need to know what the answer
+                                                                                          # was named.
+$rh_ans_hash = $ans_eval1->evaluate($first_Answer);
+
+# warn pretty_print($rh_ans_hash);  # this is useful technique for finding errors.
+                                    # When uncommented it prints out the contents of 
+                                    # the ans_hash for debugging
+
+# The output of each answer evaluator consists of a single %ans_hash with (at
+# least) these entries:
+#       $ans_hash{score}        -- a number between 0 and 1
+#       $ans_hash{correct_ans}  -- The correct answer, as supplied by the instructor
+#       $ans_hash{student_ans}  -- This is the student's answer
+#       $ans_hash{ans_message}  -- Any error message, or hint provided by
+#                                                          the answer evaluator.
+#       $ans_hash{type}   -- A string indicating the type of answer evaluator.
+#                                         -- Some examples:
+#                                               'number_with_units'
+#                                               'function'
+#                                               'frac_number'
+#                                               'arith_number'
+# For more details see
+# http://webwork.math.rochester.edu/docs/docs/pglanguage/pgreference/answerhashdataype.html
+
+# If they get the first answer right, then we'll ask a second part to the
+# question ...
+if (1 == $rh_ans_hash->{score} ) {
+
+        # WATCH OUT!!:  BEGIN_TEXT and END_TEXT have to be on lines by
+        # themselves and left justified!!!   This means you can't indent
+        # this section as you might want to. The placement of BEGIN_TEXT
+        # and END_TEXT is one of the very few formatting requirements in
+        # the PG language.
+
+BEGIN_TEXT
+                $PAR Right! Now
+                try the second part of the problem: $PAR $HR
+                If \( f(x) = $a2 x + \{$b1+5\}  \), find \( f'( x) \).
+                $BR $BR \{ NAMED_ANS_RULE('SecondAnSwEr',10) \}
+                $BR
+END_TEXT
+
+$ans_eval2 = num_cmp($a2);
+
+        NAMED_ANS(SecondAnSwEr => $ans_eval2); 
+
+}  
+ENDDOCUMENT();
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/hello.pg b/courses.dist/modelCourse/templates/setMAAtutorial/hello.pg
new file mode 100644
index 0000000000..a27388830d
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/hello.pg
@@ -0,0 +1,18 @@
+DOCUMENT();       
+loadMacros("PGbasicmacros.pl",       
+           "PGchoicemacros.pl",       
+           "PGanswermacros.pl",      
+           );       
+           
+BEGIN_TEXT
+Complete the sentence: $PAR
+\{ ans_rule(20) \}  world!
+END_TEXT
+
+ANS( str_cmp( "Hello" ) );  # here is the answer, a string.
+
+
+
+
+ENDDOCUMENT(); 
+   
\ No newline at end of file
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/hermitegraphexample.pg b/courses.dist/modelCourse/templates/setMAAtutorial/hermitegraphexample.pg
new file mode 100644
index 0000000000..0556dec368
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/hermitegraphexample.pg
@@ -0,0 +1,126 @@
+DOCUMENT();
+loadMacros("PGbasicmacros.pl",
+           "PGchoicemacros.pl",
+           "PGanswermacros.pl",
+           "PGnumericalmacros.pl",
+           "PGgraphmacros.pl"
+);
+TEXT($BEGIN_ONE_COLUMN);
+TEXT(beginproblem(), $BR,$BBOLD, "Hermite polynomial graph example", $EBOLD, $BR,$BR); 
+$showPartialAnswers = 1;
+
+$graph = init_graph(-5,-5,5,5,'axes'=>[0,0],'grid'=>[10,10]);
+
+my (@x_values1, @y_values1);
+foreach $i (0..10) {
+	$x_values1[$i] =$i-5;
+	$y_values1[$i] = random(-4,4,1);
+}
+
+# creates a reference to a perl subroutine for the piecewise linear function 
+# passing through the defined points
+$fun_rule = plot_list(~~@x_values1, ~~@y_values1);
+
+#new function is to be plotted in graph
+$f1=new Fun($fun_rule, $graph); 
+$f1->color('black');
+
+$trans = non_zero_random(-2,2,1);
+# add a new function to the graph which is a translate of the first
+$fun_rule2 = sub{ my $x = shift; &$fun_rule($x-$trans)  }; 
+$f2 = new Fun($fun_rule2, $graph);  
+$f2->color('orange');
+
+$graph->stamps(open_circle(-1,&$fun_rule(-1),'black') ); 
+# indicates open interval at the left endpoint
+$graph->stamps(closed_circle(4,&$fun_rule(4), 'black') ); 
+# and a closed interval at the right endpoint
+# Be careful about getting the stamps properly located on the translated
+# function below:
+$graph->stamps(open_circle(-1 + $trans, &$fun_rule(-1),'orange') ); 
+# indicates open interval at the left endpoint
+$graph->stamps(closed_circle(4 +$trans, &$fun_rule(4), 'orange') ); 
+# and a closed interval at the right endpoint
+
+$graph2 = init_graph(-4,-4,4,4,'axes'=>[0,0],'grid'=>[8,8]);
+$b1= random(-3.5,3.5,.5);
+$b2= random(-3.5,3.5,.5);
+$b3= random(-3.5,3.5,.5);
+@x_val3 = (-4,-3,-2,-1,  0,   1,   2,  3, 4 );
+@y_val3 = ( 0, 1, 2, 0,$b1, $b2,  $b3,  1, 2 );
+@yp_val3= ( .1, 1, 0,-2,  0,    1,  2, -3, 1 );
+$hermite = new Hermite(
+         ~~@x_val3,   # x values
+         ~~@y_val3,   # y values
+         ~~@yp_val3   # y prime values
+  );
+$spline_rule = $hermite->rf_f;                         
+$f3 = new Fun($spline_rule, $graph2);
+$f3->color('green');
+$graph2->stamps(closed_circle(-4, &$spline_rule(-4), 'green') ) ;
+$graph2->stamps(closed_circle( 4, &$spline_rule( 4), 'green') ) ;
+
+# Insert the graphs and the text. 
+BEGIN_TEXT
+
+$PAR
+We have developed other ways to specify graphs which are to be created 'on the fly'. 
+All of these new methods consist of adding macro packages to WeBWorK.  Since they
+do not require the core of WeBWorK to be changed, these enhancements can be added by
+anyone using WeBWorK. 
+$PAR
+ These two piecewise linear graphs were created by specifying the points at the nodes.
+ $BR Click on the graph to view a larger image.
+$PAR
+\{ image(insertGraph($graph),tex_size => 300, width=> 300, height=> 300 ) \}
+$HR
+If the black function is written as \(f(x)\), then the orange function 
+would be written as \( f( \) \{ ans_rule \} \( ) \).
+\{ANS(function_cmp("x-$trans")),'' \}
+END_TEXT
+# $PAR
+# The numerical calculations were all written in Perl using
+# numerical routines adapted from the Numerical Analysis book by Burden and Faires. 
+# $BR
+# We are also working on a macro which will automatically
+# identify the maximum, minimum and inflection points of an arbitary hermite 
+# cubic spline from its specifying values.  This will allow automatic generation
+# of  problems in which the maximum, minimum and inflection points are to be 
+# deduced from a graph.  
+# 
+# Get the internal local maximums
+@critical_points = keys %{$hermite->rh_critical_points};
+@critical_points = num_sort( @critical_points);
+@minimum_points = ();
+foreach my $x (@critical_points) {
+	push(@minimum_points, $x) if &{$hermite->rf_fpp}($x) >0 ;
+}
+# TEXT(pretty_print(~~@minimum_points)); # (for debugging purposes)
+$answer_string = "";
+foreach my $x (@minimum_points) {
+	$answer_string .= EV2(' \{ ans_rule(10) \} ');
+} 
+
+BEGIN_TEXT
+$HR
+This graph was created using a hermite spline by specifying points at
+
+\{ begintable(1+scalar( @x_val3 ) ) \}
+\{ row('x', @x_val3)\}
+\{ row('y', @y_val3) \}
+\{ row('yp',@yp_val3) \}
+\{endtable() \}
+
+$PAR
+\{ begintable(2) \}
+\{row( image(insertGraph($graph2), tex_size => 300,width=>300, height=> 300),
+   "List the internal local minimum points $BR in increasing order: $BR $answer_string"
+ ) \}
+\{ endtable() \}
+
+$PAR
+END_TEXT
+ANS(num_cmp([ @minimum_points ], tol => .3));
+
+TEXT($END_ONE_COLUMN);
+ENDDOCUMENT();
\ No newline at end of file
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/1-24438.gif b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/1-24438.gif
new file mode 100644
index 0000000000..df1f85cbd2
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/1-24438.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/1-31126.gif b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/1-31126.gif
new file mode 100644
index 0000000000..b0ad26bb6e
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/1-31126.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/1-34859.gif b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/1-34859.gif
new file mode 100644
index 0000000000..702784afdd
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/1-34859.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/1-42639.gif b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/1-42639.gif
new file mode 100644
index 0000000000..dfebffd690
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/1-42639.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/1-76239.gif b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/1-76239.gif
new file mode 100644
index 0000000000..741fdd8452
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/1-76239.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/1-89540.gif b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/1-89540.gif
new file mode 100644
index 0000000000..aa9a75d45a
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/1-89540.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/1-91734.gif b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/1-91734.gif
new file mode 100644
index 0000000000..cd5aae4ebd
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/1-91734.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/1-96355.gif b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/1-96355.gif
new file mode 100644
index 0000000000..23ac97828b
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/1-96355.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/1.gif b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/1.gif
new file mode 100644
index 0000000000..073055392b
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/1.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/2-42653.gif b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/2-42653.gif
new file mode 100644
index 0000000000..709cd644e2
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/2-42653.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/2-49261.gif b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/2-49261.gif
new file mode 100644
index 0000000000..3767c0de47
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/2-49261.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/2-54427.gif b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/2-54427.gif
new file mode 100644
index 0000000000..11c71d8010
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/2-54427.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/2-62384.gif b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/2-62384.gif
new file mode 100644
index 0000000000..eae5ade6ae
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/2-62384.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/2-64591.gif b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/2-64591.gif
new file mode 100644
index 0000000000..4bd408e32f
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/2-64591.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/2-70190.gif b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/2-70190.gif
new file mode 100644
index 0000000000..3e646a41ac
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/2-70190.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/2-81779.gif b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/2-81779.gif
new file mode 100644
index 0000000000..944f3efcf6
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/2-81779.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/2-92879.gif b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/2-92879.gif
new file mode 100644
index 0000000000..11506db3bc
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/2-92879.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/2.gif b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/2.gif
new file mode 100644
index 0000000000..b85a6d3ad3
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/2.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/3-14197.gif b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/3-14197.gif
new file mode 100644
index 0000000000..c28c1b68ee
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/3-14197.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/3-14538.gif b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/3-14538.gif
new file mode 100644
index 0000000000..c57d2fbe84
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/3-14538.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/3-37616.gif b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/3-37616.gif
new file mode 100644
index 0000000000..a9c2db85c3
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/3-37616.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/3-46739.gif b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/3-46739.gif
new file mode 100644
index 0000000000..4244a8ca61
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/3-46739.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/3-52898.gif b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/3-52898.gif
new file mode 100644
index 0000000000..afe8cd9d75
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/3-52898.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/3-68458.gif b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/3-68458.gif
new file mode 100644
index 0000000000..8690563535
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/3-68458.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/3-89262.gif b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/3-89262.gif
new file mode 100644
index 0000000000..5c954beec1
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/3-89262.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/3-99389.gif b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/3-99389.gif
new file mode 100644
index 0000000000..f948cc3e83
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/3-99389.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/3.gif b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/3.gif
new file mode 100644
index 0000000000..5f8f80e7d8
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/3.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/htmllinksexample.pg b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/htmllinksexample.pg
new file mode 100644
index 0000000000..708fb789a6
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/htmllinksexample/htmllinksexample.pg
@@ -0,0 +1,80 @@
+DOCUMENT();
+loadMacros("PGbasicmacros.pl",
+           "PGchoicemacros.pl",
+           "PGanswermacros.pl"
+);
+$showPartialCorrectAnswers = 0;
+
+TEXT(beginproblem(), $BR,$BBOLD, "HTML links example", $EBOLD, $BR,$BR); 
+
+BEGIN_TEXT
+This example shows how to link to resources outside the problem itself.
+$PAR
+Linking to other web pages over the internet is easy. For example,
+you can get more information about the buffon needle problem and how it is used by ants to find new nest sites  by linking to
+ \{ htmlLink("http://www.maa.org/mathland/mathtrek_5_15_00.html",
+ "Ivars Peterson's column on the MAA site") \}.
+$PAR
+END_TEXT
+
+#  You can write the HTML code yourself, but
+# that will look funny when the problem is printed in
+# hard copy, so it is probably better to use the
+# htmlLink('url','text') function which
+# will create something readable when the problem is printed.
+
+BEGIN_TEXT
+All of the files in the html directory of your WeBWorK course site can be read
+by anyone with a web browser and the URL (the  address of the file). This is a good
+place to put files that are referenced by more than one problem in your WeBWorK course.
+$PAR
+Here is the link to 
+the 
+\{ htmlLink(alias("${htmlDirectory}calc.html"),
+                  'to the calculator page', 
+                   qq!target="ww_calculator"                         
+                        ONCLICK="window.open( this.href, this.target, 
+                                                                'width=250,height=350,scrollbars=no,resizable=off'
+                        )"
+!) \} 
+stored in the top level of the 
+html directory of the tutorialCourse. 
+$PAR
+END_TEXT
+
+# To link to files on your own computer use the alias function whose
+# job it is to find the file in question.
+# You need to do this access indirectly, because WeBWorK is set up to
+# restrict access to most files -- (you don't want everyone reading
+# the source text of the WeBWorK problems, they could reconstruct the answer.)
+#
+# Note that you need double quotes around "${htmlDirectory}calc.html" so that
+# the string in $htmlDirectory will be
+# concatenated with calc.html to form a string describing
+# the DIRECTORY in which the file is to be found.  Alias converts
+# the directory to a URL
+
+BEGIN_TEXT
+Finally there are files, such as picture files, which are 
+stored with the problem itself in the same directory. 
+ $BR \{ image("2-70190.gif", width=>200, height=>200) \} 
+
+END_TEXT
+
+# Image automatically uses alias
+# to search for files.
+
+BEGIN_TEXT
+$PAR
+And the table below has three more graphs which are stored 
+in the directory containing the current problem. $PAR
+END_TEXT
+
+TEXT(
+   begintable(3),
+   row( image( [ ( '1-24438.gif', '2-49261.gif', '3-37616.gif') ],
+                                   tex_size=>200, width=>200, height=>200 )),
+   endtable()
+);
+
+ENDDOCUMENT();
\ No newline at end of file
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/javaappletexample.pg b/courses.dist/modelCourse/templates/setMAAtutorial/javaappletexample.pg
new file mode 100644
index 0000000000..fee0411cbc
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/javaappletexample.pg
@@ -0,0 +1,95 @@
+DOCUMENT();
+
+loadMacros("PG.pl",
+           "PGbasicmacros.pl",
+           "PGchoicemacros.pl",
+           "PGanswermacros.pl",
+           ); 
+ 
+TEXT(beginproblem(), $BR,$BBOLD, "Java applet example", $EBOLD, $BR,$BR); 
+# define function to be evaluated
+$a= random(1,3,1);
+$b= random(-4,4,.1);
+$c = random(-4,4,1);
+$x0=random(-2,2,1);
+$function = FEQ(" ${a}x^2+${b}x +$c ");  # This function will be redefined for javaScript as well.
+sub fp {   # define a subroutine to calculate the derivative
+	my $x = shift;
+	2*$a*$x+$b;
+}
+$ans = fp($x0);
+
+BEGIN_TEXT
+$PAR
+This problem illustrates how you can embed Java applet code in a WeBWorK example
+to create an interactive homework problem that could never be provided by a text book.
+$PAR
+WeBWorK can use existing $BBOLD javaScript$EBOLD  and $BBOLD Java $EBOLD 
+code to augment its capabilities.
+$HR
+
+END_TEXT
+$javaApplet = <<EOF;
+<applet code="mathbeans.SliderGraphApplet.class"
+    archive="/courses/system_html/applets/mathbeans.jar"
+    codebase="../classes/" width=400 height=380>
+           <PARAM NAME="variable1" VALUE="a">
+           <PARAM NAME="variable2" VALUE="b">
+           <param name="function"   value="x^2 +a*x +b">
+            <param name="limits"     value="-2 2 -9 9">
+                     
+</applet> 
+
+<H6><A HREF="http://math.hws.edu/mathbeans/applets/index.html">
+mathbean applet from David Ecks</A>
+</H6>
+EOF
+# only print out the java applet code when viewing on the screen
+TEXT(MODES(
+     TeX        => " \fbox{ The java applet was displayed here
+                    }",
+     HTML       =>  $javaApplet,
+));
+
+$a1= random(-3,3,.5);
+$a2= random(-3,3,.5);
+$a3= random(-3,3,.5);
+$b1 = ($a1/2)**2;  # remember to use ** for exponentiation when 
+                   # calculating in pure Perl!
+$b2=  ($a2 / 2)**2;
+$b3 = ($a3 / 2)**2;
+
+ANS( num_cmp(  $b1, reltol => 10, format=>'%0.2g'));
+ANS( num_cmp(  $b2, reltol => 10, format=>'%0.2g'));
+ANS( num_cmp(  $b3, reltol => 10, format=>'%0.2g'));
+
+BEGIN_TEXT
+
+$PAR
+The graph above represents the function
+\[f(x) = x^2 + a x +b \]
+where \( a \) and \( b \) are parameters. $PAR
+
+For each value of \( a \) find the value of \( b \) which 
+makes the graph just touch the x-axis.  
+$BR
+if a= $a1 then \{  ans_rule(10) \}$BR
+if a= $a2 then \{  ans_rule(10) \}$BR
+if a= $a3 then \{  ans_rule(10) \} $PAR
+
+Does this relationship between a and b specify b as a function of a?
+ \{ ans_rule(4) \} (Yes or No)$BR
+
+Does this relationship between a and b specify a as a function of b?
+ \{ ans_rule(4) \} (Yes or No)$BR
+
+Write a formula for calculating this value of \( b \) from \( a \).$BR
+b = \{ ans_rule(40) \}
+
+END_TEXT
+ANS(str_cmp('Yes') );
+ANS(str_cmp('No')  );
+ANS(function_cmp( '(a/2)^2', 'a') );
+
+
+ENDDOCUMENT();
\ No newline at end of file
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/javascriptexample1.pg b/courses.dist/modelCourse/templates/setMAAtutorial/javascriptexample1.pg
new file mode 100644
index 0000000000..1f76031c1b
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/javascriptexample1.pg
@@ -0,0 +1,146 @@
+DOCUMENT();
+
+loadMacros(
+           "PGbasicmacros.pl",
+           "PGchoicemacros.pl",
+           "PGanswermacros.pl",
+); 
+TEXT(beginproblem(), $BR,$BBOLD, "JavaScript Example 1", $EBOLD, $BR,$BR);
+# define function to be evaluated
+$a= random(1,3,1);
+$b= random(-4,4,.1);
+$c = random(-4,4,1);
+$x0=random(-2,2,1);
+
+# function =  ${a}x^2+${b}x +${c}
+# This is just to provide the correct answer.
+# This function will be defined for javaScript below.
+sub fp {   # define a perl subroutine to calculate the derivative
+	my $x = shift;
+	2*$a*$x+$b;
+}
+$ans = fp($x0);
+
+## This text will be placed in the header section of the HTML page
+## not in the body where TEXT output is placed.
+## Not processing is done.
+
+HEADER_TEXT(<<EOF);
+<SCRIPT LANGUAGE="JavaScript">
+<!-- Begin
+
+function func(x) {
+return( $a*Math.pow(x,2) + $b*x +$c );}  
+	// We redefine the function for the javaScript
+       // A savy student will be able to tell to read this
+       // by looking at the HTML source of their window.
+       // Later we'll see other methods that make this
+       // difficult or impossible.
+
+// End 
+ -->
+</SCRIPT>
+
+EOF
+
+TEXT(beginproblem());
+TEXT(MODES( TeX => "",
+	        Latex2HTML => "\begin{rawhtml}
+                         <NOSCRIPT> This problem requires that Java Script be 
+                         enabled </NOSCRIPT> ~~n\end{rawhtml}
+                         ",
+            HTML_tth =>  "<NOSCRIPT> This problem requires that javaScript be enabled
+                          </NOSCRIPT>~~n",
+            HTML      =>  "<NOSCRIPT> This problem requires that javaScript be enabled
+                           </NOSCRIPT>~~n"
+));
+
+$functionArrow = MODES(
+	TeX => "\(- f\rightarrow\)",
+	Latex2HTML => "\(- f\rightarrow \) ",
+	HTML_tth => "-- f -- &gt; &nbsp; ",
+	HTML => '-- f -- &gt; &nbsp; '
+);
+
+# The following string contains a combination of HTML and javaScript
+# which displays the input table for the javaScript calculator
+
+$javaScript =<<ENDOFSCRIPT;
+<CENTER>
+<TABLE BORDER=4>
+<TR>
+<TD>
+<INPUT TYPE="text"   NAME="Input1"  Value = "$x0" Size="20">
+</TD>
+<TD>
+<INPUT TYPE="button" VALUE="---f--&gt;"  
+            OnClick="this.form.Output1.value=func(this.form.Input1.value)">
+</TD>
+<TD>
+<INPUT TYPE="text"   NAME="Output1"   Size="20">
+</TD>
+</TR>
+<TR>
+<TD>
+<INPUT TYPE="text"   NAME="Input2"  Value = "$x0" Size="20">
+</TD>
+<TD>
+<INPUT TYPE="button" VALUE="---f--&gt;"  
+            OnClick="this.form.Output2.value=func(this.form.Input2.value)">
+</TD>
+<TD>
+<INPUT TYPE="text"   NAME="Output2"   Size="20">
+</TD>
+</TR>
+<TR>
+<TD>
+<INPUT TYPE="text"   NAME="Input3"  Value = "$x0" Size="20">
+</TD>
+<TD>
+<INPUT TYPE="button" VALUE="---f--&gt;"  
+            OnClick="this.form.Output3.value=func(this.form.Input3.value)">
+</TD>
+<TD>
+<INPUT TYPE="text"   NAME="Output3"   Size="20">
+</TD>
+</TR>
+</TABLE>
+
+</CENTER>
+ENDOFSCRIPT
+
+
+
+BEGIN_TEXT
+
+Find the derivative of the function f(x).  The windows below will tell
+you the value of f for any input x. (I call this an "oracle function", since
+if you ask, it will tell.)
+$PAR
+\(f '( $x0  ) \) = \{ans_rule(50 ) \}
+$PAR
+You may want to use a  
+\{ htmlLink(alias("${htmlDirectory}calc.html"),
+          'calculator',
+         qq! TARGET = "ww_calculator"
+               ONCLICK="window.open( this.href,this.target, 
+                                       'width=200, height=350, scrollbars=no, resizable=off'
+               )"
+!) \} 
+
+to find the result.  
+ You can also enter numerical expressions and have 
+ WeBWorK do the calculations for you.
+END_TEXT
+
+# Here is where we actually print the javaScript, or alternatives for printed output.
+
+TEXT(MODES(
+     TeX        => " \fbox{ The java Script calculator was displayed here
+                    }",
+     HTML       =>  $javaScript,
+ ));
+
+ANS(num_cmp($ans,reltol => 1) );  #We are allowing 1 percent error for the answer.
+
+ENDDOCUMENT();
\ No newline at end of file
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/javascriptexample2.pg b/courses.dist/modelCourse/templates/setMAAtutorial/javascriptexample2.pg
new file mode 100644
index 0000000000..898f77e842
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/javascriptexample2.pg
@@ -0,0 +1,154 @@
+DOCUMENT();
+
+loadMacros("PGbasicmacros.pl",
+           "PGchoicemacros.pl",
+           "PGanswermacros.pl",
+           "PGnumericalmacros.pl",  # needed for the javaScript spline code
+           ); 
+TEXT(beginproblem(), $BR,$BBOLD, "JavaScript Example 2", $EBOLD, $BR,$BR);
+
+# define function to be evaluated
+$a= random(1,3,1);
+$b= random(-4,4,.1);
+$c = random(-4,4,1);
+$x0=random(-2,2,1);
+
+# function =  ${a}x^2+${b}x +${c}sin(x)   
+# This is just to provide the correct answer.
+# This function will be defined for javaScript below.
+sub fp {   # define a perl subroutine to calculate the derivative
+	my $x = shift;
+	2*$a*$x+$b;
+}
+$ans = fp($x0);
+
+# approximate the function by a cubic spline
+sub fun{
+	my $x = shift;
+	${a}*$x**2+$b*$x +$c;
+}
+@x = ();
+@y = ();
+for ( $x1 = -3; $x1<3; $x1 = $x1+.1) {
+	push(@x, $x1);
+	push(@y, fun($x1) );
+}
+#warn join(" ", @x) ;  # test the calculation of the data points
+#warn join(" ", @y) ;
+$javascript= javaScript_cubic_spline(~~@x, ~~@y, name =>'func');
+
+#$javascript =~s/</\&lt;/g;  # make the script visible for debugging
+#warn 	"script=$javascript" ; # check that the script was created
+
+
+ 
+## This text will be placed in the header section of the HTML page
+## not in the body where TEXT output is placed.
+## Not processing is done.
+
+HEADER_TEXT( javaScript_cubic_spline(~~@x, ~~@y, name =>'func')  );  
+
+
+TEXT(beginproblem());
+TEXT(MODES( TeX => "",
+	        Latex2HTML => "\begin{rawhtml}
+                         <NOSCRIPT> This problem requires that Java Script be 
+                         enabled </NOSCRIPT> ~~n\end{rawhtml}
+                         ",
+            HTML_tth =>  "<NOSCRIPT> This problem requires that javaScript be 
+                           enabled </NOSCRIPT>~~n",
+            HTML      =>  "<NOSCRIPT> This problem requires that javaScript be 
+                           enabled </NOSCRIPT>~~n"
+));
+
+$functionArrow = MODES(
+	TeX => "\(- f\rightarrow\)",
+	Latex2HTML => "\(- f\rightarrow \) ",
+	HTML_tth => "-- f -- &gt; &nbsp; ",
+	HTML => '-- f -- &gt; &nbsp; '
+);
+
+# The following string contains a combination of HTML and javaScript
+# which displays the input table for the javaScript calculator
+
+$javaScript =<<ENDOFSCRIPT;
+<CENTER>
+<TABLE BORDER=4>
+<TR>
+<TD>
+<INPUT TYPE="text"   NAME="Input1"  Value = "$x0" Size="20">
+</TD>
+<TD>
+<INPUT TYPE="button" VALUE="---f-->"  
+            OnClick="this.form.Output1.value=func(this.form.Input1.value)">
+</TD>
+<TD>
+<INPUT TYPE="text"   NAME="Output1"   Size="20">
+</TD>
+</TR>
+<TR>
+<TD>
+<INPUT TYPE="text"   NAME="Input2"  Value = "$x0" Size="20">
+</TD>
+<TD>
+<INPUT TYPE="button" VALUE="---f-->"  
+            OnClick="this.form.Output2.value=func(this.form.Input2.value)">
+</TD>
+<TD>
+<INPUT TYPE="text"   NAME="Output2"   Size="20">
+</TD>
+</TR>
+<TR>
+<TD>
+<INPUT TYPE="text"   NAME="Input3"  Value = "$x0" Size="20">
+</TD>
+<TD>
+<INPUT TYPE="button" VALUE="---f-->"  
+            OnClick="this.form.Output3.value=func(this.form.Input3.value)">
+</TD>
+<TD>
+<INPUT TYPE="text"   NAME="Output3"   Size="20">
+</TD>
+</TR>
+</TABLE>
+
+</CENTER>
+<!-- Script Size:  1.89 KB  -->
+ENDOFSCRIPT
+
+BEGIN_TEXT
+Find the derivative of the function f(x).  The windows below will tell
+you the value of f for any input x. (I call this an "oracle function", since
+if you ask, it will tell.)
+$PAR
+\(f'( $x0  ) \) = \{ans_rule(50 ) \}
+$PAR
+You may want to use a  
+\{ htmlLink(alias("${htmlDirectory}calc.html"),
+          'calculator',
+         qq! TARGET = "ww_calculator"
+               ONCLICK="window.open( this.href,this.target, 
+                                       'width=200, height=350, scrollbars=no, resizable=off'
+               )"
+!) \} 
+
+to find the result.  You can also enter numerical expressions and 
+have WeBWorK do the calculations for you.
+END_TEXT
+
+# Here is where we actually print the javaScript, or alternatives for printed output.
+TEXT(MODES(
+     TeX        => " \fbox{ The java Script calculator was displayed here
+                    }",
+     Latex2HTML => "\begin{rawhtml} $javaScript \end{rawhtml}",
+     HTML_tth   =>  $javaScript,
+     HTML       =>  $javaScript,
+      ));
+
+
+
+
+ANS(num_cmp($ans,reltol => 1) );  #We are allowing 1 percent error for the answer.
+
+
+ENDDOCUMENT();
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/liteApplet1.pg b/courses.dist/modelCourse/templates/setMAAtutorial/liteApplet1.pg
new file mode 100644
index 0000000000..7a8cc4c075
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/liteApplet1.pg
@@ -0,0 +1,68 @@
+DOCUMENT();
+
+loadMacros("PGbasicmacros.pl",
+           "PGchoicemacros.pl",
+           "PGanswermacros.pl",
+); 
+
+$showPartialCorrectAnswers = 1;
+TEXT(beginproblem());
+
+# The link to the java applet is hard wired to use the java applet
+# served from the University of Rochester WeBWorK machine.
+# It is possible to set this up so that the java applet is served
+# from any machine
+# For details use the Feedback button to contact the authors of WeBWorK
+
+BEGIN_TEXT
+This is  a lite applet designed by Frank Wattenberg.
+$BR
+\{htmlLink( '/webwork2_course_files/demoCourse/live_map_instructions.html ', 
+'Instructions for using the map',' target="intro" ' )\}
+$HR
+END_TEXT
+$appletText = 
+appletLink(
+q! archive="/courses/system_html/applets/Image_and_Cursor_All/Image_and_Cursor.jar" 
+code="Image_and_Cursor" width = 500 height = 458
+!,
+q!Your browser does not support Java, so nothing is displayed.
+   <param name = "applet_width" value = "500">
+   <param name = "applet_height" value = "458">
+   <param name = "image_width" value = "351">
+   <param name = "image_height" value = "378">
+   <param name = "backdrop_filename" value = "/courses/system_html/applets/Image_and_Cursor_All/AF-MAP.JPG">
+   <param name = "display_placement" value = "1">
+   <param name = "display_sw" value = "0">
+!
+);
+sub  dist {
+    my $ra_pt1 = shift;
+    my $ra_pt2 =shift;
+    my $conversion        = 300 /(145 - 72);  # number of km per pixel
+   return $conversion* sqrt( ($ra_pt1->[0] - $ra_pt2->[0])**2 + ($ra_pt1->[1] - $ra_pt2->[1])**2);
+}
+
+$kandahar          = [132,101];
+$kabul                = [209,185];
+$mazur_e_sharif = [170, 243];
+$shindand          = [46,  155];
+
+$questions = EV3(
+"$PAR   How far  is it from Kandahar to Kabul? " , ans_rule(30),
+" $PAR  How far  is it from Kabul to Mazar-e-Sharif? ", ans_rule(30),
+" $PAR   How far  is it from Kandahar to Shindand? "  , ans_rule(30),
+);
+#TEXT(
+#begintable(2),
+#row( $appletText, $questions),
+#endtable()
+#);
+TEXT($appletText, $questions);
+ANS(num_cmp(dist($kandahar,$kabul),           reltol => 3,   units=>'km'));
+ANS(num_cmp(dist($kabul, $mazur_e_sharif), reltol => 3,   units=>'km'));
+ANS(num_cmp(dist($kandahar,$shindand),      reltol => 3,  units=>'km'));
+
+
+			
+ENDDOCUMENT();
\ No newline at end of file
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/liteApplet2.pg b/courses.dist/modelCourse/templates/setMAAtutorial/liteApplet2.pg
new file mode 100644
index 0000000000..6f251df90e
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/liteApplet2.pg
@@ -0,0 +1,74 @@
+DOCUMENT();
+
+loadMacros("PGbasicmacros.pl",
+           "PGchoicemacros.pl",
+           "PGanswermacros.pl",
+); 
+
+$showPartialCorrectAnswers = 1;
+TEXT(beginproblem());
+
+
+BEGIN_TEXT
+This is  a lite applet designed by Frank Wattenberg.
+$BR
+\{htmlLink( '/webwork2_course_files/demoCourse/live_map_instructions.html ', 
+'Instructions for using the map',' target="intro" ' )\}
+$HR
+END_TEXT
+TEXT(
+appletLink(
+q! archive="/courses/system_html/applets/Image_and_Cursor_All/Image_and_Cursor.jar" 
+code="Image_and_Cursor" width = 500 height = 458
+!,
+q!Your browser does not support Java, so nothing is displayed.
+   <param name = "applet_width" value = "500">
+   <param name = "applet_height" value = "458">
+   <param name = "image_width" value = "351">
+   <param name = "image_height" value = "378">
+   <param name = "backdrop_filename" value = "/courses/system_html/applets/Image_and_Cursor_All/AF-MAP.JPG">
+   <param name = "display_placement" value = "1">
+   <param name = "display_sw" value = "0">
+!
+),
+);
+sub  dist {
+    my $ra_pt1 = shift;
+    my $ra_pt2 =shift;
+   $conversion        = 300 /(145 - 72);  # number of km per pixel
+   return $conversion * sqrt( ($ra_pt1->[0] - $ra_pt2->[0])**2 + ($ra_pt1->[1] - $ra_pt2->[1])**2);
+}
+@cities               = (
+  { name => 'Kandahar',             location =>   [132,101] },
+  { name => 'Kabul',                   location =>   [209,185] },
+  { name => 'Mazur e Sharif',     location =>    [170, 243] },
+  { name => 'Shindand',             location =>    [46,  155] },
+  { name => 'Zaranj',                  location =>    [39, 93] }
+);
+@index  = NchooseK(scalar(@cities), 3 );
+sub cityName {
+     my $index = shift ;
+    $cities[$index -1]->{name};
+}
+sub cityLoc {
+    my $index = shift;
+    $cities[$index-1]->{location};
+}
+
+$conversion        = 300 /(145 - 72);  # number of km per pixel
+BEGIN_TEXT
+$PAR
+How far  is it from  \{cityName($index[1])\} to \{cityName($index[2])\}? \{ans_rule(30)\}
+$PAR  
+How far  is it from  \{cityName($index[1])\} to \{cityName($index[3])\}? \{ans_rule(30)\}
+$PAR  
+How far  is it from \{cityName($index[2])\}  to \{cityName($index[3])\}? \{ans_rule(30)\}
+END_TEXT
+
+ANS(num_cmp(dist(cityLoc($index[1]),cityLoc($index[2])),  reltol=>3,          units=>'km'));
+ANS(num_cmp(dist(cityLoc($index[2]), cityLoc($index[2])),  reltol=>3,         units=>'km'));
+ANS(num_cmp(dist(cityLoc($index[2]),cityLoc($index[2])),   reltol=>3,         units=>'km'));
+
+
+			
+ENDDOCUMENT();
\ No newline at end of file
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/matchinglistexample.pg b/courses.dist/modelCourse/templates/setMAAtutorial/matchinglistexample.pg
new file mode 100644
index 0000000000..6d85a7eddc
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/matchinglistexample.pg
@@ -0,0 +1,129 @@
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+           "PGbasicmacros.pl",
+           "PGchoicemacros.pl",
+           "PGanswermacros.pl",
+ );
+
+
+TEXT(beginproblem(), $BR,$BBOLD, "Matching list example", $EBOLD, $BR,$BR);
+
+
+# Since this is a matching question, we do not usually wish to tell students
+# which parts of the matching question have been answered correctly and which
+# areincorrect.  That is too easy.  To accomplish this we set the following
+# flag to zero.
+$showPartialCorrectAnswers = 0;
+
+# Make a new match list
+$ml = new_match_list();
+# enter questions and matching answers
+$ml -> qa (
+    "\( \sin(x) \)",        # Notice the use of the LateX construction
+    "\( \cos(x) \)",                # for math mode: \\( ...  \\) and the use of TeX
+    "\( \cos(x) \)",        # symbols such as \\sin and \\tan.
+    "\( -\sin(x) \)",
+    "\( \tan(x) \)",
+    "\( \sec^2(x) \)",      # Remember that in these strings we are 
+                                                # only specifying typography,via TeX,
+    "\( x^{20} \)",         #not any calculational rules.
+    "\( 20x^{19} \)",
+    "\( \sin(2x) \)",
+    "\( 2\cos(2x) \)",
+    "\( \sin(3x) \)",
+    "\( 3\cos(3x) \)"
+);
+
+
+# Calculate coefficients for another question
+$b=random(2,5);
+$exp= random(2,5);
+$coeff=$b*$exp;
+$new_exp = $exp-1;
+
+# Store the question and answers in the match list object.
+$ml -> qa (
+    '\( ${b}x^$exp \)',
+    '\( ${coeff}x^{$new_exp} \)',
+);
+
+# Add another example
+$b2=random(2,5);
+$exp2= random(2,5);
+$coeff2=$b2*$exp;
+$new_exp2 = $exp-1;
+$ml -> qa (
+    "\( ${b2}x^$exp2 \)",
+    "\( ${coeff2}x^{$new_exp2} \)",
+);
+
+# Choose four of the question and answer pairs at random.
+$ml ->choose(4); 
+# Using choose(8) would choose all eight questions,
+# but the order of the questions and answers would be
+# scrambled.
+
+# The following code is needed to make the enumeration work right within tables
+# when LaTeX output is being used.
+# It is an example of the powerful tools of TeX and perl which are available
+# for each PG problem author. 
+# Once we figure out the best way to protect enumerated lists automatically
+# we will include it in the tables macro.  Meantime, it is better to have
+# have to do it by hand, rather than to have the wrong thing done automatically.
+
+$BSPACING = MODES( TeX               => '\hbox to .5\linewidth {\hspace{0.5cm}\vbox {',
+                                   HTML            =>' ',
+                                   Latex2HTML => ' '
+);
+$ESPACING = MODES(TeX => '}}', HTML =>'', Latex2HTML => '');
+sub protect_enumerated_lists {
+        my @in = @_;
+        my @out = ();
+        foreach my $item (@in) {
+                push(@out, $BSPACING . $item . $ESPACING);
+        }
+        @out;
+}
+# End of code for protecting enumerated lists in TeX.
+
+# Now print the text using $ml->print_q for
+# the questions and $ml->print_a to print the answers.
+
+BEGIN_TEXT
+$PAR
+
+Place the letter of the derivative next to each function listed below: $BR
+\{ $ml -> print_q \}
+$PAR
+\{$ml -> print_a \}
+$PAR
+END_TEXT
+
+ANS( str_cmp( $ml->ra_correct_ans )   ) ;
+# insist that the first two questions (labeled 0 and 1) are always included
+$ml ->choose([0,1],1);
+BEGIN_TEXT
+Let's print the questions again, but insist that the
+first two questions (about sin and cos) always be included.
+Here is a second way to format this question, using tables:
+$PAR
+\{begintable(2)\}
+\{row(protect_enumerated_lists( $ml->print_q, $ml -> print_a) )\}
+\{endtable()\}
+$PAR
+And below is yet another way to enter a table of questions and answers:
+$PAR
+END_TEXT
+ANS( str_cmp( $ml->ra_correct_ans )   ) ;
+# Finally add a last answer
+$ml ->makeLast("The derivative is not provided");
+BEGIN_TEXT
+    \{ begintable(2) \}
+    \{ row(   protect_enumerated_lists($ml->print_q, $ml ->print_a))\}
+    \{endtable()\}
+END_TEXT
+# Enter the correct answers to be checked against the answers to the students.
+ANS( str_cmp( $ml->ra_correct_ans )   ) ;
+
+ENDDOCUMENT();      
\ No newline at end of file
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/multiplechoiceexample.pg b/courses.dist/modelCourse/templates/setMAAtutorial/multiplechoiceexample.pg
new file mode 100644
index 0000000000..d1144f0740
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/multiplechoiceexample.pg
@@ -0,0 +1,45 @@
+DOCUMENT();        # This should be the first executable line in the problem.
+loadMacros("PGbasicmacros.pl",
+        "PGchoicemacros.pl",
+        "PGanswermacros.pl",
+
+);
+TEXT(beginproblem(), $BR,$BBOLD, "Multiple choice example", $EBOLD, $BR,$BR);
+
+$showPartialCorrectAnswers = 0;
+# Make a new multiple choice object.
+$mc = new_multiple_choice();
+# $mc now "contains" the multiple choice object.
+
+# Insert some  questions and matching answers in the q/a list
+$mc -> qa (# Notice that the first string is the question
+         "What is the derivative of tan(x)?",
+         # The second string is the  correct answer
+        "\( \sec^2(x) \)",                   
+);
+$mc ->extra(       
+        "\( -\cot(x) \)",             
+        "\( \tan(x) \)",       
+        # Use double quotes " ... " to enter a string
+        "\( \cosh(x) \)",
+                "\( \sin(x) \)",
+                "\( \cos^3(x) \)",
+        "\( \text{sech}(x) \)"      
+        # Remember that in these strings we are only specifying typography,
+        # via TeX, not any calculational rules.
+);
+# Print the question using $mc->print_q
+# Use $mc->print_a to print the list of possible answers.
+# These need to be done inside BEGIN_TEXT/END_TEXT to make sure that the 
+# equations inside the questions and answers are processed properly.
+
+BEGIN_TEXT
+
+\{$mc -> print_q \}
+$PAR
+\{$mc -> print_a\}
+END_TEXT
+# Enter the correct answers to be checked against the answers to the students.
+ANS( str_cmp( $mc->correct_ans )   ) ;
+
+ENDDOCUMENT();     
\ No newline at end of file
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/ontheflygraphicsexample1.pg b/courses.dist/modelCourse/templates/setMAAtutorial/ontheflygraphicsexample1.pg
new file mode 100644
index 0000000000..be9bda7efa
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/ontheflygraphicsexample1.pg
@@ -0,0 +1,117 @@
+DOCUMENT();
+loadMacros(
+           "PGbasicmacros.pl",
+           "PGchoicemacros.pl",
+           "PGanswermacros.pl",
+           "PGgraphmacros.pl"
+);
+          
+TEXT(beginproblem(), $BR,$BBOLD, "On-the-fly Graphics Example1", $EBOLD, $BR,$BR);
+$showPartialCorrectAnswers = 0;
+
+# First we define a graph with x and y in the range -4 to 4, axes (strong lines) 
+# defined at the point [0,0] and
+# with 8 gridlines horizontally and 8 grid lines veritically.
+# $graph is a graph object (or more appropriately, a pointer to a graph object).
+
+# We  will define a function and it's first and second derivatives defined 
+# on the domain [-4,4]
+$dom = 4;
+$graph = init_graph(-$dom,-$dom,$dom,$dom,'axes'=>[0,0],'grid'=>[8,8]);
+
+# Here are the basic colors -- we'll mix them up in the next example
+@colors = ("blue", "red", "green"); #orange, yellow,
+@scrambled_colors = @colors;
+@labels = ('A', 'B', 'C');
+@scrambled_labels = @labels;
+  
+$a=random(0, 6.3, .1);
+$b=random(1.1, 1.5, .1);
+# now define the functions too be graphed
+# defining strings need to be on one line (\n is not handled correctly)
+# The three variables $f, $fp, and $fpp contain  strings
+# with the correct syntax to be inputs into the plot_function
+# macro.  The FEQ macro (Format EQuation) cleans up the writing of the function. 
+# Otherwise we would need to worry about the signs of $a, $b and so forth.
+# For example if $b were negative, then after interpolation
+# $a+$b might look like 3+-5.  FEQ replaces the +- pair by -, which is what you want.
+
+# The first string (for $f) should be read as: "The function is calculated
+# using sin($a+$b*cos(x))
+# and is defined for all x in the
+# interval -$dom to +$dom.  Draw the function using the first color
+# in the permuted color list @scrambled_colors
+# and using a weight (width) of two pixels."
+
+$f = FEQ(
+       "sin($a+$b*cos(x)) for x in <-$dom,$dom> using color:$scrambled_colors[0] and weight:2"
+);
+$fp = FEQ(
+      "cos($a+${b}*cos(x))*(-$b)*sin(x)   for x in <-$dom,$dom> using color=$scrambled_colors[1] and weight:2"
+);
+# The multiplication signs are not actually needed, although they are allowed.
+     $fpp = FEQ("-sin($a+${b}*cos(x))*$b*$b* sin(x)* sin(x)+ cos($a+$b* cos(x))*(-$b)*cos(x) for x in <-$dom,$dom> using color=$scrambled_colors[2] and weight=2"
+);
+
+
+
+# Install the functions into the graph object.
+# Plot_functions converts the string to a subroutine which performs the
+# necessary calculations and
+# asks the graph object to plot the functions.
+
+($fRef,$fpRef,$fppRef) = plot_functions( $graph,
+                                       $f,$fp,$fpp
+ );
+
+# The output of plot_functions is a list of pointers to functions which
+# contain the appropriate data and methods.
+# So $fpRef->rule points to the method which will calculate the value
+# of the function.
+# &{$fpRef->rule}(3) calculates the value of the function at 3.
+
+# create labels for each function
+# The 'left' tag determines the justification of the label to the defining point.
+
+
+$label_point=-0.75;
+$label_f = new Label ( $label_point,&{$fRef->rule}($label_point),
+                       $scrambled_labels[0], $scrambled_colors[0],'left');
+        # NOTE: $fRef->ruleis a reference to the subroutine which calculates the
+        # function.  It was defined in the output of plot_functions.
+        # It is used here to calculate the y value of the label corresponding
+        # to the function, and below to find the y values for the labels
+                # corresponding to the first and second derivatives.
+
+$label_fp = new Label ( $label_point,&{$fpRef->rule}($label_point),
+                       $scrambled_labels[1],$scrambled_colors[1],'left');
+# Place the second letter in the permuted letter list at the point
+# (-.75, fp(-.75)) using the second color in the permuted color list.
+
+$label_fpp = new Label ( $label_point,&{$fppRef->rule}($label_point),
+                       $scrambled_labels[2],$scrambled_colors[2],'left');  
+       
+# insert the labels into the graph
+$graph->lb($label_f,$label_fp,$label_fpp);                
+
+# make sure that the browser will fetch 
+# the new picture when it is created by changing the name of the
+# graph each time the problem seed is changed.  This helps prevent caching problems
+# on browsers.
+
+            $graph->gifName($graph->gifName()."-$newProblemSeed");
+# Begin writing the problem.
+# This inserts the graph and then asks three questions:
+
+BEGIN_TEXT
+\{ image(insertGraph($graph)) \} $PAR
+Identify the graphs A (blue), B( red) and C (green) as the graphs 
+of a function and its
+derivatives (click on the graph to see an enlarged image):$PAR
+\{ans_rule(4)\} is the graph of the function $PAR
+\{ans_rule(4)\} is the graph of the function's first derivative $PAR
+\{ans_rule(4)\} is the graph of the function's second derivative $PAR
+END_TEXT
+ANS(str_cmp( [@scrambled_labels] ) );
+
+ENDDOCUMENT();
\ No newline at end of file
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/ontheflygraphicsexample2.pg b/courses.dist/modelCourse/templates/setMAAtutorial/ontheflygraphicsexample2.pg
new file mode 100644
index 0000000000..063ae5804d
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/ontheflygraphicsexample2.pg
@@ -0,0 +1,124 @@
+DOCUMENT();
+
+loadMacros("PGbasicmacros.pl",
+           "PGchoicemacros.pl",
+           "PGanswermacros.pl",
+           "PGgraphmacros.pl"
+);
+           
+TEXT(beginproblem(), $BR,$BBOLD, "On-the-fly Graphics Example2", $EBOLD, $BR,$BR); 
+
+# First we define a graph with x and y in the range -4 to 4, axes (strong lines) 
+# defined at the point [0,0] and
+# with 8 gridlines horizontally and 8 grid lines veritically.
+# $graph is a graph object (or more appropriately, a pointer to a graph object).
+
+# We  will define a function and it's first and second derivatives
+# defined on the domain [-4,4]
+
+$dom = 4;
+$graph = init_graph(-$dom,-$dom,$dom,$dom,'axes'=>[0,0],'grid'=>[8,8]);
+
+# We need to scramble the colors and the labels -- otherwise every student
+# will have the function is A, the derivative is B, etc.
+# and the colors won't be scrambled either.
+
+#This provides a permutation of the numbers (0,1,2);
+
+@slice = NchooseK(3,3);
+
+# Here are the basic colors
+
+@colors = ("blue", "red", "green"); #orange, yellow,
+
+# This lists the colors in the order defined by the list in @slice
+# It effectively applies the same permutation to the list of colors
+# and to the list of labels.  A will always be blue, B red, and C green
+#and applies the same permutation to the list of labels
+
+@scrambled_colors = @colors[@slice];
+@labels = ('A', 'B', 'C');
+@scrambled_labels = @labels[@slice];
+ 
+# The rest of this example is the same as ontheflygraphicsexample1
+
+# function definitions need to be on one line
+$a=random(0, 6.3, .1);
+$b=random(1.1, 1.5, .1);
+
+# The three variables $f, $fp, and $fpp contain  strings
+# with the correct syntax to be inputs into the plot_function
+# macro.  The FEQ macro (Format EQuation) cleans up the writing of the function. 
+# Otherwise we would need to worry about the signs of $a, $b and so forth.
+# For example if $b were negative, then after interpolation
+# $a+$b might look like 3+-5.  FEQ replaces the +- pair by -, which is what you want.
+
+# The first string (for $f) should be read as: "The function is calculated
+# using sin($a+$b*cos(x))
+# and is defined for all x in the
+# interval -$dom to +$dom.  Draw the function using the first color
+# in the permuted color list @scrambled_colors
+# and using a weight (width) of two pixels."
+
+$f = FEQ("sin($a+$b*cos(x)) for x in <-$dom,$dom> using color:$scrambled_colors[0] and weight:2");
+$fp = FEQ("cos($a+${b}*cos(x))*(-$b)*sin(x)   for x in <-$dom,$dom> using color=$scrambled_colors[1] and weight:2");
+$fpp = FEQ("-sin($a+${b}*cos(x))*$b*$b* sin(x)* sin(x)+ cos($a+$b* cos(x))*(-$b)*cos(x) for x in <-$dom,$dom> using color=$scrambled_colors[2] and weight=2");
+
+
+# Install the functions into the graph object.
+# Plot_functions converts the string to a subroutine which performs the
+# necessary calculations and
+# asks the graph object to plot the functions.
+
+($fRef,$fpRef,$fppRef) = plot_functions( $graph,
+                                       $f,$fp,$fpp
+ );
+# The output of plot_functions is a list of pointers to functions which
+# contain the appropriate data and methods.
+# So $fpRef->rule points to the method which will calculate the value
+# of the function.
+# &{$fpRef->rule}(3) calculates the value of the function at 3.
+
+# create labels for each function
+# The 'left' tag determines the justification of the label to the defining point.
+
+
+$label_point=-0.75;
+$label_f = new Label ( $label_point,&{$fRef->rule}($label_point),
+           $scrambled_labels[0],$scrambled_colors[0],'left')        ;
+        # NOTE: $fRef->ruleis a reference to the subroutine which calculates the
+        # function.  It was defined in the output of plot_functions.
+        # It is used here to calculate the y value of the label corresponding
+        # to the function, and below to find the y values for the labels
+                # corresponding to the first and second derivatives.
+
+$label_fp = new Label ( $label_point,&{$fpRef->rule}($label_point),
+           $scrambled_labels[1],$scrambled_colors[1],'left')      ;
+# Place the second letter in the permuted letter list at the point
+# (-.75, fp(-.75)) using the second color in the permuted color list.
+
+$label_fpp = new Label ( $label_point,&{$fppRef->rule}($label_point),$scrambled_labels[2],$scrambled_colors[2],'left');  
+       
+# insert the labels into the graph
+$graph->lb($label_f,$label_fp,$label_fpp);                
+
+# make sure that the browser will fetch 
+# the new picture when it is created by changing the name of the
+# graph each time the problem seed is changed.
+$graph->gifName($graph->gifName()."-$newProblemSeed");
+
+# Begin writing the problem.
+# This inserts the graph and then asks three questions:
+
+BEGIN_TEXT
+\{ image(insertGraph($graph),width => 200, height => 200) \} $PAR
+Identify the graphs A (blue), B( red) and C (green) as the graphs of a function and its
+derivatives (click on the graph to see an enlarged image):$PAR
+\{ans_rule(4)\} is the graph of the function $PAR
+\{ans_rule(4)\} is the graph of the function's first derivative $PAR
+\{ans_rule(4)\} is the graph of the function's second derivative $PAR
+END_TEXT
+
+ANS(str_cmp( [@scrambled_labels] ) );
+
+ENDDOCUMENT();
\ No newline at end of file
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/paperHeader.pg b/courses.dist/modelCourse/templates/setMAAtutorial/paperHeader.pg
new file mode 100644
index 0000000000..d26d1abcd3
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/paperHeader.pg
@@ -0,0 +1,22 @@
+## Paper set header for setSampleGraders
+
+DOCUMENT();
+
+loadMacros(
+"PG.pl",
+"PGbasicmacros.pl",
+"PGchoicemacros.pl",
+"PGanswermacros.pl"
+);
+
+
+BEGIN_TEXT
+$BEGIN_ONE_COLUMN
+This set shows how to write simple WeBWorK problems and introduces you to the most common
+constructions.
+$END_ONE_COLUMN
+
+END_TEXT
+
+
+ENDDOCUMENT(); 
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/popuplistexample.pg b/courses.dist/modelCourse/templates/setMAAtutorial/popuplistexample.pg
new file mode 100644
index 0000000000..eed7511d1d
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/popuplistexample.pg
@@ -0,0 +1,65 @@
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros("PGbasicmacros.pl",
+           "PGchoicemacros.pl",
+           "PGanswermacros.pl",
+);
+
+TEXT(beginproblem(), $BR,$BBOLD, "True False Pop-up Example", $EBOLD, $BR,$BR);
+$showPartialCorrectAnswers = 0;
+
+# Make a new select list
+$tf = new_select_list();
+# $tf now "contains" the select list object.
+
+# change the printing mechanism of the object to
+# use pop-up list instead of an answer rule.
+$tf->rf_print_q(~~&pop_up_list_print_q);
+
+# What should the pop-up list contain, and what string should it
+# submit for an answer when selected?
+# These are specified in the statment below.
+# To enter T as an answer choose the list element "True"
+# To enter F as an answer choose the list element "False"
+# The first choice is a blank to make the students do SOMETHING!!!
+$tf -> ra_pop_up_list( [ No_answer => "&nbsp;&nbsp;?", T => "True", F => "False"] );
+# Note how the list is constructed [ answer => list element text, answer => list element text ]
+
+# Insert some  questions and their answers.
+
+$tf -> qa ( # each entry has to end with a comma
+"All continuous functions are differentiable.",
+"F",
+"All differentiable functions are continuous.",
+"T",
+"All polynomials are differentiable.",
+"T",
+"All functions with positive derivatives are increasing.",
+"T",
+"All compact sets are closed",
+"T",
+"All closed sets are compact",
+"F",
+"All increasing functions have positive deriviatives",
+"F",
+"All differentiable strictly increasing functions have non-negative derivatives
+                                        at every point",
+"T",
+);
+
+# Choose two of the question and answer pairs at random.
+$tf ->choose(4);  # Using choose(3) would choose all three
+                           # questions, but the order of the questions
+                           # and answers would be scrambled.
+
+# Now print the text using $ml->print_q for the questions.
+BEGIN_TEXT
+$PAR
+Indicate whether each statement is true or false. $BR
+\{ $tf-> print_q \}
+$PAR
+END_TEXT
+# Enter the correct answers to be checked against the answers to the students.
+ANS( str_cmp( $tf->ra_correct_ans )   ) ;
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
\ No newline at end of file
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/prob3.pg b/courses.dist/modelCourse/templates/setMAAtutorial/prob3.pg
new file mode 100644
index 0000000000..7c1671c93c
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/prob3.pg
@@ -0,0 +1,162 @@
+#<HTML>
+#<BODY BGCOLOR = "#ffffff">
+#<PRE>
+# Description
+# The first example using match lists
+# EndDescription
+
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros("PGbasicmacros.pl",
+           "PGchoicemacros.pl",
+           "PGanswermacros.pl",
+           "PGgraphmacros.pl",
+           "PGnumericalmacros.pl"
+           );
+
+# TEXT( ... , ... , )
+# Is the simplest way of printing text, each string in the input is immediately printed.
+# It does not do any of the simplifying and evaluating tricks performed by the BEGIN_TEXT/END_TEXT construction.
+
+# beginproblem() is a macro which outputs the string 
+# which contains the number
+# of points the problem is worth.
+
+# Putting these two ideas together prints the standard opening line of a problem.
+# We will use this construction routinely at the beginning of all subsequent problems.
+TEXT(beginproblem());
+
+# Since this is a matching questions, we do not usually wish to tell students which
+# parts of the matching question have been answered correctly and which are
+# incorrect.  That is too easy.  To accomplish this we set the following flag to zero.
+$showPartialCorrectAnswers = 0;
+
+
+#####################################################################
+# This section allows you to manipulate the problem seed while working on the problem
+# thus seeing different versions of the problem. Skip the details of how this works
+# for now.
+
+# allow the student to change the seed for this problem.
+$newProblemSeed = ( defined( ${$inputs_ref}{'newProblemSeed'} ) )?  ${$inputs_ref}{'newProblemSeed'} : $problemSeed;
+$PG_random_generator->srand($newProblemSeed);
+
+BEGIN_TEXT     
+
+To see a different version of the problem change
+the problem seed and press the 'Submit Answer' button below.$PAR Problem Seed:
+\{  M3(
+qq! Change the problem seed to change the problem:$problemSeed!,
+qq! Change the problem seed to change the problem:
+    \begin{rawhtml}
+    <INPUT NAME="newProblemSeed" VALUE = "$newProblemSeed" SIZE = "10">
+    \end{rawhtml}!,
+qq! <INPUT NAME="newProblemSeed" VALUE = "$newProblemSeed" SIZE = "10">!
+)
+\}
+
+$HR  
+END_TEXT
+#####################################################################
+
+
+# Make a new match list
+$ml = new_match_list();
+
+# $ml now "contains" the match list object.  (Actually $ml is a scalar variable which contains a pointer to 
+# the match list object, but you can think of the match list object as being shoe horned into the variable $ml.
+# You need to remember that $ml contains (a pointer to) an object, and not ordinary data such as a number or string.
+
+# Some people use the convention $o_ml to remind them that the variable contains an object, but for short problems
+# that is probably not necessary.
+
+# An object contains both data (in this case the list of questions and answers) and subroutines (called methods)
+# for manipulating that data.
+
+
+# Insert some  questions and matching answers in the q/a list by calling on the objects qa method.
+# using the construction $ml ->qa(..list of alternating questions and matching answers ...).
+# Think of this as asking the object $ml to store the  matching questions 
+# and answers given in the argument to the method qa.
+
+$ml -> qa (
+"\( \sin(x) \)",        # Notice the use of the LateX construction for math mode: \\( ...  \\)
+"\( \cos(x) \)",		# and the use of TeX symbols such as \\sin and \\tan
+"\( \cos(x) \)",        # Use " ... " to enter a string
+"\( -\sin(x) \)",
+"\( \tan(x) \)",
+"\( \sec^2(x) \)"       # Remember that in these strings we are only specifying typography, 
+ 						# via TeX, not any calculational rules.
+);
+
+#
+# Calculate coefficients for another question
+$b=random(2,5);
+$exp= random(2,5);
+$coeff=$b*$exp;
+$new_exp = $exp-1;
+
+# Store the question and answers in the match list object. 
+$ml -> qa (
+"\( ${b}x^$exp \)",
+"\( ${coeff}x^{$new_exp} \)",
+);
+
+# Add another example
+$b2=random(2,5);
+$exp2= random(2,5);
+$coeff2=$b2*$exp;
+$new_exp2 = $exp-1;
+$ml -> qa (
+"\( ${b2}x^$exp2 \)",
+"\( ${coeff2}x^{$new_exp2} \)",
+);
+
+
+# Choose two of the question and answer pairs at random.
+$ml ->choose(2);  # Using choose(3) would choose all three questions, but the order of the questions and answers would be 
+                  # scrambled.
+
+
+# Now print the text using $ml->print_q for the questions and $ml->print_a to print the answers.
+
+BEGIN_TEXT
+$PAR
+
+Match the functions and their derivatives: $BR
+
+\{ $ml -> print_q \}
+
+$PAR
+
+\{$ml -> print_a \}
+END_TEXT
+
+# Enter the correct answers to be checked against the answers to the students.
+
+ANS( str_cmp( $ml->ra_correct_ans )   ) ;
+
+# That's it.
+
+#########################################################  
+
+BEGIN_TEXT
+<hr>
+
+You can view the 
+\{ htmlLink(alias("${htmlDirectory}/links/set$setNumber/prob3.html"),"source", q!TARGET="source"!)\} 
+for this problem.
+END_TEXT
+
+TEXT(
+"$PAR Return to ", htmlLink($$inputs_ref{returnPage},$$inputs_ref{returnPage}),
+) if exists($$inputs_ref{returnPage});
+#########################################################  
+
+
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
+#</PRE>
+#</BODY>
+#</HTML>
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/prob4.pg b/courses.dist/modelCourse/templates/setMAAtutorial/prob4.pg
new file mode 100644
index 0000000000..7d52a89951
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/prob4.pg
@@ -0,0 +1,95 @@
+#<PRE>
+#Description
+# Testing knowledge of differentiation rules
+#EndDescription
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros("PGbasicmacros.pl",
+           "PGchoicemacros.pl",
+           "PGanswermacros.pl",
+           "PGgraphmacros.pl",
+           "PGnumericalmacros.pl"
+           );
+ 
+TEXT(&beginproblem);
+$showPartialCorrectAnswers = 0;
+
+
+
+# allow the student to change the seed for this problem.
+$newProblemSeed = ( defined( ${$inputs_ref}{'newProblemSeed'} ) )?  ${$inputs_ref}{'newProblemSeed'} : $problemSeed;
+$PG_random_generator->srand($newProblemSeed);
+BEGIN_TEXT
+
+To see a different version of the problem change
+the problem seed and press the 'Submit Answer' button below.$PAR Problem Seed:
+\{  M3(
+qq! Change the problem seed to change the problem:$problemSeed!,
+qq! Change the problem seed to change the problem:
+    \begin{rawhtml}
+    <INPUT NAME="newProblemSeed" VALUE = "$newProblemSeed" SIZE = "10">
+    \end{rawhtml}!,
+qq! <INPUT NAME="newProblemSeed" VALUE = "$newProblemSeed" SIZE = "10">!
+)
+\}
+
+$HR  
+END_TEXT
+
+########################################################################
+# Make a new select list
+$ml = new_select_list();
+#$ml -> rf_print_q(~~&my_print_q);
+# New versions using the macros in PGchoicemacros.pl
+$ml->rf_print_q(~~&pop_up_list_print_q);
+$ml -> ra_pop_up_list([ No_answer => "&nbsp;&nbsp;?",SR => "Sum Rule",PR => "Product Rule",CR => "Chain rule",QR => "Quotient rule" ] );
+
+
+$ml -> qa (
+"\( (f(x) + g(x) )' = f'(x) + g'(x) \)",
+"SR",
+"\( ( f(x)g(x) )' = f'(x)g(x) + f(x)g'(x) \)",
+"PR",
+"\( ( f(g(x)) )' = f'(g(x))g'(x) \) ",
+"CR",
+"\( \frac{d}{dx} \sin(\cos(x)) = - \cos(\cos(x))\sin(x) \)",
+"CR",
+"\( (f(x) - g(x) )' = f'(x) - g'(x) \)",
+"SR",
+);
+
+$ml ->choose(5);
+
+#coda
+
+
+
+
+BEGIN_TEXT
+ $PAR
+
+For each example below, list the label of the  differentiation rule used in that example: $BR
+
+\{ $ml -> print_q \}
+
+$PAR
+You can view the 
+\{ htmlLink(alias("${htmlDirectory}links/setDerivativeRules/prob2.html"), "source",q!TARGET="source"!) \}
+for this problem.
+or consult the 
+\{ htmlLink("/webwork_system_html/docs/techdescription/pglanguage/index.html","documentation") \}  for  more details on the PG language.
+
+END_TEXT
+
+install_problem_grader(~~&std_problem_grader);
+
+ANS( str_cmp( $ml->ra_correct_ans )   ) ;
+
+BEGIN_TEXT
+$PAR
+There are only a few examples in this problem.  A production verison
+would need more examples to choose from.
+END_TEXT
+ENDDOCUMENT();        # This should be the last executable line in the problem.
+#</PRE>
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/screenHeader.pg b/courses.dist/modelCourse/templates/setMAAtutorial/screenHeader.pg
new file mode 100644
index 0000000000..bb7de4e6a7
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/screenHeader.pg
@@ -0,0 +1,21 @@
+DOCUMENT();       
+loadMacros("PG.pl",       
+           "PGbasicmacros.pl",       
+           "PGchoicemacros.pl",       
+           "PGanswermacros.pl"       
+           );       
+
+
+$usd = '$';
+BEGIN_TEXT
+
+This set shows how to write simple WeBWorK problems and introduces you to the most common
+constructions.
+
+
+
+END_TEXT
+TEXT("Return to ", htmlLink('http://cartan.math.rochester.edu/WeBWorKdiscussion/discuss/msgReader$14',
+"discussion page"), "for more information or to make comments.");
+ENDDOCUMENT(); 
+   
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/simple_drawing.pg b/courses.dist/modelCourse/templates/setMAAtutorial/simple_drawing.pg
new file mode 100644
index 0000000000..f4d86c4e7a
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/simple_drawing.pg
@@ -0,0 +1,40 @@
+##DESCRIPTION
+##  A very simple drawing problem
+##ENDDESCRIPTION
+
+##KEYWORDS('algebra')
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+"PG.pl",
+"PGbasicmacros.pl",
+"PGchoicemacros.pl",
+"PGanswermacros.pl",
+"PGgraphmacros.pl",
+"PGauxiliaryFunctions.pl"
+);
+
+
+$graph = init_graph(-5,-5,5,5,ticks=>[4,4],axes=>[0,0],pixels=>[400,400]);
+
+$graph->moveTo(-2,1);
+$graph->lineTo(2,2,'blue');
+$graph->lineTo(-1,2,'red');
+$graph->lineTo(-2,1,'green');
+$graph->fillRegion([0,1.7,'yellow']);
+BEGIN_TEXT
+\{image(insertGraph($graph),width=>400,height=>400)\}
+
+
+END_TEXT
+
+# At the moment there is no easy way to change the weight of the lines being drawn.  To do so one would want
+# to incorporate some of the code in Fun.pm into WWPlot.pm itself.  The code involves gdBrushed.  
+# Since GD  has
+# gone through many revisions since the WWPlot.pm code was written it may now be possible to write some of 
+# this code more efficiently.
+
+
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/simplemultiplechoiceexample.pg b/courses.dist/modelCourse/templates/setMAAtutorial/simplemultiplechoiceexample.pg
new file mode 100644
index 0000000000..f62e09bb28
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/simplemultiplechoiceexample.pg
@@ -0,0 +1,33 @@
+DOCUMENT();        # This should be the first executable line in the problem.
+loadMacros(
+                    "PGbasicmacros.pl", 
+                    "PGchoicemacros.pl", 
+                    "PGanswermacros.pl",
+);
+TEXT(beginproblem(), $BR,$BBOLD, "Multiple choice example", $EBOLD, $BR,$BR);
+
+   
+$showPartialCorrectAnswers = 0;
+$question =  "What is the derivative of tan(x)?";
+# An example of a list or array variable. It begins with @. 
+@answer_list = (        "\( \sec^2(x) \)",  # correct                        
+                                "\( -\cot(x) \)",             
+                                "\( \tan(x) \)",       
+                                "\( \cosh(x) \)",
+                                "\( \sin(x) \)",  
+);
+# These commands permute the order of the answers.
+#@permutation = NchooseK(5,5);  # random permutation of the five answers
+@permutation = (1,0,2,3,4);     # example of fixed permutation
+@permuted_answer_list = @answer_list[@permutation];
+@inverted_alphabet = @ALPHABET[invert( @permutation )];  # needed to check the answers
+
+# Use the macro OL to print an Ordered List of the answerslabeled with letters.
+BEGIN_TEXT
+$BR $question
+$PAR \{ OL( @permuted_answer_list ) \}
+$PAR Enter the letter corresponding to the correct answer: \{ ans_rule(10) \}
+END_TEXT
+ANS( str_cmp( $inverted_alphabet[0] )   ) ;
+
+ENDDOCUMENT(); 
\ No newline at end of file
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/standardexample.pg b/courses.dist/modelCourse/templates/setMAAtutorial/standardexample.pg
new file mode 100644
index 0000000000..29ea3ecfca
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/standardexample.pg
@@ -0,0 +1,47 @@
+DOCUMENT();     
+loadMacros("PGbasicmacros.pl",     
+           "PGchoicemacros.pl",     
+           "PGanswermacros.pl",
+           "PGauxiliaryFunctions.pl"    
+);     
+
+TEXT(beginproblem(), $BR,$BBOLD, "Standard Example", $EBOLD, $BR,$BR);
+
+# A question requiring a string answer.
+$str = 'world'; 
+#$str = "Dolly"; 
+BEGIN_TEXT
+Complete the sentence: $BR 
+\{ ans_rule(20) \}  $str;
+$PAR
+END_TEXT
+ 
+ANS( str_cmp( "Hello") );
+
+# A question requiring a numerical answer.
+#define the variables
+$a = 3;
+$b = 5;
+#$a=random(1,9,1);
+#$b=random(2,9,1);
+
+BEGIN_TEXT
+Enter the sum of these two numbers: $BR
+ \($a + $b = \) \{ans_rule(10) \}
+$PAR
+END_TEXT
+
+$sum = $a + $b;
+ANS( num_cmp( $sum ) ); 
+
+# A question requiring an expression as an answwer
+BEGIN_TEXT
+Enter the derivative of \[ f(x) = x^{$b} \] $BR
+\(f '(x) = \) \{ ans_rule(30) \}
+$PAR
+END_TEXT
+$new_exponent = $b-1;
+$ans2 = "$b*x^($new_exponent)";
+ANS( fun_cmp( $ans2 ) );
+ENDDOCUMENT();
+ 
\ No newline at end of file
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-24438.gif b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-24438.gif
new file mode 100644
index 0000000000..df1f85cbd2
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-24438.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-24438.png b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-24438.png
new file mode 100644
index 0000000000..580193f1ec
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-24438.png differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-31126.gif b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-31126.gif
new file mode 100644
index 0000000000..b0ad26bb6e
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-31126.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-31126.png b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-31126.png
new file mode 100644
index 0000000000..4a6286ab5c
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-31126.png differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-34859.gif b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-34859.gif
new file mode 100644
index 0000000000..702784afdd
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-34859.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-34859.png b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-34859.png
new file mode 100644
index 0000000000..664c466d85
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-34859.png differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-42639.gif b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-42639.gif
new file mode 100644
index 0000000000..dfebffd690
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-42639.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-42639.png b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-42639.png
new file mode 100644
index 0000000000..1180e668cf
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-42639.png differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-76239.gif b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-76239.gif
new file mode 100644
index 0000000000..741fdd8452
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-76239.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-76239.png b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-76239.png
new file mode 100644
index 0000000000..ad13276793
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-76239.png differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-89540.gif b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-89540.gif
new file mode 100644
index 0000000000..aa9a75d45a
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-89540.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-89540.png b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-89540.png
new file mode 100644
index 0000000000..5ee4d64c9d
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-89540.png differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-91734.gif b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-91734.gif
new file mode 100644
index 0000000000..cd5aae4ebd
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-91734.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-91734.png b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-91734.png
new file mode 100644
index 0000000000..82a533be4b
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-91734.png differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-96355.gif b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-96355.gif
new file mode 100644
index 0000000000..23ac97828b
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-96355.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-96355.png b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-96355.png
new file mode 100644
index 0000000000..53203cf0e7
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1-96355.png differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1.gif b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1.gif
new file mode 100644
index 0000000000..073055392b
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1.png b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1.png
new file mode 100644
index 0000000000..f8df18ec73
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/1.png differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-42653.gif b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-42653.gif
new file mode 100644
index 0000000000..709cd644e2
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-42653.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-42653.png b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-42653.png
new file mode 100644
index 0000000000..11a642e8e2
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-42653.png differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-49261.gif b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-49261.gif
new file mode 100644
index 0000000000..3767c0de47
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-49261.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-49261.png b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-49261.png
new file mode 100644
index 0000000000..273247474d
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-49261.png differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-54427.gif b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-54427.gif
new file mode 100644
index 0000000000..11c71d8010
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-54427.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-54427.png b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-54427.png
new file mode 100644
index 0000000000..538e6f5a62
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-54427.png differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-62384.gif b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-62384.gif
new file mode 100644
index 0000000000..538e6f5a62
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-62384.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-62384.png b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-62384.png
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-64591.gif b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-64591.gif
new file mode 100644
index 0000000000..4bd408e32f
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-64591.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-64591.png b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-64591.png
new file mode 100644
index 0000000000..9d3cfa05c1
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-64591.png differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-68458.png b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-68458.png
new file mode 100644
index 0000000000..4f821ea915
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-68458.png differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-68458.pnm b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-68458.pnm
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-70190.gif b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-70190.gif
new file mode 100644
index 0000000000..3e646a41ac
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-70190.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-70190.png b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-70190.png
new file mode 100644
index 0000000000..cc82c39ef1
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-70190.png differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-81779.gif b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-81779.gif
new file mode 100644
index 0000000000..944f3efcf6
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-81779.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-81779.png b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-81779.png
new file mode 100644
index 0000000000..b72c870a2b
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-81779.png differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-92879.gif b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-92879.gif
new file mode 100644
index 0000000000..11506db3bc
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-92879.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-92879.png b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-92879.png
new file mode 100644
index 0000000000..febe0715b8
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2-92879.png differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2.gif b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2.gif
new file mode 100644
index 0000000000..b85a6d3ad3
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2.png b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2.png
new file mode 100644
index 0000000000..0a68a46210
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/2.png differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-14197.gif b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-14197.gif
new file mode 100644
index 0000000000..c28c1b68ee
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-14197.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-14197.png b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-14197.png
new file mode 100644
index 0000000000..65fb892896
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-14197.png differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-14538.gif b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-14538.gif
new file mode 100644
index 0000000000..c57d2fbe84
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-14538.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-14538.png b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-14538.png
new file mode 100644
index 0000000000..99e6748686
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-14538.png differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-37616.gif b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-37616.gif
new file mode 100644
index 0000000000..a9c2db85c3
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-37616.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-37616.png b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-37616.png
new file mode 100644
index 0000000000..212e96cfe2
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-37616.png differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-46739.gif b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-46739.gif
new file mode 100644
index 0000000000..4244a8ca61
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-46739.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-46739.png b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-46739.png
new file mode 100644
index 0000000000..43d18b86ec
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-46739.png differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-52898.gif b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-52898.gif
new file mode 100644
index 0000000000..afe8cd9d75
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-52898.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-52898.png b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-52898.png
new file mode 100644
index 0000000000..93a35d4e35
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-52898.png differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-68458.gif b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-68458.gif
new file mode 100644
index 0000000000..8690563535
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-68458.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-68458.png b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-68458.png
new file mode 100644
index 0000000000..4f821ea915
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-68458.png differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-89262.gif b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-89262.gif
new file mode 100644
index 0000000000..5c954beec1
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-89262.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-89262.png b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-89262.png
new file mode 100644
index 0000000000..37c3e8418e
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-89262.png differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-99389.gif b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-99389.gif
new file mode 100644
index 0000000000..f948cc3e83
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-99389.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-99389.png b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-99389.png
new file mode 100644
index 0000000000..51f7c7e1b3
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3-99389.png differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3.gif b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3.gif
new file mode 100644
index 0000000000..5f8f80e7d8
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3.gif differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3.png b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3.png
new file mode 100644
index 0000000000..c16fb935e9
Binary files /dev/null and b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/3.png differ
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/staticgraphicsexample.pg b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/staticgraphicsexample.pg
new file mode 100644
index 0000000000..97f15b6b25
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/staticgraphicsexample.pg
@@ -0,0 +1,115 @@
+DOCUMENT();
+loadMacros("PGbasicmacros.pl",
+           "PGchoicemacros.pl",
+           "PGanswermacros.pl"
+);
+TEXT($BEGIN_ONE_COLUMN);
+TEXT(beginproblem(), $BR,$BBOLD, "Static graphics Example", $EBOLD, $BR,$BR);
+
+$showPartialCorrectAnswers = 0;
+# Define which of the three sets of pictures to use
+
+# The pictures are labeled 1.png, 2.png and 3.png and
+# stored in the same directory as staticgraphicsexample.png
+# These are the corresponding transformed pictures.
+# Be careful with the labeling, since the URL's could give the
+# correct answers away.
+# (In this example the middle integer tells you
+#  the correct position.)
+
+$pictID[1] = [
+"1-31126.png",  # "\( F(x+3)\)",
+"1-76239.png",  # "\(F(x-3) \)" ,
+"1-96355.png",  # "\( -F(-x)\)",
+"1-24438.png",  # "\( F(-x) \)",
+"1-89540.png",  # "\( 5F(x) \)",
+"1-42639.png",  # "\( F(3x) \)" ,
+"1-91734.png",  # "\( F(x/3) \)",
+"1-34859.png",  # "\( F(x^2) \)",
+];
+$pictID[2] = [
+"2-70190.png",  # ditto
+"2-49261.png",
+"2-62384.png",
+"2-54427.png",
+"2-64591.png",
+"2-42653.png",
+"2-81779.png",
+"2-92879.png",
+];
+$pictID[3] = [
+"3-14197.png",
+"3-89262.png",
+"3-99389.png",
+"3-68458.png",
+"3-14538.png",
+"3-37616.png",
+"3-46739.png",
+"3-52898.png",
+];
+$ml = new_match_list();
+
+$pictSet=random(1,3,1);  # Choose one of the three picture sets
+$pictSet=1;
+$pictSetname = $pictSet.".png";
+$ml->qa (
+"\( F(x+3)\) ",
+image($pictID[$pictSet][0],tex_size=>200),
+"\(F(x-3) \)" ,
+image($pictID[$pictSet][1],tex_size=>200),
+"\( -F(-x)\) ",
+image($pictID[$pictSet][2],tex_size=>200),
+"\( F(-x) \)",
+image($pictID[$pictSet][3],tex_size=>200),
+"\( 5F(x) \)",
+image($pictID[$pictSet][4],tex_size=>200),
+"\( F(3x) \)" ,
+image($pictID[$pictSet][5],tex_size=>200),
+"\( F(x/3) \)",
+image($pictID[$pictSet][6],tex_size=>200),
+"\( F(x^2) \)",
+image($pictID[$pictSet][7],tex_size=>200),
+);
+
+$ml->choose(4);
+sub format_graphs {
+        my $self = shift;
+        my @in = @_;
+        my $out = "";
+        while(@in) {
+                $out .=  shift(@in). "#" ;
+        }
+        $out;      # The output has to be a string in order to conform to the
+                   # specs for the match list object, but I've put some
+                   # markers in (#) so that
+                   # I can break the string up into a list for use
+                   # as an input into row.
+}
+
+# We need to change the output, since the normal
+# output routine will put the pictures one above another.
+$ml->rf_print_a(~~&format_graphs);
+             
+BEGIN_TEXT
+This is a graph of the function \( F(x) \):
+($BBOLD Click on image for a larger view $EBOLD)
+$PAR
+\{ image($pictSetname,  tex_size => 200) \}
+$PAR
+Enter the letter of the graph below which corresponds to the transformation
+of the function.
+\{ $ml -> print_q \}
+END_TEXT
+
+# Place the output into a table
+TEXT(
+   begintable(4),
+   row( split("#",$ml->print_a() ) ),
+   row('A', 'B', 'C', 'D' ),
+   endtable(),
+);
+
+ANS(  str_cmp( $ml ->ra_correct_ans()   ) ) ;
+
+TEXT($END_ONE_COLUMN);
+ENDDOCUMENT();
\ No newline at end of file
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/tmp b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/tmp
new file mode 100644
index 0000000000..3090a9405f
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/staticgraphicsexample/tmp
@@ -0,0 +1,3 @@
+#!/usr/bin/csh
+
+cat $1 | giftopnm | pnmtopng >$2
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/truefalseexample.pg b/courses.dist/modelCourse/templates/setMAAtutorial/truefalseexample.pg
new file mode 100644
index 0000000000..36e59f0f87
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/truefalseexample.pg
@@ -0,0 +1,63 @@
+DOCUMENT();      
+loadMacros("PGbasicmacros.pl",
+           "PGchoicemacros.pl",
+           "PGanswermacros.pl",
+
+);
+TEXT(beginproblem(), $BR,$BBOLD, "True False Example", $EBOLD, $BR,$BR);
+
+# Since this is a true questions, we do not usually wish to tell students which
+# parts of the matching question have been answered correctly and which are
+# incorrect.  That is too easy.  To accomplish this we set the following flag to
+# zero.
+$showPartialCorrectAnswers = 0;
+
+# True false questions are a special case of a "select list"
+# Make a new select list
+$tf = new_select_list();
+# $tf now "contains" the select list object.
+# Insert some  questions and whether or not they are true.
+
+$tf -> qa ( # each entry has to end with a comma
+"All continuous functions are differentiable.",
+"F",
+"All differentiable functions are continuous.",
+"T",
+"All polynomials are differentiable.",
+"T",
+"All functions with positive derivatives are increasing.",
+"T",
+"All compact sets are closed",
+"T",
+"All closed sets are compact",
+"F",
+"All increasing functions have positive deriviatives",
+"F",
+"All differentiable strictly increasing functions have non-negative derivatives
+                                        at every point",
+"T",
+);   
+
+# Choose four of the question and answer pairs at random.
+$tf ->choose(4);
+
+# Now print the text using $ml->print_q for the questions
+# and $ml->print_a to print the answers.
+
+BEGIN_TEXT
+$PAR
+
+Enter T or F depending on whether the statement is true or false.
+(You must enter T or F -- True and False will not work.)$BR
+
+\{ $tf-> print_q \}
+
+$PAR
+
+END_TEXT
+
+# Enter the correct answers to be checked against the answers to the students.
+
+ANS( str_cmp( $tf->ra_correct_ans )   ) ;
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
\ No newline at end of file
diff --git a/courses.dist/modelCourse/templates/setMAAtutorial/vectorfieldexample.pg b/courses.dist/modelCourse/templates/setMAAtutorial/vectorfieldexample.pg
new file mode 100644
index 0000000000..50214bd5b5
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setMAAtutorial/vectorfieldexample.pg
@@ -0,0 +1,94 @@
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros("PG.pl",
+           "PGbasicmacros.pl",
+           "PGchoicemacros.pl",
+           "PGanswermacros.pl",
+           "PGgraphmacros.pl",        
+);
+
+TEXT(beginproblem()); # standard preamble to each problem.
+
+# Since this is a true questions, we do not usually wish to tell students which
+# parts of the matching question have been answered correctly and which are
+# incorrect.  That is too easy.  To accomplish this we set the following flag to zero.
+$showPartialCorrectAnswers = 0;
+
+
+# Make a new select list
+
+$tf = new_match_list();
+
+$numberOfQuestions = 4;
+$tf -> qa (
+"\(y'= 2y + x^2e^{2x} \)",
+sub{my ($x,$y) = @_; 2*$y+($x**2)*exp(2*$x); },
+"\( y'= -2 + x - y \)",
+sub{my ($x,$y) = @_; -2 + $x - $y;},
+"\(y'= e^{-x} + 2y\)",
+sub{my ($x,$y) = @_; exp(-$x) + 2*$y;},
+"\(y'= 2\sin(x) + 1 + y\)",
+sub{my ($x,$y) = @_; 2*sin($x) + 1 + $y;},
+"\(y'= -\frac{2x+y)}{(2y)} \)",
+sub{my ($x,$y) = @_; ($y==0)? -2*$x/0.001 : -(2*$x+$y)/(2*$y);},
+"\(y'= y + 2\)",
+sub{my ($x,$y) = @_; $y + 2 ;},
+);  
+
+$tf ->choose($numberOfQuestions);
+BEGIN_TEXT
+$BEGIN_ONE_COLUMN
+
+Match the following equations with their direction field. 
+Clicking on each picture will give you an
+enlarged view.  While you can probably solve this problem by guessing,
+it is useful to try to predict characteristics of the direction field
+and then match them to the picture.
+$PAR
+Here are some handy characteristics to start with --
+you will develop more as you practice.
+$PAR
+
+\{OL(
+  "Set y equal to zero and look at how the derivative behaves along the x axis.",
+  "Do the same for the y axis by setting x equal to 0",
+  "Consider the curve in the plane defined by setting y'=0
+   -- this should correspond to the points in the picture where the
+   slope is zero.",
+ "Setting y' equal to a constant other than zero gives the curve of points
+   where the slope is that
+   constant.  These are called isoclines, and can be used to construct the
+   direction field picture by hand."
+)\}
+        
+
+        \{ $tf->print_q \}
+
+END_TEXT
+$dx_rule = sub{my ($x,$y) = @_; 1; };
+$dy_rule = sub{my ($x,$y) = @_; $y; };
+# prepare graphs:
+@dy_rules = @{ $tf->{selected_a} };
+
+for my $i (0..$numberOfQuestions-1) {
+        $graph[$i] = init_graph(-4,-4,4,4,'axes'=>[0,0],'grid'=>[8,8]);
+        $vectorfield[$i] = new VectorField($dx_rule, $dy_rules[$i], $graph[$i]);
+        $vectorfield[$i]->dot_radius(2);
+        $graphURL[$i] = insertGraph($graph[$i]);
+}
+####
+BEGIN_TEXT
+$PAR
+        \{  imageRow( [@graphURL[0..$numberOfQuestions/2-1]],
+                      [@ALPHABET[0..$numberOfQuestions/2-1]], height => 200,
+                              width => 200,tex_size=>300 )  \}
+       \{  imageRow( [@graphURL[$numberOfQuestions/2..$numberOfQuestions-1]],
+                      [@ALPHABET[$numberOfQuestions/2..$numberOfQuestions-1]],
+                             height => 200, width => 200,tex_size=>300 )  \}
+       
+$END_ONE_COLUMN
+END_TEXT
+
+ANS( str_cmp( $tf->ra_correct_ans )   ) ;
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/courses.dist/modelCourse/templates/setOrientation.def b/courses.dist/modelCourse/templates/setOrientation.def
new file mode 100644
index 0000000000..fec0acb974
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setOrientation.def
@@ -0,0 +1,23 @@
+setNumber=Orientation
+openDate = 6/26/04 at 11:30am
+dueDate = 4/4/15 at 12:20pm
+answerDate = 4/5/15 at 12:00pm
+paperHeaderFile = setOrientation/setHeader.pg
+screenHeaderFile = setOrientation/setHeader.pg
+
+problemList =
+setOrientation/prob01.pg, 1
+setOrientation/prob02.pg, 1
+setOrientation/prob03.pg, 1
+setOrientation/prob04.pg, 1
+setOrientation/prob05/prob05.pg, 1
+setOrientation/prob06.pg, 1
+setOrientation/prob07.pg, 1
+setOrientation/prob08.pg, 1
+setOrientation/prob09.pg, 1
+setOrientation/prob10.pg, 1
+setOrientation/prob11.pg, 1
+setOrientation/prob12.pg, 1
+setOrientation/prob13.pg, 1
+setOrientation/prob14/prob14.pg, 1
+setOrientation/prob15.pg, 1
diff --git a/courses.dist/modelCourse/templates/setOrientation/course_info.txt b/courses.dist/modelCourse/templates/setOrientation/course_info.txt
new file mode 100644
index 0000000000..f955c346c8
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setOrientation/course_info.txt
@@ -0,0 +1,22 @@
+<FONT SIZE="+1"><B>You have logged into WeBWorK!</B></FONT>
+
+<p align="justify">
+
+If you haven't already done so, you should change your password to
+something other than your student ID.  To do this, click on the
+Password/Email link in the list at the far left, and follow the
+directions on that page.
+
+<p align="justify">
+
+Once you have changed your password, click on the "Orientation" link
+in the white area at the left.  This will take you to the the first
+homework assignment, which will help you to learn how to use WeBWorK
+effectively.
+
+<p align="justify">
+
+If you wish to get a printed copy of one of your assignments, you can
+do so from this page by pressing the "Download Hardcopy" button.  You
+will be taken to a page where you can select what information to
+include in the set, and which set to download.
diff --git a/courses.dist/modelCourse/templates/setOrientation/login_info.txt b/courses.dist/modelCourse/templates/setOrientation/login_info.txt
new file mode 100644
index 0000000000..3ff81bcd37
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setOrientation/login_info.txt
@@ -0,0 +1,20 @@
+<FONT SIZE="+1"><B>Welcome to WeBWorK!</B></FONT>
+
+<P ALIGN="JUSTIFY">
+
+Your username is the same as the one used for your Union College
+email, and your initial password is your Union College Student ID
+number (you will change that after you log in).
+
+<P ALIGN="JUSTIFY">
+
+Log in and follow the instructions that will appear in this panel once
+you have done so.  For the first assignment, <I>do not</I> log in as a
+guest user or using a friend's account.  If you do, you will not
+receive credit for doing the asignment!
+
+<P ALIGN="JUSTIFY">
+
+On future assignments, you can use the guest accounts to get
+additional practice problems that are similar to the ones in your
+homework set, but with different numbers.
diff --git a/courses.dist/modelCourse/templates/setOrientation/options_info.txt b/courses.dist/modelCourse/templates/setOrientation/options_info.txt
new file mode 100644
index 0000000000..f6aa8eadf3
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setOrientation/options_info.txt
@@ -0,0 +1,31 @@
+<FONT SIZE="+1"><B>Change Your Password</B></FONT>
+
+<p align="justify">
+
+If you haven't already changed your password, you should do so now.
+To do this, type your OLD password in the top box at the left and
+your NEW password in the two lower boxes at the left,
+then press the "Change User Options" button.
+
+<p align="justify">
+
+Your password should be at least 6 characters long, and should include
+something other than just letters.  Don't make it something that is
+easily guessed, and don't make it the same as the password for your
+e-mail account!
+
+<p align="justify">
+
+If you prefer to receive your e-mail at a location other than your
+Union College account, you should change your e-mail address in the box
+at the left.  Be aware, however, that your professor (and others on
+the Union campus) may still send mail to your Union College address,
+so you should check that account regularly anyway.  Note that you can
+have your Union college e-mail forwarded to another address
+automatically if you wish.
+
+<p align="justify">
+
+Finally, when you have made the changes that you want to make, select
+the "Homework Sets" link at the top of the red panel at the far left
+to get back to the list of homework sets.
diff --git a/courses.dist/modelCourse/templates/setOrientation/parserOrientation.pl b/courses.dist/modelCourse/templates/setOrientation/parserOrientation.pl
new file mode 100644
index 0000000000..99abee9ff4
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setOrientation/parserOrientation.pl
@@ -0,0 +1,229 @@
+#!/usr/local/bin/perl
+
+######################################################################
+#
+#  Macros used by the orientation problem set
+#
+######################################################################
+
+
+#loadMacros("PGcourse.pl");
+
+#
+#  Special use of CARET to have it work in non-math mode
+#
+$CARET = MODES(
+  TeX => '\hbox{\texttt{\char94}}',
+  Latex2HTML => '^',
+  HTML => '^'
+);
+
+#
+#  Functions to display student input and computer output
+#  (written as functions so that we change the style without
+#  recoding the problems themselves).
+#
+sub student {
+  my $message = shift;
+  MODES(
+    TeX => '\leavevmode\hbox{\texttt{'.$message.'}}',
+    Latex2HTML =>
+       $bHTML.'<NOBR><TT>'.$eHTML.$message.$bHTML.'</TT></NOBR>'.$eHTML,
+    HTML => '<NOBR><TT>'.$message.'</TT></NOBR>'
+  );
+}
+
+sub computer {
+  my $message = shift;
+  MODES(
+    TeX => '\hbox{\texttt{'.$message.'}}',
+    Latex2HTML =>
+       $bHTML.'<NOBR><TT>'.$eHTML.$message.$bHTML.'</TT></NOBR>'.$eHTML,
+    HTML => '<NOBR><TT>'.$message.'</TT></NOBR>'
+  );
+}
+
+#
+#  This prints things we need to fill in yet in red
+#
+sub moreWork {
+  my $message = shift;
+  MODES(
+    TeX => '{\sl ' . $message . '}',
+    Latex2HTML => $bHTML . '<FONT COLOR="#A00000">' . $eHTML .
+      $message . $bHTML . '</FONT>' . $eHTML,
+    HTML => '<FONT COLOR="#A00000">' . $message . '</FONT>'
+  );
+}
+
+#
+#  Temporary macros to mark comments in areas that we are
+#  working on.
+#
+$BCOMMENT = MODES(
+  TeX => '{\footnotesize\it',
+  Latex2HTML => $bHTML.'<BLOCKQUOTE><SMALL><I><FONT COLOR="#A00000">'.$eHTML,
+  HTML => '<BLOCKQUOTE><SMALL><I><FONT COLOR="#A00000">'
+);
+
+$ECOMMENT = MODES(
+  TeX => '}',
+  Latex2HTML => $bHTML.'</FONT></I></SMALL></BLOCKQUOTE>'.$eHTML,
+  HTML => '</FONT></I></SMALL></BLOCKQUOTE>'
+);
+
+# $BCOMMENT = MODES(
+#     TeX => '\iffalse',
+#     Latex2HTML => $bHTML.'<!-- '.$eHTML,
+#     HTML => '<!-- '
+# );
+# 
+# $ECOMMENT = MODES(
+#     TeX => '\fi',
+#     Latex2HTML => $bHTML.' -->'.$eHTML,
+#     HTML => ' -->'
+# );
+
+
+#
+#  Hack to get better spacing in HTML_tth math mode but without
+#  messing up the spacing in other modes.
+#
+$SP = MODES(
+   TeX => ' ', Latex2HTML => ' ',
+   HTML => ' ', HTML_tth => '\ ',
+   HTML_jsMath => ' ', HTML_dpng => ' ',
+);
+
+
+#
+#  Special table macros for questions that have 
+#  displayed math expressions equal to an answer rule,
+#  with an accompanying explanation on a separate line.
+#
+
+sub BeginExamples {
+  return "" if ($displayMode eq "TeX");
+  BeginTable(@_);
+}
+
+sub EndExamples {
+  return "" if ($displayMode eq "TeX");
+  EndTable();
+}
+
+@ExampleDefaults = (ans_rule_len => 40, ans_rule_height => 1);
+
+sub BeginExample {
+  my $math = shift;
+  my $ans = shift;
+  my %options = (@ExampleDefaults, @_);
+  my ($cols,$rows) = ($options{ans_rule_len},$options{ans_rule_height});
+  my $rule;
+
+  if ($rows == 1) {$rule = ans_rule($cols)}
+    else {$rule = ans_box($rows,$cols)}
+  ANS($ans);
+
+  #
+  #  HTML_tth puts an unwanted <BR> at the beginning,
+  #  and uses a centered table.  Remove the <BR> and
+  #  align the table to the right.
+  #
+  if ($displayMode eq "HTML_tth") {
+    $math = trimString(EV2('\['.$math.'\]'));
+    $math =~ s!<br clear="all" />!!;
+    $math =~ s!table align="center"!table align="right"!;
+  } elsif ($displayMode eq "HTML") {
+    $math = '\('.$math.'\)'
+  } elsif ($displayMode =~ m/^HTML/) {
+    $math = '\(\displaystyle '.$math.'\)'
+  }
+
+  MODES(
+    TeX => "\n".'\['.$math.'=\hbox to 8em{'.$rule.'}\]',
+    Latex2HTML => $bHTML.'<TR><TD ALIGN="RIGHT">'.$eHTML.
+      '\(\displaystyle '.$math.'\)'.$bHTML.'</TD><TD>&nbsp;=&nbsp;&nbsp;</TD>'.
+      '<TD>'.$eHTML.$rule.$bHTML.'</TD></TR>'.
+      '<TR><TD></TD><TD></TD><TD>'.$eHTML,
+    HTML => 
+      '<TR><TD ALIGN="RIGHT">'.$math.'</TD><TD>&nbsp;=&nbsp;&nbsp;</TD>'.
+      '<TD>'.$rule.'</TD></TR><TR><TD COLSPAN="2"></TD><TD>'
+  );
+}
+
+sub EndExample {
+  MODES(
+    TeX => "\n",
+    Latex2HTML => $bHTML.'<BR><BR></TD></TR>'.$eHTML,
+    HTML => '<BR><BR></TD></TR>'
+  );
+}
+
+sub ExampleRule {
+  MODES(
+    TeX => '\par',
+    Latex2HTML => $bHTML.'<TR><TD COLSPAN="3"><HR></TD></TR>'.$eHTML,
+    HTML => '<TR><TD COLSPAN="3"><HR></TD></TR>'
+  );
+}
+
+#
+#  Produce a TeX version and an answer checker for the formula
+#
+sub DisplayQA {my $f = shift; return (DMATH($f->TeX),$f->cmp)}
+sub QA {my $f = shift; return ($f->TeX,$f->cmp)}
+
+##################################################
+#
+#  Insert an image of an equation (but use the equation
+#  in TeX mode).
+#
+
+sub MathIMG {
+  my ($img,$text,$tex) = @_;
+  my $useTeX = MODES(TeX => 1, Latex2HTML => 0, HTML => 0, HTML_tth => 0, HTML_dpng => 1);
+  return '\('.$tex.'\)' if $useTeX;
+  $img = alias($img);
+  return qq{<IMG SRC="$img" BORDER="0" ALIGN="MIDDLE" ALT="$text">};
+}
+
+
+##################################################
+#
+#  A simple grader that always returns a score of 1.
+#  This is used in the tutorial to give students
+#  credit for reading a problem (even if it doesn't
+#  ask any questions).
+#  
+sub forgiving_grader {
+    my $rh_evaluated_answers = shift;
+    my $rh_problem_state = shift;
+    my %form_options = @_;
+    my %evaluated_answers = %{$rh_evaluated_answers};
+    my %problem_state =	%{$rh_problem_state};
+    
+    my %problem_result = (
+       score  => 1,   # always return 1
+       errors => '',
+       type   => 'forgiving_grader',
+       msg    => '',
+    );
+    
+    return(\%problem_result,\%problem_state)
+      if (!$form_options{answers_submitted});
+    
+    $problem_state{recorded_score} = $problem_result{score};
+    $problem_state{num_of_correct_ans}++;
+    
+    (\%problem_result, \%problem_state);
+}
+
+##################################################
+#
+#  Syntactic sugar to avoid ugly ~~& construct in PG.
+#
+sub install_forgiving_grader {install_problem_grader(\&forgiving_grader)}
+
+
+1;
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob01.pg b/courses.dist/modelCourse/templates/setOrientation/prob01.pg
new file mode 100644
index 0000000000..739d2eec5d
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setOrientation/prob01.pg
@@ -0,0 +1,82 @@
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGstandard.pl",
+  "PGunion.pl",
+  "parserOrientation.pl",
+  "PGcourse.pl",
+);
+
+
+TEXT(beginproblem());
+
+Title("Understanding $WW Problem Pages");
+
+##############################################
+BEGIN_TEXT
+
+The $WW screen is divided into several areas, each used for a
+different purpose.  You will need to understand these
+in order to use $WW effectively.
+$PAR
+
+At the upper left are the navigation buttons that allow you to move
+from problem to problem.  The ${LQ}Next$RQ and ${LQ}Previous$RQ
+buttons, naturally, send you to the next and previous problems.  The
+${LQ}Prob. List$RQ button takes you back to the opening
+page for the homework set (the one that lists all the problems and
+gives the instructions for the homework set).
+$PAR
+
+The area below the navigation buttons is where $WW tells you about
+your score for the current problem.  When you have submitted your
+answers, this is where you will be given information about what
+answers you got right and wrong.  (It will be shown on a grey
+backgound to help make it stand out; you will see this later.) This
+area also shows you how many points a problem is worth.
+$PAR
+
+The main part of the page is the text of the problem you are trying to
+answer, including blank boxes for you to enter your answers. (There 
+aren't any such boxes on this page, because you are not being asked
+any questions here, but usually there will be one or more answer blanks
+on a page.)
+$PAR
+
+Below the problem text is a message area where you may be informed
+about how partial credit is handled in multi-part problems.  Other
+information also may appear there, such as a message indicating that
+the due date is passed, or that answers are available.
+$PAR
+
+In the red panel at the left, instead of the list of homework sets, you
+now have a list of the problems within this assignment.  You can go to
+any problem just by clicking on it.  The checkboxes at the bottom of
+the panel are discussed in the next problem.
+$PAR
+
+In the center of the top red panel is an indication of how much time
+you have left to work on the problems for this set.  Note that this is
+computed at the moment you downloaded the problem page; if you use the
+${LQ}Back$RQ and ${LQ}Forward$RQ buttons on your browser, this does
+not reload the page, so the times will not be updated.  Reload the
+page using your browser's Reload or Refresh buttons to get the current
+time.
+$PAR
+
+The buttons at the bottom of the screen, including the ${LQ}Submit
+Answers$RQ button, are discussed in the next problem. At this point,
+you can get credit for Problem 1 by pressing the ${LQ}Submit
+Answers$RQ button at the bottom of the page (even though there was no
+answer to submit), and then pressing the ${LQ}Next$RQ button at the
+top of the screen to go on to the next problem.
+
+END_TEXT
+
+
+install_forgiving_grader();
+$showPartialCorrectAnswers = 1;
+
+##############################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob02.pg b/courses.dist/modelCourse/templates/setOrientation/prob02.pg
new file mode 100644
index 0000000000..9cee044cbc
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setOrientation/prob02.pg
@@ -0,0 +1,108 @@
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGstandard.pl",
+  "PGunion.pl",
+  "parserOrientation.pl",
+  "PGcourse.pl",
+);
+
+
+TEXT(beginproblem());
+
+Title("Controlling $WW");
+
+##############################################
+
+BEGIN_TEXT
+
+The buttons at the bottom of the screen are what cause $WW to process
+your answers.  Nothing that you type will have any effect until you
+press one of these buttons.
+$PAR
+
+The ${LQ}Submit Answers$RQ button causes $WW to check your answers and
+report your score for the problem.  You can continue to work on a
+problem until you get it right, so don't be afraid to submit your
+answer even if you have only finished parts of the problem or are
+not sure of the correctness of your answer.  If the due date is
+passed and the answers are available, you can click the ${LQ}Show
+Correct Answers$RQ button before pressing ${LQ}Submit$RQ.
+If you do, the correct answer(s) will be displayed in the answer area
+at the top of the screen along with the answers you have provided.
+$PAR
+
+If you have typed in a complicated answer, or are being told your
+answer is incorrect when you think it's right, you may want to use the
+${LQ}Preview Answer$RQ button.  This will ask $WW to display at the
+top of the page its interpretation of what you have entered.  This
+can be used to help spot errors in your typing, and verify that $WW
+understands your answer the way you intend it to.  (This is discussed
+further in a later problem.)
+$PAR
+
+At the bottom of the red panel at the left is a box that allows you to
+change how the problem is displayed.  The equations within the problem
+can be represented in three different ways:
+
+\{BeginParList("UL")\}
+
+$ITEM
+${LQ}images${RQ} mode is the default choice (what $WW uses unless you tell 
+it otherwise). It produces the accurate mathematical notation,
+with the disadvantages of being slightly slower, and not printing well
+if you want to print out a single problem.
+$ITEMSEP
+
+$ITEM
+${LQ}formatted-text${RQ} mode produces results quickly, but more
+complicated mathematics may be difficult to read in this
+mode.  For example, some fractions and integrals are not easy to read
+in formatted-text mode.
+$ITEMSEP
+
+$ITEM
+${LQ}jsMath${RQ} mode uses a JavaScript program and Cascading Style
+Sheets (CSS) to display the mathematics.  This produces good results,
+and is particularly nice if you need to change the size of the fonts
+in your browser or wish to print out a single problem.  For best
+results, however, you should download and install some fonts that
+jsMath uses; there is a link to the fonts on the jsMath control panel,
+which you can activate using the small jsMath button that will appear
+at the lower right of the screen when you activate this mode.  The
+first problem you view using jsMath may take a little longer to
+appear, as the JavaScript program is being loaded into your browser,
+but things should run faster after that.
+
+\{EndParList("UL")\}
+$PAR
+
+Choose whichever mode is most comfortable for you.  You can always
+select a different mode if a particular problem needs it.  Here is a
+sample of some simple mathematics, \(x^2 + 3\), and a more complicated
+expression, \(\frac{x(1-x)}{2x + 1}\).  Try changing the display mode
+by clicking the ${LQ}formatted-text$RQ or ${LQ}jsMath${RQ} radio
+button and then pressing the ${LQ}Apply Options${RQ} button to cause
+the page to be reformatted.  Then change the display mode to back to
+${LQ}images$RQ mode for the rest of the homework set.
+$PAR
+
+The ${LQ}Show saved answers${RQ} checkbox tells whether you
+want $WW to fill in the answer blanks with your previous answers or
+not.  (If you like, you can test this out on the next problem, since
+there are no answer blanks in this one.)
+$PAR
+
+You are now ready to learn how to enter answers into $WW.  Press the
+${LQ}Submit Answers${RQ} button to get credit for this problem, and
+then press the ${LQ}Next$RQ button at the top of the page to go on to
+the next one.
+
+END_TEXT
+
+install_forgiving_grader();
+$showPartialCorrectAnswers = 1;
+
+##############################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob03.pg b/courses.dist/modelCourse/templates/setOrientation/prob03.pg
new file mode 100644
index 0000000000..fef926ba5d
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setOrientation/prob03.pg
@@ -0,0 +1,141 @@
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGstandard.pl",
+  "MathObjects.pl",
+  "contextLimitedNumeric.pl",
+  "PGunion.pl",
+  "parserOrientation.pl",
+  "PGcourse.pl",
+);
+
+
+$showPartialCorrectAnswers = 1;
+
+TEXT(beginproblem());
+Title("Typing in Your Answers");
+
+##############################################
+
+BEGIN_TEXT
+
+Here are the standard symbols that $WW, along with most other
+computer software, uses for arithmetic operations:
+$PAR
+
+\{
+  BeginTable().
+   Row([$BBOLD.'Symbol'.$EBOLD,
+       $BBOLD.'Meaning'.$EBOLD,
+       $BBOLD.'Example'.$EBOLD]).
+    TableLine().
+    Row([computer("+"),'Addition',computer("3+4 = 7")],align=>"CENTER").
+    Row([computer("-"),'Subtraction',computer("3-4 = -1")],align=>"CENTER").
+    Row([computer("*"),'Multiplication',computer("3*4 = 12")],align=>"CENTER").
+    Row([computer("/"),'Division',computer("3/4 = .75")],align=>"CENTER").
+    Row([computer($CARET)." or ".computer("**"),'Exponentiation',
+      computer("3${CARET}4 = 81")." or ".
+      computer("3**4 = 81")],align=>"CENTER").
+    TableLine().
+  EndTable()
+\}
+$PAR
+
+END_TEXT
+
+##################################################
+
+$a = non_zero_random(-5,5,1);
+$b = non_zero_random(-5,5,1);
+$c = non_zero_random(-3,3,1) * 2;
+$d = non_zero_random(-5,5,1);
+
+BEGIN_TEXT
+
+Sometimes $WW will insist that you calculate the value of an
+expression as a single number before you enter it.  For example,
+calculate the value of \($c($a - $b) - ($c - $d)\) and enter it in
+the following blank.
+(Here you have to enter a single integer; the question is testing
+whether you can do the operations correctly.)
+
+$PAR
+$BBLOCKQUOTE
+\($c($a - $b) - ($c - $d)\) = \{ans_rule(10)\}
+$EBLOCKQUOTE
+$PAR
+END_TEXT
+
+Context("LimitedNumeric");
+$ans = $c*($a - $b) - ($c - $d);
+ANS(Real($ans)->cmp);
+
+##################################################
+
+BEGIN_TEXT
+
+Most often you will not have to simplify your answer, but can let 
+$WW do this for you. The following blanks are all expecting 
+the value 16.  Try entering it several different ways, such as
+\{student "7+9"\}, \{student "18-2"\}, \{student "8*2"\}, 
+\{student "32/2"\}, and \{student "4${CARET}2"\}. Note: pressing
+the ${LQ}Tab$RQ key on your keyboard will move you from one answer
+box to the next.
+
+$PAR
+$BBLOCKQUOTE
+16 = \{ans_rule(8)\} or
+\{ans_rule(8)\} or
+\{ans_rule(8)\} or
+\{ans_rule(8)\} or
+\{ans_rule(8)\}
+$EBLOCKQUOTE
+$PAR
+
+END_TEXT
+
+Context("Numeric");
+
+ANS(
+  Real(16)->cmp,
+  Real(16)->cmp,
+  Real(16)->cmp,
+  Real(16)->cmp,
+  Real(16)->cmp,
+);
+
+##################################################
+
+BEGIN_TEXT
+
+$WW also understands that quantities written next to each other are
+supposed to be multiplied.  For example, you can enter \{student
+"(9)(7)"\} instead of \{student "63"\}.  Most often this is used when
+one quantity is a number and the other a variable or function.  For
+instance, \{computer "2x"\} means \{computer "2*x"\}, while \{computer
+"3sin(5x)"\} means \{computer "3*sin(5*x)"\}.  The following blank is
+expecting the value 100; try entering it as
+\{student("4(30-5)")\}.
+
+$PAR
+$BBLOCKQUOTE
+100 = \{ans_rule(10)\}
+$EBLOCKQUOTE
+$PAR
+END_TEXT
+
+ANS(Real(100)->cmp);
+
+##################################################
+
+BEGIN_TEXT
+
+${BITALIC}When you are ready, don't forget to press the ${LQ}Submit Answers${RQ}
+button to ask $WW to check your work.  Once you get the answers
+correct, press ${LQ}Next${RQ} to go on.${EITALIC}
+
+END_TEXT
+
+##################################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob04.pg b/courses.dist/modelCourse/templates/setOrientation/prob04.pg
new file mode 100644
index 0000000000..09a051ade6
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setOrientation/prob04.pg
@@ -0,0 +1,95 @@
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGstandard.pl",
+  "PGchoicemacros.pl",
+  "MathObjects.pl",
+  "PGunion.pl",
+  "alignedChoice.pl",
+  "contextLimitedNumeric.pl",
+  "parserOrientation.pl",
+  "PGcourse.pl",
+);
+
+$showPartialCorrectAnswers = 1;
+
+TEXT(beginproblem());
+Title("Rules of Precedence");
+
+##############################################
+
+BEGIN_TEXT
+
+The rules of precedence determine the order in which the mathematical
+operations are performed by $WW. It is essential for you to understand
+these so that you know how $WW interprets what you type in.  If there
+are no parentheses and no functions (such as \{computer "sin"\} or
+\{computer "log"\}), then $WW computes the value of your answer by
+performing exponentiation first, followed by multiplication and division
+(from left to right), and finally addition and subtraction
+(from left to right).
+$PAR
+
+If there are expressions within parentheses, those expressions are
+simplified first.  We'll talk about functions (and give a more
+complete list of rules) in a later problem.
+
+$PAR
+Examples:
+\{BeginList("UL")\}
+$ITEM
+\{student "4*3/6 = 12/6 = 2"\} (multiplications and divisions are done
+from left to right), and \{student "2*7 = 14"\}, so
+\{student "4*3/6-2*7+10 = 2 - 14 + 10 = -2"\}.
+$ITEM
+\{student "12/3/2 = 4/2 = 2"\} (multiplications and divisions are done
+from left to right).
+$ITEM
+\{student "12/(3/2) = 12/1.5 = 8"\}
+(expressions inside parentheses are calculated before anything else).
+$ITEM
+\{student "2*4${CARET}2 = 2*16 = 32"\} (exponentiation is done before multiplication),
+so \{student "2*4${CARET}2 - 3*4 = 2*16 - 3*4 = 32 - 12 = 20"\}.
+\{EndList("UL")\}
+$PAR
+
+To practice these rules, completely simplify the following
+expressions. Because the point of this problem is for you to do the
+numerical calculations correctly, $WW will only accept sufficiently 
+accurate decimal numbers as the answers to these problems.  
+It will not simplify any expressions, including fractions.
+$PAR
+
+END_TEXT
+
+$a = random(1,6,1);
+$b = random(2,6,1);
+$c = random(3,6,1);
+$d = random(2,25,1);
+$al = new_aligned_list(equals => 1);
+
+$al->qa(
+  computer("$a+$b*$c"),         Real($a+($b*$c))->cmp,
+#  computer("($a+$b)*$c"),       Real(($a+$b)*$c)->cmp,
+#  computer("($a+$b)/$c"),       Real(($a+$b)/$c)->cmp,
+#  computer("$a+$b/$c"),         Real($a+($b/$c))->cmp,
+  computer("$a/$b*$c"),         Real(($a/$b)*$c)->cmp,
+#  computer("$a/($b*$c)"),       Real($a/($b*$c))->cmp,
+#  computer("$a/$b/$c"),         Real(($a/$b)/$c)->cmp,
+  computer("3*$b-$a/5*$c+$d"),  Real((3*$b)-(($a/5)*$c)+$d)->cmp,
+  computer("2${CARET}$b+1"),    Real((2**$b)+1)->cmp,
+  computer("2${CARET}($b+1)"),  Real(2**($b+1))->cmp,
+);
+
+BEGIN_TEXT
+$BBLOCKQUOTE
+\{$al->print_q\}
+$EBLOCKQUOTE
+
+END_TEXT
+
+ANS($al->correct_ans);
+
+##############################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob05/prob05-a.gif b/courses.dist/modelCourse/templates/setOrientation/prob05/prob05-a.gif
new file mode 100644
index 0000000000..d32ee11b3b
Binary files /dev/null and b/courses.dist/modelCourse/templates/setOrientation/prob05/prob05-a.gif differ
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob05/prob05-b.gif b/courses.dist/modelCourse/templates/setOrientation/prob05/prob05-b.gif
new file mode 100644
index 0000000000..b074b10281
Binary files /dev/null and b/courses.dist/modelCourse/templates/setOrientation/prob05/prob05-b.gif differ
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob05/prob05-c.gif b/courses.dist/modelCourse/templates/setOrientation/prob05/prob05-c.gif
new file mode 100644
index 0000000000..71062c6f06
Binary files /dev/null and b/courses.dist/modelCourse/templates/setOrientation/prob05/prob05-c.gif differ
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob05/prob05.pg b/courses.dist/modelCourse/templates/setOrientation/prob05/prob05.pg
new file mode 100644
index 0000000000..3e9f0f9fb2
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setOrientation/prob05/prob05.pg
@@ -0,0 +1,131 @@
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGstandard.pl",
+  "PGchoicemacros.pl",
+  "MathObjects.pl",
+  "PGunion.pl",
+  "alignedChoice.pl",
+  "../parserOrientation.pl",
+  "PGcourse.pl",
+);
+
+$showPartialCorrectAnswers = 1;
+
+TEXT(beginproblem);
+
+Title("Common Errors to Avoid");
+
+##############################################
+
+BEGIN_TEXT
+
+Many of the answers you enter into $WW will be expressions
+that involve variables.  Here are some important things to know.
+
+$PAR
+
+\{BeginParList("UL")\}
+
+$ITEM
+It matters what letter you use.  For example, if you are asked for a
+function using the variable \(x\), then it won't work to enter the
+function with the variable \(t\). Also, $WW considers upper- and
+lower-case letters to be different, so don't use the capital letter
+\{student "X"\} in place of the lower-case letter \{student "x"\}. 
+The following blank is expecting the
+function \(x^3\), which you would enter as \{student "x${CARET}3"\} or
+\{student "x**3"\}.  Instead, try entering \{student "t${CARET}3"\} and
+submitting your answer.
+
+$PAR
+$BBLOCKQUOTE
+\{ans_rule(10)\}
+$EBLOCKQUOTE
+$PAR
+
+You should get an error message informing you that \{computer "t"\}
+is not defined in this context.  This tells you that $WW did not receive the
+correct variable and doesn't know how to check your answer.  Now enter
+\{student "x${CARET}3"\} and resubmit to get credit for this part of
+the problem.
+
+END_TEXT
+
+ANS(Formula("x^3")->cmp);
+
+##################################################
+
+$IMGA = MathIMG("prob05-a.gif","1/x+1","1/x+1");
+$IMGB = MathIMG("prob05-b.gif","1/(x+1)","\frac{1}{x+1}");
+$IMGC = MathIMG("prob05-c.gif","(1/x)+1","\frac{1}{x} + 1");
+
+BEGIN_TEXT
+
+$ITEM
+$WW requires that you be precise in how you think about and present
+your answer.  We have just seen that you need to be careful about the
+variables that you use.  You must be equally careful about how the
+rules of precedence apply to your answers.  Often, this involves using
+parentheses appropriately.
+
+$PAR
+
+For example, you might write $IMGA on your paper when you meant $IMGB,
+but that is actually incorrect.  The expression $IMGA means $IMGC,
+according to the rules of precedence.  $WW will force you to be exact
+in what you are thinking and in what you are writing, because it must
+interpret your answers according to the standard rules.  If you want
+to enter something that means $IMGB, you must write \{student
+"1/(x+1)"\}.  This also is true in written work, so making a habit of
+being precise about this will improve your written mathematics as well
+as your ability to enter answers quickly and correctly in $WW.
+
+$PAR
+END_TEXT
+
+##################################################
+
+BEGIN_TEXT
+
+\{EndParList("UL")\}
+
+$PAR
+$HR
+$PAR
+
+Now enter the following functions:
+$PAR
+END_TEXT
+
+$al = new_aligned_list(
+  equals => 1, ans_rule_len => 30,
+  tex_spacing => "5pt", spacing => 10
+);
+
+Context("Numeric")->variables->are(t=>'Real'); $t = Formula("t");
+Context("Numeric")->variables->are(y=>'Real'); $y = Formula("y");
+Context("Numeric")->variables->are(x=>'Real'); $x = Formula("x");
+
+$al->qa(
+  DisplayQA($t/(2*$t+6)),
+#  DisplayQA(2*$y*($y**2-$y+1)),
+#  DisplayQA(1/$x**2 - 3*(1/$x)),
+  DisplayQA(1/(2*($x-5))),
+  DisplayQA((2*$x-3)**4),
+);
+
+BEGIN_TEXT
+
+$BBLOCKQUOTE
+\{$al->print_q\}
+$EBLOCKQUOTE
+
+END_TEXT
+
+ANS($al->correct_ans);
+
+
+##############################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob06.pg b/courses.dist/modelCourse/templates/setOrientation/prob06.pg
new file mode 100644
index 0000000000..586ad35b35
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setOrientation/prob06.pg
@@ -0,0 +1,129 @@
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGstandard.pl",
+  "MathObjects.pl",
+  "PGunion.pl",
+  "parserOrientation.pl",
+  "PGcourse.pl",
+);
+
+
+$showPartialCorrectAnswers = 1;
+
+Context("Numeric")->variables->are(y=>'Real'); $y = Formula('y');
+Context("Numeric")->variables->are(x=>'Real'); $x = Formula('x');
+Context()->flags->set(limits=>[0,2]);
+
+TEXT(beginproblem());
+Title("Using Parentheses Effectively");
+
+##############################################
+
+BEGIN_TEXT
+
+One of the hardest parts about using parentheses is making sure that
+they match up correctly.  Here are a couple of hints to help you with 
+this:
+
+$PAR
+END_TEXT
+
+$BRACES =  HTML('{}','\char123\char125');
+
+BEGIN_TEXT
+
+\{BeginParList("UL")\}
+
+$ITEM
+Several types of parentheses are allowed: \{student "()"\},
+\{student "[]"\}, and \{student $BRACES\}.  When you need to nest
+parentheses inside other parentheses, try using a different type for
+each so that you can see more easily which ones match up. 
+$ITEMSEP
+
+$ITEM
+When you type a left parenthesis, type the corresponding right
+parenthesis at the same time, then position your cursor between them and
+type the expression that goes inside.  This can save you a
+lot of time hunting for mismatched parentheses.
+$ITEMSEP
+
+$ITEM
+When you have a complicated answer, type a template for
+the structure of your result first.  For example, suppose that you are
+planning to enter the fraction
+\[\frac{2x^2-5}{(x+1)(3x^{3x} - 22)}.\]
+A good way to start would be to type in \{student "()/[()*()]"\}.
+This shows a template of one number divided by the product of two
+other numbers.  (Note that \{student "()/()*()"\} would not be a good
+way to start; do you see why?)  Now when you fill in the expressions, you
+will be sure your parentheses balance correctly.
+$PAR
+
+Although $WW understands that numbers written next to each other are
+meant to be multiplied (so you do not have to use \{student "*"\} to
+indicate multiplication if you don't want to), it is often useful for
+you to include the \{student "*"\} anyway, as it helps you keep track
+of the structure of your answer.
+$PAR
+
+$ITEM
+To see how $WW is interpreting what you type, enter your answer and
+then click the ${LQ}Preview Answers$RQ button, which is next to the
+${LQ}Submit Answers$RQ button below.  $WW will show you what it thinks
+you entered (the preview appears in your answer area at the top of the
+page). Previewing your answer does not submit it for credit; that only
+happens when you press the ${LQ}Submit Answers$RQ button.
+$ITEMSEP
+
+$ITEM 
+When division or exponentiation are involved, it is a good idea to
+use parentheses even in simple situations, rather than relying on the
+order of operations. For example, 1/2x and (1/2)x both mean the same
+thing (first divide 1 by 2, then multiply the result by x), but the
+second makes it easier to see what is going on. Likewise, use
+parentheses to clarify expressions involving exponentiation.  Type
+\{student "(e${CARET}x)${CARET}2"\} if you mean \((e^x)^2\), and type
+\{student "e${CARET}(x${CARET}2)"\} if you mean \(e^{(x^2)}\).
+
+\{EndParList("UL")\}
+
+$PAR
+$HR
+$PAR
+
+Now enter the following functions:
+
+$BBLOCKQUOTE
+
+\{@ExampleDefaults = (ans_rule_len => 50, ans_rule_height => 1);
+  BeginExamples\}
+
+\{BeginExample(QA(($x**(2*$x-1))/(($x**2-$x)*(3*$x+5))))\}
+Start with the template \{student "[x${CARET}()]/[()*()]"\}.
+\{EndExample\}
+\{ExampleRule\}
+
+\{BeginExample(QA((($y+3)*($y**3+$y+1))/((2*$y**2-2)*(5*$y+4))))\}
+Start by putting in an appropriate template. This means that you 
+should begin by looking at the function and thinking about how many 
+pieces are used to construct it and how those pieces are related.
+Once you have entered your answer, try using the ${LQ}Preview$RQ button
+to see how $WW is interpreting your answer.
+\{EndExample\}
+\{ExampleRule\}
+
+\{BeginExample(QA((($x+1)/($x-2))**4))\}
+Start by putting in an appropriate template. 
+\{EndExample\}
+
+\{EndExamples\}
+
+$EBLOCKQUOTE
+
+END_TEXT
+
+##############################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob07.pg b/courses.dist/modelCourse/templates/setOrientation/prob07.pg
new file mode 100644
index 0000000000..32bffa2fb8
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setOrientation/prob07.pg
@@ -0,0 +1,137 @@
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGstandard.pl",
+  "PGchoicemacros.pl",
+  "MathObjects.pl",
+  "PGunion.pl",
+  "alignedChoice.pl",
+  "parserOrientation.pl",
+  "PGcourse.pl",
+);
+
+
+$showPartialCorrectAnswers = 1;
+
+TEXT(beginproblem());
+Title("Constants and Functions in $WW");
+
+##############################################
+
+BEGIN_TEXT
+
+$WW knows the value of \(\pi\), which you can enter as \{student
+"pi"\}, and the value of \(e\) (the base of the natural logarithm,
+\(e\approx 2.71828\)), which you can enter simply as the letter
+\{student "e"\}.
+$PAR
+
+$WW also understands many standard functions.  Here
+is a partial list. Notice that all the function names start with a lower-case
+letter.  Capitalizing the function will lead to an error message.
+
+\{BeginParList("UL")\}
+
+$ITEM
+$WW knows about \{student "sin(x)"\}, \{student "cos(x)"\}, \{student
+"tan(x)"\}, \{student "arcsin(x)"\}, \{student "arccos(x)"\},
+\{student "arctan(x)"\} and the other trigonometric functions and their
+inverses.  $WW ${BITALIC}always$EITALIC uses radian mode for these
+functions.
+$PAR
+
+$WW will evaluate trigonometric functions for you in many situations.
+For example, the following blank is expecting the value \(-1\).
+Remember that \(\cos(\pi) = -1\), so enter \{student "cos(pi)"\}
+and submit it.
+
+$PAR
+$BBLOCKQUOTE
+\{ans_rule(10)\} \(= -1\)
+$EBLOCKQUOTE
+$PAR
+
+END_TEXT
+
+ANS(Real(-1)->cmp);
+
+##################################################
+
+BEGIN_TEXT
+
+$ITEM
+The square root \(\sqrt x\) is represented by the function \{student
+"sqrt(x)"\} or by \{student "x${CARET}(1/2)"\}.
+$ITEMSEP
+
+$ITEM
+The function \{student "log(x)"\} means the ${BITALIC}natural$EITALIC
+logarithm of \(x\) (the logarithm with base \(e\)), not the common
+logarithm (the logarithm with base \(10\), sometimes written
+\(\log_{10}\)).  You can also write \{student "ln(x)"\} for the
+natural logarithm of \(x\), so \{student "log(x)"\} and \{student "ln(x)"\}
+mean the same thing.  Use \{student "log10(x)"\} for the base 10
+logarithm of \(x\).
+$ITEMSEP
+
+$ITEM
+The exponential function with base \(e\) can be entered as
+\{student "e${CARET}x"\} or \{student "exp(x)"\}.  The second notation
+is convenient if you have a long, complicated exponent.
+$ITEMSEP
+
+$ITEM
+The absolute value function, \(|x|\), should be entered as
+\{student "|x|"\} or \{student "abs(x)"\}.
+$ITEMSEP
+
+$ITEM
+The inverse sine function, \(\sin${CARET}{-1}(x)\), is written
+\{student "arcsin(x)"\} or \{student "asin(x)"\} or \{student "sin${CARET}(-1)(x)"\}
+in $WW.  Note that this is ${BITALIC}not$EITALIC the same as
+\{student "(sin(x))${CARET}(-1)"\}, which means \(\frac{1}{\sin(x)}\).
+The other inverse functions are handled similarly.
+
+\{EndParList("UL")\}
+
+$PAR
+$HR
+$PAR
+
+Now enter the following functions:
+$PAR
+END_TEXT
+
+$al = new_aligned_list(
+    equals => 1,
+    ans_rule_len => 40,
+    tex_spacing => "5pt",
+    spacing => 10,
+);
+
+Context("Numeric")->variables->are(t=>'Real'); $t = Formula('t');
+Context("Numeric")->variables->are(y=>'Real'); $y = Formula('y');
+Context("Numeric")->variables->are(x=>'Real'); $x = Formula('x');
+Context()->flags->set(limits=>[-2,10]);
+
+$al->qa(
+#  DisplayQA(sqrt($y**2+1)),
+#  DisplayQA(sin(3*$x+1)),
+  DisplayQA(1/tan($x)),
+  DisplayQA(asin($t+1)->with(limits=>[-2,0])),
+  DisplayQA((sin($x)-cos($x))/sqrt(2*$x-7))
+);
+
+BEGIN_TEXT
+
+$BBLOCKQUOTE
+\{$al->print_q\}
+$EBLOCKQUOTE
+
+END_TEXT
+
+ANS($al->correct_ans);
+
+##############################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob08.pg b/courses.dist/modelCourse/templates/setOrientation/prob08.pg
new file mode 100644
index 0000000000..4534a5c325
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setOrientation/prob08.pg
@@ -0,0 +1,158 @@
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGstandard.pl",
+  "MathObjects.pl",
+  "PGunion.pl",
+  "parserOrientation.pl",
+  "PGcourse.pl",
+);
+
+
+Context("Numeric")->variables->are(y=>'Real'); $y = Formula('y');
+Context("Numeric")->variables->are(x=>'Real'); $x = Formula('x');
+
+$showPartialCorrectAnswers = 1;
+
+TEXT(beginproblem());
+Title("Rules of Precedence (Again)");
+
+##############################################
+
+$Explanation = "${BITALIC}Explanation${EITALIC}";
+$Moral = "${BITALIC}Moral${EITALIC}";
+
+BEGIN_TEXT
+
+At this point, we can give the complete rules of precedence for
+how $WW computes the value of a mathematical formula.  The operations
+are handled in the following order:
+$PAR
+
+\{BeginList\}
+$ITEM Evaluate expressions within parentheses.
+$ITEM Evaluate functions such as \{student "sin(x)"\},
+\{student "cos(x)"\}, \{student "log(x)"\}, \{student "sqrt(x)"\}.
+$ITEM Perform exponentiation (from right to left).
+$ITEM Perform multiplication and division, (from left to right).
+$ITEM Perform addition and subtraction, (from left to right).
+\{EndList\}
+$PAR
+
+This can get a little subtle, so be careful. The following are some
+typical traps for $WW users.
+$PAR
+
+\{BeginParList("UL")\}
+
+$ITEM
+$WW interprets \{student "sin 2x"\} to mean \((\sin${SP}2)*x\) 
+$PAR
+
+$Explanation: Rule 2 tells you that $WW does evaluation of functions
+(like \{student "sin"\}) before multiplication.  Thus $WW first
+computes \(\sin${SP}2\), and then multiplies the result by \(x\). 
+$PAR
+
+$Moral: You must type \{student "sin(2x)"\} for the sine of \(2x\),
+even though we often write it as \(\sin${SP}2x\).
+Get in the habit of using parentheses for all your trigonometric
+functions.  
+$PAR
+
+Now enter the following function:
+$PAR
+$BBLOCKQUOTE
+The cosine of \(5x\) is entered as \{ans_rule(15)\}.
+$EBLOCKQUOTE
+$PAR
+
+END_TEXT
+
+ANS(cos(5*$x)->cmp);
+
+BEGIN_TEXT
+
+$ITEM
+$WW interprets \{student "cos t${CARET}3"\} to mean \((\cos${SP}t)^3\)
+$PAR
+
+$Explanation: Rule 2 tells you that $WW does evaluation of functions
+(like \{student "cos"\}) before exponentiation. Thus $WW first
+computes \(\cos${SP}t\) and then raises the result to the power 3.
+$PAR
+
+$Moral: You must type in \{student "cos(t${CARET}3)"\} if you mean the
+cosine of \(t^3\), even though we sometimes write it as \(\cos${SP}t^3\).
+$PAR
+
+Now enter the following function:
+$PAR
+$BBLOCKQUOTE
+The tangent of \(y^4\) is entered as \{ans_rule(15)\}.
+$EBLOCKQUOTE
+$PAR
+
+END_TEXT
+
+ANS(tan($y**4)->cmp);
+
+BEGIN_TEXT
+
+$ITEM
+In mathematics, we often write \(\sin^2${SP}x\) to mean \((\sin x)^2\).  
+$WW will let you write \{student "sin${CARET}2(x)"\} for this, though
+it is probably better to type \{student "(sin(x))${CARET}2"\} instead,
+as this makes your intention clearer.  Note that a power of \(-1\), as
+in \{student "sin${CARET}(-1)(x)"\}, is a special case; it indicates the
+${BITALIC}inverse${EITALIC} function \{student "arcsin(x)"\} rather
+than a power. 
+$PAR
+
+Now enter the following function:
+$PAR
+$BBLOCKQUOTE
+\(\sin^2${SP}x + \cos^3${SP}x\) = \{ans_rule(30)\}
+$EBLOCKQUOTE
+$PAR
+
+END_TEXT
+
+ANS((sin($x)**2 + cos($x)**3)->cmp);
+
+BEGIN_TEXT
+
+$ITEM
+\{student "e${CARET}3x"\} means \((e^3) x\) and not \(e^{(3x)}\) $PAR
+$PAR
+
+$Explanation: Rule 3 says that $WW does exponentiation before multiplication.
+Thus $WW first computes \{student "e${CARET}3"\}, with the result
+\(e^3\), and then multiplies the result by \(x\).
+$PAR
+
+$Moral: Always put parentheses around an exponent. 
+Type \{student "e${CARET}(3x)"\} if you want \(e^{3x}\).
+$PAR
+
+Now enter the following function:
+$PAR
+$BBLOCKQUOTE
+\(2^{4x^3}\) = \{ans_rule(30)\}
+$EBLOCKQUOTE
+$PAR
+
+END_TEXT
+
+ANS((2**(4*($x**3)))->cmp);
+
+BEGIN_TEXT
+
+\{EndParList("UL")\}
+
+
+END_TEXT
+
+##############################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob09.pg b/courses.dist/modelCourse/templates/setOrientation/prob09.pg
new file mode 100644
index 0000000000..08c31ab5ce
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setOrientation/prob09.pg
@@ -0,0 +1,113 @@
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGstandard.pl",
+  "MathObjects.pl",
+  "PGunion.pl",
+  "parserOrientation.pl",
+  "PGcourse.pl",
+);
+
+$showPartialCorrectAnswers = 1;
+
+TEXT(beginproblem());
+Title("Non-Numeric Answers");
+
+##############################################
+
+BEGIN_TEXT
+
+Sometimes you will be asked to enter answers that are not numbers.
+For example, if you are asked to determine a limit, the answer may be
+that the limit does not exist, so you might have to type \{student
+"DNE"\} to indicate this (the problem should tell you what word to
+use).  Note that upper- and lower-case letters are not the same to
+$WW, so you will need to enter the answer exactly as indicated in the
+problem.  (Well written problems will allow the answer to be
+entered either way.)
+$PAR
+
+$BBLOCKQUOTE
+Please enter ${LQ}\{student "DNE"\}${RQ} here: \{ans_rule(10)\}.
+$EBLOCKQUOTE
+
+END_TEXT
+
+ANS(String('DNE')->cmp);
+
+##################################################
+
+BEGIN_TEXT
+
+Other problems may require you to enter \(\infty\), which you do using
+the word ${LQ}\{student "INFINITY"\}${RQ} (in upper- or lower-case) or
+${LQ}\{student "INF"\}${RQ} for short.  The problem should remind you
+of how to do this.  Note that most operations are not defined on
+infinity, so you can't add or multiply something by infinity.  You
+can, however, indicate \(-\infty\) by ${LQ}\{student "-INFINITY"\}${RQ},
+or ${LQ}\{student "-INF"\}${RQ}.
+$PAR
+
+$BBLOCKQUOTE
+Try entering \(-\infty\) here: \{ans_rule(10)\}.
+$EBLOCKQUOTE
+
+END_TEXT
+
+ANS((-(Infinity))->cmp);
+
+##################################################
+
+Context("Interval");
+
+$a = random(-5,5,1);
+$I = Compute("(-infinity,$a)");
+
+BEGIN_TEXT
+
+One common place where you use \(\infty\) is as an endpoint of
+an interval.  $WW allows you to enter intervals using standard
+interval notation, including infinite endpoints.  For example,
+\{student "[-2,5)"\} represents an interval that is closed on the
+left and open on the right, while \{student "[2,inf)"\} is an interval
+that extends infinitely to the right.
+$PAR
+
+$BBLOCKQUOTE
+Write the interval of points that are less than \($a\): \{ans_rule(20)\}.
+$EBLOCKQUOTE
+
+END_TEXT
+
+ANS($I->cmp);
+
+##################################################
+
+Context("Interval");
+
+$a = random(-8,-2,1);
+$b = random($a+1,$a+5,1);
+$c = random($b+1,$b+5,1);
+$I = Compute("[$a,$b) U ($b,$c)");
+
+BEGIN_TEXT
+
+Several intervals can be combined into one region using the ${LQ}set
+union${RQ} operation, \(\cup\), which is represented as ${LQ}\{student
+"U"\}${RQ} in $WW.  For example, \{student "[-2,0] U (8,inf)"\}
+represents the points from \(-2\) to \(0\) together with everything
+bigger than 8.
+$PAR
+
+$BBLOCKQUOTE
+Write the set of points from \($a\) to \($c\) but excluding \($b\) and \($c\)
+as a union of intervals: \{ans_rule(20)\}.
+$EBLOCKQUOTE
+
+END_TEXT
+
+ANS($I->cmp);
+
+##################################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob10.pg b/courses.dist/modelCourse/templates/setOrientation/prob10.pg
new file mode 100644
index 0000000000..2b1d392e58
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setOrientation/prob10.pg
@@ -0,0 +1,130 @@
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGstandard.pl",
+  "MathObjects.pl",
+  "PGunion.pl",
+  "parserVectorUtils.pl",
+  "parserOrientation.pl",
+  "PGcourse.pl",
+);
+
+$showPartialCorrectAnswers = 1;
+
+TEXT(beginproblem());
+Title("Points and Vectors");
+
+##############################################
+
+Context("Vector");
+
+$p0 = non_zero_point2D();
+$p1 = $p0 + 2*non_zero_point2D(2,2,1);
+
+Context()->texStrings;
+BEGIN_TEXT
+
+Some problems will ask you to enter an answer that is a point rather
+than a number.  You enter points in $WW just as you would expect:  by
+separating the coordinates by commas and enclosing them all in
+parentheses.  So \{student "(2,-3)"\} represents the point in the
+plane that has an \(x\)-coordinate of \(2\) and \(y\)-coordinate of
+\(-3\).
+$PAR
+
+$BBLOCKQUOTE
+What point is halfway between \($p0\) and \($p1\)?  \{ans_rule(20)\}.
+$EBLOCKQUOTE
+
+END_TEXT
+Context()->normalStrings;
+
+ANS((($p0+$p1)/2)->cmp);
+
+##################################################
+
+$P = non_zero_point3D();
+
+$LANGLE = HTML('&lt;',"\char60 ");
+$RANGLE = HTML('&gt;',"\char62 ");
+
+Context()->flags->set(ijk=>1);
+Context()->texStrings;
+BEGIN_TEXT
+
+Other problems require you to provide a vector as your answer.  $WW
+allows you to enter vectors either as a list of coordinates enclosed
+in angle braces, \{student $LANGLE\} and \{student $RANGLE\}, or as a
+sum of multiples of the coordinate unit vectors, \(\{i\}\), \(\{j\}\)
+and \(\{k\}\), which you enter as \{student "i"\}, \{student "j"\} and
+\{student "k"\}.  For example, \{student "${LANGLE}1,3,-2${RANGLE}"\}
+represents the same vector as \{student "i+3j-2k"\}.
+$PAR
+
+$BBLOCKQUOTE
+What vector points from the origin to the point \($P\)?  \{ans_rule(20)\}.
+$EBLOCKQUOTE
+
+END_TEXT
+Context()->normalStrings;
+Context()->flags->set(ijk=>0);
+
+ANS(Vector($P)->cmp);
+
+##################################################
+
+$v0 = non_zero_vector3D();
+$v1 = non_zero_vector3D();
+
+$SPACING = HTML('&nbsp;&nbsp;');
+$BNOBR = HTML('<NOBR>');
+$ENOBR = HTML('</NOBR>');
+
+Context()->texStrings;
+BEGIN_TEXT
+
+Just as you can enter a number by giving an equation that reduces to it,
+$WW allows you to enter points and vectors by giving equations for the
+individual coordinates, or by using a vector-valued equation that
+reduces to your answer.  For example,
+$PAR
+$BCENTER
+$BNOBR\{student "${LANGLE}1-(-3),2-sqrt(4),6/2${RANGLE}"\}$ENOBR
+${SPACING} and ${SPACING}
+$BNOBR\{student "[1-(-3)]i + [2-sqrt(4)]j + (6/2)k"\}$ENOBR
+$ECENTER
+$PAR
+both represent the vector \(\{Vector(4,0,3)\}\), while
+$BNOBR\{student "${LANGLE}1,0,-1${RANGLE} + ${LANGLE}2,-2,3${RANGLE}"\}$ENOBR
+could be used to answer a question that asks for the vector \(\{Vector(3,-2,2)\}\).
+$PAR
+
+$BBLOCKQUOTE
+Write \(\{$v0+$v1\}\) as a sum of two vectors:  \{ans_rule(30)\}.
+$EBLOCKQUOTE
+
+END_TEXT
+Context()->normalStrings;
+
+#
+#  Check that the result actually IS a sum (or difference).
+#
+sub checkAdd {
+  my $ans = shift;
+  if ($ans->{score} == 1 && !$ans->{isPreview}) {
+    my $item = $ans->{student_formula}->{tree};
+    $ans->{correct_value}->cmp_Error
+      ($ans,"Your answer is not a sum of vectors")
+         unless $item->class eq 'BOP' && 
+         ($item->{bop} eq '+' || $item->{bop} eq '-');
+  }
+  return $ans;
+}
+
+my $check = ($v0+$v1)->cmp;
+$check->install_post_filter(~~&checkAdd);
+ANS($check);
+
+##################################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob11.pg b/courses.dist/modelCourse/templates/setOrientation/prob11.pg
new file mode 100644
index 0000000000..ca5a2227c5
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setOrientation/prob11.pg
@@ -0,0 +1,70 @@
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGstandard.pl",
+  "MathObjects.pl",
+  "PGunion.pl",
+  "parserOrientation.pl",
+  "PGcourse.pl",
+);
+
+$showPartialCorrectAnswers = 1;
+
+TEXT(beginproblem());
+Title("Multiple Answers in One Blank");
+
+##############################################
+
+Context("Numeric");
+
+$a = random(1,5,1);
+$f = Formula("1/(x^2-$a^2)")->reduce;
+
+Context()->texStrings;
+BEGIN_TEXT
+
+You may sometimes be asked to provide more than one answer in a single
+answer blank.  For example, you may need to enter all the values where
+a function is not defined.  In this case, you should separate your
+answers by commas.  Such an answer is called a
+${BITALIC}list${EITALIC} in $WW.  Note that you need not enter
+multiple answers for a list; a single number is a legal answer (there
+might only be one point where the function is undefined, for
+instance).
+$PAR
+
+$BBLOCKQUOTE
+The function \(\displaystyle f(x)=$f\) is not defined at these \(x\) values: \{ans_rule(20)\}.
+$EBLOCKQUOTE
+
+END_TEXT
+Context()->normalStrings;
+
+ANS(List($a,-$a)->cmp);
+
+##################################################
+
+$a = random(1,5,1);
+$f = Formula("1/(x^2+$a^2)")->reduce;
+
+Context()->texStrings;
+BEGIN_TEXT
+
+When you are asked for a list of numbers, another possible answer is
+that there are ${BITALIC}no${EITALIC} numbers that satisfy the
+requirements.  In that case, you should enter ${LQ}\{student
+"NONE"\}${RQ} as your answer.
+$PAR
+
+$BBLOCKQUOTE
+The function \(\displaystyle f(x)=$f\) is not defined at these \(x\) values: \{ans_rule(20)\}.
+$EBLOCKQUOTE
+
+END_TEXT
+Context()->normalStrings;
+
+ANS(String('NONE')->cmp);
+
+##################################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob12.pg b/courses.dist/modelCourse/templates/setOrientation/prob12.pg
new file mode 100644
index 0000000000..117d7992e3
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setOrientation/prob12.pg
@@ -0,0 +1,69 @@
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGstandard.pl",
+  "PGchoicemacros.pl",
+  "PGunion.pl",
+  "choiceUtils.pl",
+  "parserOrientation.pl",
+  "PGcourse.pl",
+);
+
+TEXT(beginproblem());
+Title("True/False Questions in $WW");
+
+##############################################
+
+$a = random(1,5,1);
+$b = random(6,10,1);
+$c = random(-10,-1,1);
+$d = random(-10,-1,1);
+$e = random(1,10,1);
+
+$sl = new_select_list();
+$sl->{rf_print_q} = ~~&alt_print_q;
+$sl->{separation} = 5;
+
+$sl->qa(
+  "\(-$a $LT -$b\)",    "F",
+  "\($c $LE $c\)",      "T",
+  "\($d $LT $d\)",      "F",
+  "\(\pi $GE 3.2\)",    "F",
+  "\($e-1 $LE $e\)",    "T"
+);
+
+$sl->choose(4);
+
+##################################################
+
+BEGIN_TEXT
+
+Enter a \{student "T"\} or an \{student "F"\} in each
+answer space below to indicate whether the corresponding
+statement is true or false.
+$PAR
+
+$BBLOCKQUOTE
+\{$sl->print_q\}
+$EBLOCKQUOTE
+$PAR 
+
+END_TEXT
+
+ANS(str_cmp($sl->ra_correct_ans));
+install_problem_grader(~~&std_problem_grader);
+$showPartialCorrectAnswers = 0;
+
+BEGIN_TEXT
+
+In most multipart problems, if one or more of your answers is wrong,
+then $WW tells you which ones they are.  For True/False or
+multiple-choice questions, however, $WW usually only tells you whether
+${BITALIC}all$EITALIC the answers are correct.  It won't tell you
+which ones are right or wrong.
+
+END_TEXT
+
+##################################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob13.pg b/courses.dist/modelCourse/templates/setOrientation/prob13.pg
new file mode 100644
index 0000000000..7c43672d71
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setOrientation/prob13.pg
@@ -0,0 +1,67 @@
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGstandard.pl",
+  "PGchoicemacros.pl",
+  "PGunion.pl",
+  "parserOrientation.pl",
+  "choiceUtils.pl",
+  "PGcourse.pl",
+);
+
+TEXT(beginproblem());
+Title("Matching Lists in $WW");
+
+##############################################
+
+$a = random(-10,10,1);
+$b = random(1,3,1);
+
+$ml = new_match_list();
+$ml->rf_print_q(~~&alt_print_q);
+$ml->rf_print_a(~~&alt_print_a);
+$ml->{separation} = 5;
+
+$ml->qa(
+  "\(x\) is less than \($a\)",                "\(x $LT $a\)",
+  "\(x\) is any real number",                 "\(-\infty $LT x $LT \infty\)",
+  "\(x\) is greater than \($a\)",             "\($a $LT x\)",
+  "\(x\) is less than or equal to \($a\)",    "\(x $LE $a\)",
+  "\(x\) is greater than or equal to \($a\)", "\(x $GE $a\)",
+  "The distance from \(x\) to \($a\) is at most $b",
+     "\(|x - $a| $LE $b\)",
+  "The distance from \(x\) to \($a\) is more than $b",
+     "\(|x - $a| $GT $b\)"
+);
+
+$ml->choose(5);
+
+##################################################
+
+BEGIN_TEXT
+
+Match the statements defined below with the letters labeling their
+equivalent expressions.
+$PAR
+
+\{ColumnMatchTable($ml,indent => 30)\}
+$PAR
+
+END_TEXT
+
+ANS(str_cmp($ml->ra_correct_ans));
+install_problem_grader(~~&std_problem_grader);
+$showPartialCorrectAnswers = 0;
+
+BEGIN_TEXT
+
+Usually with matching problems like this,
+$WW only tells you whether ${BITALIC}all$EITALIC
+your answers are correct or not.  If they are not all
+correct, $WW will not tell you which ones are right
+and which are wrong.
+$PAR 
+
+END_TEXT
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob14/prob14-hint.html b/courses.dist/modelCourse/templates/setOrientation/prob14/prob14-hint.html
new file mode 100644
index 0000000000..9ad160d2da
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setOrientation/prob14/prob14-hint.html
@@ -0,0 +1,35 @@
+<HEAD>
+<TITLE>WeBWork Set 0 Problem 11 Hint</TITLE>
+</HEAD>
+<BODY BGCOLOR="#EFEFEF">
+
+<BLOCKQUOTE>
+<TABLE BORDER="0" CELLSPACING="0" CELLPADDING="0" BGCOLOR="#AAAAAA">
+<TR><TD><TABLE BORDER="1" CELLSPACING="1" CELLPADDING="15" BGCOLOR="#E8E8E8">
+<TR><TD>
+
+<CENTER><H2>Graphs in WeBWorK</H2></CENTER>
+
+Often in WeBWorK, the graphs are displayed as small thumbnail images.
+These can be difficult to read, so in these cases, WeBWorK provides
+you with a link to a larger copy of the graph.  You can click on the
+small version of the image to get the larger one.  For example, click
+on the diagram below to enlarge it.  It will be displayed in a
+separate window; close that window when you are done looking at the
+larger graph.
+<p>
+
+<CENTER>
+<A HREF="prob14.gif" TARGET="ZOOM"><IMG SRC="prob14.gif" WIDTH="100" HEIGHT="100" BORDER="2"></A>
+</CENTER>
+<p>
+
+After you are done, press the "Back" button to go back to the problem page.
+
+</TD></TR>
+</TABLE></TD></TR>
+</TABLE>
+</BLOCKQUOTE>
+
+</BODY>
+</HTML>
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob14/prob14.gif b/courses.dist/modelCourse/templates/setOrientation/prob14/prob14.gif
new file mode 100644
index 0000000000..16461e6334
Binary files /dev/null and b/courses.dist/modelCourse/templates/setOrientation/prob14/prob14.gif differ
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob14/prob14.pg b/courses.dist/modelCourse/templates/setOrientation/prob14/prob14.pg
new file mode 100644
index 0000000000..0e4402efe7
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setOrientation/prob14/prob14.pg
@@ -0,0 +1,116 @@
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGstandard.pl",
+  "PGchoicemacros.pl",
+  "PGgraphmacros.pl",
+  "PGunion.pl",
+  "imageChoice.pl",
+  "../parserOrientation.pl",
+  "PGcourse.pl"
+);
+
+#
+#  You need to change this to point to where you have stored the hint
+#  and graphic files.
+#
+$htmlWebworkURL = "http://omega.math.union.edu/webwork2_files/local";
+$hintURL = "${htmlWebworkURL}/parserOrientation/prob14-hint.html";
+
+TEXT(beginproblem);
+
+Title("Matching Graphs in $WW");
+
+##############################################
+
+$ml = new_image_match_list(link => 0, border => 0);
+$ml->{separation} = 3;
+
+@Goptions = (-6,-6,6,6, axes => [0,0], grid => [6,6], size => [150,150]);
+$G1 = init_graph(@Goptions);
+$G2 = init_graph(@Goptions);
+$G3 = init_graph(@Goptions);
+$G4 = init_graph(@Goptions);
+
+$a1 = random(-6,2,.1); $b1 = random($a1+1,6,.1);  $m1 = ($b1-$a1)/12;
+$a2 = random(-2,6,.1); $b2 = random($a2-1,-6,.1); $m2 = ($b2-$a2)/12;
+$a3 = non_zero_random(.5,5,.1)*non_zero_random(-1,1,1);
+$a4 = non_zero_random(.5,5,.1)*non_zero_random(-1,1,1);
+
+$plotoptions = "using color:red and weight=2";
+plot_functions($G1,"$m1(x+6)+$a1 for x in <-5.8,5.8> $plotoptions");
+plot_functions($G2,"$m2(x+6)+$a2 for x in <-5.8,5.8> $plotoptions");
+plot_functions($G3,"$a3 for x in <-5.8,5.8> $plotoptions");
+plot_functions($G4,"10000(x-$a4) for x in <-5.8,5.8> $plotoptions");
+
+$ml->qa(
+  "The line is the graph of an increasing function", $G1,
+  "The line is the graph of a decreasing function",  $G2,
+  "The line is the graph of a constant function",    $G3,
+  "The line is not the graph of a function",         $G4
+);
+
+$ml->choose(4);
+
+#BEGIN_TEXT
+#
+#The simplest functions are the ${BITALIC}linear$EITALIC ones ---
+#the functions whose graphs are straight lines.  They are important
+#because many functions locally look like straight lines.  (Looking
+#like a line ${BITALIC}locally$EITALIC means that if we zoom in on the
+#function and look at it at a very powerful magnification, it will look
+#like a straight line.)
+#$PAR
+
+BEGIN_TEXT
+
+Enter the letter of the graph that corresponds to each statement:
+$PAR
+
+$BCENTER
+$PAR
+\{$ml->print_q\}
+$PAR
+$ECENTER
+
+\{$ml->print_a\}
+$PAR
+
+END_TEXT
+
+ANS(str_cmp($ml->ra_correct_ans));
+install_problem_grader(~~&std_problem_grader);
+$showPartialCorrectAnswers = 0;
+
+##################################################
+
+BEGIN_TEXT
+
+As with the previous matching problems, you will not be told which of
+your answers are correct when you submit your answers to this problem.
+$WW will only tell you if ${BITALIC}all${EITALIC} your answers are
+correct or not.
+$PAR
+
+Some $WW problems display a link to additional information or a
+\{htmlLink($hintURL,"hint")\}.  Follow this link for a hint about
+graphs in $WW.
+$PAR
+
+END_TEXT
+
+#Occasionally, a problem includes a hint that will not be available
+#immediately.  Once you have submitted incorrect answers a certain
+#number of times (determined by the problem), you will see a ${LQ}Show
+#Hint$RQ button above the submit buttons at the bottom of the screen.
+#Check the box and press ${LQ}Submit$RQ in order to get the hint.  For
+#this problem, the hint will be available after one wrong answer.
+#
+#END_TEXT
+#
+#$showHint = 1;
+#HINT("$HINT Usually the hints are more helpful than this.");
+
+##################################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/courses.dist/modelCourse/templates/setOrientation/prob15.pg b/courses.dist/modelCourse/templates/setOrientation/prob15.pg
new file mode 100644
index 0000000000..fe1f2268b7
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setOrientation/prob15.pg
@@ -0,0 +1,90 @@
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGstandard.pl",
+  "PGunion.pl",
+  "parserOrientation.pl",
+  "PGcourse.pl",
+);
+
+
+TEXT(beginproblem());
+
+Title("When You're Stuck...");
+
+##############################################
+
+BEGIN_TEXT
+The goal of the $WW software is to help you learn mathematics by giving
+you immediate feedback on the correctness of your answer to a problem. 
+It is not designed to be a tutorial or to replace humans in 
+explaining the material to you. As with any learning tool, it is
+up to you to make efficient and effective use of the software. 
+
+Here are some things you can try when you are stuck on a problem.
+$PAR
+
+\{BeginParList("UL")\}
+$ITEM
+Reread the problem carefully to see if there are any instructions
+that you did not notice.
+$ITEMSEP
+
+$ITEM
+Check carefully for directions on the Problem List page. 
+You can get to this page by pressing the ${LQ}Prob. List$RQ button at the 
+top of any problem page.
+$ITEMSEP
+
+$ITEM
+Look in the textbook for similar problems or relevant methods.
+$ITEMSEP
+
+$ITEM
+Talk to your instructor during office hours. 
+$ITEMSEP
+
+$ITEM
+Ask a fellow student for help.
+$ITEMSEP
+
+$ITEM
+Use the Calculus Help Center. (Be sure to take a printout of
+the problem with you. The tutors will need the ${BITALIC}exact$EITALIC
+wording of the problem.)
+$ITEMSEP
+
+$ITEM
+Use the ${LQ}Email instructor$RQ button at the bottom of the problem page
+to send e-mail to your instructor. Include in your message the details of
+what you have tried so far. If you are having a software problem, 
+include details about the error messages you are getting.
+
+\{EndParList("UL")\}
+
+$PAR
+
+When you are truly stuck on a $WW problem, you should turn to other
+sources (humans or books) for help, because it is not in your best
+interest to guess repeatedly instead of thinking about what you might
+be doing wrong.  
+$PAR
+
+To get credit for this problem, you must click the ${LQ}Submit
+Answers$RQ button. Then you can use the ${LQ}Prob. List$RQ button at
+the top of the page to return to the problem list page.  You will see
+that the problems you have done have been labeled as correct or
+incorrect, and you can go back and do problems you skipped or couldn't
+get right the first time.  Once you have done a problem correctly, it
+is ${BITALIC}always$EITALIC listed as correct even if you go back and
+do it incorrectly later.  This means you can use WeBWorK to review
+course material without any danger of changing your grade.  $PAR
+
+END_TEXT
+
+install_forgiving_grader();
+$showPartialCorrectAnswers = 1;
+
+##############################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/courses.dist/modelCourse/templates/setOrientation/setHeader.pg b/courses.dist/modelCourse/templates/setOrientation/setHeader.pg
new file mode 100644
index 0000000000..b9d3389043
--- /dev/null
+++ b/courses.dist/modelCourse/templates/setOrientation/setHeader.pg
@@ -0,0 +1,118 @@
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGstandard.pl",
+  "PGunion.pl",
+  "PGcourse.pl",
+);
+
+$WW = "WeBWorK";
+
+if ($displayMode eq 'TeX') {
+
+TEXT($BEGIN_ONE_COLUMN,
+    '\noindent{\large\bf '.$studentName.'}\hfill{\large\bf '.$course.'}',
+    '\par\noindent',
+"
+This set of $WW problems is designed to orient you to the 
+$WW system and to help you learn how to communicate with the 
+software. You will be learning about how to understand what
+you see on the screen and about how to enter your answers when you do 
+the problems. You will practice entering numerical and functional
+expressions and look at ways to find and correct errors in your 
+entries.
+
+",
+     "WeBWorK assignment $setNumber is due on $formattedDueDate.",
+     $END_ONE_COLUMN
+);
+
+} else {
+
+BEGIN_TEXT
+
+${BBOLD}Orientation to WeBWorK${EBOLD}
+$PAR
+
+This set of $WW problems is designed to orient you to the $WW system
+and to help you learn how to communicate with the software. You will
+be learning about how to understand what you see on the screen and
+about how to enter your answers when you do the problems.  You will
+practice entering numerical and functional expressions and look at
+ways to find and correct errors in your entries.
+$PAR
+
+Start by examining the features of this page.  The panels at the
+left and top help you to navigate to the different pages available in
+WeBWorK.
+$PAR
+On the left, in the ${LQ}Main Menu${RQ} panel, you have already 
+seen the ${LQ}Homework Sets${RQ} page,
+which lists all the homework assignments (with due dates, etc.) that have
+been assigned to you.  Links allow you to go to any assignment
+you want to work on.  
+$PAR
+The ${LQ}Password/Email${RQ} page lets you change your password or
+email address.  The ${LQ}Grades${RQ} page 
+shows your scores on the various assignments (but there is nothing
+much to show at this point).
+$PAR
+
+Links to your homework assignments are also listed in the ${LQ}Sets${RQ} 
+panel so you can quickly switch to another assignment.
+$PAR
+
+The ${LQ}Display Options${RQ} panel gives you control over how you want
+math equations displayed.  For example with ${LQ}MathJax${RQ} you can 
+control the size of equations, have access to accessibility options, etc.
+$PAR
+
+\{
+#The ${LQ}Report Bugs${RQ} button is for reporting bugs in the WeBWorK
+#System itself to the developers WeBWorK.  It is unlikely that
+#you will need to use that yourself.  If you are having difficulty with
+#WeBWorK, you should contact your professor using the ${LQ}Email
+#Instructor${RQ} button instead.  This should be available on nearly
+#every page, so you always have a quick way to reach your professor.
+#$PAR
+\}
+
+The data in the panel at the top of the page tells you where you
+are in WeBWorK's hierarchy of pages, but you can ignore that for the
+most part.  There is an additional logout button at the far right,
+however, that you will need to use when you are done using $WW (don't
+press it yet).
+$PAR
+
+\{
+#The yellow question mark icon is a ${LQ}Help${RQ}
+#button for system documentation, but there is not much of that
+#available at the moment.
+#$PAR
+\}
+
+The main information on this page is located in the large panel
+to the left.  It shows the status of the problems in this assignment,
+and your score on the set so far.  Since you haven't yet tried any of
+the problems, your score is zero, but after you work on some of them,
+the number of attempts and the score will reflect the work you have
+done.
+$PAR
+Near the top is a link that allows you to download a pdf ${LQ}hardcopy${RQ}
+version of your 
+whole assignment which you can print out.  This allows you to work on 
+the assignment without having to be connected to $WW.
+$PAR
+Each problem number is a link to that problem in the homework set.
+You can click on one to get to any specific problem.  To begin the
+orientation assignment, click on the link for Problem 1.  When you are
+done working, be sure to dismiss your connection to the server by
+clicking on ${LQ}Log Out${RQ}, so that no one else can gain access to
+your account.
+$PAR
+
+END_TEXT
+
+}
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/doc/Copying b/doc/Copying
index 43cd72c3e0..d6400a2c8a 100644
--- a/doc/Copying
+++ b/doc/Copying
@@ -1,37 +1,41 @@
+
 		    GNU GENERAL PUBLIC LICENSE
-		     Version 1, February 1989
+		       Version 2, June 1991
 
- Copyright (C) 1989 Free Software Foundation, Inc.
-                59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
 			    Preamble
 
-  The license agreements of most software companies try to keep users
-at the mercy of those companies.  By contrast, our General Public
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
 License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  The
-General Public License applies to the Free Software Foundation's
-software and to any other program whose authors commit to using it.
-You can use it for your programs, too.
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
 
   When we speak of free software, we are referring to freedom, not
-price.  Specifically, the General Public License is designed to make
-sure that you have the freedom to give away or sell copies of free
-software, that you receive source code or can get it if you want it,
-that you can change the software or use pieces of it in new free
-programs; and that you know you can do these things.
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
 
   To protect your rights, we need to make restrictions that forbid
 anyone to deny you these rights or to ask you to surrender the rights.
 These restrictions translate to certain responsibilities for you if you
 distribute copies of the software, or if you modify it.
 
-  For example, if you distribute copies of a such a program, whether
+  For example, if you distribute copies of such a program, whether
 gratis or for a fee, you must give the recipients all the rights that
 you have.  You must make sure that they, too, receive or can get the
-source code.  And you must tell them their rights.
+source code.  And you must show them these terms so they know their
+rights.
 
   We protect your rights with two steps: (1) copyright the software, and
 (2) offer you this license which gives you legal permission to copy,
@@ -44,120 +48,208 @@ want its recipients to know that what they have is not the original, so
 that any problems introduced by others will not reflect on the original
 authors' reputations.
 
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
   The precise terms and conditions for copying, distribution and
 modification follow.
-
+
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-  0. This License Agreement applies to any program or other work which
-contains a notice placed by the copyright holder saying it may be
-distributed under the terms of this General Public License.  The
-"Program", below, refers to any such program or work, and a "work based
-on the Program" means either the Program or any work containing the
-Program or a portion of it, either verbatim or with modifications.  Each
-licensee is addressed as "you".
-
-  1. You may copy and distribute verbatim copies of the Program's source
-code as you receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice and
-disclaimer of warranty; keep intact all the notices that refer to this
-General Public License and to the absence of any warranty; and give any
-other recipients of the Program a copy of this General Public License
-along with the Program.  You may charge a fee for the physical act of
-transferring a copy.
-
-  2. You may modify your copy or copies of the Program or any portion of
-it, and copy and distribute such modifications under the terms of Paragraph
-1 above, provided that you also do the following:
-
-    a) cause the modified files to carry prominent notices stating that
-    you changed the files and the date of any change; and
-
-    b) cause the whole of any work that you distribute or publish, that
-    in whole or in part contains the Program or any part thereof, either
-    with or without modifications, to be licensed at no charge to all
-    third parties under the terms of this General Public License (except
-    that you may choose to grant warranty protection to some or all
-    third parties, at your option).
-
-    c) If the modified program normally reads commands interactively when
-    run, you must cause it, when started running for such interactive use
-    in the simplest and most usual way, to print or display an
-    announcement including an appropriate copyright notice and a notice
-    that there is no warranty (or else, saying that you provide a
-    warranty) and that users may redistribute the program under these
-    conditions, and telling the user how to view a copy of this General
-    Public License.
-
-    d) You may charge a fee for the physical act of transferring a
-    copy, and you may at your option offer warranty protection in
-    exchange for a fee.
-
-Mere aggregation of another independent work with the Program (or its
-derivative) on a volume of a storage or distribution medium does not bring
-the other work under the scope of these terms.
-
-  3. You may copy and distribute the Program (or a portion or derivative of
-it, under Paragraph 2) in object code or executable form under the terms of
-Paragraphs 1 and 2 above provided that you also do one of the following:
-
-    a) accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of
-    Paragraphs 1 and 2 above; or,
-
-    b) accompany it with a written offer, valid for at least three
-    years, to give any third party free (except for a nominal charge
-    for the cost of distribution) a complete machine-readable copy of the
-    corresponding source code, to be distributed under the terms of
-    Paragraphs 1 and 2 above; or,
-
-    c) accompany it with the information you received as to where the
-    corresponding source code may be obtained.  (This alternative is
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software
+    interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
     allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form alone.)
-
-Source code for a work means the preferred form of the work for making
-modifications to it.  For an executable file, complete source code means
-all the source code for all modules it contains; but, as a special
-exception, it need not include source code for modules which are standard
-libraries that accompany the operating system on which the executable
-file runs, or for standard header files or definitions files that
-accompany that operating system.
-
-  4. You may not copy, modify, sublicense, distribute or transfer the
-Program except as expressly provided under this General Public License.
-Any attempt otherwise to copy, modify, sublicense, distribute or transfer
-the Program is void, and will automatically terminate your rights to use
-the Program under this License.  However, parties who have received
-copies, or rights to use copies, from you under this General Public
-License will not have their licenses terminated so long as such parties
-remain in full compliance.
-
-  5. By copying, distributing or modifying the Program (or any work based
-on the Program) you indicate your acceptance of this license to do so,
-and all its terms and conditions.
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
 
   6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the original
-licensor to copy, distribute or modify the Program subject to these
-terms and conditions.  You may not impose any further restrictions on the
-recipients' exercise of the rights granted herein.
-
-  7. The Free Software Foundation may publish revised and/or new versions
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
 of the General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 
 Each version is given a distinguishing version number.  If the Program
-specifies a version number of the license which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-the license, you may choose any version ever published by the Free Software
-Foundation.
-
-  8. If you wish to incorporate parts of the Program into other free
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Program does not specify a
+version number of this License, you may choose any version ever
+published by the Free Software Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
 programs whose distribution conditions are different, write to the author
 to ask for permission.  For software which is copyrighted by the Free
 Software Foundation, write to the Free Software Foundation; we sometimes
@@ -167,47 +259,48 @@ of promoting the sharing and reuse of software generally.
 
 			    NO WARRANTY
 
-  9. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  10. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
-
-	Appendix: How to Apply These Terms to Your New Programs
+
+	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
-possible use to humanity, the best way to achieve this is to make it
+possible use to the public, the best way to achieve this is to make it
 free software which everyone can redistribute and change under these
 terms.
 
-  To do so, attach the following notices to the program.  It is safest to
-attach them to the start of each source file to most effectively convey
-the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
+    Copyright (C) <year>  <name of author>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 1, or (at your option)
-    any later version.
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -215,34 +308,37 @@ the exclusion of warranty; and each file should have at least the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software Foundation,
-    Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
 
 Also add information on how to contact you by electronic and paper mail.
 
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) 19xx name of author
+    Gnomovision version 69, Copyright (C) year name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
 
-The hypothetical commands `show w' and `show c' should show the
-appropriate parts of the General Public License.  Of course, the
-commands you use may be called something other than `show w' and `show
-c'; they could even be mouse-clicks or menu items--whatever suits your
-program.
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
 
 You should also get your employer (if you work as a programmer) or your
 school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here a sample; alter the names:
+necessary.  Here is a sample; alter the names:
 
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  program `Gnomovision' (a program to direct compilers to make passes
-  at assemblers) written by James Hacker.
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
 
   <signature of Ty Coon>, 1 April 1989
   Ty Coon, President of Vice
 
-That's all there is to it!
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/doc/devel/converted-cgs b/doc/devel/converted-cgs
new file mode 100644
index 0000000000..89d98aebcf
--- /dev/null
+++ b/doc/devel/converted-cgs
@@ -0,0 +1,81 @@
+4 => 3 + GENERATE PATHS WITH URLPath INSTEAD OF HARD CODING
+(this has to be done before we can change the virtual heirarchy.)
+	lib/WeBWorK/ContentGenerator.pm
+	lib/WeBWorK/ContentGenerator/EquationDisplay.pm
+	lib/WeBWorK/ContentGenerator/Error.pm
+	lib/WeBWorK/ContentGenerator/Feedback.pm
+	lib/WeBWorK/ContentGenerator/Grades.pm
+	lib/WeBWorK/ContentGenerator/Home.pm
+	lib/WeBWorK/ContentGenerator/Instructor.pm
+	lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm
+	lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm
+	lib/WeBWorK/ContentGenerator/Instructor/FileXfer.pm
+	lib/WeBWorK/ContentGenerator/Instructor/Index.pm
+	lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm
+	lib/WeBWorK/ContentGenerator/Login.pm
+	lib/WeBWorK/ContentGenerator/Logout.pm
+	lib/WeBWorK/ContentGenerator/Options.pm
+	lib/WeBWorK/ContentGenerator/Problem.pm
+	lib/WeBWorK/ContentGenerator/ProblemSet.pm
+	lib/WeBWorK/ContentGenerator/ProblemSets.pm
+	
+	lib/WeBWorK/ContentGenerator/Instructor/ProblemList.pm
+	lib/WeBWorK/ContentGenerator/Instructor/ProblemSetEditor.pm
+	lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm	
+	lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm
+	lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm
+	lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm
+	lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm
+	lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm
+	lib/WeBWorK/ContentGenerator/Instructor/Stats.pm
+	lib/WeBWorK/ContentGenerator/Instructor/UserList.pm
+	
+3 => 2 + GET PATH DATA FROM URLPath INSTEAD OF FROM $self->r
+(this has to be done before we can take advantage of path/param munging.)
+	lib/WeBWorK/ContentGenerator/GatewayQuiz.pm
+		- delaying path generation changes until major cleanup
+	lib/WeBWorK/ContentGenerator/Hardcopy.pm
+		- delaying path generation changes until major cleanup
+		
+	
+
+
+	
+	
+	
+	
+	
+	
+	
+	lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm
+	
+2 => 1 + GET $ce, $db, $authz FROM $self->r INSTEAD OF FROM $self
+(this has to be done before we can remove ce/db/authz from $self.)
+
+
+1 => REMOVE DEPENDANCY ON DATA FROM @_ (get from URLPath instead)
+(this has to be done before things will work.)
+	
+	
+	
+
+
+0 => NONE OF THE ABOVE DONE
+
+----- Code that needs cleaning -----
+
+- lots of code needs to be factored out of Problem and GatewayQuiz:
+	- problem logic (recording answers, checking permissions, etc.)
+	- display idioms (attemptResults, etc.)
+- Hardcopy:
+	- move actual PDF generation into a Utils::* module
+	- clean up error handling
+- code can be factored out of Grades, Stats, and SendMail
+	- a widget for displaying the "student progress" chart
+	- util code for doing mail merge from scoring files (whatever it does)
+- Instructor needs work -- there's a lot of cut-n-paste going on
+- factor info box formatting code out of Login, ProblemSets, ProblemSet
+  and into WeBWorK::HTML::InfoBox
+- some modules should probably go under Utils:
+	- Compatability.pm
+	- Timing.pm
diff --git a/doc/parser/README b/doc/parser/README
new file mode 100644
index 0000000000..8c62267d3f
--- /dev/null
+++ b/doc/parser/README
@@ -0,0 +1,145 @@
+OVERVIEW:
+
+This directory contains the documentation for a new
+mathematical-expression parser written in perl.  It was developed for
+use with the WeBWorK on-line homework system, but it can be used in
+any perl program.
+
+The goal was to process vector-valued expressions, but the parser was 
+designed to be extensible, so that you could add your own functions, 
+operators, and data types.  It is still a work in progress, but should 
+provide a framework for building more sophisticated expression handling.
+
+Currenlty, the parser understands:
+
+   - real and complex numbers,
+   - points, vectors, and matrices (with real or complex entries)
+   - arbitrary lists of elements
+   - intervals and unions of intervals
+   - predefined strings like 'infinity'
+
+Some other useful features are that you can write sin^2 x for (sin(x))^2
+and sin^-1 x for arcsin(x), and so on.
+
+Most of the documentation still needs to be written, but you can get some 
+ideas from the samples in the problems and extensions directories, and by 
+reading the files in the docs directory.
+
+
+INSTALLATION:
+
+The parser should already be installed as part of the WeBWorK 2.1
+distribution, so you should not need to install it separately.  If you
+don't seem to have it installed, then it can be obtained from the
+Union CVS repository at
+
+  http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/WeBWorKCVS
+
+The README file in that directory contains the installation instructions.
+
+
+SAMPLE FILES:
+
+Sample problems are given in the problems and extensions directories.  Move 
+these to the templates directory of a course where you want to test the 
+Parser, and move the contents of the macros directory to that course's 
+macros directory.
+
+Now try looking at these problems using the Library Browser.  Edit the
+source to see how they work, and to read the comments within the code
+itself.
+
+
+EXAMPLE FILES:
+
+The 'problems' directory contains several examples that show how to use 
+Parser within your problem files.
+
+    sample01.pg
+        Uses the parser to make a string into a formula that you can
+        evaluate and print in TeX form
+
+    sample02.pg
+        Shows how to create formulas using perl's usual mathematical
+        expressions rather than character strings.
+
+    sample03.pg
+        Shows how to use the parser's differentiation abilities.
+
+    sample04.pg and sample05.pg
+        Use the parser in conjunction with the graphics macros to generate 
+        function graphs on the fly.  These also show how to create a 
+        perl function to evaluate an expression.
+
+    sample06.pg
+        Shows some simple use of vectors in a problem.
+
+    sample07.pg
+        Example if using the build-in Real object and its answer
+        checker
+
+   sample08.pg
+        Uses complex numbers and the built-in checker
+
+   sample09.pg and sample10.pg
+        Demonstrates points and vectors and their answer checkers
+
+   sample11.pg and sample12.pg
+        Shows the answer checkers for intervals and unions.
+
+   sample13.pg, sample14.pg, sample15.pg
+        Demonstrate various list checkers, including a check for the
+        word 'NONE', which is a predefined string.
+
+   sample16.pg, sample17.pg, sample18.pg
+        These show the multi-variable function checker in use (for
+        functions of the form R->R, R^2->R and R->R^3).
+
+   sample19.pg
+        Uses the function checker to implement a "constant" that can
+        be used in formulas.
+
+   sample20.pg
+        Shows how to use the parser's substitution abilities.
+
+   sample21.pg
+        Checks for a list of points.
+
+   sample22.pg
+        Shows how to provide named constants that the student can
+	use in his answer.
+
+The 'examples' directory contains samples that show how to extend the 
+parser to include your own functions, operators, and so on.  There are also 
+some samples of how to call the methods available for Formula objects 
+generated by the parser, and what some error messages look like.
+
+    1-function.pg
+       Adds a single-variable function to the parsers list of functions.
+
+    2-function.pg
+       Adds a two-variable function to the parser.
+
+    3-operator.pg
+       Adds a binary operator to the parser.  (Unary operators are similar.)
+
+    4-list.pg
+       Adds a new "list type" object.  In this case, it's really an
+       operation [n,r] that returns n choose r.
+
+    5-list.pg
+       Add a new "equality" operator that you can use to handle answers
+       like "x+y=0".
+
+    6-precedence.pg
+       Shows an experimental precedence setting that can be used to make
+       sin 2x return sin(2x) rather than (sin(2))x.
+
+    7-context.pg
+       Shows how to switch contexts (in this case, to complex and to vector
+       contexts), and how this affects the parsing.
+
+    8-answer.pg
+       Implements a simple vector-valued answer checker using the
+       parser's computation and comparison ability.
+
diff --git a/doc/parser/docs/ParserAnswerCheckers.pod b/doc/parser/docs/ParserAnswerCheckers.pod
new file mode 100644
index 0000000000..10d3f7ad69
--- /dev/null
+++ b/doc/parser/docs/ParserAnswerCheckers.pod
@@ -0,0 +1,423 @@
+=head1 MathObjects-based Answer Checkers
+
+MathObjects is designed to be used in two ways.  First, you can use
+it within your perl code when writing problems as a means of making it
+easier to handle formulas, and in particular, to genarate be able to
+use a single object to produce numeric values, TeX output and answer
+strings.  This avoids having to type a function three different ways
+(which makes maintaining a problem much harder).  Since MathObjects
+also included vector and complex arthimatic, it is easier to work with
+these types of values as well.
+
+The second reason for MathObjects is to use it to process student
+input.  This is accomplished through special answer checkers that are
+part of the Parser package (rather than the traditional WeBWorK answer
+checkers).  Checkers are available for all the types of values that
+the parser can produce (numbers, complex numbers, infinities, points,
+vectors, intervals, unions, formulas, lists of numbers, lists of
+points, lists of intervals, lists of formulas returning numbers, lists
+of formulas returning points, and so on).
+
+To use one of these checkers, simply call the ->cmp method of the
+object that represents the correct answer.  For example:
+
+    $n = Real(sqrt(2));
+    ANS($n->cmp);
+
+will produce an answer checker that matches the square root of two.
+Similarly, 
+
+    ANS(Vector(1,2,3)->cmp);
+
+matches the vector <1,2,3> (or any computation that produces it, e.g.,
+i+2j+3k, or <4,4,4>-<3,2,1>), while
+
+    ANS(Interval("(-inf,3]")->cmp);
+
+matches the given interval.  Other examples include:
+
+    ANS(Infinity->cmp);
+    ANS(String('NONE')->cmp);
+    ANS(Union("(-inf,$a) U ($a,inf)")->cmp);
+
+and so on.
+
+Formulas are handled in the same way:
+
+    ANS(Formula("x+1")->cmp);
+    
+    $a = random(-5,5,1); $b = random(-5,5,1); $x = random(-5,5,1);
+    $f = Formula("x^2 + $a x + $b")->reduce;
+    ANS($f->cmp);
+    ANS($f->eval(x=>$x)->cmp);
+    
+    $x = Formula('x');
+    ANS((1+$a*$x)->cmp);
+    
+    Context("Vector")->variables->are(t=>'Real');
+    $v = Formula("<t,t^2,t^3>"); $t = random(-5,5,1);
+    ANS($v->cmp);
+    ANS($v->eval(t=>$t)->cmp);
+
+and so on.
+
+Lists of items can be checked as easily:
+
+    ANS(List(1,-1,0)->cmp);
+    ANS(List(Point($a,$b),Point($a,-$b))->cmp);
+    ANS(List(Vector(1,0,0),Vector(0,1,1))->cmp);
+    ANS(Compute("(-inf,2),(4,5)")->cmp); # easy way to get list of intervals
+    ANS(Formula("x, x+1, x^2-1")->cmp);
+    ANS(Formula("<x,2x>,<x,-2x>,<0,x>")->cmp);
+    ANS(List('NONE')->cmp);
+
+and so on.  The last example may seem strange, as you could have used
+ANS(String('NONE')->cmp), but there is a reason for using this type 
+of construction.  You might be asking for one or more numbers (or
+points, or whatever) or the word 'NONE' of there are no numbers (or
+points).  If you used String('NONE')->cmp, the student would get an
+error message about a type mismatch if he entered a list of numbers,
+but with List('NONE')->cmp, he will get appropriate error messages for
+the wrong entries in the list.
+
+It is often appropriate to use the list checker in this way even when
+the correct answer is a single value, if the student might type a list
+of answers.
+
+On the other hand, using the list checker has its disadvantages.  For
+example, if you use
+
+    ANS(Interval("(-inf,3]")->cmp);
+
+and the student enters (-inf,3), she will get a message indicating
+that the type of interval is incorrect, while that would not be the
+case if
+
+    ANS(List(Interval("(-inf,3]"))->cmp);
+
+were used.  (This is because the student doesn't know how many
+intervals there are, so saying that the type of interval is wrong
+would inform her that there is only one.)
+
+The rule of thumb is:  the individual checkers can give more detailed
+information about what is wrong with the student's answer; the list
+checker allows a wider range of answers to be given without giving
+away how many answers there are.  If the student knows there's only
+one, use the individual checker; if there may or may not be more than
+one, use the list checker.
+
+Note that you can form lists of formulas as well.  The following all
+produce the same answer checker:
+
+    ANS(List(Formula("x+1"),Formula("x-1"))->cmp);
+
+    ANS(Formula("x+1,x-1")->cmp); # easier
+
+    $f = Formula("x+1"); $g = Formula("x-1");
+    ANS(List($f,$g)->cmp);
+
+    $x = Formula('x');
+    ANS(List($x+1,$x-1)->cmp);
+
+See the files in webwork2/doc/parser/problems for more
+examples of using the parser's answer checkers.
+
+=head2 Controlling the Details of the Answer Checkers
+
+The action of the answer checkers can be modified by passing flags to
+the cmp() method.  For example:
+
+    ANS(Real(pi)->cmp(showTypeWarnings=>0));
+
+will prevent the answer checker from reporting errors due to the
+student entering in the wrong type of answer (say a vector rather than
+a number).
+
+=head3 Flags common to all answer checkers
+
+There are a number of flags common to all the checkers:
+
+=over
+
+=item S<C<< showTypeWarnings=>1 or 0 >>>
+
+show/don't show messages about student
+answers not being of the right type.
+(default: 1)
+
+=item S<C<< showEqualErrors=>1 or 0 >>>
+
+show/don't show messages produced by
+trying to compare the professor and
+student values for equality, e.g.,
+conversion errors between types.
+(default: 1)
+
+=item S<C<< ignoreStrings=>1 or 0 >>>
+
+show/don't show type mismatch errors
+produced by strings (so that 'NONE' will
+not cause a type mismatch in a checker
+looking for a list of numbers, for example).
+(default: 1)
+
+=back
+
+In addition to these, the individual types have their own flags:
+
+=head3 Flags for Real()->cmp
+
+=over
+
+=item S<C<< ignoreInfinity=>1 or 0 >>>
+
+Don't report type mismatches if the
+student enters an infinity.
+(default: 1)
+
+=back
+
+=head3 Flags for String()->cmp
+
+=over
+
+=item S<C<< typeMatch=>value >>>
+
+Specifies the type of object that
+the student should be allowed to enter
+(in addition the string).
+(default: 'Value::Real')
+
+=back
+
+=head3 Flags for Point()->cmp
+
+=over
+
+=item S<C<< showDimensionHints=>1 or 0 >>>
+
+show/don't show messages about the
+wrong number of coordinates.
+(default: 1)
+
+=item S<C<< showCoordinateHints=>1 or 0 >>>
+
+show/don't show message about
+which coordinates are right.
+(default: 1)
+
+=back
+
+=head3 Flags for Vector()->cmp
+
+=over
+
+=item S<C<< showDimensionHints=>1 or 0 >>>
+
+show/don't show messages about the
+wrong number of coordinates.
+(default: 1)
+
+=item S<C<< showCoordinateHints=>1 or 0 >>>
+
+show/don't show message about
+which coordinates are right.
+(default: 1)
+
+=item S<C<< promotePoints=>1 or 0 >>>
+
+do/don't allow the student to
+enter a point rather than a vector.
+(default: 1)
+
+=item S<C<< parallel=>1 or 0 >>>
+
+Mark the answer as correct if it
+is parallel to the professor's answer.
+Note that a value of 1 forces
+showCoordinateHints to be 0.
+(default: 0)
+
+=item S<C<< sameDirection=>1 or 0 >>>
+
+During a parallel check, mark the
+answer as correct only if it is in
+the same (not the opposite)
+direction as the professor's answer.
+(default: 0)
+
+=back
+
+=head3 Flags for Matrix()->cmp
+
+=over
+
+=item S<C<< showDimensionHints=>1 or 0 >>>
+
+show/don't show messages about the
+wrong number of coordinates.
+(default: 1)
+
+=back
+
+The default for showEqualErrors is set to 0 for Matrices, since
+these errors usually are dimension errors, and that is handled
+separately (and after the equality check).
+
+=head3 Flags for Interval()->cmp
+
+=over
+
+=item S<C<< showEndpointHints=>1 or 0 >>>
+
+do/don't show messages about which
+endpoints are correct.
+(default: 1)
+
+=item S<C<< showEndTypeHints=>1 or 0 >>>
+
+do/don't show messages about
+whether the open/closed status of
+the enpoints are correct (only
+shown when the endpoints themselves
+are correct).
+(default: 1)
+
+=back
+
+=head3 Flags for Union()->cmp and List()->cmp
+
+all the flags from the Real()->cmp, plus:
+
+=over
+
+=item S<C<< showHints=>1 or 0 >>>
+
+do/don't show messages about which
+entries are incorrect.
+(default:  $showPartialCorrectAnswers)
+
+=item S<C<< showLengthHints=>1 or 0 >>>
+
+do/don't show messages about having the
+correct number of entries (only shown
+when all the student answers are
+correct but there are more needed, or
+all the correct answsers are among the
+ones given, but some extras were given).
+(default:  $showPartialCorrectAnswers)
+
+=item S<C<< partialCredit=>1 or 0 >>>
+
+do/don't give partial credit for when
+some answers are right, but not all.
+(default:  $showPartialCorrectAnswers)
+(currently the default is 0 since WW
+can't handle partial credit properly).
+
+=item S<C<< ordered=>1 or 0 >>>
+
+give credit only if the student answers
+are in the same order as the
+professor's answers.
+(default:  0)
+
+=item S<C<< entry_type=>'a (name)' >>>
+
+The string to use in error messages
+about type mismatches.
+(default:  dynamically determined from list)
+
+=item S<C<< list_type=>'a (name)' >>>
+
+The string to use in error messages
+about numbers of entries in the list.
+(default:  dynamically determined from list)
+
+=item S<C<< typeMatch=>value >>>
+
+Specifies the type of object that
+the student should be allowed to enter
+in the list (determines what
+constitutes a type mismatch error).
+(default: dynamically determined from list)
+
+=item S<C<< requireParenMatch=>1 or 0 >>>
+
+Do/don't require the parentheses in the
+student's answer to match those in the
+professor's answer exactly.
+(default: 1)
+
+=item S<C<< removeParens=>1 or 0 >>>
+
+Do/don't remove the parentheses from the
+professor's list as part of the correct
+answer string.  This is so that if you
+use List() to create the list (which
+doesn't allow you to control the parens
+directly), you can still get a list
+with no parentheses.
+(default: 0 for List() and 1 for Formula())
+
+=back
+
+=head3 Flags for Formula()->cmp
+
+The flags for formulas are dependent on the type of the result of
+the formula.  If the result is a list or union, it gets the flags
+for that type above, otherwise it gets that flags of the Real
+type above.
+
+More flags need to be added in order to allow more control over the
+answer checkers to give the full flexibility of the traditional
+WeBWorK answer checkers.  Note that some things, like whether trig
+functions are allowed in the answer, are controlled through the
+Context() rather than the answer checker itself.  For example, 
+
+    Context()->functions->undefine('sin','cos','tan');
+
+would remove those three functions from use.  (One would need to remove
+cot, sec, csc, arcsin, asin, etc., to do this properly; there could be
+a function call to do this.)
+
+Similarly, which arithmetic operations are available is controlled
+through Context()->operations.
+
+The tolerances used in comparing numbers are part of the Context as
+well.  You can set these via:
+
+    Context()->flags->set(
+        tolerance    => .0001,       # the relative or absolute tolerance
+        tolType      => 'relative',  # or 'absolute'
+        zeroLevel    => 1E-14,       # when to use zeroLevelTol
+        zeroLevelTol => 1E-12,       # smaller than this matches zero
+                                     #  when one of the two is less
+                                     #  than zeroLevel
+        limits       => [-2,2],      # limits for variables in formulas
+        num_points   => 5,           # the number of test points
+    );
+
+[These need to be handled better.]
+
+Note that for testing formulas, you can override the limits and
+num_points settings by setting these fields of the formula itself:
+
+    $f = Formula("sqrt(x-10)");
+    $f->{limits} = [10,12];
+
+    $f = Formula("log(xy)");
+    $f->{limits} = [[.1,2],[.1,2]]; # x and y limits
+
+You can also specify the test points explicitly:
+
+    $f = Formula("sqrt(x-10)");
+    $f->{test_points} = [[11],[11.5],[12]];
+
+    $f = Formula("log(xy)");
+    $f->{test_points} = [[.1,.1],[.1,.5],[.1,.75],
+                         [.5,.1],[.5,.5],[.5,.75]];
+
+[There still needs to be a means of handling the tolerances similarly,
+and through the ->cmp() call itself.]
+
diff --git a/doc/parser/docs/UsingParser.pod b/doc/parser/docs/UsingParser.pod
new file mode 100644
index 0000000000..4ece7c5b90
--- /dev/null
+++ b/doc/parser/docs/UsingParser.pod
@@ -0,0 +1,401 @@
+=head1 USING MATHOBJECTS
+
+To use MathObjects in your own problems, you need to load the 
+"MathObjects.pl" macro file:
+
+    loadMacros("Parser.pl");
+
+which defines the commands you need to interact with MathObjects.
+Once you have done that, you can call the MathObjects functions to create 
+formulas for you.  The main call is Formula(), which takes a string and 
+returns a parsed version of the string.  For example:
+
+    $f = Formula("x^2 + 3x + 1");
+
+will set $f to a reference to the parsed version of the formula.
+
+=head2 Working With Formulas
+
+A formula has a number of methods that you can call.  These include:
+
+=over
+
+=item $f->eval(x=>5)
+
+Evaluate the formula when x is 5.
+If $f has more variables than that, then
+you must provide additional values, as in
+$f->eval(x=>3,y=>1/2);
+
+=item $f->reduce
+
+Tries to remove redundent items from your 
+formula.  For example, Formula("1x+0") returns "x".
+Reduce tries to factor out negatives and do
+some other adjustments as well.  (There still
+needs to be more work done on this.  What it does 
+is correct, but not always smart, and there need 
+to be many more situations covered.)  All the
+reduction rules can be individually enabled
+or disabled using the Context()->reduction->set()
+method, but the documentation for the various
+rules is not yet ready.
+
+=item $f->substitute(x=>5)
+
+Replace x by the value 5 throughout (you may want
+to reduce the result afterword, as this is not 
+done automatically).  Note that you can replace a 
+variable by another formula, if you wish.  To make 
+this easier, substitute will apply Formula() to 
+any string values automatically.  E.g.,
+    Formula("x-1")->substitute(x=>"y")
+
+returns "y-1" as a formula.
+
+=item $f->string
+
+returns a string representation of the formula
+(should be equivalent to the original, though not
+necessarily equal to it).
+
+=item $f->TeX
+
+returns a LaTeX representation of the formula.
+You can use this in BEGIN_TEXT...END_TEXT blocks
+as follows:
+
+    BEGIN_TEXT
+    Suppose \(f(x) = \{$f->TeX}\). ...
+    END_TEXT
+
+=item $f->perl
+
+returns a representation of the formula that could
+be evaluated by perl's eval() function.
+
+=item $f->perlFunction
+
+returns a perl code block that can be called to
+evaluate the function.  For example:
+
+    $f = Formula('x^2 + 3')->perlFunction;
+    $y = &$f(5);
+
+will assign the value 28 to $y.
+You can also pass a function name to perlFunction 
+to get a named function to call:
+
+    Formula('x^2 + 3')->perlFunction('f');
+    $y = f(5);
+
+If the formula involves more than one variable,
+then the paramaters should be given in 
+alphabetical order.
+
+    Formula('x^2 + y')->perlFunction('f');
+    $z = f(5,3);  # $z is 28.
+
+Alternatively, you can tell the order for the
+parameters:
+
+    Formula('x^2 + y')->perlFunction('f',['y','x']);
+    $z = f(5,3); $ now $z is 14.
+
+=back
+
+=head2 Combining Formulas
+
+There is a second way to create formulas.  Once you have a formula, you can 
+create additional formulas simply by using perls' built-in operations and 
+functions, which have been overloaded to handle formulas.  For example,
+
+    $x = Formula('x');
+    $f = 3*x**2 + 2*$x - 1;
+
+makes $f be a formula, and is equivalent to having done
+
+    $f = Formula("3x^2 + 2x - 1");
+
+This can be very convenient, but also has some pitfalls.  First, you
+need to include '*' for multiplication, since perl doesn't do implied
+multiplication, and you must remember to use '**' not '^'.  (If you use '^'
+on a formula, the parser will remind you to use '**'.)  Second, the
+precedences of the operators in perl are fixed, and so changes you make to
+the precedence table for the parser are not reflected in formulas produced
+in this way.  (The reason '^' is not overloaded to do exponentiation is
+that the precedence of '^' is wrong for that in perl, and can't be 
+changed.)  As long as you leave the default precedences, however, things 
+should work as you expect.
+
+Note that the standard functions, like sin, cos, etc, are overloaded to 
+generate appropriate formulas when their values are formulas.  For example,
+
+    $x = Formula('x');
+    $f = cos(3*$x + 1);
+
+produces the same result as $f = Formula("cos(3x+1)"); and you can then go 
+on to output its TeX form, etc.
+
+=head2 Special Syntax
+
+This parser has support for some things that are missing from the current 
+one, like absolute values.  You can say  |1+x|  rather than  abs(1+x)
+(though both are allowed), and even |1 - |x|| works.
+
+Also, you can use  sin^2(x)  (or even sin^2 x) to get  (sin(x))^2.
+
+Finally, you can use  sin^-1(x)  to get  arcsin(x).
+
+There is an experimental set of operator precedences that make it possible 
+to write  sin 2x + 3 and get  sin(2x) + 3.  See examples/7-precedence.pg 
+for some details.
+
+=head2 The Formula Types
+
+The parser understands a wide range of data types, including real and 
+complex numbers, points, vectors, matrices, arbitrary lists, intervals, 
+unions of intervals, and predefined words.  Each has a syntax for use 
+within formulas, as described below:
+
+    numbers        the usual form:  153, 233.5, -2.456E-3, etc.
+
+    complex        a + b i  where a and b are numbers:  1+i, -5i, 6-7i, etc.
+
+    infinitites    the words 'infinity' or '-infinity' (or several
+                   equivalents).
+
+    point          (a,b,c)  where a, b and c are real or complex numbers.
+                   any number of coordinates are allowed.  Eg, (1,2), 
+                   (1,0,0,0), (-1,2,-3).  Points are promoted to vectors 
+                   automatically, when necessary.
+
+    vector         <a,b,c>  or  a i + b j + c k  (when used in vector context).
+                   As with points, vectors can have any number of 
+                   coordinates.  For example, <1,0,0>, <-1,3>, <x,1-x>, etc.
+
+    matrix         [[a11,...,a1n],...[am1,...amn]], i.e., use [..] around 
+                   each row, and around the matrix itself.  The elements 
+                   are separated by commas (not spaces).  e.g,
+                        [[1,2],[3,4]]     (a 2x2 matrix)
+                        [1,2]             (a 1x2 matrix, really a vector)
+                        [[1],[2]]         (a 2x1 matrix, ie. column vector)
+                   Points and vectors are promoted to matrices when 
+                   appropriate.  Vectors are converted to column vectors 
+                   when needed for matrix-vector multiplication.  Matrices 
+                   can be 3-dimensional or higher by repeated nesting of 
+                   matrices.  (In this way, a 2-dimensional matrix is really 
+                   thought of as a vector of vectors, and n-dimensional 
+                   ones as vectors of (n-1)-dimensional ones.)
+
+   list            (a,b,c)  where a,b,c are arbitrary elements.
+                   For example, (1+i, -3, <1,2,3>, Infinity).
+                   The empty list () is allowed, and the parentheses are 
+                   optional if there is only one list.  (This makes it 
+                   possible to make list-based answer checkers that
+                   really know where the separations occur.)
+
+   interval        (a,b), (a,b], [a,b), [a,b], or [a,a]  where a and b are
+                   numbers or appropriate forms of infinity.
+                   For example, (-INF,3], [4,4], [2,INF), (-INF,INF).
+
+   union           represented by 'U'.  For example  [-1,0) U (0,1].
+
+   string          special predefined strings like NONE and DNE.
+
+These forms are what are used in the strings passed to Formula().
+If you want to create versions of these in perl, there are several
+ways to do it.  One way is to use the Compute() command, which takes a
+string parses it and then evaluates the result (it is equivalent to
+Formula(...)->eval).  If the formula produces a vector, the result
+will be a Vector constant that you can use in perl formulas by hand.
+
+For example:
+
+    $v = Compute("<1,1,0> >< <-1,4,-2>");
+
+would compute the dot product of the two vectors and assign the
+resulting vector object to $v.
+
+Another way to generate constants of the various types is to use the
+following routines.  If their inputs are constant, they produce a
+constant of the appropriate type.  If an input is a formula, they
+produce corresponding formula objects.
+
+    Real(a)            create a real number with "fuzzy"
+                       comparisons (so that 1.0000001 == Real(1) is true).
+
+    Complex(a,b)       create a complex number a + b i
+ 
+    Infinity           creates the +infinity object
+    -(Infinity)        creates -infinity
+
+    Point(x1,...xn) or Point([x1,...,xn])      produces (x1,...,xn)
+
+    Vector(x1,...,xn) or Vector([x1,...,xn])   produces <x1,...,xn>
+
+    Matrix([a11,...,a1m],...,[am1,...,amn]) or
+    Matrix([[a11,...,a1m],...,[am1,...,amn]])  produces an n x m matrix
+
+    List(a,...,b)   produces a list with the given elements
+
+    Interval('(',a,b,']')   produces (a,b], (the other endpoints work as
+                            expected.  Use 'INF' and '-INF' for infinities.)
+
+    Union(I1,...,In)  takes the union of the n intervals. (where I1 to In 
+                      are intervals.)
+
+    String(word)  Produces a string object for the given word (if it
+                  is a known word).  This is mostly to be able to
+          call the ->cmp and ->TeX methods.
+
+For example,
+
+    $a = random(-5,5,1)
+    $V = Vector($a,1-$a,$a**2+1);
+
+produces a vector with some random coordinates.
+
+Objects of these types also have TeX, string and perl methods, so you can 
+use:
+
+    Vector(1,2,3)->TeX
+
+to produce a TeX version of the vector, just as you can with formulas.
+
+There are several "constant" functions that generate common constant
+values.  These include pi, i, j, k and Infininty.  you can use these
+in perl expressions as though they were their actual values:
+
+    $z = $a + $b * i;
+    $v = $a*i + $b*j + $c*k;
+    $I = Infinity;
+
+Note that because of a peculiarity of perl, you need to use -(pi)
+or - pi (with a space) rather than -pi, and similary for the other
+functions.  Without this, you will get an error message about an
+ambiguity being resolved.  (This is not a problem if you process your
+expressions through the parser itself, only if you are writing
+expressions in perl directly.  Note that since student answers are
+processed by the parser, not perl directly, they can write -pi without
+problems.)
+
+Another useful command is Compute(), which evaluates a formula and
+returns its value.  This is one way to create point or vector-valued
+constants, but there is an easier way discussed below.
+
+=head2 Specifying the Context
+
+You may have noticed that "i" was used in two different ways in the
+examples above.  In the first example, it was treated as a complex
+number and the second as a coordinate unit vector.  To control which
+interpretation is used, you specify a parser "context".
+
+The context controls what operations and functions are defined in the
+parser, what variables and constants to allow, how to interpret
+various paretheses, and so on.  Changing the context can completely
+change the way a formula is interpreted.
+
+There are several predefined contexts:  Numeric, Complex, Vector,
+Interval and Full.  (You can also define your own contexts, but that
+will be described elsewhere.)  To select a context, use the Context()
+function, e.g.
+
+    Context("Numeric");
+
+selects the numeric context, where i, j and k have no special meaning,
+points and vectors can't be used, and the only predefined variable is
+'x'.
+
+On the other hand, Context("Vector") makes i, j and k represent the
+unit coordinate vectors, and defines variables 'x', 'y' and 'z'.
+
+Context("Interval") is like numeric context, but it also defines the
+parentheses so that they will form intervals (rather than points or
+lists).
+
+Once you have selected a context, you can modify it to suit the
+particular needs of your problem.  The command
+
+    $context = Context();
+
+gets you a reference to the current context object (you can also use
+something like
+
+    $context = Context("Numeric");
+
+to set the context and get its reference at the same time).  Once you
+have this reference, you can call the Context methods to change values
+in the context.  These are discussed in more detail in the
+documentation of the Context object [not yet written], but some of the
+more common actions are described here.
+
+To add a variable, use, for example,
+
+    $context->variables->add(y=>'Real');
+
+To delete any existing variables and replace them with new ones, use
+
+    $context->variables->are(t=>'Real');
+
+To remove a variable, use
+
+    $context->variables->remove('t');
+
+To get the names of the defind variables, use
+
+    @names = $context->variables->names;
+
+
+Similarly, you can add a named constant via
+
+    $context->constants->add(M=>1/log(10));
+
+and can change, remove or list the constants via methods like those
+used for variables above.  The command
+
+    $M = $context->constants->get('M');
+
+will return the value of the consant M.  (See the
+pg/lib/Value/Context/Data.pm file for more information on the methods
+you can call for the various types of context data.)
+
+To add new predefined words (like 'NONE' and 'DNE'), use something
+like
+
+    $context->strings->add(TRUE=>{},FALSE=>{});
+
+Strings are case-insensitive, unless you say otherwise.  To mark a
+string as being case-senstive, use
+
+    $context->strings->add(TRUE => {caseSensitive=>1});
+
+You may want to privide several forms for the same word; to do so,
+make the additional words into aliases:
+
+    $context->strings->add(
+        T => {alias=>'TRUE'},
+        F => {alias=>'FALSE'},
+    );
+
+so that either "TRUE" or "T" will be interpreted as TRUE, and
+similarly for "FALSE" and "F";
+
+There are a number of values stored in the context that control things
+like the tolerance used when comparing numbers, and so on.  You
+control these via commands like:
+
+    $context->flags->set(tolerance=>.00001);
+
+For example,
+
+    $context->flags->set(ijk=>1);
+
+will cause the output of all vectors to be written in ijk format
+rather than <...> format.
+
+Finally, you can add or modify the operators and functions that are
+available in the parser via calls to $context->operators and
+$context->functions.  See the files in webwork2/docs/parser/extensions
+for examples of how to do this.
+
diff --git a/doc/parser/extensions/1-function.pg b/doc/parser/extensions/1-function.pg
new file mode 100644
index 0000000000..7e42c75e9f
--- /dev/null
+++ b/doc/parser/extensions/1-function.pg
@@ -0,0 +1,83 @@
+##########################################################
+#
+#  Example showing how to add a new single-variable function to the Parser
+#
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGbasicmacros.pl",
+  "PGanswermacros.pl",
+  "Parser.pl",
+  "parserTables.pl",
+);
+
+TEXT(beginproblem());
+
+###########################################################
+#
+#   Use  standard numeric mode
+#
+Context('Numeric');
+
+#############################################
+#
+#  Create a 'log2' function to the Parser for log base 2
+#
+
+package MyFunction1;
+our @ISA = qw(Parser::Function::numeric); # this is what makes it R -> R
+
+sub log2 {
+  shift; my $x = shift;
+  return CORE::log($x)/CORE::log(2);
+}
+
+package main;
+
+#
+#  Make it work on formulas as well as numbers
+#
+sub log2 {Parser::Function->call('log2',@_)}
+
+#
+#  Add the new functions into the Parser
+#
+
+Context()->functions->add(
+  log2 => {class => 'MyFunction1', TeX => '\log_2'},  # fancier TeX output
+);
+
+$x = Formula('x');
+
+###########################################################
+#
+#  The problem text
+#
+BEGIN_TEXT
+$BEGIN_ONE_COLUMN
+
+In this problem, we have added a new function to the Parser: ${BTT}log2(x)${ETT}.
+(Edit the code to see how this is done.)
+$PAR
+Assuming that ${BTT}${DOLLAR}x = Formula('x')${ETT}, it can be used as follows:
+$PAR
+
+\{ParserTable(
+     'Formula("log2(x)")',
+     'log2(8)',
+     'log2($x+1)',
+     'Formula("log2(x)")->eval(x=>16)',
+     '(log2($x))->eval(x=>16)',
+     'Formula("log2()")',
+     'Formula("log2(1,x)")',
+     'log2()',
+     'log2(1,3)',
+  )\}
+
+$END_ONE_COLUMN
+END_TEXT
+
+###########################################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/doc/parser/extensions/2-function.pg b/doc/parser/extensions/2-function.pg
new file mode 100644
index 0000000000..bcde6c059c
--- /dev/null
+++ b/doc/parser/extensions/2-function.pg
@@ -0,0 +1,83 @@
+##########################################################
+#
+#  Example showing how to add a new two-variable function to the Parser
+#
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGbasicmacros.pl",
+  "PGanswermacros.pl",
+  "Parser.pl",
+  "parserTables.pl",
+);
+
+TEXT(beginproblem());
+
+###########################################################
+#
+#   Use  standard numeric mode
+#
+Context('Numeric');
+
+#############################################
+#
+#   Create a "Combinations" function
+#
+
+package MyFunction2;
+our @ISA = qw(Parser::Function::numeric2); # this is what makes it R^2 -> R
+
+sub C {
+  shift; my ($n,$r) = @_; my $C = 1;
+  $r = $n-$r if ($r > $n-$r); # find the smaller of the two
+  for (1..$r) {$C = $C*($n-$_+1)/$_}
+  return $C
+}
+
+package main;
+
+#
+#  Make it work on formulas as well as numbers
+#
+sub C {Parser::Function->call('C',@_)}
+
+#
+#  Add the new functions into the Parser
+#
+
+Context()->functions->add(C => {class => 'MyFunction2'});
+
+$x = Formula('x');
+
+###########################################################
+#
+#  The problem text
+#
+BEGIN_TEXT
+$BEGIN_ONE_COLUMN
+
+In this problem, we have added a new function to the Parser: ${BTT}C(n,r)${ETT}.
+(Edit the code to see how this is done).
+$PAR
+Assuming that ${BTT}${DOLLAR}x = Formula('x')${ETT}, it can be used as follows:
+$PAR
+
+\{ParserTable(
+     'Formula("C(x,3)")',
+     'C(6,2)',
+     'C($x,3)',
+     'Formula("C(x,3)")->eval(x=>6)',
+     '(C($x,2))->eval(x=>6)',
+     'Formula("C(x)")',
+     'Formula("C(1,2,3)")',
+     'C(1)',
+     'C(1,2,3)',
+  )\}
+
+$END_ONE_COLUMN
+END_TEXT
+
+###########################################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/doc/parser/extensions/3-operator.pg b/doc/parser/extensions/3-operator.pg
new file mode 100644
index 0000000000..7cbdfa50c6
--- /dev/null
+++ b/doc/parser/extensions/3-operator.pg
@@ -0,0 +1,113 @@
+##########################################################
+#
+#  Example showing how to add new operators to the Parser
+#
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGbasicmacros.pl",
+  "PGanswermacros.pl",
+  "Parser.pl",
+  "parserTables.pl",
+);
+
+TEXT(beginproblem());
+
+##########################################################
+#
+#  Define our own binary operator
+#
+
+package MyOperator;
+our @ISA = qw(Parser::BOP); # subclass of Binary OPerator
+
+#
+#  Check that the operand types are numbers.
+#
+sub _check {
+  my $self = shift; my $name = $self->{bop};
+  return if $self->checkNumbers();
+  $self->Error("Operands of '$name' must be Numbers");
+}
+
+#
+#  Compute the value of n choose r.
+#
+sub _eval {
+  shift; my ($n,$r) = @_; my $C = 1;
+  $r = $n-$r if ($r > $n-$r); # find the smaller of the two
+  for (1..$r) {$C = $C*($n-$_+1)/$_}
+  return $C
+}
+
+#
+#  Non-standard TeX output
+#
+sub TeX {
+  my $self = shift;
+  return '{'.$self->{lop}->TeX.' \choose '.$self->{rop}->TeX.'}';
+}
+
+#
+#  Non-standard perl output
+#
+sub perl {
+  my $self = shift;
+  return '(MyOperator->_eval('.$self->{lop}->perl.','.$self->{rop}->perl.'))';
+}
+
+package main;
+
+##########################################################
+#
+#  Add the operator into the current context
+#
+
+$prec = Context()->operators->get('+')->{precedence} - .25;
+
+Context()->operators->add(
+  '#' => {
+     class => 'MyOperator',
+     precedence => $prec,         #  just below addition
+     associativity => 'left',     #  computed left to right
+     type => 'bin',               #  binary operator
+     string => ' # ',             #  output string for it
+     TeX => '\mathop{\#}',         #  TeX version (overridden above, but just an example)
+  }
+);
+
+
+$CHOOSE = MODES(TeX => '\#', HTML => '#');
+
+
+###########################################################
+#
+#  The problem text
+#
+BEGIN_TEXT
+$BEGIN_ONE_COLUMN
+
+In this problem, we have added a new operator to the Parser: ${BTT}n $CHOOSE r${ETT}, 
+which returns \(n\choose r\).
+$PAR
+
+\{ParserTable(
+    'Formula("x # y")',
+    'Formula("x+1 # 5")',
+    'Formula("x # 5")->eval(x=>7)',
+    'Formula("(x#5)+(x#4)")',
+    'Formula("x#5+x#4")',
+    'Formula("x # y")',
+    'Formula("x # y")->substitute(x=>5)',
+    'Formula("x # y")->eval(x=>5,y=>2)',
+    'Formula("x # y")->perlFunction(~~'C~~'); C(5,2)',
+    'Formula("1 # <x,3>")',
+  )\}
+
+$END_ONE_COLUMN
+END_TEXT
+
+###########################################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/doc/parser/extensions/4-list.pg b/doc/parser/extensions/4-list.pg
new file mode 100644
index 0000000000..1056685ea7
--- /dev/null
+++ b/doc/parser/extensions/4-list.pg
@@ -0,0 +1,106 @@
+##########################################################
+#
+#  Example showing how to add a new list-type object
+#
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGbasicmacros.pl",
+  "PGanswermacros.pl",
+  "Parser.pl",
+  "parserTables.pl",
+);
+
+TEXT(beginproblem());
+
+##########################################################
+#
+#  Define our own [n,r] notation for n choose r
+#
+
+package MyChoose;
+our @ISA = qw(Parser::List); # subclass of List
+
+#
+#  Check that two numbers are given
+#
+sub _check {
+  my $self = shift;
+  $self->{type}{list} = 0;  # our result is a single number, not really a list
+  $self->Error("You need two numbers within '[' and ']'")
+    if ($self->{type}{length} < 2);
+  $self->Error("Only two numbers can appear within '[' and ']'")
+    if ($self->{type}{length} > 2);
+  my ($n,$r) = @{$self->{coords}};
+  $self->Error("The arguments for '[n,r]' must be numbers")
+    unless ($n->type eq 'Number' && $r->type eq 'Number');
+  $self->{type} = $Value::Type{number};
+}
+
+#
+#  Compute n choose r
+#
+sub _eval {
+  shift; my ($n,$r) = @_; my $C = 1;
+  $r = $n-$r if ($r > $n-$r); # find the smaller of the two
+  for (1..$r) {$C = $C*($n-$_+1)/$_}
+  return $C
+}
+
+#
+#  Non-standard TeX output
+#
+sub TeX {
+  my $self = shift; 
+  return '{'.$self->{coords}[0]->TeX.' \choose '.$self->{coords}[1]->TeX.'}';
+}
+
+#
+#  Non-standard perl output
+#
+sub perl {
+  my $self = shift;
+  return '(MyChoose->_eval('.$self->{coords}[0]->perl.','.$self->{coords}[1]->perl.'))';
+}
+
+
+package main;
+
+##########################################################
+#
+#  Add the new list to the context
+#
+
+Context()->lists->add(Choose => {class => 'MyChoose'});
+Context()->parens->replace('[' => {close => ']', type => 'Choose'});
+
+###########################################################
+#
+#  The problem text
+#
+BEGIN_TEXT
+$BEGIN_ONE_COLUMN
+
+In this problem, we have added a new list to the Parser: ${BTT}[n,r]${ETT}, 
+which returns \(n\choose r\).
+$PAR
+
+\{ParserTable(
+    'Formula("[x,3]")',
+    'Formula("[5,3]")',
+    'Formula("[x,3]")->eval(x=>5)',
+    '$C = Formula("[x,y]"); $C->substitute(x=>5)',
+    'Formula("[x,y]")->perlFunction("C"); C(5,3)',
+    'Formula("[x,y,3]")',
+    'Formula("[x]")',
+    'Formula("[x,[y,2]]")',
+    'Formula("[x,<1,2>]")',
+  )\}
+
+$END_ONE_COLUMN
+END_TEXT
+
+###########################################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/doc/parser/extensions/5-operator.pg b/doc/parser/extensions/5-operator.pg
new file mode 100644
index 0000000000..0ccd57b9aa
--- /dev/null
+++ b/doc/parser/extensions/5-operator.pg
@@ -0,0 +1,89 @@
+##########################################################
+#
+#  Example of how to implement equalities in the Parser
+#
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGbasicmacros.pl",
+  "PGanswermacros.pl",
+  "Parser.pl",
+  "parserTables.pl",
+);
+
+TEXT(beginproblem());
+
+##########################################################
+#
+#  Define our own operator for equality
+#
+
+package Equality;
+our @ISA = qw(Parser::BOP); # subclass of Binary OPerator
+
+#
+#  Check that the operand types are numbers.
+#
+sub _check {
+  my $self = shift; my $name = $self->{bop};
+  $self->Error("Only one equality is allowed in an equation")
+    if ($self->{lop}->class eq 'Equality' || $self->{rop}->class eq 'Equality') ;
+  $self->Error("Operands of '$name' must be Numbers") unless $self->checkNumbers();
+  $self->{type} = Value::Type('Equality',1); # Make it not a number, to get errors with other operations.
+}
+
+#
+#  Determine if the two sides are equal
+#
+sub _eval {return ($_[1] == $_[2])? 1: 0}
+
+package main;
+
+#
+#  Add the operator into the current context
+#
+
+$prec = Context()->operators->get(',')->{precedence} + .25;
+
+Context()->operators->add(
+  '=' => {
+     class => 'Equality',
+     precedence => $prec,      #  just above comma
+     associativity => 'left',  #  computed left to right
+     type => 'bin',            #  binary operator
+     string => '=',            #  output string for it
+     perl => '==',             #  perl string
+  }
+);
+
+
+###########################################################
+#
+#  The problem text
+#
+BEGIN_TEXT
+$BEGIN_ONE_COLUMN
+
+In this problem, we have added a new operator to the Parser: ${BTT} a
+= b${ETT}, for equality.
+$PAR
+
+\{ParserTable(
+    'Formula("x + y = 0")',
+    'Formula("x + y = 0")->{tree}->class',
+    'Formula("x + y = 0")->{tree}{lop}',
+    'Formula("x + y = 0")->{tree}{rop}',
+    'Formula("x + y = 0")->eval(x=>2,y=>3)',
+    'Formula("x + y = 0")->eval(x=>2,y=>-2)',
+    'Formula("x + y = 0 = z")',
+    'Formula("(x + y = 0) + 5")',
+    'Formula("x + y = 0, 3x-y = 4")', # you CAN get a list of equalities
+  )\}
+
+$END_ONE_COLUMN
+END_TEXT
+
+###########################################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/doc/parser/extensions/6-precedence.pg b/doc/parser/extensions/6-precedence.pg
new file mode 100644
index 0000000000..a3e1f24155
--- /dev/null
+++ b/doc/parser/extensions/6-precedence.pg
@@ -0,0 +1,84 @@
+##########################################################
+#
+#  Example of the non-standard precedences as a possible alternative
+#  that makes it possible to write "sin 2x" and get "sin(2x)"
+#
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGbasicmacros.pl",
+  "PGanswermacros.pl",
+  "Parser.pl",
+  "parserTables.pl",
+);
+
+TEXT(beginproblem());
+
+##########################################################
+#
+#  Use standard precedences for multiplication
+#
+
+Context()->usePrecedence("Standard");
+
+$standard = ParserTable(
+   'Formula("sin 2xy/3")',
+   'Formula("sin 2x y/3")',
+   'Formula("sin 2x y / 3")',
+   'Formula("sin 2x+5")',
+   'Formula("sin x(x+1)")',
+   'Formula("sin x (x+1)")',
+   'Formula("1/2xy")',
+   'Formula("1/2 xy")',
+   'Formula("1/2x y")',
+   'Formula("sin^2 x")',
+   'Formula("sin^(-1) x")',
+   'Formula("x^2x")',
+);
+
+Context()->usePrecedence("Non-Standard");
+
+$nonstandard = ParserTable(
+   'Formula("sin 2xy/3")',
+   'Formula("sin 2x y/3")',
+   'Formula("sin 2x y / 3")',
+   'Formula("sin 2x+5")',
+   'Formula("sin x(x+1)")',
+   'Formula("sin x (x+1)")',
+   'Formula("1/2xy")',
+   'Formula("1/2 xy")',
+   'Formula("1/2x y")',
+   'Formula("sin^2 x")',
+   'Formula("sin^(-1) x")',
+   'Formula("x^2x")',
+);
+
+
+
+###########################################################
+#
+#  The problem text
+#
+BEGIN_TEXT
+$BEGIN_ONE_COLUMN
+
+In this problem, we compare the standard and non-standard precedences for
+multiplication.
+$PAR
+
+\{Title("The Non-Standard precedences:")\}
+$PAR
+$nonstandard
+$PAR$BR
+
+\{Title("The Standard precedences:")\}
+$PAR
+$standard
+
+$END_ONE_COLUMN
+END_TEXT
+
+###########################################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/doc/parser/extensions/7-context.pg b/doc/parser/extensions/7-context.pg
new file mode 100644
index 0000000000..a43ae859c1
--- /dev/null
+++ b/doc/parser/extensions/7-context.pg
@@ -0,0 +1,86 @@
+##########################################################
+#
+#  Example showing how to switch different contexts
+#
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGbasicmacros.pl",
+  "PGanswermacros.pl",
+  "Parser.pl",
+  "parserTables.pl",
+);
+
+TEXT(beginproblem());
+
+BEGIN_TEXT
+$BEGIN_ONE_COLUMN
+
+In this problem, we compare formulas in complex and vector contexts.
+Note the difference between how ${BTT}i${ETT} is treated in the two
+contexts.  Note that 'Number' comprises both real and complex numbers.
+$PAR
+
+Assuming that ${BTT}${DOLLAR}x = Formula('x')${ETT}, it can be used as follows:
+$PAR
+
+END_TEXT
+
+$x = Formula('x');
+
+##########################################################
+#
+#  Use Complex context
+#
+
+Context('Complex');
+
+BEGIN_TEXT
+\{Title("The Complex context:")\}
+$PAR
+\{ParserTable(
+   'i',
+   'Formula("1+3i")',
+   'Formula("x+3i")',
+   '1 + 3*i',
+   '$x + 3*i',
+   '$z = tan(2*i)',
+   'Formula("sinh(zi)")',
+   'Formula("3i+4j-k")',
+   'Formula("3i+4j-k")->eval',
+   '3*i + 4*j - k',
+)\}
+$PAR$BR
+END_TEXT
+
+
+##########################################################
+#
+#  Use Vector context
+#
+
+Context('Vector');
+
+BEGIN_TEXT
+\{Title("The Vector context:")\}
+$PAR
+\{ParserTable(
+   'i',
+   'Formula("1+3i")',
+   'Formula("x+3i")',
+   '1 + 3*i',
+   '$x + 3*i',
+   '$z = tan(2*i)',
+   'Formula("sinh(zi)")',
+   'Formula("3i+4j-k")',
+   'Formula("3i+4j-k")->eval',
+   '3*i + 4*j - k',
+)\}
+
+$END_ONE_COLUMN
+END_TEXT
+
+###########################################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/doc/parser/extensions/8-answer.pg b/doc/parser/extensions/8-answer.pg
new file mode 100644
index 0000000000..6f76804e82
--- /dev/null
+++ b/doc/parser/extensions/8-answer.pg
@@ -0,0 +1,112 @@
+##########################################################
+#
+#  Example showing an answer checker that uses the parser
+#  to evaluate the student (and professor's) answers.
+#
+#  This is now obsolete, as the paser's ->cmp method
+#  can be used to produce an answer checker for any
+#  of the parser types.
+#
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGbasicmacros.pl",
+  "PGanswermacros.pl",
+  "Parser.pl",
+  "parserUtils.pl",
+);
+
+TEXT(beginproblem());
+
+##########################################################
+#
+#  Use Vector context
+#
+
+Context('Vector');
+
+##########################################################
+#
+#  Make the answer checker
+#
+sub vector_cmp {
+  my $v = shift;
+  die "vector_cmp requires a vector argument" unless defined $v;
+  my $v = Vector($v);  # covert to vector if it isn't already
+  my $ans = new AnswerEvaluator;
+  $ans->ans_hash(type => "vector",correct_ans => $v->string, vector=>$v);
+  $ans->install_evaluator(~~&vector_cmp_check);
+  return $ans;
+}
+
+sub vector_cmp_check {
+  my $ans = shift; my $v = $ans->{vector},
+  $ans->score(0);  # assume failure
+  my $f = Parser::Formula($ans->{student_ans});
+  my $V = Parser::Evaluate($f);
+  if (defined $V) {
+    $V = Formula($V) unless Value::isValue($V);  #  make sure we can call Value methods
+    $ans->{preview_latex_string} = $f->TeX;
+    $ans->{preview_text_string} = $f->string;
+    $ans->{student_ans} = $V->string;
+    if ($V->type eq 'Vector') {
+      $ans->score(1) if ($V == $v); #  Let the overloaded == do the check
+    } else {
+      $ans->{ans_message} = $ans->{error_message} =
+         "Your answer doesn't seem to be a Vector (it looks like ".Value::showClass($V).")"
+            unless $inputs_ref->{previewAnswers};
+    }
+  } else {
+    #
+    #  Student answer evaluation failed.
+    #  Report the error, with formatting, if possible.
+    #
+    my $context = Context();
+    my $message = $context->{error}{message};
+    if ($context->{error}{pos}) {
+      my $string = $context->{error}{string};
+      my ($s,$e) = @{$context->{error}{pos}};
+      $message =~ s/; see.*//;  # remove the position from the message
+      $ans->{student_ans} = protectHTML(substr($string,0,$s)) .
+                 '<SPAN CLASS="parsehilight">' . 
+                    protectHTML(substr($string,$s,$e-$s)) .
+                 '</SPAN>' .
+                 protectHTML(substr($string,$e));
+    }
+    $ans->{ans_message} = $ans->{error_message} = $message;
+  }
+  return $ans;
+}
+
+##########################################################
+#
+#  The problem text
+#
+
+$V = Vector(1,2,3);
+
+Context()->flags->set(ijk=>0);
+Context()->constants->add(a=>1,b=>1,c=>1);
+
+$ABC = Formula("<a,b,c>");
+
+BEGIN_TEXT
+Enter the vector \(\{$V->TeX\}\) in any way you like: \{ans_rule(20)\}.
+$PAR
+You can use either \(\{$ABC->TeX\}\) or \(\{$ABC->ijk\}\) notation,$BR
+and can perform vector operations to produce your answer.
+$PAR
+${BBOLD}Note:${EBOLD} This problem is obsolete.
+END_TEXT
+
+###########################################################
+#
+#  The answer
+#
+
+ANS(vector_cmp($V));
+
+###########################################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/doc/parser/macros/Differentiation.pl b/doc/parser/macros/Differentiation.pl
new file mode 100644
index 0000000000..b614caeeb9
--- /dev/null
+++ b/doc/parser/macros/Differentiation.pl
@@ -0,0 +1,20 @@
+#
+#  Example of how to add new functionality to the Parser.
+#  
+#  Here we load new methods for the Parser object classes.  Note, however,
+#  that these are PERSISTANT when used with webwork2 (mod_perl), and so we
+#  need to take care not to load them more than once.  We look for the
+#  variable $Parser::Differentiation::loaded, which is defined in the
+#  differentiation package, in order to tell.
+#  
+#  DifferentiationDefs.pl is really just a copy of the
+#  Parser::Differentiation.pm file, and you really could just preload the
+#  latter instead by uncommenting the 'use Parser::Differentiation' line at
+#  the bottom of Parser.pm.  (This file is really just a sample).  The way
+#  it's done here will load it the first time it gets used, then will keep
+#  it around, so not much overhead even this way.
+#
+
+loadMacros("DifferentiationDefs.pl") unless $Parser::Differentiation::loaded;
+
+1;
diff --git a/doc/parser/macros/DifferentiationDefs.pl b/doc/parser/macros/DifferentiationDefs.pl
new file mode 100644
index 0000000000..32c37b91aa
--- /dev/null
+++ b/doc/parser/macros/DifferentiationDefs.pl
@@ -0,0 +1,635 @@
+#
+#  Extend differentiation to multiple variables
+#  Check differentiation for complex functions
+#  Do derivatives for norm and unit.
+#  
+#  Make shortcuts for getting numbers 1, 2, and sqrt, etc.
+#  
+
+##################################################
+#
+#  Differentiate the formula in terms of the given variable
+#
+sub Parser::D {
+  my $self = shift; my $x = shift;
+  if (!defined($x)) {
+    my @vars = keys(%{$self->{variables}});
+    my $n = scalar(@vars);
+    if ($n == 0) {
+      return $self->new('0') if $self->{isNumber};
+      $x = 'x';
+    } else {
+      $self->Error("You must specify a variable to differentiate by") unless $n ==1;
+      $x = $vars[0];
+    }
+  } else {
+    return $self->new('0') unless defined $self->{variables}{$x};
+  }
+  return $self->new($self->{tree}->D($x));
+}
+
+sub Item::D {
+  my $self = shift;
+  my $type = ref($self); $type =~ s/.*:://;
+  $self->Error("Differentiation for '$type' is not implemented",$self->{ref});
+}
+
+
+#########################################################################
+
+sub Parser::BOP::comma::D {Item::D(shift)}
+sub Parser::BOP::union::D {Item::D(shift)}
+
+sub Parser::BOP::add::D {
+  my $self = shift; my $x = shift;
+  $self = Parser::BOP->new(
+    $self->{equation},$self->{bop},
+    $self->{lop}->D($x),$self->{rop}->D($x)
+  );
+  return $self->reduce;
+}
+
+
+sub Parser::BOP::subtract::D {
+  my $self = shift; my $x = shift;
+  $self = Parser::BOP->new(
+    $self->{equation},$self->{bop},
+    $self->{lop}->D($x),$self->{rop}->D($x)
+  );
+  return $self->reduce;
+}
+
+sub Parser::BOP::multiply::D {
+  my $self = shift; my $x = shift;
+  my $equation = $self->{equation};
+  $self =
+    Parser::BOP->new($equation,'+',
+      Parser::BOP->new($equation,$self->{bop},
+        $self->{lop}->D($x),$self->{rop}->copy($equation)),
+      Parser::BOP->new($equation,$self->{bop},
+        $self->{lop}->copy($equation),$self->{rop}->D($x))
+    );
+  return $self->reduce;
+}
+
+sub Parser::BOP::divide::D {
+  my $self = shift; my $x = shift;
+  my $equation = $self->{equation};
+  $self =
+    Parser::BOP->new($equation,$self->{bop},
+      Parser::BOP->new($equation,'-',
+        Parser::BOP->new($equation,'*',
+          $self->{lop}->D($x),$self->{rop}->copy($equation)),
+        Parser::BOP->new($equation,'*',
+          $self->{lop}->copy($equation),$self->{rop}->D($x))
+      ),
+      Parser::BOP->new($equation,'^',
+        $self->{rop},Parser::Number->new($equation,2)
+      )
+    );
+  return $self->reduce;
+}
+
+sub Parser::BOP::power::D {
+  my $self = shift; my $x = shift;
+  my $equation = $self->{equation};
+  my $vars = $self->{rop}->getVariables;
+  if (defined($vars->{$x})) {
+    $vars = $self->{lop}->getVariables;
+    if (defined($vars->{$x})) {
+      $self =
+        Parser::Function->new($equation,'exp',
+          [Parser::BOP->new($equation,'*',$self->{rop}->copy($equation),
+            Parser::Function->new($equation,'log',[$self->{lop}->copy($equation)],0))]);
+       return $self->D($x);
+    }
+    $self = Parser::BOP->new($equation,'*',
+      Parser::Function->new($equation,'log',[$self->{lop}->copy($equation)],0),
+      Parser::BOP->new($equation,'*',
+        $self->copy($equation),$self->{rop}->D($x))
+    );
+  } else {
+    $self =
+      Parser::BOP->new($equation,'*',
+        Parser::BOP->new($equation,'*',
+          $self->{rop}->copy($equation),
+          Parser::BOP->new($equation,$self->{bop},
+            $self->{lop}->copy($equation),
+            Parser::BOP->new($equation,'-',
+              $self->{rop}->copy($equation),
+              Parser::Number->new($equation,1)
+            )
+          )
+        ),
+        $self->{lop}->D($x)
+      );
+  }
+  return $self->reduce;
+}
+
+sub Parser::BOP::cross::D      {Item::D(shift)}
+sub Parser::BOP::dot::D        {Item::D(shift)}
+sub Parser::BOP::underscore::D {Item::D(shift)}
+
+#########################################################################
+
+sub Parser::UOP::plus::D {
+  my $self = shift; my $x = shift;
+  return $self->{op}->D($x)
+}
+
+sub Parser::UOP::minus::D {
+  my $self = shift; my $x = shift;
+  $self = Parser::UOP->new($self->{equation},'u-',$self->{op}->D($x));
+  return $self->reduce;
+}
+
+sub Parser::UOP::factorial::D  {Item::D(shift)}
+
+#########################################################################
+
+sub Parser::Function::D {
+  my $self = shift;
+  $self->Error("Differentiation of '$self->{name}' not implemented",$self->{ref});
+}
+
+sub Parser::Function::D_chain {
+  my $self = shift; my $x = $self->{params}[0];
+  my $name = "D_" . $self->{name};
+  $self = Parser::BOP->new($self->{equation},'*',$self->$name($x->copy),$x->D(shift));
+  return $self->reduce;
+}
+
+#############################
+
+sub Parser::Function::trig::D {Parser::Function::D_chain(@_)}
+
+sub Parser::Function::trig::D_sin {
+  my $self = shift; my $x = shift;
+  return Parser::Function->new($self->{equation},'cos',[$x]);
+}
+
+sub Parser::Function::trig::D_cos {
+  my $self = shift; my $x = shift;
+  my $equation = $self->{equation};
+  return 
+    Parser::UOP->new($equation,'u-',
+      Parser::Function->new($equation,'sin',[$x])
+    );
+}
+
+sub Parser::Function::trig::D_tan {
+  my $self = shift; my $x = shift;
+  my $equation = $self->{equation};
+  return 
+    Parser::BOP->new($equation,'^',
+      Parser::Function->new($equation,'sec',[$x]),
+      Parser::Number->new($equation,2)
+    );
+}
+
+sub Parser::Function::trig::D_cot {
+  my $self = shift; my $x = shift;
+  my $equation = $self->{equation};
+  return 
+    Parser::UOP->new($equation,'u-',
+      Parser::BOP->new($equation,'^',
+        Parser::Function->new($equation,'csc',[$x]),
+        Parser::Number->new($equation,2)
+      )
+    );
+}
+ 
+sub Parser::Function::trig::D_sec {
+  my $self = shift; my $x = shift;
+  my $equation = $self->{equation};
+  return 
+    Parser::BOP->new($equation,'*',
+      Parser::Function->new($equation,'sec',[$x]),
+      Parser::Function->new($equation,'tan',[$x])
+    );
+}
+
+sub Parser::Function::trig::D_csc {
+  my $self = shift; my $x = shift;
+  my $equation = $self->{equation};
+  return
+    Parser::UOP->new($equation,'u-',
+      Parser::BOP->new($equation,'*',
+        Parser::Function->new($equation,'csc',[$x]),
+        Parser::Function->new($equation,'cot',[$x])
+      )
+    );
+}
+
+sub Parser::Function::trig::D_asin {
+  my $self = shift; my $x = shift;
+  my $equation = $self->{equation};
+  return
+    Parser::BOP->new($equation,'/',
+      Parser::Number->new($equation,1),
+      Parser::Function->new($equation,'sqrt',[
+        Parser::BOP->new($equation,'-',
+          Parser::Number->new($equation,1),
+          Parser::BOP->new($equation,'^',
+            $x,Parser::Number->new($equation,2)
+          )
+        )]
+      )
+    );
+}
+
+sub Parser::Function::trig::D_acos {
+  my $self = shift; my $x = shift;
+  my $equation = $self->{equation};
+  return
+    Parser::UOP->new($equation,'u-',
+      Parser::BOP->new($equation,'/',
+        Parser::Number->new($equation,1),
+        Parser::Function->new($equation,'sqrt',[
+          Parser::BOP->new($equation,'-',
+            Parser::Number->new($equation,1),
+            Parser::BOP->new($equation,'^',
+              $x,Parser::Number->new($equation,2)
+            )
+          )]
+        )
+      )
+    );
+}
+
+sub Parser::Function::trig::D_atan {
+  my $self = shift; my $x = shift;
+  my $equation = $self->{equation};
+  return
+    Parser::BOP->new($equation,'/',
+      Parser::Number->new($equation,1),
+      Parser::BOP->new($equation,'+',
+        Parser::Number->new($equation,1),
+        Parser::BOP->new($equation,'^',
+          $x, Parser::Number->new($equation,2)
+        )
+      )
+    );
+}
+
+sub Parser::Function::trig::D_acot {
+  my $self = shift; my $x = shift;
+  my $equation = $self->{equation};
+  return
+    Parser::UOP->new($equation,'u-',
+      Parser::BOP->new($equation,'/',
+        Parser::Number->new($equation,1),
+        Parser::BOP->new($equation,'+',
+          Parser::Number->new($equation,1),
+          Parser::BOP->new($equation,'^',
+            $x, Parser::Number->new($equation,2)
+          )
+        )
+      )
+    );
+}
+
+sub Parser::Function::trig::D_asec {
+  my $self = shift; my $x = shift;
+  my $equation = $self->{equation};
+  return
+    Parser::BOP->new($equation,'/',
+      Parser::Number->new($equation,1),
+      Parser::BOP->new($equation,'*',
+        Parser::Function->new($equation,'abs',[$x]),
+        Parser::Function->new($equation,'sqrt',[
+          Parser::BOP->new($equation,'-',
+            Parser::BOP->new($equation,'^',
+              $x, Parser::Number->new($equation,2)
+            ),
+            Parser::Number->new($equation,1)
+          )]
+        )
+      )
+    );
+}
+
+sub Parser::Function::trig::D_acsc {
+  my $self = shift; my $x = shift;
+  my $equation = $self->{equation};
+  return
+    Parser::UOP->new($equation,'u-',
+      Parser::BOP->new($equation,'/',
+        Parser::Number->new($equation,1),
+        Parser::BOP->new($equation,'*',
+          Parser::Function->new($equation,'abs',[$x]),
+          Parser::Function->new($equation,'sqrt',[
+            Parser::BOP->new($equation,'-',
+              Parser::BOP->new($equation,'^',
+                $x, Parser::Number->new($equation,2)
+              ),
+              Parser::Number->new($equation,1)
+            )]
+          )
+        )
+      )
+    );
+}
+
+
+#############################
+
+sub Parser::Function::hyperbolic::D {Parser::Function::D_chain(@_)}
+
+sub Parser::Function::hyperbolic::D_sinh {
+  my $self = shift; my $x = shift;
+  return Parser::Function->new($self->{equation},'cosh',[$x]);
+}
+
+sub Parser::Function::hyperbolic::D_cosh {
+  my $self = shift; my $x = shift;
+  return Parser::Function->new($self->{equation},'sinh',[$x]);
+}
+
+sub Parser::Function::hyperbolic::D_tanh {
+  my $self = shift; my $x = shift;
+  my $equation = $self->{equation};
+  return 
+    Parser::BOP->new($equation,'^',
+      Parser::Function->new($equation,'sech',[$x]),
+      Parser::Number->new($equation,2)
+    );
+}
+
+sub Parser::Function::hyperbolic::D_coth {
+  my $self = shift; my $x = shift;
+  my $equation = $self->{equation};
+  return 
+    Parser::UOP->new($equation,'u-',
+      Parser::BOP->new($equation,'^',
+        Parser::Function->new($equation,'csch',[$x]),
+        Parser::Number->new($equation,2)
+      )
+    );
+}
+ 
+sub Parser::Function::hyperbolic::D_sech {
+  my $self = shift; my $x = shift;
+  my $equation = $self->{equation};
+  return 
+    Parser::UOP->new($equation,'u-',
+      Parser::BOP->new($equation,'*',
+        Parser::Function->new($equation,'sech',[$x]),
+        Parser::Function->new($equation,'tanh',[$x])
+      )
+    );
+}
+
+sub Parser::Function::hyperbolic::D_csch {
+  my $self = shift; my $x = shift;
+  my $equation = $self->{equation};
+  return
+    Parser::UOP->new($equation,'u-',
+      Parser::BOP->new($equation,'*',
+        Parser::Function->new($equation,'csch',[$x]),
+        Parser::Function->new($equation,'coth',[$x])
+      )
+    );
+}
+
+sub Parser::Function::hyperbolic::D_asinh {
+  my $self = shift; my $x = shift;
+  my $equation = $self->{equation};
+  return
+    Parser::BOP->new($equation,'/',
+      Parser::Number->new($equation,1),
+      Parser::Function->new($equation,'sqrt',[
+        Parser::BOP->new($equation,'+',
+          Parser::Number->new($equation,1),
+          Parser::BOP->new($equation,'^',
+            $x, Parser::Number->new($equation,2)
+          )
+        )]
+      )
+    );
+}
+
+sub Parser::Function::hyperbolic::D_acosh {
+  my $self = shift; my $x = shift;
+  my $equation = $self->{equation};
+  return
+    Parser::BOP->new($equation,'/',
+      Parser::Number->new($equation,1),
+      Parser::Function->new($equation,'sqrt',[
+        Parser::BOP->new($equation,'-',
+          Parser::BOP->new($equation,'^',
+            $x, Parser::Number->new($equation,2)
+          ),
+          Parser::Number->new($equation,1)
+        )]
+      )
+    );
+}
+
+sub Parser::Function::hyperbolic::D_atanh {
+  my $self = shift; my $x = shift;
+  my $equation = $self->{equation};
+  return
+    Parser::BOP->new($equation,'/',
+      Parser::Number->new($equation,1),
+      Parser::BOP->new($equation,'-',
+        Parser::Number->new($equation,1),
+        Parser::BOP->new($equation,'^',
+          $x, Parser::Number->new($equation,2)
+        )
+      )
+    );
+}
+
+sub Parser::Function::hyperbolic::D_acoth {
+  my $self = shift; my $x = shift;
+  my $equation = $self->{equation};
+  return
+    Parser::BOP->new($equation,'/',
+      Parser::Number->new($equation,1),
+      Parser::BOP->new($equation,'-',
+        Parser::Number->new($equation,1),
+        Parser::BOP->new($equation,'^',
+          $x, Parser::Number->new($equation,2)
+        )
+      )
+    );
+}
+
+sub Parser::Function::hyperbolic::D_asech {
+  my $self = shift; my $x = shift;
+  my $equation = $self->{equation};
+  return
+    Parser::UOP->new($equation,'u-',
+      Parser::BOP->new($equation,'/',
+        Parser::Number->new($equation,1),
+        Parser::BOP->new($equation,'*',
+          $x,
+          Parser::Function->new($equation,'sqrt',[
+            Parser::BOP->new($equation,'-',
+              Parser::Number->new($equation,1),
+              Parser::BOP->new($equation,'^',
+                $x, Parser::Number->new($equation,2)
+              )
+            )]
+          )
+        )
+      )
+    );
+}
+
+sub Parser::Function::hyperbolic::D_acsch {
+  my $self = shift; my $x = shift;
+  my $equation = $self->{equation};
+  return
+    Parser::UOP->new($equation,'u-',
+      Parser::BOP->new($equation,'/',
+        Parser::Number->new($equation,1),
+        Parser::BOP->new($equation,'*',
+          Parser::Function->new($equation,'abs',[$x]),
+          Parser::Function->new($equation,'sqrt',[
+            Parser::BOP->new($equation,'+',
+              Parser::Number->new($equation,1),
+              Parser::BOP->new($equation,'^',
+                $x, Parser::Number->new($equation,2)
+              )
+            )]
+          )
+        )
+      )
+    );
+}
+
+
+#############################
+
+sub Parser::Function::numeric::D {Parser::Function::D_chain(@_)}
+
+sub Parser::Function::numeric::D_log {
+  my $self = shift; my $x = shift;
+  my $equation = $self->{equation};
+  return Parser::BOP->new($equation,'/',Parser::Number->new($equation,1),$x);
+}
+
+sub Parser::Function::numeric::D_log10 {
+  my $self = shift; my $x = shift;
+  my $equation = $self->{equation};
+  return
+    Parser::BOP->new($equation,'/',
+      Parser::Number->new($equation,1),
+      Parser::BOP->new($equation,'*',
+        Parser::Number->new($equation,CORE::log(10)), $x
+      )
+    );
+}
+
+sub Parser::Function::numeric::D_exp {
+  my $self = shift; my $x = shift;
+  return $self->copy();
+}
+
+sub Parser::Function::numeric::D_sqrt {
+  my $self = shift; my $x = shift;
+  my $equation = $self->{equation};
+  return
+    Parser::BOP->new($equation,'/',
+      Parser::Number->new($equation,1),
+      Parser::BOP->new($equation,'*',
+        Parser::Number->new($equation,2),
+        $self->copy
+      )
+    );
+}
+ 
+sub Parser::Function::numeric::D_abs {Parser::Function::D(@_)} 
+sub Parser::Function::numeric::D_int {Parser::Function::D(@_)} 
+sub Parser::Function::numeric::D_sgn {Parser::Function::D(@_)} 
+
+#########################################################################
+
+sub Parser::List::D {
+  my $self = shift; my $x = shift;
+  $self = $self->copy($self->{equation});
+  foreach my $f (@{$self->{coords}}) {$f = $f->D($x)}
+  return $self->reduce;
+}
+
+
+sub Parser::List::Interval::D {
+  my $self = shift;
+  $self->Error("Can't differentiate intervals",$self->{ref});
+}
+
+sub Parser::List::AbsoluteValue::D {
+  my $self = shift;
+  $self->Error("Can't differentiate absolute values",$self->{ref});
+}
+
+
+#########################################################################
+
+sub Parser::Number::D {Parser::Number->new(shift->{equation},0)}
+
+#########################################################################
+
+sub Parser::Complex::D {Parser::Number->new(shift->{equation},0)}
+
+#########################################################################
+
+sub Parser::Constant::D {Parser::Number->new(shift->{equation},0)}
+
+#########################################################################
+
+sub Parser::Value::D {
+  my $self = shift; my $x = shift; my $equation = $self->{equation};
+  return Parser::Value->new($equation,$self->{value}->D($x,$equation));
+}
+
+sub Value::D {
+  my $self = shift; my $x = shift; my $equation = shift;
+  return 0 if $self->isComplex;
+  my @coords = @{$self->{data}};
+  foreach my $n (@coords)
+    {if (ref($n) eq "") {$n = 0} else {$n = $n->D($x,$equation)->data}}
+  return $self->new([@coords]);
+}
+
+sub Value::List::D {
+  my $self = shift; my $x = shift; my $equation = shift;
+  my @coords = @{$self->{data}};
+  foreach my $n (@coords)
+    {if (ref($n) eq "") {$n = 0} else {$n = $n->D($x)}}
+  return $self->new([@coords]);
+}
+
+sub Value::Interval::D {
+  shift; shift; my $self = shift;
+  $self->Error("Can't differentiate intervals",$self->{ref});
+}
+
+sub Value::Union::D {
+  shift; shift; my $self = shift;
+  $self->Error("Can't differentiate unions",$self->{ref});
+}
+
+#########################################################################
+
+sub Parser::Variable::D {
+  my $self = shift; my $x = shift;
+  my $d = ($self->{name} eq $x)? 1: 0;
+  return Parser::Number->new($self->{equation},$d);
+}
+
+#########################################################################
+
+sub Parser::String::D {Parser::Number->new(shift->{equation},0)}
+
+#########################################################################
+
+package Parser::Differentiation;
+our $loaded = 1;
+
+#########################################################################
+
+1;
diff --git a/doc/parser/macros/parserTables.pl b/doc/parser/macros/parserTables.pl
new file mode 100644
index 0000000000..bd382392f6
--- /dev/null
+++ b/doc/parser/macros/parserTables.pl
@@ -0,0 +1,87 @@
+loadMacros("parserUtils.pl");
+
+#############################################
+#
+#  For Parser example tables:
+#
+
+$BTT = MODES(TeX=>'{\tt ', Latex2HTML => $bHTML.'<TT>'.$eHTML, HTML => '<TT>');
+$ETT = MODES(TeX=>'}', Latex2HTML => $bHTML.'</TT>'.$eHTML, HTML => '</TT>');
+
+$BC = MODES(
+  TeX=>'{\small\it ',
+  Latex2HTML => $bHTML.'<SMALL><I>'.$eHTML,
+  HTML => '<SMALL><I>'
+);
+$EC = MODES(
+  TeX=>'}',
+  Latex2HTML => $bHTML.'</I></SMALL>'.$eHTML,
+  HTML => '</I></SMALL>'
+);
+
+$LT = MODES(TeX => "<", Latex2HTML => "<", HTML => '&lt;');
+$GT = MODES(TeX => ">", Latex2HTML => ">", HTML => '&gt;');
+
+$TEX = MODES(TeX => '{\TeX}', HTML => 'TeX', HTML_dpng => '\(\bf\TeX\)');
+
+@rowOptions = (
+  indent => 0,
+  separation => 0,
+  align => 'LEFT" NOWRAP="1',  # alignment hack to get NOWRAP
+);
+
+sub ParserRow {
+  my $f = shift; my $t = '';
+  Context()->clearError;
+  my ($s,$err) = PG_restricted_eval($f);
+  if (defined $s) {
+    my $ss = $s;
+    if (ref($s) && \&{$s->string}) {
+      $t = '\('.$s->TeX.'\)';
+      $s = $s->string;
+    } elsif ($s !~ m/^[a-z]+$/i) {
+      $t = '\('.Formula($s)->TeX.'\)';
+      $s = Formula($s)->string;
+    }
+    $s =~ s/</$LT/g; $s =~ s/>/$GT/g;
+    if (ref($ss) && \&{$ss->class}) {
+      if ($ss->class eq 'Formula') {
+	$s .= ' '.$BC.'(Formula returning '.$ss->showType.')'.$EC;
+      } else {
+	$s .= ' '.$BC.'('.$ss->class.' object)'.$EC;
+      }
+    }
+  } else {
+    $s = $BC. (Context()->{error}{message} || $err) . $EC;
+    $t = '';
+  }
+  $f =~ s/</$LT/g; $f =~ s/>/$GT/g;
+  if ($displayMode eq 'TeX') {
+    $f =~ s/\^/\\char`\\^/g; $s =~ s/\^/\\char`\\^/g;
+    $f =~ s/#/\\#/g; $s =~ s/#/\\#/g;
+  }
+  my $row = Row([$BTT.$f.$ETT,$BTT.$s.$ETT,$t],@rowOptions);
+  $row =~ s/\$/\${DOLLAR}/g;
+  return $row;
+}
+
+sub ParserTable {
+  my $table = 
+    BeginTable(border=>1, padding=>20).
+      Row([$BBOLD."Perl Code".$EBOLD,
+           $BBOLD."Result".$EBOLD,
+           $BBOLD.$TEX.' version'.$EBOLD],@rowOptions);
+  foreach my $f (@_) {$table .= ParserRow($f)}
+  $table .= EndTable();
+  return $table;
+}
+
+sub Title {
+  my $title = shift;
+
+  MODES(
+    TeX => "\\par\\centerline{\\bf $title}\\par\\nobreak\n",
+    Latex2HTML => $bHTML.'<CENTER><H2>'.$title.'</H2></CENTER>'.$eHTML,
+    HTML => '<CENTER><H2>'.$title.'</H2></CENTER>'
+  );
+}
diff --git a/doc/parser/macros/parserUtils.pl b/doc/parser/macros/parserUtils.pl
new file mode 100644
index 0000000000..4db7dd5c4d
--- /dev/null
+++ b/doc/parser/macros/parserUtils.pl
@@ -0,0 +1,61 @@
+loadMacros(
+  "unionImage.pl",
+  "unionTables.pl",
+);
+
+$bHTML = '\begin{rawhtml}';
+$eHTML = '\end{rawhtml}';
+
+#  HTML(htmlcode)
+#  HTML(htmlcode,texcode)
+#
+#  Insert $html in HTML mode or \begin{rawhtml}$html\end{rawhtml} in
+#  Latex2HTML mode.  In TeX mode, insert nothing for the first form, and
+#  $tex for the second form.
+#
+sub HTML {
+  my ($html,$tex) = @_;
+  return('') unless (defined($html) && $html ne '');
+  $tex = '' unless (defined($tex));
+  MODES(TeX => $tex, Latex2HTML => $bHTML.$html.$eHTML, HTML => $html);
+}
+
+#
+#  Begin and end <TT> mode
+#
+$BTT = HTML('<TT>','\texttt{');
+$ETT = HTML('</TT>','}');
+
+#
+#  Begin and end <SMALL> mode
+#
+$BSMALL = HTML('<SMALL>','{\small ');
+$ESMALL = HTML('</SMALL>','}');
+
+#
+#  Block quotes
+#
+$BBLOCKQUOTE = HTML('<BLOCKQUOTE>','\hskip3em ');
+$EBLOCKQUOTE = HTML('</BLOCKQUOTE>');
+
+#
+#  Smart-quotes in TeX mode, regular quotes in HTML mode
+#
+$LQ = MODES(TeX => '``', Latex2HTML => '"', HTML => '"');
+$RQ = MODES(TeX => "''", Latex2HTML => '"', HTML => '"');
+
+#
+#  make sure all characters are displayed
+#
+sub protectHTML {
+    my $string = shift;
+    $string =~ s/&/\&amp;/g;
+    $string =~ s/</\&lt;/g;
+    $string =~ s/>/\&gt;/g;
+    $string;
+}
+
+sub _parserUtils_init {}
+
+1;
+
diff --git a/doc/parser/macros/unionImage.pl b/doc/parser/macros/unionImage.pl
new file mode 100644
index 0000000000..31162b76a3
--- /dev/null
+++ b/doc/parser/macros/unionImage.pl
@@ -0,0 +1,75 @@
+######################################################################
+#
+#  A routine to make including images easier to control
+#
+#  Usage:  Image(name,options)
+#
+#  where name is the name of an image file or a reference to a
+#  graphics object (or a reference to a pair of one of these),
+#  and options are taken from among the following:
+#
+#    size => [w,h]           the size of the image in the HTML page
+#                            (default is [150,150])
+#
+#    tex_size => r           the size to use in TeX mode (as a percentage
+#                            of the line width times 10).  E.g., 500 is 
+#                            half the width, etc.  (default is 200.)
+#
+#    link => 0 or 1          whether to include a link to the original
+#                            image (default is 0, unless there are
+#                            two images given)
+#
+#    border => 0 or 1        size of image border in HTML mode
+#                            (defaults to 2 or 1 depending on whether
+#                            there is a link or not)
+#
+#    align => placement      vertical alignment for image in HTML mode
+#                            (default is "BOTTOM")
+#
+#    tex_center => 0 or 1    whether to center the image horizontally
+#                            in TeX mode  (default is 0)
+#
+#  The image name can be one of a number of different things.  It can be
+#  the name of an image file, or an alias to one produce by the alias()
+#  command.  It can be a graphics object reference created by init_graph().
+#  Or it can be a pair of these (in square brackets).  The first is the
+#  image for the HTML file, and the second is the image that it will be
+#  linked to.
+#
+#  Examples:  Image("graph.gif", size => [200,200]);
+#             Image(["graph.gif","graph-large.gif"]);
+#
+#  The alias() and insertGraph() functions will be called automatically
+#  when needed.
+#
+sub Image {
+  my $image = shift; my $ilink;
+  my %options = (
+    size => [150,150], tex_size => 200,
+    link => 0, align => "BOTTOM", tex_center => 0, @_);
+  my ($w,$h) = @{$options{size}};
+  my ($ratio,$link) = ($options{tex_size}*(.001),$options{link});
+  my ($border,$align) = ($options{border},$options{align});
+  my ($tcenter) = $options{tex_center};
+  my $HTML; my $TeX;
+  ($image,$ilink) = @{$image} if (ref($image) eq "ARRAY");
+  $image = alias(insertGraph($image)) if (ref($image) eq "WWPlot");
+  $image = alias($image) unless ($image =~ m!^/!i);
+  if ($ilink) {
+    $ilink = alias(insertGraph($ilink)) if (ref($ilink) eq "WWPlot");
+    $ilink = alias($ilink) unless ($ilink =~ m!^/!i);
+  } else {$ilink = $image}
+  $border = (($link || $ilink ne $image)? 2: 1) unless defined($border);
+  $HTML = '<IMG SRC="'.$image.'" WIDTH="'.$w.
+          '" HEIGHT="'.$h.'" BORDER="'.$border.'" ALIGN="'.$align.'">';
+  $HTML = '<A HREF="'.$ilink.'">'.$HTML.'</A>' if $link or $ilink ne $image;
+  $TeX = '\includegraphics[width='.$ratio.'\linewidth]{'.$image.'}';
+  $TeX = '\centerline{'.$TeX.'}' if $tcenter;
+  MODES(
+    TeX => $TeX."\n",
+    Latex2HTML => $bHTML.$HTML.$eHTML,
+    HTML => $HTML
+  );
+}
+
+1;
diff --git a/doc/parser/macros/unionTables.pl b/doc/parser/macros/unionTables.pl
new file mode 100644
index 0000000000..8db8c8f46e
--- /dev/null
+++ b/doc/parser/macros/unionTables.pl
@@ -0,0 +1,253 @@
+######################################################################
+##
+##  Functions for creating tables of various kinds
+##
+##    ColumnTable()           Creates a two-column display in HTML,
+##                            but only one column in TeX.
+##
+##    ColumnMatchTable()      Does a side-by-side match table
+##
+##    BeginTable()            Begin a borderless HTML table
+##    Row()                   Create a row in the table
+##    AlignedRow()            Create a row with alignment in each column
+##    TableSpace()            Insert extra vertical space in the table
+##    EndTable()              End the table
+##
+
+######################################################################
+#
+#  Make a two-column table in HTML and Latex2HTML modes
+#
+#  Usage:  ColumnTable(col1,col2,[options])
+#
+#  Options can be taken from:
+#
+#      indent => n           the width to indent the first column
+#                            (default is 0)
+#
+#      separation => n       the width of the separating gutter
+#                            (default is 50)
+#
+#      valign => type        set the vertical alignment
+#                            (default is "MIDDLE")
+#
+sub ColumnTable {
+  my $col1 = shift; my $col2 = shift;
+  my %options = (indent => 0, separation => 50, valign => "MIDDLE", @_);
+  my ($ind,$sep) = ($options{"indent"},$options{"separation"});
+  my $valign = $options{"valign"};
+
+  my ($bhtml,$ehtml) = ('\begin{rawhtml}','\end{rawhtml}');
+  ($bhtml,$ehtml) = ('','') unless ($displayMode eq "Latex2HTML");
+
+  my $HTMLtable = qq {
+    $bhtml<TABLE BORDER="0"><TR VALIGN="$valign">
+    <TD WIDTH="$ind">&nbsp;</TD><TD>$ehtml
+    $col1
+    $bhtml</TD><TD WIDTH="$sep">&nbsp;</TD><TD>$ehtml
+    $col2
+    $bhtml</TD></TR></TABLE>$ehtml
+  };
+
+  MODES(
+    TeX => '\par\medskip\hbox{\qquad\vtop{'.
+	   '\advance\hsize by -3em '.$col1.'}}'.
+           '\medskip\hbox{\qquad\vtop{'.
+           '\advance\hsize by -3em '.$col2.'}}\medskip',
+    Latex2HTML => $HTMLtable,
+    HTML => $HTMLtable
+  );
+}
+
+#
+#  Use columns for a match-list output
+#
+#  Usage:  ColumnMatchTable($ml,options)
+#
+#  where $ml is a math list reference and options are those
+#  allowed for ColumnTable above.
+#
+sub ColumnMatchTable {
+  my $ml = shift;
+
+  ColumnTable($ml->print_q,$ml->print_a,@_);
+}
+
+
+#
+#  Command for tables with no borders.
+#
+#  Usage:  BeginTable(options);
+#
+#  Options are taken from:
+#
+#    border => n           value for BORDER attribute (default 0)
+#    spacing => n          value for CELLSPACING attribute (default 0)
+#    padding => n          value for CELLPADDING attribute (default 0)
+#    tex_spacing => dimen  value for spacing between columns in TeX
+#                          (e.g, tex_spacing => 2em) (default 1em)
+#    tex_border => dimen   value for left- and right border in TeX (0pt)
+#    center => 0 or 1      center table or not (default 1)
+#
+sub BeginTable {
+  my %options = (border => 0, padding => 0, spacing => 0, center => 1,
+                 tex_spacing => "1em", tex_border => "0pt", @_);
+  my ($bd,$pd,$sp) = ($options{border},$options{padding},$options{spacing});
+  my ($tsp,$tbd) = ($options{tex_spacing},$options{tex_border});
+  my ($center,$tcenter) = (' ALIGN="CENTER"','\centerline');
+     ($center,$tcenter) = ('','') if (!$options{center});
+  my $table = 
+    qq{<TABLE BORDER="$bd" CELLPADDING="$pd" CELLSPACING="$sp"$center>};
+
+  MODES(
+    TeX => '\par\medskip'.$tcenter.'{\kern '.$tbd.
+           '\vbox{\halign{#\hfil&&\kern '.$tsp.' #\hfil',
+    Latex2HTML => $bHTML.$table.$eHTML."\n",
+    HTML => $table."\n"
+  );
+}
+
+#
+#  Usage:  EndTable(options)
+#
+#  where options are taken from:
+#
+#     tex_border => dimen     extra vertical space in TeX mode (default 0pt)
+#
+sub EndTable {
+  my %options = (tex_border => "0pt", @_);
+  my $tbd = $options{tex_border};
+  MODES(
+    TeX => '\cr}}\kern '.$tbd.'}\medskip'."\n",
+    Latex2HTML => $bHTML.'</TABLE>'.$eHTML."\n",
+    HTML => '</TABLE>'."\n"
+  );
+}
+
+#
+#  Creates a row in the table
+#
+#  Usage:  Row([item1,item2,...],options);
+#
+#  Each item appears as a separate entry in the table.
+#
+#  Options control how the row is displayed:
+#
+#    indent => num           Specifies size of blank column on the left
+#                            (default:  indent => 0)
+#
+#    separation => num       Specifies separation of columns
+#                            (default:  spearation => 30)
+#
+#    align => "type"         Specifies alignment of initial column
+#                            (default:  align => "LEFT")
+#
+#    valign => "type"        Specified vertical alignment of row
+#                            (default:  valign => "MIDDLE")
+#
+sub Row {
+  my $rowref = shift; my @row = @{$rowref};
+  my %options = (
+     indent => 0, separation => 30,
+     align => "LEFT", valign => "MIDDLE",
+     @_
+  );
+  my ($cind,$csep) = ($options{indent},$options{separation});
+  my ($align,$valign) = ($options{align},$options{valign});
+  my $sep = '<TD WIDTH="'.$csep.'">&nbsp;</TD>'; $sep = '' if ($csep < 1);
+  my $ind = '<TD WIDTH="'.$cind.'">&nbsp;</TD>'; $ind = '' if ($cind < 1);
+  my $fill = '';
+  $fill = '\hfil' if (uc($align) eq "CENTER");
+  $fill = '\hfill' if (uc($align) eq "RIGHT");
+
+  MODES(
+    TeX => "\\cr\n". $fill . join('& ',@row),
+    Latex2HTML =>
+      $bHTML."<TR VALIGN=\"$valign\">$ind<TD ALIGN=\"$align\">".$eHTML .
+      join($bHTML."</TD>$sep<TD>".$eHTML,@row) .
+      $bHTML.'</TD></TR>'.$eHTML."\n",
+    HTML => "<TR VALIGN=\"$valign\">$ind<TD ALIGN=\"$align\">" .
+      join("</TD>$sep<TD>",@row) . '</TD></TR>'."\n"
+  );
+}
+
+#
+#  AlignedRow([item1,item2,...],options);
+#
+#  Options control how the row is displayed:
+#
+#    indent => num           Specifies size of blank column on the left
+#                            (default:  indent => 0)
+#
+#    separation => num       Specifies separation of columns
+#                            (default:  spearation => 30)
+#
+#    align => "type"         Specifies alignment of all columns
+#                            (default:  align => "CENTER")
+#
+#    valign => "type"        Specified vertical alignment of row
+#                            (default:  valign => "MIDDLE")
+#
+sub AlignedRow {
+  my $rowref = shift; my @row = @{$rowref};
+  my %options = (
+     indent => 0, separation => 30,
+     align => "CENTER", valign => "MIDDLE",
+     @_
+  );
+  my ($cind,$csep) = ($options{indent},$options{separation});
+  my ($align,$valign) = ($options{align},$options{valign});
+  my $sep = '<TD WIDTH="'.$csep.'">&nbsp;</TD>'; $sep = '' if ($csep < 1);
+  my $ind = '<TD WIDTH="'.$cind.'">&nbsp;</TD>'; $ind = '' if ($cind < 1);
+  my $fill = '';
+  $fill = '\hfil ' if (uc($align) eq "CENTER");
+  $fill = '\hfill ' if (uc($align) eq "RIGHT");
+
+  MODES(
+    TeX => "\\cr\n". $fill . join('&'.$fill,@row),
+    Latex2HTML =>
+      $bHTML."<TR VALIGN=\"$valign\">$ind<TD ALIGN=\"$align\">".$eHTML .
+      join($bHTML."</TD>$sep<TD ALIGN=\"$align\">".$eHTML,@row) .
+      $bHTML.'</TD></TR>'.$eHTML."\n",
+    HTML => "<TR VALIGN=\"$valign\">$ind<TD ALIGN=\"$align\">" .
+      join("</TD>$sep<TD ALIGN=\"$align\">",@row) . '</TD></TR>'."\n"
+  );
+}
+
+#
+#  Add extra space between rows of a table
+#
+#  Usage:  TableSpace(pixels,points)
+#
+#  where pixels is the number of pixels of space in HTML mode and
+#  points is the number of points to use in TeX mode.
+#
+sub TableSpace {
+  my $rsep = shift;
+  my $tsep = shift;
+  $rsep = $tsep if (defined($tsep) && $main::displayMode eq "TeX");
+  return "" if ($rsep < 1);
+  MODES(
+    TeX => '\vadjust{\kern '.$rsep.'pt}' . "\n",
+    Latex2HTML =>
+      $bHTML.'<TR><TD HEIGHT="'.$rsep.'"><!></TD></TR>'.$eHTML."\n",
+    HTML => '<TR><TD HEIGHT="'.$rsep.'"></TD></TR>'."\n",
+  );
+}
+
+#
+#  A horizontal rule within a table.  (Could have been a variable,
+#  but all the other table commands are subroutines, so kept it
+#  one to be consistent.)
+#
+sub TableLine {
+  MODES(
+    TeX => '\vadjust{\kern2pt\hrule\kern2pt}',
+    Latex2HTML => $bHTML.
+      '<TR><TD COLSPAN="10"><HR NOSHADE SIZE="1"></TD></TR>'.
+      $eHTML."\n",
+    HTML =>'<TR><TD COLSPAN="10"><HR NOSHADE SIZE="1"></TD></TR>'."\n"
+  );
+}
+
+1;
diff --git a/doc/parser/problems/sample01.pg b/doc/parser/problems/sample01.pg
new file mode 100644
index 0000000000..492f8fdb67
--- /dev/null
+++ b/doc/parser/problems/sample01.pg
@@ -0,0 +1,66 @@
+###########################################################
+#
+#  Example showing how to use the Parser to make
+#  a formula that you can evaluate and print in TeX form.
+#
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGbasicmacros.pl",
+  "PGanswermacros.pl",
+  "Parser.pl",
+);
+
+TEXT(beginproblem());
+
+###########################################################
+#
+#   Use  standard numeric mode
+#
+Context('Numeric');
+
+#
+#   Define some functions
+#
+$a = non_zero_random(-8,8,1);
+$b = random(1,8,1);
+
+@f = (
+    "1 + $a*x + $b x^2", 
+    "$a / (1 + $b x)",
+    "$a x^3 + $b",
+    "($a - x) / ($b + x^2)"
+);
+
+#
+#  Pick one at random
+#
+$k = random(0,$#f,1);
+$f = Formula($f[$k])->reduce;
+
+#
+#  Where to evaluate it
+#
+$x = random(-5,5,1);
+
+###########################################################
+#
+#  The problem text
+#
+BEGIN_TEXT
+
+If \(\displaystyle f(x) = \{$f->TeX\}\) then \(f($x)=\) \{ans_rule(10)\}.
+
+END_TEXT
+
+###########################################################
+#
+#  The answer
+#
+ANS(num_cmp($f->eval(x=>$x)));
+$showPartialCorrectAnswers = 1;
+
+###########################################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
\ No newline at end of file
diff --git a/doc/parser/problems/sample02.pg b/doc/parser/problems/sample02.pg
new file mode 100644
index 0000000000..c0cc938862
--- /dev/null
+++ b/doc/parser/problems/sample02.pg
@@ -0,0 +1,59 @@
+###########################################################
+#
+#  Example showing how you can use perl expressions (not
+#  just character strings) to generate formulas.
+#
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGbasicmacros.pl",
+  "PGanswermacros.pl",
+  "Parser.pl",
+);
+
+TEXT(beginproblem());
+
+###########################################################
+#
+#   Use  standard numeric mode
+#
+Context('Numeric');
+$x = Formula('x');  # used to construct formulas below.
+
+#
+#   Define a function and its derivative and make them pretty
+#
+$a = random(1,8,1);
+$b = random(-8,8,1);
+$c = random(-8,8,1);
+
+$f = ($a*$x**2 + $b*$x + $c) -> reduce;
+$df = (2*$a*$x + $b) -> reduce;
+
+$x = random(-8,8,1);
+
+###########################################################
+#
+#  The problem text
+#
+BEGIN_TEXT
+
+Suppose \(f(x) = \{$f->TeX\}\).
+$PAR
+Then \(f'(x)=\) \{ans_rule(20)\},$BR
+and \(f'($x)=\) \{ans_rule(20)\}.
+
+END_TEXT
+
+###########################################################
+#
+#  The answers
+#
+ANS(fun_cmp($df->string));
+ANS(num_cmp($df->eval(x=>$x)));
+$showPartialCorrectAnswers = 1;
+
+###########################################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/doc/parser/problems/sample03.pg b/doc/parser/problems/sample03.pg
new file mode 100644
index 0000000000..15fe482fe8
--- /dev/null
+++ b/doc/parser/problems/sample03.pg
@@ -0,0 +1,63 @@
+###########################################################
+#
+#  Example showing how to use the Parser's differentiation
+#  capabilities.
+#
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGbasicmacros.pl",
+  "PGanswermacros.pl",
+  "Parser.pl",
+  "Differentiation.pl",
+);
+
+TEXT(beginproblem());
+
+###########################################################
+#
+#   Use standard numeric mode
+#
+Context('Numeric');
+$x = Formula('x');  # used to construct formulas below.
+
+#
+#   Define a function and its derivative and make them pretty
+#
+$a = random(1,8,1);
+$b = random(-8,8,1);
+$c = random(-8,8,1);
+
+$f = ($a*$x**2 + $b*$x + $c) -> reduce;
+$df = $f->D('x');
+
+$x = random(-8,8,1);
+
+###########################################################
+#
+#  The problem text
+#
+BEGIN_TEXT
+
+Suppose \(f(x) = \{$f->TeX\}\).
+$PAR
+Then \(f'(x)=\) \{ans_rule(20)\},$BR
+and \(f'($x)=\) \{ans_rule(20)\}.
+$PAR
+(Same as previous problem, but using the formal differentiation package.
+Note that automatic differentiation does not always produce the simples form.)
+
+END_TEXT
+
+###########################################################
+#
+#  The answers
+#
+ANS(fun_cmp($df->string));
+ANS(num_cmp($df->eval(x=>$x)));
+$showPartialCorrectAnswers = 1;
+
+###########################################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/doc/parser/problems/sample04.pg b/doc/parser/problems/sample04.pg
new file mode 100644
index 0000000000..e325f1df9c
--- /dev/null
+++ b/doc/parser/problems/sample04.pg
@@ -0,0 +1,115 @@
+################################################################
+#
+#  Example showing how to use the Parser to create functions you
+#  can call from perl, to substitute values into a formula, and to
+#  convert a formula to a form that can be used in graphics generated
+#  on the fly.
+#
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PG.pl",
+  "PGbasicmacros.pl",
+  "PGanswermacros.pl",
+  "PGgraphmacros.pl",
+  "Parser.pl",
+  "parserUtils.pl",
+);
+
+TEXT(&beginproblem);
+
+##############################################
+#
+#  The setup
+#
+
+Context('Vector');
+Context()->variables->add(a => 'Real', b => 'Real');
+$a = non_zero_random(-4,-1,1);
+$b = non_zero_random(-3,3,1);
+
+#
+#  The function to plot
+#
+$f = Formula("ax^2 + by");     #  the function to display
+
+#
+#  Traces to show
+#
+$x = non_zero_random(-1,1,1);
+$y = non_zero_random(-1,1,1);
+
+#
+#  Graph domain and size
+#
+($xm,$xM) = (-2,2);
+($ym,$yM) = (-2,2);
+($zm,$zM) = (-5,5);
+$size = [200,300];
+$tex_size = 350;
+
+##############################################
+
+#
+#  The plot defaults
+#
+@Goptions = (
+  $ym,$zm,$yM,$zM,                            # dimensions of graph
+  axes => [0,0], grid => [$yM-$ym,$zM-$zm],   # number of grid lines
+  size => $size                               # pixel dimension
+);
+@imageoptions = (size=>$size, tex_size=>$tex_size);
+
+$xdomain  = "x in <$xm,$xM>";
+#$ydomain  = "y in <$ym,$yM>";  # plot_functions only handles variable x
+$ydomain  = "x in <$ym,$yM>";
+$plotoptions = "using color:red and weight:2";
+
+#
+#  Make the traces
+#
+$fx = $f->substitute(x=>$x, a=>$a, b=>$b, y=>'x')->reduce; # must have variable x
+$Gx = init_graph(@Goptions);
+plot_functions($Gx,"$fx for $ydomain $plotoptions");
+$Xtrace = Image($Gx,@imageoptions);
+
+$fy = $f->substitute(y=>$y, a=>$a, b=>$b)->reduce;
+$Gy = init_graph(@Goptions);
+plot_functions($Gy,"$fy for $xdomain $plotoptions");
+$Ytrace = Image($Gy,@imageoptions);
+
+#
+#  Make the table of images
+#
+@rowopts = (indent=>0, separation=>30);
+$Images = 
+  BeginTable().
+    AlignedRow([$Xtrace,$Ytrace], @rowopts).
+    AlignedRow(["Trace for \(x=$x\)","Trace for \(y=$y\)"], @rowopts).
+  EndTable();
+
+##############################################
+
+BEGIN_TEXT
+
+The graphs below are traces for a function \(f(x,y)\) at \(x=$x\) and 
+\(y=$y\).
+$PAR
+
+$Images
+$PAR
+
+If \(f(x,y) = \{$f->TeX\}\) then
+\(a\) = \{ans_rule(6)\} and \(b\) = \{ans_rule(6)\}.
+
+END_TEXT
+
+##################################################
+
+ANS(std_num_cmp($a));
+ANS(std_num_cmp($b));
+
+##################################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/doc/parser/problems/sample05.pg b/doc/parser/problems/sample05.pg
new file mode 100644
index 0000000000..ba69a452c4
--- /dev/null
+++ b/doc/parser/problems/sample05.pg
@@ -0,0 +1,139 @@
+################################################################
+#
+#  A more complex example showing how to use the Parser to create
+#  functions you can call from perl, to substitute values into a
+#  formula, and to convert a formula to a form that can be used in
+#  graphics generated on the fly.
+#
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGbasicmacros.pl",
+  "PGanswermacros.pl",
+  "PGgraphmacros.pl",
+  "PGauxiliaryFunctions.pl",
+  "Parser.pl",
+  "parserUtils.pl",
+);
+
+TEXT(&beginproblem);
+
+##############################################
+#
+#  The setup
+#
+
+Context('Vector');
+Context()->variables->add(a => 'Real', b => 'Real');
+
+$c = non_zero_random(-1,1,1);
+$a = $c*random(2,5,1)/2;
+$b = -$c*random(2,5,1)/2;
+
+#
+#  The function to plot
+#
+$f = Formula("a x^2 y + b x y^2");
+$f->substitute(a=>$a,b=>$b)->perlFunction('f');
+
+#
+#  Traces to show
+#
+$x1 = non_zero_random(-2,2,1); $x1 /= 2 if (abs($b) >= 2 && abs($x1) == 2);
+$x2 = non_zero_random(-2,2,1); $x2 /= 2 if (abs($a) >= 2 && abs($x2) == 2);
+
+$x = max(.5,min(3,round(-2*$b*$x2/$a)/2));
+$y = max(.5,min(3,round(-2*$a*$x1/$b)/2));
+
+#
+#  Points to show
+#
+$xv = round(-$b*$y/$a/2); $xv = 1 if ($xv == 0);
+$fxv = f($xv,$y); if (abs($fxv) < .75) {$xv = -$xv; $fxv = f($xv,$y)}
+
+$yv = round(-$a*$x/$b/2); $yv = -1 if ($yv == 0);
+$fyv = f($x,$yv); if (abs($fyv) < .75) {$yv = -$yv; $fyv = f($x,$yv)}
+
+$M = int(max(abs($fxv),abs($fyv),4))+1;
+#
+#  Graph size
+#
+($xm,$xM) = (-3,3);
+($ym,$yM) = (-3,3);
+($zm,$zM) = (-$M,$M);
+$size = [200,250];
+$tex_size = 350;
+
+##############################################
+
+#
+#  The plot defaults
+#
+@Goptions = (
+  $ym,$zm,$yM,$zM,                            # dimensions of graph
+  axes => [0,0], grid => [$yM-$ym,$zM-$zm],   # number of grid lines
+  size => $size                               # pixel dimension
+);
+@imageoptions = (size=>$size, tex_size=>$tex_size);
+
+$plotoptions = "using color:red and weight:2";
+
+#
+#  Make the traces
+#
+$fx = $f->substitute(x => x, a => $a, b => $b, y => 'x')->reduce;
+$Gx = init_graph(@Goptions);
+plot_functions($Gx,
+  "$fx for x in <$ym,$yv] $plotoptions",
+  "$fx for x in <$yv,$yM> $plotoptions",
+);
+$Xtrace = Image($Gx,@imageoptions);
+
+$fy = $f->substitute(y => $y, a => $a, b => $b)->reduce;
+$Gy = init_graph(@Goptions);
+plot_functions($Gy,
+  "$fy for x in <$xm,$xv] $plotoptions",
+  "$fy for x in <$xv,$xM> $plotoptions",
+);
+$Ytrace = Image($Gy,@imageoptions);
+
+Context()->texStrings;
+
+#
+#  Make the table of images
+#
+@rowopts = (indent=>0, separation=>30);
+$Images = 
+  BeginTable().
+    AlignedRow([$Xtrace,$Ytrace], @rowopts).
+    AlignedRow(["Trace for \(x=$x\) has","Trace for \(y=$y\) has"], @rowopts).
+    AlignedRow(["a point at \(($yv,$fyv)\).","a point at \(($xv,$fxv)\)."], @rowopts).
+  EndTable();
+
+##############################################
+
+BEGIN_TEXT
+
+The graphs below are traces for a function \(f(x,y)\) at \(x=$x\) and 
+\(y=$y\).
+$PAR
+
+$Images
+$PAR
+
+If \(f(x,y) = \{$f->TeX\}\) then
+\(a\) = \{ans_rule(6)\} and \(b\) = \{ans_rule(6)\}.
+
+END_TEXT
+
+Context()->normalStrings;
+
+##################################################
+
+ANS(std_num_cmp($a));
+ANS(std_num_cmp($b));
+
+##################################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/doc/parser/problems/sample06.pg b/doc/parser/problems/sample06.pg
new file mode 100644
index 0000000000..a15ea0b2c1
--- /dev/null
+++ b/doc/parser/problems/sample06.pg
@@ -0,0 +1,55 @@
+###########################################################
+#
+#  Example showing how to use the Parser to make
+#  a formula that you can evaluate and print in TeX form.
+#
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGbasicmacros.pl",
+  "PGanswermacros.pl",
+  "Parser.pl",
+);
+
+TEXT(beginproblem());
+
+###########################################################
+#
+#   The setup
+#
+Context('Vector');
+
+#
+#   Define a vector
+#
+$a = non_zero_random(-8,8,1);
+$b = non_zero_random(-8,8,1);
+$c = non_zero_random(-8,8,1);
+
+$V = $a*i + $b*j + $c*k;  # equivalently: $V = Vector($a,$b,$c);
+
+###########################################################
+#
+#  The problem text
+#
+
+Context()->texStrings;
+BEGIN_TEXT
+
+The length of the vector \($V\) is \{ans_rule(20)\}.
+
+END_TEXT
+Context()->normalStrings;
+
+###########################################################
+#
+#  The answer
+#
+
+ANS(num_cmp(norm($V)->value));  # easier:  ANS($V->cmp)
+$showPartialCorrectAnswers = 1;
+
+###########################################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/doc/parser/problems/sample07.pg b/doc/parser/problems/sample07.pg
new file mode 100644
index 0000000000..cacfc7d25e
--- /dev/null
+++ b/doc/parser/problems/sample07.pg
@@ -0,0 +1,51 @@
+##########################################################
+#
+#  Example showing how to use the built-in answer checker for parsed values.
+#
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGbasicmacros.pl",
+  "PGanswermacros.pl",
+  "Parser.pl",
+);
+
+TEXT(beginproblem());
+
+##########################################################
+#
+#  The setup
+#
+
+Context('Numeric');
+
+$a = Real(random(2,6,1));
+$b = Real(random($a+1,$a+8,1));
+
+$c = sqrt($a**2 + $b**2);  # still a Real object
+
+##########################################################
+#
+#  The problem text
+#
+
+Context()->texStrings;
+BEGIN_TEXT
+
+Suppose the legs of a triangle are of length \($a\) and \($b\).$BR
+Then the hypoteneuse is of length \{ans_rule(20)\}.
+
+END_TEXT
+Context()->normalStrings();
+
+###########################################################
+#
+#  The answer
+#
+
+ANS($c->cmp);
+
+###########################################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/doc/parser/problems/sample08.pg b/doc/parser/problems/sample08.pg
new file mode 100644
index 0000000000..42e7f332ec
--- /dev/null
+++ b/doc/parser/problems/sample08.pg
@@ -0,0 +1,51 @@
+##########################################################
+#
+#  Example showing how to use the built-in answer checker for parsed values.
+#
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGbasicmacros.pl",
+  "PGanswermacros.pl",
+  "Parser.pl",
+);
+
+TEXT(beginproblem());
+
+##########################################################
+#
+#  The setup
+#
+
+Context('Complex');
+
+$z = random(-5,5,1) + non_zero_random(-5,5,1)*i;
+
+$f = Formula('z^2 + 2z - 1');
+$fz = $f->eval(z => $z);
+
+##########################################################
+#
+#  The problem text
+#
+
+Context()->texStrings;
+BEGIN_TEXT
+
+Suppose \(f(z) = $f\).$BR
+Then \(f($z)\) = \{ans_rule(20)\}.
+
+END_TEXT
+Context()->normalStrings;
+
+###########################################################
+#
+#  The answer
+#
+
+ANS($fz->cmp);
+
+###########################################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/doc/parser/problems/sample09.pg b/doc/parser/problems/sample09.pg
new file mode 100644
index 0000000000..dbf228f5c2
--- /dev/null
+++ b/doc/parser/problems/sample09.pg
@@ -0,0 +1,51 @@
+##########################################################
+#
+#  Example showing how to use the built-in answer checker for parsed values.
+#
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGbasicmacros.pl",
+  "PGanswermacros.pl",
+  "Parser.pl",
+);
+
+TEXT(beginproblem());
+
+##########################################################
+#
+#  The setup
+#
+
+Context('Vector');
+
+$P1 = Point(-2,4,2);
+$P2 = Point(2,-3,1);
+
+$M = ($P1+$P2)/2;
+
+##########################################################
+#
+#  The problem text
+#
+
+Context()->texStrings;
+BEGIN_TEXT
+
+The midpoint of the line segment from \($P1\) to \($P2\)
+is \{ans_rule(20)\}.
+
+END_TEXT
+Context()->normalStrings;
+
+###########################################################
+#
+#  The answer
+#
+
+ANS($M->cmp);
+
+###########################################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/doc/parser/problems/sample10.pg b/doc/parser/problems/sample10.pg
new file mode 100644
index 0000000000..b63e9e9d92
--- /dev/null
+++ b/doc/parser/problems/sample10.pg
@@ -0,0 +1,56 @@
+##########################################################
+#
+#  Example showing how to use the built-in answer checker for parsed values.
+#
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGbasicmacros.pl",
+  "PGanswermacros.pl",
+  "Parser.pl",
+);
+
+TEXT(beginproblem());
+
+##########################################################
+#
+#  The setup
+#
+
+Context('Vector');
+
+$P1 = Point(1,random(-3,3,1),random(-3,3,1));
+$P2 = Point(random(-3,3,1),4,random(-3,3,1));
+
+$V = Vector($P2-$P1);
+
+Context()->flags->set(ijk=>0);
+Context()->constants->add(a=>1,b=>1,c=>1);
+
+$ABC = Formula("<a,b,c>");
+
+##########################################################
+#
+#  The problem text
+#
+
+Context()->texStrings;
+BEGIN_TEXT
+The vector from \($P1\) to \($P2\)  is \{ans_rule(20)\}.
+$PAR
+You can use either \($ABC\) or \(\{$ABC->ijk\}\) notation,$BR
+and can perform vector operations to produce your answer.
+END_TEXT
+Context()->normalStrings;
+
+###########################################################
+#
+#  The answer
+#
+
+ANS($V->cmp(promotePoints=>1));  #  allow answers to be points or vectors
+
+###########################################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/doc/parser/problems/sample11.pg b/doc/parser/problems/sample11.pg
new file mode 100644
index 0000000000..1e1c8514a0
--- /dev/null
+++ b/doc/parser/problems/sample11.pg
@@ -0,0 +1,50 @@
+##########################################################
+#
+#  Example showing how to use the built-in answer checker for parsed values.
+#
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGbasicmacros.pl",
+  "PGanswermacros.pl",
+  "Parser.pl",
+);
+
+TEXT(beginproblem());
+
+##########################################################
+#
+#  The setup
+#
+
+Context('Interval');
+
+$p1 = random(-5,2,1);
+$p2 = random($p1+1,$p1+7,1);
+
+$f = Formula("x^2 - ($p1+$p2) x + $p1*$p2")->reduce;
+$I = Interval("($p1,$p2)");
+
+##########################################################
+#
+#  The problem text
+#
+
+Context()->texStrings;
+BEGIN_TEXT
+The function \(f(x) = $f\) is negative for values of \(x\) in the interval
+\{ans_rule(20)\}.
+END_TEXT
+Context()->normalStrings;
+
+###########################################################
+#
+#  The answer
+#
+
+ANS($I->cmp);
+
+###########################################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/doc/parser/problems/sample12.pg b/doc/parser/problems/sample12.pg
new file mode 100644
index 0000000000..db981a1a7d
--- /dev/null
+++ b/doc/parser/problems/sample12.pg
@@ -0,0 +1,62 @@
+##########################################################
+#
+#  Example showing how to use the built-in answer checker for parsed values.
+#
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGbasicmacros.pl",
+  "PGanswermacros.pl",
+  "Parser.pl",
+  "parserUtils.pl",
+);
+
+TEXT(beginproblem());
+
+##########################################################
+#
+#  The setup
+#
+
+Context("Interval");
+
+$a = non_zero_random(-5,5,1);
+$f = Formula("(x^2+1)/(x-$a)")->reduce;
+$R = Union("(-inf,$a) U ($a,inf)");
+
+##########################################################
+#
+#  The problem text
+#
+
+Context()->texStrings;
+BEGIN_TEXT
+
+Suppose \(\displaystyle f(x) = $f\).
+$PAR
+Then \(f\) is defined on the region \{ans_rule(30)\}.
+$PAR
+${BCENTER}
+${BSMALL}
+Several intervals can be combined using the
+set union symbol, ${LQ}${BTT}U${ETT}${RQ}.$BR
+Use ${LQ}${BTT}infinity${ETT}${RQ} for ${LQ}\(\infty\)${RQ} and
+${LQ}${BTT}-infinity${ETT}${RQ} for ${LQ}\(-\infty\)${RQ}.
+${ESMALL}
+${ECENTER}
+
+END_TEXT
+Context()->normalStrings;
+
+###########################################################
+#
+#  The answer
+#
+
+ANS($R->cmp);
+$showPartialCorrectAnswers=1;
+
+###########################################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/doc/parser/problems/sample13.pg b/doc/parser/problems/sample13.pg
new file mode 100644
index 0000000000..53d7e09671
--- /dev/null
+++ b/doc/parser/problems/sample13.pg
@@ -0,0 +1,61 @@
+##########################################################
+#
+#  Example showing how to use the built-in answer checker for parsed values.
+#
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGbasicmacros.pl",
+  "PGanswermacros.pl",
+  "Parser.pl",
+  "parserUtils.pl",
+);
+
+TEXT(beginproblem());
+
+##########################################################
+#
+#  The setup
+#
+
+Context("Interval");
+
+$a = non_zero_random(-5,5,1);
+$f = Formula("(x^2+1)/(x-$a)")->reduce;
+$R = Compute("(-inf,$a),($a,inf)");
+
+##########################################################
+#
+#  The problem text
+#
+
+Context()->texStrings;
+BEGIN_TEXT
+
+Suppose \(\displaystyle f(x) = $f\).
+$PAR
+Then \(f\) is defined on the intervals \{ans_rule(30)\}.
+$PAR
+${BCENTER}
+${BSMALL}
+To enter more than one interval, separate them by commas.$BR
+Use ${LQ}${BTT}infinity${ETT}${RQ} for ${LQ}\(\infty\)${RQ} and
+${LQ}${BTT}-infinity${ETT}${RQ} for ${LQ}\(-\infty\)${RQ}.
+${ESMALL}
+${ECENTER}
+
+END_TEXT
+Context()->normalStrings;
+
+###########################################################
+#
+#  The answer
+#
+
+ANS($R->cmp);
+$showPartialCorrectAnswers = 1;
+
+###########################################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/doc/parser/problems/sample14.pg b/doc/parser/problems/sample14.pg
new file mode 100644
index 0000000000..fbe0f9dd42
--- /dev/null
+++ b/doc/parser/problems/sample14.pg
@@ -0,0 +1,59 @@
+##########################################################
+#
+#  Example showing how to use the built-in answer checker for parsed values.
+#
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGbasicmacros.pl",
+  "PGanswermacros.pl",
+  "Parser.pl",
+  "parserUtils.pl",
+);
+
+TEXT(beginproblem());
+
+##########################################################
+#
+#  The setup
+#
+
+Context("Numeric");
+
+$a = random(1,5,1);
+$f = Formula("(x^2+1)/(x^2-$a^2)")->reduce;
+
+##########################################################
+#
+#  The problem text
+#
+
+Context()->texStrings;
+BEGIN_TEXT
+
+Suppose \(\displaystyle f(x) = $f\).
+$PAR
+Then \(f\) is defined for all \(x\) except for \{ans_rule(30)\}.
+$PAR
+${BCENTER}
+${BSMALL}
+To enter more than one value, separate them by commas.$BR
+Enter ${LQ}${BTT}NONE${ETT}${RQ} if there are no such values.
+${ESMALL}
+${ECENTER}
+
+END_TEXT
+Context()->normalStrings;
+
+###########################################################
+#
+#  The answer
+#
+
+ANS(List($a,-$a)->cmp);
+$showPartialCorrectAnswers = 1;
+
+###########################################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/doc/parser/problems/sample15.pg b/doc/parser/problems/sample15.pg
new file mode 100644
index 0000000000..2bb48e6140
--- /dev/null
+++ b/doc/parser/problems/sample15.pg
@@ -0,0 +1,59 @@
+##########################################################
+#
+#  Example showing how to use the built-in answer checker for parsed values.
+#
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGbasicmacros.pl",
+  "PGanswermacros.pl",
+  "Parser.pl",
+  "parserUtils.pl",
+);
+
+TEXT(beginproblem());
+
+##########################################################
+#
+#  The setup
+#
+
+Context("Numeric");
+
+$a = random(1,5,1);
+$f = Formula("(x^2-$a)/(x^2+$a)");
+
+##########################################################
+#
+#  The problem text
+#
+
+Context()->texStrings;
+BEGIN_TEXT
+
+Suppose \(\displaystyle f(x) = $f\).
+$PAR
+Then \(f\) is defined for all \(x\) except for \{ans_rule(30)\}.
+$PAR
+${BCENTER}
+${BSMALL}
+To enter more than one value, separate them by commas.$BR
+Enter ${LQ}${BTT}NONE${ETT}${RQ} if there are no such values.
+${ESMALL}
+${ECENTER}
+
+END_TEXT
+Context()->normalStrings;
+
+###########################################################
+#
+#  The answer
+#
+
+ANS(List("NONE")->cmp);
+$showPartialCorrectAnswers = 1;
+
+###########################################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/doc/parser/problems/sample16.pg b/doc/parser/problems/sample16.pg
new file mode 100644
index 0000000000..f81d89d65e
--- /dev/null
+++ b/doc/parser/problems/sample16.pg
@@ -0,0 +1,63 @@
+###########################################################
+#
+#  Example showing how to use the Parser's function
+#  answer checker.
+#
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGbasicmacros.pl",
+  "PGanswermacros.pl",
+  "Parser.pl",
+  "Differentiation.pl",
+);
+
+TEXT(beginproblem());
+
+###########################################################
+#
+#   The setup
+#
+Context('Numeric');
+$x = Formula('x');  # used to construct formulas below.
+
+#
+#   Define a function and its derivative and make them pretty
+#
+$a = random(1,8,1);
+$b = random(-8,8,1);
+$c = random(-8,8,1);
+
+$f = ($a*$x**2 + $b*$x + $c) -> reduce;
+$df = $f->D('x');
+
+$x = random(-8,8,1);
+
+###########################################################
+#
+#  The problem text
+#
+
+Context()->texStrings;
+BEGIN_TEXT
+
+Suppose \(f(x) = $f\).
+$PAR
+Then \(f'(x)=\) \{ans_rule(20)\},$BR
+and \(f'($x)=\) \{ans_rule(20)\}.
+
+END_TEXT
+Context()->normalStrings;
+
+###########################################################
+#
+#  The answers
+#
+ANS($df->cmp);
+ANS($df->eval(x=>$x)->cmp);
+$showPartialCorrectAnswers = 1;
+
+###########################################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/doc/parser/problems/sample17.pg b/doc/parser/problems/sample17.pg
new file mode 100644
index 0000000000..710f801a6c
--- /dev/null
+++ b/doc/parser/problems/sample17.pg
@@ -0,0 +1,64 @@
+###########################################################
+#
+#  Example showing how to use the Parser's function
+#  answer checker.
+#
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGbasicmacros.pl",
+  "PGanswermacros.pl",
+  "Parser.pl",
+  "Differentiation.pl",
+);
+
+TEXT(beginproblem());
+
+###########################################################
+#
+#   The setup
+#
+Context('Numeric')->variables->add(y=>'Real');
+$x = Formula('x');  # used to construct formulas below.
+$y = Formula('y');
+
+#
+#   Define a function and its derivative and make them pretty
+#
+$a = random(1,8,1);
+$b = random(-8,8,1);
+$c = random(-8,8,1);
+
+$f = ($a*$x**2 + $b*$x*$y + $c*$y**2) -> reduce;
+$fx = $f->D('x');
+$fy = $f->D('y');
+
+###########################################################
+#
+#  The problem text
+#
+
+Context()->texStrings;
+BEGIN_TEXT
+
+Suppose \(f(x,y) = $f\).
+$PAR
+Then \(f_x(x,y) =\) \{ans_rule(30)\},$BR
+and \(f_y(x,y) =\) \{ans_rule(30)\}.
+
+
+END_TEXT
+Context()->normalStrings;
+
+###########################################################
+#
+#  The answers
+#
+ANS($fx->cmp);
+ANS($fy->cmp);
+$showPartialCorrectAnswers = 1;
+
+###########################################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/doc/parser/problems/sample18.pg b/doc/parser/problems/sample18.pg
new file mode 100644
index 0000000000..1321ea31f6
--- /dev/null
+++ b/doc/parser/problems/sample18.pg
@@ -0,0 +1,63 @@
+###########################################################
+#
+#  Example showing how to use the Parser's function
+#  answer checker.
+#
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGbasicmacros.pl",
+  "PGanswermacros.pl",
+  "Parser.pl",
+  "Differentiation.pl",
+);
+
+TEXT(beginproblem());
+
+###########################################################
+#
+#   The setup
+#
+Context('Vector')->variables->are(t=>'Real');
+
+#
+#   Define a function and its derivative and make them pretty
+#
+$a = random(1,8,1);
+$b = random(-8,8,1);
+$c = random(-8,8,1);
+
+$f = Formula("<t^2,$at+$b,$c-t>") -> reduce;
+$df = $f->D('t');
+
+$t = random(-5,5,1);
+
+###########################################################
+#
+#  The problem text
+#
+
+Context()->texStrings;
+BEGIN_TEXT
+
+Suppose \(f(t) = $f\).
+$PAR
+Then \(f'(t) =\) \{ans_rule(20)\},$BR
+and \(f'($t) =\) \{ans_rule(20)\}.
+
+
+END_TEXT
+Context()->normalStrings;
+
+###########################################################
+#
+#  The answers
+#
+ANS($df->cmp);
+ANS($df->eval(t=>$t)->cmp);
+$showPartialCorrectAnswers = 1;
+
+###########################################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/doc/parser/problems/sample19.pg b/doc/parser/problems/sample19.pg
new file mode 100644
index 0000000000..3b29af6e59
--- /dev/null
+++ b/doc/parser/problems/sample19.pg
@@ -0,0 +1,67 @@
+###########################################################
+#
+#  Example showing how to use the Parser's function
+#  answer checker.
+#
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGbasicmacros.pl",
+  "PGanswermacros.pl",
+  "Parser.pl",
+  "parserUtils.pl",
+);
+
+TEXT(beginproblem());
+
+###########################################################
+#
+#   The setup
+#
+Context('Interval')->variables->add(a=>'Real');
+$x = Formula('x'); $a = Formula('a');
+
+$f = log($x-$a);
+$I = Formula("(-infinity,a]");
+
+###########################################################
+#
+#  The problem text
+#
+
+Context()->texStrings;
+BEGIN_TEXT
+
+Suppose \(f(x) = $f\).
+$PAR
+Then \(f\) is undefined for \(x\) in the interval(s)
+\{ans_rule(20)\}.
+$PAR
+${BCENTER}
+${BSMALL}
+To enter more than one interval, separate them by commas.$BR
+Use ${LQ}${BTT}infinity${ETT}${RQ} for ${LQ}\(\infty\)${RQ} and
+${LQ}${BTT}-infinity${ETT}${RQ} for ${LQ}\(-\infty\)${RQ}.$BR
+Enter ${LQ}${BTT}NONE${ETT}${RQ} if the function is always defined.
+${ESMALL}
+${ECENTER}
+
+END_TEXT
+Context()->normalStrings;
+
+###########################################################
+#
+#  The answers
+#
+ANS(List($I)->cmp(
+  list_type  => 'a list of intervals',  # override these names to avoid
+  entry_type => "an interval",          # 'formula returning ...' messages
+));
+Context()->variables->remove('x'); # error if 'x' is used in answer
+
+$showPartialCorrectAnswers = 1;
+
+###########################################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/doc/parser/problems/sample20.pg b/doc/parser/problems/sample20.pg
new file mode 100644
index 0000000000..bfe6b74f6b
--- /dev/null
+++ b/doc/parser/problems/sample20.pg
@@ -0,0 +1,62 @@
+###########################################################
+#
+#  Example showing how to use the Parser's function
+#  answer checker.
+#
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGbasicmacros.pl",
+  "PGanswermacros.pl",
+  "Parser.pl",
+);
+
+TEXT(beginproblem());
+
+###########################################################
+#
+#   The setup
+#
+Context('Numeric')->variables->are(
+  x=>'Real',y=>'Real',
+  s=>'Real',t=>'Real'
+);
+$x = Formula('x'); $y = Formula('y');
+
+$a = random(1,5,1);
+$b = random(-5,5,1);
+$c = random(-5,5,1);
+
+$f = ($a*$x**2 + $b*$x*$y + $c*$y**2) -> reduce;
+
+$x = random(-5,5,1);
+$y = random(-5,5,1);
+
+###########################################################
+#
+#  The problem text
+#
+
+Context()->texStrings;
+BEGIN_TEXT
+
+Suppose \(f(x) = $f\).
+$PAR
+Then \(f($x,$y)\) = \{ans_rule(20)\},$BR
+and \(f(s+t,s-t)\) = \{ans_rule(30)\}.
+
+END_TEXT
+Context()->normalStrings;
+
+###########################################################
+#
+#  The answers
+#
+ANS($f->eval(x=>$x,y=>$y)->cmp);
+ANS($f->substitute(x=>'s+t',y=>'s-t')->cmp);
+$showPartialCorrectAnswers = 1;
+
+###########################################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/doc/parser/problems/sample21.pg b/doc/parser/problems/sample21.pg
new file mode 100644
index 0000000000..0a7d71addf
--- /dev/null
+++ b/doc/parser/problems/sample21.pg
@@ -0,0 +1,64 @@
+###########################################################
+#
+#  Example showing how to use the Parser's function
+#  answer checker.
+#
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGbasicmacros.pl",
+  "PGanswermacros.pl",
+  "Parser.pl",
+  "parserUtils.pl",
+);
+
+TEXT(beginproblem());
+
+###########################################################
+#
+#   The setup
+#
+Context('Vector')->variables->are(x=>'Real',y=>'Real');
+$x = Formula('x'); $y = Formula('y');
+
+$a = random(1,16,1);
+$b = non_zero_random(-5,5,1);
+
+$f = ($x**2 + $a*$y**2 + $b*$x**2*$y) -> reduce;
+
+$x = sqrt(2*$a)/$b; $y = -1/$b;
+
+###########################################################
+#
+#  The problem text
+#
+
+Context()->texStrings;
+BEGIN_TEXT
+
+Suppose \(f(x,y) = $f\).
+$PAR
+Then \(f\) has critical points at the following
+points: \{ans_rule(30)\}.
+$PAR
+${BCENTER}
+${BSMALL}
+To enter more than one point, separate them by commas.$BR
+Enter ${LQ}${BTT}NONE${ETT}${RQ} if there are none.
+${ESMALL}
+${ECENTER}
+
+END_TEXT
+Context()->normalStrings;
+
+###########################################################
+#
+#  The answers
+#
+ANS(List(Point(0,0),Point($x,$y),Point(-$x,$y))->cmp);
+$showPartialCorrectAnswers = 1;
+
+###########################################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
diff --git a/doc/parser/problems/sample22.pg b/doc/parser/problems/sample22.pg
new file mode 100644
index 0000000000..2074914724
--- /dev/null
+++ b/doc/parser/problems/sample22.pg
@@ -0,0 +1,60 @@
+###########################################################
+#
+#  Example showing how to use the Parser's function
+#  answer checker.
+#
+
+DOCUMENT();        # This should be the first executable line in the problem.
+
+loadMacros(
+  "PGbasicmacros.pl",
+  "PGanswermacros.pl",
+  "Parser.pl",
+  "parserUtils.pl",
+);
+
+TEXT(beginproblem());
+
+###########################################################
+#
+#   The setup
+#
+$context = Context('Vector');
+$context->variables->are(t=>'Real');
+$context->constants->add(
+  p0 => Point(pi,sqrt(2),3/exp(1)),
+  v => Vector(exp(1),log(10),-(pi**2)),
+);
+$context->constants->set(v => {TeX => '\boldsymbol{v}'}); # make it print nicer
+
+$L = Formula("p0+tv");
+$v = Formula('v');
+
+###########################################################
+#
+#  The problem text
+#
+
+Context()->texStrings;
+BEGIN_TEXT
+
+Suppose \(p_0\) is a point and \($v\) a vector in \(n\)-space.
+$PAR
+Then the vector-parametric form for the line through \(p_0\) in the
+direction of \(v\) is$PAR
+${BBLOCKQUOTE}
+\(L(t)\) = \{ans_rule(30)\}.
+${EBLOCKQUOTE}
+
+END_TEXT
+Context()->normalStrings;
+
+###########################################################
+#
+#  The answers
+#
+ANS($L->cmp);
+
+###########################################################
+
+ENDDOCUMENT();        # This should be the last executable line in the problem.
\ No newline at end of file
diff --git a/doc/webwork2.0pr1-errata b/doc/webwork2.0pr1-errata
deleted file mode 100644
index 1b7980141e..0000000000
--- a/doc/webwork2.0pr1-errata
+++ /dev/null
@@ -1,10 +0,0 @@
-The location of the documentation about what to add to your Apache config is
-non-obvious.  It is located in lib/Apache/WeBWorK.pm.
-
-The Apache config documentation is missing the line
-	use lib '/opt/webwork/pglib';
-which should immediately follow the line
-	use lib '/opt/webwork/lib';
-	
-Line 86 of the file lib/WeBWorK/ContentGenerator/ProblemSet.pm should read
-	my $effectiveUser = $cldb->getUser($r->param("effectiveUser"));
diff --git a/htdocs/ASCIIMathML/ASCIIMathML.js b/htdocs/ASCIIMathML/ASCIIMathML.js
new file mode 100644
index 0000000000..a35f58f92c
--- /dev/null
+++ b/htdocs/ASCIIMathML/ASCIIMathML.js
@@ -0,0 +1,673 @@
+/*
+ASCIIMathML.js
+==============
+This file contains JavaScript functions to convert ASCII math notation
+to Presentation MathML. The conversion is done while the XHTML page 
+loads, and should work with Internet Explorer 6 + MathPlayer 
+(http://www.dessci.com/en/products/mathplayer/) and Mozilla/Netscape 7+.
+This is a convenient and inexpensive solution for authoring MathML.
+
+Version 1.3 Apr 6 2004, (c) Peter Jipsen http://www.chapman.edu/~jipsen
+Latest version at http://www.chapman.edu/~jipsen/mathml/ASCIIMathML.js
+If you use it on a webpage, please send the URL to jipsen@chapman.edu
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or (at
+your option) any later version.
+
+This program is distributed in the hope that it will be useful, 
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License (at http://www.gnu.org/copyleft/gpl.html) 
+for more details.
+*/
+
+mathcolor = "Red"; // change it to Black or any other preferred color
+displaystyle = true; // puts limits above and below large operators
+separatetokens = false;//if true, letter tokens must be separated by nonletters
+doubleblankmathdelimiter = false; // if true,  x+1  is equal to `x+1`
+                                  // for IE this works only in <!--   -->
+if (document.getElementById==null) 
+  alert("This webpage requires a recent browser such as\
+\nMozilla/Netscape 7+ or Internet Explorer 6+MathPlayer")
+
+isIE = document.createElementNS==null;
+
+// character lists for Mozilla/Netscape fonts
+cal = [0xEF35,0x212C,0xEF36,0xEF37,0x2130,0x2131,0xEF38,0x210B,0x2110,0xEF39,0xEF3A,0x2112,0x2133,0xEF3B,0xEF3C,0xEF3D,0xEF3E,0x211B,0xEF3F,0xEF40,0xEF41,0xEF42,0xEF43,0xEF44,0xEF45,0xEF46];
+frk = [0xEF5D,0xEF5E,0x212D,0xEF5F,0xEF60,0xEF61,0xEF62,0x210C,0x2111,0xEF63,0xEF64,0xEF65,0xEF66,0xEF67,0xEF68,0xEF69,0xEF6A,0x211C,0xEF6B,0xEF6C,0xEF6D,0xEF6E,0xEF6F,0xEF70,0xEF71,0x2128];
+bbb = [0xEF8C,0xEF8D,0x2102,0xEF8E,0xEF8F,0xEF90,0xEF91,0x210D,0xEF92,0xEF93,0xEF94,0xEF95,0xEF96,0x2115,0xEF97,0x2119,0x211A,0x211D,0xEF98,0xEF99,0xEF9A,0xEF9B,0xEF9C,0xEF9D,0xEF9E,0x2124];
+
+symbols = [
+//some greek symbols
+{input:"alpha",  tag:"mi", output:"\u03B1"},
+{input:"beta",   tag:"mi", output:"\u03B2"},
+{input:"chi",    tag:"mi", output:"\u03C7"},
+{input:"delta",  tag:"mi", output:"\u03B4"},
+{input:"Delta",  tag:"mo", output:"\u0394"},
+{input:"epsi",   tag:"mi", output:"\u03B5", tex:"epsilon"},
+{input:"varepsilon", tag:"mi", output:"\u025B"},
+{input:"eta",    tag:"mi", output:"\u03B7"},
+{input:"gamma",  tag:"mi", output:"\u03B3"},
+{input:"Gamma",  tag:"mo", output:"\u0393"},
+{input:"iota",   tag:"mi", output:"\u03B9"},
+{input:"kappa",  tag:"mi", output:"\u03BA"},
+{input:"lambda", tag:"mi", output:"\u03BB"},
+{input:"Lambda", tag:"mo", output:"\u039B"},
+{input:"mu",     tag:"mi", output:"\u03BC"},
+{input:"nu",     tag:"mi", output:"\u03BD"},
+{input:"omega",  tag:"mi", output:"\u03C9"},
+{input:"Omega",  tag:"mo", output:"\u03A9"},
+{input:"phi",    tag:"mi", output:"\u03C6"},
+{input:"varphi", tag:"mi", output:"\u03D5"},
+{input:"Phi",    tag:"mo", output:"\u03A6"},
+{input:"pi",     tag:"mi", output:"\u03C0"},
+{input:"Pi",     tag:"mo", output:"\u03A0"},
+{input:"psi",    tag:"mi", output:"\u03C8"},
+{input:"rho",    tag:"mi", output:"\u03C1"},
+{input:"sigma",  tag:"mi", output:"\u03C3"},
+{input:"Sigma",  tag:"mo", output:"\u03A3"},
+{input:"tau",    tag:"mi", output:"\u03C4"},
+{input:"theta",  tag:"mi", output:"\u03B8"},
+{input:"vartheta", tag:"mi", output:"\u03D1"},
+{input:"Theta",  tag:"mo", output:"\u0398"},
+{input:"upsilon", tag:"mi", output:"\u03C5"},
+{input:"xi",     tag:"mi", output:"\u03BE"},
+{input:"Xi",     tag:"mo", output:"\u039E"},
+{input:"zeta",   tag:"mi", output:"\u03B6"},
+
+//binary operation symbols
+{input:"*",  tag:"mo", output:"\u22C5", tex:"cdot"},
+{input:"**", tag:"mo", output:"\u22C6", tex:"star"},
+{input:"//", tag:"mo", output:"/"},
+{input:"\\\\", tag:"mo", output:"\\", tex:"backslash"},
+{input:"xx", tag:"mo", output:"\u00D7", tex:"times"},
+{input:"-:", tag:"mo", output:"\u00F7", tex:"divide"},
+{input:"@",  tag:"mo", output:"\u2218", tex:"circ"},
+{input:"o+", tag:"mo", output:"\u2295", tex:"oplus"},
+{input:"ox", tag:"mo", output:"\u2297", tex:"otimes"},
+{input:"o.", tag:"mo", output:"\u2299", tex:"odot"},
+{input:"sum", tag:"mo", output:"\u2211", underover:"true"},
+{input:"prod", tag:"mo", output:"\u220F", underover:"true"},
+{input:"^^",  tag:"mo", output:"\u2227", tex:"wedge"},
+{input:"^^^", tag:"mo", output:"\u22C0", tex:"bigwedge", underover:"true"},
+{input:"vv",  tag:"mo", output:"\u2228", tex:"vee"},
+{input:"vvv", tag:"mo", output:"\u22C1", tex:"bigvee", underover:"true"},
+{input:"nn",  tag:"mo", output:"\u2229", tex:"cap"},
+{input:"nnn", tag:"mo", output:"\u22C2", tex:"bigcap", underover:"true"},
+{input:"uu",  tag:"mo", output:"\u222A", tex:"cup"},
+{input:"uuu", tag:"mo", output:"\u22C3", tex:"bigcup", underover:"true"},
+
+//binary relation symbols
+{input:"!=",  tag:"mo", output:"\u2260", tex:"ne"},
+{input:"lt",  tag:"mo", output:"<"},
+{input:"<=",  tag:"mo", output:"\u2264", tex:"le"},
+{input:"lt=", tag:"mo", output:"\u2264", tex:"leq"},
+{input:">=",  tag:"mo", output:"\u2265", tex:"ge"},
+{input:"geq", tag:"mo", output:"\u2265"},
+{input:"-<",  tag:"mo", output:"\u227A", tex:"prec"},
+{input:"-lt", tag:"mo", output:"\u227A"},
+{input:">-",  tag:"mo", output:"\u227B", tex:"succ"},
+{input:"in",  tag:"mo", output:"\u2208"},
+{input:"!in", tag:"mo", output:"\u2209", tex:"notin"},
+{input:"sub", tag:"mo", output:"\u2282", tex:"subset"},
+{input:"sup", tag:"mo", output:"\u2283", tex:"supset"},
+{input:"sube", tag:"mo", output:"\u2286", tex:"subseteq"},
+{input:"supe", tag:"mo", output:"\u2287", tex:"supseteq"},
+{input:"-=",  tag:"mo", output:"\u2261", tex:"equiv"},
+{input:"~=",  tag:"mo", output:"\u2245", tex:"cong"},
+{input:"~~",  tag:"mo", output:"\u2248", tex:"approx"},
+{input:"prop", tag:"mo", output:"\u221D", tex:"propto"},
+
+//logical symbols
+{input:"and", tag:"mtext", output:"and", space:"1ex"},
+{input:"or",  tag:"mtext", output:"or", space:"1ex"},
+{input:"not", tag:"mo", output:"\u00AC", tex:"neg"},
+{input:"=>",  tag:"mo", output:"\u21D2", tex:"implies"},
+{input:"if",  tag:"mo", output:"if", space:"1ex"},
+{input:"<=>", tag:"mo", output:"\u21D4", tex:"iff"},
+{input:"AA",  tag:"mo", output:"\u2200", tex:"forall"},
+{input:"EE",  tag:"mo", output:"\u2203", tex:"exists"},
+{input:"_|_", tag:"mo", output:"\u22A5", tex:"bot"},
+{input:"TT",  tag:"mo", output:"\u22A4", tex:"top"},
+{input:"|-",  tag:"mo", output:"\u22A2", tex:"vdash"},
+{input:"|=",  tag:"mo", output:"\u22A8", tex:"models"},
+
+//grouping brackets
+{input:"(", tag:"mo", output:"(", leftBracket:true},
+{input:")", tag:"mo", output:")", rightBracket:true},
+{input:"[", tag:"mo", output:"[", leftBracket:true},
+{input:"]", tag:"mo", output:"]", rightBracket:true},
+{input:"{", tag:"mo", output:"{", leftBracket:true},
+{input:"}", tag:"mo", output:"}", rightBracket:true},
+{input:"(:", tag:"mo", output:"\u2329", leftBracket:true, tex:"langle"},
+{input:":)", tag:"mo", output:"\u232A", rightBracket:true, tex:"rangle"},
+{input:"{:", tag:"mo", output:"{:", leftBracket:true, invisible:true},
+{input:":}", tag:"mo", output:":}", rightBracket:true, invisible:true},
+
+//miscellaneous symbols
+{input:"int",  tag:"mo", output:"\u222B"},
+{input:"oint", tag:"mo", output:"\u222E"},
+{input:"del",  tag:"mo", output:"\u2202", tex:"partial"},
+{input:"grad", tag:"mo", output:"\u2207", tex:"nabla"},
+{input:"+-",   tag:"mo", output:"\u00B1", tex:"pm"},
+{input:"O/",   tag:"mo", output:"\u2205", tex:"emptyset"},
+{input:"oo",   tag:"mo", output:"\u221E", tex:"infty"},
+{input:"aleph", tag:"mo", output:"\u2135"},
+{input:"...",  tag:"mo", output:"...", tex:"ldots"},
+{input:"\\ ",  tag:"mo", output:"\u00A0"},
+{input:"quad", tag:"mo", output:"\u00A0\u00A0"},
+{input:"qquad", tag:"mo", output:"\u00A0\u00A0\u00A0\u00A0"},
+{input:"cdots", tag:"mo", output:"\u22EF"},
+{input:"diamond", tag:"mo", output:"\u22C4"},
+{input:"square", tag:"mo", output:"\u25A1"},
+{input:"|_", tag:"mo", output:"\u230A", tex:"lfloor"},
+{input:"_|", tag:"mo", output:"\u230B", tex:"rfloor"},
+{input:"|~", tag:"mo", output:"\u2308", tex:"lceiling"},
+{input:"~|", tag:"mo", output:"\u2309", tex:"rceiling"},
+{input:"CC",  tag:"mo", output:"\u2102"},
+{input:"NN",  tag:"mo", output:"\u2115"},
+{input:"QQ",  tag:"mo", output:"\u211A"},
+{input:"RR",  tag:"mo", output:"\u211D"},
+{input:"ZZ",  tag:"mo", output:"\u2124"},
+
+//standard functions
+{input:"lim",  tag:"mo", output:"lim", underover:"true"},
+{input:"sin",  tag:"mo", output:"sin"},
+{input:"cos",  tag:"mo", output:"cos"},
+{input:"tan",  tag:"mo", output:"tan"},
+{input:"sinh", tag:"mo", output:"sinh"},
+{input:"cosh", tag:"mo", output:"cosh"},
+{input:"tanh", tag:"mo", output:"tanh"},
+{input:"cot",  tag:"mo", output:"cot"},
+{input:"sec",  tag:"mo", output:"sec"},
+{input:"csc",  tag:"mo", output:"csc"},
+{input:"log",  tag:"mo", output:"log"},
+{input:"ln",   tag:"mo", output:"ln"},
+{input:"det",  tag:"mo", output:"det"},
+{input:"dim",  tag:"mo", output:"dim"},
+{input:"mod",  tag:"mo", output:"mod"},
+{input:"gcd",  tag:"mo", output:"gcd"},
+{input:"lcm",  tag:"mo", output:"lcm"},
+{input:"min",  tag:"mo", output:"min", underover:"true"},
+{input:"max",  tag:"mo", output:"max", underover:"true"},
+
+//arrows
+{input:"uarr", tag:"mo", output:"\u2191", tex:"uparrow"},
+{input:"darr", tag:"mo", output:"\u2193", tex:"downarrow"},
+{input:"rarr", tag:"mo", output:"\u2192", tex:"rightarrow"},
+{input:"->",   tag:"mo", output:"\u2192", tex:"to"},
+{input:"larr", tag:"mo", output:"\u2190", tex:"leftarrow"},
+{input:"harr", tag:"mo", output:"\u2194", tex:"leftrightarrow"},
+{input:"rArr", tag:"mo", output:"\u21D2", tex:"Rightarrow"},
+{input:"lArr", tag:"mo", output:"\u21D0", tex:"Leftarrow"},
+{input:"hArr", tag:"mo", output:"\u21D4", tex:"Leftrightarrow"},
+
+//commands with argument
+sqrt = {input:"sqrt", tag:"msqrt", output:"sqrt", unary:true},
+root = {input:"root", tag:"mroot", output:"root", binary:true},
+frac = {input:"frac", tag:"mfrac", output:"/", binary:true},
+div = {input:"/", tag:"mfrac", output:"/", infix:true},
+sub = {input:"_", tag:"msub",  output:"_", infix:true},
+sup = {input:"^", tag:"msup",  output:"^", infix:true},
+hat = {input:"hat", tag:"mover", output:"\u005E", unary:true, acc:true},
+bar = {input:"bar", tag:"mover", output:"\u00AF", unary:true, acc:true},
+vec = {input:"vec", tag:"mover", output:"\u2192", unary:true, acc:true},
+dot = {input:"dot", tag:"mover", output:".", unary:true, acc:true},
+ddot = {input:"ddot", tag:"mover", output:"..", unary:true, acc:true},
+ul = {input:"ul", tag:"munder", output:"\u0332", unary:true, acc:true},
+text = {input:"text", tag:"mtext", output:"text", unary:true},
+mbox = {input:"mbox", tag:"mtext", output:"mbox", unary:true},
+quote = {input:"\"", tag:"mtext", output:"mbox", unary:true},
+{input:"bb", tag:"mstyle", atname:"fontweight", atval:"bold", output:"bb", unary:true},
+{input:"mathbf", tag:"mstyle", atname:"fontweight", atval:"bold", output:"mathbf", unary:true},
+{input:"sf", tag:"mstyle", atname:"fontfamily", atval:"sans-serif", output:"sf", unary:true},
+{input:"mathsf", tag:"mstyle", atname:"fontfamily", atval:"sans-serif", output:"mathsf", unary:true},
+{input:"bbb", tag:"mstyle", atname:"mathvariant", atval:"double-struck", output:"bbb", unary:true, codes:bbb},
+{input:"mathbb", tag:"mstyle", atname:"mathvariant", atval:"double-struck", output:"mathbb", unary:true, codes:bbb},
+{input:"cc",  tag:"mstyle", atname:"mathvariant", atval:"script", output:"cc", unary:true, codes:cal},
+{input:"mathcal", tag:"mstyle", atname:"mathvariant", atval:"script", output:"mathcal", unary:true, codes:cal},
+{input:"tt",  tag:"mstyle", atname:"fontfamily", atval:"monospace", output:"tt", unary:true},
+{input:"mathtt", tag:"mstyle", atname:"fontfamily", atval:"monospace", output:"mathtt", unary:true},
+{input:"fr",  tag:"mstyle", atname:"mathvariant", atval:"fraktur", output:"fr", unary:true, codes:frk},
+{input:"mathfrak",  tag:"mstyle", atname:"mathvariant", atval:"fraktur", output:"mathfrak", unary:true, codes:frk}
+];
+
+function compareNames(s1,s2) {
+  if (s1.input > s2.input) return 1
+  else return -1;
+}
+
+names = []; //list of input symbols
+
+function initSymbols() {
+  var texsymbols = [];
+  for (var i=0; i<symbols.length; i++)
+    if (symbols[i].tex) 
+      texsymbols[texsymbols.length] = 
+        {input:symbols[i].tex, tag:"mo", output:symbols[i].output};
+  symbols = symbols.concat(texsymbols);
+  symbols.sort(compareNames);
+  for (var i=0; i<symbols.length; i++) names[i] = symbols[i].input;
+}
+
+function myCreateElementXHTML(t) {
+  if (isIE) return document.createElement(t);
+  else return document.createElementNS("http://www.w3.org/1999/xhtml",t);
+}
+
+function myCreateElementMathML(t) {
+  if (isIE) return document.createElement("mml:"+t);
+  else return document.createElementNS("http://www.w3.org/1998/Math/MathML",t);
+}
+
+function createMmlNode(name,frag) {
+  var node = myCreateElementMathML(name);
+  node.appendChild(frag);
+  return node;
+}
+
+function removeCharsAndBlanks(str,n) {
+//remove n characters and any following blanks
+  var st;
+  if (str.charAt(n)=="\\" && str.charAt(n+1)!="\\" && str.charAt(n+1)!=" ") 
+    st = str.slice(n+1);
+  else st = str.slice(n);
+  for (var i=0; i<st.length && st.charCodeAt(i)<=32; i=i+1);
+  return st.slice(i);
+}
+
+function position(arr, str, n) { 
+// return position >=n where str appears or would be inserted
+// assumes arr is sorted
+  if (n==0) {
+    var h,m;
+    n = -1;
+    h = arr.length;
+    while (n+1<h) {
+      m = (n+h) >> 1;
+      if (arr[m]<str) n = m; else h = m;
+    }
+    return h;
+  } else
+    for (var i=n; i<arr.length && arr[i]<str; i++);
+  return i; // i=arr.length || arr[i]>=str
+}
+
+var separated = true;
+
+function getSymbol(str) {
+//return maximal initial substring of str that appears in names
+//return null if there is none
+  var k = 0; //new pos
+  var j = 0; //old pos
+  var mk; //match pos
+  var st;
+  var tagst;
+  var match = "";
+  var more = true;
+  for (var i=1; i<=str.length && more; i++) {
+    st = str.slice(0,i); //initial substring of length i
+    j = k;
+    k = position(names, st, j);
+    if (k<names.length && str.slice(0,names[k].length)==names[k]){
+      match = names[k];
+      mk = k;
+      i = match.length;
+    }
+    more = k<names.length && str.slice(0,names[k].length)>=names[k];
+  }
+  if (match!="")
+    if (separatetokens) {
+      i = match.length;
+      if ("a">str.charAt(0) || str.charAt(0)>"z" || 
+        "a">str.charAt(i-1) || str.charAt(i-1)>"z") {
+        separated = true;
+        return symbols[mk];
+      }
+      st = str.charAt(i);
+      separated = separated && ("a">st || st>"z");
+      if (separated) return symbols[mk];
+    } else return symbols[mk]; 
+// if str[0] is a digit or - return maxsubstring of digits.digits
+  k = 1;
+  st = str.slice(0,1);
+  var pos = true;
+  var integ = true;
+  if (st == "-") {
+    pos = false;
+    st = str.slice(k,k+1);
+    k++;
+  }
+  while ("0"<=st && st<="9" && k<=str.length) {
+    st = str.slice(k,k+1);
+    k++;
+  }
+  if (st == ".") {
+    integ = false;
+    st = str.slice(k,k+1);
+    k++;
+    while ("0"<=st && st<="9" && k<=str.length) {
+      st = str.slice(k,k+1);
+      k++;
+    }
+  }
+  if ((pos && integ && k>1) || ((pos || integ) && k>2) || k>3) {
+    st = str.slice(0,k-1);
+    tagst = "mn";
+    separated = true;
+  } else {
+    k = 2;
+    st = str.slice(0,1); //take 1 character
+    separated = ("A">st || st>"Z") && ("a">st || st>"z");
+    tagst = (separated?"mo":"mi");
+    separated = separated || str.charAt(1)<"a" || str.charAt(1)>"z";
+  }
+  return {input:str.slice(0,k-1), tag:tagst, output:st};
+}
+
+function removeBrackets(node) {
+  if (node.nodeName=="mrow") {
+    var st = node.firstChild.firstChild.nodeValue;
+    if (st=="(" || st=="[" || st=="{") node.removeChild(node.firstChild);
+  }
+  if (node.nodeName=="mrow") {
+    var st = node.lastChild.firstChild.nodeValue;
+    if (st==")" || st=="]" || st=="}") node.removeChild(node.lastChild);
+  }
+}
+
+/*Parsing ASCII math expressions with the following grammar
+c ::= [A-z] | numbers | greek letters | other constant symbols
+u ::= "sqrt" | "text" | "bb" | other unary symbols for font commands
+b ::= "frac" | "root"          binary symbols
+i ::= _ | ^ | /                infix symbols: subscript, superscript, division
+l ::= ( | [ | { | (: | {:      left brackets
+r ::= ) | ] | } | :) | :}      right brackets
+S ::= c | lEr | uS' | bS'S'    simple expression: S' is S with brackets removed
+E ::= SE | SiS' | S_S'^S'      expression
+Each terminal symbol is translated into a corresponding mathml node.*/
+
+function parseSexpr(str) { //parses str and returns [node,tailstr]
+  var symbol;
+  var node;
+  var result;
+  str = removeCharsAndBlanks(str,0);
+  symbol = getSymbol(str);             //either a token or a bracket or empty
+  if (symbol == null || symbol.rightBracket)
+    return [null,str];
+  if (symbol.leftBracket) {                     //read (expr+)
+    str = removeCharsAndBlanks(str,symbol.input.length); 
+    result = parseExpr(str);
+    if (symbol.invisible) node = createMmlNode("mrow",result[0]);
+    else {
+      node = createMmlNode("mo",document.createTextNode(symbol.output));
+      node = createMmlNode("mrow",node);
+      node.appendChild(result[0]);
+    }
+    return [node,result[1]];
+  }
+  else if (symbol.unary) {
+    if (symbol == text || symbol == mbox || symbol == quote) {
+      if (symbol!=quote) str = removeCharsAndBlanks(str,symbol.input.length);
+      if (str.charAt(0)=="{") var i=str.indexOf("}");
+      else if (str.charAt(0)=="(") var i=str.indexOf(")");
+      else if (str.charAt(0)=="[") var i=str.indexOf("]");
+      else if (symbol==quote) var i=str.slice(1).indexOf("\"")+1;
+      else var i = 0;
+      if (i==-1) i = str.length;
+      var st = str.slice(1,i);
+      var newFrag = document.createDocumentFragment();
+      if (st.charAt(0) == " ") {
+        node = myCreateElementMathML("mspace");
+        node.setAttribute("width","1ex");
+        newFrag.appendChild(node);
+      }
+      newFrag.appendChild(
+        createMmlNode(symbol.tag,document.createTextNode(st)));
+      if (st.charAt(st.length-1) == " ") {
+        node = myCreateElementMathML("mspace");
+        node.setAttribute("width","1ex");
+        newFrag.appendChild(node);
+      }
+      str = removeCharsAndBlanks(str,i+1);
+      return [createMmlNode("mrow",newFrag),str];
+    } else {
+      str = removeCharsAndBlanks(str,symbol.input.length); 
+      result = parseSexpr(str);
+      if (result[0]==null) return [createMmlNode("mo",
+                             document.createTextNode(symbol.input)),str];
+      removeBrackets(result[0]);
+      if (symbol == sqrt) {           // sqrt
+        return [createMmlNode(symbol.tag,result[0]),result[1]];
+      } else if (symbol.acc) {        // accent
+        node = createMmlNode(symbol.tag,result[0]);
+        node.appendChild(createMmlNode("mo",document.createTextNode(symbol.output)));
+        return [node,result[1]];
+      } else {                        // font change command
+        if (!isIE && symbol.codes!=null) {
+          for (var i=0; i<result[0].childNodes.length; i++)
+            if (result[0].childNodes[i].nodeName=="mi" || result[0].nodeName=="mi") {
+             var st = (result[0].nodeName=="mi"?result[0].firstChild.nodeValue:
+                              result[0].childNodes[i].firstChild.nodeValue);
+              var newst = [];
+              for (var j=0; j<st.length; j++)
+                if (st.charCodeAt(j)>64 && st.charCodeAt(j)<91) newst = newst +
+                  String.fromCharCode(symbol.codes[st.charCodeAt(j)-65]);
+                else newst = newst + st.charAt(j);
+              if (result[0].nodeName=="mi")
+                result[0]=myCreateElementMathML("mo").
+                          appendChild(document.createTextNode(newst));
+              else result[0].replaceChild(myCreateElementMathML("mo").
+          appendChild(document.createTextNode(newst)),result[0].childNodes[i]);
+            }
+        }
+        node = createMmlNode(symbol.tag,result[0]);
+        node.setAttribute(symbol.atname,symbol.atval);
+        return [node,result[1]];
+      }
+    }
+  }
+  else {
+   str = removeCharsAndBlanks(str,symbol.input.length); 
+   if (symbol.binary) {
+    var newFrag = document.createDocumentFragment();
+    result = parseSexpr(str);
+    if (result[0]==null) return [createMmlNode("mo",
+                             document.createTextNode(symbol.input)),str];
+    removeBrackets(result[0]);
+    var result2 = parseSexpr(result[1]);
+    if (result2[0]==null) return [createMmlNode("mo",
+                             document.createTextNode(symbol.input)),str];
+    removeBrackets(result2[0]);
+    if (symbol==root) newFrag.appendChild(result2[0]);
+    newFrag.appendChild(result[0]);
+    if (symbol==frac) newFrag.appendChild(result2[0]);
+    return [createMmlNode(symbol.tag,newFrag),result2[1]];
+  }
+  else if (symbol.infix)
+    return [createMmlNode("mo",document.createTextNode(symbol.output)),str];
+  else if (symbol.space!=undefined) {
+    var newFrag = document.createDocumentFragment();
+    node = myCreateElementMathML("mspace");
+    node.setAttribute("width",symbol.space);
+    newFrag.appendChild(node);
+    newFrag.appendChild(
+      createMmlNode(symbol.tag,document.createTextNode(symbol.output)));
+    node = myCreateElementMathML("mspace");
+    node.setAttribute("width",symbol.space);
+    newFrag.appendChild(node);
+    return [createMmlNode("mrow",newFrag),str];
+  }else return [createMmlNode(symbol.tag,        //its a constant
+                             document.createTextNode(symbol.output)),str];
+ }
+}
+
+function parseExpr(str) {
+  var symbol,sym1,sym2;
+  var node;
+  var result;
+  var newFrag = document.createDocumentFragment();
+  var nodeList = [];
+  do {
+    str = removeCharsAndBlanks(str,0);
+    sym1 = getSymbol(str);
+    result = parseSexpr(str);
+    node = result[0];
+    str = result[1];
+    symbol = getSymbol(str);
+    if (symbol.infix) {
+      str = removeCharsAndBlanks(str,symbol.input.length);
+      result = parseSexpr(str);
+      removeBrackets(result[0]);
+      str = result[1];
+      if (symbol == div) removeBrackets(node);
+      if (symbol == sub) {
+        sym2 = getSymbol(str);
+        if (sym2 == sup) {
+          str = removeCharsAndBlanks(str,sym2.input.length);
+          var res2 = parseSexpr(str);
+          removeBrackets(res2[0]);
+          str = res2[1];
+            node = createMmlNode((sym1.underover?"munderover":"msubsup"),node);
+            node.appendChild(result[0]);
+            node.appendChild(res2[0]);
+            node = createMmlNode("mrow",node);          
+        } else {
+          node = createMmlNode((sym1.underover?"munder":"msub"),node);
+          node.appendChild(result[0]);
+        }
+      } else {
+        node = createMmlNode(symbol.tag,node);
+        node.appendChild(result[0]);
+      }
+      newFrag.appendChild(node);
+    } 
+    else if (node!=undefined) newFrag.appendChild(node);
+  } while (!symbol.rightBracket && !(symbol==null) && symbol.output!="");
+  if (symbol.rightBracket) {
+    var len = newFrag.childNodes.length;
+    if (len>0 && newFrag.childNodes[len-1].nodeName == "mrow" && len>1 &&
+      newFrag.childNodes[len-2].nodeName == "mo" &&
+      newFrag.childNodes[len-2].firstChild.nodeValue == ",") { //matrix
+      var right = newFrag.childNodes[len-1].lastChild.firstChild.nodeValue;
+      if (right==")" || right=="]") {
+        var left = newFrag.childNodes[len-1].firstChild.firstChild.nodeValue;
+        if (left=="(" && right==")" && symbol.output != "}" || 
+            left=="[" && right=="]") {
+        var pos = []; // positions of commas
+        var matrix = true;
+        var m = newFrag.childNodes.length;
+        for (var i=0; matrix && i<m; i=i+2) {
+          pos[i] = [];
+          node = newFrag.childNodes[i];
+          if (matrix) matrix = node.nodeName=="mrow" && 
+            (i==m-1 || node.nextSibling.nodeName=="mo" && 
+            node.nextSibling.firstChild.nodeValue==",")&&
+            node.firstChild.firstChild.nodeValue==left &&
+            node.lastChild.firstChild.nodeValue==right;
+          if (matrix) for (var j=0; j<node.childNodes.length; j++)
+            if (node.childNodes[j].firstChild.nodeValue==",")
+              pos[i][pos[i].length]=j;
+          if (matrix && i>1) matrix = pos[i].length == pos[i-2].length;
+        }
+        if (matrix) {
+          var table = document.createDocumentFragment();
+          for (var i=0; i<m; i=i+2) {
+            var row = document.createDocumentFragment();
+            var frag = document.createDocumentFragment();
+            node = newFrag.firstChild; // <mrow>(-,-,...,-,-)</mrow>
+            var n = node.childNodes.length;
+            var k = 0;
+            node.removeChild(node.firstChild); //remove (
+            for (var j=1; j<n-1; j++) {
+              if (j==pos[i][k]){
+                node.removeChild(node.firstChild); //remove ,
+                row.appendChild(createMmlNode("mtd",frag));
+                k++;
+              } else frag.appendChild(node.firstChild);
+            }
+            row.appendChild(createMmlNode("mtd",frag));
+            if (newFrag.childNodes.length>2) {
+              newFrag.removeChild(newFrag.firstChild); //remove <mrow>)</mrow>
+              newFrag.removeChild(newFrag.firstChild); //remove <mo>,</mo>
+            }
+            table.appendChild(createMmlNode("mtr",row));
+          }
+          node = createMmlNode("mtable",table);
+          if (symbol.invisible) node.setAttribute("columnalign","left");
+          newFrag.replaceChild(node,newFrag.firstChild);
+        }
+      }}
+    }
+    str = removeCharsAndBlanks(str,symbol.input.length);
+    if (!symbol.invisible) {
+      node = createMmlNode("mo",document.createTextNode(symbol.output));
+      newFrag.appendChild(node);
+    }
+  }
+  return [newFrag,str];
+}
+
+function parseMath(str) {
+  var node = myCreateElementMathML("mstyle");
+  node.setAttribute("mathcolor",mathcolor);
+  if (displaystyle) node.setAttribute("displaystyle","true");
+  node.appendChild(parseExpr(str)[0]);
+  return createMmlNode("math",node);
+}
+
+function strarr2docFrag(arr, linebreaks) {
+  var newFrag=document.createDocumentFragment();
+  var expr = false;
+  for (var i=0; i<arr.length; i++) {
+    if (expr) newFrag.appendChild(parseMath(arr[i]));
+    else {
+      var arri = (linebreaks ? arr[i].split("\n\n") : [arr[i]]);
+      newFrag.appendChild(myCreateElementXHTML("span").
+      appendChild(document.createTextNode(arri[0].
+        replace(/\\dollar/g,"$").replace(/\\lq/g,"`"))));
+      for (var j=1; j<arri.length; j++) {
+        newFrag.appendChild(myCreateElementXHTML("p"));
+        newFrag.appendChild(myCreateElementXHTML("span").
+        appendChild(document.createTextNode(arri[j].
+          replace(/\\dollar/g,"$").replace(/\\lq/g,"`"))));
+      }
+    }
+    expr = !expr;
+  }
+  return newFrag;
+}
+
+function processNode(n) {
+  if (n.childNodes.length == 0 &&
+    n.parentNode.nodeName!="textarea" && n.parentNode.nodeName!="TEXTAREA" &&
+    n.parentNode.nodeName!="pre" && n.parentNode.nodeName!="PRE") {
+    var str = n.nodeValue;
+    if (!(str == null)) {
+      str = str.replace(/\r\n\r\n/g,"\n\n");
+      if (doubleblankmathdelimiter) {
+        str = str.replace(/\x20\x20\./g," `.");
+        str = str.replace(/\x20\x20,/g," `,");
+        str = str.replace(/\x20\x20/g," ` ");
+      }
+      str = str.replace(/\x20+/g," ");
+      str = str.replace(/\s*\r\n/g," ");
+      mtch = false;
+      str = str.replace(/\\\$/g,function(st){mtch=true;return "\\dollar"});
+      str = str.replace(/\\`/g,function(st){mtch=true;return "\\lq"});
+      str = str.replace(/\$/g,"`");
+      var arr = str.split("`");
+      if (arr.length>1 || mtch)
+        n.parentNode.replaceChild(strarr2docFrag(arr,n.nodeType==8),n);
+    }
+  } else if (n.nodeName!="math") for (var i=0; i<n.childNodes.length; i++)
+      processNode(n.childNodes[i]);
+}
+
+function translate() {
+  initSymbols();
+  body = document.getElementsByTagName("body")[0];
+  processNode(body);
+}
diff --git a/htdocs/LaTeXMathML/LaTeXMathML.js b/htdocs/LaTeXMathML/LaTeXMathML.js
new file mode 100644
index 0000000000..3d8126116d
--- /dev/null
+++ b/htdocs/LaTeXMathML/LaTeXMathML.js
@@ -0,0 +1,1245 @@
+/*
+
+This is a modified verson of Douglas Woodall's LaTeXMathML.js file for
+use with WeBWorK.  I have marked the changes with "DPVC" comments.
+These include adding a few missing commands that we needed, and making
+it look for $$..$$ rather than just $...$ so as to avoid matching
+dollar signs used within the problem text itself.  It is also modified
+to not reinitialize itself if loaded a second time (as it will be in
+the Library Browser).
+
+LaTeXMathML.js
+==============
+
+This file, in this form, is due to Douglas Woodall, June 2006.
+It contains JavaScript functions to convert (most simple) LaTeX
+math notation to Presentation MathML.  It was obtained by
+downloading the file ASCIIMathML.js from
+	http://www1.chapman.edu/~jipsen/mathml/asciimathdownload/
+and modifying it so that it carries out ONLY those conversions
+that would be carried out in LaTeX.  A description of the original
+file, with examples, can be found at
+	www1.chapman.edu/~jipsen/mathml/asciimath.html
+	ASCIIMathML: Math on the web for everyone
+
+Here is the header notice from the original file:
+
+ASCIIMathML.js
+==============
+This file contains JavaScript functions to convert ASCII math notation
+to Presentation MathML. The conversion is done while the (X)HTML page
+loads, and should work with Firefox/Mozilla/Netscape 7+ and Internet
+Explorer 6+MathPlayer (http://www.dessci.com/en/products/mathplayer/).
+Just add the next line to your (X)HTML page with this file in the same folder:
+<script type="text/javascript" src="ASCIIMathML.js"></script>
+This is a convenient and inexpensive solution for authoring MathML.
+
+Version 1.4.7 Dec 15, 2005, (c) Peter Jipsen http://www.chapman.edu/~jipsen
+Latest version at http://www.chapman.edu/~jipsen/mathml/ASCIIMathML.js
+For changes see http://www.chapman.edu/~jipsen/mathml/asciimathchanges.txt
+If you use it on a webpage, please send the URL to jipsen@chapman.edu
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or (at
+your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License (at http://www.gnu.org/copyleft/gpl.html)
+for more details.
+
+LaTeXMathML.js (ctd)
+==============
+
+The instructions for use are the same as for the original
+ASCIIMathML.js, except that of course the line you add to your
+file should be
+<script type="text/javascript" src="LaTeXMathML.js"></script>
+Or use absolute path names if the file is not in the same folder
+as your (X)HTML page.
+*/
+
+var checkForMathML = true;   // check if browser can display MathML
+var notifyIfNoMathML = true; // display note if no MathML capability
+var alertIfNoMathML = false;  // show alert box if no MathML capability
+// was "red":
+var mathcolor = "";	     // change it to "" (to inherit) or any other color
+// was "serif":
+var mathfontfamily = "";      // change to "" to inherit (works in IE)
+                              // or another family (e.g. "arial")
+var showasciiformulaonhover = true; // helps students learn ASCIIMath
+/*
+// Commented out by DRW -- not now used -- see DELIMITERS (twice) near the end
+var displaystyle = false;     // puts limits above and below large operators
+var decimalsign = ".";        // change to "," if you like, beware of `(1,2)`!
+var AMdelimiter1 = "`", AMescape1 = "\\\\`"; // can use other characters
+var AMdelimiter2 = "$", AMescape2 = "\\\\\\$", AMdelimiter2regexp = "\\$";
+var doubleblankmathdelimiter = false; // if true,  x+1  is equal to `x+1`
+                                      // for IE this works only in <!--   -->
+//var separatetokens;// has been removed (email me if this is a problem)
+*/
+
+if (!window.LaTeXMathML_loaded) { // DPVC
+window.LaTeXMathML_loaded = 1;    // DPVC
+
+var isIE = document.createElementNS==null;
+
+if (document.getElementById==null)
+  alert("This webpage requires a recent browser such as\
+\nMozilla/Netscape 7+ or Internet Explorer 6+MathPlayer")
+
+// all further global variables start with "AM"
+
+function AMcreateElementXHTML(t) {
+  if (isIE) return document.createElement(t);
+  else return document.createElementNS("http://www.w3.org/1999/xhtml",t);
+}
+
+function AMnoMathMLNote() {
+  var nd = AMcreateElementXHTML("h3");
+  nd.setAttribute("align","center")
+  nd.appendChild(AMcreateElementXHTML("p"));
+  nd.appendChild(document.createTextNode("To view the "));
+  var an = AMcreateElementXHTML("a");
+  an.appendChild(document.createTextNode("LaTeXMathML"));
+  an.setAttribute("href","http://www.maths.nott.ac.uk/personal/drw/lm.html");
+  nd.appendChild(an);
+  nd.appendChild(document.createTextNode(" notation use Internet Explorer 6+")); 
+  an = AMcreateElementXHTML("a");
+  an.appendChild(document.createTextNode("MathPlayer"));
+  an.setAttribute("href","http://www.dessci.com/en/products/mathplayer/download.htm");
+  nd.appendChild(an);
+  nd.appendChild(document.createTextNode(" or Netscape/Mozilla/Firefox"));
+  nd.appendChild(AMcreateElementXHTML("p"));
+  return nd;
+}
+
+function AMisMathMLavailable() {
+  if (navigator.appName.slice(0,8)=="Netscape")
+    if (navigator.appVersion.slice(0,1)>="5") return null;
+    else return AMnoMathMLNote();
+  else if (navigator.appName.slice(0,9)=="Microsoft")
+    try {
+        var ActiveX = new ActiveXObject("MathPlayer.Factory.1");
+        return null;
+    } catch (e) {
+        return AMnoMathMLNote();
+    }
+  else return AMnoMathMLNote();
+}
+
+// character lists for Mozilla/Netscape fonts
+var AMcal = [0xEF35,0x212C,0xEF36,0xEF37,0x2130,0x2131,0xEF38,0x210B,0x2110,0xEF39,0xEF3A,0x2112,0x2133,0xEF3B,0xEF3C,0xEF3D,0xEF3E,0x211B,0xEF3F,0xEF40,0xEF41,0xEF42,0xEF43,0xEF44,0xEF45,0xEF46];
+var AMfrk = [0xEF5D,0xEF5E,0x212D,0xEF5F,0xEF60,0xEF61,0xEF62,0x210C,0x2111,0xEF63,0xEF64,0xEF65,0xEF66,0xEF67,0xEF68,0xEF69,0xEF6A,0x211C,0xEF6B,0xEF6C,0xEF6D,0xEF6E,0xEF6F,0xEF70,0xEF71,0x2128];
+var AMbbb = [0xEF8C,0xEF8D,0x2102,0xEF8E,0xEF8F,0xEF90,0xEF91,0x210D,0xEF92,0xEF93,0xEF94,0xEF95,0xEF96,0x2115,0xEF97,0x2119,0x211A,0x211D,0xEF98,0xEF99,0xEF9A,0xEF9B,0xEF9C,0xEF9D,0xEF9E,0x2124];
+
+var CONST = 0, UNARY = 1, BINARY = 2, INFIX = 3, LEFTBRACKET = 4,
+    RIGHTBRACKET = 5, SPACE = 6, UNDEROVER = 7, DEFINITION = 8,
+    TEXT = 9, BIG = 10, LONG = 11, STRETCHY = 12, MATRIX = 13; // token types
+
+var AMsqrt = {input:"\\sqrt",	tag:"msqrt", output:"sqrt",	ttype:UNARY},
+  AMroot = {input:"\\root",	tag:"mroot", output:"root",	ttype:BINARY},
+  AMfrac = {input:"\\frac",	tag:"mfrac", output:"/",	ttype:BINARY},
+  AMover = {input:"\\stackrel", tag:"mover", output:"stackrel", ttype:BINARY},
+  AMatop = {input:"\\atop",	tag:"mfrac", output:"",		ttype:INFIX},
+  AMchoose = {input:"\\choose", tag:"mfrac", output:"",		ttype:INFIX},
+  AMsub  = {input:"_",		tag:"msub",  output:"_",	ttype:INFIX},
+  AMsup  = {input:"^",		tag:"msup",  output:"^",	ttype:INFIX},
+  AMtext = {input:"\\mathrm",	tag:"mtext", output:"text",	ttype:TEXT},
+  AMmbox = {input:"\\mbox",	tag:"mtext", output:"mbox",	ttype:TEXT};
+
+// Commented out by DRW to prevent 1/2 turning into a 2-line fraction
+// AMdiv   = {input:"/",	 tag:"mfrac", output:"/",    ttype:INFIX},
+// Commented out by DRW so that " prints literally in equations
+// AMquote = {input:"\"",	 tag:"mtext", output:"mbox", ttype:TEXT};
+
+var AMsymbols = [
+//Greek letters
+{input:"\\alpha",	tag:"mi", output:"\u03B1", ttype:CONST},
+{input:"\\beta",	tag:"mi", output:"\u03B2", ttype:CONST},
+{input:"\\gamma",	tag:"mi", output:"\u03B3", ttype:CONST},
+{input:"\\delta",	tag:"mi", output:"\u03B4", ttype:CONST},
+{input:"\\epsilon",	tag:"mi", output:"\u03B5", ttype:CONST},
+{input:"\\varepsilon",  tag:"mi", output:"\u025B", ttype:CONST},
+{input:"\\zeta",	tag:"mi", output:"\u03B6", ttype:CONST},
+{input:"\\eta",		tag:"mi", output:"\u03B7", ttype:CONST},
+{input:"\\theta",	tag:"mi", output:"\u03B8", ttype:CONST},
+{input:"\\vartheta",	tag:"mi", output:"\u03D1", ttype:CONST},
+{input:"\\iota",	tag:"mi", output:"\u03B9", ttype:CONST},
+{input:"\\kappa",	tag:"mi", output:"\u03BA", ttype:CONST},
+{input:"\\lambda",	tag:"mi", output:"\u03BB", ttype:CONST},
+{input:"\\mu",		tag:"mi", output:"\u03BC", ttype:CONST},
+{input:"\\nu",		tag:"mi", output:"\u03BD", ttype:CONST},
+{input:"\\xi",		tag:"mi", output:"\u03BE", ttype:CONST},
+{input:"\\pi",		tag:"mi", output:"\u03C0", ttype:CONST},
+{input:"\\varpi",	tag:"mi", output:"\u03D6", ttype:CONST},
+{input:"\\rho",		tag:"mi", output:"\u03C1", ttype:CONST},
+{input:"\\varrho",	tag:"mi", output:"\u03F1", ttype:CONST},
+{input:"\\varsigma",	tag:"mi", output:"\u03C2", ttype:CONST},
+{input:"\\sigma",	tag:"mi", output:"\u03C3", ttype:CONST},
+{input:"\\tau",		tag:"mi", output:"\u03C4", ttype:CONST},
+{input:"\\upsilon",	tag:"mi", output:"\u03C5", ttype:CONST},
+{input:"\\phi",		tag:"mi", output:"\u03C6", ttype:CONST},
+{input:"\\varphi",	tag:"mi", output:"\u03D5", ttype:CONST},
+{input:"\\chi",		tag:"mi", output:"\u03C7", ttype:CONST},
+{input:"\\psi",		tag:"mi", output:"\u03C8", ttype:CONST},
+{input:"\\omega",	tag:"mi", output:"\u03C9", ttype:CONST},
+{input:"\\Gamma",	tag:"mo", output:"\u0393", ttype:CONST},
+{input:"\\Delta",	tag:"mo", output:"\u0394", ttype:CONST},
+{input:"\\Theta",	tag:"mo", output:"\u0398", ttype:CONST},
+{input:"\\Lambda",	tag:"mo", output:"\u039B", ttype:CONST},
+{input:"\\Xi",		tag:"mo", output:"\u039E", ttype:CONST},
+{input:"\\Pi",		tag:"mo", output:"\u03A0", ttype:CONST},
+{input:"\\Sigma",	tag:"mo", output:"\u03A3", ttype:CONST},
+{input:"\\Upsilon",	tag:"mo", output:"\u03A5", ttype:CONST},
+{input:"\\Phi",		tag:"mo", output:"\u03A6", ttype:CONST},
+{input:"\\Psi",		tag:"mo", output:"\u03A8", ttype:CONST},
+{input:"\\Omega",	tag:"mo", output:"\u03A9", ttype:CONST},
+
+//fractions
+{input:"\\frac12",	tag:"mo", output:"\u00BD", ttype:CONST},
+{input:"\\frac14",	tag:"mo", output:"\u00BC", ttype:CONST},
+{input:"\\frac34",	tag:"mo", output:"\u00BE", ttype:CONST},
+{input:"\\frac13",	tag:"mo", output:"\u2153", ttype:CONST},
+{input:"\\frac23",	tag:"mo", output:"\u2154", ttype:CONST},
+{input:"\\frac15",	tag:"mo", output:"\u2155", ttype:CONST},
+{input:"\\frac25",	tag:"mo", output:"\u2156", ttype:CONST},
+{input:"\\frac35",	tag:"mo", output:"\u2157", ttype:CONST},
+{input:"\\frac45",	tag:"mo", output:"\u2158", ttype:CONST},
+{input:"\\frac16",	tag:"mo", output:"\u2159", ttype:CONST},
+{input:"\\frac56",	tag:"mo", output:"\u215A", ttype:CONST},
+{input:"\\frac18",	tag:"mo", output:"\u215B", ttype:CONST},
+{input:"\\frac38",	tag:"mo", output:"\u215C", ttype:CONST},
+{input:"\\frac58",	tag:"mo", output:"\u215D", ttype:CONST},
+{input:"\\frac78",	tag:"mo", output:"\u215E", ttype:CONST},
+
+//binary operation symbols
+{input:"\\pm",		tag:"mo", output:"\u00B1", ttype:CONST},
+{input:"\\mp",		tag:"mo", output:"\u2213", ttype:CONST},
+{input:"\\triangleleft",tag:"mo", output:"\u22B2", ttype:CONST},
+{input:"\\triangleright",tag:"mo",output:"\u22B3", ttype:CONST},
+{input:"\\cdot",	tag:"mo", output:"\u22C5", ttype:CONST},
+{input:"\\star",	tag:"mo", output:"\u22C6", ttype:CONST},
+{input:"\\ast",		tag:"mo", output:"\u002A", ttype:CONST},
+{input:"\\times",	tag:"mo", output:"\u00D7", ttype:CONST},
+{input:"\\div",		tag:"mo", output:"\u00F7", ttype:CONST},
+{input:"\\circ",	tag:"mo", output:"\u2218", ttype:CONST},
+//{input:"\\bullet",	  tag:"mo", output:"\u2219", ttype:CONST},
+{input:"\\bullet",	tag:"mo", output:"\u2022", ttype:CONST},
+{input:"\\oplus",	tag:"mo", output:"\u2295", ttype:CONST},
+{input:"\\ominus",	tag:"mo", output:"\u2296", ttype:CONST},
+{input:"\\otimes",	tag:"mo", output:"\u2297", ttype:CONST},
+{input:"\\bigcirc",	tag:"mo", output:"\u25CB", ttype:CONST},
+{input:"\\oslash",	tag:"mo", output:"\u2298", ttype:CONST},
+{input:"\\odot",	tag:"mo", output:"\u2299", ttype:CONST},
+{input:"\\land",	tag:"mo", output:"\u2227", ttype:CONST},
+{input:"\\wedge",	tag:"mo", output:"\u2227", ttype:CONST},
+{input:"\\lor",		tag:"mo", output:"\u2228", ttype:CONST},
+{input:"\\vee",		tag:"mo", output:"\u2228", ttype:CONST},
+{input:"\\cap",		tag:"mo", output:"\u2229", ttype:CONST},
+{input:"\\cup",		tag:"mo", output:"\u222A", ttype:CONST},
+{input:"\\sqcap",	tag:"mo", output:"\u2293", ttype:CONST},
+{input:"\\sqcup",	tag:"mo", output:"\u2294", ttype:CONST},
+{input:"\\uplus",	tag:"mo", output:"\u228E", ttype:CONST},
+{input:"\\amalg",	tag:"mo", output:"\u2210", ttype:CONST},
+{input:"\\bigtriangleup",tag:"mo",output:"\u25B3", ttype:CONST},
+{input:"\\bigtriangledown",tag:"mo",output:"\u25BD", ttype:CONST},
+{input:"\\dag",		tag:"mo", output:"\u2020", ttype:CONST},
+{input:"\\dagger",	tag:"mo", output:"\u2020", ttype:CONST},
+{input:"\\ddag",	tag:"mo", output:"\u2021", ttype:CONST},
+{input:"\\ddagger",	tag:"mo", output:"\u2021", ttype:CONST},
+{input:"\\lhd",		tag:"mo", output:"\u22B2", ttype:CONST},
+{input:"\\rhd",		tag:"mo", output:"\u22B3", ttype:CONST},
+{input:"\\unlhd",	tag:"mo", output:"\u22B4", ttype:CONST},
+{input:"\\unrhd",	tag:"mo", output:"\u22B5", ttype:CONST},
+
+
+//BIG Operators
+{input:"\\sum",		tag:"mo", output:"\u2211", ttype:UNDEROVER},
+{input:"\\prod",	tag:"mo", output:"\u220F", ttype:UNDEROVER},
+{input:"\\bigcap",	tag:"mo", output:"\u22C2", ttype:UNDEROVER},
+{input:"\\bigcup",	tag:"mo", output:"\u22C3", ttype:UNDEROVER},
+{input:"\\bigwedge",	tag:"mo", output:"\u22C0", ttype:UNDEROVER},
+{input:"\\bigvee",	tag:"mo", output:"\u22C1", ttype:UNDEROVER},
+{input:"\\bigsqcap",	tag:"mo", output:"\u2A05", ttype:UNDEROVER},
+{input:"\\bigsqcup",	tag:"mo", output:"\u2A06", ttype:UNDEROVER},
+{input:"\\coprod",	tag:"mo", output:"\u2210", ttype:UNDEROVER},
+{input:"\\bigoplus",	tag:"mo", output:"\u2A01", ttype:UNDEROVER},
+{input:"\\bigotimes",	tag:"mo", output:"\u2A02", ttype:UNDEROVER},
+{input:"\\bigodot",	tag:"mo", output:"\u2A00", ttype:UNDEROVER},
+{input:"\\biguplus",	tag:"mo", output:"\u2A04", ttype:UNDEROVER},
+{input:"\\int",		tag:"mo", output:"\u222B", ttype:CONST},
+{input:"\\oint",	tag:"mo", output:"\u222E", ttype:CONST},
+
+//binary relation symbols
+{input:":=",		tag:"mo", output:":=",	   ttype:CONST},
+{input:"\\colon",	tag:"mo", output:":",	   ttype:CONST}, // DPVC
+{input:"\\$",		tag:"mo", output:"$",	   ttype:CONST}, // DPVC
+{input:"\\lt",		tag:"mo", output:"<",	   ttype:CONST},
+{input:"\\gt",		tag:"mo", output:">",	   ttype:CONST},
+{input:"\\ne",		tag:"mo", output:"\u2260", ttype:CONST},
+{input:"\\neq",		tag:"mo", output:"\u2260", ttype:CONST},
+{input:"\\le",		tag:"mo", output:"\u2264", ttype:CONST},
+{input:"\\leq",		tag:"mo", output:"\u2264", ttype:CONST},
+{input:"\\leqslant",	tag:"mo", output:"\u2264", ttype:CONST},
+{input:"\\ge",		tag:"mo", output:"\u2265", ttype:CONST},
+{input:"\\geq",		tag:"mo", output:"\u2265", ttype:CONST},
+{input:"\\geqslant",	tag:"mo", output:"\u2265", ttype:CONST},
+{input:"\\equiv",	tag:"mo", output:"\u2261", ttype:CONST},
+{input:"\\ll",		tag:"mo", output:"\u226A", ttype:CONST},
+{input:"\\gg",		tag:"mo", output:"\u226B", ttype:CONST},
+{input:"\\doteq",	tag:"mo", output:"\u2250", ttype:CONST},
+{input:"\\prec",	tag:"mo", output:"\u227A", ttype:CONST},
+{input:"\\succ",	tag:"mo", output:"\u227B", ttype:CONST},
+{input:"\\preceq",	tag:"mo", output:"\u227C", ttype:CONST},
+{input:"\\succeq",	tag:"mo", output:"\u227D", ttype:CONST},
+{input:"\\subset",	tag:"mo", output:"\u2282", ttype:CONST},
+{input:"\\supset",	tag:"mo", output:"\u2283", ttype:CONST},
+{input:"\\subseteq",	tag:"mo", output:"\u2286", ttype:CONST},
+{input:"\\supseteq",	tag:"mo", output:"\u2287", ttype:CONST},
+{input:"\\sqsubset",	tag:"mo", output:"\u228F", ttype:CONST},
+{input:"\\sqsupset",	tag:"mo", output:"\u2290", ttype:CONST},
+{input:"\\sqsubseteq",  tag:"mo", output:"\u2291", ttype:CONST},
+{input:"\\sqsupseteq",  tag:"mo", output:"\u2292", ttype:CONST},
+{input:"\\sim",		tag:"mo", output:"\u223C", ttype:CONST},
+{input:"\\simeq",	tag:"mo", output:"\u2243", ttype:CONST},
+{input:"\\approx",	tag:"mo", output:"\u2248", ttype:CONST},
+{input:"\\cong",	tag:"mo", output:"\u2245", ttype:CONST},
+{input:"\\Join",	tag:"mo", output:"\u22C8", ttype:CONST},
+{input:"\\bowtie",	tag:"mo", output:"\u22C8", ttype:CONST},
+{input:"\\in",		tag:"mo", output:"\u2208", ttype:CONST},
+{input:"\\ni",		tag:"mo", output:"\u220B", ttype:CONST},
+{input:"\\owns",	tag:"mo", output:"\u220B", ttype:CONST},
+{input:"\\propto",	tag:"mo", output:"\u221D", ttype:CONST},
+{input:"\\vdash",	tag:"mo", output:"\u22A2", ttype:CONST},
+{input:"\\dashv",	tag:"mo", output:"\u22A3", ttype:CONST},
+{input:"\\models",	tag:"mo", output:"\u22A8", ttype:CONST},
+{input:"\\perp",	tag:"mo", output:"\u22A5", ttype:CONST},
+{input:"\\smile",	tag:"mo", output:"\u2323", ttype:CONST},
+{input:"\\frown",	tag:"mo", output:"\u2322", ttype:CONST},
+{input:"\\asymp",	tag:"mo", output:"\u224D", ttype:CONST},
+{input:"\\notin",	tag:"mo", output:"\u2209", ttype:CONST},
+
+//matrices
+{input:"\\begin{eqnarray}",	output:"X",	ttype:MATRIX, invisible:true},
+{input:"\\begin{array}",	output:"X",	ttype:MATRIX, invisible:true},
+{input:"\\\\",			output:"}&{",	ttype:DEFINITION},
+{input:"\\end{eqnarray}",	output:"}}",	ttype:DEFINITION},
+{input:"\\end{array}",		output:"}}",	ttype:DEFINITION},
+
+//grouping and literal brackets -- ieval is for IE
+{input:"\\big",	   tag:"mo", output:"X", atval:"1.2", ieval:"2.2", ttype:BIG},
+{input:"\\Big",	   tag:"mo", output:"X", atval:"1.6", ieval:"2.6", ttype:BIG},
+{input:"\\bigg",   tag:"mo", output:"X", atval:"2.2", ieval:"3.2", ttype:BIG},
+{input:"\\Bigg",   tag:"mo", output:"X", atval:"2.9", ieval:"3.9", ttype:BIG},
+{input:"\\left",   tag:"mo", output:"X", ttype:LEFTBRACKET},
+{input:"\\right",  tag:"mo", output:"X", ttype:RIGHTBRACKET},
+{input:"{",	   output:"{", ttype:LEFTBRACKET,  invisible:true},
+{input:"}",	   output:"}", ttype:RIGHTBRACKET, invisible:true},
+
+{input:"(",	   tag:"mo", output:"(",      atval:"1", ttype:STRETCHY},
+{input:"[",	   tag:"mo", output:"[",      atval:"1", ttype:STRETCHY},
+{input:"\\lbrack", tag:"mo", output:"[",      atval:"1", ttype:STRETCHY},
+{input:"\\{",	   tag:"mo", output:"{",      atval:"1", ttype:STRETCHY},
+{input:"\\lbrace", tag:"mo", output:"{",      atval:"1", ttype:STRETCHY},
+{input:"\\langle", tag:"mo", output:"\u2329", atval:"1", ttype:STRETCHY},
+{input:"\\lfloor", tag:"mo", output:"\u230A", atval:"1", ttype:STRETCHY},
+{input:"\\lceil",  tag:"mo", output:"\u2308", atval:"1", ttype:STRETCHY},
+
+// rtag:"mi" causes space to be inserted before a following sin, cos, etc.
+// (see function AMparseExpr() )
+{input:")",	  tag:"mo",output:")",	    rtag:"mi",atval:"1",ttype:STRETCHY},
+{input:"]",	  tag:"mo",output:"]",	    rtag:"mi",atval:"1",ttype:STRETCHY},
+{input:"\\rbrack",tag:"mo",output:"]",	    rtag:"mi",atval:"1",ttype:STRETCHY},
+{input:"\\}",	  tag:"mo",output:"}",	    rtag:"mi",atval:"1",ttype:STRETCHY},
+{input:"\\rbrace",tag:"mo",output:"}",	    rtag:"mi",atval:"1",ttype:STRETCHY},
+{input:"\\rangle",tag:"mo",output:"\u232A", rtag:"mi",atval:"1",ttype:STRETCHY},
+{input:"\\rfloor",tag:"mo",output:"\u230B", rtag:"mi",atval:"1",ttype:STRETCHY},
+{input:"\\rceil", tag:"mo",output:"\u2309", rtag:"mi",atval:"1",ttype:STRETCHY},
+
+// "|", "\\|", "\\vert" and "\\Vert" modified later: lspace = rspace = 0em
+{input:"|",		tag:"mo", output:"\u2223", atval:"1", ttype:STRETCHY},
+{input:"\\|",		tag:"mo", output:"\u2225", atval:"1", ttype:STRETCHY},
+{input:"\\vert",	tag:"mo", output:"\u2223", atval:"1", ttype:STRETCHY},
+{input:"\\Vert",	tag:"mo", output:"\u2225", atval:"1", ttype:STRETCHY},
+{input:"\\mid",		tag:"mo", output:"\u2223", atval:"1", ttype:STRETCHY},
+{input:"\\parallel",	tag:"mo", output:"\u2225", atval:"1", ttype:STRETCHY},
+{input:"/",		tag:"mo", output:"/",	atval:"1.01", ttype:STRETCHY},
+{input:"\\backslash",	tag:"mo", output:"\u2216", atval:"1", ttype:STRETCHY},
+{input:"\\setminus",	tag:"mo", output:"\\",	   ttype:CONST},
+
+//miscellaneous symbols
+{input:"\\!",	  tag:"mspace", atname:"width", atval:"-0.167em", ttype:SPACE},
+{input:"\\,",	  tag:"mspace", atname:"width", atval:"0.167em", ttype:SPACE},
+{input:"\\>",	  tag:"mspace", atname:"width", atval:"0.222em", ttype:SPACE},
+{input:"\\:",	  tag:"mspace", atname:"width", atval:"0.222em", ttype:SPACE},
+{input:"\\;",	  tag:"mspace", atname:"width", atval:"0.278em", ttype:SPACE},
+{input:"~",	  tag:"mspace", atname:"width", atval:"0.333em", ttype:SPACE},
+{input:"\\quad",  tag:"mspace", atname:"width", atval:"1em", ttype:SPACE},
+{input:"\\qquad", tag:"mspace", atname:"width", atval:"2em", ttype:SPACE},
+//{input:"{}",		  tag:"mo", output:"\u200B", ttype:CONST}, // zero-width
+{input:"\\prime",	tag:"mo", output:"\u2032", ttype:CONST},
+{input:"'",		tag:"mo", output:"\u02B9", ttype:CONST},
+{input:"''",		tag:"mo", output:"\u02BA", ttype:CONST},
+{input:"'''",		tag:"mo", output:"\u2034", ttype:CONST},
+{input:"''''",		tag:"mo", output:"\u2057", ttype:CONST},
+{input:"\\ldots",	tag:"mo", output:"\u2026", ttype:CONST},
+{input:"\\cdots",	tag:"mo", output:"\u22EF", ttype:CONST},
+{input:"\\vdots",	tag:"mo", output:"\u22EE", ttype:CONST},
+{input:"\\ddots",	tag:"mo", output:"\u22F1", ttype:CONST},
+{input:"\\forall",	tag:"mo", output:"\u2200", ttype:CONST},
+{input:"\\exists",	tag:"mo", output:"\u2203", ttype:CONST},
+{input:"\\Re",		tag:"mo", output:"\u211C", ttype:CONST},
+{input:"\\Im",		tag:"mo", output:"\u2111", ttype:CONST},
+{input:"\\aleph",	tag:"mo", output:"\u2135", ttype:CONST},
+{input:"\\hbar",	tag:"mo", output:"\u210F", ttype:CONST},
+{input:"\\ell",		tag:"mo", output:"\u2113", ttype:CONST},
+{input:"\\wp",		tag:"mo", output:"\u2118", ttype:CONST},
+{input:"\\emptyset",	tag:"mo", output:"\u2205", ttype:CONST},
+{input:"\\infty",	tag:"mo", output:"\u221E", ttype:CONST},
+{input:"\\surd",	tag:"mo", output:"\\sqrt{}", ttype:DEFINITION},
+{input:"\\partial",	tag:"mo", output:"\u2202", ttype:CONST},
+{input:"\\nabla",	tag:"mo", output:"\u2207", ttype:CONST},
+{input:"\\triangle",	tag:"mo", output:"\u25B3", ttype:CONST},
+{input:"\\therefore",	tag:"mo", output:"\u2234", ttype:CONST},
+{input:"\\angle",	tag:"mo", output:"\u2220", ttype:CONST},
+//{input:"\\\\ ",	  tag:"mo", output:"\u00A0", ttype:CONST},
+{input:"\\diamond",	tag:"mo", output:"\u22C4", ttype:CONST},
+//{input:"\\Diamond",	  tag:"mo", output:"\u25CA", ttype:CONST},
+{input:"\\Diamond",	tag:"mo", output:"\u25C7", ttype:CONST},
+{input:"\\neg",		tag:"mo", output:"\u00AC", ttype:CONST},
+{input:"\\lnot",	tag:"mo", output:"\u00AC", ttype:CONST},
+{input:"\\bot",		tag:"mo", output:"\u22A5", ttype:CONST},
+{input:"\\top",		tag:"mo", output:"\u22A4", ttype:CONST},
+{input:"\\square",	tag:"mo", output:"\u25AB", ttype:CONST},
+{input:"\\Box",		tag:"mo", output:"\u25A1", ttype:CONST},
+{input:"\\wr",		tag:"mo", output:"\u2240", ttype:CONST},
+
+//standard functions
+//Note UNDEROVER *must* have tag:"mo" to work properly
+{input:"\\arccos", tag:"mi", output:"arccos", ttype:UNARY, func:true},
+{input:"\\arcsin", tag:"mi", output:"arcsin", ttype:UNARY, func:true},
+{input:"\\arctan", tag:"mi", output:"arctan", ttype:UNARY, func:true},
+{input:"\\arg",	   tag:"mi", output:"arg",    ttype:UNARY, func:true},
+{input:"\\cos",	   tag:"mi", output:"cos",    ttype:UNARY, func:true},
+{input:"\\cosh",   tag:"mi", output:"cosh",   ttype:UNARY, func:true},
+{input:"\\cot",	   tag:"mi", output:"cot",    ttype:UNARY, func:true},
+{input:"\\coth",   tag:"mi", output:"coth",   ttype:UNARY, func:true},
+{input:"\\csc",	   tag:"mi", output:"csc",    ttype:UNARY, func:true},
+{input:"\\deg",	   tag:"mi", output:"deg",    ttype:UNARY, func:true},
+{input:"\\det",	   tag:"mi", output:"det",    ttype:UNARY, func:true},
+{input:"\\dim",	   tag:"mi", output:"dim",    ttype:UNARY, func:true}, //CONST?
+{input:"\\exp",	   tag:"mi", output:"exp",    ttype:UNARY, func:true},
+{input:"\\gcd",	   tag:"mi", output:"gcd",    ttype:UNARY, func:true}, //CONST?
+{input:"\\hom",	   tag:"mi", output:"hom",    ttype:UNARY, func:true},
+{input:"\\inf",	      tag:"mo", output:"inf",	 ttype:UNDEROVER},
+{input:"\\ker",	   tag:"mi", output:"ker",    ttype:UNARY, func:true},
+{input:"\\lg",	   tag:"mi", output:"lg",     ttype:UNARY, func:true},
+{input:"\\lim",	      tag:"mo", output:"lim",	 ttype:UNDEROVER},
+{input:"\\liminf",    tag:"mo", output:"liminf", ttype:UNDEROVER},
+{input:"\\limsup",    tag:"mo", output:"limsup", ttype:UNDEROVER},
+{input:"\\ln",	   tag:"mi", output:"ln",     ttype:UNARY, func:true},
+{input:"\\log",	   tag:"mi", output:"log",    ttype:UNARY, func:true},
+{input:"\\max",	      tag:"mo", output:"max",	 ttype:UNDEROVER},
+{input:"\\min",	      tag:"mo", output:"min",	 ttype:UNDEROVER},
+{input:"\\Pr",	   tag:"mi", output:"Pr",     ttype:UNARY, func:true},
+{input:"\\sec",	   tag:"mi", output:"sec",    ttype:UNARY, func:true},
+{input:"\\sin",	   tag:"mi", output:"sin",    ttype:UNARY, func:true},
+{input:"\\sinh",   tag:"mi", output:"sinh",   ttype:UNARY, func:true},
+{input:"\\sup",	      tag:"mo", output:"sup",	 ttype:UNDEROVER},
+{input:"\\tan",	   tag:"mi", output:"tan",    ttype:UNARY, func:true},
+{input:"\\tanh",   tag:"mi", output:"tanh",   ttype:UNARY, func:true},
+
+//arrows
+{input:"\\gets",		tag:"mo", output:"\u2190", ttype:CONST},
+{input:"\\leftarrow",		tag:"mo", output:"\u2190", ttype:CONST},
+{input:"\\to",			tag:"mo", output:"\u2192", ttype:CONST},
+{input:"\\rightarrow",		tag:"mo", output:"\u2192", ttype:CONST},
+{input:"\\leftrightarrow",	tag:"mo", output:"\u2194", ttype:CONST},
+{input:"\\uparrow",		tag:"mo", output:"\u2191", ttype:CONST},
+{input:"\\downarrow",		tag:"mo", output:"\u2193", ttype:CONST},
+{input:"\\updownarrow",		tag:"mo", output:"\u2195", ttype:CONST},
+{input:"\\Leftarrow",		tag:"mo", output:"\u21D0", ttype:CONST},
+{input:"\\Rightarrow",		tag:"mo", output:"\u21D2", ttype:CONST},
+{input:"\\Leftrightarrow",	tag:"mo", output:"\u21D4", ttype:CONST},
+{input:"\\iff", tag:"mo", output:"~\\Longleftrightarrow~", ttype:DEFINITION},
+{input:"\\Uparrow",		tag:"mo", output:"\u21D1", ttype:CONST},
+{input:"\\Downarrow",		tag:"mo", output:"\u21D3", ttype:CONST},
+{input:"\\Updownarrow",		tag:"mo", output:"\u21D5", ttype:CONST},
+{input:"\\mapsto",		tag:"mo", output:"\u21A6", ttype:CONST},
+{input:"\\longleftarrow",	tag:"mo", output:"\u2190", ttype:LONG},
+{input:"\\longrightarrow",	tag:"mo", output:"\u2192", ttype:LONG},
+{input:"\\longleftrightarrow",	tag:"mo", output:"\u2194", ttype:LONG},
+{input:"\\Longleftarrow",	tag:"mo", output:"\u21D0", ttype:LONG},
+{input:"\\Longrightarrow",	tag:"mo", output:"\u21D2", ttype:LONG},
+{input:"\\Longleftrightarrow",  tag:"mo", output:"\u21D4", ttype:LONG},
+{input:"\\longmapsto",		tag:"mo", output:"\u21A6", ttype:CONST},
+							// disaster if LONG
+
+//commands with argument
+AMsqrt, AMroot, AMfrac, AMover, AMsub, AMsup, AMtext, AMmbox, AMatop, AMchoose,
+//AMdiv, AMquote,
+
+//diacritical marks
+{input:"\\acute",	tag:"mover",  output:"\u00B4", ttype:UNARY, acc:true},
+//{input:"\\acute",	  tag:"mover",  output:"\u0317", ttype:UNARY, acc:true},
+//{input:"\\acute",	  tag:"mover",  output:"\u0301", ttype:UNARY, acc:true},
+//{input:"\\grave",	  tag:"mover",  output:"\u0300", ttype:UNARY, acc:true},
+//{input:"\\grave",	  tag:"mover",  output:"\u0316", ttype:UNARY, acc:true},
+{input:"\\grave",	tag:"mover",  output:"\u0060", ttype:UNARY, acc:true},
+{input:"\\breve",	tag:"mover",  output:"\u02D8", ttype:UNARY, acc:true},
+{input:"\\check",	tag:"mover",  output:"\u02C7", ttype:UNARY, acc:true},
+{input:"\\dot",		tag:"mover",  output:".",      ttype:UNARY, acc:true},
+{input:"\\ddot",	tag:"mover",  output:"..",     ttype:UNARY, acc:true},
+//{input:"\\ddot",	  tag:"mover",  output:"\u00A8", ttype:UNARY, acc:true},
+{input:"\\mathring",	tag:"mover",  output:"\u00B0", ttype:UNARY, acc:true},
+{input:"\\vec",		tag:"mover",  output:"\u20D7", ttype:UNARY, acc:true},
+{input:"\\overrightarrow",tag:"mover",output:"\u20D7", ttype:UNARY, acc:true},
+{input:"\\overleftarrow",tag:"mover", output:"\u20D6", ttype:UNARY, acc:true},
+{input:"\\hat",		tag:"mover",  output:"\u005E", ttype:UNARY, acc:true},
+{input:"\\widehat",	tag:"mover",  output:"\u0302", ttype:UNARY, acc:true},
+{input:"\\tilde",	tag:"mover",  output:"~",      ttype:UNARY, acc:true},
+//{input:"\\tilde",	  tag:"mover",  output:"\u0303", ttype:UNARY, acc:true},
+{input:"\\widetilde",	tag:"mover",  output:"\u02DC", ttype:UNARY, acc:true},
+{input:"\\bar",		tag:"mover",  output:"\u203E", ttype:UNARY, acc:true},
+{input:"\\overbrace",	tag:"mover",  output:"\u23B4", ttype:UNARY, acc:true},
+{input:"\\overline",	tag:"mover",  output:"\u00AF", ttype:UNARY, acc:true},
+{input:"\\underbrace",  tag:"munder", output:"\u23B5", ttype:UNARY, acc:true},
+{input:"\\underline",	tag:"munder", output:"\u00AF", ttype:UNARY, acc:true},
+//{input:"underline",	tag:"munder", output:"\u0332", ttype:UNARY, acc:true},
+
+//typestyles and fonts
+{input:"\\displaystyle",tag:"mstyle",atname:"displaystyle",atval:"true", ttype:UNARY},
+{input:"\\textstyle",tag:"mstyle",atname:"displaystyle",atval:"false", ttype:UNARY},
+{input:"\\scriptstyle",tag:"mstyle",atname:"scriptlevel",atval:"1", ttype:UNARY},
+{input:"\\scriptscriptstyle",tag:"mstyle",atname:"scriptlevel",atval:"2", ttype:UNARY},
+{input:"\\textrm", tag:"mstyle", output:"\\mathrm", ttype: DEFINITION},
+{input:"\\mathbf", tag:"mstyle", atname:"mathvariant", atval:"bold", ttype:UNARY},
+{input:"\\textbf", tag:"mstyle", atname:"mathvariant", atval:"bold", ttype:UNARY},
+{input:"\\mathit", tag:"mstyle", atname:"mathvariant", atval:"italic", ttype:UNARY},
+{input:"\\textit", tag:"mstyle", atname:"mathvariant", atval:"italic", ttype:UNARY},
+{input:"\\mathtt", tag:"mstyle", atname:"mathvariant", atval:"monospace", ttype:UNARY},
+{input:"\\texttt", tag:"mstyle", atname:"mathvariant", atval:"monospace", ttype:UNARY},
+{input:"\\mathsf", tag:"mstyle", atname:"mathvariant", atval:"sans-serif", ttype:UNARY},
+{input:"\\mathbb", tag:"mstyle", atname:"mathvariant", atval:"double-struck", ttype:UNARY, codes:AMbbb},
+{input:"\\mathcal",tag:"mstyle", atname:"mathvariant", atval:"script", ttype:UNARY, codes:AMcal},
+{input:"\\mathfrak",tag:"mstyle",atname:"mathvariant", atval:"fraktur",ttype:UNARY, codes:AMfrk},
+{input:"\\rm",     tag:"mstyle", output:"\\mathrm", ttype: DEFINITION},             // DPVC
+{input:"\\bf",     tag:"mstyle", atname:"mathvariant", atval:"bold", ttype:UNARY},  // DPVC
+{input:"\\it",     tag:"mstyle", atname:"mathvariant", atval:"italic", ttype:UNARY} // DPVC
+];
+
+function compareNames(s1,s2) {
+  if (s1.input > s2.input) return 1
+  else return -1;
+}
+
+var AMnames = []; //list of input symbols
+
+function AMinitSymbols() {
+  AMsymbols.sort(compareNames);
+  for (i=0; i<AMsymbols.length; i++) AMnames[i] = AMsymbols[i].input;
+}
+
+var AMmathml = "http://www.w3.org/1998/Math/MathML";
+
+function AMcreateElementMathML(t) {
+  if (isIE) return document.createElement("m:"+t);
+  else return document.createElementNS(AMmathml,t);
+}
+
+function AMcreateMmlNode(t,frag) {
+//  var node = AMcreateElementMathML(name);
+  if (isIE) var node = document.createElement("m:"+t);
+  else var node = document.createElementNS(AMmathml,t);
+  node.appendChild(frag);
+  return node;
+}
+
+function newcommand(oldstr,newstr) {
+  AMsymbols = AMsymbols.concat([{input:oldstr, tag:"mo", output:newstr,
+                                 ttype:DEFINITION}]);
+}
+
+function AMremoveCharsAndBlanks(str,n) {
+//remove n characters and any following blanks
+  var st;
+  st = str.slice(n);
+  for (var i=0; i<st.length && st.charCodeAt(i)<=32; i=i+1);
+  return st.slice(i);
+}
+
+function AMposition(arr, str, n) {
+// return position >=n where str appears or would be inserted
+// assumes arr is sorted
+  if (n==0) {
+    var h,m;
+    n = -1;
+    h = arr.length;
+    while (n+1<h) {
+      m = (n+h) >> 1;
+      if (arr[m]<str) n = m; else h = m;
+    }
+    return h;
+  } else
+    for (var i=n; i<arr.length && arr[i]<str; i++);
+  return i; // i=arr.length || arr[i]>=str
+}
+
+function AMgetSymbol(str) {
+//return maximal initial substring of str that appears in names
+//return null if there is none
+  var k = 0; //new pos
+  var j = 0; //old pos
+  var mk; //match pos
+  var st;
+  var tagst;
+  var match = "";
+  var more = true;
+  for (var i=1; i<=str.length && more; i++) {
+    st = str.slice(0,i); //initial substring of length i
+    j = k;
+    k = AMposition(AMnames, st, j);
+    if (k<AMnames.length && str.slice(0,AMnames[k].length)==AMnames[k]){
+      match = AMnames[k];
+      mk = k;
+      i = match.length;
+    }
+    more = k<AMnames.length && str.slice(0,AMnames[k].length)>=AMnames[k];
+  }
+  AMpreviousSymbol=AMcurrentSymbol;
+  if (match!=""){
+    AMcurrentSymbol=AMsymbols[mk].ttype;
+    return AMsymbols[mk];
+  }
+  AMcurrentSymbol=CONST;
+  k = 1;
+  st = str.slice(0,1); //take 1 character
+  if ("0"<=st && st<="9") tagst = "mn";
+  else tagst = (("A">st || st>"Z") && ("a">st || st>"z")?"mo":"mi");
+/*
+// Commented out by DRW (not fully understood, but probably to do with
+// use of "/" as an INFIX version of "\\frac", which we don't want):
+//}
+//if (st=="-" && AMpreviousSymbol==INFIX) {
+//  AMcurrentSymbol = INFIX;  //trick "/" into recognizing "-" on second parse
+//  return {input:st, tag:tagst, output:st, ttype:UNARY, func:true};
+//}
+*/
+  return {input:st, tag:tagst, output:st, ttype:CONST};
+}
+
+
+/*Parsing ASCII math expressions with the following grammar
+v ::= [A-Za-z] | greek letters | numbers | other constant symbols
+u ::= sqrt | text | bb | other unary symbols for font commands
+b ::= frac | root | stackrel	binary symbols
+l ::= { | \left			left brackets
+r ::= } | \right		right brackets
+S ::= v | lEr | uS | bSS	Simple expression
+I ::= S_S | S^S | S_S^S | S	Intermediate expression
+E ::= IE | I/I			Expression
+Each terminal symbol is translated into a corresponding mathml node.*/
+
+var AMpreviousSymbol,AMcurrentSymbol;
+
+function AMparseSexpr(str) { //parses str and returns [node,tailstr,(node)tag]
+  var symbol, node, result, result2, i, st,// rightvert = false,
+    newFrag = document.createDocumentFragment();
+  str = AMremoveCharsAndBlanks(str,0);
+  symbol = AMgetSymbol(str);             //either a token or a bracket or empty
+  if (symbol == null || symbol.ttype == RIGHTBRACKET)
+    return [null,str,null];
+  if (symbol.ttype == DEFINITION) {
+    str = symbol.output+AMremoveCharsAndBlanks(str,symbol.input.length);
+    symbol = AMgetSymbol(str);
+    if (symbol == null || symbol.ttype == RIGHTBRACKET)
+      return [null,str,null];
+  }
+  str = AMremoveCharsAndBlanks(str,symbol.input.length);
+  switch (symbol.ttype) {
+  case SPACE:
+    node = AMcreateElementMathML(symbol.tag);
+    node.setAttribute(symbol.atname,symbol.atval);
+    return [node,str,symbol.tag];
+  case UNDEROVER:
+    if (isIE) {
+      if (symbol.input.substr(0,4) == "\\big") {   // botch for missing symbols
+	str = "\\"+symbol.input.substr(4)+str;	   // make \bigcup = \cup etc.
+	symbol = AMgetSymbol(str);
+	symbol.ttype = UNDEROVER;
+	str = AMremoveCharsAndBlanks(str,symbol.input.length);
+      }
+    }
+    return [AMcreateMmlNode(symbol.tag,
+			document.createTextNode(symbol.output)),str,symbol.tag];
+  case CONST:
+    var output = symbol.output;
+    if (isIE) {
+      if (symbol.input == "'")
+	output = "\u2032";
+      else if (symbol.input == "''")
+	output = "\u2033";
+      else if (symbol.input == "'''")
+	output = "\u2033\u2032";
+      else if (symbol.input == "''''")
+	output = "\u2033\u2033";
+      else if (symbol.input == "\\square")
+	output = "\u25A1";	// same as \Box
+      else if (symbol.input.substr(0,5) == "\\frac") {
+						// botch for missing fractions
+	var denom = symbol.input.substr(6,1);
+	if (denom == "5" || denom == "6") {
+	  str = symbol.input.replace(/\\frac/,"\\frac ")+str;
+	  return [node,str,symbol.tag];
+	}
+      }
+    }
+    node = AMcreateMmlNode(symbol.tag,document.createTextNode(output));
+    return [node,str,symbol.tag];
+  case LONG:  // added by DRW
+    node = AMcreateMmlNode(symbol.tag,document.createTextNode(symbol.output));
+    node.setAttribute("minsize","1.5");
+    node.setAttribute("maxsize","1.5");
+    node = AMcreateMmlNode("mover",node);
+    node.appendChild(AMcreateElementMathML("mspace"));
+    return [node,str,symbol.tag];
+  case STRETCHY:  // added by DRW
+    if (isIE && symbol.input == "\\backslash")
+	symbol.output = "\\";	// doesn't expand, but then nor does "\u2216"
+    node = AMcreateMmlNode(symbol.tag,document.createTextNode(symbol.output));
+    if (symbol.input == "|" || symbol.input == "\\vert" ||
+	symbol.input == "\\|" || symbol.input == "\\Vert") {
+	  node.setAttribute("lspace","0em");
+	  node.setAttribute("rspace","0em");
+    }
+    node.setAttribute("maxsize",symbol.atval);  // don't allow to stretch here
+    if (symbol.rtag != null)
+      return [node,str,symbol.rtag];
+    else
+      return [node,str,symbol.tag];
+  case BIG:  // added by DRW
+    var atval = symbol.atval;
+    if (isIE)
+      atval = symbol.ieval;
+    symbol = AMgetSymbol(str);
+    if (symbol == null)
+	return [null,str,null];
+    str = AMremoveCharsAndBlanks(str,symbol.input.length);
+    node = AMcreateMmlNode(symbol.tag,document.createTextNode(symbol.output));
+    if (isIE) {		// to get brackets to expand
+      var space = AMcreateElementMathML("mspace");
+      space.setAttribute("height",atval+"ex");
+      node = AMcreateMmlNode("mrow",node);
+      node.appendChild(space);
+    } else {		// ignored in IE
+      node.setAttribute("minsize",atval);
+      node.setAttribute("maxsize",atval);
+    }
+    return [node,str,symbol.tag];
+  case LEFTBRACKET:   //read (expr+)
+    if (symbol.input == "\\left") { // left what?
+      symbol = AMgetSymbol(str);
+      if (symbol != null) {
+	if (symbol.input == ".")
+	  symbol.invisible = true;
+	str = AMremoveCharsAndBlanks(str,symbol.input.length);
+      }
+    }
+    result = AMparseExpr(str,true,false);
+    if (symbol==null ||
+	(typeof symbol.invisible == "boolean" && symbol.invisible))
+      node = AMcreateMmlNode("mrow",result[0]);
+    else {
+      node = AMcreateMmlNode("mo",document.createTextNode(symbol.output));
+      node = AMcreateMmlNode("mrow",node);
+      node.appendChild(result[0]);
+    }
+    return [node,result[1],result[2]];
+  case MATRIX:	 //read (expr+)
+    if (symbol.input == "\\begin{array}") {
+      var mask = "";
+      symbol = AMgetSymbol(str);
+      str = AMremoveCharsAndBlanks(str,0);
+      if (symbol == null)
+	mask = "l";
+      else {
+	str = AMremoveCharsAndBlanks(str,symbol.input.length);
+	if (symbol.input != "{")
+	  mask = "l";
+	else do {
+	  symbol = AMgetSymbol(str);
+	  if (symbol != null) {
+	    str = AMremoveCharsAndBlanks(str,symbol.input.length);
+	    if (symbol.input != "}")
+	      mask = mask+symbol.input;
+	  }
+	} while (symbol != null && symbol.input != "" && symbol.input != "}");
+      }
+      result = AMparseExpr("{"+str,true,true);
+//    if (result[0]==null) return [AMcreateMmlNode("mo",
+//			   document.createTextNode(symbol.input)),str];
+      node = AMcreateMmlNode("mtable",result[0]);
+      mask = mask.replace(/l/g,"left ");
+      mask = mask.replace(/r/g,"right ");
+      mask = mask.replace(/c/g,"center ");
+      node.setAttribute("columnalign",mask);
+      node.setAttribute("displaystyle","false");
+      if (isIE)
+	return [node,result[1],null];
+// trying to get a *little* bit of space around the array
+// (IE already includes it)
+      var lspace = AMcreateElementMathML("mspace");
+      lspace.setAttribute("width","0.167em");
+      var rspace = AMcreateElementMathML("mspace");
+      rspace.setAttribute("width","0.167em");
+      var node1 = AMcreateMmlNode("mrow",lspace);
+      node1.appendChild(node);
+      node1.appendChild(rspace);
+      return [node1,result[1],null];
+    } else {	// eqnarray
+      result = AMparseExpr("{"+str,true,true);
+      node = AMcreateMmlNode("mtable",result[0]);
+      if (isIE)
+	node.setAttribute("columnspacing","0.25em"); // best in practice?
+      else
+	node.setAttribute("columnspacing","0.167em"); // correct (but ignored?)
+      node.setAttribute("columnalign","right center left");
+      node.setAttribute("displaystyle","true");
+      node = AMcreateMmlNode("mrow",node);
+      return [node,result[1],null];
+    }
+  case TEXT:
+      if (str.charAt(0)=="{") i=str.indexOf("}");
+      else i = 0;
+      if (i==-1)
+		 i = str.length;
+      st = str.slice(1,i);
+      if (st.charAt(0) == " ") {
+	node = AMcreateElementMathML("mspace");
+	node.setAttribute("width","0.33em");	// was 1ex
+	newFrag.appendChild(node);
+      }
+      newFrag.appendChild(
+        AMcreateMmlNode(symbol.tag,document.createTextNode(st)));
+      if (st.charAt(st.length-1) == " ") {
+	node = AMcreateElementMathML("mspace");
+	node.setAttribute("width","0.33em");	// was 1ex
+	newFrag.appendChild(node);
+      }
+      str = AMremoveCharsAndBlanks(str,i+1);
+      return [AMcreateMmlNode("mrow",newFrag),str,null];
+  case UNARY:
+      result = AMparseSexpr(str);
+      if (result[0]==null) return [AMcreateMmlNode(symbol.tag,
+                             document.createTextNode(symbol.output)),str];
+      if (typeof symbol.func == "boolean" && symbol.func) { // functions hack
+	st = str.charAt(0);
+//	if (st=="^" || st=="_" || st=="/" || st=="|" || st==",") {
+	if (st=="^" || st=="_" || st==",") {
+	  return [AMcreateMmlNode(symbol.tag,
+		    document.createTextNode(symbol.output)),str,symbol.tag];
+        } else {
+	  node = AMcreateMmlNode("mrow",
+	   AMcreateMmlNode(symbol.tag,document.createTextNode(symbol.output)));
+	  if (isIE) {
+	    var space = AMcreateElementMathML("mspace");
+	    space.setAttribute("width","0.167em");
+	    node.appendChild(space);
+	  }
+	  node.appendChild(result[0]);
+	  return [node,result[1],symbol.tag];
+        }
+      }
+      if (symbol.input == "\\sqrt") {		// sqrt
+	if (isIE) {	// set minsize, for \surd
+	  var space = AMcreateElementMathML("mspace");
+	  space.setAttribute("height","1.2ex");
+	  space.setAttribute("width","0em");	// probably no effect
+	  node = AMcreateMmlNode(symbol.tag,result[0])
+//	  node.setAttribute("minsize","1");	// ignored
+//	  node = AMcreateMmlNode("mrow",node);  // hopefully unnecessary
+	  node.appendChild(space);
+	  return [node,result[1],symbol.tag];
+	} else
+	  return [AMcreateMmlNode(symbol.tag,result[0]),result[1],symbol.tag];
+      } else if (typeof symbol.acc == "boolean" && symbol.acc) {   // accent
+        node = AMcreateMmlNode(symbol.tag,result[0]);
+	var output = symbol.output;
+	if (isIE) {
+		if (symbol.input == "\\hat")
+			output = "\u0302";
+		else if (symbol.input == "\\widehat")
+			output = "\u005E";
+		else if (symbol.input == "\\bar")
+			output = "\u00AF";
+		else if (symbol.input == "\\grave")
+			output = "\u0300";
+		else if (symbol.input == "\\tilde")
+			output = "\u0303";
+	}
+	var node1 = AMcreateMmlNode("mo",document.createTextNode(output));
+	if (symbol.input == "\\vec" || symbol.input == "\\check")
+						// don't allow to stretch
+	    node1.setAttribute("maxsize","1.2");
+		 // why doesn't "1" work?  \vec nearly disappears in firefox
+	if (isIE && symbol.input == "\\bar")
+	    node1.setAttribute("maxsize","0.5");
+	if (symbol.input == "\\underbrace" || symbol.input == "\\underline")
+	  node1.setAttribute("accentunder","true");
+	else
+	  node1.setAttribute("accent","true");
+	node.appendChild(node1);
+	if (symbol.input == "\\overbrace" || symbol.input == "\\underbrace")
+	  node.ttype = UNDEROVER;
+	return [node,result[1],symbol.tag];
+      } else {			      // font change or displaystyle command
+        if (!isIE && typeof symbol.codes != "undefined") {
+          for (i=0; i<result[0].childNodes.length; i++)
+            if (result[0].childNodes[i].nodeName=="mi" || result[0].nodeName=="mi") {
+              st = (result[0].nodeName=="mi"?result[0].firstChild.nodeValue:
+                              result[0].childNodes[i].firstChild.nodeValue);
+              var newst = [];
+              for (var j=0; j<st.length; j++)
+                if (st.charCodeAt(j)>64 && st.charCodeAt(j)<91) newst = newst +
+                  String.fromCharCode(symbol.codes[st.charCodeAt(j)-65]);
+                else newst = newst + st.charAt(j);
+              if (result[0].nodeName=="mi")
+                result[0]=AMcreateElementMathML("mo").
+                          appendChild(document.createTextNode(newst));
+              else result[0].replaceChild(AMcreateElementMathML("mo").
+          appendChild(document.createTextNode(newst)),result[0].childNodes[i]);
+            }
+        }
+        node = AMcreateMmlNode(symbol.tag,result[0]);
+        node.setAttribute(symbol.atname,symbol.atval);
+	if (symbol.input == "\\scriptstyle" ||
+	    symbol.input == "\\scriptscriptstyle")
+		node.setAttribute("displaystyle","false");
+	return [node,result[1],symbol.tag];
+      }
+  case BINARY:
+    result = AMparseSexpr(str);
+    if (result[0]==null) return [AMcreateMmlNode("mo",
+			   document.createTextNode(symbol.input)),str,null];
+    result2 = AMparseSexpr(result[1]);
+    if (result2[0]==null) return [AMcreateMmlNode("mo",
+			   document.createTextNode(symbol.input)),str,null];
+    if (symbol.input=="\\root" || symbol.input=="\\stackrel")
+      newFrag.appendChild(result2[0]);
+    newFrag.appendChild(result[0]);
+    if (symbol.input=="\\frac") newFrag.appendChild(result2[0]);
+    return [AMcreateMmlNode(symbol.tag,newFrag),result2[1],symbol.tag];
+  case INFIX:
+    str = AMremoveCharsAndBlanks(str,symbol.input.length);
+    return [AMcreateMmlNode("mo",document.createTextNode(symbol.output)),
+	str,symbol.tag];
+  default:
+    return [AMcreateMmlNode(symbol.tag,        //its a constant
+	document.createTextNode(symbol.output)),str,symbol.tag];
+  }
+}
+
+function AMparseIexpr(str) {
+  var symbol, sym1, sym2, node, result, tag, underover;
+  str = AMremoveCharsAndBlanks(str,0);
+  sym1 = AMgetSymbol(str);
+  result = AMparseSexpr(str);
+  node = result[0];
+  str = result[1];
+  tag = result[2];
+  symbol = AMgetSymbol(str);
+  if (symbol.ttype == INFIX) {
+    str = AMremoveCharsAndBlanks(str,symbol.input.length);
+    result = AMparseSexpr(str);
+    if (result[0] == null) // show box in place of missing argument
+      result[0] = AMcreateMmlNode("mo",document.createTextNode("\u25A1"));
+    str = result[1];
+    tag = result[2];
+    if (symbol.input == "_" || symbol.input == "^") {
+      sym2 = AMgetSymbol(str);
+      tag = null;	// no space between x^2 and a following sin, cos, etc.
+// This is for \underbrace and \overbrace
+      underover = ((sym1.ttype == UNDEROVER) || (node.ttype == UNDEROVER));
+//    underover = (sym1.ttype == UNDEROVER);
+      if (symbol.input == "_" && sym2.input == "^") {
+        str = AMremoveCharsAndBlanks(str,sym2.input.length);
+        var res2 = AMparseSexpr(str);
+	str = res2[1];
+	tag = res2[2];  // leave space between x_1^2 and a following sin etc.
+        node = AMcreateMmlNode((underover?"munderover":"msubsup"),node);
+        node.appendChild(result[0]);
+        node.appendChild(res2[0]);
+      } else if (symbol.input == "_") {
+	node = AMcreateMmlNode((underover?"munder":"msub"),node);
+        node.appendChild(result[0]);
+      } else {
+	node = AMcreateMmlNode((underover?"mover":"msup"),node);
+        node.appendChild(result[0]);
+      }
+      node = AMcreateMmlNode("mrow",node); // so sum does not stretch
+    } else {
+      node = AMcreateMmlNode(symbol.tag,node);
+      if (symbol.input == "\\atop" || symbol.input == "\\choose")
+	node.setAttribute("linethickness","0ex");
+      node.appendChild(result[0]);
+      if (symbol.input == "\\choose")
+	node = AMcreateMmlNode("mfenced",node);
+    }
+  }
+  return [node,str,tag];
+}
+
+function AMparseExpr(str,rightbracket,matrix) {
+  var symbol, node, result, i, tag,
+  newFrag = document.createDocumentFragment();
+  do {
+    str = AMremoveCharsAndBlanks(str,0);
+    result = AMparseIexpr(str);
+    node = result[0];
+    str = result[1];
+    tag = result[2];
+    symbol = AMgetSymbol(str);
+    if (node!=undefined) {
+      if ((tag == "mn" || tag == "mi") && symbol!=null &&
+	typeof symbol.func == "boolean" && symbol.func) {
+			// Add space before \sin in 2\sin x or x\sin x
+	  var space = AMcreateElementMathML("mspace");
+	  space.setAttribute("width","0.167em");
+	  node = AMcreateMmlNode("mrow",node);
+	  node.appendChild(space);
+      }
+      newFrag.appendChild(node);
+    }
+  } while ((symbol.ttype != RIGHTBRACKET)
+        && symbol!=null && symbol.output!="");
+  tag = null;
+  if (symbol.ttype == RIGHTBRACKET) {
+    if (symbol.input == "\\right") { // right what?
+      str = AMremoveCharsAndBlanks(str,symbol.input.length);
+      symbol = AMgetSymbol(str);
+      if (symbol != null && symbol.input == ".")
+	symbol.invisible = true;
+      if (symbol != null)
+	tag = symbol.rtag;
+    }
+    if (symbol!=null)
+      str = AMremoveCharsAndBlanks(str,symbol.input.length); // ready to return
+    var len = newFrag.childNodes.length;
+    if (matrix &&
+      len>0 && newFrag.childNodes[len-1].nodeName == "mrow" && len>1 &&
+      newFrag.childNodes[len-2].nodeName == "mo" &&
+      newFrag.childNodes[len-2].firstChild.nodeValue == "&") { //matrix
+	var pos = []; // positions of ampersands
+        var m = newFrag.childNodes.length;
+        for (i=0; matrix && i<m; i=i+2) {
+          pos[i] = [];
+          node = newFrag.childNodes[i];
+	  for (var j=0; j<node.childNodes.length; j++)
+	    if (node.childNodes[j].firstChild.nodeValue=="&")
+	      pos[i][pos[i].length]=j;
+        }
+	var row, frag, n, k, table = document.createDocumentFragment();
+	for (i=0; i<m; i=i+2) {
+	  row = document.createDocumentFragment();
+	  frag = document.createDocumentFragment();
+	  node = newFrag.firstChild; // <mrow> -&-&...&-&- </mrow>
+	  n = node.childNodes.length;
+	  k = 0;
+	  for (j=0; j<n; j++) {
+	    if (typeof pos[i][k] != "undefined" && j==pos[i][k]){
+	      node.removeChild(node.firstChild); //remove &
+	      row.appendChild(AMcreateMmlNode("mtd",frag));
+	      k++;
+	    } else frag.appendChild(node.firstChild);
+	  }
+	  row.appendChild(AMcreateMmlNode("mtd",frag));
+	  if (newFrag.childNodes.length>2) {
+	    newFrag.removeChild(newFrag.firstChild); //remove <mrow> </mrow>
+	    newFrag.removeChild(newFrag.firstChild); //remove <mo>&</mo>
+	  }
+	  table.appendChild(AMcreateMmlNode("mtr",row));
+	}
+	return [table,str];
+    }
+    if (typeof symbol.invisible != "boolean" || !symbol.invisible) {
+      node = AMcreateMmlNode("mo",document.createTextNode(symbol.output));
+      newFrag.appendChild(node);
+    }
+  }
+  return [newFrag,str,tag];
+}
+
+function AMparseMath(str) {
+  var result, node = AMcreateElementMathML("mstyle");
+  if (mathcolor != "") node.setAttribute("mathcolor",mathcolor);
+  if (mathfontfamily != "") node.setAttribute("fontfamily",mathfontfamily);
+  node.appendChild(AMparseExpr(str.replace(/^\s+/g,""),false,false)[0]);
+  node = AMcreateMmlNode("math",node);
+  if (showasciiformulaonhover)                      //fixed by djhsu so newline
+    node.setAttribute("title",str.replace(/\s+/g," "));//does not show in Gecko
+  if (mathfontfamily != "" && (isIE || mathfontfamily != "serif")) {
+    var fnode = AMcreateElementXHTML("font");
+    fnode.setAttribute("face",mathfontfamily);
+    fnode.appendChild(node);
+    return fnode;
+  }
+  return node;
+}
+
+function AMstrarr2docFrag(arr, linebreaks) {
+  var newFrag=document.createDocumentFragment();
+  var expr = false;
+  for (var i=0; i<arr.length; i++) {
+    if (expr) newFrag.appendChild(AMparseMath(arr[i]));
+    else {
+      var arri = (linebreaks ? arr[i].split("\n\n") : [arr[i]]);
+      newFrag.appendChild(AMcreateElementXHTML("span").
+      appendChild(document.createTextNode(arri[0])));
+      for (var j=1; j<arri.length; j++) {
+        newFrag.appendChild(AMcreateElementXHTML("p"));
+        newFrag.appendChild(AMcreateElementXHTML("span").
+        appendChild(document.createTextNode(arri[j])));
+      }
+    }
+    expr = !expr;
+  }
+  return newFrag;
+}
+
+function AMprocessNodeR(n, linebreaks) {
+  var mtch, str, arr, frg, i;
+  if (n.childNodes.length == 0) {
+   if ((n.nodeType!=8 || linebreaks) &&
+    n.parentNode.nodeName!="form" && n.parentNode.nodeName!="FORM" &&
+    n.parentNode.nodeName!="textarea" && n.parentNode.nodeName!="TEXTAREA" &&
+    n.parentNode.nodeName!="pre" && n.parentNode.nodeName!="PRE") {
+    str = n.nodeValue;
+    if (!(str == null)) {
+      str = str.replace(/\r\n\r\n/g,"\n\n");
+      str = str.replace(/\x20+/g," ");
+      str = str.replace(/\s*\r\n/g," ");
+// DELIMITERS:
+      mtch = (str.indexOf("\$\$")==-1 ? false : true);   //  DPVC use $$ instead of $
+//      str = str.replace(/([^\\])\$/g,"$1 \$");         //  DPVC no need for these with $$
+//      str = str.replace(/^\$/," \$");	// in case \$ at start of string
+      arr = str.split("\$\$");                           // DPVC split on $$ 
+//      for (i=0; i<arr.length; i++)             // DPVC (use \$ macro above instead)
+//	arr[i]=arr[i].replace(/\\\$/g,"\$");     // DPVC
+      if (arr.length>1 || mtch) {
+        if (checkForMathML) {
+          checkForMathML = false;
+          var nd = AMisMathMLavailable();
+          AMnoMathML = nd != null;
+          if (AMnoMathML && notifyIfNoMathML)
+            if (alertIfNoMathML)
+              alert("To view the ASCIIMathML notation use Internet Explorer 6 +\nMathPlayer (free from www.dessci.com)\n\
+                or Firefox/Mozilla/Netscape");
+            else AMbody.insertBefore(nd,AMbody.childNodes[0]);
+        }
+        if (!AMnoMathML) {
+          frg = AMstrarr2docFrag(arr,n.nodeType==8);
+          var len = frg.childNodes.length;
+          n.parentNode.replaceChild(frg,n);
+          return len-1;
+        } else return 0;
+      }
+    }
+   } else return 0;
+  } else if (n.nodeName!="math") {
+    for (i=0; i<n.childNodes.length; i++)
+      i += AMprocessNodeR(n.childNodes[i], linebreaks);
+  }
+  return 0;
+}
+
+function AMprocessNode(n, linebreaks, spanclassAM) {
+  var frag,st;
+  if (spanclassAM!=null) {
+    frag = document.getElementsByTagName("span")
+    for (var i=0;i<frag.length;i++)
+      if (frag[i].className == "AM")
+        AMprocessNodeR(frag[i],linebreaks);
+  } else {
+    try {
+      st = n.innerHTML;
+    } catch(err) {}
+// DELIMITERS:
+    if (st==null || st.indexOf("\$\$")!=-1)    // DPVC (use $$ not $ for delimiter)
+      AMprocessNodeR(n,linebreaks);
+  }
+  if (isIE) { //needed to match size and font of formula to surrounding text
+    frag = document.getElementsByTagName('math');
+    for (var i=0;i<frag.length;i++) frag[i].update()
+  }
+}
+
+var AMbody;
+var AMnoMathML = false, AMtranslated = false;
+
+function translate(spanclassAM) {
+  if (!AMtranslated) { // run this only once
+    AMtranslated = true;
+    AMinitSymbols();
+    AMbody = document.getElementsByTagName("body")[0];
+    AMprocessNode(AMbody, false, spanclassAM);
+  }
+}
+
+if (isIE) { // avoid adding MathPlayer info explicitly to each webpage
+  document.write("<object id=\"mathplayer\"\
+  classid=\"clsid:32F66A20-7614-11D4-BD11-00104BD3F987\"></object>");
+  document.write("<?import namespace=\"m\" implementation=\"#mathplayer\"?>");
+}
+
+// GO1.1 Generic onload by Brothercake
+// http://www.brothercake.com/
+//onload function (replaces the onload="translate()" in the <body> tag)
+function generic()
+{
+  translate();
+};
+//setup onload function
+if(typeof window.addEventListener != 'undefined')
+{
+  //.. gecko, safari, konqueror and standard
+  window.addEventListener('load', generic, false);
+}
+else if(typeof document.addEventListener != 'undefined')
+{
+  //.. opera 7
+  document.addEventListener('load', generic, false);
+}
+else if(typeof window.attachEvent != 'undefined')
+{
+  //.. win/ie
+  window.attachEvent('onload', generic);
+}
+//** remove this condition to degrade older browsers
+else
+{
+  //.. mac/ie5 and anything else that gets this far
+  //if there's an existing onload function
+  if(typeof window.onload == 'function')
+  {
+    //store it
+    var existing = onload;
+    //add new onload handler
+    window.onload = function()
+    {
+      //call existing onload function
+      existing();
+      //call generic onload function
+      generic();
+    };
+  }
+  else
+  {
+    //setup onload function
+    window.onload = generic;
+  }
+}
+
+} // DPVC
diff --git a/htdocs/applets/AC_RunActiveContent.js b/htdocs/applets/AC_RunActiveContent.js
new file mode 100755
index 0000000000..30cddb9dbb
--- /dev/null
+++ b/htdocs/applets/AC_RunActiveContent.js
@@ -0,0 +1,292 @@
+//v1.7
+// Flash Player Version Detection
+// Detect Client Browser type
+// Copyright 2005-2007 Adobe Systems Incorporated.  All rights reserved.
+var isIE  = (navigator.appVersion.indexOf("MSIE") != -1) ? true : false;
+var isWin = (navigator.appVersion.toLowerCase().indexOf("win") != -1) ? true : false;
+var isOpera = (navigator.userAgent.indexOf("Opera") != -1) ? true : false;
+
+function ControlVersion()
+{
+	var version;
+	var axo;
+	var e;
+
+	// NOTE : new ActiveXObject(strFoo) throws an exception if strFoo isn't in the registry
+
+	try {
+		// version will be set for 7.X or greater players
+		axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.7");
+		version = axo.GetVariable("$version");
+	} catch (e) {
+	}
+
+	if (!version)
+	{
+		try {
+			// version will be set for 6.X players only
+			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6");
+			
+			// installed player is some revision of 6.0
+			// GetVariable("$version") crashes for versions 6.0.22 through 6.0.29,
+			// so we have to be careful. 
+			
+			// default to the first public version
+			version = "WIN 6,0,21,0";
+
+			// throws if AllowScripAccess does not exist (introduced in 6.0r47)		
+			axo.AllowScriptAccess = "always";
+
+			// safe to call for 6.0r47 or greater
+			version = axo.GetVariable("$version");
+
+		} catch (e) {
+		}
+	}
+
+	if (!version)
+	{
+		try {
+			// version will be set for 4.X or 5.X player
+			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.3");
+			version = axo.GetVariable("$version");
+		} catch (e) {
+		}
+	}
+
+	if (!version)
+	{
+		try {
+			// version will be set for 3.X player
+			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.3");
+			version = "WIN 3,0,18,0";
+		} catch (e) {
+		}
+	}
+
+	if (!version)
+	{
+		try {
+			// version will be set for 2.X player
+			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash");
+			version = "WIN 2,0,0,11";
+		} catch (e) {
+			version = -1;
+		}
+	}
+	
+	return version;
+}
+
+// JavaScript helper required to detect Flash Player PlugIn version information
+function GetSwfVer(){
+	// NS/Opera version >= 3 check for Flash plugin in plugin array
+	var flashVer = -1;
+	
+	if (navigator.plugins != null && navigator.plugins.length > 0) {
+		if (navigator.plugins["Shockwave Flash 2.0"] || navigator.plugins["Shockwave Flash"]) {
+			var swVer2 = navigator.plugins["Shockwave Flash 2.0"] ? " 2.0" : "";
+			var flashDescription = navigator.plugins["Shockwave Flash" + swVer2].description;
+			var descArray = flashDescription.split(" ");
+			var tempArrayMajor = descArray[2].split(".");			
+			var versionMajor = tempArrayMajor[0];
+			var versionMinor = tempArrayMajor[1];
+			var versionRevision = descArray[3];
+			if (versionRevision == "") {
+				versionRevision = descArray[4];
+			}
+			if (versionRevision[0] == "d") {
+				versionRevision = versionRevision.substring(1);
+			} else if (versionRevision[0] == "r") {
+				versionRevision = versionRevision.substring(1);
+				if (versionRevision.indexOf("d") > 0) {
+					versionRevision = versionRevision.substring(0, versionRevision.indexOf("d"));
+				}
+			}
+			var flashVer = versionMajor + "." + versionMinor + "." + versionRevision;
+		}
+	}
+	// MSN/WebTV 2.6 supports Flash 4
+	else if (navigator.userAgent.toLowerCase().indexOf("webtv/2.6") != -1) flashVer = 4;
+	// WebTV 2.5 supports Flash 3
+	else if (navigator.userAgent.toLowerCase().indexOf("webtv/2.5") != -1) flashVer = 3;
+	// older WebTV supports Flash 2
+	else if (navigator.userAgent.toLowerCase().indexOf("webtv") != -1) flashVer = 2;
+	else if ( isIE && isWin && !isOpera ) {
+		flashVer = ControlVersion();
+	}	
+	return flashVer;
+}
+
+// When called with reqMajorVer, reqMinorVer, reqRevision returns true if that version or greater is available
+function DetectFlashVer(reqMajorVer, reqMinorVer, reqRevision)
+{
+	versionStr = GetSwfVer();
+	if (versionStr == -1 ) {
+		return false;
+	} else if (versionStr != 0) {
+		if(isIE && isWin && !isOpera) {
+			// Given "WIN 2,0,0,11"
+			tempArray         = versionStr.split(" "); 	// ["WIN", "2,0,0,11"]
+			tempString        = tempArray[1];			// "2,0,0,11"
+			versionArray      = tempString.split(",");	// ['2', '0', '0', '11']
+		} else {
+			versionArray      = versionStr.split(".");
+		}
+		var versionMajor      = versionArray[0];
+		var versionMinor      = versionArray[1];
+		var versionRevision   = versionArray[2];
+
+        	// is the major.revision >= requested major.revision AND the minor version >= requested minor
+		if (versionMajor > parseFloat(reqMajorVer)) {
+			return true;
+		} else if (versionMajor == parseFloat(reqMajorVer)) {
+			if (versionMinor > parseFloat(reqMinorVer))
+				return true;
+			else if (versionMinor == parseFloat(reqMinorVer)) {
+				if (versionRevision >= parseFloat(reqRevision))
+					return true;
+			}
+		}
+		return false;
+	}
+}
+
+function AC_AddExtension(src, ext)
+{
+  if (src.indexOf('?') != -1)
+    return src.replace(/\?/, ext+'?'); 
+  else
+    return src + ext;
+}
+
+function AC_Generateobj(objAttrs, params, embedAttrs) 
+{ 
+  var str = '';
+  if (isIE && isWin && !isOpera)
+  {
+    str += '<object ';
+    for (var i in objAttrs)
+    {
+      str += i + '="' + objAttrs[i] + '" ';
+    }
+    str += '>';
+    for (var i in params)
+    {
+      str += '<param name="' + i + '" value="' + params[i] + '" /> ';
+    }
+    str += '</object>';
+  }
+  else
+  {
+    str += '<embed ';
+    for (var i in embedAttrs)
+    {
+      str += i + '="' + embedAttrs[i] + '" ';
+    }
+    str += '> </embed>';
+  }
+
+  document.write(str);
+}
+
+function AC_FL_RunContent(){
+  var ret = 
+    AC_GetArgs
+    (  arguments, ".swf", "movie", "clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"
+     , "application/x-shockwave-flash"
+    );
+  AC_Generateobj(ret.objAttrs, ret.params, ret.embedAttrs);
+}
+
+function AC_SW_RunContent(){
+  var ret = 
+    AC_GetArgs
+    (  arguments, ".dcr", "src", "clsid:166B1BCA-3F9C-11CF-8075-444553540000"
+     , null
+    );
+  AC_Generateobj(ret.objAttrs, ret.params, ret.embedAttrs);
+}
+
+function AC_GetArgs(args, ext, srcParamName, classid, mimeType){
+  var ret = new Object();
+  ret.embedAttrs = new Object();
+  ret.params = new Object();
+  ret.objAttrs = new Object();
+  for (var i=0; i < args.length; i=i+2){
+    var currArg = args[i].toLowerCase();    
+
+    switch (currArg){	
+      case "classid":
+        break;
+      case "pluginspage":
+        ret.embedAttrs[args[i]] = args[i+1];
+        break;
+      case "src":
+      case "movie":	
+        args[i+1] = AC_AddExtension(args[i+1], ext);
+        ret.embedAttrs["src"] = args[i+1];
+        ret.params[srcParamName] = args[i+1];
+        break;
+      case "onafterupdate":
+      case "onbeforeupdate":
+      case "onblur":
+      case "oncellchange":
+      case "onclick":
+      case "ondblclick":
+      case "ondrag":
+      case "ondragend":
+      case "ondragenter":
+      case "ondragleave":
+      case "ondragover":
+      case "ondrop":
+      case "onfinish":
+      case "onfocus":
+      case "onhelp":
+      case "onmousedown":
+      case "onmouseup":
+      case "onmouseover":
+      case "onmousemove":
+      case "onmouseout":
+      case "onkeypress":
+      case "onkeydown":
+      case "onkeyup":
+      case "onload":
+      case "onlosecapture":
+      case "onpropertychange":
+      case "onreadystatechange":
+      case "onrowsdelete":
+      case "onrowenter":
+      case "onrowexit":
+      case "onrowsinserted":
+      case "onstart":
+      case "onscroll":
+      case "onbeforeeditfocus":
+      case "onactivate":
+      case "onbeforedeactivate":
+      case "ondeactivate":
+      case "type":
+      case "codebase":
+      case "id":
+        ret.objAttrs[args[i]] = args[i+1];
+        break;
+      case "width":
+      case "height":
+      case "align":
+      case "vspace": 
+      case "hspace":
+      case "class":
+      case "title":
+      case "accesskey":
+      case "name":
+      case "tabindex":
+        ret.embedAttrs[args[i]] = ret.objAttrs[args[i]] = args[i+1];
+        break;
+      default:
+        ret.embedAttrs[args[i]] = ret.params[args[i]] = args[i+1];
+    }
+  }
+  ret.objAttrs["classid"] = classid;
+  if (mimeType) ret.embedAttrs["type"] = mimeType;
+  return ret;
+}
diff --git a/htdocs/applets/Image_and_Cursor_All/AF-MAP.JPG b/htdocs/applets/Image_and_Cursor_All/AF-MAP.JPG
new file mode 100644
index 0000000000..aa0c1df3a7
Binary files /dev/null and b/htdocs/applets/Image_and_Cursor_All/AF-MAP.JPG differ
diff --git a/htdocs/applets/Image_and_Cursor_All/App1.class b/htdocs/applets/Image_and_Cursor_All/App1.class
new file mode 100644
index 0000000000..90ead25279
Binary files /dev/null and b/htdocs/applets/Image_and_Cursor_All/App1.class differ
diff --git a/htdocs/applets/Image_and_Cursor_All/App2.class b/htdocs/applets/Image_and_Cursor_All/App2.class
new file mode 100644
index 0000000000..41b21f6453
Binary files /dev/null and b/htdocs/applets/Image_and_Cursor_All/App2.class differ
diff --git a/htdocs/applets/Image_and_Cursor_All/BinaryExpr.class b/htdocs/applets/Image_and_Cursor_All/BinaryExpr.class
new file mode 100644
index 0000000000..018215776b
Binary files /dev/null and b/htdocs/applets/Image_and_Cursor_All/BinaryExpr.class differ
diff --git a/htdocs/applets/Image_and_Cursor_All/ConditionalExpr.class b/htdocs/applets/Image_and_Cursor_All/ConditionalExpr.class
new file mode 100644
index 0000000000..64bbc78d79
Binary files /dev/null and b/htdocs/applets/Image_and_Cursor_All/ConditionalExpr.class differ
diff --git a/htdocs/applets/Image_and_Cursor_All/DataDisplayFrame.class b/htdocs/applets/Image_and_Cursor_All/DataDisplayFrame.class
new file mode 100644
index 0000000000..97d22ea72e
Binary files /dev/null and b/htdocs/applets/Image_and_Cursor_All/DataDisplayFrame.class differ
diff --git a/htdocs/applets/Image_and_Cursor_All/Expr.class b/htdocs/applets/Image_and_Cursor_All/Expr.class
new file mode 100644
index 0000000000..8511946bee
Binary files /dev/null and b/htdocs/applets/Image_and_Cursor_All/Expr.class differ
diff --git a/htdocs/applets/Image_and_Cursor_All/Image_and_Cursor.class b/htdocs/applets/Image_and_Cursor_All/Image_and_Cursor.class
new file mode 100644
index 0000000000..cb11f9c7da
Binary files /dev/null and b/htdocs/applets/Image_and_Cursor_All/Image_and_Cursor.class differ
diff --git a/htdocs/applets/Image_and_Cursor_All/Image_and_Cursor.jar b/htdocs/applets/Image_and_Cursor_All/Image_and_Cursor.jar
new file mode 100644
index 0000000000..0547d08873
Binary files /dev/null and b/htdocs/applets/Image_and_Cursor_All/Image_and_Cursor.jar differ
diff --git a/htdocs/applets/Image_and_Cursor_All/Image_and_Cursor.java b/htdocs/applets/Image_and_Cursor_All/Image_and_Cursor.java
new file mode 100644
index 0000000000..f8c5bdf348
--- /dev/null
+++ b/htdocs/applets/Image_and_Cursor_All/Image_and_Cursor.java
@@ -0,0 +1,2194 @@
+//
+//  Image_and_Cursor.java
+//
+//  Written by Frank Wattenberg
+//
+//  Version 0.40
+//  6 June 2002
+//
+//  Uses new parser written by Darius Bacon
+//
+//  Known problems
+//
+//  Lines drawn with a slope of -1 seem to be off by one pixel.   
+//
+
+import java.awt.*;
+import java.applet.*;
+import java.util.*;
+import java.io.*;                // for Expr class
+import java.util.Hashtable;      // for Variable class
+import java.util.Vector;
+
+public class Image_and_Cursor extends Applet 
+{
+       int          check_out_sw = 1;                      // 0 = omit console messages; 1 = write console messages
+              
+       int          margin_x, margin_y;                    // Left and right margins (pixels)
+       int          mid_x, mid_y;                          // Location of cursor control points
+       int          cursor_size;                           // Size of cursor
+       
+       int          cursor_pad_sw;                         // 0 = cursors at edges, 1 = cursor pad
+       int          cursor_pad_x, cursor_pad_y;            // Center of cursor pad if pad
+       
+       Color        controls_color;                        // Color for cursor controls
+       Color        cursor_color;
+       Color        back_color;                            // Background color
+       Color        button_color;
+       Color        shadow_color;                          // Button shadow color
+       Color        list_color;                            // List button color
+       Color        list_shadow_color;                     // List button shadow color
+       Color        mark_color;                            // Color for mark symbols
+       int          mark_sw;                               // 0 = no marks, 1 = squares, 2 = filled squares, 
+                                                           // 3 = diamonds, 4 = filled diamonds
+       int          mark_radius;                           // Controls size (radius) of mark symbols
+       int          mark_connect;                          // 0 = do not connect marks by lines; 1 = do connect marks by lines
+       Color        clear_color;                           // Clear button color
+       Color        clear_shadow_color;                    // Clear button shadow color
+       
+       VCRButton    record_button;                         // Press this button to record one point
+       VCRButton    list_button;                           // Press this button to list recorded data
+       VCRButton    clear_button;                          // Press this button to clear recorded data
+       
+       int          font_size;                             // Size of display font
+       Font         text_font;
+       int          display_placement;                     // 0 = underneath, 1 = at right
+       int          coordinates_left;                      // left edge of coordinate display
+       int          coordinates_top;                       // top of coordinate display
+       int          button_left;                           // left edge for buttons
+       int          button_top;                            // top for buttons
+       int          button_width;                          // width of buttons
+       int          button_height;                         // height of buttons
+       int          display_sw;                            // 0 = coordinates only, 1 = coordinates and three buttons, 2 = omit list button
+       int          record_sw = 0;                         // 0 = this point not yet recorded; 1 = this point recorded
+       
+       Graphics     bG;                                    // Screen buffer
+       Image        bI;
+       
+       int          applet_width, applet_height;           // Applet dimensions
+       int          image_width, image_height;             // Image dimensions
+       
+       int          cursor_x, cursor_y;                    // Cursor coordinates (pixels)
+       
+       Image        backdrop;                              // backdrop image
+       String       backdrop_filename;
+       
+       int          save_x[] = new int[1000];              // Save the x-and y-coordinates of marked points
+       int          save_y[] = new int[1000];
+       String       save_distance[] = new String[1000];    // Save the polar coordinates of marked points as
+       String       save_angle[] = new String[1000];       // formatted strings
+       double       angle, distance;
+       int          save_index = 0;
+                                                
+       DataDisplayFrame       list_window;                 // Window for list of marked points
+       DataDisplayFrame       message_window;              // Window for parser error messages.
+       
+       Expr         x_of_t;                                // The expression for x(t)
+       Expr         y_of_t;                                // The expression for y(t)
+       Expr         y_of_x;                                // The expression for y(x)
+       Expr         r_of_theta;                            // The expression for r(theta)
+       Expr         curve_a_expression;                    // Expression for curve_a
+       Expr         curve_b_expression;                    // Expression for curve_b
+       
+       String       recovery_message_line_1;               // Recovery message printed for syntax errors
+       String       recovery_message_line_2;
+
+       Variable     t     = Variable.make("t");            // independent variable for parametric curve
+       Variable     x     = Variable.make("x");            // independent variable for y = f(x) curve
+       Variable     theta = Variable.make("theta");        // Independent variable for curve in polar coordinates
+       Variable     Picon = Variable.make("Pi");           // define Pi, pi, E, and e
+       Variable     PIcon = Variable.make("PI");
+       Variable     picon = Variable.make("pi");
+       Variable     Econ  = Variable.make("E");
+       Variable     econ  = Variable.make("e");
+       
+       int          curve_n;                               // number of steps for parametric curve
+       String       curve_a_string;                        // expression for curve_a
+       String       curve_b_string;                        // expression for curve_b
+       double       curve_a;                               // left (t) end point for parametric curve
+       double       curve_b;                               // right (t) end point for parametric curve
+       double       curve_dt;                              // step size for parametric curve
+       double       curve_t;
+       String       curve_x_of_t;
+       String       curve_y_of_t;
+       String       curve_y_of_x;
+       String       curve_r_of_theta;
+       int          curve_sw;                              // 0 = no curve; 1 = y = f(x) curve; 2 = parametric curve; 3 = curve in polar coordinates
+       int          curve_thickness;                       // thickness is 2 * curve_thickness + 1
+       Color        curve_color;
+       int          x_start, y_start, x_end, y_end;        // used to draw curve 
+       
+       int          cas_sw;                                // 0 = Maple; 1 = Mathematica; 2 = MathCAD/Spreadsheet
+       
+       int          polar_sw;                              // 0 = Cartesian; 1 = polar in radians; 2 = polar in degrees
+       Color        polar_color;
+       int          polar_origin_x, polar_origin_y;
+       
+       int          grid_sw, grid_x_start, grid_dx, grid_y_start, grid_dy, grid_width, grid_height, grid_fill_sw;
+       Color        grid_color;
+       
+       public String formatdouble(double arg, int width, int digits)
+       {
+           double   work;
+           int      iwork;
+           String   swork;
+           String   blanks = "                                             ";
+           String   zeros  = "000000000000000000000000000000000000000000000";
+
+           work = arg;
+           for(int i = 0; i < digits; i = i + 1)
+               work = 10 * work;
+           iwork = (int) java.lang.Math.round(work);
+           swork = java.lang.Integer.toString(iwork);
+           iwork = swork.length();
+           if (iwork < digits)
+           {
+               swork = zeros.substring(0, digits - iwork + 1) + swork;
+               iwork = swork.length();
+           }
+           swork = swork.substring(0, iwork - digits) + "." + swork.substring(iwork - digits, iwork);
+           iwork = swork.length();
+           swork = blanks.substring(0, width - iwork) + swork;
+           return swork;
+       }
+       
+       public int getInteger(String param_name, int low, int high, int no_param)
+       {
+           int    value;
+           if (check_out_sw == 1)
+           {
+               System.out.println("Parameter: " + param_name);
+               System.out.println("    Default value: " + java.lang.Integer.toString(no_param));           
+           }
+           if (getParameter(param_name) != null)
+           {
+               value = Integer.parseInt(getParameter(param_name));
+               value = java.lang.Math.min(high, java.lang.Math.max(low, value));
+           }
+           else
+           {
+               value = no_param;
+           }
+           if (check_out_sw == 1)
+           {
+               System.out.println("     Actual value: " + java.lang.Integer.toString(value));           
+           }
+           return value;
+       }
+       
+       public String getString(String param_name, String no_param)
+       {
+           String     value;
+           
+           if (check_out_sw == 1)
+           {
+               System.out.println("Parameter: " + param_name);
+               System.out.println("    Default value: " + no_param);           
+           }
+           if (getParameter(param_name) != null)
+           {
+               value = getParameter(param_name);      
+           }
+           else
+           {
+               value = no_param;
+           }
+           if (check_out_sw == 1)
+           {
+               System.out.println("     Actual value: " + value);           
+           }
+           return value;
+       }
+       
+       public double getDouble(String param_name, double low, double high, double no_param)
+       {
+           double    value;
+           if (check_out_sw == 1)
+           {
+               System.out.println("Parameter: " + param_name);
+               System.out.println("    Default value: " +  java.lang.Double.toString(no_param));           
+           }
+           if (getParameter(param_name) != null)
+           {
+               value = java.lang.Double.valueOf(getParameter(param_name)).doubleValue();
+               value = java.lang.Math.min(high, java.lang.Math.max(low, value));
+           }
+           else
+           {
+               value = no_param;
+           }
+           if (check_out_sw == 1)
+           {
+               System.out.println("     Actual value: " + java.lang.Double.toString(value));           
+           }
+           return value;
+       }
+
+       public Color getColor(String color_parameter, String default_color_parameter)
+       {
+            int    red, green, blue;
+            Color  color_variable;
+            String work;
+            
+            work   = getString(color_parameter, default_color_parameter);
+            if (work.length() != 9)
+                work = default_color_parameter;
+            red = Integer.parseInt(work.substring(0, 3));
+            green = Integer.parseInt(work.substring(3, 6));
+            blue = Integer.parseInt(work.substring(6, 9));
+            red = java.lang.Math.max(0, java.lang.Math.min(255, red));
+            green = java.lang.Math.max(0, java.lang.Math.min(255, green));
+            blue = java.lang.Math.max(0, java.lang.Math.min(255, blue));
+            color_variable = new Color(red, green, blue);
+            return color_variable;       
+       }
+       
+        public void init()
+       {
+           check_out_sw = getInteger("check_out_sw", 0, 1, 0);
+           
+           if (check_out_sw == 1)
+           {
+               System.out.println("Starting Image_and_Cursor Applet.");
+               System.out.println("Parameter messages to follow.");                
+           }
+           else
+           {
+               System.out.println("Starting Color_Play Applet.");
+               System.out.println("Parameter messages omitted."); 
+               System.out.println("To turn parameter messages on add an");
+               System.out.println("applet parameter tag setting check_out_sw to 1.");               
+           }
+		
+           applet_width = getInteger("applet_width", 100, 2000, 100);    // Get applet dimensions
+           
+           applet_height = getInteger("applet_height", 100, 2000, 100);
+           
+           bI = createImage(applet_width, applet_height);                // Screen buffer
+           bG = bI.getGraphics();
+           
+           image_width = getInteger("image_width", 10, 2000, 10);        // Get (backdrop) image dimensions
+           image_height = getInteger("image_height", 10, 2000, 10);
+           margin_x = getInteger("margin_x", 0, applet_width - image_width, (applet_width - image_width)/2);
+           margin_y = getInteger("margin_y", 0, applet_height - image_height, (applet_height - image_height)/2); 
+           
+           backdrop_filename = getString("backdrop_filename", "No file name parameter");
+           backdrop = getImage(getCodeBase(), backdrop_filename);        // Backdrop image
+           back_color = getColor("back_color", "255255255");
+           
+           cursor_color = getColor("cursor_color", "000000000");
+           cursor_x = getInteger("cursor_x", 0, image_width - 1, image_width/2);
+           cursor_y = image_height - 1 - getInteger("cursor_y", 0, image_height - 1, image_height/2);
+           
+           cursor_pad_sw = getInteger("cursor_pad_sw", 0, 1, 0);
+           cursor_pad_x = getInteger("cursor_pad_x", 0, applet_width, margin_x + image_width + 150);
+           cursor_pad_y = getInteger("cursor_pad_y", 0, applet_height, margin_y + image_height/2);
+           
+           controls_color = getColor("controls_color", "000000000");
+           
+           mid_x = margin_x + image_width/2;
+           mid_y = margin_y + image_height/2;
+           
+           cursor_size = getInteger("cursor_size", 5, 40, 10);
+           font_size = getInteger("font_size", 8, 48, 12);               // Set font for display
+           text_font = new Font("Courier", Font.BOLD, font_size);
+           bG.setFont(text_font);
+
+           display_placement = getInteger("display_placement", 0, 1, 0); // Display placement          
+           if (display_placement == 0)
+           {
+               // Set up for display underneath image
+               //
+               coordinates_left = getInteger("coordinates_left", 0, applet_width, margin_x);
+               button_left = getInteger("button_left", 0, applet_width, margin_x + image_width/2);
+               coordinates_top = getInteger("coordinates_top", margin_y + image_height + 5, applet_height, 
+                                            margin_y + image_height + cursor_size + 15); 
+               button_top = getInteger("button_top", margin_y + image_height + 5, applet_height,
+                                    margin_y + image_height + cursor_size + 15);
+           }
+           else
+           {
+               // Set up for display to the right of the image
+               //
+               coordinates_left = getInteger("coordinates_left", 0, applet_width, margin_x + image_width + cursor_size + 15);
+               button_left = getInteger("button_left", 0, applet_width, margin_x + image_width + cursor_size + 15);
+               coordinates_top = getInteger("coordinates_top", 0, applet_height, margin_y);
+               button_top = getInteger("button_top", 0, applet_height, margin_y + image_height/2);          
+           }           
+           display_sw = getInteger("display_sw", 0, 2, 1);
+           
+           button_color = getColor("button_color", "064064255");
+           button_width = getInteger("button_width", 10, 200, 80);
+           button_height = getInteger("button_height", 10, 50, 20);
+           
+           shadow_color = getColor("shadow_color", "000000128");
+           
+           record_button = new VCRButton(button_left, button_top, button_width, button_height, 
+                                         button_color, back_color, shadow_color, "Mark point");
+                                         
+           list_color = getColor("list_color", "255064064");
+           
+           list_shadow_color = getColor("list_shadow_color", "128000000");
+           
+           list_button = new VCRButton(button_left, button_top + 2 * button_height, button_width, button_height,
+                                         list_color, back_color, list_shadow_color, "List points");
+                                         
+           clear_color = getColor("clear_color", "064064064");
+           clear_shadow_color = getColor("clear_shadow_color", "000000000");
+           
+           clear_button = new VCRButton(button_left, button_top + 4 * button_height, button_width, button_height,
+                                           clear_color, back_color, clear_shadow_color, "Clear points"); 
+                                         
+           mark_color = getColor("mark_color", "000000000");
+           mark_sw = getInteger("mark_sw", 0, 4, 4);
+           mark_radius = getInteger("mark_radius", 0, 10, 3);
+           mark_connect = getInteger("mark_connect", 0, 1, 0);
+                                         
+           picon.set_value(Math.PI);
+           Picon.set_value(Math.PI);
+           PIcon.set_value(Math.PI);
+           econ.set_value(Math.E);   
+           Econ.set_value(Math.E);
+           
+           recovery_message_line_1 = getString("recovery_message_line_1", "Close this window and the previous window.");
+           recovery_message_line_2 = getString("recovery_message_line_2", "");
+           
+           curve_n = getInteger("curve_n", 10, 1000, 100);
+           curve_x_of_t = getString("curve_x_of_t", "t");
+           curve_y_of_t = getString("curve_y_of_t", "t");
+           curve_y_of_x = getString("curve_y_of_x", "x");
+           curve_a_string = getString("curve_a", "0");
+           curve_b_string = getString("curve_b", "1");
+           curve_r_of_theta = getString("r_of_theta", "theta");
+           
+           try
+           {
+               curve_a_expression = Parser.parse(curve_a_string);
+           }
+           catch (SyntaxException e)
+           {
+               tell_error("Syntax error: " + e + "\n" + e.explain());
+               return;
+           }
+           
+           try
+           {
+               curve_b_expression = Parser.parse(curve_b_string);
+           }
+           catch (SyntaxException e)
+           {
+               tell_error("Syntax error: " + e + "\n" + e.explain());
+               return;
+           }
+           
+           curve_a = curve_a_expression.value();
+           curve_b = curve_b_expression.value();
+           curve_dt = (curve_b - curve_a)/curve_n;
+           curve_sw = getInteger("curve_sw", 0, 3, 0);
+           curve_thickness = getInteger("curve_thickness", 0, 10, 1);
+           
+           try
+           {
+               x_of_t = Parser.parse(curve_x_of_t);
+           }
+           catch (SyntaxException e)
+           {
+               tell_error("Syntax error: " + e + "\n" + e.explain());
+               return;
+           }
+   
+           try
+           {
+               y_of_t = Parser.parse(curve_y_of_t);
+           }
+           catch (SyntaxException e)
+           {
+               tell_error("Syntax error: " + e + "\n" + e.explain());
+               return;
+           }
+
+           try
+           {
+               y_of_x = Parser.parse(curve_y_of_x);
+           }
+           catch (SyntaxException e)
+           {
+               tell_error("Syntax error: " + e + "\n" + e.explain());
+               return;
+           }
+
+           try
+           {
+               r_of_theta = Parser.parse(curve_r_of_theta);
+           }
+           catch (SyntaxException e)
+           {
+               tell_error("Syntax error: " + e + "\n" + e.explain());
+               return;
+           }
+
+           curve_color = getColor("curve_color", "000000000");
+           
+           cas_sw = getInteger("cas_sw", 0, 2, 2);
+           
+           polar_sw = getInteger("polar_sw", 0, 2, 0);
+           if (polar_sw > 0)
+           {
+               polar_color = getColor("polar_color", "255255255");
+               polar_origin_x = getInteger("polar_origin_x", 0, image_width - 1, image_width/2);
+               polar_origin_y = getInteger("polar_origin_y", 0, image_height - 1, image_height/2);
+           }
+           
+           grid_sw = getInteger("grid_sw", 0, 1, 0);
+           grid_x_start = getInteger("grid_x_start", 0, image_width - 1, 0);
+           grid_dx = getInteger("grid_dx", 2, image_width - 1, 10);
+           grid_y_start = getInteger("grid_y_start", 0, image_height - 1, 0);
+           grid_dy = getInteger("grid_dy", 1, image_height - 1, 10);
+           grid_color = getColor("grid_color", "000000000");
+           grid_width = getInteger("grid_width", 0, image_width, image_width);
+           grid_height = getInteger("grid_height", 0, image_height, image_height);
+           grid_fill_sw = getInteger("grid_fill_sw", 0, 1, 0);
+       }
+       
+       public void paint(Graphics g)
+       {
+           super.paint(g);
+           drawcursors();
+           g.drawImage(bI, 0, 0, this);       
+       }
+       
+       public void update(Graphics g)
+       {
+           paint(g);       
+       }
+
+       public void drawcursors()
+       {
+           int work, work_x, work_y;
+           int center_x, center_y;
+           int real_y;
+           String angle_string;
+           
+           bG.setColor(back_color);
+           bG.fillRect(0, 0, applet_width, applet_height);
+           bG.drawImage(backdrop, margin_x, margin_y, this);
+           
+           if(grid_sw == 1)
+           {
+              bG.setColor(grid_color);
+              for (int ix = grid_x_start; ix <= grid_x_start + grid_width - 1; ix = ix + grid_dx)
+              {
+                   bG.drawLine(margin_x + ix, margin_y + image_height - 1 - grid_y_start, 
+                               margin_x + ix, margin_y + image_height - grid_y_start - grid_height);
+              }
+              for (int iy = grid_y_start; iy <= grid_y_start + grid_height - 1; iy = iy + grid_dy)
+              {
+                   bG.drawLine(margin_x + grid_x_start, margin_y + image_height - 1 - iy, 
+                               margin_x + grid_x_start + grid_width - 1, margin_y + image_height - 1 - iy);
+              }
+           }
+           
+           if (polar_sw > 0)
+           {
+           
+               //  Draw polar grid
+               
+               bG.setColor(polar_color);
+               
+               //  Compute center for diagonal polar grid lines
+               
+               center_x = margin_x + polar_origin_x;
+               center_y = margin_y + image_height - 1 - polar_origin_y;
+               
+               //  Draw horizontal and vertical polar grid lines
+               
+               bG.drawLine(margin_x, center_y, margin_x + image_width - 1, center_y);
+               bG.drawLine(center_x, margin_y, center_x, margin_y + image_height - 1);
+               
+               //  Draw 45 degree polar grid line
+               
+               work = java.lang.Math.min(image_width - 1 - polar_origin_x, polar_origin_y) + 1;
+               bG.drawLine(center_x, center_y, center_x + work, center_y + work);
+               
+               //  Draw -45 degree polar grid line
+               
+               work = java.lang.Math.min(image_width - polar_origin_x, image_height - polar_origin_y) + 1;               
+               bG.drawLine(center_x, center_y, center_x + work, center_y - work);
+               
+               //  Draw 135 degree polar grid line
+               
+               work = java.lang.Math.min(polar_origin_x, polar_origin_y) + 1;
+               bG.drawLine(center_x, center_y, center_x - work, center_y + work);
+               
+               //  Draw -135 degree polar grid line
+                 
+               work = java.lang.Math.min(polar_origin_x, image_height - 1 - polar_origin_y);
+               bG.drawLine(center_x, center_y, center_x - work, center_y - work);               
+           }
+           
+           //  Draw control buttons
+           
+           if (record_sw == 0)
+           {
+               if (display_sw > 0)
+               {
+                   record_button.draw_off(bG);          
+                   if (save_index > 0)
+                   {
+                       clear_button.draw_off(bG);
+                       if (display_sw == 1)
+                           list_button.draw_off(bG);
+                   }
+                   else
+                   {
+                       clear_button.draw_on(bG);
+                       if (display_sw == 1)                   
+                           list_button.draw_on(bG);
+                   }
+               }
+           }
+           else
+           {
+               if (display_sw > 0)
+               {
+                   record_button.draw_on(bG);
+                   if (display_sw == 1)          
+                       list_button.draw_off(bG);
+                   if (save_index > 0)
+                   {
+                       clear_button.draw_off(bG);
+                   }
+                   else
+                   {
+                       clear_button.draw_on(bG);                   
+                   }
+               }
+           }
+           
+           //  Draw marks at recorded points
+        
+           if ((mark_sw > 0) & (grid_fill_sw == 0))
+           {
+               bG.setColor(mark_color);
+               for (int i = 0; i < save_index; i = i + 1)
+               {
+                   work_x = margin_x + save_x[i];                        // x- and y-coordinates of marked point
+                   work_y = margin_y + image_height - save_y[i] - 1;
+               
+                   if (mark_sw == 1)    // Mark by open box
+                   {
+                        bG.drawLine(work_x - mark_radius, work_y + mark_radius, work_x + mark_radius, work_y + mark_radius); 
+                        bG.drawLine(work_x - mark_radius, work_y - mark_radius, work_x + mark_radius, work_y - mark_radius); 
+                        bG.drawLine(work_x - mark_radius, work_y - mark_radius, work_x - mark_radius, work_y + mark_radius); 
+                        bG.drawLine(work_x + mark_radius, work_y - mark_radius, work_x + mark_radius, work_y + mark_radius); 
+                   }
+               
+                   if (mark_sw == 2)    // Mark by solid box
+                   {
+                        for (int j = -mark_radius; j <= mark_radius; j = j + 1)
+                             bG.drawLine(work_x - mark_radius, work_y + j, work_x + mark_radius, work_y + j); 
+                   }
+               
+                   if (mark_sw == 3)    // Mark by open diamond
+                   {
+                       bG.drawLine(work_x - mark_radius, work_y, work_x, work_y + mark_radius); 
+                       bG.drawLine(work_x, work_y + mark_radius, work_x + mark_radius, work_y); 
+                       bG.drawLine(work_x + mark_radius, work_y, work_x, work_y - mark_radius); 
+                       bG.drawLine(work_x, work_y - mark_radius, work_x - mark_radius, work_y); 
+                   }
+               
+                   if (mark_sw == 4)    // Mark by solid diamond (default)
+                   {
+                       for (int j = 0; j <= mark_radius; j = j + 1)
+                       {
+                             bG.drawLine(work_x - mark_radius + j, work_y + j, work_x + mark_radius - j, work_y + j); 
+                             bG.drawLine(work_x - mark_radius + j, work_y - j, work_x + mark_radius - j, work_y - j);
+                       }
+                   }
+               }
+           }
+           
+           //  Draw lines connecting marked points
+           
+           if ((mark_sw > 0) & (mark_connect == 1) & (grid_fill_sw == 0))
+           {
+               bG.setColor(mark_color);
+               x_start = margin_x + save_x[0];
+               y_start = margin_y + image_height - save_y[0] - 1;
+               for (int i = 1; i < save_index; i = i + 1)
+               {
+                    work_x = margin_x + save_x[i];
+                    work_y = margin_y + image_height - save_y[i] - 1;
+                    bG.drawLine(x_start, y_start, work_x, work_y);
+                    x_start = work_x;
+                    y_start = work_y;
+               }
+           }
+           
+           if ((grid_fill_sw == 1) & (grid_sw == 1))
+           {
+               bG.setColor(mark_color);
+               for (int i = 0; i < save_index; i = i + 1)
+               {
+                    work_x = (int) java.lang.Math.floor((save_x[i] - grid_x_start + 100 * grid_dx)/grid_dx) - 100;
+                    work_x = grid_x_start + grid_dx * work_x;
+                    work_y = (int) java.lang.Math.floor((save_y[i] - grid_y_start + 100 * grid_dy)/grid_dy) - 100;
+                    work_y = grid_y_start + grid_dy * work_y + grid_dy;
+                    bG.fillRect(margin_x + work_x + 1, margin_y + image_height - work_y, grid_dx - 1, grid_dy - 1);
+               }
+           }
+           
+           if (curve_sw == 1)     // Draw curve specified as y(x)
+           {
+               curve_t = curve_a;
+               x.set_value(curve_a);
+               bG.setColor(curve_color);
+               x_start = (int) java.lang.Math.round(curve_a);
+               y_start = (int) java.lang.Math.round(y_of_x.value());
+               for (int i = 1; i <= curve_n; i = i + 1)
+               {
+                    curve_t = curve_t + curve_dt;
+                    x.set_value(curve_t);
+                    x_end = (int) java.lang.Math.round(curve_t);
+                    y_end = (int) java.lang.Math.round(y_of_x.value());      
+                    for (int j = -curve_thickness; j <= curve_thickness; j = j + 1)
+                    {
+                         for (int k = -curve_thickness; k <= curve_thickness; k = k + 1)
+                         {
+                              bG.drawLine(margin_x + x_start + j,
+                                          margin_y + image_height - 1 - y_start + k,
+                                          margin_x + x_end + j,
+                                          margin_y + image_height - 1 - y_end + k);
+                         }
+                    }
+                    x_start = x_end;
+                    y_start = y_end;
+               }
+           }
+           
+           if (curve_sw == 2)     // Draw curve specified as x(t), y(t)
+           {
+               curve_t = curve_a;
+               t.set_value(curve_a); 
+               bG.setColor(curve_color);
+               x_start = (int) java.lang.Math.round(x_of_t.value());
+               y_start = (int) java.lang.Math.round(y_of_t.value());
+               for (int i = 1; i <= curve_n; i = i + 1)
+               {
+                    curve_t = curve_t + curve_dt;
+                    t.set_value(curve_t);
+                    x_end = (int) java.lang.Math.round(x_of_t.value()); 
+                    y_end = (int) java.lang.Math.round(y_of_t.value());
+                    for (int j = -curve_thickness; j <= curve_thickness; j = j + 1)
+                    {
+                         for (int k = -curve_thickness; k <= curve_thickness; k = k + 1)
+                         {
+                              bG.drawLine(margin_x + x_start + j,
+                                          margin_y + image_height - 1 - y_start + k,
+                                          margin_x + x_end + j,
+                                          margin_y + image_height - 1 - y_end + k);
+                         }
+                    }
+                    x_start = x_end;
+                    y_start = y_end;
+               }
+           }
+           
+           if ((curve_sw == 3) & (polar_sw > 0))
+           {
+                center_x = margin_x + polar_origin_x;
+                center_y = margin_y + image_height - 1 - polar_origin_y;
+
+                curve_t = curve_a;
+                t.set_value(curve_t);
+                theta.set_value(curve_t);
+                bG.setColor(curve_color);
+                x_start = (int) java.lang.Math.round(
+                                center_x + java.lang.Math.cos(curve_t) * r_of_theta.value());
+                y_start = (int) java.lang.Math.round(
+                                center_y - java.lang.Math.sin(curve_t) * r_of_theta.value());
+                for (int i = 1; i <= curve_n; i = i + 1)
+                {
+                     curve_t = curve_t + curve_dt;
+                     t.set_value(curve_t);
+                     theta.set_value(curve_t);
+                     x_end = (int) java.lang.Math.round(
+                                   center_x + java.lang.Math.cos(curve_t) * r_of_theta.value());
+                     y_end = (int) java.lang.Math.round(
+                                   center_y - java.lang.Math.sin(curve_t) * r_of_theta.value());
+                     for (int j = -curve_thickness; j <= curve_thickness; j = j + 1)
+                     {
+                          for (int k = -curve_thickness; k <= curve_thickness; k = k + 1)
+                               bG.drawLine(x_start + j, y_start + k, x_end + j, y_end + k);
+                     }
+                     x_start = x_end;
+                     y_start = y_end;
+               }
+           }
+           
+           //  Draw cursors
+           
+           bG.setColor(cursor_color);
+           bG.drawLine(margin_x + cursor_x, margin_y, margin_x + cursor_x, margin_y + image_height - 1);
+           bG.drawLine(margin_x, margin_y + cursor_y, margin_x + image_width - 1, margin_y + cursor_y);
+           
+           //  Draw controls to move cursor one pixel at a time
+           
+           bG.setColor(controls_color); 
+           for (int i = 0; i <= cursor_size; i = i + 1)
+           {
+                if (cursor_pad_sw == 0)
+                {
+                    bG.drawLine(mid_x - i, margin_y - 10 - cursor_size + i, mid_x + i, margin_y - 10 - cursor_size + i);
+                    bG.drawLine(mid_x - i, margin_y + 10 + image_height + cursor_size - i, 
+                                mid_x + i, margin_y + 10 + image_height + cursor_size - i);
+                    bG.drawLine(margin_x - 10 - cursor_size + i, mid_y - i, margin_x - 10 - cursor_size + i, mid_y + i);
+                    bG.drawLine(margin_x + image_width + 10 + cursor_size - i, mid_y - i,
+                                margin_x + image_width + 10 + cursor_size - i, mid_y + i);
+                }
+                else
+                {
+                    bG.drawLine(cursor_pad_x - i, 5 + cursor_pad_y + 10 + cursor_size - i,
+                                cursor_pad_x + i, 5 + cursor_pad_y + 10 + cursor_size - i);
+                    bG.drawLine(cursor_pad_x - i, cursor_pad_y - 10 - cursor_size + i - 5,
+                                cursor_pad_x + i, cursor_pad_y - 10 - cursor_size + i - 5);
+                    bG.drawLine(5 + cursor_pad_x + 10 + cursor_size - i, cursor_pad_y - i,
+                                5 + cursor_pad_x + 10 + cursor_size - i, cursor_pad_y + i);
+                    bG.drawLine(cursor_pad_x - 10 - cursor_size + i - 5, cursor_pad_y - i,
+                                cursor_pad_x - 10 - cursor_size + i - 5, cursor_pad_y + i);
+                }
+           }
+           
+           //    Print cursor coordinates
+           
+           bG.drawString("x: " + String.valueOf(cursor_x), coordinates_left, coordinates_top + font_size);
+           bG.drawString("y: " + String.valueOf(image_height - cursor_y - 1), coordinates_left, 
+                         coordinates_top + 2 * font_size + 5);
+           if (grid_fill_sw == 1)
+               bG.drawString("count: " + String.valueOf(save_index), coordinates_left, coordinates_top + 3 * font_size + 10);
+           if (polar_sw > 0)
+           {
+               real_y = image_height - cursor_y - 1;
+               distance = java.lang.Math.sqrt((cursor_x - polar_origin_x) * (cursor_x - polar_origin_x) +
+                                                (real_y - polar_origin_y) * (real_y - polar_origin_y));
+               bG.drawString("r: " + formatdouble(distance, 7, 2), 
+                              coordinates_left, coordinates_top + 3 * font_size + 10);
+               if (cursor_x == polar_origin_x)
+               {
+                   if (polar_sw == 1)
+                   {
+                       if (real_y >= polar_origin_y)
+                           angle_string = " 1.5708";
+                       else
+                           angle_string = " 4.7124";
+                       if (real_y == polar_origin_y)
+                           angle_string = " undefined";
+                   }
+                   else
+                   {
+                       if (real_y >= polar_origin_y)
+                           angle_string = " 90.00";
+                       else
+                           angle_string = " 270.00";
+                       if (real_y == polar_origin_y)
+                           angle_string = " undefined";
+                   }
+               }
+               else
+               {
+                  angle = java.lang.Math.atan(1.0 * (real_y - polar_origin_y)/(cursor_x - polar_origin_x));
+                  if (cursor_x < polar_origin_x)
+                      angle = Math.PI + angle;
+                  if (angle < 0)
+                      angle = angle + 2 * Math.PI;
+                  if (polar_sw == 2)
+                  {
+                      angle = angle * 360 / (2 * Math.PI);
+                      angle_string = formatdouble(angle, 10, 2);
+                  }
+                  else
+                      angle_string = formatdouble(angle, 7, 4);
+               }
+               bG.drawString("theta: " + angle_string, coordinates_left, coordinates_top + 4 * font_size + 15);
+           }
+       }
+       
+       public boolean mouseDown(Event evt, int mx, int my)
+       {
+            int x_start, y_start, x_end, y_end;
+            int real_y;
+            double work;
+            
+            if ((mx >= margin_x) & (mx <= margin_x + image_width - 1) & 
+                (my >= margin_y) & (my <= margin_y + image_height - 1))
+            {
+                 cursor_x = mx - margin_x;
+                 cursor_y = my - margin_y;
+                 record_sw = 0;
+                 repaint();
+                 return true;
+            }
+            
+            if (cursor_pad_sw == 0)
+            {
+                 if ((mx >= margin_x - 10 - cursor_size) & (mx <= margin_x - 10) &
+                     (my >= mid_y - cursor_size) & (my <= mid_y + cursor_size))
+                 {
+                      cursor_x = java.lang.Math.max(0, cursor_x - 1);
+                      record_sw = 0;
+                      repaint();
+                      return true; 
+                 }
+                 if ((mx >= margin_x + image_width + 10) & (mx <= margin_x + image_width + 10 + cursor_size) &
+                     (my >= mid_y - cursor_size) & (my <= mid_y + cursor_size))
+                 {
+                      cursor_x= java.lang.Math.min(image_width - 1, cursor_x + 1);
+                      record_sw = 0;
+                      repaint();
+                      return true; 
+                 }
+                 if ((mx >= mid_x - cursor_size) & (mx <= mid_x + cursor_size) &
+                     (my >= margin_y - 10 - cursor_size) & (my <= margin_y - 10))
+                 {
+                      cursor_y = java.lang.Math.max(0, cursor_y - 1);
+                      record_sw = 0;
+                      repaint();
+                      return true;
+                 }
+                 if ((mx >= mid_x - cursor_size) & (mx <= mid_x + cursor_size) &
+                     (my >= margin_y + image_height + 10) & (my <= margin_y + image_height + 10 + cursor_size))
+                 {
+                      cursor_y = java.lang.Math.min(image_height - 1, cursor_y + 1);
+                      record_sw = 0;
+                      repaint();
+                      return true;
+                 }
+            }
+            else
+            {
+                 if ((mx >= cursor_pad_x - 5 - 2 * cursor_size) & (mx <= cursor_pad_x - 5 - cursor_size) &
+                     (my >= cursor_pad_y - cursor_size - 5) & (my <= cursor_pad_y + cursor_size + 5))
+                 {
+                      cursor_x = java.lang.Math.max(0, cursor_x - 1);
+                      record_sw = 0;
+                      repaint();
+                      return true; 
+                 }
+                 if ((mx >= cursor_pad_x + 5 + cursor_size) & (mx <= cursor_pad_x + 5 + 2 * cursor_size) &
+                     (my >= cursor_pad_y - cursor_size - 5) & (my <= cursor_pad_y + cursor_size + 5))
+                 {
+                      cursor_x= java.lang.Math.min(image_width - 1, cursor_x + 1);
+                      record_sw = 0;
+                      repaint();
+                      return true; 
+                 }
+                 if ((mx >= cursor_pad_x - 5 - cursor_size) & (mx <= cursor_pad_x + 5 + cursor_size) &
+                     (my >= cursor_pad_y - 5 - 2 * cursor_size) & (my <= cursor_pad_y - 5 - cursor_size))
+                 {
+                      cursor_y = java.lang.Math.max(0, cursor_y - 1);
+                      record_sw = 0;
+                      repaint();
+                      return true;
+                 }
+                 if ((mx >= cursor_pad_x - 5 - cursor_size) & (mx <= cursor_pad_x + 5 + cursor_size) &
+                     (my >= cursor_pad_y + 5 + cursor_size) & (my <= cursor_pad_y + 5 + 2 * cursor_size))
+                 {
+                      cursor_y = java.lang.Math.min(image_height - 1, cursor_y + 1);
+                      record_sw = 0;
+                      repaint();
+                      return true;
+                 }
+            
+            }
+                 
+            if (record_button.test(mx, my))
+            {
+                 if (record_sw == 0)
+                 {
+                     if (save_index == 1000)
+                         save_index = 0;
+                     real_y = image_height - cursor_y - 1;
+                     save_x[save_index] = cursor_x;
+                     save_y[save_index] = real_y;
+                     distance = java.lang.Math.sqrt((cursor_x - polar_origin_x) * (cursor_x - polar_origin_x) +
+                                                    (real_y - polar_origin_y) * (real_y - polar_origin_y));
+                     save_distance[save_index] = formatdouble(distance, 10, 2);
+                     if (cursor_x == polar_origin_x)
+                     {
+                         if (polar_sw == 1)
+                         {
+                             if (real_y >= polar_origin_y)
+                                 save_angle[save_index] = "    1.5708";
+                             else
+                                 save_angle[save_index] = "    4.7124";
+                             if (real_y == polar_origin_y)
+                                 save_angle[save_index] = " undefined";
+                         }
+                         else
+                         {
+                             if (real_y >= polar_origin_y)
+                                 save_angle[save_index] = "     90.00";
+                             else
+                                 save_angle[save_index] = "    270.00";
+                             if (real_y == polar_origin_y)
+                                 save_angle[save_index] = " undefined";
+                         }
+                     }
+                     else
+                     {
+                        angle = java.lang.Math.atan(1.0 * (real_y - polar_origin_y)/(cursor_x - polar_origin_x));
+                        if (cursor_x < polar_origin_x)
+                            angle = Math.PI + angle;
+                        if (angle < 0)
+                            angle = angle + 2 * Math.PI;
+                        if (polar_sw == 2)
+                        {
+                            angle = angle * 360 / (2 * Math.PI);
+                            save_angle[save_index] = formatdouble(angle, 10, 2);
+                        }
+                        else
+                            save_angle[save_index] = formatdouble(angle, 10, 4);
+                     }
+                     save_index = save_index + 1;
+                     record_sw = 1;
+                     repaint();
+                     return true;                 
+                 }
+            }
+            if (clear_button.test(mx, my))
+            {
+                save_index = 0;
+                record_sw = 0;
+                repaint();
+                return true;  
+            }
+            if (list_button.test(mx, my) & (display_sw == 1))
+            {
+                list_window = new DataDisplayFrame("List of marked points");
+                list_window.hide();
+                list_window.clearText();
+                list_window.addText("The way in which you copy information from this window into\n");
+                list_window.addText("another window depends on the browser and operating system you are\n");
+                list_window.addText("using.  One of the following methods should work.\n\n");
+                list_window.addText("*  Highlight the information to be copied in this window.\n");
+                list_window.addText("   Then copy it by pressing command-c.   Next click in the area\n");
+                list_window.addText("   into which it is to be pasted and press command-v.\n\n");
+                list_window.addText("*  Highlight the information to be copied in this window.\n");
+                list_window.addText("   Then copy it by pressing control-c.   Next click in the area\n");
+                list_window.addText("   into which it is to be pasted and press control-v.\n\n");
+                list_window.addText("*  Highlight the information to be copied in this window.\n");
+                list_window.addText("   then drag it into the window into which it is to be pasted.\n\n");
+
+                if (cas_sw == 0)  // Format for Maple
+                {
+                    list_window.addText("n := ");
+                    list_window.addText(String.valueOf(save_index));
+                    list_window.addText(";\n\n");
+                    list_window.addText("x := [");
+                    for (int i = 0; i < save_index; i = i + 1)
+                    {
+                         list_window.addText(String.valueOf(save_x[i]));
+                         if (i < save_index - 1)
+                         {
+                            list_window.addText(",  ");
+                            if (i == 10 * (i/ 10) + 9)
+                                list_window.addText("\n          ");
+                         }
+                    }
+                    list_window.addText("];\n\n");
+                    list_window.addText("y := [");
+                    for (int i = 0; i < save_index; i = i + 1)
+                    {
+                         list_window.addText(String.valueOf(save_y[i]));
+                         if (i < save_index - 1)
+                         {
+                            list_window.addText(",  ");
+                            if (i == 10 * (i/ 10) + 9)
+                                list_window.addText("\n          ");
+                         }
+                    }
+                    list_window.addText("];\n\n");
+                    if (polar_sw > 0)
+                    {
+                        list_window.addText("r := [");
+                        for (int i = 0; i < save_index; i = i + 1)
+                        {
+                             list_window.addText(save_distance[i]);
+                             if (i < save_index - 1)
+                             {
+                                 list_window.addText(", ");
+                                 if (i == 10 * (i/10) + 9)
+                                list_window.addText("\n          ");
+                             }
+                        }
+                        list_window.addText("];\n\n");
+                        list_window.addText("t := [");
+                        for (int i = 0; i < save_index; i = i + 1)
+                        {
+                             list_window.addText(save_angle[i]);
+                             if (i < save_index - 1)
+                             {
+                                 list_window.addText(", ");
+                                 if (i == 10 * (i/10) + 9)
+                                list_window.addText("\n          ");
+                             }
+                        }
+                        list_window.addText("];\n\n");
+                    }
+                }
+                else
+                if (cas_sw == 1)   // Format for Mathematica
+                {
+                    list_window.addText("n := ");
+                    list_window.addText(String.valueOf(save_index));
+                    list_window.addText("\n\n");
+                    list_window.addText("x := {");
+                    for (int i = 0; i < save_index; i = i + 1)
+                    {
+                         list_window.addText(String.valueOf(save_x[i]));
+                         if (i < save_index - 1)
+                         {
+                            list_window.addText(",  ");
+                            if (i == 10 * (i/ 10) + 9)
+                                list_window.addText("\n          ");
+                         }
+                    }
+                    list_window.addText("}\n\n");
+                    list_window.addText("y := {");
+                    for (int i = 0; i < save_index; i = i + 1)
+                    {
+                         list_window.addText(String.valueOf(save_y[i]));
+                         if (i < save_index - 1)
+                         {
+                            list_window.addText(",  ");
+                            if (i == 10 * (i/ 10) + 9)
+                                list_window.addText("\n          ");
+                         }
+                    }
+                    list_window.addText("}\n\n");
+                    if (polar_sw > 0)
+                    {
+                        list_window.addText("r := {");
+                        for (int i = 0; i < save_index; i = i + 1)
+                        {
+                             list_window.addText(save_distance[i]);
+                             if (i < save_index - 1)
+                             {
+                                 list_window.addText(", ");
+                                 if (i == 10 * (i/10) + 9)
+                                list_window.addText("\n          ");
+                             }
+                        }
+                        list_window.addText("}\n\n");
+                        list_window.addText("t := {");
+                        for (int i = 0; i < save_index; i = i + 1)
+                        {
+                             list_window.addText(save_angle[i]);
+                             if (i < save_index - 1)
+                             {
+                                 list_window.addText(", ");
+                                 if (i == 10 * (i/10) + 9)
+                                list_window.addText("\n          ");
+                             }
+                        }
+                        list_window.addText("}\n\n");
+                    }
+                }
+                if (cas_sw == 2)  // Format for Excel
+                {
+                    if (polar_sw == 0)
+                        list_window.addText("x-coordinate \t y-coordinate\n\n");
+                    if (polar_sw == 1)
+                        list_window.addText("x-coordinate \t y-coordinate \t distance \t angle (radians)\n\n");
+                    if (polar_sw == 2)
+                        list_window.addText("x-coordinate \t y-coordinate \t distance \t angle (degrees)\n\n");
+                    for (int i = 0; i < save_index; i = i + 1)
+                    {
+                         list_window.addText(leftfill(6, String.valueOf(save_x[i])));
+                         list_window.addText("\t ");
+                         list_window.addText(leftfill(6, String.valueOf(save_y[i])));
+                         if (polar_sw > 0)
+                             list_window.addText("\t" + save_distance[i] + "\t" + save_angle[i]);
+                         list_window.addText("\n");                
+                    }
+                }
+                list_window.pack();
+                list_window.show();
+            }
+            return true;
+       }
+       
+       public void tell_error(String message)
+       {
+              message_window = new DataDisplayFrame("Expression Error");
+              message_window.hide();
+              message_window.clearText();
+              message_window.addText("An error has been detected in an algebraic expression.\n\n");
+              message_window.addText(message);
+              message_window.addText("\n\n");
+              message_window.addText(recovery_message_line_1);
+              message_window.addText("\n");
+              message_window.addText(recovery_message_line_2);
+              message_window.addText("\n");
+              message_window.pack();
+              message_window.show();
+              return;
+       }
+       
+       //
+       //   Used to right justify output
+       //
+       
+       public String leftfill(int n, String str)
+       {
+           int      k;
+           String   body;
+           body = str;
+           k = body.length();
+           body = "                    ";
+           body = body.substring(0, n - k) + str;
+           return body;
+       }
+}
+
+//
+//    The following is used to display information in a form that
+//    can be imported into another program by cut-and-paste
+//
+
+class DataDisplayFrame extends Frame
+{
+      final    static    Font   textfont = new Font("Courier", Font.PLAIN, 12);
+
+      TextArea                  txt      = new TextArea();
+
+      public DataDisplayFrame (String title)
+      {
+             super(title);
+             txt.setEditable(true);
+             txt.setFont(textfont);
+             add(txt);
+      }
+
+      public void addText(String text)
+      {
+             txt.setText(txt.getText() + text);
+      }
+
+      public void clearText()
+      {
+             txt.setText("");
+      }
+
+      public boolean handleEvent(Event evt)
+      {
+             if (evt.id == Event.WINDOW_DESTROY)
+                 dispose();
+             return super.handleEvent(evt);
+      }
+}
+
+//
+//    The following were written by Frank Wattenberg
+//
+
+class VCRButton
+{
+      //
+      //    On-off button
+      //    Click to turn on
+      //
+
+      public      int     left;
+      public      int     top;
+      public      int     width;
+      public      int     height;
+      public      String  label;
+      public      Color   button_color, back_color, shadow_color;
+      
+      public VCRButton(int left, int top, int width, int height, 
+                       Color button_color, Color back_color, Color shadow_color, String label)
+      {
+             this.left          = left;
+             this.top           = top;
+             this.width         = width;
+             this.height        = height;
+             this.button_color  = button_color;
+             this.back_color    = back_color;
+             this.shadow_color  = shadow_color;
+             this.label         = label;
+      }
+
+      public void draw_on(Graphics g)
+      {
+             g.setColor(back_color);
+             g.fillRect(left, top, width, height);
+             g.setColor(button_color);
+             g.fillRect(left + 3, top + 3, width - 3, height - 3);
+             g.setColor(shadow_color);
+             g.drawString(label, left + width/2 - g.getFontMetrics().stringWidth(label)/2, top + height + height/2);
+      }
+
+      public void draw_off(Graphics g)
+      {
+             g.setColor(back_color);
+             g.fillRect(left, top, width, height);
+             g.setColor(shadow_color);
+             g.fillRect(left + 3, top + 3, width - 3, height - 3);
+             g.setColor(button_color);
+             g.fillRect(left, top, width - 3, height - 3);
+             g.setColor(shadow_color);
+             g.drawString(label, left + width/2 - g.getFontMetrics().stringWidth(label)/2, top + height + height/2);
+      }
+
+      public boolean test(int mx, int my)
+      {
+             if ((mx >= left) & (mx <= left + width) &
+                 (my >= top) & (my <= top + height))
+                return true;
+             else
+                return false; 
+      }
+}
+
+//
+// The following was written by Darius Bacon
+//
+
+abstract class Expr {
+
+    /** @return the value given the current variable values */
+    public abstract double value();
+
+    /** Binary operator: addition        */  public static final int ADD =  0;  
+    /** Binary operator: subtraction     */  public static final int SUB =  1;
+    /** Binary operator: multiplication  */  public static final int MUL =  2;
+    /** Binary operator: division        */  public static final int DIV =  3;
+    /** Binary operator: exponentiation  */  public static final int POW =  4;
+    /** Binary operator: arctangent      */  public static final int ATAN2 = 5;
+    /** Binary operator: maximum         */  public static final int MAX =  6;
+    /** Binary operator: minimum         */  public static final int MIN =  7;
+    /** Binary operator: less than       */  public static final int LT  =  8;
+    /** Binary operator: less or equal   */  public static final int LE  =  9;
+    /** Binary operator: equality        */  public static final int EQ  = 10;
+    /** Binary operator: inequality      */  public static final int NE  = 11;
+    /** Binary operator: greater or equal*/  public static final int GE  = 12;
+    /** Binary operator: greater than    */  public static final int GT  = 13;
+    /** Binary operator: logical and     */  public static final int AND = 14;
+    /** Binary operator: logical or      */  public static final int OR  = 15;
+  
+    /** Unary operator: absolute value*/   public static final int ABS   = 100;
+    /** Unary operator: arccosine */       public static final int ACOS  = 101;
+    /** Unary operator: arcsine   */       public static final int ASIN  = 102;
+    /** Unary operator: arctangent*/       public static final int ATAN  = 103;
+    /** Unary operator: ceiling   */       public static final int CEIL  = 104;
+    /** Unary operator: cosine    */       public static final int COS   = 105;
+    /** Unary operator: e to the x*/       public static final int EXP   = 106;
+    /** Unary operator: floor     */       public static final int FLOOR = 107;
+    /** Unary operator: natural log*/      public static final int LOG   = 108;
+    /** Unary operator: negation        */ public static final int NEG   = 109;
+    /** Unary operator: rounding  */       public static final int ROUND = 110;
+    /** Unary operator: sine      */       public static final int SIN   = 111;
+    /** Unary operator: square root */     public static final int SQRT  = 112;
+    /** Unary operator: tangent */         public static final int TAN   = 113;
+
+    /** Make a literal expression.
+     * @param v the constant value of the expression
+     * @return an expression whose value is always v */
+    public static Expr makeLiteral(double v) { 
+	return new LiteralExpr(v); 
+    }
+    /** Make an expression that applies a unary operator to an operand.
+     * @param rator a code for a unary operator
+     * @param rand operand
+     * @return an expression meaning rator(rand)
+     */
+    public static Expr makeApp1(int rator, Expr rand) {
+	Expr app = new UnaryExpr(rator, rand);
+	return rand instanceof LiteralExpr
+	    ? new LiteralExpr(app.value()) 
+	    : app;
+    }
+    /** Make an expression that applies a binary operator to two operands.
+     * @param rator a code for a binary operator
+     * @param rand0 left operand
+     * @param rand1 right operand
+     * @return an expression meaning rator(rand0, rand1)
+     */
+    public static Expr makeApp2(int rator, Expr rand0, Expr rand1) {
+	Expr app = new BinaryExpr(rator, rand0, rand1);
+	return rand0 instanceof LiteralExpr && rand1 instanceof LiteralExpr
+	    ? new LiteralExpr(app.value()) 
+	    : app;
+    }
+    /** Make a conditional expression.
+     * @param test `if' part
+     * @param consequent `then' part
+     * @param alternative `else' part
+     * @return an expression meaning `if test, then consequent, else
+     *         alternative' 
+     */
+    public static Expr makeIfThenElse(Expr test,
+				      Expr consequent,
+				      Expr alternative) {
+	Expr cond = new ConditionalExpr(test, consequent, alternative);
+	if (test instanceof LiteralExpr &&
+	    consequent instanceof LiteralExpr &&
+	    alternative instanceof LiteralExpr)
+	    return new LiteralExpr(cond.value());
+	else
+	    return cond;
+    }
+}
+
+// These classes are all private to this module so that I can get rid
+// of them later.  For applets you want to use as few classes as
+// possible to avoid http connections at load time; it'd be profitable
+// to replace all these subtypes with bytecodes for a stack machine,
+// or perhaps a type that's the union of all of them (see class Node
+// in java/demo/SpreadSheet/SpreadSheet.java).
+
+class LiteralExpr extends Expr {
+    double v;
+    LiteralExpr(double v) { this.v = v; }
+    public double value() { return v; }
+}
+
+class UnaryExpr extends Expr {
+    int rator;
+    Expr rand;
+
+    UnaryExpr(int rator, Expr rand) { 
+	this.rator = rator;
+	this.rand = rand;
+    }
+
+    public double value() {
+	double arg = rand.value();
+	switch (rator) {
+	case ABS:   return Math.abs(arg);
+	case ACOS:  return Math.acos(arg);
+	case ASIN:  return Math.asin(arg);
+	case ATAN:  return Math.atan(arg);
+	case CEIL:  return Math.ceil(arg);
+	case COS:   return Math.cos(arg);
+	case EXP:   return Math.exp(arg);
+	case FLOOR: return Math.floor(arg);
+	case LOG:   return Math.log(arg);
+	case NEG:   return -arg;
+	case ROUND: return Math.round(arg);
+	case SIN:   return Math.sin(arg);
+	case SQRT:  return Math.sqrt(arg);
+	case TAN:   return Math.tan(arg);
+	default: throw new RuntimeException("BUG: bad rator");
+	}
+    }
+}
+
+class BinaryExpr extends Expr {
+    int rator;
+    Expr rand0, rand1;
+
+    BinaryExpr(int rator, Expr rand0, Expr rand1) {
+	this.rator = rator;
+	this.rand0 = rand0;
+	this.rand1 = rand1;
+    }
+    public double value() {
+	double arg0 = rand0.value();
+	double arg1 = rand1.value();
+	switch (rator) {
+	case ADD:   return arg0 + arg1;
+	case SUB:   return arg0 - arg1;
+	case MUL:   return arg0 * arg1;
+	case DIV:   return arg0 / arg1; // division by 0 has IEEE 754 behavior
+	case POW:   return Math.pow(arg0, arg1);
+	case ATAN2: return Math.atan2(arg0, arg1);
+	case MAX:   return arg0 < arg1 ? arg1 : arg0;
+	case MIN:   return arg0 < arg1 ? arg0 : arg1;
+        case LT:    return arg0 <  arg1 ? 1.0 : 0.0;
+        case LE:    return arg0 <= arg1 ? 1.0 : 0.0;
+        case EQ:    return arg0 == arg1 ? 1.0 : 0.0;
+        case NE:    return arg0 != arg1 ? 1.0 : 0.0;
+        case GE:    return arg0 >= arg1 ? 1.0 : 0.0;
+        case GT:    return arg0  > arg1 ? 1.0 : 0.0;
+        case AND:   return arg0 != 0 && arg1 != 0 ? 1.0 : 0.0;
+        case OR:    return arg0 != 0 || arg1 != 0 ? 1.0 : 0.0; 
+	default: throw new RuntimeException("BUG: bad rator");
+	}
+    }
+}
+
+class ConditionalExpr extends Expr {
+    Expr test, consequent, alternative;
+
+    ConditionalExpr(Expr test, Expr consequent, Expr alternative) {
+	this.test = test;
+	this.consequent = consequent;
+	this.alternative = alternative;
+    }
+
+    public double value() {
+	return test.value() != 0 ? consequent.value() : alternative.value();
+    }
+}
+
+// Operator-precedence parser.
+// Copyright 1996 by Darius Bacon; see the file COPYING.
+
+/** 
+  Parses strings representing mathematical formulas with variables.
+  The following operators, in descending order of precedence, are
+  defined:
+
+  <UL>
+  <LI>^ (raise to a power)
+  <LI>* /
+  <LI>Unary minus (-x)
+  <LI>+ -
+  <LI>&lt; &lt;= = &lt;&gt; &gt;= &gt;
+  <LI>and
+  <LI>or
+  </UL>
+
+  ^ associates right-to-left; other operators associate left-to-right.
+
+  <P>These functions are defined: 
+    abs, acos, asin, atan, 
+    ceil, cos, exp, floor, 
+    log, round, sin, sqrt, 
+    tan.  Each requires one argument enclosed in parentheses.
+
+  <P>There are also binary functions: atan2, min, max; and a ternary
+  conditional function: if(test, then, else).
+
+  <P>Whitespace outside identifiers is ignored.
+
+  <P>Examples:
+  <UL>
+  <LI>42
+  <LI>2-3
+  <LI>cos(x^2) + sin(x^2)
+  <UL> */
+
+class Parser {
+
+    // Built-in constants
+    static private Variable pi = Variable.make("pi");
+    static {
+	pi.setValue(Math.PI);
+    }
+
+    /** Return the expression denoted by the input string.
+     *
+     *       @param input the unparsed expression
+     *      @exception SyntaxException if the input is unparsable */
+    static public Expr parse(String input) throws SyntaxException {
+	return new Parser().parseString(input);
+    }
+
+    /** Set of Variable's that are allowed to appear in input expressions. 
+     * If null, any Variable is allowed. */
+    private Hashtable allowedVariables = null;
+
+    public void allow(Variable variable) {
+	if (null == allowedVariables) {
+	    allowedVariables = new Hashtable();
+	    allowedVariables.put(pi, pi);
+	}
+	allowedVariables.put(variable, variable);
+    }
+
+    Scanner tokens = null;
+    private Token token = null;
+
+    /** Return the expression denoted by the input string.
+     *
+     *       @param input the unparsed expression
+     *      @exception SyntaxException if the input is unparsable */
+    public Expr parseString(String input) throws SyntaxException {
+	String operatorChars = "+-*/^<>=,";
+	tokens = new Scanner(input, operatorChars);
+	return reparse();
+    }
+
+    private Expr reparse() throws SyntaxException {
+	tokens.index = -1;
+	nextToken();
+	Expr expr = parseExpr(0);
+	if (token.ttype != Token.TT_EOF)
+	    throw error("Incomplete expression",
+			SyntaxException.INCOMPLETE, null);
+	return expr;
+    }
+
+    private void nextToken() {
+	token = tokens.nextToken();
+    }
+
+    private Expr parseExpr(int precedence) throws SyntaxException {
+	Expr expr = parseFactor();
+    loop:
+	for (;;) {
+	    int l, r, rator;   
+
+	    // The operator precedence table.
+	    // l = left precedence, r = right precedence, rator = operator.
+	    // Higher precedence values mean tighter binding of arguments.
+	    // To associate left-to-right, let r = l+1;
+	    // to associate right-to-left, let r = l.
+
+	    switch (token.ttype) {
+
+	    case '<':         l = 20; r = 21; rator = Expr.LT; break;
+	    case Token.TT_LE: l = 20; r = 21; rator = Expr.LE; break;
+	    case '=':         l = 20; r = 21; rator = Expr.EQ; break;
+	    case Token.TT_NE: l = 20; r = 21; rator = Expr.NE; break;
+	    case Token.TT_GE: l = 20; r = 21; rator = Expr.GE; break;
+	    case '>':         l = 20; r = 21; rator = Expr.GT; break;
+
+	    case '+': l = 30; r = 31; rator = Expr.ADD; break;
+	    case '-': l = 30; r = 31; rator = Expr.SUB; break;
+	
+	    case '/': l = 40; r = 41; rator = Expr.DIV; break;
+	    case '*': l = 40; r = 41; rator = Expr.MUL; break;
+	
+	    case '^': l = 50; r = 50; rator = Expr.POW; break;
+	
+	    default:
+		if (token.ttype == Token.TT_WORD && token.sval.equals("and")) {
+		    l = 5; r = 6; rator = Expr.AND; break;
+		} 
+		if (token.ttype == Token.TT_WORD && token.sval.equals("or")) {
+		    l = 10; r = 11; rator = Expr.OR; break;
+		} 
+		break loop;
+	    }
+
+	    if (l < precedence)
+		break loop;
+
+	    nextToken();
+	    expr = Expr.makeApp2(rator, expr, parseExpr(r));
+	}
+	return expr;
+    }
+
+    static private final String[] procs1 = {
+	"abs", "acos", "asin", "atan", 
+	"ceil", "cos", "exp", "floor", 
+	"log", "round", "sin", "sqrt", 
+	"tan"
+    };
+    static private final int[] rators1 = {
+	Expr.ABS, Expr.ACOS, Expr.ASIN, Expr.ATAN, 
+	Expr.CEIL, Expr.COS, Expr.EXP, Expr.FLOOR,
+	Expr.LOG, Expr.ROUND, Expr.SIN, Expr.SQRT, 
+	Expr.TAN
+    };
+	
+    static private final String[] procs2 = {
+	"atan2", "max", "min"
+    };
+    static private final int[] rators2 = {
+	Expr.ATAN2, Expr.MAX, Expr.MIN
+    };
+	
+    private boolean atStartOfFactor() {
+	return token.ttype == Token.TT_NUMBER
+	    || token.ttype == Token.TT_WORD
+	    || token.ttype == '('
+	    || token.ttype == '-';
+    }
+
+    private Expr parseFactor() throws SyntaxException {
+	switch (token.ttype) {
+	case Token.TT_NUMBER: {
+	    Expr lit = Expr.makeLiteral(token.nval);
+	    nextToken();
+	    return lit;
+	}
+	case Token.TT_WORD: {
+	    for (int i = 0; i < procs1.length; ++i)
+		if (procs1[i].equals(token.sval)) {
+		    nextToken();
+		    expect('(');
+		    Expr rand = parseExpr(0);
+		    expect(')');
+		    return Expr.makeApp1(rators1[i], rand);
+		}
+
+	    for (int i = 0; i < procs2.length; ++i)
+		if (procs2[i].equals(token.sval)) {
+		    nextToken();
+		    expect('(');
+		    Expr rand1 = parseExpr(0);
+		    expect(',');
+		    Expr rand2 = parseExpr(0);
+		    expect(')');
+		    return Expr.makeApp2(rators2[i], rand1, rand2);
+		}
+
+	    if (token.sval.equals("if")) {
+		nextToken();
+		expect('(');
+		Expr test = parseExpr(0);
+		expect(',');
+		Expr consequent = parseExpr(0);
+		expect(',');
+		Expr alternative = parseExpr(0);
+		expect(')');
+		return Expr.makeIfThenElse(test, consequent, alternative);
+	    }
+
+	    Expr var = Variable.make(token.sval);
+	    if (null != allowedVariables && null == allowedVariables.get(var))
+		throw error("Unknown variable",
+			    SyntaxException.UNKNOWN_VARIABLE, null);
+	    nextToken();
+	    return var;
+	}
+	case '(': {
+	    nextToken();
+	    Expr enclosed = parseExpr(0);
+	    expect(')');
+	    return enclosed;
+	}
+	case '-': 
+	    nextToken();
+	    return Expr.makeApp1(Expr.NEG, parseExpr(35));
+	case Token.TT_EOF:
+	    throw error("Expected a factor",
+			SyntaxException.PREMATURE_EOF, null);
+	default:
+	    throw error("Expected a factor",
+			SyntaxException.BAD_FACTOR, null);
+	}
+    }
+
+    private SyntaxException error(String complaint, 
+				  int reason, 
+				  String expected) {
+	return new SyntaxException(complaint, this, reason, expected);
+    }
+
+    private void expect(int ttype) throws SyntaxException {
+	if (token.ttype != ttype)
+	    throw error("'" + (char)ttype + "' expected",
+			SyntaxException.EXPECTED, "" + (char)ttype);
+	nextToken();
+    }
+
+
+    // Error correction
+
+    boolean tryCorrections() {
+	return tryInsertions() || tryDeletions() || trySubstitutions();
+    }
+
+    private boolean tryInsertions() {
+	Vector v = tokens.tokens;
+	for (int i = tokens.index; 0 <= i; --i) {
+	    Token t;
+	    if (i < v.size()) {
+		t = (Token) v.elementAt(i);
+	    } else {
+		String s = tokens.getInput();
+		t = new Token(Token.TT_EOF, 0, s, s.length(), s.length());
+	    }
+	    Token[] candidates = possibleInsertions(t);
+	    for (int j = 0; j < candidates.length; ++j) {
+		v.insertElementAt(candidates[j], i);
+		try {
+		    reparse();
+		    return true;
+		} catch (SyntaxException se) { 
+		    v.removeElementAt(i);
+		}
+	    }
+	}
+	return false;
+    }
+
+    private boolean tryDeletions() {
+	Vector v = tokens.tokens;
+	for (int i = tokens.index; 0 <= i; --i) {
+	    if (v.size() <= i)
+		continue;
+	    Object t = v.elementAt(i);
+	    v.remove(i);
+	    try {
+		reparse();
+		return true;
+	    } catch (SyntaxException se) {
+		v.insertElementAt(t, i);
+	    }
+	}
+	return false;
+    }
+
+    private boolean trySubstitutions() {
+	Vector v = tokens.tokens;
+	for (int i = tokens.index; 0 <= i; --i) {
+	    if (v.size() <= i)
+		continue;
+	    Token t = (Token) v.elementAt(i);
+	    Token[] candidates = possibleSubstitutions(t);
+	    for (int j = 0; j < candidates.length; ++j) {
+		v.setElementAt(candidates[j], i);
+		try {
+		    reparse();
+		    return true;
+		} catch (SyntaxException se) { }
+	    }
+	    v.setElementAt(t, i);
+	}
+	return false;
+    }
+
+    private Token[] possibleInsertions(Token t) {
+	String ops = tokens.getOperatorChars();
+	Token[] ts = 
+	    new Token[ops.length() + 6 + procs1.length + procs2.length];
+	int i = 0;
+
+	Token one = new Token(Token.TT_NUMBER, 1, "1", t);
+	ts[i++] = one;
+
+	for (int j = 0; j < ops.length(); ++j)
+	    ts[i++] = new Token(ops.charAt(j), 0, "" + ops.charAt(j), t);
+
+	ts[i++] = new Token(Token.TT_WORD, 0, "x", t);
+
+	for (int k = 0; k < procs1.length; ++k)
+	    ts[i++] = new Token(Token.TT_WORD, 0, procs1[k], t);
+
+	for (int m = 0; m < procs2.length; ++m)
+	    ts[i++] = new Token(Token.TT_WORD, 0, procs2[m], t);
+
+	ts[i++] = new Token(Token.TT_LE, 0, "<=", t);
+	ts[i++] = new Token(Token.TT_NE, 0, "<>", t);
+	ts[i++] = new Token(Token.TT_GE, 0, ">=", t);
+	ts[i++] = new Token(Token.TT_WORD, 0, "if", t);
+	
+	return ts;
+    }
+
+    private Token[] possibleSubstitutions(Token t) {
+	return possibleInsertions(t);
+    }
+}
+
+class Scanner {
+
+    private String s;
+    private String operatorChars;
+
+    Vector tokens = new Vector();
+    int index = -1;
+
+    public Scanner(String string, String operatorChars) {
+        this.s = string;
+	this.operatorChars = operatorChars + "()";
+
+        int i = 0;
+	do {
+	    i = scanToken(i);
+	} while (i < s.length());
+    }
+
+    public String getInput() {
+	return s;
+    }
+
+    public String getOperatorChars() {
+	return operatorChars;
+    }
+
+    // The tokens may have been diddled, so this can be different from 
+    // getInput().
+    public String toString() {
+	StringBuffer sb = new StringBuffer();
+	int whitespace = 0;
+	for (int i = 0; i < tokens.size(); ++i) {
+	    Token t = (Token) tokens.elementAt(i);
+
+	    int spaces = (whitespace != 0 ? whitespace : t.leadingWhitespace);
+	    if (i == 0) 
+		spaces = 0;
+	    else if (spaces == 0 && !joinable((Token) tokens.elementAt(i-1), t))
+		spaces = 1;
+	    for (int j = spaces; 0 < j; --j)
+		sb.append(" ");
+
+	    sb.append(t.sval);
+	    whitespace = t.trailingWhitespace;
+	}
+	return sb.toString();
+    }
+
+    private boolean joinable(Token s, Token t) {
+	return !(isAlphanumeric(s) && isAlphanumeric(t));
+    }
+
+    private boolean isAlphanumeric(Token t) {
+	return t.ttype == Token.TT_WORD || t.ttype == Token.TT_NUMBER;
+    }
+
+    public boolean isEmpty() {
+	return tokens.size() == 0;
+    }
+
+    public boolean atStart() {
+	return index <= 0;
+    }
+
+    public boolean atEnd() {
+	return tokens.size() <= index;
+    }
+
+    public Token nextToken() {
+	++index;
+	return getCurrentToken();
+    }
+
+    public Token getCurrentToken() {
+	if (atEnd())
+	    return new Token(Token.TT_EOF, 0, s, s.length(), s.length());
+	return (Token) tokens.elementAt(index);
+    }
+
+    private int scanToken(int i) {
+        while (i < s.length() && Character.isWhitespace(s.charAt(i)))
+            ++i;
+
+        if (i == s.length()) {
+	    return i;
+        } else if (0 <= operatorChars.indexOf(s.charAt(i))) {
+	    if (i+1 < s.length()) {
+		String pair = s.substring(i, i+2);
+		int ttype = 0;
+		if (pair.equals("<="))
+		    ttype = Token.TT_LE;
+		else if (pair.equals(">="))
+		    ttype = Token.TT_GE;
+		else if (pair.equals("<>"))
+		    ttype = Token.TT_NE;
+		if (0 != ttype) {
+		    tokens.addElement(new Token(ttype, 0, s, i, i+2));
+		    return i+2;
+		}
+	    }
+	    tokens.addElement(new Token(s.charAt(i), 0, s, i, i+1));
+            return i+1;
+        } else if (Character.isLetter(s.charAt(i))) {
+            return scanSymbol(i);
+        } else if (Character.isDigit(s.charAt(i)) || '.' == s.charAt(i)) {
+            return scanNumber(i);
+        } else {
+            tokens.addElement(makeErrorToken("Unknown lexeme", i, i+1));
+            return i+1;
+        }
+    }
+
+    private int scanSymbol(int i) {
+	int from = i;
+        while (i < s.length() 
+	       && (Character.isLetter(s.charAt(i))
+		   || Character.isDigit(s.charAt(i))))
+            ++i;
+	tokens.addElement(new Token(Token.TT_WORD, 0, s, from, i));
+	return i;
+    }
+
+    private int scanNumber(int i) {
+	int from = i;
+
+        // We include letters in our purview because otherwise we'd
+        // accept a word following with no intervening space.
+        for (; i < s.length(); ++i)
+	    if ('.' != s.charAt(i)
+		&& !Character.isDigit(s.charAt(i))
+		&& !Character.isLetter(s.charAt(i)))
+                break;
+
+        String text = s.substring(from, i);
+	double nval;
+        try {
+            nval = Double.valueOf(text).doubleValue();
+        } catch (NumberFormatException nfe) {
+            tokens.addElement(makeErrorToken("Not a number", from, i));
+	    return i;
+        }
+
+	tokens.addElement(new Token(Token.TT_NUMBER, nval, s, from, i));
+	return i;
+    }
+
+    private Token makeErrorToken(String complaint, int from, int i) {
+	// TODO: incorporate the complaint somehow
+	return new Token(Token.TT_ERROR, 0, s, from, i);
+    }
+}
+
+/**
+ * An exception indicating a problem in parsing an expression.  It can
+ * produce a short, cryptic error message (with getMessage()) or a
+ * long, hopefully helpful one (with explain()).
+ */
+
+class SyntaxException extends Exception {
+
+    /** An error code meaning the input string had stuff left over. */
+    public static final int INCOMPLETE = 0;
+
+    /** An error code meaning the parser ran into a non-value token
+      (like "/") at a point it was expecting a value (like "42" or
+      "x^2"). */
+    public static final int BAD_FACTOR = 1;
+
+    /** An error code meaning the parser hit the end of its input
+        before it had parsed a full expression. */
+    public static final int PREMATURE_EOF = 2;
+
+    /** An error code meaning the parser hit an unexpected token at a
+        point it expected to see some particular other token. */
+    public static final int EXPECTED = 3;
+
+    /** An error code meaning the expression includes a variable not
+        on the `approved' list. */
+    public static final int UNKNOWN_VARIABLE = 4;
+
+    /** Make a new instance.
+     * @param complaint short error message
+     * @param parser the parser that hit this snag
+     * @param reason one of the error codes defined in this class
+     * @param expected if nonnull, the token the parser expected to
+     *        see (in place of the erroneous token it did see)
+     */
+    public SyntaxException(String complaint, 
+			   Parser parser,
+			   int reason, 
+			   String expected) {
+	super(complaint); 
+	this.reason = reason;
+	this.parser = parser;
+	this.scanner = parser.tokens;
+	this.expected = expected;
+    }
+
+    /** Give a long, hopefully helpful error message.
+     * @returns the message */
+    public String explain() {
+	StringBuffer sb = new StringBuffer();
+
+	sb.append("I don't understand your formula ");
+	quotify(sb, scanner.getInput());
+	sb.append(".\n\n");
+
+	explainWhere(sb);
+	explainWhy(sb);
+	explainWhat(sb);
+
+	return sb.toString();
+    }
+
+    private Parser parser;
+    private Scanner scanner;
+
+    private int reason;
+    private String expected;
+
+    private String fixedInput = "";
+
+    private void explainWhere(StringBuffer sb) {
+	if (scanner.isEmpty()) {
+	    sb.append("It's empty!\n");
+	} else if (scanner.atStart()) {
+	    sb.append("It starts with ");
+	    quotify(sb, theToken());
+	    if (isLegalToken()) 
+		sb.append(", which can never be the start of a formula.\n");
+	    else
+		sb.append(", which is a meaningless symbol to me.\n");
+	} else {
+	    sb.append("I got as far as ");
+	    quotify(sb, asFarAs());
+	    sb.append(" and then ");
+	    if (scanner.atEnd()) {
+		sb.append("reached the end unexpectedly.\n");
+	    } else {
+		sb.append("saw ");
+		quotify(sb, theToken());
+		if (isLegalToken()) 
+		    sb.append(".\n");
+		else
+		    sb.append(", which is a meaningless symbol to me.\n");
+	    }
+	}
+    }
+
+    private void explainWhy(StringBuffer sb) {
+	switch (reason) {
+	case INCOMPLETE: 
+	    if (isLegalToken())
+		sb.append("The first part makes sense, but I don't see " +
+			  "how the rest connects to it.\n");
+	    break;
+	case BAD_FACTOR:
+	case PREMATURE_EOF:
+	    sb.append("I expected a value");
+	    if (!scanner.atStart()) sb.append(" to follow");
+	    sb.append(", instead.\n");
+	    break;
+	case EXPECTED:
+	    sb.append("I expected ");
+	    quotify(sb, expected);
+	    sb.append(" at that point, instead.\n");
+	    break;
+	case UNKNOWN_VARIABLE:
+	    sb.append("That variable has no value.\n");
+	    break;
+	default:
+	    throw new Error("Can't happen");
+	}
+    }
+
+    private void explainWhat(StringBuffer sb) {
+	fixedInput = tryToFix();
+	if (null != fixedInput) {
+	    sb.append("An example of a formula I can parse is ");
+	    quotify(sb, fixedInput);
+	    sb.append(".\n");
+	}
+    }
+
+    private String tryToFix() {
+	return (parser.tryCorrections() ? scanner.toString() : null);
+    }
+
+    private void quotify(StringBuffer sb, String s) {
+	sb.append('"');
+	sb.append(s);
+	sb.append('"');
+    }
+
+    private String asFarAs() {
+	Token t = scanner.getCurrentToken();
+	int point = t.location - t.leadingWhitespace;
+	return scanner.getInput().substring(0, point);
+    }
+
+    private String theToken() {
+	return scanner.getCurrentToken().sval;
+    }
+
+    private boolean isLegalToken() {
+	Token t = scanner.getCurrentToken();
+	return t.ttype != Token.TT_EOF
+	    && t.ttype != Token.TT_ERROR;
+    }
+}
+
+class Token {
+    public static final int TT_ERROR  = -1;
+    public static final int TT_EOF    = -2;
+    public static final int TT_NUMBER = -3;
+    public static final int TT_WORD   = -4;
+    public static final int TT_LE     = -5;
+    public static final int TT_NE     = -6;
+    public static final int TT_GE     = -7;
+
+    public Token(int ttype, double nval, String input, int start, int end) {
+        this.ttype = ttype;
+        this.sval = input.substring(start, end);
+	this.nval = nval;
+	this.location = start;
+	
+	int count = 0;
+	for (int i = start-1; 0 <= i; --i) {
+	    if (!Character.isWhitespace(input.charAt(i)))
+		break;
+	    ++count;
+	}
+	this.leadingWhitespace = count;
+
+	count = 0;
+	for (int i = end; i < input.length(); ++i) {
+	    if (!Character.isWhitespace(input.charAt(i)))
+		break;
+	    ++count;
+	}
+	this.trailingWhitespace = count;
+    }
+
+    Token(int ttype, double nval, String sval, Token token) {
+	this.ttype = ttype;
+	this.sval = sval;
+	this.nval = nval;
+	this.location = token.location;
+	this.leadingWhitespace = token.leadingWhitespace;
+	this.trailingWhitespace = token.trailingWhitespace;
+    }
+
+    public final int ttype;
+    public final String sval;
+    public final double nval;
+
+    public final int location;
+
+    public final int leadingWhitespace, trailingWhitespace;
+}
+
+/**
+ * A variable is a simple expression with a name (like "x") and a
+ * changeable value.
+ */
+class Variable extends Expr {
+    private static Hashtable variables = new Hashtable();
+    
+    /**
+     * Return the variable named `name'.  There can be only one
+     * variable with the same name returned by this method; that is,
+     * make(s1) == make(s2) if and only if s1.equals(s2).
+     * @param name the variable's name
+     * @return the variable; create it initialized to 0 if it doesn't
+     *         yet exist */
+    static public synchronized Variable make(String name) {
+	Variable result = (Variable) variables.get(name);
+	if (result == null)
+	    variables.put(name, result = new Variable(name));
+	return result;
+    }
+
+    private String name;
+    private double val;
+
+    /**
+     * Create a new variable.
+     * @param name the variable's name
+     */
+    public Variable(String name) { 
+	this.name = name; val = 0; 
+    }
+
+    public String toString() { return name; }
+
+    /** Get the value.
+     * @return the current value */
+    public double value() { 
+	return val; 
+    }
+    /** Set the value.
+     * @param value the new value */
+    public void setValue(double value) { 
+	val = value; 
+    }
+
+    public void set_value(double value) { 
+	val = value; 
+    }
+}
+
+
+
diff --git a/htdocs/applets/Image_and_Cursor_All/Image_and_Cursor_All.html b/htdocs/applets/Image_and_Cursor_All/Image_and_Cursor_All.html
new file mode 100644
index 0000000000..b2c841fa1d
--- /dev/null
+++ b/htdocs/applets/Image_and_Cursor_All/Image_and_Cursor_All.html
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+	"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+	<title>Image and Cursor Java Applets</title>
+	<meta name="generator" content="BBEdit 9.6">
+</head>
+<body>
+<h3>Image and Cursor Applets</h3>
+<ul>
+	<li><a href="afghanistan_borders_alt.html" target="_applet">afghanistan_borders_alt</a></li>
+	<li><a href="afghanistan_borders.html" target="_applet">afghanistan_borders</a></li>
+	<li><a href="afghanistan_distances_alt.html" target="_applet">afghanistan_distances_alt</a></li>
+	<li><a href="afghanistan_distances.html" title="afghanistan_distances" target="_applet">afghanistan_distances</a></li>
+	<li><a href="curve_template_alt.html" title="curve_template_alt" target="_applet">curve_template_alt</a></li>
+	<li><a href="curve_template.html" title="curve_template" target="_applet">curve_template</a></li>
+	<li><a href=" water_fountain.html" title="water_fountain" target="_applet">water_fountain</a></li>
+	<li><a href=" water_fountain_alt.html" title="water_fountain_alt" target="_applet">water_fountain_alt</a></li>
+</ul>
+
+</body>
+</html>
diff --git a/htdocs/applets/Image_and_Cursor_All/Literal.class b/htdocs/applets/Image_and_Cursor_All/Literal.class
new file mode 100644
index 0000000000..d1262e2ad5
Binary files /dev/null and b/htdocs/applets/Image_and_Cursor_All/Literal.class differ
diff --git a/htdocs/applets/Image_and_Cursor_All/LiteralExpr.class b/htdocs/applets/Image_and_Cursor_All/LiteralExpr.class
new file mode 100644
index 0000000000..c798bb2b80
Binary files /dev/null and b/htdocs/applets/Image_and_Cursor_All/LiteralExpr.class differ
diff --git a/htdocs/applets/Image_and_Cursor_All/MiscFunctions.class b/htdocs/applets/Image_and_Cursor_All/MiscFunctions.class
new file mode 100644
index 0000000000..d688266b66
Binary files /dev/null and b/htdocs/applets/Image_and_Cursor_All/MiscFunctions.class differ
diff --git a/htdocs/applets/Image_and_Cursor_All/Parser.class b/htdocs/applets/Image_and_Cursor_All/Parser.class
new file mode 100644
index 0000000000..9c53796441
Binary files /dev/null and b/htdocs/applets/Image_and_Cursor_All/Parser.class differ
diff --git a/htdocs/applets/Image_and_Cursor_All/Scanner.class b/htdocs/applets/Image_and_Cursor_All/Scanner.class
new file mode 100644
index 0000000000..934b8e463e
Binary files /dev/null and b/htdocs/applets/Image_and_Cursor_All/Scanner.class differ
diff --git a/htdocs/applets/Image_and_Cursor_All/SyntaxException.class b/htdocs/applets/Image_and_Cursor_All/SyntaxException.class
new file mode 100644
index 0000000000..5451b0386d
Binary files /dev/null and b/htdocs/applets/Image_and_Cursor_All/SyntaxException.class differ
diff --git a/htdocs/applets/Image_and_Cursor_All/Syntax_error.class b/htdocs/applets/Image_and_Cursor_All/Syntax_error.class
new file mode 100644
index 0000000000..3d7c14ac7a
Binary files /dev/null and b/htdocs/applets/Image_and_Cursor_All/Syntax_error.class differ
diff --git a/htdocs/applets/Image_and_Cursor_All/Token.class b/htdocs/applets/Image_and_Cursor_All/Token.class
new file mode 100644
index 0000000000..c0294a0678
Binary files /dev/null and b/htdocs/applets/Image_and_Cursor_All/Token.class differ
diff --git a/htdocs/applets/Image_and_Cursor_All/UnaryExpr.class b/htdocs/applets/Image_and_Cursor_All/UnaryExpr.class
new file mode 100644
index 0000000000..7009ec1009
Binary files /dev/null and b/htdocs/applets/Image_and_Cursor_All/UnaryExpr.class differ
diff --git a/htdocs/applets/Image_and_Cursor_All/VCRButton.class b/htdocs/applets/Image_and_Cursor_All/VCRButton.class
new file mode 100644
index 0000000000..3a29ab58e7
Binary files /dev/null and b/htdocs/applets/Image_and_Cursor_All/VCRButton.class differ
diff --git a/htdocs/applets/Image_and_Cursor_All/Var_ref.class b/htdocs/applets/Image_and_Cursor_All/Var_ref.class
new file mode 100644
index 0000000000..1b12d21bce
Binary files /dev/null and b/htdocs/applets/Image_and_Cursor_All/Var_ref.class differ
diff --git a/htdocs/applets/Image_and_Cursor_All/Variable.class b/htdocs/applets/Image_and_Cursor_All/Variable.class
new file mode 100644
index 0000000000..3572a86dac
Binary files /dev/null and b/htdocs/applets/Image_and_Cursor_All/Variable.class differ
diff --git a/htdocs/applets/Image_and_Cursor_All/afghanistan_borders.html b/htdocs/applets/Image_and_Cursor_All/afghanistan_borders.html
new file mode 100644
index 0000000000..eaece7cfeb
--- /dev/null
+++ b/htdocs/applets/Image_and_Cursor_All/afghanistan_borders.html
@@ -0,0 +1,63 @@
+<HTML>
+<HEAD>
+<TITLE>The Border between Afghanistan and Iran</TITLE>
+</HEAD>
+<BODY>
+<p><center><H1>The Border between Afghanistan and Iran</H1></center></p>
+
+<table><tr><td width = 60%>
+<p>The live map below shows Afghanistan.  Your mission is to use this map to estimate the length of the border between Afghanistan and Iran</p>
+
+<center>
+<APPLET archive="Image_and_Cursor.jar" code="Image_and_Cursor" width = 530 height = 458>
+Your browser does not support Java, so nothing is displayed.
+   <param name = "applet_width" value = "530">
+   <param name = "applet_height" value = "458">
+   <param name = "image_width" value = "351">
+   <param name = "image_height" value = "378">
+   <param name = "backdrop_filename" value = "AF-MAP.JPG">
+   <param name = "display_placement" value = "1">
+   <param name = "display_sw" value = "1">
+   <param name = "cas_sw" value = "2">
+   <param name = "margin_x" value = "20">
+</APPLET>
+</center>
+</td><td width = 40% valign = top
+<p><center><b>Using this Live Map</b></center></p>
+
+<UL>
+
+<LI> Click anyplace on the map to move the cursor to that point.
+
+<p></p>
+
+<LI> Notice the readout at the upper right gives the location of the cursor measured in pixels from the lower left corner of the map.
+
+<p></p>
+
+<LI> You can fine tune the location of the cursor by clicking on the four arrows at the left, right, top, and bottom of the map.  Each click moves the cursor one pixel in the direction indicated by the arrow.
+
+<p></p>
+
+<LI> Use the scale printed at the bottom of the map to determine how to convert distances measured on the map in pixels to distances on the ground measured in miles or kilometers.
+
+<LI> Click the blue button, labeled "Mark point," to record the coordinates of a point.  Click it each time that you have moved the cursor to a new point whose coordinates you want to record.
+
+<LI> Click the red button, labeled "Show points," to display the coordinates of the points whose coordinates you have recorded. A new window will appear with the information that you have recorded.
+
+<LI> Click the black button, labeled "Clear points," to clear the list of recorded points.
+
+<LI> In this new window select the coordinates of the points in the usual way using your mouse and then copy them by pressing command-C in the MacOS or CTRL-C in Windows.
+
+<LI> Open your favorite spreadsheet and use paste to enter the coordinates that you just copied.
+
+<LI> Use this spreadsheet to do the arithmetic needed to determine the length of the border between Afghanistan and Iran.
+
+</UL>
+</td></tr></table>
+
+
+
+
+</BODY>
+</HTML>
diff --git a/htdocs/applets/Image_and_Cursor_All/afghanistan_borders_alt.html b/htdocs/applets/Image_and_Cursor_All/afghanistan_borders_alt.html
new file mode 100644
index 0000000000..73e4fd9243
--- /dev/null
+++ b/htdocs/applets/Image_and_Cursor_All/afghanistan_borders_alt.html
@@ -0,0 +1,63 @@
+<HTML>
+<HEAD>
+<TITLE>The Border between Afghanistan and Iran</TITLE>
+</HEAD>
+<BODY>
+<p><center><H1>The Border between Afghanistan and Iran</H1></center></p>
+
+<table><tr><td width = 60%>
+<p>The live map below shows Afghanistan.  Your mission is to use this map to estimate the length of the border between Afghanistan and Iran</p>
+
+<center>
+<APPLET code="Image_and_Cursor" width = 530 height = 458>
+Your browser does not support Java, so nothing is displayed.
+   <param name = "applet_width" value = "530">
+   <param name = "applet_height" value = "458">
+   <param name = "image_width" value = "351">
+   <param name = "image_height" value = "378">
+   <param name = "backdrop_filename" value = "AF-MAP.JPG">
+   <param name = "display_placement" value = "1">
+   <param name = "display_sw" value = "1">
+   <param name = "cas_sw" value = "2">
+   <param name = "margin_x" value = "20">
+</APPLET>
+</center>
+</td><td width = 40% valign = top
+<p><center><b>Using this Live Map</b></center></p>
+
+<UL>
+
+<LI> Click anyplace on the map to move the cursor to that point.
+
+<p></p>
+
+<LI> Notice the readout at the upper right gives the location of the cursor measured in pixels from the lower left corner of the map.
+
+<p></p>
+
+<LI> You can fine tune the location of the cursor by clicking on the four arrows at the left, right, top, and bottom of the map.  Each click moves the cursor one pixel in the direction indicated by the arrow.
+
+<p></p>
+
+<LI> Use the scale printed at the bottom of the map to determine how to convert distances measured on the map in pixels to distances on the ground measured in miles or kilometers.
+
+<LI> Click the blue button, labeled "Mark point," to record the coordinates of a point.  Click it each time that you have moved the cursor to a new point whose coordinates you want to record.
+
+<LI> Click the red button, labeled "Show points," to display the coordinates of the points whose coordinates you have recorded. A new window will appear with the information that you have recorded.
+
+<LI> Click the black button, labeled "Clear points," to clear the list of recorded points.
+
+<LI> In this new window select the coordinates of the points in the usual way using your mouse and then copy them by pressing command-C in the MacOS or CTRL-C in Windows.
+
+<LI> Open your favorite spreadsheet and use paste to enter the coordinates that you just copied.
+
+<LI> Use this spreadsheet to do the arithmetic needed to determine the length of the border between Afghanistan and Iran.
+
+</UL>
+</td></tr></table>
+
+
+
+
+</BODY>
+</HTML>
diff --git a/htdocs/applets/Image_and_Cursor_All/afghanistan_distances.html b/htdocs/applets/Image_and_Cursor_All/afghanistan_distances.html
new file mode 100644
index 0000000000..62e1590cd1
--- /dev/null
+++ b/htdocs/applets/Image_and_Cursor_All/afghanistan_distances.html
@@ -0,0 +1,53 @@
+<HTML>
+<HEAD>
+<TITLE>Distances in Afghanistan</TITLE>
+</HEAD>
+<BODY>
+<p><center><H1>Distances in Afghanistan</H1></center></p>
+
+<p>The live map below shows Afghanistan.  Your mission is to use this map to determine the distance (as the crow flies) between various points in Afghanistan.</p>
+
+<table><tr><td width = 60%>
+<center>
+<APPLET archive="Image_and_Cursor.jar" code="Image_and_Cursor" width = 500 height = 458>
+Your browser does not support Java, so nothing is displayed.
+   <param name = "applet_width" value = "500">
+   <param name = "applet_height" value = "458">
+   <param name = "image_width" value = "351">
+   <param name = "image_height" value = "378">
+   <param name = "backdrop_filename" value = "AF-MAP.JPG">
+   <param name = "display_placement" value = "1">
+   <param name = "display_sw" value = "0">
+</APPLET>
+</center>
+</td><td width = 40% valign = top
+<p><center><b>Using this Live Map</b></center></p>
+
+<p>&nbsp</p>
+<UL>
+
+<LI> Click anyplace on the map to move the cursor to that point.
+
+<p>&nbsp</p>
+
+<LI> Notice the readout at the upper right gives the location of the cursor measured in pixels from the lower left corner of the map.
+
+<p>&nbsp</p>
+
+<LI> You can fine tune the location of the cursor by clicking on the four arrows at the left, right, top, and bottom of the map.  Each click moves the cursor one pixel in the direction indicated by the arrow.
+
+<p>&nbsp</p>
+
+<LI> Use the scale printed at the bottom of the map to determine how to convert distances measured on the map in pixels to distances on the ground measured in miles or kilometers.
+</UL>
+</td></tr></table>
+
+<p><b>Question 1:</b>  How far (in miles) is it from Kandahar to Kabul?</p>
+
+<p><b>Question 2:</b> How far (in miles) is it from Kabul to Mazar-e-Sharif?</p>
+
+<p><b>Question 3:</b> How far (in miles) is it from Kandahar to Shindand?</p>
+
+
+</BODY>
+</HTML>
diff --git a/htdocs/applets/Image_and_Cursor_All/afghanistan_distances_alt.html b/htdocs/applets/Image_and_Cursor_All/afghanistan_distances_alt.html
new file mode 100644
index 0000000000..b8c7e31431
--- /dev/null
+++ b/htdocs/applets/Image_and_Cursor_All/afghanistan_distances_alt.html
@@ -0,0 +1,53 @@
+<HTML>
+<HEAD>
+<TITLE>Distances in Afghanistan</TITLE>
+</HEAD>
+<BODY>
+<p><center><H1>Distances in Afghanistan</H1></center></p>
+
+<p>The live map below shows Afghanistan.  Your mission is to use this map to determine the distance (as the crow flies) between various points in Afghanistan.</p>
+
+<table><tr><td width = 60%>
+<center>
+<APPLET code="Image_and_Cursor" width = 500 height = 458>
+Your browser does not support Java, so nothing is displayed.
+   <param name = "applet_width" value = "500">
+   <param name = "applet_height" value = "458">
+   <param name = "image_width" value = "351">
+   <param name = "image_height" value = "378">
+   <param name = "backdrop_filename" value = "AF-MAP.JPG">
+   <param name = "display_placement" value = "1">
+   <param name = "display_sw" value = "0">
+</APPLET>
+</center>
+</td><td width = 40% valign = top
+<p><center><b>Using this Live Map</b></center></p>
+
+<p>&nbsp</p>
+<UL>
+
+<LI> Click anyplace on the map to move the cursor to that point.
+
+<p>&nbsp</p>
+
+<LI> Notice the readout at the upper right gives the location of the cursor measured in pixels from the lower left corner of the map.
+
+<p>&nbsp</p>
+
+<LI> You can fine tune the location of the cursor by clicking on the four arrows at the left, right, top, and bottom of the map.  Each click moves the cursor one pixel in the direction indicated by the arrow.
+
+<p>&nbsp</p>
+
+<LI> Use the scale printed at the bottom of the map to determine how to convert distances measured on the map in pixels to distances on the ground measured in miles or kilometers.
+</UL>
+</td></tr></table>
+
+<p><b>Question 1:</b>  How far (in miles) is it from Kandahar to Kabul?</p>
+
+<p><b>Question 2:</b> How far (in miles) is it from Kabul to Mazar-e-Sharif?</p>
+
+<p><b>Question 3:</b> How far (in miles) is it from Kandahar to Shindand?</p>
+
+
+</BODY>
+</HTML>
diff --git a/htdocs/applets/Image_and_Cursor_All/curve_template.html b/htdocs/applets/Image_and_Cursor_All/curve_template.html
new file mode 100644
index 0000000000..a137c0030a
--- /dev/null
+++ b/htdocs/applets/Image_and_Cursor_All/curve_template.html
@@ -0,0 +1,7 @@
+<html><head><title>The Curve and the Water Fountain</title></head><body>
<p><center><H1>The Curve and the Water Fountain</H1></center></p>
+
+<p><center>
+<applet archive='Image_and_Cursor.jar' code='Image_and_Cursor' width = 701 height = 265>
<param name = 'applet_width' value = '701'>
<param name = 'applet_height' value = '265'>
<param name = 'image_width' value = '481'>
<param name = 'image_height' value = '223'>
<param name = 'backdrop_filename' value = 'water_fountain_1.gif'>
<param name = 'display_sw' value = '0'>
<param name = 'display_placement' value = '1'>
<param name = 'curve_sw' value = '1'>
<param name = 'curve_n' value = '100'>
+<param name = 'curve_color' value = '255000000'>
<param name = 'curve_a' value = 0>
<param name = 'curve_b' value = 423>
<param name = 'curve_y_of_x' value = '-0.00504238 * x^2 + 2.34528 * x - 69.4962'>
</applet>
+</center></p>
+
</body></html>
\ No newline at end of file
diff --git a/htdocs/applets/Image_and_Cursor_All/curve_template_alt.html b/htdocs/applets/Image_and_Cursor_All/curve_template_alt.html
new file mode 100644
index 0000000000..32d0970084
--- /dev/null
+++ b/htdocs/applets/Image_and_Cursor_All/curve_template_alt.html
@@ -0,0 +1,7 @@
+<html><head><title>The Curve and the Water Fountain</title></head><body>
<p><center><H1>The Curve and the Water Fountain</H1></center></p>
+
+<p><center>
+<applet code='Image_and_Cursor' width = 701 height = 265>
<param name = 'applet_width' value = '701'>
<param name = 'applet_height' value = '265'>
<param name = 'image_width' value = '481'>
<param name = 'image_height' value = '223'>
<param name = 'backdrop_filename' value = 'water_fountain_1.gif'>
<param name = 'display_sw' value = '0'>
<param name = 'display_placement' value = '1'>
<param name = 'curve_sw' value = '1'>
<param name = 'curve_n' value = '100'>
+<param name = 'curve_color' value = '255000000'>
<param name = 'curve_a' value = 0>
<param name = 'curve_b' value = 423>
<param name = 'curve_y_of_x' value = '-0.00504238 * x^2 + 2.34528 * x - 69.4962'>
</applet>
+</center></p>
+
</body></html>
\ No newline at end of file
diff --git a/htdocs/applets/Image_and_Cursor_All/water_fountain.html b/htdocs/applets/Image_and_Cursor_All/water_fountain.html
new file mode 100644
index 0000000000..af2094647f
--- /dev/null
+++ b/htdocs/applets/Image_and_Cursor_All/water_fountain.html
@@ -0,0 +1,102 @@
+<html> 
+<head>
+<script language="JavaScript">
+function respond()
+{
+    var x_low             = document.response.x_low.value
+    var x_high            = document.response.x_high.value
+    var y_of_x            = document.response.y_of_x.value
+
+    var win               = open("", "unusedname")
+
+    win.document.writeln("<html><head><title>The Curve and the Water Fountain</title></head><body>")
+    win.document.writeln("<p><center><H1>The Curve and the Water Fountain</H1></center></p>")
+    win.document.writeln("<p><center><applet archive='Image_and_Cursor.jar' code='Image_and_Cursor' width = 701 height = 265>")
+    win.document.writeln("<param name = 'applet_width' value = '701'>")
+    win.document.writeln("<param name = 'applet_height' value = '265'>")
+    win.document.writeln("<param name = 'image_width' value = '481'>")
+    win.document.writeln("<param name = 'image_height' value = '223'>")
+    win.document.writeln("<param name = 'backdrop_filename' value = 'water_fountain_1.gif'>")
+    win.document.writeln("<param name = 'display_sw' value = '0'>")
+    win.document.writeln("<param name = 'display_placement' value = '1'>")
+    win.document.writeln("<param name = 'curve_sw' value = '1'>")
+    win.document.writeln("<param name = 'curve_n' value = '100'>")
+    win.document.writeln("<param name = 'curve_color' value = '255000000'>")
+
+    win.document.write("<param name = 'curve_a' value = ")
+    win.document.write(x_low)
+    win.document.writeln(">")
+
+    win.document.write("<param name = 'curve_b' value = ")
+    win.document.write(x_high)
+    win.document.writeln(">")
+
+    win.document.write("<param name = 'curve_y_of_x' value = '")
+    win.document.write(y_of_x)
+    win.document.writeln("'>")
+    win.document.writeln("<param name = 'recovery_message_line_2' value = 'Then correct the expression for f(x).'>")
+
+    win.document.writeln("</applet></center></p>")
+    win.document.writeln("</body></html>")
+    win.document.close()
+}
+</script>
+
+<title>Describe the Squirt</title>
+</head>
+<body>
+
+<p><center><H1>Describe the Squirt</H1></center></p>
+
+<p><center>
+<APPLET archive="Image_and_Cursor.jar" code="Image_and_Cursor" width = 701 height = 303>
+Your browser does not support Java, so nothing is displayed.
+   <param name = "applet_width" value = "701">
+   <param name = "applet_height" value = "303">
+   <param name = "image_width" value = "481">
+   <param name = "image_height" value = "223">
+   <param name = "backdrop_filename" value = "water_fountain_1.gif">
+   <param name = "display_placement" value = "1">
+   <param name = "display_sw" value = "1">
+</APPLET>
+</center></p>
+
+<p>The photograph above shows water squirting from a water fountain.  Your job is to find a function <b>y = f(x)</b> describing the curve formed by the squirting water.  As part of describing the function <b>f(x)</b> you will need to specify its domain -- that is, the lowest and highest values of the variable <b>x</b>.</p>  
+
+<p>You can click on the photograph above to find the coordinates of the point at which you clicked.  You can fine tune the selected point by clicking at the arrows at the four sides of the photograph.  Each click on an arrow moves the cursors one pixel in the direction indicated by the arrow.</p>
+
+<p>
+You must enter three items in the form below to describe the curve formed by the squirting water.  The first two items specify the domain of the function <b>f(x)</b> and, thus, the part of the photograph above containing the curve formed by the squirting water.  The third item is an algebraic expression -- like <b>x^3 - x + 12</b>, for example -- that defines the function <b>f(x)</b> that describes the shape of the curve.  <font color = "B00000"><b>WARNING: Do not type something like f(x) = x^3 - x - 12.  Just type the algebraic expression, something like x^3 - x - 12</b>.</b></font></p>
+
+<p>After you have entered the three items in the form below, click the "<b>Try it!!</b>" button to see the curve superimposed on the photograph.</p>
+</p>
+
+<form name = "response">
+<p><center><table cellpadding = 10 width = 90%>
+<tr>
+<td width = 35%><b>Low end of the domain</b></td>
+<td width = 65%><input type = "textfield" value = "lowest value of x" 
+cols = "60" name = "x_low"></td>
+</tr>
+<td width = 35%><b>High end of the domain</b></td>
+<td width = 65%><input type = "textfield" value = "highest value of x" 
+cols = "60" name = "x_high"></td>
+</tr>
+<tr>
+<td width = 35%><b>The function f(x)</b></td>
+<td width = 65%>
+<textarea rows = 1 cols = 75 name = "y_of_x">
+Enter an algebraic expression defining the function f(x)
+</textarea></td>
+</tr>
+</table></center></p>
+
+<p><center>
+<input type = "button" value = "Try it!!" onclick = "respond()">
+</center></p>
+</form>
+
+<p>After you have found a function that you are reasonably happy with that describes the curve formed by the squirting water, discuss why it does not do as good a job as you might have hoped. </p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/htdocs/applets/Image_and_Cursor_All/water_fountain_1.gif b/htdocs/applets/Image_and_Cursor_All/water_fountain_1.gif
new file mode 100644
index 0000000000..e49ce8dfed
Binary files /dev/null and b/htdocs/applets/Image_and_Cursor_All/water_fountain_1.gif differ
diff --git a/htdocs/applets/Image_and_Cursor_All/water_fountain_alt.html b/htdocs/applets/Image_and_Cursor_All/water_fountain_alt.html
new file mode 100644
index 0000000000..7d4c0e86d4
--- /dev/null
+++ b/htdocs/applets/Image_and_Cursor_All/water_fountain_alt.html
@@ -0,0 +1,102 @@
+<html> 
+<head>
+<script language="JavaScript">
+function respond()
+{
+    var x_low             = document.response.x_low.value
+    var x_high            = document.response.x_high.value
+    var y_of_x            = document.response.y_of_x.value
+
+    var win               = open("", "unusedname")
+
+    win.document.writeln("<html><head><title>The Curve and the Water Fountain</title></head><body>")
+    win.document.writeln("<p><center><H1>The Curve and the Water Fountain</H1></center></p>")
+    win.document.writeln("<p><center><applet code='Image_and_Cursor' width = 701 height = 265>")
+    win.document.writeln("<param name = 'applet_width' value = '701'>")
+    win.document.writeln("<param name = 'applet_height' value = '265'>")
+    win.document.writeln("<param name = 'image_width' value = '481'>")
+    win.document.writeln("<param name = 'image_height' value = '223'>")
+    win.document.writeln("<param name = 'backdrop_filename' value = 'water_fountain_1.gif'>")
+    win.document.writeln("<param name = 'display_sw' value = '0'>")
+    win.document.writeln("<param name = 'display_placement' value = '1'>")
+    win.document.writeln("<param name = 'curve_sw' value = '1'>")
+    win.document.writeln("<param name = 'curve_n' value = '100'>")
+    win.document.writeln("<param name = 'curve_color' value = '255000000'>")
+
+    win.document.write("<param name = 'curve_a' value = ")
+    win.document.write(x_low)
+    win.document.writeln(">")
+
+    win.document.write("<param name = 'curve_b' value = ")
+    win.document.write(x_high)
+    win.document.writeln(">")
+
+    win.document.write("<param name = 'curve_y_of_x' value = '")
+    win.document.write(y_of_x)
+    win.document.writeln("'>")
+    win.document.writeln("<param name = 'recovery_message_line_2' value = 'Then correct the expression for f(x).'>")
+
+    win.document.writeln("</applet></center></p>")
+    win.document.writeln("</body></html>")
+    win.document.close()
+}
+</script>
+
+<title>Describe the Squirt</title>
+</head>
+<body>
+
+<p><center><H1>Describe the Squirt</H1></center></p>
+
+<p><center>
+<APPLET code="Image_and_Cursor" width = 701 height = 303>
+Your browser does not support Java, so nothing is displayed.
+   <param name = "applet_width" value = "701">
+   <param name = "applet_height" value = "303">
+   <param name = "image_width" value = "481">
+   <param name = "image_height" value = "223">
+   <param name = "backdrop_filename" value = "water_fountain_1.gif">
+   <param name = "display_placement" value = "1">
+   <param name = "display_sw" value = "1">
+</APPLET>
+</center></p>
+
+<p>The photograph above shows water squirting from a water fountain.  Your job is to find a function <b>y = f(x)</b> describing the curve formed by the squirting water.  As part of describing the function <b>f(x)</b> you will need to specify its domain -- that is, the lowest and highest values of the variable <b>x</b>.</p>  
+
+<p>You can click on the photograph above to find the coordinates of the point at which you clicked.  You can fine tune the selected point by clicking at the arrows at the four sides of the photograph.  Each click on an arrow moves the cursors one pixel in the direction indicated by the arrow.</p>
+
+<p>
+You must enter three items in the form below to describe the curve formed by the squirting water.  The first two items specify the domain of the function <b>f(x)</b> and, thus, the part of the photograph above containing the curve formed by the squirting water.  The third item is an algebraic expression -- like <b>x^3 - x + 12</b>, for example -- that defines the function <b>f(x)</b> that describes the shape of the curve.  <font color = "B00000"><b>WARNING: Do not type something like f(x) = x^3 - x - 12.  Just type the algebraic expression, something like x^3 - x - 12</b>.</b></font></p>
+
+<p>After you have entered the three items in the form below, click the "<b>Try it!!</b>" button to see the curve superimposed on the photograph.</p>
+</p>
+
+<form name = "response">
+<p><center><table cellpadding = 10 width = 90%>
+<tr>
+<td width = 35%><b>Low end of the domain</b></td>
+<td width = 65%><input type = "textfield" value = "lowest value of x" 
+cols = "60" name = "x_low"></td>
+</tr>
+<td width = 35%><b>High end of the domain</b></td>
+<td width = 65%><input type = "textfield" value = "highest value of x" 
+cols = "60" name = "x_high"></td>
+</tr>
+<tr>
+<td width = 35%><b>The function f(x)</b></td>
+<td width = 65%>
+<textarea rows = 1 cols = 75 name = "y_of_x">
+Enter an algebraic expression defining the function f(x)
+</textarea></td>
+</tr>
+</table></center></p>
+
+<p><center>
+<input type = "button" value = "Try it!!" onclick = "respond()">
+</center></p>
+</form>
+
+<p>After you have found a function that you are reasonably happy with that describes the curve formed by the squirting water, discuss why it does not do as good a job as you might have hoped. </p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/htdocs/applets/PointGraph/MultiPointGraph.html b/htdocs/applets/PointGraph/MultiPointGraph.html
new file mode 100644
index 0000000000..faaa38119b
--- /dev/null
+++ b/htdocs/applets/PointGraph/MultiPointGraph.html
@@ -0,0 +1,58 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+	"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+	<title></title>
+	<meta name="generator" content="BBEdit 9.6">
+</head>
+<body>
+
+<h3>PointGraph Flash Applet</h3>
+
+This should show a blank canvas with a red dot.
+<p>
+         <object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" 
+             id="PointGraph"  width="550" height="400"
+             codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab">
+         <param name="movie" value="PointGraph.swf" />
+         <param name="quality" value="high" />
+         <param name="bgcolor" value="#869ca7" />
+         <param name="allowScriptAccess" value="sameDomain" />
+         <param name="FlashVars" value=""/>
+         <embed src="PointGraph.swf" quality="high" bgcolor="#869ca7"
+             width="550" height="400" name="PointGraph"  align="middle" id="PointGraph"
+             play="true" loop="false" quality="high" allowScriptAccess="sameDomain"
+             type="application/x-shockwave-flash"
+             pluginspage="http://www.macromedia.com/go/getflashplayer"
+             FlashVars="">
+         </embed>
+
+     </object>
+</p>
+
+<h3>MultiPointGraph Flash Applet</h3>
+
+This should show only a blank canvas.
+<p>
+        <object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" 
+             id="PointGraph"  width="550" height="400"
+             codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab">
+         <param name="movie" value="MultiPointGraph.swf" />
+         <param name="quality" value="high" />
+         <param name="bgcolor" value="#869ca7" />
+         <param name="allowScriptAccess" value="sameDomain" />
+         <param name="FlashVars" value=""/>
+         <embed src="MultiPointGraph.swf" quality="high" bgcolor="#869ca7"
+             width="550" height="400" name="MultiPointGraph"  align="middle" id="MultiPointGraph"
+             play="true" loop="false" quality="high" allowScriptAccess="sameDomain"
+             type="application/x-shockwave-flash"
+             pluginspage="http://www.macromedia.com/go/getflashplayer"
+             FlashVars="">
+         </embed>
+
+     </object>
+</p>
+
+
+</body>
+</html>
diff --git a/htdocs/applets/PointGraph/MultiPointGraph.swf b/htdocs/applets/PointGraph/MultiPointGraph.swf
new file mode 100644
index 0000000000..16d7f325b5
Binary files /dev/null and b/htdocs/applets/PointGraph/MultiPointGraph.swf differ
diff --git a/htdocs/applets/PointGraph/PointGraph.save b/htdocs/applets/PointGraph/PointGraph.save
new file mode 100644
index 0000000000..bb0f73e166
Binary files /dev/null and b/htdocs/applets/PointGraph/PointGraph.save differ
diff --git a/htdocs/applets/PointGraph/PointGraph.swf b/htdocs/applets/PointGraph/PointGraph.swf
new file mode 100644
index 0000000000..bb0f73e166
Binary files /dev/null and b/htdocs/applets/PointGraph/PointGraph.swf differ
diff --git a/htdocs/applets/README b/htdocs/applets/README
new file mode 100644
index 0000000000..12a1fd1ef6
--- /dev/null
+++ b/htdocs/applets/README
@@ -0,0 +1,68 @@
+
+Sources for the applets used in WeBWork demos:
+
+=================================================
+
+Java Applets:
+=================================================
+
+xFunctions (from David Eck at Hobart and William Smith College)
+http://math.hws.edu/xFunctions/
+Doesn't connect directly to WeBWorK but can be useful for students
+
+==================================================
+
+geogebra (version 3.2.40+)
+This applet is updated frequently so you will not to get fresh versions at;
+http://www.geogebra.org/cms/en/installers (offline installers)    or
+http://www.geogebra.org/cms/en/download
+Information generaly about geogebra is at:   http://www.geogebra.org/cms/
+
+==================================================
+
+
+Image_and_Cursor -- liteApplet from Frank Wattenberg (West Point)
+http://mathdl.maa.org/images/upload_library/4/vol2/liteapplets/contents.html
+
+==================================================
+
+SketchGraph, SliderGraph, GummyGraph  -- David Eck
+Designed specifically to interact with webwork.  
+Source code for these applets is in the webwork2/htdocs/applets/source subdirectory
+Uses components from this repository:
+http://math.hws.edu/javamath/
+=================================================
+
+FlashApplets
+=================================================
+
+
+MutiPointGraph.swf, PointGraph.swf -- flash applets from Doug Ensley (Shippensburg U.)  and Mike Gage (UR)
+Designed for webwork.  Based on other mathematics applets illustrated at:
+http://www.flashandmath.com/mathlets/index.html
+and http://www.flashandmath.com/index.html for tutorials on using flash.
+See also http://webwork.maa.org/wiki/Simple_example for a description of the actionScript code for this flash applet
+
+=================================================
+
+
+Canvas Applets  
+-- a version of SketchGraph in html5 and javaScript by David Gage
+-- the code is in webwork2/js/sketchgraphhtml5b 
+-- html5 and javaScript is a relatively new technology but it is likely to become important 
+   particularly for mobile devices such as the iPad
+-- javaScript and actionScript have become fairly similar
+
+=================================================
+
+The existing applets are still mostly at the proof of concept stage. Find useful
+questions to build around them or create your own applets which are more flexible or 
+more useful.
+
+
+Examples of the use of thee applets are at:
+
+https://test.webwork.maa.org/webwork2/2010JMM_demo/
+https://test.webwork.maa.org/webwork2/2010geogebra_at_ithaca/
+https://courses.webwork.maa.org/webwork2/wikiExamples/
+
diff --git a/htdocs/applets/WeBWorKAppletTest.html b/htdocs/applets/WeBWorKAppletTest.html
new file mode 100644
index 0000000000..3794a1a177
--- /dev/null
+++ b/htdocs/applets/WeBWorKAppletTest.html
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+        "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd">
+<html>
+<head>
+
+
+
+<title>WeBWorKAppletTest.html</title>
+
+</head>
+<body>
+
+<h1>WeBWorK Applet Test page</h1>
+
+This page is used to test the availability of the default Java, WeBWorK and HTML5 applets
+available through WeBWorK.  Use this to test whether your browser can properly interpret 
+these java applets.
+
+<h3>Java Applets</h3>
+
+<UL>
+<li> <a href="Xgraph/GummyGraph.html" title="Gummy Graph" target="_applet">Gummy Graph</a></li>
+<li><a href="Xgraph/SketchGraph.html" title="Sketch Graph" target="_applet">Sketch Graph</a></li>
+<li><a href="liveJar/liveJar.html" target="_applet">liveJar -- used to display 3d graphs</li></a>
+<li><a href="Image_and_Cursor_All/Image_and_Cursor_All.html" target="_applet">Image and cursor java applets</a></li>
+</UL>
+<h3>Geogebra Java Applet</h3>
+<ul>
+	<li><a href="geogebra_stable/geogebra_webstart.html" target="_applet">Geogebra Applet webstart</a></li>
+	<p>
+	  This references the latest version of Geogebra available at <a href="http://www.geogebra.org/">http://www.geogebra.org/</a>. Unfortunately this cannot be
+	  used in WeBWorK questions that interact with geogebra.  The security rules for the javaScript communication require that the java applet (geogebra) and 
+	  the calling page (the WeBWorK question) come from the same domain. (You can check the version number under the "Help" menu in the geogebra window.)  
+	</p>
+	<li><a href="geogebra_stable/geogebra.html" target="_applet">Geogebra Java Applet</a></li>
+		<p>
+	  This references the version of  Geogebra available on thei WeBWorK website. (You can check the version number under the "Help" menu in the geogebra window.)  
+	  This is the version of Geogebra referenced from within most webwork questions.
+	</p>
+</ul>
+
+<h3>Flash Applets</h3>
+<a href="PointGraph/MultiPointGraph.html" target="_applet">PointGraph and MultiPointGraph Flash Applets</a>
+<hr>
+
+<p align="left">
+Sources for the applets used in WeBWork demos:
+<a href="README" title="README" target="_applet">README</a>
+</p>
+
+
+
+</body>
+</html>
diff --git a/htdocs/applets/Xgraph/GummyGraph.class b/htdocs/applets/Xgraph/GummyGraph.class
new file mode 100644
index 0000000000..8cdf647b22
Binary files /dev/null and b/htdocs/applets/Xgraph/GummyGraph.class differ
diff --git a/htdocs/applets/Xgraph/GummyGraph.html b/htdocs/applets/Xgraph/GummyGraph.html
new file mode 100644
index 0000000000..0a4184ca04
--- /dev/null
+++ b/htdocs/applets/Xgraph/GummyGraph.html
@@ -0,0 +1,20 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+	"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+	<title>Gummy Graph</title>
+	<meta name="generator" content="BBEdit 9.6">
+</head>
+<body>
+<h2>GummyGraph</h2>
+
+<applet code="GummyGraph.class" name="GummyGraph" alt="GummyGraph" 
+align="middle" width="500" height="300">
+
+</applet>
+<p>
+Written by David Eck 
+
+
+</body>
+</html>
diff --git a/htdocs/applets/Xgraph/SketchGraph.html b/htdocs/applets/Xgraph/SketchGraph.html
new file mode 100755
index 0000000000..1911e3ff8a
--- /dev/null
+++ b/htdocs/applets/Xgraph/SketchGraph.html
@@ -0,0 +1,85 @@
+<html>
+
+<head>
+
+<title>TrivialApplet</title>
+
+<script>
+
+<!--
+
+    function getGraphPoints() {
+
+       var ct = document.graphApplet.getPointCount();
+
+       var str = "Graph has " + ct + " points.\n\n";
+
+       for (var i = 0; i < ct; i++) {
+
+          str = str + document.graphApplet.getX(i) + "   " + document.graphApplet.getY(i) + "   " + document.graphApplet.getDerivative(i) + "\n";
+
+       } 
+
+       document.control.pointDisplay.value = str;
+
+    }
+
+// -->
+
+</script>
+
+</head>
+
+<body>
+
+<hr>
+
+<applet name="graphApplet" archive="SketchGraph.jar"
+code="SketchGraph.class" width=350 height=300>
+
+</applet>
+
+<hr>
+
+
+
+<form name="control">
+
+
+
+<p>
+
+Y-values: 
+
+<input type="text" name="points" size=50> 
+
+<input type="button" name="setPts" value="Set" onClick="document.graphApplet.setPoints(points.value)">
+
+<br><br>
+
+&nbsp;&nbsp;&nbsp;&nbsp;
+
+<input type="button" name="showGrid" value="Show Grid" onClick="document.graphApplet.setShowGrid(true)">
+
+<input type="button" name="hideGrid" value="Hide Grid" onClick="document.graphApplet.setShowGrid(false)">
+
+<input type="button" name="reset" value="Reset to Zero" onClick="document.graphApplet.reset()">
+
+<br><br>
+
+<input type="button" name="getPts" value="Get Points" onClick="getGraphPoints()"><br>
+
+<textarea name="pointDisplay" rows=10 cols=60></textarea>
+
+</p>
+
+
+
+</form>
+
+
+
+</body>
+
+</html>
+
diff --git a/htdocs/applets/Xgraph/SketchGraph.jar b/htdocs/applets/Xgraph/SketchGraph.jar
new file mode 100644
index 0000000000..53fba62f86
Binary files /dev/null and b/htdocs/applets/Xgraph/SketchGraph.jar differ
diff --git a/htdocs/applets/Xgraph/SliderGraph.html b/htdocs/applets/Xgraph/SliderGraph.html
new file mode 100644
index 0000000000..880e6593ce
--- /dev/null
+++ b/htdocs/applets/Xgraph/SliderGraph.html
@@ -0,0 +1,156 @@
+<HTML>
+<HEAD>
+<TITLE>Sample JCM Applet: SliderGraph</TITLE>
+</HEAD>
+<BODY bgcolor="#DDDDDD">
+
+
+<blockquote>
+
+<div align=right>[
+<a href="GraphApplet3.html">prev</a> |
+<a href="index.html">main</a> |
+<a href="TangentsApplet.html">next</a>
+]</div>
+
+
+
+<HR noshade>
+<H1 align=center><font color="#CC0000">Slider Graph</font></H1>
+<HR noshade>
+<br>
+
+<p>This applet that draws the graph of a function that can include<br>
+references to the "constants" a, b, and c.  The values of these<br>
+constants can be adjusted using the sliders at the bottom of the<br>
+applet.  The applet responds to the mouse actions click, shift-click,<br>
+click-and-drag, and right-click-and-drag.  I've added another<br>
+buttons to the limit control panel.  The "Equalize Axes" button<br>
+adjusts the x- and y-limits so that the scales on the two axes<br>
+are the same.
+</p>
+
+<p align=center><applet align=center code="SliderGraph.class" 
+        archive="jcm1.0-basic.jar" width=500 height=450></applet></p>
+         
+<p>The following source code shows how the applet is built from<br>
+JCM components.  Most of the comments are for features that were<br>
+not already covered in previous examples.
+</p>
+ 
+<hr noshade>
+
+<pre>
+
+import java.awt.*;
+import edu.hws.jcm.data.*;
+import edu.hws.jcm.draw.*;
+import edu.hws.jcm.awt.*;
+
+public class SliderGraph extends java.applet.Applet {
+
+   private DisplayCanvas canvas;
+   
+   public void stop() {
+      canvas.releaseResources();
+   }
+   
+   JCMPanel makeSliderPanel(VariableSlider v) {
+         <font color="#0000AA">// A small utility routing that makes a JCMPanel that contains</font>
+         <font color="#0000AA">// a VariableSlider and a DisplayLabel that shows the value</font>
+         <font color="#0000AA">// of the variable associated with that slider.</font>
+      JCMPanel p = new JCMPanel();
+      p.add(v, BorderLayout.CENTER);
+      p.add( new DisplayLabel(v.getName() + " = #", new Value[] { v } ), BorderLayout.EAST);
+      return p;
+   }
+   
+
+   public void init() {
+   
+      Parser parser = new Parser();
+      Variable x = new Variable("x");
+      parser.add(x);
+      
+        <font color="#0000AA">// Create the three VariableSliders.  In this case, the sliders have</font>
+        <font color="#0000AA">//   names.  There is also a Variable associated with each slider, </font>
+        <font color="#0000AA">//   which has the same name.  This variable is added to the parser</font>
+        <font color="#0000AA">//   which is passed as the fourth parameter to the constructor, making</font>
+        <font color="#0000AA">//   it possible to use "a", "b", and "c" in expressions parsed by the</font>
+        <font color="#0000AA">//   parser.  Adjusting the value on a slider changes the value of the</font>
+        <font color="#0000AA">//   associated variable, and therefore changes the value of any</font>
+        <font color="#0000AA">//   expression that refers to that variable.  The second and third</font>
+        <font color="#0000AA">//   parameters to the constructor give the minimum and maximum Values</font>
+        <font color="#0000AA">//   on the slider.  Passing "null,null" uses the defaults, namely</font>
+        <font color="#0000AA">//   new Constant(-5) and new Constant(5).</font>
+      VariableSlider a = new VariableSlider("a",null,null,parser);
+      VariableSlider b = new VariableSlider("b",null,null,parser);
+      VariableSlider c = new VariableSlider("c",null,null,parser);
+
+      canvas = new DisplayCanvas();
+      canvas.setHandleMouseZooms(true);
+      canvas.add(new Panner());
+      
+      LimitControlPanel limits =
+           new LimitControlPanel( LimitControlPanel.SET_LIMITS | LimitControlPanel.RESTORE
+                                    | LimitControlPanel.EQUALIZE,  false);
+      limits.addCoords(canvas);
+      
+      ExpressionInput input = new ExpressionInput("a*x^2 + b*x + c", parser);
+      Graph1D graph = new Graph1D(input.getFunction(x));
+      
+      ComputeButton button = new ComputeButton("Graph it!");
+      
+      canvas.add(new Axes());
+      canvas.add(graph);
+      canvas.add(new DrawBorder(Color.darkGray, 2));
+      
+      JCMPanel main = new JCMPanel();  <font color="#0000AA">// Build interface out of JCMPanels!</font>
+      main.setInsetGap(3);
+      main.add(canvas, BorderLayout.CENTER);
+      main.add(limits, BorderLayout.EAST);
+      JCMPanel bot = new JCMPanel(5,1);
+      main.add(bot, BorderLayout.SOUTH);
+      
+      bot.add(new Label("Enter a function f(x), which can use the constants a, b, and c:"));
+      JCMPanel inputPanel = new JCMPanel();
+      bot.add(inputPanel);      
+      inputPanel.add(input, BorderLayout.CENTER);
+      inputPanel.add(button, BorderLayout.EAST);
+      
+      bot.add( makeSliderPanel(a) );  <font color="#0000AA">// Create and add the sliders.</font>
+      bot.add( makeSliderPanel(b) );
+      bot.add( makeSliderPanel(c) );
+      
+      Controller controller = main.getController();  <font color="#0000AA">// Set up error reporting.</font>
+      controller.setErrorReporter(canvas);
+      limits.setErrorReporter(canvas);
+
+      main.gatherInputs();  <font color="#0000AA">// Set up main panel to respond to changes in input objects.</font>
+                            <font color="#0000AA">// This works since the interface is built of JCMPanels.  For</font>
+                            <font color="#0000AA">// the same reason, I don't have to add the objects the the</font>
+                            <font color="#0000AA">// controller.</font>
+                             
+      button.setOnUserAction(controller);  <font color="#0000AA">// Set controller to respond to button.</font>
+
+      setBackground(Color.lightGray);
+      setLayout(new BorderLayout());
+      add(main,BorderLayout.CENTER);
+
+   } <font color="#0000AA">// end init()</font>
+   
+} <font color="#0000AA">// end class SliderGraph</font>
+
+
+</pre>
+
+<hr noshade>
+<div align=center>[
+<a href="GraphApplet3.html">prev</a> |
+<a href="index.html">main</a> |
+<a href="TangentsApplet.html">next</a>
+]</div>
+
+</blockquote>
+</body>
+</HTML>
diff --git a/htdocs/applets/Xgraph/jcm1.0-config2.jar b/htdocs/applets/Xgraph/jcm1.0-config2.jar
new file mode 100644
index 0000000000..da5a76a8d6
Binary files /dev/null and b/htdocs/applets/Xgraph/jcm1.0-config2.jar differ
diff --git a/htdocs/applets/geogebra_stable/README b/htdocs/applets/geogebra_stable/README
new file mode 100644
index 0000000000..3045b99b71
--- /dev/null
+++ b/htdocs/applets/geogebra_stable/README
@@ -0,0 +1,15 @@
+Updating the geogebra_stable directory
+
+Currently at 
+
+Version 3.2.46.0  December 17, 2010
+
+(a little behind webstart version)
+
+To upgrade go to 
+
+http://www.geogebra.org/cms/en/installers
+
+grab the installer APPROPRIATE FOR YOUR OPERATING SYSTEM 
+
+unpack it and install it in geogebra_stable
\ No newline at end of file
diff --git a/htdocs/applets/geogebra_stable/geogebra.html b/htdocs/applets/geogebra_stable/geogebra.html
new file mode 100644
index 0000000000..ed2b2cf317
--- /dev/null
+++ b/htdocs/applets/geogebra_stable/geogebra.html
@@ -0,0 +1,25 @@
+<html><head></head><body>
+
+<h1> Geogebra applet </h1>
+<div id="applet1"><applet name="ggbApplet" 
+                          code="geogebra.GeoGebraApplet" 
+                          archive="geogebra.jar" 
+                          height="475" width="878">
+                          <param name="framePossible" value="true">
+                          <param name="enableRightClick" value="true">
+                          <param name="enableShiftDragZoom" value="true">
+                          <param name="enableLabelDrags" value="true">
+                          <param name="showSpreadsheet" value="true">
+                          <param name="showAlgebraView" value="true">
+                          <param name="showResetIcon" value="true">
+                          <param name="showMenuBar" value="true">
+                          <param name="showToolBar" value="true">
+                          <param name="showToolBarHelp" value="true">
+                          <param name="showAlgebraInput" value="true">Sorry, the GeoGebra Applet could not be started. Please make sure that Java 1.4.2 (or later) is installed and activated.(<a href="http://java.sun.com/getjava">click here to install Java now</a>)
+                    </applet>
+</div>
+
+
+
+
+</body></html>
diff --git a/htdocs/applets/geogebra_stable/geogebra.jar b/htdocs/applets/geogebra_stable/geogebra.jar
new file mode 100644
index 0000000000..d0586fc83e
Binary files /dev/null and b/htdocs/applets/geogebra_stable/geogebra.jar differ
diff --git a/htdocs/applets/geogebra_stable/geogebra.xml b/htdocs/applets/geogebra_stable/geogebra.xml
new file mode 100644
index 0000000000..e613d7595c
--- /dev/null
+++ b/htdocs/applets/geogebra_stable/geogebra.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+	<mime-type type="application/vnd.geogebra.file">
+		<comment>GeoGebra worksheet</comment>
+		<comment xml:lang="cs">Pracovní list GeoGebry</comment>
+		<comment xml:lang="de">GeoGebra-Arbeitsblatt</comment>
+		<comment xml:lang="es">Archivo GeoGebra</comment>
+		<comment xml:lang="fr">Feuille de travail GeoGebra </comment>
+		<comment xml:lang="hi">जीओ-जेब�रा कार�य-पत�र</comment>
+		<comment xml:lang="it">Foglio di lavoro GeoGebra </comment>
+		<comment xml:lang="pt-BR">Planilha GeoGebra</comment>
+		<sub-class-of type="application/zip"/>
+		<glob pattern="*.ggb"/>
+	</mime-type>
+	<mime-type type="application/vnd.geogebra.tool">
+		<comment>GeoGebra tool</comment>
+		<comment xml:lang="cs">Nástroj GeoGebry</comment>
+		<comment xml:lang="de">GeoGebra-Werkzeug</comment>
+		<comment xml:lang="es">Herramienta GeoGebra</comment>
+		<comment xml:lang="fr">Outil GeoGebra</comment>
+		<comment xml:lang="hi">जीओ-जेब�रा साधन</comment>
+		<comment xml:lang="it">Strumento GeoGebra</comment>
+		<comment xml:lang="pt-BR">Ferramenta GeoGebra</comment>
+		<sub-class-of type="application/zip"/>
+		<glob pattern="*.ggt"/>
+	</mime-type>
+</mime-info>
\ No newline at end of file
diff --git a/htdocs/applets/geogebra_stable/geogebra/properties/error.properties b/htdocs/applets/geogebra_stable/geogebra/properties/error.properties
new file mode 100755
index 0000000000..572d113010
--- /dev/null
+++ b/htdocs/applets/geogebra_stable/geogebra/properties/error.properties
@@ -0,0 +1,129 @@
+AngleMustBeConstant=Every angle has to be constant.
+
+AppletWindowClosing=Please close the browser window to exit GeoGebra.
+# not used
+AssignmentDependentToFree=Free objects may not be overwritten by dependent objects.
+# not used
+AssignmentToDependent=Dependent objects may not be overwritten.
+
+AssignmentToFixed=Fixed objects may not be changed.
+
+ChangeDependent=Dependent objects may not be changed.
+
+CircularDefinition=Circular definition
+
+CoordinatesMustBeConstant=Coordinates have to be constant.
+
+DivisorMustBeConstant=Every divisor has to be constant.
+
+Error=Error
+
+ExponentMustBeConstant=Every exponent has to be constant.
+
+ExponentMustBeInteger=Every exponent has to be an integer.
+
+FileFormatNewer=Please upgrade to a newer version of GeoGebra.\nThis file format is not supported.
+
+FileFormatUnknown=Unknown file format
+
+FileNotFound=File not found
+
+FunctionExpected=Function expected
+
+HelpNotFound=Could not find online help.
+
+IllegalAddition=Illegal addition
+
+IllegalArgument=Illegal argument
+
+IllegalArgumentNumber=Illegal number of arguments
+
+IllegalAssignment=Illegal assignment
+
+IllegalDivision=Illegal division
+
+IllegalExponent=Illegal exponent
+
+IllegalMultiplication=Illegal multiplication
+
+IllegalSubtraction=Illegal subtraction
+
+IllegalVariable=Illegal variable
+
+IncompleteEquation=Incomplete equation:\nPlease enter both sides of the equation.
+
+InvalidEquation=Invalid equation:\nPlease enter a linear or quadratic equation in x and y.
+
+InvalidFunction=Invalid function:\nPlease enter an explicit function in x.
+
+InvalidInput=Invalid input
+
+isNoAngle=is not an angle
+
+isNoConic=is not a conic
+
+isNoFunction=is not a function
+
+isNoLength=is not a length
+
+isNoLine=is not a line
+
+isNoNumber=is not a number
+
+isNoPoint=is not a point
+
+isNoText=is not a text
+
+isNoVector=is not a vector
+
+LengthMustBeConstant=Every length has to be constant.
+
+LoadFileFailed=Opening file failed.
+
+NameUsed=This label is already in use.
+
+NumberExpected=Number expected
+
+RenameFailed=Rename failed
+
+ReplaceFailed=Redefinition failed
+
+SaveFileFailed=Saving file failed
+
+UndefinedVariable=Undefined variable
+
+UnknownCommand=Unknown command
+
+UnsupportedLAF=The chosen look and feel is not available on your computer.
+
+URLnotFound=Opening URL failed
+
+VectorExpected=Point or vector expected
+
+#V3.0 begin
+IllegalBoolean=Illegal Boolean operation
+
+IllegalComparison=Illegal comparison
+
+Tool.CreationFailed=Tool could not be created.
+
+Tool.OutputNotDependent=Output object does not depend on input objects.
+
+Tool.InputNotNeeded=Input object is not needed.
+
+Tool.DeleteUsed=Tool is used in construction and cannot be deleted.
+
+Tool.CommandNameTaken=Command name is already used by another tool.
+
+#V3.0 end
+
+#V3.1 start
+PasteImageFailed=Sorry - couldn't paste bitmap from the clipboard.
+
+IllegalComplexMultiplication=Illegal complex multiplication
+
+ExportJarMissing=Sorry, the geogebra_export.jar file is missing or corrupt.
+#V3.1 end
+# new keys below
+
+CAS.GeneralErrorMessage = Sorry, the input is not acceptable.
\ No newline at end of file
diff --git a/htdocs/applets/geogebra_stable/geogebra/properties/javaui.properties b/htdocs/applets/geogebra_stable/geogebra/properties/javaui.properties
new file mode 100755
index 0000000000..e23f6f14bc
--- /dev/null
+++ b/htdocs/applets/geogebra_stable/geogebra/properties/javaui.properties
@@ -0,0 +1,57 @@
+FileChooser.acceptAllFileFilterText=All Files
+FileChooser.cancelButtonText=Cancel 
+FileChooser.cancelButtonToolTipText=Cancel
+FileChooser.deleteFileButtonText=Delete
+FileChooser.deleteFileButtonToolTipText=Delete selected file
+FileChooser.detailsViewActionLabelText=Details
+FileChooser.detailsViewButtonAccessibleName=Details
+FileChooser.detailsViewButtonToolTipText=Details
+FileChooser.directoryDescriptionText=Directory 
+FileChooser.directoryOpenButtonText=Open
+FileChooser.directoryOpenButtonToolTipText=Open selected file
+FileChooser.directorysavebuttonText=Save
+FileChooser.directorysavebuttonToolTipText=Save directory 
+FileChooser.enterFilenameLabelText=File name:
+FileChooser.fileAttrHeaderText=Attributes
+FileChooser.FileChooserDetailsText=Details 
+FileChooser.fileDateHeaderText=Date
+FileChooser.fileDateHeaderText=Modified
+FileChooser.fileNameHeaderText=Name
+FileChooser.fileNameLabelText=File name:
+FileChooser.fileSizeHeaderText=Size
+FileChooser.filesLabelText=Files:
+FileChooser.filesOfTypeLabelText=Files of type:
+FileChooser.fileTypeHeaderText=Type
+FileChooser.filterLabelText=Filter: 
+FileChooser.foldersLabelText=Folder: 
+FileChooser.helpButtonText=Help
+FileChooser.helpButtonToolTipText=Help
+FileChooser.homeFolderAccessibleName=Home
+FileChooser.homeFolderToolTipText=Home
+FileChooser.listViewActionLabelText=List
+FileChooser.listViewButtonAccessibleName=List
+FileChooser.listViewButtonToolTipText=List
+FileChooser.lookInLabelText=Look In: 
+FileChooser.newFolderActionLabelText=New Folder
+FileChooser.newFolderButtonText=New Folder
+FileChooser.newFolderButtonToolTipText=Create new folder
+FileChooser.newFolderDialogText=New Folder
+FileChooser.newFolderToolTipText=Create New Folder
+FileChooser.openButtonText=Open 
+FileChooser.openButtonToolTipText=Open 
+FileChooser.openDialogTitleText=Open
+FileChooser.pathLabelText=Path:
+FileChooser.refreshActionLabelText=Refresh
+FileChooser.renameFileButtonText=Rename
+FileChooser.renameFileButtonToolTipText=Rename
+FileChooser.renameFileDialogText=Rename
+FileChooser.saveButtonText=Save 
+FileChooser.saveButtonToolTipText=Save 
+FileChooser.saveDialogTitleText=Save
+FileChooser.saveInLabelText=Save in:
+FileChooser.sortMenuLabelText=Arrange Icons By
+FileChooser.updateButtonText=Update 
+FileChooser.updateButtonToolTipText=Update 
+FileChooser.upFolderAccessibleName=Up
+FileChooser.upFolderToolTipText=Up 
+FileChooser.viewMenuLabelText=View
\ No newline at end of file
diff --git a/htdocs/applets/geogebra_stable/geogebra/properties/menu.properties b/htdocs/applets/geogebra_stable/geogebra/properties/menu.properties
new file mode 100755
index 0000000000..4d8b6d0538
--- /dev/null
+++ b/htdocs/applets/geogebra_stable/geogebra/properties/menu.properties
@@ -0,0 +1,606 @@
+About=About
+
+AngleUnit=Angle Unit
+
+AngularBisector=Angle Bisector
+
+Axes=Axes
+
+Circle2=Circle with Center through Point
+
+Circle3=Circle through Three Points
+
+Close=Close
+
+Conic5=Conic through Five Points
+
+Conic=Conic
+
+ConicMenu=Conic
+
+DecimalPlaces=Decimal Places
+
+Degree=Degree
+
+Delete=Delete Object
+
+DrawingPadToClipboard=Graphics View to Clipboard
+
+Edit=Edit
+
+English=English
+
+Exit=Exit
+
+Export=Export
+
+FastHelp=Fast Help
+
+File=File
+
+Files=Files
+
+FontSize=Font Size
+
+Geometry=Geometry
+
+German=Deutsch
+
+GraphicsQuality=Graphics
+
+Grid=Grid
+
+Help=Help
+
+HighQuality=High Quality
+
+InputField=Input Bar
+
+Intersect=Intersect Two Objects
+
+Join=Line through Two Points
+
+Labels=Show or Hide Labels
+
+Landscape=Landscape
+
+Language=Language
+
+License=License
+
+LineBisector=Perpendicular Bisector
+
+LineMenu=Line
+
+Load=Open
+
+LookAndFeel=Look and Feel
+
+LowQuality=Low Quality
+
+Metal=Metal
+
+Mode=Mode
+
+Motif=Motif
+
+Move=Move
+
+New=New
+
+off=Off
+
+on=On
+
+Options=Options
+
+Orthogonal=Perpendicular Line
+
+Parallel=Parallel Line
+
+Point=New Point
+
+PointCapturing=Point Capturing
+
+PointMenu=Point
+
+Polygon=Polygon
+
+Portrait=Portrait
+
+Print=Print
+
+PrintPreview=Print Preview
+
+Radiant=Radians
+
+Ray=Ray through Two Points
+
+Redo=Redo
+
+Refresh=Refresh Views
+
+Relation=Relation between Two Objects
+
+Rename=Rename
+
+Save=Save
+
+SaveAs=Save As
+
+SaveCurrentFileQuestion=Do you want to save the current file?
+
+Segment=Segment between Two Points
+
+Tangent=Tangents
+
+#V2.5 changed
+Text=Insert Text
+
+TranslateView=Move Drawing Pad
+
+Undo=Undo
+
+Vector=Vector between Two Points
+
+VectorMenu=Vector
+
+View=View
+
+Windows=Windows
+
+
+#V2.5 begin
+CircleArc3=Circular Arc with Center between Two Points
+
+CircleSector3=Circular Sector with Center between Two Points
+
+CircumcircleArc3=Circumcircular Arc through Three Points
+
+CircumcircleSector3=Circumcircular Sector through Three Points
+
+Semicircle=Semicircle through Two Points
+
+Midpoint=Midpoint or Center
+
+PointStyle=Point Style
+
+Zoom=Zoom
+
+Slider=Slider
+
+NewWindow=New Window
+
+Image=Insert Image
+
+ShowHideObject=Show / Hide Object
+
+ShowHideLabel=Show / Hide Label
+
+Window=Window
+
+CopyVisualStyle=Copy Visual Style
+
+TranslateByVector=Translate Object by Vector
+
+RotateByAngle=Rotate Object around Point by Angle
+
+MirrorAtPoint=Reflect Object about Point
+	
+MirrorAtLine=Reflect Object about Line
+
+DilateFromPoint=Dilate Object from Point by Factor
+
+CirclePointRadius=Circle with Center and Radius
+
+Angle=Angle
+
+VectorFromPoint=Vector from Point
+
+Distance=Distance or Length
+
+MoveRotate=Rotate around Point
+
+ZoomIn=Zoom In
+
+ZoomOut=Zoom Out
+
+PolarDiameter=Polar or Diameter Line
+
+SegmentFixed=Segment with Given Length from Point
+
+AngleFixed=Angle with Given Size
+
+CloseAll=Close All
+#V2.5 end
+
+#V2.5.1 begin
+Locus=Locus
+#V2.5.1 end
+
+#V2.6 begin
+CmdList=Command List
+#V2.6 end
+
+#V3.0 begin
+RightAngleStyle=Right Angle Style
+
+Continuity=Continuity
+
+Tool=Tool
+
+Tools=Tools
+
+Toolbar=Toolbar
+
+Toolbar.Customize=Customize Toolbar
+
+Toolbar.ResetDefault=Restore Default Toolbar
+
+Tool.CreateNew=Create New Tool
+
+Tool.Manage=Manage Tools
+
+Tool.SelectObjects=Select objects in construction or choose from list
+
+Tool.CreationSuccess=New tool created successfully!
+
+Tool.DeleteQuestion=Do you really want to delete the selected tools?
+
+ToolName=Tool name
+
+ToolHelp=Tool help
+
+CommandName=Command name
+
+OutputObjects=Output Objects
+
+InputObjects=Input Objects
+
+NameIcon=Name & Icon
+
+Icon=Icon
+
+ShowInToolBar=Show in Toolbar
+
+Select=Select Object
+Select.Help=Click on object to select it
+
+Move.Help=Drag or select objects (Esc)
+
+InputField.Help=Select object to copy its name to input bar
+
+Point.Help=Click on the drawing pad or on line, function, or curve
+
+Join.Help=Select two points
+
+Segment.Help=Select two points
+
+SegmentFixed.Help=Select point and enter segment length
+
+Ray.Help=Select starting point, then point on ray
+
+Polygon.Help=Select all vertices, then click first vertex again
+
+Parallel.Help=Select point and parallel line
+
+Orthogonal.Help=Select point and perpendicular line
+
+Intersect.Help=Select two objects or click directly on intersection
+
+LineBisector.Help=Select two points or one segment
+
+AngularBisector.Help=Select three points or two lines
+
+Tangent.Help=Select point or line, then circle, conic, or function
+
+PolarDiameter.Help=Select point or line, then circle or conic
+
+Circle2.Help=Select center point, then point on circle
+
+Circle3.Help=Select three points on circle
+
+Conic5.Help=Select five points on conic
+
+Relation.Help=Select two objects
+
+TranslateView.Help=Drag the drawing pad or one axis (Shift + Drag)
+
+ShowHideObject.Help=Select objects to hide, then switch to another tool
+
+ShowHideLabel.Help=Select object
+
+CopyVisualStyle.Help=Select one object, then click on others
+
+Delete.Help=Select object
+
+Vector.Help=Select starting point, then end point
+
+Text.Help=Click on the drawing pad or on point to specify position
+
+Image.Help=Click on the drawing pad or on point to specify position
+
+Midpoint.Help=Select two points, one segment, circle, or conic
+
+Semicircle.Help=Select two end points
+
+CircleArc3.Help=Select center and two points
+
+CircleSector3.Help=Select center and two points
+
+CircumcircleArc3.Help=Select three points on arc
+
+CircumcircleSector3.Help=Select three points on sector
+
+Slider.Help=Click on the drawing pad to specify position
+
+MirrorAtPoint.Help=Select object to reflect, then center point
+
+MirrorAtLine.Help=Select object to reflect, then line of reflection
+
+TranslateByVector.Help=Select object to translate, then vector
+
+RotateByAngle.Help=Select object to rotate, then center point, and enter angle
+
+DilateFromPoint.Help=Select object to dilate, then center point, and enter factor
+
+CirclePointRadius.Help=Select center point and enter radius
+
+Angle.Help=Select three points or two lines
+
+AngleFixed.Help=Select leg point, then vertex, and enter size
+
+VectorFromPoint.Help=Select starting point and vector
+
+Distance.Help=Select two points, segment, polygon, or circle
+
+MoveRotate.Help=Select rotation center point, then drag object
+
+ZoomIn.Help=Click on the drawing pad to zoom in (Mouse Wheel)
+
+ZoomOut.Help=Click on the drawing pad to zoom out (Mouse Wheel)
+
+Locus.Help=Select locus point, then point on object
+
+Area=Area
+Area.Help=Select polygon, circle, or conic
+
+Slope=Slope
+Slope.Help=Select line
+
+RegularPolygon=Regular Polygon
+RegularPolygon.Help=Select two points and enter number of vertices
+
+Trace=Trace On / Off
+Trace.Help=Select object to show / hide its trace
+
+Fix=Fix On / Off
+Fix.Help=Select object to fix / free it
+
+ShowCheckBox=Check Box to Show / Hide Objects
+ShowCheckBox.Help=Click on the drawing pad to specify position
+
+General=General
+
+Advanced=Advanced
+
+UserInterface=User Interface
+
+Functionality=Functionality
+
+EnableRightClick=Enable right click features
+
+ShowResetIcon=Show icon to reset construction
+
+ShowMenuBar=Show menubar
+
+ShowToolBarHelp=Show toolbar help
+
+ShowToolBar=Show toolbar
+
+ShowInputField=Show input bar
+
+Separator=Separator
+
+Labeling=Labeling
+
+Labeling.automatic=Automatic
+
+Labeling.on=All New Objects
+
+Labeling.off=No New Objects
+
+Labeling.pointsOnly=New Points Only	
+	
+Labeling.propertiesDefault=Use Properties Default
+	
+Settings=Settings
+
+Settings.Save=Save Settings
+
+Settings.ResetDefault=Restore Default Settings
+
+Copy=Copy
+
+Paste=Paste
+
+Cut=Cut
+
+SelectAll=Select All
+
+Default.Set=Set as Default
+
+Default.Restore=Restore Default
+
+Properties.Basic=Basic
+
+Properties.Algebra=Algebra
+
+Properties.Style=Style
+
+Properties.Position=Position
+
+Preview=Preview
+
+ExpandAll=Expand All
+
+CollapseAll=Collapse All
+
+Button.Caption=Caption
+
+Conditions=Conditions
+
+Condition.ShowObject=Condition to Show Object
+#V3.0 end
+
+#V3.1 start
+Clipboard=Clipboard
+
+SelectCurrentLayer=Select Current Layer
+
+Compasses=Compass
+Compasses.Help=Select segment or two points for radius, then center point
+
+MirrorAtCircle=Reflect Point about Circle
+MirrorAtCircle.Help=Select point to reflect, then circle
+
+#RGB=RGB
+#Swatches=Swatches
+DynamicColors=Dynamic Colors
+
+Red=Red
+
+Green=Green
+
+Blue=Blue
+
+Ellipse3=Ellipse
+Ellipse3.Help=Select two foci and point on ellipse
+
+Hyperbola3=Hyperbola
+Hyperbola3.Help=Select two foci and point on hyperbola
+
+Parabola=Parabola
+Parabola.Help=Select point and directrix
+
+PasteDataFromClipboard=Paste Data from Clipboard
+
+DoYouWantToSaveYourChanges=Do you want to save your changes?
+
+DontSave=Don't Save
+
+Cancel=Cancel
+
+CloseFile=Close File
+
+DontOverwrite=Don't Overwrite
+
+Overwrite=Overwrite
+
+DeleteTool=Delete Tool
+
+DontDeleteTool=Don't Delete Tool
+
+ClearSelection=Clear Selection
+
+InsertLeft=Insert Left
+
+InsertRight=Insert Right
+
+InsertAbove=Insert Above
+
+InsertBelow=Insert Below
+
+CheckboxSize=Checkbox Size
+
+CheckboxSize.Large=Large
+
+CheckboxSize.Regular=Regular
+
+CreateListOfPoints=Create List of Points
+
+CreateList=Create List
+
+CreateMatrix=Create Matrix
+
+ClearColumn=Clear Column
+
+ClearColumns=Clear Columns
+
+ClearRow=Clear Row
+
+ClearRows=Clear Rows
+
+FitLine=Best Fit Line
+FitLine.Help=Select points using selection rectangle, or list of points
+
+Isometric=Isometric
+
+Bold=Bold
+
+Rounding=Rounding
+
+SelectAncestors=Select Ancestors
+
+SelectDescendants=Select Descendants
+
+RecordToSpreadsheet=Record to Spreadsheet
+RecordToSpreadsheet.Help=Select object to trace, then change the construction
+
+CopyToInputBar=Copy to Input Bar
+
+EnableLabelDrags=Enable dragging of labels
+
+DeleteObjects=Delete Objects
+## new tokens below
+
+SubstituteDialog=Substitute Dialog
+
+RecomputeAllViews=Recompute All Objects
+#V3.1 end
+
+# keys for perspectives in menu
+IgnoreDocumentPerspective=Ignore Layout of Loaded Documents
+
+ShowViewTitlebar=Show Title Bar of Views
+
+SaveCurrentPerspective=Save Current Perspective
+
+ManagePerspectives=Manage Perspectives
+
+InputOnTop=Show at the Top
+
+Perspective.BasicGeometry=Basic Geometry
+
+Perspective.Geometry=Geometry
+
+Perspective.AlgebraAndGraphics=Algebra & Graphics
+
+Perspective.TableAndGraphics=Table & Graphics
+# end keys for perspectives in menu
+
+# keys for tool boxes in menu
+MovementTools=Movement Tools
+
+PointTools=Point Tools
+
+BasicLineTools=Line Tools
+
+SpecialLineTools=Special Line Tools
+
+PolygonTools=Polygon Tools
+
+CircleArcTools=Circle & Arc Tools
+
+ConicSectionTools=Conic Section Tools
+
+MeasurementTools=Measurement Tools
+
+TransformationTools=Transformation Tools
+
+SpecialObjectTools=Special Object Tools
+
+GeneralTools=General Tools
+
+CustomTools=Custom Tools
+# end keys for tool boxes in menu
\ No newline at end of file
diff --git a/htdocs/applets/geogebra_stable/geogebra/properties/plain.properties b/htdocs/applets/geogebra_stable/geogebra/properties/plain.properties
new file mode 100755
index 0000000000..38619a72a5
--- /dev/null
+++ b/htdocs/applets/geogebra_stable/geogebra/properties/plain.properties
@@ -0,0 +1,569 @@
+Algebra=Algebra
+
+AlgebraWindow=Algebra View
+
+Angle=Angle
+
+Angles=Angles
+
+AnimationStep=Increment
+
+ApplicationName=GeoGebra
+
+ApplicationURL=http://www.geogebra.org
+
+Apply=Apply
+
+Author=Author
+
+AuxiliaryObject=Auxiliary Object
+
+AuxiliaryObjects=Auxiliary Objects
+
+back=Back
+
+Cancel=Cancel
+
+cartesian=Cartesian
+
+CartesianCoords=Cartesian Coordinates
+
+ChooseColor=Choose a color
+
+ChooseObject=Choose one object
+
+Circle=Circle
+
+CircleEquation=(x - m)\u00B2 + (y - n)\u00B2 = r\u00B2
+
+Color=Color
+
+Command=Command
+
+Conic=Conic
+
+ConicLinesEquation=(a x + b y + c) (d x + e y + f) = 0
+
+Conics=Conics
+
+ConstructionProtocol=Construction Protocol
+
+ConstructionProtocolHelp=<html><body><p><b>Using the Construction Protocol</b></p><p><br><b>Keyboard</b></p><table border="1"><tr><td >&#8593;</td><td>Previous construction step</td></tr><tr><td >&#8595;</td><td >Next construction step</td></tr><tr><td >Home</td><td >Start of construction</td></tr><tr><td>End</td><td>End of construction</td></tr><tr><td >Del</td><td >Delete construction step</td></tr></table><p><b><br>Mouse</b></p><table border="1" ><tr><td>Double click row</td><td >Choose construction step</td></tr><tr><td>Double click header</td><td >Start of construction</td></tr><tr><td>Drag &amp; drop row</td><td>Move construction step</td></tr><tr><td>Right click row</td><td>Context menu</td></tr></table><body></html>
+
+Coordinates=Coordinates
+
+CreatedWith=Created with
+
+Date=Date
+
+Definition=Definition
+
+Delete=Delete
+
+dependent=dependent
+
+DependentObjects=Dependent Objects
+
+Directrix=Directrix
+
+DoubleClickToOpen=Double click opens application window 
+
+DoubleLine=Double line
+
+DoubleLineEquation=(a x + b y + c)\u00B2 = 0
+
+DrawingPad=Drawing Pad
+
+DynamicWorksheet=Dynamic worksheet
+
+Edit=Edit
+
+Ellipse=Ellipse
+
+EllipseEquation=(x - m)\u00B2 / a\u00B2 + (y - n)\u00B2 / b\u00B2 = 1
+
+EmptySet=Empty set
+
+eps=Encapsulated Postscript
+
+equal=equal
+
+Equation=Equation
+
+ExplicitConicEquation=y = a x\u00b2 + b x + c
+
+ExplicitLineEquation=y = m x + b
+
+Filling=Filling
+
+firstAxisLength=first axis' length
+
+FixObject=Fix Object
+
+Format=Format
+
+forward=forward
+
+free=free
+
+FreeObjects=Free Objects
+
+Function=Function
+
+GeometricObjects=Geometric objects
+
+Height=Height
+
+Hexagon=Hexagon
+
+Hide=Hide
+
+Home=Home
+
+HorizontalSplit=Horizontal Splitting
+
+html=Webpage
+
+Hyperbola=Hyperbola
+
+HyperbolaEquation=(x - m)\u00B2 / a\u00B2 - (y - n)\u00B2 / b\u00B2 = 1
+
+ImplicitConicEquation=a x\u00B2 + b xy + c y\u00B2 + d x + e y = f
+
+ImplicitLineEquation=a x + b y = c
+
+InputFieldHelp=<html><body><p><b>Using the Input Bar</b></p><table border="1"><tr><td >Enter </td><td >Execute input</td></tr><tr><td >Escape</td><td >Clear input bar</td></tr><tr><td >&#8593;</td><td >Previous input</td></tr><tr><td >&#8595;</td><td >Next input</td></tr><tr><td>F1</td><td>Help for current command</td></tr></table><p><br><b>Auto-Completion of Commands</b><br>After typing the first two letters of a command<br>GeoGebra will complete the command for you.</p><table border="1" ><tr><td >Enter </td><td >Accept proposed command</td></tr><tr><td >Another letter</td><td >Adapts proposed command</td></tr></table><body></html>
+
+InputLabel=Input
+
+InputLabelToolTip=Type a command
+
+InsertPictureOfConstruction=Insert picture of graphics view
+
+IntersectingLines=Intersecting lines
+
+jpg=JPG Format
+
+LaTeXFormula=LaTeX formula
+
+Length=Length
+
+Lengths=Lengths
+
+Line=Line
+
+Lines=Lines
+
+LineStyle=Line Style
+
+Midpoint=Midpoint
+
+Name=Name
+
+No.=No.
+
+Numeric=Number
+
+NumericObjects=Numeric objects
+
+Objects=Objects
+
+Open=Open
+
+OpenButton=Button to open application window
+
+OverwriteFile=Do you want to overwrite this file?
+
+Parabola=Parabola
+
+ParabolaEquation=y\u00B2 =  or  x\u00B2 =
+
+parallel=parallel
+
+ParallelLines=Parallel lines
+
+ParametricForm=Parametric Form
+
+Pentagon=Pentagon
+
+Picture=Picture
+
+png=Portable Network Graphics
+
+emf=Enhanced Metafile
+
+svg=Scaleable Vector Graphics
+
+pdf=Portable Document Format
+
+Point=Point
+
+PointOn=Point on
+
+Points=Points
+
+polar=polar
+
+PolarCoords=Polar Coordinates
+
+Polygon=Polygon
+
+Properties=Object Properties
+
+Quadrangle=Quadrilateral
+
+Question=Question
+
+Radius=Radius
+
+Ray=Ray
+
+Redefine=Redefine
+
+Rename=Rename
+
+Segment=Segment
+
+Show=Show
+
+ShowLabel=Show Label
+
+ShowObject=Show Object
+
+ShowTrace=Show Trace
+
+Size=Size
+
+StandardObject=Standard Object
+
+StandardView=Standard View
+
+StartingPoint=Starting Point
+
+Text=Text
+
+TextAfterConstruction=Text below the construction
+
+TextBeforeConstruction=Text above the construction
+
+Thickness=Line Thickness
+
+Title=Title
+
+TraceOff=Trace Off
+
+TraceOn=Trace On
+
+Triangle=Triangle
+
+undefined=undefined
+
+unequal=unequal
+
+Value=Value
+
+Vector=Vector
+
+Vectors=Vectors
+
+Width=Width
+
+WindowOpened=Window opened
+
+ZoomIn=Zoom in
+
+ZoomOut=Zoom out
+
+
+#V2.5 begin
+ColorfulConstructionProtocol=Colorful construction protocol
+
+InsertPictureOfAlgebraAndConstruction=Insert picture of algebra and graphics view
+
+# the translation of xAxis MUST NOT include
+# any spaces, i.e. it has to be ONE SINGLE word
+# e.g. wrong:   xAxis=axe X 
+#      right:   xAxis=axeX
+xAxis=xAxis
+
+# the translation of yAxis MUST NOT include
+# any spaces, i.e. it has to be ONE SINGLE word
+# e.g. wrong:   yAxis=axe Y 
+#      right:   yAxis=axeY
+yAxis=yAxis
+
+Arc=Arc
+
+Sector=Sector
+
+Semicircle=Semicircle
+
+Interval=Interval
+
+Slider=Slider
+
+min=min
+
+max=max
+
+fixed=Fixed
+
+horizontal=Horizontal
+
+vertical=Vertical
+
+BackgroundImage=Background Image
+
+CornerPoint=Corner
+
+allowReflexAngle=Allow Reflex Angle
+
+Image=Image
+
+AbsoluteScreenLocation=Absolute Position on Screen
+
+ScaleInCentimeter=Scale in cm
+
+dilatedByFactor=dilated by factor
+
+ResolutionInDPI=Resolution in dpi
+
+Locus=Locus
+
+#V2.5 final begin
+allowOutlyingIntersections=Allow Outlying Intersections
+AxisNumbers=Numbers
+AxisUnitLabel=Unit
+AxisLabel=Label
+TickDistance=Distance
+BackgroundColor=Background Color
+#V2.5 final end
+#V2.5 end
+
+#V2.6 begin
+clockwise=clockwise
+counterClockwise=counter clockwise
+
+Breakpoint=Breakpoint
+ShowOnlyBreakpoints=Show Only Breakpoints
+ConstructionProtocolNavigation=Navigation Bar for Construction Steps
+ConstructionProtocolButton=Button to open construction protocol 
+PlayButton=Play button
+Play=Play
+Pause=Pause
+#V2.6 end
+
+#V2.7 begin
+Bold=Bold
+Italic=Italic
+#V2.7 end
+
+#V3.0 begin
+resetConstruction=Reset construction
+Decoration=Decoration
+EmphasizeRightAngle=Emphasize Right Angle
+TitleExportPstricks=GeoGebra to PSTricks export
+GeneratePstricks=Generate PSTricks code
+CopyToClipboard=Copy to Clipboard
+XUnits=X units (cm)
+YUnits=Y units (cm)
+PictureWidth=Picture width
+PictureHeight=Picture height
+LatexFontSize=Document font size:
+DisplayPointSymbol=Display the symbol for points
+AxisTicks=Ticks
+
+Up=Up
+Down=Down
+Insert=Insert
+Remove=Remove
+Next=Next
+Back=Back
+Finish=Finish
+
+Quadrilateral=Quadrilateral
+
+Boolean=Boolean Value
+FixCheckbox=Fix Checkbox
+List=List
+#V3.0 end
+
+#V3.1 begin
+
+forceReflexAngle=Force Reflex Angle
+Layer=Layer
+ExportAsWebpage=Export as Webpage
+DrawingPadAsPicture=Graphics View as Picture
+DynamicWorksheetAsWebpage=Dynamic Worksheet as Webpage
+NameAndValue=Name & Value
+Caption=Caption
+Spreadsheet=Spreadsheet View
+off=off
+xmin=xmin
+xmax=xmax
+ymin=ymin
+ymax=ymax
+Curve=Curve
+
+
+NewNameForA=New name for %0
+AngleOfA=Angle of %0
+AngleBetweenAB=Angle between %0, %1
+AngleBetweenABC=Angle between %0, %1, %2
+AngleBetweenABCofD=Angle between %0, %1, %2 of %3
+AngleBisectorOfAB=Angle bisector of %0, %1
+AngleBisectorOfABC=Angle bisector of %0, %1, %2
+AsymptoteToA=Asymptote to %0
+AxisOfA=Axis of %0
+FirstAxisOfA=First axis of %0
+FirstAxisLengthOfA=First axis' length of %0
+SecondAxisOfA=Second axis of %0
+SecondAxisLengthOfA=Second axis' length of %0
+CenterOfA=Center of %0
+CentroidOfA=Centroid of %0
+CircleWithCenterAandRadiusB=Circle with center %0 and radius %1
+CircleThroughABC=Circle through %0, %1, %2
+CircleThroughAwithCenterB=Circle through %0 with center %1
+ConicThroughABCDE=Conic through %0, %1, %2, %3, %4
+AthDerivativeOfB=%0th derivative of %1
+DerivativeOfA=Derivative of %0
+DiameterOfAConjugateToB=Diameter of %0 conjugate to %1
+ADilatedByFactorBfromC=%0 dilated by factor %1 from %2
+DirectionOfA=Direction of %0
+DirectrixOfA=Directrix of %0
+DistanceOfAandB=Distance of %0 and %1
+EllipseWithFociABandFirstAxisLengthC=Ellipse with foci %0, %1 and first axis' length %2
+EllipseWithFociABPassingThroughC=Ellipse with foci %0, %1 passing through %2
+HyperbolaWithFociABandFirstAxisLengthC=Hyperbola with foci %0, %1 and first axis' length %2
+HyperbolaWithFociABPassingThroughC=Hyperbola with foci %0, %1 passing through %2
+ParabolaWithFocusAandDirectrixB=Parabola with focus %0 and directrix %1
+EccentricityOfA=Eccentricity of %0
+LinearEccentricityOfA=Linear eccentricity of %0
+ExtremumOfA=Extremum of %0
+FocusOfA=Focus of %0
+FunctionAonIntervalBC=Function %0 on interval [%1, %2]
+IntegralOfA=Integral of %0
+IntegralOfAfromBtoC=Integral of %0 from %1 to %2
+SegmentABofC=Segment [%0, %1] of %2
+SegmentAB=Segment [%0, %1]
+LengthOfA=Length of %0
+LineBisectorAB=Bisector %0, %1
+LineBisectorOfA=Bisector %0
+LineThroughAParallelToB=Line through %0 parallel to %1
+LineThroughAPerpendicularToB=Line through %0 perpendicular to %1
+LineThroughAwithDirectionB=Line through %0 with direction %1
+RayThroughAWithDirectionB=Ray through %0 with direction %1
+MidpointOfAB=Midpoint of %0, %1
+MidpointOfA=Midpoint of %0
+VectorPerpendicularToA=Vector perpendicular to %0
+UnitVectorPerpendicularToA=Unit vector perpendicular to %0
+ParameterOfA=Parameter of %0
+PointOnA=Point on %0
+PolarLineOfARelativeToB=Polar line of %0 relative to %1
+RadiusOfA=Radius of %0
+RootOfAonIntervalBC=Root of %0 on interval [%1, %2]
+RootOfAWithInitialValueB=Root of %0 with initial value %1
+IntersectionPointOfAB=Intersection point of %0, %1
+IntersectionPointOfABWithInitialValueC=Intersection point of %0, %1 with initial value %2
+RootOfA=Root of %0
+ARotatedByAngleB=%0 rotated by angle %1
+SemicircleThroughAandB=Semicircle through %0 and %1
+SlopeOfA=Slope of %0
+TangentToAParallelToB=Tangent to %0 parallel to %1
+TangentToAThroughB=Tangent to %0 through %1
+InflectionPointofA=Inflection point of %0
+VertexOfA=Vertex of %0
+TranslationOfAbyB=Translation of %0 by %1
+TranslationOfAtoB=Translation of %0 to %1
+LineThroughAB=Line through %0, %1
+RayThroughAB=Ray through %0, %1
+PointAplusB=Point %0 + %1
+UnitVectorOfA=Unit vector of %0
+AMirroredAtB=%0 mirrored at %1
+# Relation.java
+AIntersectsWithB=%0 intersects with %1
+ADoesNotIntersectWithB=%0 does not intersect with %1
+AandBareParallel=%0 and %1 are parallel
+AandBarePerpendicular=%0 and %1 are perpendicular
+AliesOnB=%0 lies on %1
+AdoesNotLieOnB=%0 does not lie on %1
+AandBareLinearlyDependent=%0 and %1 are linearly dependent
+AandBareLinearlyIndependent=%0 and %1 are linearly independent
+AandBareEqual=%0 and %1 are equal
+AandBareNotEqual=%0 and %1 are not equal
+AisaDegenerateBranchOfB=%0 is a degenerate branch of %1
+AisAnAsymptoteToB=%0 is an asymptote to %1
+AintersectsWithBOnce=%0 intersects with %1 once
+AisaTangentToB=%0 is a tangent to %1
+AintersectsWithBTwice=%0 intersects with %1 twice
+ADoesNotIntersectWithB=%0 does not intersect with %1
+AisNotDefined=%0 is not defined
+AhasTheSameLengthAsB=%0 has the same length as %1
+AdoesNothaveTheSameLengthAsB=%0 does not have the same length as %1
+AhasTheSameAreaAsB=%0 has the same area as %1
+AdoesNothaveTheSameAreaAsB=%0 does not have the same area as %1
+AandBcannotBeCompared=%0 and %1 cannot be compared
+# Relation.java end
+
+AliesOnThePerimeterOfB=%0 lies on the perimeter of %1
+AdoesNotLieOnThePerimeterOfB=%0 does not lie on the perimeter of %1
+ExportTextAsShapes=Export Text as Shapes
+ShowAllObjects=Show All Objects
+DrawingPadAsPSTricks=Graphics View as PSTricks
+#TangentToAatBCD=Tangent to %0 at %1%2%3
+#replaced with:
+TangentToAatB=Tangent to %0 at %1
+
+TitleExportPgf=GeoGebra to PGF Export
+GeneratePgf=Generate PGF/TikZ code
+DrawingPagAsPGF=Graphics View as PGF/TikZ
+ForceGnuplotPgf=Use Gnuplot to plot functions
+Default=Default
+CellAisNotDefined=Cell %0 is not defined
+2x2Matrix=2x2 matrix
+3x3Matrix=3x3 matrix
+ADecimalPlace=%0 Decimal Place
+ADecimalPlaces=%0 Decimal Places
+ASignificantFigure=%0 Significant Figure
+ASignificantFigures=%0 Significant Figures
+ComplexNumber=Complex Number
+TraceToSpreadsheet=Trace to Spreadsheet
+OK=OK
+Speed=Speed
+SyntaxErrorAisNotAList=Syntax Error: %0 is not a list
+PGFExport.Grayscale=Grayscale
+Inequality=Inequality
+LinearInequality=Linear inequality
+## new keys below:
+
+Animating=Animation On
+Oscillating=Oscillating
+Repeat=Repeat
+Increasing=Increasing
+Decreasing=Decreasing
+AnimationSpeed=Speed
+Animation=Animation
+Substitute=Substitute
+SubstituteSimplify= Substitute & Simplify
+XMLTagANotFound=Invalid file: XML tag %0 not found
+# for the Distance Tool
+DistanceAB.LaTeX="\\overline{" + %0 + %1 + "} \\, = \\, " + %2
+#DistanceAB.LaTeX=%0+%1+" \\, = \\, "+%2
+PointSize=Point Size
+
+# default names for different object types
+Name.list=list
+Name.polygon=poly
+Name.locus=loc
+Name.matrix=matrix
+Name.text=text
+Name.picture=pic
+
+# TODO: add (for file menu entry)
+# DeleteAll=Delete all objects
+
+#V3.1 end
+
+ViewOpenExtraWindow=Show View in New Window
+ViewCloseExtraWindow=Show View in Main Window
+PerspectiveName=Name of Perspective
diff --git a/htdocs/applets/geogebra_stable/geogebra_applet_java2javascript.ggb b/htdocs/applets/geogebra_stable/geogebra_applet_java2javascript.ggb
new file mode 100755
index 0000000000..9b64468465
Binary files /dev/null and b/htdocs/applets/geogebra_stable/geogebra_applet_java2javascript.ggb differ
diff --git a/htdocs/applets/geogebra_stable/geogebra_blank.ggb b/htdocs/applets/geogebra_stable/geogebra_blank.ggb
new file mode 100644
index 0000000000..f2dce8e84d
Binary files /dev/null and b/htdocs/applets/geogebra_stable/geogebra_blank.ggb differ
diff --git a/htdocs/applets/geogebra_stable/geogebra_blank2.ggb b/htdocs/applets/geogebra_stable/geogebra_blank2.ggb
new file mode 100644
index 0000000000..50ad41949b
Binary files /dev/null and b/htdocs/applets/geogebra_stable/geogebra_blank2.ggb differ
diff --git a/htdocs/applets/geogebra_stable/geogebra_blank3.ggb b/htdocs/applets/geogebra_stable/geogebra_blank3.ggb
new file mode 100644
index 0000000000..2389271ee5
Binary files /dev/null and b/htdocs/applets/geogebra_stable/geogebra_blank3.ggb differ
diff --git a/htdocs/applets/geogebra_stable/geogebra_cas.jar b/htdocs/applets/geogebra_stable/geogebra_cas.jar
new file mode 100644
index 0000000000..eee62253a7
Binary files /dev/null and b/htdocs/applets/geogebra_stable/geogebra_cas.jar differ
diff --git a/htdocs/applets/geogebra_stable/geogebra_export.jar b/htdocs/applets/geogebra_stable/geogebra_export.jar
new file mode 100644
index 0000000000..628b3bae31
Binary files /dev/null and b/htdocs/applets/geogebra_stable/geogebra_export.jar differ
diff --git a/htdocs/applets/geogebra_stable/geogebra_gui.jar b/htdocs/applets/geogebra_stable/geogebra_gui.jar
new file mode 100644
index 0000000000..6c031125dc
Binary files /dev/null and b/htdocs/applets/geogebra_stable/geogebra_gui.jar differ
diff --git a/htdocs/applets/geogebra_stable/geogebra_main.jar b/htdocs/applets/geogebra_stable/geogebra_main.jar
new file mode 100644
index 0000000000..95529532ad
Binary files /dev/null and b/htdocs/applets/geogebra_stable/geogebra_main.jar differ
diff --git a/htdocs/applets/geogebra_stable/geogebra_properties.jar b/htdocs/applets/geogebra_stable/geogebra_properties.jar
new file mode 100644
index 0000000000..2a3a55c0b4
Binary files /dev/null and b/htdocs/applets/geogebra_stable/geogebra_properties.jar differ
diff --git a/htdocs/applets/geogebra_stable/geogebra_webstart.html b/htdocs/applets/geogebra_stable/geogebra_webstart.html
new file mode 100644
index 0000000000..3e5442ea06
--- /dev/null
+++ b/htdocs/applets/geogebra_stable/geogebra_webstart.html
@@ -0,0 +1,68 @@
+<html><head></head><body>
+
+
+<script type="text/javascript">
+
+var width=0;
+var height=0;
+setWidthHeight();
+
+if (height < 500) height=500;
+if (width < 800) width=800;
+
+
+function geogebra_applet(width,height,filename,framePossible,enableRightClick,enableShiftDragZoom,showResetIcon,showMenuBar,showToolBar,showToolBarHelp,showAlgebraInput,enableLabelDrags,showSpreadsheet,showAlgebraView) {
+ 
+ret = '<applet name="ggbApplet" code="geogebra.GeoGebraApplet" archive="http://www.geogebra.org/webstart/dev/unpacked/geogebra.jar" height="'+height+'" width="'+width+'">';
+//ret = '<applet name="ggbApplet" code="geogebra.GeoGebraApplet" archive="http://hosted2.webwork.rochester.edu/webwork2_files/applets/geogebra_stable/geogebra.jar" 
+//height="'+height+'" width="'+width+'">';
+
+  if (filename != "") ret+='<param name="filename" value="'+filename+'">';
+  ret+='<param name="framePossible" value="'+framePossible+'">';
+  ret+='<param name="enableRightClick" value="'+enableRightClick+'">';
+  ret+='<param name="enableShiftDragZoom" value="'+enableShiftDragZoom+'">';
+  ret+='<param name="enableLabelDrags" value="'+enableLabelDrags+'">';
+  ret+='<param name="showSpreadsheet" value="'+showSpreadsheet+'">';
+  ret+='<param name="showAlgebraView" value="'+showAlgebraView+'">';
+  ret+='<param name="showResetIcon" value="'+showResetIcon+'">';
+  ret+='<param name="showMenuBar" value="'+showMenuBar+'">';
+  ret+='<param name="showToolBar" value="'+showToolBar+'">';
+  ret+='<param name="showToolBarHelp" value="'+showToolBarHelp+'">';
+  ret+='<param name="showAlgebraInput" value="'+showAlgebraInput+'">';
+  ret+='Sorry, the GeoGebra Applet could not be started. Please make sure that Java 1.4.2 (or later) is installed and activated.';
+  ret+='(<a href="http://java.sun.com/getjava">click here to install Java now</a>)';
+  ret+='</applet>';
+  return ret;
+}
+
+function setWidthHeight() {
+  var myWidth = 0, myHeight = 0;
+  if( typeof( window.innerWidth ) == 'number' ) {
+    //Non-IE
+    myWidth = window.innerWidth;
+    myHeight = window.innerHeight;
+  } else if( document.documentElement && ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
+    //IE 6+ in 'standards compliant mode'
+    myWidth = document.documentElement.clientWidth;
+    myHeight = document.documentElement.clientHeight;
+  } else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
+    //IE 4 compatible
+    myWidth = document.body.clientWidth;
+    myHeight = document.body.clientHeight;
+  }
+  //window.alert( 'Width = ' + myWidth );
+  //window.alert( 'Height = ' + myHeight );
+  width=myWidth;
+  height=myHeight;
+}
+
+
+
+var applet1=document.getElementById('applet1');
+
+applet1.innerHTML=geogebra_applet(0.95*width,height*0.95,"",true,true,true,true,true,true,true,true,true,true,true,true);
+
+</script>
+
+
+</body></html>
diff --git a/htdocs/applets/geogebra_stable/icons/hicolor/128x128/apps/geogebra.png b/htdocs/applets/geogebra_stable/icons/hicolor/128x128/apps/geogebra.png
new file mode 100644
index 0000000000..05b31e392b
Binary files /dev/null and b/htdocs/applets/geogebra_stable/icons/hicolor/128x128/apps/geogebra.png differ
diff --git a/htdocs/applets/geogebra_stable/icons/hicolor/128x128/mimetypes/application-vnd.geogebra.file.png b/htdocs/applets/geogebra_stable/icons/hicolor/128x128/mimetypes/application-vnd.geogebra.file.png
new file mode 100644
index 0000000000..05b31e392b
Binary files /dev/null and b/htdocs/applets/geogebra_stable/icons/hicolor/128x128/mimetypes/application-vnd.geogebra.file.png differ
diff --git a/htdocs/applets/geogebra_stable/icons/hicolor/128x128/mimetypes/application-vnd.geogebra.tool.png b/htdocs/applets/geogebra_stable/icons/hicolor/128x128/mimetypes/application-vnd.geogebra.tool.png
new file mode 100644
index 0000000000..05b31e392b
Binary files /dev/null and b/htdocs/applets/geogebra_stable/icons/hicolor/128x128/mimetypes/application-vnd.geogebra.tool.png differ
diff --git a/htdocs/applets/geogebra_stable/icons/hicolor/16x16/apps/geogebra.png b/htdocs/applets/geogebra_stable/icons/hicolor/16x16/apps/geogebra.png
new file mode 100644
index 0000000000..3754bfb3bd
Binary files /dev/null and b/htdocs/applets/geogebra_stable/icons/hicolor/16x16/apps/geogebra.png differ
diff --git a/htdocs/applets/geogebra_stable/icons/hicolor/16x16/mimetypes/application-vnd.geogebra.file.png b/htdocs/applets/geogebra_stable/icons/hicolor/16x16/mimetypes/application-vnd.geogebra.file.png
new file mode 100644
index 0000000000..3754bfb3bd
Binary files /dev/null and b/htdocs/applets/geogebra_stable/icons/hicolor/16x16/mimetypes/application-vnd.geogebra.file.png differ
diff --git a/htdocs/applets/geogebra_stable/icons/hicolor/16x16/mimetypes/application-vnd.geogebra.tool.png b/htdocs/applets/geogebra_stable/icons/hicolor/16x16/mimetypes/application-vnd.geogebra.tool.png
new file mode 100644
index 0000000000..3754bfb3bd
Binary files /dev/null and b/htdocs/applets/geogebra_stable/icons/hicolor/16x16/mimetypes/application-vnd.geogebra.tool.png differ
diff --git a/htdocs/applets/geogebra_stable/icons/hicolor/192x192/apps/geogebra.png b/htdocs/applets/geogebra_stable/icons/hicolor/192x192/apps/geogebra.png
new file mode 100644
index 0000000000..88d1878da8
Binary files /dev/null and b/htdocs/applets/geogebra_stable/icons/hicolor/192x192/apps/geogebra.png differ
diff --git a/htdocs/applets/geogebra_stable/icons/hicolor/192x192/mimetypes/application-vnd.geogebra.file.png b/htdocs/applets/geogebra_stable/icons/hicolor/192x192/mimetypes/application-vnd.geogebra.file.png
new file mode 100644
index 0000000000..88d1878da8
Binary files /dev/null and b/htdocs/applets/geogebra_stable/icons/hicolor/192x192/mimetypes/application-vnd.geogebra.file.png differ
diff --git a/htdocs/applets/geogebra_stable/icons/hicolor/192x192/mimetypes/application-vnd.geogebra.tool.png b/htdocs/applets/geogebra_stable/icons/hicolor/192x192/mimetypes/application-vnd.geogebra.tool.png
new file mode 100644
index 0000000000..88d1878da8
Binary files /dev/null and b/htdocs/applets/geogebra_stable/icons/hicolor/192x192/mimetypes/application-vnd.geogebra.tool.png differ
diff --git a/htdocs/applets/geogebra_stable/icons/hicolor/22x22/apps/geogebra.png b/htdocs/applets/geogebra_stable/icons/hicolor/22x22/apps/geogebra.png
new file mode 100644
index 0000000000..65c7197d6b
Binary files /dev/null and b/htdocs/applets/geogebra_stable/icons/hicolor/22x22/apps/geogebra.png differ
diff --git a/htdocs/applets/geogebra_stable/icons/hicolor/22x22/mimetypes/application-vnd.geogebra.file.png b/htdocs/applets/geogebra_stable/icons/hicolor/22x22/mimetypes/application-vnd.geogebra.file.png
new file mode 100644
index 0000000000..65c7197d6b
Binary files /dev/null and b/htdocs/applets/geogebra_stable/icons/hicolor/22x22/mimetypes/application-vnd.geogebra.file.png differ
diff --git a/htdocs/applets/geogebra_stable/icons/hicolor/22x22/mimetypes/application-vnd.geogebra.tool.png b/htdocs/applets/geogebra_stable/icons/hicolor/22x22/mimetypes/application-vnd.geogebra.tool.png
new file mode 100644
index 0000000000..65c7197d6b
Binary files /dev/null and b/htdocs/applets/geogebra_stable/icons/hicolor/22x22/mimetypes/application-vnd.geogebra.tool.png differ
diff --git a/htdocs/applets/geogebra_stable/icons/hicolor/24x24/apps/geogebra.png b/htdocs/applets/geogebra_stable/icons/hicolor/24x24/apps/geogebra.png
new file mode 100644
index 0000000000..d9d45ac611
Binary files /dev/null and b/htdocs/applets/geogebra_stable/icons/hicolor/24x24/apps/geogebra.png differ
diff --git a/htdocs/applets/geogebra_stable/icons/hicolor/24x24/mimetypes/application-vnd.geogebra.file.png b/htdocs/applets/geogebra_stable/icons/hicolor/24x24/mimetypes/application-vnd.geogebra.file.png
new file mode 100644
index 0000000000..d9d45ac611
Binary files /dev/null and b/htdocs/applets/geogebra_stable/icons/hicolor/24x24/mimetypes/application-vnd.geogebra.file.png differ
diff --git a/htdocs/applets/geogebra_stable/icons/hicolor/24x24/mimetypes/application-vnd.geogebra.tool.png b/htdocs/applets/geogebra_stable/icons/hicolor/24x24/mimetypes/application-vnd.geogebra.tool.png
new file mode 100644
index 0000000000..d9d45ac611
Binary files /dev/null and b/htdocs/applets/geogebra_stable/icons/hicolor/24x24/mimetypes/application-vnd.geogebra.tool.png differ
diff --git a/htdocs/applets/geogebra_stable/icons/hicolor/256x256/apps/geogebra.png b/htdocs/applets/geogebra_stable/icons/hicolor/256x256/apps/geogebra.png
new file mode 100644
index 0000000000..d86b5ff494
Binary files /dev/null and b/htdocs/applets/geogebra_stable/icons/hicolor/256x256/apps/geogebra.png differ
diff --git a/htdocs/applets/geogebra_stable/icons/hicolor/256x256/mimetypes/application-vnd.geogebra.file.png b/htdocs/applets/geogebra_stable/icons/hicolor/256x256/mimetypes/application-vnd.geogebra.file.png
new file mode 100644
index 0000000000..d86b5ff494
Binary files /dev/null and b/htdocs/applets/geogebra_stable/icons/hicolor/256x256/mimetypes/application-vnd.geogebra.file.png differ
diff --git a/htdocs/applets/geogebra_stable/icons/hicolor/256x256/mimetypes/application-vnd.geogebra.tool.png b/htdocs/applets/geogebra_stable/icons/hicolor/256x256/mimetypes/application-vnd.geogebra.tool.png
new file mode 100644
index 0000000000..d86b5ff494
Binary files /dev/null and b/htdocs/applets/geogebra_stable/icons/hicolor/256x256/mimetypes/application-vnd.geogebra.tool.png differ
diff --git a/htdocs/applets/geogebra_stable/icons/hicolor/32x32/apps/geogebra.png b/htdocs/applets/geogebra_stable/icons/hicolor/32x32/apps/geogebra.png
new file mode 100644
index 0000000000..110252d6ef
Binary files /dev/null and b/htdocs/applets/geogebra_stable/icons/hicolor/32x32/apps/geogebra.png differ
diff --git a/htdocs/applets/geogebra_stable/icons/hicolor/32x32/mimetypes/application-vnd.geogebra.file.png b/htdocs/applets/geogebra_stable/icons/hicolor/32x32/mimetypes/application-vnd.geogebra.file.png
new file mode 100644
index 0000000000..110252d6ef
Binary files /dev/null and b/htdocs/applets/geogebra_stable/icons/hicolor/32x32/mimetypes/application-vnd.geogebra.file.png differ
diff --git a/htdocs/applets/geogebra_stable/icons/hicolor/32x32/mimetypes/application-vnd.geogebra.tool.png b/htdocs/applets/geogebra_stable/icons/hicolor/32x32/mimetypes/application-vnd.geogebra.tool.png
new file mode 100644
index 0000000000..110252d6ef
Binary files /dev/null and b/htdocs/applets/geogebra_stable/icons/hicolor/32x32/mimetypes/application-vnd.geogebra.tool.png differ
diff --git a/htdocs/applets/geogebra_stable/icons/hicolor/36x36/apps/geogebra.png b/htdocs/applets/geogebra_stable/icons/hicolor/36x36/apps/geogebra.png
new file mode 100644
index 0000000000..31bc739a8f
Binary files /dev/null and b/htdocs/applets/geogebra_stable/icons/hicolor/36x36/apps/geogebra.png differ
diff --git a/htdocs/applets/geogebra_stable/icons/hicolor/36x36/mimetypes/application-vnd.geogebra.file.png b/htdocs/applets/geogebra_stable/icons/hicolor/36x36/mimetypes/application-vnd.geogebra.file.png
new file mode 100644
index 0000000000..31bc739a8f
Binary files /dev/null and b/htdocs/applets/geogebra_stable/icons/hicolor/36x36/mimetypes/application-vnd.geogebra.file.png differ
diff --git a/htdocs/applets/geogebra_stable/icons/hicolor/36x36/mimetypes/application-vnd.geogebra.tool.png b/htdocs/applets/geogebra_stable/icons/hicolor/36x36/mimetypes/application-vnd.geogebra.tool.png
new file mode 100644
index 0000000000..31bc739a8f
Binary files /dev/null and b/htdocs/applets/geogebra_stable/icons/hicolor/36x36/mimetypes/application-vnd.geogebra.tool.png differ
diff --git a/htdocs/applets/geogebra_stable/icons/hicolor/48x48/apps/geogebra.png b/htdocs/applets/geogebra_stable/icons/hicolor/48x48/apps/geogebra.png
new file mode 100644
index 0000000000..49945ddc03
Binary files /dev/null and b/htdocs/applets/geogebra_stable/icons/hicolor/48x48/apps/geogebra.png differ
diff --git a/htdocs/applets/geogebra_stable/icons/hicolor/48x48/mimetypes/application-vnd.geogebra.file.png b/htdocs/applets/geogebra_stable/icons/hicolor/48x48/mimetypes/application-vnd.geogebra.file.png
new file mode 100644
index 0000000000..49945ddc03
Binary files /dev/null and b/htdocs/applets/geogebra_stable/icons/hicolor/48x48/mimetypes/application-vnd.geogebra.file.png differ
diff --git a/htdocs/applets/geogebra_stable/icons/hicolor/48x48/mimetypes/application-vnd.geogebra.tool.png b/htdocs/applets/geogebra_stable/icons/hicolor/48x48/mimetypes/application-vnd.geogebra.tool.png
new file mode 100644
index 0000000000..49945ddc03
Binary files /dev/null and b/htdocs/applets/geogebra_stable/icons/hicolor/48x48/mimetypes/application-vnd.geogebra.tool.png differ
diff --git a/htdocs/applets/geogebra_stable/icons/hicolor/64x64/apps/geogebra.png b/htdocs/applets/geogebra_stable/icons/hicolor/64x64/apps/geogebra.png
new file mode 100644
index 0000000000..8102d45380
Binary files /dev/null and b/htdocs/applets/geogebra_stable/icons/hicolor/64x64/apps/geogebra.png differ
diff --git a/htdocs/applets/geogebra_stable/icons/hicolor/64x64/mimetypes/application-vnd.geogebra.file.png b/htdocs/applets/geogebra_stable/icons/hicolor/64x64/mimetypes/application-vnd.geogebra.file.png
new file mode 100644
index 0000000000..8102d45380
Binary files /dev/null and b/htdocs/applets/geogebra_stable/icons/hicolor/64x64/mimetypes/application-vnd.geogebra.file.png differ
diff --git a/htdocs/applets/geogebra_stable/icons/hicolor/64x64/mimetypes/application-vnd.geogebra.tool.png b/htdocs/applets/geogebra_stable/icons/hicolor/64x64/mimetypes/application-vnd.geogebra.tool.png
new file mode 100644
index 0000000000..8102d45380
Binary files /dev/null and b/htdocs/applets/geogebra_stable/icons/hicolor/64x64/mimetypes/application-vnd.geogebra.tool.png differ
diff --git a/htdocs/applets/geogebra_stable/icons/hicolor/72x72/apps/geogebra.png b/htdocs/applets/geogebra_stable/icons/hicolor/72x72/apps/geogebra.png
new file mode 100644
index 0000000000..be6dc1f389
Binary files /dev/null and b/htdocs/applets/geogebra_stable/icons/hicolor/72x72/apps/geogebra.png differ
diff --git a/htdocs/applets/geogebra_stable/icons/hicolor/72x72/mimetypes/application-vnd.geogebra.file.png b/htdocs/applets/geogebra_stable/icons/hicolor/72x72/mimetypes/application-vnd.geogebra.file.png
new file mode 100644
index 0000000000..be6dc1f389
Binary files /dev/null and b/htdocs/applets/geogebra_stable/icons/hicolor/72x72/mimetypes/application-vnd.geogebra.file.png differ
diff --git a/htdocs/applets/geogebra_stable/icons/hicolor/72x72/mimetypes/application-vnd.geogebra.tool.png b/htdocs/applets/geogebra_stable/icons/hicolor/72x72/mimetypes/application-vnd.geogebra.tool.png
new file mode 100644
index 0000000000..be6dc1f389
Binary files /dev/null and b/htdocs/applets/geogebra_stable/icons/hicolor/72x72/mimetypes/application-vnd.geogebra.tool.png differ
diff --git a/htdocs/applets/geogebra_stable/icons/hicolor/96x96/apps/geogebra.png b/htdocs/applets/geogebra_stable/icons/hicolor/96x96/apps/geogebra.png
new file mode 100644
index 0000000000..65bb9e259e
Binary files /dev/null and b/htdocs/applets/geogebra_stable/icons/hicolor/96x96/apps/geogebra.png differ
diff --git a/htdocs/applets/geogebra_stable/icons/hicolor/96x96/mimetypes/application-vnd.geogebra.file.png b/htdocs/applets/geogebra_stable/icons/hicolor/96x96/mimetypes/application-vnd.geogebra.file.png
new file mode 100644
index 0000000000..65bb9e259e
Binary files /dev/null and b/htdocs/applets/geogebra_stable/icons/hicolor/96x96/mimetypes/application-vnd.geogebra.file.png differ
diff --git a/htdocs/applets/geogebra_stable/icons/hicolor/96x96/mimetypes/application-vnd.geogebra.tool.png b/htdocs/applets/geogebra_stable/icons/hicolor/96x96/mimetypes/application-vnd.geogebra.tool.png
new file mode 100644
index 0000000000..65bb9e259e
Binary files /dev/null and b/htdocs/applets/geogebra_stable/icons/hicolor/96x96/mimetypes/application-vnd.geogebra.tool.png differ
diff --git a/htdocs/applets/geogebra_stable/icons/hicolor/scalable/apps/geogebra.svgz b/htdocs/applets/geogebra_stable/icons/hicolor/scalable/apps/geogebra.svgz
new file mode 100644
index 0000000000..0b19364dd9
Binary files /dev/null and b/htdocs/applets/geogebra_stable/icons/hicolor/scalable/apps/geogebra.svgz differ
diff --git a/htdocs/applets/geogebra_stable/icons/hicolor/scalable/mimetypes/application-vnd.geogebra.file.svgz b/htdocs/applets/geogebra_stable/icons/hicolor/scalable/mimetypes/application-vnd.geogebra.file.svgz
new file mode 100644
index 0000000000..0b19364dd9
Binary files /dev/null and b/htdocs/applets/geogebra_stable/icons/hicolor/scalable/mimetypes/application-vnd.geogebra.file.svgz differ
diff --git a/htdocs/applets/geogebra_stable/icons/hicolor/scalable/mimetypes/application-vnd.geogebra.tool.svgz b/htdocs/applets/geogebra_stable/icons/hicolor/scalable/mimetypes/application-vnd.geogebra.tool.svgz
new file mode 100644
index 0000000000..0b19364dd9
Binary files /dev/null and b/htdocs/applets/geogebra_stable/icons/hicolor/scalable/mimetypes/application-vnd.geogebra.tool.svgz differ
diff --git a/htdocs/applets/geogebra_stable/quadratictest.ggb b/htdocs/applets/geogebra_stable/quadratictest.ggb
new file mode 100644
index 0000000000..ab1773b3ba
Binary files /dev/null and b/htdocs/applets/geogebra_stable/quadratictest.ggb differ
diff --git a/htdocs/applets/geogebra_stable/transformationstest2.ggb b/htdocs/applets/geogebra_stable/transformationstest2.ggb
new file mode 100644
index 0000000000..c6d7513dca
Binary files /dev/null and b/htdocs/applets/geogebra_stable/transformationstest2.ggb differ
diff --git a/htdocs/applets/geogebra_stable/unsigned/geogebra.jar b/htdocs/applets/geogebra_stable/unsigned/geogebra.jar
new file mode 100644
index 0000000000..32ba6f843e
Binary files /dev/null and b/htdocs/applets/geogebra_stable/unsigned/geogebra.jar differ
diff --git a/htdocs/applets/geogebra_stable/unsigned/geogebra_cas.jar b/htdocs/applets/geogebra_stable/unsigned/geogebra_cas.jar
new file mode 100644
index 0000000000..c093a06b37
Binary files /dev/null and b/htdocs/applets/geogebra_stable/unsigned/geogebra_cas.jar differ
diff --git a/htdocs/applets/geogebra_stable/unsigned/geogebra_export.jar b/htdocs/applets/geogebra_stable/unsigned/geogebra_export.jar
new file mode 100644
index 0000000000..30eb7fb2f5
Binary files /dev/null and b/htdocs/applets/geogebra_stable/unsigned/geogebra_export.jar differ
diff --git a/htdocs/applets/geogebra_stable/unsigned/geogebra_gui.jar b/htdocs/applets/geogebra_stable/unsigned/geogebra_gui.jar
new file mode 100644
index 0000000000..8f81814d49
Binary files /dev/null and b/htdocs/applets/geogebra_stable/unsigned/geogebra_gui.jar differ
diff --git a/htdocs/applets/geogebra_stable/unsigned/geogebra_main.jar b/htdocs/applets/geogebra_stable/unsigned/geogebra_main.jar
new file mode 100644
index 0000000000..e93b71e2a9
Binary files /dev/null and b/htdocs/applets/geogebra_stable/unsigned/geogebra_main.jar differ
diff --git a/htdocs/applets/geogebra_stable/unsigned/geogebra_properties.jar b/htdocs/applets/geogebra_stable/unsigned/geogebra_properties.jar
new file mode 100644
index 0000000000..fdb46c561e
Binary files /dev/null and b/htdocs/applets/geogebra_stable/unsigned/geogebra_properties.jar differ
diff --git a/htdocs/applets/geogebra_stable/vectortest.ggb b/htdocs/applets/geogebra_stable/vectortest.ggb
new file mode 100644
index 0000000000..3b6ce6d426
Binary files /dev/null and b/htdocs/applets/geogebra_stable/vectortest.ggb differ
diff --git a/htdocs/applets/index.html b/htdocs/applets/index.html
new file mode 120000
index 0000000000..58750e779f
--- /dev/null
+++ b/htdocs/applets/index.html
@@ -0,0 +1 @@
+WeBWorKAppletTest.html
\ No newline at end of file
diff --git a/htdocs/applets/liveJar/live.jar b/htdocs/applets/liveJar/live.jar
new file mode 100644
index 0000000000..231dee7abf
Binary files /dev/null and b/htdocs/applets/liveJar/live.jar differ
diff --git a/htdocs/applets/liveJar/liveJar.html b/htdocs/applets/liveJar/liveJar.html
new file mode 100755
index 0000000000..eec665e901
--- /dev/null
+++ b/htdocs/applets/liveJar/liveJar.html
@@ -0,0 +1,8 @@
+<HTML>
+<APPLET ARCHIVE="live.jar"  CODE="Live.class" WIDTH=150 HEIGHT=150 
+ALIGN=LEFT>
+<PARAM NAME=BGCOLOR VALUE=#FFFFFF>
+<PARAM NAME=MAGNIFICATION VALUE=1.>
+<PARAM NAME=INPUT_FILE VALUE="test.m">
+</APPLET>
+</HTML>
diff --git a/htdocs/applets/liveJar/test.m b/htdocs/applets/liveJar/test.m
new file mode 100755
index 0000000000..d8414bf6cf
--- /dev/null
+++ b/htdocs/applets/liveJar/test.m
@@ -0,0 +1,2 @@
+Graphics3D[{ (* ...primitives and directives... *) },
+   BoxRatios->{1,4,9} (* ...options... *)]
diff --git a/htdocs/applets/live_map_instructions.html b/htdocs/applets/live_map_instructions.html
new file mode 100644
index 0000000000..79fffb3b5b
--- /dev/null
+++ b/htdocs/applets/live_map_instructions.html
@@ -0,0 +1,27 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+	<title>Instructions for live map</title>
+	<meta name="generator" content="BBEdit 7.1.4">
+</head>
+<body>
+<b> Using this Live </b></p>
+<UL>
+<LI> Click anyplace on the map to move the cursor to that point.
+
+<p>&nbsp</p>
+
+<LI> Notice the readout at the upper right gives the location of the cursor measured in pixels from the lower left corner of the map.
+
+<p>&nbsp</p>
+
+<LI> You can fine tune the location of the cursor by clicking on the four arrows at the left, right, top, and bottom of the map.  Each click moves the cursor one pixel in the direction indicated by the arrow.
+
+<p>&nbsp</p>
+
+<LI> Use the scale printed at the bottom of the map to determine how to convert distances measured on the map in pixels to distances on the ground measured in miles or kilometers.
+</UL>
+
+</body>
+</html>
diff --git a/htdocs/applets/source/GraphApplet.java b/htdocs/applets/source/GraphApplet.java
new file mode 100644
index 0000000000..f248ad348d
--- /dev/null
+++ b/htdocs/applets/source/GraphApplet.java
@@ -0,0 +1 @@
+/*
   Modified June 10, 2000 to add some public methods that are
   meant to be called from JavaScript.  The following applet 
   parameters were also added:

       Param name    Default value  Meaning
       ----------    -------------  -------
       parameter,       none        The name of a variable, other than "x"
        parameter1,                     that can be used as a parameter in
        parameter2,                     the definition of the function.
        ...                             Their values can be set and queried
                                        by calling public methods.
       value,           0           Initial values for the parameters.
        value1,
        value2,
        ...
*/

/*
   GraphApplet displays the graph of a mathematical function.  It can
   be configured with the following applet parameters:
   
       Param name  Default value  Meaning
       ----------  -------------  -------
        userInput   no             If set to yes, there will be an input
                                        box where the user can enter the
                                        definition of the function.
        userLimits  no             If set to yes, there will be a set
                                        of inputs which control the x and
                                        y limits on the graph.
        userZoom    no             If set to yes, the user can zoom in on
                                        a point by clicking on it, and zoom
                                        out by shift-clicking.
        function    abs(x) ^ x     The function to be graphed, or if userInput
                                        is set to "yes", the initial function.
        limits      -5 5 -5 5      Four numbers giving the x and y limits on
                                        the graph (xmin, xmax, ymin, ymax).
                                        Numbers can be separated by spaces or
                                        commas.
 
   The definition of a function can include: numbers, the variable x, the
   operators + - * / ^ and ! (where ^ represents exponentiation), and the
   functions sin, cos, tan, sec, csc, cot, arcsin, arccos, arctan, ln, log2,
   log10, exp, abs, sqrt, cubert, trunc, round, and ceiling.  It can also
   include a "?:" conditional operator in the style of the C programming
   language:  test ? value1 : value2  where test can include the logical
   operators:  < <= = > >= and or not.  (The ": value2" part is optional.)
   There is also a sum operation:  sum(sumationVariable, start, end, expression).
   For example:  sum(i, 0, k, x^i / i!)
                                        
   This applet is part of the mathbeans package, and it must be used in
   an <applet> tag with code="mathbeans.GraphApplet.class" and with
   mathbeans.jar available as an archive.  See the mathbeans web site
   at http://math.hws.edu/mathbeans/ for more information.
   
   David Eck (eck@hws.edu, http://math.hws.edu/eck/)
   26 August 1999
*/


package mathbeans;

import mathbeans.awt.*;
import mathbeans.data.*;
import mathbeans.draw.*;

import java.awt.*;
import java.awt.event.*;
import java.applet.Applet;


public class GraphApplet extends Applet {

   /*
       Some public methods for calling from JavaScript
   */
   
   public void setFunction(String funcDef) {
      if (functionInput == null) {
         if (functionLabel != null)
            functionLabel.setText(funcDef);
         try {
            functionParser.getSymbolTable().remove("f");
            Function f = functionParser.defineFunction("f","x",funcDef);
            graph.setFunction(f);
            mainPanel.compute();
         }
         catch (ParseError e) {
            graph.setFunction(null);
            canvas.setErrorMessage("Error in function definition: " + e);
         }
      }
      else {
         functionInput.setText(funcDef);
         funcDefString = funcDef;
         mainPanel.compute();
      }
   }
   
   public String getFunction() {
      if (functionInput != null) {
         mainPanel.compute();
         return functionInput.getText();
      }
      else {
         return funcDefString;
      }
   }
   
   public void setLimits(double xmin, double xmax, double ymin, double ymax) {
      coordRect.setLimits(xmin,xmax,ymin,ymax);
   }
   
   public boolean setVariableValue(String name, double val) {
      MathObject obj = functionParser.getSymbol(name);
      if (obj != null && obj instanceof Variable) {
         ((Variable)obj).setValue(val);
         mainPanel.compute();
         return true;
      }
      else {
         return false;
      }
   }
   
   public boolean defineNewVariable(String name) {
      if (name != null && functionParser.getSymbol(name) == null) {
         functionParser.defineVariable(name);
         return true;
      }
      else {
         return false;
      }
   }
   
   public double getVariableValue(String name) {
      MathObject obj = functionParser.getSymbol(name);
      if (obj != null && obj instanceof Variable)
         return ((Variable)obj).getValue();
      else
         return Double.NaN;
   }
   
   // Variables introduced for use in the above routines.
   // They are set in the init() method.
   
   private MathBeanPanel mainPanel;   // Main MathBeanPanel for the applet.
   private CoordinateRect coordRect;  // Coordinate rect for the canvas.
   private ExpressionFunctionInput functionInput;  // Input box, if userInput is "yes"
   private Label functionLabel;   // Label that shows definition, if userInput is "no"
   private String funcDefString;  // String that defines function, if userInput is "no"
   private Parser functionParser; // Parser used to define function.
   private Graph1D graph;         // Graph that shows the function.
   
   //----------------------------------------------------

   public void init() {
   
      /*  The init method sets up the interface of the applet.  For a "mathbean"
       *  applet, this is all you have to do, since interface components take care
       *  of themselves once they have been created and properly configured.
       *     The entire applet is filled by a "MathBeanPanel", which coordinates
       *  the activities of the mathematical components that it contains.
       *  "panel.setInsetGap(3) leaves a 3-pixel border between the edge of the
       *  panel and the components that it contains.
       */

      MathBeanPanel panel = new MathBeanPanel();
      mainPanel = panel;  // new, for Javascript
      panel.setInsetGap(3);
      setLayout(new BorderLayout());
      add(panel,BorderLayout.CENTER);
      
      /*  A parser knows how to convert a string that represents a mathematical
       *  expression into an internal form that can be used for computation.
       *  Every mathbeans application needs at least one parser.
       */

      Parser parser = new Parser();
      functionParser = parser;
      
      /* New for JavaScript:  Get names of variables from applet params.  These
       * variables can be used in the function.  Their values can be set and
       * tested by calling the above public methods.
       */
      
      String name = getParameter("parameter");
      String val = getParameter("value");
      int ct = 0;
      if (name == null) {
         ct++;
         name = getParameter("parameter1");
         val = getParameter("value1");
      }
      while (name != null) {
         Variable v = parser.defineVariable(name);
         if (val != null) {
            double[] value = Util.extractNumbers(val);
            if (value != null && value.length > 0)
               v.setValue(value[0]);
            else
               v.setValue(0);
         }
         ct++;
         name = getParameter("parameter" + ct);
         val = getParameter("value" + ct);
      }
      
      /*  This section defines the function that is to be graphed, either as
       *  as a fixed function or as a user input function.  The call to
       *  getParameter("function") gets the value of the applet param with
       *  name="function", if one has been provided in the <applet> tag.
       *  If not, the value will be null.  In that case, use a default
       *  function.
       */
                  
      Function func;  // The function to be graphed.

      String functionDef = getParameter("function");
      if (functionDef == null)
         functionDef = "abs(x) ^ x";
      
      if ("yes".equalsIgnoreCase(getParameter("userInput"))) {
             // Function can be entered by user.  Use an
             // ExpressionFunctionInput box for user input.
         ExpressionFunctionInput in = 
                          new ExpressionFunctionInput("f","x",parser,functionDef);
         MathBeanPanel top = new MathBeanPanel();
             // in.withLabel() is a component consisting of the input
             // box together with a lable "f(x)=" at its left.
         top.add(in.withLabel(), BorderLayout.CENTER);
         Button button = new Button("Use New Data");
             // The next two lines cause the panel to recompute its contents
             // -- that is, to graph the new function -- when the user clicks
             // the button or presses return in the input box.  A MathBeanPanel
             // always responds to events by recomputing everything.
         button.addActionListener(panel);
         in.addActionListener(panel);
         top.add(button, BorderLayout.EAST);
             // The ExpressionInputBox has an associated Function object,
             // representing the function defined by the user's input.
             // This is the function that is to be graphed.  The definition
             // of the function changes whenever the panel recomputes its
             // contents (in this applet, when the user clicks the button or
             // presses return in the function input box).
         func = in.getFunction();
         panel.add(top, BorderLayout.NORTH);
         functionInput = in;   // new, for Javascript
      }
      else {
            // The graph will show a fixed function, defined by functionDef.
            // If there is an error in the function definition, a ParseError
            // will be thrown.  In that case, use the default function.
         try {
            func = parser.defineFunction("f","x",functionDef);
         }
         catch (ParseError e) {
            func = null;
         }
         if (func == null) {
            try {
               functionDef = "abs(x) ^ x";
               func = parser.defineFunction("f","x",functionDef);
            }
            catch (ParseError e) {
                  // There shouldn't be an error here, unless the programmer makes
                  // an error in the default function.  However, ParseErrors must
                  // always be handled in a try..catch.  Print an error to the
                  // console for debugging.
               System.out.println("Unexpected parse error in init(): " + e.getMessage());
            }
         }
         Label lbl = new Label("f(x) = " + functionDef, Label.CENTER);
         panel.add(lbl, BorderLayout.NORTH);
         functionLabel = lbl;  // new, for JavaScript
         funcDefString = functionDef;  // new, for JavaScript
      }
      
      /*  Get the xy limits specified by the user, if any.  If there is no "limits"
       *  param in the <applet> tag or if the value of the param is illegal, use
       *  a default value of -5,5,-5,5.  The routine Util.extractNumbers(String)
       *  converts a string consisting of a list of numbers into an array of doubles.
       */
      
      double[] limits = Util.extractNumbers(getParameter("limits"));
      if (limits == null || limits.length < 4)
         limits = new double[] { -5,5,-5,5 };
         
      /*  Create the canvas and add it to the panel.  The call to
       *  panel.setErrorReporter(canvas) means that if an error is
       *  found in user input, an error message will be display on
       *  the canvas.  Otherwise, the error would be reported in
       *  a dialog box, which is probably not a good idea in an applet.
       *  A DisplayCanvas can display various graphical
       *  objects, including axes and graphs.  These objects are subclasses
       *  of the class "Drawable".  In this case the Drawable objects 
       *  displayed by the canvas are a set of axes, the graph of func,
       *  and a one-pixel black border around the canvas.  The canvas has
       *  a CoordinateRect, which lays down an xy-coordinate system on
       *  the canvas.  The axes and graph use this coordinate system.       
       */

      canvas = new DisplayCanvas();   // declared below, outside the init() routine
      panel.setErrorReporter(canvas);
      CoordinateRect cr = new CoordinateRect(limits[0],limits[1],limits[2],limits[3]);
      coordRect = cr;  // new, for JavaScript
      canvas.addCoordinateRect(cr);
      canvas.add(new Axes());
      graph = new Graph1D(func);  // new, for JavaScript
      canvas.add(graph);
      canvas.add(new DrawBorder());
      panel.add(canvas, BorderLayout.CENTER);
      
      /*  If the user is allowed to change xy limits, add a "control panel"
       *  for this on the right edge of the applet.   Here, some extra buttons 
       *  are added to a standard LimitControlPanel.  The "ZoomButtons"
       *  let the user zoom in or out on the graph by clicking a button.
       *  The "RestoreButton" will restore the original limits from when
       *  the applet was first created.
       */
      
      if ("yes".equalsIgnoreCase(getParameter("userLimits"))) {
         LimitControlPanel lcp = new LimitControlPanel(canvas.getCoordinateRect(0));
         lcp.addZoomButtons();
         lcp.addRestoreButton();
         panel.add(lcp, BorderLayout.EAST);
      }
      
      /*  If "userZoom" is enabled, call canvas.setHandleMouseZooms(true).  This 
       *  will let the user zoom in on a point on the graph by clicking on the
       *  canvas.  The user can zoom out from a point by clicking with the shift
       *  key held down.
       */
      
      if ("yes".equalsIgnoreCase(getParameter("userZoom")))
         canvas.setHandleMouseZooms(true);
      
   }  // end init()
   
   private DisplayCanvas canvas;  // The canvas used in the applet
   
   public void stop() {
         // When the applet is stopped, be polite by releasing the
         // canvas's fairly large amount of allocated memory.
      canvas.releaseResources();
   }
   
         
}  // end class GraphApplet
\ No newline at end of file
diff --git a/htdocs/applets/source/GummyGraph.java b/htdocs/applets/source/GummyGraph.java
new file mode 100644
index 0000000000..7a063157f0
--- /dev/null
+++ b/htdocs/applets/source/GummyGraph.java
@@ -0,0 +1 @@
+
/*
    Lets user reshape a graph by dragging points up and down.
    Shift-click to move all points back to the vertical center.
    Left click to drag a point and drag its neighbors along.
    Right-click to drag a point without dragging its neighbors.
    --David Eck, June 2000 (eck@hws.edu, http://math.hws.edu/eck/)
*/

import java.awt.*;
import java.applet.Applet;
import java.util.StringTokenizer;

public class GummyGraph extends Applet {

   // Parameters that can be set through appelt params and manipulated
   // with JavaScript.  (See public methods below.)

   private int points = 11;
   private double xmin = -5, xmax = 5, ymin = -5, ymax = 5;
   private double xGrid = 1;
   private double yGrid = 1;
   private int gap = 5;
   private double fallOff = 0.5;
   
   private Color borderColor = Color.black;
   private int borderWidth = 2;
   private Color gridColor = Color.lightGray;
   private Color axesColor = new Color(0,0,220);
   private Color lightAxesColor = new Color(160,180,255);
   private Color graphColor = Color.magenta;
   private boolean showPoints = true;
   private boolean showGrid = true;
   // Background color is set in init(); change it there.
   
   //-------------------- private implementation details ---------------------------
   
   private Image OSC = null;
   private int canvasWidth, canvasHeight;
   private boolean graphNeedsRedraw;
   private boolean axesNeedsRedraw;
   private boolean needsRedraw;
   
   //------------------- Public methods for scripting -------------------------------
   
   public int getPointCount() {
        // Return the number of draggable points on the graph
        // (which is one plus the number of sub-intervals).
      return points;
   }
   
   public double getX(int pointNumber) {
        // Get the x-value of point number pointNumber.
        // Note: x-values are always evenly spaced.
      if (pointNumber < 0 || pointNumber >= points)
         return Double.NaN;
      return xmin + pointNumber*(xmax-xmin)/(points-1);
   }
   
   public double getY(int pointNumber) {
        // Return the y-value of point number pointNumber.
        // X and y values are stored internally as values
        // between 0 and 1.  The actual x and y values
        // are determined by scaling these internal values
        // using the current xmin, xmax, ymin, ymax.
      if (pointNumber < 0 || pointNumber >= points)
         return Double.NaN;
      return ymin + yValues[pointNumber]*(ymax - ymin);
   }
   
   public double getDerivative(int pointNumber) {
        // Get the derivative at point number pointNumber.
        // This is just computed from the y-values.
      if (pointNumber < 0 || pointNumber >= points)
         return Double.NaN;
      double dx = 1.0/points * (xmax - xmin);
      if (pointNumber == 0)
         return (yValues[1] - yValues[0])*(ymax-ymin)/dx;
      else if (pointNumber == points-1)
         return (yValues[points-1] - yValues[points-2])*(ymax-ymin)/dx;
      else
         return (yValues[pointNumber+1] - yValues[pointNumber-1])*(ymax-ymin)/(2*dx);
   }
   
   public void reset() {
        // Puts all points back to the vertical center of the applet.
      for (int i = 0; i < points; i++) {
        yValues[i] = 0.5;
        derivatives[i] = 0;
      }
      graphNeedsRedraw = true;
      repaint();
   }
   
   public void setPointCount(int ct) {
        // Set the number of points and reset y-values
        // to the vertical center of the applet.
      if (ct > 2 && ct <= 500) {
         points = ct;
         yValues = new double[points];
         derivatives = new double[points];
         for (int i = 0; i < points; i++)
            yValues[i] = 0.5;
         graphNeedsRedraw = true;
         repaint();
      }
   }
   
   public void setY(int pointNumber, double val) {
        // Change the y-value of one point.
      if (pointNumber < 0 || pointNumber >= 0 || val < ymin || val > ymax)
         return;
      yValues[pointNumber] = (val-ymin)/(ymax-ymin);
      graphNeedsRedraw = true;
      repaint();
   }
   
   public boolean setPoints(String points) {
         // The string, points, should be a list of numbers
         // separated by spaces or commas.  These are used as
         // y-values for the points on the curve, replacing the
         // current points.  Values are clamped to the range
         // from ymin to ymax.  If the contents of the string
         // are not legal, the current graph is not changed
         // and the value false is returned.  If the contents
         // of points are legal, true is returned.
      double[] vals = getDoubles(points);
      if (vals == null || vals.length < 3 || vals.length > 500)
         return false;
      setPointCount(vals.length);  // Sets graphNeedsRedraw = true and calls repaint()
      for (int i = 0; i < vals.length; i++) {
         if (vals[i] > ymax)
            yValues[i] = 1;
         else if (vals[i] < ymin)
            yValues[i] = 0;
         else
            yValues[i] = (vals[i]-ymin)/(ymax-ymin);
      }
      makeDerivs();
      return true;
   }
   
   public void setLimits(double xmin, double xmax, double ymin, double ymax) {
          // Change the ranges of x and y on the applet.
      if (xmax <= xmin || ymax <= ymin)
         return;
      this.ymax = ymax;
      this.ymin = ymin;
      this.xmax = xmax;
      this.xmin = xmin;
      axesNeedsRedraw = true;
      repaint();
   }
   
   public void setGap(int g) {
         // This is space left between the axex and the border 
         // of the applet.  Default is 5.
      if (g >= 0 && g != gap) {
         gap = g;
         axesNeedsRedraw = true;
         graphNeedsRedraw = true;
         repaint();
      }
   }
   
   public void setXGrid(double spacing) {
         // Set spacing between x grid lines (in the same units
         // that are used for xmin and xmax, so changing these
         // will change the number of grid lines).  If the
         // value is zero, no x grid lines are drawn.
      if (spacing >= 0) {
         xGrid = spacing;
         needsRedraw = true;
         repaint();
      }
   }
   
   public void setYGrid(double spacing) {
        // Set spacing between y grid lines.  If the value is
        // zero, no y grid lines are drawn.
      if (spacing >= 0) {
         yGrid = spacing;
         needsRedraw = true;
         repaint();
      }
   }
   
   public void setFallOff(double factor) {
        // When a point is dragged with the left mouse button, it can drag
        // its neighbors along.  The displacement of the neighbor is
        // less than the displacement of the point by the fallOff factor.
        // For the neighbor of the neighbor, the displacement decreases by
        // another fallOff factor, and so on.  If the value is zero,
        // then neighbors are not dragged at all.  If the number of points
        // is small, this should be close to zero.  For large numbers of
        // points, it can be close to one.
      if (factor >= 0 && factor < 1) {
         fallOff = factor;
      }
   }
   
   public void setBorderWidth(int b) {
         // How many pixels is the border drawn around the edge of the
         // applet.
      if (b >= 0) {
         borderWidth = b;
         needsRedraw = true;
         repaint();
      }
   }
   
   public void setBorderColor(String color) {
         // Color of border.
      Color c = getColor(color);
      if (c != null) {
         borderColor = c;
         needsRedraw = true;
         repaint();
      }
   }
   
   public void setGridColor(String color) {
         // Color of grid lines.
      Color c = getColor(color);
      if (c != null) {
         gridColor = c;
         needsRedraw = true;
         repaint();
      }
   }
   
   public void setAxesColor(String color) {
         // Color of axes.
      Color c = getColor(color);
      if (c != null) {
         axesColor= c;
         needsRedraw = true;
         repaint();
      }
   }
   
   public void setLightAxesColor(String color) {
         // Color used for axis when the real axis is
         // outside of the applet.
      Color c = getColor(color);
      if (c != null) {
         lightAxesColor= c;
         needsRedraw = true;
         repaint();
      }
   }
   
   public void setGraphColor(String color) {
        // Color of graph.
      Color c = getColor(color);
      if (c != null) {
         graphColor= c;
         needsRedraw = true;
         repaint();
      }
   }
   
   public void setBackgroundColor(String color) {
        // Background color for the whole applet.
      Color c = getColor(color);
      if (c != null) {
         setBackground(c);
         needsRedraw = true;
         repaint();
      }
   }
   
   public void setShowPoints(boolean show) {
        // Should the points be drawn as little circles?
        // If you have a lot of points, it might not be
        // a good idea, since then just about any point on
        // the graph can be dragged.
      if (show != showPoints) {
         showPoints = show;
         needsRedraw = true;
         repaint();
      }
   }   
   
   public void setShowGrid(boolean show) {
         // Should the grid lines be drawn?
      if (show != showGrid) {
         showGrid = show;
         needsRedraw = true;
         repaint();
      }
   }   
   
   //----------------- Init method can set properties from applet params ---------------
   
   public void init() {
      setBackground(Color.white);
      setBackgroundColor(getParameter("backgroundColor"));
      setBorderColor(getParameter("borderColor"));
      setAxesColor(getParameter("axesColor"));
      setLightAxesColor(getParameter("lightAxesColor"));
      setGraphColor(getParameter("graphColor"));
      setGridColor(getParameter("gridColor"));
      setGap(getInt(getParameter("gap")));
      int n = getInt(getParameter("pointCount"));
      setPointCount( (n > 2 && n <= 500)? n : 11 );
      double[] dvals = getDoubles(getParameter("limits"));
      if (dvals != null && dvals.length == 4)
         setLimits(dvals[0], dvals[1], dvals[2], dvals[3]);
      setXGrid(getDouble(getParameter("xGrid")));
      setYGrid(getDouble(getParameter("yGrid")));
      setFallOff(getDouble(getParameter("fallOff")));
      setBorderWidth(getInt(getParameter("borderWidth")));
      if ("no".equalsIgnoreCase(getParameter("showPoints")))
         showPoints = false;
      if ("no".equalsIgnoreCase(getParameter("showGrid")))
         showGrid = false;
      setPoints(getParameter("points"));  // overrides point count
   }
   
   //----------------------- For getting values from strings -------------------------
   
   private int getInt(String str) {
      if (str == null || str.trim().length() == 0)
         return Integer.MIN_VALUE;
      try {
         return Integer.parseInt(str);
      }
      catch (NumberFormatException e) {
         return Integer.MIN_VALUE;
      }
   }
   
   private int[] getInts(String str) {
      if (str == null)
         return null;
      StringTokenizer tk = new StringTokenizer(str," ,\t");
      int ct = tk.countTokens();
      if (ct == 0)
         return null;
      int[] vals = new int[ct];
      for (int i = 0; i < ct; i++) {
         String s = tk.nextToken();
         vals[i] = getInt(s);
         if (vals[i] == Integer.MIN_VALUE)
            return null;
      }
      return null;
   }
   
   private double getDouble(String str) {
      if (str == null || str.trim().length() == 0)
         return Double.NaN;
      try {
         return (new Double(str)).doubleValue();
      }
      catch (NumberFormatException e) {
         return Double.NaN;
      }
   }
   
   private double[] getDoubles(String str) {
      if (str == null)
         return null;
      StringTokenizer tk = new StringTokenizer(str," ,\t");
      int ct = tk.countTokens();
      if (ct == 0)
         return null;
      double[] vals = new double[ct];
      for (int i = 0; i < ct; i++) {
         String s = tk.nextToken();
         vals[i] = getDouble(s);
         if (Double.isNaN(vals[i]) || Double.isInfinite(vals[i]))
            return null;
      }
      return vals;
   }
   
   private static String[] colorNames = {
         "black", "white", "red", "green", "blue",
         "yellow", "cyan", "magenta", "pink", "orange",
         "lightGray", "gray", "darkGray"
      };

   private static Color[] colorList = {
         Color.black, Color.white, Color.red, Color.green, Color.blue,
         Color.yellow, Color.cyan, Color.magenta, Color.pink, Color.orange,
         Color.lightGray, Color.gray, Color.darkGray
      };
   
   private Color getColor(String str) {
      if (str == null)
         return null;
      str = str.trim();
      if (str.length() == 0)
         return null;
      if (Character.isDigit(str.charAt(1))) {
         int[] levels = getInts(str);
         if (levels == null || levels.length != 3)
            return null;
         if (levels[0] < 0 || levels[0] > 255 || levels[1] < 0 || levels[1] > 255 || levels[2] < 0 || levels[2] > 255)
            return null;
         return new Color(levels[0],levels[1],levels[2]);
      }
      else {
         for (int i = 0; i < colorNames.length; i++)
            if (colorNames[i].equalsIgnoreCase(str))
               return colorList[i];
         return null;
      }
   }
   
   public void update(Graphics g) {
      paint(g);
   }
   
   //--------------------------------------------------------------------------
   
   synchronized public void paint(Graphics g) {
      int width = size().width;
      int height = size().height;
      if (OSC == null || width != canvasWidth || height != canvasHeight) {
         axesNeedsRedraw = true;
         graphNeedsRedraw = true;
         canvasWidth = width;
         canvasHeight = height;
         OSC = null;
         try {
            OSC = createImage(width,height);
         }
         catch (OutOfMemoryError e) {
         }
      }
      if (OSC == null) {
         draw(g);
      }
      else {
         if (axesNeedsRedraw || graphNeedsRedraw || needsRedraw) {
            Graphics OSG = OSC.getGraphics();
            draw(OSG);
            OSG.dispose();
            needsRedraw = false;
         }
         g.drawImage(OSC,0,0,this);
      }
   }
   
   private void draw(Graphics g) {
      g.setColor(getBackground());
      g.fillRect(0,0,canvasWidth,canvasHeight);
      drawGrid(g);
      g.setColor(borderColor);
      for (int i = 0; i < borderWidth; i++)
         g.drawRect(i, i, canvasWidth - 2*i - 1, canvasHeight - 2*i - 1);
      drawAxes(g);
      drawGraph(g);
   }
   
   private void drawGrid(Graphics g) {
      if (!showGrid)
         return;
      g.setColor(gridColor);
      if (xGrid > 0) {
         double x = (int)(xmin/xGrid)*xGrid;
         while (x <= xmax) {
            int a = (int)(gap + (x-xmin)*(canvasWidth-2*gap)/(xmax - xmin));
            g.drawLine(a,0,a,canvasHeight);
            x += xGrid;
         }
      }
      if (yGrid > 0) {
         double y = (int)(ymin/yGrid)*yGrid;
         while (y <= ymax) {
            int b = (int)(gap + (ymax-y)*(canvasHeight-2*gap)/(ymax - ymin));
            g.drawLine(0,b,canvasWidth,b);
            y += yGrid;
         }
      }
   }
   
   //--------------------------- Axes ---------------------------------------
   
   private int[] xTicks;
   private int[] yTicks;
   private String[] xTickLabels;
   private String[] yTickLabels;
   private int[][] xTickLabelPos;
   private int[][] yTickLabelPos;
   private int xAxisPixelPosition, yAxisPixelPosition;
   private Font font;
   private int ascent, descent, digitWidth;
   
   private void drawAxes(Graphics g) {
      if (axesNeedsRedraw) {
         font = g.getFont();
         FontMetrics fm = g.getFontMetrics(font);
         setup(fm, xmin, xmax, ymin, ymax, 0, 0, canvasWidth, canvasHeight, gap);
         axesNeedsRedraw = false;
      }
      if (ymax < 0 || ymin > 0)
         g.setColor(lightAxesColor);
      else 
         g.setColor(axesColor);
      g.drawLine(gap, xAxisPixelPosition, canvasWidth - gap - 1, xAxisPixelPosition);
      for (int i = 0; i < xTicks.length; i++) {
         int a = (xAxisPixelPosition - 2 < 0) ? xAxisPixelPosition : xAxisPixelPosition - 2;
         int b = (xAxisPixelPosition + 2 >= canvasHeight)? xAxisPixelPosition : xAxisPixelPosition + 2; 
         g.drawLine(xTicks[i], a, xTicks[i], b);
      }
      for (int i = 0; i < xTickLabels.length; i++)
         g.drawString(xTickLabels[i], xTickLabelPos[i][0], xTickLabelPos[i][1]);
      if (xmax < 0 || xmin > 0)
         g.setColor(lightAxesColor);
      else 
         g.setColor(axesColor);
      g.drawLine(yAxisPixelPosition, gap, yAxisPixelPosition, canvasHeight - gap - 1);
      for (int i = 0; i < yTicks.length; i++) {
         int a = (yAxisPixelPosition - 2 < 0) ? yAxisPixelPosition : yAxisPixelPosition - 2;
         int b = (yAxisPixelPosition + 2 >= canvasWidth)? yAxisPixelPosition : yAxisPixelPosition + 2; 
         g.drawLine(a, yTicks[i], b, yTicks[i]);
      }
      for (int i = 0; i < yTickLabels.length; i++)
         g.drawString(yTickLabels[i], yTickLabelPos[i][0], yTickLabelPos[i][1]);
   }
   
   void setup(FontMetrics fm, double xmin, double xmax, double ymin, double ymax,
                              int left, int top, int width, int height, int gap) {
      digitWidth = fm.charWidth('0');
      ascent = fm.getAscent();
      descent = fm.getDescent();
      if (ymax < 0)
         xAxisPixelPosition = top + gap;
      else if (ymin > 0)
         xAxisPixelPosition = top + height - gap - 1;
      else
         xAxisPixelPosition = top + gap + (int)((height-2*gap - 1) * ymax / (ymax-ymin));
      if (xmax < 0)
         yAxisPixelPosition = left + width - gap - 1;
      else if (xmin > 0)
         yAxisPixelPosition = left + gap;
      else
         yAxisPixelPosition = left + gap - (int)((width-2*gap - 1) * xmin / (xmax-xmin));
      double start = fudgeStart( ((xmax-xmin)*(yAxisPixelPosition - (left + gap)))/(width - 2*gap)  + xmin, 
                                                  0.05*(xmax-xmin) );
      int labelCt = (width - 2*gap) / (8*digitWidth);
      if (labelCt <= 2)
         labelCt = 3;
      else if (labelCt > 20)
         labelCt = 20;
      double interval = fudge( (xmax - xmin) / labelCt );
      for (double mul = 1.5; mul < 4; mul += 0.5) {
         if (fm.stringWidth(realToString(interval+start)) + digitWidth > (interval/(xmax-xmin))*(width-2*gap))  // overlapping labels
             interval = fudge( mul*(xmax - xmin) / labelCt );
         else
            break;
      }
      double[] label = new double[50];
      labelCt = 0;
      double x = start + interval;
      double limit = left + width;
      while (labelCt < 50 && x < xmax) {
         if (left + gap + (width-2*gap)*(x-xmin)/(xmax-xmin) + fm.stringWidth(realToString(x))/2 > limit)
            break;
         label[labelCt] = x;
         labelCt++;
         x += interval;
      }
      x = start - interval;
      limit = left;
      while (labelCt < 50 && x >= xmin) {
         if (left + gap + (width-2*gap)*(x-xmin)/(xmax-xmin) - fm.stringWidth(realToString(x))/2 < limit)
            break;
         label[labelCt] = x;
         labelCt++;
         x -= interval;
      }
      xTicks = new int[labelCt];
      xTickLabels = new String[labelCt];
      xTickLabelPos = new int[labelCt][2];
      for (int i = 0; i < labelCt; i++) {
         xTicks[i] = (int)(left + gap + (width-2*gap)*(label[i]-xmin)/(xmax-xmin));
         xTickLabels[i] = realToString(label[i]);
         xTickLabelPos[i][0] = xTicks[i] - fm.stringWidth(xTickLabels[i])/2;
         if (xAxisPixelPosition - 4 - ascent >= top)
            xTickLabelPos[i][1] = xAxisPixelPosition - 4;
         else
            xTickLabelPos[i][1] = xAxisPixelPosition + 4 + ascent;
      }
      
      start = fudgeStart( ymax - ((ymax-ymin)*(xAxisPixelPosition - (top + gap)))/(height - 2*gap), 
                                                  0.05*(ymax-ymin) );
      labelCt = (height - 2*gap) / (4*(ascent+descent));
      if (labelCt <= 2)
         labelCt = 3;
      else if (labelCt > 20)
         labelCt = 20;
      interval = fudge( (ymax - ymin) / labelCt );
      labelCt = 0;
      double y = start + interval;
      limit = top + 8 + gap;
      while (labelCt < 50 && y <= ymax) {
         if (top + gap + (height-2*gap)*(ymax-y)/(ymax-ymin) - ascent/2 < limit)
            break;
         label[labelCt] = y;
         labelCt++;
         y += interval;
      }
      y = start - interval;
      limit = top + height - gap - 8;
      while (labelCt < 50 && y >= ymin) {
         if (top + gap + (height-2*gap)*(ymax-y)/(ymax-ymin) + ascent/2 > limit)
            break;
         label[labelCt] = y;
         labelCt++;
         y -= interval;
      }
      yTicks = new int[labelCt];
      yTickLabels = new String[labelCt];
      yTickLabelPos = new int[labelCt][2];
      int w = 0;  // max width of tick mark
      for (int i = 0; i < labelCt; i++) {
          yTickLabels[i] = realToString(label[i]);
          int s = fm.stringWidth(yTickLabels[i]);
          if (s > w)
             w = s;  
      }
      for (int i = 0; i < labelCt; i++) {
         yTicks[i] = (int)(top + gap + (height-2*gap)*(ymax-label[i])/(ymax-ymin));
         yTickLabelPos[i][1] = yTicks[i] + ascent/2;
         if (yAxisPixelPosition - 4 - w < left)
            yTickLabelPos[i][0] = yAxisPixelPosition + 4;
         else
            yTickLabelPos[i][0] = yAxisPixelPosition - 4 - fm.stringWidth(yTickLabels[i]);
      }
   } // end setup()
   
   
   
   double fudge (double x) { // Translated directly from the Pascal version of xFunctions.
                             // Move x to a more "rounded" value; used for labeling axes.
      int i, digits;
      double y;
      if (Math.abs(x) < 0.0005 || Math.abs(x) > 500000)
         return x;
      else if (Math.abs(x) < 0.1 || Math.abs(x) > 5000) {
            y = x;
            digits = 0;
            if (Math.abs(y) >= 1) {
               while (Math.abs(y) >= 8.75) {
                     y = y / 10;
                     digits = digits + 1;
               }
            }
            else {
               while (Math.abs(y) < 1) {
                     y = y * 10;
                     digits = digits - 1;
               }
            }
            y = Math.round(y * 4) / 4;
            if (digits > 0) {
               for (int j = 0; j < digits; j++)
                  y = y * 10;
            }
            else if (digits < 0) {
               for (int j = 0; j < -digits; j++)
                  y = y / 10;
            }
            return y;
      }
      else if (Math.abs(x) < 0.5)
         return Math.round(10 * x) / 10.0;
      else if (Math.abs(x) < 2.5)
         return Math.round(2 * x) / 2.0;
      else if (Math.abs(x) < 12)
         return Math.round(x);
      else if (Math.abs(x) < 120) 
         return Math.round(x / 10) * 10.0;
      else if (Math.abs(x) < 1200)
         return Math.round(x / 100) * 100.0;
      else
         return Math.round(x / 1000) * 1000.0;
   }
   
   
   double fudgeStart(double a, double diff) { // Adapted from the Pascal version of xFunctions.
                                              // Tries to find a "rounded value" withint diff of a
      if (Math.abs(Math.round(a) - a) < diff)
          return Math.round(a);
      for (double x = 10; x <= 100000; x *= 10) {
          double d = Math.round(a*x) / x;
          if (Math.abs(d - a) < diff)
             return d;
      }
      return a;
   }


   public static String realToString(double x) {
      return realToString(x,8);
   }
   
   public static String realToString(double x, int width) {
         // Goal is to return a reasonable string representation
         // of x, using at most width spaces.  (If width is
         // unreasonably big or small, its value is adjusted to
         // lie in the range 7 to 25.)
      width = Math.min(25, Math.max(7,width));
      if (Double.isNaN(x))
         return "undefined";
      if (Double.isInfinite(x))
         if (x < 0)
            return "-INF";
         else
            return "INF";
      String s = String.valueOf(x);
      if (Math.rint(x) == x && Math.abs(x) < 5e15 && s.length() <= (width+2))
         return String.valueOf( (long)x );  // return string without trailing ".0"
      if (s.length() <= width)
         return s;
      boolean neg = false;
      if (x < 0) {
         neg = true;
         x = -x;
         width--;
         s = String.valueOf(x);
      }
      long maxForNonExp = 5*(long)Math.pow(10,width-2);
      if (x >= 0.0005 && x <= maxForNonExp && (s.indexOf('E') == -1 && s.indexOf('e') == -1)) {
         s = round(s,width);
         s = trimZeros(s);
      }
      else if (x > 1) { // construct exponential form with positive exponent
          long power = (long)Math.floor(Math.log(x)/Math.log(10));
          String exp = "E" + power;
          int numlength = width - exp.length();
          x = x / Math.pow(10,power);
          s = String.valueOf(x);
          s = round(s,numlength);
          s = trimZeros(s);
          s += exp;
      }
      else { // constuct exponential form with negative argument
          long power = (long)Math.ceil(-Math.log(x)/Math.log(10));
          String exp = "E-" + power;
          int numlength = width - exp.length();
          x = x * Math.pow(10,power);
          s = String.valueOf(x);
          s = round(s,numlength);
          s = trimZeros(s);
          s += exp;
      }
      if (neg)
         return "-" + s;
      else
         return s;
   }
   
   private static String trimZeros(String num) {
        // remove trailing zeros if num contains a decimal point, and
        // remove the decimal point as well if all following digits are zero
     if (num.indexOf('.') >= 0 && num.charAt(num.length() - 1) == '0') {
        int i = num.length() - 1;
        while (num.charAt(i) == '0')
           i--;
        if (num.charAt(i) == '.')
           num = num.substring(0,i);
        else
           num = num.substring(0,i+1);
     }
     return num;
   }
   
   private static String round(String num, int length) {
         // Round off num to the given field width
      if (num.indexOf('.') < 0)
         return num;
      if (num.length() <= length)
         return num;
      if (num.charAt(length) >= '5' && num.charAt(length) != '.') {
         char[] temp = new char[length+1];
         int ct = length;
         boolean rounding = true;
         for (int i = length-1; i >= 0; i--) {
            temp[ct] = num.charAt(i); 
            if (rounding && temp[ct] != '.') {
               if (temp[ct] < '9') {
                  temp[ct]++;
                  rounding = false;
               }
               else
                  temp[ct] = '0';
            }
            ct--;
         }
         if (rounding) {
            temp[ct] = '1';
            ct--;
         }
         // ct is -1 or 0
         return new String(temp,ct+1,length-ct);
      }
      else 
         return num.substring(0,length);
   }
   
   
   //--------------------------- Graph --------------------------------------
   
   private double[] yValues;
   private double[] derivatives;
   
   private int[] pixelX;
   private int[] pixelY;
   private int[] dotX;
   private int[] dotY;
   
   private void drawGraph(Graphics g) {
      if (graphNeedsRedraw) {
         makeGraphCoords();
         graphNeedsRedraw = false;
      }
      g.setColor(graphColor);
      for (int i = 1; i < pixelX.length; i++) {
         g.drawLine(pixelX[i-1], pixelY[i-1], pixelX[i], pixelY[i]);
      }
      if (showPoints) {
         for (int i = 0; i < dotX.length; i++)
            g.fillOval(dotX[i], dotY[i], 5, 5);
      }
   }
   
   private void makeGraphCoords() {
      int pointCt = (canvasWidth-2*gap-2) / 3 + 2;
      if (pixelX == null || pixelX.length != pointCt) {
         pixelX = new int[pointCt];
         for (int i = 0; i < pointCt - 1; i++)
            pixelX[i] = gap + i*3;
         pixelX[pointCt-1] = canvasWidth - gap - 1;
         pixelY = new int[pointCt];
      }
      double dx = (xmax - xmin) / (canvasWidth - 2*gap - 1);
      double dy = (ymax - ymin) / (canvasHeight - 2*gap - 1);
      for (int i = 0; i < pointCt; i++) {
         double x = xmin + dx*(pixelX[i]-gap);
         double y = eval(x);
         pixelY[i] = (int)(gap + (ymax - y)/dy);
      }
      if (dotX == null || dotX.length != points) {
         dotX = new int[points];
         dotY = new int[points];
      }
      dx = (xmax - xmin) / (points-1);
      double factorX = (canvasWidth - 2*gap - 1)/(xmax-xmin);
      double factorY = (canvasHeight - 2*gap - 1)/(ymax-ymin);
      for (int i = 0; i < points; i++) {
         double x = xmin + dx*i;
         double y = eval(x);
         dotX[i] = (int)(gap + (x-xmin)*factorX) - 2;
         dotY[i] = (int)(gap + (ymax-y)*factorY) - 2;
      }
   }
   
   private double eval(double x) {
         // NOTE:  yvalues and derivatives are stored as if x and y range from 0 to 1!!!
      double scaledx = (x-xmin)/(xmax-xmin);
      int interval = (int)((points-1)*scaledx);
      if (interval >= points-1)
         return ymin + yValues[points-1]*(ymax-ymin);
      double temp = 1.0/(points-1);
      double a = yValues[interval+1]/(temp*temp*temp);
      double b = derivatives[interval+1]/(temp*temp) - 3*a;
      double d = -yValues[interval]/(temp*temp*temp);
      double c = derivatives[interval]/(temp*temp) - 3*d;
      double t1 = scaledx - interval*temp;
      double t2 = t1*t1;
      double t3 = t2*t1;
      double s1 = scaledx - (interval+1)*temp;
      double s2 = s1*s1;
      double s3 = s2*s1;
      double scaledy = a*t3 + b*t2*s1 + c*t1*s2 + d*s3;
      return ymin + scaledy*(ymax-ymin);
   }
   
   //--------------------------- Mouse Handling -----------------------------

   private boolean dragging;
   private int dragPoint;
   private int lastY;
   private boolean propogate;
   
   synchronized public boolean mouseDown(Event evt, int x, int y) {
      dragging = false;
      if (evt.shiftDown()) {
         for (int i = 0; i < points; i++) {
            yValues[i] = 0.5;
            derivatives[i] = 0;
         }
         graphNeedsRedraw = true;
         repaint();
         return true;
      }
      if (dotX == null || graphNeedsRedraw) {  // shouldn't happen
         repaint();
         return true;
      }
      for (int i = 0; i < points; i++)
        if (x >= dotX[i] - 1  && x < dotX[i] + 7 && y >= dotY[i] - 1 && y < dotY[i] + 7) {
           dragging = true;
           dragPoint = i;
           lastY = y;
           propogate = ! evt.metaDown();
           break;
        }
      return true;
   }
   
   synchronized public boolean mouseUp(Event evt, int x, int y) {
      dragging = false;
      return true;
   }
   
   synchronized public boolean mouseDrag(Event evt, int x, int y) {
      if (!dragging || graphNeedsRedraw)
         return true;
      if (y < gap)
         y = gap;
      if (y > canvasHeight - gap)
         y = canvasHeight - gap;
      if (y - lastY == 0)
         return true;
      movePoint(dragPoint, y - lastY);
      lastY = y;
      return true;
   }
   
   private void movePoint(int pointNum, int pixelsOffset) {
      double offset = -1.0/(canvasHeight - 2*gap) * pixelsOffset;
      double oldy = yValues[pointNum];
      yValues[pointNum] += offset;
      double dx = 1.0 / (points - 1);
      if (propogate && fallOff > 0) {
         if (offset > 0) {
            int pt = pointNum + 1;
            double factor = fallOff;
            double prevy = oldy;
            while (pt < points && yValues[pt] < prevy) {
               prevy = yValues[pt];
               yValues[pt] += offset*factor;
               factor *= fallOff;
               pt++;
            }
            pt = pointNum - 1;
            factor = fallOff;
            prevy = oldy;
            while (pt >= 0 && yValues[pt] < prevy) {
               prevy = yValues[pt];
               yValues[pt] += offset*factor;
               factor *= fallOff;
               pt--;
            }
         }
         else {
            int pt = pointNum + 1;
            double factor = fallOff;
            double prevy = oldy;
            while (pt < points && yValues[pt] > prevy) {
               prevy = yValues[pt];
               yValues[pt] += offset*factor;
               factor *= fallOff;
               pt++;
            }
            pt = pointNum - 1;
            factor = fallOff;
            prevy = oldy;
            while (pt >= 0 && yValues[pt] > prevy) {
               prevy = yValues[pt];
               yValues[pt] += offset*factor;
               factor *= fallOff;
               pt--;
            }
         }
      }
      graphNeedsRedraw = true;
      makeDerivs();
      repaint();
   }

   private void makeDerivs() {
      double dx = 1.0 / (points - 1);
      derivatives[0] = (yValues[1] - yValues[0])/dx;
      for (int i = 1; i < points - 1; i++)
         derivatives[i] = (yValues[i+1] - yValues[i-1])/(2*dx);
      derivatives[points-1] = (yValues[points-1] - yValues[points-2])/dx;
   }

} // end class GummyGraph
\ No newline at end of file
diff --git a/htdocs/applets/source/SketchGraph.java b/htdocs/applets/source/SketchGraph.java
new file mode 100644
index 0000000000..87944a6163
--- /dev/null
+++ b/htdocs/applets/source/SketchGraph.java
@@ -0,0 +1 @@
+
/*
    Lets user sketch a graph by moving the mouse.
    Left-click and drag to sketch the shape of the graph.
    Shift-click to reset graph.
    Right-click (Command-click on Mac) to smoothen the graph.
    --David Eck, June 2000 (eck@hws.edu, http://math.hws.edu/eck/)
*/

import java.awt.*;
import java.applet.Applet;
import java.util.StringTokenizer;

public class SketchGraph extends Applet {

   // Parameters that can be set through appelt params and manipulated
   // with JavaScript.  (See public methods below.)

   private int points;
   private double xmin = -5, xmax = 5, ymin = -5, ymax = 5;
   private double xGrid = 1;
   private double yGrid = 1;
   private int gap = 7;
   
   private Color borderColor = Color.black;
   private int borderWidth = 2;
   private Color gridColor = Color.lightGray;
   private Color axesColor = new Color(0,0,220);
   private Color lightAxesColor = new Color(160,180,255);
   private Color graphColor = Color.magenta;
   private boolean showGrid = true;
   // Background color is set in init(); change it there.
   
   //-------------------- private implementation details ---------------------------
   
   private Image OSC = null;
   private int canvasWidth, canvasHeight;
   private boolean graphNeedsRedraw;
   private boolean axesNeedsRedraw;
   private boolean needsRedraw;
   
   //------------------- Public methods for scripting -------------------------------
   
   public int getPointCount() {
        // Return the number of draggable points on the graph
        // (which is one plus the number of sub-intervals).
      return points;
   }
   
   public double getX(int pointNumber) {
        // Get the x-value of point number pointNumber.
        // Note: x-values are always evenly spaced.
      if (pointNumber < 0 || pointNumber >= points)
         return Double.NaN;
      return xmin + pointNumber*(xmax-xmin)/(points-1);
   }
   
   public double getY(int pointNumber) {
        // Return the y-value of point number pointNumber.
        // X and y values are stored internally as values
        // between 0 and 1.  The actual x and y values
        // are determined by scaling these internal values
        // using the current xmin, xmax, ymin, ymax.
      if (pointNumber < 0 || pointNumber >= points)
         return Double.NaN;
      return ymin + yValues[pointNumber]*(ymax - ymin);
   }
   
   public double getDerivative(int pointNumber) {
        // Get the derivative at point number pointNumber.
        // This is just computed from the y-values (but not in
        // the standard way -- it uses a weighted average of
        // the slope from the point on left and the slope to 
        // the point on the right).
      if (pointNumber < 0 || pointNumber >= points)
         return Double.NaN;
      double dx = 1.0/points * (xmax - xmin);
      if (pointNumber == 0)
         return (yValues[1] - yValues[0])*(ymax-ymin)/dx;
      else if (pointNumber == points-1)
         return (yValues[points-1] - yValues[points-2])*(ymax-ymin)/dx;
      else {
         int i = pointNumber;
         double left = Math.abs(yValues[i] - yValues[i-1]);
         double right = Math.abs(yValues[i+1] - yValues[i]);
         if (left < 1e-20 || right < 1e-20)
            return 0;
         else
            return ((1/right)*(yValues[i+1]-yValues[i]) - (1/left)*(yValues[i]-yValues[i-1]))/(2*dx*((1/right)+(1/left)));
      }
   }
   
   public void reset() {
        // Puts all points back to the vertical center of the applet.
      for (int i = 0; i < points; i++) {
        yValues[i] = 0.5;
        derivatives[i] = 0;
      }
      graphNeedsRedraw = true;
      repaint();
   }
   
   public void smoothen() {
        // Make the graph smoother by replacine each y-value with a weighted
        // average of y-values of nearby points.
       double[] newPoints = new double[points];
       for (int i = 0; i < points; i++) {
          double sum = 0.3 * yValues[i];
          sum += 0.2 * (i > 0? yValues[i-1] : yValues[i]);
          sum += 0.2 * (i < points-1? yValues[i+1] : yValues[i]);
          sum += 0.1 * (i > 1? yValues[i-2] : yValues[i]);
          sum += 0.1 * (i < points - 2? yValues[i+2] : yValues[i]);
          sum += 0.05 * (i > 2? yValues[i-3] : yValues[i]);
          sum += 0.05 * (i < points - 3? yValues[i+3] : yValues[i]);
          newPoints[i] = sum;
       }
       yValues = newPoints;
       graphNeedsRedraw = true;
       repaint();
   }
   
   public void setPointCount(int ct) {
        // Set the number of points and reset y-values
        // to the vertical center of the applet.
      if (ct > 2 && ct <= 500) {
         points = ct;
         yValues = new double[points];
         derivatives = new double[points];
         for (int i = 0; i < points; i++)
            yValues[i] = 0.5;
         graphNeedsRedraw = true;
         repaint();
      }
   }
   
   public void setY(int pointNumber, double val) {
        // Change the y-value of one point.
      if (pointNumber < 0 || pointNumber >= 0 || val < ymin || val > ymax)
         return;
      yValues[pointNumber] = (val-ymin)/(ymax-ymin);
      graphNeedsRedraw = true;
      repaint();
   }
   
   public boolean setPoints(String points) {
         // The string, points, should be a list of numbers
         // separated by spaces or commas.  These are used as
         // y-values for the points on the curve, replacing the
         // current points.  Values are clamped to the range
         // from ymin to ymax.  If the contents of the string
         // are not legal, the current graph is not changed
         // and the value false is returned.  If the contents
         // of points are legal, true is returned.
      double[] vals = getDoubles(points);
      if (vals == null || vals.length < 3 || vals.length > 500)
         return false;
      setPointCount(vals.length);  // Sets graphNeedsRedraw = true and calls repaint()
      for (int i = 0; i < vals.length; i++) {
         if (vals[i] > ymax)
            yValues[i] = 1;
         else if (vals[i] < ymin)
            yValues[i] = 0;
         else
            yValues[i] = (vals[i]-ymin)/(ymax-ymin);
      }
      return true;
   }
   
   public void setLimits(double xmin, double xmax, double ymin, double ymax) {
          // Change the ranges of x and y on the applet.
      if (xmax <= xmin || ymax <= ymin)
         return;
      this.ymax = ymax;
      this.ymin = ymin;
      this.xmax = xmax;
      this.xmin = xmin;
      axesNeedsRedraw = true;
      repaint();
   }
   
   public void setGap(int g) {
         // This is space left between the axex and the border 
         // of the applet.  Default is 5.
      if (g >= 0 && g != gap) {
         gap = g;
         axesNeedsRedraw = true;
         graphNeedsRedraw = true;
         repaint();
      }
   }
   
   public void setXGrid(double spacing) {
         // Set spacing between x grid lines (in the same units
         // that are used for xmin and xmax, so changing these
         // will change the number of grid lines).  If the
         // value is zero, no x grid lines are drawn.
      if (spacing >= 0) {
         xGrid = spacing;
         needsRedraw = true;
         repaint();
      }
   }
   
   public void setYGrid(double spacing) {
        // Set spacing between y grid lines.  If the value is
        // zero, no y grid lines are drawn.
      if (spacing >= 0) {
         yGrid = spacing;
         needsRedraw = true;
         repaint();
      }
   }
   
   public void setBorderWidth(int b) {
         // How many pixels is the border drawn around the edge of the
         // applet.
      if (b >= 0) {
         borderWidth = b;
         needsRedraw = true;
         repaint();
      }
   }
   
   public void setBorderColor(String color) {
         // Color of border.
      Color c = getColor(color);
      if (c != null) {
         borderColor = c;
         needsRedraw = true;
         repaint();
      }
   }
   
   public void setGridColor(String color) {
         // Color of grid lines.
      Color c = getColor(color);
      if (c != null) {
         gridColor = c;
         needsRedraw = true;
         repaint();
      }
   }
   
   public void setAxesColor(String color) {
         // Color of axes.
      Color c = getColor(color);
      if (c != null) {
         axesColor= c;
         needsRedraw = true;
         repaint();
      }
   }
   
   public void setLightAxesColor(String color) {
         // Color used for axis when the real axis is
         // outside of the applet.
      Color c = getColor(color);
      if (c != null) {
         lightAxesColor= c;
         needsRedraw = true;
         repaint();
      }
   }
   
   public void setGraphColor(String color) {
        // Color of graph.
      Color c = getColor(color);
      if (c != null) {
         graphColor= c;
         needsRedraw = true;
         repaint();
      }
   }
   
   public void setBackgroundColor(String color) {
        // Background color for the whole applet.
      Color c = getColor(color);
      if (c != null) {
         setBackground(c);
         needsRedraw = true;
         repaint();
      }
   }
   
   public void setShowGrid(boolean show) {
         // Should the grid lines be drawn?
      if (show != showGrid) {
         showGrid = show;
         needsRedraw = true;
         repaint();
      }
   }   
   
   //----------------- Init method can set properties from applet params ---------------
   
   public void init() {
      setBackground(Color.white);
      setBackgroundColor(getParameter("backgroundColor"));
      setBorderColor(getParameter("borderColor"));
      setAxesColor(getParameter("axesColor"));
      setLightAxesColor(getParameter("lightAxesColor"));
      setGraphColor(getParameter("graphColor"));
      setGridColor(getParameter("gridColor"));
      setGap(getInt(getParameter("gap")));
      int n = getInt(getParameter("pointCount"));
      setPointCount( (n > 2 && n <= 500)? n : 101 );
      double[] dvals = getDoubles(getParameter("limits"));
      if (dvals != null && dvals.length == 4)
         setLimits(dvals[0], dvals[1], dvals[2], dvals[3]);
      setXGrid(getDouble(getParameter("xGrid")));
      setYGrid(getDouble(getParameter("yGrid")));
      setBorderWidth(getInt(getParameter("borderWidth")));
      if ("no".equalsIgnoreCase(getParameter("showGrid")))
         showGrid = false;
      setPoints(getParameter("points"));  // overrides point count
   }
   
   //----------------------- For getting values from strings -------------------------
   
   private int getInt(String str) {
      if (str == null || str.trim().length() == 0)
         return Integer.MIN_VALUE;
      try {
         return Integer.parseInt(str);
      }
      catch (NumberFormatException e) {
         return Integer.MIN_VALUE;
      }
   }
   
   private int[] getInts(String str) {
      if (str == null)
         return null;
      StringTokenizer tk = new StringTokenizer(str," ,\t");
      int ct = tk.countTokens();
      if (ct == 0)
         return null;
      int[] vals = new int[ct];
      for (int i = 0; i < ct; i++) {
         String s = tk.nextToken();
         vals[i] = getInt(s);
         if (vals[i] == Integer.MIN_VALUE)
            return null;
      }
      return null;
   }
   
   private double getDouble(String str) {
      if (str == null || str.trim().length() == 0)
         return Double.NaN;
      try {
         return (new Double(str)).doubleValue();
      }
      catch (NumberFormatException e) {
         return Double.NaN;
      }
   }
   
   private double[] getDoubles(String str) {
      if (str == null)
         return null;
      StringTokenizer tk = new StringTokenizer(str," ,\t");
      int ct = tk.countTokens();
      if (ct == 0)
         return null;
      double[] vals = new double[ct];
      for (int i = 0; i < ct; i++) {
         String s = tk.nextToken();
         vals[i] = getDouble(s);
         if (Double.isNaN(vals[i]) || Double.isInfinite(vals[i]))
            return null;
      }
      return vals;
   }
   
   private static String[] colorNames = {
         "black", "white", "red", "green", "blue",
         "yellow", "cyan", "magenta", "pink", "orange",
         "lightGray", "gray", "darkGray"
      };

   private static Color[] colorList = {
         Color.black, Color.white, Color.red, Color.green, Color.blue,
         Color.yellow, Color.cyan, Color.magenta, Color.pink, Color.orange,
         Color.lightGray, Color.gray, Color.darkGray
      };
   
   private Color getColor(String str) {
      if (str == null)
         return null;
      str = str.trim();
      if (str.length() == 0)
         return null;
      if (Character.isDigit(str.charAt(1))) {
         int[] levels = getInts(str);
         if (levels == null || levels.length != 3)
            return null;
         if (levels[0] < 0 || levels[0] > 255 || levels[1] < 0 || levels[1] > 255 || levels[2] < 0 || levels[2] > 255)
            return null;
         return new Color(levels[0],levels[1],levels[2]);
      }
      else {
         for (int i = 0; i < colorNames.length; i++)
            if (colorNames[i].equalsIgnoreCase(str))
               return colorList[i];
         return null;
      }
   }
   
   public void update(Graphics g) {
      paint(g);
   }
   
   //--------------------------------------------------------------------------
   
   synchronized public void paint(Graphics g) {
      int width = size().width;
      int height = size().height;
      if (OSC == null || width != canvasWidth || height != canvasHeight) {
         axesNeedsRedraw = true;
         graphNeedsRedraw = true;
         canvasWidth = width;
         canvasHeight = height;
         OSC = null;
         try {
            OSC = createImage(width,height);
         }
         catch (OutOfMemoryError e) {
         }
      }
      if (OSC == null) {
         draw(g);
      }
      else {
         if (axesNeedsRedraw || graphNeedsRedraw || needsRedraw) {
            Graphics OSG = OSC.getGraphics();
            draw(OSG);
            OSG.dispose();
            needsRedraw = false;
         }
         g.drawImage(OSC,0,0,this);
      }
   }
   
   private void draw(Graphics g) {
      g.setColor(getBackground());
      g.fillRect(0,0,canvasWidth,canvasHeight);
      drawGrid(g);
      g.setColor(borderColor);
      for (int i = 0; i < borderWidth; i++)
         g.drawRect(i, i, canvasWidth - 2*i - 1, canvasHeight - 2*i - 1);
      drawAxes(g);
      drawGraph(g);
   }
   
   private void drawGrid(Graphics g) {
      if (!showGrid)
         return;
      g.setColor(gridColor);
      if (xGrid > 0) {
         double x = (int)(xmin/xGrid)*xGrid;
         while (x <= xmax) {
            int a = (int)(gap + (x-xmin)*(canvasWidth-2*gap)/(xmax - xmin));
            g.drawLine(a,0,a,canvasHeight);
            x += xGrid;
         }
      }
      if (yGrid > 0) {
         double y = (int)(ymin/yGrid)*yGrid;
         while (y <= ymax) {
            int b = (int)(gap + (ymax-y)*(canvasHeight-2*gap)/(ymax - ymin));
            g.drawLine(0,b,canvasWidth,b);
            y += yGrid;
         }
      }
   }
   
   //--------------------------- Axes ---------------------------------------
   
   private int[] xTicks;
   private int[] yTicks;
   private String[] xTickLabels;
   private String[] yTickLabels;
   private int[][] xTickLabelPos;
   private int[][] yTickLabelPos;
   private int xAxisPixelPosition, yAxisPixelPosition;
   private Font font;
   private int ascent, descent, digitWidth;
   
   private void drawAxes(Graphics g) {
      if (axesNeedsRedraw) {
         font = g.getFont();
         FontMetrics fm = g.getFontMetrics(font);
         setup(fm, xmin, xmax, ymin, ymax, 0, 0, canvasWidth, canvasHeight, gap);
         axesNeedsRedraw = false;
      }
      if (ymax < 0 || ymin > 0)
         g.setColor(lightAxesColor);
      else 
         g.setColor(axesColor);
      g.drawLine(gap, xAxisPixelPosition, canvasWidth - gap - 1, xAxisPixelPosition);
      for (int i = 0; i < xTicks.length; i++) {
         int a = (xAxisPixelPosition - 2 < 0) ? xAxisPixelPosition : xAxisPixelPosition - 2;
         int b = (xAxisPixelPosition + 2 >= canvasHeight)? xAxisPixelPosition : xAxisPixelPosition + 2; 
         g.drawLine(xTicks[i], a, xTicks[i], b);
      }
      for (int i = 0; i < xTickLabels.length; i++)
         g.drawString(xTickLabels[i], xTickLabelPos[i][0], xTickLabelPos[i][1]);
      if (xmax < 0 || xmin > 0)
         g.setColor(lightAxesColor);
      else 
         g.setColor(axesColor);
      g.drawLine(yAxisPixelPosition, gap, yAxisPixelPosition, canvasHeight - gap - 1);
      for (int i = 0; i < yTicks.length; i++) {
         int a = (yAxisPixelPosition - 2 < 0) ? yAxisPixelPosition : yAxisPixelPosition - 2;
         int b = (yAxisPixelPosition + 2 >= canvasWidth)? yAxisPixelPosition : yAxisPixelPosition + 2; 
         g.drawLine(a, yTicks[i], b, yTicks[i]);
      }
      for (int i = 0; i < yTickLabels.length; i++)
         g.drawString(yTickLabels[i], yTickLabelPos[i][0], yTickLabelPos[i][1]);
   }
   
   void setup(FontMetrics fm, double xmin, double xmax, double ymin, double ymax,
                              int left, int top, int width, int height, int gap) {
      digitWidth = fm.charWidth('0');
      ascent = fm.getAscent();
      descent = fm.getDescent();
      if (ymax < 0)
         xAxisPixelPosition = top + gap;
      else if (ymin > 0)
         xAxisPixelPosition = top + height - gap - 1;
      else
         xAxisPixelPosition = top + gap + (int)((height-2*gap - 1) * ymax / (ymax-ymin));
      if (xmax < 0)
         yAxisPixelPosition = left + width - gap - 1;
      else if (xmin > 0)
         yAxisPixelPosition = left + gap;
      else
         yAxisPixelPosition = left + gap - (int)((width-2*gap - 1) * xmin / (xmax-xmin));
      double start = fudgeStart( ((xmax-xmin)*(yAxisPixelPosition - (left + gap)))/(width - 2*gap)  + xmin, 
                                                  0.05*(xmax-xmin) );
      int labelCt = (width - 2*gap) / (8*digitWidth);
      if (labelCt <= 2)
         labelCt = 3;
      else if (labelCt > 20)
         labelCt = 20;
      double interval = fudge( (xmax - xmin) / labelCt );
      for (double mul = 1.5; mul < 4; mul += 0.5) {
         if (fm.stringWidth(realToString(interval+start)) + digitWidth > (interval/(xmax-xmin))*(width-2*gap))  // overlapping labels
             interval = fudge( mul*(xmax - xmin) / labelCt );
         else
            break;
      }
      double[] label = new double[50];
      labelCt = 0;
      double x = start + interval;
      double limit = left + width;
      while (labelCt < 50 && x < xmax) {
         if (left + gap + (width-2*gap)*(x-xmin)/(xmax-xmin) + fm.stringWidth(realToString(x))/2 > limit)
            break;
         label[labelCt] = x;
         labelCt++;
         x += interval;
      }
      x = start - interval;
      limit = left;
      while (labelCt < 50 && x >= xmin) {
         if (left + gap + (width-2*gap)*(x-xmin)/(xmax-xmin) - fm.stringWidth(realToString(x))/2 < limit)
            break;
         label[labelCt] = x;
         labelCt++;
         x -= interval;
      }
      xTicks = new int[labelCt];
      xTickLabels = new String[labelCt];
      xTickLabelPos = new int[labelCt][2];
      for (int i = 0; i < labelCt; i++) {
         xTicks[i] = (int)(left + gap + (width-2*gap)*(label[i]-xmin)/(xmax-xmin));
         xTickLabels[i] = realToString(label[i]);
         xTickLabelPos[i][0] = xTicks[i] - fm.stringWidth(xTickLabels[i])/2;
         if (xAxisPixelPosition - 4 - ascent >= top)
            xTickLabelPos[i][1] = xAxisPixelPosition - 4;
         else
            xTickLabelPos[i][1] = xAxisPixelPosition + 4 + ascent;
      }
      
      start = fudgeStart( ymax - ((ymax-ymin)*(xAxisPixelPosition - (top + gap)))/(height - 2*gap), 
                                                  0.05*(ymax-ymin) );
      labelCt = (height - 2*gap) / (4*(ascent+descent));
      if (labelCt <= 2)
         labelCt = 3;
      else if (labelCt > 20)
         labelCt = 20;
      interval = fudge( (ymax - ymin) / labelCt );
      labelCt = 0;
      double y = start + interval;
      limit = top + 8 + gap;
      while (labelCt < 50 && y <= ymax) {
         if (top + gap + (height-2*gap)*(ymax-y)/(ymax-ymin) - ascent/2 < limit)
            break;
         label[labelCt] = y;
         labelCt++;
         y += interval;
      }
      y = start - interval;
      limit = top + height - gap - 8;
      while (labelCt < 50 && y >= ymin) {
         if (top + gap + (height-2*gap)*(ymax-y)/(ymax-ymin) + ascent/2 > limit)
            break;
         label[labelCt] = y;
         labelCt++;
         y -= interval;
      }
      yTicks = new int[labelCt];
      yTickLabels = new String[labelCt];
      yTickLabelPos = new int[labelCt][2];
      int w = 0;  // max width of tick mark
      for (int i = 0; i < labelCt; i++) {
          yTickLabels[i] = realToString(label[i]);
          int s = fm.stringWidth(yTickLabels[i]);
          if (s > w)
             w = s;  
      }
      for (int i = 0; i < labelCt; i++) {
         yTicks[i] = (int)(top + gap + (height-2*gap)*(ymax-label[i])/(ymax-ymin));
         yTickLabelPos[i][1] = yTicks[i] + ascent/2;
         if (yAxisPixelPosition - 4 - w < left)
            yTickLabelPos[i][0] = yAxisPixelPosition + 4;
         else
            yTickLabelPos[i][0] = yAxisPixelPosition - 4 - fm.stringWidth(yTickLabels[i]);
      }
   } // end setup()
   
   
   
   double fudge (double x) { // Translated directly from the Pascal version of xFunctions.
                             // Move x to a more "rounded" value; used for labeling axes.
      int i, digits;
      double y;
      if (Math.abs(x) < 0.0005 || Math.abs(x) > 500000)
         return x;
      else if (Math.abs(x) < 0.1 || Math.abs(x) > 5000) {
            y = x;
            digits = 0;
            if (Math.abs(y) >= 1) {
               while (Math.abs(y) >= 8.75) {
                     y = y / 10;
                     digits = digits + 1;
               }
            }
            else {
               while (Math.abs(y) < 1) {
                     y = y * 10;
                     digits = digits - 1;
               }
            }
            y = Math.round(y * 4) / 4;
            if (digits > 0) {
               for (int j = 0; j < digits; j++)
                  y = y * 10;
            }
            else if (digits < 0) {
               for (int j = 0; j < -digits; j++)
                  y = y / 10;
            }
            return y;
      }
      else if (Math.abs(x) < 0.5)
         return Math.round(10 * x) / 10.0;
      else if (Math.abs(x) < 2.5)
         return Math.round(2 * x) / 2.0;
      else if (Math.abs(x) < 12)
         return Math.round(x);
      else if (Math.abs(x) < 120) 
         return Math.round(x / 10) * 10.0;
      else if (Math.abs(x) < 1200)
         return Math.round(x / 100) * 100.0;
      else
         return Math.round(x / 1000) * 1000.0;
   }
   
   
   double fudgeStart(double a, double diff) { // Adapted from the Pascal version of xFunctions.
                                              // Tries to find a "rounded value" withint diff of a
      if (Math.abs(Math.round(a) - a) < diff)
          return Math.round(a);
      for (double x = 10; x <= 100000; x *= 10) {
          double d = Math.round(a*x) / x;
          if (Math.abs(d - a) < diff)
             return d;
      }
      return a;
   }


   public static String realToString(double x) {
      return realToString(x,8);
   }
   
   public static String realToString(double x, int width) {
         // Goal is to return a reasonable string representation
         // of x, using at most width spaces.  (If width is
         // unreasonably big or small, its value is adjusted to
         // lie in the range 7 to 25.)
      width = Math.min(25, Math.max(7,width));
      if (Double.isNaN(x))
         return "undefined";
      if (Double.isInfinite(x))
         if (x < 0)
            return "-INF";
         else
            return "INF";
      String s = String.valueOf(x);
      if (Math.rint(x) == x && Math.abs(x) < 5e15 && s.length() <= (width+2))
         return String.valueOf( (long)x );  // return string without trailing ".0"
      if (s.length() <= width)
         return s;
      boolean neg = false;
      if (x < 0) {
         neg = true;
         x = -x;
         width--;
         s = String.valueOf(x);
      }
      long maxForNonExp = 5*(long)Math.pow(10,width-2);
      if (x >= 0.0005 && x <= maxForNonExp && (s.indexOf('E') == -1 && s.indexOf('e') == -1)) {
         s = round(s,width);
         s = trimZeros(s);
      }
      else if (x > 1) { // construct exponential form with positive exponent
          long power = (long)Math.floor(Math.log(x)/Math.log(10));
          String exp = "E" + power;
          int numlength = width - exp.length();
          x = x / Math.pow(10,power);
          s = String.valueOf(x);
          s = round(s,numlength);
          s = trimZeros(s);
          s += exp;
      }
      else { // constuct exponential form with negative argument
          long power = (long)Math.ceil(-Math.log(x)/Math.log(10));
          String exp = "E-" + power;
          int numlength = width - exp.length();
          x = x * Math.pow(10,power);
          s = String.valueOf(x);
          s = round(s,numlength);
          s = trimZeros(s);
          s += exp;
      }
      if (neg)
         return "-" + s;
      else
         return s;
   }
   
   private static String trimZeros(String num) {
        // remove trailing zeros if num contains a decimal point, and
        // remove the decimal point as well if all following digits are zero
     if (num.indexOf('.') >= 0 && num.charAt(num.length() - 1) == '0') {
        int i = num.length() - 1;
        while (num.charAt(i) == '0')
           i--;
        if (num.charAt(i) == '.')
           num = num.substring(0,i);
        else
           num = num.substring(0,i+1);
     }
     return num;
   }
   
   private static String round(String num, int length) {
         // Round off num to the given field width
      if (num.indexOf('.') < 0)
         return num;
      if (num.length() <= length)
         return num;
      if (num.charAt(length) >= '5' && num.charAt(length) != '.') {
         char[] temp = new char[length+1];
         int ct = length;
         boolean rounding = true;
         for (int i = length-1; i >= 0; i--) {
            temp[ct] = num.charAt(i); 
            if (rounding && temp[ct] != '.') {
               if (temp[ct] < '9') {
                  temp[ct]++;
                  rounding = false;
               }
               else
                  temp[ct] = '0';
            }
            ct--;
         }
         if (rounding) {
            temp[ct] = '1';
            ct--;
         }
         // ct is -1 or 0
         return new String(temp,ct+1,length-ct);
      }
      else 
         return num.substring(0,length);
   }
   
   
   //--------------------------- Graph --------------------------------------
   
   private double[] yValues;
   private double[] derivatives;
   
   private int[] pixelX;
   private int[] pixelY;
   
   private void drawGraph(Graphics g) {
      if (graphNeedsRedraw) {
         makeGraphCoords();
         makeDerivs();
         graphNeedsRedraw = false;
      }
      g.setColor(graphColor);
      for (int i = 1; i < pixelX.length; i++) {
         g.drawLine(pixelX[i-1], pixelY[i-1], pixelX[i], pixelY[i]);
      }
   }
   
   private void makeGraphCoords() {
      int pointCt = (canvasWidth-2*gap-2) / 3 + 2;
      if (pixelX == null || pixelX.length != pointCt) {
         pixelX = new int[pointCt];
         for (int i = 0; i < pointCt - 1; i++)
            pixelX[i] = gap + i*3;
         pixelX[pointCt-1] = canvasWidth - gap - 1;
         pixelY = new int[pointCt];
      }
      double dx = (xmax - xmin) / (canvasWidth - 2*gap - 1);
      double dy = (ymax - ymin) / (canvasHeight - 2*gap - 1);
      for (int i = 0; i < pointCt; i++) {
         double x = xmin + dx*(pixelX[i]-gap);
         double y = eval(x);
         pixelY[i] = (int)(gap + (ymax - y)/dy);
      }
   }
   
   private double eval(double x) {
         // NOTE:  yvalues and derivatives are stored as if x and y range from 0 to 1!!!
      double scaledx = (x-xmin)/(xmax-xmin);
      int interval = (int)((points-1)*scaledx);
      if (interval >= points-1)
         return ymin + yValues[points-1]*(ymax-ymin);
      double temp = 1.0/(points-1);
      double a = yValues[interval+1]/(temp*temp*temp);
      double b = derivatives[interval+1]/(temp*temp) - 3*a;
      double d = -yValues[interval]/(temp*temp*temp);
      double c = derivatives[interval]/(temp*temp) - 3*d;
      double t1 = scaledx - interval*temp;
      double t2 = t1*t1;
      double t3 = t2*t1;
      double s1 = scaledx - (interval+1)*temp;
      double s2 = s1*s1;
      double s3 = s2*s1;
      double scaledy = a*t3 + b*t2*s1 + c*t1*s2 + d*s3;
      return ymin + scaledy*(ymax-ymin);
   }
   
   //--------------------------- Mouse Handling -----------------------------

   private boolean dragging;
   private int lastPointNum;
   private double lastY;
   
   synchronized public boolean mouseDown(Event evt, int x, int y) {
      dragging = false;
      if (evt.shiftDown()) {
         for (int i = 0; i < points; i++) {
            yValues[i] = 0.5;
            derivatives[i] = 0;
         }
         graphNeedsRedraw = true;
         repaint();
         return true;
      }
      if (evt.metaDown()) {
         smoothen();
         return true;
      }
      if (graphNeedsRedraw) {
         repaint();
         return true;
      }
      dragging = true;
      lastY = Double.NaN;
      jumpPoint(x, y);
      return true;
   }
   
   synchronized public boolean mouseUp(Event evt, int x, int y) {
      if (dragging) {
         jumpPoint(x,y);
         dragging = false;
      }
      return true;
   }
   
   synchronized public boolean mouseDrag(Event evt, int x, int y) {
      if (dragging && ! graphNeedsRedraw)
         jumpPoint(x,y);
      return true;
   }
   
   private void jumpPoint(int x, int y) {
      y = Math.max(gap, Math.min(canvasHeight-gap-1, y));
      int pointNum = (int)(Math.round( ((double)(x-gap)/(canvasWidth-2*gap-1))*(points-1) ));
      double newYVal = 1.0 - ((double)(y-gap))/(canvasHeight-2*gap-1);  // Scaled!
      if (pointNum >= 0 && pointNum < points) 
          yValues[pointNum] = newYVal;
      if (Double.isNaN(lastY) || Math.abs(pointNum - lastPointNum) <= 1) {
      }
      else if (pointNum > lastPointNum) {
         double dy = (newYVal - lastY)/(pointNum - lastPointNum);
         for (int i = lastPointNum + 1; i < pointNum && i < points; i++) {
            if (i >= 0)
               yValues[i] = lastY + (i-lastPointNum)*dy;
         }
      }
      else {
         double dy = (newYVal - lastY)/(pointNum - lastPointNum);
         for (int i = lastPointNum - 1; i > pointNum && i >= 0; i--) {
            if (i < points)
               yValues[i] = lastY + (i-lastPointNum)*dy;
         }
      }
      lastPointNum = pointNum;
      lastY = newYVal;
      graphNeedsRedraw = true;
      repaint();
   }

   private void makeDerivs() {
      double dx = 1.0 / (points - 1);
      derivatives[0] = (yValues[1] - yValues[0])/dx;
      for (int i = 1; i < points - 1; i++) {
         double left = Math.abs(yValues[i] - yValues[i-1]);
         double right = Math.abs(yValues[i+1] - yValues[i]);
         if (left < 1e-20 || right < 1e-20)
            derivatives[i] = 0;
         else
            derivatives[i] = ((1/right)*(yValues[i+1]-yValues[i]) - (1/left)*(yValues[i]-yValues[i-1]))/(2*dx*((1/right)+(1/left)));
      }
      derivatives[points-1] = (yValues[points-1] - yValues[points-2])/dx;
   } 

  /* I changed to the derivatives to the preceding because the following more usual
     version gives funny "overshoot" when when there is a big jump in the curve
     between successive points.

   private void makeDerivs() {
      double dx = 1.0 / (points - 1);
      derivatives[0] = (yValues[1] - yValues[0])/dx;
      for (int i = 1; i < points - 1; i++)
         derivatives[i] = (yValues[i+1] - yValues[i-1])/(2*dx);
      derivatives[points-1] = (yValues[points-1] - yValues[points-2])/dx;
   } 
   
   */

} // end class GummyGraph
\ No newline at end of file
diff --git a/htdocs/applets/xFunctions/example_file.txt b/htdocs/applets/xFunctions/example_file.txt
new file mode 100755
index 0000000000..f24874375e
--- /dev/null
+++ b/htdocs/applets/xFunctions/example_file.txt
@@ -0,0 +1,23 @@
+
+function; -5,5,-5,5; table; Tbl; 3; -5,-2; -3,1; -1,3; 0,0; 2,1; 4,2; 5,1
+function; -5,5,-5,5; graph; B; -5,1,-1, -3,-0.5,1; -3,-0.5,-1, 0,2,0; 0,-2,4, 2.5,1,-1; 2.5,1,-1, 5,0,1
+function; 0,5,-1,4; expression; Split;
++  x^2; x < 1; 2*x - 1; x >= 1 and x < 2; 5 - x; x >= 2 and x < 3; (x-3)^2 + 1
+
+multigraph; tan(x) = sin(x) / cos(x); -5,5,-5,5; tan(x); sin(x); cos(x)
+animation; Tweening Animation; -8,8,-2,2,0,1,50; sin(x)*k + (1/(x^2+1))*(1-k); false
+param; Squiggly Curve; -6,6,-6,6,0,6.3,300; 2*cos(5*t) + 3*cos(9*t); 2*sin(10*t) - 4*sin(2*t)
+derivatives; Bezier Curve Derivative; -5,5,-5,5; b(x)
+reimann; Close to e; 1,2.718,0,1.5,10; 1/x; 3
+graph3d; Singularity; -2,2,-2,2,-2,2,20; 1/(x^2 + y^2); 2
+g; 3D Graph with Table Function; -5,5, -5,5, -5,10, 32; Tbl(x)*Tbl(y); 4
+
+integral curves; Attracting/Repelling; -1.5,1.5,-1.5,1.5,0,1,0.01; x^2 + y^2 - 1; (x-y) * (x+y); 3; true;
++   -1.2,-1.2; -0.8,,-1.2; -0.4,,-1.2;  0,,-1.2;  .4,,-1.2;  .8,,-1.2;  1.2,-1.2,;
++   -1.2,-0.8; -0.8,-0.8; -0.4,-0.8;  0,-0.8;  .4,-0.8;  .8,-0.8;  1.2,-0.8;
++   -1.2,-0.4; -0.8,-0.4; -0.4,-0.4;  0,-0.4;  .4,-0.4;  .8,-0.4;  1.2,-0.4;
++   -1.2,0; -0.8,0; -0.4,0;  0,0;  .4,0;  .8,0;  1.2,0;
++   -1.2,.4; -0.8,.4; -0.4,.4;  0,.4;  .4,.4;  .8,.4;  1.2,.4;
++   -1.2,.8; -0.8,.8; -0.4,.8;  0,.8;  .4,.8;  .8,.8;  1.2,.8;
++   -1.2,1.2; -0.8,1.2; -0.4,1.2;  0,1.2;  .4,1.2;  .8,1.2;  1.2,1.2
+
diff --git a/htdocs/applets/xFunctions/index.html b/htdocs/applets/xFunctions/index.html
new file mode 100644
index 0000000000..de1facc7cd
--- /dev/null
+++ b/htdocs/applets/xFunctions/index.html
@@ -0,0 +1,17 @@
+<applet     
+ codebase = "https://hosted2.webwork.rochester.edu/webwork2_files/applets/xFunctions/"
+  
+archive="xFunctions.zip" 
+  code="xFunctionsLauncher.class"  width=200 height=30
+>
+<param> name="file" value="example_file.txt"</param>
+</applet>
+
+<!-- code bases that don't work
+
+ codebase = "https://hosted2.webwork.rochester.edu/webwork2_files/applets/xFunctions/"
+incompatible magic value in class file xFunctionsLauncher
+
+
+
+-->
diff --git a/htdocs/applets/xFunctions/using_examples.html b/htdocs/applets/xFunctions/using_examples.html
new file mode 100755
index 0000000000..f7757c7a4f
--- /dev/null
+++ b/htdocs/applets/xFunctions/using_examples.html
@@ -0,0 +1,446 @@
+<HTML>
+<HEAD>
+<TITLE>xFunctions Educational Mathematics Applet -- Using Examples</TITLE>
+</HEAD>
+<BODY bgcolor="#FFFFCC">
+
+<br><br>
+<H1 align=center><font color="#990000">xFunctions: Using Examples</font></H1>
+<br>
+
+<blockquote>
+
+<p><font size="+1" color="#990000">xFunctions</font> is an educational applet
+for exploring several aspects of calculus and precalculus mathematics.
+Its use is fully described on the <a href="index.html">main xFunctions Web page</a>.
+This page, on the other hand, explains how extra functions and examples can be added to xFunctions.
+The examples can be specified as applet parameters in the HTML source code of
+a Web page.  If xFunctions is run as a standalone applications, it can read
+examples from a file that is specified as a command line parameter.
+Unfortunately, if you want to create such examples, you have to
+encode them by hand.  This page explains how to do the encoding.</p>
+
+<p>There are two versions of the applet, one that appears right on the Web
+page and one that can be launched in a separate window.  Examples are used
+in the same way with either version of the applet.  You can see them in the
+"Launcher" version of the applet on the <a href="index.html">main page</a>.
+The xFunctionsLauncher applet on that page is
+specified with the following rather long applet tag, which encodes three example
+functions and eight examples for the various xFunctions utilities:</p>
+
+<pre>
+   &lt;applet  archive=&quot;xFunctions.zip&quot;  code=&quot;xFunctionsLauncher.class&quot;  width=200 height=30&gt;
+      &lt;param  name=&quot;1&quot;   value=&quot;function; -5,5,-5,5; table; Tbl; 3; -5,-2; -3,1; -1,3; 0,0; 2,1; 4,2; 5,1&quot;&gt;
+      &lt;param  name=&quot;2&quot;   value=&quot;function; -5,5,-5,5; graph; B; -5,1,-1, -3,-0.5,1; -3,-0.5,-1, 0,2,0; 0,-2,4, 2.5,1,-1; 2.5,1,-1, 5,0,1&quot;&gt;
+      &lt;param  name=&quot;3&quot;   value=&quot;function; 0,5,-1,4; expression; Split;&quot;&gt;
+      &lt;param  name=&quot;4&quot;   value=&quot;+  x^2; x &lt; 1; 2*x - 1; x &gt;= 1 and x &lt; 2; 5 - x; x &gt;= 2 and x &lt; 3; (x-3)^2 + 1&quot;&gt;
+      &lt;param  name=&quot;5&quot;   value=&quot;multigraph; tan(x) = sin(x) / cos(x); -5,5,-5,5; tan(x); sin(x); cos(x)&quot;&gt;
+      &lt;param  name=&quot;6&quot;   value=&quot;animation; Tweening Animation; -8,8,-2,2,0,1,50; sin(x)*k + (1/(x^2+1))*(1-k); false&quot;&gt;
+      &lt;param  name=&quot;7&quot;   value=&quot;param; Squiggly Curve; -6,6,-6,6,0,6.3,300; 2*cos(5*t) + 3*cos(9*t); 2*sin(10*t) - 4*sin(2*t)&quot;&gt;
+      &lt;param  name=&quot;8&quot;   value=&quot;derivatives; Bezier Curve Derivative; -5,5,-5,5; b(x)&quot;&gt;
+      &lt;param  name=&quot;9&quot;   value=&quot;reimann; Close to e; 1,2.718,0,1.5,10; 1/x; 3&quot;&gt;
+      &lt;param  name=&quot;10&quot;  value=&quot;graph3d; Singularity; -2,2,-2,2,-2,2,20; 1/(x^2 + y^2); 2&quot;&gt;
+      &lt;param  name=&quot;11&quot;  value=&quot;g; 3D Graph with Table Function; -5,5, -5,5, -5,10, 32; Tbl(x)*Tbl(y); 4&quot;&gt;
+      &lt;param  name=&quot;12&quot;  value=&quot;integral curves; Attracting/Repelling; -1.5,1.5,-1.5,1.5,0,1,0.01; x^2 + y^2 - 1; (x-y) * (x+y); 3; true;&quot;&gt;
+      &lt;param  name=&quot;13&quot;  value=&quot;+   -1.2,-1.2; -0.8,,-1.2; -0.4,,-1.2;  0,,-1.2;  .4,,-1.2;  .8,,-1.2;  1.2,-1.2,;&quot;&gt;
+      &lt;param  name=&quot;14&quot;  value=&quot;+   -1.2,-0.8; -0.8,-0.8; -0.4,-0.8;  0,-0.8;  .4,-0.8;  .8,-0.8;  1.2,-0.8;&quot;&gt;
+      &lt;param  name=&quot;15&quot;  value=&quot;+   -1.2,-0.4; -0.8,-0.4; -0.4,-0.4;  0,-0.4;  .4,-0.4;  .8,-0.4;  1.2,-0.4;&quot;&gt;
+      &lt;param  name=&quot;16&quot;  value=&quot;+   -1.2,0; -0.8,0; -0.4,0;  0,0;  .4,0;  .8,0;  1.2,0;&quot;&gt;
+      &lt;param  name=&quot;17&quot;  value=&quot;+   -1.2,.4; -0.8,.4; -0.4,.4;  0,.4;  .4,.4;  .8,.4;  1.2,.4;&quot;&gt;
+      &lt;param  name=&quot;18&quot;  value=&quot;+   -1.2,.8; -0.8,.8; -0.4,.8;  0,.8;  .4,.8;  .8,.8;  1.2,.8;&quot;&gt;
+      &lt;param  name=&quot;19&quot;  value=&quot;+   -1.2,1.2; -0.8,1.2; -0.4,1.2;  0,1.2;  .4,1.2;  .8,1.2;  1.2,1.2&quot;&gt;
+   &lt;/applet&gt;
+
+</pre>
+
+<hr>
+
+<br><h2><font color="#990000">Applet Params and Files</font></h2>
+
+<p>An applet parameter is specified by a &lt;param&gt; tag between the opening &lt;applet&gt;
+tag and the closing &lt;/applet&gt;.  The applet can read these parameters when it runs.
+A &lt;param&gt; tag has the form
+
+<pre>              &lt;param  name="<font color=blue>some name</font>"  value="<font color=blue>some value</font>"&gt;
+</pre>
+
+<p>For the xFuctions applet, the names must be the consecutive numbers 1, 2, 3, 4, ...
+You can have as many as you want, but you can't skip any.  The applet will stop reading
+as soon as it encounters a missing number.  (By the way, the applet requests params by
+name, and it doesn't matter to the applet what order the params appear in the
+&lt;applet&gt; tag.  That's why you need the names.)</p>
+
+<p>When xFunctions processes these parameters, it will simply process all the param values
+in order, as if they were lines in a file.  In fact, if you run xFunctions as a standalone
+application, you can put the exact same lines in a file and tell xFunctions to read them
+when it starts up.  (You do this by providing the file name as a command line argument
+when you run xFunctions. If you download xFunctions, using one of the downloading links
+on the <a href="index.html">main xFunctions page</a>, you'll find a 
+<a href="README.txt">README</a> file that explains more about running xFunctions as
+an application.  You also find a <a href="example_file.txt">file of examples</a>
+which contains the same examples given in the applet tag above.)</p>
+
+<p>Now, when xFunctions reads the examples, either from applet params or from a file,
+<b>any line beginning with a plus sign (+) is appended to the preceding line</b>.  (The plus
+sign is discarded.)  This allows you to spread long example definitions over several
+lines.  After lines have been joined in this way, each line defines one example.</p>
+
+<p>So, all you need to know is how to compose a line to specify each of the possible types of example.
+It's not all that complicated, but the computer is picky about the syntax, and it's easy to
+make mistakes.  If an example contains an error, xFunctions will ignore the example.  (It won't crash.)
+To help you find the problem, xFunctions writes messages to standard output as it processes
+the example descriptions.  If it finds an error, it prints an error message.  If you run
+xFunctions in a Web browser, you will have to figure out where it actually prints these
+messages.  Netscape, for example, prints them to a "Java Console."  You can open this
+console with an entry under the "Communicator" menu (possibly inside a "Tools" submenu
+in this menu, depending on what version of the program you are using).</p>
+
+<p>(Note: As an alternative to -- or in addition to -- using applet params to specify
+examples in an applet, you can put the examples in a file and tell the applet to read
+that file.  The file should be on the Web server in the same directory with the
+source file of the Web page.  Then you just have to
+give the applet the name of the file as an applet parameter.  The name is specified
+in a &lt;param&gt; tag whose name is "file" and whose value is the name of the file.
+For example: <tt>&lt;param&nbsp;name="file"&nbsp;value="example_file.txt"&gt;</tt>.)</p>
+
+<p>Every example specification consists of a series of items separated by
+semicolons (;).  The first item tells what kind of example it is.  This can 
+be the word "function" to specify that you are defining a new function, or it can be
+the name of a utility (Multigraph, Animate,...) to specify that you are giving an
+example for one of the utilities.  Actually, <b>xFunctions only looks at the first
+character</b>, so you can say "f" or "func" or "fried green tomatoes" instead of
+"function".  Also, you can use either upper or lower case.  The rest of the items
+in the example depend on which type of example it is.  I'll give lists of the
+items required for all the different types of examples.</p>
+
+<br><hR>
+
+<br><h2><font color="#990000">Defining New Functions in Examples</font></h2>
+
+<p>It is possible to define new functions as examples.  These will be added to the list of
+functions that appears on xFunction's main screen.  Once they are in that list, they can
+be used in the Utilities and in the definitions of other functions -- you can even use them
+in later examples.  There are three ways to define functions:  as one or more expressions,
+as a graph, or as a table of xy-points.  I'll describe each of these possibilities
+separately, but all three types of function specification begin with the same
+four items (separated by semicolons):  the word "function" (or any string beginning with
+an "f"), the xy-limits for the function, the type of function, and the name of the function.</p>
+
+<p>The <b>xy-limits</b> consist of four numbers, separated by commas.  These are the xmin, xmax,
+ymin, and ymax values that will be used in the corresponding input boxes when the function
+is graphed on the Main Screen.  Note that they are not the domain and range of the function.
+They merely specify what region of the xy-plane is displayed on the Main Screen by default.
+The <b>type</b> of function is one of the words "expression", "table", or "graph".
+Again, xFunctions will actually only look at the first character, so you can abbreviate
+these to "e", "t", and "g".  The <b>name</b> of the function can be any sequence of
+letters and digits, as long as it begins with a letter.  You cannot redefine a function
+that is already defined.  The letters can be either upper or lower case.  (When names are
+used in expressions, xFunctions doesn't distinguish between upper and lower case.
+However, when it places functions in the list on the Main Screen, it will order
+upper case letters before lower case letters.  You can make the functions that you define
+easier to find if you start their names with upper case letters, so that they appear
+at the top of the list.)</p>
+
+
+<br><h3><font color="#990000">Expression Functions</font></h3>
+
+<p>An expression function is defined by from one to eight expressions.  These are the same
+expressions that would be entered in the Expression Function Input Screen in xFunctions.
+Note that if you have more than one expression, then every even-numbered expression
+must be a logical-valued expression (such as "x&nbsp;&lt;=&nbsp;3") which defines the
+domain on which the previous expression is valid.  For an expression function example,
+the defining expressions are simply listed as separate items in the example -- separated
+by semicolons -- after the four standard items.  Here is list of the items that
+go into an expression function example:</p>
+
+<OL>
+<LI>the word "function" (or anything beginning with f)
+<LI>a list of four numbers, separated by commas, giving the xy-limits for the display on the Main Screen
+<LI>the word "expression" (or anything beginning with e)
+<LI>the name of the function you are defining
+<LI>anywhere from one to eight expressions that define the function (separated by more semicolons)
+</OL>
+
+<p>For example, here is how you could define the hyperbolic functions and add them to the function list
+one the Main Screen.  Once they are there, they can be used just like the built-in functions.
+(Note that spaces between items or between numbers in a list are not significant.)</p>
+
+<pre>             f; -3,3,-3,3; e; sinh; (e^x - e^(-x)) / 2
+             f; -3,3,-3,3; e; cosh; (e^x + e^(-x)) / 2
+             f; -3,3,-3,3; e; tanh; sinh(x) / cosh(x)
+</pre>
+
+
+<br><h3><font color="#990000">Table Functions</font></h3>
+
+<p>A table function is defined by a list of xy-points that lie on the graph of the function.
+You also have to specify how to fill in the graph between points.  There are three possible
+styles: a step function, a piecewise linear function, or a smooth function.
+In an example, the style is specified (in order of increasing "quality") as one of the
+numbers 1, 2, or 3.  The specification for a table function includes the following items:</p>
+
+<OL>
+<LI>the word "function" (or anything beginning with f)
+<LI>a list of four numbers, separated by commas, giving the xy-limits for the display on the Main Screen
+<LI>the word "table" (or anything beginning with t)
+<LI>the name of the function you are defining
+<LI>one of the numbers 1, 2, or 3 to specify whether its a step function, piecewise linear, or smooth
+<LI>two or more points, where each point is a pair of numbers separated by a comma.  The 
+x-values of the points must be in strictly increasing order.  The points are separated by semicolons.
+</OL>
+
+<p>For example, this defines a piecewise linear function named "W" that looks like a W"</p>
+
+<pre>              f; -5,5,0,5; t; W; 2; -4,4; -2,0; 0,2; 2,0; 4,4
+</pre>
+
+
+<br><h3><font color="#990000">Graph Functions</font></h3>
+
+<p>A graph function is a sequence of Bezier segments.  Each segment is defined by
+a list of six numbers, separated by commas.  The numbers give:</p>
+
+<UL>
+<LI>the x-coordinate of the left endpoint
+<LI>the y-coordinate of the left endpoint
+<LI>the slope of the graph at the left endpoint
+<LI>the x-coordinate of the right endpoint
+<LI>the y-coordinate of the right endpoint
+<LI>the slope of the graph at the right endpoint
+</UL>
+
+<p>The x-coordinates in a segment must agree with the x-coordinates of its neighbors.
+(It is not possible to define graphs with gaps in the domain.)  The y-coordinates
+don't have to agree, so you can make functions with discontinuities.  Even if the
+y-coordinates of neighboring segments do agree, the slopes don't have to
+agree, so you can make functions with corners.</p>
+
+<p>The specification of a graph function consists of the following items:
+
+<OL>
+<LI>the word "function" (or anything beginning with f)
+<LI>a list of four numbers, separated by commas, giving the xy-limits for the display on the Main Screen
+<LI>the word "graph" (or anything beginning with g)
+<LI>the name of the function you are defining
+<LI>specifications for one or more bezier segments, separated by semicolons.  Each segment is
+specified as a list of six numbers, as described above, separated by commas.
+</OL>
+
+<p>Here is an example that defines a graph function named "Grf" consisting of two bezier segments with a
+sharp corner at the point (0,0) and with horizontal tangents at (-2,1) and (2,1)</p>
+
+<pre>            f; -2,2,0,2; g; Grf; -2,1,0, 0,0,-5; 0,0,5, 2,1,0;</pre>
+
+
+<br><hr>
+
+<br><h2><font color="#990000">Examples for the Utilities</font></h2>
+
+<p>To define an example for one of the seven utilities, you have to say what goes into
+each of the inputs on that utility screen.  In all cases, this includes a set of values
+for xmin, xmax, ymin, ymax, and possibly for other numerical values.  It also includes
+one or more expressions to define the functions that the utility will use.  There might
+be other inputs, such as the checkbox labeled "Loop back and forth" in the Animate Utility
+or the radio buttons for controlling the style of graph in the Graph 3D Utility.
+I'll describe the exact format you need in order to specify the inputs for each of the
+utilities.  In all cases, the first item in the example is the name of the utility,
+which can be abbreviated to as little as one letter.  This is followed by a menu entry,
+which is the string that will appear in the pop-up menu in xFunctions to describe this
+example to the user.  (It has to be short enough to fit into this menu.)
+Next comes a list of numbers, separated by commas, that go into the
+numerical input boxes in the utility.
+This is followed by one or more expressions, separated by semicolons.  Any further
+inputs are specified after that.</p>
+
+
+<br><h3><font color="#990000">Multigraph Utility</font></h3>
+
+<p>An example for the multigraph utility is specified by</p>
+
+<OL>
+<LI>the word "multigraph" (or anything beginning with m)
+<LI>the menu entry for the example, which can be any (short) string
+<LI>a list of 4 numbers, separated by commas, specifying xmin, xmax, ymin, and ymax
+<LI>anywhere from one to eight expressions, giving the functions of x that are to be
+graphed, separated by more semicolons.
+</OL>
+
+<p>For example:</p>
+
+<pre>                m; An interesting function; -1,2,0,2; abs(x)^x
+                multigraph; Two halves of a circle; -2,2,-2,2; sqrt(1-x^2); -sqrt(1-x^2)
+</pre>
+       
+
+<br><h3><font color="#990000">Animate Utility</font></h3>
+
+<p>For the animate utility, the list of numbers has seven entries.  In addition to 
+xmin, xmax, ymin, and ymax, there are kmin and kmax, which give the limits on the parameter
+k, and the number of intervals in the
+animation.  The number of intervals must be between 1 and 1000, inclusive.
+The expression to be animated uses the variables x and k.  There is a final item
+that specifies whether the "Loop back and forth" checkbox should be on.
+The value of this item must be specified as "true" or "false".  (As usual, you can
+abbreviate to one character.)  When the user selects an animation example, the
+animation will start playing automatically after a second or two.  So, an Animate
+Utility example consists of:</p>
+
+<OL>
+<LI>the word "animate" (or anything beginning with a)
+<LI>the menu entry for the example, which can be any (short) string
+<LI>a list of 7 numbers, separated by commas, specifying xmin, xmax, ymin, ymax, kmin, kmax
+    and the number of intervals, where the number of intervals is between 1 and 1000
+<LI>an expression that uses the variables x and k
+<LI>one of the values "true" or "false" to specify whether the animation loops back and forth
+</OL>
+
+<p>For example:</p>
+
+<pre>            a; Functions Converging to f(x)=x; 0,1.2,0,1.2,0,50,50; x^k; false
+</pre> 
+
+
+<br><h3><font color="#990000">Parametric Curves Utility</font></h3>
+
+<p>The Parametric Curves Utility requires seven numerical inputs.  The three extra inputs
+are the values of tmin and tmax (the range of values for the parameter) and the
+number of points that are plotted on a curve.  The number of points must be between
+2 and 1000, inclusive.  You can have up to eight curves.  For each two curves,
+you need <b>two</b> expressions involving the variable t, one to define
+x(t) and one to define y(t).  A Parametric Curves example consists of:</p>
+
+<OL>
+<LI>the words "parametric curves" (or anything beginning with p)
+<LI>the menu entry for the example, which can be any (short) string
+<LI>a list of 7 numbers, separated by commas, specifying xmin, xmax, ymin, ymax, tmin, tmax,
+and the number of points on a curve.  The number of points must be between 2 and 1000.
+<LI>an even number of expressions, from two to sixteen, 
+giving the functions of t that define x(t) and y(t) for each curve, separated by more semicolons.
+</OL>
+
+<p>For example (using a + on the second line to break the example into two lines):</p>
+
+<pre>              p; A Circle and Two Ellipses; -3,3, -3,3, 0,6.29, 200; 2*cos(t); 2*sin(t);
+              +   2*cos(t); sin(t);   cos(t); 2*sin(t)
+</pre>
+
+
+<br><h3><font color="#990000">Derivatives Utility</font></h3>
+
+<p>An example for the derivatives Utility consists of the following items:</p>
+
+<OL>
+<LI>the word "derivatives" (or anything beginning with d)
+<LI>the menu entry for the example, which can be any (short) string
+<LI>a list of 4 numbers, separated by commas, specifying xmin, xmax, ymin, and ymax
+<LI>an expression giving the function of x
+</OL>
+
+<p>For example:</p>
+
+<pre>             d; Vertical tangent at x=0?; -2,2,-2,2; abs(x)^x
+</pre>
+
+
+<br><h3><font color="#990000">Riemann Sums Utility</font></h3>
+
+<p>The Riemann Sums Utility requires five numerical inputs.  The last one is the number of
+intervals into which the domain is to be divided.  This must be a number between 1 and 512,
+inclusive.  You also have to specify which summation method will be displayed on the
+graph.  There are six possible methods, which are specified by the numbers from 1 to 6:
+left endpoint rule, right endpoint rule, midpoint rule, inscribed rectangle rule,
+circumscribed rectangle rule, and trapezoid rule.  So, an example consists of:</p>
+
+<OL>
+<LI>the words "riemann sums" (or anything beginning with r)
+<LI>the menu entry for the example, which can be any (short) string
+<LI>a list of 5 numbers, separated by commas, specifying xmin, xmax, ymin, ymax, and
+the number of subintervals.  The number of subintervals must be between 1 and 512.
+<LI>An expression giving the function of x
+<LI>A number from 1 to 6 specifying the display method
+</OL>
+
+<p>For example:</p>
+
+<pre>         r; Area Under a Parabola; 0,1,-0.2,1.2,6; x^2; 3
+</pre>
+
+
+<br><h3><font color="#990000">Integral Curves Utility</font></h3>
+
+<p>An Integral Curves example requires seven numbers.  The fifth and sixth of these
+go in the boxes labeled "Start x" and "Start y" in the utility.  (These values give
+a point where a curve will start when the user presses the New Curve button.
+You might not find it useful to provide such a point in an example, but you have
+to include it anyway.)  The seventh number is the "dt" value that specifies time
+between points on the curves.  The example must also specify the integration
+method as a number 1, 2, or 3 standing for Euler's method, Runge-Kutta Order 2,
+or Runge-Kutta Order 4 (in order of increasing "quality").
+Finally, you have to specify whether the checkbox labeled "Extend curves
+in both directions" is checked.  You do this with one of the values
+"true" or "false", which can be abbreviated to just "t" or "f".</p>
+
+<p>The Integral Curve utility draws integral curves starting at specified points.
+You can, optionally, include a list of points in your example where curves
+are to be started.  Each point is specified as a pair of numbers, separated by 
+a comma.  If your example includes such points, then the curves will be started
+a second or two after the user chooses the example from the menu.</p>
+
+<p>An Integral Curve example consists of</p>
+
+<OL>
+<LI>the words "integral curves" (or anything beginning with i)
+<LI>the menu entry for the example, which can be any (short) string
+<LI>a list of 7 numbers, separated by commas, specifying xmin, xmax, ymin, ymax,
+Start x, Start y, and dt.  The value of dt must be greater than zero.
+<LI>two expressions using the variables x and y, separated by a semicolon.
+These give the values of dx/dt and dy/dt.
+<LI>A number 1, 2, or 3 specifying the integration method.
+<LI>One of the values "true" or "false" to specify whether curves are to be
+drawn both forwards and backwards in time
+<LI>Optionally, you can add any number of points.  Each point is a pair of
+numbers, separated by a comma.  The points are separated by semicolons.
+</OL>
+
+<p>Here is an example that does not use extra points.  For an example with
+points, see the example in the applet tag at the top of this page.</p>
+
+<pre>            i; Pendulum Phase Space; -4, 4, -4, 4, 0, 0, 0.1; y; sin(x); 3
+</pre>
+
+
+<br><h3><font color="#990000">Graph 3D Utility</font></h3>
+
+<p>For the Graph 3D Utility, you need seven numbers, including zmin, zmax, and the
+grid size.  The grid size is a number between 8 and 64, inclusive, that determines 
+how many points are plotted on the graph.  Then, in addition to a function of x and y,
+you need to specify which type of graph will be drawn.  There are four types,
+which are specified by the numbers 1, 2, 3, and 4 (in order of increasing "quality"):
+wireframe model, wireframe with hidden lines removed, shaded model, and shaded model
+with wires.  So, an example for Graph 3D consists of:</p>
+
+<OL>
+<LI>the words "graph 3d" (or anything beginning with g)
+<LI>the menu entry for the example, which can be any (short) string
+<LI>a list of 7 numbers, separated by commas, specifying xmin, xmax, ymin, ymax,
+zmin, zmax, and the grid size.  The grid size must be between 8 and 64.
+<LI>an expression giving the function of x and y that is to be graphed
+<LI>A number between 1 and 4 specifying the style of graph.
+</OL>
+
+<p>For example:</p>
+
+<pre>                g; Eggcrate; -4,4,-4,4,-2,2,50; sin(x)*cos(y); 4
+</pre>
+
+
+
+<br><hR>
+<center><font size="-1"><a href="http://math.hws.edu/eck/index.html">David Eck</a>
+(<a href="mailto:eck@hws.edu">eck@hws.edu</a>), 27 October 1999</font></center>
+
+</blockquote>
+
+</BODY>
+</HTML>
+
diff --git a/htdocs/applets/xFunctions/xFunctions.html b/htdocs/applets/xFunctions/xFunctions.html
new file mode 100755
index 0000000000..d1ee109ce4
--- /dev/null
+++ b/htdocs/applets/xFunctions/xFunctions.html
@@ -0,0 +1,421 @@
+<html>
+	<head>
+	<meta name="generator" content="Frontier 6.1.1 MacOS">
+	<title>
+		xFunctions xPresso Educational Mathematics Applet
+	</title>
+	</head>
+	<body bgcolor="#FFFFEE" alink="#008000" vlink="#800080" link="#0000FF" text="#000000">
+<IMG SRC="/images/header.gif"  ALIGN=LEFT ALT = "math dept"  >
+<P ALIGN=RIGHT> 
+<A HREF="../index.html"  ><IMG SRC="/images/up.gif"   BORDER=1 ALT ="[Up]"  ></A> 
+<A HREF="/cgi-bin/feedback"><IMG SRC="/images/feedback.gif"   BORDER=1 ALT ="[Feedback]"  ></A>
+<BR CLEAR=ALL><HR NOSHADE>
+</P>
+
+This applet was created by David Eck (see below).  It is the web version
+of the graphing program which I often use in class.
+<hr>
+
+<br>
+<H2><font color="#990000">Quick Instructions</font></H2>
+
+<p>When the applet starts up, it is showing a "Main Screen" where you can see the graph of
+functions. The available functions are shown in a list on the left.  Click on
+a function to view its graph.  You can define your own functions to add to
+this list using the three buttons at the lower left of the Main Screen.
+There are three ways to define new functions:  using expressions (such as
+0.5*x^2+sin(3*x-2)), by giving the graph of the function, or by listing a
+table of (x,y) pairs.  There is a separate input screen for each of these input methods.
+To get back to the Main Screen from one of these input screens, you have
+to press a "Done" or "Cancel" button.
+The pop-up menu at the top of the applet can be used to go to seven other
+screens.  Each screen is a separate "utility" that allows you to play with
+functions in a different way.  When you enter functions into the utility
+screens, you can use any new functions that you have defined, as well as the built-in
+functions.</p>
+
+<p>In the "Launcher Version," you'll find a few extra functions in the list on the Main Screen.
+You'll also find some extra entries in the pop-up menu.  These extra entries are examples that
+will take to one of the utility screens, and load an example in to that screen.
+(Information about <b>making</b> examples for <font color="#990000">xFunctions</font>
+can be found <a href="using_examples.html">here</a> -- but to do that, you need to make your own Web pages.)</p>
+
+<p>Now, just go ahead and play!</p>
+
+<hr>
+
+<H2><font color="#990000">More Detailed Instructions</font></H2>
+
+<H3><font color="#990000">First some general ideas</font></h3>
+
+<ul>
+<LI><font color="#990000">Expressions</font>
+ in <font color="#990000">xFunctions</font> can include the operations +, -, *, /, and
+^, where ^ represents exponentiation (this is, x^3 is x*x*x).  You always have
+to type multiplication explicitly as *.  When you use a function such as
+sin or f in an expression, you have to put parentheses around its argument.
+That is, you have to say "<b>sin(x^2)</b>" rather than "<b>sin&nbsp;x^2</b>".
+You can use the constants <b>e</b> and <b>pi</b> in expressions.
+<LI><font color="#990000">Built-in functions</font> are shown on the main
+screen.  Some might not be obvious:  "<b>abs</b>" is absolute value. "<b>sqrt</b>"
+is square root and <b>cubert</b> is the cube root.  "<b>ln</b>" is the
+natural logarithm and "<b>exp</b>" is exponentiation in the base <b>e</b> (same as e^x).
+"<b>round(x)</b>" is the nearest integer to x, "<b>floor(x)</b>"  is the integer
+just below or equal to x, "<b>ceiling(x)</b>" is the integer just above or
+equal to x, and "<b>trunc(x)</b>" in the integral part of x after any decimal
+part is thrown away.
+<LI><font color="#990000">Graph limits</font> and other limits can be set by
+filling in the text boxes labeled <b>xmin</b>, <b>tmax</b>, and so on.  Usually,
+if you <b>press return</b> in any text box, the graph will be redrawn, so you
+don't have to use the buttons too much.  Many screens have buttons for zooming in 
+and out on the graph.  A "Restore" button will restore the original limits on the
+graph.  An "Equalize" button will reset the xy limits on the graph so that the
+scales on the horizontal and vertical axes are equal.  (This makes circles look
+like circles instead of ellipses, and it lets you estimate slope visually.)
+<LI><font color="#990000">The mouse</font> can be used for zooming on some of the applet's
+screens.  Click with the right mouse button at a point (or command-click on Macintosh)
+to zoom in on that point.  Click with the middle mouse button (or option-click or
+ALT-click) to zoom out from the point).
+<LI><font color="#990000">Error messages</font> are displayed in the same region of
+the screen where graphs are drawn. An error message will go away if you click on it.  Or, you
+can just fix the problem and the error message will go away the next time a
+graph is drawn.
+<LI><font color="#990000">Never trust a computer!</font>  Do not assume that
+what you see in this program is perfectly accurate.  For one thing, there are
+probably some bugs -- out and out programming errors.  More important, the methods
+used in computations are approximations and in some cases guesses.  Graphs are
+drawing by plotting a lot of points and connecting them with lines.  Since a lot
+of points are used, generally the results are pretty good, but if the graph 
+varies rapidly the results can be positively deceptive.
+</ul>
+
+
+<H3><font color="#990000">The Main Screen</font></H3>
+
+<p>The main screen is <b>not</b> the most interesting part of 
+<font color="#990000">xFunctions</font>!  The more interesting "utility screens" are described 
+below.  However, you have to use the main screen if you want to
+define new functions to use in the utility screens.</p>
+
+<p>The main screen shows a list of available functions on the left.
+Click on a function to see its graph.  To add to this list, click on one
+of the buttons "New Expr.", "New Table", or "New Graph" in the lower left
+corner.  This will take you to a screen where you can input a function.
+These input screens are describe below.  If the function that is hilited
+in the list is a user-defined function, as opposed to one of the
+built-in functions, then the "Edit" button is enabled.  If you click the
+"Edit" button, it will take you to the appropriate function input screen, 
+where you can modify the definition of the function.</p>
+
+<p>If you click on the graph, a cross-hair will appear marking a point on the
+graph.  The coordinates of the point will appear under the graph.
+There is also an input box under the graph where you can input an
+x-value.  This gives you much finer control of the x-value
+than you can get by clicking on the graph.
+Either press return in this box or click the "Set" button,
+and the corresponding point will be marked on the graph.  If you
+click-and-drag on the graph, the cross-hair will move as you drag 
+the mouse.</p>
+
+<p>Right-click on the graph to zoom in on a point.  Click with
+the middle-mouse button, or hold down the ALT key and <b>left</b>-click,
+to zoom out.  You can also control the ranges of values displayed on the 
+x- and y-axes with the controls along the right edge of the screen.</p>
+
+<H3><font color="#990000">The Utilities</font></H3>
+
+<p>The main point of <font color="#990000">xFunctions</font> is its
+seven "utilities."  Each utility is a screen that allows you to work
+with functions in a different way.  To go to a utility, select its name from 
+the pop-up menu at the top of the applet.  This pop-up menu is
+visible on the Main Screen and on each of the utility screens, so
+it is easy to move among these screens.  (The pop-up menu is <b>not</b>
+available on the function input screens.)  On other Web pages that use 
+<font color="#990000">xFunctions</font>, there might also be "examples" in this pop-up menu.  Selecting one of the
+examples will take you to one of the utility screens and load data for some
+example into that screen.</p>
+
+<p>Below, you'll find brief instructions for each of the seven utilities.
+However, much of the interface for the utilities is pretty self-explanatory.</p>
+
+<H3><font color="#990000">Expression Function Input Screen</font></H3>
+
+<p>When you click the "New Expr." button on the main screen, you will be
+taken to an input screen where you can define a function as an 
+expression such as "x^2+2*x+1".  You can also define <b>split</b>
+functions, which have different expressions on different parts of their
+domains.</p>
+
+<p>To define a function, set the
+name of the function in the input box the top of the screen (or just accept the
+name that is already provided there).  To define a function using just one 
+expression, just fill in the box labeled "Let&nbsp;y&nbsp;=".  
+If you want to limit the domain of the function, you can 
+enter a condition such as "x &gt; -1 and x &lt; 1" in
+the box labeled "provided:".  The condition can use the relational operators
+=, &lt;&gt;, &lt;, &gt;, &lt;=, and &gt;=, and it can use the logical operators
+"and", "or", and "not".  You can use any expression as part of the condition,
+such as "abs(sin(x)) &lt; 0.5".
+You can define a function by up to four cases
+by filling in more of the boxes labeled "or y=" and "provided".
+For example:  Let "<b>y = x^2</b>" provided "<b>abs(x) &lt; 1</b>" or "<b>y = x^3</b>" provided
+"<b>x &gt;= 1</b>" or "<b>y = 1</b>" provided "<b>x &lt;= -1</b>".</p>
+
+<p>Click the "Test" button to see the graph of your function.  The limits on the
+axes here do not limit the domain of the function.  They are only used to determine
+what part of the graph will be shown by default on the Main Screen.</p>
+
+<p>Click the "Done" button to define the function and go back to the Main Screen.
+You <b>must</b> click either the "Done" or "Cancel" button to get out of 
+the Expression Function Input Screen.</p>
+
+<H3><font color="#990000">Graph Function Input Screen</font></H3>
+
+<p>Functions don't have to be defined by expressions!  They can also be
+defined by graphs and by tables of values.  From the Main Screen, click
+the "New Graph" button to go to the Graph Function Input Screen, where
+you can define a function as a graph.  Technically, the graphs used here
+are Bezier functions, which are made up of segments.  Each segment is
+a piece of a cubic polynomial, which is completely determined by the
+two points at the ends of the segments and by the slopes at those two
+points.  It is possible to make graphs that have discontinuities,
+corners, and cusps.</p>
+
+<p>A new function is just a line segment on the x-axis, with a point at each
+end.  You can double-click the graph to introduce new points.  Each point
+has a "handle", shown as a black point nearby.  You can click-and-drag the
+points and the handles to modify the graph.  Other operations are described
+in the "Brief Instructions" at the top right of the screen.  If you want
+fine control over the x-value of a new endpoint, enter the x-value in the
+box labeled "at x =" and either press return or click the "Insert New Point"
+button.  Note that the x and y limits in the lower right do not affect
+the shape of the graph, just how the xy-values on the graph are interpreted.</p>
+
+<p>Click the "Done" or "Cancel" button to return to the main screen.</p>
+
+<H3><font color="#990000">Table Function Input Screen</font></H3>
+
+<p>Use the <b>Graph</b> Function Input Screen if you want to set the general
+shape of a graph by hand.  If you have a list of xy-points on the
+graph, enter them as a table in the <b>Table</b> Function Input Screen.
+You get to this screen by pressing the "New Table" button on the Main
+Screen.</p>
+
+<p>Just enter the pairs of xy-values one-by-one in the boxes labeled
+"Input x" and "Input y".  (You can press tab after entering the x-value,
+and press return after entering the y-value.)  The points will be shown 
+in a list in the upper right corner of the screen.  If you click on 
+a point in the list, it will be copied to the input boxes, so you can
+edit it.  There is a button for deleting the selected point from the 
+list.</p>
+
+<p>Just knowing some points on the graph doesn't tell you what the whole
+function looks like.  You have to specify what happens between the points.
+You have three choices: A "Step Function" has a constant value between
+two consecutive points from your list.  For a "Piecewise Linear Function",
+the points are connected by line segments.  A "Smooth Function" is 
+continuous and differentiable at all points.  (It's actually a Bezier function,
+defined by cubic polynomials between the points specified in your list.)</p>
+
+<p>A preview of the graph is shown in the lower right (but not until there are
+at least two points).  The limits on the axes are increased if necessary, and
+or can set them yourself.</p>
+
+<p>Click the "Done" or "Cancel" button to get back to the Main Screen.</p>
+
+<H3><font color="#990000">Multigraph Utility</font></H3>
+
+<p>The Multigraph Utility Screen let's you draw up to eight functions in different
+colors on the same set of axes.  You can select the number (1 to 8) of the
+function to be graphed with a pop-up menu near the lower left of the
+screen.  Each curve is a different color, shown in a
+colored patch next to the pop-up menu.
+Enter the function and press return (or click "Graph!")
+to graph the function.  Right-clicking on the graph will
+zoom in on a point.  Click with the middle mouse button, or
+hold down the ALT key and left-click, to zoom out.
+</p>
+
+<H3><font color="#990000">Animate Utility</font></H3>
+
+<p>The Animate Utility Screen lets you work with a function whose definition can
+contain the parameter k, as well as the variable x.  This is really a <b>family</b>
+of different functions, one for each value of k.  The Animate Utility
+plays a "movie" showing a sequence of the graphs for different values of k.
+There are input boxes where you can specify the values of k at the start and
+end of the movie.  You can also specify the number of intervals in the movie.
+(The number of frames is the number of intervals plus one.)  What happens
+when you get to the end of the movie?  The Animate Utility can either jump directly back
+to the beginning, or it can play the movie backwards. Which it does is controlled
+by a checkbox labeled "Loop Back and Forth."
+The "Go" button will start the animation.  The "Next" button will move the
+animation from one frame to the next.  You can use the mouse to zoom in out on the graph.</p>
+
+
+<H3><font color="#990000">Parametric Curves Utility</font></H3>
+
+<p>The Parametric Curves Utility draws parametric curves in the xy-plane.
+A parametric curve is a plot of xy-points where the x and y coordinates
+are functions of some parameter.  In this utility, the parameter is t.
+For example, the parametric curve defined by x=cos(t), y=sin(t) for
+t between 0 and 6.3 is a circle.  (6.3 is about 2*pi.)</p>
+
+<p>In this utility, you can enter x and y functions for up to eight
+parametric curves.  There is a pop-up menu near the bottom left corner
+of the screen that you can use to select the curve whose definition you
+want to enter/display.  Each curve is a different color, shown in a
+colored patch next to the pop-up menu.
+There are input boxes for specifying the 
+range of t-values to use for the curves.  You can also specify the
+number of points on each curve.  (Remember that <font color="#990000">xFunctions</font> draws graphs
+by plotting points and connecting them with lines.  The results for
+discontinuous or rapidly changing functions might not be great.  You might
+get a better curve by increasing the number of points.)</p>
+
+<p>There is a button labeled "Trace".  If you click this button, a crosshair
+will be moved along the curve whose number is specified in the pop-up menu.
+This lets you see how the point on the curve varies as t changes.  The crosshair
+disappears after the curve has been traced once.</p>
+
+<p>Zooming with the mouse will work in this utility.
+
+<H3><font color="#990000">Derivatives Utility</font></H3>
+
+<p>The Derivatives Utility will draw the graphs of a function, the
+first derivative of the function, and the second derivative of the
+function.  The three graphs are displayed in separate panels in
+the bottom half of the applet.  If you left-click and drag on the
+graph of the function, a tangent line to the graph will be displayed.
+At the same time, the corresponding point on the graph of the first
+derivative will be marked.  (You can also click and drag on the
+other graphs and see what happens.)  Mouse zooming will also work 
+in this utility.</p>
+
+<H3><font color="#990000">Riemann Sums Utility</font></H3>
+
+<p>The Riemann Sum Utility computes Riemann sums for a specified function on
+a specified interval.  The values of various Riemann sums, using
+different rules, are shown at the right.  (The trapezoid rule isn't 
+strictly a Riemann sum, but it's there as a choice anyway.)
+The area corresponding to <b>one</b> of the sums is displayed on the graph.  Use the pop-up
+menu at the lower right to select which area is displayed.  If you
+click on the graph, you get details about one of the
+rectangles or trapezoids in the sum.  (Click on the blue information box
+to get rid of it.)   Note that for the
+"~Circumscribed" and "~Inscribed" rules, the maximum and minimum
+of the function on a sub-interval is only computed approximately.
+(This explains the "~", which stands for "approximately.")  Mouse zooming does
+<b>not</b> work on this screen.</p>
+
+<H3><font color="#990000">Integral Curves Utility</font></H3>
+
+<p>The Integral Curves Utility draws direction fields and integral curves.
+An integral curve is the path followed by a point whose velocity
+at each point is given by a "vector field".  A vector field on the
+xy-plane is given by a pair of functions of x and y.  For the curve,
+these functions specify the derivatives dx/dt and dy/dt at each point.
+In the Integral Curves Utility, you can specify the functions dx/dt
+and dy/dt, and you can "drop" points onto the xy-plane and see the
+curves along which they move.  The utility also draws a grid of arrows.
+An arrow at a point shows the direction of the integral curve as it
+passes through that point.  (This is a "direction field" rather than a
+"vector field" because it shows only the direction of the curve,
+not the speed.)</p>
+
+<p>You can start a curve by clicking at a point on the graph.  Alternatively,
+for finer control, you can enter the x and y values of the starting
+point of the curve in the boxes labeled "Start x" and "Start y".  Then,
+click the "New Curve" button to start a curve at that point.
+You can have as many curves as you want.
+If you turn on the "Extend curves in both directions" option,
+you get to see how the point would move backwards in time as well as
+forwards.</p>
+
+<p>An integral curve is drawn by looking at the current position of
+the point and at the derivative functions at that point (and possibly
+at some nearby points for greater accuracy).  This is used to project
+the point forward "dt" time units into the future.  <b>This
+is only an approximation!</b>  A smaller value of dt will generally give
+a better approximation.  There is an input box where you can specify
+the value of dt.  The Integral Curves Utility can use 
+three different approximations:  Euler's Method, Runge-Kutta Order 2,
+and Runge-Kutta Order 4.  The utility has a set of radio buttons that
+you can use to select the method.  Runge-Kutta Order 4 is the most accurate
+method, and there is really no reason to use the other two unless you
+specifically interested in the method rather than in getting
+the best possible approximation of the true integral curve.</p>
+
+<p>Once a curve has been started, it uses the same method and the same
+value of dt forever.  This lets you start different curves from the
+same point, using different methods or different values of t, to compare them.</p>
+
+<p>In this utility, more than in others, you might want to use the
+"Equalize" button to equalize the scales on the x and y axes.  Otherwise,
+the arrow directions, as drawn, can be misleading.  You can use the
+mouse for zooming in this utility.</p>
+
+<H3><font color="#990000">Graph 3D Utility</font></H3>
+
+<p>The Graph 3D Utility draws three-dimensional graphs of functions
+of two variables.  The function to be graphed is of the form z=f(x,y),
+where f(x,y) is given as an expression that can contain variables x and y.
+The values of xmin, xmax, ymin, and ymax have a different interpretation
+in this utility:  They specify a rectangle in the xy-plane that is used
+as the domain over which the graph is drawn.  You can also enter
+zmin and zmax, which specify the range of z-values that you want to see.
+The scale on the graph is adjusted so that the specified ranges of x, y, and
+z are visible.  But since the image on the screen is a two-dimensional
+projection of a three dimensional object, there is not an exact correspondence
+between the ranges and the boundaries of the rectangle shown on the screen.</p>
+
+<p>To produce the graph, a rectangular grid of points in the domain is used.
+The function is evaluated at each point, and the resulting xyz-points
+are connected with lines.  You can enter the grid size -- that is, the
+number of points along each side of this grid of points.
+The utility can draw graphs in four different
+styles:  When only the lines between the points are drawn, the result is a
+so-called "wire-mesh model."  The second style also consists of just lines,
+but lines that are hidden by other parts of the graph are not shown.
+Instead of drawing the lines, the regions between the lines can be filled in
+with color, giving a "shaded model."  (The color used is determined by
+the orientation of the graph surface, so it looks as if the graph is
+illuminated from a certain direction.)  In the fourth style, both the
+lines and the shading are shown.  You can select among the four styles
+using a set of radio buttons under the graph.  The shaded model
+without lines only really looks good on a high color monitor using a
+large grid size.</p>
+
+<p>When the utility starts up, you will see a projection of the x-, y-,
+and z-axes along with a rectangle that frames the domain of the function 
+in the xy-plane.  When you press the "Graph it!" button or press return 
+in any input box, the graph will be drawn.  You get to see the graph
+being drawn, from back to front.  (This is deliberate -- for understanding
+the graph, seeing the drawing process is more effective than just seeing
+the final result.)</p>
+
+<p>You can rotate the axes and graph using two scroll bars.  The
+horizontal scroll bar rotates the graph around the z-axis.  The
+vertical scroll bar tilts the image towards you and away from you.</p>
+
+<p>Mouse zooming does <b>not</b> work in the Graph 3D Utility.  Do
+not expect Graph 3D to work well with most discontinuous functions.</p>
+
+<HR>
+<center><font size="-1"><a href="http://math.hws.edu/eck/index.html">David Eck</a>
+(<a href="mailto:eck@hws.edu"><a href="mailto:eck@hws.edu">eck@hws.edu</a></a>), 27 October 1999 </font></center>
+
+</blockquote>
+
+
+
+
+<HR NOSHADE>
+Last updated: <STRONG>Wednesday, April 12, 2000</STRONG>
+<BR>
+<TT>http://www.math.rochester.edu/courses/current/MTH163/xFunctions.html</TT>
+<h5>This page was built by <A HREF = "mailto:gage@math.rochester.edu">M.Gage</A> using <a href="http://www.scripting.com/frontier/">Frontier</a> </h5>
+</body>
+</html>
+</body>
+</html>
diff --git a/htdocs/applets/xFunctions/xFunctions.zip b/htdocs/applets/xFunctions/xFunctions.zip
new file mode 100755
index 0000000000..ac071ff240
Binary files /dev/null and b/htdocs/applets/xFunctions/xFunctions.zip differ
diff --git a/htdocs/crossdomain.xml b/htdocs/crossdomain.xml
new file mode 100644
index 0000000000..a45fa2ff23
--- /dev/null
+++ b/htdocs/crossdomain.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+
+   <!DOCTYPE cross-domain-policy SYSTEM "http://www.macromedia.com/xml/dtds/cross-domain-policy.dtd">
+
+   <cross-domain-policy>
+
+   <allow-access-from domain="*" />
+
+   </cross-domain-policy>
+</xml>
diff --git a/htdocs/css/dgage.css b/htdocs/css/dgage.css
new file mode 100644
index 0000000000..ebe5b0f1cc
--- /dev/null
+++ b/htdocs/css/dgage.css
@@ -0,0 +1,239 @@
+/* WeBWorK Online Homework Delivery System
+ * Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+ * $CVSHeader: webwork2/htdocs/css/math.css,v 1.12 2008/03/04 15:43:44 sh002i 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
+ * Free Software Foundation; either version 2, or (at your option) any later
+ * version, or (b) the "Artistic License" which comes with this package.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+ * Artistic License for more details.
+ */
+
+/* --- Standard elements ---------------------------------------------------- */
+
+body {
+	background: #EFEFEF;
+	color: black;
+	margin: 0 .5em 0 .5em; /* MSIE ignores bottom margin; Gecko doesn't */
+	padding: 0;
+	font-family: Times, serif;
+	min-width: 25em;
+}
+
+h1, h2, h3, h4, h5, h6 {
+	font-family: "Trebuchet MS", "Arial", "Helvetica", sans-serif;
+	/* FIXME "You have no background-color with your color" */
+	color: #225;
+	background: transparent;
+}
+h1 { font-size: 170%; }
+h2 { font-size: 140%; padding-bottom: 0; margin-bottom: .5ex }
+h3 { font-size: 120%; }
+h4 { font-size: 110%; }
+h5 { font-size: 105%; }
+h6 { font-size: 105%; } 
+
+a:link { color: #00e; background-color: inherit; }
+a:visited { color: #808; background-color: inherit; }
+
+/* --- Miscellaneous classes ---------------------------------------------- */
+
+/* show only to CSS-ignorant browsers */
+.for-broken-browsers { display: none }
+
+/* for hiding floats from Netscape 4.x */
+.float-left { float: left; }
+.float-right { float: right; }
+
+/* CSS Generated by Primer - primercss.com */
+
+div#masthead {
+	width:100%;
+}
+
+div#loginstatus {
+	float:right;
+}
+
+div#logo {
+	float:left;
+}
+
+div#site-navigation {
+	position:absolute;
+	width:180px;
+}
+
+div#site-navigation ul, div#site-nagivation li{
+  padding-left:10px;
+  list-style:none;
+}
+
+div#fisheye {
+	
+}
+/*
+div.info-box {
+	width:100%;
+	height:3ex;
+	border-bottom:solid 1px;
+	margin-bottom:10px;
+}
+
+div.info-box ul li ul{
+  height:0;
+  overflow:hidden;
+  list-style:none;
+  margin:0;
+  padding:4px;
+}
+
+div.info-box ul{
+  position:relative;
+  list-style:none;
+}
+
+div.info-box ul li:hover{
+  cursor:pointer;
+  width:auto;
+  z-index:100;
+}
+
+div.info-box ul li:hover>ul{
+  z-index:100;
+  background:rgba(125, 125, 125, 0.9);
+  height:10ex;
+  overflow:visible;
+  width:auto;
+}
+
+div.info-box ul li ul li:hover>ul{
+  z-index:100;
+  left:3em;
+  background:rgba(125, 125, 125, 0.9);
+  height:auto;
+  overflow:visible;
+}
+*/
+	
+a#Courses {
+	
+}
+
+a#Homework_Sets {
+	
+}
+
+a#Password_Email {
+	
+}
+
+a#Grades {
+	
+}
+
+a#Instructor_Tools {
+	
+}
+
+a#Classlist_Editor {
+	
+}
+
+a#Hmwk_Sets_Editor {
+	
+}
+
+a#Library_Browser {
+	
+}
+
+a#Library_Browser_2 {
+	
+}
+
+a#Statistics {
+	
+}
+
+a#Student_Progress {
+	
+}
+
+a#Scoring_Tools {
+	
+}
+
+a#Email {
+	
+}
+
+a#File_Manager {
+	
+}
+
+a#Course_Configuration {
+	
+}
+
+a.active {
+	
+}
+
+hr.for-broken-browsers {
+	
+}
+
+
+
+
+
+div#big-wrapper {
+  margin:0px 1% 0px 190px;
+	background:white;
+	padding-left:10px;
+	padding-right:10px;
+	min-width:788px;
+	min-height:100%;
+	-moz-box-shadow: 1px 0px 4px gray, -1px 0px 4px gray; /* FF3.5+ */
+  -webkit-box-shadow: 1px 1px 4px 2px gray; /* Saf3.0+, Chrome */
+  box-shadow: 1px 1px 4px 2px gray; /* Opera 10.5, IE 9 */
+	
+}
+
+div#breadcrumbs {
+	
+}
+
+div#content {
+	
+}
+
+span.Message {
+	
+}
+
+div.Body {
+	
+}
+
+div.Message {
+	
+}
+
+div#footer {
+	
+}
+
+p#last-modified {
+	
+}
+
+div#copyright {
+	
+}
+
diff --git a/htdocs/css/gateway.css b/htdocs/css/gateway.css
new file mode 100644
index 0000000000..a3ab347b94
--- /dev/null
+++ b/htdocs/css/gateway.css
@@ -0,0 +1,113 @@
+/******************/
+/* gateway styles */
+/******************/
+
+/* update margins to reflect missing left column */
+#breadcrumbs { margin-left: .5em }
+#content { margin-left: .5em }
+#footer { margin-left: .5em }
+
+hr { clear: both; }
+
+div.gwMessage { background-color:#dddddd; color: black; }
+div.gwTiming {
+        background-color:#ddddff;
+        color: black;
+        margin-top: 10px;
+        margin-bottom: 0px;
+}
+div.gwWarning { background-color:#ffffdd; color: black; }
+
+/* Louis Zulli's IE6 non-fixed positioning workaround follows */
+div#gwTimer {
+	background-color:#ffeeaa;
+	color: black;
+	font-family: Times serif;
+	position: absolute; /* IE<7 sees this */
+	width: 15em;
+	right: 4em;
+	top: 4em;
+	border: dashed black 1px;
+	padding: 3px;
+	text-align: center;
+	z-index: 2;
+} 
+html>body #gwTimer {
+	position: fixed; /* IE 7 and other browsers see this */
+}
+div#gwScoreSummary {
+	background-color:#fcfccc;
+	color: black;
+	font-family:Times serif;
+	z-index: 1;
+	font-size: 85%;
+	border: black 3px outset;
+	width: 15em;
+	top: 8em;
+	right: 2em;
+	padding: 3px;
+	position: absolute;
+}
+html>body #gwScoreSummary {
+	position: fixed; /* IE 7 and other browsers see this */
+}
+
+span.resultsWithError { background-color: #ffcccc; color: black; }
+span.resultsWithoutError { background-color: #66ff99; color: black; }
+div.gwCorrect { background-color: #66ff99; color: black; }
+div.gwIncorrect { background-color: #ff9999; color: black; }
+
+div.gwProblem {
+        clear: both;
+        background-color: #E0E0E0;
+        color: black;
+        padding: 3px;
+        border: solid black 1px;
+}
+div.gwSoln {
+/*      background-color: #e0e0ff; */
+        background-color: transparent;
+        color: black;
+/*      padding: 2px; */
+/*      border: dashed black 1px; */
+}
+div.gwSoln b { color: navy; }
+
+p.gwPreview {
+        font-size: smaller;
+        text-align: right;
+        margin-top: 0px;
+        margin-bottom: 0px;
+}
+
+table.gwAttemptResults {
+        border-width: 0px;
+}
+table.gwAttemptResults td.label {
+        font-weight: bold;
+        background-color: transparent;
+        color: navy;
+}
+table.gwAttemptResults td.output {
+        padding: 2px;
+        border: solid black 1px;
+        background-color: #eeeeee;
+}
+
+div.gwPrintMe { 
+	width: 25%;
+	float: right;
+	margin-top: 2em;
+	margin-right: 1em;
+/*	position: relative;
+	left: 65%;
+	top: -1em;
+	z-index: 1; */
+/*	margin-left: auto;
+	margin-right: 2em;
+	margin-top: 3px; */
+	border: dashed black 1px;
+	padding: 3px;
+	color: black;
+	background-color: #e0e0ff;
+}
diff --git a/htdocs/css/math.css b/htdocs/css/math.css
new file mode 120000
index 0000000000..d1f2981277
--- /dev/null
+++ b/htdocs/css/math.css
@@ -0,0 +1 @@
+../../conf/templates/math/math.css
\ No newline at end of file
diff --git a/htdocs/css/math2.css b/htdocs/css/math2.css
new file mode 120000
index 0000000000..4ed2570f62
--- /dev/null
+++ b/htdocs/css/math2.css
@@ -0,0 +1 @@
+../../conf/templates/math2/math2.css
\ No newline at end of file
diff --git a/htdocs/css/math3.css b/htdocs/css/math3.css
new file mode 120000
index 0000000000..1c78305408
--- /dev/null
+++ b/htdocs/css/math3.css
@@ -0,0 +1 @@
+../../conf/templates/math3/math3.css
\ No newline at end of file
diff --git a/htdocs/css/moodle.css b/htdocs/css/moodle.css
new file mode 100644
index 0000000000..c25d94fbcc
--- /dev/null
+++ b/htdocs/css/moodle.css
@@ -0,0 +1,48 @@
+/*
+ *  Start with math.css
+ */
+@import url(math.css);
+
+/*
+ *  Additions/changes to math.css for moodle.css
+ */
+
+BODY {
+	margin: 0px;    /* no margin (use #fullPage for that) */
+	padding: 0px;
+}
+
+#fullPage {
+	border: 10px solid white;  /* needed to get height correctly */
+	margin:0px;
+	padding:0px;
+}
+
+#masthead {
+       margin: 0 0 .5em 0;  /* add space below masthead */
+                            /* rather than above big-wrapper */
+}
+
+#big-wrapper {
+       top: 0px;            /* see above */
+                            /* (shouldn't it have been margin-top anyway?) */
+}
+
+#breadcrumbs {
+       margin-bottom: .5em;  /* put space here rather than in content */
+}
+
+#content {
+	margin: 0 0 0 10.4em;  /* see above */
+}
+
+#site-navigation {
+       position: relative;  /* can't use absolute and still get the */
+       left: auto;          /* correct height in #fullPage */
+       top: auto;
+       float: left;
+}
+
+#footer {
+       margin: 0 .5em .2ex 0;  /* don't indent this */
+}
diff --git a/htdocs/css/moodle.js b/htdocs/css/moodle.js
new file mode 100644
index 0000000000..ea4297c769
--- /dev/null
+++ b/htdocs/css/moodle.js
@@ -0,0 +1,82 @@
+/*
+ *  Turn off interface elements that are not needed by Moodle
+ */
+if (parent.ww) {
+  document.write('<STYLE>.moodleIgnore {display:none}</STYLE>');
+  /*
+   *  This prevents scrollbars from appearing
+   *  (we won't need them because we resize the IFRAME
+   *  to fit, but some browsers would show them anyway).
+   *
+   *  This is not part of the CSS style so that it only
+   *  is in effect if JavaScript is enabled.
+   */
+  if (document.body) {document.body.style.overflow = "hidden"}
+}
+
+ww = {
+  /*
+   *  Look for the "up" image on the Sets page and disable it.
+   *  (If WW taged these with ID's, this would be easier.)
+   */
+  disableUp: function () {
+    var img = document.getElementsByTagName('img');
+    for (var i=0; i < img.length; i++) {
+      if (img[i].src.match(/navUp\.gif$/)) {
+        img[i].parentNode.style.display = "none";
+	break;
+      }
+    }
+  },
+
+  /*
+   *  Look for the "Sets" box and disable it.
+   *  (If WW taged these with ID's, this would be easier.)
+   */
+  disableSets: function () {
+    var h2 = document.getElementsByTagName('h2');
+    for (var i=0; i < h2.length; i++) {
+      if (h2[i].innerHTML == 'Sets') {
+        h2[i].parentNode.style.display = "none";
+	break;
+      }
+    }
+  },
+
+  /*
+   *  This resets the size of the IFRAME to match the
+   *  size of the DIV with ID="fullPage", which should be the
+   *  whole document.
+   */
+  updateSize: function () {
+    parent.ww.page.height = ww.page.offsetHeight+20;
+    parent.ww.page.style.height = "";
+  },
+
+  /*
+   *  We wait for the window to completely update, then
+   *  resize the IFRAME.  Safari has a bug where it gets
+   *  the size wrong when the page is reloaded, so we
+   *  resize again after a short delay.  Resizing also is
+   *  done if the browser window size changes.
+   */
+  onload: function () {
+    if (ww.oldLoad) ww.oldLoad();
+    ww.updateSize();
+    setTimeout('ww.updateSize()',1); // for reloading in Safari
+    setTimeout('window.onresize=ww.updateSize',100); // let it update first
+  },
+
+  /*
+   *  Save the old onload handler and replace it with ours
+   */  
+  Init: function () {
+    if (!parent.ww || !parent.ww.page) return;
+    ww.page = document.getElementById('fullPage');
+    if (!ww.page) return;
+    ww.oldLoad = window.onload;
+    window.onload = ww.onload;
+    ww.disableUp();
+    ww.disableSets();
+  }
+}
diff --git a/htdocs/css/setmaker2.css b/htdocs/css/setmaker2.css
new file mode 100644
index 0000000000..08bd560fd7
--- /dev/null
+++ b/htdocs/css/setmaker2.css
@@ -0,0 +1,212 @@
+div#editor-form{
+  min-width:768px;
+  width:100%;
+}
+
+/*Control Pannel Style*/
+div#control_panel{
+  float:left;
+  width:100%;
+  margin-bottom:5px;
+  padding-bottom:0px;
+  padding-top:5px;
+  border:solid 1px;
+  /*-moz-border-radius:5px;
+  -webkit-border-radius:5px;
+  border-radius:5px;*/
+}
+
+div#library_control{
+  overflow:auto;
+  height:auto;
+  float:right;
+}
+div.control{
+  height:auto;
+  margin:0.1%;
+}
+
+div#myset_control{
+  float:left;
+}
+
+div.setSelector{
+  height:163px;
+  margin-bottom:20px;
+  overflow:auto;
+}
+
+div.setSelectorLib{
+  /*height:1px;
+  overflow:auto;*/
+  display:none;
+}
+/*End Control Panel Style*/
+
+/*Problem Lists Style*/
+div#problem_container{
+  width:100%;
+  float:left;
+}
+
+div.mysets{
+  float:left;
+  background:#ffffff;
+  margin-top:0px;
+  /*min-width:200px;
+  width:24%;*/
+}
+
+div.setmaker_library{
+  /*margin-left:305px;*/
+  margin-top:0px;
+  float:right;
+  background-color:#EEFFFF;
+  /*min-width:550px;
+  width:71%;*/
+}
+
+div.problemList{
+  position:relative;
+  overflow:auto;
+  min-height:100px;
+  height:90%;
+  border:solid 1px;
+  /*-moz-border-radius:5px;
+  -webkit-border-radius:5px;
+  border-radius:5px;*/
+  padding:0.1%;
+  margin:0px;
+}
+/*add extra space at the bottom 
+so we can add at end of list*/
+/* div#mysets_problems{
+
+} */
+
+div#mysets_problems div.myProblem:last-child {
+  margin-bottom:200px;
+}
+
+/*order is important here*/
+div.problem{
+  background:rgba(255,255,255,0.75);
+  border-bottom:solid 1px;
+  margin-bottom:5px;
+  overflow:hidden;
+}
+
+div.used{
+  background:rgba(0, 102, 102,0.8);
+}
+
+div.libProblem{
+  background:rgba(0,0,204,0.5);
+}
+
+div.removedProblem{
+  background:rgba(204,0,0,0.8);
+}
+
+div.ResultsWithError{
+  background:rgba(225,225,0,0.9);
+}
+
+
+/*End Problem Lists Style*/
+
+select#myset_sets{
+  background:none;
+  height:180px;
+}
+
+div#size_slider{
+  float:left;
+  width:1%;
+  text-align:center;
+  height:90%;
+  -webkit-user-select:none;
+  -moz-user-select:none;
+  user-select:none;
+  margin:0;
+  margin-top:235px;
+  padding:0;
+}
+
+div#horizontal_slider{
+  height:15px;
+  text-align:center;
+  width:100%;
+  -webkit-user-select:none;
+  -moz-user-select:none;
+  user-select:none;
+  margin:0;
+  padding:0;
+  position:absolute;
+  background:white;
+}
+
+div#size_slider:hover{
+  cursor:col-resize;
+}
+
+div#horizontal_slider:hover{
+  cursor:row-resize; 
+}
+
+div#size_slider p{
+  position:relative;
+  top:50%;
+  width:100%;
+  margin-top:-10px;
+}
+.shadowed{
+  -moz-box-shadow: 1px 1px 4px 2px gray; /* FF3.5+ */
+  -webkit-box-shadow: 1px 1px 4px 2px gray; /* Saf3.0+, Chrome */
+  box-shadow: 1px 1px 4px 2px gray; /* Opera 10.5, IE 9 */
+}
+
+
+*[draggable=true] {
+  -moz-user-select:none;
+  -khtml-user-drag: element;
+  cursor: move;
+}
+
+div#loading{
+  position:fixed;
+  height:100%;
+  width:100%;
+  background-color:white;
+  background-image:url('/webwork2_files/images/ajax-loader.gif');
+  background-repeat:no-repeat;
+  background-attachment:fixed;
+  background-position:center; 
+  top:0;
+  left:0;
+  z-index:2000;
+}
+
+div#loading img{
+}
+
+div#create_new_set{
+  background:white;
+  position:absolute;
+  height:300px;
+  width:300px;
+  margin:0 auto;
+  z-index:200;
+  display:none;
+}
+span.js_action_span{
+  text-decoration:underline;
+}
+span.js_action_span:hover{
+  cursor:pointer;
+}
+
+div#set_maker_two_box{
+  clear:both;
+  float:left;
+}
diff --git a/htdocs/css/tabber.css b/htdocs/css/tabber.css
new file mode 100644
index 0000000000..23612bd024
--- /dev/null
+++ b/htdocs/css/tabber.css
@@ -0,0 +1,112 @@
+/* $Id: example.css,v 1.5 2006/03/27 02:44:36 pat Exp $ */
+/* Renamed tabber.css for use in WeBWorK */
+/* By Patrick Fitzgerald pat@barelyfitz.com, documentation can be found at  http://www.barelyfitz.com/projects/tabber/ */
+
+
+/*--------------------------------------------------
+  REQUIRED to hide the non-active tab content.
+  But do not hide them in the print stylesheet!
+  --------------------------------------------------*/
+.tabberlive .tabbertabhide {
+ display:none;
+}
+
+/*--------------------------------------------------
+  .tabber = before the tabber interface is set up
+  .tabberlive = after the tabber interface is set up
+  --------------------------------------------------*/
+.tabber {
+}
+.tabberlive {
+ margin-top:1em;
+}
+
+/*--------------------------------------------------
+  ul.tabbernav = the tab navigation list
+  li.tabberactive = the active tab
+  --------------------------------------------------*/
+ul.tabbernav
+{
+ margin:0;
+ padding: 3px 0;
+ border-bottom: 1px solid #778;
+ font: bold 12px Verdana, sans-serif;
+}
+
+ul.tabbernav li
+{
+ list-style: none;
+ margin: 0;
+ display: inline;
+}
+
+ul.tabbernav li a
+{
+ padding: 3px 0.5em;
+ margin-left: 3px;
+ border: 1px solid #778;
+ border-bottom: none;
+ background: #DDE;
+ text-decoration: none;
+}
+
+ul.tabbernav li a:link { color: #448; }
+ul.tabbernav li a:visited { color: #667; }
+
+ul.tabbernav li a:hover
+{
+ color: #000;
+ background: #AAE;
+ border-color: #227;
+}
+
+ul.tabbernav li.tabberactive a
+{
+ background-color: #fff;
+ border-bottom: 1px solid #fff;
+}
+
+ul.tabbernav li.tabberactive a:hover
+{
+ color: #000;
+ background: white;
+ border-bottom: 1px solid white;
+}
+
+/*--------------------------------------------------
+  .tabbertab = the tab content
+  Add style only after the tabber interface is set up (.tabberlive)
+  --------------------------------------------------*/
+.tabberlive .tabbertab {
+ padding:5px;
+ border:1px solid #aaa;
+ border-top:0;
+
+ /* If you don't want the tab size changing whenever a tab is changed
+    you can set a fixed height */
+
+ /* height:200px; */
+
+ /* If you set a fix height set overflow to auto and you will get a
+    scrollbar when necessary */
+
+ /* overflow:auto; */
+}
+
+/* If desired, hide the heading since a heading is provided by the tab */
+.tabberlive .tabbertab h2 {
+ display:none;
+}
+.tabberlive .tabbertab h3 {
+ display:none;
+}
+
+/* Example of using an ID to set different styles for the tabs on the page */
+.tabberlive#tab1 {
+}
+.tabberlive#tab2 {
+}
+.tabberlive#tab2 .tabbertab {
+ height:200px;
+ overflow:auto;
+}
diff --git a/htdocs/css/union.css b/htdocs/css/union.css
new file mode 120000
index 0000000000..2a9896e880
--- /dev/null
+++ b/htdocs/css/union.css
@@ -0,0 +1 @@
+../../conf/templates/union/union.css
\ No newline at end of file
diff --git a/htdocs/css/ur.css b/htdocs/css/ur.css
new file mode 120000
index 0000000000..ba86bd7c73
--- /dev/null
+++ b/htdocs/css/ur.css
@@ -0,0 +1 @@
+../../conf/templates/ur/ur.css
\ No newline at end of file
diff --git a/htdocs/favicon.ico b/htdocs/favicon.ico
new file mode 100644
index 0000000000..10893e0d6b
Binary files /dev/null and b/htdocs/favicon.ico differ
diff --git a/htdocs/helpFiles/Entering-Angles.html b/htdocs/helpFiles/Entering-Angles.html
new file mode 100644
index 0000000000..6b9ea27cd6
--- /dev/null
+++ b/htdocs/helpFiles/Entering-Angles.html
@@ -0,0 +1,47 @@
+<html>
+
+<body>
+
+<center>
+<b><font size="+2">Entering Angles</font></b>
+</center>
+
+<ul type="square">
+
+<li><u>Angles in radians without units are the default:</u>
+<blockquote>
+For an angle of 60 degrees, enter it in radians as &nbsp; <tt>pi/3</tt> &nbsp; or &nbsp; <tt>1.04719...</tt>, but <b>not 60</b><br />
+By default, trig functions are evaluated in radians, so <tt>cos(pi/3) = 1/2</tt>, but <tt>cos(60) = -0.9524</tt> since it is radians.  You must convert degrees to radians before applying a trig function to an angle. 
+</blockquote>
+</li>
+
+<li><u>Occasionally, units are required on angles:</u>
+<blockquote>
+If asked for units on an angle, enter, for example, <br />
+<tt>pi/6 rad</tt> &nbsp; (including rad)<br />
+<tt>30 deg</tt> &nbsp; (including deg)
+</blockquote>
+</li>
+
+<li><u>Examples of constants available:</u>
+<blockquote><tt>pi</tt>, &nbsp; <tt>e = e^1</tt></blockquote>
+</li>
+
+<li><u>Sometimes decimals are not allowed:</u>
+<blockquote>Sometimes &nbsp; <tt>pi/6</tt> &nbsp; is allowed, but &nbsp; <tt>0.524</tt> &nbsp; is not</blockquote>
+</li>
+
+<li><u>Sometimes trig functions are not allowed:</u>
+<blockquote>
+Sometimes &nbsp; <tt>0.866025403784</tt> &nbsp; is allowed, but &nbsp; <tt>cos(pi/6)</tt> &nbsp; is not
+</blockquote>
+</li>
+
+<li><a href="http://webwork.maa.org/wiki/Available_Functions" target="_new">Link to a list of all available functions</a></li>
+
+
+</ul>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/htdocs/helpFiles/Entering-Decimals.html b/htdocs/helpFiles/Entering-Decimals.html
new file mode 100644
index 0000000000..9fc1fef7d1
--- /dev/null
+++ b/htdocs/helpFiles/Entering-Decimals.html
@@ -0,0 +1,33 @@
+<html>
+
+<body>
+
+<center>
+<b><font size="+2">Entering decimals</font></b>
+</center>
+
+<ul type="square">
+
+<li><u>In general, give at least 5 decimal places.</u>
+<blockquote>Typically, if your answer is correct to 5 decimal places it will be marked correct, although the number of decimal places required may vary from problem to problem.  When in doubt, give more decimal places.</blockquote>
+</li>
+
+<li><u>If there is more than one correct answer, enter your answers as a comma separated list.</u>
+<blockquote>
+For example, if your answers are <nobr><tt>-3/2, 4/3, 2pi, e^3, 5</tt></nobr> enter them as
+<nobr><tt>-1.5, 1.3333333, 6.2831853, 20.0855369, 5</tt></nobr>
+</blockquote>
+
+<li><u>Sometimes, fractions and certain operations are not allowed.</u>
+<blockquote>Usually, the operations that are not allowed include addition <tt>+</tt>, subtraction <tt>-</tt>, multiplication <tt>*</tt>, division <tt>/</tt>, and exponentiation <tt>^</tt> (or <tt>**</tt>).  When these operations are not allowed, it is usually because you are expected to be able to simplify your answer, often without using a calculator.</blockquote>
+</li>
+
+<li><u>Sometimes, certain functions are not allowed.</u>  
+<blockquote>Usually, the functions that are not allowed include square root <tt>sqrt( )</tt>, absolute value <tt>| |</tt> (or <tt>abs( )</tt>), as well as other named functions such as <tt>sin( )</tt>, <tt>ln( )</tt>, etc.  When these functions are not allowed, it is usually because you are expected to be able to simplify your answer, often without using a calculator.</blockquote>
+</li>
+
+</ul>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/htdocs/helpFiles/Entering-Equations.html b/htdocs/helpFiles/Entering-Equations.html
new file mode 100644
index 0000000000..99f43ed314
--- /dev/null
+++ b/htdocs/helpFiles/Entering-Equations.html
@@ -0,0 +1,48 @@
+<html>
+
+<body>
+
+<center>
+<b><font size="+2">Entering Equations</font></b>
+</center>
+
+<ul type="square">
+
+<li><u>Equations must have an equals sign and use the correct variable names:</u>
+<blockquote>
+<tt>y = 5x+2</tt> &nbsp; will be incorrect if the answer is &nbsp; <tt>w = 5y+2</tt>
+</blockquote>
+</li>
+
+<li><u>Examples of valid equations that are equivalent:</u>
+<blockquote>
+<tt>32 = 5*x + 2</tt> &nbsp; is the same as &nbsp; <tt>30 = 5x</tt> &nbsp; or &nbsp; <tt>x = 6</tt></tt><br />
+<tt>y = (x-1)^2 + 3</tt> &nbsp; is the same as &nbsp; <tt>y - 3 = (x-1)^2</tt><br />
+<tt>x^2 + xy + y^2 = 13x</tt> &nbsp; is the same as &nbsp; <tt>y*(y+x) = 13x - x^2</tt><br />
+</blockquote>
+</li>
+
+<li><u>If there is no equation that solves the question:</u>
+<blockquote>
+Enter &nbsp; <tt>NONE</tt> &nbsp; or &nbsp; <tt>DNE</tt> &nbsp; (this may vary from problem to problem)
+</blockquote>
+</li>
+
+<li><u>Examples of constants used in equations:</u>
+<blockquote><tt>pi</tt>, <tt>e = e^1</tt></blockquote>
+</li>
+
+<li><u>Functions may be used in equations, but may not be applied across the equals sign:</u>
+<blockquote>
+<tt>sqrt(x) = sqrt(5)</tt> &nbsp; is valid, but &nbsp; <tt>sqrt(x=5)</tt> &nbsp; is not
+<br /> 
+<br />
+<a href="http://webwork.maa.org/wiki/Available_Functions" target="_new">Link to a list of all available functions</a>
+</blockquote>
+</li>
+
+</ul>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/htdocs/helpFiles/Entering-Exponents.html b/htdocs/helpFiles/Entering-Exponents.html
new file mode 100644
index 0000000000..c9b2dcd69d
--- /dev/null
+++ b/htdocs/helpFiles/Entering-Exponents.html
@@ -0,0 +1,33 @@
+<html>
+
+<body>
+
+<center>
+<b><font size="+2">Entering exponents</font></b>
+</center>
+
+<ul type="square">
+
+<li><u>Both ^ and ** are used for exponentiation.</u>
+<blockquote>For example, <tt>x^2</tt> and <tt>x**2</tt> are the same, as are <tt>e^(-x/2)</tt> and <tt>1/(e**(x/2))</tt></blockquote>
+</li>
+
+<li><u>Square roots have a named function, but other roots do not and should be entered using fractional exponents.</u>
+<blockquote>
+For example, the square root of 2 can be entered as <tt>sqrt(2)</tt>, <tt>2^(1/2)</tt>, or <tt>2**(1/2)</tt>, but the cube root of 2 must be entered as <tt>2^(1/3)</tt> or <tt>2**(1/3)</tt>.  The parentheses in <tt>2^(1/3)</tt> are required, since <tt>2^1/3</tt> will be interpreted as <tt>(2^1)/3 = 2/3</tt>.
+</blockquote>
+</li>
+
+<li><u>Sometimes, fractional exponents and certain operations are not allowed.</u>
+<blockquote>Usually, the operations that are not allowed include addition <tt>+</tt>, subtraction <tt>-</tt>, multiplication <tt>*</tt>, division <tt>/</tt>.  When these operations are not allowed, it is usually because you are expected to be able to simplify your answer, often without using a calculator.</blockquote>
+</li>
+
+<li><u>Sometimes, certain functions are not allowed.</u>  
+<blockquote>Usually, the functions that are not allowed include square root <tt>sqrt( )</tt>, absolute value <tt>| |</tt> (or <tt>abs( )</tt>), as well as other named functions such as <tt>sin( )</tt>, <tt>ln( )</tt>, etc.  When these functions are not allowed, it is usually because you are expected to be able to simplify your answer, often without using a calculator.</blockquote>
+</li>
+
+</ul>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/htdocs/helpFiles/Entering-Formulas.html b/htdocs/helpFiles/Entering-Formulas.html
new file mode 100644
index 0000000000..b40362e9cd
--- /dev/null
+++ b/htdocs/helpFiles/Entering-Formulas.html
@@ -0,0 +1,67 @@
+<html>
+
+<body>
+
+<center>
+<b><font size="+2">Entering Formulas</font></b>
+</center>
+
+<ul type="square">
+
+<li><a href="http://webwork.maa.org/wiki/Available_Functions" target="_new">Link to a list of all available functions</a><br /><br /></li>
+
+<li><u>Formulas must use the correct variable(s):</u>
+<blockquote>
+For example, a function of time &nbsp; <tt>t</tt> &nbsp; could be &nbsp; <tt>-16t^2 + 12</tt>, while &nbsp; <tt>-16x^2 + 12</tt> &nbsp; would be incorrect. 
+</blockquote>
+</li>
+
+<li><u>Examples of valid formulas:</u>
+<blockquote>
+<tt>5*sin((pi*x)/2)</tt> &nbsp;&nbsp;or&nbsp;&nbsp; <tt>5 sin(pi x/2)</tt><br />
+<tt>e^(-x)</tt> &nbsp;&nbsp;or&nbsp;&nbsp; <tt>e**(-x)</tt> &nbsp;&nbsp;or&nbsp;&nbsp; <tt>1/(e^x)</tt><br />
+<tt>abs(5y)</tt> &nbsp;&nbsp;or&nbsp;&nbsp; <tt>|5y|</tt><br />
+<tt>sqrt(9 - z^2)</tt> &nbsp;&nbsp;or&nbsp;&nbsp; <tt>(9 - z^2)^(1/2)</tt><br />
+<tt>24</tt> &nbsp;&nbsp;or&nbsp;&nbsp; <tt>4!</tt> &nbsp;&nbsp;or&nbsp;&nbsp; <tt>4 * 3 * 2 * 1</tt><br />
+<tt>pi</tt> &nbsp;&nbsp;or&nbsp;&nbsp; <tt>4 arctan(1)</tt> &nbsp;&nbsp;or&nbsp;&nbsp; <tt>4 atan(1)</tt> &nbsp;&nbsp;or&nbsp;&nbsp; <tt>4 tan^(-1)(1)</tt><br />
+</blockquote>
+</li>
+
+<li><u>Examples of constants used in formulas:</u>
+<blockquote><tt>pi</tt>, <tt>e = e^1</tt></blockquote>
+</li>
+
+<li><u>Examples of operations used in formulas:</u>
+<blockquote>Addition <tt>+</tt>, subtraction <tt>-</tt>, multiplication <tt>*</tt>, division <tt>/</tt>, exponentiation <tt>^</tt> (or <tt>**</tt>), factorial <tt>!</tt>
+</blockquote>
+</li>
+
+<li><u>Examples of functions used in formulas:</u>
+<blockquote>
+<tt>sqrt(x) = x^(1/2)</tt>, <tt>abs(x) = | x |</tt><br />
+<tt>2^x, e^x, ln(x), log10(x)</tt> <br />
+<tt>sin(x), cos(x), tan(x), csc(x), sec(x), cot(x)</tt><br />
+<tt>arcsin(x) = asin(x) = sin^(-1)(x)</tt><br /> 
+<tt>arccos(x) = acos(x) = cos^(-1)(x)</tt><br />
+<tt>arctan(x) = atan(x) = tan^(-1)(x)</tt><br />
+</blockquote>
+
+<li><u>Sometimes formulas must be simplified:</u>
+<blockquote>
+For example, &nbsp; <tt>6x + 5 - 2x</tt> &nbsp; should be simplified to &nbsp; <tt>4x + 5</tt>
+</blockquote>
+</li>
+
+<li><u>Sometimes, certain operations are not allowed.</u>
+<blockquote>Usually, the operations that are not allowed include addition <tt>+</tt>, subtraction <tt>-</tt>, multiplication <tt>*</tt>, division <tt>/</tt>, and exponentiation <tt>^</tt> (or <tt>**</tt>).  When these operations are not allowed, it is usually because you are expected to be able to simplify your answer, often without using a calculator.</blockquote>
+</li>
+
+<li><u>Sometimes, certain functions are not allowed.</u>  
+<blockquote>Usually, the functions that are not allowed include square root <tt>sqrt( )</tt>, absolute value <tt>| |</tt> (or <tt>abs( )</tt>), as well as other named functions such as <tt>sin( )</tt>, <tt>ln( )</tt>, etc.  When these functions are not allowed, it is usually because you are expected to be able to simplify your answer, often without using a calculator.</blockquote>
+</li>
+
+</ul>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/htdocs/helpFiles/Entering-Fractions.html b/htdocs/helpFiles/Entering-Fractions.html
new file mode 100644
index 0000000000..2e456b8b12
--- /dev/null
+++ b/htdocs/helpFiles/Entering-Fractions.html
@@ -0,0 +1,62 @@
+<html>
+
+<body>
+
+<center>
+<b><font size="+2">Entering fractions</font></b>
+</center>
+
+<ul type="square">
+
+<li><u>Examples of fractions, which are of the form a / b for non-decimal numbers a and b that have no common factors, include:</u>
+<blockquote>
+<tt>5/2, -1/3, pi/3, 4, sqrt(2)/2</tt>
+</blockquote>
+</li>
+
+<li><u>Examples of fractions that can be simplified include:</u>
+<blockquote>
+<tt>15/6, (3-4)/3, 2*pi/6, (16/2)/2</tt>
+</blockquote>
+</li>
+
+<li><u>Sometimes decimals are not allowed:</u>
+<blockquote>
+Allowed: &nbsp;&nbsp; <tt>5/2, -1/3, pi/3, 4, sqrt(2)/2, 2^(1/2)</tt><br />
+Not allowed: &nbsp;&nbsp; <tt>2.5, -0.33333, 3.14159/3, 0.707106/2, 2^(0.5)</tt>
+</blockquote>
+</li>
+
+<li><u>Sometimes a mixed fraction is required:</u>
+<blockquote>Enter <tt>1 2/3</tt> (for 1 and 2/3) with a space between the 1 and the 2 instead of <tt>5/3</tt></blockquote>
+</li>
+
+<li><u>Sometimes, you must make an integer into a fraction:</u>
+<blockquote>Enter <tt>4/1</tt> instead of <tt>4</tt></blockquote>
+</li>
+
+<li><u>If there is more than one correct answer, enter your answers as a comma separated list.</u>
+<blockquote>
+For example, if your answers are <nobr><tt>-3/2, 4/3, 2pi, e^3, 5</tt></nobr> enter
+<nobr><tt>3/2, 4/3, 2*pi, e^3, 5</tt></nobr>
+</blockquote>
+
+<li><u>If there are no solutions:</u>
+<blockquote>
+Enter &nbsp; <tt>NONE</tt> &nbsp; or &nbsp; <tt>DNE</tt> &nbsp; (this may vary from problem to problem)
+</blockquote>
+</li>
+
+<li><u>Sometimes, certain operations are not allowed.</u>
+<blockquote>Usually, the operations that are not allowed include addition <tt>+</tt>, subtraction <tt>-</tt>, multiplication <tt>*</tt>, and exponentiation <tt>^</tt> (or <tt>**</tt>).  When these operations are not allowed, it is usually because you are expected to be able to simplify your answer, often without using a calculator.</blockquote>
+</li>
+
+<li><u>Sometimes, certain functions are not allowed.</u>  
+<blockquote>Usually, the functions that are not allowed include square root <tt>sqrt( )</tt>, absolute value <tt>| |</tt> (or <tt>abs( )</tt>), as well as other named functions such as <tt>sin( )</tt>, <tt>ln( )</tt>, etc.  When these functions are not allowed, it is usually because you are expected to be able to simplify your answer, often without using a calculator.</blockquote>
+</li>
+
+</ul>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/htdocs/helpFiles/Entering-Inequalities.html b/htdocs/helpFiles/Entering-Inequalities.html
new file mode 100644
index 0000000000..03fe890589
--- /dev/null
+++ b/htdocs/helpFiles/Entering-Inequalities.html
@@ -0,0 +1,73 @@
+<html>
+
+<body>
+
+<center>
+<b><font size="+2">Entering inequalities</font></b>
+</center>
+
+<ul type="square">
+
+<li><u>Types of operators:</u>
+<blockquote>
+<table border="0" cellspacing="2">
+<tr><td><tt>&lt;</tt></td><td>&nbsp;&nbsp;&nbsp; less than</td></tr>
+<tr><td><tt>&lt;=</tt></td><td>&nbsp;&nbsp;&nbsp; less than or equal to (&nbsp; <tt>=&lt;</tt> &nbsp; might also work)</td></tr>
+<tr><td><tt>=</tt></td><td>&nbsp;&nbsp;&nbsp; equals</td></tr>
+<tr><td><tt>!=</tt></td><td>&nbsp;&nbsp;&nbsp; not equal to (uses exclamation point)</td></tr>
+<tr><td><tt>&gt;</tt></td><td>&nbsp;&nbsp;&nbsp; greater than</td></tr>
+<tr><td><tt>&gt;=</tt></td><td>&nbsp;&nbsp;&nbsp; greater than or equal to (&nbsp; <tt>=&gt;</tt> &nbsp; might also work)</td></tr>
+</table>
+</blockquote>
+</li>
+
+<li><u>Special symbols:</u>
+<blockquote>
+<tt>infinity</tt> &nbsp;&nbsp;or&nbsp;&nbsp; <tt>inf</tt> &nbsp;&nbsp;means positive infinity<br />
+<tt>-infinity</tt> &nbsp;&nbsp;or&nbsp;&nbsp; <tt>-inf</tt> &nbsp;&nbsp;means negative infinity<br />
+<tt>R</tt> &nbsp;&nbsp;means all real numbers<br />
+<tt>R</tt> &nbsp;&nbsp;is the same as&nbsp;&nbsp; <tt>-inf < x < inf</tt> &nbsp;&nbsp;or&nbsp;&nbsp; <tt>(-inf,inf)</tt><br />
+<tt>{2,4,5}</tt> &nbsp;&nbsp;using curly braces denotes a finite set<br /> 
+<tt>NONE</tt> &nbsp;&nbsp;or a pair of curly braces&nbsp;&nbsp; <tt>{}</tt> &nbsp;&nbsp;means the empty set<br />
+<tt>U</tt> &nbsp;&nbsp;denotes the union of intervals
+</blockquote>
+</li>
+
+<li><u>Entering answers using inequality or interval notation:</u>
+<blockquote>
+<table border="1" cellspacing="0" cellpadding="5">
+<tr><td>Inequality<br />Notation</td><td><font color="#FF0000">* </font>Interval<br />Notation</td><td>Remarks</td></tr>
+<tr><td><tt>x&LT;2</tt></td><td><tt>(-infinity,2)</tt></td>
+    <td>Use rounded parentheses <nobr><tt>(</tt> &nbsp;&nbsp;or&nbsp;&nbsp; <tt>)</tt></nobr> at infinite endpoints</td></tr>
+<tr><td><tt>x&GT;2</tt></td><td><tt>(2,infinity)</tt></td><td>&nbsp;</td></tr>
+<tr><td><tt>x&LT;=2</tt></td><td><tt>(-infinity,2]</tt></td><td>&nbsp;</td></tr>
+<tr><td><tt>x&GT;=2</tt></td><td><tt>[2,infinity)</tt></td><td>&nbsp;</td></tr>
+<tr><td><tt>0&LT;x&LT;=2</tt></td><td><tt>(0,2]</tt></td><td>&nbsp;</td></tr>
+<tr><td><nobr><tt>0&LT;x and x&LT;2</tt></nobr></td><td><tt>(0,2)</tt></td>
+    <td><tt>and</tt> &nbsp;&nbsp;is special</td></tr>
+<tr><td><nobr><tt>x&LT;0 or x&GT;2</tt></nobr></td><td><tt>(-inf,0)U(2,inf)</tt></td>
+    <td><tt>or</tt> &nbsp;&nbsp;is special<br /><tt>U</tt> &nbsp;&nbsp;denotes union</td></tr>
+<tr><td><nobr><tt>x=0 or x=2</tt></nobr></td><td><tt>{0,2}</tt></td>
+    <td>finite sets are allowed using curly braces&nbsp;&nbsp; <tt>{a,b,c}</tt></td></tr>
+<tr><td><nobr><tt>x<3 or x>3</tt></nobr></td><td><tt>(-inf,3)U(3,inf)</tt><br /><tt>x != 3</tt><br /><tt>R-{3}</tt></td><td>set differences are allowed</td></tr>
+</table>
+<br />
+<font color="#FF0000">* Some questions may not allow interval notation to be used</font>
+</blockquote>
+</li>
+
+<li><u>Tips for entering inequalities and intervals:</u>
+<blockquote>
+If an interval includes an endpoint, use square brackets: <nobr><tt>[</tt> &nbsp;&nbsp;or&nbsp;&nbsp; <tt>]</tt></nobr><br /><br />
+If an interval excludes an endpoint or an endpoint is infinite, use rounded parentheses: <nobr><tt>(</tt> &nbsp;&nbsp;or&nbsp;&nbsp; <tt>)</tt></nobr><br /><br />
+Use curly braces to enclose finite sets and commas to separate elements the set: <nobr><tt>{ -3, pi, 2/5, 0.75 }</tt></nobr><br /><br />
+All sets should be expressed in their simplest form in interval notation with no overlapping intervals.  For example,&nbsp;&nbsp; <tt>[2,4]U[3,5]</tt> &nbsp;&nbsp;is not equivalent to&nbsp;&nbsp; <tt>[2,5]</tt></br /><br />
+If you are asked to find the range of a function <tt>y = f(x)</tt>, your inequality should be in terms of the variable <tt>y</tt>
+</blockquote>
+</li>
+
+</ul>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/htdocs/helpFiles/Entering-Intervals.html b/htdocs/helpFiles/Entering-Intervals.html
new file mode 100644
index 0000000000..607c0c81c7
--- /dev/null
+++ b/htdocs/helpFiles/Entering-Intervals.html
@@ -0,0 +1,73 @@
+<html>
+<head>
+<title>WeBWorK Help: Interval Notation</title>
+</head>
+<body bgcolor=#ffffff text=#000000 link=#0000cc
+vlink=#551a8b alink=#ff0000 onLoad=sf()>
+
+<h4 align="center">
+Using Interval Notation
+</h4>
+
+<ul>
+
+<li> If an endpoint is included, then use <tt>[</tt> or <tt>]</tt>.
+If not, then use <tt>(</tt> or <tt>)</tt>.  For example, the interval
+from -3 to 7 that includes 7 but not -3 is expressed <tt>(-3,7]</tt>.
+
+
+<br>
+<br>
+
+<li> For infinite intervals, use <tt>Inf</tt>
+for <font size="+2">&#8734;</font> (infinity) and/or
+<tt>-Inf</tt> for <font size="+2">-&#8734;</font> (-Infinity).  For
+example, the infinite interval containing all points greater than or
+equal to 6 is expressed <tt>[6,Inf)</tt>.
+
+
+<br>
+<br>
+
+<li> If the set includes more than one interval, they are joined using the union
+symbol U.  For example, the set consisting of all points in (-3,7] together with all points in [-8,-5) is expressed <code>[-8,-5)U(-3,7]</code>.
+
+<br>
+<br>
+
+<li> If the answer is the empty set, you can specify that by using
+     braces with nothing inside: <code> { } </code>
+
+<br>
+
+<br>
+
+<li> You can use <code>R</code> as a shorthand for all real numbers.
+  So, it is equivalent to entering <code>(-Inf, Inf)</code>.
+
+<br>
+<br>
+
+<li> You can use set difference notation.  So, for all real numbers
+  except 3, you can use <code>R-{3}</code> or
+  <code>(-Inf, 3)U(3,Inf)</code> (they are the same).  Similarly,
+  <code>[1,10)-{3,4}</code> is the same as <code>[1,3)U(3,4)U(4,10)</code>.
+
+
+<br>
+<br>
+
+
+<li> WeBWorK will <b>not</b> interpret <tt>[2,4]U[3,5]</tt> as equivalent
+ to <tt>[2,5]</tt>, unless a problem tells you otherwise.  
+All sets should be expressed in their simplest interval notation form, with no 
+overlapping intervals.
+
+</ul>
+
+<script language="JavaScript">
+document.write(" <center> <p><input type=\"button\" value=\"Close this window\" name=\"close\" onClick=\"window.close()\"></p> </center> ");
+
+</script>
+
+</body></html>
diff --git a/htdocs/helpFiles/Entering-Limits.html b/htdocs/helpFiles/Entering-Limits.html
new file mode 100644
index 0000000000..6b3f3ac6ef
--- /dev/null
+++ b/htdocs/helpFiles/Entering-Limits.html
@@ -0,0 +1,59 @@
+<html>
+
+<body>
+
+<center>
+<b><font size="+2">Entering Limits</font></b>
+</center>
+
+<ul type="square">
+
+<li><u>Limits whose values are numbers:</u>
+<blockquote>
+For example, lim<sub>x &rarr; &infin;</sub> arctan(x) = &pi;/2, so you would enter &nbsp; <tt>pi/2</tt> 
+</blockquote>
+</li>
+
+<li><u>Limits whose values are infinite:</u>
+<blockquote>
+Enter &nbsp; <tt>infinity</tt>, &nbsp; <tt>inf</tt>, &nbsp; <tt>-infinity</tt>, &nbsp; <tt>-inf</tt>
+</blockquote>
+</li>
+
+<li><u>Limits that don't exist:</u>
+<blockquote>
+Enter &nbsp; <tt>DNE</tt> &nbsp; or &nbsp; <tt>NONE</tt> &nbsp; (this may vary from question to question)
+</blockquote>
+</li>
+
+<li><u>Limits whose value is a function:</u>
+<blockquote>
+Enter the function using appropriate syntax, for example:<br />
+<tt>sqrt(x) = x^(1/2)</tt>, <tt>abs(x) = | x |</tt><br />
+<tt>2^x, e^x, ln(x), log10(x)</tt> <br />
+<tt>sin(x), cos(x), tan(x), csc(x), sec(x), cot(x)</tt><br />
+<tt>arcsin(x) = asin(x) = sin^(-1)(x)</tt><br /> 
+<tt>arccos(x) = acos(x) = cos^(-1)(x)</tt><br />
+<tt>arctan(x) = atan(x) = tan^(-1)(x)</tt><br />
+</blockquote>
+</li>
+
+<li><u>Sometimes answers must be simplified:</u>
+<blockquote>
+For example, &nbsp; <tt>6x+5-2x+7</tt> &nbsp; should be simplified to &nbsp; <tt>4x+12</tt>
+</blockquote>
+</li>
+
+<li><u>Sometimes, certain operations are not allowed.</u>
+<blockquote>Usually, the operations that are not allowed include addition <tt>+</tt>, subtraction <tt>-</tt>, multiplication <tt>*</tt>, division <tt>/</tt>, and exponentiation <tt>^</tt> (or <tt>**</tt>).  When these operations are not allowed, it is usually because you are expected to be able to simplify your answer, often without using a calculator.</blockquote>
+</li>
+
+<li><u>Sometimes, certain functions are not allowed.</u>  
+<blockquote>Usually, the functions that are not allowed include square root <tt>sqrt( )</tt>, absolute value <tt>| |</tt> (or <tt>abs( )</tt>), as well as other named functions such as <tt>sin( )</tt>, <tt>ln( )</tt>, etc.  When these functions are not allowed, it is usually because you are expected to be able to simplify your answer, often without using a calculator.</blockquote>
+</li>
+
+</ul>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/htdocs/helpFiles/Entering-Logarithms.html b/htdocs/helpFiles/Entering-Logarithms.html
new file mode 100644
index 0000000000..45fac2d0ee
--- /dev/null
+++ b/htdocs/helpFiles/Entering-Logarithms.html
@@ -0,0 +1,55 @@
+<html>
+
+<body>
+
+<center>
+<b><font size="+2">Entering Logarithms</font></b>
+</center>
+
+<ul type="square">
+
+<li><u>Entering natural logarithms:</u> &nbsp; <tt>ln(x)</tt> &nbsp; or &nbsp; <tt>log(x)</tt>
+<blockquote>
+The default is that &nbsp; <tt>ln(x)</tt> &nbsp; and &nbsp; <tt>log(x)</tt> &nbsp; are <b>both</b> the natural log function.  (Although unlikely, your professor may have changed the default setting for your course.)
+</blockquote>
+</li>
+
+<li><u>Entering base 10 logarithms:</u> &nbsp; <tt>log10(x)</tt> &nbsp; or &nbsp; <tt>logten(x)</tt>
+<blockquote>
+The default is that &nbsp; <tt>log10(x)</tt> &nbsp; and &nbsp; <tt>logten(x)</tt> &nbsp; are <b>both</b> the base 10 logarithm function.  (Although unlikely, your professor may have changed the default setting for your course.)
+</blockquote>
+</li>
+
+<li><u>Entering logarithms base b:</u>  &nbsp; <tt>ln(x)/ln(b)</tt> &nbsp; or &nbsp; <tt>log10(x)/log10(b)</tt>
+<blockquote>
+WeBWorK does not recognize logarithms to other bases, so you must use the change of base formula for logarithms to enter your answer.  For example, enter log base 2 of x as 
+<br /><br />
+<tt>ln(x)/ln(2)</tt> &nbsp;&nbsp; or &nbsp;&nbsp; <tt>log10(x)/log10(2)</tt>
+</blockquote>
+</li>
+
+<li><u>Put parentheses around the arguments to logs:</u>
+<blockquote>
+<tt>ln(2x+8)</tt> &nbsp; and &nbsp; <tt>ln2x+8 = ln(2)*x+8</tt> &nbsp; are very different.
+</blockquote>
+</li>
+
+<li><u>Sometimes logarithms must be simplified or expanded:</u>
+<blockquote>
+For example, the required answer may be &nbsp; <tt>ln(6) + ln(x)</tt> &nbsp; or &nbsp; <tt>ln(6x)</tt>
+</blockquote>
+</li>
+
+<li><u>Sometimes, certain operations are not allowed.</u>
+<blockquote>Usually, the operations that are not allowed include addition <tt>+</tt>, subtraction <tt>-</tt>, multiplication <tt>*</tt>, division <tt>/</tt>, and exponentiation <tt>^</tt> (or <tt>**</tt>).  When these operations are not allowed, it is usually because you are expected to be able to simplify your answer, often without using a calculator.</blockquote>
+</li>
+
+<li><u>Sometimes, certain functions are not allowed.</u>  
+<blockquote>Usually, the functions that are not allowed include square root <tt>sqrt( )</tt>, absolute value <tt>| |</tt> (or <tt>abs( )</tt>), as well as other named functions such as <tt>sin( )</tt>, <tt>ln( )</tt>, etc.  When these functions are not allowed, it is usually because you are expected to be able to simplify your answer, often without using a calculator.</blockquote>
+</li>
+
+</ul>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/htdocs/helpFiles/Entering-Numbers.html b/htdocs/helpFiles/Entering-Numbers.html
new file mode 100644
index 0000000000..42ddd5d68d
--- /dev/null
+++ b/htdocs/helpFiles/Entering-Numbers.html
@@ -0,0 +1,43 @@
+<html>
+
+<body>
+
+<center>
+<b><font size="+2">Entering numbers</font></b>
+</center>
+
+<ul type="square">
+
+<li><u>Examples of (real) numbers include:</u>
+<blockquote><tt>4, 5/2, -1/3, pi/3, e^3, 3.1415926535, sqrt(2) = 2^(1/2), ln(2), sin(2pi/3)</tt></blockquote>
+</li>
+
+<li><u>If there is more than one correct answer, enter your answers as a comma separated list.</u>
+<blockquote>
+For example, enter &nbsp; <nobr><tt>-1.5, 4/3, 2pi, e^3, 5</tt></nobr><br />
+Do not use commas in large numbers: enter &nbsp; <tt>4321</tt> &nbsp; (not &nbsp; <tt>4,321</tt>)
+</blockquote>
+
+<li><u>If there are no solutions:</u>
+<blockquote>
+Enter &nbsp; <tt>NONE</tt> &nbsp; or &nbsp; <tt>DNE</tt> &nbsp; (this may vary from problem to problem)
+</blockquote>
+</li>
+
+<li><u>If your answer is a decimal, give at least 5 decimal places.</u>
+<blockquote>Typically, if your answer is correct to 5 decimal places it will be marked correct, although the number of decimal places required may vary from problem to problem.  When in doubt, give more decimal places.</blockquote>
+</li>
+
+<li><u>Sometimes, fractions and certain operations are not allowed.</u>
+<blockquote>Usually, the operations that are not allowed include addition <tt>+</tt>, subtraction <tt>-</tt>, multiplication <tt>*</tt>, division <tt>/</tt>, and exponentiation <tt>^</tt> (or <tt>**</tt>).  When these operations are not allowed, it is usually because you are expected to be able to simplify your answer, often without using a calculator.</blockquote>
+</li>
+
+<li><u>Sometimes, certain functions are not allowed.</u>  
+<blockquote>Usually, the functions that are not allowed include square root <tt>sqrt( )</tt>, absolute value <tt>| |</tt> (or <tt>abs( )</tt>), as well as other named functions such as <tt>sin( )</tt>, <tt>ln( )</tt>, etc.  When these functions are not allowed, it is usually because you are expected to be able to simplify your answer, often without using a calculator.</blockquote>
+</li>
+
+</ul>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/htdocs/helpFiles/Entering-Points.html b/htdocs/helpFiles/Entering-Points.html
new file mode 100644
index 0000000000..fb2212e633
--- /dev/null
+++ b/htdocs/helpFiles/Entering-Points.html
@@ -0,0 +1,48 @@
+<html>
+
+<body>
+
+<center>
+<b><font size="+2">Entering Points</font></b>
+</center>
+
+<ul type="square">
+
+<li><u>A point must use parentheses and commas:</u>
+<blockquote>
+<tt>(4.5, 3/7)</tt> &nbsp; is a valid point in 2 dimensions<br />
+<tt>(pi,e,2)</tt> &nbsp; is a valid point in 3 dimensions 
+</blockquote>
+</li>
+
+<li><u>If the answer is more than one point:</u>
+<blockquote>
+Enter your answer as a comma-separated list of points, for example: &nbsp;&nbsp;
+<tt>(4,3), (5,10)</tt> 
+</blockquote>
+</li>
+
+<li><u>If there are no solutions:</u>
+<blockquote>
+Enter &nbsp; <tt>NONE</tt> &nbsp; or &nbsp; <tt>DNE</tt> &nbsp; (this may vary from problem to problem)
+</blockquote>
+</li>
+
+<li><u>Examples of constants used in points:</u>
+<blockquote><tt>pi</tt>, <tt>e = e^1</tt></blockquote>
+</li>
+
+<li><u>Functions may be used in each coordinate of a point, but may not be applied across the parentheses or commas:</u>
+<blockquote>
+<tt>(sqrt(2),sqrt(5))</tt> &nbsp; is valid, but &nbsp; <tt>(sqrt(2,5))</tt> &nbsp; is not
+<br /> 
+<br />
+<a href="http://webwork.maa.org/wiki/Available_Functions" target="_new">Link to a list of all available functions</a>
+</blockquote>
+</li>
+
+</ul>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/htdocs/helpFiles/Entering-Syntax.html b/htdocs/helpFiles/Entering-Syntax.html
new file mode 100644
index 0000000000..43fee3f495
--- /dev/null
+++ b/htdocs/helpFiles/Entering-Syntax.html
@@ -0,0 +1,147 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+        "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title>Syntax for entering answers to WeBWorK</title>
+	<meta name="generator" content="BBEdit 8.7">
+</head>
+<body>
+<h1 id="firstHeading">Syntax for entering answers to WeBWorK</h1>
+
+
+<h4> <span class="mw-headline">Mathematical Symbols Available In WeBWorK</span></h4>
+
+<ul><li> + Addition
+</li><li> - Subtraction
+</li><li> * Multiplication can also be indicated by a space or juxtaposition, e.g. 2x, 2 x or 2*x, also 2(3+4).
+</li><li> / Division
+</li><li> ^ or ** You can use either ^ or ** for exponentiation, e.g. 3^2 or 3**2
+</li><li> Parentheses: () - You can also use square brackets, [ ], and braces, { }, for grouping, e.g. [1+2]/[3(4+5)]
+</li></ul>
+<a name="Syntax_for_entering_expressions"></a><h4> <span class="mw-headline">Syntax for entering expressions</span></h4>
+<ul><li> Be careful entering expressions just as you would be careful entering expressions in a calculator.
+
+</li><li> <b>Use the "Preview Button" to see exactly how your entry
+looks. E.g. to tell the difference between 1+2/3*4 and [1+2]/[3*4]
+click the "Preview Button".</b>
+</li><li> Sometimes using the * symbol to indicate mutiplication makes
+things easier to read. For example (1+2)*(3+4) and (1+2)(3+4) are both
+valid. So are 3*4 and 3&nbsp;4 (3 space 4, not 34) but using a * makes
+things clearer.
+</li><li> Use ('s and )'s to make your meaning clear. You can also use ['s and ]'s and {'s and }'s.
+</li><li> Don't enter 2/4+5 (which is 5.5) when you really want 2/(4+5) (which is 2/9).
+</li><li> Don't enter 2/3*4 (which is 8/3) when you really want 2/(3*4) (which is 2/12).
+</li><li> Entering big quotients with square brackets, e.g. [1+2+3+4]/[5+6+7+8], is a good practice.
+</li><li> Be careful when entering functions. It's always good practice
+to use parentheses when entering functions. Write sin(t) instead of
+sint or sin t even though WeBWorK is smart enough to <b>usually</b> accept sin t or even sint. For example, sin 2t is interpreted as sin(2)t, i.e. (sin(2))*t so be careful.
+
+</li><li> You can enter sin^2(t) as a short cut although mathematically
+speaking sin^2(t) is shorthand for (sin(t))^2(the square of sin of t).
+(You can enter it as sin(t)^2 or even sint^2, but don't try such things
+unless you <b>really</b> understand the precedence of operations. The
+"sin" operation has highest precedence, so it is performed first, using
+the next token (i.e. t) as an argument. Then the result is squared.)
+You can always use the Preview button to see a typeset version of what
+you entered and check whether what you wrote was what you
+meant.&nbsp;:-)
+</li><li> For example 2+3sin^2(4x) will work and is equivalent to
+2+3(sin(4x))^2 or 2+3sin(4x)^2. Why does the last expression work?
+Because things in parentheses are always done first [ i.e. (4x)], next
+all functions, such as sin, are evaluated [giving sin(4x)], next all
+exponents are taken [giving sin(4x)^2], next all multiplications and
+divisions are performed in order from left to right [giving
+3sin(4x)^2], and finally all additions and subtractions are performed
+[giving 2+3sin(4x)^2].
+</li><li> Is -5^2 positive or negative? It's negative. This is because
+the square operation is done before the negative sign is applied. Use
+(-5)^2 if you want to square negative 5.
+</li><li> When in doubt use parentheses!!!&nbsp;:-)
+</li><li> The complete rules for the precedence of operations, in addition to the above, are
+<ul><li> Multiplications and divisions are performed left to right: 2/3*4 = (2/3)*4 = 8/3.
+
+</li><li> Additions and subtractions are performed left to right: 1-2+3 = (1-2)+3 = 2.
+</li><li> Exponents are taken right to left: 2^3^4 = 2^(3^4) = 2^81 = a big number.
+</li></ul>
+</li><li> <b>Use the "Preview Button" to see exactly how your entry
+looks. E.g. to tell the difference between 1+2/3*4 and [1+2]/[3*4]
+click the "Preview Button".</b>
+</li></ul>
+<a name="Mathematical_Constants_Available_In_WeBWorK"></a><h4> <span class="mw-headline">Mathematical Constants Available In WeBWorK</span></h4>
+<ul><li> pi This gives 3.14159265358979, e.g. cos(pi) is -1
+</li><li> e This gives 2.71828182845905, e.g. ln(e*2) is 1 + ln(2)
+</li></ul>
+
+<a name="Scientific_Notation_Available_In_WeBWorK"></a><h4> <span class="mw-headline">Scientific Notation Available In WeBWorK</span></h4>
+<ul><li> 2.1E2 is the same as  210
+</li><li> 2.1E-2 is the same as .021
+</li></ul>
+<a name="Mathematical_Functions_Available_In_WeBWorK"></a><h4> <span class="mw-headline">Mathematical Functions Available In WeBWorK</span></h4>
+<p>Note that sometimes one or more of these functions is disabled for a WeBWorK problem because the 
+instructor wants you to calculate the answer by some means other than just using the function.
+</p>
+<ul><li> abs( ) The absolute value
+</li><li> cos( ) Note: cos( ) uses radian measure
+
+</li><li> sin( ) Note: sin( ) uses radian measure
+</li><li> tan( ) Note: tan( ) uses radian measure
+</li><li> sec( ) Note: sec( ) uses radian measure
+</li><li> cot( ) Note: cot( ) uses radian measure
+</li><li> csc( ) Note: csc( ) uses radian measure
+</li><li> exp( ) The same function as e^x
+</li><li> log( ) This is usually the natural log but your professor may have redined this as log to the base 10
+</li><li> ln( ) The natural log
+</li><li> logten( ) The log to the base 10
+
+</li><li> arcsin( )
+</li><li> asin( ) or sin^-1() Another name for arcsin
+</li><li> arccos( )
+</li><li> acos( ) or cos^-1() Another name for arccos
+</li><li> arctan( )
+</li><li> atan( ) or tan^-1() Another name for arctan
+</li><li> arccot( )
+</li><li> acot( ) or cot^-1() Another name for arccot
+</li><li> arcsec( )
+
+</li><li> asec( ) or sec^-1() Another name for arcsec
+</li><li> arccsc( )
+</li><li> acsc( ) or csc^-1() Another name for arccsc
+</li><li> sinh( )
+</li><li> cosh( )
+</li><li> tanh( )
+</li><li> sech( )
+</li><li> csch( )
+</li><li> coth( )
+
+</li><li> arcsinh( )
+</li><li> asinh( ) or sinh^-1() Another name for arcsinh
+</li><li> arccosh( )
+</li><li> acosh( ) or cosh^-1()Another name for arccosh
+</li><li> arctanh( )
+</li><li> atanh( ) or tanh^-1()Another name for arctanh
+</li><li> arcsech( )
+</li><li> asech( ) or sech^-1()Another name for arcsech
+</li><li> arccsch( )
+
+</li><li> acsch( ) or csch^-1() Another name for arccsch
+</li><li> arccoth( )
+</li><li> acoth( ) or coth^-1() Another name for arccoth
+</li><li> sqrt( )
+</li><li> n!  (n factorial -- defined for <span class="typeset"><nobr><span class="scale"><span style="position: relative;"><span style="position: absolute; top: -0.131em; left: 0em;"><span class="cmmi10">n</span><span style="position: relative; margin-left: 0.277em;"><span class="cmsy10">Õ</span></span><span style="position: relative; margin-left: 0.277em;"><span class="cmr10">0</span></span>&nbsp;</span><span class="blank" style="width: 2.429em; height: 0.722em; vertical-align: 0.722em;"></span></span><span class="blank" style="height: 0.93em; vertical-align: 0.744em;"></span></span></nobr></span>
+</li><li> These functions may not always be available for every problem.
+<ul><li> sgn( ) The sign function, either -1, 0, or 1
+
+</li><li> step( ) The step function (0 if <span class="typeset"><nobr><span class="scale"><span style="position: relative;"><span style="position: absolute; top: -0.131em; left: 0em;"><span class="cmmi10">x</span><span style="position: relative; margin-left: 0.277em;"><span class="cmmi10">&lt;</span></span><span style="position: relative; margin-left: 0.277em;"><span class="cmr10">0</span></span>&nbsp;</span><span class="blank" style="width: 2.429em; height: 0.722em; vertical-align: 0.722em;"></span></span><span class="blank" style="height: 0.833em; vertical-align: 0.744em;"></span></span></nobr></span>, 1 if <span class="typeset"><nobr><span class="scale"><span style="position: relative;"><span style="position: absolute; top: -0.131em; left: 0em;"><span class="cmmi10">x</span><span style="position: relative; margin-left: 0.277em;"><span class="cmsy10">Õ</span></span><span style="position: relative; margin-left: 0.277em;"><span class="cmr10">0</span></span>&nbsp;</span><span class="blank" style="width: 2.429em; height: 0.722em; vertical-align: 0.722em;"></span></span><span class="blank" style="height: 0.93em; vertical-align: 0.744em;"></span></span></nobr></span>)
+</li><li> fact(n) The factorial function n! (defined only for nonnegative integers)
+</li><li> P(n,k) = n*(n-1)*(n-2)...(n-k+1) the number of ordered sequences of k elements chosen from n elements
+</li><li> C(n,k) = "n choose k" the number of unordered sequences of k elements chosen from n elements
+</li></ul>
+</li></ul>
+
+For more information:
+
+<a href="http://webwork.maa.org/wiki/Available_Functions">http://webwork.maa.org/wiki/Available_Functions</a>
+
+
+</body>
+</html>
diff --git a/htdocs/helpFiles/Entering-Units.html b/htdocs/helpFiles/Entering-Units.html
new file mode 100644
index 0000000000..4bd5978637
--- /dev/null
+++ b/htdocs/helpFiles/Entering-Units.html
@@ -0,0 +1,96 @@
+<!DOCTYPE HTML PUBtr><tdC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head><Title>WeBWorK Help: Units</title>
+  
+  <style type="text/css"><p>
+
+  </style>
+  
+  </head>
+  <body bgcolor="#FFFFFF" alink="#FF0000" vlink="#800080" link="#0000FF" text="#000000">
+    <p align="center">
+
+<p >
+      
+
+<H4 align="center">Units Available in WeBWorK</H4><p><p>
+<p>
+Some WeBWorK problems ask for answers with units.  Below is a list of basic units
+and how they need to be abbreviated in WeBWorK answers.  In some problems, you
+may need to combine units (e.g, velocity might be in <code>ft/s</code> for feet per
+second).
+<center>
+<table border="1" cellpadding="4">
+<tr> <th> Unit <th> Abbreviation
+<tr><td colspan="2" align="center"><b>Time</b>
+<tr><td> Seconds  <td align="center">  s
+
+<tr><td> Minutes  <td align="center">  min
+<tr><td> Hours  <td align="center">  hr
+<tr><td> Days  <td align="center">  day
+<tr><td> Years  <td align="center">  year
+<tr><td> Milliseconds  <td align="center">  ms
+
+
+<tr><td colspan="2" align="center"><b>Distance</b>
+<tr><td> Feet  <td align="center">  ft
+<tr><td> Inches  <td align="center">  in
+<tr><td> Miles  <td align="center">  mi
+<tr><td> Meters  <td align="center">  m
+
+<tr><td> Centimeters  <td align="center">  cm
+<tr><td> Millimeters  <td align="center">  mm
+<tr><td> Kilometers  <td align="center">  km
+<tr><td> Angstroms  <td align="center">  A
+<tr><td> Light years  <td align="center">  light-year
+
+
+<tr><td colspan="2" align="center"><b>Mass</b>
+<tr><td> Grams  <td align="center">  g
+<tr><td> Kilograms  <td align="center">  kg
+<tr><td> Slugs  <td align="center">  slug
+
+<tr><td colspan="2" align="center"><b>Volume</b>
+<tr><td> Liters  <td align="center">  L
+
+<tr><td> Cubic Centimeters  <td align="center">  cc
+<tr><td> Milliliters  <td align="center">  ml
+
+<tr><td colspan="2" align="center"><b>Force</b>
+<tr><td> Newtons  <td align="center">  N
+<tr><td> Dynes  <td align="center">  dyne
+
+<tr><td> Pounds  <td align="center">  lb
+<tr><td> Tons  <td align="center">  ton
+
+<tr><td colspan="2" align="center"><b>Work/Energy</b>
+<tr><td> Joules  <td align="center">  J
+<tr><td> kilo Joule  <td align="center">  kJ
+
+<tr><td> ergs  <td align="center">  erg
+<tr><td> foot pounds  <td align="center">  lbf
+<tr><td> calories  <td align="center">  cal
+<tr><td> kilo calories  <td align="center">  kcal
+<tr><td> electron volts  <td align="center">  eV
+
+<tr><td> kilo Watt hours  <td align="center">  kWh
+
+<tr><td colspan="2" align="center"><b>Misc</b>
+<tr><td> Amperes  <td align="center">  amp
+<tr><td> Moles  <td align="center">  mol
+<tr><td> Degrees Centrigrade  <td align="center">  degC
+
+<tr><td> Degrees Fahrenheit  <td align="center">  degF
+<tr><td> Degrees Kelvin  <td align="center">  degK
+<tr><td> Angle degrees <td align="center">  deg
+<tr><td> Angle radians <td align="center">  rad
+
+</table>
+
+
+</center>
+<script language="JavaScript">
+document.write(" <center> <p><input type=\"button\" value=\"Close this window\" name=\"close\" onClick=\"window.close()\"></p> </center> ");
+</script>
+    </body>
+  </html>
diff --git a/htdocs/helpFiles/Entering-Vectors.html b/htdocs/helpFiles/Entering-Vectors.html
new file mode 100644
index 0000000000..edb5f7ad34
--- /dev/null
+++ b/htdocs/helpFiles/Entering-Vectors.html
@@ -0,0 +1,56 @@
+<html>
+
+<body>
+
+<center>
+<b><font size="+2">Entering Vectors</font></b>
+</center>
+
+<ul type="square">
+
+<li><u>Predefined vectors i, j, and k</u>
+<blockquote>
+<tt>i</tt> &nbsp; is the same as &nbsp; <tt>&lt;1,0,0&gt;</tt><br />
+<tt>j</tt> &nbsp; is the same as &nbsp; <tt>&lt;0,1,0&gt;</tt><br />
+<tt>k</tt> &nbsp; is the same as &nbsp; <tt>&lt;0,0,1&gt;</tt><br />
+</blockquote>
+</li>
+
+<li><u>A vector may be entered using angle brackes and commas, or adding multiples of i, j, and k:</u>
+<blockquote>
+<tt>&lt;4.5, 3/7&gt;</tt> &nbsp; and &nbsp; <tt>4.5i + 3/7j</tt> &nbsp; are valid vectors in 2 dimensions<br />
+<tt>&lt;pi,e,2&gt;</tt> &nbsp; and &nbsp; <tt>pi i + e j + 2 k</tt> &nbsp; are valid vectors in 3 dimensions 
+</blockquote>
+</li>
+
+<li><u>If the answer is more than one vector:</u>
+<blockquote>
+Enter your answer as a comma-separated list of vectors, for example: &nbsp;&nbsp;
+<tt>&lt;4,3&gt;, &lt;5,10&gt;</tt> 
+</blockquote>
+</li>
+
+<li><u>If there are no solutions:</u>
+<blockquote>
+Enter &nbsp; <tt>NONE</tt> &nbsp; or &nbsp; <tt>DNE</tt> &nbsp; (this may vary from problem to problem)
+</blockquote>
+</li>
+
+<li><u>Examples of constants used in vectors:</u>
+<blockquote><tt>pi</tt>, <tt>e = e^1</tt></blockquote>
+</li>
+
+<li><u>Functions may be used in each coordinate of a vector, but may not be applied across the parentheses or commas:</u>
+<blockquote>
+<tt>&lt;sqrt(2),sqrt(5)&gt;</tt> &nbsp; is valid, but &nbsp; <tt>&lt;sqrt(2,5)&gt;</tt> &nbsp; is not
+<br /> 
+<br />
+<a href="http://webwork.maa.org/wiki/Available_Functions" target="_new">Link to a list of all available functions</a>
+</blockquote>
+</li>
+
+</ul>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/htdocs/helpFiles/Grades.html b/htdocs/helpFiles/Grades.html
new file mode 100644
index 0000000000..4560895fd9
--- /dev/null
+++ b/htdocs/helpFiles/Grades.html
@@ -0,0 +1,31 @@
+<html>
+<!--
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/htdocs/helpFiles/Grades.html,v 1.2 2006/01/25 23:13:50 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+-->
+<head>
+<title>Student Grades Help Page</title>
+</head>
+
+<body><br>
+<p>
+<p>The "Ind" column is :  (totalNumberOfCorrectProblems / totalNumberOfProblems)^2/ AvgNumberOfAttemptsPerProblem), which is a more 
+useful number when it comes to summarizing how well you are doing.
+</p>
+<p>In the problems section of the chart the upper letter represents whether or not the problem was answered correctly (C for 
+correct) and the lower number is the number of times the problem was attempted.</p>
+</body>
+</html>
diff --git a/htdocs/helpFiles/InstructorAddUsers.html b/htdocs/helpFiles/InstructorAddUsers.html
new file mode 100644
index 0000000000..cd65d30ed0
--- /dev/null
+++ b/htdocs/helpFiles/InstructorAddUsers.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html
+	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+	
+<!--
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/htdocs/helpFiles/InstructorAddUsers.html,v 1.2 2006/01/25 23:13:50 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
+<head>
+<title>Add User Help Page</title>
+</head>
+
+<body><br>
+<h3>Add User Help Page</h3>
+<p>The number of rows can be changed by changing the number in the text box and hitting the "create" button, but be careful, 
+once some information is entered do not change the number of rows or all the text in the boxes will be lost.</p>
+<p>The only mandatory information is the "login" and the "Student ID", the Student ID will be the student's initial password.</p>
+<p> Any other boxes may be left blank, but it may be useful to fill in section and recitation as they can be used to seperate 
+scores later on.</p>
+<p>Multiple sets may be given to the user by holding down the shift key while selecting from the list.</p>
+
+</body>
+</html>
diff --git a/htdocs/helpFiles/InstructorAssigner.html b/htdocs/helpFiles/InstructorAssigner.html
new file mode 100644
index 0000000000..8f23707b0c
--- /dev/null
+++ b/htdocs/helpFiles/InstructorAssigner.html
@@ -0,0 +1,27 @@
+<html>
+<!--
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/htdocs/helpFiles/InstructorAssigner.html,v 1.2 2006/01/25 23:13:50 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+-->
+<head>
+<title>Set Assigner Help Page</title>
+</head>
+
+<body><br>
+<p>Either list can be reordered by changing the criteria and pushing the button. Then multiple sets can be assigned to a user, or 
+multiple users to a set.</p>
+</body>
+</html>
diff --git a/htdocs/helpFiles/InstructorConfig.html b/htdocs/helpFiles/InstructorConfig.html
new file mode 100644
index 0000000000..6ff1c68963
--- /dev/null
+++ b/htdocs/helpFiles/InstructorConfig.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html
+	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+	
+<!--
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/htdocs/helpFiles/InstructorConfig.html,v 1.2 2006/01/25 23:13:50 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
+<head>
+<title>Course Configuration Help Page</title>
+</head>
+<body>
+<blockquote>
+<p>
+This page allows you to configuration of certain parameters, such as 
+<ul>
+	<li>permission levels, </li>
+	<li>display modes allowed </li>
+	<li>default display mode </li>
+	<li>and email feedback behavior, </li>
+</ul>
+on a course by course basis.
+</p>
+
+<p>
+Click on each of the tabs to view the configuration items.  The question
+mark icon provides access to information about the behavior of the configuration
+settings.
+</p>
+
+
+</blockquote>
+</body>
+</html>
diff --git a/htdocs/helpFiles/InstructorFileManager.html b/htdocs/helpFiles/InstructorFileManager.html
new file mode 100644
index 0000000000..847a0172fb
--- /dev/null
+++ b/htdocs/helpFiles/InstructorFileManager.html
@@ -0,0 +1,92 @@
+<!DOCTYPE html
+	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+	
+<!--
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/htdocs/helpFiles/InstructorFileManager.html,v 1.3 2006/08/26 17:42:51 gage 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
+<head>
+<title>File Manager Help Page</title>
+</head>
+
+<body><br>
+<h3>File Manager Help Page</h3>
+
+<p align="left">
+The File Manager module will soon replace the File Transfer module.  We'll keep
+both available for the time being.
+<p>
+Locations of files:
+<dl>
+	<dt>Set definition (".def") files</dt>
+		<dd>These are stored in the templates directory.  To view the format for 
+		<strong>Set Definition files</strong> see
+		<a href="http://webwork.math.rochester.edu/docs/docs/courseadmin/setdefinitionformat.html" target="Webworkdocs">Set Definition specification </a>
+		or download set0.def and copy that. Set definition files are mainly
+		useful for transferring set assignments from one course to another.
+		(For example from a calculus course taught the previous year.)They contain a
+		list of problems used and the dates and times.
+		These definitions can be imported into the current course and a set in the current course
+		can be exported to a set definition files.</dd>
+	<dt>Class list (".lst") files</dt>
+		<dd>The classlist files are stored in the templates directory and provide
+		a convenient way to enter a large number of students into your
+		class. To view the format for <strong>ClassList files</strong> see
+		<a href="http://webwork.maa.org/wiki/Classlist_Files#Format_of_classlist_files" target="Webworkdocs">ClassList specification</a>
+		or download demoCourse.lst and use it as a model. 
+		ClassList files can be
+		prepared using a spreadsheet and then saved as .csv (comma separated
+		variables) text files. </dd>
+	<dt>Scoring (".csv") files</dt>
+		<dd>The scoring files are stored in the scoring directory and are produced 
+		using the "Scoring" module or the scoring command in the "Instructor Tools" module.
+		These files can be downloaded, modified in a spread sheet (for example, add midterm scores)
+		and then uploaded again to the scoring directory to be merged with email messages. (Use
+		a new file name, other than courseName_totals.csv, when uploading to prevent the 
+		scoring module from overwriting an uploaded file.)
+		)
+		</dd>
+	<dt>Problem template (".pg") files</dt>
+		<dd>These provide the template from which are problems are created and 
+		are located in the template directory.   They can be edited directly using
+		the "edit problem" link on each problem page. The File Manager allows you to
+		upload or download these files so that you can save them on your desktop.</dd>
+	<dt>html directory</dt>
+		<dd>This directory is accessible from the web. You can use it to store html documents
+		or image documents that are used by the course.  Do not store private information in
+		this directory or in any subdirectory.These documents can be pointed to from within
+		problems using the htmlLink macro</dd>
+	<dt>templates/email directory</dt>
+		<dd>This is where email messages are saved.  You can upload or download files in 
+		this directory if you wish to save the files for later.</dd>
+	<dt>templates/macros directory</dt>
+		<dd>Macro (".pl") files containing favorite macros for your course can be stored here. Those
+		being used for many courses should be stored in pg/macros.</dd>
+</dl>
+
+
+</p>
+  
+
+<p align="left">
+
+</p>
+
+
+</body>
+</html>
diff --git a/htdocs/helpFiles/InstructorFileTransfer.html b/htdocs/helpFiles/InstructorFileTransfer.html
new file mode 100644
index 0000000000..3c8c6c7e83
--- /dev/null
+++ b/htdocs/helpFiles/InstructorFileTransfer.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html
+	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+	
+<!--
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/htdocs/helpFiles/InstructorFileTransfer.html,v 1.2 2006/01/25 23:13:50 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
+<head>
+<title>File Transfer Help Page</title>
+</head>
+
+<body><br>
+<h3>File Transfer Help Page</h3>
+
+<p align="left">
+To view the format for <strong>ClassList files</strong> see
+<a href="http://webhost.math.rochester.edu/webworkdocs/discuss/msgReader$59#2397" target="Webworkdocs">ClassList specification</a>
+or download demoCourse.lst and use it as a model. 
+ClassList files can be
+prepared using a spreadsheet and then saved as .csv (comma separated
+variables) text files.
+</p>
+  
+
+<p align="left">
+To view the format for <strong>Set Definition files</strong> see
+<a href="http://webwork.math.rochester.edu/docs/docs/courseadmin/setdefinitionformat.html" target="Webworkdocs">Set Definition specification </a>
+or download set0.def and copy that. Set definition files are mainly
+useful for transferring course assignments from one course to another.
+(For example from a calculus course taught the previous year.)
+</p>
+
+
+</body>
+</html>
diff --git a/htdocs/helpFiles/InstructorIndex.html b/htdocs/helpFiles/InstructorIndex.html
new file mode 100644
index 0000000000..665e6790d6
--- /dev/null
+++ b/htdocs/helpFiles/InstructorIndex.html
@@ -0,0 +1,52 @@
+
+<!DOCTYPE html
+	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+	
+<!--
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/htdocs/helpFiles/InstructorIndex.html,v 1.2 2006/01/25 23:13:50 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
+<head>
+<title>Instructor Tools Help Page</title>
+</head>
+<body>
+
+<h3>Instructor Tools Help Page</h3>
+<blockquote>
+<p>
+This page allows quick access to an individual student's homework set,
+ a homework set for the entire class, or the class roster data for one or more
+ students.  
+</p>
+
+<p>
+It is a collection of short cut techniques which allow you to modify the database with fewer
+page clicks than are required when using the "Class List Editor" and "Hmwk Sets Editor" pages. It is often more efficient because the set and the student can both be selected at the same time.
+</p>
+
+<p>
+New users will probably find it easier to use those two pages until they get used to the information required.
+</p>
+ 
+<p>
+Importing and exporting class lists, and deleting students <strong>must</strong> be done
+from the class list editor.
+</p>
+</blockquote>
+</body>
+</html>
diff --git a/htdocs/helpFiles/InstructorPGProblemEditor.html b/htdocs/helpFiles/InstructorPGProblemEditor.html
new file mode 100644
index 0000000000..005e2b09bd
--- /dev/null
+++ b/htdocs/helpFiles/InstructorPGProblemEditor.html
@@ -0,0 +1,115 @@
+
+<!DOCTYPE html
+	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+	
+<!--
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/htdocs/helpFiles/InstructorPGProblemEditor.html,v 1.4 2007/08/13 22:59:53 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
+<head>
+<title>PG Problem Editor Help Page</title>
+</head>
+<body>
+
+<h3>PG Problem Editor Help Page</h3>
+<blockquote>
+<p>
+This page allows one to edit the contents of PG problem files (templates)
+as well as set headers and other files.
+</p>
+<p>
+When using this page two or more windows may be created -- one to edit the text in the 
+file and one to view the results.  This can be a bit confusing.  If a window seems to 
+have completely disappeared make sure that it is not hiding behind one of the other windows.
+</p>
+<h4>Features:</h4> 
+<dl>
+		
+
+	<dt>| <a href="http://webwork.math.rochester.edu/docs/docs/pglanguage/manpages/">Manpages</a>
+	| <a href="http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/PGmacrosByFile">
+			macro list</a>
+	| <a href="http://webwork.maa.org/wiki/Category:Authors">
+			authoring info and help</a> 
+	|  <a href="http://devel.webwork.rochester.edu/doc/cvs/pg_HEAD/">
+			testing lab</a>
+	| <a href="http://devel.webwork.rochester.edu/doc/cvs/pg_HEAD/">
+			pod docs</a>
+	| <a href="http://bugs.webwork.rochester.edu">Report problem bugs</a> 
+	|</dt>
+		<dd>The first five links are to pages that give some information about writing problems: 
+
+			<dl>
+			<dt><a href="http://webwork.math.rochester.edu/docs/docs/pglanguage/manpages/">Manpages</a></dt>
+				<dd>This links to an (incomplete) list of the most commonly used macros with a description of their parameters and how to use them; </dd>
+			<dt><a href="http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/PGmacrosByFile">
+			macro list</a></dt>
+				<dd>This link provides a complete list of macros;</dd>
+
+			<dt><a href="http://webwork.maa.org/wiki/Category:Authors">
+			authoring info and help</a> </dt>
+				<dd>This link takes you to the authoring section of the WeBWorK wiki;</dd>
+			<dt><a href="http://devel.webwork.rochester.edu/doc/cvs/pg_HEAD/">
+			testing lab</a></dt>
+				<dd>This links to a WeBWorK "problem" which allows you to try out fragments of PG code.</dd>
+			<dt><a href="http://devel.webwork.rochester.edu/doc/cvs/pg_HEAD/">
+			pod docs</a></dt>
+				<dd>This link gives details for many macros. It links to documentation embedded in the macro files themselves;</dd>
+			<dt><a href="http://bugs.webwork.rochester.edu">Report problem bugs</a></dt>
+				<dd>If you find an error in a library problem please use the  link to notify us so that we can fix it.  You will need to register with an email address the first time you use bugzilla, but after that you will not. </dd>
+		   </dl>
+
+		</dd>
+	<dt>		The large text window</dt>
+		<dd>		This is where you edit the text of the problem template.  Nothing happens until you pick an action (below) and 
+		            click the "Take action!" button.</dd>
+		</dl>
+		
+<h4>Action items:</h4> <i>(If an action cannot be executed it will not appear as an action item.)
+</i>
+<dl>
+	<dt>		View using seed "12345" and display mode "image"</dt>
+		<dd>		Will bring up a window to show the results of your editing.  It does not change the permanent file on the disk. You can view
+		            different versions of the same problem by changing the seed (any number will do).  You can also change mannerin which the 
+		            mathematics is typset (jsMath and images are the most common modes.)</dd>
+	<dt>		Add to set ...</dt>
+		<dd>		Add this problem as the last problem of an existing set, either as a problem or as the set header 
+		           (the text that appears on the home page of a homework set). You can rearrange the order of the problems later using 
+		            the "Hmwk Sets Editor"</dd>
+	<dt>		Save as [TMPL]/"path"...</dt>
+		<dd>		Makes a new copy of the file you are editing at the location relative to the course's templates ([TMPL]) directory given by  "path".
+		            The checkbox allows you to replace the current problem with the new problem in the current homework set. 
+		            <p> Check the checkbox if you want to edit the current problem without changing the original problem file.</p>
+		            <p> Leave the checkbox unchecked if you are using the current problem as a model for a brand new problem. You can add the
+		                new file to the homework set from the Library Browser.</p>
+		            <p>If the original problem can not be edited than the path name
+		            must be changed in order to be allowed to save the problem. (Adding  "local/" to the beginning of the original path is the default solution. All locally created and 
+		            edited files will then appear in a subdirectory named "local". </p>
+		            <p>A new problem whose path ends in blankProblem.pg should be given a new name, for example, "myNewProblem.pg")</P></dd>
+	<dt>		Revert</dt>
+		<dd>		Reverts to the copy of the file saved on the disk -- all unsaved editing changes will be lost. 
+		            This option only appears when you have making
+		            provisional edits using the first option "View..." above</dd>
+	<dt>		Take action</dt>
+		<dd>		Executes the action item selected above. You can elect to have the results of this action appear in a new window.
+		</dd>
+</dl>
+
+</blockquote>
+</body>
+</html>
diff --git a/htdocs/helpFiles/InstructorPreflight.html b/htdocs/helpFiles/InstructorPreflight.html
new file mode 100644
index 0000000000..45b983be36
--- /dev/null
+++ b/htdocs/helpFiles/InstructorPreflight.html
@@ -0,0 +1 @@
+hi
diff --git a/htdocs/helpFiles/InstructorProblemSetDetail.html b/htdocs/helpFiles/InstructorProblemSetDetail.html
new file mode 100644
index 0000000000..2e37e75be2
--- /dev/null
+++ b/htdocs/helpFiles/InstructorProblemSetDetail.html
@@ -0,0 +1,130 @@
+<!DOCTYPE html
+	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+	
+<!--
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/htdocs/helpFiles/InstructorProblemSetDetail.html,v 1.4 2006/07/18 16:33:12 gage 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
+<head>
+<title>Set Detail Help Page</title>
+</head>
+
+<body>
+
+<h2>Set Detail Help Page</h2>
+
+<!--
+<h3> Quick Links </h3>
+
+<ul>
+   <li> I do <i>foo</i> and nothing seems to happen! </li>
+   <li> My problems are in random order </li>
+   <li> My nose is leaking. </li>
+   <li> How does this work? </li>
+</ul>
+-->
+<h3> "Modes" </h3>
+
+<p>The <strong>Set Detail</strong> page can be viewed in one of three distinct modes:
+	<ul>
+		<li> All students </li>
+		<li> One specific student </li>
+		<li> Many students </li>
+	</ul>
+
+This should be quite clear at the top of the page.  If one or more of the students selected has not
+had this set assigned to them, then those students will be ignored (they are listed).  This can be fixed
+if needed by clicking on the link <a href="#">x users</a> or the navigation link <a href="#">Set Assigner</a>
+
+<p><small>Note: There is a subtle difference between editing a set for an entire class and editting it
+for <i>every</i> student in the set at once.  If you select all the students and edit the set for all
+of them, any new students added after those changes will get the old, unchanged information.  Unless you
+have good reason, it is best to edit the set in general.</small>
+
+</p>
+
+<h3> Contents </h3>
+
+<ul type="1">
+	<li> <a href="#form">Form buttons</a>
+	<li> <a href="#general">General Information</a>
+	<li> <a href="#headers">Headers</a>
+	<li> <a href="#problems">Problems</a>
+</ul>
+
+
+
+
+<h4> <a name="form">Form buttons</a> </h4>
+<dl>
+	<dt> Save Changes </dt>
+		<dd>Occurs twice on the page, at the top and the bottom.  <br>Any and all changes made to any
+		part of the set will be saved with one important exception: When editting the set for one
+		or more students, you can choose to override the default value (defined for the set in 
+		general) by clicking on the checkbox and providing a value (or possibly leaving a blank).
+		If you do <strong>NOT</strong> check the checkbox, the override value will be discarded.
+		<p><small>Example:</small>
+		<br><input type="checkbox"> Weight <input value=2 size=5> 1
+		<br><input type="checkbox" checked> Weight <input value=2 size=5> 1
+		<br><small>The first value of 2 will be discarded because the checkbox is not checked.</small>
+		</dd>
+	<dt> Reset Form </dt>
+		<dd>Discards any and all changes, reloading the page by re-reading the database information
+		for this set.  Also, resets the display modes.<p></dd>
+	<dt> Refresh Display </dt>
+		<dd>You can maintain a different display mode for the headers and for the problems if you want.
+		<br>"Refresh Display" does not commit any of the changes currently in the form, but it also
+		does not reset the form so you can safely change the display mode without making any permanent
+		changes to the set and without losing any work up to that point.
+		<p><small>Example:</small>
+		<br><strong>Display&nbsp;Mode:&nbsp;</strong>
+		<select>
+		<option>plainText</option>
+		<option>formattedText</option>
+
+		<option selected>images</option>
+		<option>jsMath</option>
+		<option>asciimath</option>
+		<option>None</option>
+		</select>&nbsp;
+		<input type="submit" value="Refresh Display">
+		<br><small>Change display mode to "images"</small>
+		</dd>
+	<dt> Reorder problems only </dt>
+		<dd>Sometimes it could be necessary to want to change the order of the problems in a set 
+		without actually make any changes to the information about that problem.  This can even
+		be done individually for one or more students.  If all you want to is reorder the problems,
+		this is <strong>much</strong> faster than "Save Changes".  However, any changes made in the form and not yet
+		saved <strong>will be lost</strong>.
+		
+		</dd>
+	<dt>Add blank problem template</dt>
+		<dd> Adds a new problem essentially blank problem to the homework set when the homework set is saved.  
+		You can modify this to create your own problem, by clicking on the "Edit it" link and 
+		saving the "blankProblem.pg" to some new file, e.g. "myNewProblem.pg".
+</dl>
+
+<h4> <a name="general">General Information</a> </h4>
+
+
+All of the paths for problem files are relative to the templates directory
+of the current course.  You can access this directory "directly" using the File Manager
+page.
+
+</body>
+</html>
diff --git a/htdocs/helpFiles/InstructorProblemSetList.html b/htdocs/helpFiles/InstructorProblemSetList.html
new file mode 100644
index 0000000000..fdd23f1c32
--- /dev/null
+++ b/htdocs/helpFiles/InstructorProblemSetList.html
@@ -0,0 +1,85 @@
+<html>
+<!--
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/htdocs/helpFiles/InstructorProblemSetList.html,v 1.2 2006/01/25 23:13:50 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+-->
+<head>
+<title>Set List Help Page</title>
+</head>
+<body>
+<p>	After selecting a task with the radio buttons (round buttons on the left), 
+click the "Take action" button.
+</p>
+<hr>
+<dl>
+	<dt>Show</dt>
+		<dd>Display  sets matching a selected criteria.  
+		    Useful if there are many sets, such as in a library.</dd>
+	<dt>Sort</dt>
+		<dd>Sorts the lists displayed; by due date, name, etc.</dd>
+	<dt>Edit</dt>
+		<dd>The sets checked below will become available for editing the due dates and set headers.</dd>
+	<dt>Make visible/hidden</dt>
+		<dd>The sets checked below will be visible to students or hidden from students.  Useful for preparing sets
+		    ahead of time, but not showing them to students; or for temporarily hiding a set which has a mistake in 
+		    it while it is being fixed.</dd>
+	<dt>Import</dt>
+		<dd>Import a set from a set definition file. 
+		    (Use "File Transfer" to upload/download set definition files.)</dd>
+	<dt>Export</dt>
+		<dd>The sets checked below will written to set definition files, to be saved for future use, or 
+		    to be transferred to another course.  The set definition files can be uploaded/downloaded 
+		    using "File Transfer".
+		    </dd>
+	<dt>Score</dt>
+		<dd>Student scores for the sets selected below will be calculated.  This and other scoring operations
+		    can also be done using the "Scoring Tools" link. </dd>
+	<dt>Create</dt>
+		<dd>Create a new, empty set.  This can also be done directly from the "Library Browser".</dd>
+	<dt>Delete</dt>
+		<dd>Delete the sets checked below. Be careful, this cannot be undone.</dd>
+</dl>
+<hr>
+Other actions
+<dl>
+	<dt>"Edit Problems" column</dt>
+		<dd>Indicates the number of problems in the set.  Clicking on this link allows you to edit the set headers,
+		change the problem order, specifying the number of allowed attempts and the weight (credit value) of each problem.
+		You can also inspect and edit the template of the problem and delete the problem entirely.  
+		<p>
+		To add new problems use the "Library Browser".
+		</dd>
+	<dt>"Edit Assigned Sets" column</dt>
+		<dd>Shows how many instructors and students have been assigned this problem set, out of the total number in the class. 
+		    (While testing it is best to assign
+		    the problem only to instructors and TA's; once the set is ready, assign it to the entire class or section.)
+		    Clicking on this link allows you to assign or unassign this set to additional users and to individually edit 
+		    the assignment to specific users. For changing dates for individual users there are also 
+		    shortcuts from the "Instructor Tools" link.
+		    </dd>
+	<dt>Changing dates</dt>
+		<dd>Dates for problem sets can be edited by clicking the pencil in the "Edit Set Data" column next to the set name.
+		    To change dates for several sets at once, click the check box in the "Select" column and 
+		    choose "Edit selected" from the tasks above.
+		    <p>
+		    For those upgrading from WW2.0 to WW2.1: The headers have moved -- to edit them click in the "Edit problems" column.
+		    </dd>
+
+</dl>
+
+
+</body>
+</html>
diff --git a/htdocs/helpFiles/InstructorScoring.html b/htdocs/helpFiles/InstructorScoring.html
new file mode 100644
index 0000000000..1c5b158dea
--- /dev/null
+++ b/htdocs/helpFiles/InstructorScoring.html
@@ -0,0 +1,96 @@
+<html>
+<!--
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/htdocs/helpFiles/InstructorScoring.html,v 1.3 2007/08/13 22:59:53 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+-->
+<head>
+<title>Scoring Tools Help Page</title>
+</head>
+
+<body><br>
+
+<p>
+WeBWorK does not have a full featured scoring ability -- we leave that to your
+favorite spread sheet application.  
+</p>
+
+<p>
+What WeBWorK does have is good support for summarizing the scores on WeBWorK
+homework sets and exporting them in a form (.csv) which any spreadsheet can use.
+WeBWorK reports all of the homework grades,
+creates a column which totals these grades and leaves it at that.
+</p>
+
+<p>
+Click on the sets you want scored (usually all of them :-) ) 
+choose the name of the export file you want to 
+use (by default:  courseName_totals.csv) and then click the
+"score selected sets" button.
+</p>
+
+<p>
+If you want a form that is easy to read on the web (for a quick look at grades)
+click the "pad fields" option.  This adds spaces the fields which makes the 
+columns easy to read when in text form but it can confuse
+some spread sheet applications since the extra spaces violate the csv standard
+(although Excel handles them with no problem). If you want a reliable .csv file
+for use in any spreadsheet application unclick the "pad fields" option.
+You can download the .csv file immediately by clicking on the link, or you
+can download it using the "File Manager" from the scoring directory.
+</p>
+
+<p>
+I have no clue what "record scores for single sets" does -- sorry.
+</p>
+
+<p>
+The index is a number assigned on the basis of the number of incorrect attempts
+(roughly equivalent to 1/the number of attempts) which seems to correlate with
+the relative difficulty the student had with the problem.
+</p>
+
+<p>
+We would all like to be able to merge the spreadsheet with the webwork grades
+and a spread sheet with the excel grades automatically.  Unfortunately this 
+application has not yet been written for WeBWorK and for that matter it doesn't
+appear to be an ability that Excel has either.  The closes I have been able
+to find is third party software for excel (e.g. http://www.synkronizer.com/e/tutorial_merging.html)
+</p>
+
+<p>
+To use the Email and spreadsheet merge feature, upload your spreadsheet with
+calculated grades to the scoring directory using the File Manager link. 
+</p>
+
+<p>
+Do NOT use the file name courseName_totals.csv, since you might accidentally 
+overwrite that if you again export your WeBWorK homework scores (actually the 
+earlier file is moved to courseName_totals_bak1.csv -- so you can recover 
+using the File Manager -- but it's still a pain).
+</p>
+
+<p>
+If you upload your file on the web with the name: <code>report_grades_data.csv</code>
+and also create an email message with the name <code>report_grade.msg</code> with the 
+approriate <code>$COL</code> variables then not only can you email the message
+with the embedded grades to the students, but files with those exact names are 
+automatically appended to the "Grades" page seen by the students.
+</p>
+
+
+
+</body>
+</html>
diff --git a/htdocs/helpFiles/InstructorSendMail.html b/htdocs/helpFiles/InstructorSendMail.html
new file mode 100644
index 0000000000..468f7497e8
--- /dev/null
+++ b/htdocs/helpFiles/InstructorSendMail.html
@@ -0,0 +1,34 @@
+<html>
+<!--
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/htdocs/helpFiles/InstructorSendMail.html,v 1.2 2006/01/25 23:13:50 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+-->
+<head>
+<title>Mail Merge Help Page</title>
+</head>
+
+<body><br>
+<p>Emails can be sent from this page to the class. Be sure to change all blanks which read "fixme". The email can be sent to
+all students, or some subset. To change the way the students are ordered, after selecting the criteria, push the "Change Display 
+Settings" button.</p>
+<p>Personalized data can be inserted into the message using any of the variables available in the drop down menu titled "list of 
+insertable macros". Most of the personal data does not need a merge file, but if you wish to include scoring data, you must select 
+that scoring file as the merge file, and then enter the score into the message by using what ever column the score is in. For example,
+if the scores where in the 4 column of s0scr.cvs then I would set the merge file to that file, and then type $COL[4] to have that
+be the score.</p>
+<p>The size of the email box can be changed by changing the numbers in the "columns" and "rows" boxes and pressing enter.</p>
+</body>
+</html>
diff --git a/htdocs/helpFiles/InstructorSetMaker.html b/htdocs/helpFiles/InstructorSetMaker.html
new file mode 100644
index 0000000000..6f63123e75
--- /dev/null
+++ b/htdocs/helpFiles/InstructorSetMaker.html
@@ -0,0 +1,32 @@
+<html>
+<!--
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/htdocs/helpFiles/InstructorSetMaker.html,v 1.2 2006/01/25 23:13:50 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+-->
+<head>
+<title>Problem Set Maker Help Page</title>
+</head>
+
+<body><br>
+<p>This page is used to create problem sets. The first step is to choose which set your working on. If you need to name a new problem 
+set fill in the blank next to the "Create a New Set in This Course" button and then press the button. Then choose which set you want to
+work on in the drop down menu.</p>
+<p>Use the options in the uppermost box to pick a collection of problems to look at, and then to add problems to the set select them 
+and then hit update.</p>
+<p>To set the open and close dates, assign the set to users, delete problems from the set, or change their order, click on the 
+"Edit Taget Set" button.</p>
+</body>
+</html>
diff --git a/htdocs/helpFiles/InstructorStats.html b/htdocs/helpFiles/InstructorStats.html
new file mode 100644
index 0000000000..01dd3f4a64
--- /dev/null
+++ b/htdocs/helpFiles/InstructorStats.html
@@ -0,0 +1,30 @@
+<html>
+<!--
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/htdocs/helpFiles/InstructorStats.html,v 1.2 2006/01/25 23:13:50 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+-->
+<head>
+<title>Statistics Help Page</title>
+</head>
+
+<body><br>
+<p>This page is a useful tool for Professors who want to see how their students are doing. Statistics can either be viewed for a single
+set or for a single user simply by clicking on the link.</p>
+<p>The "Ind" column is :  (totalNumberOfCorrectProblems / totalNumberOfProblems)^2/ AvgNumberOfAttemptsPerProblem), which is a more 
+useful number when it comes to summarizing how well students are doing.</p>
+<p>The bottom most chart on the set statistics can be resorted by any column by clicking the blue link of that column's name.</p>
+</body>
+</html>
diff --git a/htdocs/helpFiles/InstructorUserDetail.html b/htdocs/helpFiles/InstructorUserDetail.html
new file mode 100644
index 0000000000..486c75fd7e
--- /dev/null
+++ b/htdocs/helpFiles/InstructorUserDetail.html
@@ -0,0 +1,49 @@
+
+<!DOCTYPE html
+	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+	
+<!--
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/htdocs/helpFiles/InstructorUserDetail.html,v 1.2 2006/01/25 23:13:50 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
+<head>
+<title>Instructor Tools Help Page</title>
+</head>
+<body>
+
+<h3>Sets assigned to student Help Page</h3>
+<blockquote>
+<p>A student must be assigned a homework set in order for it to appear on their WeBWorK home page. Check the box in the left column to assign a student to that homework set. Uncheck the box to unassign a student.  If a student is unassigned from a homework set, all of the student's data for that homework set is deleted 
+and cannot be recovered. Use this action cautiously! </p>
+
+<p>
+Change the due dates for an individual
+student on this page.  Check the checkbox and enter the new date in order
+to override the date. (You can copy the date format from the date in the right hand column which indicates the date when the homework set is due for the whole class.)
+</p>
+
+<p>
+Click on the homework set links to edit change the grades for this individual student on the homework set. (The grade of each problem is called the "status".)
+You can also change the number of allowed attempts and further modify the 
+individual student's homework set.) You will also be able to change a student's seed which determines the individual values used in the individual version of the student's problem and the weight (how much a problem counts towards the grade.)
+</p>
+
+</blockquote>
+</body>
+</html>
+
diff --git a/htdocs/helpFiles/InstructorUserList.html b/htdocs/helpFiles/InstructorUserList.html
new file mode 100644
index 0000000000..b4cc28d7ef
--- /dev/null
+++ b/htdocs/helpFiles/InstructorUserList.html
@@ -0,0 +1,107 @@
+<!DOCTYPE html
+	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<!--
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/htdocs/helpFiles/InstructorUserList.html,v 1.4 2007/08/13 22:59:53 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
+<head>
+<title>Class List Editor Help Page</title>
+</head>
+<h3>Class List Editor Help Page</h3>
+<body>
+<blockquote>
+<p>
+From this page you can <strong>add new students</strong>, to <strong>edit</strong> the class list data (names, email addresses, recitation, section
+permission levels and enrollment status), to <strong>change passwords</strong>, to <strong>export</strong> (save)
+class lists for back-up or use in another course. You can also delete students from the class roster, but this cannot be undone.
+</p>
+<p>
+This page gives access to information about the student, independ of the homework sets
+assigned to them.
+</p>
+<p>
+To perform an action first click the radio button next to desired action then click the "Take Action!" button.
+</p>
+
+
+<h4>How to:</h4>
+<dl>
+	<dt>Restrict or sort the students displayed</dt>
+		<dd>When the class is very large not all students will be displayed.  Using the first action on this page you can show only the students from a given recitation or from a given section, or only students whose login or last name fits a pattern match. The second action will sort the students currently being displayed.  You can also sort the displayed students by clicking on the active links at the top of each column.</dd>
+
+	<dt>Edit class list data</dt>
+		<dd>You can edit the class list data for a single student by clicking on the pencil icon next to their login name.  To edit several students at once click on the "Select" checkbox next to their names, click on the radio button for editing selected users and then click "Take Action!". You can also edit all visible users (those students currently being displayed) or even all users in the course although this last option might take a long time to load for a large class. </dd>
+		<dd> The login name cannot be changed. (It is the primary key for the student's data.) If you make a mistake in the login name at the beginning of the course (before any work has been done) then it is best to simply add a new student with the correct entry and drop the student with the bad login name. (See drop and delete students below.)</dd>	
+	<dt>Add a few students to the course.</dt>
+		<dd>	Click the "Add x student(s)" radio button and then click "Take action". This will take you to a new page where the data can be entered for one or more students.  It is also possible to assign the student to one or more problem sets as they are being entered: simply select the homework sets from the list below the data entry table. Use 'command' or 'control' click to select more than one homework set.</dd>
+	
+	<dt>Add many students to a course from a class list.</dt>
+		<dd>This is most easily done by importing a class list.  The class list can be uploaded from your workstation to the server using the File Manager page.  The class list must be a file ending in .lst and must have a specific <a href="http://webwork.maa.org/wiki/Classlist_Files#Format_of_classlist_files">format</a>.  Once the file has been uploaded to the server the file will appear in the import action pop-up list (5th action). demoCourse.lst is available for most courses and adds the "practice users" which activate guest logins to the class list .</dd>
+
+	<dt>Add a TA or an instructor (change permission level of user)</dt>
+		<dd>This is done by first entering the user as a student and then changing the permission level of the user. First edit the user by clicking on the pencil next to their name (or using the technique above for several users), then change their permssion level -- an entry blank at the far right of the screen, you may have to scroll to see it.  The permission levels are
+		<ul>
+			<li>Guest: -5</li>
+			<li>Student: 0</li>
+			<li>Proctor: 2</li>
+			<li>TA: 5</li>
+			<li>Instructor: 10</li>
+		</ul></dd>
+
+	<dt> Drop student from the course</dt>
+		<dd> To drop a student or students, select them for editing as described above and then set the pop-up list to enrolled,drop, or audit.  Dropped students cannot log in to the course, are not assigned new homework sets and are not sent e-mail.  They can be re-enrolled simply by changing their status back to enrolled.  No data is lost, any homework sets assigned before they were dropped are restored  unchanged.  </dd>
+	<dt>Delete a student from a course</dt>
+		<dd>This should be done cautiously.  Once a student is deleted from a course their data is lost forever and cannot be recovered.  They can be added to the course as a new student, but all of their homework set assignments and homework has been permanently deleted.  </dd>
+	<dt>		Assign sets to one student</dt>
+		<dd>	 To assign one or more sets to an individual student click in the column "Assigned Sets" in the student's row.  This will take you to a page where you can assign and unassign homework sets and change the due dates for homework on an individual basis.</dd>
+	<dt>Change the due date for one student</dt>
+		<dd>Click on the column "Assigned Sets" in the student's row. This will take you to a page where you can assign and unassign homework sets and change the due dates for homework on an individual basis.</dd>
+	<dt>		"Act as" a student</dt>
+		<dd>Clicking on the login name link in a student's row allows you to view the student's version of the homework (rather than your own) so that you can more easily answer student questions about homework problems. (A "acting as xxx" alert will appear in the upper right corner of each window while you are acting as a student.) You can submit the answers (which will NOT be recorded) to check that the computer is grading the problem correctly.  You will also be able to view past answers submitted by the student for each problem. To stop acting in the student's role click the "Stop acting" link in the upper right corner of the window. </dd>
+	<dt>	Change the grades on a homework set for one student. </dt>
+		<dd>Click first in the "Assigned Sets" column in the student's row.  This will take you to a new page where you will click on the link to the homework set where the grade change is to be made.  (The grade for each problem is listed as "status" on this third page).</dd>
+	<dt>Extend the number of attempts allowed a student on a given problem</dt>
+		<dd>Click first in the "Assigned Sets" column in the student's row.  This will take you to a new page where you will click on the link to the homework set where the grade change is to be made.  </dd>
+	<dt>Assign sets to many students</dt>
+		<dd>This is  done from the "Hmwrk Sets Editor" or from the "Instructor Tools" page if you wish to assign a homework set to all students or a large group of students (e.g. a section).</dd>
+	<dt>Change dates for a homework set for the whole class.</dt>
+		<dd>This is  done from the "Hmwrk Sets Editor" or from the "Instructor Tools" page.</dd>
+	<dt>Change the grading on a homework set for an entire class.</dt>
+		<dd>You might want to do this if you want to give full credit to everyone on a particular problem that was not worded correctly, or wasn't working properly. This is done from the "Hmwk sets editor" page or the "Instructor tools" page.</dd>
+	<dt>Change the number of atttempts allowed on a problem.</dt>
+		<dd>This is done from the "Hmwk sets editor" page or the "Instructor tools" page.</dd>
+</dl>
+
+<p>
+Many of these editing activities can also be done more quickly from the "Instructor tools" page where students and homework sets can be selected simultaneously. The Instructor Tools page is useful for quick editing of one or two students. The initial setup of the class can be done best from this page.
+Importing and
+exporting class lists can only be done from this page. Deleting students can only be done from this page.
+</p>
+<h4>Review of column functions:</h4>
+<ul>
+	<li>Clicking on any active link at the top of the column sorts the page by that column. You can do lexigraphic sorts: click on "First name" then "Last name" to sort by last name, sorting those with the same last name by their first name.</li>
+	<li>The <strong>login name</strong> column links allow you to "act as" a student.</li>
+	<li>The <strong>pencil</strong> in the login column allows you to edit that student's data.</li>
+	<li>The <strong>Assigned sets</strong> column (x/y) indicates that x sets out of y sets avaiable have been assigned to this student. Click this link to assign or unassign sets to this student, to adjust due dates, or to adjust the grades on a homework set for a student.</li>
+	<li>Clicking the <strong>e-mail address</strong> link will bring up your standard email application so that you can send email to the student.  This works even if the student has been dropped from the course.  To send email to an entire class or to merge grades with the email message use the "Email" page link in the left margin.</li>
+</ul>
+
+</blockquote>
+</body>
+</html>
diff --git a/htdocs/helpFiles/InstructorUsersAssignedToSet.html b/htdocs/helpFiles/InstructorUsersAssignedToSet.html
new file mode 100644
index 0000000000..846ad56215
--- /dev/null
+++ b/htdocs/helpFiles/InstructorUsersAssignedToSet.html
@@ -0,0 +1,27 @@
+<html>
+<!--
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/htdocs/helpFiles/InstructorUsersAssignedToSet.html,v 1.2 2006/01/25 23:13:50 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+-->
+<head>
+<title>Users Assigned to Set Help Page</title>
+</head>
+
+<body><br>
+<p>A student needs to be assigned a set in order for them to do it. Once a student is unassigned a set, all the data for them is lost 
+and there's no way to undo it. When unassigning be sure to change the option to "Allow unassign".</p>
+</body>
+</html>
diff --git a/htdocs/helpFiles/IntervalNotation.html b/htdocs/helpFiles/IntervalNotation.html
new file mode 100644
index 0000000000..e2feb1d51b
--- /dev/null
+++ b/htdocs/helpFiles/IntervalNotation.html
@@ -0,0 +1,68 @@
+<html>
+<head>
+<title>WeBWorK Help: Interval Notation</title>
+</head>
+<body bgcolor=#ffffff text=#000000 link=#0000cc
+vlink=#551a8b alink=#ff0000 onLoad=sf()>
+
+<h4 align="center">
+Using Interval Notation
+</h4>
+
+<ul>
+
+<li> If an endpoint is included, then use <tt>[</tt> or <tt>]</tt>.
+If not, then use <tt>(</tt> or <tt>)</tt>.  For example, the interval
+from -3 to 7 that includes 7 but not -3 is expressed <tt>(-3,7]</tt>.
+
+<br>
+<br>
+
+<li> For infinite intervals, use <tt>Inf</tt>
+for <font size="+2">&#8734;</font> (infinity) and/or
+<tt>-Inf</tt> for <font size="+2">-&#8734;</font> (-Infinity).  For
+example, the infinite interval containing all points greater than or
+equal to 6 is expressed <tt>[6,Inf)</tt>.
+
+<br>
+<br>
+
+<li> If the set includes more than one interval, they are joined using the union
+symbol U.  For example, the set consisting of all points in (-3,7] together with all points in [-8,-5) is expressed <code>[-8,-5)U(-3,7]</code>.
+
+<br>
+<br>
+
+<li> If the answer is the empty set, you can specify that by using
+     braces with nothing inside: <code> { } </code>
+
+<br>
+<br>
+
+<li> You can use <code>R</code> as a shorthand for all real numbers.
+  So, it is equivalent to entering <code>(-Inf, Inf)</code>.
+
+<br>
+<br>
+
+<li> You can use set difference notation.  So, for all real numbers
+  except 3, you can use <code>R-{3}</code> or
+  <code>(-Inf, 3)U(3,Inf)</code> (they are the same).  Similarly,
+  <code>[1,10)-{3,4}</code> is the same as <code>[1,3)U(3,4)U(4,10)</code>.
+
+<br>
+<br>
+
+
+<li> WeBWorK will <b>not</b> interpret <tt>[2,4]U[3,5]</tt> as equivalent
+ to <tt>[2,5]</tt>, unless a problem tells you otherwise.  
+All sets should be expressed in their simplest interval notation form, with no 
+overlapping intervals.
+
+</ul>
+
+<script language="JavaScript">
+document.write(" <center> <p><input type=\"button\" value=\"Close this window\" name=\"close\" onClick=\"window.close()\"></p> </center> ");
+</script>
+
+</body></html>
diff --git a/htdocs/helpFiles/Options.html b/htdocs/helpFiles/Options.html
new file mode 100644
index 0000000000..a8d4c7cd83
--- /dev/null
+++ b/htdocs/helpFiles/Options.html
@@ -0,0 +1,28 @@
+<html>
+<!--
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/htdocs/helpFiles/Options.html,v 1.2 2006/01/25 23:13:50 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+-->
+<head>
+<title>User Option Help Page</title>
+</head>
+
+<body><br>
+<p>The password can be any combination of letters, numbers and special symbols. Students are encouraged to use all three, and stay 
+away from dictionary words. Also you should not use the same password you use elsewhere, such as on your email account.</p>
+<p>It is important that you enter your email address or you won't recieve any of the important emails your professor sends you.</p>
+</body>
+</html>
diff --git a/htdocs/helpFiles/ProblemSets.html b/htdocs/helpFiles/ProblemSets.html
new file mode 100644
index 0000000000..274eec5549
--- /dev/null
+++ b/htdocs/helpFiles/ProblemSets.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html
+	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+	
+<!--
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/htdocs/helpFiles/ProblemSets.html,v 1.2 2006/01/25 23:13:50 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
+<head>
+<title>Course Home Help Page</title>
+</head>
+
+<body><br>
+<h3>Course Home Help Page</h3>
+<p align="left">
+This is the standard entry point for the course.
+</p>
+
+<p align="left">
+It lists the homework problem sets available for the students.
+</p>
+
+<p align="left">
+The information box on the right displays information is useful for
+leaving course wide messages for students.  It contains text from the file 
+templates/course_info.txt.  Instructors can edit this file from the 
+web (click on the "edit" link).
+</p>
+ 
+</body>
+</html>
diff --git a/htdocs/helpFiles/Problems.html b/htdocs/helpFiles/Problems.html
new file mode 100644
index 0000000000..79e48b4c41
--- /dev/null
+++ b/htdocs/helpFiles/Problems.html
@@ -0,0 +1,29 @@
+<html>
+<!--
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/htdocs/helpFiles/Problems.html,v 1.2 2006/01/25 23:13:50 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+-->
+<head>
+<title>Problems Help Page</title>
+</head>
+
+<body><br>
+<p>If you want to see the problems change the display mode and press "Refresh". The order of problems can be changed by changing the
+numbers. After a problem is deleted (by checking delete and then the "Save Problem Changes" button on the bottom of the page) 
+the number is left empty unless the option above the button is checked. The
+weight of a problem is how many points will be awarded for it during scoring.</p>
+</body>
+</html>
diff --git a/htdocs/helpFiles/Syntax.html b/htdocs/helpFiles/Syntax.html
new file mode 100644
index 0000000000..2673dd759e
--- /dev/null
+++ b/htdocs/helpFiles/Syntax.html
@@ -0,0 +1,136 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+        "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title>Syntax for entering answers to WeBWorK</title>
+	<meta name="generator" content="BBEdit 8.7">
+</head>
+<body>
+<h1 id="firstHeading">Syntax for entering answers to WeBWorK</h1>
+
+
+<h4> <span class="mw-headline">Mathematical Symbols Available In WeBWorK</span></h4>
+<ul><li> + Addition
+</li><li> - Subtraction
+</li><li> * Multiplication can also be indicated by a space or juxtaposition, e.g. 2x, 2 x or 2*x, also 2(3+4).
+</li><li> / Division
+</li><li> ^ or ** You can use either ^ or ** for exponentiation, e.g. 3^2 or 3**2
+</li><li> Parentheses: () - You can also use square brackets, [ ], and braces, { }, for grouping, e.g. [1+2]/[3(4+5)]
+</li></ul>
+<a name="Syntax_for_entering_expressions"></a><h4> <span class="mw-headline">Syntax for entering expressions</span></h4>
+<ul><li> Be careful entering expressions just as you would be careful entering expressions in a calculator.
+</li><li> <b>Use the "Preview Button" to see exactly how your entry
+looks. E.g. to tell the difference between 1+2/3*4 and [1+2]/[3*4]
+click the "Preview Button".</b>
+</li><li> Sometimes using the * symbol to indicate mutiplication makes
+things easier to read. For example (1+2)*(3+4) and (1+2)(3+4) are both
+valid. So are 3*4 and 3&nbsp;4 (3 space 4, not 34) but using a * makes
+things clearer.
+</li><li> Use ('s and )'s to make your meaning clear. You can also use ['s and ]'s and {'s and }'s.
+</li><li> Don't enter 2/4+5 (which is 5.5) when you really want 2/(4+5) (which is 2/9).
+</li><li> Don't enter 2/3*4 (which is 8/3) when you really want 2/(3*4) (which is 2/12).
+</li><li> Entering big quotients with square brackets, e.g. [1+2+3+4]/[5+6+7+8], is a good practice.
+</li><li> Be careful when entering functions. It's always good practice
+to use parentheses when entering functions. Write sin(t) instead of
+sint or sin t even though WeBWorK is smart enough to <b>usually</b> accept sin t or even sint. For example, sin 2t is interpreted as sin(2)t, i.e. (sin(2))*t so be careful.
+</li><li> You can enter sin^2(t) as a short cut although mathematically
+speaking sin^2(t) is shorthand for (sin(t))^2(the square of sin of t).
+(You can enter it as sin(t)^2 or even sint^2, but don't try such things
+unless you <b>really</b> understand the precedence of operations. The
+"sin" operation has highest precedence, so it is performed first, using
+the next token (i.e. t) as an argument. Then the result is squared.)
+You can always use the Preview button to see a typeset version of what
+you entered and check whether what you wrote was what you
+meant.&nbsp;:-)
+</li><li> For example 2+3sin^2(4x) will work and is equivalent to
+2+3(sin(4x))^2 or 2+3sin(4x)^2. Why does the last expression work?
+Because things in parentheses are always done first [ i.e. (4x)], next
+all functions, such as sin, are evaluated [giving sin(4x)], next all
+exponents are taken [giving sin(4x)^2], next all multiplications and
+divisions are performed in order from left to right [giving
+3sin(4x)^2], and finally all additions and subtractions are performed
+[giving 2+3sin(4x)^2].
+</li><li> Is -5^2 positive or negative? It's negative. This is because
+the square operation is done before the negative sign is applied. Use
+(-5)^2 if you want to square negative 5.
+</li><li> When in doubt use parentheses!!!&nbsp;:-)
+</li><li> The complete rules for the precedence of operations, in addition to the above, are
+<ul><li> Multiplications and divisions are performed left to right: 2/3*4 = (2/3)*4 = 8/3.
+</li><li> Additions and subtractions are performed left to right: 1-2+3 = (1-2)+3 = 2.
+</li><li> Exponents are taken right to left: 2^3^4 = 2^(3^4) = 2^81 = a big number.
+</li></ul>
+</li><li> <b>Use the "Preview Button" to see exactly how your entry
+looks. E.g. to tell the difference between 1+2/3*4 and [1+2]/[3*4]
+click the "Preview Button".</b>
+</li></ul>
+<a name="Mathematical_Constants_Available_In_WeBWorK"></a><h4> <span class="mw-headline">Mathematical Constants Available In WeBWorK</span></h4>
+<ul><li> pi This gives 3.14159265358979, e.g. cos(pi) is -1
+</li><li> e This gives 2.71828182845905, e.g. ln(e*2) is 1 + ln(2)
+</li></ul>
+<a name="Scientific_Notation_Available_In_WeBWorK"></a><h4> <span class="mw-headline">Scientific Notation Available In WeBWorK</span></h4>
+<ul><li> 2.1E2 is the same as  210
+</li><li> 2.1E-2 is the same as .021
+</li></ul>
+<a name="Mathematical_Functions_Available_In_WeBWorK"></a><h4> <span class="mw-headline">Mathematical Functions Available In WeBWorK</span></h4>
+<p>Note that sometimes one or more of these functions is disabled for a WeBWorK problem because the 
+instructor wants you to calculate the answer by some means other than just using the function.
+</p>
+<ul><li> abs( ) The absolute value
+</li><li> cos( ) Note: cos( ) uses radian measure
+</li><li> sin( ) Note: sin( ) uses radian measure
+</li><li> tan( ) Note: tan( ) uses radian measure
+</li><li> sec( ) Note: sec( ) uses radian measure
+</li><li> cot( ) Note: cot( ) uses radian measure
+</li><li> csc( ) Note: csc( ) uses radian measure
+</li><li> exp( ) The same function as e^x
+</li><li> log( ) This is usually the natural log but your professor may have redined this as log to the base 10
+</li><li> ln( ) The natural log
+</li><li> logten( ) The log to the base 10
+</li><li> arcsin( )
+</li><li> asin( ) or sin^-1() Another name for arcsin
+</li><li> arccos( )
+</li><li> acos( ) or cos^-1() Another name for arccos
+</li><li> arctan( )
+</li><li> atan( ) or tan^-1() Another name for arctan
+</li><li> arccot( )
+</li><li> acot( ) or cot^-1() Another name for arccot
+</li><li> arcsec( )
+</li><li> asec( ) or sec^-1() Another name for arcsec
+</li><li> arccsc( )
+</li><li> acsc( ) or csc^-1() Another name for arccsc
+</li><li> sinh( )
+</li><li> cosh( )
+</li><li> tanh( )
+</li><li> sech( )
+</li><li> csch( )
+</li><li> coth( )
+</li><li> arcsinh( )
+</li><li> asinh( ) or sinh^-1() Another name for arcsinh
+</li><li> arccosh( )
+</li><li> acosh( ) or cosh^-1()Another name for arccosh
+</li><li> arctanh( )
+</li><li> atanh( ) or tanh^-1()Another name for arctanh
+</li><li> arcsech( )
+</li><li> asech( ) or sech^-1()Another name for arcsech
+</li><li> arccsch( )
+</li><li> acsch( ) or csch^-1() Another name for arccsch
+</li><li> arccoth( )
+</li><li> acoth( ) or coth^-1() Another name for arccoth
+</li><li> sqrt( )
+</li><li> n!  (n factorial -- defined for <span class="typeset"><nobr><span class="scale"><span style="position: relative;"><span style="position: absolute; top: -0.131em; left: 0em;"><span class="cmmi10">n</span><span style="position: relative; margin-left: 0.277em;"><span class="cmsy10">Õ</span></span><span style="position: relative; margin-left: 0.277em;"><span class="cmr10">0</span></span>&nbsp;</span><span class="blank" style="width: 2.429em; height: 0.722em; vertical-align: 0.722em;"></span></span><span class="blank" style="height: 0.93em; vertical-align: 0.744em;"></span></span></nobr></span>
+</li><li> These functions may not always be available for every problem.
+<ul><li> sgn( ) The sign function, either -1, 0, or 1
+</li><li> step( ) The step function (0 if <span class="typeset"><nobr><span class="scale"><span style="position: relative;"><span style="position: absolute; top: -0.131em; left: 0em;"><span class="cmmi10">x</span><span style="position: relative; margin-left: 0.277em;"><span class="cmmi10">&lt;</span></span><span style="position: relative; margin-left: 0.277em;"><span class="cmr10">0</span></span>&nbsp;</span><span class="blank" style="width: 2.429em; height: 0.722em; vertical-align: 0.722em;"></span></span><span class="blank" style="height: 0.833em; vertical-align: 0.744em;"></span></span></nobr></span>, 1 if <span class="typeset"><nobr><span class="scale"><span style="position: relative;"><span style="position: absolute; top: -0.131em; left: 0em;"><span class="cmmi10">x</span><span style="position: relative; margin-left: 0.277em;"><span class="cmsy10">Õ</span></span><span style="position: relative; margin-left: 0.277em;"><span class="cmr10">0</span></span>&nbsp;</span><span class="blank" style="width: 2.429em; height: 0.722em; vertical-align: 0.722em;"></span></span><span class="blank" style="height: 0.93em; vertical-align: 0.744em;"></span></span></nobr></span>)
+</li><li> fact(n) The factorial function n! (defined only for nonnegative integers)
+</li><li> P(n,k) = n*(n-1)*(n-2)...(n-k+1) the number of ordered sequences of k elements chosen from n elements
+</li><li> C(n,k) = "n choose k" the number of unordered sequences of k elements chosen from n elements
+</li></ul>
+</li></ul>
+
+For more information:
+
+<a href="http://webwork.maa.org/wiki/Available_Functions">http://webwork.maa.org/wiki/Available_Functions</a>
+
+
+</body>
+</html>
diff --git a/htdocs/helpFiles/Units.html b/htdocs/helpFiles/Units.html
new file mode 100644
index 0000000000..e81cdb03a8
--- /dev/null
+++ b/htdocs/helpFiles/Units.html
@@ -0,0 +1,86 @@
+<!DOCTYPE HTML PUBtr><tdC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head><Title>WeBWorK Help: Units</title>
+  
+  <style type="text/css"><p>
+
+  </style>
+  
+  </head>
+  <body bgcolor="#FFFFFF" alink="#FF0000" vlink="#800080" link="#0000FF" text="#000000">
+    <p align="center">
+
+<p >
+      
+<H4 align="center">Units Available in WeBWorK</H4><p><p>
+<p>
+Some WeBWorK problems ask for answers with units.  Below is a list of basic units
+and how they need to be abbreviated in WeBWorK answers.  In some problems, you
+may need to combine units (e.g, velocity might be in <code>ft/s</code> for feet per
+second).
+<center>
+<table border="1" cellpadding="4">
+<tr> <th> Unit <th> Abbreviation
+<tr><td colspan="2" align="center"><b>Time</b>
+<tr><td> Seconds  <td align="center">  s
+<tr><td> Minutes  <td align="center">  min
+<tr><td> Hours  <td align="center">  hr
+<tr><td> Days  <td align="center">  day
+<tr><td> Years  <td align="center">  year
+<tr><td> Milliseconds  <td align="center">  ms
+
+<tr><td colspan="2" align="center"><b>Distance</b>
+<tr><td> Feet  <td align="center">  ft
+<tr><td> Inches  <td align="center">  in
+<tr><td> Miles  <td align="center">  mi
+<tr><td> Meters  <td align="center">  m
+<tr><td> Centimeters  <td align="center">  cm
+<tr><td> Millimeters  <td align="center">  mm
+<tr><td> Kilometers  <td align="center">  km
+<tr><td> Angstroms  <td align="center">  A
+<tr><td> Light years  <td align="center">  light-year
+
+<tr><td colspan="2" align="center"><b>Mass</b>
+<tr><td> Grams  <td align="center">  g
+<tr><td> Kilograms  <td align="center">  kg
+<tr><td> Slugs  <td align="center">  slug
+
+<tr><td colspan="2" align="center"><b>Volume</b>
+<tr><td> Liters  <td align="center">  L
+<tr><td> Cubic Centimeters  <td align="center">  cc
+<tr><td> Milliliters  <td align="center">  ml
+
+<tr><td colspan="2" align="center"><b>Force</b>
+<tr><td> Newtons  <td align="center">  N
+<tr><td> Dynes  <td align="center">  dyne
+<tr><td> Pounds  <td align="center">  lb
+<tr><td> Tons  <td align="center">  ton
+
+<tr><td colspan="2" align="center"><b>Work/Energy</b>
+<tr><td> Joules  <td align="center">  J
+<tr><td> kilo Joule  <td align="center">  kJ
+<tr><td> ergs  <td align="center">  erg
+<tr><td> foot pounds  <td align="center">  lbf
+<tr><td> calories  <td align="center">  cal
+<tr><td> kilo calories  <td align="center">  kcal
+<tr><td> electron volts  <td align="center">  eV
+<tr><td> kilo Watt hours  <td align="center">  kWh
+
+<tr><td colspan="2" align="center"><b>Misc</b>
+<tr><td> Amperes  <td align="center">  amp
+<tr><td> Moles  <td align="center">  mol
+<tr><td> Degrees Centrigrade  <td align="center">  degC
+<tr><td> Degrees Fahrenheit  <td align="center">  degF
+<tr><td> Degrees Kelvin  <td align="center">  degK
+<tr><td> Angle degrees <td align="center">  deg
+<tr><td> Angle radians <td align="center">  rad
+
+</table>
+
+
+</center>
+<script language="JavaScript">
+document.write(" <center> <p><input type=\"button\" value=\"Close this window\" name=\"close\" onClick=\"window.close()\"></p> </center> ");
+</script>
+    </body>
+  </html>
diff --git a/htdocs/helpFiles/instructor_links.html b/htdocs/helpFiles/instructor_links.html
new file mode 100644
index 0000000000..7419c50ab7
--- /dev/null
+++ b/htdocs/helpFiles/instructor_links.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html
+	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+	
+<!--
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/htdocs/helpFiles/instructor_links.html,v 1.6 2007/08/13 22:59:53 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
+<head>
+<title>Instructor Links Help Page</title>
+</head>
+<body>
+		
+<h3>Instructor Links Help Page</h3>
+
+Click the icon <a href="instructor_links.html"><img src="/webwork2_files/images/question_mark.png"></a> for
+page and item specific help.  
+
+<hr/>
+The main page for WeBWorK documentation is the <a href="http://webwork.maa.org/wiki"> webwork wiki</a>
+while specific help for instructors setting up a a course are 
+in the <a href="http://webwork.maa.org/wiki/Instructors" target="_help">instructors' section</a>.
+<hr/>
+
+<dl>
+	<dt>Instructor Tools</dt>
+		<dd>Quick access to many instructor tools, including 
+		       <strong>Reset passwords</strong>, 
+		       <strong>Act as student</strong>, 
+		       <strong>Assign individual sets</strong>
+		       and <strong>Edit individual due dates</strong>. 
+				Beginners may find
+		       it easier to use the "Class List Editor", "Hmwk Sets Editor"            				 
+               at first.</dd>
+	<dt>Class List Editor</dt>
+		<dd>Edit class roster data.  Add students, edit student data, drop 
+			students from class, import students from a classlist, and give 
+			user professor privileges. Access to individual homework sets</dd>
+	<dt>Hmwk Sets Editor</dt>
+		<dd>Edit homework sets for entire class. Change homework set due dates, create new sets from a set 
+		    definition file, create new homework sets, make sets visible/invisible, 
+			score homework sets. Assign homework sets to the class.</dd>
+	<dt>Library Browser</dt>
+		<dd>Choose problems from a library and add
+		    them to a homework set.</dd>
+	<dt>Statistics</dt>
+		<dd>View statistics of students' performance on homework either by individual or by set.</dd>
+	<dt>Student Progress</dt>
+		<dd>View details of student perofrmance either by individual or by set.</dd>
+	<dt>Scoring Tools</dt>
+		<dd>Score one or more sets.  This can also be done from the "Hmwk 
+		Sets Editor" or from the "Instructor Tools", but the "Scoring Tools" page
+		allows control over parameters.</dd>
+	<dt>Email</dt>
+		<dd>Send email to students.</dd>
+	<dt>File Transfer</dt>
+		<dd>Upload, download and delete text files, including scoring 
+		    spread sheets, set definition files, class list spread
+		    sheets, and "PG" problems.</dd>
+	<dt>Course configuration</dt>
+		<dd>Allows configuration of certain parameters, such as permission levels,
+		default display mode for equations, and email feedback behavior, on a course by course basis.</dd>
+</dl>
+
+Click the icon <a href="instructor_links.html"><img src="/webwork2_files/images/question_mark.png"></a> for
+page and item specific help.  
+
+</body>
+</html>
diff --git a/conf/templates/test.template b/htdocs/helpFiles/no_help.html
similarity index 63%
rename from conf/templates/test.template
rename to htdocs/helpFiles/no_help.html
index 85091cb9ca..b5b973e900 100644
--- a/conf/templates/test.template
+++ b/htdocs/helpFiles/no_help.html
@@ -1,13 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html
 	PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 	SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
 <!--
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/htdocs/helpFiles/no_help.html,v 1.3 2006/01/25 23:13:50 sh002i 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
@@ -20,17 +18,17 @@
 # Artistic License for more details.
 ################################################################################
 -->
-
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
- <head>
-  <title>WeBWorK Test Template</title>
- </head>
- <body>
-  <h1>#path</h1>	<div><!--#path style="image" image="webwork_files/images/right_arrow.png" text=" > "--></div>
-  <h1>#quicklinks</h1>	<div><!--#quicklinks--></div>
-  <h1>#siblings</h1>	<div><!--#siblings--></div>
-  <h1>#nav</h1>		<div><!--#nav style="image" imagesuffix=".png" separator=" | "--></div>
-  <h1>#title</h1>	<div><!--#title--></div>
-  <h1>#body</h1>	<div><!--#body--></div>
- </body>
+<head>
+<title>No Help Page</title>
+</head>
+
+<body>
+<p>There is no specific help for this item.  
+Click on 'Help' in the left margin
+for more general information.
+</p>
+</body>
 </html>
+
+
diff --git a/htdocs/images/ajax-loader-small.gif b/htdocs/images/ajax-loader-small.gif
new file mode 100644
index 0000000000..d0bce15423
Binary files /dev/null and b/htdocs/images/ajax-loader-small.gif differ
diff --git a/htdocs/images/ajax-loader.gif b/htdocs/images/ajax-loader.gif
new file mode 100644
index 0000000000..cc70a7a8b3
Binary files /dev/null and b/htdocs/images/ajax-loader.gif differ
diff --git a/htdocs/images/dgage/background.gif b/htdocs/images/dgage/background.gif
new file mode 100644
index 0000000000..55dc56f4e7
Binary files /dev/null and b/htdocs/images/dgage/background.gif differ
diff --git a/htdocs/images/dgage/slide-button-active.gif b/htdocs/images/dgage/slide-button-active.gif
new file mode 100644
index 0000000000..1df6d4dda1
Binary files /dev/null and b/htdocs/images/dgage/slide-button-active.gif differ
diff --git a/htdocs/images/dgage/slide-button.gif b/htdocs/images/dgage/slide-button.gif
new file mode 100644
index 0000000000..65dd171f77
Binary files /dev/null and b/htdocs/images/dgage/slide-button.gif differ
diff --git a/htdocs/images/edit.gif b/htdocs/images/edit.gif
new file mode 100644
index 0000000000..1da1fec1da
Binary files /dev/null and b/htdocs/images/edit.gif differ
diff --git a/htdocs/images/favicon.ico b/htdocs/images/favicon.ico
new file mode 100644
index 0000000000..10893e0d6b
Binary files /dev/null and b/htdocs/images/favicon.ico differ
diff --git a/htdocs/images/images_es/navNext.gif b/htdocs/images/images_es/navNext.gif
new file mode 100644
index 0000000000..280dedb92b
Binary files /dev/null and b/htdocs/images/images_es/navNext.gif differ
diff --git a/htdocs/images/images_es/navNextGrey.gif b/htdocs/images/images_es/navNextGrey.gif
new file mode 100644
index 0000000000..622b71b44a
Binary files /dev/null and b/htdocs/images/images_es/navNextGrey.gif differ
diff --git a/htdocs/images/images_es/navPrev.gif b/htdocs/images/images_es/navPrev.gif
new file mode 100644
index 0000000000..37651a7e9e
Binary files /dev/null and b/htdocs/images/images_es/navPrev.gif differ
diff --git a/htdocs/images/images_es/navPrevGrey.gif b/htdocs/images/images_es/navPrevGrey.gif
new file mode 100644
index 0000000000..97ce546cb9
Binary files /dev/null and b/htdocs/images/images_es/navPrevGrey.gif differ
diff --git a/htdocs/images/images_es/navProbList.gif b/htdocs/images/images_es/navProbList.gif
new file mode 100644
index 0000000000..e75ff61840
Binary files /dev/null and b/htdocs/images/images_es/navProbList.gif differ
diff --git a/htdocs/images/images_es/navProbListGrey.gif b/htdocs/images/images_es/navProbListGrey.gif
new file mode 100644
index 0000000000..e57a12d703
Binary files /dev/null and b/htdocs/images/images_es/navProbListGrey.gif differ
diff --git a/htdocs/images/images_es/navUp.gif b/htdocs/images/images_es/navUp.gif
new file mode 100644
index 0000000000..c9c7db184a
Binary files /dev/null and b/htdocs/images/images_es/navUp.gif differ
diff --git a/htdocs/images/images_fr/navNext.gif b/htdocs/images/images_fr/navNext.gif
new file mode 100644
index 0000000000..280dedb92b
Binary files /dev/null and b/htdocs/images/images_fr/navNext.gif differ
diff --git a/htdocs/images/images_fr/navNextGrey.gif b/htdocs/images/images_fr/navNextGrey.gif
new file mode 100644
index 0000000000..622b71b44a
Binary files /dev/null and b/htdocs/images/images_fr/navNextGrey.gif differ
diff --git a/htdocs/images/images_fr/navPrev.gif b/htdocs/images/images_fr/navPrev.gif
new file mode 100644
index 0000000000..37651a7e9e
Binary files /dev/null and b/htdocs/images/images_fr/navPrev.gif differ
diff --git a/htdocs/images/images_fr/navPrevGrey.gif b/htdocs/images/images_fr/navPrevGrey.gif
new file mode 100644
index 0000000000..97ce546cb9
Binary files /dev/null and b/htdocs/images/images_fr/navPrevGrey.gif differ
diff --git a/htdocs/images/images_fr/navProbList.gif b/htdocs/images/images_fr/navProbList.gif
new file mode 100644
index 0000000000..e75ff61840
Binary files /dev/null and b/htdocs/images/images_fr/navProbList.gif differ
diff --git a/htdocs/images/images_fr/navProbListGrey.gif b/htdocs/images/images_fr/navProbListGrey.gif
new file mode 100644
index 0000000000..e57a12d703
Binary files /dev/null and b/htdocs/images/images_fr/navProbListGrey.gif differ
diff --git a/htdocs/images/images_fr/navUp.gif b/htdocs/images/images_fr/navUp.gif
new file mode 100644
index 0000000000..c9c7db184a
Binary files /dev/null and b/htdocs/images/images_fr/navUp.gif differ
diff --git a/htdocs/images/images_tr/navNext.gif b/htdocs/images/images_tr/navNext.gif
new file mode 100644
index 0000000000..280dedb92b
Binary files /dev/null and b/htdocs/images/images_tr/navNext.gif differ
diff --git a/htdocs/images/images_tr/navNextGrey.gif b/htdocs/images/images_tr/navNextGrey.gif
new file mode 100644
index 0000000000..622b71b44a
Binary files /dev/null and b/htdocs/images/images_tr/navNextGrey.gif differ
diff --git a/htdocs/images/images_tr/navPrev.gif b/htdocs/images/images_tr/navPrev.gif
new file mode 100644
index 0000000000..37651a7e9e
Binary files /dev/null and b/htdocs/images/images_tr/navPrev.gif differ
diff --git a/htdocs/images/images_tr/navPrevGrey.gif b/htdocs/images/images_tr/navPrevGrey.gif
new file mode 100644
index 0000000000..97ce546cb9
Binary files /dev/null and b/htdocs/images/images_tr/navPrevGrey.gif differ
diff --git a/htdocs/images/images_tr/navProbList.gif b/htdocs/images/images_tr/navProbList.gif
new file mode 100644
index 0000000000..e75ff61840
Binary files /dev/null and b/htdocs/images/images_tr/navProbList.gif differ
diff --git a/htdocs/images/images_tr/navProbListGrey.gif b/htdocs/images/images_tr/navProbListGrey.gif
new file mode 100644
index 0000000000..e57a12d703
Binary files /dev/null and b/htdocs/images/images_tr/navProbListGrey.gif differ
diff --git a/htdocs/images/images_tr/navUp.gif b/htdocs/images/images_tr/navUp.gif
new file mode 100644
index 0000000000..c9c7db184a
Binary files /dev/null and b/htdocs/images/images_tr/navUp.gif differ
diff --git a/htdocs/images/maa_logo.png b/htdocs/images/maa_logo.png
new file mode 100644
index 0000000000..6f1d84c9aa
Binary files /dev/null and b/htdocs/images/maa_logo.png differ
diff --git a/htdocs/images/navNextGrey.gif b/htdocs/images/navNextGrey.gif
new file mode 100644
index 0000000000..c6d131b134
Binary files /dev/null and b/htdocs/images/navNextGrey.gif differ
diff --git a/htdocs/images/navPrevGrey.gif b/htdocs/images/navPrevGrey.gif
new file mode 100644
index 0000000000..e5411c974d
Binary files /dev/null and b/htdocs/images/navPrevGrey.gif differ
diff --git a/htdocs/images/navProbListGrey.gif b/htdocs/images/navProbListGrey.gif
new file mode 100644
index 0000000000..f46c033ef5
Binary files /dev/null and b/htdocs/images/navProbListGrey.gif differ
diff --git a/htdocs/images/question_mark.png b/htdocs/images/question_mark.png
new file mode 100644
index 0000000000..ef8e328569
Binary files /dev/null and b/htdocs/images/question_mark.png differ
diff --git a/htdocs/images/spiderweb.png b/htdocs/images/spiderweb.png
new file mode 100644
index 0000000000..72cf36e145
Binary files /dev/null and b/htdocs/images/spiderweb.png differ
diff --git a/htdocs/images/webwork_rectangle.png b/htdocs/images/webwork_rectangle.png
new file mode 100644
index 0000000000..9a0e305039
Binary files /dev/null and b/htdocs/images/webwork_rectangle.png differ
diff --git a/htdocs/index.html b/htdocs/index.html
index 5f336ada94..74d30d3829 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -2,13 +2,15 @@
         "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-	<title>WeBWorK2 site</title>
-	<meta name="generator" content="BBEdit 7.0">
+<title>WeBWorK Placeholder Page</title>
 </head>
 <body>
-<H1>
-Welcome to WeBWorK at the University of Rochester
-</H1>
+
+<h1>WeBWorK Placeholder Page</h1>
+
+<p>Exploring?</p>
+
+<p>This page sits at the top level of the WeBWorK 2 system htdocs directory. You should never see it, unless you're verifying that you installed WeBWorK correctly.</p>
 
 </body>
 </html>
diff --git a/htdocs/js/Base64.js b/htdocs/js/Base64.js
new file mode 100644
index 0000000000..7d9536a4f0
--- /dev/null
+++ b/htdocs/js/Base64.js
@@ -0,0 +1,143 @@
+
+/**
+*
+*  Base64 encode / decode
+*  http://www.webtoolkit.info/
+*
+**/
+
+var Base64 = {
+
+	// private property
+	_keyStr : "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",
+
+	// public method for encoding
+	encode : function (input) {
+		var output = "";
+		var chr1, chr2, chr3, enc1, enc2, enc3, enc4;
+		var i = 0;
+
+		input = Base64._utf8_encode(input);
+
+		while (i < input.length) {
+
+			chr1 = input.charCodeAt(i++);
+			chr2 = input.charCodeAt(i++);
+			chr3 = input.charCodeAt(i++);
+
+			enc1 = chr1 >> 2;
+			enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
+			enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
+			enc4 = chr3 & 63;
+
+			if (isNaN(chr2)) {
+				enc3 = enc4 = 64;
+			} else if (isNaN(chr3)) {
+				enc4 = 64;
+			}
+
+			output = output +
+			this._keyStr.charAt(enc1) + this._keyStr.charAt(enc2) +
+			this._keyStr.charAt(enc3) + this._keyStr.charAt(enc4);
+
+		}
+
+		return output;
+	},
+
+	// public method for decoding
+	decode : function (input) {
+		var output = "";
+		var chr1, chr2, chr3;
+		var enc1, enc2, enc3, enc4;
+		var i = 0;
+
+		input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
+
+		while (i < input.length) {
+
+			enc1 = this._keyStr.indexOf(input.charAt(i++));
+			enc2 = this._keyStr.indexOf(input.charAt(i++));
+			enc3 = this._keyStr.indexOf(input.charAt(i++));
+			enc4 = this._keyStr.indexOf(input.charAt(i++));
+
+			chr1 = (enc1 << 2) | (enc2 >> 4);
+			chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
+			chr3 = ((enc3 & 3) << 6) | enc4;
+
+			output = output + String.fromCharCode(chr1);
+
+			if (enc3 != 64) {
+				output = output + String.fromCharCode(chr2);
+			}
+			if (enc4 != 64) {
+				output = output + String.fromCharCode(chr3);
+			}
+
+		}
+
+		output = Base64._utf8_decode(output);
+
+		return output;
+
+	},
+
+	// private method for UTF-8 encoding
+	_utf8_encode : function (string) {
+		string = string.replace(/\r\n/g,"\n");
+		var utftext = "";
+
+		for (var n = 0; n < string.length; n++) {
+
+			var c = string.charCodeAt(n);
+
+			if (c < 128) {
+				utftext += String.fromCharCode(c);
+			}
+			else if((c > 127) && (c < 2048)) {
+				utftext += String.fromCharCode((c >> 6) | 192);
+				utftext += String.fromCharCode((c & 63) | 128);
+			}
+			else {
+				utftext += String.fromCharCode((c >> 12) | 224);
+				utftext += String.fromCharCode(((c >> 6) & 63) | 128);
+				utftext += String.fromCharCode((c & 63) | 128);
+			}
+
+		}
+
+		return utftext;
+	},
+
+	// private method for UTF-8 decoding
+	_utf8_decode : function (utftext) {
+		var string = "";
+		var i = 0;
+		var c = c1 = c2 = 0;
+
+		while ( i < utftext.length ) {
+
+			c = utftext.charCodeAt(i);
+
+			if (c < 128) {
+				string += String.fromCharCode(c);
+				i++;
+			}
+			else if((c > 191) && (c < 224)) {
+				c2 = utftext.charCodeAt(i+1);
+				string += String.fromCharCode(((c & 31) << 6) | (c2 & 63));
+				i += 2;
+			}
+			else {
+				c2 = utftext.charCodeAt(i+1);
+				c3 = utftext.charCodeAt(i+2);
+				string += String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63));
+				i += 3;
+			}
+
+		}
+
+		return string;
+	}
+
+}
diff --git a/htdocs/js/addOnLoadEvent.js b/htdocs/js/addOnLoadEvent.js
new file mode 100644
index 0000000000..e168626cf7
--- /dev/null
+++ b/htdocs/js/addOnLoadEvent.js
@@ -0,0 +1,19 @@
+/*Here is declared the addOnLoadEvent function, which is used to sequentially add onload event handlers to the page*/
+
+/*This method of adding to the onload event listener is taken from tabber.js, which in turn takes from http://simon.incutio.com/archive/2004/05/26/addLoadEvent*/
+
+function addOnLoadEvent(f) {
+	var prevOnload = window.onload;
+	
+	if(typeof window.onload != 'function'){
+		window.onload = function() {
+			f();
+		}
+	}
+	else{
+		window.onload = function() {
+			prevOnload();
+			f();
+		}
+	}
+}
\ No newline at end of file
diff --git a/htdocs/js/color.js b/htdocs/js/color.js
new file mode 100644
index 0000000000..5c8e5e1d63
--- /dev/null
+++ b/htdocs/js/color.js
@@ -0,0 +1,22 @@
+/* color.js file, for coloring the input elements with the proper color based on whether they are correct or incorrect 
+	By ghe3*/
+	
+function color_in() {
+	var correct_elem = document.getElementsByName('correct_ids');
+	var incorrect_elem = document.getElementsByName('incorrect_ids');
+	var length_c = correct_elem.length;
+	var length_i = incorrect_elem.length;
+	
+	for (var i = 0; i<length_c; i++) {
+		var id = correct_elem[i].getAttribute('value');
+		var input_elem = document.getElementById(id.substr(0, id.indexOf('_')));
+		input_elem.style.backgroundColor = '#88FF88';
+	}
+	
+	for (var j = 0; j<length_i; j++) {
+		var id = incorrect_elem[j].getAttribute('value');
+		var input_elem = document.getElementById(id.substr(0, id.indexOf('_')));
+		input_elem.style.backgroundColor = '#FF9494';
+	}
+};
+addOnLoadEvent(color_in);
\ No newline at end of file
diff --git a/htdocs/js/dnd.js b/htdocs/js/dnd.js
new file mode 100644
index 0000000000..f24802aa38
--- /dev/null
+++ b/htdocs/js/dnd.js
@@ -0,0 +1,763 @@
+var changingSize = false;
+var changingHorizontalSize = false;
+var myStartWidth, libStartWidth;
+var myStartHeight;
+var mouseX, mouseY;
+var changeInX = 0;
+var changeInY = 0;
+var dragging = false;
+var horizontalSliderStartTop;
+var scrollIntervals = new Array();
+//dom element tools
+function hasClassName(element, class_name) {
+  return element?new RegExp("(?:^|\\s+)" + class_name + "(?:\\s+|$)").test(element.className):false;
+}
+
+function addClassName(element, class_name) {
+  if (!hasClassName(element, class_name) && element) {
+    var c = element.className;
+    element.className = c ? [c, class_name].join(' ') : class_name;
+  }
+}
+
+function removeClassName(element, class_name) {
+  if (hasClassName(element, class_name)) {
+    var c = element.className;
+    element.className = c.replace(
+        new RegExp("(?:^|\\s+)" + class_name + "(?:\\s+|$)", "g"), "");
+  }
+}
+
+function getChildById(id, node){
+  var children = node.childNodes;
+  for(var i = 0; i < children.length; i++){
+    if(children[i].id == id){
+      return children[i];
+    }
+    else{
+      var result = getChildById(id, children[i]);
+      if(result){
+        return result;
+      }
+    }
+  }
+  return false;
+}
+
+var fullscreen = false;
+var savedScreenInfo = new Array(6);
+
+function fullWindowMode(){
+  if(fullscreen){
+    document.getElementById("set_maker_two_box").style.position = savedScreenInfo[0];
+    document.getElementById("set_maker_two_box").style.top = savedScreenInfo[1];
+    document.getElementById("set_maker_two_box").style.left = savedScreenInfo[2];
+    document.getElementById("set_maker_two_box").style.height = savedScreenInfo[3];
+    document.getElementById("set_maker_two_box").style.width = savedScreenInfo[4];
+    document.getElementById("set_maker_two_box").style.background = savedScreenInfo[5];
+    document.getElementById("set_maker_two_box").style.zIndex = null;
+  } else {
+    savedScreenInfo[0] = document.getElementById("set_maker_two_box").style.position;
+    document.getElementById("set_maker_two_box").style.position = "absolute";
+    document.getElementById("set_maker_two_box").style.zIndex = 100;
+    savedScreenInfo[1] = document.getElementById("set_maker_two_box").style.top;
+    document.getElementById("set_maker_two_box").style.top = 0;
+    savedScreenInfo[2] = document.getElementById("set_maker_two_box").style.left;
+    document.getElementById("set_maker_two_box").style.left = 0;
+    savedScreenInfo[3] = document.getElementById("set_maker_two_box").style.height;
+    document.getElementById("set_maker_two_box").style.height = window.innerWidth;
+    savedScreenInfo[4] = document.getElementById("set_maker_two_box").style.width;
+    document.getElementById("set_maker_two_box").style.width = window.innerWidth;
+    savedScreenInfo[5] = document.getElementById("set_maker_two_box").style.background;
+    document.getElementById("set_maker_two_box").style.background = "white";
+    //adjust for relatively position parrents
+    if (Math.abs(findPos(document.getElementById("set_maker_two_box"))[1]) > 1){
+      document.getElementById("set_maker_two_box").style.top = -findPos(document.getElementById("set_maker_two_box"))[1]; 
+    }
+    if (Math.abs(findPos(document.getElementById("set_maker_two_box"))[0]) > 1){
+      document.getElementById("set_maker_two_box").style.left = -findPos(document.getElementById("set_maker_two_box"))[0]; 
+    }
+  }
+  gridify(false);
+  hasBeenGridded = false;
+  gridify(false);
+  fullscreen = !fullscreen;
+}
+
+function setup(){
+  //console.log("app code name:" + navigator.appCodeName);
+  //console.log("app name: " + navigator.appName);
+  if(navigator.appCodeName != "Mozilla"){
+    alert("Your browser may not be supported");
+  }
+  //set up all draggable items
+  var dragItems = document.querySelectorAll('[draggable=true]');
+  for (var i = 0; i < dragItems.length; i++) {
+    dragItems[i].addEventListener('dragstart', function (event) {
+      dragging = true;
+      event.dataTransfer.effectAllowed = 'all';
+      // store the ID of the element, and collect it on the drop later on
+      event.dataTransfer.setData('Text', this.id);
+      event.dataTransfer.setData('Move', event.shiftKey);
+    },false);
+  }
+  
+  var table = document.getElementById('mysets_problems');
+  var targetProblems = table.childNodes;
+  for(var i = 0; i < targetProblems.length; i++){
+    targetProblems[i].addEventListener('drop', reorderDrop, false);
+    targetProblems[i].addEventListener('dragenter', dragEnter, false);
+    targetProblems[i].addEventListener('dragleave', reorderDragLeave, false);
+    targetProblems[i].addEventListener('dragover', reorderDragOver, false);
+  }
+  
+  //dynamically size the lists
+  var libraryBox = document.querySelectorAll('div.setmaker_library');
+  var mysetsBox = document.querySelectorAll('div.mysets');
+  //fix sizes
+  var totalWidth = document.getElementById('problem_container').clientWidth;
+  myStartWidth = (100*(1/4))-0.8;
+  libStartWidth = (100*(3/4))-0.8;
+  for(var i = 0; i < libraryBox.length; i++)
+    libraryBox[i].style.width = ""+libStartWidth+"%";
+  for(var i = 0; i < mysetsBox.length; i++)
+    mysetsBox[i].style.width = ""+myStartWidth+"%";
+    
+  var myset_sets = document.querySelectorAll('select#myset_sets option');
+  for(var i = 0; i < myset_sets.length; i++){
+    myset_sets[i].addEventListener('drop', singleAddDrop, false);
+    myset_sets[i].addEventListener('dragenter', singleAddEnter, false);
+    myset_sets[i].addEventListener('dragleave', singleAddLeave, false);
+    myset_sets[i].addEventListener('dragover', singleAddOver, false);
+    myset_sets[i].addEventListener('mouseover', singleMouseOver, false);
+    myset_sets[i].addEventListener('mouseout', singleMouseOut, false);
+  }
+  
+  myStartHeight = table.clientHeight;
+  document.body.addEventListener('mousemove', sliderMove , false);
+  document.getElementById("size_slider").addEventListener('mousedown', sliderDown , false);
+  document.body.addEventListener('mouseup', sliderUp , false);
+  var horizontalSlider = document.getElementById("horizontal_slider");
+  horizontalSlider.style.width = totalWidth;
+  horizontalSliderStartTop = findPos(table)[1] - findPos(horizontalSlider)[1] - 16;
+  horizontalSlider.style.marginTop = horizontalSliderStartTop+"px";
+  horizontalSlider.addEventListener('mousedown', horizontalSliderDown, false);
+  
+  //important drag and drop stuff
+  table.addEventListener('drop', drop, false);
+  table.addEventListener('dragenter', dragEnter, false);
+  table.addEventListener('dragleave', dragLeave, false);
+  table.addEventListener('dragover', dragOver, false);
+  
+  document.body.addEventListener('drop', removeDrop, false);
+  document.body.addEventListener('dragenter', dragEnter, false);
+  document.body.addEventListener('dragleave', dragLeave, false);
+  document.body.addEventListener('dragover', dragOver, false);
+  //set up problem counter
+  document.getElementById('problem_counter').innerHTML = document.getElementById('mysets_problems').childNodes.length;
+  
+  var pastGridded = document.getElementById('pastGridded');
+  //console.log(pastGridded.value);
+  if(pastGridded.value == "true"){
+    gridify(false);
+  }
+  document.getElementById("loading").style.display = "none";
+}
+
+function redoSetup(problemSet){
+  //set up all draggable items
+  //var dragItems = problemSet.childNodes;
+  //this may add multiple listeners but they're all doing the same thing so it should be ok
+  
+  var dragItems = problemSet.childNodes;
+  for (var i = 0; i < dragItems.length; i++) {
+    dragItems[i].addEventListener('dragstart', function (event) {
+      dragging = true;
+      event.dataTransfer.effectAllowed = 'all';
+      // store the ID of the element, and collect it on the drop later on
+      event.dataTransfer.setData('Text', this.id);
+      event.dataTransfer.setData('Move', event.shiftKey);
+    },false);
+  }
+  if(problemSet.id == "mysets_problems"){
+    for(var i = 0; i < dragItems.length; i++){
+      dragItems[i].addEventListener('drop', reorderDrop, false);
+      dragItems[i].addEventListener('dragenter', dragEnter, false);
+      dragItems[i].addEventListener('dragleave', reorderDragLeave, false);
+      dragItems[i].addEventListener('dragover', reorderDragOver, false);
+    }
+  }
+  //set up problem counter
+  document.getElementById('problem_counter').innerHTML = document.getElementById('mysets_problems').childNodes.length;
+
+}
+
+/****** view problems functions ******/
+
+function selectAll(){
+  //console.log("test");
+  var libraryCheckboxes = document.querySelectorAll(".add_problem_checkbox");
+  for(var i = 0; i < libraryCheckboxes.length; i++){
+    libraryCheckboxes[i].checked = true;
+  }
+}
+
+function selectNone(){
+  var libraryCheckboxes = document.querySelectorAll(".add_problem_checkbox");
+  for(var i = 0; i < libraryCheckboxes.length; i++){
+    libraryCheckboxes[i].checked = false;
+  }
+}
+
+/****** end view problems functions ******/
+
+/****** Event listeners ******/
+
+/****** automatic scrolling functions ******/
+function scrollMouseMove(event){
+  //var mouseX = event.pageX;
+  var mousePos = getMouseXY(event);
+  if (mousePos[1] > (document.getElementById('mysets_problems' ).offsetTop+document.getElementById('mysets_problems').clientHeight) - 20){
+    scrollIntervals.push(setInterval('scrollMysetsDown()', 50));
+    //document.getElementById('mysets_problems').scrollTop = 300;
+  } else if (mousePos[1] < document.getElementById('mysets_problems' ).offsetTop + 20){
+    scrollIntervals.push(setInterval('scrollMysetsUp()', 50));
+  } else {
+    for(var i = 0; i < scrollIntervals.length; i++){
+      clearInterval(scrollIntervals[i]); 
+    }
+  }
+}
+
+function scrollMysetsDown(){
+  //console.log("scrolling to: "+document.getElementById('mysets_problems').scrollTop);
+  document.getElementById('mysets_problems').scrollTop+=5; 
+}
+
+function scrollMysetsUp(){
+  //console.log("scrolling to: "+document.getElementById('mysets_problems').scrollTop);
+  document.getElementById('mysets_problems').scrollTop-=5; 
+}
+
+/****** resize list functions ******/
+//change the precent width of the lists by how much the mouse has moved
+function sliderMove(event){
+  event.preventDefault();
+  if(changingSize){
+    changeInX += event.pageX-mouseX;
+    var totalWidth = document.getElementById('problem_container').clientWidth;
+    if((libStartWidth-((changeInX/totalWidth)*100))>2 && (myStartWidth+((changeInX/totalWidth)*100)) > 2 ){
+      mouseX = event.pageX;
+      var libraryBox = document.getElementById('setmaker_library_box');
+      var mysetsBox = document.getElementById('mysets_problems_box');
+      libraryBox.style.width = ""+(libStartWidth-((changeInX/totalWidth)*100))+ "%";
+      mysetsBox.style.width = ""+(myStartWidth+((changeInX/totalWidth)*100))+ "%";
+    }
+  } else if(changingHorizontalSize && 163+(changeInY+(event.pageY-mouseY)) > 0){
+    changeInY += event.pageY-mouseY;
+    var controlPanels = document.querySelectorAll("div.setSelector");
+    for(var i = 0; i < controlPanels.length; i++){
+      controlPanels[i].style.height = (163 + changeInY) + "px";
+      document.getElementById("mysets_problems").style.height = (myStartHeight - changeInY)+"px";
+      document.getElementById("setmaker_library_problems").style.height = (myStartHeight - changeInY)+"px";
+    }
+    document.getElementById('horizontal_slider').style.marginTop = (horizontalSliderStartTop + changeInY)+"px";
+    document.getElementById('size_slider').style.marginTop = (horizontalSliderStartTop +changeInY)+"px";
+    document.getElementById('size_slider').style.height = (myStartHeight - changeInY)+"px";
+    mouseY = event.pageY;
+  }
+}
+
+function horizontalSliderDown(event){
+  event.preventDefault();
+  changingHorizontalSize = true;
+  mouseY = event.pageY;
+}
+
+//mouse down over slider bar between the lists
+function sliderDown(event){
+  event.preventDefault();
+  changingSize = true;
+  mouseX = event.pageX;
+  mouseY = event.pageY;
+}
+
+function sliderUp(event){
+  if(changingSize && isGridded){
+    gridify(false)
+    hasBeenGridded = false;
+    gridify(false);
+    hasBeenGridded = false;
+    fixGrid();
+    fixMysetsGrid();
+  }
+  changingSize = false;
+  changingHorizontalSize = false;
+}
+
+/****** reorder functions ******/
+//reorder problems
+function reorderDrop(event){
+  for(var i = 0; i < scrollIntervals.length; i++){
+    clearInterval(scrollIntervals[i]); 
+  }
+  dragging = false;
+  if (event.preventDefault) event.preventDefault();
+  if (event.stopPropagation) event.stopPropagation();
+  var movedProblem = document.getElementById(event.dataTransfer.getData('Text'));
+  //console.log(event.dataTransfer.getData('Text'));
+  previewProblemEnd(event);
+  //get problem dropped on
+  var targetProblem = event.target;
+  while(targetProblem && !hasClassName(targetProblem, "problem")){
+    targetProblem = targetProblem.parentNode;
+  }
+  //dont let it drop on itself;
+  if(targetProblem.id == movedProblem.id){
+    if (event.stopPropagation) event.stopPropagation();
+    return false;
+  }
+  if((hasClassName(movedProblem, 'myProblem') && !hasClassName(movedProblem, "removedProblem")) || hasClassName(movedProblem, "libProblem")){  
+    //console.log("were just doing a reorder");
+    movedProblem.parentNode.removeChild(movedProblem);
+    targetProblem.parentNode.insertBefore(movedProblem, targetProblem);
+  } else {
+    //cancel remove problem
+    if(hasClassName(movedProblem, 'removedProblem')){
+      //console.log("we're adding a problem back and reordering it");
+      //have to disable a remove checkbox here as well
+      var deleteProbBox = document.getElementById("deleted" + movedProblem.id);
+      deleteProbBox.checked = false;
+      deleteProbBox.parentNode.style.display = "inline";
+      removeClassName(movedProblem,"removedProblem");
+      //uncomment for reorder
+      movedProblem.addEventListener('drop', reorderDrop, false);
+      movedProblem.addEventListener('dragenter', dragEnter, false);
+      movedProblem.addEventListener('dragleave', reorderDragLeave, false);
+      movedProblem.addEventListener('dragover', reorderDragOver, false);
+      
+      movedProblem.parentNode.removeChild(movedProblem);
+      targetProblem.parentNode.insertBefore(movedProblem, targetProblem);
+    }
+    //add library problem to target set
+    else{
+      //console.log("we're adding a new problem");
+      addClassName(movedProblem,"libProblem");
+      //where the work needs to be done
+      var toBeMoved = event.dataTransfer.getData('Move') == "true";
+      var moveProbBox = document.getElementById("moved" + movedProblem.id);
+      if(moveProbBox){
+        moveProbBox.checked = toBeMoved;
+        moveProbBox.parentNode.style.display = "none";
+      }
+      //console.log("trial"+movedProblem.id);
+      var addProbBox = document.getElementById("trial" + movedProblem.id);
+      //only add problem if not moving
+      addProbBox.checked = !toBeMoved || !moveProbBox;
+      //addProbBox.parentNode.style.display = "none";
+    
+      var hideProbBox = document.getElementById("hideme" + movedProblem.id);
+      //hideProbBox.parentNode.style.display = "none";
+      //do the work to copy problem over to target set
+      //remove if else to turn off copy
+      if(addProbBox.checked){
+        var cloneEl = movedProblem.cloneNode(true);
+        cloneEl.id = movedProblem.id + "clone";
+        cloneEl.removeChild(getChildById("trial" + movedProblem.id, cloneEl).parentNode.parentNode);
+        cloneEl.removeChild(getChildById("hideme" + movedProblem.id, cloneEl).parentNode.parentNode);
+        cloneEl.removeChild(getChildById("filetrial" + movedProblem.id, cloneEl));
+        if(moveProbBox)
+          cloneEl.removeChild(getChildById("moved" + movedProblem.id, cloneEl).parentNode.parentNode);
+        targetProblem.parentNode.insertBefore(cloneEl, targetProblem);
+        movedProblem.draggable = false;
+        cloneEl.addEventListener('dragstart', function (event) {
+          event.dataTransfer.effectAllowed = 'all';
+          // store the ID of the element, and collect it on the drop later on
+          event.dataTransfer.setData('Text', this.id);
+          },false);
+        //uncomment for reorder
+        cloneEl.addEventListener('drop', reorderDrop, false);
+        cloneEl.addEventListener('dragenter', dragEnter, false);
+        cloneEl.addEventListener('dragleave', reorderDragLeave, false);
+        cloneEl.addEventListener('dragover', reorderDragOver, false);
+        
+        if(isGridded){
+          cloneEl.addEventListener('mouseover', onMouseOver, false);
+          cloneEl.addEventListener('mousemove', onMouseMove, false);
+          //libProblems[i].addEventListener('click', previewProblemEnd, false);
+          cloneEl.addEventListener('mouseout', onMouseOut, false);
+        }
+      }
+      else{ //move
+        //console.log("we're moving a problem?");
+        //uncomment for reorder
+        movedProblem.addEventListener('drop', reorderDrop, false);
+        movedProblem.addEventListener('dragenter', dragEnter, false);
+        movedProblem.addEventListener('dragleave', reorderDragLeave, false);
+        movedProblem.addEventListener('dragover', reorderDragOver, false);
+        
+        movedProblem.parentNode.removeChild(movedProblem);
+        targetProblem.parentNode.insertBefore(movedProblem, targetProblem);
+      }
+    }
+    document.getElementById('problem_counter').innerHTML = document.getElementById('mysets_problems').childNodes.length;
+  }
+  
+  document.getElementById('isReordered').value = 1;
+  //propegation issue so call fix grids here..should really do this better
+  if(isGridded){
+    targetProblem.style.borderLeft = "none";
+    movedProblem.style.borderLeft = "none";
+  }
+  else {
+    targetProblem.style.borderTop = "none";
+    movedProblem.style.borderTop = "none";
+  }
+  //rename and reorder all problems in the target set
+  var reorderedProblems = document.getElementById('mysets_problems').childNodes;
+  for(var i = 0; i < reorderedProblems.length; i++){
+    //starts counting at one
+    var currentCount = i+1;
+    if(document.getElementById('reorder'+currentCount)){
+      document.getElementById('reorder'+currentCount).parentNode.removeChild(document.getElementById('reorder'+currentCount));
+    }
+    var reorderedInput = document.createElement('input');
+    reorderedInput.type = "hidden";
+    reorderedInput.id = "reorder"+currentCount;
+    reorderedInput.name = "reorder"+currentCount;
+    var fileNameToGet = reorderedProblems[i].id.match("clone")?reorderedProblems[i].id.replace("clone", ""):reorderedProblems[i].id;
+    reorderedInput.value = document.getElementById("filetrial"+fileNameToGet).value;
+    reorderedInput.override = 1;
+    reorderedProblems[i].appendChild(reorderedInput);
+  }
+  
+  if(isGridded){
+    hasBeenGridded = false;
+    fixGrid();
+    fixMysetsGrid();
+  }
+  return true;
+}
+
+function reorderDragOver(event) {
+  scrollMouseMove(event);
+    if (event.preventDefault) event.preventDefault(); // allows us to drop
+    event.dataTransfer.effectAllowed = 'all';
+    //var table = e.target;
+  //table.style.background = "green";
+  //doesn't work in webkit
+  //var movedProblem = document.getElementById(event.dataTransfer.getData('Text'));
+  //get problem dropped on
+  var targetProblem = event.target;
+  while(targetProblem && !hasClassName(targetProblem, "problem")){
+    targetProblem = targetProblem.parentNode;
+  }
+  //don't allow move and reorder at the same time
+  //if(((movedProblem.hasClassName("myProblem") && !movedProblem.hasClassName("removedProblem")) || movedProblem.hasClassName("libProblem"))&&((targetProblem.hasClassName("myProblem") && !targetProblem.hasClassName("removedProblem")) || targetProblem.hasClassName("libProblem"))){
+    //show where it will be dropped
+    if(isGridded){
+      targetProblem.style.borderLeft = "3px solid blue";
+    }
+    else {
+      targetProblem.style.borderTop = "3px solid blue";
+    }
+  //}
+}
+
+
+function reorderDragLeave(event) {
+  for(var i = 0; i < scrollIntervals.length; i++){
+    clearInterval(scrollIntervals[i]); 
+  }
+  if (event.preventDefault) event.preventDefault(); // allows us to drop
+  //var table = e.target;
+  //table.style.background = "red";
+  //var movedProblem = document.getElementById(event.dataTransfer.getData('Text'));
+  //get problem dropped on
+  var targetProblem = event.target;
+  while(targetProblem && !hasClassName(targetProblem, "problem")){
+    targetProblem = targetProblem.parentNode;
+  }
+  //don't allow move and reorder at the same time
+  //if(((movedProblem.hasClassName("myProblem") && !movedProblem.hasClassName("removedProblem")) || movedProblem.hasClassName("libProblem"))&&((targetProblem.hasClassName("myProblem") && !targetProblem.hasClassName("removedProblem")) || targetProblem.hasClassName("libProblem"))){
+    //show where it will be dropped
+    if(isGridded){
+      targetProblem.style.borderLeft = "none";
+    }
+    else {
+      targetProblem.style.borderTop = "none";
+    }
+  //}
+
+}
+
+/****** individual add functions ******/
+function singleMouseOver(event) {
+  //this is the kind of crazy work around that shouldn't be nessisary:
+  event.target.style.background = "rgba(176, 216, 230, 1)";
+  event.target.parentNode.style.background = "white";
+}
+
+function singleMouseOut(event) {
+  event.target.style.background = "none";
+  event.target.parentNode.style.background = "none";
+}
+
+function singleAddOver(event) {
+    if (event.preventDefault) event.preventDefault(); // allows us to drop
+    event.dataTransfer.effectAllowed = 'all';
+    event.target.style.background = "rgba(176, 216, 230, 1)";
+    event.target.parentNode.style.background = "white";
+    
+}
+
+  // to get IE to work
+function singleAddEnter(event) {
+  if (event.preventDefault) event.preventDefault(); // allows us to drop
+  event.dataTransfer.effectAllowed = 'all';
+  event.target.style.background = "rgba(176, 216, 230, 1)";
+  event.target.parentNode.style.background = "white";
+  //var table = e.target;
+  //table.style.background = "white";
+
+}
+
+function singleAddLeave(event) {
+  //if (event.preventDefault) event.preventDefault(); // allows us to drop
+  event.target.style.background = "none";
+  event.target.parentNode.style.background = "none";
+}
+
+function singleAddDrop(event) {
+  for(var i = 0; i < scrollIntervals.length; i++){
+    clearInterval(scrollIntervals[i]); 
+  }
+  dragging = false;
+  previewProblemEnd(event);
+  if (event.preventDefault) event.preventDefault();
+  if (event.stopPropagation) event.stopPropagation();
+  var el = document.getElementById(event.dataTransfer.getData('Text'));
+  var currentURL = window.location.href//window.location.protocol + "//" + window.location.host + window.location.pathname;
+  //var wantedElements = ["myset_sets", "local_sets", "reorder", "user", "filetrial", "isReordered", "mysetfiletrial", "trial", "deleted", "moved", "effectiveUser", "key", "new_set_name", "library_sets"];
+  var form = document.createElement('form');
+  var currentFormElements = document.getElementById('mainform').elements;
+  
+  form.appendChild(currentFormElements['user'].cloneNode(true));
+  form.appendChild(currentFormElements['effectiveUser'].cloneNode(true));
+  form.appendChild(currentFormElements['key'].cloneNode(true));
+  
+  var myset_sets = document.createElement('input');
+  myset_sets.name = "myset_sets";
+  myset_sets.value = event.target.value;
+  form.appendChild(myset_sets);
+  
+  form.appendChild(currentFormElements['local_sets'].cloneNode(true));
+  
+  //console.log(parseInt(el.id));
+  for(var i = 1; i < parseInt(el.id); i++){
+    var addedProblem = document.createElement('input');
+    addedProblem.name = "filetrial" + i;
+    addedProblem.value = document.getElementById("filetrial" + i).value;
+    form.appendChild(addedProblem);
+  }
+
+  var addedProblem = document.createElement('input');
+  addedProblem.name = "filetrial" + el.id.replace('myset', '');
+  addedProblem.value = document.getElementById("filetrial" + el.id).value;
+  form.appendChild(addedProblem);
+    
+  var addedProblemAddBox = document.createElement('input');
+  addedProblemAddBox.name = "trial" + el.id.replace('myset', '');
+  addedProblemAddBox.value = 1;
+  form.appendChild(addedProblemAddBox);
+  
+  singleAddSubmit(form, currentURL, 'save_changes_spinner');
+  event.target.style.background = "none";
+  event.target.parentNode.style.background = "none";
+}
+
+/****** normal drag functions ******/
+function dragOver(event) {
+    scrollMouseMove(event);
+    if (event.preventDefault) event.preventDefault(); // allows us to drop
+    event.dataTransfer.effectAllowed = 'all';
+}
+
+  // to get IE to work
+function dragEnter(event) {
+  if (event.preventDefault) event.preventDefault(); // allows us to drop
+  event.dataTransfer.effectAllowed = 'all';
+  //var table = e.target;
+  //table.style.background = "white";
+
+}
+
+function dragLeave(event) {
+     for(var i = 0; i < scrollIntervals.length; i++){
+        clearInterval(scrollIntervals[i]); 
+      }
+  //if (event.preventDefault) event.preventDefault(); // allows us to drop
+}
+
+function drop(event) {
+    for(var i = 0; i < scrollIntervals.length; i++){
+        clearInterval(scrollIntervals[i]); 
+      }
+    dragging = false;
+  //has to be done in both places just in case
+  previewProblemEnd(event);
+  if (event.preventDefault) event.preventDefault();
+  if (event.stopPropagation) event.stopPropagation();
+  var table = document.getElementById('mysets_problems');
+  var el = document.getElementById(event.dataTransfer.getData('Text'));
+  //If I drop on the empty table place at end
+  if((hasClassName(el,"myProblem") && !hasClassName(el,"removedProblem")) || hasClassName(el,"libProblem")){
+    table.removeChild(el);
+    table.appendChild(el);
+  }
+  else {
+    //cancel remove problem
+    if(hasClassName(el,'removedProblem')){
+      //have to disable a remove checkbox here as well
+      var deleteProbBox = document.getElementById("deleted" + el.id);
+      deleteProbBox.checked = false;
+      deleteProbBox.parentNode.style.display = "inline";
+      removeClassName(el, "removedProblem");
+      //uncomment for reorder
+      el.addEventListener('drop', reorderDrop, false);
+      el.addEventListener('dragenter', dragEnter, false);
+      el.addEventListener('dragleave', reorderDragLeave, false);
+      el.addEventListener('dragover', reorderDragOver, false);
+      
+      el.parentNode.removeChild(el);
+      table.appendChild(el);
+    }
+    //add library problem to target set
+    else{
+      addClassName(el,"libProblem");
+      //where the work needs to be done
+      var toBeMoved = event.dataTransfer.getData('Move') == "true";
+      var moveProbBox = document.getElementById("moved" + el.id);
+      if(moveProbBox){
+        moveProbBox.checked = toBeMoved;
+        moveProbBox.parentNode.style.display = "none";
+      }
+      var addProbBox = document.getElementById("trial" + el.id);
+      //only add problem if not moving
+      addProbBox.checked = !toBeMoved || !moveProbBox;
+      //addProbBox.parentNode.style.display = "none";
+    
+      var hideProbBox = document.getElementById("hideme" + el.id);
+      //hideProbBox.parentNode.style.display = "none";
+      //do the work to copy problem over to target set
+      //remove if else to turn off copy
+      if(addProbBox.checked){
+        var cloneEl = el.cloneNode(true);
+        cloneEl.id = el.id + "clone";
+        cloneEl.removeChild(getChildById("trial" + el.id, cloneEl).parentNode.parentNode);
+        cloneEl.removeChild(getChildById("hideme" + el.id, cloneEl).parentNode.parentNode);
+        cloneEl.removeChild(getChildById("filetrial" + el.id, cloneEl));
+        if(moveProbBox)
+          cloneEl.removeChild(getChildById("moved" + el.id, cloneEl).parentNode.parentNode);
+        table.appendChild(cloneEl);
+        el.draggable = false;
+        cloneEl.addEventListener('dragstart', function (event) {
+          event.dataTransfer.effectAllowed = 'all';
+          // store the ID of the element, and collect it on the drop later on
+          event.dataTransfer.setData('Text', this.id);
+          },false);
+        //uncomment for reorder
+        el.addEventListener('drop', reorderDrop, false);
+        el.addEventListener('dragenter', dragEnter, false);
+        el.addEventListener('dragleave', reorderDragLeave, false);
+        el.addEventListener('dragover', reorderDragOver, false);
+      }
+      else{ //move
+        //uncomment for reorder
+        el.addEventListener('drop', reorderDrop, false);
+        el.addEventListener('dragenter', dragEnter, false);
+        el.addEventListener('dragleave', reorderDragLeave, false);
+        el.addEventListener('dragover', reorderDragOver, false);
+        
+        el.parentNode.removeChild(el);
+        table.appendChild(el);
+      }
+    }
+    document.getElementById('problem_counter').innerHTML = document.getElementById('mysets_problems').childNodes.length;
+  }
+  return false;
+}
+
+function removeDrop(e) {
+  if (e.preventDefault) e.preventDefault();
+  //kind of a hack fix later
+  if(e.target.id == "div_cover"){
+    if (e.stopPropagation) e.stopPropagation();
+    return false;
+  }
+  //has to be done in both places just in case
+  previewProblemEnd(e);
+  if (e.stopPropagation) e.stopPropagation(); // stops the browser from redirecting
+  var el = document.getElementById(e.dataTransfer.getData('Text'));
+  //cancel remove
+  if(hasClassName(el,'myProblem')){
+    //have to enable a remove checkbox here as well
+    var deleteProbBox = document.getElementById("deleted" + el.id);
+    deleteProbBox.checked = true;
+    deleteProbBox.parentNode.style.display = "none";
+    addClassName(el,"removedProblem");
+    el.parentNode.removeChild(el);
+    //uncomment for reorder
+    el.removeEventListener('drop', reorderDrop, false);
+    el.removeEventListener('dragenter', dragEnter, false);
+    el.removeEventListener('dragleave', reorderDragLeave, false);
+    el.removeEventListener('dragover', reorderDragOver, false);
+    document.getElementById('setmaker_library_problems').appendChild(el);
+  }
+  //cancel add
+  else if(hasClassName(el,'libProblem')){
+    //comment for only one moved problem
+    var realEl = document.getElementById(el.id.replace("clone", ""));
+    realEl.draggable = true;
+    //remove libProblem tag
+    removeClassName(realEl,'libProblem');
+    //only one moved problem
+    //el.removeClassName('libProblem');
+    var addProbBox = document.getElementById("trial" + realEl.id);
+    addProbBox.checked = false;
+    addProbBox.parentNode.style.display = "inline";
+    var moveProbBox = document.getElementById("moved" + realEl.id);
+    if(moveProbBox){
+      moveProbBox.checked = false;
+      moveProbBox.parentNode.style.display = "inline";
+    }
+    var hideProbBox = document.getElementById("hideme" + realEl.id);
+    hideProbBox.parentNode.style.display = "inline";
+    el.parentNode.removeChild(el);
+    
+    //uncomment for reorder
+    el.removeEventListener('drop', reorderDrop, false);
+    el.removeEventListener('dragenter', dragEnter, false);
+    el.removeEventListener('dragleave', reorderDragLeave, false);
+    el.removeEventListener('dragover', reorderDragOver, false);
+    
+    //only one moved problem:
+    //document.getElementById('setmaker_library_problems').appendChild(el);
+  }
+  document.getElementById('problem_counter').innerHTML = document.getElementById('mysets_problems').childNodes.length;
+  return false;
+}
+
+/****** end event listeners ******/
+
+/****** help function ******/
+function toggleHelp(sender){
+  if(sender.value == "false"){
+    document.getElementById('help').style.display = "block";
+    sender.value = "true";
+  }
+  else{
+    document.getElementById('help').style.display = "none";
+    sender.value = "false";
+  }
+}
diff --git a/htdocs/js/form_builder.js b/htdocs/js/form_builder.js
new file mode 100644
index 0000000000..9802930a5c
--- /dev/null
+++ b/htdocs/js/form_builder.js
@@ -0,0 +1,396 @@
+
+/****** submit types ******/
+function viewSet(formID, uploadAddress, spinnerName){
+  var weAreUpdating = "view_set";
+  var activeSpinner = spinnerName;
+  //console.log(uploadAddress);
+  document.getElementById(activeSpinner).style.display = "inline";
+  var wantedElements = ["myset_sets", "local_sets", "mydisplayMode", "user", "key", "effectiveUser", "showHints", "showSolutions"];
+  upload(document.getElementById(formID), uploadAddress, wantedElements, null, weAreUpdating, activeSpinner);
+}
+
+function viewProblems(inputName ,formID, uploadAddress, spinnerName){
+  var weAreUpdating = "view_problems";
+  var activeSpinner = spinnerName;
+  document.getElementById(activeSpinner).style.display = "inline";
+  upload(document.getElementById(formID), uploadAddress, null, inputName, weAreUpdating, activeSpinner);
+}
+
+function saveChanges(formID, uploadAddress, spinnerName){
+  var weAreUpdating = "";
+  var activeSpinner = spinnerName;
+  document.getElementById(activeSpinner).style.display = "inline";
+  var wantedElements = ["myset_sets", "local_sets", "reorder", "user", "filetrial", "isReordered", "mysetfiletrial", "trial", "deleted", "moved", "effectiveUser", "key", "new_set_name", "library_sets"];
+  upload(document.getElementById(formID), uploadAddress, wantedElements, null, weAreUpdating, activeSpinner);
+}
+
+function updateLibCategories(formID, uploadAddress, inputName, spinnerName){
+  var weAreUpdating = "lib_categories";
+  document.getElementById(spinnerName).style.display = "inline";
+  var wantedElements =["effectiveUser", "key", "user", "library_is_basic", "library_subjects", "library_chapters", "library_sections", "library_textbook", "library_textchapter", "library_textsection", "library_keywords"];
+  upload(document.getElementById(formID), uploadAddress, wantedElements, inputName, weAreUpdating, spinnerName);
+}
+
+function changeLibrary(formID, uploadAddress, sender, spinnerName){
+  //console.log(sender.id);
+  console.log(sender.value);
+  var weAreUpdating = "libs";
+  document.getElementById(spinnerName).style.display = "inline";
+  var wantedElements = ["effectiveUser", "key", "user"];
+  upload(document.getElementById(formID), uploadAddress, wantedElements, sender.value, weAreUpdating, spinnerName);
+}
+
+function singleAddSubmit(form, uploadAddress, spinnerName){
+  var wantedElements = ["myset_sets", "local_sets", "reorder", "user", "filetrial", "isReordered", "mysetfiletrial", "trial", "deleted", "moved", "effectiveUser", "key", "new_set_name", "library_sets"];
+  document.getElementById(spinnerName).style.display = "inline";
+  upload(form, uploadAddress, wantedElements, null, "", spinnerName);
+}
+
+function rerandomize(){
+
+}
+
+function cleardisplay(){
+
+}
+
+/****** end submit types *****/
+
+function upload(form, uploadAddress, wantedElements, inputName, weAreUpdating, activeSpinner) {
+  //console.log("uploaded to " + uploadAddress+ " started for form: " + formID);
+  //var form = document.getElementById(formID);
+	var formElements = form.elements;
+  //create a progress bar:
+
+  //style is in main.css can be moved here if nessiasry
+  var xhr = new XMLHttpRequest();
+  xhr.addEventListener("progress", updateProgress, false);
+  xhr.addEventListener("load", function (event) {transferComplete(event, weAreUpdating, activeSpinner);}, false);
+  xhr.addEventListener("error", transferFailed, false);
+  xhr.addEventListener("abort", transferCanceled, false);
+
+	xhr.open("POST", uploadAddress, true);
+	//webkit
+	if(!(typeof FormData === "undefined")){
+		//var xhr = new XMLHttpRequest();
+	  //console.log("FormData exists");
+	  //make this more flexable
+	  //check if this works in ff4
+		var formData = new FormData(); //new FormData(form);//form.getFormData(); //  these work in ff and chrome but safari doesn't play nice yet
+		//so we build the formdata by hand
+		for(var i = 0; i < formElements.length; i++){
+		  //ignore the submits or we'll confuse perl...poor perl
+		  if(formElements[i].type != "submit" && formElements[i].name && (formElements[i].type != "checkbox" || formElements[i].checked)){
+				if(stringIsInArray(formElements[i].name, wantedElements)){
+				  formData.append(formElements[i].name, formElements[i].value);
+				}
+			}
+		}
+		switch (weAreUpdating)
+		{
+			case "view_set":
+      break;
+      
+			case "view_problems":
+				formData.append(inputName, 1);
+      break;
+      
+      case "libs":
+        formData.append(inputName, 1);
+      break;
+      
+      case "lib_categories":
+        formData.append(inputName, 1);
+      break;
+      
+			default:
+				formData.append("update", "Update Set");
+      break;
+		}
+		xhr.send(formData);
+	}
+		//mozilla untill ff4
+	else{
+		//console.log("FormData doesn't exist");
+		//build top of form
+		var boundary = '------WebKitFormBoundary' + (new Date).getTime();
+		var dashdash = '--';
+		var crlf     = '\r\n';
+	
+		/* Build RFC2388 string. */
+		var builder = '';
+	
+		/* Generate headers. */
+		for(var i = 0; i < formElements.length; i++){
+		  //ignore the submits or we'll confuse perl...poor perl
+		  if(formElements[i].type != "submit" && formElements[i].name && (formElements[i].type != "checkbox" || formElements[i].checked) && stringIsInArray(formElements[i].name, wantedElements)){
+		    if(formElements[i].name.indexOf("all_past_list") == -1)
+		      //console.log(formElements[i].name);
+		    //build each input
+		    builder += dashdash;
+			  builder += boundary;
+			  builder += crlf;  
+			  builder += 'Content-Disposition: form-data; name='+formElements[i].name;
+			  builder += crlf;
+			  builder += crlf;
+			  builder += formElements[i].value;
+			  builder += crlf;
+			}
+		}
+		switch (weAreUpdating)
+		{
+			case "view_set":
+      break;
+      
+			case "view_problems":
+				builder += dashdash;
+			  builder += boundary;
+			  builder += crlf;  
+			  builder += 'Content-Disposition: form-data; name='+inputName;
+			  builder += crlf;
+			  builder += crlf;
+			  builder += 1;
+			  builder += crlf;
+      break;
+      
+      case "libs":
+				builder += dashdash;
+			  builder += boundary;
+			  builder += crlf;  
+			  builder += 'Content-Disposition: form-data; name='+inputName;
+			  builder += crlf;
+			  builder += crlf;
+			  builder += 1;
+			  builder += crlf;
+      break;
+      
+			default:
+				builder += dashdash;
+			  builder += boundary;
+			  builder += crlf;  
+			  builder += 'Content-Disposition: form-data; name='+"update";
+			  builder += crlf;
+			  builder += crlf;
+			  builder += "Update Set";
+			  builder += crlf;
+      break;
+		}
+		//build bottom of form
+		builder += dashdash;
+		builder += boundary;
+		builder += dashdash;
+		builder += crlf;
+		//send form
+		//xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
+	  xhr.setRequestHeader('content-type', 'multipart/form-data; boundary=' + boundary);
+		xhr.send(builder);
+	}
+	//console.log("uploaded finished");
+}
+
+/****** event listeners ******/
+// progress on transfers from the server to the client (downloads)
+function updateProgress(evt) {
+  if (evt.lengthComputable) {
+    var percentComplete = evt.loaded / evt.total;
+    //console.log("Percent complete: "+precentComplete);
+  } else {
+    // Unable to compute progress information since the total size is unknown
+    //console.log("Loading.. "+ evt.loaded + " out of " + evt.total);
+  }
+}
+
+function transferComplete(evt, weAreUpdating, activeSpinner) {
+  //console.log("recieved response");
+  //console.log(weAreUpdating);
+  var responseObject = HTMLParser(evt.target.responseText);
+  //console.log(responseObject);
+  switch (weAreUpdating)
+  {
+    case "view_set":
+      var newSet = getChildById("mysets_problems", responseObject);
+      //console.log(newSet);
+      if (newSet) {
+				document.getElementById("mysets_problems").innerHTML = newSet.innerHTML;
+				document.getElementById('problem_counter').innerHTML = document.getElementById('mysets_problems').childNodes.length;
+				weAreUpdating = "";
+				redoSetup(document.getElementById("mysets_problems"));
+				newSet = null;
+				gridify(false)
+        hasBeenGridded = false;
+        gridify(false);
+        if(isGridded){
+          hasBeenGridded = false;
+          fixGrid();
+          fixMysetsGrid();
+        }
+      } else {
+				//console.log(responseObject);
+        alert("There is an error in the response, see javascript console for details");
+      }
+      break;
+      
+    case "view_problems":
+        var problems = getChildById("setmaker_library_data", responseObject);
+        //console.log(problems);
+      if(problems){
+        document.getElementById("setmaker_library_data").innerHTML = problems.innerHTML;
+        weAreUpdating = "";
+        redoSetup(document.getElementById("setmaker_library_problems"));
+        problems = null;
+        
+        gridify(false)
+        hasBeenGridded = false;
+        gridify(false);
+        if(isGridded){
+          hasBeenGridded = false;
+          fixGrid();
+          fixMysetsGrid();
+        }
+      } else {
+        //console.log(responseObject);
+        alert("There is an error in the response, see javascript console for details");
+			}
+      break;
+      
+    case "lib_categories":
+      //console.log("looking for categories");
+      //console.log(getInnerElementId(responseObject, "control_panel"));
+      var categories = getChildById("library_categories", responseObject);
+      if(categories){
+        document.getElementById("library_categories").innerHTML = categories.innerHTML;
+        weAreUpdating = "";
+        //redoSetup(document.getElementById("setmaker_library_problems"));
+        categories = null;
+      } else {
+        //console.log(responseObject);
+        alert("There is an error in the response, see javascript console for details");
+			}
+      break;
+    
+    case "libs":
+      //console.log("looking for categories");
+      //console.log(getInnerElementId(responseObject, "control_panel"));
+      var categories = getChildById("library_categories", responseObject);
+      if(categories){
+        document.getElementById("library_categories").innerHTML = categories.innerHTML;
+        weAreUpdating = "";
+        //redoSetup(document.getElementById("setmaker_library_problems"));
+        categories = null;
+      } else {
+        //console.log(responseObject);
+        alert("There is an error in the response, see javascript console for details");
+			}
+      break;  
+    
+    default:
+      //console.log(responseObject);
+      break;
+  }
+  //update messages:
+  var newMessages = getChildByClass("Message", responseObject);
+  var currentMessages = document.querySelectorAll(".Message");
+  for(var i = 0; i < currentMessages.length; i++){
+    currentMessages[i].innerHTML = newMessages.innerHTML;
+  }
+  responseObject = null;
+  if(document.getElementById(activeSpinner)){
+    document.getElementById(activeSpinner).style.display = "none";
+  }
+}
+
+function transferFailed(evt) {
+  alert("An error occurred while transferring the file.");
+}
+
+function transferCanceled(evt) {
+  alert("The transfer has been canceled by the user.");
+}
+/****** end event listeners ******/
+
+/****** Utility functions ******/
+//i worry about uniqueness of id's can the document see the resulting object here, i hope not
+//html parser from https://developer.mozilla.org/en/Code_snippets/HTML_to_DOM#Safely_parsing_simple_HTML.c2.a0to_DOM
+function HTMLParser(aHTMLString){
+  //their version doesn't seem to work
+  /*var html = document.implementation.createDocument("http://www.w3.org/1999/xhtml", "html", null),
+    body = document.createElementNS("http://www.w3.org/1999/xhtml", "body");
+  html.documentElement.appendChild(body);
+
+  body.appendChild(Components.classes["@mozilla.org/feed-unescapehtml;1"]
+    .getService(Components.interfaces.nsIScriptableUnescapeHTML)
+    .parseFragment(aHTMLString, false, null, body));
+  */
+  //might not be safe but it works
+  var body = document.createElement("div");
+  body.innerHTML = aHTMLString;
+  //console.log(body);
+  return body;
+}
+
+//creates a modal window containing object
+function modal(object){
+  var modalDiv = document.getElementById('modal-div');
+  if(modalDiv){
+    document.body.removeChild(modalDiv);
+  }
+  if(object){
+    var modalDiv = document.createElement('div');
+    //nessisary styles are included in main.css but can be moved to js if needed
+    modalDiv.id= 'modal-div';
+    modalDiv.appendChild(object);
+    document.body.appendChild(modalDiv);
+  }
+}
+
+function stringIsInArray(string, array){
+  //if the array's empty return true (means we don't care)
+  if(!array){
+    return true;
+  }
+  for(var i = 0; i < array.length; i++){
+    //switch to regex someday
+    if(string.indexOf(array[i]) != -1){
+      return true;
+    } 
+  }
+  return false;
+}
+
+//returns the first instance of a myClass
+function getChildByClass(myClass, el){
+  var children = el.childNodes;
+  var result = false;
+  for(var i = 0; i < children.length; i++){
+    if(hasClassName(children[i], myClass)){
+      //console.log("Found "+children[i].className);
+      result = children[i];
+      break;
+    } else if(children[i].childNodes.length > 0){
+      result = getChildByClass(myClass, children[i]);
+      if(result){
+        break;
+      }
+    }
+  }
+  return result;
+}
+
+/*function getInnerElementId(parent, id){
+  var children = parent.childNodes;
+  var result = false;
+  for(var i = 0; i < children.length; i++){
+    if(children[i].id == id){
+      console.log("Found "+children[i].id);
+      result = children[i];
+      break;
+    } else if(children[i].childNodes.length > 0){
+      result = getInnerElementId(children[i], id);
+      if(result){
+        break;
+      }
+    }
+  }
+  return result;
+}*/
+/****** End utility functions ******/
diff --git a/htdocs/js/gateway.js b/htdocs/js/gateway.js
new file mode 100644
index 0000000000..a74b85ab0f
--- /dev/null
+++ b/htdocs/js/gateway.js
@@ -0,0 +1,126 @@
+/***********************************************************
+ *
+ * Javascript for gateway tests.  
+ *
+ * This file includes the routines allowing navigation
+ * within gateway tests, manages the timer, and posts 
+ * alerts when test time is winding up.
+ *
+ * To install, include
+ *    <script language="javascript" type="text/javascript" 
+ *      src="<!--#url type="webwork" name="htdocs"-->/js/gateway.js"></script>
+ * to the head othe the template file being used.
+ * 
+ * The code here relies heavily on the existence of form elements 
+ * created by GatewayQuiz.pm
+ *
+ ***********************************************************/
+
+function jumpTo(ref) {  // scrolling javascript function
+    if ( ref ) {
+        var pn = ref - 1; // we start anchors at 1, not zero
+        if ( navigator.appName == "Netscape" && 
+             parseFloat(navigator.appVersion) < 5 ) {
+            var xpos = document.anchors[pn].x;
+            var ypos = document.anchors[pn].y;
+        } else {
+            var xpos = document.anchors[pn].offsetLeft;
+            var ypos = document.anchors[pn].offsetTop;
+        }
+        if ( window.scrollTo == null ) { // cover for anyone
+            window.scroll(xpos,ypos);    //   lacking js1.2
+        } else {
+            window.scrollTo(xpos,ypos);
+        }
+    }
+    return false; // prevent link from being followed
+}
+
+// timer for gateway 
+var theTimer;		// variable for the timer
+var browserTime;	// on load, the time on the client's computer
+var serverTime;		// on load, the time on the server
+var timeDelta;		// the difference between those
+var serverDueTime;	// the time the test is due
+
+function runtimer() {
+// function to start the timer, initializing the time variables
+    if ( document.getElementById('gwTimer') == null ) {  // no timer
+	return;
+    } else {
+	theTimer = document.getElementById('gwTimer');
+	var dateNow = new Date();
+	browserTime = Math.round(dateNow.getTime()/1000);
+	serverTime = document.gwTimeData.serverTime.value;
+	serverDueTime = document.gwTimeData.serverDueTime.value;
+	timeDelta = browserTime - serverTime;
+
+	var remainingTime = serverDueTime - browserTime + 1.*timeDelta;
+
+	if ( remainingTime >= 0 ) {
+	    theTimer.innerHTML = "Remaining time: " + toMinSec(remainingTime) + " (min:sec)";
+	    setTimeout("updateTimer();", 1000);
+	    setTimeout("checkAlert();", 1000);
+	} else {
+	    theTimer.innerHTML = "Remaining time: 0 min";
+	}
+    }
+}
+
+function updateTimer() {
+// update the timer 
+    var dateNow = new Date();
+    browserTime = Math.round(dateNow.getTime()/1000);
+    var remainingTime = serverDueTime - browserTime + 1.*timeDelta;
+    if ( remainingTime >= 0 ) {
+	theTimer.innerHTML = "Remaining time: " + toMinSec(remainingTime) + " (min:sec)";
+	setTimeout("updateTimer();", 1000);
+    }
+}
+
+function checkAlert() { 
+// check to see if we should put up a low time alert
+    var dateNow = new Date();
+    browserTime = Math.round(dateNow.getTime()/1000);
+    var timeRemaining = serverDueTime - browserTime + 1.*timeDelta;
+
+    if ( timeRemaining <= 0 ) {
+        alert("* You are out of time! *\n" + 
+	      "* Press grade now!     *");
+    } else if ( timeRemaining <= 45 && timeRemaining > 40 ) {
+	alert("* You have less than 45 seconds left! *\n" + 
+	      "*      Press Grade very soon!         *");
+    } else if ( timeRemaining <= 90 && timeRemaining > 85 ) {
+	alert("* You only have less than 90 sec left to complete  *\n" + 
+	      "* this assignment. You should finish it very soon! *");
+    }
+    if ( timeRemaining > 0 ) {
+	setTimeout("checkAlert();", 5000);
+    }
+}
+
+function toMinSec(t) {
+// convert to min:sec
+    if ( t < 0 ) {     // don't deal with negative times
+	t = 0;
+    }
+    mn = Math.floor(t/60);
+    sc = t - 60*mn;
+    if ( mn < 10 && mn > -1 ) {
+        mn = "0" + mn;
+    }
+    if ( sc < 10 ) {
+        sc = "0" + sc;
+    }
+    return mn + ":" + sc;
+}
+
+// for some reason putting this as an onload event in the body tag
+// isn't working.  so start the timer here; the 500ms delay is to be 
+// sure that the timer has loaded
+setTimeout("runtimer()",500);
+// this does not work either
+// window.onload=runtimer();
+
+/* end of gateway javascript routines
+ ***********************************************************/
diff --git a/htdocs/js/limit-reloads.js b/htdocs/js/limit-reloads.js
new file mode 100644
index 0000000000..18a091a88d
--- /dev/null
+++ b/htdocs/js/limit-reloads.js
@@ -0,0 +1,56 @@
+/*******************************************************
+ *
+ *  This file implements a JavaScript-based hack to prevent
+ *  an autorepeating F5 key from swamping your server with
+ *  requests.  it does this by ignoring F5 keydown events
+ *  and reloading the page on an F5 keyup event.  It will
+ *  also put up a dialog box when it has spotted repeated
+ *  F5 attempts to ask you to check if something is sitting
+ *  on the F5 button.
+ *
+ *  This only works in MSIE/PC and Firefox/PC.  It does
+ *  not work for Firefox/Mac or Opera (either platform).
+ *
+ *  Autorepeating the reload button should be considered
+ *  a browser bug, in my opinion, but I can't do much
+ *  about that.
+ *
+ *  To install it, add the line
+ *
+ *    <script src="<!--#url type="webwork" name="htdocs"-->/js/limit-reloads.js"></script>
+ *
+ *  to the head of the system.template file that you are
+ *  using (in a webwork/conf/templates subdirectory).
+ *
+ ********************************************************/
+
+var wwLimitReloads = {
+  maxF5count: 5, // warn after this many blocked F5 attempts
+  F5count: 0,
+  warned: 0
+}
+
+document.onkeydown = function (event) {
+  if (!event) {event = window.event}
+  if (event.keyCode == 116) {
+    if (wwLimitReloads.F5count++ == wwLimitReloads.maxF5count && !wwLimitReloads.warned) {
+      wwLimitReloads.warned = 1;
+      setTimeout(function () {
+        alert("You seem to be generating many F5 presses.\n"
+              + "See if something is holding the F5 key down.");
+      },10);
+    }
+    try {event.keyCode = 8} catch (err) {}; // make MSIE event cancelable
+    if (event.preventDefault) event.preventDefault();
+    if (event.stopPropagation) event.stopPropagation();
+    event.cancelBubble = true;
+    event.returnValue = false;
+    return false;
+  }
+  return true;
+}
+
+document.onkeyup = function (event) {
+  if (!event) {event = window.event}
+  if (event.keyCode == 116) {window.location.reload()}
+}
diff --git a/htdocs/js/problem_grid.js b/htdocs/js/problem_grid.js
new file mode 100644
index 0000000000..61f8a5190a
--- /dev/null
+++ b/htdocs/js/problem_grid.js
@@ -0,0 +1,432 @@
+var isGridded = false;
+var mysetsHeight, mysetsWidth;
+var libraryHeight, libraryWidth;
+var previewWidth = 440;
+var previewHeight = 120;
+var mysetsAcross = 1;
+var libAcross = 4;
+var padding = 20; //the amount of padding on the lists
+var property = false; //our browsers transform property
+//stored values while problem is previewed
+var previewProblem;
+var previewProblemScale;
+var tempTop, tempLeft;
+//state variables
+var viewing = false;
+var hasBeenGridded = false;
+var timeoutID;
+var relativeNode;
+var magnification = 1;
+
+function gridify(e){
+  //set up
+  var mysetsList = document.getElementById("mysets_problems");
+  var mysetsProblems = mysetsList.childNodes;
+  var libraryList = document.getElementById("setmaker_library_problems");
+  var libProblems = libraryList.childNodes;
+  mysetsHeight = mysetsList.clientHeight;
+  mysetsWidth = mysetsList.clientWidth - padding;
+  libraryHeight = libraryList.clientHeight;
+  libraryWidth = libraryList.clientWidth - padding;
+  property = getTransformProperty(document.getElementById("editor-form"));
+  //no point if can't transform
+  if(property){
+    if(!isGridded){
+      document.getElementById("gridifyButton").innerHTML = "Ungridify?";
+      document.getElementById('mysets_problems').addEventListener('drop', styleAddedGridProblem, false);
+      document.body.addEventListener('drop', styleRemovedGridProblem, false);
+      
+      for(var i = 0; i<mysetsProblems.length; i++){
+        mysetsProblems[i].addEventListener('mouseover', onMouseOver, false);
+        mysetsProblems[i].addEventListener('mousemove', onMouseMove, false);
+        //libProblems[i].addEventListener('click', previewProblemEnd, false);
+        mysetsProblems[i].addEventListener('mouseout', onMouseOut, false);
+      }
+
+      for(var i = 0; i < libProblems.length; i++){
+        if(!libProblems[i].className.match("libProblem")){
+          libProblems[i].addEventListener('mouseover', onMouseOver, false);
+          libProblems[i].addEventListener('mousemove', onMouseMove, false);
+          //libProblems[i].addEventListener('click', previewProblemEnd, false);
+          libProblems[i].addEventListener('mouseout', onMouseOut, false);
+        }
+      }
+      fixGrid();
+      fixMysetsGrid();
+      isGridded = true;
+      document.getElementById('pastGridded').value = "true";
+      hasBeenGridded = true;
+    }else{
+      previewProblemEnd(false);
+      document.getElementById("gridifyButton").innerHTML = "Gridify!!";
+      document.getElementById('mysets_problems').removeEventListener('drop', styleAddedGridProblem, false);
+      document.body.removeEventListener('drop', styleRemovedGridProblem, false);
+      //scale mysets
+      for(var i = 0; i<mysetsProblems.length; i++){
+        //set the height and width for the preview version
+        mysetsProblems[i].style.height = "auto";
+        mysetsProblems[i].style.width = "auto";
+        mysetsProblems[i].style[property] = "none";
+        mysetsProblems[i].removeEventListener('mouseover', onMouseOver, false);
+        mysetsProblems[i].removeEventListener('mousemove', onMouseMove, false);
+        //libProblems[i].removeEventListener('click', previewProblemEnd, false);
+        mysetsProblems[i].removeEventListener('mouseout', onMouseOut, false);
+        mysetsProblems[i].style.position = "static";
+      }
+      //scale library sets
+      for(var i = 0; i < libProblems.length; i++){
+        libProblems[i].style.height = "auto";
+        libProblems[i].style.width = "auto";
+        //ratio should allow for 4 accross in library sets
+        libProblems[i].style[property] = "none";
+        libProblems[i].removeEventListener('mouseover', onMouseOver, false);
+        libProblems[i].removeEventListener('mousemove', onMouseMove, false);
+        //libProblems[i].removeEventListener('click', previewProblemEnd, false);
+        libProblems[i].removeEventListener('mouseout', onMouseOut, false);
+        libProblems[i].style.position = "static";
+      }
+      isGridded = false;
+      document.getElementById('pastGridded').value = "false";
+    }
+  }
+}
+//gui adjustments
+function increasMysetsAcross(){
+  mysetsAcross++;
+  document.getElementById('mysetsAcross').innerHTML = mysetsAcross;
+  if(isGridded){
+    hasBeenGridded = false;
+    fixGrid();
+    fixMysetsGrid();
+  }
+}
+
+function decreaseMysetsAcross(){
+  mysetsAcross--;
+  document.getElementById('mysetsAcross').innerHTML = mysetsAcross;
+  if(isGridded){
+    hasBeenGridded = false;
+    fixGrid();
+    fixMysetsGrid();
+  }
+}
+
+function increaseLibAcross(){
+  libAcross++;
+  document.getElementById('libAcross').innerHTML = libAcross;
+  if(isGridded){
+    hasBeenGridded = false;
+    fixGrid();
+    fixMysetsGrid();
+  }
+}
+
+function decreaseLibAcross(){
+  libAcross--;
+  document.getElementById('libAcross').innerHTML = libAcross;
+  if(isGridded){
+    hasBeenGridded = false;
+    fixGrid();
+    fixMysetsGrid();
+  }
+}
+
+function decreaseMagnification(){
+  magnification -= 0.1;
+  magnification = Math.round(magnification*10)/10;
+  document.getElementById('magnification').innerHTML = magnification;
+}
+function increaseMagnification(){
+  magnification += 0.1;
+  magnification = Math.round(magnification*10)/10;
+  document.getElementById('magnification').innerHTML = magnification;
+}
+
+function fixGrid(){
+  var topDiff = 0;
+  var tempHeight = 0;
+  var libProblems = document.getElementById("setmaker_library_problems").childNodes;
+  for(var i = 0; i < libProblems.length; i++){
+    libProblems[i].style.height = "auto";
+    libProblems[i].style.width = ""+previewWidth+"px";
+    //ratio should allow for 4 accross in library sets
+    var scale = (libraryWidth/libAcross)/previewWidth;
+    var scaleY = previewHeight/libProblems[i].clientHeight;
+    libProblems[i].style[property] = "scale("+scale+","+scaleY+")";
+    libProblems[i].style.position = "absolute";
+    //move things to create the grid
+    if(!hasBeenGridded){
+      topDiff = -(libProblems[i].clientHeight+2)*(1-scaleY)*(0.5);
+      if(i == 0){
+        tempHeight += 10;
+        topDiff += tempHeight;
+      } 
+      else if(i%libAcross == 0){
+        tempHeight += previewHeight + 10;
+        topDiff += tempHeight;
+      }
+      else{
+        topDiff += tempHeight;
+      }
+      libProblems[i].style.top = "" + ((topDiff)) + "px";
+      //alert(topDiff);
+    
+      var leftDiff = -1*((((previewWidth-(libraryWidth/libAcross)))/2))+(i%libAcross)*(libraryWidth/libAcross);
+      //pad the grid
+      libProblems[i].style.left = "" + (leftDiff+10+(i%libAcross)*5) + "px";
+    }
+  }
+}
+
+function fixMysetsGrid(){
+  var tempHeight = 0;
+  var topDiff = 0;
+  var mysetsProblems = document.getElementById("mysets_problems").childNodes;
+  //scale mysets
+  for(var i = 0; i<mysetsProblems.length; i++){
+    mysetsProblems[i].style.height = "auto";
+    mysetsProblems[i].style.width = ""+previewWidth+"px";
+    //ratio should allow for 4 accross in library sets
+    var scale = (mysetsWidth/mysetsAcross)/previewWidth;
+    var scaleY = previewHeight/mysetsProblems[i].clientHeight;
+    mysetsProblems[i].style[property] = "scale("+scale+","+scaleY+")";
+    mysetsProblems[i].style.position = "absolute";
+    //move things to create the grid
+    if(!hasBeenGridded){
+      topDiff = -(mysetsProblems[i].clientHeight+2)*(1-scaleY)*(0.5);
+      if(i == 0){
+        tempHeight += 10;
+        topDiff += tempHeight;
+      } 
+      else if(i%mysetsAcross == 0){
+        tempHeight += previewHeight + 10;
+        topDiff += tempHeight;
+      }
+      else{
+        topDiff += tempHeight;
+      }
+      mysetsProblems[i].style.top = "" + ((topDiff)) + "px";
+      //alert(topDiff);
+    
+      var leftDiff = -1*((((previewWidth-(mysetsWidth/mysetsAcross)))/2))+(i%mysetsAcross)*(mysetsWidth/mysetsAcross);
+      //pad the grid
+      mysetsProblems[i].style.left = "" + (leftDiff+10+(i%mysetsAcross)*5) + "px";
+    }
+  }
+}
+
+function onMouseOver(event){
+  if(!viewing && !dragging){
+    clearTimeout(timeoutID);
+    //console.log("?");
+    previewProblem = getProblem(event.target);
+    if (previewProblem){
+      timeoutID = setTimeout("previewProblemStart()", 250);
+    }
+  }
+}
+
+function onMouseMove(event){
+  if(!viewing && !dragging){
+    clearTimeout(timeoutID);
+    timeoutID = setTimeout("previewProblemStart()", 250);
+  }
+}
+
+function onMouseOut(event){
+  clearTimeout(timeoutID);
+  //previewProblemEnd(false);
+}
+
+
+function previewProblemStart(){
+  //save stuff for mouse leave
+  tempTop = previewProblem.style.top;
+  tempLeft = previewProblem.style.left;
+  previewProblemScale = previewProblem.style[property];
+  //adjust for magnification
+  var leftDiff = -(((1-magnification)*previewProblem.clientWidth)/2);
+  var topDiff = -(((1-magnification)*previewProblem.clientHeight)/2);
+  
+  var container = previewProblem.parentNode;
+  /*var newPos = [Math.max(10, (previewProblem.offsetTop-topDiff)-previewProblem.parentNode.scrollTop), Math.max(10, (previewProblem.offsetLeft-leftDiff)-previewProblem.parentNode.scrollLeft)];
+  previewProblem.style.top = newPos[0];
+  previewProblem.style.left = newPos[1];*/
+  previewProblem.style.zIndex = "1000";
+  //previewProblem.className += " shadowed";
+  //previewProblem.style.position = "fixed";
+  /*if(previewProblem.offsetTop+previewProblem.clientHeight*magnification > previewProblem.parentNode.clientHeight){
+    previewProblem.style.top = previewProblem.parentNode.clientHeight-previewProblem.clientHeight*magnification-10;
+  }
+  if((previewProblem.offsetLeft-leftDiff)+(previewProblem.clientWidth*magnification) > previewProblem.parentNode.clientWidth && previewProblem.clientWidth*magnification < previewProblem.parentNode.clientWidth){
+    previewProblem.style.left = previewProblem.parentNode.clientWidth-10-previewProblem.clientWidth*magnification;
+  }*/
+  previewProblem.style[property] = "scale("+magnification+")";
+  
+  //get it's position relative to the problem container
+  var relativePosition = findPos(previewProblem, "problemList");
+  relativePosition[0] += leftDiff;
+  relativePosition[1] += topDiff;
+  relativePosition[1] -= previewProblem.parentNode.scrollTop;
+  relativePosition[0] -= previewProblem.parentNode.scrollLeft;
+  //set a relative node so it can be put back in the correct place
+  relativeNode = previewProblem.nextSibling != null ? previewProblem.nextSibling : previewProblem.parentNode;
+  //move the problem out of the box to deal with overflow
+  previewProblem.parentNode.removeChild(previewProblem);
+  document.getElementById('problem_container').appendChild(previewProblem);
+  //set new position
+  previewProblem.style.left = relativePosition[0];
+  previewProblem.style.top = relativePosition[1];
+  //set up a cover so that mouse out will work
+  var divCover;
+  if(!document.getElementById("div_cover")){
+    divCover = document.createElement('div');
+    divCover.id = "div_cover";
+    divCover.className += "shadowed"
+    document.getElementById('problem_container').appendChild(divCover);
+    divCover.style.position = "absolute";
+    divCover.style.zIndex = "2000";
+  } else {
+    divCover = document.getElementById("div_cover");
+  }
+  divCover.addEventListener('dragstart', dummyDrag,false);
+  divCover.addEventListener('mouseout', previewProblemEnd, false);
+  divCover.style.display = "block";
+  divCover.style.height = previewProblem.clientHeight*magnification;
+  divCover.style.width = previewProblem.clientWidth*magnification;
+  divCover.style.top = previewProblem.offsetTop-topDiff;
+  divCover.style.left = previewProblem.offsetLeft-leftDiff;
+  //divCover.style[property] = "scale("+magnification+")";
+  divCover.draggable = previewProblem.draggable;
+  viewing = !viewing;
+}
+
+function dummyDrag(event){
+  dragging = true;
+  event.dataTransfer.effectAllowed = 'all';
+  event.dataTransfer.setDragImage(previewProblem, previewProblem.clientWidth*(1/4), previewProblem.clientHeight*(1/4));
+  //console.log("drag start for: "+previewProblem.id);
+  // store the ID of the element, and collect it on the drop later on
+  event.dataTransfer.setData('Text', previewProblem.id);
+  event.dataTransfer.setData('Move', event.shiftKey);
+  //previewProblemEnd(event);
+}
+
+function previewProblemEnd(event){
+  if (event.preventDefault) event.preventDefault();
+  if (event.stopPropagation) event.stopPropagation();
+  clearTimeout(timeoutID);
+  if(viewing){
+    //document.getElementById('problem_container').removeChild(document.getElementById("div_cover"));
+    document.getElementById("div_cover").style.display = "none";
+    //document.getElementById("div_cover").style.zIndex = "-1000";
+    document.getElementById("div_cover").removeEventListener('dragstart', dummyDrag,false);
+    document.getElementById("div_cover").removeEventListener('mouseout', previewProblemEnd, false);
+    document.getElementById('problem_container').removeChild(previewProblem);
+    if(hasClassName(relativeNode, 'problemList')){
+      relativeNode.appendChild(previewProblem);
+    }else{
+      relativeNode.parentNode.insertBefore(previewProblem, relativeNode); 
+    }
+    if(previewProblem.parentNode.id == "setmaker_library_problems"){
+      var scale = (libraryWidth/libAcross)/previewWidth;
+    }else{
+      var scale = (mysetsWidth/mysetsAcross)/previewWidth;
+    }
+    previewProblem.style.position = "absolute";
+    previewProblem.style.top = tempTop;
+    previewProblem.style.left = tempLeft;
+    previewProblem.style.zIndex = "0";
+    previewProblem.style[property] = previewProblemScale;
+    removeClassName(previewProblem, "shadowed");
+    viewing = !viewing;
+    //previewProblem = null;
+  }
+}
+
+//utilities
+function styleAddedGridProblem(e){
+  previewProblemEnd(e);
+  for(var i = 0; i < scrollIntervals.length; i++){
+    clearInterval(scrollIntervals[i]); 
+  }
+  dragging = false;
+  hasBeenGridded = false;
+  fixGrid();
+  fixMysetsGrid();
+}
+
+function styleRemovedGridProblem(e){
+  previewProblemEnd(e);
+  for(var i = 0; i < scrollIntervals.length; i++){
+    clearInterval(scrollIntervals[i]); 
+  }
+  dragging = false;
+  hasBeenGridded = false;
+  fixGrid();
+  fixMysetsGrid();
+}
+
+function getProblem(node){
+  if(hasClassName(node, "problem")){
+    return node;
+  }
+  else{
+    return getProblem(node.parentNode);
+  }
+}
+
+function getMouseXY(e) {
+  var IE = document.all?true:false;
+  var tempX, tempY;
+  if (IE) { // grab the x-y pos.s if browser is IE
+    tempX = event.clientX + document.body.scrollLeft;
+    tempY = event.clientY + document.body.scrollTop;
+  }
+  else {  // grab the x-y pos.s if browser is NS
+    tempX = e.pageX;
+    tempY = e.pageY;
+  }  
+  if (tempX < 0){tempX = 0;}
+  if (tempY < 0){tempY = 0;}  
+
+  return [tempX, tempY];
+}
+    
+function findPos(obj, until) {
+  var curleft = curtop = 0;
+  if (obj.offsetParent) {
+     while (obj) {
+      curleft += obj.offsetLeft;
+      curtop += obj.offsetTop;
+      if(hasClassName(obj,until))
+        break;
+      obj = obj.offsetParent
+    }
+  }
+  return [curleft,curtop];
+}
+
+function findPos(obj) {
+  var curleft = curtop = 0;
+  if (obj.offsetParent) {
+     while (obj) {
+      curleft += obj.offsetLeft;
+      curtop += obj.offsetTop;
+      obj = obj.offsetParent
+    }
+  }
+  return [curleft,curtop];
+}
+
+//from http://www.zachstronaut.com/posts/2009/02/17/animate-css-transforms-firefox-webkit.html
+function getTransformProperty(element) {
+    var properties = ['transform', 'WebkitTransform', 'MozTransform'];
+    var p;
+    while (p = properties.shift()) {
+        if (typeof element.style[p] != 'undefined') {
+            return p;
+        }
+    }
+    return false;
+}
diff --git a/htdocs/js/sketchgraphhtml5b/SketchGraph.html b/htdocs/js/sketchgraphhtml5b/SketchGraph.html
new file mode 100644
index 0000000000..43212a2c4c
--- /dev/null
+++ b/htdocs/js/sketchgraphhtml5b/SketchGraph.html
@@ -0,0 +1,114 @@
+<html>
+<head>
+<title>Trivial HTML5</title>
+<script language="javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
+<script language="javascript" src="processing-dgfix.js"></script>
+<script>
+//set your limits here
+var xmin = -10, xmax = 10, ymin = -5, ymax = 5;
+var points;
+var showGrid = true;
+var yValues = new Array();
+var derivatives = new Array();
+
+//-------------------  Listeners ---------------------------
+    //had to add the listeners with javascript
+    //because it's not currently possible to reference processing methods from the html
+    
+    //reset the graph to 0
+    function reset() {
+      for (var i = 0; i < points; i++) {
+        yValues[i] = 0.5;
+        derivatives[i] = 0;
+      }
+    }
+    
+    //toggle grid
+    function toggleGrid() {
+      showGrid = !showGrid;
+    }
+    
+    //smooth the current graph 
+    function smooth() {
+      var newPoints = new Array(points);
+      for (var i = 0; i < points; i++) {
+        var sum = 0.3 * yValues[i];
+        sum += 0.2 * (i > 0? yValues[i-1] : yValues[i]);
+        sum += 0.2 * (i < points-1? yValues[i+1] : yValues[i]);
+        sum += 0.1 * (i > 1? yValues[i-2] : yValues[i]);
+        sum += 0.1 * (i < points - 2? yValues[i+2] : yValues[i]);
+        sum += 0.05 * (i > 2? yValues[i-3] : yValues[i]);
+        sum += 0.05 * (i < points - 3? yValues[i+3] : yValues[i]);
+        newPoints[i] = sum;
+      }
+      yValues = newPoints;
+    }
+    
+    //grab points from graph and print
+    function getPoints() {
+      var temp = "";
+      for(var i = 0; i < points; i++){
+        temp += xmin + i*(xmax-xmin)/(points-1) + " ";
+        temp += ymin + yValues[i]*(ymax - ymin) + " ";
+        var dx = 1.0/points * (xmax - xmin);
+        if (i == 0)
+          temp += (yValues[1] - yValues[0])*(ymax-ymin)/dx + "\n";
+        else if (i == points-1)
+          temp += (yValues[points-1] - yValues[points-2])*(ymax-ymin)/dx + "\n";
+        else {
+          var i = i;
+          var left = Math.abs(yValues[i] - yValues[i-1]);
+          var right = Math.abs(yValues[i+1] - yValues[i]);
+          if (left < 1e-20 || right < 1e-20)
+            temp += 0 + "\n";
+          else
+            temp += ((1/right)*(yValues[i+1]-yValues[i]) - (1/left)*(yValues[i]-yValues[i-1]))/(2*dx*((1/right)+(1/left))) + "\n";
+        }
+      }
+      $('#pointDisplay').val(temp);
+    }
+    
+    //load points from y-values
+    function setPoints() {
+      var tempString = $('#points').val();
+      var tempPoints = tempString.split(',');
+      var vals = new Array(tempPoints.length);
+      for(var i = 0; i < tempPoints.length; i++){
+        vals[i] = parseInt(tempPoints[i]);
+      }
+      points = vals.length;
+      yValues = new Array(points);
+      derivatives = [points];
+      for (var i = 0; i < points; i++)
+        yValues[i] = 0.5;
+      for (var i = 0; i < vals.length; i++) {
+        if (vals[i] > ymax)
+          yValues[i] = 1;
+        else if (vals[i] < ymin)
+          yValues[i] = 0;
+        else
+          yValues[i] = (vals[i]-ymin)/(ymax-ymin);
+      }
+    }
+</script>
+</head>
+<body>
+
+<canvas data-src="SketchGraph.pjs" id="cv" width="200" height="200"></canvas>  
+<br/>
+<p>
+Y-values: 
+<input type="text" id="points" size=50 ></input>
+<button type="button" id="setPts" onClick="setPoints();">Set</button>
+<br><br>
+
+<button type="button" id="hideGrid" onClick="toggleGrid();">Toggle Grid</button>
+<button type="button" id="reset" onClick="reset();">Reset to Zero</button>
+<button type="button" id="smooth" onClick="smooth();">Smooth</button>
+<br><br>
+<button type="button" id="getPts" onClick="getPoints();">Get Points</button><br/>
+<textarea id="pointDisplay" rows=10 cols=60></textarea>
+</p>
+
+</body>
+</html>
diff --git a/htdocs/js/sketchgraphhtml5b/SketchGraph.pjs b/htdocs/js/sketchgraphhtml5b/SketchGraph.pjs
new file mode 100644
index 0000000000..ef71b6eae2
--- /dev/null
+++ b/htdocs/js/sketchgraphhtml5b/SketchGraph.pjs
@@ -0,0 +1,236 @@
+/*
+  Lets user sketch a graph by moving the mouse.
+  Origional Java App:
+  --David Eck, June 2000 (eck@hws.edu, http://math.hws.edu/eck/)
+  
+  Rewritten for WebWork in javascript with processingjs for html5 by David Gage 2010
+  see processingjs.org for info on processingjs
+  
+  Drag on the graph to change it.
+  The Y-values box will take numbers separated by commas and space them equaly on the graph.
+  Enjoy!!
+  */
+
+  double xGrid;
+  double yGrid;
+  
+  //show a tick mark every ? spaces
+  int tickEvery = 2
+  
+  //set the border color
+  color borderColor = color(0,0,0);
+  //set the color of the grid
+  color gridColor = color(150,150,150);
+  //set the color of the axes 
+  color axesColor = color(0,0,220);
+  //set the alternat color of the axes
+  color lightAxesColor = color(160,180,255);
+  //set the color of the graph
+  color graphColor = color(255, 0, 255);
+  
+  //set the border width
+  int borderWidth = 20;
+  
+  var padding = 0;
+  //-------------------  methods -------------------------------
+  
+  void setup(){
+    //set the canvas size
+
+    size( canvasWidth+padding, canvasHeight+padding );
+
+    strokeWeight( 1 );
+
+    frameRate( 15 );
+
+    gwidth = width-2*padding;
+    gheight = height -2*padding;
+    gheight = height;
+    xGrid = gwidth/(xmax - xmin);
+    yGrid = gheight/(ymax - ymin);
+    
+
+    //starting number of points
+    points = 101;
+    yValues = new int[points];
+    derivatives = new double[points];
+    for(int i = 0; i < points; i++){
+      yValues[i] = (abs(ymin)*yGrid)/gheight;
+      derivatives[i] = 0;
+    }
+
+  }  
+      
+  //processings draw loop
+
+  void draw() {
+    //background color clears the graph every draw
+    background(color(255,255,255));
+    drawGrid();
+
+    drawAxes();
+    drawGraph();
+  }
+  
+  void drawGrid() {
+    if (!showGrid)
+      return;
+    stroke(gridColor);
+    if (xGrid > 0) {
+      int left = 0.5+padding;
+      int right = left+gwidth;
+      int a     = left;
+      while (a < right) {
+        line(a,padding,a,gheight+padding);
+        a += xGrid;
+      }
+    }
+    //draw the right edge
+    line(right-1, padding, right-1, gheight);
+    if (yGrid > 0) {
+      int top = 0.5+padding;
+      int bottom    = top +gheight; 
+      int b = top;
+      while (b < bottom) {
+        line(padding,b,gwidth+padding,b);
+        b += yGrid;
+      }
+    }
+    //draw the bottom edge
+    line(padding, bottom-1, gwidth, bottom-1);
+  }
+  
+  //--------------------------- Axes ---------------------------------------
+  
+  void drawAxes() {
+  
+    if (ymax < 0 || ymin > 0)
+      stroke(lightAxesColor);
+    else 
+      stroke(axesColor);
+    line(padding, yGrid*abs(ymin)+padding, gwidth+padding, yGrid*abs(ymin)+padding);
+    //draw the x ticks
+    for(int i = 0; i < (xmax - xmin); i += tickEvery) {
+      line(xGrid*abs(xmin)+padding+xGrid*i, yGrid*abs(ymin)-2+padding, xGrid*abs(xmin)+padding + xGrid*i, yGrid*abs(ymin)+2+padding);
+      line(xGrid*abs(xmin)+padding-xGrid*i, yGrid*abs(ymin)-2+padding, xGrid*abs(xmin)+padding - xGrid*i, yGrid*abs(ymin)+padding);
+    }
+    if (xmax < 0 || xmin > 0)
+      stroke(lightAxesColor);
+    else 
+      stroke(axesColor);
+    line(xGrid*abs(xmin)+padding, padding, xGrid*abs(xmin)+padding, gheight+padding);
+    //draw the y ticks
+    for(int i = 0; i < (xmax - xmin); i += tickEvery) {
+      line(xGrid*abs(xmin)-2+padding, yGrid*abs(ymin)+padding+yGrid*i, xGrid*abs(xmin)+2+padding, yGrid*abs(ymin)+padding+yGrid*i);
+      line(xGrid*abs(xmin)-2+padding, yGrid*abs(ymin)+padding-yGrid*i, xGrid*abs(xmin)+2+padding, yGrid*abs(ymin)+padding-yGrid*i);
+    }
+  }
+  //--------------------------- Graph --------------------------------------
+  
+  int[] pixelX;
+  int[] pixelY;
+  
+  void drawGraph() {
+    makeGraphCoords();
+    makeDerivs();
+    stroke(graphColor);
+    //plot the points
+    for (int i = 1; i < pixelX.length; i++) {
+      line(pixelX[i-1], pixelY[i-1], pixelX[i], pixelY[i]);
+    }
+  }
+  
+  void makeGraphCoords() {
+    int pointCt = (gwidth);
+    if (pixelX == null || pixelX.length != pointCt) {
+      pixelX = new int[pointCt];
+      pixelY = new int[pointCt];
+    for (int i = 0; i < pointCt; i++)
+      pixelX[i] = i+padding;
+      pixelX[pointCt-1] = gwidth+padding;
+     
+    }
+    double dx = (xmax - xmin) / (gwidth);
+    double dy = (ymax - ymin) / (gheight);
+    for (int i = 0; i < pointCt; i++) {
+      double x = xmin + dx*(pixelX[i]);
+      double y = eval(x);
+      pixelY[i] = (ymax - y)/dy+padding;
+    }
+  }
+  //math from java applet
+  double eval(double x) {
+    // NOTE:  yvalues and derivatives are stored as if x and y range from 0 to 1!!!
+    double scaledx = (x-xmin)/(xmax-xmin);
+    int interval = (int)((points-1)*scaledx);
+    if (interval >= points-1)
+      return ymin + yValues[points-1]*(ymax-ymin);
+    double temp = 1.0/(points-1);
+    double a = yValues[interval+1]/(temp*temp*temp);
+    double b = derivatives[interval+1]/(temp*temp) - 3*a;
+    double d = -yValues[interval]/(temp*temp*temp);
+    double c = derivatives[interval]/(temp*temp) - 3*d;
+    double t1 = scaledx - interval*temp;
+    double t2 = t1*t1;
+    double t3 = t2*t1;
+    double s1 = scaledx - (interval+1)*temp;
+    double s2 = s1*s1;
+    double s3 = s2*s1;
+    double scaledy = a*t3 + b*t2*s1 + c*t1*s2 + d*s3;
+    
+    return ymin + scaledy*(ymax-ymin);
+  }
+  
+  //--------------------------- Mouse Handling -----------------------------
+  
+  int lastPointNum;
+  double lastY;
+  
+  //couldn't just use mouseDragged because of a bug if dragged off canvas
+  
+  
+  
+  void mouseDragged(){
+      jumpPoint(mouseX, mouseY);
+  }
+  
+  //math from java applet
+  void jumpPoint(int x, int y) {
+    y = min(gheight - 1, y);
+    int pointNum = (int)( ((x)/(gwidth-1))*(points-1) );
+    double newYVal = 1.0 - ((y))/(gheight-1);  // Scaled!
+    if (pointNum >= 0 && pointNum < points) 
+      yValues[pointNum] = newYVal;
+    if (isNaN(lastY) || abs(pointNum - lastPointNum) <= 1 ||abs(pointNum - lastPointNum) >= 20) {}
+    else if (pointNum > lastPointNum) {
+      double dy = (newYVal - lastY)/(pointNum - lastPointNum);
+      for (int i = lastPointNum + 1; i < pointNum && i < points; i++) {
+        if (i >= 0)
+          yValues[i] = lastY + (i-lastPointNum)*dy;
+      }
+    }
+    else {
+      double dy = (newYVal - lastY)/(pointNum - lastPointNum);
+      for (int i = lastPointNum - 1; i > pointNum && i >= 0; i--) {
+        if (i < points)
+          yValues[i] = lastY + (i-lastPointNum)*dy;
+      }
+    }
+    lastPointNum = pointNum;
+    lastY = newYVal;
+  }
+  
+  //math from java applet
+    void makeDerivs() {
+    double dx = 1.0 / (points - 1);
+    derivatives[0] = (yValues[1] - yValues[0])/dx;
+    for (int i = 1; i < points - 1; i++) {
+      double left = abs(yValues[i] - yValues[i-1]);
+      double right = abs(yValues[i+1] - yValues[i]);
+      if (left < 1e-20 || right < 1e-20)
+      derivatives[i] = 0;
+      else
+      derivatives[i] = ((1/right)*(yValues[i+1]-yValues[i]) - (1/left)*(yValues[i]-yValues[i-1]))/(2*dx*((1/right)+(1/left)));
+      }
+    derivatives[points-1] = (yValues[points-1] - yValues[points-2])/dx;
+  }
\ No newline at end of file
diff --git a/htdocs/js/sketchgraphhtml5b/processing-dgfix.js b/htdocs/js/sketchgraphhtml5b/processing-dgfix.js
new file mode 100644
index 0000000000..2f45309b3f
--- /dev/null
+++ b/htdocs/js/sketchgraphhtml5b/processing-dgfix.js
@@ -0,0 +1,8231 @@
+/*
+
+    P R O C E S S I N G . J S - 0.9.1
+    a port of the Processing visualization language
+
+    License       : MIT
+    Developer     : John Resig: http://ejohn.org
+    Web Site      : http://processingjs.org
+    Java Version  : http://processing.org
+    Github Repo.  : http://github.com/jeresig/processing-js
+    Bug Tracking  : http://processing-js.lighthouseapp.com
+    Mozilla POW!  : http://wiki.Mozilla.org/Education/Projects/ProcessingForTheWeb
+    Maintained by : Seneca: http://zenit.senecac.on.ca/wiki/index.php/Processing.js
+                    Hyper-Metrix: http://hyper-metrix.com/#Processing
+                    BuildingSky: http://weare.buildingsky.net/pages/processing-js
+
+ */
+
+(function() {
+
+  var Processing = this.Processing = function Processing(curElement, aCode) {
+
+    var p = this;
+
+    p.pjs = {
+       imageCache: {
+         pending: 0
+       }
+    }; // by default we have an empty imageCache, no more.
+
+    p.name = 'Processing.js Instance'; // Set Processing defaults / environment variables
+    p.use3DContext = false; // default '2d' canvas context
+    p.canvas = curElement;
+
+    // Glyph path storage for textFonts
+    p.glyphTable = {};
+
+    // Global vars for tracking mouse position
+    p.pmouseX = 0;
+    p.pmouseY = 0;
+    p.mouseX = 0;
+    p.mouseY = 0;
+    p.mouseButton = 0;
+    p.mouseDown = false;
+    p.mouseScroll = 0;
+
+    // Undefined event handlers to be replaced by user when needed
+    p.mouseClicked = undefined;
+    p.mouseDragged = undefined;
+    p.mouseMoved = undefined;
+    p.mousePressed = undefined;
+    p.mouseReleased = undefined;
+    p.mouseScrolled = undefined;
+    p.key = undefined;
+    p.keyPressed = undefined;
+    p.keyReleased = undefined;
+    p.keyTyped = undefined;
+    p.draw = undefined;
+    p.setup = undefined;
+
+    // The height/width of the canvas
+    p.width = curElement.width - 0;
+    p.height = curElement.height - 0;
+
+    // The current animation frame
+    p.frameCount = 0;
+
+    // Color modes
+    p.RGB   = 1;
+    p.ARGB  = 2;
+    p.HSB   = 3;
+    p.ALPHA = 4;
+    p.CMYK  = 5;
+
+    // Renderers
+    p.P2D    = 1;
+    p.JAVA2D = 1;
+    p.WEBGL  = 2;
+    p.P3D    = 2;
+    p.OPENGL = 2;
+    p.EPSILON = 0.0001;
+    p.MAX_FLOAT   = 3.4028235e+38;
+    p.MIN_FLOAT   = -3.4028235e+38;
+    p.MAX_INT     = 2147483647;
+    p.MIN_INT     = -2147483648;
+    p.PI          = Math.PI;
+    p.TWO_PI      = 2 * p.PI;
+    p.HALF_PI     = p.PI / 2;
+    p.THIRD_PI    = p.PI / 3;
+    p.QUARTER_PI  = p.PI / 4;
+    p.DEG_TO_RAD  = p.PI / 180;
+    p.RAD_TO_DEG  = 180 / p.PI;
+    p.WHITESPACE  = " \t\n\r\f\u00A0";
+
+    // Filter/convert types
+    p.BLUR      = 11;
+    p.GRAY      = 12;
+    p.INVERT    = 13;
+    p.OPAQUE    = 14;
+    p.POSTERIZE = 15;
+    p.THRESHOLD = 16;
+    p.ERODE     = 17;
+    p.DILATE    = 18;
+
+    // Blend modes
+    p.REPLACE    = 0;
+    p.BLEND      = 1 << 0;
+    p.ADD        = 1 << 1;
+    p.SUBTRACT   = 1 << 2;
+    p.LIGHTEST   = 1 << 3;
+    p.DARKEST    = 1 << 4;
+    p.DIFFERENCE = 1 << 5;
+    p.EXCLUSION  = 1 << 6;
+    p.MULTIPLY   = 1 << 7;
+    p.SCREEN     = 1 << 8;
+    p.OVERLAY    = 1 << 9;
+    p.HARD_LIGHT = 1 << 10;
+    p.SOFT_LIGHT = 1 << 11;
+    p.DODGE      = 1 << 12;
+    p.BURN       = 1 << 13;
+
+    // Color component bit masks
+    p.ALPHA_MASK = 0xff000000;
+    p.RED_MASK   = 0x00ff0000;
+    p.GREEN_MASK = 0x0000ff00;
+    p.BLUE_MASK  = 0x000000ff;
+
+    // Projection matrices
+    p.CUSTOM       = 0;
+    p.ORTHOGRAPHIC = 2;
+    p.PERSPECTIVE  = 3;
+
+    // Shapes
+    p.POINT          = 2;
+    p.POINTS         = 2;
+    p.LINE           = 4;
+    p.LINES          = 4;
+    p.TRIANGLE       = 8;
+    p.TRIANGLES      = 9;
+    p.TRIANGLE_STRIP = 10;
+    p.TRIANGLE_FAN   = 11;
+    p.QUAD           = 16;
+    p.QUADS          = 16;
+    p.QUAD_STRIP     = 17;
+    p.POLYGON        = 20;
+    p.PATH           = 21;
+    p.RECT           = 30;
+    p.ELLIPSE        = 31;
+    p.ARC            = 32;
+    p.SPHERE         = 40;
+    p.BOX            = 41;
+
+    // Shape closing modes
+    p.OPEN  = 1;
+    p.CLOSE = 2;
+
+    // Shape drawing modes
+    p.CORNER          = 0; // Draw mode convention to use (x, y) to (width, height)
+    p.CORNERS         = 1; // Draw mode convention to use (x1, y1) to (x2, y2) coordinates
+    p.RADIUS          = 2; // Draw mode from the center, and using the radius
+    p.CENTER_RADIUS   = 2; // Deprecated! Use RADIUS instead
+    p.CENTER          = 3; // Draw from the center, using second pair of values as the diameter
+    p.DIAMETER        = 3; // Synonym for the CENTER constant. Draw from the center
+    p.CENTER_DIAMETER = 3; // Deprecated! Use DIAMETER instead
+
+    // Text vertical alignment modes
+    p.BASELINE = 0;   // Default vertical alignment for text placement
+    p.TOP      = 101; // Align text to the top
+    p.BOTTOM   = 102; // Align text from the bottom, using the baseline
+
+    // UV Texture coordinate modes
+    p.NORMAL    = 1;
+    p.NORMALIZE = 1;
+    p.IMAGE     = 2;
+
+    // Text placement modes
+    p.MODEL = 4;
+    p.SHAPE = 5;
+
+    // Stroke modes
+    p.SQUARE  = 'butt';
+    p.ROUND   = 'round';
+    p.PROJECT = 'square';
+    p.MITER   = 'miter';
+    p.BEVEL   = 'bevel';
+
+    // Lighting modes
+    p.AMBIENT     = 0;
+    p.DIRECTIONAL = 1;
+    //POINT       = 2; Shared with Shape constant
+    p.SPOT        = 3;
+
+    // Key constants
+
+    // Both key and keyCode will be equal to these values
+    p.BACKSPACE = 8;
+    p.TAB       = 9;
+    p.ENTER     = 10;
+    p.RETURN    = 13;
+    p.ESC       = 27;
+    p.DELETE    = 127;
+    p.CODED     = 0xffff;
+
+    // p.key will be CODED and p.keyCode will be this value
+    p.SHIFT     = 16;
+    p.CONTROL   = 17;
+    p.ALT       = 18;
+    p.UP        = 38;
+    p.RIGHT     = 39;
+    p.DOWN      = 40;
+    p.LEFT      = 37;
+
+    var codedKeys = [p.SHIFT, p.CONTROL, p.ALT, p.UP, p.RIGHT, p.DOWN, p.LEFT];
+
+    // Cursor types
+    p.ARROW    = 'default';
+    p.CROSS    = 'crosshair';
+    p.HAND     = 'pointer';
+    p.MOVE     = 'move';
+    p.TEXT     = 'text';
+    p.WAIT     = 'wait';
+    p.NOCURSOR = "url('data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw=='), auto";
+
+    // Hints
+    p.DISABLE_OPENGL_2X_SMOOTH    =  1;
+    p.ENABLE_OPENGL_2X_SMOOTH     = -1;
+    p.ENABLE_OPENGL_4X_SMOOTH     =  2;
+    p.ENABLE_NATIVE_FONTS         =  3;
+    p.DISABLE_DEPTH_TEST          =  4;
+    p.ENABLE_DEPTH_TEST           = -4;
+    p.ENABLE_DEPTH_SORT           =  5;
+    p.DISABLE_DEPTH_SORT          = -5;
+    p.DISABLE_OPENGL_ERROR_REPORT =  6;
+    p.ENABLE_OPENGL_ERROR_REPORT  = -6;
+    p.ENABLE_ACCURATE_TEXTURES    =  7;
+    p.DISABLE_ACCURATE_TEXTURES   = -7;
+    p.HINT_COUNT                  = 10;
+
+    // PJS defined constants
+    p.SINCOS_LENGTH      = parseInt(360 / 0.5, 10);
+    p.FRAME_RATE         = 0;
+    p.focused            = true;
+    p.PRECISIONB         = 15; // fixed point precision is limited to 15 bits!!
+    p.PRECISIONF         = 1 << p.PRECISIONB;
+    p.PREC_MAXVAL        = p.PRECISIONF - 1;
+    p.PREC_ALPHA_SHIFT   = 24 - p.PRECISIONB;
+    p.PREC_RED_SHIFT     = 16 - p.PRECISIONB;
+    p.NORMAL_MODE_AUTO   = 0;
+    p.NORMAL_MODE_SHAPE  = 1;
+    p.NORMAL_MODE_VERTEX = 2;
+    p.MAX_LIGHTS         = 8;
+
+    // "Private" variables used to maintain state
+    var curContext,
+        online = true,
+        doFill = true,
+        fillStyle = "rgba( 255, 255, 255, 1 )",
+        doStroke = true,
+        strokeStyle = "rgba( 204, 204, 204, 1 )",
+        lineWidth = 1,
+        loopStarted = false,
+        refreshBackground = function() {},
+        doLoop = true,
+        looping = 0,
+        curRectMode = p.CORNER,
+        curEllipseMode = p.CENTER,
+        normalX = 0,
+        normalY = 0,
+        normalZ = 0,
+        normalMode = p.NORMAL_MODE_AUTO,
+        inDraw = false,
+        curBackground = "rgba( 204, 204, 204, 1 )",
+        curFrameRate = 60,
+        curCursor = p.ARROW,
+        oldCursor = curElement.style.cursor,
+        curMsPerFrame = 1,
+        curShape = p.POLYGON,
+        curShapeCount = 0,
+        curvePoints = [],
+        curTightness = 0,
+        curveDetail = 20,
+        curveInited = false,
+        colorModeA = 255,
+        colorModeX = 255,
+        colorModeY = 255,
+        colorModeZ = 255,
+        pathOpen = false,
+        mousePressed = false,
+        mouseDragging = false,
+        keyPressed = false,
+        curColorMode = p.RGB,
+        curTint = function() {},
+        curTextSize = 12,
+        curTextFont = "Arial",
+        getLoaded = false,
+        start = new Date().getTime(),
+        timeSinceLastFPS = start,
+        framesSinceLastFPS = 0,
+        lastTextPos = [0, 0, 0],
+        curveBasisMatrix,
+        curveToBezierMatrix,
+        curveDrawMatrix,
+        bezierBasisInverse,
+        bezierBasisMatrix,
+        programObject3D,
+        programObject2D,
+        boxBuffer,
+        boxNormBuffer,
+        boxOutlineBuffer,
+        sphereBuffer,
+        lineBuffer,
+        fillBuffer,
+        pointBuffer;
+
+    // User can only have MAX_LIGHTS lights
+    var lightCount = 0;
+
+    //sphere stuff
+    var sphereDetailV = 0,
+        sphereDetailU = 0,
+        sphereX = [],
+        sphereY = [],
+        sphereZ = [],
+        sinLUT = new Array(p.SINCOS_LENGTH),
+        cosLUT = new Array(p.SINCOS_LENGTH),
+        sphereVerts,
+        sphereNorms;
+
+    // Camera defaults and settings
+    var cam,
+        cameraInv,
+        forwardTransform,
+        reverseTransform,
+        modelView,
+        modelViewInv,
+        userMatrixStack,
+        inverseCopy,
+        projection,
+        manipulatingCamera = false,
+        frustumMode = false,
+        cameraFOV = 60 * (Math.PI / 180),
+        cameraX = curElement.width / 2,
+        cameraY = curElement.height / 2,
+        cameraZ = cameraY / Math.tan(cameraFOV / 2),
+        cameraNear = cameraZ / 10,
+        cameraFar = cameraZ * 10,
+        cameraAspect = curElement.width / curElement.height;
+
+    var vertArray = [],
+        isCurve = false,
+        isBezier = false,
+        firstVert = true;
+
+    // Stores states for pushStyle() and popStyle().
+    var styleArray = new Array(0);
+
+    // Vertices are specified in a counter-clockwise order
+    // triangles are in this order: back, front, right, bottom, left, top
+    var boxVerts = [0.5, 0.5, -0.5, 0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5,
+                   -0.5, 0.5, -0.5, 0.5, 0.5, -0.5, 0.5, 0.5, 0.5, -0.5, 0.5, 0.5,
+                   -0.5, -0.5, 0.5, -0.5, -0.5, 0.5, 0.5, -0.5, 0.5, 0.5, 0.5, 0.5,
+                    0.5, 0.5, -0.5, 0.5, 0.5, 0.5, 0.5, -0.5, 0.5, 0.5, -0.5, 0.5,
+                    0.5, -0.5, -0.5, 0.5, 0.5, -0.5, 0.5, -0.5, -0.5, 0.5, -0.5, 0.5,
+                   -0.5, -0.5, 0.5, -0.5, -0.5, 0.5, -0.5, -0.5, -0.5, 0.5, -0.5, -0.5,
+                   -0.5, -0.5, -0.5, -0.5, -0.5, 0.5, -0.5, 0.5, 0.5, -0.5, 0.5, 0.5,
+                   -0.5, 0.5, -0.5, -0.5, -0.5, -0.5, 0.5, 0.5, 0.5, 0.5, 0.5, -0.5,
+                   -0.5, 0.5, -0.5, -0.5, 0.5, -0.5, -0.5, 0.5, 0.5, 0.5, 0.5, 0.5];
+
+    var boxNorms = [0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1,
+                    0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1,
+                    1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0,
+                    0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0,
+                    -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0,
+                    0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0];
+
+    var boxOutlineVerts = [0.5, 0.5, 0.5, 0.5, -0.5, 0.5, 0.5, 0.5, -0.5, 0.5, -0.5, -0.5,
+                          -0.5, 0.5, -0.5, -0.5, -0.5, -0.5, -0.5, 0.5, 0.5, -0.5, -0.5, 0.5,
+                           0.5, 0.5, 0.5, 0.5, 0.5, -0.5, 0.5, 0.5, -0.5, -0.5, 0.5, -0.5,
+                          -0.5, 0.5, -0.5, -0.5, 0.5, 0.5, -0.5, 0.5, 0.5, 0.5, 0.5, 0.5,
+                           0.5, -0.5, 0.5, 0.5, -0.5, -0.5, 0.5, -0.5, -0.5, -0.5, -0.5, -0.5,
+                          -0.5, -0.5, -0.5, -0.5, -0.5, 0.5, -0.5, -0.5, 0.5, 0.5, -0.5, 0.5];
+
+    // Vertex shader for points and lines
+    var vertexShaderSource2D =
+      "attribute vec3 Vertex;" +
+      "uniform vec4 color;" +
+
+      "uniform mat4 model;" +
+      "uniform mat4 view;" +
+      "uniform mat4 projection;" +
+
+      "void main(void) {" +
+      "  gl_FrontColor = color;" +
+      "  gl_Position = projection * view * model * vec4(Vertex, 1.0);" +
+      "}";
+
+    var fragmentShaderSource2D =
+      "void main(void){" +
+      "  gl_FragColor = gl_Color;" +
+      "}";
+
+    // Vertex shader for boxes and spheres
+    var vertexShaderSource3D =
+      "attribute vec3 Vertex;" +
+      "attribute vec3 Normal;" +
+
+      "uniform vec4 color;" +
+
+      "uniform bool usingMat;" +
+      "uniform vec3 specular;" +
+      "uniform vec3 mat_emissive;" +
+      "uniform vec3 mat_ambient;" +
+      "uniform vec3 mat_specular;" +
+      "uniform float shininess;" +
+
+      "uniform mat4 model;" +
+      "uniform mat4 view;" +
+      "uniform mat4 projection;" +
+      "uniform mat4 normalTransform;" +
+
+      "uniform int lightCount;" +
+      "uniform vec3 falloff;" +
+
+      "struct Light {" +
+      "  bool dummy;" +
+      "   int type;" +
+      "   vec3 color;" +
+      "   vec3 position;" +
+      "  vec3 direction;" +
+      "  float angle;" +
+      "  vec3 halfVector;" +
+      "  float concentration;" +
+      "};" +
+      "uniform Light lights[8];" +
+
+      "void AmbientLight( inout vec3 totalAmbient, in vec3 ecPos, in Light light ) {" +
+      // Get the vector from the light to the vertex
+      // Get the distance from the current vector to the light position
+      "  float d = length( light.position - ecPos );" +
+      "  float attenuation = 1.0 / ( falloff[0] + ( falloff[1] * d ) + ( falloff[2] * d * d ));" + "  totalAmbient += light.color * attenuation;" +
+      "}" +
+
+      "void DirectionalLight( inout vec3 col, in vec3 ecPos, inout vec3 spec, in vec3 vertNormal, in Light light ) {" +
+      "  float powerfactor = 0.0;" +
+      "  float nDotVP = max(0.0, dot( vertNormal, light.position ));" +
+      "  float nDotVH = max(0.0, dot( vertNormal, normalize( light.position-ecPos )));" +
+
+      "  if( nDotVP != 0.0 ){" +
+      "    powerfactor = pow( nDotVH, shininess );" +
+      "  }" +
+
+      "  col += light.color * nDotVP;" +
+      "  spec += specular * powerfactor;" +
+      "}" +
+
+      "void PointLight( inout vec3 col, inout vec3 spec, in vec3 vertNormal, in vec3 ecPos, in vec3 eye, in Light light ) {" +
+      "  float powerfactor;" +
+
+      // Get the vector from the light to the vertex
+      "   vec3 VP = light.position - ecPos;" +
+
+      // Get the distance from the current vector to the light position
+      "  float d = length( VP ); " +
+
+      // Normalize the light ray so it can be used in the dot product operation.
+      "  VP = normalize( VP );" +
+
+      "  float attenuation = 1.0 / ( falloff[0] + ( falloff[1] * d ) + ( falloff[2] * d * d ));" +
+
+      "  float nDotVP = max( 0.0, dot( vertNormal, VP ));" +
+      "  vec3 halfVector = normalize( VP + eye );" +
+      "  float nDotHV = max( 0.0, dot( vertNormal, halfVector ));" +
+
+      "  if( nDotVP == 0.0) {" +
+      "    powerfactor = 0.0;" +
+      "  }" +
+      "  else{" +
+      "    powerfactor = pow( nDotHV, shininess );" +
+      "  }" +
+
+      "  spec += specular * powerfactor * attenuation;" +
+      "  col += light.color * nDotVP * attenuation;" +
+      "}" +
+
+      /*
+      */
+      "void SpotLight( inout vec3 col, inout vec3 spec, in vec3 vertNormal, in vec3 ecPos, in vec3 eye, in Light light ) {" +
+      "  float spotAttenuation;" +
+      "  float powerfactor;" +
+
+      // calculate the vector from the current vertex to the light.
+      "  vec3 VP = light.position - ecPos; " +
+      "  vec3 ldir = normalize( light.direction );" +
+
+      // get the distance from the spotlight and the vertex
+      "  float d = length( VP );" +
+      "  VP = normalize( VP );" +
+
+      "  float attenuation = 1.0 / ( falloff[0] + ( falloff[1] * d ) + ( falloff[2] * d * d ) );" +
+
+      // dot product of the vector from vertex to light and light direction.
+      "  float spotDot = dot( VP, ldir );" +
+
+      // if the vertex falls inside the cone
+      "  if( spotDot < cos( light.angle ) ) {" +
+      "    spotAttenuation = pow( spotDot, light.concentration );" +
+      "  }" +
+      "  else{" +
+      "    spotAttenuation = 1.0;" +
+      "  }" +
+      "  attenuation *= spotAttenuation;" +
+
+      "  float nDotVP = max( 0.0, dot( vertNormal, VP ));" +
+      "  vec3 halfVector = normalize( VP + eye );" +
+      "  float nDotHV = max( 0.0, dot( vertNormal, halfVector ));" +
+
+      "  if( nDotVP == 0.0 ) {" +
+      "    powerfactor = 0.0;" +
+      "  }" +
+      "  else {" +
+      "    powerfactor = pow( nDotHV, shininess );" +
+      "  }" +
+
+      "  spec += specular * powerfactor * attenuation;" +
+      "  col += light.color * nDotVP * attenuation;" +
+      "}" +
+
+      "void main(void) {" +
+      "  vec3 finalAmbient = vec3( 0.0, 0.0, 0.0 );" +
+      "  vec3 finalDiffuse = vec3( 0.0, 0.0, 0.0 );" +
+      "  vec3 finalSpecular = vec3( 0.0, 0.0, 0.0 );" +
+
+      "  vec3 norm = vec3( normalTransform * vec4( Normal, 0.0 ) );" +
+
+      "  vec4 ecPos4 = view * model * vec4(Vertex,1.0);" +
+      "  vec3 ecPos = (vec3(ecPos4))/ecPos4.w;" +
+      "  vec3 eye = vec3( 0.0, 0.0, 1.0 );" +
+
+      // If there were no lights this draw call, just use the
+      // assigned fill color of the shape and the specular value
+      "  if( lightCount == 0 ) {" +
+      "    gl_FrontColor = color + vec4(mat_specular,1.0);" +
+      "  }" +
+      "  else {" +
+      "    for( int i = 0; i < lightCount; i++ ) {" +
+      "      if( lights[i].type == 0 ) {" +
+      "        AmbientLight( finalAmbient, ecPos, lights[i] );" +
+      "      }" +
+      "      else if( lights[i].type == 1 ) {" +
+      "        DirectionalLight( finalDiffuse,ecPos, finalSpecular, norm, lights[i] );" +
+      "      }" +
+      "      else if( lights[i].type == 2 ) {" +
+      "        PointLight( finalDiffuse, finalSpecular, norm, ecPos, eye, lights[i] );" +
+      "      }" +
+      "      else if( lights[i].type == 3 ) {" +
+      "        SpotLight( finalDiffuse, finalSpecular, norm, ecPos, eye, lights[i] );" +
+      "      }" +
+      "    }" +
+
+      "   if( usingMat == false ) {" +
+      "    gl_FrontColor = vec4(  " +
+      "      vec3(color) * finalAmbient +" +
+      "      vec3(color) * finalDiffuse +" +
+      "      vec3(color) * finalSpecular," +
+      "      color[3] );" +
+      "   }" +
+      "   else{" +
+      "     gl_FrontColor = vec4( " +
+      "       mat_emissive + " +
+      "       (vec3(color) * mat_ambient * finalAmbient) + " +
+      "       (vec3(color) * finalDiffuse) + " +
+      "       (mat_specular * finalSpecular), " +
+      "       color[3] );" +
+      "    }" +
+      "  }" +
+      "  gl_Position = projection * view * model * vec4( Vertex, 1.0 );" +
+      "}";
+
+    var fragmentShaderSource3D =
+      "void main(void){" +
+      "  gl_FragColor = gl_Color;" +
+      "}";
+
+    // Wrapper to easily deal with array names changes.
+    var newWebGLArray = function(data) {
+      return new WebGLFloatArray(data);
+    };
+
+    var imageModeCorner = function imageModeCorner(x, y, w, h, whAreSizes) {
+      return {
+        x: x,
+        y: y,
+        w: w,
+        h: h
+      };
+    };
+    var imageModeConvert = imageModeCorner;
+
+    var imageModeCorners = function imageModeCorners(x, y, w, h, whAreSizes) {
+      return {
+        x: x,
+        y: y,
+        w: whAreSizes ? w : w - x,
+        h: whAreSizes ? h : h - y
+      };
+    };
+
+    var imageModeCenter = function imageModeCenter(x, y, w, h, whAreSizes) {
+      return {
+        x: x - w / 2,
+        y: y - h / 2,
+        w: w,
+        h: h
+      };
+    };
+
+    var createProgramObject = function(curContext, vetexShaderSource, fragmentShaderSource) {
+      var vertexShaderObject = curContext.createShader(curContext.VERTEX_SHADER);
+      curContext.shaderSource(vertexShaderObject, vetexShaderSource);
+      curContext.compileShader(vertexShaderObject);
+      if (!curContext.getShaderParameter(vertexShaderObject, curContext.COMPILE_STATUS)) {
+        throw curContext.getShaderInfoLog(vertexShaderObject);
+      }
+
+      var fragmentShaderObject = curContext.createShader(curContext.FRAGMENT_SHADER);
+      curContext.shaderSource(fragmentShaderObject, fragmentShaderSource);
+      curContext.compileShader(fragmentShaderObject);
+      if (!curContext.getShaderParameter(fragmentShaderObject, curContext.COMPILE_STATUS)) {
+        throw curContext.getShaderInfoLog(fragmentShaderObject);
+      }
+
+      var programObject = curContext.createProgram();
+      curContext.attachShader(programObject, vertexShaderObject);
+      curContext.attachShader(programObject, fragmentShaderObject);
+      curContext.linkProgram(programObject);
+      if (!curContext.getProgramParameter(programObject, curContext.LINK_STATUS)) {
+        throw "Error linking shaders.";
+      }
+
+      return programObject;
+    };
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Char handling
+    ////////////////////////////////////////////////////////////////////////////
+    var charMap = {};
+
+    var Char = function Char(chr) {
+      if (typeof chr === 'string' && chr.length === 1) {
+        this.code = chr.charCodeAt(0);
+      } else {
+        this.code = NaN;
+      }
+
+      return (typeof charMap[this.code] === 'undefined') ? charMap[this.code] = this : charMap[this.code];
+    };
+
+    Char.prototype.toString = function() {
+      return String.fromCharCode(this.code);
+    };
+
+    Char.prototype.valueOf = function() {
+      return this.code;
+    };
+
+    ////////////////////////////////////////////////////////////////////////////
+    // PVector
+    ////////////////////////////////////////////////////////////////////////////
+    var PVector = function(x, y, z) {
+      this.x = x || 0;
+      this.y = y || 0;
+      this.z = z || 0;
+    },
+    createPVectorMethod = function(method) {
+      return function(v1, v2) {
+        var v = v1.get();
+        v[method](v2);
+        return v;
+      };
+    },
+    createSimplePVectorMethod = function(method) {
+      return function(v1, v2) {
+        return v1[method](v2);
+      };
+    },
+    simplePVMethods = "dist dot cross".split(" "),
+    method = simplePVMethods.length;
+
+    PVector.angleBetween = function(v1, v2) {
+      return Math.acos(v1.dot(v2) / (v1.mag() * v2.mag()));
+    };
+
+    // Common vector operations for PVector
+    PVector.prototype = {
+      set: function(v, y, z) {
+        if (arguments.length === 1) {
+          this.set(v.x || v[0], v.y || v[1], v.z || v[2]);
+        } else {
+          this.x = v;
+          this.y = y;
+          this.z = z;
+        }
+      },
+      get: function() {
+        return new PVector(this.x, this.y, this.z);
+      },
+      mag: function() {
+        return Math.sqrt(this.x * this.x + this.y * this.y + this.z * this.z);
+      },
+      add: function(v, y, z) {
+        if (arguments.length === 3) {
+          this.x += v;
+          this.y += y;
+          this.z += z;
+        } else if (arguments.length === 1) {
+          this.x += v.x;
+          this.y += v.y;
+          this.z += v.z;
+        }
+      },
+      sub: function(v, y, z) {
+        if (arguments.length === 3) {
+          this.x -= v;
+          this.y -= y;
+          this.z -= z;
+        } else if (arguments.length === 1) {
+          this.x -= v.x;
+          this.y -= v.y;
+          this.z -= v.z;
+        }
+      },
+      mult: function(v) {
+        if (typeof v === 'number') {
+          this.x *= v;
+          this.y *= v;
+          this.z *= v;
+        } else if (typeof v === 'object') {
+          this.x *= v.x;
+          this.y *= v.y;
+          this.z *= v.z;
+        }
+      },
+      div: function(v) {
+        if (typeof v === 'number') {
+          this.x /= v;
+          this.y /= v;
+          this.z /= v;
+        } else if (typeof v === 'object') {
+          this.x /= v.x;
+          this.y /= v.y;
+          this.z /= v.z;
+        }
+      },
+      dist: function(v) {
+        var dx = this.x - v.x,
+          dy = this.y - v.y,
+          dz = this.z - v.z;
+        return Math.sqrt(dx * dx + dy * dy + dz * dz);
+      },
+      dot: function(v, y, z) {
+        var num;
+        if (arguments.length === 3) {
+          num = this.x * v + this.y * y + this.z * z;
+        } else if (arguments.length === 1) {
+          num = this.x * v.x + this.y * v.y + this.z * v.z;
+        }
+        return num;
+      },
+      cross: function(v) {
+        var
+        crossX = this.y * v.z - v.y * this.z,
+          crossY = this.z * v.x - v.z * this.x,
+          crossZ = this.x * v.y - v.x * this.y;
+        return new PVector(crossX, crossY, crossZ);
+      },
+      normalize: function() {
+        var m = this.mag();
+        if (m > 0) {
+          this.div(m);
+        }
+      },
+      limit: function(high) {
+        if (this.mag() > high) {
+          this.normalize();
+          this.mult(high);
+        }
+      },
+      heading2D: function() {
+        var angle = Math.atan2(-this.y, this.x);
+        return -angle;
+      },
+      toString: function() {
+        return "[" + this.x + ", " + this.y + ", " + this.z + "]";
+      },
+      array: function() {
+        return [this.x, this.y, this.z];
+      }
+    };
+
+    while (method--) {
+      PVector[simplePVMethods[method]] = createSimplePVectorMethod(simplePVMethods[method]);
+    }
+
+    for (method in PVector.prototype) {
+      if (PVector.prototype.hasOwnProperty(method) && !PVector.hasOwnProperty(method)) {
+        PVector[method] = createPVectorMethod(method);
+      }
+    }
+
+    p.PVector = PVector;
+
+    ////////////////////////////////////////////////////////////////////////////
+    // 2D Matrix
+    ////////////////////////////////////////////////////////////////////////////
+
+    /*
+      Helper function for printMatrix(). Finds the largest scalar
+      in the matrix, then number of digits left of the decimal.
+      Call from PMatrix2D and PMatrix3D's print() function.
+    */
+    var printMatrixHelper = function printMatrixHelper(elements) {
+      var big = 0;
+      for (var i = 0; i < elements.length; i++) {
+
+        if (i !== 0) {
+          big = Math.max(big, Math.abs(elements[i]));
+        } else {
+          big = Math.abs(elements[i]);
+        }
+      }
+
+      var digits = (big + "").indexOf(".");
+      if (digits === 0) {
+        digits = 1;
+      } else if (digits === -1) {
+        digits = (big + "").length;
+      }
+
+      return digits;
+    };
+
+    var PMatrix2D = function() {
+      if (arguments.length === 0) {
+        this.reset();
+      } else if (arguments.length === 1 && arguments[0] instanceof PMatrix2D) {
+        this.set(arguments[0].array());
+      } else if (arguments.length === 6) {
+        this.set(arguments[0], arguments[1], arguments[2], arguments[3], arguments[4], arguments[5]);
+      }
+    };
+
+    PMatrix2D.prototype = {
+      set: function() {
+        if (arguments.length === 6) {
+          var a = arguments;
+          this.set([a[0], a[1], a[2],
+                    a[3], a[4], a[5]]);
+        } else if (arguments.length === 1 && arguments[0] instanceof PMatrix2D) {
+          this.elements = arguments[0].array();
+        } else if (arguments.length === 1 && arguments[0] instanceof Array) {
+          this.elements = arguments[0].slice();
+        }
+      },
+      get: function() {
+        var outgoing = new PMatrix2D();
+        outgoing.set(this.elements);
+        return outgoing;
+      },
+      reset: function() {
+        this.set([1, 0, 0, 0, 1, 0]);
+      },
+      // Returns a copy of the element values.
+      array: function array() {
+        return this.elements.slice();
+      },
+      translate: function(tx, ty) {
+        this.elements[2] = tx * this.elements[0] + ty * this.elements[1] + this.elements[2];
+        this.elements[5] = tx * this.elements[3] + ty * this.elements[4] + this.elements[5];
+      },
+      // Does nothing in Processing.
+      transpose: function() {
+      },
+      mult: function(source, target) {
+        var x, y;
+        if (source instanceof PVector) {
+          x = source.x;
+          y = source.y;
+          if (!target) {
+            target = new PVector();
+          }
+        } else if (source instanceof Array) {
+          x = source[0];
+          y = source[1];
+          if (!target) {
+            target = [];
+          }
+        }
+        if (target instanceof Array) {
+          target[0] = this.elements[0] * x + this.elements[1] * y + this.elements[2];
+          target[1] = this.elements[3] * x + this.elements[4] * y + this.elements[5];
+        } else if (target instanceof PVector) {
+          target.x = this.elements[0] * x + this.elements[1] * y + this.elements[2];
+          target.y = this.elements[3] * x + this.elements[4] * y + this.elements[5];
+          target.z = 0;
+        }
+        return target;
+      },
+      multX: function(x, y) {
+        return x * this.elements[0] + y * this.elements[1] + this.elements[2];
+      },
+      multY: function(x, y) {
+        return x * this.elements[3] + y * this.elements[4] + this.elements[5];
+      },
+      skewX: function(angle) {
+        this.apply(1, 0, 1, angle, 0, 0);
+      },
+      skewY: function(angle) {
+        this.apply(1, 0, 1, 0, angle, 0);
+      },
+      determinant: function() {
+        return this.elements[0] * this.elements[4] - this.elements[1] * this.elements[3];
+      },
+      invert: function() {
+        var d = this.determinant();
+        if ( Math.abs( d ) > p.FLOAT_MIN ) {
+          var old00 = this.elements[0];
+          var old01 = this.elements[1];
+          var old02 = this.elements[2];
+          var old10 = this.elements[3];
+          var old11 = this.elements[4];
+          var old12 = this.elements[5];
+          this.elements[0] =  old11 / d;
+          this.elements[3] = -old10 / d;
+          this.elements[1] = -old01 / d;
+          this.elements[1] =  old00 / d;
+          this.elements[2] = (old01 * old12 - old11 * old02) / d;
+          this.elements[5] = (old10 * old02 - old00 * old12) / d;
+          return true;
+        }
+        return false;
+      },
+      scale: function(sx, sy) {
+        if (sx && !sy) {
+          sy = sx;
+        }
+        if (sx && sy) {
+          this.elements[0] *= sx;
+          this.elements[1] *= sy;
+          this.elements[3] *= sx;
+          this.elements[4] *= sy;
+        }
+      },
+      apply: function() {
+        if (arguments.length === 1 && arguments[0] instanceof PMatrix2D) {
+          this.apply(arguments[0].array());
+        } else if (arguments.length === 6) {
+          var a = arguments;
+          this.apply([a[0], a[1], a[2],
+                      a[3], a[4], a[5]]);
+        } else if (arguments.length === 1 && arguments[0] instanceof Array) {
+          var source = arguments[0];
+          var result = [0, 0, this.elements[2],
+                        0, 0, this.elements[5]];
+          var e = 0;
+          for (var row = 0; row < 2; row++) {
+            for (var col = 0; col < 3; col++, e++) {
+              result[e] += this.elements[row * 3 + 0] * source[col + 0] + this.elements[row * 3 + 1] * source[col + 3];
+            }
+          }
+          this.elements = result.slice();
+        }
+      },
+      preApply: function() {
+        if (arguments.length === 1 && arguments[0] instanceof PMatrix2D) {
+          this.preApply(arguments[0].array());
+        } else if (arguments.length === 6) {
+          var a = arguments;
+          this.preApply([a[0], a[1], a[2],
+                         a[3], a[4], a[5]]);
+        } else if (arguments.length === 1 && arguments[0] instanceof Array) {
+          var source = arguments[0];
+          var result = [0, 0, source[2],
+                        0, 0, source[5]];
+          result[2]= source[2] + this.elements[2] * source[0] + this.elements[5] * source[1];
+          result[5]= source[5] + this.elements[2] * source[3] + this.elements[5] * source[4];
+          result[0] = this.elements[0] * source[0] + this.elements[3] * source[1];
+          result[3] = this.elements[0] * source[3] + this.elements[3] * source[4];
+          result[1] = this.elements[1] * source[0] + this.elements[4] * source[1];
+          result[4] = this.elements[1] * source[3] + this.elements[4] * source[4];
+          this.elements = result.slice();
+        }
+      },
+      rotate: function(angle) {
+        var c = Math.cos(angle);
+        var s = Math.sin(angle);
+        var temp1 = this.elements[0];
+        var temp2 = this.elements[1];
+        this.elements[0] =  c * temp1 + s * temp2;
+        this.elements[1] = -s * temp1 + c * temp2;
+        temp1 = this.elements[3];
+        temp2 = this.elements[4];
+        this.elements[3] =  c * temp1 + s * temp2;
+        this.elements[4] = -s * temp1 + c * temp2;
+      },
+      rotateZ: function(angle) {
+        this.rotate(angle);
+      },
+      print: function() {
+        var digits = printMatrixHelper(this.elements);
+        var output = "";
+        output += p.nfs(this.elements[0], digits, 4) + " " + p.nfs(this.elements[1], digits, 4) + " " + p.nfs(this.elements[2], digits, 4) + "\n";
+        output += p.nfs(this.elements[3], digits, 4) + " " + p.nfs(this.elements[4], digits, 4) + " " + p.nfs(this.elements[5], digits, 4) + "\n\n";
+        p.println(output);
+      }
+    };
+
+    ////////////////////////////////////////////////////////////////////////////
+    // PMatrix3D
+    ////////////////////////////////////////////////////////////////////////////
+    var PMatrix3D = function PMatrix3D() {
+      //When a matrix is created, it is set to an identity matrix
+      this.reset();
+    };
+
+    PMatrix3D.prototype = {
+      set: function() {
+        if (arguments.length === 16) {
+          var a = arguments;
+          this.set([a[0], a[1], a[2], a[3],
+                    a[4], a[5], a[6], a[7],
+                    a[8], a[9], a[10], a[11],
+                    a[12], a[13], a[14], a[15]]);
+        } else if (arguments.length === 1 && arguments[0] instanceof PMatrix3D) {
+          this.elements = arguments[0].array();
+        } else if (arguments.length === 1 && arguments[0] instanceof Array) {
+          this.elements = arguments[0].slice();
+        }
+      },
+      get: function() {
+        var outgoing = new PMatrix3D();
+        outgoing.set(this.elements);
+        return outgoing;
+      },
+      reset: function() {
+        this.set([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]);
+      },
+      // Returns a copy of the element values.
+      array: function array() {
+        return this.elements.slice();
+      },
+      translate: function(tx, ty, tz) {
+        if (typeof tz === 'undefined') {
+          tx = 0;
+        }
+
+        this.elements[3] += tx * this.elements[0] + ty * this.elements[1] + tz * this.elements[2];
+        this.elements[7] += tx * this.elements[4] + ty * this.elements[5] + tz * this.elements[6];
+        this.elements[11] += tx * this.elements[8] + ty * this.elements[9] + tz * this.elements[10];
+        this.elements[15] += tx * this.elements[12] + ty * this.elements[13] + tz * this.elements[14];
+      },
+      transpose: function() {
+        var temp = this.elements.slice();
+        this.elements[0] = temp[0];
+        this.elements[1] = temp[4];
+        this.elements[2] = temp[8];
+        this.elements[3] = temp[12];
+        this.elements[4] = temp[1];
+        this.elements[5] = temp[5];
+        this.elements[6] = temp[9];
+        this.elements[7] = temp[13];
+        this.elements[8] = temp[2];
+        this.elements[9] = temp[6];
+        this.elements[10] = temp[10];
+        this.elements[11] = temp[14];
+        this.elements[12] = temp[3];
+        this.elements[13] = temp[7];
+        this.elements[14] = temp[11];
+        this.elements[15] = temp[15];
+      },
+      /*
+        You must either pass in two PVectors or two arrays,
+        don't mix between types. You may also omit a second
+        argument and simply read the result from the return.
+      */
+      mult: function(source, target) {
+        var x, y, z, w;
+        if (source instanceof PVector) {
+          x = source.x;
+          y = source.y;
+          z = source.z;
+          w = 1;
+          if (!target) {
+            target = new PVector();
+          }
+        } else if (source instanceof Array) {
+          x = source[0];
+          y = source[1];
+          z = source[2];
+          w = source[3] || 1;
+
+          if (!target || target.length !== 3 && target.length !== 4) {
+            target = [0, 0, 0];
+          }
+        }
+
+        if (target instanceof Array) {
+          if (target.length === 3) {
+            target[0] = this.elements[0] * x + this.elements[1] * y + this.elements[2] * z + this.elements[3];
+            target[1] = this.elements[4] * x + this.elements[5] * y + this.elements[6] * z + this.elements[7];
+            target[2] = this.elements[8] * x + this.elements[9] * y + this.elements[10] * z + this.elements[11];
+          } else if (target.length === 4) {
+            target[0] = this.elements[0] * x + this.elements[1] * y + this.elements[2] * z + this.elements[3] * w;
+            target[1] = this.elements[4] * x + this.elements[5] * y + this.elements[6] * z + this.elements[7] * w;
+            target[2] = this.elements[8] * x + this.elements[9] * y + this.elements[10] * z + this.elements[11] * w;
+            target[3] = this.elements[12] * x + this.elements[13] * y + this.elements[14] * z + this.elements[15] * w;
+          }
+        }
+        if (target instanceof PVector) {
+          target.x = this.elements[0] * x + this.elements[1] * y + this.elements[2] * z + this.elements[3];
+          target.y = this.elements[4] * x + this.elements[5] * y + this.elements[6] * z + this.elements[7];
+          target.z = this.elements[8] * x + this.elements[9] * y + this.elements[10] * z + this.elements[11];
+        }
+        return target;
+      },
+      preApply: function() {
+        if (arguments.length === 1 && arguments[0] instanceof PMatrix3D) {
+          this.preApply(arguments[0].array());
+        } else if (arguments.length === 16) {
+          var a = arguments;
+          this.preApply([a[0], a[1], a[2], a[3],
+                         a[4], a[5], a[6], a[7],
+                         a[8], a[9], a[10], a[11],
+                         a[12], a[13], a[14], a[15]]);
+        } else if (arguments.length === 1 && arguments[0] instanceof Array) {
+          var source = arguments[0];
+
+          var result = [0, 0, 0, 0,
+                        0, 0, 0, 0,
+                        0, 0, 0, 0,
+                        0, 0, 0, 0];
+          var e = 0;
+          for (var row = 0; row < 4; row++) {
+            for (var col = 0; col < 4; col++, e++) {
+              result[e] += this.elements[col + 0] * source[row * 4 + 0] + this.elements[col + 4] * source[row * 4 + 1] + this.elements[col + 8] * source[row * 4 + 2] + this.elements[col + 12] * source[row * 4 + 3];
+            }
+          }
+          this.elements = result.slice();
+        }
+      },
+      apply: function() {
+        if (arguments.length === 1 && arguments[0] instanceof PMatrix3D) {
+          this.apply(arguments[0].array());
+        } else if (arguments.length === 16) {
+          var a = arguments;
+          this.apply([a[0], a[1], a[2], a[3],
+                      a[4], a[5], a[6], a[7],
+                      a[8], a[9], a[10], a[11],
+                      a[12], a[13], a[14], a[15]]);
+        } else if (arguments.length === 1 && arguments[0] instanceof Array) {
+          var source = arguments[0];
+
+          var result = [0, 0, 0, 0,
+                        0, 0, 0, 0,
+                        0, 0, 0, 0,
+                        0, 0, 0, 0];
+          var e = 0;
+          for (var row = 0; row < 4; row++) {
+            for (var col = 0; col < 4; col++, e++) {
+              result[e] += this.elements[row * 4 + 0] * source[col + 0] + this.elements[row * 4 + 1] * source[col + 4] + this.elements[row * 4 + 2] * source[col + 8] + this.elements[row * 4 + 3] * source[col + 12];
+            }
+          }
+          this.elements = result.slice();
+        }
+      },
+      rotate: function(angle, v0, v1, v2) {
+        if (!v1) {
+          this.rotateZ(angle);
+        } else {
+          // TODO should make sure this vector is normalized
+          var c = p.cos(angle);
+          var s = p.sin(angle);
+          var t = 1.0 - c;
+
+          this.apply((t * v0 * v0) + c, (t * v0 * v1) - (s * v2), (t * v0 * v2) + (s * v1), 0, (t * v0 * v1) + (s * v2), (t * v1 * v1) + c, (t * v1 * v2) - (s * v0), 0, (t * v0 * v2) - (s * v1), (t * v1 * v2) + (s * v0), (t * v2 * v2) + c, 0, 0, 0, 0, 1);
+        }
+      },
+      invApply: function() {
+        if (typeof inverseCopy === "undefined") {
+          inverseCopy = new PMatrix3D();
+        }
+        var a = arguments;
+        inverseCopy.set(a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], a[13], a[14], a[15]);
+
+        if (!inverseCopy.invert()) {
+          return false;
+        }
+        this.preApply(inverseCopy);
+        return true;
+      },
+      rotateX: function(angle) {
+        var c = p.cos(angle);
+        var s = p.sin(angle);
+        this.apply([1, 0, 0, 0, 0, c, -s, 0, 0, s, c, 0, 0, 0, 0, 1]);
+      },
+
+      rotateY: function(angle) {
+        var c = p.cos(angle);
+        var s = p.sin(angle);
+        this.apply([c, 0, s, 0, 0, 1, 0, 0, -s, 0, c, 0, 0, 0, 0, 1]);
+      },
+      rotateZ: function(angle) {
+        var c = Math.cos(angle);
+        var s = Math.sin(angle);
+        this.apply([c, -s, 0, 0, s, c, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]);
+      },
+      // Uniform scaling if only one value passed in
+      scale: function(sx, sy, sz) {
+        if (sx && !sy && !sz) {
+          sy = sz = sx;
+        } else if (sx && sy && !sz) {
+          sz = 1;
+        }
+
+        if (sx && sy && sz) {
+          this.elements[0] *= sx;
+          this.elements[1] *= sy;
+          this.elements[2] *= sz;
+          this.elements[4] *= sx;
+          this.elements[5] *= sy;
+          this.elements[6] *= sz;
+          this.elements[8] *= sx;
+          this.elements[9] *= sy;
+          this.elements[10] *= sz;
+          this.elements[12] *= sx;
+          this.elements[13] *= sy;
+          this.elements[14] *= sz;
+        }
+      },
+      skewX: function(angle) {
+        var t = p.tan(angle);
+        this.apply(1, t, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+      },
+      skewY: function(angle) {
+        var t = Math.tan(angle);
+        this.apply(1, 0, 0, 0, t, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+      },
+      multX: function(x, y, z, w) {
+        if (!z) {
+          return this.elements[0] * x + this.elements[1] * y + this.elements[3];
+        } else if (!w) {
+          return this.elements[0] * x + this.elements[1] * y + this.elements[2] * z + this.elements[3];
+        } else {
+          return this.elements[0] * x + this.elements[1] * y + this.elements[2] * z + this.elements[3] * w;
+        }
+      },
+      multY: function(x, y, z, w) {
+        if (!z) {
+          return this.elements[4] * x + this.elements[5] * y + this.elements[7];
+        } else if (!w) {
+          return this.elements[4] * x + this.elements[5] * y + this.elements[6] * z + this.elements[7];
+        } else {
+          return this.elements[4] * x + this.elements[5] * y + this.elements[6] * z + this.elements[7] * w;
+        }
+      },
+      multZ: function(x, y, z, w) {
+        if (!w) {
+          return this.elements[8] * x + this.elements[9] * y + this.elements[10] * z + this.elements[11];
+        } else {
+          return this.elements[8] * x + this.elements[9] * y + this.elements[10] * z + this.elements[11] * w;
+        }
+      },
+      multW: function(x, y, z, w) {
+        if (!w) {
+          return this.elements[12] * x + this.elements[13] * y + this.elements[14] * z + this.elements[15];
+        } else {
+          return this.elements[12] * x + this.elements[13] * y + this.elements[14] * z + this.elements[15] * w;
+        }
+      },
+      invert: function() {
+        var kInv = [];
+        var fA0 = this.elements[0] * this.elements[5] - this.elements[1] * this.elements[4];
+        var fA1 = this.elements[0] * this.elements[6] - this.elements[2] * this.elements[4];
+        var fA2 = this.elements[0] * this.elements[7] - this.elements[3] * this.elements[4];
+        var fA3 = this.elements[1] * this.elements[6] - this.elements[2] * this.elements[5];
+        var fA4 = this.elements[1] * this.elements[7] - this.elements[3] * this.elements[5];
+        var fA5 = this.elements[2] * this.elements[7] - this.elements[3] * this.elements[6];
+        var fB0 = this.elements[8] * this.elements[13] - this.elements[9] * this.elements[12];
+        var fB1 = this.elements[8] * this.elements[14] - this.elements[10] * this.elements[12];
+        var fB2 = this.elements[8] * this.elements[15] - this.elements[11] * this.elements[12];
+        var fB3 = this.elements[9] * this.elements[14] - this.elements[10] * this.elements[13];
+        var fB4 = this.elements[9] * this.elements[15] - this.elements[11] * this.elements[13];
+        var fB5 = this.elements[10] * this.elements[15] - this.elements[11] * this.elements[14];
+
+        // Determinant
+        var fDet = fA0 * fB5 - fA1 * fB4 + fA2 * fB3 + fA3 * fB2 - fA4 * fB1 + fA5 * fB0;
+
+        // Account for a very small value
+        // return false if not successful.
+        if (Math.abs(fDet) <= 1e-9) {
+          return false;
+        }
+
+        kInv[0] = +this.elements[5] * fB5 - this.elements[6] * fB4 + this.elements[7] * fB3;
+        kInv[4] = -this.elements[4] * fB5 + this.elements[6] * fB2 - this.elements[7] * fB1;
+        kInv[8] = +this.elements[4] * fB4 - this.elements[5] * fB2 + this.elements[7] * fB0;
+        kInv[12] = -this.elements[4] * fB3 + this.elements[5] * fB1 - this.elements[6] * fB0;
+        kInv[1] = -this.elements[1] * fB5 + this.elements[2] * fB4 - this.elements[3] * fB3;
+        kInv[5] = +this.elements[0] * fB5 - this.elements[2] * fB2 + this.elements[3] * fB1;
+        kInv[9] = -this.elements[0] * fB4 + this.elements[1] * fB2 - this.elements[3] * fB0;
+        kInv[13] = +this.elements[0] * fB3 - this.elements[1] * fB1 + this.elements[2] * fB0;
+        kInv[2] = +this.elements[13] * fA5 - this.elements[14] * fA4 + this.elements[15] * fA3;
+        kInv[6] = -this.elements[12] * fA5 + this.elements[14] * fA2 - this.elements[15] * fA1;
+        kInv[10] = +this.elements[12] * fA4 - this.elements[13] * fA2 + this.elements[15] * fA0;
+        kInv[14] = -this.elements[12] * fA3 + this.elements[13] * fA1 - this.elements[14] * fA0;
+        kInv[3] = -this.elements[9] * fA5 + this.elements[10] * fA4 - this.elements[11] * fA3;
+        kInv[7] = +this.elements[8] * fA5 - this.elements[10] * fA2 + this.elements[11] * fA1;
+        kInv[11] = -this.elements[8] * fA4 + this.elements[9] * fA2 - this.elements[11] * fA0;
+        kInv[15] = +this.elements[8] * fA3 - this.elements[9] * fA1 + this.elements[10] * fA0;
+
+        // Inverse using Determinant
+        var fInvDet = 1.0 / fDet;
+        kInv[0] *= fInvDet;
+        kInv[1] *= fInvDet;
+        kInv[2] *= fInvDet;
+        kInv[3] *= fInvDet;
+        kInv[4] *= fInvDet;
+        kInv[5] *= fInvDet;
+        kInv[6] *= fInvDet;
+        kInv[7] *= fInvDet;
+        kInv[8] *= fInvDet;
+        kInv[9] *= fInvDet;
+        kInv[10] *= fInvDet;
+        kInv[11] *= fInvDet;
+        kInv[12] *= fInvDet;
+        kInv[13] *= fInvDet;
+        kInv[14] *= fInvDet;
+        kInv[15] *= fInvDet;
+
+        this.elements = kInv.slice();
+        return true;
+      },
+      toString: function() {
+        var str = "";
+        for (var i = 0; i < 15; i++) {
+          str += this.elements[i] + ", ";
+        }
+        str += this.elements[15];
+        return str;
+      },
+      print: function() {
+        var digits = printMatrixHelper(this.elements);
+
+        var output = "";
+        output += p.nfs(this.elements[0], digits, 4) + " " + p.nfs(this.elements[1], digits, 4) + " " + p.nfs(this.elements[2], digits, 4) + " " + p.nfs(this.elements[3], digits, 4) + "\n";
+        output += p.nfs(this.elements[4], digits, 4) + " " + p.nfs(this.elements[5], digits, 4) + " " + p.nfs(this.elements[6], digits, 4) + " " + p.nfs(this.elements[7], digits, 4) + "\n";
+        output += p.nfs(this.elements[8], digits, 4) + " " + p.nfs(this.elements[9], digits, 4) + " " + p.nfs(this.elements[10], digits, 4) + " " + p.nfs(this.elements[11], digits, 4) + "\n";
+        output += p.nfs(this.elements[12], digits, 4) + " " + p.nfs(this.elements[13], digits, 4) + " " + p.nfs(this.elements[14], digits, 4) + " " + p.nfs(this.elements[15], digits, 4) + "\n\n";
+
+        p.println(output);
+      },
+      invTranslate: function(tx, ty, tz) {
+        this.preApply(1, 0, 0, -tx, 0, 1, 0, -ty, 0, 0, 1, -tz, 0, 0, 0, 1);
+      },
+      invRotateX: function(angle) {
+        var c = p.cos(-angle);
+        var s = p.sin(-angle);
+        this.preApply([1, 0, 0, 0, 0, c, -s, 0, 0, s, c, 0, 0, 0, 0, 1]);
+      },
+      invRotateY: function(angle) {
+        var c = p.cos(-angle);
+        var s = p.sin(-angle);
+        this.preApply([c, 0, s, 0, 0, 1, 0, 0, -s, 0, c, 0, 0, 0, 0, 1]);
+      },
+      invRotateZ: function(angle) {
+        var c = p.cos(-angle);
+        var s = p.sin(-angle);
+        this.preApply([c, -s, 0, 0, s, c, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]);
+      },
+      invScale: function(x, y, z) {
+        this.preApply([1 / x, 0, 0, 0, 0, 1 / y, 0, 0, 0, 0, 1 / z, 0, 0, 0, 0, 1]);
+      }
+    };
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Matrix Stack
+    ////////////////////////////////////////////////////////////////////////////
+    var PMatrixStack = function PMatrixStack() {
+      this.matrixStack = [];
+    };
+
+    PMatrixStack.prototype.load = function load() {
+      var tmpMatrix;
+      if (p.use3DContext) {
+        tmpMatrix = new PMatrix3D();
+      } else {
+        tmpMatrix = new PMatrix2D();
+      }
+
+      if (arguments.length === 1) {
+        tmpMatrix.set(arguments[0]);
+      } else {
+        tmpMatrix.set(arguments);
+      }
+      this.matrixStack.push(tmpMatrix);
+    };
+
+    PMatrixStack.prototype.push = function push() {
+      this.matrixStack.push(this.peek());
+    };
+
+    PMatrixStack.prototype.pop = function pop() {
+      return this.matrixStack.pop();
+    };
+
+    PMatrixStack.prototype.peek = function peek() {
+      var tmpMatrix;
+      if (p.use3DContext) {
+        tmpMatrix = new PMatrix3D();
+      } else {
+        tmpMatrix = new PMatrix2D();
+      }
+
+      tmpMatrix.set(this.matrixStack[this.matrixStack.length - 1]);
+      return tmpMatrix;
+    };
+
+    PMatrixStack.prototype.mult = function mult(matrix) {
+      this.matrixStack[this.matrixStack.length - 1].apply(matrix);
+    };
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Array handling
+    ////////////////////////////////////////////////////////////////////////////
+    p.split = function(str, delim) {
+      return str.split(delim);
+    };
+
+    p.splitTokens = function(str, tokens) {
+      if (arguments.length === 1) {
+        tokens = "\n\t\r\f ";
+      }
+
+      tokens = "[" + tokens + "]";
+
+      var ary = new Array(0);
+      var index = 0;
+      var pos = str.search(tokens);
+
+      while (pos >= 0) {
+        if (pos === 0) {
+          str = str.substring(1);
+        } else {
+          ary[index] = str.substring(0, pos);
+          index++;
+          str = str.substring(pos);
+        }
+        pos = str.search(tokens);
+      }
+
+      if (str.length > 0) {
+        ary[index] = str;
+      }
+
+      if (ary.length === 0) {
+        ary = undefined;
+      }
+
+      return ary;
+    };
+
+    p.append = function(array, element) {
+      array[array.length] = element;
+      return array;
+    };
+
+    p.concat = function(array1, array2) {
+      return array1.concat(array2);
+    };
+
+    p.sort = function(array, numElem) {
+      var ret = [];
+
+      // depending on the type used (int, float) or string
+      // we'll need to use a different compare function
+      if (array.length > 0) {
+        // copy since we need to return another array
+        var elemsToCopy = numElem > 0 ? numElem : array.length;
+        for (var i = 0; i < elemsToCopy; i++) {
+          ret.push(array[i]);
+        }
+        if (typeof array[0] === "string") {
+          ret.sort();
+        }
+        // int or float
+        else {
+          ret.sort(function(a, b) {
+            return a - b;
+          });
+        }
+
+        // copy on the rest of the elements that were not sorted in case the user
+        // only wanted a subset of an array to be sorted.
+        if (numElem > 0) {
+          for (var j = ret.length; j < array.length; j++) {
+            ret.push(array[j]);
+          }
+        }
+      }
+      return ret;
+    };
+
+    p.splice = function(array, value, index) {
+      if (array.length === 0 && value.length === 0) {
+        return array;
+      }
+
+      if (value instanceof Array) {
+        for (var i = 0, j = index; i < value.length; j++, i++) {
+          array.splice(j, 0, value[i]);
+        }
+      } else {
+        array.splice(index, 0, value);
+      }
+
+      return array;
+    };
+
+    p.subset = function(array, offset, length) {
+      if (arguments.length === 2) {
+        return p.subset(array, offset, array.length - offset);
+      } else if (arguments.length === 3) {
+        return array.slice(offset, offset + length);
+      }
+    };
+
+    p.join = function(array, seperator) {
+      return array.join(seperator);
+    };
+
+    p.shorten = function(ary) {
+      var newary = new Array(0);
+
+      // copy array into new array
+      var len = ary.length;
+      for (var i = 0; i < len; i++) {
+        newary[i] = ary[i];
+      }
+      newary.pop();
+
+      return newary;
+    };
+
+    p.expand = function(ary, newSize) {
+      var newary = new Array(0);
+
+      var len = ary.length;
+      for (var i = 0; i < len; i++) {
+        newary[i] = ary[i];
+      }
+
+      if (arguments.length === 1) {
+        // double size of array
+        newary.length *= 2;
+      } else if (arguments.length === 2) {
+        // size is newSize
+        newary.length = newSize;
+      }
+
+      return newary;
+    };
+
+    p.arrayCopy = function(src, srcPos, dest, destPos, length) {
+      if (arguments.length === 2) {
+        // recall itself and copy src to dest from start index 0 to 0 of src.length
+        p.arrayCopy(src, 0, srcPos, 0, src.length);
+      } else if (arguments.length === 3) {
+        // recall itself and copy src to dest from start index 0 to 0 of length
+        p.arrayCopy(src, 0, srcPos, 0, dest);
+      } else if (arguments.length === 5) {
+        // copy src to dest from index srcPos to index destPos of length recursivly on objects
+        for (var i = srcPos, j = destPos; i < length + srcPos; i++, j++) {
+          if (src[i] && typeof src[i] === "object") {
+            // src[i] is not null and is another object or array. go recursive
+            p.arrayCopy(src[i], 0, dest[j], 0, src[i].length);
+          } else {
+            // standard type, just copy
+            dest[j] = src[i];
+          }
+        }
+      }
+    };
+
+    p.ArrayList = function() {
+      var createArrayList = function(args){
+        var array = [];
+        for (var i = 0; i < args[0]; i++){
+          array[i] = (args.length > 1 ? createArrayList(args.slice(1)) : 0 );
+        }
+
+        array.get = function(i) {
+          return this[i];
+        };
+        array.contains = function(item) {
+          return this.indexOf(item) !== -1;
+        };
+        array.add = function(item) {
+          return this.push(item);
+        };
+        array.size = function() {
+          return this.length;
+        };
+        array.clear = function() {
+          this.length = 0;
+        };
+        array.remove = function(i) {
+          return this.splice(i, 1)[0];
+        };
+        array.isEmpty = function() {
+          return !this.length;
+        };
+        array.clone = function() {
+          var size = this.length;
+          var a = new p.ArrayList(size);
+          for (var i = 0; i < size; i++) {
+            a[i] = this[i];
+          }
+          return a;
+        };
+
+        return array;
+      };
+      return createArrayList(Array.prototype.slice.call(arguments));
+    };
+
+    p.reverse = function(array) {
+      return array.reverse();
+    };
+
+    ////////////////////////////////////////////////////////////////////////////
+    // HashMap
+    ////////////////////////////////////////////////////////////////////////////
+
+    var virtHashCode = function virtHashCode(obj) {
+      if (obj.constructor === String) {
+        var hash = 0;
+        for (var i = 0; i < obj.length; ++i) {
+          hash = (hash * 31 + obj.charCodeAt(i)) & 0xFFFFFFFF;
+        }
+        return hash;
+      } else if (typeof(obj) !== "object") {
+        return obj & 0xFFFFFFFF;
+      } else if ("hashCode" in obj) {
+        return obj.hashCode.call(obj);
+      } else {
+        if (obj.$id === undefined) {
+          obj.$id = ((Math.floor(Math.random() * 0x10000) - 0x8000) << 16) | Math.floor(Math.random() * 0x10000);
+        }
+        return obj.$id;
+      }
+    };
+
+    var virtEquals = function virtEquals(obj, other) {
+      if (obj === null || other === null) {
+        return (obj === null) && (other === null);
+      } else if (obj.constructor === String) {
+        return obj === other;
+      } else if (typeof(obj) !== "object") {
+        return obj === other;
+      } else if ("equals" in obj) {
+        return obj.equals.call(obj, other);
+      } else {
+        return obj === other;
+      }
+    };
+
+    p.HashMap = function HashMap() {
+      if (arguments.length === 1 && arguments[0].constructor === HashMap) {
+        return arguments[0].clone();
+      }
+
+      var initialCapacity = arguments.length > 0 ? arguments[0] : 16;
+      var loadFactor = arguments.length > 1 ? arguments[1] : 0.75;
+
+      var buckets = new Array(initialCapacity);
+      var count = 0;
+      var hashMap = this;
+
+      function ensureLoad() {
+        if (count <= loadFactor * buckets.length) {
+          return;
+        }
+        var allEntries = [];
+        for (var i = 0; i < buckets.length; ++i) {
+          if (buckets[i] !== undefined) {
+            allEntries = allEntries.concat(buckets[i]);
+          }
+        }
+        buckets = new Array(buckets.length * 2);
+        for (var j = 0; j < allEntries.length; ++j) {
+          var index = virtHashCode(allEntries[j].key) % buckets.length;
+          var bucket = buckets[index];
+          if (bucket === undefined) {
+            buckets[index] = bucket = [];
+          }
+          bucket.push(allEntries[j]);
+        }
+      }
+
+      function Iterator(conversion, removeItem) {
+        var bucketIndex = 0;
+        var itemIndex = -1;
+        var endOfBuckets = false;
+
+        function findNext() {
+          while (!endOfBuckets) {
+            ++itemIndex;
+            if (bucketIndex >= buckets.length) {
+              endOfBuckets = true;
+            } else if (typeof(buckets[bucketIndex]) === 'undefined' || itemIndex >= buckets[bucketIndex].length) {
+              itemIndex = -1;
+              ++bucketIndex;
+            } else {
+              return;
+            }
+          }
+        }
+
+        this.hasNext = function() {
+          return !endOfBuckets;
+        };
+        this.next = function() {
+          var result = conversion(buckets[bucketIndex][itemIndex]);
+          findNext();
+          return result;
+        };
+        this.remove = function() {
+          removeItem(this.next());
+          --itemIndex;
+        };
+
+        findNext();
+      }
+
+      function Set(conversion, isIn, removeItem) {
+        this.clear = function() {
+          hashMap.clear();
+        };
+        this.contains = function(o) {
+          return isIn(o);
+        };
+        this.containsAll = function(o) {
+          var it = o.iterator();
+          while (it.hasNext()) {
+            if (!this.contains(it.next())) {
+              return false;
+            }
+          }
+          return true;
+        };
+        this.isEmpty = function() {
+          return hashMap.isEmpty();
+        };
+        this.iterator = function() {
+          return new Iterator(conversion, removeItem);
+        };
+        this.remove = function(o) {
+          if (this.contains(o)) {
+            removeItem(o);
+            return true;
+          }
+          return false;
+        };
+        this.removeAll = function(c) {
+          var it = c.iterator();
+          var changed = false;
+          while (it.hasNext()) {
+            var item = it.next();
+            if (this.contains(item)) {
+              removeItem(item);
+              changed = true;
+            }
+          }
+          return true;
+        };
+        this.retainAll = function(c) {
+          var it = this.iterator();
+          var toRemove = [];
+          while (it.hasNext()) {
+            var entry = it.next();
+            if (!c.contains(entry)) {
+              toRemove.push(entry);
+            }
+          }
+          for (var i = 0; i < toRemove.length; ++i) {
+            removeItem(toRemove[i]);
+          }
+          return toRemove.length > 0;
+        };
+        this.size = function() {
+          return hashMap.size();
+        };
+        this.toArray = function() {
+          var result = new p.ArrayList(0);
+          var it = this.iterator();
+          while (it.hasNext()) {
+            result.push(it.next());
+          }
+          return result;
+        };
+      }
+
+      function Entry(pair) {
+        this._isIn = function(map) {
+          return map === hashMap && (typeof(pair.removed) === 'undefined');
+        };
+        this.equals = function(o) {
+          return virtEquals(pair.key, o.getKey());
+        };
+        this.getKey = function() {
+          return pair.key;
+        };
+        this.getValue = function() {
+          return pair.value;
+        };
+        this.hashCode = function(o) {
+          return virtHashCode(pair.key);
+        };
+        this.setValue = function(value) {
+          var old = pair.value;
+          pair.value = value;
+          return old;
+        };
+      }
+
+      this.clear = function() {
+        count = 0;
+        buckets = new Array(initialCapacity);
+      };
+      this.clone = function() {
+        var map = new p.HashMap();
+        map.putAll(this);
+        return map;
+      };
+      this.containsKey = function(key) {
+        var index = virtHashCode(key) % buckets.length;
+        var bucket = buckets[index];
+        if (bucket === undefined) {
+          return false;
+        }
+        for (var i = 0; i < bucket.length; ++i) {
+          if (virtEquals(bucket[i].key, key)) {
+            return true;
+          }
+        }
+        return false;
+      };
+      this.containsValue = function(value) {
+        for (var i = 0; i < buckets.length; ++i) {
+          var bucket = buckets[i];
+          if (bucket === undefined) {
+            continue;
+          }
+          for (var j = 0; j < bucket.length; ++j) {
+            if (virtEquals(bucket[j].value, value)) {
+              return true;
+            }
+          }
+        }
+        return false;
+      };
+      this.entrySet = function() {
+        return new Set(
+
+        function(pair) {
+          return new Entry(pair);
+        },
+
+        function(pair) {
+          return pair.constructor === Entry && pair._isIn(hashMap);
+        },
+
+        function(pair) {
+          return hashMap.remove(pair.getKey());
+        });
+      };
+      this.get = function(key) {
+        var index = virtHashCode(key) % buckets.length;
+        var bucket = buckets[index];
+        if (bucket === undefined) {
+          return null;
+        }
+        for (var i = 0; i < bucket.length; ++i) {
+          if (virtEquals(bucket[i].key, key)) {
+            return bucket[i].value;
+          }
+        }
+        return null;
+      };
+      this.isEmpty = function() {
+        return count === 0;
+      };
+      this.keySet = function() {
+        return new Set(
+
+        function(pair) {
+          return pair.key;
+        },
+
+        function(key) {
+          return hashMap.containsKey(key);
+        },
+
+        function(key) {
+          return hashMap.remove(key);
+        });
+      };
+      this.put = function(key, value) {
+        var index = virtHashCode(key) % buckets.length;
+        var bucket = buckets[index];
+        if (bucket === undefined) {
+          ++count;
+          buckets[index] = [{
+            key: key,
+            value: value
+          }];
+          ensureLoad();
+          return null;
+        }
+        for (var i = 0; i < bucket.length; ++i) {
+          if (virtEquals(bucket[i].key, key)) {
+            var previous = bucket[i].value;
+            bucket[i].value = value;
+            return previous;
+          }
+        }++count;
+        bucket.push({
+          key: key,
+          value: value
+        });
+        ensureLoad();
+        return null;
+      };
+      this.putAll = function(m) {
+        var it = m.entrySet().iterator();
+        while (it.hasNext()) {
+          var entry = it.next();
+          this.put(entry.getKey(), entry.getValue());
+        }
+      };
+      this.remove = function(key) {
+        var index = virtHashCode(key) % buckets.length;
+        var bucket = buckets[index];
+        if (bucket === undefined) {
+          return null;
+        }
+        for (var i = 0; i < bucket.length; ++i) {
+          if (virtEquals(bucket[i].key, key)) {
+            --count;
+            var previous = bucket[i].value;
+            bucket[i].removed = true;
+            if (bucket.length > 1) {
+              bucket.splice(i, 1);
+            } else {
+              buckets[index] = undefined;
+            }
+            return previous;
+          }
+        }
+        return null;
+      };
+      this.size = function() {
+        return count;
+      };
+      this.values = function() {
+        var result = new p.ArrayList(0);
+        var it = this.entrySet().iterator();
+        while (it.hasNext()) {
+          var entry = it.next();
+          result.push(entry.getValue());
+        }
+        return result;
+      };
+    };
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Color functions
+    ////////////////////////////////////////////////////////////////////////////
+
+    // helper functions for internal blending modes
+    p.mix = function(a, b, f) {
+      return a + (((b - a) * f) >> 8);
+    };
+
+    p.peg = function(n) {
+      return (n < 0) ? 0 : ((n > 255) ? 255 : n);
+    };
+
+    // blending modes
+    p.modes = {
+      replace: function(c1, c2) {
+        return c2;
+      },
+      blend: function(c1, c2) {
+        var f = (c2 & p.ALPHA_MASK) >>> 24;
+        return (Math.min(((c1 & p.ALPHA_MASK) >>> 24) + f, 0xff) << 24 | p.mix(c1 & p.RED_MASK, c2 & p.RED_MASK, f) & p.RED_MASK | p.mix(c1 & p.GREEN_MASK, c2 & p.GREEN_MASK, f) & p.GREEN_MASK | p.mix(c1 & p.BLUE_MASK, c2 & p.BLUE_MASK, f));
+      },
+      add: function(c1, c2) {
+        var f = (c2 & p.ALPHA_MASK) >>> 24;
+        return (Math.min(((c1 & p.ALPHA_MASK) >>> 24) + f, 0xff) << 24 | Math.min(((c1 & p.RED_MASK) + ((c2 & p.RED_MASK) >> 8) * f), p.RED_MASK) & p.RED_MASK | Math.min(((c1 & p.GREEN_MASK) + ((c2 & p.GREEN_MASK) >> 8) * f), p.GREEN_MASK) & p.GREEN_MASK | Math.min((c1 & p.BLUE_MASK) + (((c2 & p.BLUE_MASK) * f) >> 8), p.BLUE_MASK));
+      },
+      subtract: function(c1, c2) {
+        var f = (c2 & p.ALPHA_MASK) >>> 24;
+        return (Math.min(((c1 & p.ALPHA_MASK) >>> 24) + f, 0xff) << 24 | Math.max(((c1 & p.RED_MASK) - ((c2 & p.RED_MASK) >> 8) * f), p.GREEN_MASK) & p.RED_MASK | Math.max(((c1 & p.GREEN_MASK) - ((c2 & p.GREEN_MASK) >> 8) * f), p.BLUE_MASK) & p.GREEN_MASK | Math.max((c1 & p.BLUE_MASK) - (((c2 & p.BLUE_MASK) * f) >> 8), 0));
+      },
+      lightest: function(c1, c2) {
+        var f = (c2 & p.ALPHA_MASK) >>> 24;
+        return (Math.min(((c1 & p.ALPHA_MASK) >>> 24) + f, 0xff) << 24 | Math.max(c1 & p.RED_MASK, ((c2 & p.RED_MASK) >> 8) * f) & p.RED_MASK | Math.max(c1 & p.GREEN_MASK, ((c2 & p.GREEN_MASK) >> 8) * f) & p.GREEN_MASK | Math.max(c1 & p.BLUE_MASK, ((c2 & p.BLUE_MASK) * f) >> 8));
+      },
+      darkest: function(c1, c2) {
+        var f = (c2 & p.ALPHA_MASK) >>> 24;
+        return (Math.min(((c1 & p.ALPHA_MASK) >>> 24) + f, 0xff) << 24 | p.mix(c1 & p.RED_MASK, Math.min(c1 & p.RED_MASK, ((c2 & p.RED_MASK) >> 8) * f), f) & p.RED_MASK | p.mix(c1 & p.GREEN_MASK, Math.min(c1 & p.GREEN_MASK, ((c2 & p.GREEN_MASK) >> 8) * f), f) & p.GREEN_MASK | p.mix(c1 & p.BLUE_MASK, Math.min(c1 & p.BLUE_MASK, ((c2 & p.BLUE_MASK) * f) >> 8), f));
+      },
+      difference: function(c1, c2) {
+        var f = (c2 & p.ALPHA_MASK) >>> 24;
+        var ar = (c1 & p.RED_MASK) >> 16;
+        var ag = (c1 & p.GREEN_MASK) >> 8;
+        var ab = (c1 & p.BLUE_MASK);
+        var br = (c2 & p.RED_MASK) >> 16;
+        var bg = (c2 & p.GREEN_MASK) >> 8;
+        var bb = (c2 & p.BLUE_MASK);
+        // formula:
+        var cr = (ar > br) ? (ar - br) : (br - ar);
+        var cg = (ag > bg) ? (ag - bg) : (bg - ag);
+        var cb = (ab > bb) ? (ab - bb) : (bb - ab);
+        // alpha blend (this portion will always be the same)
+        return (Math.min(((c1 & p.ALPHA_MASK) >>> 24) + f, 0xff) << 24 | (p.peg(ar + (((cr - ar) * f) >> 8)) << 16) | (p.peg(ag + (((cg - ag) * f) >> 8)) << 8) | (p.peg(ab + (((cb - ab) * f) >> 8))));
+      },
+      exclusion: function(c1, c2) {
+        var f = (c2 & p.ALPHA_MASK) >>> 24;
+        var ar = (c1 & p.RED_MASK) >> 16;
+        var ag = (c1 & p.GREEN_MASK) >> 8;
+        var ab = (c1 & p.BLUE_MASK);
+        var br = (c2 & p.RED_MASK) >> 16;
+        var bg = (c2 & p.GREEN_MASK) >> 8;
+        var bb = (c2 & p.BLUE_MASK);
+        // formula:
+        var cr = ar + br - ((ar * br) >> 7);
+        var cg = ag + bg - ((ag * bg) >> 7);
+        var cb = ab + bb - ((ab * bb) >> 7);
+        // alpha blend (this portion will always be the same)
+        return (Math.min(((c1 & p.ALPHA_MASK) >>> 24) + f, 0xff) << 24 | (p.peg(ar + (((cr - ar) * f) >> 8)) << 16) | (p.peg(ag + (((cg - ag) * f) >> 8)) << 8) | (p.peg(ab + (((cb - ab) * f) >> 8))));
+      },
+      multiply: function(c1, c2) {
+        var f = (c2 & p.ALPHA_MASK) >>> 24;
+        var ar = (c1 & p.RED_MASK) >> 16;
+        var ag = (c1 & p.GREEN_MASK) >> 8;
+        var ab = (c1 & p.BLUE_MASK);
+        var br = (c2 & p.RED_MASK) >> 16;
+        var bg = (c2 & p.GREEN_MASK) >> 8;
+        var bb = (c2 & p.BLUE_MASK);
+        // formula:
+        var cr = (ar * br) >> 8;
+        var cg = (ag * bg) >> 8;
+        var cb = (ab * bb) >> 8;
+        // alpha blend (this portion will always be the same)
+        return (Math.min(((c1 & p.ALPHA_MASK) >>> 24) + f, 0xff) << 24 | (p.peg(ar + (((cr - ar) * f) >> 8)) << 16) | (p.peg(ag + (((cg - ag) * f) >> 8)) << 8) | (p.peg(ab + (((cb - ab) * f) >> 8))));
+      },
+      screen: function(c1, c2) {
+        var f = (c2 & p.ALPHA_MASK) >>> 24;
+        var ar = (c1 & p.RED_MASK) >> 16;
+        var ag = (c1 & p.GREEN_MASK) >> 8;
+        var ab = (c1 & p.BLUE_MASK);
+        var br = (c2 & p.RED_MASK) >> 16;
+        var bg = (c2 & p.GREEN_MASK) >> 8;
+        var bb = (c2 & p.BLUE_MASK);
+        // formula:
+        var cr = 255 - (((255 - ar) * (255 - br)) >> 8);
+        var cg = 255 - (((255 - ag) * (255 - bg)) >> 8);
+        var cb = 255 - (((255 - ab) * (255 - bb)) >> 8);
+        // alpha blend (this portion will always be the same)
+        return (Math.min(((c1 & p.ALPHA_MASK) >>> 24) + f, 0xff) << 24 | (p.peg(ar + (((cr - ar) * f) >> 8)) << 16) | (p.peg(ag + (((cg - ag) * f) >> 8)) << 8) | (p.peg(ab + (((cb - ab) * f) >> 8))));
+      },
+      hard_light: function(c1, c2) {
+        var f = (c2 & p.ALPHA_MASK) >>> 24;
+        var ar = (c1 & p.RED_MASK) >> 16;
+        var ag = (c1 & p.GREEN_MASK) >> 8;
+        var ab = (c1 & p.BLUE_MASK);
+        var br = (c2 & p.RED_MASK) >> 16;
+        var bg = (c2 & p.GREEN_MASK) >> 8;
+        var bb = (c2 & p.BLUE_MASK);
+        // formula:
+        var cr = (br < 128) ? ((ar * br) >> 7) : (255 - (((255 - ar) * (255 - br)) >> 7));
+        var cg = (bg < 128) ? ((ag * bg) >> 7) : (255 - (((255 - ag) * (255 - bg)) >> 7));
+        var cb = (bb < 128) ? ((ab * bb) >> 7) : (255 - (((255 - ab) * (255 - bb)) >> 7));
+        // alpha blend (this portion will always be the same)
+        return (Math.min(((c1 & p.ALPHA_MASK) >>> 24) + f, 0xff) << 24 | (p.peg(ar + (((cr - ar) * f) >> 8)) << 16) | (p.peg(ag + (((cg - ag) * f) >> 8)) << 8) | (p.peg(ab + (((cb - ab) * f) >> 8))));
+      },
+      soft_light: function(c1, c2) {
+        var f = (c2 & p.ALPHA_MASK) >>> 24;
+        var ar = (c1 & p.RED_MASK) >> 16;
+        var ag = (c1 & p.GREEN_MASK) >> 8;
+        var ab = (c1 & p.BLUE_MASK);
+        var br = (c2 & p.RED_MASK) >> 16;
+        var bg = (c2 & p.GREEN_MASK) >> 8;
+        var bb = (c2 & p.BLUE_MASK);
+        // formula:
+        var cr = ((ar * br) >> 7) + ((ar * ar) >> 8) - ((ar * ar * br) >> 15);
+        var cg = ((ag * bg) >> 7) + ((ag * ag) >> 8) - ((ag * ag * bg) >> 15);
+        var cb = ((ab * bb) >> 7) + ((ab * ab) >> 8) - ((ab * ab * bb) >> 15);
+        // alpha blend (this portion will always be the same)
+        return (Math.min(((c1 & p.ALPHA_MASK) >>> 24) + f, 0xff) << 24 | (p.peg(ar + (((cr - ar) * f) >> 8)) << 16) | (p.peg(ag + (((cg - ag) * f) >> 8)) << 8) | (p.peg(ab + (((cb - ab) * f) >> 8))));
+      },
+      overlay: function(c1, c2) {
+        var f = (c2 & p.ALPHA_MASK) >>> 24;
+        var ar = (c1 & p.RED_MASK) >> 16;
+        var ag = (c1 & p.GREEN_MASK) >> 8;
+        var ab = (c1 & p.BLUE_MASK);
+        var br = (c2 & p.RED_MASK) >> 16;
+        var bg = (c2 & p.GREEN_MASK) >> 8;
+        var bb = (c2 & p.BLUE_MASK);
+        // formula:
+        var cr = (ar < 128) ? ((ar * br) >> 7) : (255 - (((255 - ar) * (255 - br)) >> 7));
+        var cg = (ag < 128) ? ((ag * bg) >> 7) : (255 - (((255 - ag) * (255 - bg)) >> 7));
+        var cb = (ab < 128) ? ((ab * bb) >> 7) : (255 - (((255 - ab) * (255 - bb)) >> 7));
+        // alpha blend (this portion will always be the same)
+        return (Math.min(((c1 & p.ALPHA_MASK) >>> 24) + f, 0xff) << 24 | (p.peg(ar + (((cr - ar) * f) >> 8)) << 16) | (p.peg(ag + (((cg - ag) * f) >> 8)) << 8) | (p.peg(ab + (((cb - ab) * f) >> 8))));
+      },
+      dodge: function(c1, c2) {
+        var f = (c2 & p.ALPHA_MASK) >>> 24;
+        var ar = (c1 & p.RED_MASK) >> 16;
+        var ag = (c1 & p.GREEN_MASK) >> 8;
+        var ab = (c1 & p.BLUE_MASK);
+        var br = (c2 & p.RED_MASK) >> 16;
+        var bg = (c2 & p.GREEN_MASK) >> 8;
+        var bb = (c2 & p.BLUE_MASK);
+        // formula:
+        var cr = (br === 255) ? 255 : p.peg((ar << 8) / (255 - br)); // division requires pre-peg()-ing
+        var cg = (bg === 255) ? 255 : p.peg((ag << 8) / (255 - bg)); // "
+        var cb = (bb === 255) ? 255 : p.peg((ab << 8) / (255 - bb)); // "
+        // alpha blend (this portion will always be the same)
+        return (Math.min(((c1 & p.ALPHA_MASK) >>> 24) + f, 0xff) << 24 | (p.peg(ar + (((cr - ar) * f) >> 8)) << 16) | (p.peg(ag + (((cg - ag) * f) >> 8)) << 8) | (p.peg(ab + (((cb - ab) * f) >> 8))));
+      },
+      burn: function(c1, c2) {
+        var f = (c2 & p.ALPHA_MASK) >>> 24;
+        var ar = (c1 & p.RED_MASK) >> 16;
+        var ag = (c1 & p.GREEN_MASK) >> 8;
+        var ab = (c1 & p.BLUE_MASK);
+        var br = (c2 & p.RED_MASK) >> 16;
+        var bg = (c2 & p.GREEN_MASK) >> 8;
+        var bb = (c2 & p.BLUE_MASK);
+        // formula:
+        var cr = (br === 0) ? 0 : 255 - p.peg(((255 - ar) << 8) / br); // division requires pre-peg()-ing
+        var cg = (bg === 0) ? 0 : 255 - p.peg(((255 - ag) << 8) / bg); // "
+        var cb = (bb === 0) ? 0 : 255 - p.peg(((255 - ab) << 8) / bb); // "
+        // alpha blend (this portion will always be the same)
+        return (Math.min(((c1 & p.ALPHA_MASK) >>> 24) + f, 0xff) << 24 | (p.peg(ar + (((cr - ar) * f) >> 8)) << 16) | (p.peg(ag + (((cg - ag) * f) >> 8)) << 8) | (p.peg(ab + (((cb - ab) * f) >> 8))));
+      }
+    };
+
+    p.color = function color(aValue1, aValue2, aValue3, aValue4) {
+      var r, g, b, a, rgb, aColor;
+
+      // 4 arguments: (R, G, B, A) or (H, S, B, A)
+      if (aValue1 != null && aValue2 != null && aValue3 != null && aValue4 != null) {
+        if (curColorMode === p.HSB) {
+          rgb = p.color.toRGB(aValue1, aValue2, aValue3);
+          r = rgb[0];
+          g = rgb[1];
+          b = rgb[2];
+        } else {
+          r = Math.round(255 * (aValue1 / colorModeX));
+          g = Math.round(255 * (aValue2 / colorModeY));
+          b = Math.round(255 * (aValue3 / colorModeZ));
+        }
+
+        a = Math.round(255 * (aValue4 / colorModeA));
+
+        // Limit values greater than 255
+        r = (r > 255) ? 255 : r;
+        g = (g > 255) ? 255 : g;
+        b = (b > 255) ? 255 : b;
+        a = (a > 255) ? 255 : a;
+
+        // Create color int
+        aColor = (a << 24) & p.ALPHA_MASK | (r << 16) & p.RED_MASK | (g << 8) & p.GREEN_MASK | b & p.BLUE_MASK;
+      }
+
+      // 3 arguments: (R, G, B) or (H, S, B)
+      else if (aValue1 != null && aValue2 != null && aValue3 != null) {
+        aColor = p.color(aValue1, aValue2, aValue3, colorModeA);
+      }
+
+      // 2 arguments: (Color, A) or (Grayscale, A)
+      else if (aValue1 != null && aValue2 != null) {
+        // Color int and alpha
+        if (aValue1 & p.ALPHA_MASK) {
+          a = Math.round(255 * (aValue2 / colorModeA));
+          a = (a > 255) ? 255 : a;
+
+          aColor = aValue1 - (aValue1 & p.ALPHA_MASK) + ((a << 24) & p.ALPHA_MASK);
+        }
+        // Grayscale and alpha
+        else {
+          switch(curColorMode) {
+            case p.RGB: aColor = p.color(aValue1, aValue1, aValue1, aValue2); break;
+            case p.HSB: aColor = p.color(0, 0, (aValue1 / colorModeX) * colorModeZ, aValue2); break;
+          }
+        }
+      }
+
+      // 1 argument: (Grayscale) or (Color)
+      else if (typeof aValue1 === "number") {
+        // Grayscale
+        if (aValue1 <= colorModeX && aValue1 >= 0) {
+          switch(curColorMode) {
+            case p.RGB: aColor = p.color(aValue1, aValue1, aValue1, colorModeA); break;
+            case p.HSB: aColor = p.color(0, 0, (aValue1 / colorModeX) * colorModeZ, colorModeA); break;
+          }
+        }
+        // Color int
+        else if (aValue1) {
+          aColor = aValue1;
+        }
+      }
+
+      // Default
+      else {
+        aColor = p.color(colorModeX, colorModeY, colorModeZ, colorModeA);
+      }
+
+      return aColor;
+    };
+
+    // Ease of use function to extract the colour bits into a string
+    p.color.toString = function(colorInt) {
+      return "rgba(" + ((colorInt & p.RED_MASK) >>> 16) + "," + ((colorInt & p.GREEN_MASK) >>> 8) + "," + ((colorInt & p.BLUE_MASK)) + "," + ((colorInt & p.ALPHA_MASK) >>> 24) / 255 + ")";
+    };
+
+    // Easy of use function to pack rgba values into a single bit-shifted color int.
+    p.color.toInt = function(r, g, b, a) {
+      return (a << 24) & p.ALPHA_MASK | (r << 16) & p.RED_MASK | (g << 8) & p.GREEN_MASK | b & p.BLUE_MASK;
+    };
+
+    // Creates a simple array in [R, G, B, A] format, [255, 255, 255, 255]
+    p.color.toArray = function(colorInt) {
+      return [(colorInt & p.RED_MASK) >>> 16, (colorInt & p.GREEN_MASK) >>> 8, colorInt & p.BLUE_MASK, (colorInt & p.ALPHA_MASK) >>> 24];
+    };
+
+    // Creates a WebGL color array in [R, G, B, A] format. WebGL wants the color ranges between 0 and 1, [1, 1, 1, 1]
+    p.color.toGLArray = function(colorInt) {
+      return [((colorInt & p.RED_MASK) >>> 16) / 255, ((colorInt & p.GREEN_MASK) >>> 8) / 255, (colorInt & p.BLUE_MASK) / 255, ((colorInt & p.ALPHA_MASK) >>> 24) / 255];
+    };
+
+    // HSB conversion function from Mootools, MIT Licensed
+    p.color.toRGB = function(h, s, b) {
+      // Limit values greater than range
+      h = (h > colorModeX)   ? colorModeX   : h;
+      s = (s > colorModeY) ? colorModeY : s;
+      b = (b > colorModeZ)  ? colorModeZ  : b;
+
+      h = (h / colorModeX) * 360;
+      s = (s / colorModeY) * 100;
+      b = (b / colorModeZ) * 100;
+
+      var br = Math.round(b / 100 * 255);
+
+      if (s === 0) { // Grayscale
+        return [br, br, br];
+      } else {
+        var hue = h % 360;
+        var f = hue % 60;
+        var p = Math.round((b * (100 - s)) / 10000 * 255);
+        var q = Math.round((b * (6000 - s * f)) / 600000 * 255);
+        var t = Math.round((b * (6000 - s * (60 - f))) / 600000 * 255);
+        switch (Math.floor(hue / 60)) {
+        case 0:
+          return [br, t, p];
+        case 1:
+          return [q, br, p];
+        case 2:
+          return [p, br, t];
+        case 3:
+          return [p, q, br];
+        case 4:
+          return [t, p, br];
+        case 5:
+          return [br, p, q];
+        }
+      }
+    };
+
+    p.color.toHSB = function( colorInt ) {
+      var red, green, blue;
+
+      red = ((colorInt & p.RED_MASK) >>> 16) / 255;
+      green = ((colorInt & p.GREEN_MASK) >>> 8) / 255;
+      blue = (colorInt & p.BLUE_MASK) / 255;
+
+      var max = p.max(p.max(red,green), blue),
+          min = p.min(p.min(red,green), blue),
+          hue, saturation;
+
+      if (min === max) {
+        return [0, 0, max];
+      } else {
+        saturation = (max - min) / max;
+
+        if (red === max) {
+          hue = (green - blue) / (max - min);
+        } else if (green === max) {
+          hue = 2 + ((blue - red) / (max - min));
+        } else {
+          hue = 4 + ((red - green) / (max - min));
+        }
+
+        hue /= 6;
+
+        if (hue < 0) {
+          hue += 1;
+        } else if (hue > 1) {
+          hue -= 1;
+        }
+      }
+      return [hue*colorModeX, saturation*colorModeY, max*colorModeZ];
+    };
+
+    p.brightness = function(colInt){
+      return  p.color.toHSB(colInt)[2];
+    };
+
+    p.saturation = function(colInt){
+      return  p.color.toHSB(colInt)[1];
+    };
+
+    p.hue = function(colInt){
+      return  p.color.toHSB(colInt)[0];
+    };
+
+    var verifyChannel = function verifyChannel(aColor) {
+      if (aColor.constructor === Array) {
+        return aColor;
+      } else {
+        return p.color(aColor);
+      }
+    };
+
+    p.red = function(aColor) {
+      return ((aColor & p.RED_MASK) >>> 16) / 255 * colorModeX;
+    };
+
+    p.green = function(aColor) {
+      return ((aColor & p.GREEN_MASK) >>> 8) / 255 * colorModeY;
+    };
+
+    p.blue = function(aColor) {
+      return (aColor & p.BLUE_MASK) / 255 * colorModeZ;
+    };
+
+    p.alpha = function(aColor) {
+      return ((aColor & p.ALPHA_MASK) >>> 24) / 255 * colorModeA;
+    };
+
+    p.lerpColor = function lerpColor(c1, c2, amt) {
+      // Get RGBA values for Color 1 to floats
+      var colorBits1 = p.color(c1);
+      var r1 = (colorBits1 & p.RED_MASK) >>> 16;
+      var g1 = (colorBits1 & p.GREEN_MASK) >>> 8;
+      var b1 = (colorBits1 & p.BLUE_MASK);
+      var a1 = ((colorBits1 & p.ALPHA_MASK) >>> 24) / colorModeA;
+
+      // Get RGBA values for Color 2 to floats
+      var colorBits2 = p.color(c2);
+      var r2 = (colorBits2 & p.RED_MASK) >>> 16;
+      var g2 = (colorBits2 & p.GREEN_MASK) >>> 8;
+      var b2 = (colorBits2 & p.BLUE_MASK);
+      var a2 = ((colorBits2 & p.ALPHA_MASK) >>> 24) / colorModeA;
+
+      // Return lerp value for each channel, INT for color, Float for Alpha-range
+      var r = parseInt(p.lerp(r1, r2, amt), 10);
+      var g = parseInt(p.lerp(g1, g2, amt), 10);
+      var b = parseInt(p.lerp(b1, b2, amt), 10);
+      var a = parseFloat(p.lerp(a1, a2, amt) * colorModeA, 10);
+
+      return p.color.toInt(r, g, b, a);
+    };
+
+    // Forced default color mode for #aaaaaa style
+    p.defaultColor = function(aValue1, aValue2, aValue3) {
+      var tmpColorMode = curColorMode;
+      curColorMode = p.RGB;
+      var c = p.color(aValue1 / 255 * colorModeX, aValue2 / 255 * colorModeY, aValue3 / 255 * colorModeZ);
+      curColorMode = tmpColorMode;
+      return c;
+    };
+
+    p.colorMode = function colorMode(mode, range1, range2, range3, range4) {
+      curColorMode = mode;
+      if (arguments.length >= 4) {
+        colorModeX = range1;
+        colorModeY = range2;
+        colorModeZ = range3;
+      }
+      if (arguments.length === 5) {
+        colorModeA = range4;
+      }
+      if (arguments.length === 2) {
+        p.colorMode(mode, range1, range1, range1, range1);
+      }
+    };
+
+    p.blendColor = function(c1, c2, mode) {
+      var color = 0;
+      switch (mode) {
+      case p.REPLACE:
+        color = p.modes.replace(c1, c2);
+        break;
+      case p.BLEND:
+        color = p.modes.blend(c1, c2);
+        break;
+      case p.ADD:
+        color = p.modes.add(c1, c2);
+        break;
+      case p.SUBTRACT:
+        color = p.modes.subtract(c1, c2);
+        break;
+      case p.LIGHTEST:
+        color = p.modes.lightest(c1, c2);
+        break;
+      case p.DARKEST:
+        color = p.modes.darkest(c1, c2);
+        break;
+      case p.DIFFERENCE:
+        color = p.modes.difference(c1, c2);
+        break;
+      case p.EXCLUSION:
+        color = p.modes.exclusion(c1, c2);
+        break;
+      case p.MULTIPLY:
+        color = p.modes.multiply(c1, c2);
+        break;
+      case p.SCREEN:
+        color = p.modes.screen(c1, c2);
+        break;
+      case p.HARD_LIGHT:
+        color = p.modes.hard_light(c1, c2);
+        break;
+      case p.SOFT_LIGHT:
+        color = p.modes.soft_light(c1, c2);
+        break;
+      case p.OVERLAY:
+        color = p.modes.overlay(c1, c2);
+        break;
+      case p.DODGE:
+        color = p.modes.dodge(c1, c2);
+        break;
+      case p.BURN:
+        color = p.modes.burn(c1, c2);
+        break;
+      }
+      return color;
+    };
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Canvas-Matrix manipulation
+    ////////////////////////////////////////////////////////////////////////////
+
+    p.printMatrix = function printMatrix() {
+      modelView.print();
+    };
+
+    p.translate = function translate(x, y, z) {
+      if (p.use3DContext) {
+        forwardTransform.translate(x, y, z);
+        reverseTransform.invTranslate(x, y, z);
+      } else {
+        curContext.translate(x, y);
+      }
+    };
+
+    p.scale = function scale(x, y, z) {
+      if (p.use3DContext) {
+        forwardTransform.scale(x, y, z);
+        reverseTransform.invScale(x, y, z);
+      } else {
+        curContext.scale(x, y || x);
+      }
+    };
+
+    p.pushMatrix = function pushMatrix() {
+      if (p.use3DContext) {
+        userMatrixStack.load(modelView);
+      } else {
+        curContext.save();
+      }
+    };
+
+    p.popMatrix = function popMatrix() {
+      if (p.use3DContext) {
+        modelView.set(userMatrixStack.pop());
+      } else {
+        curContext.restore();
+      }
+    };
+
+    p.resetMatrix = function resetMatrix() {
+      forwardTransform.reset();
+      reverseTransform.reset();
+    };
+
+    p.applyMatrix = function applyMatrix() {
+      var a = arguments;
+      if (!p.use3DContext) {
+        for (var cnt = a.length; cnt < 16; cnt++) {
+          a[cnt] = 0;
+        }
+        a[10] = a[15] = 1;
+      }
+
+      forwardTransform.apply(a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], a[13], a[14], a[15]);
+      reverseTransform.invApply(a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], a[13], a[14], a[15]);
+    };
+
+    p.rotateX = function(angleInRadians) {
+      forwardTransform.rotateX(angleInRadians);
+      reverseTransform.invRotateX(angleInRadians);
+    };
+
+    p.rotateZ = function(angleInRadians) {
+      forwardTransform.rotateZ(angleInRadians);
+      reverseTransform.invRotateZ(angleInRadians);
+    };
+
+    p.rotateY = function(angleInRadians) {
+      forwardTransform.rotateY(angleInRadians);
+      reverseTransform.invRotateY(angleInRadians);
+    };
+
+    p.rotate = function rotate(angleInRadians) {
+      if (p.use3DContext) {
+        forwardTransform.rotateZ(angleInRadians);
+        reverseTransform.invRotateZ(angleInRadians);
+      } else {
+        curContext.rotate(angleInRadians);
+      }
+    };
+
+    p.pushStyle = function pushStyle() {
+      // Save the canvas state.
+      curContext.save();
+
+      p.pushMatrix();
+
+      var newState = {
+        'doFill': doFill,
+        'doStroke': doStroke,
+        'curTint': curTint,
+        'curRectMode': curRectMode,
+        'curColorMode': curColorMode,
+        'colorModeX': colorModeX,
+        'colorModeZ': colorModeZ,
+        'colorModeY': colorModeY,
+        'colorModeA': colorModeA,
+        'curTextFont': curTextFont,
+        'curTextSize': curTextSize
+      };
+
+      styleArray.push(newState);
+    };
+
+    p.popStyle = function popStyle() {
+      var oldState = styleArray.pop();
+
+      if (oldState) {
+        curContext.restore();
+
+        p.popMatrix();
+
+        doFill = oldState.doFill;
+        doStroke = oldState.doStroke;
+        curTint = oldState.curTint;
+        curRectMode = oldState.curRectmode;
+        curColorMode = oldState.curColorMode;
+        colorModeX = oldState.colorModeX;
+        colorModeZ = oldState.colorModeZ;
+        colorModeY = oldState.colorModeY;
+        colorModeA = oldState.colorModeA;
+        curTextFont = oldState.curTextFont;
+        curTextSize = oldState.curTextSize;
+      } else {
+        throw "Too many popStyle() without enough pushStyle()";
+      }
+    };
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Time based functions
+    ////////////////////////////////////////////////////////////////////////////
+
+    p.year = function year() {
+      return new Date().getFullYear();
+    };
+    p.month = function month() {
+      return new Date().getMonth() + 1;
+    };
+    p.day = function day() {
+      return new Date().getDate();
+    };
+    p.hour = function hour() {
+      return new Date().getHours();
+    };
+    p.minute = function minute() {
+      return new Date().getMinutes();
+    };
+    p.second = function second() {
+      return new Date().getSeconds();
+    };
+    p.millis = function millis() {
+      return new Date().getTime() - start;
+    };
+
+    p.noLoop = function noLoop() {
+      doLoop = false;
+      loopStarted = false;
+      clearInterval(looping);
+    };
+
+    p.redraw = function redraw() {
+      var sec = (new Date().getTime() - timeSinceLastFPS) / 1000;
+      framesSinceLastFPS++;
+      var fps = framesSinceLastFPS / sec;
+
+      // recalculate FPS every half second for better accuracy.
+      if (sec > 0.5) {
+        timeSinceLastFPS = new Date().getTime();
+        framesSinceLastFPS = 0;
+        p.FRAME_RATE = fps;
+      }
+
+      p.frameCount++;
+
+      inDraw = true;
+
+      if (p.use3DContext) {
+        // Delete all the lighting states and the materials the
+        // user set in the last draw() call.
+        p.noLights();
+        p.lightFalloff(1, 0, 0);
+        p.shininess(1);
+        p.ambient(255, 255, 255);
+        p.specular(0, 0, 0);
+        p.camera();
+        p.draw();
+      } else {
+        curContext.save();
+        p.draw();
+        curContext.restore();
+      }
+
+      inDraw = false;
+    };
+
+    p.loop = function loop() {
+      if (loopStarted) {
+        return;
+      }
+
+      looping = window.setInterval(function() {
+        try {
+          try {
+            p.focused = document.hasFocus();
+          } catch(e) {}
+          p.redraw();
+        } catch(e_loop) {
+          window.clearInterval(looping);
+          throw e_loop;
+        }
+      }, curMsPerFrame);
+
+      doLoop = true;
+      loopStarted = true;
+    };
+
+    p.frameRate = function frameRate(aRate) {
+      curFrameRate = aRate;
+      curMsPerFrame = 1000 / curFrameRate;
+    };
+
+    p.exit = function exit() {
+      window.clearInterval(looping);
+
+      for (var i=0, ehl=p.pjs.eventHandlers.length; i<ehl; i++) {
+        var elem = p.pjs.eventHandlers[i][0],
+            type = p.pjs.eventHandlers[i][1],
+            fn   = p.pjs.eventHandlers[i][2];
+
+        if (elem.removeEventListener) {
+          elem.removeEventListener(type, fn, false);
+        } else if (elem.detachEvent) {
+          elem.detachEvent("on" + type, fn);
+        }
+      }
+    };
+
+    ////////////////////////////////////////////////////////////////////////////
+    // MISC functions
+    ////////////////////////////////////////////////////////////////////////////
+
+    p.cursor = function cursor() {
+      if (arguments.length > 1 || (arguments.length === 1 && arguments[0] instanceof p.PImage)) {
+        var image = arguments[0],
+          x, y;
+        if (arguments.length >= 3) {
+          x = arguments[1];
+          y = arguments[2];
+          if (x < 0 || y < 0 || y >= image.height || x >= image.width) {
+            throw "x and y must be non-negative and less than the dimensions of the image";
+          }
+        } else {
+          x = image.width >>> 1;
+          y = image.height >>> 1;
+        }
+
+        // see https://developer.mozilla.org/en/Using_URL_values_for_the_cursor_property
+        var imageDataURL = image.toDataURL();
+        var style = "url(\"" + imageDataURL + "\") " + x + " " + y + ", default";
+        curCursor = curElement.style.cursor = style;
+      } else if (arguments.length === 1) {
+        var mode = arguments[0];
+        curCursor = curElement.style.cursor = mode;
+      } else {
+        curCursor = curElement.style.cursor = oldCursor;
+      }
+    };
+
+    p.noCursor = function noCursor() {
+      curCursor = curElement.style.cursor = p.NOCURSOR;
+    };
+
+    p.link = function(href, target) {
+      if (typeof target !== 'undefined') {
+        window.open(href, target);
+      } else {
+        window.location = href;
+      }
+    };
+
+    // PGraphics methods
+    // TODO: These functions are suppose to be called before any operations are called on the
+    //       PGraphics object. They currently do nothing.
+    p.beginDraw = function beginDraw() {};
+    p.endDraw = function endDraw() {};
+
+    // Imports an external Processing.js library
+    p.Import = function Import(lib) {
+      // Replace evil-eval method with a DOM <script> tag insert method that
+      // binds new lib code to the Processing.lib names-space and the current
+      // p context. -F1LT3R
+    };
+
+    var contextMenu = function(e) {
+      e.preventDefault();
+      e.stopPropagation();
+    };
+
+    p.disableContextMenu = function disableContextMenu() {
+      curElement.addEventListener('contextmenu', contextMenu, false);
+    };
+
+    p.enableContextMenu = function enableContextMenu() {
+      curElement.removeEventListener('contextmenu', contextMenu, false);
+    };
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Binary Functions
+    ////////////////////////////////////////////////////////////////////////////
+
+    function decToBin(value, numBitsInValue) {
+      var mask = 1;
+      mask = mask << (numBitsInValue - 1);
+
+      var str = "";
+      for (var i = 0; i < numBitsInValue; i++) {
+        str += (mask & value) ? "1" : "0";
+        mask = mask >>> 1;
+      }
+      return str;
+    }
+
+    p.binary = function(num, numBits) {
+      var numBitsInValue = 32;
+
+      // color
+      if (typeof num === "string" && num.length > 1) {
+        var c = num.slice(5, -1).split(",");
+
+        // if all components are zero, a single "0" is returned for some reason
+        // [0] alpha is normalized, [1] r, [2] g, [3] b
+        var sbin = [
+          decToBin(c[3] * 255, 8),
+          decToBin(c[0], 8),
+          decToBin(c[1], 8),
+          decToBin(c[2], 8)
+          ];
+
+        var s = sbin[0] + sbin[1] + sbin[2] + sbin[3];
+
+        if (numBits) {
+          s = s.substr(-numBits);
+        }
+        // if the user didn't specify number of bits,
+        // trim leading zeros.
+        else {
+          s = s.replace(/^0+$/g, "0");
+          s = s.replace(/^0{1,}1/g, "1");
+        }
+        return s;
+      }
+
+      // char
+      if (typeof num === "string" || num instanceof Char) {
+
+        if (num instanceof Char) {
+          num = num.toString().charCodeAt(0);
+        } else {
+          num = num.charCodeAt(0);
+        }
+
+        if (numBits) {
+          numBitsInValue = 32;
+        } else {
+          numBitsInValue = 16;
+        }
+      }
+
+      var str = decToBin(num, numBitsInValue);
+
+      // trim string if user wanted less chars
+      if (numBits) {
+        str = str.substr(-numBits);
+      }
+      return str;
+    };
+
+    p.unbinary = function unbinary(binaryString) {
+      var binaryPattern = new RegExp("^[0|1]{8}$");
+      var addUp = 0;
+
+      if (isNaN(binaryString)) {
+        throw "NaN_Err";
+      } else {
+        if (arguments.length === 1 || binaryString.length === 8) {
+          if (binaryPattern.test(binaryString)) {
+            for (var i = 0; i < 8; i++) {
+              addUp += (Math.pow(2, i) * parseInt(binaryString.charAt(7 - i), 10));
+            }
+            return addUp + "";
+          } else {
+            throw "notBinary: the value passed into unbinary was not an 8 bit binary number";
+          }
+        } else {
+          throw "longErr";
+        }
+      }
+    };
+
+    p.nfs = function(num, left, right) {
+      var str, len, formatLength, rounded;
+
+      // array handling
+      if (typeof num === "object" && num.constructor === Array) {
+        str = new Array(0);
+        len = num.length;
+        for (var i = 0; i < len; i++) {
+          str[i] = p.nfs(num[i], left, right);
+        }
+      } else if (arguments.length === 3) {
+        var negative = num < 0 ? true : false;
+
+        // Make it work exactly like p5 for right = 0
+        if (right === 0) {
+          right = 1;
+        }
+
+        if (right < 0) {
+          rounded = Math.round(num);
+        } else {
+          // round to 'right' decimal places
+          rounded = Math.round(num * Math.pow(10, right)) / Math.pow(10, right);
+        }
+
+        // split number into whole and fractional components
+        var splitNum = Math.abs(rounded).toString().split("."); // [0] whole number, [1] fractional number
+        // format whole part
+        formatLength = left - splitNum[0].length;
+        for (; formatLength > 0; formatLength--) {
+          splitNum[0] = "0" + splitNum[0];
+        }
+
+        // format fractional part
+        if (splitNum.length === 2 || right > 0) {
+          splitNum[1] = splitNum.length === 2 ? splitNum[1] : "";
+          formatLength = right - splitNum[1].length;
+          for (; formatLength > 0; formatLength--) {
+            splitNum[1] += "0";
+          }
+          str = splitNum.join(".");
+        } else {
+          str = splitNum[0];
+        }
+
+        str = (negative ? "-" : " ") + str;
+      } else if (arguments.length === 2) {
+        str = p.nfs(num, left, -1);
+      }
+      return str;
+    };
+
+    p.nfp = function(num, left, right) {
+      var str, len, formatLength, rounded;
+
+      // array handling
+      if (typeof num === "object" && num.constructor === Array) {
+        str = new Array(0);
+        len = num.length;
+        for (var i = 0; i < len; i++) {
+          str[i] = p.nfp(num[i], left, right);
+        }
+      } else if (arguments.length === 3) {
+        var negative = num < 0 ? true : false;
+
+        // Make it work exactly like p5 for right = 0
+        if (right === 0) {
+          right = 1;
+        }
+
+        if (right < 0) {
+          rounded = Math.round(num);
+        } else {
+          // round to 'right' decimal places
+          rounded = Math.round(num * Math.pow(10, right)) / Math.pow(10, right);
+        }
+
+        // split number into whole and fractional components
+        var splitNum = Math.abs(rounded).toString().split("."); // [0] whole number, [1] fractional number
+        // format whole part
+        formatLength = left - splitNum[0].length;
+        for (; formatLength > 0; formatLength--) {
+          splitNum[0] = "0" + splitNum[0];
+        }
+
+        // format fractional part
+        if (splitNum.length === 2 || right > 0) {
+          splitNum[1] = splitNum.length === 2 ? splitNum[1] : "";
+          formatLength = right - splitNum[1].length;
+          for (; formatLength > 0; formatLength--) {
+            splitNum[1] += "0";
+          }
+          str = splitNum.join(".");
+        } else {
+          str = splitNum[0];
+        }
+
+        str = (negative ? "-" : "+") + str;
+      } else if (arguments.length === 2) {
+        str = p.nfp(num, left, -1);
+      }
+      return str;
+    };
+
+    p.nfc = function(num, right) {
+      var str;
+      var decimals = right >= 0 ? right : 0;
+      if (typeof num === "object") {
+        str = new Array(0);
+        for (var i = 0; i < num.length; i++) {
+          str[i] = p.nfc(num[i], decimals);
+        }
+      } else if (arguments.length === 2) {
+        var rawStr = p.nfs(num, 0, decimals);
+        var ary = new Array(0);
+        ary = rawStr.split('.');
+        // ary[0] contains left of decimal, ary[1] contains decimal places if they exist
+        // insert commas now, then append ary[1] if it exists
+        var leftStr = ary[0];
+        var rightStr = ary.length > 1 ? '.' + ary[1] : '';
+        var commas = /(\d+)(\d{3})/;
+        while (commas.test(leftStr)) {
+          leftStr = leftStr.replace(commas, '$1' + ',' + '$2');
+        }
+        str = leftStr + rightStr;
+      } else if (arguments.length === 1) {
+        str = p.nfc(num, 0);
+      }
+      return str;
+    };
+
+    var decimalToHex = function decimalToHex(d, padding) {
+      //if there is no padding value added, default padding to 8 else go into while statement.
+      padding = typeof(padding) === "undefined" || padding === null ? padding = 8 : padding;
+      if (d < 0) {
+        d = 0xFFFFFFFF + d + 1;
+      }
+      var hex = Number(d).toString(16).toUpperCase();
+      while (hex.length < padding) {
+        hex = "0" + hex;
+      }
+      if (hex.length >= padding) {
+        hex = hex.substring(hex.length - padding, hex.length);
+      }
+      return hex;
+    };
+
+    // note: since we cannot keep track of byte, int types by default the returned string is 8 chars long
+    // if no 2nd argument is passed.  closest compromise we can use to match java implementation Feb 5 2010
+    // also the char parser has issues with chars that are not digits or letters IE: !@#$%^&*
+    p.hex = function hex(value, len) {
+      var hexstring = "";
+      if (arguments.length === 1) {
+        if (value instanceof Char) {
+          hexstring = hex(value, 4);
+        } else { // int or byte, indistinguishable at the moment, default to 8
+          hexstring = hex(value, 8);
+        }
+      } else { // pad to specified length
+        hexstring = decimalToHex(value, len);
+      }
+      return hexstring;
+    };
+
+    p.unhex = function(str) {
+      var value = 0, multiplier = 1, num = 0;
+
+      var len = str.length - 1;
+      for (var i = len; i >= 0; i--) {
+        try {
+          switch (str[i]) {
+          case "0":
+            num = 0;
+            break;
+          case "1":
+            num = 1;
+            break;
+          case "2":
+            num = 2;
+            break;
+          case "3":
+            num = 3;
+            break;
+          case "4":
+            num = 4;
+            break;
+          case "5":
+            num = 5;
+            break;
+          case "6":
+            num = 6;
+            break;
+          case "7":
+            num = 7;
+            break;
+          case "8":
+            num = 8;
+            break;
+          case "9":
+            num = 9;
+            break;
+          case "A":
+          case "a":
+            num = 10;
+            break;
+          case "B":
+          case "b":
+            num = 11;
+            break;
+          case "C":
+          case "c":
+            num = 12;
+            break;
+          case "D":
+          case "d":
+            num = 13;
+            break;
+          case "E":
+          case "e":
+            num = 14;
+            break;
+          case "F":
+          case "f":
+            num = 15;
+            break;
+          default:
+            return 0;
+          }
+          value += num * multiplier;
+          multiplier *= 16;
+        } catch(e) {
+          Processing.debug(e);
+        }
+        // correct for int overflow java expectation
+        if (value > 2147483647) {
+          value -= 4294967296;
+        }
+      }
+      return value;
+    };
+
+    // Load a file or URL into strings
+    p.loadStrings = function loadStrings(url) {
+      return ajax(url).split("\n");
+    };
+
+    p.loadBytes = function loadBytes(url) {
+      var string = ajax(url);
+      var ret = new Array(string.length);
+
+      for (var i = 0; i < string.length; i++) {
+        ret[i] = string.charCodeAt(i);
+      }
+
+      return ret;
+    };
+
+    // nf() should return an array when being called on an array, at the moment it only returns strings. -F1LT3R
+    // This breaks the join() ref-test. The Processing.org documentation says String or String[]. SHOULD BE FIXED NOW
+    p.nf = function() {
+      var str, num, pad, arr, left, right, isNegative, test, i;
+
+      if (arguments.length === 2 && typeof arguments[0] === 'number' && typeof arguments[1] === 'number' && (arguments[0] + "").indexOf('.') === -1) {
+        num = arguments[0];
+        pad = arguments[1];
+
+        isNegative = num < 0;
+
+        if (isNegative) {
+          num = Math.abs(num);
+        }
+
+        str = "" + num;
+        for (i = pad - str.length; i > 0; i--) {
+          str = "0" + str;
+        }
+
+        if (isNegative) {
+          str = "-" + str;
+        }
+      } else if (arguments.length === 2 && typeof arguments[0] === 'object' && arguments[0].constructor === Array && typeof arguments[1] === 'number') {
+        arr = arguments[0];
+        pad = arguments[1];
+
+        str = new Array(arr.length);
+
+        for (i = 0; i < arr.length && str !== undefined; i++) {
+          test = p.nf(arr[i], pad);
+          if (test === undefined) {
+            str = undefined;
+          } else {
+            str[i] = test;
+          }
+        }
+      } else if (arguments.length === 3 && typeof arguments[0] === 'number' && typeof arguments[1] === 'number' && typeof arguments[2] === 'number' && (arguments[0] + "").indexOf('.') >= 0) {
+        num = arguments[0];
+        left = arguments[1];
+        right = arguments[2];
+
+        isNegative = num < 0;
+
+        if (isNegative) {
+          num = Math.abs(num);
+        }
+
+        // Change the way the number is 'floored' based on whether it is odd or even.
+        if (right < 0 && Math.floor(num) % 2 === 1) {
+          // Make sure 1.49 rounds to 1, but 1.5 rounds to 2.
+          if ((num) - Math.floor(num) >= 0.5) {
+            num = num + 1;
+          }
+        }
+
+        str = "" + num;
+
+        for (i = left - str.indexOf('.'); i > 0; i--) {
+          str = "0" + str;
+        }
+
+        var numDec = str.length - str.indexOf('.') - 1;
+        if (numDec <= right) {
+          for (i = right - (str.length - str.indexOf('.') - 1); i > 0; i--) {
+            str = str + "0";
+          }
+        } else if (right > 0) {
+          str = str.substring(0, str.length - (numDec - right));
+        } else if (right < 0) {
+
+          str = str.substring(0, str.indexOf('.'));
+        }
+
+        if (isNegative) {
+          str = "-" + str;
+        }
+      } else if (arguments.length === 3 && typeof arguments[0] === 'object' && arguments[0].constructor === Array && typeof arguments[1] === 'number' && typeof arguments[2] === 'number') {
+        arr = arguments[0];
+        left = arguments[1];
+        right = arguments[2];
+
+        str = new Array(arr.length);
+
+        for (i = 0; i < arr.length && str !== undefined; i++) {
+          test = p.nf(arr[i], left, right);
+          if (test === undefined) {
+            str = undefined;
+          } else {
+            str[i] = test;
+          }
+        }
+      }
+
+      return str;
+    };
+
+    ////////////////////////////////////////////////////////////////////////////
+    // String Functions
+    ////////////////////////////////////////////////////////////////////////////
+
+    p.matchAll = function matchAll(aString, aRegExp) {
+      var results = [],
+        latest;
+      var regexp = new RegExp(aRegExp, "g");
+      while ((latest = regexp.exec(aString)) !== null) {
+        results.push(latest);
+        if (latest[0].length === 0) {
+          ++regexp.lastIndex;
+        }
+      }
+      return results.length > 0 ? results : null;
+    };
+
+    String.prototype.replaceAll = function(re, replace) {
+      return this.replace(new RegExp(re, "g"), replace);
+    };
+
+    String.prototype.equals = function equals(str) {
+      return this.valueOf() === str.valueOf();
+    };
+
+    String.prototype.toCharArray = function() {
+      var chars = this.split("");
+      for (var i = chars.length - 1; i >= 0; i--) {
+        chars[i] = new Char(chars[i]);
+      }
+      return chars;
+    };
+
+    p.match = function(str, regexp) {
+      return str.match(regexp);
+    };
+
+    // tinylog lite JavaScript library
+    /*global tinylog,print*/
+    var tinylogLite = (function() {
+      "use strict";
+
+      var tinylogLite = {},
+        undef = "undefined",
+        func = "function",
+        False = !1,
+        True = !0,
+        log = "log";
+
+      if (typeof tinylog !== undef && typeof tinylog[log] === func) {
+        // pre-existing tinylog present
+        tinylogLite[log] = tinylog[log];
+      } else if (typeof document !== undef && !document.fake) {
+        (function() {
+          // DOM document
+          var doc = document,
+
+          $div = "div",
+          $style = "style",
+          $title = "title",
+
+          containerStyles = {
+            zIndex: 10000,
+            position: "fixed",
+            bottom: "0px",
+            width: "100%",
+            height: "15%",
+            fontFamily: "sans-serif",
+            color: "#ccc",
+            backgroundColor: "black"
+          },
+          outputStyles = {
+            position: "relative",
+            fontFamily: "monospace",
+            overflow: "auto",
+            height: "100%",
+            paddingTop: "5px"
+          },
+          resizerStyles = {
+            height: "5px",
+            marginTop: "-5px",
+            cursor: "n-resize",
+            backgroundColor: "darkgrey"
+          },
+          closeButtonStyles = {
+            position: "absolute",
+            top: "5px",
+            right: "20px",
+            color: "#111",
+            MozBorderRadius: "4px",
+            webkitBorderRadius: "4px",
+            borderRadius: "4px",
+            cursor: "pointer",
+            fontWeight: "normal",
+            textAlign: "center",
+            padding: "3px 5px",
+            backgroundColor: "#333",
+            fontSize: "12px"
+          },
+          entryStyles = {
+            //borderBottom: "1px solid #d3d3d3",
+            minHeight: "16px"
+          },
+          entryTextStyles = {
+            fontSize: "12px",
+            margin: "0 8px 0 8px",
+            maxWidth: "100%",
+            whiteSpace: "pre-wrap",
+            overflow: "auto"
+          },
+
+          view = doc.defaultView,
+            docElem = doc.documentElement,
+            docElemStyle = docElem[$style],
+
+          setStyles = function() {
+            var i = arguments.length,
+              elemStyle, styles, style;
+
+            while (i--) {
+              styles = arguments[i--];
+              elemStyle = arguments[i][$style];
+
+              for (style in styles) {
+                if (styles.hasOwnProperty(style)) {
+                  elemStyle[style] = styles[style];
+                }
+              }
+            }
+          },
+
+          observer = function(obj, event, handler) {
+            if (obj.addEventListener) {
+              obj.addEventListener(event, handler, False);
+            } else if (obj.attachEvent) {
+              obj.attachEvent("on" + event, handler);
+            }
+            return [obj, event, handler];
+          },
+          unobserve = function(obj, event, handler) {
+            if (obj.removeEventListener) {
+              obj.removeEventListener(event, handler, False);
+            } else if (obj.detachEvent) {
+              obj.detachEvent("on" + event, handler);
+            }
+          },
+          clearChildren = function(node) {
+            var children = node.childNodes,
+              child = children.length;
+
+            while (child--) {
+              node.removeChild(children.item(0));
+            }
+          },
+          append = function(to, elem) {
+            return to.appendChild(elem);
+          },
+          createElement = function(localName) {
+            return doc.createElement(localName);
+          },
+          createTextNode = function(text) {
+            return doc.createTextNode(text);
+          },
+
+          createLog = tinylogLite[log] = function(message) {
+            // don't show output log until called once
+            var uninit,
+              originalPadding = docElemStyle.paddingBottom,
+              container = createElement($div),
+              containerStyle = container[$style],
+              resizer = append(container, createElement($div)),
+              output = append(container, createElement($div)),
+              closeButton = append(container, createElement($div)),
+              resizingLog = False,
+              previousHeight = False,
+              previousScrollTop = False,
+
+              updateSafetyMargin = function() {
+                // have a blank space large enough to fit the output box at the page bottom
+                docElemStyle.paddingBottom = container.clientHeight + "px";
+              },
+              setContainerHeight = function(height) {
+                var viewHeight = view.innerHeight,
+                  resizerHeight = resizer.clientHeight;
+
+                // constrain the container inside the viewport's dimensions
+                if (height < 0) {
+                  height = 0;
+                } else if (height + resizerHeight > viewHeight) {
+                  height = viewHeight - resizerHeight;
+                }
+
+                containerStyle.height = height / viewHeight * 100 + "%";
+
+                updateSafetyMargin();
+              },
+              observers = [
+                observer(doc, "mousemove", function(evt) {
+                  if (resizingLog) {
+                    setContainerHeight(view.innerHeight - evt.clientY);
+                    output.scrollTop = previousScrollTop;
+                  }
+                }),
+
+                observer(doc, "mouseup", function() {
+                  if (resizingLog) {
+                    resizingLog = previousScrollTop = False;
+                  }
+                }),
+
+                observer(resizer, "dblclick", function(evt) {
+                  evt.preventDefault();
+
+                  if (previousHeight) {
+                    setContainerHeight(previousHeight);
+                    previousHeight = False;
+                  } else {
+                    previousHeight = container.clientHeight;
+                    containerStyle.height = "0px";
+                  }
+                }),
+
+                observer(resizer, "mousedown", function(evt) {
+                  evt.preventDefault();
+                  resizingLog = True;
+                  previousScrollTop = output.scrollTop;
+                }),
+
+                observer(resizer, "contextmenu", function() {
+                  resizingLog = False;
+                }),
+
+                observer(closeButton, "click", function() {
+                  uninit();
+                })
+              ];
+
+            uninit = function() {
+              // remove observers
+              var i = observers.length;
+
+              while (i--) {
+                unobserve.apply(tinylogLite, observers[i]);
+              }
+
+              // remove tinylog lite from the DOM
+              docElem.removeChild(container);
+              docElemStyle.paddingBottom = originalPadding;
+
+              clearChildren(output);
+              clearChildren(container);
+
+              tinylogLite[log] = createLog;
+            };
+
+            setStyles(
+            container, containerStyles, output, outputStyles, resizer, resizerStyles, closeButton, closeButtonStyles);
+
+            closeButton[$title] = "Close Log";
+            append(closeButton, createTextNode("\u2716"));
+
+            resizer[$title] = "Double-click to toggle log minimization";
+
+            docElem.insertBefore(container, docElem.firstChild);
+
+            tinylogLite[log] = function(message) {
+              var entry = append(output, createElement($div)),
+                entryText = append(entry, createElement($div));
+
+              entry[$title] = (new Date()).toLocaleTimeString();
+
+              setStyles(
+              entry, entryStyles, entryText, entryTextStyles);
+
+              append(entryText, createTextNode(message));
+              output.scrollTop = output.scrollHeight;
+            };
+
+            tinylogLite[log](message);
+          };
+        }());
+      } else if (typeof print === func) { // JS shell
+        tinylogLite[log] = print;
+      }
+
+      return tinylogLite;
+    }()),
+
+    logBuffer = [];
+
+    p.console = window.console || tinylogLite;
+
+    p.println = function println(message) {
+      var bufferLen = logBuffer.length;
+      if (bufferLen) {
+        tinylogLite.log(logBuffer.join(""));
+        logBuffer.length = 0; // clear log buffer
+      }
+
+      if (arguments.length === 0 && bufferLen === 0) {
+        tinylogLite.log("");
+      } else if (arguments.length !== 0) {
+        tinylogLite.log(message);
+      }
+    };
+
+    p.print = function print(message) {
+      logBuffer.push(message);
+    };
+
+    // Alphanumeric chars arguments automatically converted to numbers when
+    // passed in, and will come out as numbers.
+    p.str = function str(val) {
+      var ret;
+
+      if (arguments.length === 1) {
+        if (typeof val === "string" && val.length === 1) {
+          // No strings allowed.
+          ret = val;
+        } else if (typeof val === "object" && val.constructor === Array) {
+          ret = new Array(0);
+
+          for (var i = 0; i < val.length; i++) {
+            ret[i] = str(val[i]);
+          }
+        } else {
+          ret = val + "";
+        }
+      }
+
+      return ret;
+    };
+
+    p.trim = function(str) {
+      var newstr;
+      if (typeof str === "object" && str.constructor === Array) {
+        newstr = new Array(0);
+        for (var i = 0; i < str.length; i++) {
+          newstr[i] = p.trim(str[i]);
+        }
+      } else {
+        // if str is not an array then remove all whitespace, tabs, and returns
+        newstr = str.replace(/^\s*/, '').replace(/\s*$/, '').replace(/\r*$/, '');
+      }
+      return newstr;
+    };
+
+    // Conversion
+    p['boolean'] = function(val) {
+      if (typeof val === 'number') {
+        return val !== 0;
+      } else if (typeof val === 'boolean') {
+        return val;
+      } else if (typeof val === 'string') {
+        return val.toLowerCase() === 'true';
+      } else if (val instanceof Char) {
+        // 1, T or t
+        return val.code === 49 || val.code === 84 || val.code === 116;
+      } else if (typeof val === 'object' && val.constructor === Array) {
+        var ret = new Array(val.length);
+        for (var i = 0; i < val.length; i++) {
+          ret[i] = p['boolean'](val[i]);
+        }
+        return ret;
+      }
+    };
+
+    // a byte is a number between -128 and 127
+    p['byte'] = function(aNumber) {
+      if (typeof aNumber === 'object' && aNumber.constructor === Array) {
+        var bytes = [];
+        for (var i = 0; i < aNumber.length; i++) {
+          bytes[i] = p['byte'](aNumber[i]);
+        }
+        return bytes;
+      } else {
+        return (0 - (aNumber & 0x80)) | (aNumber & 0x7F);
+      }
+    };
+
+    p['char'] = function(key) {
+      if (arguments.length === 1 && typeof key === "number") {
+        return new Char(String.fromCharCode(key & 0xFFFF));
+      } else if (arguments.length === 1 && typeof key === "object" && key.constructor === Array) {
+        var ret = new Array(key.length);
+        for (var i = 0; i < key.length; i++) {
+          ret[i] = p['char'](key[i]);
+        }
+        return ret;
+      } else {
+        throw "char() may receive only one argument of type int, byte, int[], or byte[].";
+      }
+    };
+
+    // Processing doc claims good argument types are: int, char, byte, boolean,
+    // String, int[], char[], byte[], boolean[], String[].
+    // floats should not work. However, floats with only zeroes right of the
+    // decimal will work because JS converts those to int.
+    p['float'] = function(val) {
+      if (arguments.length === 1) {
+        if (typeof val === 'number') {
+          return val;
+        } else if (typeof val === 'boolean') {
+          return val ? 1 : 0;
+        } else if (typeof val === 'string') {
+          return parseFloat(val);
+        } else if (val instanceof Char) {
+          return val.code;
+        } else if (typeof val === 'object' && val.constructor === Array) {
+          var ret = new Array(val.length);
+          for (var i = 0; i < val.length; i++) {
+            ret[i] = p['float'](val[i]);
+          }
+          return ret;
+        }
+      }
+    };
+
+    p['int'] = function(val) {
+      if (typeof val === 'number') {
+        return val & 0xFFFFFFFF;
+      } else if (typeof val === 'boolean') {
+        return val ? 1 : 0;
+      } else if (typeof val === 'string') {
+        var number = parseInt(val, 10); // Force decimal radix. Don't convert hex or octal (just like p5)
+        return number & 0xFFFFFFFF;
+      } else if (val instanceof Char) {
+        return val.code;
+      } else if (typeof val === 'object' && val.constructor === Array) {
+        var ret = new Array(val.length);
+        for (var i = 0; i < val.length; i++) {
+          if (typeof val[i] === 'string' && !/^\s*[+\-]?\d+\s*$/.test(val[i])) {
+            ret[i] = 0;
+          } else {
+            ret[i] = p['int'](val[i]);
+          }
+        }
+        return ret;
+      }
+    };
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Math functions
+    ////////////////////////////////////////////////////////////////////////////
+
+    // Calculation
+    p.abs = Math.abs;
+
+    p.ceil = Math.ceil;
+
+    p.constrain = function(aNumber, aMin, aMax) {
+      return aNumber > aMax ? aMax : aNumber < aMin ? aMin : aNumber;
+    };
+
+    p.dist = function() {
+      var dx, dy, dz;
+      if (arguments.length === 4) {
+        dx = arguments[0] - arguments[2];
+        dy = arguments[1] - arguments[3];
+        return Math.sqrt(dx * dx + dy * dy);
+      } else if (arguments.length === 6) {
+        dx = arguments[0] - arguments[3];
+        dy = arguments[1] - arguments[4];
+        dz = arguments[2] - arguments[5];
+        return Math.sqrt(dx * dx + dy * dy + dz * dz);
+      }
+    };
+
+    p.exp = Math.exp;
+
+    p.floor = Math.floor;
+
+    p.lerp = function(value1, value2, amt) {
+      return ((value2 - value1) * amt) + value1;
+    };
+
+    p.log = Math.log;
+
+    p.mag = function(a, b, c) {
+      if (arguments.length === 2) {
+        return Math.sqrt(a * a + b * b);
+      } else if (arguments.length === 3) {
+        return Math.sqrt(a * a + b * b + c * c);
+      }
+    };
+
+    p.map = function(value, istart, istop, ostart, ostop) {
+      return ostart + (ostop - ostart) * ((value - istart) / (istop - istart));
+    };
+
+    p.max = function() {
+      if (arguments.length === 2) {
+        return arguments[0] < arguments[1] ? arguments[1] : arguments[0];
+      } else {
+        var numbers = arguments.length === 1 ? arguments[0] : arguments; // if single argument, array is used
+        if (! ("length" in numbers && numbers.length > 0)) {
+          throw "Non-empty array is expected";
+        }
+        var max = numbers[0],
+          count = numbers.length;
+        for (var i = 1; i < count; ++i) {
+          if (max < numbers[i]) {
+            max = numbers[i];
+          }
+        }
+        return max;
+      }
+    };
+
+    p.min = function() {
+      if (arguments.length === 2) {
+        return arguments[0] < arguments[1] ? arguments[0] : arguments[1];
+      } else {
+        var numbers = arguments.length === 1 ? arguments[0] : arguments; // if single argument, array is used
+        if (! ("length" in numbers && numbers.length > 0)) {
+          throw "Non-empty array is expected";
+        }
+        var min = numbers[0],
+          count = numbers.length;
+        for (var i = 1; i < count; ++i) {
+          if (min > numbers[i]) {
+            min = numbers[i];
+          }
+        }
+        return min;
+      }
+    };
+
+    p.norm = function(aNumber, low, high) {
+      return (aNumber - low) / (high - low);
+    };
+
+    p.pow = Math.pow;
+
+    p.round = Math.round;
+
+    p.sq = function(aNumber) {
+      return aNumber * aNumber;
+    };
+
+    p.sqrt = Math.sqrt;
+
+    // Trigonometry
+    p.acos = Math.acos;
+
+    p.asin = Math.asin;
+
+    p.atan = Math.atan;
+
+    p.atan2 = Math.atan2;
+
+    p.cos = Math.cos;
+
+    p.degrees = function(aAngle) {
+      return (aAngle * 180) / Math.PI;
+    };
+
+    p.radians = function(aAngle) {
+      return (aAngle / 180) * Math.PI;
+    };
+
+    p.sin = Math.sin;
+
+    p.tan = Math.tan;
+
+    var currentRandom = Math.random;
+
+    p.random = function random() {
+      if(arguments.length === 0) {
+        return currentRandom();
+      } else if(arguments.length === 1) {
+        return currentRandom() * arguments[0];
+      } else {
+        var aMin = arguments[0], aMax = arguments[1];
+        return currentRandom() * (aMax - aMin) + aMin;
+      }
+    };
+
+    // Pseudo-random generator
+    function Marsaglia(i1, i2) {
+      // from http://www.math.uni-bielefeld.de/~sillke/ALGORITHMS/random/marsaglia-c
+      var z=i1 || 362436069, w= i2 || 521288629;
+      var nextInt = function() {
+        z=(36969*(z&65535)+(z>>>16)) & 0xFFFFFFFF;
+        w=(18000*(w&65535)+(w>>>16)) & 0xFFFFFFFF;
+        return (((z&0xFFFF)<<16) | (w&0xFFFF)) & 0xFFFFFFFF;
+      };
+
+      this.nextDouble = function() {
+        var i = nextInt() / 4294967296;
+        return i < 0 ? 1 + i : i;
+      };
+      this.nextInt = nextInt;
+    }
+    Marsaglia.createRandomized = function() {
+      var now = new Date();
+      return new Marsaglia((now / 60000) & 0xFFFFFFFF, now & 0xFFFFFFFF);
+    };
+
+    p.randomSeed = function(seed) {
+      currentRandom = (new Marsaglia(seed)).nextDouble;
+    };
+
+    // Random
+    p.Random = function(seed) {
+      var haveNextNextGaussian = false, nextNextGaussian, random;
+
+      this.nextGaussian = function() {
+        if (haveNextNextGaussian) {
+          haveNextNextGaussian = false;
+          return nextNextGaussian;
+        } else {
+          var v1, v2, s;
+          do {
+            v1 = 2 * random() - 1; // between -1.0 and 1.0
+            v2 = 2 * random() - 1; // between -1.0 and 1.0
+            s = v1 * v1 + v2 * v2;
+          }
+          while (s >= 1 || s === 0);
+
+          var multiplier = Math.sqrt(-2 * Math.log(s) / s);
+          nextNextGaussian = v2 * multiplier;
+          haveNextNextGaussian = true;
+
+          return v1 * multiplier;
+        }
+      };
+
+      // by default use standard random, otherwise seeded
+      random = seed === undefined ? Math.random : (new Marsaglia(seed)).nextDouble;
+    };
+
+    // Noise functions and helpers
+    function PerlinNoise(seed) {
+      var rnd = seed !== undefined ? new Marsaglia(seed) : Marsaglia.createRandomized();
+      var i, j;
+      // http://www.noisemachine.com/talk1/17b.html
+      // http://mrl.nyu.edu/~perlin/noise/
+      // generate permutation
+      var p = new Array(512);
+      for(i=0;i<256;++i) { p[i] = i; }
+      for(i=0;i<256;++i) { var t = p[j = rnd.nextInt() & 0xFF]; p[j] = p[i]; p[i] = t; }
+      // copy to avoid taking mod in p[0];
+      for(i=0;i<256;++i) { p[i + 256] = p[i]; }
+
+      function grad3d(i,x,y,z) {
+        var h = i & 15; // convert into 12 gradient directions
+        var u = h<8 ? x : y,
+            v = h<4 ? y : h===12||h===14 ? x : z;
+        return ((h&1) === 0 ? u : -u) + ((h&2) === 0 ? v : -v);
+      }
+
+      function grad2d(i,x,y) {
+        var v = (i & 1) === 0 ? x : y;
+        return (i&2) === 0 ? -v : v;
+      }
+
+      function grad1d(i,x) {
+        return (i&1) === 0 ? -x : x;
+      }
+
+      function lerp(t,a,b) { return a + t * (b - a); }
+
+      this.noise3d = function(x, y, z) {
+        var X = Math.floor(x)&255, Y = Math.floor(y)&255, Z = Math.floor(z)&255;
+        x -= Math.floor(x); y -= Math.floor(y); z -= Math.floor(z);
+        var fx = (3-2*x)*x*x, fy = (3-2*y)*y*y, fz = (3-2*z)*z*z;
+        var p0 = p[X]+Y, p00 = p[p0] + Z, p01 = p[p0 + 1] + Z, p1  = p[X + 1] + Y, p10 = p[p1] + Z, p11 = p[p1 + 1] + Z;
+        return lerp(fz,
+          lerp(fy, lerp(fx, grad3d(p[p00], x, y, z), grad3d(p[p10], x-1, y, z)),
+                   lerp(fx, grad3d(p[p01], x, y-1, z), grad3d(p[p11], x-1, y-1,z))),
+          lerp(fy, lerp(fx, grad3d(p[p00 + 1], x, y, z-1), grad3d(p[p10 + 1], x-1, y, z-1)),
+                   lerp(fx, grad3d(p[p01 + 1], x, y-1, z-1), grad3d(p[p11 + 1], x-1, y-1,z-1))));
+      };
+
+      this.noise2d = function(x, y) {
+        var X = Math.floor(x)&255, Y = Math.floor(y)&255;
+        x -= Math.floor(x); y -= Math.floor(y);
+        var fx = (3-2*x)*x*x, fy = (3-2*y)*y*y;
+        var p0 = p[X]+Y, p1  = p[X + 1] + Y;
+        return lerp(fy,
+          lerp(fx, grad2d(p[p0], x, y), grad2d(p[p1], x-1, y)),
+          lerp(fx, grad2d(p[p0 + 1], x, y-1), grad2d(p[p1 + 1], x-1, y-1)));
+      };
+
+      this.noise1d = function(x) {
+        var X = Math.floor(x)&255;
+        x -= Math.floor(x);
+        var fx = (3-2*x)*x*x;
+        return lerp(fx, grad1d(p[X], x), grad1d(p[X+1], x-1));
+      };
+    }
+
+    // processing defaults
+    var noiseProfile = { generator: undefined, octaves: 4, fallout: 0.5, seed: undefined};
+
+    p.noise = function(x, y, z) {
+      if(noiseProfile.generator === undefined) {
+        // caching
+        noiseProfile.generator = new PerlinNoise(noiseProfile.seed);
+      }
+      var generator = noiseProfile.generator;
+      var effect = 1, k = 1, sum = 0;
+      for(var i=0; i<noiseProfile.octaves; ++i) {
+        effect *= noiseProfile.fallout;
+        switch (arguments.length) {
+        case 1:
+          sum += effect * (1 + generator.noise1d(k*x))/2; break;
+        case 2:
+          sum += effect * (1 + generator.noise2d(k*x, k*y))/2; break;
+        case 3:
+          sum += effect * (1 + generator.noise3d(k*x, k*y, k*z))/2; break;
+        }
+        k *= 2;
+      }
+      return sum;
+    };
+
+    p.noiseDetail = function(octaves, fallout) {
+      noiseProfile.octaves = octaves;
+      if(fallout !== undefined) {
+        noiseProfile.fallout = fallout;
+      }
+    };
+
+    p.noiseSeed = function(seed) {
+      noiseProfile.seed = seed;
+      noiseProfile.generator = undefined;
+    };
+
+    // Changes the size of the Canvas ( this resets context properties like 'lineCap', etc.
+    p.size = function size(aWidth, aHeight, aMode) {
+      if (aMode && (aMode === p.WEBGL)) {
+        // get the 3D rendering context
+        try {
+          // If the HTML <canvas> dimensions differ from the
+          // dimensions specified in the size() call in the sketch, for
+          // 3D sketches, browsers will either not render or render the
+          // scene incorrectly. To fix this, we need to adjust the
+          // width and height attributes of the canvas.
+          if (curElement.width !== aWidth || curElement.height !== aHeight) {
+            curElement.setAttribute("width", aWidth);
+            curElement.setAttribute("height", aHeight);
+          }
+          curContext = curElement.getContext("experimental-webgl");
+        } catch(e_size) {
+          p.debug(e_size);
+        }
+
+        if (!curContext) {
+          throw "OPENGL 3D context is not supported on this browser.";
+        } else {
+          for (var i = 0; i < p.SINCOS_LENGTH; i++) {
+            sinLUT[i] = p.sin(i * (p.PI / 180) * 0.5);
+            cosLUT[i] = p.cos(i * (p.PI / 180) * 0.5);
+          }
+          // Set defaults
+          curContext.viewport(0, 0, curElement.width, curElement.height);
+          curContext.clearColor(204 / 255, 204 / 255, 204 / 255, 1.0);
+          curContext.clear(curContext.COLOR_BUFFER_BIT);
+          curContext.enable(curContext.DEPTH_TEST);
+          curContext.enable(curContext.BLEND);
+          curContext.blendFunc(curContext.SRC_ALPHA, curContext.ONE_MINUS_SRC_ALPHA);
+
+          // Create the program objects to render 2D (points, lines) and
+          // 3D (spheres, boxes) shapes. Because 2D shapes are not lit,
+          // lighting calculations could be ommitted from that program object.
+          programObject2D = createProgramObject(curContext, vertexShaderSource2D, fragmentShaderSource2D);
+          programObject3D = createProgramObject(curContext, vertexShaderSource3D, fragmentShaderSource3D);
+
+          // Now that the programs have been compiled, we can set the default
+          // states for the lights.
+          curContext.useProgram(programObject3D);
+          p.lightFalloff(1, 0, 0);
+          p.shininess(1);
+          p.ambient(255, 255, 255);
+          p.specular(0, 0, 0);
+
+          // Create buffers for 3D primitives
+          boxBuffer = curContext.createBuffer();
+          curContext.bindBuffer(curContext.ARRAY_BUFFER, boxBuffer);
+          curContext.bufferData(curContext.ARRAY_BUFFER, newWebGLArray(boxVerts), curContext.STATIC_DRAW);
+
+          boxNormBuffer = curContext.createBuffer();
+          curContext.bindBuffer(curContext.ARRAY_BUFFER, boxNormBuffer);
+          curContext.bufferData(curContext.ARRAY_BUFFER, newWebGLArray(boxNorms), curContext.STATIC_DRAW);
+
+          boxOutlineBuffer = curContext.createBuffer();
+          curContext.bindBuffer(curContext.ARRAY_BUFFER, boxOutlineBuffer);
+          curContext.bufferData(curContext.ARRAY_BUFFER, newWebGLArray(boxOutlineVerts), curContext.STATIC_DRAW);
+
+          // The sphere vertices are specified dynamically since the user
+          // can change the level of detail. Everytime the user does that
+          // using sphereDetail(), the new vertices are calculated.
+          sphereBuffer = curContext.createBuffer();
+
+          lineBuffer = curContext.createBuffer();
+          curContext.bindBuffer(curContext.ARRAY_BUFFER, lineBuffer);
+
+          fillBuffer = curContext.createBuffer();
+          curContext.bindBuffer(curContext.ARRAY_BUFFER, fillBuffer);
+
+          pointBuffer = curContext.createBuffer();
+          curContext.bindBuffer(curContext.ARRAY_BUFFER, pointBuffer);
+          curContext.bufferData(curContext.ARRAY_BUFFER, newWebGLArray([0, 0, 0]), curContext.STATIC_DRAW);
+
+          cam = new PMatrix3D();
+          cameraInv = new PMatrix3D();
+          forwardTransform = new PMatrix3D();
+          reverseTransform = new PMatrix3D();
+          modelView = new PMatrix3D();
+          modelViewInv = new PMatrix3D();
+          projection = new PMatrix3D();
+          p.camera();
+          p.perspective();
+          forwardTransform = modelView;
+          reverseTransform = modelViewInv;
+
+          userMatrixStack = new PMatrixStack();
+          // used by both curve and bezier, so just init here
+          curveBasisMatrix = new PMatrix3D();
+          curveToBezierMatrix = new PMatrix3D();
+          curveDrawMatrix = new PMatrix3D();
+          bezierBasisInverse = new PMatrix3D();
+          bezierBasisMatrix = new PMatrix3D();
+          bezierBasisMatrix.set(-1, 3, -3, 1, 3, -6, 3, 0, -3, 3, 0, 0, 1, 0, 0, 0);
+        }
+        p.stroke(0);
+        p.fill(255);
+      } else {
+        if (typeof curContext === "undefined") {
+          // size() was called without p.init() default context, ie. p.createGraphics()
+          curContext = curElement.getContext("2d");
+          userMatrixStack = new PMatrixStack();
+          modelView = new PMatrix2D();
+        }
+      }
+
+      // The default 2d context has already been created in the p.init() stage if
+      // a 3d context was not specified. This is so that a 2d context will be
+      // available if size() was not called.
+      var props = {
+        fillStyle: curContext.fillStyle,
+        strokeStyle: curContext.strokeStyle,
+        lineCap: curContext.lineCap,
+        lineJoin: curContext.lineJoin
+      };
+      curElement.width = p.width = aWidth;
+      curElement.height = p.height = aHeight;
+
+      for (var j in props) {
+        if (props) {
+          curContext[j] = props[j];
+        }
+      }
+
+      // redraw the background if background was called before size
+      refreshBackground();
+
+      p.context = curContext; // added for createGraphics
+      p.toImageData = function() {
+        return curContext.getImageData(0, 0, this.width, this.height);
+      };
+    };
+
+    ////////////////////////////////////////////////////////////////////////////
+    // 3D Functions
+    ////////////////////////////////////////////////////////////////////////////
+
+    /*
+      Sets the uniform variable 'varName' to the value specified by 'value'.
+      Before calling this function, make sure the correct program object
+      has been installed as part of the current rendering state.
+
+      On some systems, if the variable exists in the shader but isn't used,
+      the compiler will optimize it out and this function will fail.
+    */
+    function uniformf(programObj, varName, varValue) {
+      var varLocation = curContext.getUniformLocation(programObj, varName);
+      // the variable won't be found if it was optimized out.
+      if (varLocation !== -1) {
+        if (varValue.length === 4) {
+          curContext.uniform4fv(varLocation, varValue);
+        } else if (varValue.length === 3) {
+          curContext.uniform3fv(varLocation, varValue);
+        } else if (varValue.length === 2) {
+          curContext.uniform2fv(varLocation, varValue);
+        } else {
+          curContext.uniform1f(varLocation, varValue);
+        }
+      }
+    }
+
+    function uniformi(programObj, varName, varValue) {
+      var varLocation = curContext.getUniformLocation(programObj, varName);
+      // the variable won't be found if it was optimized out.
+      if (varLocation !== -1) {
+        if (varValue.length === 4) {
+          curContext.uniform4iv(varLocation, varValue);
+        } else if (varValue.length === 3) {
+          curContext.uniform3iv(varLocation, varValue);
+        } else if (varValue.length === 2) {
+          curContext.uniform2iv(varLocation, varValue);
+        } else {
+          curContext.uniform1i(varLocation, varValue);
+        }
+      }
+    }
+
+    function vertexAttribPointer(programObj, varName, size, VBO) {
+      var varLocation = curContext.getAttribLocation(programObj, varName);
+      if (varLocation !== -1) {
+        curContext.bindBuffer(curContext.ARRAY_BUFFER, VBO);
+        curContext.vertexAttribPointer(varLocation, size, curContext.FLOAT, false, 0, 0);
+        curContext.enableVertexAttribArray(varLocation);
+      }
+    }
+
+    function uniformMatrix(programObj, varName, transpose, matrix) {
+      var varLocation = curContext.getUniformLocation(programObj, varName);
+      // the variable won't be found if it was optimized out.
+      if (varLocation !== -1) {
+        if (matrix.length === 16) {
+          curContext.uniformMatrix4fv(varLocation, transpose, matrix);
+        } else if (matrix.length === 9) {
+          curContext.uniformMatrix3fv(varLocation, transpose, matrix);
+        } else {
+          curContext.uniformMatrix2fv(varLocation, transpose, matrix);
+        }
+      }
+    }
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Lights
+    ////////////////////////////////////////////////////////////////////////////
+
+    p.ambientLight = function(r, g, b, x, y, z) {
+      if (p.use3DContext) {
+        if (lightCount === p.MAX_LIGHTS) {
+          throw "can only create " + p.MAX_LIGHTS + " lights";
+        }
+
+        var pos = new PVector(x, y, z);
+        var view = new PMatrix3D();
+        view.scale(1, -1, 1);
+        view.apply(modelView.array());
+        view.mult(pos, pos);
+
+        curContext.useProgram(programObject3D);
+        uniformf(programObject3D, "lights[" + lightCount + "].color", [r / 255, g / 255, b / 255]);
+        uniformf(programObject3D, "lights[" + lightCount + "].position", pos.array());
+        uniformi(programObject3D, "lights[" + lightCount + "].type", 0);
+        uniformi(programObject3D, "lightCount", ++lightCount);
+      }
+    };
+
+    p.directionalLight = function(r, g, b, nx, ny, nz) {
+      if (p.use3DContext) {
+        if (lightCount === p.MAX_LIGHTS) {
+          throw "can only create " + p.MAX_LIGHTS + " lights";
+        }
+
+        curContext.useProgram(programObject3D);
+
+        // Less code than manually multiplying, but I'll fix
+        // this when I have more time.
+        var dir = [nx, ny, nz, 0.0000001];
+
+        var view = new PMatrix3D();
+        view.scale(1, -1, 1);
+        view.apply(modelView.array());
+        view.mult(dir, dir);
+
+        uniformf(programObject3D, "lights[" + lightCount + "].color", [r / 255, g / 255, b / 255]);
+        uniformf(programObject3D, "lights[" + lightCount + "].position", [-dir[0], -dir[1], -dir[2]]);
+        uniformi(programObject3D, "lights[" + lightCount + "].type", 1);
+        uniformi(programObject3D, "lightCount", ++lightCount);
+      }
+    };
+
+    p.lightFalloff = function lightFalloff(constant, linear, quadratic) {
+      if (p.use3DContext) {
+        curContext.useProgram(programObject3D);
+        uniformf(programObject3D, "falloff", [constant, linear, quadratic]);
+      }
+    };
+
+    p.lightSpecular = function lightSpecular(r, g, b) {
+      if (p.use3DContext) {
+        curContext.useProgram(programObject3D);
+        uniformf(programObject3D, "specular", [r / 255, g / 255, b / 255]);
+      }
+    };
+
+    /*
+      Sets the default ambient light, directional light,
+      falloff, and specular values. P5 Documentation says specular()
+      is set, but the code calls lightSpecular().
+    */
+    p.lights = function lights() {
+      p.ambientLight(128, 128, 128);
+      p.directionalLight(128, 128, 128, 0, 0, -1);
+      p.lightFalloff(1, 0, 0);
+      p.lightSpecular(0, 0, 0);
+    };
+
+    p.pointLight = function(r, g, b, x, y, z) {
+      if (p.use3DContext) {
+        if (lightCount === p.MAX_LIGHTS) {
+          throw "can only create " + p.MAX_LIGHTS + " lights";
+        }
+
+        // place the point in view space once instead of once per vertex
+        // in the shader.
+        var pos = new PVector(x, y, z);
+        var view = new PMatrix3D();
+        view.scale(1, -1, 1);
+        view.apply(modelView.array());
+        view.mult(pos, pos);
+
+        curContext.useProgram(programObject3D);
+        uniformf(programObject3D, "lights[" + lightCount + "].color", [r / 255, g / 255, b / 255]);
+        uniformf(programObject3D, "lights[" + lightCount + "].position", pos.array());
+        uniformi(programObject3D, "lights[" + lightCount + "].type", 2);
+        uniformi(programObject3D, "lightCount", ++lightCount);
+      }
+    };
+
+    /*
+      Disables lighting so the all shapes drawn after this
+      will not be lit.
+    */
+    p.noLights = function noLights() {
+      if (p.use3DContext) {
+        lightCount = 0;
+        curContext.useProgram(programObject3D);
+        uniformi(programObject3D, "lightCount", lightCount);
+      }
+    };
+
+    /*
+      r,g,b - Color of the light
+      x,y,z - position of the light in modeling space
+      nx,ny,nz - direction of the spotlight
+      angle - in radians
+      concentration -
+    */
+    p.spotLight = function spotLight(r, g, b, x, y, z, nx, ny, nz, angle, concentration) {
+      if (p.use3DContext) {
+        if (lightCount === p.MAX_LIGHTS) {
+          throw "can only create " + p.MAX_LIGHTS + " lights";
+        }
+
+        curContext.useProgram(programObject3D);
+
+        // place the point in view space once instead of once per vertex
+        // in the shader.
+        var pos = new PVector(x, y, z);
+        var view = new PMatrix3D();
+        view.scale(1, -1, 1);
+        view.apply(modelView.array());
+        view.mult(pos, pos);
+
+        // transform the spotlight's direction
+        // need to find a solution for this one. Maybe manual mult?
+        var dir = [nx, ny, nz, 0.0000001];
+        view = new PMatrix3D();
+        view.scale(1, -1, 1);
+        view.apply(modelView.array());
+        view.mult(dir, dir);
+
+        uniformf(programObject3D, "lights[" + lightCount + "].color", [r / 255, g / 255, b / 255]);
+        uniformf(programObject3D, "lights[" + lightCount + "].position", pos.array());
+        uniformf(programObject3D, "lights[" + lightCount + "].direction", [dir[0], dir[1], dir[2]]);
+        uniformf(programObject3D, "lights[" + lightCount + "].concentration", concentration);
+        uniformf(programObject3D, "lights[" + lightCount + "].angle", angle);
+        uniformi(programObject3D, "lights[" + lightCount + "].type", 3);
+        uniformi(programObject3D, "lightCount", ++lightCount);
+      }
+    };
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Camera functions
+    ////////////////////////////////////////////////////////////////////////////
+
+    p.beginCamera = function beginCamera() {
+      if (manipulatingCamera) {
+        throw ("You cannot call beginCamera() again before calling endCamera()");
+      } else {
+        manipulatingCamera = true;
+        forwardTransform = cameraInv;
+        reverseTransform = cam;
+      }
+    };
+
+    p.endCamera = function endCamera() {
+      if (!manipulatingCamera) {
+        throw ("You cannot call endCamera() before calling beginCamera()");
+      } else {
+        modelView.set(cam);
+        modelViewInv.set(cameraInv);
+        forwardTransform = modelView;
+        reverseTransform = modelViewInv;
+        manipulatingCamera = false;
+      }
+    };
+
+    p.camera = function camera(eyeX, eyeY, eyeZ, centerX, centerY, centerZ, upX, upY, upZ) {
+      if (arguments.length === 0) {
+        //in case canvas is resized
+        cameraX = curElement.width / 2;
+        cameraY = curElement.height / 2;
+        cameraZ = cameraY / Math.tan(cameraFOV / 2);
+        p.camera(cameraX, cameraY, cameraZ, cameraX, cameraY, 0, 0, 1, 0);
+      } else {
+        var z = new p.PVector(eyeX - centerX, eyeY - centerY, eyeZ - centerZ);
+        var y = new p.PVector(upX, upY, upZ);
+        var transX, transY, transZ;
+        z.normalize();
+        var x = p.PVector.cross(y, z);
+        y = p.PVector.cross(z, x);
+        x.normalize();
+        y.normalize();
+
+        cam.set(x.x, x.y, x.z, 0, y.x, y.y, y.z, 0, z.x, z.y, z.z, 0, 0, 0, 0, 1);
+
+        cam.translate(-eyeX, -eyeY, -eyeZ);
+
+        cameraInv.reset();
+        cameraInv.invApply(x.x, x.y, x.z, 0, y.x, y.y, y.z, 0, z.x, z.y, z.z, 0, 0, 0, 0, 1);
+
+        cameraInv.translate(eyeX, eyeY, eyeZ);
+
+        modelView.set(cam);
+        modelViewInv.set(cameraInv);
+      }
+    };
+
+    p.perspective = function perspective(fov, aspect, near, far) {
+      if (arguments.length === 0) {
+        //in case canvas is resized
+        cameraY = curElement.height / 2;
+        cameraZ = cameraY / Math.tan(cameraFOV / 2);
+        cameraNear = cameraZ / 10;
+        cameraFar = cameraZ * 10;
+        cameraAspect = curElement.width / curElement.height;
+        p.perspective(cameraFOV, cameraAspect, cameraNear, cameraFar);
+      } else {
+        var a = arguments;
+        var yMax, yMin, xMax, xMin;
+        yMax = near * Math.tan(fov / 2);
+        yMin = -yMax;
+        xMax = yMax * aspect;
+        xMin = yMin * aspect;
+        p.frustum(xMin, xMax, yMin, yMax, near, far);
+      }
+    };
+
+    p.frustum = function frustum(left, right, bottom, top, near, far) {
+      frustumMode = true;
+      projection = new PMatrix3D();
+      projection.set((2 * near) / (right - left), 0, (right + left) / (right - left), 0, 0, (2 * near) / (top - bottom), (top + bottom) / (top - bottom), 0, 0, 0, -(far + near) / (far - near), -(2 * far * near) / (far - near), 0, 0, -1, 0);
+    };
+
+    p.ortho = function ortho(left, right, bottom, top, near, far) {
+      if (arguments.length === 0) {
+        p.ortho(0, p.width, 0, p.height, -10, 10);
+      } else {
+        var x = 2 / (right - left);
+        var y = 2 / (top - bottom);
+        var z = -2 / (far - near);
+
+        var tx = -(right + left) / (right - left);
+        var ty = -(top + bottom) / (top - bottom);
+        var tz = -(far + near) / (far - near);
+
+        projection = new PMatrix3D();
+        projection.set(x, 0, 0, tx, 0, y, 0, ty, 0, 0, z, tz, 0, 0, 0, 1);
+
+        frustumMode = false;
+      }
+    };
+
+    p.printProjection = function() {
+      projection.print();
+    };
+
+    p.printCamera = function() {
+      cam.print();
+    };
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Shapes
+    ////////////////////////////////////////////////////////////////////////////
+
+    p.box = function(w, h, d) {
+      if (p.use3DContext) {
+        // user can uniformly scale the box by
+        // passing in only one argument.
+        if (!h || !d) {
+          h = d = w;
+        }
+
+        // Modeling transformation
+        var model = new PMatrix3D();
+        model.scale(w, h, d);
+
+        // viewing transformation needs to have Y flipped
+        // becuase that's what Processing does.
+        var view = new PMatrix3D();
+        view.scale(1, -1, 1);
+        view.apply(modelView.array());
+
+        curContext.useProgram(programObject3D);
+        uniformMatrix(programObject3D, "model", true, model.array());
+        uniformMatrix(programObject3D, "view", true, view.array());
+        uniformMatrix(programObject3D, "projection", true, projection.array());
+
+        if (doFill === true) {
+          // fix stitching problems. (lines get occluded by triangles
+          // since they share the same depth values). This is not entirely
+          // working, but it's a start for drawing the outline. So
+          // developers can start playing around with styles.
+          curContext.enable(curContext.POLYGON_OFFSET_FILL);
+          curContext.polygonOffset(1, 1);
+          uniformf(programObject3D, "color", fillStyle);
+
+          var v = new PMatrix3D();
+          v.set(view);
+
+          var m = new PMatrix3D();
+          m.set(model);
+
+          v.mult(m);
+
+          var normalMatrix = new PMatrix3D();
+          normalMatrix.set(v);
+          normalMatrix.invert();
+
+          uniformMatrix(programObject3D, "normalTransform", false, normalMatrix.array());
+
+          vertexAttribPointer(programObject3D, "Vertex", 3, boxBuffer);
+          vertexAttribPointer(programObject3D, "Normal", 3, boxNormBuffer);
+
+          curContext.drawArrays(curContext.TRIANGLES, 0, boxVerts.length / 3);
+          curContext.disable(curContext.POLYGON_OFFSET_FILL);
+        }
+
+        if (lineWidth > 0 && doStroke) {
+          curContext.useProgram(programObject3D);
+          uniformMatrix(programObject3D, "model", true, model.array());
+          uniformMatrix(programObject3D, "view", true, view.array());
+          uniformMatrix(programObject3D, "projection", true, projection.array());
+
+          uniformf(programObject3D, "color", strokeStyle);
+          curContext.lineWidth(lineWidth);
+          vertexAttribPointer(programObject3D, "Vertex", 3, boxOutlineBuffer);
+          curContext.drawArrays(curContext.LINES, 0, boxOutlineVerts.length / 3);
+        }
+      }
+    };
+
+    var initSphere = function() {
+      var i;
+      sphereVerts = [];
+
+      for (i = 0; i < sphereDetailU; i++) {
+        sphereVerts.push(0);
+        sphereVerts.push(-1);
+        sphereVerts.push(0);
+        sphereVerts.push(sphereX[i]);
+        sphereVerts.push(sphereY[i]);
+        sphereVerts.push(sphereZ[i]);
+      }
+      sphereVerts.push(0);
+      sphereVerts.push(-1);
+      sphereVerts.push(0);
+      sphereVerts.push(sphereX[0]);
+      sphereVerts.push(sphereY[0]);
+      sphereVerts.push(sphereZ[0]);
+
+      var v1, v11, v2;
+
+      // middle rings
+      var voff = 0;
+      for (i = 2; i < sphereDetailV; i++) {
+        v1 = v11 = voff;
+        voff += sphereDetailU;
+        v2 = voff;
+        for (var j = 0; j < sphereDetailU; j++) {
+          sphereVerts.push(parseFloat(sphereX[v1]));
+          sphereVerts.push(parseFloat(sphereY[v1]));
+          sphereVerts.push(parseFloat(sphereZ[v1++]));
+          sphereVerts.push(parseFloat(sphereX[v2]));
+          sphereVerts.push(parseFloat(sphereY[v2]));
+          sphereVerts.push(parseFloat(sphereZ[v2++]));
+        }
+
+        // close each ring
+        v1 = v11;
+        v2 = voff;
+
+        sphereVerts.push(parseFloat(sphereX[v1]));
+        sphereVerts.push(parseFloat(sphereY[v1]));
+        sphereVerts.push(parseFloat(sphereZ[v1]));
+        sphereVerts.push(parseFloat(sphereX[v2]));
+        sphereVerts.push(parseFloat(sphereY[v2]));
+        sphereVerts.push(parseFloat(sphereZ[v2]));
+      }
+
+      // add the northern cap
+      for (i = 0; i < sphereDetailU; i++) {
+        v2 = voff + i;
+
+        sphereVerts.push(parseFloat(sphereX[v2]));
+        sphereVerts.push(parseFloat(sphereY[v2]));
+        sphereVerts.push(parseFloat(sphereZ[v2]));
+        sphereVerts.push(0);
+        sphereVerts.push(1);
+        sphereVerts.push(0);
+      }
+
+      sphereVerts.push(parseFloat(sphereX[voff]));
+      sphereVerts.push(parseFloat(sphereY[voff]));
+      sphereVerts.push(parseFloat(sphereZ[voff]));
+      sphereVerts.push(0);
+      sphereVerts.push(1);
+      sphereVerts.push(0);
+
+      //set the buffer data
+      curContext.bindBuffer(curContext.ARRAY_BUFFER, sphereBuffer);
+      curContext.bufferData(curContext.ARRAY_BUFFER, newWebGLArray(sphereVerts), curContext.STATIC_DRAW);
+    };
+
+    p.sphereDetail = function sphereDetail(ures, vres) {
+      var i;
+
+      if (arguments.length === 1) {
+        ures = vres = arguments[0];
+      }
+
+      if (ures < 3) {
+        ures = 3;
+      } // force a minimum res
+      if (vres < 2) {
+        vres = 2;
+      } // force a minimum res
+      // if it hasn't changed do nothing
+      if ((ures === sphereDetailU) && (vres === sphereDetailV)) {
+        return;
+      }
+
+      var delta = p.SINCOS_LENGTH / ures;
+      var cx = new Array(ures);
+      var cz = new Array(ures);
+      // calc unit circle in XZ plane
+      for (i = 0; i < ures; i++) {
+        cx[i] = cosLUT[parseInt((i * delta) % p.SINCOS_LENGTH, 10)];
+        cz[i] = sinLUT[parseInt((i * delta) % p.SINCOS_LENGTH, 10)];
+      }
+
+      // computing vertexlist
+      // vertexlist starts at south pole
+      var vertCount = ures * (vres - 1) + 2;
+      var currVert = 0;
+
+      // re-init arrays to store vertices
+      sphereX = new Array(vertCount);
+      sphereY = new Array(vertCount);
+      sphereZ = new Array(vertCount);
+
+      var angle_step = (p.SINCOS_LENGTH * 0.5) / vres;
+      var angle = angle_step;
+
+      // step along Y axis
+      for (i = 1; i < vres; i++) {
+        var curradius = sinLUT[parseInt(angle % p.SINCOS_LENGTH, 10)];
+        var currY = -cosLUT[parseInt(angle % p.SINCOS_LENGTH, 10)];
+        for (var j = 0; j < ures; j++) {
+          sphereX[currVert] = cx[j] * curradius;
+          sphereY[currVert] = currY;
+          sphereZ[currVert++] = cz[j] * curradius;
+        }
+        angle += angle_step;
+      }
+      sphereDetailU = ures;
+      sphereDetailV = vres;
+
+      // make the sphere verts and norms
+      initSphere();
+    };
+
+    p.sphere = function() {
+      if (p.use3DContext) {
+        var sRad = arguments[0], c;
+
+        if ((sphereDetailU < 3) || (sphereDetailV < 2)) {
+          p.sphereDetail(30);
+        }
+
+        // Modeling transformation
+        var model = new PMatrix3D();
+        model.scale(sRad, sRad, sRad);
+
+        // viewing transformation needs to have Y flipped
+        // becuase that's what Processing does.
+        var view = new PMatrix3D();
+        view.scale(1, -1, 1);
+        view.apply(modelView.array());
+
+        curContext.useProgram(programObject3D);
+
+        uniformMatrix(programObject3D, "model", true, model.array());
+        uniformMatrix(programObject3D, "view", true, view.array());
+        uniformMatrix(programObject3D, "projection", true, projection.array());
+
+        var v = new PMatrix3D();
+        v.set(view);
+
+        var m = new PMatrix3D();
+        m.set(model);
+
+        v.mult(m);
+
+        var normalMatrix = new PMatrix3D();
+        normalMatrix.set(v);
+        normalMatrix.invert();
+
+        uniformMatrix(programObject3D, "normalTransform", false, normalMatrix.array());
+
+        vertexAttribPointer(programObject3D, "Vertex", 3, sphereBuffer);
+        vertexAttribPointer(programObject3D, "Normal", 3, sphereBuffer);
+
+        if (doFill === true) {
+          // fix stitching problems. (lines get occluded by triangles
+          // since they share the same depth values). This is not entirely
+          // working, but it's a start for drawing the outline. So
+          // developers can start playing around with styles.
+          curContext.enable(curContext.POLYGON_OFFSET_FILL);
+          curContext.polygonOffset(1, 1);
+
+          uniformf(programObject3D, "color", fillStyle);
+
+          curContext.drawArrays(curContext.TRIANGLE_STRIP, 0, sphereVerts.length / 3);
+          curContext.disable(curContext.POLYGON_OFFSET_FILL);
+        }
+
+        if (lineWidth > 0 && doStroke) {
+          curContext.useProgram(programObject3D);
+          vertexAttribPointer(programObject3D, "Vertex", 3, sphereBuffer);
+
+          uniformMatrix(programObject3D, "model", true, model.array());
+          uniformMatrix(programObject3D, "view", true, view.array());
+          uniformMatrix(programObject3D, "projection", true, projection.array());
+
+          uniformf(programObject3D, "color", strokeStyle);
+
+          curContext.lineWidth(lineWidth);
+          curContext.drawArrays(curContext.LINE_STRIP, 0, sphereVerts.length / 3);
+        }
+      }
+    };
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Coordinates
+    ////////////////////////////////////////////////////////////////////////////
+
+    p.modelX = function modelX(x, y, z) {
+      var mv = modelView.array();
+      var ci = cameraInv.array();
+
+      var ax = mv[0] * x + mv[1] * y + mv[2] * z + mv[3];
+      var ay = mv[4] * x + mv[5] * y + mv[6] * z + mv[7];
+      var az = mv[8] * x + mv[9] * y + mv[10] * z + mv[11];
+      var aw = mv[12] * x + mv[13] * y + mv[14] * z + mv[15];
+
+      var ox = ci[0] * ax + ci[1] * ay + ci[2] * az + ci[3] * aw;
+      var ow = ci[12] * ax + ci[13] * ay + ci[14] * az + ci[15] * aw;
+
+      return (ow !== 0) ? ox / ow : ox;
+    };
+
+    p.modelY = function modelY(x, y, z) {
+      var mv = modelView.array();
+      var ci = cameraInv.array();
+
+      var ax = mv[0] * x + mv[1] * y + mv[2] * z + mv[3];
+      var ay = mv[4] * x + mv[5] * y + mv[6] * z + mv[7];
+      var az = mv[8] * x + mv[9] * y + mv[10] * z + mv[11];
+      var aw = mv[12] * x + mv[13] * y + mv[14] * z + mv[15];
+
+      var oy = ci[4] * ax + ci[5] * ay + ci[6] * az + ci[7] * aw;
+      var ow = ci[12] * ax + ci[13] * ay + ci[14] * az + ci[15] * aw;
+
+      return (ow !== 0) ? oy / ow : oy;
+    };
+
+    p.modelZ = function modelZ(x, y, z) {
+      var mv = modelView.array();
+      var ci = cameraInv.array();
+
+      var ax = mv[0] * x + mv[1] * y + mv[2] * z + mv[3];
+      var ay = mv[4] * x + mv[5] * y + mv[6] * z + mv[7];
+      var az = mv[8] * x + mv[9] * y + mv[10] * z + mv[11];
+      var aw = mv[12] * x + mv[13] * y + mv[14] * z + mv[15];
+
+      var oz = ci[8] * ax + ci[9] * ay + ci[10] * az + ci[11] * aw;
+      var ow = ci[12] * ax + ci[13] * ay + ci[14] * az + ci[15] * aw;
+
+      return (ow !== 0) ? oz / ow : oz;
+    };
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Material Properties
+    ////////////////////////////////////////////////////////////////////////////
+
+    p.ambient = function ambient() {
+      // create an alias to shorten code
+      var a = arguments;
+
+      // either a shade of gray or a 'color' object.
+      if (p.use3DContext) {
+        curContext.useProgram(programObject3D);
+        uniformi(programObject3D, "usingMat", true);
+
+        if (a.length === 1) {
+          // color object was passed in
+          if (typeof a[0] === "string") {
+            var c = a[0].slice(5, -1).split(",");
+            uniformf(programObject3D, "mat_ambient", [c[0] / 255, c[1] / 255, c[2] / 255]);
+          }
+          // else a single number was passed in for gray shade
+          else {
+            uniformf(programObject3D, "mat_ambient", [a[0] / 255, a[0] / 255, a[0] / 255]);
+          }
+        }
+        // Otherwise three values were provided (r,g,b)
+        else {
+          uniformf(programObject3D, "mat_ambient", [a[0] / 255, a[1] / 255, a[2] / 255]);
+        }
+      }
+    };
+
+    p.emissive = function emissive() {
+      // create an alias to shorten code
+      var a = arguments;
+
+      if (p.use3DContext) {
+        curContext.useProgram(programObject3D);
+        uniformi(programObject3D, "usingMat", true);
+
+        // If only one argument was provided, the user either gave us a
+        // shade of gray or a 'color' object.
+        if (a.length === 1) {
+          // color object was passed in
+          if (typeof a[0] === "string") {
+            var c = a[0].slice(5, -1).split(",");
+            uniformf(programObject3D, "mat_emissive", [c[0] / 255, c[1] / 255, c[2] / 255]);
+          }
+          // else a regular number was passed in for gray shade
+          else {
+            uniformf(programObject3D, "mat_emissive", [a[0] / 255, a[0] / 255, a[0] / 255]);
+          }
+        }
+        // Otherwise three values were provided (r,g,b)
+        else {
+          uniformf(programObject3D, "mat_emissive", [a[0] / 255, a[1] / 255, a[2] / 255]);
+        }
+      }
+    };
+
+    p.shininess = function shininess(shine) {
+      if (p.use3DContext) {
+        curContext.useProgram(programObject3D);
+        uniformi(programObject3D, "usingMat", true);
+        uniformf(programObject3D, "shininess", shine);
+      }
+    };
+
+    /*
+      Documentation says the following calls are valid, but the
+      Processing throws exceptions:
+      specular(gray, alpha)
+      specular(v1, v2, v3, alpha)
+      So we don't support them either
+      <corban> I dont think this matters so much, let us let color handle it. alpha values are not sent anyways.
+    */
+    p.specular = function specular() {
+      var c = p.color.apply(this, arguments);
+
+      if (p.use3DContext) {
+        curContext.useProgram(programObject3D);
+        uniformi(programObject3D, "usingMat", true);
+        uniformf(programObject3D, "mat_specular", p.color.toGLArray(c).slice(0, 3));
+      }
+    };
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Coordinates
+    ////////////////////////////////////////////////////////////////////////////
+    p.screenX = function screenX( x, y, z ) {
+      var mv = modelView.array();
+      var pj = projection.array();
+
+      var ax = mv[ 0]*x + mv[ 1]*y + mv[ 2]*z + mv[ 3];
+      var ay = mv[ 4]*x + mv[ 5]*y + mv[ 6]*z + mv[ 7];
+      var az = mv[ 8]*x + mv[ 9]*y + mv[10]*z + mv[11];
+      var aw = mv[12]*x + mv[13]*y + mv[14]*z + mv[15];
+
+      var ox = pj[ 0]*ax + pj[ 1]*ay + pj[ 2]*az + pj[ 3]*aw;
+      var ow = pj[12]*ax + pj[13]*ay + pj[14]*az + pj[15]*aw;
+
+      if ( ow !== 0 ){
+        ox /= ow;
+      }
+      return p.width * ( 1 + ox ) / 2.0;
+    };
+
+    p.screenY = function screenY( x, y, z ) {
+      var mv = modelView.array();
+      var pj = projection.array();
+
+      var ax = mv[ 0]*x + mv[ 1]*y + mv[ 2]*z + mv[ 3];
+      var ay = mv[ 4]*x + mv[ 5]*y + mv[ 6]*z + mv[ 7];
+      var az = mv[ 8]*x + mv[ 9]*y + mv[10]*z + mv[11];
+      var aw = mv[12]*x + mv[13]*y + mv[14]*z + mv[15];
+
+      var oy = pj[ 4]*ax + pj[ 5]*ay + pj[ 6]*az + pj[ 7]*aw;
+      var ow = pj[12]*ax + pj[13]*ay + pj[14]*az + pj[15]*aw;
+
+      if ( ow !== 0 ){
+        oy /= ow;
+      }
+      return p.height * ( 1 + oy ) / 2.0;
+    };
+
+    p.screenZ = function screenZ( x, y, z ) {
+      var mv = modelView.array();
+      var pj = projection.array();
+
+      var ax = mv[ 0]*x + mv[ 1]*y + mv[ 2]*z + mv[ 3];
+      var ay = mv[ 4]*x + mv[ 5]*y + mv[ 6]*z + mv[ 7];
+      var az = mv[ 8]*x + mv[ 9]*y + mv[10]*z + mv[11];
+      var aw = mv[12]*x + mv[13]*y + mv[14]*z + mv[15];
+
+      var oz = pj[ 8]*ax + pj[ 9]*ay + pj[10]*az + pj[11]*aw;
+      var ow = pj[12]*ax + pj[13]*ay + pj[14]*az + pj[15]*aw;
+
+      if ( ow !== 0 ) {
+        oz /= ow;
+      }
+      return ( oz + 1 ) / 2.0;
+    };
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Style functions
+    ////////////////////////////////////////////////////////////////////////////
+
+    p.fill = function fill() {
+      doFill = true;
+      var color = p.color(arguments[0], arguments[1], arguments[2], arguments[3]);
+
+      if (p.use3DContext) {
+        fillStyle = p.color.toGLArray(color);
+      } else {
+        curContext.fillStyle = p.color.toString(color);
+      }
+    };
+
+    p.noFill = function noFill() {
+      doFill = false;
+    };
+
+    p.stroke = function stroke() {
+      doStroke = true;
+      var color = p.color(arguments[0], arguments[1], arguments[2], arguments[3]);
+
+      if (p.use3DContext) {
+        strokeStyle = p.color.toGLArray(color);
+      } else {
+        curContext.strokeStyle = p.color.toString(color);
+      }
+    };
+
+    p.noStroke = function noStroke() {
+      doStroke = false;
+    };
+
+    p.strokeWeight = function strokeWeight(w) {
+      if (p.use3DContext) {
+        lineWidth = w;
+      } else {
+        curContext.lineWidth = w;
+      }
+    };
+
+    p.strokeCap = function strokeCap(value) {
+      curContext.lineCap = value;
+    };
+
+    p.strokeJoin = function strokeJoin(value) {
+      curContext.lineJoin = value;
+    };
+
+    p.smooth = function() {
+      if (!p.use3DContext) {
+        curElement.style.setProperty("image-rendering", "optimizeQuality", "important");
+        curContext.mozImageSmoothingEnabled = true;
+      }
+    };
+
+    p.noSmooth = function() {
+      if (!p.use3DContext) {
+        curElement.style.setProperty("image-rendering", "optimizeSpeed", "important");
+        curContext.mozImageSmoothingEnabled = false;
+      }
+    };
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Vector drawing functions
+    ////////////////////////////////////////////////////////////////////////////
+
+    p.Point = function Point(x, y) {
+      this.x = x;
+      this.y = y;
+      this.copy = function() {
+        return new Point(x, y);
+      };
+    };
+
+    p.point = function point(x, y, z) {
+      if (p.use3DContext) {
+        var model = new PMatrix3D();
+
+        // move point to position
+        model.translate(x, y, z || 0);
+
+        var view = new PMatrix3D();
+        view.scale(1, -1, 1);
+        view.apply(modelView.array());
+
+        curContext.useProgram(programObject2D);
+        uniformMatrix(programObject2D, "model", true, model.array());
+        uniformMatrix(programObject2D, "view", true, view.array());
+        uniformMatrix(programObject2D, "projection", true, projection.array());
+
+        if (lineWidth > 0 && doStroke) {
+          // this will be replaced with the new bit shifting color code
+          uniformf(programObject2D, "color", strokeStyle);
+
+          vertexAttribPointer(programObject2D, "Vertex", 3, pointBuffer);
+          curContext.drawArrays(curContext.POINTS, 0, 1);
+        }
+      } else {
+        if (doStroke) {
+          var oldFill = curContext.fillStyle;
+          curContext.fillStyle = curContext.strokeStyle;
+          curContext.fillRect(Math.round(x), Math.round(y), 1, 1);
+          curContext.fillStyle = oldFill;
+        }
+      }
+    };
+
+    p.beginShape = function beginShape(type) {
+      curShape = type;
+      curShapeCount = 0;
+      curvePoints = [];
+      //textureImage = null;
+      vertArray = [];
+      if(p.use3DContext)
+      {
+        //normalMode = NORMAL_MODE_AUTO;
+      }
+    };
+
+    p.vertex = function vertex() {
+      if(firstVert){ firstVert = false; }
+      var vert = [];
+      if(arguments.length === 4){ //x, y, u, v
+        vert[0] = arguments[0];
+        vert[1] = arguments[1];
+        vert[2] = 0;
+        vert[3] = arguments[2];
+        vert[4] = arguments[3];
+      }
+      else{ // x, y, z, u, v
+        vert[0] = arguments[0];
+        vert[1] = arguments[1];
+        vert[2] = arguments[2] || 0;
+        vert[3] = arguments[3] || 0;
+        vert[4] = arguments[4] || 0;
+      }
+      // fill rgba
+      vert[5] = fillStyle[0];
+      vert[6] = fillStyle[1];
+      vert[7] = fillStyle[2];
+      vert[8] = fillStyle[3];
+      // stroke rgba
+      vert[9] = strokeStyle[0];
+      vert[10] = strokeStyle[1];
+      vert[11] = strokeStyle[2];
+      vert[12] = strokeStyle[3];
+      //normals
+      vert[13] = normalX;
+      vert[14] = normalY;
+      vert[15] = normalZ;
+
+      vertArray.push(vert);
+    };
+
+    var point2D = function point2D(vArray){
+      var model = new PMatrix3D();
+      var view = new PMatrix3D();
+      view.scale(1, -1, 1);
+      view.apply(modelView.array());
+
+      curContext.useProgram(programObject2D);
+      uniformMatrix(programObject2D, "model", true, model.array());
+      uniformMatrix(programObject2D, "view", true, view.array());
+      uniformMatrix(programObject2D, "projection", true, projection.array());
+
+      uniformf(programObject2D, "color", strokeStyle);
+      vertexAttribPointer(programObject2D, "Vertex", 3, pointBuffer);
+      curContext.bufferData(curContext.ARRAY_BUFFER, newWebGLArray(vArray), curContext.STREAM_DRAW);
+      curContext.drawArrays(curContext.POINTS, 0, vArray.length/3);
+    };
+
+    var line2D = function line2D(vArray, mode){
+      var ctxMode;
+      if (mode === "LINES"){
+        ctxMode = curContext.LINES;
+      }
+      else if(mode === "LINE_LOOP"){
+        ctxMode = curContext.LINE_LOOP;
+      }
+      else{
+        ctxMode = curContext.LINE_STRIP;
+      }
+      var model = new PMatrix3D();
+      var view = new PMatrix3D();
+      view.scale(1, -1, 1);
+      view.apply(modelView.array());
+
+      curContext.useProgram(programObject2D);
+      uniformMatrix(programObject2D, "model", true, model.array());
+      uniformMatrix(programObject2D, "view", true, view.array());
+      uniformMatrix(programObject2D, "projection", true, projection.array());
+
+      uniformf(programObject2D, "color", strokeStyle);
+      vertexAttribPointer(programObject2D, "Vertex", 3, lineBuffer);
+      curContext.bufferData(curContext.ARRAY_BUFFER, newWebGLArray(vArray), curContext.STREAM_DRAW);
+      curContext.drawArrays(ctxMode, 0, vArray.length/3);
+    };
+
+    var fill2D = function fill2D(vArray, mode){
+      var ctxMode;
+      if(mode === "TRIANGLES"){
+        ctxMode = curContext.TRIANGLES;
+      }
+      else if(mode === "TRIANGLE_FAN"){
+        ctxMode = curContext.TRIANGLE_FAN;
+      }
+      else{
+        ctxMode = curContext.TRIANGLE_STRIP;
+      }
+
+      var model = new PMatrix3D();
+      var view = new PMatrix3D();
+      view.scale(1, -1, 1);
+      view.apply(modelView.array());
+
+      curContext.useProgram( programObject2D );
+      uniformMatrix( programObject2D, "model", true,  model.array() );
+      uniformMatrix( programObject2D, "view", true, view.array() );
+      uniformMatrix( programObject2D, "projection", true, projection.array() );
+
+      curContext.enable( curContext.POLYGON_OFFSET_FILL );
+      curContext.polygonOffset( 1, 1 );
+      uniformf( programObject2D, "color", fillStyle);
+
+      vertexAttribPointer(programObject2D, "Vertex", 3, fillBuffer);
+      curContext.bufferData(curContext.ARRAY_BUFFER, newWebGLArray(vArray), curContext.STREAM_DRAW);
+
+      curContext.drawArrays( ctxMode, 0, vArray.length/3 );
+      curContext.disable( curContext.POLYGON_OFFSET_FILL );
+    };
+
+    p.endShape = function endShape(close){
+      firstVert = true;
+      var i, j, k;
+      var last = vertArray.length - 1;
+      if(!close){
+        p.CLOSE = false;
+      }
+      else{
+        p.CLOSE = true;
+      }
+      if(isCurve && curShape === p.POLYGON || isCurve && curShape === undefined){
+        if(vertArray.length > 3){
+          if(p.use3DContext){
+          }
+          else{
+            var b = [],
+                s = 1 - curTightness;
+            curContext.beginPath();
+            curContext.moveTo(vertArray[1][0], vertArray[1][1]);
+              /*
+              * Matrix to convert from Catmull-Rom to cubic Bezier
+              * where t = curTightness
+              * |0         1          0         0       |
+              * |(t-1)/6   1          (1-t)/6   0       |
+              * |0         (1-t)/6    1         (t-1)/6 |
+              * |0         0          0         0       |
+              */
+            for(i = 1; (i+2) < vertArray.length; i++){
+              b[0] = [vertArray[i][0], vertArray[i][1]];
+              b[1] = [vertArray[i][0] + (s * vertArray[i+1][0] - s * vertArray[i-1][0]) / 6, vertArray[i][1] + (s * vertArray[i+1][1] - s * vertArray[i-1][1]) / 6];
+              b[2] = [vertArray[i+1][0] + (s * vertArray[i][0] - s * vertArray[i+2][0]) / 6, vertArray[i+1][1] + (s * vertArray[i][1] - s * vertArray[i+2][1]) / 6];
+              b[3] = [vertArray[i+1][0], vertArray[i+1][1]];
+              curContext.bezierCurveTo(b[1][0], b[1][1], b[2][0], b[2][1], b[3][0], b[3][1]);
+            }
+            if(doFill){
+              curContext.fill();
+            }
+            if(doStroke){
+              curContext.stroke();
+            }
+            curContext.closePath();
+          }
+        }
+      }
+      else if(isBezier && curShape === p.POLYGON || isBezier && curShape === undefined){
+        curContext.beginPath();
+        curContext.moveTo(vertArray[0][0], vertArray[0][1]);
+        for(i = 1; i < vertArray.length; i++){
+          curContext.bezierCurveTo(vertArray[i][0], vertArray[i][1], vertArray[i][2], vertArray[i][3], vertArray[i][4], vertArray[i][5]);
+        }
+        if(doFill){
+          curContext.fill();
+        }
+        if(doStroke){
+          curContext.stroke();
+        }
+        curContext.closePath();
+      }
+      else{
+        if(p.use3DContext){ // 3D context
+          var lineVertArray = [];
+          var fillVertArray = [];
+          for(i = 0; i < vertArray.length; i++){
+            for(j = 0; j < 3; j++){
+              fillVertArray.push(vertArray[i][j]);
+            }
+          }
+
+          fillVertArray.push(vertArray[0][0]);
+          fillVertArray.push(vertArray[0][1]);
+          fillVertArray.push(vertArray[0][2]);
+
+          if (curShape === p.POINTS){
+            for(i = 0; i < vertArray.length; i++){
+              for(j = 0; j < 3; j++){
+                lineVertArray.push(vertArray[i][j]);
+              }
+            }
+            point2D(lineVertArray);
+          }
+          else if(curShape === p.LINES){
+            for(i = 0; i < vertArray.length; i++){
+              for(j = 0; j < 3; j++){
+                lineVertArray.push(vertArray[i][j]);
+              }
+            }
+            line2D(lineVertArray, "LINES");
+          }
+          else if(curShape === p.TRIANGLES){
+            if(vertArray.length > 2){
+              for(i = 0; (i+2) < vertArray.length; i+=3){
+                fillVertArray = [];
+                lineVertArray = [];
+                for(j = 0; j < 3; j++){
+                  for(k = 0; k < 3; k++){
+                    lineVertArray.push(vertArray[i+j][k]);
+                    fillVertArray.push(vertArray[i+j][k]);
+                  }
+                }
+                if(doStroke){
+                  line2D(lineVertArray, "LINE_LOOP");
+                }
+                if(doFill){
+                  fill2D(fillVertArray, "TRIANGLES");
+                }
+              }
+            }
+          }
+          else if(curShape === p.TRIANGLE_STRIP){
+            if(vertArray.length > 2){
+              for(i = 0; (i+2) < vertArray.length; i++){
+                lineVertArray = [];
+                fillVertArray = [];
+                for(j = 0; j < 3; j++){
+                  for(k = 0; k < 3; k++){
+                    lineVertArray.push(vertArray[i+j][k]);
+                    fillVertArray.push(vertArray[i+j][k]);
+                  }
+                }
+                if(doFill){
+                  fill2D(fillVertArray);
+                }
+                if(doStroke){
+                  line2D(lineVertArray, "LINE_LOOP");
+                }
+              }
+            }
+          }
+          else if(curShape === p.TRIANGLE_FAN){
+            if(vertArray.length > 2){
+              for(i = 0; i < 3; i++){
+                for(j = 0; j < 3; j++){
+                  lineVertArray.push(vertArray[i][j]);
+                }
+              }
+              if(doStroke){
+                line2D(lineVertArray, "LINE_LOOP");
+              }
+              for(i = 2; (i+1) < vertArray.length; i++){
+                lineVertArray = [];
+                lineVertArray.push(vertArray[0][0]);
+                lineVertArray.push(vertArray[0][1]);
+                lineVertArray.push(vertArray[0][2]);
+                for(j = 0; j < 2; j++){
+                  for(k = 0; k < 3; k++){
+                    lineVertArray.push(vertArray[i+j][k]);
+                  }
+                }
+                if(doStroke){
+                  line2D(lineVertArray, "LINE_STRIP");
+                }
+              }
+              if(doFill){
+                fill2D(fillVertArray, "TRIANGLE_FAN");
+              }
+            }
+          }
+          else if(curShape === p.QUADS){
+            for(i = 0; (i + 3) < vertArray.length; i+=4){
+              lineVertArray = [];
+              for(j = 0; j < 4; j++){
+                for(k = 0; k < 3; k++){
+                  lineVertArray.push(vertArray[i+j][k]);
+                }
+              }
+              if(doStroke){
+                line2D(lineVertArray, "LINE_LOOP");
+              }
+
+              if(doFill){
+                fillVertArray = [];
+                for(j = 0; j < 3; j++){
+                  fillVertArray.push(vertArray[i][j]);
+                }
+                for(j = 0; j < 3; j++){
+                  fillVertArray.push(vertArray[i+1][j]);
+                }
+                for(j = 0; j < 3; j++){
+                  fillVertArray.push(vertArray[i+3][j]);
+                }
+                for(j = 0; j < 3; j++){
+                  fillVertArray.push(vertArray[i+2][j]);
+                }
+                fill2D(fillVertArray, "TRIANGLE_STRIP");
+              }
+            }
+          }
+          else if(curShape === p.QUAD_STRIP){
+            var tempArray = [];
+            if(vertArray.length > 3){
+              for(i = 0; i < 2; i++){
+                for(j = 0; j < 3; j++){
+                  lineVertArray.push(vertArray[i][j]);
+                }
+              }
+              line2D(lineVertArray, "LINE_STRIP");
+              if(vertArray.length > 4 && vertArray.length % 2 > 0){
+                tempArray = fillVertArray.splice(fillVertArray.length - 6);
+                vertArray.pop();
+              }
+              for(i = 0; (i+3) < vertArray.length; i+=2){
+                lineVertArray = [];
+                for(j = 0; j < 3; j++){
+                  lineVertArray.push(vertArray[i+1][j]);
+                }
+                for(j = 0; j < 3; j++){
+                  lineVertArray.push(vertArray[i+3][j]);
+                }
+                for(j = 0; j < 3; j++){
+                  lineVertArray.push(vertArray[i+2][j]);
+                }
+                for(j = 0; j < 3; j++){
+                  lineVertArray.push(vertArray[i+0][j]);
+                }
+                line2D(lineVertArray, "LINE_STRIP");
+              }
+              if(doFill){
+                fill2D(fillVertArray);
+              }
+            }
+          }
+          else{
+            if(vertArray.length === 1){
+              for(j = 0; j < 3; j++){
+                lineVertArray.push(vertArray[0][j]);
+              }
+              point2D(lineVertArray);
+            }
+            else{
+              for(i = 0; i < vertArray.length; i++){
+                for(j = 0; j < 3; j++){
+                  lineVertArray.push(vertArray[i][j]);
+                }
+              }
+              if(p.CLOSE){
+                line2D(lineVertArray, "LINE_LOOP");
+              }
+              else{
+                line2D(lineVertArray, "LINE_STRIP");
+              }
+              if(doFill){
+                fill2D(fillVertArray);
+              }
+            }
+          }
+        }
+        // 2D context
+        else{
+          if (curShape === p.POINTS){
+            for(i = 0; i < vertArray.length; i++){
+              p.point(vertArray[i][0], vertArray[i][1]);
+            }
+          }
+          else if(curShape === p.LINES){
+            for(i = 0; (i + 1) < vertArray.length; i+=2){
+              p.line(vertArray[i][0], vertArray[i][1], vertArray[i+1][0], vertArray[i+1][1]);
+            }
+          }
+          else if(curShape === p.TRIANGLES){
+            for(i = 0; (i + 2) < vertArray.length; i+=3){
+              curContext.beginPath();
+              curContext.moveTo(vertArray[i][0], vertArray[i][1]);
+              curContext.lineTo(vertArray[i+1][0], vertArray[i+1][1]);
+              curContext.lineTo(vertArray[i+2][0], vertArray[i+2][1]);
+              curContext.lineTo(vertArray[i][0], vertArray[i][1]);
+              if(doFill){
+                curContext.fill();
+              }
+              if(doStroke){
+                curContext.stroke();
+              }
+              curContext.closePath();
+            }
+          }
+          else if(curShape === p.TRIANGLE_STRIP){
+            if(vertArray.length > 2){
+              curContext.beginPath();
+              curContext.moveTo(vertArray[0][0], vertArray[0][1]);
+              curContext.lineTo(vertArray[1][0], vertArray[1][1]);
+              for(i = 2; i < vertArray.length; i++){
+                curContext.lineTo(vertArray[i][0], vertArray[i][1]);
+                curContext.lineTo(vertArray[i-2][0], vertArray[i-2][1]);
+                if(doFill){
+                  curContext.fill();
+                }
+                if(doStroke){
+                  curContext.stroke();
+                }
+                curContext.moveTo(vertArray[i][0],vertArray[i][1]);
+              }
+            }
+          }
+          else if(curShape === p.TRIANGLE_FAN){
+            if(vertArray.length > 2){
+              curContext.beginPath();
+              curContext.moveTo(vertArray[0][0], vertArray[0][1]);
+              curContext.lineTo(vertArray[1][0], vertArray[1][1]);
+              curContext.lineTo(vertArray[2][0], vertArray[2][1]);
+              if(doFill){
+                  curContext.fill();
+                }
+              if(doStroke){
+                  curContext.stroke();
+                }
+              for(i = 3; i < vertArray.length; i++){
+                curContext.moveTo(vertArray[0][0], vertArray[0][1]);
+                curContext.lineTo(vertArray[i-1][0], vertArray[i-1][1]);
+                curContext.lineTo(vertArray[i][0], vertArray[i][1]);
+                if(doFill){
+                  curContext.fill();
+                }
+                if(doStroke){
+                  curContext.stroke();
+                }
+              }
+            }
+          }
+          else if(curShape === p.QUADS){
+            for(i = 0; (i + 3) < vertArray.length; i+=4){
+              curContext.beginPath();
+              curContext.moveTo(vertArray[i][0], vertArray[i][1]);
+              for(j = 1; j < 4; j++){
+                curContext.lineTo(vertArray[i+j][0], vertArray[i+j][1]);
+              }
+              curContext.lineTo(vertArray[i][0], vertArray[i][1]);
+              if(doFill){
+                curContext.fill();
+              }
+              if(doStroke){
+                curContext.stroke();
+              }
+              curContext.closePath();
+            }
+          }
+          else if(curShape === p.QUAD_STRIP){
+            if(vertArray.length > 3){
+              curContext.beginPath();
+              curContext.moveTo(vertArray[0][0], vertArray[0][1]);
+              curContext.lineTo(vertArray[1][0], vertArray[1][1]);
+              for(i = 2; (i+1) < vertArray.length; i++){
+                if((i % 2) === 0){
+                  curContext.moveTo(vertArray[i-2][0], vertArray[i-2][1]);
+                  curContext.lineTo(vertArray[i][0], vertArray[i][1]);
+                  curContext.lineTo(vertArray[i+1][0], vertArray[i+1][1]);
+                  curContext.lineTo(vertArray[i-1][0], vertArray[i-1][1]);
+                  if(doFill){
+                    curContext.fill();
+                  }
+                  if(doStroke){
+                    curContext.stroke();
+                  }
+                }
+              }
+            }
+          }
+          else{
+            curContext.beginPath();
+            curContext.moveTo(vertArray[0][0], vertArray[0][1]);
+            for(i = 1; i < vertArray.length; i++){
+              curContext.lineTo(vertArray[i][0], vertArray[i][1]);
+            }
+            if(p.CLOSE){
+              curContext.lineTo(vertArray[0][0], vertArray[0][1]);
+            }
+            if(doFill){
+              curContext.fill();
+            }
+            if(doStroke){
+              curContext.stroke();
+            }
+          }
+          curContext.closePath();
+        }
+      }
+      isCurve = false;
+      isBezier = false;
+    };
+
+    p.bezierVertex = function(){
+      isBezier = true;
+      var vert = [];
+      if(firstVert){
+        throw ("vertex() must be used at least once before calling bezierVertex()");
+      }
+      else{
+        if(arguments.length === 6){
+          for(var i = 0; i < arguments.length; i++){ vert[i] = arguments[i]; }
+        }
+        else{ //for 9 arguments (3d)
+        }
+        vertArray.push(vert);
+      }
+    };
+
+    p.curveVertex = function(x, y, z) {
+      isCurve = true;
+      p.vertex(x, y, z);
+    };
+
+    p.curveVertexSegment = function(x1, y1, z1, x2, y2, z2, x3, y3, z3, x4, y4, z4) {
+      var x0 = x2;
+      var y0 = y2;
+      var z0 = z2;
+
+      var draw = curveDrawMatrix.array();
+
+      var xplot1 = draw[4] * x1 + draw[5] * x2 + draw[6] * x3 + draw[7] * x4;
+      var xplot2 = draw[8] * x1 + draw[9] * x2 + draw[10] * x3 + draw[11] * x4;
+      var xplot3 = draw[12] * x1 + draw[13] * x2 + draw[14] * x3 + draw[15] * x4;
+
+      var yplot1 = draw[4] * y1 + draw[5] * y2 + draw[6] * y3 + draw[7] * y4;
+      var yplot2 = draw[8] * y1 + draw[9] * y2 + draw[10] * y3 + draw[11] * y4;
+      var yplot3 = draw[12] * y1 + draw[13] * y2 + draw[14] * y3 + draw[15] * y4;
+
+      var zplot1 = draw[4] * z1 + draw[5] * z2 + draw[6] * z3 + draw[7] * z4;
+      var zplot2 = draw[8] * z1 + draw[9] * z2 + draw[10] * z3 + draw[11] * z4;
+      var zplot3 = draw[12] * z1 + draw[13] * z2 + draw[14] * z3 + draw[15] * z4;
+
+      p.vertex(x0, y0, z0);
+      for (var j = 0; j < curveDetail; j++) {
+        x0 += xplot1;
+        xplot1 += xplot2;
+        xplot2 += xplot3;
+        y0 += yplot1;
+        yplot1 += yplot2;
+        yplot2 += yplot3;
+        z0 += zplot1;
+        zplot1 += zplot2;
+        zplot2 += zplot3;
+        p.vertex(x0, y0, z0);
+      }
+    };
+
+    p.curve = function curve() {
+      if (arguments.length === 8) // curve(x1, y1, x2, y2, x3, y3, x4, y4)
+      {
+        p.beginShape();
+        p.curveVertex(arguments[0], arguments[1]);
+        p.curveVertex(arguments[2], arguments[3]);
+        p.curveVertex(arguments[4], arguments[5]);
+        p.curveVertex(arguments[6], arguments[7]);
+        p.endShape();
+      } else { // curve( x1, y1, z1, x2, y2, z2, x3, y3, z3, x4, y4, z4);
+        if (p.use3DContext) {
+          p.beginShape();
+          p.curveVertex(arguments[0], arguments[1], arguments[2]);
+          p.curveVertex(arguments[3], arguments[4], arguments[5]);
+          p.curveVertex(arguments[6], arguments[7], arguments[8]);
+          p.curveVertex(arguments[9], arguments[10], arguments[11]);
+          p.endShape();
+        }
+      }
+    };
+
+    p.curveTightness = function(tightness) {
+      curTightness = tightness;
+    };
+
+    //used by both curveDetail and bezierDetail
+    var splineForward = function(segments, matrix) {
+      var f = 1.0 / segments;
+      var ff = f * f;
+      var fff = ff * f;
+
+      matrix.set(0, 0, 0, 1, fff, ff, f, 0, 6 * fff, 2 * ff, 0, 0, 6 * fff, 0, 0, 0);
+    };
+
+    //internal curveInit
+    //used by curveDetail, curveTightness
+    var curveInit = function() {
+      // allocate only if/when used to save startup time
+      if (!curveDrawMatrix) {
+        curveBasisMatrix = new PMatrix3D();
+        curveDrawMatrix = new PMatrix3D();
+        curveInited = true;
+      }
+
+      var s = curTightness;
+      curveBasisMatrix.set(((s - 1) / 2).toFixed(2), ((s + 3) / 2).toFixed(2), ((-3 - s) / 2).toFixed(2), ((1 - s) / 2).toFixed(2), (1 - s), ((-5 - s) / 2).toFixed(2), (s + 2), ((s - 1) / 2).toFixed(2), ((s - 1) / 2).toFixed(2), 0, ((1 - s) / 2).toFixed(2), 0, 0, 1, 0, 0);
+
+      splineForward(curveDetail, curveDrawMatrix);
+
+      if (!bezierBasisInverse) {
+        //bezierBasisInverse = bezierBasisMatrix.get();
+        //bezierBasisInverse.invert();
+        curveToBezierMatrix = new PMatrix3D();
+      }
+
+      // TODO only needed for PGraphicsJava2D? if so, move it there
+      // actually, it's generally useful for other renderers, so keep it
+      // or hide the implementation elsewhere.
+      curveToBezierMatrix.set(curveBasisMatrix);
+      curveToBezierMatrix.preApply(bezierBasisInverse);
+
+      // multiply the basis and forward diff matrices together
+      // saves much time since this needn't be done for each curve
+      curveDrawMatrix.apply(curveBasisMatrix);
+    };
+
+    p.curveDetail = function curveDetail() {
+      curveDetail = arguments[0];
+      curveInit();
+    };
+
+    p.rectMode = function rectMode(aRectMode) {
+      curRectMode = aRectMode;
+    };
+
+    p.imageMode = function(mode) {
+      switch (mode) {
+      case p.CORNER:
+        imageModeConvert = imageModeCorner;
+        break;
+      case p.CORNERS:
+        imageModeConvert = imageModeCorners;
+        break;
+      case p.CENTER:
+        imageModeConvert = imageModeCenter;
+        break;
+      default:
+        throw "Invalid imageMode";
+      }
+    };
+
+    p.ellipseMode = function ellipseMode(aEllipseMode) {
+      curEllipseMode = aEllipseMode;
+    };
+
+    p.arc = function arc(x, y, width, height, start, stop) {
+      if (width <= 0) {
+        return;
+      }
+
+      if (curEllipseMode === p.CORNER) {
+        x += width / 2;
+        y += height / 2;
+      }
+
+      curContext.moveTo(x, y);
+      curContext.beginPath();
+      curContext.arc(x, y, curEllipseMode === p.CENTER_RADIUS ? width : width / 2, start, stop, false);
+
+      if (doStroke) {
+        curContext.stroke();
+      }
+      curContext.lineTo(x, y);
+
+      if (doFill) {
+        curContext.fill();
+      }
+      curContext.closePath();
+    };
+
+    p.line = function line() {
+      var x1, y1, z1, x2, y2, z2;
+
+      if (p.use3DContext) {
+        if (arguments.length === 6) {
+          x1 = arguments[0];
+          y1 = arguments[1];
+          z1 = arguments[2];
+          x2 = arguments[3];
+          y2 = arguments[4];
+          z2 = arguments[5];
+        } else if (arguments.length === 4) {
+          x1 = arguments[0];
+          y1 = arguments[1];
+          z1 = 0;
+          x2 = arguments[2];
+          y2 = arguments[3];
+          z2 = 0;
+        }
+
+        var lineVerts = [x1, y1, z1, x2, y2, z2];
+
+        var model = new PMatrix3D();
+        //model.scale(w, h, d);
+        var view = new PMatrix3D();
+        view.scale(1, -1, 1);
+        view.apply(modelView.array());
+
+        curContext.useProgram(programObject2D);
+        uniformMatrix(programObject2D, "model", true, model.array());
+        uniformMatrix(programObject2D, "view", true, view.array());
+        uniformMatrix(programObject2D, "projection", true, projection.array());
+
+        if (lineWidth > 0 && doStroke) {
+          curContext.useProgram(programObject2D);
+
+          uniformf(programObject2D, "color", strokeStyle);
+
+          curContext.lineWidth(lineWidth);
+
+          vertexAttribPointer(programObject2D, "Vertex", 3, lineBuffer);
+          curContext.bufferData(curContext.ARRAY_BUFFER, newWebGLArray(lineVerts), curContext.STREAM_DRAW);
+          curContext.drawArrays(curContext.LINES, 0, 2);
+        }
+      } else {
+        x1 = arguments[0];
+        y1 = arguments[1];
+        x2 = arguments[2];
+        y2 = arguments[3];
+
+        if (doStroke) {
+          curContext.beginPath();
+          curContext.moveTo(x1 || 0, y1 || 0);
+          curContext.lineTo(x2 || 0, y2 || 0);
+          curContext.stroke();
+          curContext.closePath();
+        }
+      }
+    };
+
+    p.bezier = function bezier(x1, y1, x2, y2, x3, y3, x4, y4) {
+      curContext.beginPath();
+      curContext.moveTo(x1, y1);
+      curContext.bezierCurveTo(x2, y2, x3, y3, x4, y4);
+      curContext.stroke();
+      curContext.closePath();
+    };
+
+    p.bezierPoint = function bezierPoint(a, b, c, d, t) {
+      return (1 - t) * (1 - t) * (1 - t) * a + 3 * (1 - t) * (1 - t) * t * b + 3 * (1 - t) * t * t * c + t * t * t * d;
+    };
+
+    p.bezierTangent = function bezierTangent(a, b, c, d, t) {
+      return (3 * t * t * (-a + 3 * b - 3 * c + d) + 6 * t * (a - 2 * b + c) + 3 * (-a + b));
+    };
+
+    p.curvePoint = function curvePoint(a, b, c, d, t) {
+      return 0.5 * ((2 * b) + (-a + c) * t + (2 * a - 5 * b + 4 * c - d) * t * t + (-a + 3 * b - 3 * c + d) * t * t * t);
+    };
+
+    p.curveTangent = function curveTangent(a, b, c, d, t) {
+      return 0.5 * ((-a + c) + 2 * (2 * a - 5 * b + 4 * c - d) * t + 3 * (-a + 3 * b - 3 * c + d) * t * t);
+    };
+
+    p.triangle = function triangle(x1, y1, x2, y2, x3, y3) {
+      p.beginShape(p.TRIANGLES);
+      p.vertex(x1, y1, 0);
+      p.vertex(x2, y2, 0);
+      p.vertex(x3, y3, 0);
+      p.endShape();
+    };
+
+    p.quad = function quad(x1, y1, x2, y2, x3, y3, x4, y4) {
+      p.beginShape(p.QUADS);
+      p.vertex(x1, y1, 0);
+      p.vertex(x2, y2, 0);
+      p.vertex(x3, y3, 0);
+      p.vertex(x4, y4, 0);
+      p.endShape();
+    };
+
+    p.rect = function rect(x, y, width, height) {
+      if (!width && !height) {
+        return;
+      }
+
+      curContext.beginPath();
+
+      var offsetStart = 0;
+      var offsetEnd = 0;
+
+      if (curRectMode === p.CORNERS) {
+        width -= x;
+        height -= y;
+      }
+
+      if (curRectMode === p.RADIUS) {
+        width *= 2;
+        height *= 2;
+      }
+
+      if (curRectMode === p.CENTER || curRectMode === p.RADIUS) {
+        x -= width / 2;
+        y -= height / 2;
+      }
+
+      curContext.rect(
+      Math.round(x) - offsetStart, Math.round(y) - offsetStart, Math.round(width) + offsetEnd, Math.round(height) + offsetEnd);
+
+      if (doFill) {
+        curContext.fill();
+      }
+      if (doStroke) {
+        curContext.stroke();
+      }
+
+      curContext.closePath();
+    };
+
+    p.ellipse = function ellipse(x, y, width, height) {
+      x = x || 0;
+      y = y || 0;
+
+      if (width <= 0 && height <= 0) {
+        return;
+      }
+
+      curContext.beginPath();
+
+      if (curEllipseMode === p.RADIUS) {
+        width *= 2;
+        height *= 2;
+      }
+
+      if (curEllipseMode === p.CORNERS) {
+        width = width - x;
+        height = height - y;
+      }
+
+      if (curEllipseMode === p.CORNER || curEllipseMode === p.CORNERS) {
+        x += width / 2;
+        y += height / 2;
+      }
+
+      var offsetStart = 0;
+
+      // Shortcut for drawing a circle
+      if (width === height) {
+        curContext.arc(x - offsetStart, y - offsetStart, width / 2, 0, p.TWO_PI, false);
+      } else {
+        var w = width / 2,
+          h = height / 2,
+          C = 0.5522847498307933;
+        var c_x = C * w,
+          c_y = C * h;
+
+        // TODO: Audit
+        curContext.moveTo(x + w, y);
+        curContext.bezierCurveTo(x + w, y - c_y, x + c_x, y - h, x, y - h);
+        curContext.bezierCurveTo(x - c_x, y - h, x - w, y - c_y, x - w, y);
+        curContext.bezierCurveTo(x - w, y + c_y, x - c_x, y + h, x, y + h);
+        curContext.bezierCurveTo(x + c_x, y + h, x + w, y + c_y, x + w, y);
+      }
+
+      if (doFill) {
+        curContext.fill();
+      }
+      if (doStroke) {
+        curContext.stroke();
+      }
+
+      curContext.closePath();
+    };
+
+    p.normal = function normal(nx, ny, nz) {
+      if (arguments.length !== 3 || !(typeof nx === "number" && typeof ny === "number" && typeof nz === "number")) {
+        throw "normal() requires three numeric arguments.";
+      }
+
+      normalX = nx;
+      normalY = ny;
+      normalZ = nz;
+
+      if (curShape !== 0) {
+        if (normalMode === p.NORMAL_MODE_AUTO) {
+          normalMode = p.NORMAL_MODE_SHAPE;
+        } else if (normalMode === p.NORMAL_MODE_SHAPE) {
+          normalMode = p.NORMAL_MODE_VERTEX;
+        }
+      }
+    };
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Raster drawing functions
+    ////////////////////////////////////////////////////////////////////////////
+
+    // TODO: function incomplete
+    p.save = function save(file) {};
+
+    var Temporary2DContext = document.createElement('canvas').getContext('2d');
+
+    var PImage = function PImage(aWidth, aHeight, aFormat) {
+      this.get = function(x, y, w, h) {
+        if (!arguments.length) {
+          return p.get(this);
+        } else if (arguments.length === 2) {
+          return p.get(x, y, this);
+        } else if (arguments.length === 4) {
+          return p.get(x, y, w, h, this);
+        }
+      };
+
+      this.set = function(x, y, c) {
+        p.set(x, y, c, this);
+      };
+
+      this.blend = function(srcImg, x, y, width, height, dx, dy, dwidth, dheight, MODE) {
+        if (arguments.length === 9) {
+          p.blend(this, srcImg, x, y, width, height, dx, dy, dwidth, dheight, this);
+        } else if (arguments.length === 10) {
+          p.blend(srcImg, x, y, width, height, dx, dy, dwidth, dheight, MODE, this);
+        }
+      };
+
+      this.copy = function(srcImg, sx, sy, swidth, sheight, dx, dy, dwidth, dheight) {
+        if (arguments.length === 8) {
+          p.blend(this, srcImg, sx, sy, swidth, sheight, dx, dy, dwidth, p.REPLACE, this);
+        } else if (arguments.length === 9) {
+          p.blend(srcImg, sx, sy, swidth, sheight, dx, dy, dwidth, dheight, p.REPLACE, this);
+        }
+      };
+
+      this.resize = function(w, h) {
+        if (this.width !== 0 || this.height !== 0) {
+          // make aspect ratio if w or h is 0
+          if (w === 0 && h !== 0) {
+            w = this.width / this.height * h;
+          } else if (h === 0 && w !== 0) {
+            h = w / (this.width / this.height);
+          }
+          // put 'this.imageData' into a new canvas
+          var canvas = document.createElement('canvas');
+          canvas.width = this.width;
+          canvas.height = this.height;
+          // changed for 0.9 slightly this one line
+          canvas.getContext('2d').putImageData(this.imageData, 0, 0);
+          // pass new canvas to drawimage with w,h
+          var canvasResized = document.createElement('canvas');
+          canvasResized.width = w;
+          canvasResized.height = h;
+          canvasResized.getContext('2d').drawImage(canvas, 0, 0, w, h);
+          // pull imageData object out of canvas into ImageData object
+          var imageData = canvasResized.getContext('2d').getImageData(0, 0, w, h);
+          // set this as new pimage
+          this.fromImageData(imageData);
+        }
+      };
+
+      this.mask = function(mask) {
+        this._mask = undefined;
+
+        if (mask instanceof PImage) {
+          if (mask.width === this.width && mask.height === this.height) {
+            this._mask = mask;
+          } else {
+            throw "mask must have the same dimensions as PImage.";
+          }
+        } else if (typeof mask === "object" && mask.constructor === Array) { // this is a pixel array
+          // mask pixel array needs to be the same length as this.pixels
+          // how do we update this for 0.9 this.imageData holding pixels ^^
+          // mask.constructor ? and this.pixels.length = this.imageData.data.length instead ?
+          if (this.pixels.length === mask.length) {
+            this._mask = mask;
+          } else {
+            throw "mask array must be the same length as PImage pixels array.";
+          }
+        }
+      };
+
+      // handle the sketch code for pixels[] and pixels.length
+      // parser code converts pixels[] to getPixels()
+      // or setPixels(), .length becomes getLength()
+      this.pixels = {
+        getLength: (function(aImg) {
+          return function() {
+            return aImg.imageData.data.length ? aImg.imageData.data.length/4 : 0;
+          };
+        }(this)),
+        getPixel: (function(aImg) {
+          return function(i) {
+            var offset = i*4;
+            return p.color.toInt(aImg.imageData.data[offset], aImg.imageData.data[offset+1],
+                                 aImg.imageData.data[offset+2], aImg.imageData.data[offset+3]);
+          };
+        }(this)),
+        setPixel: (function(aImg) {
+          return function(i,c) {
+            if(c && typeof c === "number") {
+              var offset = i*4;
+              // split c into array
+              var c2 = p.color.toArray(c);
+              // change pixel to c
+              aImg.imageData.data[offset] = c2[0];
+              aImg.imageData.data[offset+1] = c2[1];
+              aImg.imageData.data[offset+2] = c2[2];
+              aImg.imageData.data[offset+3] = c2[3];
+            }
+          };
+        }(this))
+      };
+
+      // These are intentionally left blank for PImages, we work live with pixels and draw as necessary
+      this.loadPixels = function() {};
+
+      this.updatePixels = function() {};
+
+      this.toImageData = function() {
+        // changed for 0.9
+        var canvas = document.createElement('canvas');
+        canvas.height = this.height;
+        canvas.width = this.width;
+        var ctx = canvas.getContext('2d');
+        ctx.putImageData(this.imageData, 0, 0);
+        return ctx.getImageData(0, 0, this.width, this.height);
+      };
+
+      this.toDataURL = function() {
+        var canvas = document.createElement('canvas');
+        canvas.height = this.height;
+        canvas.width = this.width;
+        var ctx = canvas.getContext('2d');
+        var imgData = ctx.createImageData(this.width, this.height);
+        // changed for 0.9
+        ctx.putImageData(this.imageData, 0, 0);
+        return canvas.toDataURL();
+      };
+
+      this.fromImageData = function(canvasImg) {
+        this.width = canvasImg.width;
+        this.height = canvasImg.height;
+        this.imageData = canvasImg;
+        // changed for 0.9
+        this.format = p.ARGB;
+        // changed for 0.9
+      };
+
+      this.fromHTMLImageData = function(htmlImg) {
+        // convert an <img> to a PImage
+        var canvas = document.createElement("canvas");
+        canvas.width = htmlImg.width;
+        canvas.height = htmlImg.height;
+        var context = canvas.getContext("2d");
+        context.drawImage(htmlImg, 0, 0);
+        var imageData = context.getImageData(0, 0, htmlImg.width, htmlImg.height);
+        this.fromImageData(imageData);
+      };
+
+      if (arguments.length === 1) {
+        // convert an <img> to a PImage
+        this.fromHTMLImageData(arguments[0]);
+      } else if (arguments.length === 2 || arguments.length === 3) {
+        this.width = aWidth || 1;
+        this.height = aHeight || 1;
+        // changed for 0.9
+        this.imageData = curContext.createImageData(this.width, this.height);
+        this.format = (aFormat === p.ARGB || aFormat === p.ALPHA) ? aFormat : p.RGB;
+      }
+    };
+
+    p.PImage = PImage;
+
+    try {
+      // Opera createImageData fix
+      if (! ("createImageData" in CanvasRenderingContext2D.prototype)) {
+        CanvasRenderingContext2D.prototype.createImageData = function(sw, sh) {
+          return this.getImageData(0, 0, sw, sh);
+        };
+      }
+    } catch(e) {}
+
+    p.createImage = function createImage(w, h, mode) {
+      // changed for 0.9
+      return new PImage(w,h,mode);
+    };
+
+    // Loads an image for display. Type is an extension. Callback is fired on load.
+    p.loadImage = function loadImage(file, type, callback) {
+      // if type is specified add it with a . to file to make the filename
+      if (type) {
+        file = file + "." + type;
+      }
+      // if image is in the preloader cache return a new PImage
+      if (p.pjs.imageCache[file]) {
+        return new PImage(p.pjs.imageCache[file]);
+      }
+      // else aysnc load it
+      else {
+        var pimg = new PImage(0, 0, p.ARGB);
+        var img = document.createElement('img');
+
+        pimg.sourceImg = img;
+
+        img.onload = (function(aImage, aPImage, aCallback) {
+          var image = aImage;
+          var pimg = aPImage;
+          var callback = aCallback;
+          return function() {
+            // change the <img> object into a PImage now that its loaded
+            pimg.fromHTMLImageData(image);
+            pimg.loaded = true;
+            if (callback) {
+              callback();
+            }
+          };
+        }(img, pimg, callback));
+
+        img.src = file; // needs to be called after the img.onload function is declared or it wont work in opera
+        return pimg;
+      }
+    };
+
+    // async loading of large images, same functionality as loadImage above
+    p.requestImage = p.loadImage;
+
+    // Gets a single pixel or block of pixels from the current Canvas Context or a PImage
+    p.get = function get(x, y, w, h, img) {
+      var c;
+      // for 0 2 and 4 arguments use curContext, otherwise PImage.get was called
+      if (!arguments.length) {
+        //return a PImage of curContext
+        c = new PImage(p.width, p.height, p.RGB);
+        c.fromImageData(curContext.getImageData(0, 0, p.width, p.height));
+        return c;
+      } else if (arguments.length === 5) {
+        // PImage.get(x,y,w,h) was called, return x,y,w,h PImage of img
+        // changed for 0.9, offset start point needs to be *4
+        var start = y * img.width * 4 + (x*4);
+        var end = (y + h) * img.width * 4 + ((x + w) * 4);
+        c = new PImage(w, h, p.RGB);
+        for (var i = start, j = 0; i < end; i++, j++) {
+          // changed in 0.9
+          c.imageData.data[j] = img.imageData.data[i];
+          if (j*4 + 1 % w === 0) {
+            //completed one line, increment i by offset
+            i += (img.width - w) * 4;
+          }
+        }
+        return c;
+      } else if (arguments.length === 4) {
+        // return a PImage of w and h from cood x,y of curContext
+        c = new PImage(w, h, p.RGB);
+        c.fromImageData(curContext.getImageData(x, y, w, h));
+        return c;
+      } else if (arguments.length === 3) {
+        // PImage.get(x,y) was called, return the color (int) at x,y of img
+        // changed in 0.9
+        var offset = y * w.width * 4 + (x * 4);
+        return p.color.toInt(w.imageData.data[offset],
+                           w.imageData.data[offset + 1],
+                           w.imageData.data[offset + 2],
+                           w.imageData.data[offset + 3]);
+      } else if (arguments.length === 2) {
+        // return the color at x,y (int) of curContext
+        // create a PImage object of size 1x1 and return the int of the pixels array element 0
+        if (x < p.width && x >= 0 && y >= 0 && y < p.height) {
+          // x,y is inside canvas space
+          c = new PImage(1, 1, p.RGB);
+          c.fromImageData(curContext.getImageData(x, y, 1, 1));
+          // changed for 0.9
+          return p.color.toInt(c.imageData.data[0],
+                               c.imageData.data[1],
+                               c.imageData.data[2],
+                               c.imageData.data[3]);
+        } else {
+          // x,y is outside image return transparent black
+          return 0;
+        }
+      } else if (arguments.length === 1) {
+        // PImage.get() was called, return the PImage
+        return x;
+      }
+    };
+
+    // Creates a new Processing instance and passes it back for... processing
+    p.createGraphics = function createGraphics(w, h) {
+      var canvas = document.createElement("canvas");
+      var ret = new Processing(canvas);
+      ret.size(w, h);
+      ret.canvas = canvas;
+      return ret;
+    };
+
+    // Paints a pixel array into the canvas
+    p.set = function set(x, y, obj, img) {
+      var color, oldFill;
+      // PImage.set(x,y,c) was called, set coordinate x,y color to c of img
+      if (arguments.length === 4) {
+        // changed in 0.9
+        var c = p.color.toArray(obj);
+        var offset = y * img.width * 4 + (x*4);
+        img.imageData.data[offset] = c[0];
+        img.imageData.data[offset+1] = c[1];
+        img.imageData.data[offset+2] = c[2];
+        img.imageData.data[offset+3] = c[3];
+      } else if (arguments.length === 3) {
+        // called p.set(), was it with a color or a img ?
+        if (typeof obj === "number") {
+          oldFill = curContext.fillStyle;
+          color = obj;
+          curContext.fillStyle = p.color.toString(color);
+          curContext.fillRect(Math.round(x), Math.round(y), 1, 1);
+          curContext.fillStyle = oldFill;
+        } else if (obj instanceof PImage) {
+          p.image(obj, x, y);
+        }
+      }
+    };
+    p.imageData = {};
+
+    // handle the sketch code for pixels[]
+    // parser code converts pixels[] to getPixels()
+    // or setPixels(), .length becomes getLength()
+    p.pixels = {
+      getLength: function() { return p.imageData.data.length ? p.imageData.data.length/4 : 0; },
+      getPixel: function(i) {
+        var offset = i*4;
+        return p.color.toInt(p.imageData.data[offset], p.imageData.data[offset+1],
+                             p.imageData.data[offset+2], p.imageData.data[offset+3]);
+      },
+      setPixel: function(i,c) {
+        if(c && typeof c === "number") {
+          var offset = i*4;
+          // split c into array
+          var c2 = p.color.toArray(c);
+          // change pixel to c
+          p.imageData.data[offset] = c2[0];
+          p.imageData.data[offset+1] = c2[1];
+          p.imageData.data[offset+2] = c2[2];
+          p.imageData.data[offset+3] = c2[3];
+        }
+      }
+    };
+
+    // Gets a 1-Dimensional pixel array from Canvas
+    p.loadPixels = function() {
+      // changed in 0.9
+      p.imageData = p.get(0, 0, p.width, p.height).imageData;
+    };
+
+    // Draws a 1-Dimensional pixel array to Canvas
+    p.updatePixels = function() {
+      // changed in 0.9
+      if (p.imageData) {
+        curContext.putImageData(p.imageData, 0, 0);
+      }
+    };
+
+    // Draw an image or a color to the background
+    p.background = function background() {
+      var color, a, img;
+
+      // background params are either a color or a PImage
+      if (typeof arguments[0] === 'number') {
+        color = p.color.apply(this, arguments);
+        // override alpha value, processing ignores the alpha for background color
+        color = color | p.ALPHA_MASK;
+      } else if (arguments.length === 1 && arguments[0] instanceof PImage) {
+        img = arguments[0];
+
+        if (!img.pixels || img.width !== p.width || img.height !== p.height) {
+          throw "Background image must be the same dimensions as the canvas.";
+        }
+      } else {
+        throw "Incorrect background parameters.";
+      }
+
+      if (p.use3DContext) {
+        if (typeof color !== 'undefined') {
+          var c = p.color.toGLArray(color);
+          refreshBackground = function() {
+            curContext.clearColor(c[0], c[1], c[2], c[3]);
+            curContext.clear(curContext.COLOR_BUFFER_BIT | curContext.DEPTH_BUFFER_BIT);
+          };
+        } else {
+          // Handle image background for 3d context. not done yet.
+          refreshBackground = function() {};
+        }
+      } else { // 2d context
+        if (typeof color !== 'undefined') {
+          refreshBackground = function() {
+            var oldFill = curContext.fillStyle;
+            curContext.fillStyle = p.color.toString(color);
+            curContext.fillRect(0, 0, p.width, p.height);
+            curContext.fillStyle = oldFill;
+          };
+        } else {
+          refreshBackground = function() {
+            p.image(img, 0, 0);
+          };
+        }
+      }
+      refreshBackground();
+    };
+
+    // Draws an image to the Canvas
+    p.image = function image(img, x, y, w, h) {
+      if (img.width > 0) {
+        var bounds = imageModeConvert(x || 0, y || 0, w || img.width, h || img.height, arguments.length < 4);
+        var obj = img.toImageData();
+
+        if (img._mask) {
+          var j, size;
+          if (img._mask instanceof PImage) {
+            var objMask = img._mask.toImageData();
+            for (j = 2, size = img.width * img.height * 4; j < size; j += 4) {
+              // using it as an alpha channel
+              obj.data[j + 1] = objMask.data[j];
+              // but only the blue color channel
+            }
+          } else {
+            for (j = 0, size = img._mask.length; j < size; ++j) {
+              obj.data[(j << 2) + 3] = img._mask[j];
+            }
+          }
+        }
+
+        // draw the image
+        //curContext.putImageData(obj, x, y); // this causes error if data overflows the canvas dimensions
+        curTint(obj);
+
+        var c = document.createElement('canvas');
+        c.width = obj.width;
+        c.height = obj.height;
+        var ctx = c.getContext('2d');
+        ctx.putImageData(obj, 0, 0);
+
+        curContext.drawImage(c, 0, 0, img.width, img.height, bounds.x, bounds.y, bounds.w, bounds.h);
+      }
+    };
+
+    // Clears a rectangle in the Canvas element or the whole Canvas
+    p.clear = function clear(x, y, width, height) {
+      if (arguments.length === 0) {
+        curContext.clearRect(0, 0, p.width, p.height);
+      } else {
+        curContext.clearRect(x, y, width, height);
+      }
+    };
+
+    p.tint = function tint() {
+      var tintColor = p.color.apply(this, arguments);
+      var r = p.red(tintColor) / colorModeX;
+      var g = p.green(tintColor) / colorModeY;
+      var b = p.blue(tintColor) / colorModeZ;
+      var a = p.alpha(tintColor) / colorModeA;
+
+      curTint = function(obj) {
+        var data = obj.data,
+          length = 4 * obj.width * obj.height;
+        for (var i = 0; i < length;) {
+          data[i++] *= r;
+          data[i++] *= g;
+          data[i++] *= b;
+          data[i++] *= a;
+        }
+      };
+    };
+
+    p.noTint = function noTint() {
+      curTint = function() {};
+    };
+
+    p.copy = function copy(src, sx, sy, sw, sh, dx, dy, dw, dh) {
+      if (arguments.length === 8) {
+        p.copy(p, src, sx, sy, sw, sh, dx, dy, dw);
+        return;
+      }
+      p.blend(src, sx, sy, sw, sh, dx, dy, dw, dh, p.REPLACE);
+    };
+
+    p.blend = function blend(src, sx, sy, sw, sh, dx, dy, dw, dh, mode, pimgdest) {
+      if (arguments.length === 9) {
+        p.blend(p, src, sx, sy, sw, sh, dx, dy, dw, dh);
+      } else if (arguments.length === 10 || arguments.length === 11) {
+        var sx2 = sx + sw;
+        var sy2 = sy + sh;
+        var dx2 = dx + dw;
+        var dy2 = dy + dh;
+        var dest;
+        // check if pimgdest is there and pixels, if so this was a call from pimg.blend
+        if (arguments.length === 10) {
+          p.loadPixels();
+          dest = p;
+        } else if (arguments.length === 11 && pimgdest && pimgdest.imageData) {
+          dest = pimgdest;
+        }
+        if (src === p) {
+          if (p.intersect(sx, sy, sx2, sy2, dx, dy, dx2, dy2)) {
+            p.blit_resize(p.get(sx, sy, sx2 - sx, sy2 - sy), 0, 0, sx2 - sx - 1, sy2 - sy - 1, dest.imageData.data, dest.width, dest.height, dx, dy, dx2, dy2, mode);
+          } else {
+            // same as below, except skip the loadPixels() because it'd be redundant
+            p.blit_resize(src, sx, sy, sx2, sy2, dest.imageData.data, dest.width, dest.height, dx, dy, dx2, dy2, mode);
+          }
+        } else {
+          src.loadPixels();
+          p.blit_resize(src, sx, sy, sx2, sy2, dest.imageData.data, dest.width, dest.height, dx, dy, dx2, dy2, mode);
+        }
+        if (arguments.length === 10) {
+          p.updatePixels();
+        }
+      }
+    };
+
+    // shared variables for blit_resize(), filter_new_scanline(), filter_bilinear()
+    // change this in the future to not be exposed to p
+    p.shared = {
+      fracU: 0,
+      ifU: 0,
+      fracV: 0,
+      ifV: 0,
+      u1: 0,
+      u2: 0,
+      v1: 0,
+      v2: 0,
+      sX: 0,
+      sY: 0,
+      iw: 0,
+      iw1: 0,
+      ih1: 0,
+      ul: 0,
+      ll: 0,
+      ur: 0,
+      lr: 0,
+      cUL: 0,
+      cLL: 0,
+      cUR: 0,
+      cLR: 0,
+      srcXOffset: 0,
+      srcYOffset: 0,
+      r: 0,
+      g: 0,
+      b: 0,
+      a: 0,
+      srcBuffer: null
+    };
+
+    p.intersect = function intersect(sx1, sy1, sx2, sy2, dx1, dy1, dx2, dy2) {
+      var sw = sx2 - sx1 + 1;
+      var sh = sy2 - sy1 + 1;
+      var dw = dx2 - dx1 + 1;
+      var dh = dy2 - dy1 + 1;
+      if (dx1 < sx1) {
+        dw += dx1 - sx1;
+        if (dw > sw) {
+          dw = sw;
+        }
+      } else {
+        var w = sw + sx1 - dx1;
+        if (dw > w) {
+          dw = w;
+        }
+      }
+      if (dy1 < sy1) {
+        dh += dy1 - sy1;
+        if (dh > sh) {
+          dh = sh;
+        }
+      } else {
+        var h = sh + sy1 - dy1;
+        if (dh > h) {
+          dh = h;
+        }
+      }
+      return ! (dw <= 0 || dh <= 0);
+    };
+
+    p.filter_new_scanline = function filter_new_scanline() {
+      p.shared.sX = p.shared.srcXOffset;
+      p.shared.fracV = p.shared.srcYOffset & p.PREC_MAXVAL;
+      p.shared.ifV = p.PREC_MAXVAL - p.shared.fracV;
+      p.shared.v1 = (p.shared.srcYOffset >> p.PRECISIONB) * p.shared.iw;
+      p.shared.v2 = Math.min((p.shared.srcYOffset >> p.PRECISIONB) + 1, p.shared.ih1) * p.shared.iw;
+    };
+
+    p.filter_bilinear = function filter_bilinear() {
+      p.shared.fracU = p.shared.sX & p.PREC_MAXVAL;
+      p.shared.ifU = p.PREC_MAXVAL - p.shared.fracU;
+      p.shared.ul = (p.shared.ifU * p.shared.ifV) >> p.PRECISIONB;
+      p.shared.ll = (p.shared.ifU * p.shared.fracV) >> p.PRECISIONB;
+      p.shared.ur = (p.shared.fracU * p.shared.ifV) >> p.PRECISIONB;
+      p.shared.lr = (p.shared.fracU * p.shared.fracV) >> p.PRECISIONB;
+      p.shared.u1 = (p.shared.sX >> p.PRECISIONB);
+      p.shared.u2 = Math.min(p.shared.u1 + 1, p.shared.iw1);
+      // get color values of the 4 neighbouring texels
+      // changed for 0.9
+      var cULoffset = (p.shared.v1 + p.shared.u1) * 4;
+      var cURoffset = (p.shared.v1 + p.shared.u2) * 4;
+      var cLLoffset = (p.shared.v2 + p.shared.u1) * 4;
+      var cLRoffset = (p.shared.v2 + p.shared.u2) * 4;
+      p.shared.cUL = p.color.toInt(p.shared.srcBuffer[cULoffset], p.shared.srcBuffer[cULoffset+1], p.shared.srcBuffer[cULoffset+2], p.shared.srcBuffer[cULoffset+3]);
+      p.shared.cUR = p.color.toInt(p.shared.srcBuffer[cURoffset], p.shared.srcBuffer[cURoffset+1], p.shared.srcBuffer[cURoffset+2], p.shared.srcBuffer[cURoffset+3]);
+      p.shared.cLL = p.color.toInt(p.shared.srcBuffer[cLLoffset], p.shared.srcBuffer[cLLoffset+1], p.shared.srcBuffer[cLLoffset+2], p.shared.srcBuffer[cLLoffset+3]);
+      p.shared.cLR = p.color.toInt(p.shared.srcBuffer[cLRoffset], p.shared.srcBuffer[cLRoffset+1], p.shared.srcBuffer[cLRoffset+2], p.shared.srcBuffer[cLRoffset+3]);
+      p.shared.r = ((p.shared.ul * ((p.shared.cUL & p.RED_MASK) >> 16) + p.shared.ll * ((p.shared.cLL & p.RED_MASK) >> 16) + p.shared.ur * ((p.shared.cUR & p.RED_MASK) >> 16) + p.shared.lr * ((p.shared.cLR & p.RED_MASK) >> 16)) << p.PREC_RED_SHIFT) & p.RED_MASK;
+      p.shared.g = ((p.shared.ul * (p.shared.cUL & p.GREEN_MASK) + p.shared.ll * (p.shared.cLL & p.GREEN_MASK) + p.shared.ur * (p.shared.cUR & p.GREEN_MASK) + p.shared.lr * (p.shared.cLR & p.GREEN_MASK)) >>> p.PRECISIONB) & p.GREEN_MASK;
+      p.shared.b = (p.shared.ul * (p.shared.cUL & p.BLUE_MASK) + p.shared.ll * (p.shared.cLL & p.BLUE_MASK) + p.shared.ur * (p.shared.cUR & p.BLUE_MASK) + p.shared.lr * (p.shared.cLR & p.BLUE_MASK)) >>> p.PRECISIONB;
+      p.shared.a = ((p.shared.ul * ((p.shared.cUL & p.ALPHA_MASK) >>> 24) + p.shared.ll * ((p.shared.cLL & p.ALPHA_MASK) >>> 24) + p.shared.ur * ((p.shared.cUR & p.ALPHA_MASK) >>> 24) + p.shared.lr * ((p.shared.cLR & p.ALPHA_MASK) >>> 24)) << p.PREC_ALPHA_SHIFT) & p.ALPHA_MASK;
+      return p.shared.a | p.shared.r | p.shared.g | p.shared.b;
+    };
+
+    p.blit_resize = function blit_resize(img, srcX1, srcY1, srcX2, srcY2, destPixels, screenW, screenH, destX1, destY1, destX2, destY2, mode) {
+      var x, y; // iterator vars
+      if (srcX1 < 0) {
+        srcX1 = 0;
+      }
+      if (srcY1 < 0) {
+        srcY1 = 0;
+      }
+      if (srcX2 >= img.width) {
+        srcX2 = img.width - 1;
+      }
+      if (srcY2 >= img.height) {
+        srcY2 = img.height - 1;
+      }
+      var srcW = srcX2 - srcX1;
+      var srcH = srcY2 - srcY1;
+      var destW = destX2 - destX1;
+      var destH = destY2 - destY1;
+      var smooth = true; // may as well go with the smoothing these days
+      if (!smooth) {
+        srcW++;
+        srcH++;
+      }
+      if (destW <= 0 || destH <= 0 || srcW <= 0 || srcH <= 0 || destX1 >= screenW || destY1 >= screenH || srcX1 >= img.width || srcY1 >= img.height) {
+        return;
+      }
+      var dx = Math.floor(srcW / destW * p.PRECISIONF);
+      var dy = Math.floor(srcH / destH * p.PRECISIONF);
+      p.shared.srcXOffset = Math.floor(destX1 < 0 ? -destX1 * dx : srcX1 * p.PRECISIONF);
+      p.shared.srcYOffset = Math.floor(destY1 < 0 ? -destY1 * dy : srcY1 * p.PRECISIONF);
+      if (destX1 < 0) {
+        destW += destX1;
+        destX1 = 0;
+      }
+      if (destY1 < 0) {
+        destH += destY1;
+        destY1 = 0;
+      }
+      destW = Math.min(destW, screenW - destX1);
+      destH = Math.min(destH, screenH - destY1);
+      // changed in 0.9, TODO
+      var destOffset = destY1 * screenW + destX1;
+      var destColor;
+      p.shared.srcBuffer = img.imageData.data;
+      if (smooth) {
+        // use bilinear filtering
+        p.shared.iw = img.width;
+        p.shared.iw1 = img.width - 1;
+        p.shared.ih1 = img.height - 1;
+        switch (mode) {
+        case p.BLEND:
+          for (y = 0; y < destH; y++) {
+            p.filter_new_scanline();
+            for (x = 0; x < destW; x++) {
+              // changed for 0.9
+              destColor = p.color.toInt(destPixels[(destOffset + x) * 4], destPixels[((destOffset + x) * 4) + 1], destPixels[((destOffset + x) * 4) + 2], destPixels[((destOffset + x) * 4) + 3]);
+              destColor = p.color.toArray(p.modes.blend(destColor, p.filter_bilinear()));
+              //destPixels[destOffset + x] = p.modes.blend(destPixels[destOffset + x], p.filter_bilinear());
+              destPixels[(destOffset + x) * 4] = destColor[0];
+              destPixels[(destOffset + x) * 4 + 1] = destColor[1];
+              destPixels[(destOffset + x) * 4 + 2] = destColor[2];
+              destPixels[(destOffset + x) * 4 + 3] = destColor[3];
+              p.shared.sX += dx;
+            }
+            destOffset += screenW;
+            p.shared.srcYOffset += dy;
+          }
+          break;
+        case p.ADD:
+          for (y = 0; y < destH; y++) {
+            p.filter_new_scanline();
+            for (x = 0; x < destW; x++) {
+              // changed for 0.9
+              destColor = p.color.toInt(destPixels[(destOffset + x) * 4], destPixels[((destOffset + x) * 4) + 1], destPixels[((destOffset + x) * 4) + 2], destPixels[((destOffset + x) * 4) + 3]);
+              destColor = p.color.toArray(p.modes.add(destColor, p.filter_bilinear()));
+              destColor = p.color.toArray(p.modes.add(destColor, p.filter_bilinear()));
+              //destPixels[destOffset + x] = p.modes.add(destPixels[destOffset + x], p.filter_bilinear());
+              destPixels[(destOffset + x) * 4] = destColor[0];
+              destPixels[(destOffset + x) * 4 + 1] = destColor[1];
+              destPixels[(destOffset + x) * 4 + 2] = destColor[2];
+              destPixels[(destOffset + x) * 4 + 3] = destColor[3];
+              p.shared.sX += dx;
+            }
+            destOffset += screenW;
+            p.shared.srcYOffset += dy;
+          }
+          break;
+        case p.SUBTRACT:
+          for (y = 0; y < destH; y++) {
+            p.filter_new_scanline();
+            for (x = 0; x < destW; x++) {
+              // changed for 0.9
+              destColor = p.color.toInt(destPixels[(destOffset + x) * 4], destPixels[((destOffset + x) * 4) + 1], destPixels[((destOffset + x) * 4) + 2], destPixels[((destOffset + x) * 4) + 3]);
+              destColor = p.color.toArray(p.modes.subtract(destColor, p.filter_bilinear()));
+              //destPixels[destOffset + x] = p.modes.subtract(destPixels[destOffset + x], p.filter_bilinear());
+              destPixels[(destOffset + x) * 4] = destColor[0];
+              destPixels[(destOffset + x) * 4 + 1] = destColor[1];
+              destPixels[(destOffset + x) * 4 + 2] = destColor[2];
+              destPixels[(destOffset + x) * 4 + 3] = destColor[3];
+              p.shared.sX += dx;
+            }
+            destOffset += screenW;
+            p.shared.srcYOffset += dy;
+          }
+          break;
+        case p.LIGHTEST:
+          for (y = 0; y < destH; y++) {
+            p.filter_new_scanline();
+            for (x = 0; x < destW; x++) {
+              // changed for 0.9
+              destColor = p.color.toInt(destPixels[(destOffset + x) * 4], destPixels[((destOffset + x) * 4) + 1], destPixels[((destOffset + x) * 4) + 2], destPixels[((destOffset + x) * 4) + 3]);
+              destColor = p.color.toArray(p.modes.lightest(destColor, p.filter_bilinear()));
+              //destPixels[destOffset + x] = p.modes.lightest(destPixels[destOffset + x], p.filter_bilinear());
+              destPixels[(destOffset + x) * 4] = destColor[0];
+              destPixels[(destOffset + x) * 4 + 1] = destColor[1];
+              destPixels[(destOffset + x) * 4 + 2] = destColor[2];
+              destPixels[(destOffset + x) * 4 + 3] = destColor[3];
+              p.shared.sX += dx;
+            }
+            destOffset += screenW;
+            p.shared.srcYOffset += dy;
+          }
+          break;
+        case p.DARKEST:
+          for (y = 0; y < destH; y++) {
+            p.filter_new_scanline();
+            for (x = 0; x < destW; x++) {
+              // changed for 0.9
+              destColor = p.color.toInt(destPixels[(destOffset + x) * 4], destPixels[((destOffset + x) * 4) + 1], destPixels[((destOffset + x) * 4) + 2], destPixels[((destOffset + x) * 4) + 3]);
+              destColor = p.color.toArray(p.modes.darkest(destColor, p.filter_bilinear()));
+              //destPixels[destOffset + x] = p.modes.darkest(destPixels[destOffset + x], p.filter_bilinear());
+              destPixels[(destOffset + x) * 4] = destColor[0];
+              destPixels[(destOffset + x) * 4 + 1] = destColor[1];
+              destPixels[(destOffset + x) * 4 + 2] = destColor[2];
+              destPixels[(destOffset + x) * 4 + 3] = destColor[3];
+              p.shared.sX += dx;
+            }
+            destOffset += screenW;
+            p.shared.srcYOffset += dy;
+          }
+          break;
+        case p.REPLACE:
+          for (y = 0; y < destH; y++) {
+            p.filter_new_scanline();
+            for (x = 0; x < destW; x++) {
+              // changed for 0.9
+              destColor = p.color.toInt(destPixels[(destOffset + x) * 4], destPixels[((destOffset + x) * 4) + 1], destPixels[((destOffset + x) * 4) + 2], destPixels[((destOffset + x) * 4) + 3]);
+              destColor = p.color.toArray(p.filter_bilinear());
+              //destPixels[destOffset + x] = p.filter_bilinear();
+              destPixels[(destOffset + x) * 4] = destColor[0];
+              destPixels[(destOffset + x) * 4 + 1] = destColor[1];
+              destPixels[(destOffset + x) * 4 + 2] = destColor[2];
+              destPixels[(destOffset + x) * 4 + 3] = destColor[3];
+              p.shared.sX += dx;
+            }
+            destOffset += screenW;
+            p.shared.srcYOffset += dy;
+          }
+          break;
+        case p.DIFFERENCE:
+          for (y = 0; y < destH; y++) {
+            p.filter_new_scanline();
+            for (x = 0; x < destW; x++) {
+              // changed for 0.9
+              destColor = p.color.toInt(destPixels[(destOffset + x) * 4], destPixels[((destOffset + x) * 4) + 1], destPixels[((destOffset + x) * 4) + 2], destPixels[((destOffset + x) * 4) + 3]);
+              destColor = p.color.toArray(p.modes.difference(destColor, p.filter_bilinear()));
+              //destPixels[destOffset + x] = p.modes.difference(destPixels[destOffset + x], p.filter_bilinear());
+              destPixels[(destOffset + x) * 4] = destColor[0];
+              destPixels[(destOffset + x) * 4 + 1] = destColor[1];
+              destPixels[(destOffset + x) * 4 + 2] = destColor[2];
+              destPixels[(destOffset + x) * 4 + 3] = destColor[3];
+              p.shared.sX += dx;
+            }
+            destOffset += screenW;
+            p.shared.srcYOffset += dy;
+          }
+          break;
+        case p.EXCLUSION:
+          for (y = 0; y < destH; y++) {
+            p.filter_new_scanline();
+            for (x = 0; x < destW; x++) {
+              // changed for 0.9
+              destColor = p.color.toInt(destPixels[(destOffset + x) * 4], destPixels[((destOffset + x) * 4) + 1], destPixels[((destOffset + x) * 4) + 2], destPixels[((destOffset + x) * 4) + 3]);
+              destColor = p.color.toArray(p.modes.exclusion(destColor, p.filter_bilinear()));
+              //destPixels[destOffset + x] = p.modes.exclusion(destPixels[destOffset + x], p.filter_bilinear());
+              destPixels[(destOffset + x) * 4] = destColor[0];
+              destPixels[(destOffset + x) * 4 + 1] = destColor[1];
+              destPixels[(destOffset + x) * 4 + 2] = destColor[2];
+              destPixels[(destOffset + x) * 4 + 3] = destColor[3];
+              p.shared.sX += dx;
+            }
+            destOffset += screenW;
+            p.shared.srcYOffset += dy;
+          }
+          break;
+        case p.MULTIPLY:
+          for (y = 0; y < destH; y++) {
+            p.filter_new_scanline();
+            for (x = 0; x < destW; x++) {
+              // changed for 0.9
+              destColor = p.color.toInt(destPixels[(destOffset + x) * 4], destPixels[((destOffset + x) * 4) + 1], destPixels[((destOffset + x) * 4) + 2], destPixels[((destOffset + x) * 4) + 3]);
+              destColor = p.color.toArray(p.modes.multiply(destColor, p.filter_bilinear()));
+              //destPixels[destOffset + x] = p.modes.multiply(destPixels[destOffset + x], p.filter_bilinear());
+              destPixels[(destOffset + x) * 4] = destColor[0];
+              destPixels[(destOffset + x) * 4 + 1] = destColor[1];
+              destPixels[(destOffset + x) * 4 + 2] = destColor[2];
+              destPixels[(destOffset + x) * 4 + 3] = destColor[3];
+              p.shared.sX += dx;
+            }
+            destOffset += screenW;
+            p.shared.srcYOffset += dy;
+          }
+          break;
+        case p.SCREEN:
+          for (y = 0; y < destH; y++) {
+            p.filter_new_scanline();
+            for (x = 0; x < destW; x++) {
+              // changed for 0.9
+              destColor = p.color.toInt(destPixels[(destOffset + x) * 4], destPixels[((destOffset + x) * 4) + 1], destPixels[((destOffset + x) * 4) + 2], destPixels[((destOffset + x) * 4) + 3]);
+              destColor = p.color.toArray(p.modes.screen(destColor, p.filter_bilinear()));
+              //destPixels[destOffset + x] = p.modes.screen(destPixels[destOffset + x], p.filter_bilinear());
+              destPixels[(destOffset + x) * 4] = destColor[0];
+              destPixels[(destOffset + x) * 4 + 1] = destColor[1];
+              destPixels[(destOffset + x) * 4 + 2] = destColor[2];
+              destPixels[(destOffset + x) * 4 + 3] = destColor[3];
+              p.shared.sX += dx;
+            }
+            destOffset += screenW;
+            p.shared.srcYOffset += dy;
+          }
+          break;
+        case p.OVERLAY:
+          for (y = 0; y < destH; y++) {
+            p.filter_new_scanline();
+            for (x = 0; x < destW; x++) {
+              // changed for 0.9
+              destColor = p.color.toInt(destPixels[(destOffset + x) * 4], destPixels[((destOffset + x) * 4) + 1], destPixels[((destOffset + x) * 4) + 2], destPixels[((destOffset + x) * 4) + 3]);
+              destColor = p.color.toArray(p.modes.overlay(destColor, p.filter_bilinear()));
+              //destPixels[destOffset + x] = p.modes.overlay(destPixels[destOffset + x], p.filter_bilinear());
+              destPixels[(destOffset + x) * 4] = destColor[0];
+              destPixels[(destOffset + x) * 4 + 1] = destColor[1];
+              destPixels[(destOffset + x) * 4 + 2] = destColor[2];
+              destPixels[(destOffset + x) * 4 + 3] = destColor[3];
+              p.shared.sX += dx;
+            }
+            destOffset += screenW;
+            p.shared.srcYOffset += dy;
+          }
+          break;
+        case p.HARD_LIGHT:
+          for (y = 0; y < destH; y++) {
+            p.filter_new_scanline();
+            for (x = 0; x < destW; x++) {
+              // changed for 0.9
+              destColor = p.color.toInt(destPixels[(destOffset + x) * 4], destPixels[((destOffset + x) * 4) + 1], destPixels[((destOffset + x) * 4) + 2], destPixels[((destOffset + x) * 4) + 3]);
+              destColor = p.color.toArray(p.modes.hard_light(destColor, p.filter_bilinear()));
+              //destPixels[destOffset + x] = p.modes.hard_light(destPixels[destOffset + x], p.filter_bilinear());
+              destPixels[(destOffset + x) * 4] = destColor[0];
+              destPixels[(destOffset + x) * 4 + 1] = destColor[1];
+              destPixels[(destOffset + x) * 4 + 2] = destColor[2];
+              destPixels[(destOffset + x) * 4 + 3] = destColor[3];
+              p.shared.sX += dx;
+            }
+            destOffset += screenW;
+            p.shared.srcYOffset += dy;
+          }
+          break;
+        case p.SOFT_LIGHT:
+          for (y = 0; y < destH; y++) {
+            p.filter_new_scanline();
+            for (x = 0; x < destW; x++) {
+              // changed for 0.9
+              destColor = p.color.toInt(destPixels[(destOffset + x) * 4], destPixels[((destOffset + x) * 4) + 1], destPixels[((destOffset + x) * 4) + 2], destPixels[((destOffset + x) * 4) + 3]);
+              destColor = p.color.toArray(p.modes.soft_light(destColor, p.filter_bilinear()));
+              //destPixels[destOffset + x] = p.modes.soft_light(destPixels[destOffset + x], p.filter_bilinear());
+              destPixels[(destOffset + x) * 4] = destColor[0];
+              destPixels[(destOffset + x) * 4 + 1] = destColor[1];
+              destPixels[(destOffset + x) * 4 + 2] = destColor[2];
+              destPixels[(destOffset + x) * 4 + 3] = destColor[3];
+              p.shared.sX += dx;
+            }
+            destOffset += screenW;
+            p.shared.srcYOffset += dy;
+          }
+          break;
+        case p.DODGE:
+          for (y = 0; y < destH; y++) {
+            p.filter_new_scanline();
+            for (x = 0; x < destW; x++) {
+              // changed for 0.9
+              destColor = p.color.toInt(destPixels[(destOffset + x) * 4], destPixels[((destOffset + x) * 4) + 1], destPixels[((destOffset + x) * 4) + 2], destPixels[((destOffset + x) * 4) + 3]);
+              destColor = p.color.toArray(p.modes.dodge(destColor, p.filter_bilinear()));
+              //destPixels[destOffset + x] = p.modes.dodge(destPixels[destOffset + x], p.filter_bilinear());
+              destPixels[(destOffset + x) * 4] = destColor[0];
+              destPixels[(destOffset + x) * 4 + 1] = destColor[1];
+              destPixels[(destOffset + x) * 4 + 2] = destColor[2];
+              destPixels[(destOffset + x) * 4 + 3] = destColor[3];
+              p.shared.sX += dx;
+            }
+            destOffset += screenW;
+            p.shared.srcYOffset += dy;
+          }
+          break;
+        case p.BURN:
+          for (y = 0; y < destH; y++) {
+            p.filter_new_scanline();
+            for (x = 0; x < destW; x++) {
+              // changed for 0.9
+              destColor = p.color.toInt(destPixels[(destOffset + x) * 4], destPixels[((destOffset + x) * 4) + 1], destPixels[((destOffset + x) * 4) + 2], destPixels[((destOffset + x) * 4) + 3]);
+              destColor = p.color.toArray(p.modes.burn(destColor, p.filter_bilinear()));
+              //destPixels[destOffset + x] = p.modes.burn(destPixels[destOffset + x], p.filter_bilinear());
+              destPixels[(destOffset + x) * 4] = destColor[0];
+              destPixels[(destOffset + x) * 4 + 1] = destColor[1];
+              destPixels[(destOffset + x) * 4 + 2] = destColor[2];
+              destPixels[(destOffset + x) * 4 + 3] = destColor[3];
+              p.shared.sX += dx;
+            }
+            destOffset += screenW;
+            p.shared.srcYOffset += dy;
+          }
+          break;
+        }
+      }
+    };
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Font handling
+    ////////////////////////////////////////////////////////////////////////////
+
+    // Loads a font from an SVG or Canvas API
+    p.loadFont = function loadFont(name) {
+      if (name.indexOf(".svg") === -1) {
+        return {
+          name: name,
+          width: function(str) {
+            if (curContext.mozMeasureText) {
+              return curContext.mozMeasureText(
+              typeof str === "number" ? String.fromCharCode(str) : str) / curTextSize;
+            } else {
+              return 0;
+            }
+          }
+        };
+      } else {
+        // If the font is a glyph, calculate by SVG table
+        var font = p.loadGlyphs(name);
+
+        return {
+          name: name,
+          glyph: true,
+          units_per_em: font.units_per_em,
+          horiz_adv_x: 1 / font.units_per_em * font.horiz_adv_x,
+          ascent: font.ascent,
+          descent: font.descent,
+          width: function(str) {
+            var width = 0;
+            var len = str.length;
+            for (var i = 0; i < len; i++) {
+              try {
+                width += parseFloat(p.glyphLook(p.glyphTable[name], str[i]).horiz_adv_x);
+              }
+              catch(e) {
+                Processing.debug(e);
+              }
+            }
+            return width / p.glyphTable[name].units_per_em;
+          }
+        };
+      }
+    };
+
+    p.createFont = function(name, size) {};
+
+    // Sets a 'current font' for use
+    p.textFont = function textFont(name, size) {
+      curTextFont = name;
+      p.textSize(size);
+    };
+
+    // Sets the font size
+    p.textSize = function textSize(size) {
+      if (size) {
+        curTextSize = size;
+      }
+    };
+
+    p.textAlign = function textAlign() {};
+
+    // A lookup table for characters that can not be referenced by Object
+    p.glyphLook = function glyphLook(font, chr) {
+      try {
+        switch (chr) {
+        case "1":
+          return font.one;
+        case "2":
+          return font.two;
+        case "3":
+          return font.three;
+        case "4":
+          return font.four;
+        case "5":
+          return font.five;
+        case "6":
+          return font.six;
+        case "7":
+          return font.seven;
+        case "8":
+          return font.eight;
+        case "9":
+          return font.nine;
+        case "0":
+          return font.zero;
+        case " ":
+          return font.space;
+        case "$":
+          return font.dollar;
+        case "!":
+          return font.exclam;
+        case '"':
+          return font.quotedbl;
+        case "#":
+          return font.numbersign;
+        case "%":
+          return font.percent;
+        case "&":
+          return font.ampersand;
+        case "'":
+          return font.quotesingle;
+        case "(":
+          return font.parenleft;
+        case ")":
+          return font.parenright;
+        case "*":
+          return font.asterisk;
+        case "+":
+          return font.plus;
+        case ",":
+          return font.comma;
+        case "-":
+          return font.hyphen;
+        case ".":
+          return font.period;
+        case "/":
+          return font.slash;
+        case "_":
+          return font.underscore;
+        case ":":
+          return font.colon;
+        case ";":
+          return font.semicolon;
+        case "<":
+          return font.less;
+        case "=":
+          return font.equal;
+        case ">":
+          return font.greater;
+        case "?":
+          return font.question;
+        case "@":
+          return font.at;
+        case "[":
+          return font.bracketleft;
+        case "\\":
+          return font.backslash;
+        case "]":
+          return font.bracketright;
+        case "^":
+          return font.asciicircum;
+        case "`":
+          return font.grave;
+        case "{":
+          return font.braceleft;
+        case "|":
+          return font.bar;
+        case "}":
+          return font.braceright;
+        case "~":
+          return font.asciitilde;
+          // If the character is not 'special', access it by object reference
+        default:
+          return font[chr];
+        }
+      } catch(e) {
+        Processing.debug(e);
+      }
+    };
+
+    // Print some text to the Canvas
+    p.text = function text() {
+      if (typeof arguments[0] !== 'undefined') {
+        var str = arguments[0],
+          x, y, z, pos, width, height;
+
+        if (typeof str === 'number' && (str + "").indexOf('.') >= 0) {
+          // Make sure .15 rounds to .1, but .151 rounds to .2.
+          if ((str * 1000) - Math.floor(str * 1000) === 0.5) {
+            str = str - 0.0001;
+          }
+          str = str.toFixed(3);
+        }
+
+        str = str.toString();
+
+        if (arguments.length === 1) { // for text( str )
+          p.text(str, lastTextPos[0], lastTextPos[1]);
+        } else if (arguments.length === 3) { // for text( str, x, y)
+          text(str, arguments[1], arguments[2], 0);
+        } else if (arguments.length === 4) { // for text( str, x, y, z)
+          x = arguments[1];
+          y = arguments[2];
+          z = arguments[3];
+
+          do {
+            pos = str.indexOf("\n");
+            if (pos !== -1) {
+              if (pos !== 0) {
+                text(str.substring(0, pos));
+              }
+              y += curTextSize;
+              str = str.substring(pos + 1, str.length);
+            }
+          } while (pos !== -1);
+
+          // TODO: handle case for 3d text
+          if (p.use3DContext) {
+          }
+
+          width = 0;
+
+          // If the font is a standard Canvas font...
+          if (!curTextFont.glyph) {
+            if (str && (curContext.fillText || curContext.mozDrawText)) {
+              curContext.save();
+              curContext.font = curContext.mozTextStyle = curTextSize + "px " + curTextFont.name;
+
+              if (curContext.fillText) {
+                curContext.fillText(str, x, y);
+                width = curContext.measureText(str).width;
+              } else if (curContext.mozDrawText) {
+                curContext.translate(x, y);
+                curContext.mozDrawText(str);
+                width = curContext.mozMeasureText(str);
+              }
+              curContext.restore();
+            }
+          } else {
+            // If the font is a Batik SVG font...
+            var font = p.glyphTable[curTextFont.name];
+            curContext.save();
+            curContext.translate(x, y + curTextSize);
+
+            var upem = font.units_per_em,
+              newScale = 1 / upem * curTextSize;
+
+            curContext.scale(newScale, newScale);
+
+            var len = str.length;
+
+            for (var i = 0; i < len; i++) {
+              // Test character against glyph table
+              try {
+                p.glyphLook(font, str[i]).draw();
+              } catch(e) {
+                Processing.debug(e);
+              }
+            }
+            curContext.restore();
+          }
+
+          // TODO: Handle case for 3d text
+          if (p.use3DContext) {
+          }
+
+          lastTextPos[0] = x + width;
+          lastTextPos[1] = y;
+          lastTextPos[2] = z;
+        } else if (arguments.length === 5) { // for text( str, x, y , width, height)
+          text(str, arguments[1], arguments[2], arguments[3], arguments[4], 0);
+        } else if (arguments.length === 6) { // for text( stringdata, x, y , width, height, z)
+          x = arguments[1];
+          y = arguments[2];
+          width = arguments[3];
+          height = arguments[4];
+          z = arguments[5];
+
+          if (str.length > 0) {
+            if (curTextSize > height) {
+              return;
+            }
+            var spaceMark = -1;
+            var start = 0;
+            var lineWidth = 0;
+            var letterWidth = 0;
+            var textboxWidth = width;
+
+            lastTextPos[0] = x;
+            lastTextPos[1] = y - 0.4 * curTextSize;
+
+            curContext.font = curTextSize + "px " + curTextFont.name;
+
+            for (var j = 0; j < str.length; j++) {
+              if (curContext.fillText) {
+                letterWidth = curContext.measureText(str[j]).width;
+              } else if (curContext.mozDrawText) {
+                letterWidth = curContext.mozMeasureText(str[j]);
+              }
+              if (str[j] !== "\n" && (str[j] === " " || (str[j - 1] !== " " && str[j + 1] === " ") || lineWidth + 2 * letterWidth < textboxWidth)) { // check a line of text
+                if (str[j] === " ") {
+                  spaceMark = j;
+                }
+                lineWidth += letterWidth;
+              } else { // draw a line of text
+                if (start === spaceMark + 1) { // in case a whole line without a space
+                  spaceMark = j;
+                }
+
+                lastTextPos[0] = x;
+                lastTextPos[1] = lastTextPos[1] + curTextSize;
+                if (str[j] === "\n") {
+                  text(str.substring(start, j));
+                  start = j + 1;
+                } else {
+                  text(str.substring(start, spaceMark + 1));
+                  start = spaceMark + 1;
+                }
+
+                lineWidth = 0;
+                if (lastTextPos[1] + 2 * curTextSize > y + height + 0.6 * curTextSize) { // stop if no enough space for one more line draw
+                  return;
+                }
+                j = start - 1;
+              }
+            }
+
+            if (start !== str.length) { // draw the last line
+              lastTextPos[0] = x;
+              lastTextPos[1] = lastTextPos[1] + curTextSize;
+              for (; start < str.length; start++) {
+                text(str[start]);
+              }
+            }
+
+          } // end str != ""
+        } // end arguments.length == 6
+      }
+    };
+
+    // Load Batik SVG Fonts and parse to pre-def objects for quick rendering
+    p.loadGlyphs = function loadGlyph(url) {
+      var x, y, cx, cy, nx, ny, d, a, lastCom, lenC, horiz_adv_x, getXY = '[0-9\\-]+', path;
+
+      // Return arrays of SVG commands and coords
+      // get this to use p.matchAll() - will need to work around the lack of null return
+      var regex = function regex(needle, hay) {
+        var i = 0,
+          results = [],
+          latest, regexp = new RegExp(needle, "g");
+        latest = results[i] = regexp.exec(hay);
+        while (latest) {
+          i++;
+          latest = results[i] = regexp.exec(hay);
+        }
+        return results;
+      };
+
+      var buildPath = function buildPath(d) {
+        var c = regex("[A-Za-z][0-9\\- ]+|Z", d);
+
+        // Begin storing path object
+        path = "var path={draw:function(){curContext.beginPath();curContext.save();";
+
+        x = 0;
+        y = 0;
+        cx = 0;
+        cy = 0;
+        nx = 0;
+        ny = 0;
+        d = 0;
+        a = 0;
+        lastCom = "";
+        lenC = c.length - 1;
+
+        // Loop through SVG commands translating to canvas eqivs functions in path object
+        for (var j = 0; j < lenC; j++) {
+          var com = c[j][0], xy = regex(getXY, com);
+
+          switch (com[0]) {
+            case "M":
+              //curContext.moveTo(x,-y);
+              x = parseFloat(xy[0][0]);
+              y = parseFloat(xy[1][0]);
+              path += "curContext.moveTo(" + x + "," + (-y) + ");";
+              break;
+
+            case "L":
+              //curContext.lineTo(x,-y);
+              x = parseFloat(xy[0][0]);
+              y = parseFloat(xy[1][0]);
+              path += "curContext.lineTo(" + x + "," + (-y) + ");";
+              break;
+
+            case "H":
+              //curContext.lineTo(x,-y)
+              x = parseFloat(xy[0][0]);
+              path += "curContext.lineTo(" + x + "," + (-y) + ");";
+              break;
+
+            case "V":
+              //curContext.lineTo(x,-y);
+              y = parseFloat(xy[0][0]);
+              path += "curContext.lineTo(" + x + "," + (-y) + ");";
+              break;
+
+            case "T":
+              //curContext.quadraticCurveTo(cx,-cy,nx,-ny);
+              nx = parseFloat(xy[0][0]);
+              ny = parseFloat(xy[1][0]);
+
+              if (lastCom === "Q" || lastCom === "T") {
+                d = Math.sqrt(Math.pow(x - cx, 2) + Math.pow(cy - y, 2));
+                a = Math.PI + Math.atan2(cx - x, cy - y);
+                cx = x + (Math.sin(a) * (d));
+                cy = y + (Math.cos(a) * (d));
+              } else {
+                cx = x;
+                cy = y;
+              }
+
+              path += "curContext.quadraticCurveTo(" + cx + "," + (-cy) + "," + nx + "," + (-ny) + ");";
+              x = nx;
+              y = ny;
+              break;
+
+            case "Q":
+              //curContext.quadraticCurveTo(cx,-cy,nx,-ny);
+              cx = parseFloat(xy[0][0]);
+              cy = parseFloat(xy[1][0]);
+              nx = parseFloat(xy[2][0]);
+              ny = parseFloat(xy[3][0]);
+              path += "curContext.quadraticCurveTo(" + cx + "," + (-cy) + "," + nx + "," + (-ny) + ");";
+              x = nx;
+              y = ny;
+              break;
+
+            case "Z":
+              //curContext.closePath();
+              path += "curContext.closePath();";
+              break;
+          }
+          lastCom = com[0];
+        }
+
+        path += "doStroke?curContext.stroke():0;";
+        path += "doFill?curContext.fill():0;";
+        path += "curContext.restore();";
+        path += "curContext.translate(" + horiz_adv_x + ",0);";
+        path += "}}";
+
+        return path;
+      };
+
+      // Parse SVG font-file into block of Canvas commands
+      var parseSVGFont = function parseSVGFontse(svg) {
+        // Store font attributes
+        var font = svg.getElementsByTagName("font");
+        p.glyphTable[url].horiz_adv_x = font[0].getAttribute("horiz-adv-x");
+
+        var font_face = svg.getElementsByTagName("font-face")[0];
+        p.glyphTable[url].units_per_em = parseFloat(font_face.getAttribute("units-per-em"));
+        p.glyphTable[url].ascent = parseFloat(font_face.getAttribute("ascent"));
+        p.glyphTable[url].descent = parseFloat(font_face.getAttribute("descent"));
+
+        var glyph = svg.getElementsByTagName("glyph"),
+          len = glyph.length;
+
+        // Loop through each glyph in the SVG
+        for (var i = 0; i < len; i++) {
+          // Store attributes for this glyph
+          var unicode = glyph[i].getAttribute("unicode");
+          var name = glyph[i].getAttribute("glyph-name");
+          horiz_adv_x = glyph[i].getAttribute("horiz-adv-x");
+          if (horiz_adv_x === null) {
+            horiz_adv_x = p.glyphTable[url].horiz_adv_x;
+          }
+          d = glyph[i].getAttribute("d");
+          // Split path commands in glpyh
+          if (d !== undefined) {
+            path = buildPath(d);
+            eval(path);
+            // Store glyph data to table object
+            p.glyphTable[url][name] = {
+              name: name,
+              unicode: unicode,
+              horiz_adv_x: horiz_adv_x,
+              draw: path.draw
+            };
+          }
+        } // finished adding glyphs to table
+      };
+
+      // Load and parse Batik SVG font as XML into a Processing Glyph object
+      var loadXML = function loadXML() {
+        var xmlDoc;
+
+        try {
+          xmlDoc = document.implementation.createDocument("", "", null);
+        }
+        catch(e_fx_op) {
+          Processing.debug(e_fx_op.message);
+          return;
+        }
+
+        try {
+          xmlDoc.async = false;
+          xmlDoc.load(url);
+          parseSVGFont(xmlDoc.getElementsByTagName("svg")[0]);
+        }
+        catch(e_sf_ch) {
+          // Google Chrome, Safari etc.
+          Processing.debug(e_sf_ch);
+          try {
+            var xmlhttp = new window.XMLHttpRequest();
+            xmlhttp.open("GET", url, false);
+            xmlhttp.send(null);
+            parseSVGFont(xmlhttp.responseXML.documentElement);
+          }
+          catch(e) {
+            Processing.debug(e_sf_ch);
+          }
+        }
+      };
+
+      // Create a new object in glyphTable to store this font
+      p.glyphTable[url] = {};
+
+      // Begin loading the Batik SVG font...
+      loadXML(url);
+
+      // Return the loaded font for attribute grabbing
+      return p.glyphTable[url];
+    };
+
+    ////////////////////////////////////////////////////////////////////////////
+    // Class methods
+    ////////////////////////////////////////////////////////////////////////////
+
+    p.extendClass = function extendClass(obj, args, fn) {
+      if (arguments.length === 3) {
+        fn.apply(obj, args);
+      } else {
+        args.call(obj);
+      }
+    };
+
+    p.addMethod = function addMethod(object, name, fn) {
+      if (object[name]) {
+        var args = fn.length,
+          oldfn = object[name];
+
+        object[name] = function() {
+          if (arguments.length === args) {
+            return fn.apply(this, arguments);
+          } else {
+            return oldfn.apply(this, arguments);
+          }
+        };
+      } else {
+        object[name] = fn;
+      }
+    };
+
+    //////////////////////////////////////////////////////////////////////////
+    // Event handling
+    //////////////////////////////////////////////////////////////////////////
+
+    p.pjs.eventHandlers = [];
+
+    function attach(elem, type, fn) {
+      if (elem.addEventListener) {
+        elem.addEventListener(type, fn, false);
+      } else {
+        elem.attachEvent("on" + type, fn);
+      }
+      p.pjs.eventHandlers.push([elem, type, fn]);
+    }
+
+    attach(curElement, "mousemove", function(e) {
+      var element = curElement, offsetX = 0, offsetY = 0;
+
+      p.pmouseX = p.mouseX;
+      p.pmouseY = p.mouseY;
+
+      if (element.offsetParent) {
+        do {
+          offsetX += element.offsetLeft;
+          offsetY += element.offsetTop;
+        } while (element = element.offsetParent);
+      }
+
+      // Dropping support for IE clientX and clientY, switching to pageX and pageY so we don't have to calculate scroll offset.
+      // Removed in ticket #184. See rev: 2f106d1c7017fed92d045ba918db47d28e5c16f4
+      p.mouseX = e.pageX - offsetX;
+      p.mouseY = e.pageY - offsetY;
+
+      if (p.mouseMoved && !mousePressed) {
+        p.mouseMoved();
+      }
+      if (mousePressed && p.mouseDragged) {
+        p.mouseDragged();
+        p.mouseDragging = true;
+      }
+    });
+
+    attach(curElement, "mouseout", function(e) {
+      //david gage changed here!
+      mousePressed = false;
+    });
+
+    attach(curElement, "mousedown", function(e) {
+      mousePressed = true;
+      p.mouseDragging = false;
+      switch (e.which) {
+      case 1:
+        p.mouseButton = p.LEFT;
+        break;
+      case 2:
+        p.mouseButton = p.CENTER;
+        break;
+      case 3:
+        p.mouseButton = p.RIGHT;
+        break;
+      }
+      p.mouseDown = true;
+      if (typeof p.mousePressed === "function") {
+        p.mousePressed();
+      } else {
+        p.mousePressed = true;
+      }
+    });
+
+    attach(curElement, "mouseup", function(e) {
+      mousePressed = false;
+      if (p.mouseClicked && !p.mouseDragging) {
+        p.mouseClicked();
+      }
+      if (typeof p.mousePressed !== "function") {
+        p.mousePressed = false;
+      }
+      if (p.mouseReleased) {
+        p.mouseReleased();
+      }
+    });
+
+    var mouseWheelHandler = function(e) {
+      var delta = 0;
+
+      if (e.wheelDelta) {
+        delta = e.wheelDelta / 120;
+        if (window.opera) {
+          delta = -delta;
+        }
+      } else if (e.detail) {
+        delta = -e.detail / 3;
+      }
+
+      p.mouseScroll = delta;
+
+      if (delta && typeof p.mouseScrolled === 'function') {
+        p.mouseScrolled();
+      }
+    };
+
+    // Support Gecko and non-Gecko scroll events
+    attach(document, 'DOMMouseScroll', mouseWheelHandler);
+    attach(document, 'mousewheel', mouseWheelHandler);
+
+    attach(document, "keydown", function(e) {
+      keyPressed = true;
+      p.keyCode = null;
+      p.key = e.keyCode;
+
+      // Letters
+      if (e.keyCode >= 65 && e.keyCode <= 90) { // A-Z
+        // Keys return ASCII for upcased letters.
+        // Convert to downcase if shiftKey is not pressed.
+        if (!e.shiftKey) {
+          p.key += 32;
+        }
+      }
+
+      // Numbers and their shift-symbols
+      else if (e.keyCode >= 48 && e.keyCode <= 57) { // 0-9
+        if (e.shiftKey) {
+          switch (e.keyCode) {
+          case 49:
+            p.key = 33;
+            break; // !
+          case 50:
+            p.key = 64;
+            break; // @
+          case 51:
+            p.key = 35;
+            break; // #
+          case 52:
+            p.key = 36;
+            break; // $
+          case 53:
+            p.key = 37;
+            break; // %
+          case 54:
+            p.key = 94;
+            break; // ^
+          case 55:
+            p.key = 38;
+            break; // &
+          case 56:
+            p.key = 42;
+            break; // *
+          case 57:
+            p.key = 40;
+            break; // (
+          case 48:
+            p.key = 41;
+            break; // )
+          }
+        }
+      }
+
+      // Coded keys
+      else if (codedKeys.indexOf(e.keyCode) >= 0) { // SHIFT, CONTROL, ALT, LEFT, RIGHT, UP, DOWN
+        p.key = p.CODED;
+        p.keyCode = e.keyCode;
+      }
+
+      // Symbols and their shift-symbols
+      else {
+        if (e.shiftKey) {
+          switch (e.keyCode) {
+          case 107:
+            p.key = 43;
+            break; // +
+          case 219:
+            p.key = 123;
+            break; // {
+          case 221:
+            p.key = 125;
+            break; // }
+          case 222:
+            p.key = 34;
+            break; // "
+          }
+        } else {
+          switch (e.keyCode) {
+          case 188:
+            p.key = 44;
+            break; // ,
+          case 109:
+            p.key = 45;
+            break; // -
+          case 190:
+            p.key = 46;
+            break; // .
+          case 191:
+            p.key = 47;
+            break; // /
+          case 192:
+            p.key = 96;
+            break; // ~
+          case 219:
+            p.key = 91;
+            break; // [
+          case 220:
+            p.key = 92;
+            break; // \
+          case 221:
+            p.key = 93;
+            break; // ]
+          case 222:
+            p.key = 39;
+            break; // '
+          }
+        }
+      }
+
+      if (typeof p.keyPressed === "function") {
+        p.keyPressed();
+      } else {
+        p.keyPressed = true;
+      }
+    });
+
+    attach(document, "keyup", function(e) {
+      keyPressed = false;
+      if (typeof p.keyPressed !== "function") {
+        p.keyPressed = false;
+      }
+      if (p.keyReleased) {
+        p.keyReleased();
+      }
+    });
+
+    attach(document, "keypress", function (e) {
+      if (p.keyTyped) {
+        p.keyTyped();
+      }
+    });
+
+    // Place-holder for debugging function
+    p.debug = function(e) {};
+
+    // Get the DOM element if string was passed
+    if (typeof curElement === "string") {
+      curElement = document.getElementById(curElement);
+    }
+
+    // Send aCode Processing syntax to be converted to JavaScript
+    if (aCode) {
+      var parsedCode = typeof aCode === "function" ? undefined : Processing.parse(aCode, p);
+
+      if (!this.use3DContext) {
+        // Setup default 2d canvas context.
+        curContext = curElement.getContext('2d');
+
+        modelView = new PMatrix2D();
+
+        // Canvas has trouble rendering single pixel stuff on whole-pixel
+        // counts, so we slightly offset it (this is super lame).
+        curContext.translate(0.5, 0.5);
+
+        curContext.lineCap = 'round';
+
+        // Set default stroke and fill color
+        p.stroke(0);
+        p.fill(255);
+        p.noSmooth();
+        p.disableContextMenu();
+      }
+
+      // Step through the libraries that were attached at doc load...
+      for (var i in Processing.lib) {
+        if (Processing.lib) {
+          // Init the libraries in the context of this p_instance
+          Processing.lib[i].call(this);
+        }
+      }
+
+      var localizedProperties = "";
+      for (var propertyName in p) {
+        localizedProperties += "var " + propertyName + "=__p__." + propertyName + ";";
+        if (typeof p[propertyName] !== "function" || typeof p[propertyName] !== "object") {
+          localizedProperties += "__p__.__defineGetter__('" + propertyName + "',function(){return " + propertyName + ";});" +
+                                 "__p__.__defineSetter__('" + propertyName + "',function(v){" + propertyName + "=v;});";
+        }
+      }
+
+      var executeSketch = function() {
+          // Don't start until all specified images in the cache are preloaded
+          if (!p.pjs.imageCache.pending) {
+            if(typeof aCode === "function") {
+              aCode(p);
+            } else {
+              eval (" (function(__p__) { " +
+                        localizedProperties +
+                        parsedCode +
+                    "   if (setup) {" +
+                    "     __p__.setup = setup;" +
+                    "     setup();" +
+                    "   }" +
+                    "   if (draw) {" +
+                    "     __p__.draw = draw;" +
+                    "     if (!doLoop) {" +
+                    "       redraw();" +
+                    "     } else {" +
+                    "       loop();" +
+                    "     }" +
+                    "   }" +
+                    " })(p);"
+              );
+            }
+          } else {
+            window.setTimeout(executeSketch, 10);
+          }
+      };
+
+      // The parser adds custom methods to the processing context
+      executeSketch();
+    }
+  };
+
+  // Share lib space
+  Processing.lib = {};
+
+  // Parse Processing (Java-like) syntax to JavaScript syntax with Regex
+  Processing.parse = function parse(aCode, p) {
+
+    // Function to grab all code in the opening and closing of two characters
+    var nextBrace = function(right, openChar, closeChar) {
+      var rest = right,
+          position = 0,
+          leftCount = 1,
+          rightCount = 0;
+
+      while (leftCount !== rightCount) {
+        var nextLeft = rest.indexOf(openChar),
+            nextRight = rest.indexOf(closeChar);
+
+        if (nextLeft < nextRight && nextLeft !== -1) {
+          leftCount++;
+          rest = rest.slice(nextLeft + 1);
+          position += nextLeft + 1;
+        } else {
+          rightCount++;
+          rest = rest.slice(nextRight + 1);
+          position += nextRight + 1;
+        }
+      }
+
+      return right.slice(0, position - 1);
+    };
+
+    // Force characters-as-bytes to work.
+    //aCode = aCode.replace(/('(.){1}')/g, "$1.charCodeAt(0)");
+    aCode = aCode.replace(/'.{1}'/g, function(all) {
+      return "(new Char(" + all + "))";
+    });
+
+    // Parse out @pjs directive, if any.
+    var dm = /\/\*\s*@pjs\s+((?:[^\*]|\*+[^\*\/])*)\*\//g.exec(aCode);
+    if (dm && dm.length === 2) {
+      var directives = dm.splice(1, 2)[0].replace('\n', '').replace('\r', '').split(';');
+
+      // We'll L/RTrim, and also remove any surrounding double quotes (e.g., just take string contents)
+      var clean = function(s) {
+        return s.replace(/^\s*\"?/, '').replace(/\"?\s*$/, '');
+      };
+
+      for (var i = 0, dl = directives.length; i < dl; i++) {
+        var pair = directives[i].split('=');
+        if (pair && pair.length === 2) {
+          var key = clean(pair[0]);
+          var value = clean(pair[1]);
+
+          // A few directives require work beyond storying key/value pairings
+          if (key === "preload") {
+            var list = value.split(',');
+            // All pre-loaded images will get put in imageCache, keyed on filename
+            for (var j = 0, ll = list.length; j < ll; j++) {
+              var imageName = clean(list[j]);
+              var img = new Image();
+              img.onload = (function() {
+                return function() {
+                  p.pjs.imageCache.pending--;
+                };
+              }());
+              p.pjs.imageCache.pending++;
+              p.pjs.imageCache[imageName] = img;
+              img.src = imageName;
+            }
+          } else if (key === "opaque") {
+            p.canvas.mozOpaque = value === "true";
+          } else {
+            p.pjs[key] = value;
+          }
+        }
+      }
+      aCode = aCode.replace(dm[0], '');
+    }
+
+    // Saves all strings into an array
+    // masks all strings into <STRING n>
+    // to be replaced with the array strings after parsing is finished
+    var strings = [];
+    aCode = aCode.replace(/(["'])(\\\1|.)*?(\1)/g, function(all) {
+      strings.push(all);
+      return "<STRING " + (strings.length - 1) + ">";
+    });
+
+    // Windows newlines cause problems:
+    aCode = aCode.replace(/\r\n?/g, "\n");
+
+    // Remove multi-line comments
+    aCode = aCode.replace(/\/\*[\s\S]*?\*\//g, "");
+
+    // Remove end-of-line comments
+    aCode = aCode.replace(/\/\/.*\n/g, "\n");
+
+    // Weird parsing errors with %
+    aCode = aCode.replace(/([^\s])%([^\s])/g, "$1 % $2");
+
+    // Since frameRate() and frameRate are different things,
+    // we need to differentiate them somehow. So when we parse
+    // the Processing.js source, replace frameRate so it isn't
+    // confused with frameRate().
+    aCode = aCode.replace(/(\s*=\s*|\(*\s*)frameRate(\s*\)+?|\s*;)/, "$1p.FRAME_RATE$2");
+
+    // Simple convert a function-like thing to function
+    aCode = aCode.replace(/(?:static )?(\w+(?:\[\])*\s+)(\w+)\s*(\([^\)]*\)\s*\{)/g, function(all, type, name, args) {
+      if (name === "if" || name === "for" || name === "while" || type === "public ") {
+        return all;
+      } else {
+        return "PROCESSING." + name + " = function " + name + args;
+      }
+    });
+
+    var matchMethod = /PROCESSING\.(\w+ = function \w+\([^\)]*\)\s*\{)/, mc;
+
+    while ((mc = aCode.match(matchMethod))) {
+      var prev = RegExp.leftContext,
+        allNext = RegExp.rightContext,
+        next = nextBrace(allNext, "{", "}");
+
+        aCode = prev + "processing." + mc[1] + next + "};" + allNext.slice(next.length + 1);
+    }
+
+    // Delete import statements, ie. import processing.video.*;
+    // https://processing-js.lighthouseapp.com/projects/41284/tickets/235-fix-parsing-of-java-import-statement
+    aCode = aCode.replace(/import\s+(.+);/g, "");
+
+    //replace  catch (IOException e) to catch (e)
+    aCode = aCode.replace(/catch\s*\(\W*\w*\s+(\w*)\W*\)/g, "catch ($1)");
+
+    //delete  the multiple catch block
+    var catchBlock = /(catch[^\}]*\})\W*catch[^\}]*\}/;
+
+    while (catchBlock.test(aCode)) {
+      aCode = aCode.replace(new RegExp(catchBlock), "$1");
+    }
+
+    Error.prototype.printStackTrace = function() {
+      this.toString();
+    };
+
+    // changes pixels[n] into pixels.getPixels(n)
+    // and pixels[n] = n2 into pixels.setPixels(n, n2)
+    var matchPixels = /pixels\s*\[/,
+        mp;
+
+    while ((mp = aCode.match(matchPixels))) {
+      var left = RegExp.leftContext,
+          allRest = RegExp.rightContext,
+          rest = nextBrace(allRest, "[", "]"),
+          getOrSet = "getPixel";
+
+      allRest = allRest.slice(rest.length + 1);
+
+      allRest = (function(){
+        return allRest.replace(/^\s*=([^;]*)([;])/, function(all, middle, end){
+          rest += ", " + middle;
+          getOrSet = "setPixel";
+          return end;
+        });
+      }());
+
+      aCode = left + "pixels." + getOrSet + "(" + rest + ")" + allRest;
+    }
+
+    // changes pixel.length to pixels.getLength()
+    aCode = aCode.replace(/pixels.length/g, "pixels.getLength()");
+
+    // Force .length() to be .length
+    aCode = aCode.replace(/\.length\(\)/g, ".length");
+
+    // foo( int foo, float bar )
+    aCode = aCode.replace(/([\(,]\s*)(\w+)((?:\[\])+|\s+)\s*(\w+\s*[\),])/g, "$1$4");
+    aCode = aCode.replace(/([\(,]\s*)(\w+)((?:\[\])+|\s+)\s*(\w+\s*[\),])/g, "$1$4");
+
+    // float[] foo = new float[5];
+    aCode = aCode.replace(/new\s+(\w+)\s*((?:\[(?:[^\]]*)\])+)\s*(\{[^;]*\}\s*;)*/g, function(all, name, args, initVars) {
+      if (initVars) {
+        return initVars.replace(/\{/g, "[").replace(/\}/g, "]");
+      } else {
+        return "new ArrayList(" + args.replace(/\[\]/g, "[0]").slice(1, -1).split("][").join(", ") + ");";
+      }
+    });
+
+    // What does this do? This does the same thing as "Fix Array[] foo = {...} to [...]" below
+    aCode = aCode.replace(/(?:static\s+)?\w+\[\]\s*(\w+)\[?\]?\s*=\s*\{.*?\};/g, function(all) {
+      return all.replace(/\{/g, "[").replace(/\}/g, "]");
+    });
+
+    // int|float foo;
+    var intFloat = /(\s*(?:int|float)\s+(?!\[\])*(?:\s*|[^\(;]*?,\s*))([a-zA-Z]\w*)\s*(,|;)/i;
+    while (intFloat.test(aCode)) {
+      aCode = (function() {
+        return aCode.replace(new RegExp(intFloat), function(all, type, name, sep) {
+          return type + " " + name + " = 0" + sep;
+        });
+      }());
+    }
+
+    // float foo = 5;
+    aCode = aCode.replace(/(?:final\s+)?(\w+)((?:\[\s*\])+|\s)\s*(\w+)\[?\]?(\s*[=,;])/g, function(all, type, arr, name, sep) {
+      if (type === "return" || type === "else") {
+        return all;
+      } else {
+        return "var " + name + sep;
+      }
+    });
+
+    // Fix Array[] foo = {...} to [...]
+    aCode = aCode.replace(/\=\s*\{((.|\s)*?\};)/g, function(all, data) {
+      return "= [" + data.replace(/\{/g, "[").replace(/\}/g, "]");
+    });
+
+    // super() is a reserved word
+    aCode = aCode.replace(/super\(/g, "superMethod(");
+
+    // Stores the variables and mathods of a single class
+    var SuperClass = function(name){
+      return {
+        className: name,
+        classVariables: "",
+        classFunctions: []
+      };
+    };
+    var arrayOfSuperClasses = [];
+
+    // implements Int1, Int2
+    aCode = aCode.replace(/implements\s+(\w+\s*(,\s*\w+\s*)*)\s*\{/g, function(all, interfaces) {
+      var names = interfaces.replace(/\s+/g, "").split(",");
+      return "{ var __psj_interfaces = new ArrayList([\"" + names.join("\", \"") + "\"]);";
+    });
+
+    // Simply turns an interface into a class
+    aCode = aCode.replace(/interface/g, "class");
+
+    var classes = ["int", "float", "boolean", "String", "byte", "double", "long", "ArrayList"];
+
+    var classReplace = function(all, name, extend) {
+      classes.push(name);
+
+      // Move arguments up from constructor
+      return "function " + name + "() {\n " +
+              (extend ? "var __self=this;function superMethod(){extendClass(__self,arguments," + extend + ");}\n" : "") +
+              (extend ? "extendClass(this, " + extend + ");\n" : "") +
+              "<CLASS " + name + " " + extend + ">";
+    };
+
+    var matchClasses = /(?:public\s+|abstract\s+|static\s+)*class\s+?(\w+)\s*(?:extends\s*(\w+)\s*)?\{/g;
+
+    aCode = aCode.replace(matchClasses, classReplace);
+
+    var matchClass = /<CLASS (\w+) (\w+)?>/,
+        m;
+
+    while ((m = aCode.match(matchClass))) {
+      var left = RegExp.leftContext,
+          allRest = RegExp.rightContext,
+          rest = nextBrace(allRest, "{", "}"),
+          className = m[1],
+          thisSuperClass = new SuperClass(className),
+          extendingClass = m[2];
+
+      allRest = allRest.slice(rest.length + 1);
+
+      // Fix class method names
+      // this.collide = function() { ... }
+      rest = (function() {
+        return rest.replace(/(?:public\s+)?processing.\w+ = function (\w+)\(([^\)]*?)\)/g, function(all, name, args) {
+          thisSuperClass.classFunctions.push(name + "|");
+          return "ADDMETHOD(this, '" + name + "', (function(public) { return function(" + args + ")";
+        });
+      }());
+
+      var matchMethod = /ADDMETHOD([^,]+, \s*?')([^']*)('[\s\S]*?\{[^\{]*?\{)/,
+          mc,
+          methods = "",
+          publicVars  = "",
+          methodsArray = [];
+
+      while ((mc = rest.match(matchMethod))) {
+        var prev = RegExp.leftContext,
+            allNext = RegExp.rightContext,
+            next = nextBrace(allNext, "{", "}");
+
+        methodsArray.push("addMethod" + mc[1] + mc[2] + mc[3] + next + "};})(this));\n");
+        publicVars += mc[2] + "|";
+
+        if (extendingClass){
+          for (var i = 0, aLength = arrayOfSuperClasses.length; i < aLength; i++){
+            if (extendingClass === arrayOfSuperClasses[i].className){
+              publicVars += arrayOfSuperClasses[i].classVariables;
+              for (var x = 0, fLength = arrayOfSuperClasses[i].classFunctions.length; x < fLength; x++){
+                publicVars += arrayOfSuperClasses[i].classFunctions[x];
+              }
+            }
+          }
+        }
+
+        rest = prev + allNext.slice(next.length + 1);
+      }
+
+      var matchConstructor = new RegExp("\\b" + className + "\\s*\\(([^\\)]*?)\\)\\s*{"),
+          c,
+          constructor = "",
+          constructorsArray = [];
+
+      // Extract all constructors and put them into the variable "constructors"
+      while ((c = rest.match(matchConstructor))) {
+        var prev = RegExp.leftContext,
+            allNext = RegExp.rightContext,
+            next = nextBrace(allNext, "{", "}"),
+            args = c[1];
+
+          args = args.split(/,\s*?/);
+
+        if (args[0].match(/^\s*$/)) {
+          args.shift();
+        }
+
+        constructor = "if ( arguments.length === " + args.length + " ) {\n";
+
+        for (var i = 0, aLength = args.length; i < aLength; i++) {
+          constructor += " var " + args[i] + " = arguments[" + i + "];\n";
+        }
+
+        constructor += next + "}\n";
+
+        constructorsArray.push(constructor);
+        rest = prev + allNext.slice(next.length + 1);
+      }
+
+      var vars = "",
+          staticVars = "",
+          localStaticVars = [];
+
+      // Put all member variables into "vars"
+      // and keep a list of all public variables
+      rest = (function(){
+        rest.replace(/(?:final|private|public)?\s*?(?:(static)\s+)?var\s+([^;]*?;)/g, function(all, staticVar, variable) {
+          variable = "this." + variable.replace(/,\s*/g, ";\nthis.")
+            .replace(/this.(\w+);/g, "this.$1 = null;") + '\n';
+
+          publicVars += variable.replace(/\s*this\.(\w+)\s*(;|=).*\s?/g, "$1|");
+          thisSuperClass.classVariables += variable.replace(/\s*this\.(\w+)\s*(;|=).*\s?/g, "$1|");
+
+          if (staticVar === "static"){
+            // Fix static methods
+            variable = variable.replace(/this\.(\w+)\s*=\s*([^;]*?;)/g, function(all, sVariable, value){
+              localStaticVars.push(sVariable);
+              value = value.replace(new RegExp("(" + localStaticVars.join("|") + ")", "g"), className + ".$1");
+              staticVars += className + "." + sVariable + " = " + value;
+              return "if (typeof " + className + "." + sVariable + " === 'undefined'){ " + className + "." + sVariable + " = " + value + " }\n" +
+                "this.__defineGetter__('" + sVariable + "', function(){ return "+ className + "." + sVariable + "; });\n" +
+                "this.__defineSetter__('" + sVariable + "', function(val){ " + className + "." + sVariable + " = val; });\n";
+            });
+          }
+          vars += variable;
+          return "";
+        });
+      }());
+
+
+      // add this. to public variables used inside member functions, and constructors
+      if (publicVars) {
+        // Search functions for public variables
+        for (var i = 0, aLength = methodsArray.length; i < aLength; i++){
+          methodsArray[i] = (function(){
+            return methodsArray[i].replace(/(addMethod.*?\{ return function\((.*?)\)\s*\{)([\s\S]*?)(\};\}\)\(this\)\);)/g, function(all, header, localParams, body, footer) {
+              body = body.replace(/this\./g, "public.");
+              localParams = localParams.replace(/\s*,\s*/g, "|");
+              return header + body.replace(new RegExp("(var\\s+?|\\.)?\\b(" + publicVars.substr(0, publicVars.length-1) + ")\\b", "g"), function (all, first, variable) {
+                if (first === ".") {
+                  return all;
+                } else if (/var\s*?$/.test(first)) {
+                  localParams += "|" + variable;
+                  return all;
+                } else if (localParams && new RegExp("\\b(" + localParams + ")\\b").test(variable)){
+                  return all;
+                } else {
+                  return "public." + variable;
+                }
+              }) + footer;
+            });
+          }());
+        }
+        // Search constructors for public variables
+        for (var i = 0, localParameters = "", aLength = constructorsArray.length; i < aLength; i++){
+          localParameters = "";
+          (function(){
+            constructorsArray[i].replace(/var\s+(\w+) = arguments\[[^\]]\];/g, function(all, localParam){
+              localParameters += localParam + "|";
+            });
+          }());
+          (function(){
+            constructorsArray[i] = constructorsArray[i].replace(new RegExp("(var\\s+?|\\.)?\\b(" + publicVars.substr(0, publicVars.length-1) + ")\\b", "g"), function (all, first, variable) {
+              if (first === ".") {
+                return all;
+              } else if (/var\s*?$/.test(first)) {
+                localParameters += variable + "|";
+                return all;
+              } else if (localParameters && new RegExp("\\b(" + localParameters.substr(0, localParameters.length-1) + ")\\b").test(variable)){
+                return all;
+              } else {
+                return "this." + variable;
+              }
+            });
+          }());
+        }
+      }
+
+      var constructors = "";
+
+      for (var i = 0, aLength = methodsArray.length; i < aLength; i++){
+        methods += methodsArray[i];
+      }
+      for (var i = 0, aLength = constructorsArray.length; i < aLength; i++){
+        constructors += constructorsArray[i];
+      }
+      arrayOfSuperClasses.push(thisSuperClass);
+      rest = vars + "\n" + methods + "\n" + constructors;
+      aCode = left + rest + "\n}" + staticVars + allRest;
+    }
+
+    // Do some tidying up, where necessary
+    aCode = aCode.replace(/processing.\w+ = function addMethod/g, "addMethod");
+
+    // Remove processing. from leftover functions
+    aCode = aCode.replace(/processing\.((\w+) = function)/g, "$1");
+
+    // Check if 3D context is invoked -- this is not the best way to do this.
+    if (aCode.match(/size\((?:.+),(?:.+),\s*(OPENGL|P3D)\s*\);/)) {
+      p.use3DContext = true;
+    }
+
+    // Handle (int) Casting
+    aCode = aCode.replace(/\(int\)/g, "0|");
+
+    // Remove Casting
+    aCode = aCode.replace(new RegExp("\\((" + classes.join("|") + ")(\\[\\])*\\)", "g"), "");
+
+    // Force numbers to exist //
+    //aCode = aCode.replace(/([^.])(\w+)\s*\+=/g, "$1$2 = ($2||0) +");
+    var toNumbers = function(str) {
+      var ret = [];
+
+      str.replace(/(..)/g, function(str) {
+        ret.push(parseInt(str, 16));
+      });
+
+      return ret;
+    };
+
+    // Convert #aaaaaa into color
+    aCode = aCode.replace(/#([a-f0-9]{6})/ig, function(m, hex) {
+      var num = toNumbers(hex);
+      return "defaultColor(" + num[0] + "," + num[1] + "," + num[2] + ")";
+    });
+
+    // Convert 3.0f to just 3.0
+    aCode = aCode.replace(/(\d+)f/g, "$1");
+
+    // replaces all masked strings from <STRING n> to the appropriate string contained in the strings array
+    for (var n = 0, sl = strings.length; n < sl; n++) {
+      aCode = (function() {
+        return aCode.replace(new RegExp("(.*)(<STRING " + n + ">)(.*)", "g"), function(all, quoteStart, match, quoteEnd) {
+          var returnString = all,
+            notString = true,
+            quoteType = "",
+            escape = false;
+
+          for (var x = 0, ql = quoteStart.length; x < ql; x++) {
+            if (notString) {
+              if (quoteStart.charAt(x) === "\"" || quoteStart.charAt(x) === "'") {
+                quoteType = quoteStart.charAt(x);
+                notString = false;
+              }
+            } else {
+              if (!escape) {
+                if (quoteStart.charAt(x) === "\\") {
+                  escape = true;
+                } else if (quoteStart.charAt(x) === quoteType) {
+                  notString = true;
+                  quoteType = "";
+                }
+              } else {
+                escape = false;
+              }
+            }
+          }
+
+          if (notString) { // Match is not inside a string
+            returnString = quoteStart + strings[n] + quoteEnd;
+          }
+
+          return returnString;
+        });
+      }());
+    }
+    return aCode;
+  };
+
+  // IE Unfriendly AJAX Method
+  var ajax = function(url) {
+    var AJAX = new window.XMLHttpRequest();
+    if (AJAX) {
+      AJAX.open("GET", url + "?t=" + new Date().getTime(), false);
+      AJAX.send(null);
+      return AJAX.responseText;
+    } else {
+      return false;
+    }
+  };
+
+  // Automatic Initialization Method
+  var init = function() {
+    var canvas = document.getElementsByTagName('canvas');
+
+    for (var i = 0, l = canvas.length; i < l; i++) {
+      // datasrc and data-src are deprecated.
+      var processingSources = canvas[i].getAttribute('data-processing-sources');
+      if (processingSources === null) {
+        // Temporary fallback for datasrc and data-src
+        processingSources = canvas[i].getAttribute('data-src');
+        if (processingSources === null) {
+          processingSources = canvas[i].getAttribute('datasrc');
+        }
+      }
+      if (processingSources) {
+        // The problem: if the HTML canvas dimensions differ from the
+        // dimensions specified in the size() call in the sketch, for
+        // 3D sketches, browsers will either not render or render the
+        // scene incorrectly. To fix this, we need to adjust the attributes
+        // of the canvas width and height.
+        // Get the source, we'll need to find what the user has used in size()
+        var filenames = processingSources.split(' ');
+        var code = "";
+        for (var j=0, fl=filenames.length; j<fl; j++) {
+          if (filenames[j]) {
+            code += ajax(filenames[j]) + ";\n"; // deal with files that don't end with newline
+          }
+        }
+        new Processing(canvas[i], code);
+      }
+    }
+  };
+
+  document.addEventListener('DOMContentLoaded', function() {
+    init();
+  }, false);
+
+}());
+
diff --git a/htdocs/js/tabber.js b/htdocs/js/tabber.js
new file mode 100644
index 0000000000..df2d8f71a6
--- /dev/null
+++ b/htdocs/js/tabber.js
@@ -0,0 +1,525 @@
+/*==================================================
+  $Id: tabber.js,v 1.9 2006/04/27 20:51:51 pat Exp $
+  tabber.js by Patrick Fitzgerald pat@barelyfitz.com
+
+  Documentation can be found at the following URL:
+  http://www.barelyfitz.com/projects/tabber/
+
+  License (http://www.opensource.org/licenses/mit-license.php)
+
+  Copyright (c) 2006 Patrick Fitzgerald
+
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation files
+  (the "Software"), to deal in the Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, sublicense, and/or sell copies of the Software,
+  and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+  ==================================================*/
+
+function tabberObj(argsObj)
+{
+  var arg; /* name of an argument to override */
+
+  /* Element for the main tabber div. If you supply this in argsObj,
+     then the init() method will be called.
+  */
+  this.div = null;
+
+  /* Class of the main tabber div */
+  this.classMain = "tabber";
+
+  /* Rename classMain to classMainLive after tabifying
+     (so a different style can be applied)
+  */
+  this.classMainLive = "tabberlive";
+
+  /* Class of each DIV that contains a tab */
+  this.classTab = "tabbertab";
+
+  /* Class to indicate which tab should be active on startup */
+  this.classTabDefault = "tabbertabdefault";
+
+  /* Class for the navigation UL */
+  this.classNav = "tabbernav";
+
+  /* When a tab is to be hidden, instead of setting display='none', we
+     set the class of the div to classTabHide. In your screen
+     stylesheet you should set classTabHide to display:none.  In your
+     print stylesheet you should set display:block to ensure that all
+     the information is printed.
+  */
+  this.classTabHide = "tabbertabhide";
+
+  /* Class to set the navigation LI when the tab is active, so you can
+     use a different style on the active tab.
+  */
+  this.classNavActive = "tabberactive";
+
+  /* Elements that might contain the title for the tab, only used if a
+     title is not specified in the TITLE attribute of DIV classTab.
+  */
+  this.titleElements = ['h2','h3','h4','h5','h6'];
+
+  /* Should we strip out the HTML from the innerHTML of the title elements?
+     This should usually be true.
+  */
+  this.titleElementsStripHTML = true;
+
+  /* If the user specified the tab names using a TITLE attribute on
+     the DIV, then the browser will display a tooltip whenever the
+     mouse is over the DIV. To prevent this tooltip, we can remove the
+     TITLE attribute after getting the tab name.
+  */
+  this.removeTitle = true;
+
+  /* If you want to add an id to each link set this to true */
+  this.addLinkId = false;
+
+  /* If addIds==true, then you can set a format for the ids.
+     <tabberid> will be replaced with the id of the main tabber div.
+     <tabnumberzero> will be replaced with the tab number
+       (tab numbers starting at zero)
+     <tabnumberone> will be replaced with the tab number
+       (tab numbers starting at one)
+     <tabtitle> will be replaced by the tab title
+       (with all non-alphanumeric characters removed)
+   */
+  this.linkIdFormat = '<tabberid>nav<tabnumberone>';
+
+  /* You can override the defaults listed above by passing in an object:
+     var mytab = new tabber({property:value,property:value});
+  */
+  for (arg in argsObj) { this[arg] = argsObj[arg]; }
+
+  /* Create regular expressions for the class names; Note: if you
+     change the class names after a new object is created you must
+     also change these regular expressions.
+  */
+  this.REclassMain = new RegExp('\\b' + this.classMain + '\\b', 'gi');
+  this.REclassMainLive = new RegExp('\\b' + this.classMainLive + '\\b', 'gi');
+  this.REclassTab = new RegExp('\\b' + this.classTab + '\\b', 'gi');
+  this.REclassTabDefault = new RegExp('\\b' + this.classTabDefault + '\\b', 'gi');
+  this.REclassTabHide = new RegExp('\\b' + this.classTabHide + '\\b', 'gi');
+
+  /* Array of objects holding info about each tab */
+  this.tabs = new Array();
+
+  /* If the main tabber div was specified, call init() now */
+  if (this.div) {
+
+    this.init(this.div);
+
+    /* We don't need the main div anymore, and to prevent a memory leak
+       in IE, we must remove the circular reference between the div
+       and the tabber object. */
+    this.div = null;
+  }
+}
+
+
+/*--------------------------------------------------
+  Methods for tabberObj
+  --------------------------------------------------*/
+
+
+tabberObj.prototype.init = function(e)
+{
+  /* Set up the tabber interface.
+
+     e = element (the main containing div)
+
+     Example:
+     init(document.getElementById('mytabberdiv'))
+   */
+
+  var
+  childNodes, /* child nodes of the tabber div */
+  i, i2, /* loop indices */
+  t, /* object to store info about a single tab */
+  defaultTab=0, /* which tab to select by default */
+  DOM_ul, /* tabbernav list */
+  DOM_li, /* tabbernav list item */
+  DOM_a, /* tabbernav link */
+  aId, /* A unique id for DOM_a */
+  headingElement; /* searching for text to use in the tab */
+
+  /* Verify that the browser supports DOM scripting */
+  if (!document.getElementsByTagName) { return false; }
+
+  /* If the main DIV has an ID then save it. */
+  if (e.id) {
+    this.id = e.id;
+  }
+
+  /* Clear the tabs array (but it should normally be empty) */
+  this.tabs.length = 0;
+
+  /* Loop through an array of all the child nodes within our tabber element. */
+  childNodes = e.childNodes;
+  for(i=0; i < childNodes.length; i++) {
+
+    /* Find the nodes where class="tabbertab" */
+    if(childNodes[i].className &&
+       childNodes[i].className.match(this.REclassTab)) {
+      
+      /* Create a new object to save info about this tab */
+      t = new Object();
+      
+      /* Save a pointer to the div for this tab */
+      t.div = childNodes[i];
+      
+      /* Add the new object to the array of tabs */
+      this.tabs[this.tabs.length] = t;
+
+      /* If the class name contains classTabDefault,
+	 then select this tab by default.
+      */
+      if (childNodes[i].className.match(this.REclassTabDefault)) {
+	defaultTab = this.tabs.length-1;
+      }
+    }
+  }
+
+  /* Create a new UL list to hold the tab headings */
+  DOM_ul = document.createElement("ul");
+  DOM_ul.className = this.classNav;
+  
+  /* Loop through each tab we found */
+  for (i=0; i < this.tabs.length; i++) {
+
+    t = this.tabs[i];
+
+    /* Get the label to use for this tab:
+       From the title attribute on the DIV,
+       Or from one of the this.titleElements[] elements,
+       Or use an automatically generated number.
+     */
+    t.headingText = t.div.title;
+
+    /* Remove the title attribute to prevent a tooltip from appearing */
+    if (this.removeTitle) { t.div.title = ''; }
+
+    if (!t.headingText) {
+
+      /* Title was not defined in the title of the DIV,
+	 So try to get the title from an element within the DIV.
+	 Go through the list of elements in this.titleElements
+	 (typically heading elements ['h2','h3','h4'])
+      */
+      for (i2=0; i2<this.titleElements.length; i2++) {
+	headingElement = t.div.getElementsByTagName(this.titleElements[i2])[0];
+	if (headingElement) {
+	  t.headingText = headingElement.innerHTML;
+	  if (this.titleElementsStripHTML) {
+	    t.headingText.replace(/<br>/gi," ");
+	    t.headingText = t.headingText.replace(/<[^>]+>/g,"");
+	  }
+	  break;
+	}
+      }
+    }
+
+    if (!t.headingText) {
+      /* Title was not found (or is blank) so automatically generate a
+         number for the tab.
+      */
+      t.headingText = i + 1;
+    }
+
+    /* Create a list element for the tab */
+    DOM_li = document.createElement("li");
+
+    /* Save a reference to this list item so we can later change it to
+       the "active" class */
+    t.li = DOM_li;
+
+    /* Create a link to activate the tab */
+    DOM_a = document.createElement("a");
+    DOM_a.appendChild(document.createTextNode(t.headingText));
+    DOM_a.href = "javascript:void(null);";
+    DOM_a.title = t.headingText;
+    DOM_a.onclick = this.navClick;
+
+    /* Add some properties to the link so we can identify which tab
+       was clicked. Later the navClick method will need this.
+    */
+    DOM_a.tabber = this;
+    DOM_a.tabberIndex = i;
+
+    /* Do we need to add an id to DOM_a? */
+    if (this.addLinkId && this.linkIdFormat) {
+
+      /* Determine the id name */
+      aId = this.linkIdFormat;
+      aId = aId.replace(/<tabberid>/gi, this.id);
+      aId = aId.replace(/<tabnumberzero>/gi, i);
+      aId = aId.replace(/<tabnumberone>/gi, i+1);
+      aId = aId.replace(/<tabtitle>/gi, t.headingText.replace(/[^a-zA-Z0-9\-]/gi, ''));
+
+      DOM_a.id = aId;
+    }
+
+    /* Add the link to the list element */
+    DOM_li.appendChild(DOM_a);
+
+    /* Add the list element to the list */
+    DOM_ul.appendChild(DOM_li);
+  }
+
+  /* Add the UL list to the beginning of the tabber div */
+  e.insertBefore(DOM_ul, e.firstChild);
+
+  /* Make the tabber div "live" so different CSS can be applied */
+  e.className = e.className.replace(this.REclassMain, this.classMainLive);
+
+  /* Activate the default tab, and do not call the onclick handler */
+  this.tabShow(defaultTab);
+
+  /* If the user specified an onLoad function, call it now. */
+  if (typeof this.onLoad == 'function') {
+    this.onLoad({tabber:this});
+  }
+
+  return this;
+};
+
+
+tabberObj.prototype.navClick = function(event)
+{
+  /* This method should only be called by the onClick event of an <A>
+     element, in which case we will determine which tab was clicked by
+     examining a property that we previously attached to the <A>
+     element.
+
+     Since this was triggered from an onClick event, the variable
+     "this" refers to the <A> element that triggered the onClick
+     event (and not to the tabberObj).
+
+     When tabberObj was initialized, we added some extra properties
+     to the <A> element, for the purpose of retrieving them now. Get
+     the tabberObj object, plus the tab number that was clicked.
+  */
+
+  var
+  rVal, /* Return value from the user onclick function */
+  a, /* element that triggered the onclick event */
+  self, /* the tabber object */
+  tabberIndex, /* index of the tab that triggered the event */
+  onClickArgs; /* args to send the onclick function */
+
+  a = this;
+  if (!a.tabber) { return false; }
+
+  self = a.tabber;
+  tabberIndex = a.tabberIndex;
+
+  /* Remove focus from the link because it looks ugly.
+     I don't know if this is a good idea...
+  */
+  a.blur();
+
+  /* If the user specified an onClick function, call it now.
+     If the function returns false then do not continue.
+  */
+  if (typeof self.onClick == 'function') {
+
+    onClickArgs = {'tabber':self, 'index':tabberIndex, 'event':event};
+
+    /* IE uses a different way to access the event object */
+    if (!event) { onClickArgs.event = window.event; }
+
+    rVal = self.onClick(onClickArgs);
+    if (rVal === false) { return false; }
+  }
+
+  self.tabShow(tabberIndex);
+
+  return false;
+};
+
+
+tabberObj.prototype.tabHideAll = function()
+{
+  var i; /* counter */
+
+  /* Hide all tabs and make all navigation links inactive */
+  for (i = 0; i < this.tabs.length; i++) {
+    this.tabHide(i);
+  }
+};
+
+
+tabberObj.prototype.tabHide = function(tabberIndex)
+{
+  var div;
+
+  if (!this.tabs[tabberIndex]) { return false; }
+
+  /* Hide a single tab and make its navigation link inactive */
+  div = this.tabs[tabberIndex].div;
+
+  /* Hide the tab contents by adding classTabHide to the div */
+  if (!div.className.match(this.REclassTabHide)) {
+    div.className += ' ' + this.classTabHide;
+  }
+  this.navClearActive(tabberIndex);
+
+  return this;
+};
+
+
+tabberObj.prototype.tabShow = function(tabberIndex)
+{
+  /* Show the tabberIndex tab and hide all the other tabs */
+
+  var div;
+
+  if (!this.tabs[tabberIndex]) { return false; }
+
+  /* Hide all the tabs first */
+  this.tabHideAll();
+
+  /* Get the div that holds this tab */
+  div = this.tabs[tabberIndex].div;
+
+  /* Remove classTabHide from the div */
+  div.className = div.className.replace(this.REclassTabHide, '');
+
+  /* Mark this tab navigation link as "active" */
+  this.navSetActive(tabberIndex);
+
+  /* If the user specified an onTabDisplay function, call it now. */
+  if (typeof this.onTabDisplay == 'function') {
+    this.onTabDisplay({'tabber':this, 'index':tabberIndex});
+  }
+
+  return this;
+};
+
+tabberObj.prototype.navSetActive = function(tabberIndex)
+{
+  /* Note: this method does *not* enforce the rule
+     that only one nav item can be active at a time.
+  */
+
+  /* Set classNavActive for the navigation list item */
+  this.tabs[tabberIndex].li.className = this.classNavActive;
+
+  return this;
+};
+
+
+tabberObj.prototype.navClearActive = function(tabberIndex)
+{
+  /* Note: this method does *not* enforce the rule
+     that one nav should always be active.
+  */
+
+  /* Remove classNavActive from the navigation list item */
+  this.tabs[tabberIndex].li.className = '';
+
+  return this;
+};
+
+
+/*==================================================*/
+
+
+function tabberAutomatic(tabberArgs)
+{
+  /* This function finds all DIV elements in the document where
+     class=tabber.classMain, then converts them to use the tabber
+     interface.
+
+     tabberArgs = an object to send to "new tabber()"
+  */
+  var
+    tempObj, /* Temporary tabber object */
+    divs, /* Array of all divs on the page */
+    i; /* Loop index */
+
+  if (!tabberArgs) { tabberArgs = {}; }
+
+  /* Create a tabber object so we can get the value of classMain */
+  tempObj = new tabberObj(tabberArgs);
+
+  /* Find all DIV elements in the document that have class=tabber */
+
+  /* First get an array of all DIV elements and loop through them */
+  divs = document.getElementsByTagName("div");
+  for (i=0; i < divs.length; i++) {
+    
+    /* Is this DIV the correct class? */
+    if (divs[i].className &&
+	divs[i].className.match(tempObj.REclassMain)) {
+      
+      /* Now tabify the DIV */
+      tabberArgs.div = divs[i];
+      divs[i].tabber = new tabberObj(tabberArgs);
+    }
+  }
+  
+  return this;
+}
+
+
+/*==================================================*/
+
+
+function tabberAutomaticOnLoad(tabberArgs)
+{
+  /* This function adds tabberAutomatic to the window.onload event,
+     so it will run after the document has finished loading.
+  */
+  var oldOnLoad;
+
+  if (!tabberArgs) { tabberArgs = {}; }
+
+  /* Taken from: http://simon.incutio.com/archive/2004/05/26/addLoadEvent */
+
+  oldOnLoad = window.onload;
+  if (typeof window.onload != 'function') {
+    window.onload = function() {
+	  if (typeof(initializeWWquestion) == 'function') {initializeWWquestion();}
+      tabberAutomatic(tabberArgs);
+    };
+  } else {
+    window.onload = function() {
+	  if (typeof(initializeWWquestion) == 'function') {initializeWWquestion();}
+      oldOnLoad();
+      tabberAutomatic(tabberArgs);
+    };
+  }
+}
+
+
+/*==================================================*/
+
+
+/* Run tabberAutomaticOnload() unless the "manualStartup" option was specified */
+
+if (typeof tabberOptions == 'undefined') {
+
+    tabberAutomaticOnLoad();
+
+} else {
+
+  if (!tabberOptions['manualStartup']) {
+    tabberAutomaticOnLoad(tabberOptions);
+  }
+
+}
diff --git a/htdocs/js/ww-windows.js b/htdocs/js/ww-windows.js
new file mode 100644
index 0000000000..c68b2ebd50
--- /dev/null
+++ b/htdocs/js/ww-windows.js
@@ -0,0 +1,26 @@
+window.focus();  //  bring the current window to the front
+                 //  (needed by Firefox when the target window
+                 //  is not frontmost)
+
+if (!window.ww) {window.ww = {}}
+try {ww.openerName = window.opener.name} catch (err) {ww.openerName = ""}
+
+ww.ReTarget = function () {
+  var tags = document.getElementsByTagName('a');
+  for (var i = 0; i < tags.length; i++) {
+    if (!tags[i].target && !tags[i].href.match(/pgProblemEditor/)) {tags[i].target = "WW_View"} 
+  }
+  tags = document.getElementsByTagName('form');
+  for (var i = 0; i < tags.length; i++) {
+    if (!tags[i].target && tags[i].id != 'editor') {tags[i].target = "WW_View"}
+  }
+}
+
+if (window.name == 'WW_Editor' ||
+   (document.title && document.title.match(/ Editor$/))) {
+  window.name = "WW_Editor";
+} else if (!window.opener || ww.openerName != 'WW_View') {
+  window.name = "WW_View";
+}
+
+if (window.name != "WW_View") {ww.ReTarget()}
diff --git a/htdocs/js/ww_applet_support.js b/htdocs/js/ww_applet_support.js
new file mode 100644
index 0000000000..6250119ffe
--- /dev/null
+++ b/htdocs/js/ww_applet_support.js
@@ -0,0 +1,714 @@
+// ################################################################################
+// # WeBWorK Online Homework Delivery System
+// # Copyright © 2000-2009 The WeBWorK Project, http://openwebwork.sf.net/
+// # $CVSHeader: webwork2/htdocs/js/ww_applet_support.js,v 1.12 2009/07/12 23:37:10 gage 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
+// # Free Software Foundation; either version 2, or (at your option) any later
+// # version, or (b) the "Artistic License" which comes with this package.
+// # 
+// # This program is distributed in the hope that it will be useful, but WITHOUT
+// # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// # FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+// # Artistic License for more details.
+// ################################################################################
+
+
+
+//////////////////////////////////////////////////////////
+// applet lists
+//////////////////////////////////////////////////////////
+
+
+	var  ww_applet_list                  = new Object;  // holds  java script version (jsApplet) ww_applet objects
+	
+	var TIMEOUT                          = 100;         // time delay between successive checks for applet readiness
+
+    
+//////////////////////////////////////////////////////////
+// DEBUGGING tools
+//////////////////////////////////////////////////////////
+	var jsDebugMode=0; // set this to one when needed for major debugging -- puts all applets in debugMode
+	var debugText = "";
+	function debug_add(str) { 
+			debugText = debugText + "\n" +str;
+	}
+	
+//////////////////////////////////////////////////////////
+// INITIALIZE and SUBMIT actions
+//////////////////////////////////////////////////////////
+
+function submitAction()  {    // called from the submit button defined in Problem.pm
+
+	if (jsDebugMode==1) {
+		debugText = "Call submitAction() function on each applet\n";
+	}
+
+	for (var appletName in ww_applet_list ) {
+			 ww_applet_list[appletName].submitAction();
+	}
+	if (jsDebugMode==1) { debug_add("\n Done calling submitAction() on each applet.\n");}
+	if (jsDebugMode==1) {
+		alert("DebugText:\n"+debugText); debugText="";
+	};
+}
+
+function initializeAction() {  // deprecated call -- removed
+	alert("You might be using an old template (stored at webwork2/conf/templates). The <body> tag in the system.template calls a function 'initializeAction()' instead of 'intializeWWquestion()'-- this function name should be replaced by 'initializeWWquestion()'. Please update to a recent version of system.template");
+	initializeWWquestion();
+}
+
+function initializeWWquestion() {    // called from <body> tag defined in the webwork2/conf/template
+	for (var appletName in ww_applet_list)  {	
+	    if (!ww_applet_list[appletName].onInit) {
+	    	var maxInitializationAttempts = ww_applet_list[appletName].maxInitializationAttempts;
+	    	//alert("Initialize each applet. \nUse up to " +maxInitializationAttempts + " cycles to load" +"\n");
+	    	this.debug_add("initializing " + appletName);
+			ww_applet_list[appletName].safe_applet_initialize(maxInitializationAttempts);
+		} 
+		// if onInit is defined then the onInit function will handle the initialization
+	}
+    this.debug_add("end of applet initialization");
+}
+
+// applet can set isReady flag by calling applet_loaded(appletName, loaded);
+function applet_loaded(appletName,ready) {
+	debug_add("applet reporting that it has been loaded = " + ready );
+	ww_applet_list[appletName].reportsLoaded = ready; // 0 means not loaded
+}
+
+
+// insures that applet is loaded before initializing it
+
+
+
+///////////////////////////////////////////////////////
+// Utility functions
+///////////////////////////////////////////////////////   
+    
+
+
+//  This has been replaced by defining the function in the classes
+// function getApplet(appletName) {
+// 	  var isIE = navigator.appName.indexOf("Microsoft") != -1;
+// 	  var obj = (isIE) ? window[appletName] : window.document[appletName];
+// 	  //return window.document[appletName];
+// 	  if (obj && (obj.name == appletName)) {   //RECENT FIX to ==
+// 		  return( obj );
+// 	  } else {
+// 		  alert ("can't find applet " + appletName);		  
+// 	  }
+//  }	
+
+function listQuestionElements() { // list all HTML input and textarea elements in main problem form
+   var isIE = navigator.appName.indexOf("Microsoft") != -1;
+   var elementList = (isIE) ?  document.getElementsByTagName("input") : document.problemMainForm.getElementsByTagName("input");
+   var str=elementList.length +" Question Elements\n type | name = value  < id > \n";
+   for( var i=0; i< elementList.length; i++) {
+	   str = str + " "+i+" " + elementList[i].type 
+					   + " | " + elementList[i].name 
+					   + "= " + elementList[i].value + 
+					   " <" + elementList[i].id + ">\n";
+   }
+   elementList = (isIE) ?  document.getElementsByTagName("textarea") : document.problemMainForm.getElementsByTagName("textarea");
+   for( var i=0; i< elementList.length; i++) {
+	   str = str + " "+i+" " + elementList[i].type 
+					   + " | " + elementList[i].name 
+					   + "= " + elementList[i].value + 
+					   " <" + elementList[i].id + ">\n";
+   }
+   var msg = "    ( Place listQuestionElements() at end of document in order to get all form elements! )\n"+str;
+   alert(msg);
+}
+
+function base64Q(str) {   /// determine whether an XML string has been base64 encoded.
+    if (! str ) {
+          return( 0 ); // the empty string is not a base64 string.
+    } else if (str.match(/[<>]+/ ) ) {
+    	  return( 0 );  // base64 can't contain <  or >  and xml strings contain lots of them
+    } else {
+    	  return(1);   // it's probably a non-empty base64 string.
+    }
+}
+function setHTMLAppletStateToRestart(appletName){ // resets the state stored on HTML page not in the applet
+	var newState = "<xml>restart_applet</xml>";
+	getQE(appletName+"_state").value = newState;
+	getQE("previous_" + appletName + "_state").value = newState;
+}
+function setHTMLAppletState(appletName, newState){ // resets the state stored on the HTML page
+	var newState = "<xml></xml>";
+	getQE(appletName+"_state").value = newState;
+	getQE("previous_" + appletName + "_state").value = newState;
+}
+function getQE(name1) { // get Question Element in problemMainForm by name
+	//var isIE = navigator.appName.indexOf("Microsoft") != -1;
+	//var obj = (isIE) ? document.getElementById(name1)
+	//					:document.problemMainForm[name1]; 
+	
+	var obj = document.getElementById(name1);
+	if (!obj) {obj = document.problemMainForm[name1]}
+	
+	// needed for IE -- searches id and name space so it can be unreliable if names are not unique
+	if (!obj || obj.name != name1) {
+	    var msg = "Can't find element " + name1;
+		if (jsDebugMode==1) {
+			debug_add(msg + "\n ( Place listQuestionElements() at end of document in order to get all form elements! )\n" );
+		} else {
+			alert(msg);  listQuestionElements(); 
+		};
+				
+	} else {
+		return( obj );
+	}
+	
+}
+
+
+function getQuestionElement(name1) {
+	return getQE(name1);
+}
+	
+	
+///////////////////////////////////////////////////////
+// WW_Applet   class definition
+///////////////////////////////////////////////////////   
+    
+function ww_applet(appletName) {
+	this.appletName              = appletName;
+	this.code                    = '';
+	this.codebase                = '';
+	this.appletID                = '';
+//	this.base64_state            = '';
+//	this.base64_config           = '';
+    this.configuration           = '';
+    this.initialState            = '';
+	this.getStateAlias           = '';
+	this.setStateAlias           = '';
+	this.configAlias             = '';
+	this.initializeActionAlias   = '';
+	this.submitActionAlias       = '';
+	this.submitActionScript      = '';
+	this.getAnswerAlias          = '';
+	this.answerBox               = '';
+	this.debugMode               = 0 ;
+	this.isReady                 = 0 ;
+	this.reportsLoaded           = 0 ;
+};
+//////////////////////////////////////////////////////////
+// methodDefined
+//
+// make sure that the applet has this function available
+//////////////////////////////////////////////////////////
+
+ww_applet.prototype.methodDefined = function(methodName) {
+	var appletName = this.appletName;
+	var applet     = getApplet(appletName);
+	//alert("applet is undefined = " + (typeof(applet)=="undefined"));
+	//alert("applet["+methodName+ "] is undefined " + (  typeof(applet[methodName]) == "undefined"  )      );
+	//alert ("applet method has type of " +typeof(applet[methodName]) );
+	if (!methodName) {  // no methodName is defined
+		return(false);
+	}
+	try {
+		if (typeof(applet[methodName]) != "undefined" ) {  
+		    // ie8 returns "unknown" instead of "function" so we check for anything but "undefined"
+			this.debug_add("Method " + methodName + " is defined in " + appletName );
+			return(true);
+		} else {
+			this.debug_add("Method " + methodName + " is not defined in " + appletName); 
+			throw("undefined applet method");
+		}
+	} catch(e) {
+		var msg = "Error in accessing " + methodName + " in applet " +appletName + "\n  *Error: " +e ;
+		this.debug_add(msg);
+	}
+	return(false);
+}
+
+//////////////////////////////////////////////////////////
+//CONFIGURATIONS
+//
+// configurations are "permanent"
+//////////////////////////////////////////////////////////
+ww_applet.prototype.setConfig = function () {
+        
+        var appletName  = this.appletName;
+		var applet      = getApplet(appletName);
+		var setConfigAlias = this.setConfigAlias;
+
+       
+	   try {
+		    if ( this.methodDefined(this.setConfigAlias) ) {
+    			applet[setConfigAlias](this.configuration);
+    			this.debug_add("  Configuring applet: Calling " + appletName +"."+ setConfigAlias +"( " + this.configuration + " ) " );
+    		} else {
+    		    this.debug_add("  Configuring applet: Unable to execute command |" + setConfigAlias + "| in the applet "+ appletName +" with data ( \"" + this.configuration + "\" ) " );
+    		}
+    	
+    	} catch(e) {
+    	
+    	    var msg = "Error in configuring applet  " + appletName + " using command " + setConfigAlias + " : " + e ;
+			alert(msg);
+    	}
+    	
+  
+ };
+ 
+ ww_applet.prototype.getConfig = function() {                    // used for debugging purposes -- gets the configuration from the applet
+ 
+
+	var appletName     = this.appletName;
+	var applet         = getApplet(appletName);	
+	var getConfigAlias = this.getConfigAlias;
+	
+
+	try {
+		if (this.methodDefined(getConfigAlias) ) {
+  			alert( applet[getConfigAlias]() );
+ 		} else {
+    		    this.debug_add("  unable to execute " + appletName +"."+ getConfigAlias +"( " + this.configuration + " ) " );
+  		}
+    } catch(e) {
+    	var msg = "    Error in getting configuration from applet " + appletName + " " + e;
+    	alert(msg);
+    }  
+}
+	
+ 
+ 
+////////////////////////////////////////////////////////////
+//
+//STATE:
+// state can vary as the applet is manipulated -- it is reset from the questions _state values
+//
+////////////////////////////////////////////////////////// 
+
+
+ww_applet.prototype.setState = function(state) { 
+   
+	var appletName      = this.appletName;
+	var applet          = getApplet(appletName);
+	var setStateAlias   = this.setStateAlias;
+	this.debug_add("\n++++++++++++++++++++++++++++++++++++++++\nBegin process of setting state for applet " + appletName);
+////////////////////////////////////////////////////////// 
+// Obtain the state which will be sent to the applet and if it is encoded place it in plain xml text
+// Communication with the applet is in plain text,not in base64 code.
+////////////////////////////////////////////////////////// 
+	if (state) {
+		this.debug_add("Obtain state from calling parameter:\n " + state + "\n");
+	} else {
+		this.debug_add("Obtain state from " + appletName +"_state");
+	
+		var ww_preserve_applet_state = getQE(appletName + "_state"); // hidden answer box preserving applet state
+		state =   ww_preserve_applet_state.value;
+		var str = state;
+		this.debug_add("immediately on grabbing state from HTML cache state is " +state+"...");
+	}
+	
+	if ( base64Q(state) ) { 
+		state=Base64.decode(state);
+		this.debug_add("decode from " +state);
+		if (this.debugMode>=1) { //decode text for the text area box
+			ww_preserve_applet_state.value = state;
+			
+		}
+        this.debug_add("decoded to " + ww_preserve_applet_state.value);	
+	}
+	
+//////////////////////////////////////////////////////////
+// Handle the exceptional cases:
+//
+//If the state is blank, undefined, or explicitly defined as restart_applet
+// then we will not simply be restoring the state of the applet from HTML "memory"
+//
+// 1. For a restart we wipe the HTML state cache so that we won't restart again
+// 2. In the other "empty" cases we attempt to replace the state with the contents of the 
+// initialState variable. 
+//////////////////////////////////////////////////////////
+
+//////////////////////////////////////////////////////////
+// Exceptional cases
+//////////////////////////////////////////////////////////
+	if (state.match(/^<xml>restart_applet<\/xml>/) || 
+	    state.match(/^\s*$/) ||
+	    state.match(/^<xml>\s*<\/xml>/ ) ) { 
+	    
+	       this.debug_add("Beginning handling exceptional cases when the state is not simply restored from the HTML cache. State is: "+state);
+		
+//		if (state.match(/^<xml>restart_applet<\/xml>/) ) {
+		    if (typeof(this.initialState) == "undefined") {this.initialState = "<xml></xml>";}
+		         debug_add("restart_applet has been called. the value of the initialState is " + this.initialState );
+		    if(  this.initialState.match(/^<xml>\s*<\/xml>/)  || this.initialState.match(/^\s*$/)  ){ // if the initial state is empty
+		    	 debug_add("The applet " +appletName + " has been restarted. There was no non-empty initialState value. \n  Nothing is sent to the applet.  \n  Done setting state");
+		    	 if (state.match(/^<xml>restart_applet<\/xml>/) ) {
+		    	 	alert("the applet is being restarted with empty initialState");
+		    	 }
+		    	 setHTMLAppletState(appletName,"<xml></xml>");  // so that the submit action will not be overridden by restart_applet.
+				 return(''); // don't call the setStateAlias function at all.
+				 /// quit because we know we will not transmitting any starting data to the applet
+			} else {		     
+				 state = this.initialState;
+				if ( base64Q(state) ) { 
+					state=Base64.decode(state);
+				}
+			     debug_add("The applet " +appletName + "has been set to its virgin state value." +state);
+			     if (state.match(/^<xml>restart_applet<\/xml>/) ) {
+			     	alert(" The applet is being reset to its initialState.");
+			     }
+			     setHTMLAppletState(appletName,this.initialState);   // store the state in the HTML variables just for safetey
+				
+				// if there was a viable state in the initialState variable we Can.
+				// now continue as if we had found a valid state in the HTML cache
+
+		    }
+//		}
+	this.debug_add("Completed handling the exceptional cases.");
+	}
+	
+	
+	if (state.match(/\<xml/i) || state.match(/\<\?xml/i) ) {  // state MUST be an xml string in plain text
+	
+		this.debug_add("Grab data from the HTML cache and set state for " + appletName + " to the data between the lines:" 
+		               + "\n------------------------------\n" 
+		               +  state + "\n------------------------------\n");
+		
+		try {
+		    
+			if ( this.methodDefined(setStateAlias)   ) {
+		        var result = applet[setStateAlias]( state );
+		        this.debug_add("State of applet " +appletName + "set from HTML cache");
+			} 
+		} catch(err) {  // catching false positives?
+			var msg = "Error in setting state of " + appletName + " using command " + setStateAlias + " : " +err+err.number+ err.description ;
+			alert(msg);
+		}
+	} else  {                
+		this.debug_add("  new state was empty string or did not begin with <xml> --  Applet state was not reset");
+	}
+//////////////////////////////////////////////////////////
+// Nothing is returned from this subroutine.  There are only side-effects.
+//////////////////////////////////////////////////////////
+    this.debug_add("Done setting state");
+    if (this.debugMode>=2){alert("DebugText:\n"+debugText); debugText="";}
+	return('');
+};
+	
+ww_applet.prototype.getState = function () {  
+		
+	var state ="<xml>foobar</xml>";
+	var appletName      = this.appletName;
+	var applet          = getApplet(appletName);
+	var getStateAlias   = this.getStateAlias;
+	
+	this.debug_add("   Begin getState from applet " + appletName );
+
+	try {
+		if (this.methodDefined(getStateAlias)) {  // there may be no state function
+			state  = applet[getStateAlias]();                     // get state in xml format
+			this.debug_add("      state has type " + typeof(state));
+			state  = String(state);                          // geogebra returned an object type instead of a string type
+			                                                 // this insures that we can view the state as a string
+			this.debug_add("      state converted to type " + typeof(state));
+		} else {
+			this.debug_add("    Applet does not have a getState method named: "+ getStateAlias + ".");
+			state ="<xml>undefined_state</xml>";
+		}
+		
+	} catch (e) {
+	    var msg = "    Error in getting state from applet " + appletName + " " + e;
+	    alert(msg);
+	}
+	
+	if (this.debugMode==0) {
+	     //alert("encode1 " +state);
+	    if (! base64Q(state) ){    
+	        //alert("start the encoding")
+		state = Base64.encode(state);	
+		}
+		//alert("state encoded to" + state);
+	};   // replace state by encoded version unless in debug mode
+
+	this.debug_add("  state is \n    "+ state + "\n");                // state should still be in plain text
+	var ww_preserve_applet_state = getQE(appletName + "_state"); // answer box preserving applet state (jsDebugMode: textarea, otherwise: hidden)
+	ww_preserve_applet_state.value = state;                      //place state in input item  (jsDebugMode: textarea, otherwise: hidden)
+	this.debug_add("State stored in answer box "+ appletName + "_state and getState is finished.");
+
+};	
+
+ww_applet.prototype.setDebug = function(debugMode) {
+	// sets debug mode in the flash or java applet
+	// applet's method must be called   debug
+	
+	var appletName = this.appletName;
+	var applet     = getApplet(appletName);
+	debugMode      = jsDebugMode || debugMode ;
+	
+    try{ 
+		if (this.methodDefined("debug") ) {
+			applet.debug(debugMode);  // set the applet's debug functions on.
+		} else {
+			this.debug_add( "  Unable to set debug state in applet " + appletName + ".");
+		
+		}
+	} catch(e) {
+		var msg = "Unable to set debug mode for applet " + appletName;
+        alert(msg);
+	}
+
+
+}
+
+
+	
+////////////////////////////////////////////////////////////
+//
+//INITIALIZE
+//
+////////////////////////////////////////////////////////////
+    	
+ww_applet.prototype.initializeAction = function () {
+     this.setState();
+};
+	
+ww_applet.prototype.submitAction = function () { 
+	var appletName = this.appletName;
+    // var getAnswer = this.getAnswerAlias;
+    
+    // Don't do anything if the applet is hidden.
+    if(!ww_applet_list[appletName].visible) {return('')};   
+    this.debug_add("submitAction" );
+    var ww_preserve_applet_state = getQE(appletName + "_state"); // hidden HTML input element preserving applet state
+	var saved_state =   ww_preserve_applet_state.value;
+	
+
+	
+	if (saved_state.match(/^<xml>restart_applet<\/xml>/) )  {
+		this.debug_add("Restarting the applet "+appletName);
+		setHTMLAppletStateToRestart(appletName);   // replace the saved state with <xml>restart_applet</xml>
+		if (this.debugMode>=2){alert("DebugText:\n"+debugText); debugText="";}
+		return('');      
+	}
+	this.debug_add("not restarting");
+    this.debug_add("Begin submit action for applet " + appletName);
+    var applet = getApplet(appletName);
+	if (! this.isReady  ) {
+		alert(appletName + " is not ready. The .isReady flag is false which is strange since we are resubmitting this page. There should have been plenty of time for the applet to load.");
+		this.initializeAction();
+	}
+	// Check to see if we want to restart the applet
+	
+    this.debug_add("about to get state");
+	// if we are not restarting the applet save the state and submit
+	
+	this.getState();      // have ww_applet retrieve state from applet and store in HTML cache
+	
+	
+	this.debug_add("Submit Action Script " + this.submitActionScript + "\n");
+	eval(this.submitActionScript);
+	//getQE(this.answerBox).value = applet.[getAnswer]();  //FIXME -- not needed in general?
+	
+
+	this.debug_add("Completed submitAction(" + this.submitActionScript + ") \nfor applet " + appletName+ "\n");
+
+	// because the state has not always been perfectly preserved when storing the state in text area boxes
+	// we take a "belt && suspenders" approach by converting the value even of the text area state cache
+	// to base64 form
+
+	ww_preserve_applet_state = getQE(appletName + "_state"); // hidden HTML input element preserving applet state
+	saved_state =   ww_preserve_applet_state.value;
+	this.debug_add ("saved state looks like before encoding" +saved_state);
+	if (! base64Q(saved_state) ) {
+	    // preserve html entities untranslated!  Yeah!!!!!!!
+	    // FIXME -- this is not a perfect fix -- things are confused for a while when
+	    // you switch from debug to non debug modes
+	    //saved_state = saved_state.replace(/&quot;/g, '&amp;&quot;');	    
+	    //alert("encode " +saved_state);
+		saved_state = Base64.encode(saved_state);		
+		//alert("saved state encoded to " +saved_state);
+	}
+	ww_preserve_applet_state = getQE(appletName + "_state"); // hidden HTML input element preserving applet state
+	
+	ww_preserve_applet_state.value = saved_state;  // on submit the value of ww_preserve_applet_state.value is always in Base64.
+      this.debug_add("just before submitting saved state looks like " + ww_preserve_applet_state.value);
+	
+
+	if (this.debugMode>=2){alert("DebugText:\n"+debugText); debugText="";}
+};
+
+
+ww_applet.prototype.checkLoaded = function() {  // this function returns 0 unless:
+									  // applet has already been flagged as ready in applet_isReady_list
+									  // applet.config is defined  (or alias for .config)
+									  // applet.setState is defined
+									  // applet.isActive is defined and returns 1;
+									  // applet reported that it is loaded by calling applet_loaded()
+	var ready = 0;
+	var appletName = this.appletName;
+	var applet = getApplet(appletName);
+	
+	// alert("2 jsDebugMode " + jsDebugMode + " applet debugMode " + this.debugMode + " local debugMode " + debugMode);
+	
+	if (this.debugMode==0 && this.isReady) {return(1)}; // memorize readiness in non-debug mode
+	
+	this.debug_add("*Test 4 methods to see if the applet " + appletName + " has been loaded: \n"); 
+
+	try {
+		if ( this.methodDefined(this.setConfigAlias) ) {
+			ready = 1;
+		}
+	} catch(e) {
+		var msg = "*Unable to find setConfig command in applet " + appletName+ "\n" +e;
+        this.debug_add(msg);
+	}
+	
+	try {
+		if ( this.methodDefined(this.setStateAlias) ) {
+			ready =1;
+		} 
+	} catch(e) {
+		var msg = "*Unable to setState command in applet " + appletName + "\n" +e;
+        this.debug_add(msg);
+	}
+
+
+	if (typeof(this.reportsLoaded) !="undefined" && this.reportsLoaded != 0 ) {
+		this.debug_add( "    *" + appletName + " applet self reports that it has completed loading. " );
+		ready =1;
+	}
+	
+	// the return value of the isActive() method, when defined, overrides the other indications
+	// that the applet is ready
+	
+	if ( this.methodDefined("isActive") ) {
+		if (applet.isActive()) {   //this could be zero if applet is loaded, but it is loading auxiliary data.
+			this.debug_add( "*Applet " +appletName + " signals it is active.\n"); 
+			ready =1;
+		} else {
+			this.debug_add( "*Applet " + appletName + " signals it is not active. -- \n it may still be loading data.\n");
+			ready = 0;
+		}
+	} 
+    //alert("set applet ready state to " +ready);
+	this.isReady = ready;
+	return(ready);
+}
+ww_applet.prototype.debug_add = function(str) {
+	if (this.debugMode>=2) {
+		debugText = debugText + "\n" +str; // a global text string
+	}
+}
+ww_applet.prototype.safe_applet_initialize = function(i) {    
+    //alert("begin safe_applet_initialize");
+    var appletName = this.appletName;
+    i--;
+    
+    /////////////////////////////////////////////////    
+    // Check whether the applet is has already loaded
+    /////////////////////////////////////////////////
+	this.debug_add("*  Try to initialize applet " + appletName +  ". Count down: " + i + ".\n" );
+	this.debug_add("entering checkLoaded subroutine");
+	var applet_loaded = this.checkLoaded();
+	if ( ( applet_loaded != 0 ) && ( applet_loaded != 1 ) ) {
+		alert("Error: The applet_loaded variable has not been defined. " + applet_loaded);
+	}
+	this.debug_add("returning from checkLoaded subroutine with result " + applet_loaded);
+
+    /////////////////////////////////////////////////    
+    // If applet has not loaded try again -- or announce that the applet can't be loaded
+    /////////////////////////////////////////////////
+	
+	if ( applet_loaded==0 && (i> 0) ) { // wait until applet is loaded
+		this.debug_add("*Applet " + appletName + " is not yet ready try again\n");
+		if (this.debugMode>=2) {
+			alert("DebugText:\n"+debugText ); 
+			debugText="";
+		}
+		setTimeout( "ww_applet_list[\""+ appletName + "\"].safe_applet_initialize(" + i +  ")",TIMEOUT);	
+		// warn about loading after two failed attempts or if there is only one attempt left
+        if (i<=1 || i< (ww_applet_list[appletName].maxInitializationAttempts-2)) { alert("Oops, applet is not ready. " +(i-1) +" tries left")};
+        return "";
+	} else if (applet_loaded==0 && !(i> 0) ) {
+		// it's possible that the isActive() response of the applet is not working properly
+		alert("*We haven't been able to verify that the applet " +appletName + " is loaded.  We'll try to use it anyway but it might not work.\n");
+		i=1;
+		applet_loaded=1; // FIXME -- give a choice as to whether to continue or not
+		this.isReady=1;
+		return "";
+	} 
+	
+	
+    /////////////////////////////////////////////////    
+    // If the applet is loaded try to configure it.
+    /////////////////////////////////////////////////
+	
+	if( applet_loaded) {                // now that applet is loaded configure it and initialize it with saved data.
+	    // alert("configuring applet");
+	    this.debug_add("  applet is ready = " + applet_loaded  );
+
+		this.debug_add("*Applet "+ appletName + " initialization completed\n   with " + i 
+		               +  " possible attempts remaining. \n" +
+		               "------------------------------\n");  
+		if (this.debugMode>=2) {
+			alert("DebugText:\n"+debugText ); 
+			debugText="";
+		}
+		// in-line handler -- configure and initialize
+		 /////////////////////////////////////////////////
+		 //alert("setDebug")
+		 /////////////////////////////////////////////////
+		try{
+		
+			this.setDebug((this.debugMode) ? 1:0); 
+			
+		} catch(e2) {
+			var msg = "*Unable set debug in " + appletName + " \n " +e2;  
+			if (this.debugMode>=2) {this.debug_add(msg);} else {alert(msg)};
+		}
+		 /////////////////////////////////////////////////
+		 //alert("config applet");
+		 /////////////////////////////////////////////////
+		try{ 
+	        //alert("setting configuration");
+			this.setConfig();         // for applets that require a configuration (which doesn't change for a given WW question
+			//alert("finished setting the configuration");
+			
+		} catch(e4) {
+			var msg = "*Unable to configure " + appletName + " \n " +e4;  
+			if (this.debugMode>=2) {this.debug_add(msg);} else {alert(msg)};
+		}
+
+		/////////////////////////////////////////////////
+		//alert("initializeAction");
+		/////////////////////////////////////////////////
+		try{
+		    
+			this.initializeAction();  // this is often the setState action.
+			
+		} catch(e) {
+			var msg = "*unable to perform an explicit initialization action (e.g. setState) on applet  " + appletName + " because \n " +e; 
+			if (this.debugMode>=2) {
+				this.debug_add(msg);
+			} else {
+				alert(msg);
+			}
+		}
+	// 	if (this.debugMode>=2) {
+// 			alert("\n*Begin debugmode\n " + debugText ); 
+// 			debugText="";
+// 		};
+	} else {
+	    alert("Error: applet "+ appletName + " has not been loaded");
+		this.debug_add("*Error: timed out waiting for applet " +appletName + " to load");
+		//alert("4 jsDebugMode " + jsDebugMode + " applet debugMode " +ww_applet.debugMode + " local debugMode " +debugMode);
+		if (this.debugMode>=2) {
+			alert(" in safe applet initialize: " + debugText ); 
+			debugText="";
+		}
+	}
+	return "";
+}
+
+function iamhere() {
+	alert( "javaScript loaded.  functions still work");
+}
\ No newline at end of file
diff --git a/htdocs/js/wz_tooltip.js b/htdocs/js/wz_tooltip.js
new file mode 100755
index 0000000000..fc32f1db88
--- /dev/null
+++ b/htdocs/js/wz_tooltip.js
@@ -0,0 +1,1149 @@
+/* This notice must be untouched at all times.
+
+wz_tooltip.js	 v. 4.12
+
+The latest version is available at
+http://www.walterzorn.com
+or http://www.devira.com
+or http://www.walterzorn.de
+
+Copyright (c) 2002-2007 Walter Zorn. All rights reserved.
+Created 1.12.2002 by Walter Zorn (Web: http://www.walterzorn.com )
+Last modified: 13.7.2007
+
+Easy-to-use cross-browser tooltips.
+Just include the script at the beginning of the <body> section, and invoke
+Tip('Tooltip text') from within the desired HTML onmouseover eventhandlers.
+No container DIV, no onmouseouts required.
+By default, width of tooltips is automatically adapted to content.
+Is even capable of dynamically converting arbitrary HTML elements to tooltips
+by calling TagToTip('ID_of_HTML_element_to_be_converted') instead of Tip(),
+which means you can put important, search-engine-relevant stuff into tooltips.
+Appearance of tooltips can be individually configured
+via commands passed to Tip() or TagToTip().
+
+Tab Width: 4
+LICENSE: LGPL
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License (LGPL) as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+For more details on the GNU Lesser General Public License,
+see http://www.gnu.org/copyleft/lesser.html
+*/
+
+var config = new Object();
+
+
+//===================  GLOBAL TOOPTIP CONFIGURATION  =========================//
+var  tt_Debug	= true		// false or true - recommended: false once you release your page to the public
+var  tt_Enabled	= true		// Allows to (temporarily) suppress tooltips, e.g. by providing the user with a button that sets this global variable to false
+var  TagsToTip	= true		// false or true - if true, the script is capable of converting HTML elements to tooltips
+
+// For each of the following config variables there exists a command, which is
+// just the variablename in uppercase, to be passed to Tip() or TagToTip() to
+// configure tooltips individually. Individual commands override global
+// configuration. Order of commands is arbitrary.
+// Example: onmouseover="Tip('Tooltip text', LEFT, true, BGCOLOR, '#FF9900', FADEIN, 400)"
+
+config. Above			= false 	// false or true - tooltip above mousepointer?
+config. BgColor 		= '#E4E7FF' // Background color
+config. BgImg			= ''		// Path to background image, none if empty string ''
+config. BorderColor 	= '#002299'
+config. BorderStyle 	= 'solid'	// Any permitted CSS value, but I recommend 'solid', 'dotted' or 'dashed'
+config. BorderWidth 	= 1
+config. CenterMouse 	= false 	// false or true - center the tip horizontally below (or above) the mousepointer
+config. ClickClose		= false 	// false or true - close tooltip if the user clicks somewhere
+config. CloseBtn		= false 	// false or true - closebutton in titlebar
+config. CloseBtnColors	= ['#990000', '#FFFFFF', '#DD3333', '#FFFFFF']	  // [Background, text, hovered background, hovered text] - use empty strings '' to inherit title colors
+config. CloseBtnText	= '&nbsp;X&nbsp;'	// Close button text (may also be an image tag)
+config. CopyContent		= true		// When converting a HTML element to a tooltip, copy only the element's content, rather than converting the element by its own
+config. Delay			= 400		// Time span in ms until tooltip shows up
+config. Duration		= 0 		// Time span in ms after which the tooltip disappears; 0 for infinite duration
+config. FadeIn			= 0 		// Fade-in duration in ms, e.g. 400; 0 for no animation
+config. FadeOut 		= 0
+config. FadeInterval	= 30		// Duration of each fade step in ms (recommended: 30) - shorter is smoother but causes more CPU-load
+config. Fix 			= null		// Fixated position - x- an y-oordinates in brackets, e.g. [210, 480], or null for no fixation
+config. FollowMouse		= true		// false or true - tooltip follows the mouse
+config. FontColor		= '#000044'
+config. FontFace		= 'Verdana,Geneva,sans-serif'
+config. FontSize		= '8pt' 	// E.g. '9pt' or '12px' - unit is mandatory
+config. FontWeight		= 'normal'	// 'normal' or 'bold';
+config. Left			= false 	// false or true - tooltip on the left of the mouse
+config. OffsetX 		= 14		// Horizontal offset of left-top corner from mousepointer
+config. OffsetY 		= 8 		// Vertical offset
+config. Opacity 		= 100		// Integer between 0 and 100 - opacity of tooltip in percent
+config. Padding 		= 3 		// Spacing between border and content
+config. Shadow			= false 	// false or true
+config. ShadowColor 	= '#C0C0C0'
+config. ShadowWidth 	= 5
+config. Sticky			= false 	// Do NOT hide tooltip on mouseout? false or true
+config. TextAlign		= 'left'	// 'left', 'right' or 'justify'
+config. Title			= ''		// Default title text applied to all tips (no default title: empty string '')
+config. TitleAlign		= 'left'	// 'left' or 'right' - text alignment inside the title bar
+config. TitleBgColor	= ''		// If empty string '', BorderColor will be used
+config. TitleFontColor	= '#ffffff'	// Color of title text - if '', BgColor (of tooltip body) will be used
+config. TitleFontFace	= ''		// If '' use FontFace (boldified)
+config. TitleFontSize	= ''		// If '' use FontSize
+config. Width			= 0 		// Tooltip width; 0 for automatic adaption to tooltip content
+//=======  END OF TOOLTIP CONFIG, DO NOT CHANGE ANYTHING BELOW  ==============//
+
+
+
+
+//======================  PUBLIC  ============================================//
+function Tip()
+{
+	tt_Tip(arguments, null);
+}
+function TagToTip()
+{
+	if(TagsToTip)
+	{
+		var t2t = tt_GetElt(arguments[0]);
+		if(t2t)
+			tt_Tip(arguments, t2t);
+	}
+}
+
+//==================  PUBLIC EXTENSION API	==================================//
+// Extension eventhandlers currently supported:
+// OnLoadConfig, OnCreateContentString, OnSubDivsCreated, OnShow, OnMoveBefore,
+// OnMoveAfter, OnHideInit, OnHide, OnKill
+
+var tt_aElt = new Array(10), // Container DIV, outer title & body DIVs, inner title & body TDs, closebutton SPAN, shadow DIVs, and IFRAME to cover windowed elements in IE
+tt_aV = new Array(),	// Caches and enumerates config data for currently active tooltip
+tt_sContent,			// Inner tooltip text or HTML
+tt_scrlX = 0, tt_scrlY = 0,
+tt_musX, tt_musY,
+tt_over,
+tt_x, tt_y, tt_w, tt_h; // Position, width and height of currently displayed tooltip
+
+function tt_Extension()
+{
+	tt_ExtCmdEnum();
+	tt_aExt[tt_aExt.length] = this;
+	return this;
+}
+function tt_SetTipPos(x, y)
+{
+	var css = tt_aElt[0].style;
+
+	tt_x = x;
+	tt_y = y;
+	css.left = x + "px";
+	css.top = y + "px";
+	if(tt_ie56)
+	{
+		var ifrm = tt_aElt[tt_aElt.length - 1];
+		if(ifrm)
+		{
+			ifrm.style.left = css.left;
+			ifrm.style.top = css.top;
+		}
+	}
+}
+function tt_Hide()
+{
+	if(tt_db && tt_iState)
+	{
+		if(tt_iState & 0x2)
+		{
+			tt_aElt[0].style.visibility = "hidden";
+			tt_ExtCallFncs(0, "Hide");
+		}
+		tt_tShow.EndTimer();
+		tt_tHide.EndTimer();
+		tt_tDurt.EndTimer();
+		tt_tFade.EndTimer();
+		if(!tt_op && !tt_ie)
+		{
+			tt_tWaitMov.EndTimer();
+			tt_bWait = false;
+		}
+		if(tt_aV[CLICKCLOSE])
+			tt_RemEvtFnc(document, "mouseup", tt_HideInit);
+		tt_AddRemOutFnc(false);
+		tt_ExtCallFncs(0, "Kill");
+		// In case of a TagToTip tooltip, hide converted DOM node and
+		// re-insert it into document
+		if(tt_t2t && !tt_aV[COPYCONTENT])
+		{
+			tt_t2t.style.display = "none";
+			tt_MovDomNode(tt_t2t, tt_aElt[6], tt_t2tDad);
+		}
+		tt_iState = 0;
+		tt_over = null;
+		tt_ResetMainDiv();
+		if(tt_aElt[tt_aElt.length - 1])
+			tt_aElt[tt_aElt.length - 1].style.display = "none";
+	}
+}
+function tt_GetElt(id)
+{
+	return(document.getElementById ? document.getElementById(id)
+			: document.all ? document.all[id]
+			: null);
+}
+function tt_GetDivW(el)
+{
+	return(el ? (el.offsetWidth || el.style.pixelWidth || 0) : 0);
+}
+function tt_GetDivH(el)
+{
+	return(el ? (el.offsetHeight || el.style.pixelHeight || 0) : 0);
+}
+function tt_GetScrollX()
+{
+	return(window.pageXOffset || (tt_db ? (tt_db.scrollLeft || 0) : 0));
+}
+function tt_GetScrollY()
+{
+	return(window.pageYOffset || (tt_db ? (tt_db.scrollTop || 0) : 0));
+}
+function tt_GetClientW()
+{
+	return(document.body && (typeof(document.body.clientWidth) != tt_u) ? document.body.clientWidth
+			: (typeof(window.innerWidth) != tt_u) ? window.innerWidth
+			: tt_db ? (tt_db.clientWidth || 0)
+			: 0);
+}
+function tt_GetClientH()
+{
+	// Exactly this order seems to yield correct values in all major browsers
+	return(document.body && (typeof(document.body.clientHeight) != tt_u) ? document.body.clientHeight
+			: (typeof(window.innerHeight) != tt_u) ? window.innerHeight
+			: tt_db ? (tt_db.clientHeight || 0)
+			: 0);
+}
+function tt_GetEvtX(e)
+{
+	return (e ? ((typeof(e.pageX) != tt_u) ? e.pageX : (e.clientX + tt_scrlX)) : 0);
+}
+function tt_GetEvtY(e)
+{
+	return (e ? ((typeof(e.pageY) != tt_u) ? e.pageY : (e.clientY + tt_scrlY)) : 0);
+}
+function tt_AddEvtFnc(el, sEvt, PFnc)
+{
+	if(el)
+	{
+		if(el.addEventListener)
+			el.addEventListener(sEvt, PFnc, false);
+		else
+			el.attachEvent("on" + sEvt, PFnc);
+	}
+}
+function tt_RemEvtFnc(el, sEvt, PFnc)
+{
+	if(el)
+	{
+		if(el.removeEventListener)
+			el.removeEventListener(sEvt, PFnc, false);
+		else
+			el.detachEvent("on" + sEvt, PFnc);
+	}
+}
+
+//======================  PRIVATE  ===========================================//
+var tt_aExt = new Array(),	// Array of extension objects
+
+tt_db, tt_op, tt_ie, tt_ie56, tt_bBoxOld,	// Browser flags
+tt_body,
+tt_flagOpa, 			// Opacity support: 1=IE, 2=Khtml, 3=KHTML, 4=Moz, 5=W3C
+tt_maxPosX, tt_maxPosY,
+tt_iState = 0,			// Tooltip active |= 1, shown |= 2, move with mouse |= 4
+tt_opa, 				// Currently applied opacity
+tt_bJmpVert,			// Tip above mouse (or ABOVE tip below mouse)
+tt_t2t, tt_t2tDad,		// Tag converted to tip, and its parent element in the document
+tt_elDeHref,			// The tag from which Opera has removed the href attribute
+// Timer
+tt_tShow = new Number(0), tt_tHide = new Number(0), tt_tDurt = new Number(0),
+tt_tFade = new Number(0), tt_tWaitMov = new Number(0),
+tt_bWait = false,
+tt_u = "undefined";
+
+
+function tt_Init()
+{
+	tt_MkCmdEnum();
+	// Send old browsers instantly to hell
+	if(!tt_Browser() || !tt_MkMainDiv())
+		return;
+	tt_IsW3cBox();
+	tt_OpaSupport();
+	tt_AddEvtFnc(document, "mousemove", tt_Move);
+	// In Debug mode we search for TagToTip() calls in order to notify
+	// the user if they've forgotten to set the TagsToTip config flag
+	if(TagsToTip || tt_Debug)
+		tt_SetOnloadFnc();
+	tt_AddEvtFnc(window, "scroll",
+		function()
+		{
+			tt_scrlX = tt_GetScrollX();
+			tt_scrlY = tt_GetScrollY();
+			if(tt_iState && !(tt_aV[STICKY] && (tt_iState & 2)))
+				tt_HideInit();
+		} );
+	// Ensure the tip be hidden when the page unloads
+	tt_AddEvtFnc(window, "unload", tt_Hide);
+	tt_Hide();
+}
+// Creates command names by translating config variable names to upper case
+function tt_MkCmdEnum()
+{
+	var n = 0;
+	for(var i in config)
+		eval("window." + i.toString().toUpperCase() + " = " + n++);
+	tt_aV.length = n;
+}
+function tt_Browser()
+{
+	var n, nv, n6, w3c;
+
+	n = navigator.userAgent.toLowerCase(),
+	nv = navigator.appVersion;
+	tt_op = (document.defaultView && typeof(eval("w" + "indow" + "." + "o" + "p" + "er" + "a")) != tt_u);
+	tt_ie = n.indexOf("msie") != -1 && document.all && !tt_op;
+	if(tt_ie)
+	{
+		var ieOld = (!document.compatMode || document.compatMode == "BackCompat");
+		tt_db = !ieOld ? document.documentElement : (document.body || null);
+		if(tt_db)
+			tt_ie56 = parseFloat(nv.substring(nv.indexOf("MSIE") + 5)) >= 5.5
+					&& typeof document.body.style.maxHeight == tt_u;
+	}
+	else
+	{
+		tt_db = document.documentElement || document.body ||
+				(document.getElementsByTagName ? document.getElementsByTagName("body")[0]
+				: null);
+		if(!tt_op)
+		{
+			n6 = document.defaultView && typeof document.defaultView.getComputedStyle != tt_u;
+			w3c = !n6 && document.getElementById;
+		}
+	}
+	tt_body = (document.getElementsByTagName ? document.getElementsByTagName("body")[0]
+				: (document.body || null));
+	if(tt_ie || n6 || tt_op || w3c)
+	{
+		if(tt_body && tt_db)
+		{
+			if(document.attachEvent || document.addEventListener)
+				return true;
+		}
+		else
+			tt_Err("wz_tooltip.js must be included INSIDE the body section,"
+					+ " immediately after the opening <body> tag.");
+	}
+	tt_db = null;
+	return false;
+}
+function tt_MkMainDiv()
+{
+	// Create the tooltip DIV
+	if(tt_body.insertAdjacentHTML)
+		tt_body.insertAdjacentHTML("afterBegin", tt_MkMainDivHtm());
+	else if(typeof tt_body.innerHTML != tt_u && document.createElement && tt_body.appendChild)
+		tt_body.appendChild(tt_MkMainDivDom());
+	// FireFox Alzheimer bug
+	if(window.tt_GetMainDivRefs && tt_GetMainDivRefs())
+		return true;
+	tt_db = null;
+	return false;
+}
+function tt_MkMainDivHtm()
+{
+	return('<div id="WzTtDiV"></div>' +
+			(tt_ie56 ? ('<iframe id="WzTtIfRm" src="javascript:false" scrolling="no" frameborder="0" style="filter:Alpha(opacity=0);position:absolute;top:0px;left:0px;display:none;"></iframe>')
+			: ''));
+}
+function tt_MkMainDivDom()
+{
+	var el = document.createElement("div");
+	if(el)
+		el.id = "WzTtDiV";
+	return el;
+}
+function tt_GetMainDivRefs()
+{
+	tt_aElt[0] = tt_GetElt("WzTtDiV");
+	if(tt_ie56 && tt_aElt[0])
+	{
+		tt_aElt[tt_aElt.length - 1] = tt_GetElt("WzTtIfRm");
+		if(!tt_aElt[tt_aElt.length - 1])
+			tt_aElt[0] = null;
+	}
+	if(tt_aElt[0])
+	{
+		var css = tt_aElt[0].style;
+
+		css.visibility = "hidden";
+		css.position = "absolute";
+		css.overflow = "hidden";
+		return true;
+	}
+	return false;
+}
+function tt_ResetMainDiv()
+{
+	var w = (window.screen && screen.width) ? screen.width : 10000;
+
+	tt_SetTipPos(-w, 0);
+	tt_aElt[0].innerHTML = "";
+	tt_aElt[0].style.width = (w - 1) + "px";
+}
+function tt_IsW3cBox()
+{
+	var css = tt_aElt[0].style;
+
+	css.padding = "10px";
+	css.width = "40px";
+	tt_bBoxOld = (tt_GetDivW(tt_aElt[0]) == 40);
+	css.padding = "0px";
+	tt_ResetMainDiv();
+}
+function tt_OpaSupport()
+{
+	var css = tt_body.style;
+
+	tt_flagOpa = (typeof(css.filter) != tt_u) ? 1
+				: (typeof(css.KhtmlOpacity) != tt_u) ? 2
+				: (typeof(css.KHTMLOpacity) != tt_u) ? 3
+				: (typeof(css.MozOpacity) != tt_u) ? 4
+				: (typeof(css.opacity) != tt_u) ? 5
+				: 0;
+}
+// Ported from http://dean.edwards.name/weblog/2006/06/again/
+// (Dean Edwards et al.)
+function tt_SetOnloadFnc()
+{
+	tt_AddEvtFnc(document, "DOMContentLoaded", tt_HideSrcTags);
+	tt_AddEvtFnc(window, "load", tt_HideSrcTags);
+	if(tt_body.attachEvent)
+		tt_body.attachEvent("onreadystatechange",
+			function() {
+				if(tt_body.readyState == "complete")
+					tt_HideSrcTags();
+			} );
+	if(/WebKit|KHTML/i.test(navigator.userAgent))
+	{
+		var t = setInterval(function() {
+					if(/loaded|complete/.test(document.readyState))
+					{
+						clearInterval(t);
+						tt_HideSrcTags();
+					}
+				}, 10);
+	}
+}
+function tt_HideSrcTags()
+{
+	if(!window.tt_HideSrcTags || window.tt_HideSrcTags.done)
+		return;
+	window.tt_HideSrcTags.done = true;
+	if(!tt_HideSrcTagsRecurs(tt_body))
+		tt_Err("To enable the capability to convert HTML elements to tooltips,"
+				+ " you must set TagsToTip in the global tooltip configuration"
+				+ " to true.");
+}
+function tt_HideSrcTagsRecurs(dad)
+{
+	var a, ovr, asT2t;
+
+	// Walk the DOM tree for tags that have an onmouseover attribute
+	// containing a TagToTip('...') call.
+	// (.childNodes first since .children is bugous in Safari)
+	a = dad.childNodes || dad.children || null;
+	for(var i = a ? a.length : 0; i;)
+	{--i;
+		if(!tt_HideSrcTagsRecurs(a[i]))
+			return false;
+		ovr = a[i].getAttribute ? a[i].getAttribute("onmouseover")
+				: (typeof a[i].onmouseover == "function") ? a[i].onmouseover
+				: null;
+		if(ovr)
+		{
+			asT2t = ovr.toString().match(/TagToTip\s*\(\s*'[^'.]+'\s*[\),]/);
+			if(asT2t && asT2t.length)
+			{
+				if(!tt_HideSrcTag(asT2t[0]))
+					return false;
+			}
+		}
+	}
+	return true;
+}
+function tt_HideSrcTag(sT2t)
+{
+	var id, el;
+
+	// The ID passed to the found TagToTip() call identifies an HTML element
+	// to be converted to a tooltip, so hide that element
+	id = sT2t.replace(/.+'([^'.]+)'.+/, "$1");
+	el = tt_GetElt(id);
+	if(el)
+	{
+		if(tt_Debug && !TagsToTip)
+			return false;
+		else
+			el.style.display = "none";
+	}
+	else
+		tt_Err("Invalid ID\n'" + id + "'\npassed to TagToTip()."
+				+ " There exists no HTML element with that ID.");
+	return true;
+}
+function tt_Tip(arg, t2t)
+{
+	if(!tt_db)
+		return;
+	if(tt_iState)
+		tt_Hide();
+	if(!tt_Enabled)
+		return;
+	tt_t2t = t2t;
+	if(!tt_ReadCmds(arg))
+		return;
+	tt_iState = 0x1 | 0x4;
+	tt_AdaptConfig1();
+	tt_MkTipContent(arg);
+	tt_MkTipSubDivs();
+	tt_FormatTip();
+	tt_bJmpVert = false;
+	tt_maxPosX = tt_GetClientW() + tt_scrlX - tt_w - 1;
+	tt_maxPosY = tt_GetClientH() + tt_scrlY - tt_h - 1;
+	tt_AdaptConfig2();
+	// We must fake the first mousemove in order to ensure the tip
+	// be immediately shown and positioned
+	tt_Move();
+	tt_ShowInit();
+}
+function tt_ReadCmds(a)
+{
+	var i;
+
+	// First load the global config values, to initialize also values
+	// for which no command has been passed
+	i = 0;
+	for(var j in config)
+		tt_aV[i++] = config[j];
+	// Then replace each cached config value for which a command has been
+	// passed (ensure the # of command args plus value args be even)
+	if(a.length & 1)
+	{
+		for(i = a.length - 1; i > 0; i -= 2)
+			tt_aV[a[i - 1]] = a[i];
+		return true;
+	}
+	tt_Err("Incorrect call of Tip() or TagToTip().\n"
+			+ "Each command must be followed by a value.");
+	return false;
+}
+function tt_AdaptConfig1()
+{
+	tt_ExtCallFncs(0, "LoadConfig");
+	// Inherit unspecified title formattings from body
+	if(!tt_aV[TITLEBGCOLOR].length)
+		tt_aV[TITLEBGCOLOR] = tt_aV[BORDERCOLOR];
+	if(!tt_aV[TITLEFONTCOLOR].length)
+		tt_aV[TITLEFONTCOLOR] = tt_aV[BGCOLOR];
+	if(!tt_aV[TITLEFONTFACE].length)
+		tt_aV[TITLEFONTFACE] = tt_aV[FONTFACE];
+	if(!tt_aV[TITLEFONTSIZE].length)
+		tt_aV[TITLEFONTSIZE] = tt_aV[FONTSIZE];
+	if(tt_aV[CLOSEBTN])
+	{
+		// Use title colors for non-specified closebutton colors
+		if(!tt_aV[CLOSEBTNCOLORS])
+			tt_aV[CLOSEBTNCOLORS] = new Array("", "", "", "");
+		for(var i = 4; i;)
+		{--i;
+			if(!tt_aV[CLOSEBTNCOLORS][i].length)
+				tt_aV[CLOSEBTNCOLORS][i] = (i & 1) ? tt_aV[TITLEFONTCOLOR] : tt_aV[TITLEBGCOLOR];
+		}
+		// Enforce titlebar be shown
+		if(!tt_aV[TITLE].length)
+			tt_aV[TITLE] = " ";
+	}
+	// Circumvents broken display of images and fade-in flicker in Geckos < 1.8
+	if(tt_aV[OPACITY] == 100 && typeof tt_aElt[0].style.MozOpacity != tt_u && !Array.every)
+		tt_aV[OPACITY] = 99;
+	// Smartly shorten the delay for fade-in tooltips
+	if(tt_aV[FADEIN] && tt_flagOpa && tt_aV[DELAY] > 100)
+		tt_aV[DELAY] = Math.max(tt_aV[DELAY] - tt_aV[FADEIN], 100);
+}
+function tt_AdaptConfig2()
+{
+	if(tt_aV[CENTERMOUSE])
+		tt_aV[OFFSETX] -= ((tt_w - (tt_aV[SHADOW] ? tt_aV[SHADOWWIDTH] : 0)) >> 1);
+}
+// Expose content globally so extensions can modify it
+function tt_MkTipContent(a)
+{
+	if(tt_t2t)
+	{
+		if(tt_aV[COPYCONTENT])
+			tt_sContent = tt_t2t.innerHTML;
+		else
+			tt_sContent = "";
+	}
+	else
+		tt_sContent = a[0];
+	tt_ExtCallFncs(0, "CreateContentString");
+}
+function tt_MkTipSubDivs()
+{
+	var sCss = 'position:relative;margin:0px;padding:0px;border-width:0px;left:0px;top:0px;line-height:normal;width:auto;',
+	sTbTrTd = ' cellspacing=0 cellpadding=0 border=0 style="' + sCss + '"><tbody style="' + sCss + '"><tr><td ';
+
+	tt_aElt[0].innerHTML =
+		(''
+		+ (tt_aV[TITLE].length ?
+			('<div id="WzTiTl" style="position:relative;z-index:1;">'
+			+ '<table id="WzTiTlTb"' + sTbTrTd + 'id="WzTiTlI" style="' + sCss + '">'
+			+ tt_aV[TITLE]
+			+ '</td>'
+			+ (tt_aV[CLOSEBTN] ?
+				('<td align="right" style="' + sCss
+				+ 'text-align:right;">'
+				+ '<span id="WzClOsE" style="padding-left:2px;padding-right:2px;'
+				+ 'cursor:' + (tt_ie ? 'hand' : 'pointer')
+				+ ';" onmouseover="tt_OnCloseBtnOver(1)" onmouseout="tt_OnCloseBtnOver(0)" onclick="tt_HideInit()">'
+				+ tt_aV[CLOSEBTNTEXT]
+				+ '</span></td>')
+				: '')
+			+ '</tr></tbody></table></div>')
+			: '')
+		+ '<div id="WzBoDy" style="position:relative;z-index:0;">'
+		+ '<table' + sTbTrTd + 'id="WzBoDyI" style="' + sCss + '">'
+		+ tt_sContent
+		+ '</td></tr></tbody></table></div>'
+		+ (tt_aV[SHADOW]
+			? ('<div id="WzTtShDwR" style="position:absolute;overflow:hidden;"></div>'
+				+ '<div id="WzTtShDwB" style="position:relative;overflow:hidden;"></div>')
+			: '')
+		);
+	tt_GetSubDivRefs();
+	// Convert DOM node to tip
+	if(tt_t2t && !tt_aV[COPYCONTENT])
+	{
+		// Store the tag's parent element so we can restore that DOM branch
+		// once the tooltip is hidden
+		tt_t2tDad = tt_t2t.parentNode || tt_t2t.parentElement || tt_t2t.offsetParent || null;
+		if(tt_t2tDad)
+		{
+			tt_MovDomNode(tt_t2t, tt_t2tDad, tt_aElt[6]);
+			tt_t2t.style.display = "block";
+		}
+	}
+	tt_ExtCallFncs(0, "SubDivsCreated");
+}
+function tt_GetSubDivRefs()
+{
+	var aId = new Array("WzTiTl", "WzTiTlTb", "WzTiTlI", "WzClOsE", "WzBoDy", "WzBoDyI", "WzTtShDwB", "WzTtShDwR");
+
+	for(var i = aId.length; i; --i)
+		tt_aElt[i] = tt_GetElt(aId[i - 1]);
+}
+function tt_FormatTip()
+{
+	var css, w, iOffY, iOffSh;
+
+	//--------- Title DIV ----------
+	if(tt_aV[TITLE].length)
+	{
+		css = tt_aElt[1].style;
+		css.background = tt_aV[TITLEBGCOLOR];
+		css.paddingTop = (tt_aV[CLOSEBTN] ? 2 : 0) + "px";
+		css.paddingBottom = "1px";
+		css.paddingLeft = css.paddingRight = tt_aV[PADDING] + "px";
+		css = tt_aElt[3].style;
+		css.color = tt_aV[TITLEFONTCOLOR];
+		css.fontFamily = tt_aV[TITLEFONTFACE];
+		css.fontSize = tt_aV[TITLEFONTSIZE];
+		css.fontWeight = "bold";
+		css.textAlign = tt_aV[TITLEALIGN];
+		// Close button DIV
+		if(tt_aElt[4])
+		{
+			css.paddingRight = (tt_aV[PADDING] << 1) + "px";
+			css = tt_aElt[4].style;
+			css.background = tt_aV[CLOSEBTNCOLORS][0];
+			css.color = tt_aV[CLOSEBTNCOLORS][1];
+			css.fontFamily = tt_aV[TITLEFONTFACE];
+			css.fontSize = tt_aV[TITLEFONTSIZE];
+			css.fontWeight = "bold";
+		}
+		if(tt_aV[WIDTH] > 0)
+			tt_w = tt_aV[WIDTH] + ((tt_aV[PADDING] + tt_aV[BORDERWIDTH]) << 1);
+		else
+		{
+			tt_w = tt_GetDivW(tt_aElt[3]) + tt_GetDivW(tt_aElt[4]);
+			// Some spacing between title DIV and closebutton
+			if(tt_aElt[4])
+				tt_w += tt_aV[PADDING];
+		}
+		// Ensure the top border of the body DIV be covered by the title DIV
+		iOffY = -tt_aV[BORDERWIDTH];
+	}
+	else
+	{
+		tt_w = 0;
+		iOffY = 0;
+	}
+
+	//-------- Body DIV ------------
+	css = tt_aElt[5].style;
+	css.top = iOffY + "px";
+	if(tt_aV[BORDERWIDTH])
+	{
+		css.borderColor = tt_aV[BORDERCOLOR];
+		css.borderStyle = tt_aV[BORDERSTYLE];
+		css.borderWidth = tt_aV[BORDERWIDTH] + "px";
+	}
+	if(tt_aV[BGCOLOR].length)
+		css.background = tt_aV[BGCOLOR];
+	if(tt_aV[BGIMG].length)
+		css.backgroundImage = "url(" + tt_aV[BGIMG] + ")";
+	css.padding = tt_aV[PADDING] + "px";
+	css.textAlign = tt_aV[TEXTALIGN];
+	// TD inside body DIV
+	css = tt_aElt[6].style;
+	css.color = tt_aV[FONTCOLOR];
+	css.fontFamily = tt_aV[FONTFACE];
+	css.fontSize = tt_aV[FONTSIZE];
+	css.fontWeight = tt_aV[FONTWEIGHT];
+	css.background = "";
+	css.textAlign = tt_aV[TEXTALIGN];
+	if(tt_aV[WIDTH] > 0)
+		w = tt_aV[WIDTH] + ((tt_aV[PADDING] + tt_aV[BORDERWIDTH]) << 1);
+	else
+		// We measure the width of the body's inner TD, because some browsers
+		// expand the width of the container and outer body DIV to 100%
+		w = tt_GetDivW(tt_aElt[6]) + ((tt_aV[PADDING] + tt_aV[BORDERWIDTH]) << 1);
+	if(w > tt_w)
+		tt_w = w;
+
+	//--------- Shadow DIVs ------------
+	if(tt_aV[SHADOW])
+	{
+		tt_w += tt_aV[SHADOWWIDTH];
+		iOffSh = Math.floor((tt_aV[SHADOWWIDTH] * 4) / 3);
+		// Bottom shadow
+		css = tt_aElt[7].style;
+		css.top = iOffY + "px";
+		css.left = iOffSh + "px";
+		css.width = (tt_w - iOffSh - tt_aV[SHADOWWIDTH]) + "px";
+		css.height = tt_aV[SHADOWWIDTH] + "px";
+		css.background = tt_aV[SHADOWCOLOR];
+		// Right shadow
+		css = tt_aElt[8].style;
+		css.top = iOffSh + "px";
+		css.left = (tt_w - tt_aV[SHADOWWIDTH]) + "px";
+		css.width = tt_aV[SHADOWWIDTH] + "px";
+		css.background = tt_aV[SHADOWCOLOR];
+	}
+	else
+		iOffSh = 0;
+
+	//-------- Container DIV -------
+	tt_SetTipOpa(tt_aV[FADEIN] ? 0 : tt_aV[OPACITY]);
+	tt_FixSize(iOffY, iOffSh);
+}
+// Fixate the size so it can't dynamically change while the tooltip is moving.
+function tt_FixSize(iOffY, iOffSh)
+{
+	var wIn, wOut, i;
+
+	tt_aElt[0].style.width = tt_w + "px";
+	tt_aElt[0].style.pixelWidth = tt_w;
+	wOut = tt_w - ((tt_aV[SHADOW]) ? tt_aV[SHADOWWIDTH] : 0);
+	// Body
+	wIn = wOut;
+	if(!tt_bBoxOld)
+		wIn -= ((tt_aV[PADDING] + tt_aV[BORDERWIDTH]) << 1);
+	tt_aElt[5].style.width = wIn + "px";
+	// Title
+	if(tt_aElt[1])
+	{
+		wIn = wOut - (tt_aV[PADDING] << 1);
+		if(!tt_bBoxOld)
+			wOut = wIn;
+		tt_aElt[1].style.width = wOut + "px";
+		tt_aElt[2].style.width = wIn + "px";
+	}
+	tt_h = tt_GetDivH(tt_aElt[0]) + iOffY;
+	// Right shadow
+	if(tt_aElt[8])
+		tt_aElt[8].style.height = (tt_h - iOffSh) + "px";
+	i = tt_aElt.length - 1;
+	if(tt_aElt[i])
+	{
+		tt_aElt[i].style.width = tt_w + "px";
+		tt_aElt[i].style.height = tt_h + "px";
+	}
+}
+function tt_DeAlt(el)
+{
+	var aKid;
+
+	if(el.alt)
+		el.alt = "";
+	if(el.title)
+		el.title = "";
+	aKid = el.childNodes || el.children || null;
+	if(aKid)
+	{
+		for(var i = aKid.length; i;)
+			tt_DeAlt(aKid[--i]);
+	}
+}
+// This hack removes the annoying native tooltips over links in Opera
+function tt_OpDeHref(el)
+{
+	if(!tt_op)
+		return;
+	if(tt_elDeHref)
+		tt_OpReHref();
+	while(el)
+	{
+		if(el.hasAttribute("href"))
+		{
+			el.t_href = el.getAttribute("href");
+			el.t_stats = window.status;
+			el.removeAttribute("href");
+			el.style.cursor = "hand";
+			tt_AddEvtFnc(el, "mousedown", tt_OpReHref);
+			window.status = el.t_href;
+			tt_elDeHref = el;
+			break;
+		}
+		el = el.parentElement;
+	}
+}
+function tt_ShowInit()
+{
+	tt_tShow.Timer("tt_Show()", tt_aV[DELAY], true);
+	if(tt_aV[CLICKCLOSE])
+		tt_AddEvtFnc(document, "mouseup", tt_HideInit);
+}
+function tt_OverInit(e)
+{
+	tt_over = e.target || e.srcElement;
+	tt_DeAlt(tt_over);
+	tt_OpDeHref(tt_over);
+	tt_AddRemOutFnc(true);
+}
+function tt_Show()
+{
+	var css = tt_aElt[0].style;
+
+	// Override the z-index of the topmost wz_dragdrop.js D&D item
+	css.zIndex = Math.max((window.dd && dd.z) ? (dd.z + 2) : 0, 1010);
+	if(tt_aV[STICKY] || !tt_aV[FOLLOWMOUSE])
+		tt_iState &= ~0x4;
+	if(tt_aV[DURATION] > 0)
+		tt_tDurt.Timer("tt_HideInit()", tt_aV[DURATION], true);
+	tt_ExtCallFncs(0, "Show")
+	css.visibility = "visible";
+	tt_iState |= 0x2;
+	if(tt_aV[FADEIN])
+		tt_Fade(0, 0, tt_aV[OPACITY], Math.round(tt_aV[FADEIN] / tt_aV[FADEINTERVAL]));
+	tt_ShowIfrm();
+}
+function tt_ShowIfrm()
+{
+	if(tt_ie56)
+	{
+		var ifrm = tt_aElt[tt_aElt.length - 1];
+		if(ifrm)
+		{
+			var css = ifrm.style;
+			css.zIndex = tt_aElt[0].style.zIndex - 1;
+			css.display = "block";
+		}
+	}
+}
+function tt_Move(e)
+{
+	e = window.event || e;
+	if(e)
+	{
+		tt_musX = tt_GetEvtX(e);
+		tt_musY = tt_GetEvtY(e);
+	}
+	if(tt_iState)
+	{
+		if(!tt_over && e)
+			tt_OverInit(e);
+		if(tt_iState & 0x4)
+		{
+			// Protect some browsers against jam of mousemove events
+			if(!tt_op && !tt_ie)
+			{
+				if(tt_bWait)
+					return;
+				tt_bWait = true;
+				tt_tWaitMov.Timer("tt_bWait = false;", 1, true);
+			}
+			if(tt_aV[FIX])
+			{
+				tt_iState &= ~0x4;
+				tt_SetTipPos(tt_aV[FIX][0], tt_aV[FIX][1]);
+			}
+			else if(!tt_ExtCallFncs(e, "MoveBefore"))
+				tt_SetTipPos(tt_PosX(), tt_PosY());
+			tt_ExtCallFncs([tt_musX, tt_musY], "MoveAfter")
+		}
+	}
+}
+function tt_PosX()
+{
+	var x;
+
+	x = tt_musX;
+	if(tt_aV[LEFT])
+		x -= tt_w + tt_aV[OFFSETX] - (tt_aV[SHADOW] ? tt_aV[SHADOWWIDTH] : 0);
+	else
+		x += tt_aV[OFFSETX];
+	// Prevent tip from extending past right/left clientarea boundary
+	if(x > tt_maxPosX)
+		x = tt_maxPosX;
+	return((x < tt_scrlX) ? tt_scrlX : x);
+}
+function tt_PosY()
+{
+	var y;
+
+	// Apply some hysteresis after the tip has snapped to the other side of the
+	// mouse. In case of insufficient space above and below the mouse, we place
+	// the tip below.
+	if(tt_aV[ABOVE] && (!tt_bJmpVert || tt_CalcPosYAbove() >= tt_scrlY + 16))
+		y = tt_DoPosYAbove();
+	else if(!tt_aV[ABOVE] && tt_bJmpVert && tt_CalcPosYBelow() > tt_maxPosY - 16)
+		y = tt_DoPosYAbove();
+	else
+		y = tt_DoPosYBelow();
+	// Snap to other side of mouse if tip would extend past window boundary
+	if(y > tt_maxPosY)
+		y = tt_DoPosYAbove();
+	if(y < tt_scrlY)
+		y = tt_DoPosYBelow();
+	return y;
+}
+function tt_DoPosYBelow()
+{
+	tt_bJmpVert = tt_aV[ABOVE];
+	return tt_CalcPosYBelow();
+}
+function tt_DoPosYAbove()
+{
+	tt_bJmpVert = !tt_aV[ABOVE];
+	return tt_CalcPosYAbove();
+}
+function tt_CalcPosYBelow()
+{
+	return(tt_musY + tt_aV[OFFSETY]);
+}
+function tt_CalcPosYAbove()
+{
+	var dy = tt_aV[OFFSETY] - (tt_aV[SHADOW] ? tt_aV[SHADOWWIDTH] : 0);
+	if(tt_aV[OFFSETY] > 0 && dy <= 0)
+		dy = 1;
+	return(tt_musY - tt_h - dy);
+}
+function tt_OnOut()
+{
+	tt_AddRemOutFnc(false);
+	if(!(tt_aV[STICKY] && (tt_iState & 0x2)))
+		tt_HideInit();
+}
+function tt_HideInit()
+{
+	tt_ExtCallFncs(0, "HideInit");
+	tt_iState &= ~0x4;
+	if(tt_flagOpa && tt_aV[FADEOUT])
+	{
+		tt_tFade.EndTimer();
+		if(tt_opa)
+		{
+			var n = Math.round(tt_aV[FADEOUT] / (tt_aV[FADEINTERVAL] * (tt_aV[OPACITY] / tt_opa)));
+			tt_Fade(tt_opa, tt_opa, 0, n);
+			return;
+		}
+	}
+	tt_tHide.Timer("tt_Hide();", 1, false);
+}
+function tt_OpReHref()
+{
+	if(tt_elDeHref)
+	{
+		tt_elDeHref.setAttribute("href", tt_elDeHref.t_href);
+		tt_RemEvtFnc(tt_elDeHref, "mousedown", tt_OpReHref);
+		window.status = tt_elDeHref.t_stats;
+		tt_elDeHref = null;
+	}
+}
+function tt_Fade(a, now, z, n)
+{
+	if(n)
+	{
+		now += Math.round((z - now) / n);
+		if((z > a) ? (now >= z) : (now <= z))
+			now = z;
+		else
+			tt_tFade.Timer("tt_Fade("
+							+ a + "," + now + "," + z + "," + (n - 1)
+							+ ")",
+							tt_aV[FADEINTERVAL],
+							true);
+	}
+	now ? tt_SetTipOpa(now) : tt_Hide();
+}
+// To circumvent the opacity nesting flaws of IE, we set the opacity
+// for each sub-DIV separately, rather than for the container DIV.
+function tt_SetTipOpa(opa)
+{
+	tt_SetOpa(tt_aElt[5].style, opa);
+	if(tt_aElt[1])
+		tt_SetOpa(tt_aElt[1].style, opa);
+	if(tt_aV[SHADOW])
+	{
+		opa = Math.round(opa * 0.8);
+		tt_SetOpa(tt_aElt[7].style, opa);
+		tt_SetOpa(tt_aElt[8].style, opa);
+	}
+}
+function tt_OnCloseBtnOver(iOver)
+{
+	var css = tt_aElt[4].style;
+
+	iOver <<= 1;
+	css.background = tt_aV[CLOSEBTNCOLORS][iOver];
+	css.color = tt_aV[CLOSEBTNCOLORS][iOver + 1];
+}
+function tt_Int(x)
+{
+	var y;
+
+	return(isNaN(y = parseInt(x)) ? 0 : y);
+}
+// Adds or removes the document.mousemove or HoveredElem.mouseout handler
+// conveniently. Keeps track of those handlers to prevent them from being
+// set or removed redundantly.
+function tt_AddRemOutFnc(bAdd)
+{
+	var PSet = bAdd ? tt_AddEvtFnc : tt_RemEvtFnc;
+
+	if(bAdd != tt_AddRemOutFnc.bOn)
+	{
+		PSet(tt_over, "mouseout", tt_OnOut);
+		tt_AddRemOutFnc.bOn = bAdd;
+		if(!bAdd)
+			tt_OpReHref();
+	}
+}
+tt_AddRemOutFnc.bOn = false;
+Number.prototype.Timer = function(s, iT, bUrge)
+{
+	if(!this.value || bUrge)
+		this.value = window.setTimeout(s, iT);
+}
+Number.prototype.EndTimer = function()
+{
+	if(this.value)
+	{
+		window.clearTimeout(this.value);
+		this.value = 0;
+	}
+}
+function tt_SetOpa(css, opa)
+{
+	tt_opa = opa;
+	if(tt_flagOpa == 1)
+	{
+		// Hack for bugs of IE:
+		// A DIV cannot be made visible in a single step if an opacity < 100
+		// has been applied while the DIV was hidden.
+		// Moreover, in IE6, applying an opacity < 100 has no effect if the
+		// concerned element has no layout (position, size, zoom, ...).
+		if(opa < 100)
+		{
+			var bVis = css.visibility != "hidden";
+			css.zoom = "100%";
+			if(!bVis)
+				css.visibility = "visible";
+			css.filter = "alpha(opacity=" + opa + ")";
+			if(!bVis)
+				css.visibility = "hidden";
+		}
+		else
+			css.filter = "";
+	}
+	else
+	{
+		opa /= 100.0;
+		switch(tt_flagOpa)
+		{
+		case 2:
+			css.KhtmlOpacity = opa; break;
+		case 3:
+			css.KHTMLOpacity = opa; break;
+		case 4:
+			css.MozOpacity = opa; break;
+		case 5:
+			css.opacity = opa; break;
+		}
+	}
+}
+function tt_MovDomNode(el, dadFrom, dadTo)
+{
+	if(dadFrom)
+		dadFrom.removeChild(el);
+	if(dadTo)
+		dadTo.appendChild(el);
+}
+function tt_Err(sErr)
+{
+	if(tt_Debug)
+		alert("Tooltip Script Error Message:\n\n" + sErr);
+}
+
+//===========  DEALING WITH EXTENSIONS	==============//
+function tt_ExtCmdEnum()
+{
+	var s;
+
+	// Add new command(s) to the commands enum
+	for(var i in config)
+	{
+		s = "window." + i.toString().toUpperCase();
+		if(eval("typeof(" + s + ") == tt_u"))
+		{
+			eval(s + " = " + tt_aV.length);
+			tt_aV[tt_aV.length] = null;
+		}
+	}
+}
+function tt_ExtCallFncs(arg, sFnc)
+{
+	var b = false;
+	for(var i = tt_aExt.length; i;)
+	{--i;
+		var fnc = tt_aExt[i]["On" + sFnc];
+		// Call the method the extension has defined for this event
+		if(fnc && fnc(arg))
+			b = true;
+	}
+	return b;
+}
+
+tt_Init();
diff --git a/htdocs/jsMath/COPYING.txt b/htdocs/jsMath/COPYING.txt
new file mode 100644
index 0000000000..d645695673
--- /dev/null
+++ b/htdocs/jsMath/COPYING.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/htdocs/jsMath/blank.gif b/htdocs/jsMath/blank.gif
new file mode 100644
index 0000000000..8b27096e0e
Binary files /dev/null and b/htdocs/jsMath/blank.gif differ
diff --git a/htdocs/jsMath/easy/load.js b/htdocs/jsMath/easy/load.js
new file mode 100644
index 0000000000..dbd55c4d38
--- /dev/null
+++ b/htdocs/jsMath/easy/load.js
@@ -0,0 +1,164 @@
+/**********************************************************************
+ *
+ *   Customize the values given below to suit your needs.
+ *   You can make additional copies of this file with
+ *   different customizated settings if you need to load
+ *   jsMath with different parameters.
+ *   
+ *   Load this page via:
+ *   
+ *   <SCRIPT SRC="path-to-jsMath/easy/load.js"></SCRIPT>
+ *   
+ *   (If you are including this file into your page via Server-Side
+ *   Includes, you should remove line above.)
+ *   
+ *   You can make copies of this file with different settings
+ *   if you need to have several different configurations.
+ *   
+ **********************************************************************/
+
+if (!window.jsMath) {window.jsMath = {}}
+
+jsMath.Easy = {
+  //
+  //  The URL of the root jsMath directory on your server
+  //  (it must be in the same domain as the HTML page).
+  //  It should include "http://yoursite.com/", or should
+  //  be relative to the root of your server.  It is possible
+  //  to be a relative URL, but it will be relative to the
+  //  HTML page loading this file.
+  //  
+  //  If you leave this blank, jsMath will try to look it up from
+  //  the URL where it loaded this file, but that may not work.
+  //
+  root: "",
+  
+  //
+  //  The default scaling factor for mathematics compared to the
+  //  surrounding text.
+  //
+  scale: 120,
+  
+  //
+  //  1 means use the autoload plug-in to decide if jsMath should be loaded
+  //  0 means always load jsMath
+  //
+  autoload: 1,
+
+  //
+  //  Setting any of these will cause the tex2math plugin to be used
+  //  to add the <DIV> and <SPAN> tags that jsMath needs.  See the
+  //  documentation for the tex2math plugin for more information.
+  //
+  processSlashParens: 1,       // process \(...\) in text?
+  processSlashBrackets: 1,     // process \[...\] in text?
+  processDoubleDollars: 1,     // process $$...$$ in text?
+  processSingleDollars: 0,     // process $...$ in text?
+  processLaTeXenvironments: 0, // process \begin{xxx}...\end{xxx} outside math mode?
+  fixEscapedDollars: 0,        // convert \$ to $ outside of math mode?
+  doubleDollarsAreInLine: 0,   // make $$...$$ be in-line math?
+  allowDisableTag: 1,          // allow ID="tex2math_off" to disable tex2math?
+  //
+  //  If you want to use your own custom delimiters for math instead
+  //  of the usual ones, then uncomment the following four lines and
+  //  insert your own delimiters within the quotes.  You may want to
+  //  turn off processing of the dollars and other delimiters above
+  //  as well, though you can use them in combination with the
+  //  custom delimiters if you wish.  See the tex2math documentation
+  //  for more details.
+  //  
+  //customDelimiters: [
+  //  '[math]','[/math]',        // to begin and end in-line math
+  //  '[display]','[/display]'   // to begin and end display math
+  //],
+
+  //
+  //  Disallow the use of the @(...) mechanism for including raw HTML
+  //  in the contents of \hbox{}?  (If used in a content-management system
+  //  where users are allowed to enter mathematics, setting this to 0
+  //  would allow them to enter arbitrary HTML code within their
+  //  math formulas, and that poses a security risk.)
+  //
+  safeHBoxes: 1,
+
+  //
+  //  Show TeX source when mathematics is double-clicked?
+  //
+  allowDoubleClicks: 1,
+  
+  //
+  //  Show jsMath font warning messages?  (Disabling this prevents yours
+  //  users from finding out that they can have a better experience on your
+  //  site by installing some fonts, so don't disable this).
+  //
+  showFontWarnings: 1,
+  
+  //
+  //  Use "Process" or "ProcessBeforeShowing".  See the jsMath
+  //  author's documentation for the difference between these
+  //  two routines.
+  //
+  method: "Process",
+
+  //
+  //  List of plug-ins and extensions that you want to be
+  //  loaded automatically.  E.g.
+  //      ["plugins/mimeTeX.js","extensions/AMSsymbols.js"]
+  //  
+  loadFiles: [],
+  
+  //
+  //  List of fonts to load automatically.  E.g.
+  //      ["cmmib10"]
+  //
+  loadFonts: [],
+  
+  //
+  //  List of macros to define.  These are of the form
+  //      name: value
+  //  where 'value' is the replacement text for the macro \name.
+  //  The 'value' can also be [value,n] where 'value' is the replacement
+  //  text and 'n' is the number of parameters for the macro.
+  //  Note that backslashes must be doubled in the replacement string.
+  //  E.g.,
+  //      {
+  //        RR: '{\\bf R}',
+  //        bold: ['{\\bf #1}', 1]
+  //      }
+  //
+  macros: {},
+  
+  //
+  //  Allow jsMath to enter global mode?
+  //  (Uses frames, so may not always work with complex web sites)
+  //
+  allowGlobal: 1,
+  
+  //
+  //  Disable image fonts?  (In case you don't load them on your server.)
+  //
+  noImageFonts: 0
+  
+};
+
+/****************************************************************/
+/****************************************************************/
+//
+//            DO NOT MAKE CHANGES BELOW THIS
+//
+/****************************************************************/
+/****************************************************************/
+
+if (jsMath.Easy.root == "") {
+  jsMath.Easy.root = document.getElementsByTagName("script");
+  jsMath.Easy.root = jsMath.Easy.root[jsMath.Easy.root.length-1].src
+  if (jsMath.Easy.root.match(/\/easy\/[^\/]*$/)) {
+    jsMath.Easy.root = jsMath.Easy.root.replace(/\/easy\/[^\/]*$/,"");
+  } else {
+    jsMath.Easy.root = jsMath.Easy.root.replace(/\/(jsMath\/(easy\/)?)?[^\/]*$/,"/jsMath");
+  }
+}
+jsMath.Easy.root = jsMath.Easy.root.replace(/\/$/,""); // trim trailing "/" if any
+
+document.write('<script src="'+jsMath.Easy.root+'/jsMath-easy-load.js"><'+'/script>');
+
diff --git a/htdocs/jsMath/extensions/AMSmath.js b/htdocs/jsMath/extensions/AMSmath.js
new file mode 100644
index 0000000000..19cac04261
--- /dev/null
+++ b/htdocs/jsMath/extensions/AMSmath.js
@@ -0,0 +1,293 @@
+/*
+ *  extensions/AMSmath.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file defines most of the macros and environments from
+ *  the amsmath LaTeX package.  You can activate it by calling
+ *  
+ *    jsMath.Extension.Require('AMSmath');
+ *  
+ *  once jsMath.js has been loaded, or by adding "extensions/AMSmath.js"
+ *  to the loadFiles array in jsMath/easy/load.js.
+ *  
+ *  You may wish to load AMSsymbols.js as well, but note that it
+ *  requires the extra msam10 and msb10 fonts that you will have 
+ *  to install on your server first.
+ *  
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 2007 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/********************************************************************/
+
+jsMath.Extension.Require("moreArrows");
+
+jsMath.Package(jsMath.Parser,{
+  macros: {
+    intI:       ['Macro','\\mathchoice{\\!}{}{}{}\\!\\!\\int'],
+    iint:       ['Macro','\\!\\!\\!\\mathop{\\,\\,\\,\\int\\intI}'],
+    iiint:      ['Macro','\\!\\!\\!\\mathop{\\,\\,\\,\\int\\intI\\intI}'],
+    iiiint:     ['Macro','\\!\\!\\!\\mathop{\\,\\,\\,\\int\\intI\\intI\\intI}'],
+    idotsint:   ['Macro','\\!\\!\\mathop{\\,\\,\\int\\cdots\\int}'],
+    
+    dddot:      ['Macro','\\mathop{#1}\\limits^{\\textstyle ...}',1],
+    ddddot:     ['Macro','\\mathop{#1}\\limits^{\\textstyle ....}',1],
+    
+    sideset:    ['Macro','\\mathop{\\rlap{\\phantom{#3}}}#1\\!{#3}#2',3],
+    stackrel:   ['Macro','\\mathrel{\\mathop{#2}\\limits^{#1}}',2],
+    
+    boxed:      ['Macro','\\fbox{$\\displaystyle{#1}$}',1],
+    
+    tag:        'HandleTag',
+    notag:      ['Macro',''],
+    
+    substack:   ['Macro','\\begin{subarray}{c}#1\\end{subarray}',1],
+    
+    varliminf:  ['Macro','\\mathop{\\underline{\\raise1.5pt{\\rule{0pt}{.6em}{0pt}\\smash{\\lower1.5pt{\\rm lim}}}}}'],
+    varlimsup:  ['Macro','\\mathop{\\overline{\\rule{0pt}{.6em}{0pt}\\smash{\\rm lim}}}'],
+    varinjlim:  ['Macro','\\mathop{\\underrightarrow{\\rm lim}}'],
+    varprojlim: ['Macro','\\mathop{\\underleftarrow{\\rm lim}}'],
+    
+    DeclareMathOperator: 'HandleDeclareOp',
+    operatorname: 'HandleOperatorName',
+
+    genfrac:    'Genfrac',
+    frac:       ['Genfrac',"","","",""],
+    tfrac:      ['Genfrac',"","","","1"],
+    dfrac:      ['Genfrac',"","","","0"],
+    binom:      ['Genfrac',"(",")","0pt",""],
+    tbinom:     ['Genfrac',"(",")","0pt","1"],
+    dbinom:     ['Genfrac',"(",")","0pt","0"],
+    
+    cfrac:      'CFrac',
+    
+    shoveleft:  ['HandleShove','left'],
+    shoveright: ['HandleShove','right']
+  },
+  
+  environments: {
+    align:         ['Array',null,null,'rlrlrlrlrlrl',[5/18,2,5/18,2,5/18,2,5/18,2,5/18,2,5/18],1,'D'],
+    'align*':      ['Array',null,null,'rlrlrlrlrlrl',[5/18,2,5/18,2,5/18,2,5/18,2,5/18,2,5/18],1,'D'],
+    aligned:       ['Array',null,null,'rlrlrlrlrlrl',[5/18,2,5/18,2,5/18,2,5/18,2,5/18,2,5/18],1,'D'],
+    multline:     'Multline',
+    'multline*':  'Multline',
+    split:         ['Array',null,null,'rl',[5/18],1,'D'],
+    gather:        ['Array',null,null,'c',null,1,'D'],
+    'gather*':     ['Array',null,null,'c',null,1,'D'],
+    gathered:      ['Array',null,null,'c',null,1,'D'],
+    subarray:      ['Array',null,null,null,[0,0,0,0],1,'S',0,.25],
+    smallmatrix:   ['Array',null,null,'cccccccccc',[1/3,1/3,1/3,1/3,1/3,1/3,1/3,1/3,1/3,1/3],1,'S',0]
+  },
+  
+  delimiter: {
+    '\\lvert':     [4,2,0x6A,3,0x0C],
+    '\\rvert':     [5,2,0x6A,3,0x0C],
+    '\\lVert':     [4,2,0x6B,3,0x0D],
+    '\\rVert':     [5,2,0x6B,3,0x0D]
+  },
+
+  /*
+   *  Ignore the tag for now
+   */
+  HandleTag: function (name) {
+    var arg = this.trimSpaces(this.GetArgument(this.cmd+name)); if (this.error) return;
+    if (arg == "*") this.GetArgument(this.cmd+name);
+  },
+  
+  /*
+   *  Handle \DeclareMathOperator
+   */
+  HandleDeclareOp: function (name) {
+    var limits = "";
+    var cs = this.trimSpaces(this.GetArgument(this.cmd+name)); if (this.error) return;
+    if (cs == "*") {
+      limits = "\\limits";
+      cs = this.trimSpaces(this.GetArgument(this.cmd+name)); if (this.error) return;
+    }
+    if (cs.charAt(0) == "\\") {cs = cs.substr(1)}
+    var op = this.GetArgument(this.cmd+name); if (this.error) return;
+    op = op.replace(/\*/g,'\\char{cmr10}{0x2A}').replace(/-/g,'\\char{cmr10}{0x2D}');
+    jsMath.Parser.prototype.macros[cs] = ['Macro','\\mathop{\\rm '+op+'}'+limits];
+  },
+  
+  HandleOperatorName: function (name) {
+    var limits = "\\nolimits";
+    var op = this.trimSpaces(this.GetArgument(this.cmd+name)); if (this.error) return;
+    if (op == "*") {
+      limits = "\\limits";
+      op = this.trimSpaces(this.GetArgument(this.cmd+name)); if (this.error) return;
+    }
+    op = op.replace(/\*/g,'\\char{cmr10}{0x2A}').replace(/-/g,'\\char{cmr10}{0x2D}');
+    this.string = '\\mathop{\\rm '+op+'}'+limits+this.string.slice(this.i);
+    this.i = 0;
+  },
+  
+  /*
+   *  Record presence of \shoveleft and \shoveright
+   */
+  HandleShove: function (name,data) {
+    if (this.mlist.data.entry == null) {this.mlist.data.entry = {}}
+    this.mlist.data.entry.shove = data[0];
+  },
+  
+  /*
+   *  Handle \cfrac
+   */
+  CFrac: function (name) {
+    var lr = this.GetBrackets(this.cmd+name); if (this.error) return;
+    var num = this.GetArgument(this.cmd+name); if (this.error) return;
+    var den = this.GetArgument(this.cmd+name); if (this.error) return;
+    
+    num = this.Process('\\strut\\textstyle{'+num+'}'); if (this.error) return;
+    den = this.Process('\\strut\\textstyle{'+den+'}'); if (this.error) return;
+    var data = this.mlist.data;
+    var TeX = jsMath.Typeset.TeX(data.style,data.size);
+    
+    if (lr != "") {
+      if (lr != 'l' && lr != 'r') {this.Error("Illegal alignment specified in "+this.cmd+name); return}
+      num = jsMath.Box.Set(num,data.style,data.size);
+      den = jsMath.Box.Set(den,data.style,data.size);
+      if (num.w > den.w) {
+        if (lr == 'l') {den.html += jsMath.HTML.Spacer(num.w-den.w)}
+                  else {den.html = jsMath.HTML.Spacer(num.w-den.w) + den.html}
+        den.w = num.w;
+      } else if (num.w < den.w) {
+        if (lr == 'l') {num.html += jsMath.HTML.Spacer(den.w-num.w)}
+                  else {num.html = jsMath.HTML.Spacer(den.w-num.w) + num.html}
+        num.w = den.w;
+      }
+    }
+    
+    this.mlist.Add(jsMath.mItem.Fraction(name,num,den,TeX.default_rule_thickness));
+  },
+  
+  /*
+   *  Implement AMS generalized fraction
+   */
+  Genfrac: function (name,data) {
+    var left = data[0]; var right = data[1];
+    var thickness = data[2]; var style = data[3];
+    
+    if (left != null) {left = this.delimiter[left]} else
+      {left = this.GetDelimiterArg(this.cmd+name); if (this.error) return}
+    if (right != null) {right = this.delimiter[right]} else 
+      {right = this.GetDelimiterArg(this.cmd+name); if (this.error) return}
+    if (thickness == null) {thickness = this.GetArgument(this.cmd+name); if (this.error) return}
+    if (style == null) {style = this.GetArgument(this.cmd+name); if (this.error) return}
+
+    var num = this.ProcessArg(this.cmd+name); if (this.error) return;
+    var den = this.ProcessArg(this.cmd+name); if (this.error) return;
+    
+    if (left == "") {left = null}; if (right == "") {right = null}
+    if (thickness == "") {
+      var TeX =jsMath.Typeset.TeX(this.mlist.data.style,this.mlist.data.size);
+      thickness = TeX.default_rule_thickness;
+    } else {
+      thickness = this.ParseDimen(thickness,this.cmd+name,0,0);
+    }
+    
+    var frac = jsMath.mItem.Fraction(name,num,den,thickness,left,right);
+
+    if (style != "") {
+      style = (["D","T","S","SS"])[style];
+      if (style == null) {this.Error("Bad math style for "+this.cmd+name); return}
+      var mlist = new jsMath.mList([new jsMath.mItem('style',{style:style}),frac]);
+      this.mlist.Add(jsMath.mItem.Atom('inner',{type:'mlist',mlist: mlist}));
+    } else {
+      this.mlist.Add(frac);
+    }
+  },
+  
+  /*
+   *  Implements the multline environment
+   */
+  Multline: function (name,delim) {
+    var data = this.mlist.data;
+    var width = this.GetBrackets(this.cmd+'begin{'+name+'}'); if (this.error) return;
+    var arg = this.GetEnd(name); if (this.error) return;
+
+    var parse = new jsMath.Parser(arg+this.cmd+'\\',null,data.size,'D');
+    parse.matrix = name; parse.row = []; parse.table = []; parse.rspacing = [];
+    parse.Parse(); if (parse.error) {this.Error(parse); return}
+    parse.HandleRow(name,1);  // be sure the last row is recorded
+    
+    //
+    // check rows for extra columns and maximum width
+    // 
+    var i; var row; var W = 0;
+    for (i = 0; i < parse.table.length; i++) {
+      row = parse.table[i];
+      if (row.length > 1) {
+        this.Error("Rows can contain only one equation in '"+name+"' environment");
+        return;
+      }
+      if (row[0].w > W) {W = row[0].w}
+    }
+
+    //
+    //  Determine width of display
+    //
+    if (width == "") {width = W+2} else {
+      width = this.ParseDimen(width,name,0,0);
+      if (width < W) {width = W}
+    }
+    
+    //
+    //  Shove the top and bottom lines
+    //
+    if (parse.table.length > 1) {
+      parse.table[0][0].entry.shove = 'left';
+      row = parse.table[parse.table.length-1];
+      if (!row[0].entry.shove) {row[0].entry.shove = 'right'}
+    }
+    //
+    //  Adjust widths of shoved lines
+    //
+    for (i = 0; i < parse.table.length; i++) {
+      row = parse.table[i][0];
+      if (row.entry.shove && row.w < width) {
+        switch (row.entry.shove) {
+          case 'left':
+            row.html += jsMath.HTML.Spacer(width-row.w);
+            break;
+            
+          case 'right':
+            row.html = jsMath.HTML.Spacer(width-row.w)+row.html;
+            break;
+        }
+        row.w = width;
+      }
+    }
+    
+    //
+    //  Do the layout
+    //
+    var box = jsMath.Box.Layout(data.size,parse.table);
+    this.mlist.Add(jsMath.mItem.Atom('ord',box));
+  },
+
+  /*
+   *  Get a delimiter or empty argument
+   */
+  GetDelimiterArg: function (name) {
+    var c = this.trimSpaces(this.GetArgument(name)); if (this.error) return null;
+    if (c == "") return null;
+    if (this.delimiter[c]) return this.delimiter[c];
+    this.Error("Missing or unrecognized delimiter for "+name);
+    return null;
+  }
+});
\ No newline at end of file
diff --git a/htdocs/jsMath/extensions/AMSsymbols.js b/htdocs/jsMath/extensions/AMSsymbols.js
new file mode 100644
index 0000000000..8ce42457f4
--- /dev/null
+++ b/htdocs/jsMath/extensions/AMSsymbols.js
@@ -0,0 +1,290 @@
+/*
+ *  extensions/AMSsymbol.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file defines the macros needed to access the AMS symbol fonts
+ *  available in msam10 and msbm10.  You can activate it by calling
+ *  
+ *    jsMath.Extension.Require('AMSsymbols');
+ *  
+ *  once jsMath.js has been loaded.
+ *  
+ *  Note that you will need to install the msam10 and msbm10 fonts
+ *  that are available from the jsMath extra font page at
+ *  
+ *      http://www.math.union.edu/locate/jsMath/download/extra-fonts/
+ *  
+ *  in order to make this work in image mode.  Note that there is no
+ *  unicode fallback mode for these fonts at this time.
+ *  
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 2006 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/********************************************************************/
+
+
+delete jsMath.Parser.prototype.macros['hbar'];
+delete jsMath.Parser.prototype.macros['angle'];
+delete jsMath.Parser.prototype.macros['rightleftharpoons'];
+
+jsMath.Extension.MathChar("msam10",{
+  // Miscellaneous symbols
+  vartriangle:        [3,0x4D],
+  triangledown:       [0,0x4F],
+  square:             [0,0x03],
+  lozenge:            [0,0x06],
+  circledS:           [0,0x73],
+  angle:              [0,0x5C],
+  measuredangle:      [0,0x5D],
+  backprime:          [0,0x38],
+  blacktriangle:      [0,0x4E],
+  blacktriangledown:  [0,0x48],
+  blacksquare:        [0,0x04],
+  blacklozenge:       [0,0x07],
+  bigstar:            [0,0x46],
+  sphericalangle:     [0,0x5E],
+  complement:         [0,0x7B],
+
+  // Binary operators
+  dotplus:            [2,0x75],
+  Cap:                [2,0x65],
+  doublecap:          [2,0x65],
+  Cup:                [2,0x64],
+  doublecup:          [2,0x64],
+  barwedge:           [2,0x5A],
+  veebar:             [2,0x59],
+  doublebarwedge:     [2,0x5B],
+  boxminus:           [2,0x0C],
+  boxtimes:           [2,0x02],
+  boxdot:             [2,0x00],
+  boxplus:            [2,0x01],
+  leftthreetimes:     [2,0x68],
+  rightthreetimes:    [2,0x69],
+  curlywedge:         [2,0x66],
+  curlyvee:           [2,0x67],
+  circleddash:        [2,0x7F],
+  circledast:         [2,0x7E],
+  circledcirc:        [2,0x7D],
+  centerdot:          [2,0x05],
+  intercal:           [2,0x7C],
+
+  // Binary relations
+  leqq:               [3,0x35],
+  leqslant:           [3,0x36],
+  eqslantless:        [3,0x30],
+  lesssim:            [3,0x2E],
+  lessapprox:         [3,0x2F],
+  lll:                [3,0x6E],
+  llless:             [3,0x6E],
+  lessgtr:            [3,0x37],
+  lesseqgtr:          [3,0x51],
+  lesseqqgtr:         [3,0x53],
+  doteqdot:           [3,0x2B],
+  Doteq:              [3,0x2B],
+  risingdotseq:       [3,0x3A],
+  fallingdotseq:      [3,0x3B],
+  backsim:            [3,0x76],
+  backsimeq:          [3,0x77],
+  subseteqq:          [3,0x6A],
+  Subset:             [3,0x62],
+  sqsubset:           [3,0x40],
+  preccurlyeq:        [3,0x34],
+  curlyeqprec:        [3,0x32],
+  precsim:            [3,0x2D],
+  vartriangleleft:    [3,0x43],
+  trianglelefteq:     [3,0x45],
+  vDash:              [3,0x0F],
+  Vvdash:             [3,0x0E],
+  smallsmile:         [3,0x60],
+  smallfrown:         [3,0x61],
+  bumpeq:             [3,0x6C],
+  Bumpeq:             [3,0x6D],
+  varpropto:          [3,0x5F],
+  blacktriangleleft:  [3,0x4A],
+  therefore:          [3,0x29],
+  geqq:               [3,0x3D],
+  geqslant:           [3,0x3E],
+  eqslantgtr:         [3,0x31],
+  gtrsim:             [3,0x26],
+  gtrapprox:          [3,0x27],
+  ggg:                [3,0x6F],
+  gggtr:              [3,0x6F],
+  gtrless:            [3,0x3F],
+  gtreqless:          [3,0x52],
+  gtreqqless:         [3,0x54],
+  eqcirc:             [3,0x50],
+  circeq:             [3,0x24],
+  triangleq:          [3,0x2C],
+  supseteqq:          [3,0x6B],
+  Supset:             [3,0x63],
+  sqsupset:           [3,0x41],
+  succcurlyeq:        [3,0x3C],
+  curlyeqsucc:        [3,0x33],
+  succsim:            [3,0x25],
+  vartriangleright:   [3,0x42],
+  trianglerighteq:    [3,0x44],
+  Vdash:              [3,0x0D],
+  between:            [3,0x47],
+  pitchfork:          [3,0x74],
+  blacktriangleright: [3,0x49],
+  because:            [3,0x2A],
+
+  // Arrows
+  leftleftarrows:     [3,0x12],
+  leftrightarrows:    [3,0x1C],
+  Lleftarrow:         [3,0x57],
+  twoheadleftarrow:   [3,0x11],
+  leftarrowtail:      [3,0x1B],
+  looparrowleft:      [3,0x22],
+  leftrightharpoons:  [3,0x0B],
+  circlearrowleft:    [3,0x09],
+  Lsh:                [3,0x1E],
+  upuparrows:         [3,0x14],
+  upharpoonleft:      [3,0x18],
+  downharpoonleft:    [3,0x19],
+  multimap:           [3,0x28],
+  leftrightsquigarrow:[3,0x21],
+  rightrightarrows:   [3,0x13],
+  rightleftarrows:    [3,0x1D],
+  Rrightarrow:        [3,0x56],
+  twoheadrightarrow:  [3,0x10],
+  rightarrowtail:     [3,0x1A],
+  looparrowright:     [3,0x23],
+  rightleftharpoons:  [3,0x0A],
+  circlearrowright:   [3,0x08],
+  Rsh:                [3,0x1F],
+  downdownarrows:     [3,0x15],
+  upharpoonright:     [3,0x16],
+  downharpoonright:   [3,0x17],
+  rightsquigarrow:    [3,0x20]
+});
+
+jsMath.Extension.MathChar("msbm10",{
+  // Lowercase Greek letters
+  digamma:            [0,0x7A],
+  varkappa:           [0,0x7B],
+
+  // Hebrew letters
+  beth:               [0,0x69],
+  daleth:             [0,0x6B],
+  gimel:              [0,0x6A],
+
+  // Miscellaneous symbols
+  hbar:               [0,0x7E],
+  hslash:             [0,0x7D],
+  nexists:            [0,0x40],
+  mho:                [0,0x66],
+  Finv:               [0,0x60],
+  Game:               [0,0x61],
+  Bbbk:               [0,0x7C],
+  varnothing:         [0,0x3F],
+  eth:                [0,0x67],
+  diagup:             [0,0x1E],
+  diagdown:           [0,0x1F],
+
+  // Binary operators
+  smallsetminus:      [2,0x72],
+  divideontimes:      [2,0x3E],
+  ltimes:             [2,0x6E],
+  rtimes:             [2,0x6F],
+
+  // Binary relations
+  approxeq:           [3,0x75],
+  lessdot:            [3,0x6C],
+  precapprox:         [3,0x77],
+  gtrdot:             [3,0x6D],
+  thicksim:           [3,0x73],
+  thickapprox:        [3,0x74],
+  succapprox:         [3,0x76],
+  shortmid:           [3,0x70],
+  shortparallel:      [3,0x71],
+  backepsilon:        [3,0x7F],
+
+  // Negated relations
+  nless:              [3,0x04],
+  nleq:               [3,0x02],
+  nleqslant:          [3,0x0A],
+  nleqq:              [3,0x14],
+  lneq:               [3,0x0C],
+  lneqq:              [3,0x08],
+  lvertneqq:          [3,0x00],
+  lnsim:              [3,0x12],
+  lnapprox:           [3,0x1A],
+  nprec:              [3,0x06],
+  npreceq:            [3,0x0E],
+  precneqq:           [3,0x16],
+  precnsim:           [3,0x10],
+  precnapprox:        [3,0x18],
+  nsim:               [3,0x1C],
+  nshortmid:          [3,0x2E],
+  nmid:               [3,0x2D],
+  nvdash:             [3,0x30],
+  nVdash:             [3,0x31],
+  ntriangleleft:      [3,0x36],
+  ntrianglelefteq:    [3,0x35],
+  nsubseteq:          [3,0x2A],
+  nsubseteqq:         [3,0x22],
+  subsetneq:          [3,0x28],
+  varsubsetneq:       [3,0x20],
+  subsetneqq:         [3,0x24],
+  varsubsetneqq:      [3,0x26],
+  ngtr:               [3,0x05],
+  ngeq:               [3,0x03],
+  ngeqslant:          [3,0x0B],
+  ngeqq:              [3,0x15],
+  gneq:               [3,0x0D],
+  gneqq:              [3,0x09],
+  gvertneqq:          [3,0x01],
+  gnsim:              [3,0x13],
+  gnapprox:           [3,0x1B],
+  nsucc:              [3,0x07],
+  nsucceq:            [3,0x0F],
+  succneqq:           [3,0x17],
+  succnsim:           [3,0x11],
+  succnapprox:        [3,0x19],
+  ncong:              [3,0x1D],
+  nshortparallel:     [3,0x2F],
+  nparallel:          [3,0x2C],
+  nvDash:             [3,0x32],
+  nVDash:             [3,0x33],
+  ntriangleright:     [3,0x37],
+  ntrianglerighteq:   [3,0x34],
+  nsupseteq:          [3,0x2B],
+  nsupseteqq:         [3,0x23],
+  supsetneq:          [3,0x29],
+  varsupsetneq:       [3,0x21],
+  supsetneqq:         [3,0x25],
+  varsupsetneqq:      [3,0x27],
+
+  // Arrows
+  curvearrowleft:     [3,0x78],
+  curvearrowright:    [3,0x79],
+
+  // Negated arrows
+  nleftarrow:         [3,0x38],
+  nLeftarrow:         [3,0x3A],
+  nleftrightarrow:    [3,0x3D],
+  nrightarrow:        [3,0x39],
+  nRightarrow:        [3,0x3B],
+  nLeftrightarrow:    [3,0x3C]
+});
+
+jsMath.Macro('Bbb','{\\msbm #1}',1);
+jsMath.Macro('mathbb','{\\msbm #1}',1);
+jsMath.Extension.Font('msbm');
+jsMath.Extension.Font('msam');
diff --git a/htdocs/jsMath/extensions/HTML.js b/htdocs/jsMath/extensions/HTML.js
new file mode 100644
index 0000000000..1982e36370
--- /dev/null
+++ b/htdocs/jsMath/extensions/HTML.js
@@ -0,0 +1,122 @@
+/*
+ *  extensions/HTML.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file implements a number of HTML-specific extensions to TeX,
+ *  including \color, \style, \class, \unicode, etc.  It will be loaded
+ *  automatically when needed, or can be loaded by
+ *  
+ *    jsMath.Extension.Require('HTML');
+ *
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 2005-2006 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/********************************************************************/
+
+jsMath.Package(jsMath.Parser,{
+
+  macros: {
+    color:      'Color',
+    href:       'Href',
+    'class':    'Class',
+    style:      'Style',
+    cssId:      'CSSId',
+    unicode:    'Unicode'
+  },
+  
+  /*
+   *  Show the argument in a particular color
+   */
+  Color: function (name) {
+    var color = this.GetArgument(this.cmd+name); if (this.error) return;
+    this.CheckHTML(color,name); if (this.error) return;
+    // check that it looks like a color?
+    this.AddHTML(name,['<span style="color: '+color+'">','</span>']);
+  },
+  
+  /*
+   *  Make the argument be a link
+   */
+  Href: function (name) {
+    var href = this.GetArgument(this.cmd+name); if (this.error) return;
+    this.CheckHTML(href,name); if (this.error) return;
+    this.AddHTML(name,['<a class="link" href="'+href+'">','</a>']);
+  },
+  
+  /*
+   *  Apply a CSS class to the argument
+   */
+  Class: function (name) {
+    var clss = this.GetArgument(this.cmd+name); if (this.error) return;
+    this.CheckHTML(clss,name); if (this.error) return;
+    this.AddHTML(name,['<span class="'+clss+'">','</span>']);
+  },
+  
+  /*
+   *  Apply a CSS style to the argument
+   */
+  Style: function (name) {
+    var style = this.GetArgument(this.cmd+name); if (this.error) return;
+    this.CheckHTML(style,name); if (this.error) return;
+    this.AddHTML(name,['<span style="'+style+'">','</span>']);
+  },
+  
+  /*
+   *  Add a CSS element ID to the argument
+   */
+  CSSId: function (name) {
+    var id = this.GetArgument(this.cmd+name); if (this.error) return;
+    this.CheckHTML(id,name); if (this.error) return;
+    this.AddHTML(name,['<span id="'+id+'">','</span>']);
+  },
+  
+  /*
+   *  Insert some raw HTML around the argument (this will not affect
+   *  the spacing or other TeX features)
+   */
+  AddHTML: function (name,params) {
+    var data = this.mlist.data;
+    var arg = this.GetArgument(this.cmd+name); if (this.error) return;
+    arg = jsMath.Parse(arg,data.font,data.size,data.style);
+      if (arg.error) {this.Error(arg); return}
+    this.mlist.Add(jsMath.mItem.HTML(params[0]));
+    for (var i = 0; i < arg.mlist.Length(); i++) {this.mlist.Add(arg.mlist.Get(i))}
+    this.mlist.Add(jsMath.mItem.HTML(params[1]));
+  },
+  
+  CheckHTML: function (data,name) {
+    if (data.match(/[<>&"]/))
+      {this.Error("Can't include raw HTML in first argument of "+this.cmd+name)}
+  },
+  
+  /*
+   *  Insert a unicode reference as an Ord atom.  Its argument should
+   *  be the unicode code point, e.g. \unicode{8211}, or \unicode{x203F}.
+   *  You can also specify the height (offset from the x height) and depth
+   *  in ems, together with a CSS class for the character, e.g.,
+   *  \unicode{8211,class,.2,-.3}
+   */
+  Unicode: function (name) {
+    var arg = this.GetArgument(this.cmd+name); if (this.error) return;
+    this.CheckHTML(arg,name); if (this.error) return;
+    arg = arg.split(','); arg[0] = '&#'+arg[0]+';';
+    if (!arg[1]) {arg[1] = 'normal'}
+    this.mlist.Add(jsMath.mItem.TextAtom('ord',arg[0],arg[1],arg[2],arg[3]));
+  }
+
+});
diff --git a/htdocs/jsMath/extensions/autobold.js b/htdocs/jsMath/extensions/autobold.js
new file mode 100644
index 0000000000..8fea7bb9aa
--- /dev/null
+++ b/htdocs/jsMath/extensions/autobold.js
@@ -0,0 +1,51 @@
+/*
+ *  extensions/autobold.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file causes jsMath to use \boldsymbol{...} around mathematics
+ *  that appears within <B>...</B> tags or has font-weight:bold applied
+ *  via CSS rule.  You can activate it by calling
+ *  
+ *    jsMath.Extension.Require('autobold');
+ *    
+ *  once jsMath.js has been loaded, or by adding "extensions/autobold.js"
+ *  to the loadFiles array in jsMath/easy/load.js.
+ *  
+ *  Note that you will need to install the cmmib10 and cmbsy10 fonts
+ *  that are available from the jsMath extra font page at
+ *  
+ *      http://www.math.union.edu/locate/jsMath/download/extra-fonts/
+ *
+ *  to make this work in image mode.  Note that there is no unicode
+ *  fallback for these fonts at the moment.
+ *  
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 2008 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/********************************************************************/
+
+jsMath.Extension.Require("boldsymbol");
+
+jsMath.Translate.OldParse = jsMath.Translate.Parse;
+jsMath.Translate.Parse = function (style,text,noCache) {
+  if (jsMath.BBoxFor('</SPAN></SPAN><SPAN STYLE="font-family:Times,serif">MMMMMMMMMM</SPAN><SPAN><SPAN>').w >
+      jsMath.BBoxFor('</SPAN></SPAN><SPAN STYLE="font-family:Times,serif; font-weight:normal">MMMMMMMMMM</SPAN><SPAN><SPAN>').w) {
+    text = '\\boldsymbol{' + text + '}';
+  }
+  return jsMath.Translate.OldParse(style,text,noCache);
+}
diff --git a/htdocs/jsMath/extensions/bbox.js b/htdocs/jsMath/extensions/bbox.js
new file mode 100644
index 0000000000..e2b3670252
--- /dev/null
+++ b/htdocs/jsMath/extensions/bbox.js
@@ -0,0 +1,113 @@
+/*
+ *  extensions/bbox.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file implements the \bbox macro, which creates an HTML box that
+ *  can be styled (for background colors, and so on).  You can include
+ *  an optional dimension that tells how much extra padding to include
+ *  around the bounding box for the mathematics.  E.g.,
+ *  
+ *    \bbox[2pt]{x+y}        %  an invisible box around x+y with 2pt of extra space
+ *    \bbox[green]{x+y}      %  a green box around x+y
+ *    \bbox[green,2pt]{x+y}  %  a green box with 2pt of extra space
+ *    \bbox[yellow,2pt,border:1px solid red]{x+y}
+ *                           %  a yellow box with a red border and 2pt space
+ *  
+ *  This extension is loaded automatically when needed, or you can call
+ *  it directly via
+ *  
+ *    jsMath.Extension.Require('bbox');
+ *  
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 2006 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/********************************************************************/
+
+jsMath.Add(jsMath.HTML,{
+
+  /*
+   *  Create a colored bbounding box
+   */
+  BBox: function (w,h,d,c,s) {
+    if (w <= 0) {return ''}
+    if (d == null) {d = 0}
+    var style = (jsMath.Browser.msieInlineBlockFix ? '' : 'overflow:visible;');
+    style += 'width:'+this.Em(w)+'; height:'+this.Em(h+d)+';';
+    if (jsMath.Browser.mozInlineBlockBug) {d = -h}
+    if (jsMath.Browser.msieInlineBlockFix) {d -= jsMath.d}
+    if (d) {style += ' vertical-align:'+this.Em(-d)+';'}
+    if (c) {style += ' background-color:'+c+';'}
+    var html = '<span class="blank" style="'+style+s+'"></span>';
+    return html;
+  }
+
+});
+
+jsMath.Add(jsMath.mList.prototype.Atomize,{
+  /*
+   *  Creates the box HTML
+   */
+  bbox: function (style,size,mitem,prev,mlist) {
+    var box; var w; var h; var d;
+    var nuc = mitem.nuc = jsMath.Box.Set(mitem.nuc,style,size).Remeasured();
+    if (box == null) {w = nuc.w; h = nuc.h; d = nuc.d} // values before super/subs-cript
+    var nuc = mitem.nuc; nuc.Styled(); var pad = mitem.pad;
+    if (pad) {w += 2*pad; h += pad; d += pad; nuc.w += pad}
+    if (jsMath.Browser.msieCenterBugFix) 
+      {nuc.html = '<span style="position:relative">'+nuc.html+'</span>'}
+    nuc.html = 
+      jsMath.HTML.BBox(w,h,d,mitem.color,mitem.style) +
+      jsMath.HTML.Spacer(pad-w) +
+      nuc.html;
+    nuc.Remeasured();
+    if (pad && nuc.w < w) {
+      nuc.html += jsMath.HTML.Spacer(w-nuc.w);
+      nuc.w = w;
+    }
+    nuc.h  = Math.max(nuc.h,h);  nuc.d  = Math.max(nuc.d,d);
+    nuc.bh = Math.max(nuc.bh,nuc.h); nuc.bd = Math.max(nuc.bd,nuc.d);
+    mitem.type = 'ord';
+    jsMath.mList.prototype.Atomize.SupSub(style,size,mitem);
+  }
+});
+
+jsMath.Package(jsMath.Parser,{
+  
+  macros: {bbox: 'BBox'},
+
+  /*
+   *  Implement \bbox[...]{...}
+   */
+  BBox: function (name) {
+    var extra = this.GetBrackets(this.cmd+name); if (this.error) return;
+    var arg = this.GetArgument(this.cmd+name); if (this.error) return;
+    var nuc = this.Process(arg); if (this.error) return;
+    var color; var pad = 0; var style = '';
+    if (extra != '') {
+      var parts = extra.split(/,/);
+      for (var i in parts) {
+        if (parts[i].match(/^\s*([-+]?(\.\d+|\d+(\.\d*)?))(pt|em|ex|mu|px)\s*$/))
+          {pad = this.ParseDimen(parts[i],'',0,1)}
+        else if (parts[i].match(/:/)) {style = parts[i]}
+        else {color = parts[i]}
+      }
+    }
+    var atom = {nuc: nuc, atom: 1, pad: pad, color: color, style: style};
+    this.mlist.Add(new jsMath.mItem('bbox',atom));
+  }
+});
diff --git a/htdocs/jsMath/extensions/boldsymbol.js b/htdocs/jsMath/extensions/boldsymbol.js
new file mode 100644
index 0000000000..009ba1b229
--- /dev/null
+++ b/htdocs/jsMath/extensions/boldsymbol.js
@@ -0,0 +1,63 @@
+/*
+ *  extensions/boldsymbol.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file implements the \boldsymbol macro.  You can activate it
+ *  by calling
+ *  
+ *    jsMath.Extension.Macro('boldsymbol');
+ *  
+ *  which will cause the extension to be loaded only when it is
+ *  needed, or you can force it to be loaded via
+ *  
+ *    jsMath.Extension.Require('boldsymbol');
+ *    
+ *  once jsMath.js has been loaded.
+ *  
+ *  Note that you will need to install the cmmib10 and cmbsy10 fonts
+ *  that are available from the jsMath extra font page at
+ *  
+ *      http://www.math.union.edu/locate/jsMath/download/extra-fonts/
+ *
+ *  to make this work in image mode.  Note that there is no unicode
+ *  fallback for these fonts at the moment.
+ *  
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 2006-2007 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/********************************************************************/
+
+jsMath.Package(jsMath.Parser,{
+  
+  macros: {boldsymbol: 'BoldSymbol'},
+  
+  /*
+   *  Implement \boldsymbol{...}
+   */
+  BoldSymbol: function (name) {
+    var fam = jsMath.TeX.fam; var restart = 0;
+    var oldfam = [fam[0],fam[1],fam[2]];
+    fam[0] = "cmbx10"; fam[1] = "cmmib10"; fam[2] = "cmbsy10";
+    try{var box = this.ProcessArg(this.cmd+name)}
+      catch (e) {restart = (e == "restart")}
+    fam[0] = oldfam[0]; fam[1] = oldfam[1]; fam[2] = oldfam[2];
+    if (this.error) return; if (restart) {throw "restart"}
+    this.mlist.Add(jsMath.mItem.Atom('ord',box));
+  }
+  
+});
diff --git a/htdocs/jsMath/extensions/double-click.js b/htdocs/jsMath/extensions/double-click.js
new file mode 100644
index 0000000000..b0a7e873cb
--- /dev/null
+++ b/htdocs/jsMath/extensions/double-click.js
@@ -0,0 +1,250 @@
+/*
+ *  extensions/double-click.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file allows users to double click on typeset mathematics
+ *  to view the TeX source for the given expression.  It will be loaded
+ *  automatically when needed, or can be loaded by
+ *  
+ *    jsMath.Extension.Require('double-click');
+ *
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 2005-2008 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/********************************************************************/
+
+if (jsMath.Click && jsMath.Click.styles) 
+  {jsMath.Click.oldStyles = jsMath.Click.styles}
+
+jsMath.Add(jsMath.Click,{
+
+  dragging: 0,
+  
+  styles: {
+    // Floating windows for displaying TeX source
+    '#jsMath_float': {
+       position: 'absolute', top: '0px', left: '0px', 'z-index': '101',
+      'max-width': '80%', width: 'auto', height: 'auto',
+       padding: '0px', margin: '0px', 'font-size': '100%'
+    },
+    '#jsMath_float .drag': {
+      'background-color': '#DDDDDD',
+       border: 'outset 1px', padding: '0px', margin: '0px',
+       width: 'auto', height: '12px', 'font-size': '1px'
+    },
+    '#jsMath_float .close': {
+      'background-color': '#E6E6E6',
+       border: 'inset 1px', margin: '1px 2px', padding: '0px',
+       width: '8px', height: '8px'
+    },
+    '#jsMath_float .source': {
+      'background-color': '#E2E2E2',
+       border: 'outset 1px', margin: '0px', padding: '8px 15px',
+       width: 'auto', height: 'auto',
+      'font-family': 'courier, fixed', 'font-size': '90%'
+    }
+  },
+  
+  /*
+   *  Create the hidden DIV used for the tex source window
+   */
+  Init: function () {
+    if (this.oldStyles) {jsMath.Insert(this.styles,this.oldStyles)}
+    jsMath.Setup.Styles(this.styles);
+    this.source = jsMath.Setup.DIV("float",{display:'none'});
+    this.source.innerHTML =
+        '<div class="drag"><div class="close"></div></div>'
+      + '<div class="source"><span></span></div>';
+    this.drag = this.source.firstChild;
+    this.tex  = this.drag.nextSibling.firstChild;
+    this.drag.firstChild.onclick = jsMath.Click.CloseSource;
+    this.drag.onmousedown = jsMath.Click.StartDragging;
+    this.drag.ondragstart = jsMath.Click.False;
+    this.drag.onselectstart = jsMath.Click.False;
+    this.source.onclick = jsMath.Click.CheckClose;
+  },
+  False: function () {return false},
+
+  /*
+   *  Handle a double-click on an equation
+   */
+  DblClick: function (data) {
+    var event = data[0]; var TeX = data[1];
+    var event = jsMath.Click.Event(event);
+
+    var source = jsMath.Click.source
+    var tex = jsMath.Click.tex;
+
+    source.style.visibility = 'hidden';
+    source.style.display = ''; source.style.width = '';
+    source.style.left = ''; source.style.top = '';
+    tex.innerHTML = '';
+
+    TeX = TeX.replace(/^\s+|\s+$/g,'');
+    TeX = TeX.replace(/&/g,'&amp;');
+    TeX = TeX.replace(/</g,'&lt;');
+    TeX = TeX.replace(/>/g,'&gt;');
+    TeX = TeX.replace(/\n/g,'<br/>');
+    tex.innerHTML = TeX;
+
+    var h = source.offsetHeight; var w;
+    if (jsMath.Browser.msieDivWidthBug) {
+      tex.className = 'source';          // Work around MSIE bug where
+      w = tex.offsetWidth + 5;           // DIV's don't collapse to
+      tex.className = '';                // their natural widths
+    } else {
+      w = source.offsetWidth;
+    }
+    w = Math.max(50,Math.min(w,.8*event.W,event.W-40));
+    var x = Math.floor(event.x-w/2); var y = Math.floor(event.y-h/2);
+    x = event.X + Math.max(Math.min(x,event.W-w-20),20);
+    y = event.Y + Math.max(Math.min(y,event.H-h-5),5);
+
+    source.style.left = x+'px'; source.style.top = y+'px';
+    source.style.width = w+'px';
+    source.style.visibility = '';
+    jsMath.Click.left = x + event.X; jsMath.Click.top = y + event.Y;
+    jsMath.Click.w = w; jsMath.Click.h = source.offsetHeight;
+
+    jsMath.Click.DeselectText(x,y);
+    return false;
+  },
+
+  /*
+   *  Get window width, height, and offsets plus
+   *  position of pointer relative to the window
+   */
+  Event: function (event) {
+    var W = jsMath.window.innerWidth  || jsMath.document.body.clientWidth;
+    var H = jsMath.window.innerHeight || jsMath.document.body.clientHeight;
+    var X = jsMath.window.pageXOffset; var Y = jsMath.window.pageYOffset;
+    if (X == null) {
+      X = jsMath.document.body.clientLeft;
+      Y = jsMath.document.body.clientTop;
+    }
+    var x = event.pageX; var y = event.pageY;
+    if (x == null) {
+      x = event.clientX; y = event.clientY;
+      if (jsMath.browser == 'MSIE' && jsMath.document.compatMode == 'CSS1Compat') {
+        X = jsMath.document.documentElement.scrollLeft;
+        Y = jsMath.document.documentElement.scrollTop;
+        W = jsMath.document.documentElement.clientWidth;
+        H = jsMath.document.documentElement.clientHeight;
+      } else {
+        X = jsMath.document.body.scrollLeft;
+        Y = jsMath.document.body.scrollTop;
+      }
+    } else {x -= X; y -= Y}
+
+    return {x: x, y: y, W: W, H: H, X: X, Y: Y};
+  },
+  
+  /*
+   *  Unselect whatever text is selected (since double-clicking
+   *  usually selects something)
+   */
+  DeselectText: function (x,y) {
+    if (jsMath.window.getSelection && jsMath.window.getSelection().removeAllRanges)
+      {jsMath.window.getSelection().removeAllRanges()}
+    else if (jsMath.document.getSelection && jsMath.document.getSelection().removeAllRanges)
+      {jsMath.document.getSelection().removeAllRanges()}
+    else if (jsMath.document.selection && jsMath.document.selection.empty)
+      {jsMath.document.selection.empty()}
+    else {
+      /* Hack to deselect the text in Opera and Safari */
+      if (jsMath.browser == 'MSIE') return;  // don't try it if MISE on Mac
+      jsMath.hiddenTop.innerHTML =
+        '<textarea style="visibility:hidden" rows="1" cols="1">a</textarea>';
+      jsMath.hiddenTop.firstChild.style.position = 'absolute';
+      jsMath.hiddenTop.firstChild.style.left = x+'px';
+      jsMath.hiddenTop.firstChild.style.top  = y+'px';
+      setTimeout(jsMath.Click.SelectHidden,1);
+    }
+  },
+  SelectHidden: function () {
+    jsMath.hiddenTop.firstChild.focus();
+    jsMath.hiddenTop.firstChild.select();
+    jsMath.hiddenTop.innerHTML = '';
+  },
+
+  /*
+   *  Close the TeX source window
+   */
+  CloseSource: function () {
+    jsMath.Click.tex.innerHTML = '';
+    jsMath.Click.source.style.display = 'none';
+    jsMath.Click.source.style.visibility = 'hidden';
+    jsMath.Click.StopDragging();
+    return false;
+  },
+  CheckClose: function (event) {
+    if (!event) {event = jsMath.window.event}
+    if (event.altKey) {jsMath.Click.CloseSource(); return false}
+  },
+  
+  /*
+   *  Set up for dragging the source panel
+   */
+  StartDragging: function (event) {
+    if (!event) {event = jsMath.window.event}
+    if (jsMath.Click.dragging) {jsMath.Click.StopDragging(event)}
+    var event = jsMath.Click.Event(event);
+    jsMath.Click.dragging = 1;
+    jsMath.Click.x = event.x + 2*event.X - jsMath.Click.left;
+    jsMath.Click.y = event.y + 2*event.Y - jsMath.Click.top;
+    jsMath.Click.oldonmousemove = jsMath.document.onmousemove;
+    jsMath.Click.oldonmouseup = jsMath.document.onmouseup;
+    jsMath.document.onmousemove = jsMath.Click.DragSource;
+    jsMath.document.onmouseup = jsMath.Click.StopDragging;
+    return false;
+  },
+  
+  /*
+   *  Stop dragging the source window
+   */
+  StopDragging: function (event) {
+    if (jsMath.Click.dragging) {
+      jsMath.document.onmousemove = jsMath.Click.oldonmousemove;
+      jsMath.document.onmouseup   = jsMath.Click.oldonmouseup;
+      jsMath.Click.oldonmousemove = null;
+      jsMath.Click.oldonmouseup   = null;
+      jsMath.Click.dragging = 0;
+    }
+    return false;
+  },
+  
+  /*
+   *  Move the source window (but stay within the browser window)
+   */
+  DragSource: function (event) {
+    if (!event) {event = jsMath.window.event}
+    if (jsMath.Browser.buttonCheck && !event.button) {return jsMath.Click.StopDragging(event)}
+    event = jsMath.Click.Event(event);
+    var x = event.x + event.X - jsMath.Click.x;
+    var y = event.y + event.Y - jsMath.Click.y;
+    x = Math.max(event.X,Math.min(event.W+event.X-jsMath.Click.w,x));
+    y = Math.max(event.Y,Math.min(event.H+event.Y-jsMath.Click.h,y));
+    jsMath.Click.source.style.left = x + 'px';
+    jsMath.Click.source.style.top  = y + 'px';
+    jsMath.Click.left = x + event.X; jsMath.Click.top = y + event.Y;
+    return false;
+  }
+
+});
+
+jsMath.Click.Init();
diff --git a/htdocs/jsMath/extensions/eqn-number.js b/htdocs/jsMath/extensions/eqn-number.js
new file mode 100644
index 0000000000..be98db73af
--- /dev/null
+++ b/htdocs/jsMath/extensions/eqn-number.js
@@ -0,0 +1,234 @@
+/*
+ *  extensions/eqn-number.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file causes jsMath to add equation numbers to displayed
+ *  equations.  These are displayed at the right, but the styles can
+ *  be controlled through the jsMath.EqnNumber object.  Equations
+ *  are numbered if they include a \label{xxx} call, and the macro
+ *  \ref{xxx} can be used to refer to the equation number elsewhere
+ *  in the document (it must appear by itself in a math formula,
+ *  e.g., $\ref{xxx}$).  The "label-ref" CSS style can be used to
+ *  style the references.
+ *  
+ *  If jsMath.EqnNumber.autonumber is set to 1, then ALL displayed
+ *  equations will be numberd.  Use the \nolabel macro to prevent
+ *  equation numbering on an equation.
+ *  
+ *  You can activate eqn-numbering by calling
+ *  
+ *    jsMath.Extension.Require('eqn-number');
+ *    
+ *  once jsMath.js has been loaded, or by adding "extensions/eqn-number.js"
+ *  to the loadFiles array in jsMath/easy/load.js.
+ *  
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 2008 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/********************************************************************/
+
+if (jsMath.EqnNumber) {jsMath.EqnNumber_old = jsMath.EqnNumber}
+
+jsMath.EqnNumber = {
+  
+  styles: {
+    '.jsMath_displayBox, .tex2math_div': {position: 'relative'},
+    '.jsMath_number': {
+        position: 'absolute',
+        right: '2em', top: '50%', 'margin-top': '-.5em',
+        height: 'auto', width: 'auto'
+    },
+    '.jsMath_ref': {'text-decoration': 'none'}
+  },
+
+  autonumber: 0,  // set to 1 to have ALL equations numbered
+
+  number: 0,
+  format: function (n) {return n},
+  formatLabel: function (n) {return '<A NAME="eqn-'+n+'">('+n+')</A>'},
+  formatRef: function (n) {return '(<A CLASS="jsMath_ref" HREF="#eqn-'+n+'">'+n+'</A>)'},
+  
+  _label: null,   // flag set when \label{x} is used
+  _labels: {},    // stores label-name => label-value pairs
+  _refs: {},      // stores elements referring to undefined labels
+  _nolabel: 0,    // set by \nolabel
+  
+  nextNumber: function () {
+    var ref = this.format(++this.number);
+    if (this._label) {
+      this._labels[this._label] = ref;
+      if (this._refs[this._label]) this.fixRefs(this._label);
+    }
+    return this.formatLabel(ref);
+  },
+  
+  isRef: function (element) {
+    var tex = element.innerHTML;
+    var result = tex.match(/^\s*\\ref\s*\{([^\}]+)\}\s*$/);
+    if (!result) {return 0}
+    var ref = result[1];
+    if (this._labels[ref]) {
+      this.setRef(element,ref);
+    } else {
+      if (!this._refs[ref]) {this._refs[ref] = []}
+      this._refs[ref][this._refs[ref].length] = element;
+    }
+    return 1;
+  },
+  
+  setRef: function (element,ref) {
+    element.innerHTML = this.formatRef(this._labels[ref]);
+    element.className = "label-ref";
+  },
+  
+  fixRefs: function (label) {
+    for (var i = 0; i < this._refs[label].length; i++)
+      {this.setRef(this._refs[label][i],label)}
+    delete this._refs[label];
+  },
+  
+  badRefs: function () {
+    for (var label in this._refs) {
+      for (var i = 0; i < this._refs[label].length; i++) {
+        var element = this._refs[label][i];
+        element.className = "typeset";
+        element.innerHTML = "<span class='error'>Reference '"+label+"' is undefined</span>";
+      }
+    }
+  },
+  
+  makeDIV: function (element) {
+    var div = document.createElement('div');
+    div.className = 'jsMath_displayBox';
+    div.innerHTML = '<div class="jsMath_number">' + this.nextNumber() + '</div>';
+    element.parentNode.insertBefore(div,element);
+    element.parentNode.removeChild(element);
+    div.appendChild(element);
+  },
+  
+  makeSPAN: function (element) {
+    var span = document.createElement('span');
+    span.className = 'jsMath_number';
+    span.style.display = 'inline-block';
+    span.innerHTML = jsMath.EqnNumber.nextNumber();
+    element.parentNode.insertBefore(span,element);
+  },
+
+  ConvertMath: function (style,element,nocache) {
+    var EqnNumber = jsMath.EqnNumber;
+    if (EqnNumber.isRef(element)) return;
+    EqnNumber._label = null; EqnNumber._nolabel = 0;
+    this.ConvertMath_old(style,element,nocache);
+    if (EqnNumber._label || (EqnNumber.autonumber && !EqnNumber._nolabel)) {
+      if (element.tagName.toLowerCase() == 'div') {
+        EqnNumber.makeDIV(element);
+      } else if (element.parentNode.className == 'tex2math_div') {
+        EqnNumber.makeSPAN(element);
+      }
+    }
+  },
+  
+  ProcessComplete: function () {
+    jsMath.EqnNumber.badRefs();
+    this.ProcessComplete_old.apply(this,arguments);
+  },
+  
+  Init: function () {
+    jsMath.Setup.Styles(this.styles);
+    jsMath.Translate.ConvertMath_old = jsMath.Translate.ConvertMath;
+    jsMath.Translate.ConvertMath = this.ConvertMath;
+    jsMath.Translate.ProcessComplete_old = jsMath.Translate.ProcessComplete;
+    jsMath.Translate.ProcessComplete = this.ProcessComplete;
+  },
+  
+  environments: {
+    'equation*': 'Star',
+    'eqnarray*': 'Star',
+    'align*':    'Star',
+    'multline*': 'Star',
+    'gather*':   'Star',
+    align:       ['StarExtension','AMSmath'],
+    multline:    ['StarExtension','AMSmath'],
+    gather:      ['StarExtension','AMSmath']
+  },
+  
+  ResetStarEnvironments: function () {
+    var Nenv = jsMath.EqnNumber.environments;
+    var Penv = jsMath.Parser.prototype.environments;
+    for (var name in Nenv) {
+      if (name.match(/\*$/)) {Penv[name] = Nenv[name]}
+    }
+  }
+
+};
+
+if (jsMath.EqnNumber_old) {
+  jsMath.Insert(jsMath.EqnNumber,jsMath.EqnNumber_old);
+  delete jsMath.EqnNumber_old;
+}
+
+jsMath.Package(jsMath.Parser,{
+  macros: {
+    label:    'Label',
+    nolabel:  'NoLabel',
+    nonumber: 'NoLabel',
+    ref:      'Ref'
+  },
+  
+  environments: jsMath.EqnNumber.environments,
+  
+  Label: function (name) {
+    var label = this.GetArgument(this.cmd+name); if (this.error) return;
+    var EqnNumber = jsMath.EqnNumber;
+    if (!EqnNumber._label) {
+      if (!EqnNumber._labels[label]) {
+        EqnNumber._label = label;
+        EqnNumber._nolabel = 0;
+      } else {
+        this.Error("Label '"+label+"' is already defined");
+      }
+    } else {
+      this.Error(this.cmd+name+' can only be used once in an equation');
+    }
+  },
+  
+  NoLabel: function (name) {
+    var EqnNumber = jsMath.EqnNumber;
+    EqnNumber._label = null; EqnNumber._nolabel = 1;
+  },
+  
+  Ref: function (name) {
+    this.Error(this.cmd+name+' must be used by itself');
+  },
+  
+  Star: function (name) {
+    this.NoLabel();
+    var cmd = this.environments[name.substr(0,name.length-1)];
+    if (typeof(cmd) === 'string') {cmd = [cmd]}
+    this[cmd[0]](name,cmd.slice(1));
+  },
+  
+  StarExtension: function (name,data) {
+    try {this.Extension(name,data)} catch (e) {}
+    jsMath.Synchronize(jsMath.EqnNumber.ResetStarEnvironments);
+    throw "restart";
+  }
+
+});
+
+jsMath.EqnNumber.Init();
diff --git a/htdocs/jsMath/extensions/fbox.js b/htdocs/jsMath/extensions/fbox.js
new file mode 100644
index 0000000000..da1f0dd6d6
--- /dev/null
+++ b/htdocs/jsMath/extensions/fbox.js
@@ -0,0 +1,71 @@
+/*
+ *  extensions/fbox.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file implements the \fbox macro.  It will be loaded
+ *  automatically when needed, or can be loaded by
+ *  
+ *    jsMath.Extension.Require('fbox');
+ *
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 2005-2006 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/********************************************************************/
+
+jsMath.Add(jsMath.HTML,{
+
+  /*
+   *  Create a colored frame
+   */
+  Frame: function (x,y,w,h,c,pos) {
+
+    h -= 2/jsMath.em; // use 2 pixels to compensate for border size
+    w -= 2/jsMath.em;
+    y -= 1/jsMath.em;
+    if (!c) {c = ''} else {c = ' '+c};
+    if (pos) {pos = 'absolute;'} else
+             {pos = 'relative; margin-right: '+this.Em(-(w+2/jsMath.em))+'; '}
+    return '<img src="'+jsMath.blank+'" style="position:' + pos
+             + 'vertical-align: '+this.Em(y)+'; left: '+this.Em(x)+'; '
+             + 'width:' +this.Em(w*jsMath.Browser.imgScale)+'; '
+             + 'height:'+this.Em(h*jsMath.Browser.imgScale)+'; '
+             + 'border: 1px solid'+c+';" />';
+  }
+
+});
+
+jsMath.Package(jsMath.Parser,{
+  
+  macros: {fbox: 'FBox'},
+  
+  /*
+   *  Implement \fbox{...}
+   */
+  FBox: function (name) {
+    var text = this.GetArgument(this.cmd+name); if (this.error) return;
+    var arg = jsMath.Box.InternalMath(text,this.mlist.data.size);
+    var f = 0.25 * jsMath.sizes[this.mlist.data.size]/100;
+    var box = jsMath.Box.Set(arg,this.mlist.data.style,this.mlist.data.size,1).Remeasured();
+    var frame = jsMath.HTML.Frame(-f,-box.d-f,box.w+2*f,box.h+box.d+2*f);
+    box.html = frame + box.html + jsMath.HTML.Spacer(f);
+    box.h += f; box.d += f; box.w +=2*f; box.x += f;
+    box.bh = Math.max(box.bh,box.h); box.bd = Math.max(box.bd,box.d);
+    this.mlist.Add(jsMath.mItem.Atom('ord',box));
+  }
+  
+});
diff --git a/htdocs/jsMath/extensions/font.js b/htdocs/jsMath/extensions/font.js
new file mode 100644
index 0000000000..0c98ca4371
--- /dev/null
+++ b/htdocs/jsMath/extensions/font.js
@@ -0,0 +1,38 @@
+jsMath.Package(jsMath.Parser,{
+
+  macros: {font: 'Font'},
+  fontCS: {},
+  
+  /*
+   *  Get a CS name or give an error
+   */
+  GetCSname: function (cmd) {
+    var c = this.GetNext();
+    if (c != this.cmd) {this.Error(cmd+" must be followed by a control sequence"); return null}
+    var cs = this.trimSpaces(this.GetArgument(cmd)); if (this.error) {return null};
+    return cs.substr(1);
+  },
+
+  /*
+   *  Handle the \font command
+   */
+  Font: function (name) {
+    var cs = this.GetCSname(this.cmd+name); if (this.error) return;
+    while (this.nextIsSpace()) {this.i++}
+    if (this.string.charAt(this.i++) == '=') {
+      while (this.nextIsSpace()) {this.i++}
+      var font = this.string.slice(this.i).match(/^[a-z]+[0-9]+/i);
+      if (font) {
+        this.i += (new String(font)).length;
+        if (jsMath.TeX.famName[font] != null) {
+          this.macros[cs] = ['HandleFont',jsMath.TeX.famName[font]];
+        } else {
+          this.macros[cs] = ['Extension',jsMath.Font.URL(font),"fontCS"];
+          this.fontCS[cs] = 1; // so Extension has something to delete
+        }
+      } else {this.Error("Missing font name")}
+    } else {this.Error("Missing font definition")}
+  }
+  
+});
+  
diff --git a/htdocs/jsMath/extensions/leaders.js b/htdocs/jsMath/extensions/leaders.js
new file mode 100644
index 0000000000..9496790a54
--- /dev/null
+++ b/htdocs/jsMath/extensions/leaders.js
@@ -0,0 +1,124 @@
+/*
+ *  extensions/leaders.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file implements the \overbrace, \underbrace, \overrightarrow 
+ *  and \overleftarrow macros. It will be loaded automatically when needed,
+ *  or can be loaded by
+ *  
+ *    jsMath.Extension.Require('leaders');
+ *
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 2005-2006 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/********************************************************************/
+
+jsMath.Add(jsMath.Box,{
+
+  /*
+   *  Create a horizontally stretchable "delimiter" (like over- and
+   *  underbraces).
+   */
+//###  Add size?
+  Leaders: function (W,leader) {
+    var h; var d; var w; var html; var font;
+    if (leader.lmid) {// braces
+      font = jsMath.TeX.fam[leader.left[0]];
+      var left = this.GetCharCode(leader.left);
+      var right = this.GetCharCode(leader.right);
+      var lmid = this.GetCharCode(leader.lmid);
+      var rmid = this.GetCharCode(leader.rmid);
+      w = (W - left.w - right.w - lmid.w - rmid.w)/2 - .1; h = .4; d = .3;
+      if (w < 0) {w = 0}
+      html = this.AddClass(left.tclass,left.c,left.font) 
+           + jsMath.HTML.Rule(w,left.h)
+           + this.AddClass(lmid.tclass,lmid.c+rmid.c,lmid.font)
+           + jsMath.HTML.Rule(w,right.h)
+           + this.AddClass(right.tclass,right.c,right.font);
+    } else { //arrows
+      font = jsMath.TeX.fam[leader.rep[0]];
+      var left = this.GetCharCode(leader.left? leader.left: leader.rep);
+      var rep = this.GetCharCode(leader.rep);
+      var right = this.GetCharCode(leader.right? leader.right: leader.rep);
+      var n = Math.ceil((W - left.w - right.w + .4)/(rep.w - .3));
+      w = (W - left.w - right.w + .4 - n*(rep.w - .3));
+      if (leader.left) {h = left.h; d = left.d} else {h = right.h; d = right.d}
+      if (d == null) {d = 0}; if (h == null) {h = 0}
+      var html = this.AddClass(left.tclass,left.c,left.font); var m = Math.floor(n/2);
+      var ext = jsMath.HTML.Place(rep.c,-.3,0);
+      var ehtml = ''; for (var i = 0; i < m; i++) {ehtml += ext};
+      html += this.AddClass(rep.tclass,ehtml,rep.font) + jsMath.HTML.Spacer(w);
+      ehtml = ''; for (var i = m; i < n; i++) {ehtml += ext};
+      html += this.AddClass(rep.tclass,ehtml,rep.font);
+      if (jsMath.Browser.msieFontBug) {html += '<span style="display: none">x</span>'}
+      html += jsMath.HTML.Place(this.AddClass(right.tclass,right.c,right.font),-.4,0);
+    }
+    w = jsMath.EmBoxFor(html).w;
+    if (w != W) {
+      w = jsMath.HTML.Spacer((W-w)/2);
+      html = w + html + w;
+    }
+    var box = new jsMath.Box('html',html,W,h,d);
+    box.bh = jsMath.TeX[font].h; box.bd = jsMath.TeX[font].d;
+    return box;
+  }
+
+});
+
+jsMath.Package(jsMath.Parser,{
+  
+  macros: {
+    overbrace:           ['HandleLeaders','downbrace',1],
+    underbrace:          ['HandleLeaders','upbrace',1,1,-.05],
+    overrightarrow:      ['HandleLeaders','rightarrow'],
+    underrightarrow:     ['HandleLeaders','rightarrow',null,1,-.2],
+    overleftarrow:       ['HandleLeaders','leftarrow'],
+    underleftarrow:      ['HandleLeaders','leftarrow',null,1,-.2],
+    overleftrightarrow:  ['HandleLeaders','leftrightarrow'],
+    underleftrightarrow: ['HandleLeaders','leftrightarrow',null,1,-.2]
+  },
+  
+  /*
+   *  The horizontally stretchable delimiters
+   */
+  leaders: {
+    downbrace:  {left: [3,0x7A], lmid: [3,0x7D], rmid: [3,0x7C], right: [3,0x7B]},
+    upbrace:    {left: [3,0x7C], lmid: [3,0x7B], rmid: [3,0x7A], right: [3,0x7D]},
+    leftarrow:  {left: [2,0x20], rep:   [2,0x00]},
+    rightarrow: {rep:  [2,0x00], right: [2,0x21]},
+    leftrightarrow: {left: [2,0x20], rep: [2, 0x00], right: [2,0x21]}
+  },
+
+  /*
+   *  Implements \overbrace, \underbrace, etc.
+   */
+  HandleLeaders: function (name,data) {
+    var box = this.ProcessArg(this.cmd+name); if (this.error) return;
+    box = jsMath.Box.Set(box,'D',this.mlist.data.size).Remeasured();
+    var leader = jsMath.Box.Leaders(box.w,this.leaders[data[0]]);
+    if (data[2]) {leader.y = -leader.h-box.d+(data[3]||0)}
+            else {leader.y = box.h + Math.max(0,leader.d)+(data[3]||0)}
+    box.x = -(leader.w + box.w)/2;
+    var space = jsMath.Box.Space((leader.w-box.w)/2);
+    box = jsMath.mItem.Atom(data[1]? 'op': 'ord',
+      jsMath.Box.SetList([leader,box,space],'T',this.mlist.data.size));
+    box.limits = (data[1]? 1: 0);
+    this.mlist.Add(box);
+  }
+  
+});
diff --git a/htdocs/jsMath/extensions/mathchoice.js b/htdocs/jsMath/extensions/mathchoice.js
new file mode 100644
index 0000000000..0c0730116b
--- /dev/null
+++ b/htdocs/jsMath/extensions/mathchoice.js
@@ -0,0 +1,70 @@
+/*
+ *  extensions/mathchoice.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file implements the 4-way math choice.  It will be loaded
+ *  automatically when needed, or can be loaded by
+ *  
+ *    jsMath.Extension.Require('mathchoice');
+ *
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 2005-2006 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/********************************************************************/
+
+jsMath.Add(jsMath.mList.prototype.Atomize,{
+
+  /*
+   *  Handle a 4-way choice atom.  (Rule 4)
+   */
+  choice: function (style,mitem,i,mlist) {
+    if (style.charAt(style.length-1) == "'") {style = style.slice(0,style.length-1)}
+    var nlist = []; var M = mitem[style];
+    if (!M) {M = {type: 'mlist', mlist: {mlist: []}}}
+    if (M.type == 'mlist') {
+      M = M.mlist.mlist;
+      for (var k = 0; k < i; k++) {nlist[k] = mlist[k]}
+      for (k = 0; k < M.length; k++) {nlist[i+k] = M[k]}
+      for (k = i+1; k < mlist.length; k++) {nlist[nlist.length] = mlist[k]}
+      return nlist;
+    } else {
+      mlist[i] = jsMath.mItem.Atom('ord',M);
+      return mlist;
+    }
+  }
+
+});
+
+jsMath.Package(jsMath.Parser,{
+
+  macros: {mathchoice: 'MathChoice'},
+  
+  /*
+   *  Implements \mathchoice{}{}{}{}
+   */
+  MathChoice: function (name) {
+    var D  = this.ProcessArg(this.cmd+name); if (this.error) return;
+    var T  = this.ProcessArg(this.cmd+name); if (this.error) return;
+    var S  = this.ProcessArg(this.cmd+name); if (this.error) return;
+    var SS = this.ProcessArg(this.cmd+name); if (this.error) return;
+    var box = new jsMath.mItem('choice',{D: D, T: T, S: S, SS: SS});
+    this.mlist.Add(new jsMath.mItem('choice',{D: D, T: T, S: S, SS: SS}));
+  }
+
+});
+
diff --git a/htdocs/jsMath/extensions/mimeTeX.js b/htdocs/jsMath/extensions/mimeTeX.js
new file mode 100644
index 0000000000..65af7ecfd9
--- /dev/null
+++ b/htdocs/jsMath/extensions/mimeTeX.js
@@ -0,0 +1,36 @@
+/*
+ *  extensions/mimeTeX.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file loads the mimeTeX plugin, and can be called either
+ *  by
+ *  
+ *    jsMath.Extension.Require('mimeTeX');
+ *
+ *  or by using
+ *  
+ *    \require{mimeTeX}
+ * 
+ *  within a typeset equation.
+ *
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 2005-2006 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/********************************************************************/
+
+jsMath.Setup.Script('plugins/mimeTeX.js');
diff --git a/htdocs/jsMath/extensions/moreArrows.js b/htdocs/jsMath/extensions/moreArrows.js
new file mode 100644
index 0000000000..d1faaecaf3
--- /dev/null
+++ b/htdocs/jsMath/extensions/moreArrows.js
@@ -0,0 +1,68 @@
+/*
+ *  extensions/moreArrows.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file implements additional arrow macros with under- and
+ *  overset labels.  It can be loaded by
+ *  
+ *    jsMath.Extension.Require('moreArrows');
+ *
+ *  or using \require{moreArrows} within a math formula.
+ *
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 2005-2006 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/********************************************************************/
+
+jsMath.Extension.Require('leaders');
+
+jsMath.Package(jsMath.Parser,{
+
+  macros: {
+    xrightarrow:       ['HandleArrows','rightarrow'],
+    xleftarrow:        ['HandleArrows','leftarrow'],
+    xuprightharpoon:   ['HandleArrows','uprightharpoon'],
+    xupleftharpoon:    ['HandleArrows','upleftharpoon'],
+    xdownrightharpoon: ['HandleArrows','downrightharpoon'],
+    xdownleftharpoon:  ['HandleArrows','downleftharpoon']
+  },
+  
+  leaders: {
+    upleftharpoon:    {left: [1,0x28], rep:   [2,0x00]},
+    uprightharpoon:   {rep:  [2,0x00], right: [1,0x2A]},
+    downleftharpoon:  {left: [1,0x29], rep:   [2,0x00]},
+    downrightharpoon: {rep:  [2,0x00], right: [1,0x2B]}
+  },
+
+  HandleArrows: function (name,data) {
+    var bot = this.GetBrackets(this.cmd+name); if (this.error) return;
+    var top = this.ProcessArg(this.cmd+name); if (this.error) return;
+    var box = jsMath.Box.Set(top,'S',this.mlist.data.size).Remeasured();
+    var w = box.w;
+    if (bot) {
+      bot = this.Process(bot); if (this.error) return;
+      var box = jsMath.Box.Set(bot,'S',this.mlist.data.size).Remeasured();
+      w = Math.max(w,box.w);
+    }
+    var leader = jsMath.Box.Leaders(w+.75,this.leaders[data[0]]);
+    box = jsMath.mItem.Atom('op',jsMath.Box.SetList([leader],'T',this.mlist.data.size));
+    box.limits = 1; box.sup = top; box.sub = bot;
+    this.mlist.Add(box);
+  }
+
+});
diff --git a/htdocs/jsMath/extensions/newcommand.js b/htdocs/jsMath/extensions/newcommand.js
new file mode 100644
index 0000000000..d2302228a5
--- /dev/null
+++ b/htdocs/jsMath/extensions/newcommand.js
@@ -0,0 +1,205 @@
+/*
+ *  extensions/newcommand.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file implements the \newcommand and \def macros.  It will be
+ *  loaded automatically when needed, or can be loaded by
+ *  
+ *    jsMath.Extension.Require('newcommand');
+ *
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 2005-2006 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/********************************************************************/
+
+jsMath.Package(jsMath.Parser,{
+  
+  macros: {
+    newcommand: 'NewCommand',
+    newenvironment: 'NewEnvironment',
+    def: 'MacroDef'
+  },
+  
+  /*
+   *  Implement \newcommand{\name}[n]{...}
+   */
+  NewCommand: function (name) {
+    var cs = this.trimSpaces(this.GetArgument(this.cmd+name)); if (this.error) return;
+    var n = this.trimSpaces(this.GetBrackets(this.cmd+name)); if (this.error) return;
+    var def = this.GetArgument(this.cmd+name); if (this.error) return;
+    if (n == '') {n = null}
+    if (cs.charAt(0) == this.cmd) {cs = cs.substr(1)}
+    if (!cs.match(/^(.|[a-z]+)$/i)) {this.Error("Illegal control sequence name for "+this.cmd+name); return}
+    if (n != null && !n.match(/^[0-9]+$/)) {this.Error("Illegal number of parameters specified in "+this.cmd+name); return}
+    jsMath.Parser.prototype.macros[cs] = ['Macro',def,n];
+  },
+  
+  /*
+   *  Implement \newenvironment{name}[n]{begincmd}{endcmd}
+   */
+  NewEnvironment: function (name) {
+    var env = this.trimSpaces(this.GetArgument(this.cmd+name)); if (this.error) return;
+    var n = this.trimSpaces(this.GetBrackets(this.cmd+name)); if (this.error) return;
+    var bdef = this.GetArgument(this.cmd+name); if (this.error) return;
+    var edef = this.GetArgument(this.cmd+name); if (this.error) return;
+    if (n == '') {n = null}
+    if (n != null && !n.match(/^[0-9]+$/)) {this.Error("Illegal number of parameters specified in "+this.cmd+name); return}
+    jsMath.Parser.prototype.environments[env] = ['Environment',bdef,edef,n];
+  },
+  
+  /*
+   *  Implement \def command
+   */
+  MacroDef: function (name) {
+    var cs = this.GetCSname(this.cmd+name); if (this.error) return;
+    var params = this.GetTemplate(this.cmd+name); if (this.error) return;
+    var def = this.GetArgument(this.cmd+name); if (this.error) return;
+    if (typeof(params) == 'number') {
+      jsMath.Parser.prototype.macros[cs] = ['Macro',def,params];
+    } else {
+      jsMath.Parser.prototype.macros[cs] = ['MacroWithTemplate',def,params[0],params[1]];
+    }
+  },
+
+  /*
+   *  Get a CS name or give an error
+   */
+  GetCSname: function (cmd) {
+    var c = this.GetNext();
+    if (c != this.cmd) {this.Error(cmd+" must be followed by a control sequence"); return null}
+    var cs = this.trimSpaces(this.GetArgument(cmd)); if (this.error) {return null};
+    return cs.substr(1);
+  },
+  
+  /*
+   *  Get a \def parameter template
+   */
+  GetTemplate: function (cmd) {
+    var c; var params = []; var n = 0;
+    c = this.GetNext(); var i = this.i;
+    while (this.i < this.string.length) {
+      c = this.GetNext();
+      if (c == '#') {
+        if (i != this.i) {params[n] = this.string.substr(i,this.i-i)}
+        c = this.string.charAt(++this.i);
+        if (!c.match(/[1-9]/)) {this.Error("Illegal use of # in "+cmd); return null}
+        if (1*c != ++n) {this.Error("Parameters must be numbered sequentially"); return null}
+        i = this.i+1;
+      } else if (c == '{') {
+        if (i != this.i) {params[n] = this.string.substr(i,this.i-i)}
+        if (params.length > 0) {return [n,params]} else {return n}
+      }
+      this.i++;
+    }
+    this.Error("Missing replacement string for definition of "+cmd);
+    return null;
+  },
+  
+  /*
+   *  Process a macro with a parameter template
+   */
+  MacroWithTemplate: function (name,data) {
+    var text = data[0];
+    var n = data[1]; var params = data[2];
+    if (n) {
+      var args = []; var c = this.GetNext();
+      if (params[0] && !this.MatchParam(params[0]))
+        {this.Error("Use of "+this.cmd+name+" doesn't match its definition"); return}
+      for (var i = 0; i < n; i++) {
+        args[args.length] = this.GetParameter(this.cmd+name,params[i+1]);
+        if (this.error) return;
+      }
+      text = this.SubstituteArgs(args,text);
+    }
+    this.string = this.AddArgs(text,this.string.slice(this.i));
+    this.i = 0;
+  },
+  
+  /*
+   *  Process a user-defined environment
+   */
+  Environment: function (name,data) {
+    var bdef = data[0]; var edef = data[1]; var n = data[2];
+    if (n) {
+      var args = [];
+      for (var i = 0; i < n; i++) {
+        args[args.length] = this.GetArgument(this.cmd+"begin{"+name+"}"); if (this.error) return;
+      }
+      bdef = this.SubstituteArgs(args,bdef);
+    }
+    var text = this.GetEnd(name); if (this.error) return;
+    text = this.AddArgs(this.AddArgs(bdef,text),edef);
+    this.string = this.AddArgs(text,this.string.slice(this.i));
+    this.i = 0;
+  },
+
+  /*
+   *  Find a single parameter delimited by a trailing template
+   */
+  GetParameter: function (name,param) {
+    if (param == null) {return this.GetArgument(name)}
+    var i = this.i; var j = 0; var hasBraces = 0;
+    while (this.i < this.string.length) {
+      if (this.string.charAt(this.i) == '{') {
+        if (this.i == i) {hasBraces = 1}
+        this.GetArgument(name); j = this.i - i;
+      } else if (this.MatchParam(param)) {
+        if (hasBraces) {i++; j -= 2}
+        return this.string.substr(i,j);
+      } else {
+        this.i++; j++; hasBraces = 0;
+      }
+    }
+    this.Error("Runaway argument for "+name+"?");
+    return null;
+  },
+
+  /*
+   *  Check if a template is at the current location.
+   *  (The match must be exact, with no spacing differences.  TeX is
+   *   a little more forgiving about spaces after macro names)
+   */
+  MatchParam: function (param) {
+    if (this.string.substr(this.i,param.length) != param) {return 0}
+    this.i += param.length;
+    return 1;
+  }
+  
+});
+
+/*
+ *  Define a jsMath.Environment() command similar to the
+ *  jsMath.Macro() command.
+ *  
+ *  Usage:  jsMath.Environment(name,begin,end[,n])
+ *  
+ *  where "name" is the name of the environment, "begin" is the
+ *  text that replaces the \begin{name} and "end" is the text that
+ *  replaces the \end{name}.  If "n" is provided, it is the number
+ *  of parameters that the \begin{name} accepts, and these are
+ *  used to replace #1, #2, etc within the "begin" text.
+ */
+
+jsMath.Add(jsMath,{
+  Environment: function (name) {
+    var environments = jsMath.Parser.prototype.environments;
+    environments[name] = ['Environment'];
+    for (var i = 1; i < arguments.length; i++) 
+      {environments[name][environments[name].length] = arguments[i]}
+  }
+});
diff --git a/htdocs/jsMath/extensions/underset-overset.js b/htdocs/jsMath/extensions/underset-overset.js
new file mode 100644
index 0000000000..a935ade79a
--- /dev/null
+++ b/htdocs/jsMath/extensions/underset-overset.js
@@ -0,0 +1,53 @@
+/*
+ *  extensions/underset-overset.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file implements \underset and \overset macros.  It will be loaded
+ *  automatically when needed, or can be loaded by
+ *  
+ *    jsMath.Extension.Require('underset-overset');
+ *  
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 200-20065 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/********************************************************************/
+
+jsMath.Package(jsMath.Parser,{
+
+  macros: {
+    overset:  'Overset',
+    underset: 'Underset'
+  },
+  
+  Overset: function (name) {
+    var top = this.ProcessArg(this.cmd+name); if (this.error) return;
+    var bot = this.ProcessArg(this.cmd+name); if (this.error) return;
+    var op = jsMath.mItem.Atom('op',bot);
+    op.limits = 1; op.sup = top;
+    this.mlist.Add(op);
+  },
+
+  Underset: function (name) {
+    var bot = this.ProcessArg(this.cmd+name); if (this.error) return;
+    var top = this.ProcessArg(this.cmd+name); if (this.error) return;
+    var op = jsMath.mItem.Atom('op',top);
+    op.limits = 1; op.sub = bot;
+    this.mlist.Add(op);
+  }
+
+});
diff --git a/htdocs/jsMath/extensions/verb.js b/htdocs/jsMath/extensions/verb.js
new file mode 100644
index 0000000000..ec50b9572a
--- /dev/null
+++ b/htdocs/jsMath/extensions/verb.js
@@ -0,0 +1,58 @@
+/*
+ *  extensions/verb.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file implements the \verb macro.  You can activate it
+ *  by calling
+ *  
+ *    jsMath.Extension.Macro('verb');
+ *  
+ *  which will cause the extension to be loaded only when it is
+ *  needed, or you can force it to be loaded via
+ *  
+ *    jsMath.Extension.Require('verb');
+ *    
+ *  once jsMath.js has been loaded, or by adding "extensions/verb.js"
+ *  to the loadFiles array in the easy/load.js file.
+ *  
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 2008 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/********************************************************************/
+
+jsMath.Package(jsMath.Parser,{
+  
+  macros: {verb: 'Verb'},
+  
+  /*
+   *  Implement \verb|...|
+   */
+  Verb: function (name) {
+    var c = this.GetNext(); var start = ++this.i;
+    if (c == "" ) {this.Error(this.cmd+name+" requires an argument"); return}
+    while (this.i < this.string.length && this.string.charAt(this.i) != c) {this.i++}
+    if (this.i == this.string.length) 
+      {this.Error("Can't find closing delimiter for "+this.cmd+name); return}
+    var text = this.string.slice(start,this.i); this.i++;
+    text = text.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
+    text = '<span style="font-family:monospace">'+text+'</span>';
+    var box = jsMath.Box.Text(text,'normal','T',this.mlist.data.size).Styled();
+    box.h = box.bh+box.bd -jsMath.d; box.d = jsMath.d;
+    this.mlist.Add(jsMath.mItem.Typeset(box));
+  }
+});
diff --git a/htdocs/jsMath/jsMath-BaKoMa-fonts.js b/htdocs/jsMath/jsMath-BaKoMa-fonts.js
new file mode 100644
index 0000000000..661fcff189
--- /dev/null
+++ b/htdocs/jsMath/jsMath-BaKoMa-fonts.js
@@ -0,0 +1,428 @@
+/*
+ *  jsMath-BaKoMa-fonts.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file makes changes needed to use the BaKoMa fonts and
+ *  their encoding.
+ *
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 2004-2007 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+
+
+/********************************************************************
+ *
+ *  The BaKoMa fonts have a different encoding, so change the characters
+ *  to correspond to the their encoding.
+ */
+
+if (jsMath.browser == "Mozilla" && jsMath.platform != "mac") {
+
+  /*
+   *  Mozilla/PC
+   */
+  jsMath.Update.TeXfontCodes({
+    cmr10: [
+      '&#x0393;', '&#x0394;', '&#x0398;', '&#x039B;',
+      '&#x039E;', '&#x03A0;', '&#x03A3;', '&#x03A5;',
+      '&#x03A6;', '&#x03A8;', '&#x03A9;', '&#xFB00;',
+      '&#xFB01;', '&#xFB02;', '&#xFB03;', '&#xFB04;',
+      
+      '&#x0131;', '&#xEEF0;', '&#x0300;', '&#x0301;',
+      '&#x030C;', '&#x0306;', '&#x0305;', '&#x030A;',
+      '&#x0327;', '&#x00DF;', '&#x00E6;', '&#x0153;',
+      '&#x00F8;', '&#x00C6;', '&#x0152;', '&#x00D8;',
+        
+      '&#x337;', '&#x21;', '&#x201D;', '&#x23;',
+      '&#x24;', '&#x25;', '&#x26;', '&#x27;',
+      '&#x28;', '&#x29;', '&#x2A;', '&#x2B;',
+      '&#x2C;', '&#x2D;', '&#x2E;', '&#x2F;', 
+        
+      '0', '1', '2', '3', '4', '5', '6', '7',
+      '8', '9', ':', ';', '&#xA1;', '&#x3D;', '&#xBf;', '&#x3F;',
+        
+      '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G',
+      'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
+      
+      'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
+      'X', 'Y', 'Z', '&#x5B;', '&#x201C;', '&#x5D;', '&#x302;', '&#x307;',
+      
+      '&#x2018;', 'a', 'b', 'c', 'd', 'e', 'f', 'g',
+      'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
+      
+      'p', 'q', 'r', 's', 't', 'u', 'v', 'w',
+      'x', 'y', 'z', '&#x2013;', '&#x2014;', '&#x30B;', '&#x303;', '&#x308;'
+    ],
+      
+    cmmi10: [
+      '&#x393;', '&#x394;', '&#x398;', '&#x39B;',
+      '&#x39E;', '&#x3A0;', '&#x3A3;', '&#x3A5;',
+      '&#x3A6;', '&#x3A8;', '&#x3A9;', '&#x3B1;',
+      '&#x3B2;', '&#x3B3;', '&#x3B4;', '&#x3B5;',
+      
+      '&#x3B6;', '&#x3B7;', '&#x3B8;', '&#x3B9;',
+      '&#x3BA;', '&#x3BB;', '&#x3BC;', '&#x3BD;',
+      '&#x3BE;', '&#x3C0;', '&#x3C1;', '&#x3C3;',
+      '&#x3C4;', '&#x3C5;', '&#x3C6;', '&#x3C7;',
+      
+      '&#x3C8;', '&#x3C9;', '&#x25B;', '&#x3D1;',
+      '&#x3D6;', '&#x3F1;', '&#x3C2;', '&#x3D5;',
+      '&#x21BC;', '&#x21BD;', '&#x21C0;', '&#x21C1;',
+      '&#xEFBA;', '&#xEFBB;', '&#x25B9;', '&#x25C3;',
+      
+      '0', '1', '2', '3', '4', '5', '6', '7',
+      '8', '9', '&#x2E;', '&#x2C;', '&#x3C;', '&#x2F;', '&#x3E;', '&#x22C6;',
+      
+      '&#x2202;', 'A', 'B', 'C', 'D', 'E', 'F', 'G',
+      'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
+        
+      'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
+      'X', 'Y', 'Z', '&#x266D;', '&#x266E;', '&#x266F;', '&#x2323;', '&#x2322;',
+      
+      '&#x2113;', 'a', 'b', 'c', 'd', 'e', 'f', 'g',
+      'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
+      
+      'p', 'q', 'r', 's', 't', 'u', 'v', 'w',
+      'x', 'y', 'z', '&#x131;', '&#xEEF0;', '&#x2118;', '&#x20D7;', '&#x0311;'
+    ],
+      
+    cmsy10: [
+      '&#x2212;', '&#xB7;',   '&#xD7;',   '&#x22C6;',
+      '&#xF7;',   '&#x22C4;', '&#xB1;',   '&#x2213;',
+      '&#x2295;', '&#x2296;', '&#x2297;', '&#x2298;',
+      '&#x2299;', '&#x25CB;', '&#x2218;', '&#x2219;',
+      
+      '&#x2243;', '&#x224D;', '&#x2286;', '&#x2287;',
+      '&#x2264;', '&#x2265;', '&#x227C;', '&#x227D;',
+      '&#x223C;', '&#x2245;', '&#x2282;', '&#x2283;',
+      '&#x226A;', '&#x226B;', '&#x227A;', '&#x227B;',
+      
+      '&#x2190;', '&#x2192;', '&#x2191;', '&#x2193;',
+      '&#x2194;', '&#x2197;', '&#x2198;', '&#x2242;',
+      '&#x21D0;', '&#x21D2;', '&#x21D1;', '&#x21D3;', 
+      '&#x21D4;', '&#x2196;', '&#x2199;', '&#x221D;',
+      
+      '&#x2032;', '&#x221E;', '&#x2208;', '&#x220B;',
+      '&#x25B3;', '&#x25BD;', '&#x338;',  '&#xEFB9;', 
+      '&#x2200;', '&#x2203;', '&#xAC;',   '&#x2205;',
+      '&#x211C;', '&#x2111;', '&#x22A4;', '&#x22A5;',
+      
+      '&#x2135;', '&#xEF35;', '&#x212C;', '&#xEF36;',
+      '&#xEF37;', '&#x2130;', '&#x2131;', '&#xEF38;',
+      '&#x210B;', '&#x2110;', '&#xEF39;', '&#xEF3A;',
+      '&#x2112;', '&#x2133;', '&#xEF3B;', '&#xEF3C;',
+      
+      '&#xEF3D;', '&#xEF3E;', '&#x211B;', '&#xEF3F;',
+      '&#xEF40;', '&#xEF41;', '&#xEF42;', '&#xEF43;',
+      '&#xEF44;', '&#xEF45;', '&#xEF46;', '&#x222A;',
+      '&#x2229;', '&#x228E;', '&#x2227;', '&#x2228;',
+      
+      '&#x22A2;', '&#x22A3;', '&#x230A;', '&#x230B;',
+      '&#x2308;', '&#x2309;', '&#x7B;',   '&#x7D;',
+      '&#x2329;', '&#x232A;', '&#x2223;', '&#x2225;',
+      '&#x2195;', '&#x21D5;', '&#x2216;', '&#x2240;',
+      
+      '&#x221A;', '&#x2210;', '&#x2207;', '&#x222B;', 
+      '&#x2294;', '&#x2293;', '&#x2291;', '&#x2292;',
+      '&#xA7;',   '&#x2020;', '&#x2021;', '&#xB6;',
+      '&#x2663;', '&#x2662;', '&#x2661;', '&#x2660;'
+    ],
+      
+    cmex10: [
+      '&#xF006;', '&#xF007;', '&#xF008;', '&#xF009;',
+      '&#xF00A;', '&#xF00B;', '&#xF00C;', '&#xF00D;',
+      '&#xF00E;', '&#xF00F;', '&#xF02C;', '&#xF02D;',
+      '&#xF012;', '&#xF013;', '&#xF014;', '&#xF015;',
+
+      '&#xF016;', '&#xF017;', '&#xF018;', '&#xF019;',
+      '&#xF01A;', '&#xF01B;', '&#xF01C;', '&#xF01D;',
+      '&#xF01E;', '&#xF01F;', '&#xF020;', '&#xF021;',
+      '&#xF02E;', '&#xF02F;', '&#xF024;', '&#xF025;',
+      
+      '&#xF026;', '&#xEFBC;', '&#xEFBD;', '&#xEFBE;',
+      '&#xEFBF;', '&#xEFC0;', '&#xEFC1;', '&#xEFC2;',
+      '&#xEFC3;', '&#xEFC4;', '&#xF028;', '&#xF029;', 
+      '&#xEFC7;', '&#xEFC8;', '&#xEFC9;', '&#xEFCA;',
+        
+      '&#xF8EB;', '&#xF8F6;', '&#xF8EE;', '&#xF8F9;',
+      '&#xF8F0;', '&#xF8FB;', '&#xF8EF;', '&#xF8FA;',
+      '&#xF8F1;', '&#xF8FC;', '&#xF8F3;', '&#xF8FE;',
+      '&#xF8F2;', '&#xF8FD;', '&#xF8F4;', '&#xF8E6;',
+      
+      '&#xF8ED;', '&#xF8F8;', '&#xF8EC;', '&#xF8F7;',
+      '&#xF02A;', '&#xF02B;', '&#xEFCD;', '&#xEFCE;',
+      '&#xEFCF;', '&#xEFD0;', '&#xEFD1;', '&#xEFD2;',
+      '&#xEFD3;', '&#xEFD4;', '&#xEFD5;', '&#xEFD6;',
+      
+      '&#xEFD7;', '&#xEFD8;', '&#xEFD9;', '&#xEFDA;',
+      '&#xEFDB;', '&#xEFDC;', '&#xEFDD;', '&#xEFDE;',
+      '&#xEFDF;', '&#xEFE0;', '&#xEFE1;', '&#xEFE2;',
+      '&#xEFE3;', '&#xEFE4;', '&#xEFE5;', '&#xEFE6;',
+      
+      '&#xEFE7;', '&#xEFE8;', '&#xEFE9;', '&#xEFEA;',
+      '&#xEFEB;', '&#xEFEC;', '&#xEFED;', '&#xEFEE;',
+      '&#xEFEF;', '&#xEFF0;', '&#xEFF1;', '&#xEFF2;',
+      '&#xEFF3;', '&#xEFF4;', '&#xEFF5;', '&#xEFF6;',
+      
+      '&#xEFF7;', '&#xEFF8;', '&#xEFF9;', '&#xEFFA;',
+      '&#xEFFB;', '&#xEFFC;', '&#xEFFD;', '&#xEFFE;',
+      '&#xEFFF;', '&#xF000;', '&#xF001;', '&#xF002;',
+      '&#xF003;', '&#xF004;', '&#xF005;', '&#xF027;'
+    ]
+  });
+    
+  /*
+   *  Adjust a few other characters as well
+   */
+    
+  jsMath.Update.TeXfonts({
+    cmr10:  {'20': {c: '&#x02C7;', tclass: 'normal', w: .3}},
+    cmmi10: {
+      '20': {c: '<i>&kappa</i>', tclass: 'normal'},
+      '58': {c: '.', tclass: 'normal'},
+      '59': {c: ',', tclass: 'normal'},
+      '61': {c: '&#x2F;', tclass: 'cmr10'}
+    },
+    cmsy10: {
+      '3':  {c: '*', tclass: 'normal'},
+      '16': {c: '&#x224D;'},
+      '17': {c: '&equiv;', tclass: 'normal'},
+      '25': {c: '&#x2248;', tclass: 'normal'},
+      '39': {c: '&#x2243;'},
+      '20': {c: '&le;', tclass: 'normal'}
+    },
+    cmex10: {'20': {c: '<span style="font-size: 80%">&#xEFBD;</span>'}},
+    cmti10: {'10': {c: '<i>&Omega;</i>', tclass: 'normal'}},
+    cmbx10: {'10': {c: '<b>&Omega;</b>', tclass: 'normal'}}
+  });
+    
+} else {
+  
+  jsMath.Font.BaKoMa = [
+    '&#xA1;', '&#xA2;', '&#xA3;', '&#xA4;', '&#xA5;', '&#xA6;', '&#xA7;', '&#xA8;',
+    '&#xA9;', '&#xAA;', '&#xAD;', '&#xAE;', '&#xAF;', '&#xB0;', '&#xB1;', '&#xB2;',
+
+    '&#xB3;', '&#xB4;', '&#xB5;', '&#xB6;', '&#x2219;', '&#xB8;', '&#xB9;', '&#xBA;',
+    '&#xBB;', '&#xBC;', '&#xBD;', '&#xBE;', '&#xBF;', '&#xC0;', '&#xC1;', '&#xC2;',
+
+    '&#xC3;', '!', '"', '#', '$', '%', '&#x26;', '\'', 
+    '(', ')', '*', '+', ',', '-', '.', '/', 
+
+    '0', '1', '2', '3', '4', '5', '6', '7',
+    '8', '9', ':', ';', '&#x3C;', '=', '&#x3E;', '?',
+
+    '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G',
+    'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
+
+    'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
+    'X', 'Y', 'Z', '[', '\\', ']', '^', '_',
+
+    '&#x60;', 'a', 'b', 'c', 'd', 'e', 'f', 'g',
+    'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
+
+    'p', 'q', 'r', 's', 't', 'u', 'v', 'w',
+    'x', 'y', 'z', '&#x7B;', '&#x7C;', '&#x7D;', '&#x7E;', '&#xC4;'
+  ];
+
+  jsMath.Update.TeXfontCodes({
+    cmr10:  jsMath.Font.BaKoMa,
+    cmmi10: jsMath.Font.BaKoMa,
+    cmsy10: jsMath.Font.BaKoMa,
+    cmex10: jsMath.Font.BaKoMa,
+    cmti10: jsMath.Font.BaKoMa,
+    cmbx10: jsMath.Font.BaKoMa
+  });
+  
+  /*
+   *  MSIE corrections
+   */
+  switch (jsMath.browser) {
+    
+    case "MSIE":
+      if (jsMath.platform == "pc") {
+        /*
+         *  MSIE/PC
+         */
+        jsMath.Browser.msieFontBug = 1;
+        jsMath.Update.TeXfonts({
+          cmr10:  {'10': {c: '&Omega;', tclass: 'normal'}},
+          cmmi10: {
+            '10':  {c: '<i>&Omega;</i>', tclass: 'normal'},
+            '126': {c: '&#x7E;<span style="margin-left:.1em"></span>'}
+          },
+          cmsy10: {
+            '10': {c: '&#x2297;', tclass: 'arial'},
+            '55': {c: '<span style="margin-right:-.54em">7</span>'}
+          },
+          cmex10: {'10': {c: '<span style="font-size: 67%">D</span>'}},
+          cmti10: {'10': {c: '<i>&Omega;</i>', tclass: 'normal'}},
+          cmbx10: {'10': {c: '<b>&Omega;</b>', tclass: 'normal'}}
+        });
+      } else {
+        /*
+         *  MSIE/Mac
+         */
+        jsMath.Update.TeXfonts({
+          
+          cmr10: {
+            '3':  {c: '<font face="Symbol">L</font>', tclass: 'normal'},
+            '5':  {c: '<font face="Symbol">P</font>', tclass: 'normal'},
+            '10': {c: '<font face="Symbol">W</font>', tclass: 'normal'},
+            '15': {c: 'ffl', tclass: 'normal'},
+            '16': {c: '&#x0131;', tclass: 'normal'},
+            '20': {c: '&#x02C7;', tclass: 'normal'},
+            '22': {c: '&#xAF;', tclass: 'normal', w: .3},
+            '25': {c: '&#xDF;', tclass: 'normal'},
+            '26': {c: '&#xE6;', tclass: 'normal'},
+            '27': {c: '&#x153;', tclass: 'normal'}
+          },
+          
+          cmmi10: {
+            '3':  {c: '<font face="Symbol">L</font>', tclass: 'italic'},
+            '5':  {c: '<font face="Symbol">P</font>', tclass: 'italic'},
+            '10': {c: '<font face="Symbol">W</font>', tclass: 'italic'},
+            '15': {c: '<font face="Symbol">e</font>', tclass: 'italic'},
+            '16': {c: '<font face="Symbol">z</font>', tclass: 'italic'},
+            '20': {c: '<font face="Symbol">k</font>', tclass: 'italic'},
+            '22': {c: '<font face="Symbol">m</font>', tclass: 'italic'},
+            '25': {c: '<font face="Symbol">p</font>', tclass: 'italic'},
+            '26': {c: '<font face="Symbol">r</font>', tclass: 'italic'},
+            '27': {c: '<font face="Symbol">s</font>', tclass: 'italic'}
+          },
+          
+          cmsy10: {
+            '3':  {c: '<span style="vertical-align:-.3em">*</span>', tclass: 'normal'},
+            '5':  {c: '&#x389;', tclass: 'normal'},
+            '10': {c: '&otimes;', tclass: 'normal'},
+            '15': {c: '&#x2022;', tclass: 'normal'},
+            '16': {c: '&#x224D;', tclass: 'normal'},
+            '20': {c: '&le;', tclass: 'normal'},
+            '22': {c: '&le;', tclass: 'normal'},
+            '25': {c: '&#x2248;', tclass: 'normal'},
+            '26': {c: '<font face="Symbol">&#xCC;</font>', tclass: 'normal'},
+            '27': {c: '<font face="Symbol">&#xC9;</font>', tclass: 'normal'}
+          },
+          
+          cmex10: {
+            '3':  {c: '<span style="font-size: 67%">&#x69;</span>'},
+            '5':  {c: '<span style="font-size: 67%">&#x6B;</span>'},
+            '10': {c: '<span style="font-size: 67%">&#x44;</span>'},
+            '15': {c: '<span style="font-size: 55%">&#xC2;</span>'},
+            '16': {c: '<span style="font-size: 83%">&#xB5;</span>'},
+            '20': {c: '<span style="font-size: 83%">"</span>'},
+            '22': {c: '<span style="font-size: 83%">$</span>'},
+            '25': {c: '<span style="font-size: 83%">\'</span>'},
+            '26': {c: '<span style="font-size: 83%">(</span>'},
+            '27': {c: '<span style="font-size: 83%">)</span>'}
+          },
+          
+          cmti10: {
+            '3':  {c: '<font face="Symbol">L</font>', tclass: 'italic'},
+            '5':  {c: '<font face="Symbol">P</font>', tclass: 'italic'},
+            '10': {c: '<font face="Symbol">W</font>', tclass: 'italic'},
+            '16': {c: '&#x0131;', tclass: 'italic'},
+            '20': {c: '&#xAD;', tclass: 'italic'},
+            '22': {c: '&#xAF;', tclass: 'italic', w: .3},
+            '25': {c: '&#xDF;', tclass: 'italic'},
+            '26': {c: '&#xE6;', tclass: 'italic'},
+            '27': {c: '&#x153;', tclass: 'italic'}
+          },
+          
+          cmbx10: {
+            '3':  {c: '<font face="Symbol">L</font>', tclass: 'bold'},
+            '5':  {c: '<font face="Symbol">P</font>', tclass: 'bold'},
+            '10': {c: '<font face="Symbol">W</font>', tclass: 'bold'},
+            '16': {c: '&#x0131;', tclass: 'bold'},
+            '20': {c: '&#xAD;', tclass: 'bold'},
+            '22': {c: '&#xAF;', tclass: 'bold', w: .3},
+            '25': {c: '&#xDF;', tclass: 'bold'},
+            '26': {c: '&#xE6;', tclass: 'bold'},
+            '27': {c: '&#x153;', tclass: 'bold'}
+          }
+        });
+      }
+      break;
+      
+    case "Mozilla":
+      if (jsMath.platform == "mac") {
+        /*
+         *  Mozilla/Mac
+         */
+        jsMath.Update.TeXfonts({
+          cmr10:  {'10': {c: '&Omega;', tclass: 'normal'}},
+          cmmi10: {'10': {c: '<i>&Omega;</i>', tclass: 'normal'}},
+          cmsy10: {'10': {c: '&otimes;', tclass: 'normal'}},
+          cmex10: {'10': {c: '<span style="font-size: 67%">D</span>'}},
+          cmti10: {'10': {c: '<i>&Omega;</i>', tclass: 'normal'}},
+          cmbx10: {'10': {c: '<b>&Omega;</b>', tclass: 'normal'}}
+        });
+      }
+      break;
+
+    case "Opera":
+      jsMath.Update.TeXfonts({
+        cmr10:  {
+          '10': {c: '&Omega;', tclass: 'normal'},
+          '20': {c: '&#x2C7;', tclass: 'normal'}
+        },
+        cmmi10: {
+          '10': {c: '<i>&Omega;</i>', tclass: 'normal'},
+          '20': {c: '&kappa;', tclass: 'normal'}
+        },
+        cmsy10: {
+          '10': {c: '&otimes;', tclass: 'normal'},
+          '20': {c: '&#x2264;', tclass: 'normal'}
+        },
+        cmex10: {
+          '10': {c: '<span style="font-size: 67%">D</span>'},
+          '20': {c: '<span style="font-size: 82%">"</span>'}
+        },
+        cmti10: {
+          '10': {c: '<i>&Omega;</i>', tclass: 'normal'},
+          '20': {c: '<i>&#x2C7;</i>', tclass: 'normal'}
+        },
+        cmbx10: {
+          '10': {c: '<b>&Omega;</b>', tclass: 'normal'},
+          '20': {c: '<b>&#x2C7;</b>', tclass: 'normal'}
+        }
+      });
+      break;
+      
+    case "Konqueror":
+      jsMath.Update.TeXfonts({
+        cmr10:  {'20': {c: '&#x2C7;', tclass: 'normal'}},
+        cmmi10: {'20': {c: '&kappa;', tclass: 'normal'}},
+        cmsy10: {'20': {c: '&#x2264;', tclass: 'normal'}},
+        cmex10: {'20': {c: '<span style="font-size: 84%">"</span>'}},
+        cmti10: {'20': {c: '<i>&#x2C7;</i>', tclass: 'normal'}},
+        cmbx10: {'20': {c: '<b>&#x2C7;</b>', tclass: 'normal'}}
+      });
+      break;
+  }
+
+}
+
+jsMath.Setup.Styles({
+  '.typeset .cmr10':  'font-family: CMR10, serif',
+  '.typeset .cmbx10': 'font-family: CMBX10, CMR10',
+  '.typeset .cmti10': 'font-family: CMTI10, CMR10',
+  '.typeset .cmmi10': 'font-family: CMMI10',
+  '.typeset .cmsy10': 'font-family: CMSY10',
+  '.typeset .cmex10': 'font-family: CMEX10',
+  '.typeset .arial':  "font-family: 'Arial unicode MS'"
+});
diff --git a/htdocs/jsMath/jsMath-autoload.html b/htdocs/jsMath/jsMath-autoload.html
new file mode 100644
index 0000000000..ead6773d58
--- /dev/null
+++ b/htdocs/jsMath/jsMath-autoload.html
@@ -0,0 +1,53 @@
+<html>
+<head>
+<!--
+ | jsMath-autoload.html
+ |
+ | Part of the jsMath package for mathematics on the web.
+ | 
+ | This file is used for loading jsMath.js and other components
+ | when the "autoload" plugin is used.
+ | 
+ | ---------------------------------------------------------------------
+ | 
+ | Copyright 2004-2006 by Davide P. Cervone
+ |
+ | Licensed under the Apache License, Version 2.0 (the "License");
+ | you may not use this file except in compliance with the License.
+ | You may obtain a copy of the License at
+ |
+ |     http://www.apache.org/licenses/LICENSE-2.0
+ |
+ | Unless required by applicable law or agreed to in writing, software
+ | distributed under the License is distributed on an "AS IS" BASIS,
+ | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ | See the License for the specific language governing permissions and
+ | limitations under the License.
+-->
+</head>
+<body>
+
+<script>
+  var isOmniWeb4 = (document.readyState && 
+                    document.readyState == 'loading' &&
+                    navigator.accentColorName != null &&
+                    navigator.omniWebString == null);
+  window.jsMath = window.parent.jsMath;
+  window.jsMathAutoload = 1;
+  if (isOmniWeb4) {
+    if (jsMath.Autoload.Script.url != jsMath.Autoload.Script.prevURL) {
+      jsMath.Autoload.Script.prevURL = jsMath.Autoload.Script.url;
+      document.write('<script src="'+jsMath.Autoload.Script.url+'"><'+'/script>');
+      document.write('<script src="jsMath-loader-omniweb4.js"><'+'/script>');
+    }
+  } else {
+    document.write('<script src="'+jsMath.Autoload.Script.url+'"><'+'/script>');
+  }
+</script>
+
+<script>
+if (window.jsMath && !isOmniWeb4) {jsMath.Autoload.Script.endLoad()}
+</script>
+
+</body>
+</html>
diff --git a/htdocs/jsMath/jsMath-controls.html b/htdocs/jsMath/jsMath-controls.html
new file mode 100644
index 0000000000..e395ebed0d
--- /dev/null
+++ b/htdocs/jsMath/jsMath-controls.html
@@ -0,0 +1,467 @@
+<html>
+<head>
+<!--
+ | jsMath-controls.html
+ |
+ | Part of the jsMath package for mathematics on the web.
+ | 
+ | This file handles the details of the jsMath control panels
+ | 
+ | ---------------------------------------------------------------------
+ | 
+ | Copyright 2004-2007 by Davide P. Cervone
+ |
+ | Licensed under the Apache License, Version 2.0 (the "License");
+ | you may not use this file except in compliance with the License.
+ | You may obtain a copy of the License at
+ |
+ |     http://www.apache.org/licenses/LICENSE-2.0
+ |
+ | Unless required by applicable law or agreed to in writing, software
+ | distributed under the License is distributed on an "AS IS" BASIS,
+ | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ | See the License for the specific language governing permissions and
+ | limitations under the License.
+-->
+</head>
+<body>
+
+<script>
+var showWarning = 0;
+var domain = document.domain || "";
+var mustPost = ((domain == "" || domain == "localhost") && window.postMessage);
+while (!window.jsMath && !showWarning) {
+  try {
+    window.jsMath = window.parent.jsMath;
+    if (!window.jsMath) {throw "no jsMath";}
+  } catch (err) {
+    showWarning = 1; pageDomain = '';
+    try {pageDomain = document.domain} catch (err) {}
+    //
+    // MSIE on Mac can't change document.domain, and 'try' won't
+    //   catch the error (Grrr!) so don't even attempt it.
+    //
+    if (pageDomain.match(/\..*\./) &&
+        (navigator.appName != 'Microsoft Internet Explorer' ||
+         !navigator.platform.match(/Mac/) || !navigator.userProfile || !document.all)) {
+      try {
+        document.domain = pageDomain.replace(/^[^.]*\./,'');
+        showWarning = 0;
+      } catch(err) {}
+    }
+  }
+}
+
+function Warning () {
+  alert(
+    "jsMath can't open the control panel, since jsMath was not " +
+    "obtained from a server that is in the same domain as the " +
+    "page that loaded it."
+  );
+}
+
+if (showWarning) {
+  if (!mustPost) setTimeout("Warning()",1);
+} else {
+  var debug = window.parent.debug;
+  var show = window.parent.show;
+}
+</SCRIPT>
+
+<SCRIPT ID="jsMath_script">
+if (window.jsMath) {
+
+jsMath.Add(jsMath.Controls,{
+
+  loaded: 1,
+
+  mainLabels: {
+    print: 'Print',  reload: 'Reload', local: 'Go Local', global: 'Go Global',
+    ctrls: 'Controls', opts: 'Options', done: 'Done'
+  },
+  optionLabels: {back: 'Back', done: 'Done'},
+
+  Close: function () {
+    this.panel.style.display = "none";
+    jsMath.Element("button").style.display = (this.cookie.button ? "block" : "none");
+    if (jsMath.document.location.protocol == 'file:' && jsMath.Global.islocal) return;
+    for (var id in {scale:1, scaleImg:1, font:1, print:1, printwarn:1,
+                    stayhires:1, autofont:1, alpha:1, tex2math:1, global:1}) {
+      if (this.cookie[id] && this.cookie[id] != this.oldCookie[id] &&
+          this.oldCookie[id] != null) {
+        this.Reload();
+        return;
+      }
+    }
+  },
+
+  Main: function () {
+    this.oldCookie = {}; jsMath.Add(this.oldCookie,this.cookie);
+    this.GetPanel("main");
+
+    jsMath.Element("_version").innerHTML = jsMath.version;
+
+    jsMath.Element("_fontType").innerHTML =
+      ({tex:"TeX",
+        image:"Image",
+        symbol:"Image symbol",
+        unicode:"Unicode"})[this.cookie.font];
+
+     jsMath.Element("_mailto").href =
+       "mailto:dpvc@union.edu?subject=Bug Report for jsMath "
+           + jsMath.version + " (using " + jsMath.browser
+           + " in " + this.cookie.font + " mode)";
+
+    if (this.cookie.print ||
+       (this.cookie.font != 'image' && this.cookie.font != 'symbol'))
+         {jsMath.Element("_resolution").disabled = true}
+
+    if (jsMath.Global.isLocal) {
+      jsMath.Element("_ctrls").disabled = true;
+    } else {
+      this.cookie.hiddenGlobal = jsMath.Global.isHidden;
+      jsMath.Element("_global").style.display = "none";
+      jsMath.Element("_local").style.display = "";
+      if (!jsMath.Global.isHidden || jsMath.noShowGlobal)
+        {jsMath.Element("_ctrls").disabled = true}
+    }
+    if (jsMath.noChangeGlobal) {
+      for (var id in {global:1, local:1, ctrls: 1})
+        {jsMath.Element('_'+id).disabled = true}
+    }
+    if (!window.print) {jsMath.Element("_print").disabled = true}
+
+    if (jsMath.Browser.safariButtonBug) {
+      for (var id in this.mainLabels)
+        {jsMath.Element('_'+id).value = this.mainLabels[id]}
+    }
+
+    this.panel.style.display = "block";
+    this.openMain = 0;
+  },
+
+  Options: function () {
+    this.GetPanel("options");
+    jsMath.Element("_scale").value = this.cookie.scale;
+    jsMath.Element("_keep").value = this.cookie.keep;
+    jsMath.Element("_global").value = this.cookie.global;
+    for (var id in {autofont:1, scaleImg:1, alpha:1, warn:1, printwarn: 1,
+                    stayhires: 1, button:1, progress:1, asynch:1, blank:1, tex2math:1}) {
+      if (this.cookie[id]) {jsMath.Element('_'+id).checked = true}
+    }
+    var font = jsMath.document.getElementsByName("jsMath__font");
+    for (var i = 0; i < font.length; i++) {
+      if ((font[i].value == 'tex' && jsMath.nofonts) ||
+          ((font[i].value == 'symbol' || font[i].value == 'image') &&
+             jsMath.noImgFonts)) {
+        jsMath.Element('_'+font[i].value+"Text").className = "disabled";
+        font[i].disabled = true;
+      }
+      else if (this.cookie.font == font[i].value) {font[i].checked = true}
+    }
+    if (jsMath.noImgFonts) {
+      for (var id in {alpha:1, printwarn:1, stayhires:1}) {
+        var obj = jsMath.Element("_"+id);
+        obj.disabled = true;
+        obj.parentNode.className = "disabled";
+      }
+    } else if (jsMath.Browser.imgScale != 1) {
+      jsMath.Element("_alphaText").className = "disabled";
+      jsMath.Element("_alpha").disabled = true;
+    }
+    if (jsMath.tex2math.Convert) {
+      jsMath.Element("_separator").style.display = '';
+      jsMath.Element("_tex2mathRow").style.display = '';
+    }
+    if (jsMath.noChangeGlobal) {
+      jsMath.Element("_globalText").className = "disabled";
+      jsMath.Element("_global").disabled = true;
+    }
+    if (jsMath.isCHMmode) {
+      jsMath.Element("_asynchText").className  = "disabled";
+      jsMath.Element("_asynch").disabled = true;
+    }
+
+    if (jsMath.Browser.safariButtonBug) {
+      for (var id in this.optionLabels)
+        {jsMath.Element('_'+id).value = this.optionLabels[id]}
+    }
+
+    this.panel.style.display = "block";
+
+    if (jsMath.Browser.msieMoveButtonHack) {
+      this.panel.style.left = "0px";
+      this.panel.style.top = "0px";
+      jsMath.Controls.MoveButton();
+    }
+  },
+
+  HTML: {},  // storage for panels for Firefox3 in local mode
+
+  GetPanel: function (name) {
+    this.panel.innerHTML = ""; // for MSIE on the Mac
+    var html = this.HTML[name];
+    if (html == null) {html = document.getElementById("jsMath_"+name).innerHTML}
+    this.panel.innerHTML = html;
+  },
+
+  SaveOptions: function (close) {
+    this.cookie.scale = jsMath.Element("_scale").value;
+    var font = jsMath.document.getElementsByName("jsMath__font");
+    for (var i = 0; i < font.length; i++) 
+      {if (font[i].checked) {this.cookie.font = font[i].value}}
+    for (var id in {autofont:1, scaleImg:1, alpha:1, warn:1, printwarn: 1,
+                    stayhires: 1, button:1, progress:1, asynch:1, blank:1, tex2math:1}) {
+      if (this.cookie[id] != null) {
+        this.cookie[id] = jsMath.Element('_'+id).checked ? 1: 0;
+      }
+    }
+    this.cookie.keep = jsMath.Element("_keep").value;
+    this.cookie.global = jsMath.Element("_global").value;
+    this.cookie.print = this.cookie.stayhires;
+    this.SetCookie(1);
+    if (close) {this.Close()} else {this.Main()}
+  },
+
+  PrintResolution: function () {
+    this.cookie.print = 1;
+    this.SetCookie(1);
+    this.Close();
+  },
+
+  Print: function () {
+    this.Close();
+    jsMath.window.print();
+  },
+
+  GoGlobal: function () {
+    this.cookie.global = "always";
+    jsMath.Global.GoGlobal(this.SetCookie(2));
+  },
+  GoLocal: function () {jsMath.Global.GoLocal()},
+
+  ShowControls: function () {
+    this.Close();
+    jsMath.Global.Show();
+  },
+
+  NoAuto: function () {jsMath.Element("_autofont").checked = false}
+
+});
+
+jsMath.Add(jsMath.Post.Commands,{
+  PAN: function (message) {jsMath.Controls.HTML.main = message},
+  OPT: function (message) {jsMath.Controls.HTML.options = message},
+
+  PST: function (message) {
+    jsMath.Controls.Main();
+    jsMath.Script.endLoad();
+    jsMath.Message.doClear();
+  }
+});
+
+}
+</script>
+
+<!------------------------------------------------------------>
+
+<div id="jsMath_main">
+<div style="text-align:center">
+<b style="font-size:133%">jsMath v<span ID="jsMath__version"></span></b>
+(<span id="jsMath__fontType">type</span> fonts)
+[<a target="_blank" href="http://www.math.union.edu/locate/jsMath/users/main.html">help</a>]
+<p style="margin-bottom:0px">
+<table border="0" cellspacing="0" cellpadding="0" style="margin:0px">
+<tr valign="middle"><td align="center">
+<table border="0" cellspacing="0" cellpadding="0">
+<tr><td class="infoLink" align="left">&#8226; <a target="_blank" href="http://www.math.union.edu/locate/jsMath/users/quickstart.html">Quick Start</a></td></tr>
+<tr><td class="infoLink" align="left">&#8226; <a target="_blank" href="http://www.math.union.edu/locate/jsMath/users/fonts.html">Missing Fonts</a></td></tr>
+<tr><td class="infoLink" align="left">&#8226; <a target="_blank" href="http://www.math.union.edu/locate/jsMath/users/printing.html">Printing Issues</a></td></tr>
+<tr><td height="5"></td></tr>
+<tr><td class="infoLink" align="left">&#8226; <a target="_blank" href="http://www.math.union.edu/locate/jsMath">Home Page</a></td></tr>
+<tr><td class="infoLink" align="left">&#8226; <a target="_blank" href="http://www.math.union.edu/locate/jsMath/users/">Documentation</a></td></tr>
+<tr><td class="infoLink" align="left">&#8226; <a target="_blank" href="https://sourceforge.net/forum/?group_id=172663">User Community</a></td></tr>
+<tr><td height="5"></td></tr>
+<tr><td class="infoLink" align="left">&#8226; <a target="_blank" href="http://www.math.union.edu/locate/jsMath/bugs.html">Known Bugs</a></td></tr>
+<tr><td class="infoLink" align="left">&#8226; <a id="jsMath__mailto" href="mailto:dpvc@union.edu?subject=jsMath Bug Report">Report a Bug</a></td></tr>
+<tr><td height="5"></td></tr>
+<tr><td class="infoLink" align="left">&#8226; <a target="_blank" href="http://www.math.union.edu/locate/jsMath/jsMath/COPYING.txt">License</a></td></tr>
+</table>
+</td>
+
+<td style="width:1em">&nbsp;</td>
+
+<td align="center">
+<table border="0" cellspacing="0" cellpadding="0">
+<tr><td align="center" colspan="3">
+<input type="button" id="jsMath__resolution" value="Hi-Res Fonts for Printing"
+       style="width:18em" onclick="jsMath.Controls.PrintResolution()" />
+</td></tr>
+
+<tr><td height="8"></td></tr>
+
+<tr valign="bottom"><td align="left">
+<input type="button" value="Print" id="jsMath__print" style="width:8em" onclick="jsMath.Controls.Print()" /><br />
+<input type="button" value="Reload" id="jsMath__reload" style="width:8em" style="width:8em" onclick="jsMath.window.location.reload()" /><br />
+</td><td>
+&nbsp;
+</td><td align="right">
+<input type="button" value="Go Global" id="jsMath__global" style="width:8em" onclick="jsMath.Controls.GoGlobal()"a /><!--
+--><input type="button" value="Go Local" id="jsMath__local" style="width:8em;display:none" onclick="jsMath.Controls.GoLocal()" /><br />
+<input type="button" value="Controls" id="jsMath__ctrls" style="width:8em" onclick="jsMath.Controls.ShowControls()" /><br/>
+</td></tr>
+
+<tr><td height="8"></td></tr>
+
+<tr valign="bottom"><td align="left">
+<input type="button" value="Options" id="jsMath__opts" style="width:8em" onclick="jsMath.Controls.Options()" /><br/>
+</td><td>
+&nbsp;
+</td><td align="right">
+<input type="button" value="Done" id="jsMath__done" style="width:8em" onclick="jsMath.Controls.Close()" />
+</td></tr>
+</table></td></tr>
+
+<tr><td height="10"></td></tr>
+
+<tr>
+<td colspan="3" align="center" style="width:26em">
+<i style="font-size:75%">Click the jsMath button or <nobr>ALT-click</nobr>
+on mathematics to reopen this panel.</i>
+</td></tr>
+
+</table></p>
+</div>
+</div>
+
+<!------------------------------------------------------------>
+
+<div id="jsMath_options">
+<div style="text-align:center">
+<b style="font-size:133%">jsMath Options</b>
+[<a target="_blank" href="http://www.math.union.edu/locate/jsMath/users/help.html">help</a>]
+<p>
+<form action="javascript:" style="margin:0px">
+<table border="0" cellspacing="0" cellpadding="0">
+<tr valign="top"><td>
+
+<table border="0" cellspacing="0" cellpadding="0" style="text-align:left">
+
+<tr><td><input type="checkbox" id="jsMath__autofont"  value="1" /> Autoselect best font</td></tr>
+<tr><td><input type="checkbox" id="jsMath__warn"      value="1" /> Show font warnings</td></tr>
+<tr><td><input type="checkbox" id="jsMath__alpha"     value="1" /> Use image alpha channels</td></tr>
+<tr><td><input type="checkbox" id="jsMath__printwarn" value="1" /> Print image-font help</td></tr>
+<tr><td><input type="checkbox" id="jsMath__stayhires" value="1" /> Always use hi-res fonts</td></tr>
+
+<tr><td style="height:.8em"></td></tr>
+
+<tr><td><input type="checkbox" id="jsMath__progress" value="1" /> Show progress messages</td></tr>
+<tr><td><input type="checkbox" id="jsMath__asynch"   value="1" /> <span id="jsMath__asynchText">Force asynchronous processing</span></td></tr>
+<tr><td><input type="checkbox" id="jsMath__blank"    value="1" /> Don't show page until complete</td></tr>
+<tr><td><input type="checkbox" id="jsMath__button"   value="1" /> Show jsMath button</td></tr>
+
+<tr id="jsMath__separator" style="display:none"><td style="height:.8em"></td></tr>
+
+<tr id="jsMath__tex2mathRow" style="display:none"><td><input type="checkbox" id="jsMath__tex2math" value="1" /> Enable <code>tex2math</code> plug-in</td></tr>
+
+</td></tr>
+</table>
+</td>
+<td style="width:2em"></td>
+<td>
+
+<table border="0" cellspacing="0" cellpadding="0" style="text-align:left">
+<tr><td>Scale all mathematics to <input type="text" id="jsMath__scale" value="100" size="3" />%</td></tr>
+
+<tr><td style="height:.5em"></td></tr>
+
+<tr><td><input type="radio" name="jsMath__font" value="tex" onclick="jsMath.Controls.NoAuto()" />
+<span id="jsMath__texText">Use native TeX fonts</span>
+<small>(<a target="_blank" href="http://www.math.union.edu/locate/jsMath/download/jsMath-fonts.html">download</a>)</small>
+</td></tr>
+<tr><td><input type="radio" name="jsMath__font" value="image" onclick="jsMath.Controls.NoAuto()" />
+<span id="jsMath__imageText">Use image fonts
+<span id="jsMath__scaleImgText">(<input type="checkbox" id="jsMath__scaleImg" value="1" /> scalable)</span></span></td></tr>
+<tr><td><input type="radio" name="jsMath__font" value="symbol" onclick="jsMath.Controls.NoAuto()" />
+<span id="jsMath__symbolText">Use images for symbols only</span></td></tr>
+<tr><td height="2"></td></tr>
+<tr><td><input type="radio" name="jsMath__font" value="unicode" onclick="jsMath.Controls.NoAuto()" />
+Use native Unicode fonts</td></tr>
+
+<tr><td style="height:1em"></td></tr>
+
+<tr><td align="center"><span id="jsMath__globalText">Use Global mode</span>
+<select id="jsMath__global">
+<option value="auto">when requested
+<option value="always">always
+<option value="never">never
+</select>
+</td></tr>
+<tr><td height="3"></td></tr>
+<tr><td>Save settings for
+<select id="jsMath__keep">
+<option value="0D">this session only
+<option value="1D">1 day
+<option value="2D">2 days
+<option value="3D">3 days
+<option value="1W">1 week
+<option value="2W">2 weeks
+<option value="1M">1 month
+<option value="2M">2 months
+<option value="3M">3 months
+<option value="6M">6 months
+<option value="1Y">1 year
+<option value="5Y">5 years
+</select>
+</td></tr>
+
+<tr><td style="height:1em"></td></tr>
+
+</table>
+
+<table border="0" cellspacing="0" cellpadding="0" width="100%">
+<tr>
+<td align="left">&nbsp;
+<input type="button" value="Back" id="jsMath__back" style="width:8em" onclick="jsMath.Controls.SaveOptions(0)" />
+&nbsp;&nbsp;
+</td>
+<td align="right">
+<input type="button" value="Done" id="jsMath__done" style="width:8em" onclick="jsMath.Controls.SaveOptions(1)" />
+&nbsp;
+</td>
+</tr>
+</table>
+
+</td></tr>
+
+</table>
+</form>
+</div>
+</div>
+</p>
+
+<!------------------------------------------------------------>
+
+<script>
+  if (showWarning) {
+    if (mustPost) {
+      var scr = document.getElementById("jsMath_script");
+      window.parent.postMessage("jsMCP:SCR:"+scr.innerHTML,"*");
+      var main = document.getElementById("jsMath_main");
+      window.parent.postMessage("jsMCP:PAN:"+main.innerHTML,"*");
+      var options = document.getElementById("jsMath_options");
+      window.parent.postMessage("jsMCP:OPT:"+options.innerHTML,"*");
+      window.parent.postMessage("jsMCP:PST:","*");
+    }
+  } else {
+    jsMath.Controls.Main()
+  }
+</script>
+<script>
+  if (window.jsMath) {
+    jsMath.Script.endLoad();
+    jsMath.Message.doClear();
+  }
+</script>
+</body>
+</html>
diff --git a/htdocs/jsMath/jsMath-easy-load.js b/htdocs/jsMath/jsMath-easy-load.js
new file mode 100644
index 0000000000..49fe20a148
--- /dev/null
+++ b/htdocs/jsMath/jsMath-easy-load.js
@@ -0,0 +1,165 @@
+/*
+ *  jsMath-easy-load.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file is used to load jsMath with one easy <SCRIPT>
+ *  command in your HTML file.  It is called by the files
+ *  in the jsMath/easy/ directory.  It expects that the jsMath.Easy
+ *  array has been initialized before it is called.
+ *
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 2007 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+if (!window.jsMath) {window.jsMath = {}}
+if (!jsMath.Easy) {jsMath.Easy = {}}
+if (!jsMath.tex2math) {jsMath.tex2math = {}}
+
+jsMath.tex2math.doubleDollarsAreInLine = jsMath.Easy.doubleDollarsAreInLine;
+jsMath.tex2math.allowDisableTag = jsMath.Easy.allowDisableTag;
+
+jsMath.safeHBoxes = jsMath.Easy.safeHBoxes;
+
+if (jsMath.Easy.scale) {
+  if (!jsMath.Controls) {jsMath.Controls = {}}
+  if (!jsMath.Controls.cookie) {jsMath.Controls.cookie = {}}
+  jsMath.Controls.cookie.scale = jsMath.Easy.scale;
+}
+if (!jsMath.Easy.allowDoubleClicks) {
+  if (!jsMath.Click) {jsMath.Click = {}}
+  jsMath.Click.CheckDblClick = function () {};
+}
+if (!jsMath.Easy.showFontWarnings) {
+  if (!jsMath.Font) {jsMath.Font = {}}
+  jsMath.Font.Message = function () {};
+}
+
+if (!jsMath.Easy.allowGlobal) {
+  if (!jsMath.Controls) {jsMath.Controls = {}}
+  if (!jsMath.Controls.cookie) {jsMath.Controls.cookie = {}}
+  jsMath.Controls.cookie.global = 'never';
+  jsMath.noGoGlobal = 1;
+  jsMath.noChangeGlobal = 1;
+  jsMath.noShowGlobal = 1;
+}
+
+if (jsMath.Easy.noImageFonts) {
+  jsMath.noImgFonts = 1;
+  if (!jsMath.Font) {jsMath.Font = {}}
+  if (!jsMath.Font.message) {
+    jsMath.Font.message =
+      '<b>No jsMath TeX fonts found</b> -- using unicode fonts instead.<br/>\n'
+        + 'This may be slow and might not print well.<br/>\n'
+        + 'Use the jsMath control panel to get additional information.';
+  }
+  if (!jsMath.Fonts.extra_message) {
+    jsMath.Font.extra_message =
+      'Extra TeX fonts not found: <b><span id="jsMath_ExtraFonts"></span></b><br/>'
+        + 'Using unicode fonts instead.  This may be slow and might not print well.<br/>\n'
+        + 'Use the jsMath control panel to get additional information.';
+  }
+}
+
+if (jsMath.Easy.processSingleDollars ||
+    jsMath.Easy.processDoubleDollars ||
+    jsMath.Easy.processSlashParens ||
+    jsMath.Easy.processSlashBrackets ||
+    jsMath.Easy.fixEscapedDollars) {
+
+  jsMath.Easy.findCustomSettings = {
+    processSingleDollars:     jsMath.Easy.processSingleDollars,
+    processDoubleDollars:     jsMath.Easy.processDoubleDollars,
+    processSlashParens:       jsMath.Easy.processSlashParens,
+    processSlashBrackets:     jsMath.Easy.processSlashBrackets,
+    processLaTeXenvironments: jsMath.Easy.processLaTeXenvironments,
+    fixEscapedDollars:        jsMath.Easy.fixEscapedDollars,
+    custom: 0
+  }
+}
+
+if (!jsMath.Autoload) {jsMath.Autoload = {}}
+jsMath.Autoload.root = jsMath.Easy.root+'/';
+
+if (jsMath.Easy.autoload) {
+  jsMath.Autoload.findTeXstrings = 0;
+  jsMath.Autoload.findLaTeXstrings = 0;
+  jsMath.Autoload.findCustomStrings = jsMath.Easy.customDelimiters;
+  jsMath.Autoload.findCustomSettings = jsMath.Easy.findCustomSettings;
+  jsMath.Autoload.loadFiles = jsMath.Easy.loadFiles;
+  jsMath.Autoload.loadFonts = jsMath.Easy.loadFonts;
+  jsMath.Autoload.macros = jsMath.Easy.macros;
+  jsMath.Autoload.delayCheck = 1;
+  jsMath.Easy.autoloadCheck = 1;
+  document.write('<script src="'+jsMath.Autoload.root+'plugins/autoload.js"></script>');
+  
+} else {
+  jsMath.Easy.tex2math =
+     (jsMath.Easy.processSingleDollars ||
+      jsMath.Easy.processDoubleDollars ||
+      jsMath.Easy.processSlashParens ||
+      jsMath.Easy.processSlashBrackets ||
+      jsMath.Easy.processLaTeXenvironments ||
+      jsMath.Easy.fixEscapedDollars ||
+      jsMath.Easy.customDelimiters);
+
+  if (!jsMath.Setup) {jsMath.Setup = {}}
+  if (!jsMath.Setup.UserEvent) {jsMath.Setup.UserEvent = {}}
+  jsMath.Setup.UserEvent.onload = function () {
+    var easy = jsMath.Easy;
+    if (easy.tex2math) jsMath.Setup.Script("plugins/tex2math.js");
+    var i;
+    if (easy.loadFiles) {
+      for (i = 0; i < easy.loadFiles.length; i++)
+        jsMath.Setup.Script(easy.loadFiles[i]);
+    }
+    if (easy.loadFonts) {
+      for (i = 0; i < easy.loadFonts.length; i++)
+        jsMath.Font.Load(easy.loadFonts[i]);
+    }
+    if (easy.macros) {
+      for (i in easy.macros) {
+        if (typeof(easy.macros[i]) == 'string') {
+          jsMath.Macro(i,easy.macros[i]);
+        } else {
+          jsMath.Macro(i,easy.macros[i][0],easy.macros[i][1]);
+        }
+      }
+    }
+  }
+  document.write('<script src="'+jsMath.Easy.root+'/jsMath.js"></script>'+"\n");
+}
+
+jsMath.Easy.onload = function () {
+  if (jsMath.Easy.loaded) {return} else {jsMath.Easy.loaded = 1}
+  if (jsMath.Easy.autoloadCheck) jsMath.Autoload.Check();
+  if (jsMath.Easy.tex2math) {
+    jsMath.Synchronize(function () {
+      if (jsMath.Easy.findCustomSettings)
+        jsMath.tex2math.Convert(document,jsMath.Easy.findCustomSettings);
+      if (jsMath.Easy.customDelimiters) {
+        var s = jsMath.Easy.customDelimiters;
+        jsMath.tex2math.CustomSearch(s[0],s[1],s[2],s[3]);
+        jsMath.tex2math.ConvertCustom();
+      }
+    });
+  }
+  (jsMath[jsMath.Easy.method])();
+}
+
+if (window.addEventListener) {window.addEventListener("load",jsMath.Easy.onload,false)}
+else if (window.attachEvent) {window.attachEvent("onload",jsMath.Easy.onload)}
+else {window.onload = jsMath.Easy.onload}
diff --git a/htdocs/jsMath/jsMath-fallback-mac-mozilla.js b/htdocs/jsMath/jsMath-fallback-mac-mozilla.js
new file mode 100644
index 0000000000..bd2d429fed
--- /dev/null
+++ b/htdocs/jsMath/jsMath-fallback-mac-mozilla.js
@@ -0,0 +1,107 @@
+/*
+ *  jsMath-fallback-mac-mozilla.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file makes changes needed by Mozilla-based browsers on the Mac
+ *  for when the TeX fonts are not available.
+ *
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 2004-2006 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+
+
+/********************************************************************
+ *
+ *  Fix the default non-TeX-font characters to work with Mozilla
+ *
+ */
+
+jsMath.Update.TeXfonts({
+  cmmi10: {
+//  '41':  // leftharpoondown
+//  '43':  // rightharpoondown    
+    '44': {c: '<span style="position:relative; top:.15em; margin-right:-.1em; margin-left:-.2em">&#x02D3;</span>'},
+    '45': {c: '<span style="position:relative; top:.15em; margin-right:-.1em; margin-left:-.2em">&#x02D2;</span>'},
+    '47': {c: '<span style="font-size:60%">&#x25C1;</span>'},
+//  '92':  // natural
+    '126': {c: '<span style="position:relative; left: .3em; top: -.7em; font-size: 50%">&#x2192;</span>'}
+  },
+
+  cmsy10: {
+    '0':  {c: '&ndash;', tclass: 'normal'},
+    '11': {c: '<span style="font-size: 70%">&#x25EF;</span><span style="position:relative; margin-left:-.5em; top:.1em; margin-right:.3em">/</span>', tclass: 'normal'},
+    '42': {c: '&#x2963;'}, '43': {c: '&#x2965'},
+    '48': {c: '<span style="font-size: 133%; margin-right: -.75em; position: relative; top:.4em">&#x2032;</span>', tclass: 'normal'},
+    '93': {c: '&#x222A;<span style="font-size: 50%; margin-left:-1.3em; position: relative; top:-.3em; margin-right:.6em">+</span>'},
+    '104': {c: '<span style="position:relative; top:.15em; margin-left:-.6em">&#x3008;</span>'},
+    '105': {c: '<span style="position:relative; top:.15em; margin-right:-.6em">&#x3009;</span>'},
+    '109': {c: '&#x2963;<span style="position:relative; top:.1em; margin-left:-1em">&#x2965;</span>'}
+//, '116':  // sqcup
+//  '117':  // sqcap
+//  '118':  // sqsubseteq
+//  '119':  // sqsupseteq
+  },
+  
+  cmex10: {
+    '10': {c: '<span style="position:relative; top:.1em; margin-left:-.6em">&#x3008;</span>'},
+    '11': {c: '<span style="position:relative; top:.1em; margin-right:-.6em">&#x3009;</span>'},
+    '14': {c: '/'}, '15': {c: '\\'},
+    '28': {c: '<span style="position:relative; top:.1em; margin-left:-.6em">&#x3008;</span>'},
+    '29': {c: '<span style="position:relative; top:.1em; margin-right:-.6em">&#x3009;</span>'},
+    '30': {c: '/'}, '31': {c: '\\'},
+    '42': {c: '<span style="position:relative; top:.1em; margin-left:-.6em">&#x3008;</span>'},
+    '43': {c: '<span style="position:relative; top:.1em; margin-right:-.6em">&#x3009;</span>'},
+    '44': {c: '/'}, '45': {c: '\\'},
+    '46': {c: '/'}, '47': {c: '\\'},
+    '68': {c: '<span style="position:relative; top:.1em; margin-left:-.6em">&#x3008;</span>'},
+    '69': {c: '<span style="position:relative; top:.1em; margin-right:-.6em">&#x3009;</span>'},
+//  '70':  // sqcup
+//  '71':  // big sqcup
+    '72': {ic: .194},  '73': {ic: .444},
+    '82': {tclass: 'bigop1cx', ic: .15}, '90': {tclass: 'bigop2cx', ic:.6},
+    '85': {c: '&#x222A;<span style="font-size: 50%; margin-left:-1.3em; position: relative; top:-.3em; margin-right:.6em">+</span>'},
+    '93': {c: '&#x222A;<span style="font-size: 50%; margin-left:-1.3em; position: relative; top:-.3em; margin-right:.6em">+</span>'}
+  }
+  
+});
+
+jsMath.Setup.Styles({
+  '.typeset .symbol':   "font-family: Osaka",
+  '.typeset .arrow1':   "font-family: Osaka; position: relative; top: .125em; margin: -1px",
+  '.typeset .arrow2':   "font-family: AppleGothic; font-size: 100%; position:relative; top: .11em; margin:-1px",
+  '.typeset .bigop1':   "font-family: AppleGothic; font-size: 110%; position:relative; top: .9em; margin:-.05em",
+  '.typeset .bigop1b':  "font-family: Osaka; font-size: 140%; position: relative; top: .8em; margin:-.1em",
+  '.typeset .bigop1c':  "font-family: AppleGothic; font-size: 125%; position:relative; top: .85em; margin:-.3em",
+  '.typeset .bigop1cx': "font-family: 'Apple Chancery'; font-size: 125%; position:relative; top: .7em; margin:-.1em",
+  '.typeset .bigop2':   "font-family: AppleGothic; font-size: 175%; position:relative; top: .85em; margin:-.1em",
+  '.typeset .bigop2b':  "font-family: Osaka; font-size: 200%; position: relative; top: .75em; margin:-.15em",
+  '.typeset .bigop2c':  "font-family: AppleGothic; font-size: 300%; position:relative; top: .75em; margin:-.35em",
+  '.typeset .bigop2cx': "font-family: 'Apple Chancery'; font-size: 250%; position:relative; top: .7em; margin-left:-.1em; margin-right:-.2em",
+  '.typeset .delim1b':  "font-family: Times; font-size: 150%; position:relative; top:.8em; margin:.01em",
+  '.typeset .delim2b':  "font-family: Times; font-size: 210%; position:relative; top:.8em; margin:.01em",
+  '.typeset .delim3b':  "font-family: Times; font-size: 300%; position:relative; top:.75em; margin:.01em",
+  '.typeset .delim4b':  "font-family: Times; font-size: 400%; position:relative; top:.725em; margin:.01em"
+});
+
+
+/*
+ *  replace \not and \joinrel with better dimensions
+ */
+
+jsMath.Macro('not','\\mathrel{\\rlap{\\kern 3mu/}}');
+jsMath.Macro('joinrel','\\mathrel{\\kern-3mu}');
diff --git a/htdocs/jsMath/jsMath-fallback-mac-msie.js b/htdocs/jsMath/jsMath-fallback-mac-msie.js
new file mode 100644
index 0000000000..97bd15eb13
--- /dev/null
+++ b/htdocs/jsMath/jsMath-fallback-mac-msie.js
@@ -0,0 +1,200 @@
+/*
+ *  jsMath-fallback-mac-msie.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file makes changes needed by Internet Explorer on the Mac
+ *  for when the TeX fonts are not available.
+ *
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 2004-2006 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+
+
+/********************************************************************
+ *
+ *  Fix the default non-TeX-font characters to work with MSIE
+ *
+ */
+
+jsMath.Update.TeXfonts({
+  cmr10: {
+    '0':  {c: 'G', tclass: 'greek'},
+    '1':  {c: 'D', tclass: 'greek'},
+    '2':  {c: 'Q', tclass: 'greek'},
+    '3':  {c: 'L', tclass: 'greek'},
+    '4':  {c: 'X', tclass: 'greek'},
+    '5':  {c: 'P', tclass: 'greek'},
+    '6':  {c: 'S', tclass: 'greek'},
+    '7':  {c: '&#161;', tclass: 'greek'},
+    '8':  {c: 'F', tclass: 'greek'},
+    '9':  {c: 'Y', tclass: 'greek'},
+    '10': {c: 'W', tclass: 'greek'},
+    '22': {c: '<span style="position:relative; top:.1em">&#96;</span>', tclass: 'symbol3'}
+  },
+  
+  cmti10: {
+    '0':  {c: 'G', tclass: 'igreek'},
+    '1':  {c: 'D', tclass: 'igreek'},
+    '2':  {c: 'Q', tclass: 'igreek'},
+    '3':  {c: 'L', tclass: 'igreek'},
+    '4':  {c: 'X', tclass: 'igreek'},
+    '5':  {c: 'P', tclass: 'igreek'},
+    '6':  {c: 'S', tclass: 'igreek'},
+    '7':  {c: '&#161;', tclass: 'igreek'},
+    '8':  {c: 'F', tclass: 'igreek'},
+    '9':  {c: 'Y', tclass: 'igreek'},
+    '10': {c: 'W', tclass: 'igreek'},
+    '22': {c: '<span style="position:relative; top:.1em">&#96;</span>', tclass: 'symbol3'}
+  },
+  
+  cmbx10: {
+    '0':  {c: 'G', tclass: 'bgreek'},
+    '1':  {c: 'D', tclass: 'bgreek'},
+    '2':  {c: 'Q', tclass: 'bgreek'},
+    '3':  {c: 'L', tclass: 'bgreek'},
+    '4':  {c: 'X', tclass: 'bgreek'},
+    '5':  {c: 'P', tclass: 'bgreek'},
+    '6':  {c: 'S', tclass: 'bgreek'},
+    '7':  {c: '&#161;', tclass: 'bgreek'},
+    '8':  {c: 'F', tclass: 'bgreek'},
+    '9':  {c: 'Y', tclass: 'bgreek'},
+    '10': {c: 'W', tclass: 'bgreek'},
+    '22': {c: '<span style="position:relative; top:.1em">&#96;</span>', tclass: 'symbol3'}
+  },
+  cmmi10: {
+    '0':  {c: 'G', tclass: 'igreek'},
+    '1':  {c: 'D', tclass: 'igreek'},
+    '2':  {c: 'Q', tclass: 'igreek'},
+    '3':  {c: 'L', tclass: 'igreek'},
+    '4':  {c: 'X', tclass: 'igreek'},
+    '5':  {c: 'P', tclass: 'igreek'},
+    '6':  {c: 'S', tclass: 'igreek'},
+    '7':  {c: '&#161;', tclass: 'igreek'},
+    '8':  {c: 'F', tclass: 'igreek'},
+    '9':  {c: 'Y', tclass: 'igreek'},
+    '10': {c: 'W', tclass: 'igreek'},
+    '11': {c: 'a', tclass: 'greek'},
+    '12': {c: 'b', tclass: 'greek'},
+    '13': {c: 'g', tclass: 'greek'},
+    '14': {c: 'd', tclass: 'greek'},
+    '15': {c: 'e', tclass: 'greek'},
+    '16': {c: 'z', tclass: 'greek'},
+    '17': {c: 'h', tclass: 'greek'},
+    '18': {c: 'q', tclass: 'greek'},
+    '19': {c: 'i', tclass: 'greek'},
+    '20': {c: 'k', tclass: 'greek'},
+    '21': {c: 'l', tclass: 'greek'},
+    '22': {c: 'm', tclass: 'greek'},
+    '23': {c: 'n', tclass: 'greek'},
+    '24': {c: 'x', tclass: 'greek'},
+    '25': {c: 'p', tclass: 'greek'},
+    '26': {c: 'r', tclass: 'greek'},
+    '27': {c: 's', tclass: 'greek'},
+    '28': {c: 't', tclass: 'greek'},
+    '29': {c: 'u', tclass: 'greek'},
+    '30': {c: 'f', tclass: 'greek'},
+    '31': {c: 'c', tclass: 'greek'},
+    '32': {c: 'y', tclass: 'greek'},
+    '33': {c: 'w', tclass: 'greek'},
+//  '41':  // leftharpoondown
+//  '43':  // rightharpoondown   
+//  '44':  // hook left
+//  '45':  // hook right 
+//  '92':  // natural
+    '94': {c: '<span style="position:relative; top:.3em">&#xFE36;</span>'},
+    '95': {c: '<span style="position:relative; top:-.2em">&#xFE35;</span>'}
+//  '127': // half-circle down accent?
+  },
+
+  cmsy10: {
+    '0':  {c: '&ndash;', tclass: 'normal'},
+    '11': {c: '<span style="font-size: 70%">&#x25EF;</span><span style="position:relative; margin-left:-.5em; top:.1em; margin-right:.3em">/</span>', tclass: 'normal'},
+    '16': {c: '<span style="position:relative;top:-.1em; font-size: 67%">&#xFE35;</span><span style="position:relative;top:.1em;font-size:67%;margin-left:-1em">&#xFE36;</span>', tclass: 'normal'},
+    '48': {c: '<span style="font-size: 133%; margin-left:-.1em; margin-right: -.6em; position: relative; top:.4em">&#x2032;</span>'},
+    '93': {c: '&#x222A;<span style="font-size: 50%; margin-left:-1.3em; position: relative; top:-.3em; margin-right:.6em">+</span>'},
+    '96': {c: '<span style="font-size:67%; position:relative; top:-.3em;">|</span><span style="position:relative; top:-.15em; margin-left:-.1em">&ndash;</span>', tclass: 'normal'},
+    '104': {c: '<span style="position:relative; top:.2em; margin-left:-.6em">&#x3008;</span>'},
+    '105': {c: '<span style="position:relative; top:.2em; margin-right:-.6em">&#x3009;</span>'},
+    '109': {c: '&#x21D1;<span style="position:relative; top:.1em; margin-left:-1em">&#x21D3;</span>'},
+    '110': {c: '\\', d:0, tclass: 'normal'}
+//  '111': // wr
+//, '113': // amalg
+//  '116': // sqcup
+//  '117': // sqcap
+//  '118': // sqsubseteq
+//  '119': // sqsupseteq
+  },
+
+  cmex10: {
+    '10': {c: '<span style="position:relative; top:.1em; margin-left:-.6em">&#x3008;</span>'},
+    '11': {c: '<span style="position:relative; top:.1em; margin-right:-.6em">&#x3009;</span>'},
+    '14': {c: '/'}, '15': {c: '\\'},
+    '28': {c: '<span style="position:relative; top:.05em; margin-left:-.6em">&#x3008;</span>'},
+    '29': {c: '<span style="position:relative; top:.05em; margin-right:-.6em">&#x3009;</span>'},
+    '30': {c: '/'}, '31': {c: '\\'},
+    '42': {c: '<span style="margin-left:-.6em">&#x3008;</span>'},
+    '43': {c: '<span style="margin-right:-.6em">&#x3009;</span>'},
+    '44': {c: '/'}, '45': {c: '\\'},
+    '46': {c: '/'}, '47': {c: '\\'},
+    '68': {c: '<span style="margin-left:-.6em">&#x3008;</span>'},
+    '69': {c: '<span style="margin-right:-.6em">&#x3009;</span>'},
+//  '70':  // sqcup
+//  '71':  // big sqcup
+    '72': {ic: 0},  '73': {ic: 0},
+    '82': {tclass: 'bigop1cx', ic: .15}, '90': {tclass: 'bigop2cx', ic:.6},
+    '85': {c: '&#x222A;<span style="font-size: 50%; margin-left:-1.25em; position: relative; top:-.3em; margin-right:.6em">+</span>'},
+    '93': {c: '&#x222A;<span style="font-size: 50%; margin-left:-1.25em; position: relative; top:-.3em; margin-right:.6em">+</span>'},
+//  '96': // coprod
+//  '97': // big coprod
+    '98': {c: '&#xFE3F;', h: 0.722, w: .58, tclass: 'wide1'},
+    '99': {c: '&#xFE3F;', h: 0.722, w: .58, tclass: 'wide2'},
+    '100': {c: '&#xFE3F;', h: 0.722, w: .58, tclass: 'wide3'},
+    '101': {c: '~', h: 0.722, w: .42, tclass: 'wide1a'},
+    '102': {c: '~', h: 0.8, w: .73, tclass: 'wide2a'},
+    '103': {c: '~', h: 0.8, w: 1.1, tclass: 'wide3a'}
+  }
+
+});
+
+jsMath.Setup.Styles({
+  '.typeset .arrow1':   "font-family: Osaka; position: relative; top: .125em; margin: -1px",
+  '.typeset .arrow2':   "font-family: Osaka; position: relative; top: .1em; margin:-1px",
+  '.typeset .bigop1':   "font-family: Symbol; font-size: 110%; position:relative; top: .8em; margin:-.05em",
+  '.typeset .bigop1b':  "font-family: Symbol; font-size: 140%; position: relative; top: .8em; margin:-.1em",
+  '.typeset .bigop1c':  "font-family: Osaka; font-size: 125%; position:relative; top: .85em; margin:-.3em",
+  '.typeset .bigop1cx': "font-family: 'Apple Chancery'; font-size: 125%; position:relative; top: .7em; margin:-.1em",
+  '.typeset .bigop2':   "font-family: Symbol; font-size: 175%; position:relative; top: .8em; margin:-.07em",
+  '.typeset .bigop2a':  "font-family: Baskerville; font-size: 175%; position: relative; top: .65em",
+  '.typeset .bigop2b':  "font-family: Symbol; font-size: 175%; position: relative; top: .8em; margin:-.07em",
+  '.typeset .bigop2c':  "font-family: Osaka; font-size: 230%; position:relative; top: .85em; margin:-.35em",
+  '.typeset .bigop2cx': "font-family: 'Apple Chancery'; font-size: 250%; position:relative; top: .6em; margin-left:-.1em; margin-right:-.2em",
+  '.typeset .delim1b':  "font-family: Times; font-size: 150%; position:relative; top:.8em",
+  '.typeset .delim2b':  "font-family: Times; font-size: 210%; position:relative; top:.75em;",
+  '.typeset .delim3b':  "font-family: Times; font-size: 300%; position:relative; top:.7em;",
+  '.typeset .delim4b':  "font-family: Times; font-size: 400%; position:relative; top:.65em;",
+  '.typeset .symbol3':  "font-family: Symbol",
+  '.typeset .wide1':    "font-size: 50%; position: relative; top:-1.1em",
+  '.typeset .wide2':    "font-size: 80%; position: relative; top:-.7em",
+  '.typeset .wide3':    "font-size: 125%; position: relative; top:-.5em",
+  '.typeset .wide1a':   "font-size: 75%; position: relative; top:-.5em",
+  '.typeset .wide2a':   "font-size: 133%; position: relative; top: -.15em",
+  '.typeset .wide3a':   "font-size: 200%; position: relative; top: -.05em",
+  '.typeset .greek':    "font-family: Symbol",
+  '.typeset .igreek':   "font-family: Symbol; font-style:italic",
+  '.typeset .bgreek':   "font-family: Symbol; font-weight:bold"
+});
diff --git a/htdocs/jsMath/jsMath-fallback-mac.js b/htdocs/jsMath/jsMath-fallback-mac.js
new file mode 100644
index 0000000000..f1a3749a31
--- /dev/null
+++ b/htdocs/jsMath/jsMath-fallback-mac.js
@@ -0,0 +1,29 @@
+/*
+ *  jsMath-fallback-mac.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file makes changes needed for when the TeX fonts are not available
+ *  with a browser on the Mac.
+ *
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 2004-2010 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+jsMath.Script.Uncompress([
+  ['jsMath.Add(jsMath.TeX,{cmr10',':[{c:"&Gamma;",','tclass:"greek"},{c:"&','Delta;",',2,'Theta;",',2,'Lambda;",',2,'Xi;",',2,'Pi;",',2,'Sigma;",',2,'Upsilon;",',2,'Phi;",',2,'Psi;",',2,'Omega;",','tclass:"','greek','"},{c:"','ff','",ic:0.0778,krn:{"39":0.0778,"63":0.0778,"33":0.0778,"41":0.0778,"93":0.0778},lig:{"105":','14,"108":15},','tclass:"normal"},{c',':"fi",',28,':"fl",',28,':"ffi",',28,':"ffl",',28,':"&#x131',';",a:0,',28,':"j",d:0.2,',28,':"&#x60;",',22,'accent','"},{c:"&#','xB4;",',22,44,45,'x2C7;",',22,44,45,'x2D8;",',22,44,'"},{c:\'<span style="','position:relative; top',':.1em">&#x2C9',';</span>\',',22,44,45,'x2DA;",',22,44,45,'x0327;",',28,':"&#xDF;",',28,':"&#xE6',38,28,':"&#x153',38,28,':"&#xF8;",',28,':"&#xC6;",',28,':"&#x152;",',28,':"&#xD8;",',28,':"?",krn:{"108":-0.278,"76":-0.319},',28,':"!",lig:{"96":60},',28,':"&#x201D;",',28,':"#",',28,':"$",',28,':"%",',28,':"&amp;",',28,':"&#x2019;",krn:{"63":0.111,"33":0.','111},','lig:{"39":34},',28,':"(",','d:0.2,',28,':")",',105,28,':"*",',28,':"+",','a:0.1,',28,':",",a:-0.3,d:0.2,','w:0.278,',28,':"-",a:0,lig:{"45":123},',28,':".",a:-0.','25,',28,':"/",',28,':"0",',28,':"1",',28,':"2",',28,':"3",',28,':"4",',28,':"5",',28,':"6",',28,':"7",',28,':"8",',28,':"9",',28,':":",',28,':";",',28,':"&#xA1;",',28,':"=",a:0,d:-0.1,',28,':"&#xBF;",',28,':"?",lig:{"96":62},',28,':"@",',28,':"A','",krn:{"','116','":-0.0278,"','67',162,'79',162,'71',162,'85',162,'81',162,'84','":-0.0833,"','89',174,'86','":-0.111',',"87":-0.',101,28,':"B",',28,':"C",',28,':"D',160,'88',162,'87',162,'65',162,'86',162,'89','":-0.0278','},',28,':"E",',28,':"F',160,'111',174,'101',174,'117','":-0.0833,"114":-0.0833,"97":-0.0833,"65":-0.','111,"79',162,'67',162,'71',162,'81',197,'},',28,':"G",',28,':"H",',28,':"I',160,'73":','0.0278','},',28,':"J",',28,':"K',160,'79',162,'67',162,'71',162,'81',197,'},',28,':"L',160,'84',174,'89',174,'86',178,179,101,28,':"M",',28,':"N",',28,':"O',160,'88',162,'87',162,'65',162,'86',162,'89',197,'},',28,':"P',160,'65',174,'111',162,'101',162,'97',162,'46',174,'44":-0.0833},',28,':"Q",','d:0.1,',28,':"R',160,'116',162,'67',162,'79',162,'71',162,'85',162,'81',162,'84',174,'89',174,'86',178,179,101,28,':"S",',28,':"T',160,'121',162,'101',174,'111',209,'0833,"117":-0.0833','},',28,':"U",',28,':"V",','ic:0.0139,krn:{"','111',174,'101',174,'117',209,'111,"79',162,'67',162,'71',162,'81',197,'},',28,':"W",',329,'111',174,'101',174,'117',209,'111,"79',162,'67',162,'71',162,'81',197,'},',28,':"X',160,'79',162,'67',162,'71',162,'81',197,'},',28,':"Y",ic:0.025,','krn:{"101',174,'111',209,323,'},',28,':"Z",',28,':"[",',288,28,':"&#x201C;",',28,':"]",',288,28,':"&#x2C6;",',22,44,45,'x2D9;",',22,44,45,'x2018;",lig:{"96":92},',28,':"a','",a:0,krn:{"','118',162,'106','":0.0556,"','121',162,'119',197,'},',28,':"b',160,'101','":0.0278,"','111',419,'120',162,'100',419,'99',419,'113',419,'118',162,'106',409,'121',162,'119',197,'},',28,':"c',405,'104',162,'107',197,'},',28,':"d",',28,':"e",a:0,',28,':"f',26,'12,"102":11,"108":13},',28,':"g','",a:0,d:0.2,',329,'106":',227,'},',28,':"h',160,'116',162,'117',162,'98',162,'121',162,'118',162,'119',197,'},',28,':"i",',28,40,28,':"k',160,'97','":-0.0556,"','101',162,'97',162,'111',162,'99',197,'},',28,':"l",',28,':"m',405,'116',162,'117',162,'98',162,'121',162,'118',162,'119',197,'},',28,':"n',405,'116',162,'117',162,'98',162,'121',162,'118',162,'119',197,'},',28,':"o',405,'101',419,'111',419,'120',162,'100',419,'99',419,'113',419,'118',162,'106',409,'121',162,'119',197,'},',28,':"p',457,377,419,'111',419,'120',162,'100',419,'99',419,'113',419,'118',162,'106',409,'121',162,'119',197,'},',28,':"q',457,28,':"','r",a:0,',28,':"s",a:0,',28,':"t',160,'121',162,'119',197,'},',28,':"u',405,'119',197,'},',28,':"v",a:0,',329,'97',486,'101',162,'97',162,'111',162,'99',197,'},',28,':"w",a:0,',329,'101',162,'97',162,'111',162,'99',197,'},',28,':"x",a:0,',28,':"y',457,329,'111',162,'101',162,'97',162,'46',174,'44":-0.0833},',28,':"z",a:0,',28,':"&#x2013',';",a:0.1,','ic:0.0278,','lig:{"45":124},',28,':"&#x2014',645,646,28,':"&#x2DD;",',22,44,45,'x2DC;",',22,44,45,'xA8;",',22,44,'"}],cmmi10',1,'ic:0.139',',krn:{"61":-0.0556,"59":-0.111,"58":-0.111,"127":0.','0833},',22,'igreek"},{c:"&',3,'krn:{"127":0.','167},',22,670,5,'ic:',227,',krn:{"127":0.','0833},',22,670,7,672,'167},',22,670,9,'ic:0.0757',679,'0833},',22,670,11,'ic:0.0812,krn:{"61',486,'59":-0.0556,"58":-0.0556,"127":0.','0556},',22,670,13,'ic:0.0576',679,'0833},',22,670,15,'ic:0.139',667,'0556},',22,670,17,672,'0833},',22,670,19,'ic:0.11,krn:{"61',486,697,'0556},',22,670,21,'ic:0.0502',679,'0833},',22,670,'alpha',645,'ic:0.0037',679,'0278},',2,'beta',';",d:0.1,','ic:0.0528',679,'0833},',2,'gamma',645,288,'ic:0.0556,',2,'delta;",ic:0.0378,krn:{"',697,'0556},',2,'epsilon;",a:0',679,'0556},',22,'lucida"},{c:"&zeta',738,'ic:0.0738',679,'0833},',2,'eta',645,288,'ic:0.0359',679,'0556},',2,'theta;",ic:',227,679,'0833},',2,'iota;",a:0.1',679,'0556},',2,'kappa',645,2,'lambda;",',2,'mu',645,'d:0.1',679,'0278},',2,'nu',645,'ic:0.0637,krn:{"',697,'0278},',2,'xi',738,'ic:0.046',679,101,2,'pi',645,'ic:0.0359,',2,'rho',645,'d:0.1',679,'0833},',2,'sigma',645,803,'krn:{"59',486,'58":-0.0556','},',2,'tau',645,'ic:0.113,krn:{"',697,'0278},',2,'upsilon',645,'ic:0.0359',679,'0278},',2,'phi;",a:0.3,d:0.1',679,'0833},',2,'chi',645,'d:0.1',679,'0556},',2,'psi;",','a:0.3,d:0.1,','ic:0.0359',679,101,2,'omega',645,803,2,752,'.1',679,'0833},',22,'greek',45,'x3D1;",',672,'0833},',22,'greek',45,'x3D6',645,646,22,'lucida',45,'x3F1',645,'d:0.2',679,'0833},',22,'lucida',45,'x3C2',645,'d:0.2,ic:0.','0799',679,'0833},',22,'greek',45,'x3D5',645,'d:0.1',679,'0833},',22,'greek',45,'x21BC',';",a:0,d:-0.','2,',22,'harpoon',45,'x21BD',896,'1,',22,'harpoon',45,'x21C0',896,'2,',22,'harpoon',45,'x21C1',896,'1,',22,'harpoon',57,'font-size: 133%; ',58,':.1em; margin:-.2em; left:-.05em">&#','x02D3',60,113,22,'lucida',57,919,58,921,'x02D2',60,113,22,'lucida',57,'font-size:50%">&#','x25B7',';</span>\',a:0,',22,'symbol',57,937,'x25C1',939,22,941,24,'0",',28,':"1",',28,':"2",',28,':"3",',28,':"4",',28,':"5",',28,':"6",',28,':"7",',28,':"8",',28,':"9",',28,120,'3,',28,115,28,':"&lt',645,28,':\'<span style="','font-size',':133%; ',58,':.1em">/</','span>\',',288,'krn:{"1',486,'65',486,'77',486,'78',486,'89',409,'90":-0.0556},',28,':"&gt',645,28,977,937,'x2605',939,'tclass:"symbol"},{c:"&#','x2202;",ic:0.0556',679,'0833},',28,':"A",',672,'139','},tclass:"italic"},{c:"','B",ic:0.0502',679,'0833',1011,'C",ic:0.0715,krn:{"61',162,697,'0833',1011,'D",ic:',227,679,'0556',1011,'E",ic:0.0576',679,'0833',1011,'F",ic:0.139',667,'0833',1011,'G",',672,'0833',1011,'H",ic:0.0812,krn:{"61',486,697,'0556',1011,'I",ic:0.0785',679,'111',1011,'J",ic:0.0962',667,'167',1011,'K",ic:0.0715,krn:{"61',486,697,'0556',1011,'L",',672,'0278',1011,'M','",ic:0.109,krn:{"','61',486,697,'0833',1011,'N',1061,'61',174,'61',162,697,'0833',1011,'O",ic:',227,679,'0833',1011,'P",ic:0.139',667,'0833',1011,'Q",d:0.2',679,'0833',1011,'R",ic:0.00773',679,'0833',1011,'S",ic:0.0576,krn:{"61',486,697,'0833',1011,'T','",ic:0.139,krn:{"','61',162,697,'0833',1011,'U',1061,'59',178,',"58',178,',"61',486,'127":',227,1011,'V",ic:0.222,krn:{"59','":-0.167,"','58',1117,'61',178,1011,'W',1099,'59',1117,'58',1117,'61',178,1011,'X",ic:0.0785,krn:{"61',174,'61',162,697,'0833',1011,'Y",ic:0.222,krn:{"59',1117,'58',1117,'61',178,1011,'Z",ic:0.0715,krn:{"61',486,697,'0833},',22,'italic',45,'x266D;",',22,'symbol2',45,'x266E;",',22,'symbol2',45,'x266F;",',22,'symbol2',57,'position: relative; top',':.5em">&#x2323',939,'d:-0.1,',28,977,1165,':-.3em">&#x2322',939,'d:-0.1,',28,977,'margin:-.','2em">&#x2113',60,672,101,22,941,24,'a",a:0,',22,'italic"},{c:"','b",',22,1187,'c",a:0',679,'0556',1011,'d',160,'89',409,'90',486,'106',178,',"102',1117,'127":0.167',1011,'e",a:0',679,'0556',1011,'f",',880,'108,krn:{"',697,'167',1011,'g',457,'ic:0.0359',679,'0278',1011,'h',160,'127',197,1011,'i",',22,1187,'j",',880,'0572,krn:{"59',486,816,1011,'k",ic:0.0315,',22,1187,'l",ic:0.0197',679,'0833',1011,'m",a:0,',22,1187,'n",a:0,',22,1187,'o",a:0',679,'0556',1011,'p",a:0,d:0.2',679,'0833',1011,'q',457,'ic:0.0359',679,'0833',1011,583,646,'krn:{"',697,'0556',1011,'s",a:0',679,'0556',1011,'t",',672,'0833',1011,'u",a:0',679,'0278',1011,'v",a:0,ic:0.0359',679,'0278',1011,'w",a:0,ic:0.0269',679,'0833',1011,'x",a:0',679,'0278',1011,'y',457,'ic:0.0359',679,'0556',1011,'z",a:0,ic:0.044',679,'0556},',22,'italic',45,'x131;",a:0',679,'0278},',22,'italic',45,'x237',38,'d:0.2',679,'0833},',22,'italic',45,'x2118;",d:0',679,101,22,'asymbol',57,'position:relative; left: .4em; top: -.8em; ',978,': 50%">&#x2192',60,'ic:0.154,',1003,'x0311;",ic:0.399,',22,'normal"}],cmsy10:[{c:"&#x2212',645,1003,'xB7',896,'2,',1003,'xD7',38,22,941,57,58,':.3em">&#x2A',939,1003,'xF7',38,1003,'x25CA;",',22,'lucida',45,'xB1',645,1003,'x2213;",',1003,'x2295;",',1003,'x2296;",',1003,'x2297;",',1003,'x2298;",',1003,'x2299;",',22,'symbol3',45,'x25EF;",',22,941,57,58,':.25em;">&#xB0',60,'a:0.3,d:-0.3,',1003,'x2022;",a:0.2,d:-0.25,',1003,'x224D',645,1003,'x2261',645,1003,'x2286;",',1003,'x2287;",',1003,'x2264;",',1003,'x2265;",',1003,'x2AAF;",',1003,'x2AB0;",',22,941,'"},{c:"~",a:0,d:-0.2,',28,':"&#x2248',645,'d:-0.1,',1003,'x2282;",',1003,'x2283;",',1003,'x226A;",',1003,'x226B;",',1003,'x227A;",',1003,'x227B;",',1003,'x2190',896,'15,',22,'arrows',45,'x2192',896,'15,',22,'arrows',45,'x2191',';",h:0.85,',22,'arrow1a',45,'x2193',1435,22,'arrow1a',45,'x2194',38,22,'arrow1',45,'x2197',1435,288,22,'arrows',45,'x2198',1435,288,22,'arrows',45,'x2243',645,1003,'x21D0',645,22,'arrows',45,'x21D2',645,22,'arrows',45,'x21D1;",h:0.7,',22,'asymbol"},{c:"&#','x21D3;",h:0.7,',22,1476,'x21D4',645,22,'arrows',45,'x2196',1435,288,22,'arrows',45,'x2199',1435,288,22,'arrows',45,'x221D',645,'d:-0.1,',22,941,57,919,'margin-right',': -.1em; ',1165,':.4em">&#x2032',939,22,'lucida',45,'x221E',645,1003,'x2208;",',1003,'x220B;",',1003,'x25B3;",',1003,'x25BD;",',22,941,'"},{c:"/",',22,941,57,978,':50%; ',58,':-.3em; ',1504,':-.2em">|</',982,'a:0,',28,':"&#x2200;",',1003,'x2203;",',1003,'xAC',896,'1,',22,'symbol1',45,'x2205;",',1003,'x211C;",',22,1476,'x2111;",',22,1476,'x22A4;",',1003,'x22A5;",',1003,'x2135;",',22,941,24,'A',160,'48":0.194},',22,'cal"},{c:"','B",ic:0.0304',',krn:{"48":0.','139},',22,1567,'C",ic:0.0583',1569,'139},',22,1567,'D",ic:',227,1569,'0833},',22,1567,'E",ic:0.0894',1569,101,22,1567,'F",ic:0.0993',1569,101,22,1567,'G",',880,'0593',1569,101,22,1567,'H",ic:0.00965',1569,101,22,1567,'I",ic:0.0738',1569,'0278},',22,1567,'J",',880,'185',1569,'167},',22,1567,'K",ic:0.0144',1569,'0556},',22,1567,'L',160,'48":0.139},',22,1567,'M',160,'48":0.139},',22,1567,'N",ic:0.147',1569,'0833},',22,1567,'O",ic:',227,1569,101,22,1567,'P",ic:0.0822',1569,'0833},',22,1567,'Q",d:0.2',1569,101,22,1567,'R',160,'48":0.0833},',22,1567,'S",ic:0.075',1569,'139},',22,1567,'T",ic:0.254',1569,'0278},',22,1567,'U",ic:0.0993',1569,'0833},',22,1567,'V",ic:0.0822',1569,'0278},',22,1567,'W",ic:0.0822',1569,'0833},',22,1567,'X",ic:0.146',1569,'139},',22,1567,'Y",ic:0.0822',1569,'0833},',22,1567,'Z",ic:0.0794',1569,'139},',22,'cal',45,'x22C3;",',1003,'x22C2;",',1003,'x228E;",',1003,'x22C0;",',1003,'x22C1;",',1003,'x22A2;",',1003,'x22A3;",',1003,'x23A3',';",h:1,d:0.','3,',22,1476,'x23A6',1715,'3,',22,1476,'x23A1',1715,'3,',22,1476,'x23A4',1715,'3,',22,'asymbol"},{c',':"{",',105,28,':"}",',105,28,':"&#x27E8;",h:0.9,',288,22,1476,'x27E9;",h:0.9,',288,22,1733,':"|",',105,22,'vertical','"},{c:"||",',105,22,'vertical',45,'x2195',738,22,'arrow1',45,'x21D5',738,22,'arrow1',57,1177,'1em">&#x2216',60,842,22,'lucida',45,'x2240;",',22,'asymbol',57,58,': .86em">&#x221A',60,'h:0.04,d:0.9,',22,'lucida',45,'x2210',738,1003,'x2207;",',1003,'x222B;",h:1,',288,'ic:0.111,',22,'root',45,'x2294;",',1003,'x2293;",',1003,'x2291;",',1003,'x2292;",',1003,'xA7',738,28,':"&#x2020',738,28,':"&#x2021',738,28,':"&#xB6;",',842,22,'lucida',45,'x2663;",',1003,'x2666;",',1003,'x2665;",',1003,'x2660;",',22,941,'"}],cmex10:[{c',104,'h:0.04,d:1.16,n:','16,',22,'delim1"},{c',107,1829,'17,',22,1832,386,1829,'104,',22,1832,391,1829,'105,',22,'delim1',45,1714,'",',1829,'106,',22,'delim1a',45,'x23A6;",',1829,'107,',22,'delim1a',45,'x23A1;",',1829,'108,',22,'delim1a',45,'x23A4;",',1829,'109,',22,'delim1a"},{c:"{",',1829,'110,',22,1832,1737,1829,'111,',22,'delim1',45,'x3008;",',1829,'68,',22,'delim1c',45,'x3009;",',1829,'69,',22,'delim1c"},{c:"|",','h:0.7,d:0.15,delim:{rep:','12},',22,'vertical1',1752,1894,'13},',22,'vertical1',45,'x2215;",',1829,'46,',22,'delim1b',45,'x2216;",',1829,'47,',22,'delim1b','"},{c:"(",','h:0.04,d:1.76,n:','18,',22,'delim2"},{c',107,1916,'19,',22,'delim2',1915,'h:0.04,d:2.36,n:','32,',22,'delim3"},{c',107,1926,'33,',22,1929,386,1926,'34,',22,1929,391,1926,'35,',22,'delim3',45,1714,';",',1926,'36,',22,'delim3a',45,'x23A6;",',1926,'37,',22,'delim3a',45,'x23A1;",',1926,'38,',22,'delim3a',45,'x23A4;",',1926,'39,',22,'delim3a',57,'margin: -.1em','">{</',982,1926,'40,',22,'delim3',57,1971,'">}</',982,1926,'41,',22,'delim3',45,'x3008;",',1926,'42,',22,'delim3c',45,'x3009;",',1926,'43,',22,'delim3c',45,'x2215;",',1926,'44,',22,'delim3b',45,'x2216;",',1926,'45,',22,'delim3b',1915,'h:0.04,d:2.96,','n:48,',22,'delim4"},{c',107,2011,'n:49,',22,2014,386,2011,'n:50,',22,2014,391,2011,'n:51,',22,'delim4',45,1714,';",',2011,'n:52,',22,'delim4a',45,'x23A6;",',2011,'n:53,',22,'delim4a',45,'x23A1;",',2011,'n:54,',22,'delim4a',45,'x23A4;",',2011,'n:55,',22,'delim4a',57,1971,'">{</',982,2011,'n:56,',22,'delim4',57,1971,'">}</',982,2011,'n:57,',22,'delim4',45,'x3008;",',2011,22,'delim4c',45,'x3009;",',2011,22,'delim4c',45,'x2215;",',2011,22,'delim4b',45,'x2216;",',2011,22,'delim4b',45,'x2215;",',1916,'30,',22,'delim2b',45,'x2216;",',1916,'31,',22,'delim2b',45,'x239B',';",h:1,d:0.2,delim:{','top:48,bot:64,rep:66},',22,1476,'x239E',2105,'top:49,bot:65,rep:67},',22,1476,'x23A1',2105,'top:50,bot:52,rep:54},',22,1476,'x23A4',2105,'top:51,bot:53,rep:55},',22,1476,1714,2105,'bot:52,rep:54},',22,1476,'x23A6',2105,'bot:53,rep:55},',22,1476,'x23A2',2105,'top:50,rep:54},',22,1476,'x23A5',2105,'top:51,rep:55},',22,1476,'x23A7',2105,'top:56,mid:60,bot:58,rep:62},',22,1476,'x23AB',2105,'top:57,mid:61,bot:59,rep:62},',22,1476,'x23A9',2105,'top:56,bot:58,rep:62},',22,1476,'x23AD',2105,'top:57,bot:59,rep:62},',22,1476,'x23A8',2105,'rep:63},',22,1476,'x23AC',2105,'rep:119},',22,1476,'x23AA',2105,'rep:62},',22,1476,'x23AA;",h:0.95,d:0.05,delim:{top:120,bot:121,rep:63},',22,'arrow1a',45,'x239D',2105],
+  ['top:56,bot:59,rep:62},','tclass:"','asymbol','"},{c:"&#','x23A0',';",h:1,d:0.2,delim:{','top:57,bot:58,rep:62},',1,2,3,'x239C',5,'rep:66},',1,2,3,'x239F',5,'rep:67},',1,2,3,'x3008;",','h:0.04,d:1.76,n:','28,',1,'delim2c',3,'x3009;",',23,'29,',1,26,3,'x2294;",h:-0.','2,d:1,n:71,',1,'bigop1',3,34,'1,d:1.2,',1,'bigop2',3,'x222E',';",h:0,d:1.11,ic:0.095,n:','73,',1,'bigop1c',3,'x222E;",h:0,d:2.22,ic:0.222,',1,'bigop2c',3,'x2299',';",h:0,d:1,n:','75,',1,37,3,'x2299',';",h:0.1,d:1.','2,',1,42,3,'x2295;",h:0.','2,d:0.9,n:','77,',1,37,3,66,'4,d:1.2,',1,42,3,'x2297;",h:0.',67,'79,',1,37,3,77,'4,d:1.2,',1,42,3,'x2211',55,'88,',1,'bigop1a',3,'x220F',55,'89,',1,92,3,'x222B',45,'90,',1,48,3,'x222A',55,'91,',1,'bigop1b',3,'x2229',55,'92,',1,110,3,'x228E;",h:-0.','2,d:1.1,n:93,',1,110,3,'x2227',55,'94,',1,37,3,'x2228',55,'95,',1,37,3,'x2211',61,'6,',1,'bigop2a',3,'x220F',61,'6,',1,139,3,'x222B;",h:0,d:2.22,ic:0.222,',1,52,3,'x222A',61,'5,',1,'bigop2b',3,'x2229',61,'5,',1,155,3,118,'3,d:1.6,',1,155,3,'x2227',61,'2,',1,42,3,'x2228',61,'2,',1,42,3,'x2210;",h:0,d:0.9,n:97,',1,92,3,'x2210',61,'4,',1,139,3,'xFE3F;",h:0.','722,w:0.','65,n:99,',1,'wide1',3,190,'85,w:1.1,n:100,',1,'wide2',3,190,'99,w:1.65,',1,'wide3',3,'x2053;",h:0.',191,'75,n:102,',1,'wide1a',3,206,'8,w:1.35,n:103,',1,'wide2a',3,206,'99,w:2,',1,'wide3a"},{c:"[",',23,'20,',1,'delim2','"},{c:"]",',23,'21,',1,224,3,'x23A3;",',23,'22,',1,'delim2a',3,'x23A6;",',23,'23,',1,235,3,'x23A1;",',23,'24,',1,235,3,'x23A4;",',23,'25,',1,235,'"},{','c:\'<span style="','margin: -.1em','">{</span>\',',23,'26,',1,224,'"},{',255,256,'">}</span>\',',23,'27,',1,224,'"},{c:\'<span style="font-size',': 125','%; position:relative; top:.','95em','">&#x221A;</span>\',h:0.','04,d:1.16,n:113,',1,'root',270,': 190',272,'925em">&#x221A;</span>\',',23,'114,',1,277,270,': 250',272,'925em',274,'06,d:2.36,n:115,',1,277,270,': 320',272,'92em',274,'08,d:2.96,n:116,',1,277,270,': 400',272,'92em',274,'1,d:3.75,n:117,',1,277,270,': 500',272,'9em',274,'12,d:4.5,n:118,',1,277,270,': 625',272,'9em',274,'14,d:5.7,',1,277,270,':130%">&#x2016;</span>\',h:0.9,delim:{top:126,bot:127,rep:119},',1,2,3,'x2191',';",h:0.9,d:0,delim:{','top:120,rep:63},',1,'arrow1a',3,'x2193',332,'bot:121,rep:63},',1,335,270,': 67',272,'35em','; margin-left:-.','5em">&#','x256D',';</span>\',h:0.1,',1,'symbol',270,': 67',272,'35em','; margin-right:-.',347,'x256E',349,1,351,270,': 67',272,'35em',346,347,'x2570',349,1,351,270,': 67',272,'35em',356,347,'x256F',349,1,351,3,'x21D1',';",h:0.7,delim:{','top:126,rep:119},',1,2,3,'x21D3',384,'bot:127,rep:119},',1,2,'"}],cmti10',':[{c:"&Gamma;",','ic:0.133,',1,'igreek"},{c:"&','Delta;",',1,398,'Theta;",','ic:0.094,',1,398,'Lambda;",',1,398,'Xi;",ic:0.153,',1,398,'Pi;",ic:0.164,',1,398,'Sigma;",','ic',':0.12,',1,398,'Upsilon;",','ic:0.111,',1,398,'Phi;",','ic:0.0599,',1,398,'Psi;",','ic:0.111,',1,398,'Omega;",','ic:0.103,',1,'igreek','"},{c:"ff','",ic:0.212,krn:{"39":0.104,"63":0.104,"33":0.104,"41":0.104,"93":0.104},lig:{"105":','14,"108":15},','tclass:"italic"},{c',':"fi','",ic:0.103,',439,':"fl',441,439,':"ffi',441,439,':"ffl',441,439,':"&#x131;",a:0,','ic:0.','0767,',439,':"j",d:0.2,','ic:0.0374,',439,':"&#x60;",',1,'iaccent',3,'xB4;",','ic:0.0969,',1,461,3,'x2C7;",','ic:0.083,',1,461,3,'x2D8;",','ic:0.108,',1,461,3,'x2C9;",',433,1,461,3,'x2DA;",',1,461,'"},{c:"?",','d:0.17,w:0.46,',439,':"&#xDF;",','ic:0.105,',439,':"&#xE6;",a:0,','ic:0.0751,',439,':"&#x153;",a:0,',493,439,':"&#xF8;",','ic:0.0919,',439,':"&#xC6;",','ic',417,439,':"&#x152;",','ic',417,439,':"&#xD8;",',403,439,':"?",krn:{"108":-0.','256,"76":-0.321},',439,':"!",','ic:0.124,lig:{"96":','60},',439,':"&#x201D;",','ic:0.0696,',439,':"#",ic:0.0662,',439,':"$",',439,':"%",ic:0.136,',439,':"&amp;",','ic:0.0969,',439,':"&#x2019;",','ic:0.124,','krn:{"63":0.','102,"33":0.102},lig:{"39":34},',439,':"(",d:0.2,','ic:0.162,',439,':")",d:0.2,','ic:0.0369,',439,':"*",ic:0.149,',439,':"+",a:0.1,','ic:0.0369,',439,':",",a:-0.3,d:0.2,w:0.278,',439,':"-",a:0,ic:0.0283',',lig:{"45":','123},',439,':".",a:-0.25,',439,':"/",ic:0.162,',439,':"0",ic:0.136,',439,':"1",ic:0.136,',439,':"2",ic:0.136,',439,':"3",ic:0.136,',439,':"4",ic:0.136,',439,':"5",ic:0.136,',439,':"6",ic:0.136,',439,':"7",ic:0.136,',439,':"8",ic:0.136,',439,':"9",ic:0.136,',439,':":",ic:0.0582,',439,':";",ic:0.0582,',439,':"&#xA1;",','ic:0.0756,',439,':"=",a:0,d:-0.1,','ic:0.0662,',439,':"&#xBF;",',439,':"?",','ic:0.122,','lig:{"96":','62},',439,':"@",ic:0.096,',439,':"A",','krn:{"110":-0.0256,"108":-0.0256,"114":-0.0256,"117":-0.0256,"109":-0.0256,"116":-0.0256,"105":-0.0256,"67":-0.0256,"79":-0.0256,"71":-0.0256,"104":-0.0256,"98":-0.0256,"85":-0.0256,"107":-0.0256,"118":-0.0256,"119":-0.0256,"81":-','0.0256,"84','":-0.0767,"','89',599,'86','":-0.102,"','87',603,'101','":-0.0511,"','97',607,'111',607,'100',607,'99',607,'103',607,'113','":-0.0511','},',439,':"B',441,439,':"C",','ic:0.145,',439,':"D",',403,'krn:{"88','":-0.0256,"','87',631,'65',631,'86',631,'89":-0.','0256},',439,':"E",ic',417,439,':"F','",ic:0.133,krn:{"','111',599,'101',599,'117','":-0.0767,"114":-0.0767,"97":-0.0767,"','65',603,'79',631,'67',631,'71',631,'81":-0.0256','},',439,':"G",ic:0.0872,',439,':"H",ic:0.164,',439,':"I",ic:0.158,',439,':"J",ic:0.14,',439,':"K",',626,'krn:{"79',631,'67',631,'71',631,660,'},',439,':"L",krn:{"84',599,'89',599,'86',603,'87',603,'101',607,'97',607,'111',607,'100',607,'99',607,'103',607,'113',619,'},',439,':"M",ic:0.164,',439,':"N",ic:0.164,',439,':"O",',403,'krn:{"88',631,'87',631,'65',631,'86',631,638,'0256},',439,':"P',441,'krn:{"65":-0.0767},',439,':"Q",d:0.1,',403,439,':"R",ic:0.0387,',597,'0.0256,"84',599,'89',599,'86',603,'87',603,'101',607,'97',607,'111',607,'100',607,'99',607,'103',607,'113',619,'},',439,':"S",ic',417,439,':"T',645,'121',599,'101',599,'111',651,'117',599,'65":-0.0767},',439,':"U",ic:0.164,',439,':"V",ic:0.','184,krn:{"','111',599,'101',599,'117',651,'65',603,'79',631,'67',631,'71',631,660,'},',439,':"W",ic:0.',774,'65":-0.0767},',439,':"X",ic:0.158,krn:{"79',631,'67',631,'71',631,660,'},',439,':"Y",ic:0.','194',',krn:{"101',599,'111',651,'117',599,'65":-0.0767},',439,':"Z",',626,439,':"[",d:0.1,','ic:0.188,',439,':"&#x201C;",','ic:0.169,',439,':"]",d:0.1,','ic:0.105,',439,':"&#x2C6;",','ic:0.0665,',1,461,3,'x2D9;",','ic:0.118,',1,461,3,'x2018;",',516,'92},',439,':"a','",a:0,ic:0.',454,439,':"b",ic:0.0631',807,607,'97',607,'111',607,'100',607,'99',607,'103',607,'113',619,'},',439,':"c',842,'0565',807,607,'97',607,'111',607,'100',607,'99',607,'103',607,'113',619,'},',439,':"d',441,'krn:{"108":','0.0511},',439,':"e',842,'0751',807,607,'97',607,'111',607,'100',607,'99',607,'103',607,'113',619,'},',439,':"f',437,'12,"102":11,"108":13},',439,':"g','",a:0,d:0.2,ic:0.','0885,',439,':"h",ic:0.',454,439,':"i",ic:0.102,',439,456,626,439,':"k",',474,439,':"l',441,883,'0.0511},',439,':"m',842,454,439,':"n',842,454,'krn:{"39":-0.102},',439,':"o',842,'0631',807,607,'97',607,'111',607,'100',607,'99',607,'103',607,'113',619,'},',439,':"p',910,'0631',807,607,'97',607,'111',607,'100',607,'99',607,'103',607,'113',619,'},',439,':"q',910,'0885,',439,':"r',842,'108',807,607,'97',607,'111',607,'100',607,'99',607,'103',607,'113',619,'},',439,':"s',842,'0821,',439,':"t",ic:0.0949,',439,':"u',842,454,439,':"v',842,'108,',439,':"w',842,1011,883,'0.0511},',439,':"x',842,'12,',439,':"y',910,'0885,',439,':"z',842,'123,',439,':"&#x2013;",a:0.1,ic:0.','0921',550,'124},',439,':"&#x2014;",a:0.1,ic:0.','0921,',439,':"&#x2DD;",',590,1,461,3,'x2DC;",','ic:0.116,',1,461,3,'xA8;",',1,461,'"}],cmbx10',395,1,'bgreek"},{c:"&','Delta;",',1,1055,402,1,1055,'Lambda;",',1,1055,'Xi;",',1,1055,'Pi;",',1,1055,415,1,1055,420,1,1055,424,1,1055,428,1,1055,432,1,'bgreek','"},{c:"ff','",ic:0.0778,krn:{"39":0.0778,"63":0.0778,"33":0.0778,"41":0.0778,"93":0.0778},lig:{"105":','14,"108":15},','tclass:"bold"},{c',':"fi",',1089,':"fl",',1089,':"ffi",',1089,':"ffl",',1089,452,1089,456,1089,':"&#x60;",',1,'baccent',3,463,1,1104,3,468,1,1104,3,473,1,1104,3,478,1,1104,3,'x2DA;",',1,1104,486,1089,489,1089,492,1089,495,1089,498,1089,501,1089,505,1089,509,1089,512,'278,"76":-0.319},',1089,515,591,'60},',1089,519,1089,':"#",',1089,':"$",',1089,':"%",',1089,528,1089,531,533,'111,"33":0.111},lig:{"39":34},',1089,536,1089,539,1089,':"*",',1089,544,1089,':",",a:-0.3,d:0.2,w:0.278,',1089,':"-",a:0',550,'123},',1089,':".",a:-0.25,',1089,':"/",',1089,':"0",',1089,':"1",',1089,':"2",',1089,':"3",',1089,':"4",',1089,':"5",',1089,':"6",',1089,':"7",',1089,':"8",',1089,':"9",',1089,':":",',1089,':";",',1089,581,1089,584,1089,':"&#xBF;",',1089,589,591,'62},',1089,':"@",',1089,':"A",krn:{"116','":-0.0278,"','67',1217,'79',1217,'71',1217,'85',1217,'81',1217,'84','":-0.0833,"','89',1229,'86":-0.','111,"87":-0.111},',1089,':"B",',1089,625,1089,':"D",krn:{"88',1217,'87',1217,'65',1217,'86',1217,638,'0278},',1089,':"E",',1089,':"F",krn:{"111',1229,'101',1229,'117','":-0.0833,"114":-0.0833,"97":-0.0833,"65":-0.','111,"79',1217,'67',1217,'71',1217,'81":-0.0278','},',1089,':"G",',1089,':"H",',1089,':"I",krn:{"73":0.0278},',1089,':"J",',1089,':"K",krn:{"79',1217,'67',1217,'71',1217,1264,'},',1089,':"L",krn:{"84',1229,'89',1229,1232,'111,"87":-0.111},',1089,':"M",',1089,':"N",',1089,':"O",krn:{"88',1217,'87',1217,'65',1217,'86',1217,638,'0278},',1089,':"P",krn:{"65',1229,'111',1217,'101',1217,'97',1217,'46',1229,'44":-0.0833},',1089,727,1089,':"R",krn:{"116',1217,'67',1217,'79',1217,'71',1217,'85',1217,'81',1217,'84',1229,'89',1229,1232,'111,"87":-0.111},',1089,':"S",',1089,':"T",krn:{"121',1217,'101',1229,'111',1257,'0833,"117":-0.0833','},',1089,':"U",',1089,773,'0139,krn:{"','111',1229,'101',1229,'117',1257,'111,"79',1217,'67',1217,'71',1217,1264,'},',1089,792,1353,'111',1229,'101',1229,'117',1257,'111,"79',1217,'67',1217,'71',1217,1264,'},',1089,':"X",krn:{"79',1217,'67',1217,'71',1217,1264,'},',1089,805,'025',807,1229,'111',1257,1347,'},',1089,815,1089,818,1089,821,1089,824,1089,827,1,1104,3,832,1,1104,3,837,591,'92},',1089,':"a','",a:0,krn:{"','118',1217,'106":0.','0556,"121',1217,'119":-0.','0278},',1089,':"b",krn:{"101','":0.0278,"','111',1435,'120',1217,'100',1435,'99',1435,'113',1435,'118',1217,1428,'0556,"121',1217,1431,'0278},',1089,':"c',1425,'104',1217,'107":-0.0278},',1089,':"d",',1089,':"e",a:0,',1089,':"f',1087,'12,"102":11,"108":13},',1089,':"g',910,1353,1428,'0278},',1089,':"h",krn:{"116',1217,'117',1217,'98',1217,'121',1217,'118',1217,1431,'0278},',1089,':"i",',1089,456,1089,':"k",krn:{"97":-0.0556,"101',1217,'97',1217,'111',1217,'99":-0.','0278},',1089,':"l",',1089,':"m',1425,'116',1217,'117',1217,'98',1217,'121',1217,'118',1217,1431,'0278},',1089,':"n',1425,'116',1217,'117',1217,'98',1217,'121',1217,'118',1217,1431,'0278},',1089,':"o",a:0',807,1435,'111',1435,'120',1217,'100',1435,'99',1435,'113',1435,'118',1217,1428,'0556,"121',1217,1431,'0278},',1089,':"p",a:0,d:0.2',807,1435,'111',1435,'120',1217,'100',1435,'99',1435,'113',1435,'118',1217,1428,'0556,"121',1217,1431,'0278},',1089,':"q",a:0,d:0.2,',1089,':"r",a:0,',1089,':"s",a:0,',1089,':"t",krn:{"121',1217,1431,'0278},',1089,':"u',1425,1431,'0278},',1089,':"v',842,1353,'97":-0.0556,"101',1217,'97',1217,'111',1217,1497,'0278},',1089,':"w',842,'0139',807,1217,'97',1217,'111',1217,1497,'0278},',1089,':"x",a:0,',1089,':"y',910,1353,'111',1217,'101',1217,'97',1217,'46',1229,'44":-0.0833},',1089,':"z",a:0,',1089,1031,'0278',550,'124},',1089,1036,'0278,',1089,1039,1,1104,3,1044,1,1104,3,'xA8;",',1,1104,'"}]});','jsMath.Setup.Styles({".typeset .','cmr10','":"font-family: ','serif','",".typeset .','italic":"font-style: italic',1655,'bold":"font-weight: bold',1655,'lucida','":"font-family: \'','Lucida Grande','\'",".typeset .',2,'":"font-family: \'Apple Symbols\'; font-size: ','125','%",".typeset .','cal',1661,'Apple Chancery',1663,'arrows','":"font-family: \'Hiragino Mincho Pro',1663,'Arrows',1661,'AppleGothic',1663,'arrow1',1673,'\'; ','position: relative; top',': .075em; margin: -1px',1655,335,1673,'\'; margin:-.','3em',1655,'harpoon',1653,1677,'; ','font-size: ','90',1667,351,1673,1663,'symbol2',1673,1687,'2em',1655,'symbol3',1653,1677,1655,'delim1',1653,'Times; ',1694,'133',272,'7em',1655,'delim1a',1665,'125',272,'75em',1655,'delim1b',1673,'\'; ',1694,'133',272,'8em; ',256,1655,'delim1c',1653,'Symbol; ',1694,'120',272,'8em',';",".typeset .',224,1653,'Baskerville','; ',1694,'180',272,1721,1655,235,1665,'175',272,'8em',1655,'delim2b',1673,'\'; ',1694,'190',272,'8em; ',256,1655,26,1653,'Symbol; ',1694,'167',272,'8em',1739,'delim3',1653,1742,'; ',1694,'250',272,'725em',1655,'delim3a',1665,'240',272,'78em',1655,'delim3b',1673,'\'; ',1694,'250',272,'8em; ',256,1655,'delim3c',1653,351,'; ',1694,'240',272,'775em',1739,'delim4',1653,1742,'; ',1694,'325',272,'7em',1655,'delim4a',1665,'310',272,1721,1655,'delim4b',1673,'\'; ',1694,'325',272,'8em; ',256,1655,'delim4c',1653,'Symbol; ',1694,'300',272,'8em',1739,'vertical',1653,'Copperplate',1655,'vertical1',1653,1839,'; ',1694,'85%; margin: .','15em',1739,'vertical2',1653,1839,'; ',1694,1846,'17em',1739,'greek',1673,'\', serif',346,'2em',356,'2em',1739,435,1673,'\', serif','; font-style:italic',346,'2em',356,'1em',1655,1085,1673,'\', serif','; font-weight:bold',1655,37,1673,'\'; ',1694,'133%; ',1682,': .7em; margin:-.','05em',1655,92,1653,1742,'; ',1694,'100%; ',1682,': .775em',1739,110,1673,'\'; ',1694,'160%; ',1682,': .67em','; margin:-.1em',1655,48,1665,'125%; ',1682,': .',1721,1904,1739,42,1673,'\'; ',1694,'200%; ',1682,': .6em; margin:-.07em',1655,139,1653,1742,'; ',1694,'175%; ',1682,1903,1739,155,1673,'\'; ',1694,'270%; ',1682,': .62em',1904,1655,52,1665,'250%; ',1682,1885,'17em',1739,194,'":"',1694,'67%; ',1682,':-.8em',1655,199,'":"',1694,'110%; ',1682,':-.5em',1655,204,'":"',1694,'175%; ',1682,':-.32em',1655,210,'":"',1694,'75%; ',1682,1959,1655,215,'":"',1694,'133%; ',1682,': -.15em',1655,'wide3a":"',1694,'200%; ',1682,': -.05em',1655,277,1653,1742,1739,'accent":"',1682,': .02em',1655,461,'":"',1682,1994,1868,1655,1104,'":"',1682,1994,1877,'"});','if(jsMath.browser=="','OmniWeb"){jsMath.Update.TeXfonts({cmsy10:{"55":{',255,1694,'75%; position:relative; left:.3em; top:-.15em',346,'3em">&#x02EB;</span>\'},"104','":{c:\'<span style="position:relative; top:.2em; margin-','left:-.55em">&#x3008;</span>\'},"105',2015,'right:-.55em">&#x3009;</span>\'}}});',1651,'arrow2',1653,'Symbol; ',1694,'100%; ',1682,': -.1em; margin:-1px"})}',2008,'Opera"){',1651,48,'":"margin:0pt .12em 0pt 0pt',1739,52,2031,';"})}',2008,'Mozilla','"){jsMath.Setup.Script("jsMath-fallback-mac-','mozilla.js")}',2008,'MSIE',2038,'msie.js")}jsMath.Macro("not","\\\\mathrel{\\\\rlap{\\\\kern 4mu/}}");jsMath.Box.defaultH=0.8;']
+]);
diff --git a/htdocs/jsMath/jsMath-fallback-pc.js b/htdocs/jsMath/jsMath-fallback-pc.js
new file mode 100644
index 0000000000..aa3bf67b3d
--- /dev/null
+++ b/htdocs/jsMath/jsMath-fallback-pc.js
@@ -0,0 +1,29 @@
+/*
+ *  jsMath-fallback-pc.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file makes changes needed for when the TeX fonts are not available
+ *  with a browser on the PC.
+ *
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 2004-2010 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+jsMath.Script.Uncompress([
+  ['jsMath.Add(jsMath.TeX,{cmr10',':[{c:"&Gamma;",','tclass:"greek"},{c:"&','Delta;",',2,'Theta;",',2,'Lambda;",',2,'Xi;",',2,'Pi;",',2,'Sigma;",',2,'Upsilon;",',2,'Phi;",',2,'Psi;",',2,'Omega;",','tclass:"','greek','"},{c',':"ff','",ic:0.0778,krn:{"39":0.0778,"63":0.0778,"33":0.0778,"41":0.0778,"93":0.0778},lig:{"105":','14,"108":15},','tclass:"normal"},{c',':"fi",',28,':"fl",',28,':"ffi",',28,':"ffl",',28,':"&#x131',';",a:0,',28,':"j",d:0.2,',28,':"&#x2CB;",',22,'accent','"},{c:"&#','x2CA;",',22,44,45,'x2C7;",',22,44,45,'x2D8;",',22,44,45,'x2C9;",',22,44,45,'x2DA;",',22,44,45,'x0327;",',28,':"&#xDF;",',28,':"&#xE6',38,28,':"&#x153',38,28,':"&#xF8;",',28,':"&#xC6;",',28,':"&#x152;",',28,':"&#xD8;",',28,':"?",krn:{"108":-0.278,"76":-0.319},',28,':"!",lig:{"96":60},',28,':"&#x201D;",',28,':"#",',28,':"$",',28,':"%",',28,':"&amp;",',28,':"&#x2019;",krn:{"63":0.111,"33":0.','111},','lig:{"39":34},',28,':"(",','d:0.2,',28,':")",',103,28,':"*",',28,':"+",a',':0.1,',28,':",",a:-','0.3,d:0.2,','w:0.278,',28,':"-",a:0,lig:{"45":123},',28,':".",a:-0.','25,',28,':"/",',28,':"0",',28,':"1",',28,':"2",',28,':"3",',28,':"4",',28,':"5",',28,':"6",',28,':"7",',28,':"8",',28,':"9",',28,':":",',28,':";",',28,':"&#xA1;",',28,':"=",a:0,d:-0.1,',28,':"&#xBF;",',28,':"?",lig:{"96":62},',28,':"@",',28,':"A','",krn:{"','116','":-0.0278,"','67',161,'79',161,'71',161,'85',161,'81',161,'84','":-0.0833,"','89',173,'86','":-0.111',',"87":-0.',99,28,':"B",',28,':"C",',28,':"D',159,'88',161,'87',161,'65',161,'86',161,'89','":-0.0278','},',28,':"E",',28,':"F',159,'111',173,'101',173,'117','":-0.0833,"114":-0.0833,"97":-0.0833,"65":-0.','111,"79',161,'67',161,'71',161,'81',196,'},',28,':"G",',28,':"H",',28,':"I',159,'73":0.','0278','},',28,':"J",',28,':"K',159,'79',161,'67',161,'71',161,'81',196,'},',28,':"L',159,'84',173,'89',173,'86',177,178,99,28,':"M",',28,':"N",',28,':"O',159,'88',161,'87',161,'65',161,'86',161,'89',196,'},',28,':"P',159,'65',173,'111',161,'101',161,'97',161,'46',173,'44":-0.0833},',28,':"Q",',103,28,':"R',159,'116',161,'67',161,'79',161,'71',161,'85',161,'81',161,'84',173,'89',173,'86',177,178,99,28,':"S",',28,':"T',159,'121',161,'101',173,'111',208,'0833,"117":-0.0833','},',28,':"U",',28,':"V",','ic:0.0139,krn:{"','111',173,'101',173,'117',208,'111,"79',161,'67',161,'71',161,'81',196,'},',28,':"W",',328,'111',173,'101',173,'117',208,'111,"79',161,'67',161,'71',161,'81',196,'},',28,':"X',159,'79',161,'67',161,'71',161,'81',196,'},',28,':"Y",ic:0.025,','krn:{"101',173,'111',208,322,'},',28,':"Z",',28,':"[",d',111,28,':"&#x201C;",',28,':"]",d',111,28,':"&#x2C6;",',22,44,45,'x2D9;",',22,44,45,'x2018;",lig:{"96":92},',28,':"a','",a:0,krn:{"','118',161,'106":0.','0556,"121',161,'119',196,'},',28,':"b',159,'101','":0.0278,"','111',417,'120',161,'100',417,'99',417,'113',417,'118',161,407,'0556,"121',161,'119',196,'},',28,':"c',404,'104',161,'107',196,'},',28,':"d",',28,':"e",a:0,',28,':"f',26,'12,"102":11,"108":13},',28,':"g",','a:0,d:0.2,ic:0.','0139,krn:{"',407,226,'},',28,':"h',159,'116',161,'117',161,'98',161,'121',161,'118',161,'119',196,'},',28,':"i",',28,40,28,':"k',159,'97','":-0.0556,"','101',161,'97',161,'111',161,'99',196,'},',28,':"l",',28,':"m',404,'116',161,'117',161,'98',161,'121',161,'118',161,'119',196,'},',28,':"n',404,'116',161,'117',161,'98',161,'121',161,'118',161,'119',196,'},',28,':"o',404,'101',417,'111',417,'120',161,'100',417,'99',417,'113',417,'118',161,407,'0556,"121',161,'119',196,'},',28,':"p",a:0,',103,376,417,'111',417,'120',161,'100',417,'99',417,'113',417,'118',161,407,'0556,"121',161,'119',196,'},',28,':"q",a:0,',103,28,':"','r",a:0,',28,':"s",a:0,',28,':"t',159,'121',161,'119',196,'},',28,':"u',404,'119',196,'},',28,':"v",a:0,',328,'97',483,'101',161,'97',161,'111',161,'99',196,'},',28,':"w",a:0,',328,'101',161,'97',161,'111',161,'99',196,'},',28,':"x",a:0,',28,':"y",',454,455,'111',161,'101',161,'97',161,'46',173,'44":-0.0833},',28,':"z",a:0,',28,':"&#x2013',';",a:0.1,','ic:0.0278,','lig:{"45":124},',28,':"&#x2014',640,641,28,':"&#x2DD;",',22,44,45,'x2DC;",',22,44,45,'xA8;",',22,44,'"}],cmmi10',1,'ic:0.139',',krn:{"61":-0.0556,"59":-0.111,"58":-0.111,"127":0.','0833},',22,'igreek"},{c:"&',3,'krn:{"127":0.','167},',22,665,5,'ic:0.',226,',krn:{"127":0.','0833},',22,665,7,667,'167},',22,665,9,'ic:0.0757',674,'0833},',22,665,11,'ic:0.0812,krn:{"61',483,'59":-0.0556,"58":-0.0556,"127":0.','0556},',22,665,13,'ic:0.0576',674,'0833},',22,665,15,'ic:0.139',662,'0556},',22,665,17,667,'0833},',22,665,19,'ic:0.11,krn:{"61',483,692,'0556},',22,665,21,'ic:0.0502',674,'0833},',22,665,'alpha',';",a:0,ic:0.','0037',674,226,'},',2,'beta;",','d:0.2,ic:0.','0528',674,'0833},',2,'gamma;",',454,'0556,',2,'delta;",ic:0.0378,krn:{"',692,'0556},',2,'epsilon;",a:0',674,'0556},',22,'lucida',24,':"&zeta;",',734,'0738',674,'0833},',2,'eta;",',454,'0359',674,'0556},',2,'theta;",ic:0.',226,674,'0833},',2,'iota;",a:0',674,'0556},',2,'kappa',38,2,'lambda;",',2,'mu',38,'d:0.2',674,226,'},',2,'nu',727,'0637,krn:{"',692,226,'},',2,'xi;",',734,'046',674,99,2,'pi',727,'0359,',2,'rho',38,'d:0.2',674,'0833},',2,'sigma',727,801,'krn:{"59',483,'58":-0.0556','},',2,'tau',727,'113,krn:{"',692,226,'},',2,'upsilon',727,'0359',674,226,'},',2,'phi',640,'d:0.2',674,'0833},',2,'chi',38,'d:0.2',674,'0556},',2,'psi',640,734,'0359',674,99,2,'omega',727,801,2,'epsilon;",a:0',674,'0833},',22,'greek',45,'x3D1;",',667,'0833},',22,'lucida',45,'x3D6',727,226,',',22,'lucida',45,'x3F1',38,'d:0.2',674,'0833},',22,'lucida',45,'x3C2;",',454,'0799',674,'0833},',22,'lucida',45,'x3D5',640,'d:0.2',674,'0833},',22,'lucida',45,'x21BC',';",a:0,d:-0.','2,',22,'arrows',45,'x21BD',898,'1,',22,'arrows',45,'x21C0',898,'2,',22,'arrows',45,'x21C1',898,'1,',22,'arrows',24,':\'<span style="','position:relative; ','top:-.1em; ','display:inline-block">&#','x02D3',';</span>\',a:0','.1,',22,'symbol"},{c',921,922,'top:-.1em; ',924,'x02D2',926,'.1,','tclass:"symbol"},{c:"&#','x25B9;",',937,'x25C3;",',22,929,':"0",',28,':"1",',28,':"2",',28,':"3",',28,':"4",',28,':"5",',28,':"6",',28,':"7",',28,':"8",',28,':"9",',28,119,'3,',28,':",",a:-',114,28,':"&lt',640,28,921,'font-size:','133%; ',922,'top:.1em','; display:inline-block">/</span>\',d:0.','1,krn:{"1',483,'65',483,'77',483,'78',483,'89":0.0556,"90":-0.0556},',28,':"&gt',640,28,':"&#x22C6',38,22,'arial',45,'x2202;",ic:0.0556',674,'0833},',28,':"A",',667,'139','},tclass:"italic"},{c:"','B",ic:0.0502',674,'0833',1003,'C",ic:0.0715,krn:{"61',161,692,'0833',1003,'D",ic:0.',226,674,'0556',1003,'E",ic:0.0576',674,'0833',1003,'F",ic:0.139',662,'0833',1003,'G",',667,'0833',1003,'H",ic:0.0812,krn:{"61',483,692,'0556',1003,'I",ic:0.0785',674,'111',1003,'J",ic:0.0962',662,'167',1003,'K",ic:0.0715,krn:{"61',483,692,'0556',1003,'L",',667,226,1003,'M','",ic:0.109,krn:{"','61',483,692,'0833',1003,'N',1053,'61',173,'61',161,692,'0833',1003,'O",ic:0.',226,674,'0833',1003,'P",ic:0.139',662,'0833',1003,'Q",d:0.2',674,'0833',1003,'R",ic:0.00773',674,'0833',1003,'S",ic:0.0576,krn:{"61',483,692,'0833',1003,'T','",ic:0.139,krn:{"','61',161,692,'0833',1003,'U',1053,'59',177,',"58',177,',"61',483,'127":0.',226,1003,'V",ic:0.222,krn:{"59','":-0.167,"','58',1109,'61',177,1003,'W',1091,'59',1109,'58',1109,'61',177,1003,'X",ic:0.0785,krn:{"61',173,'61',161,692,'0833',1003,'Y",ic:0.222,krn:{"59',1109,'58',1109,'61',177,1003,'Z",ic:0.0715,krn:{"61',483,692,'0833},',22,'italic',45,'x266D;",',937,'x266E;",',937,'x266F;",',22,929,921,922,'top:-.3em; ',973,'75%; ',924,'x203F',926,',d:-0.1,',22,994,24,921,922,'top',':.4em; ',973,'75%; ',924,'x2040',926,',d:-0.1,',22,994,45,'x2113;",',667,'111',1003,'a",a:0,',22,'italic"},{c:"','b",',22,1183,'c",a:0',674,'0556',1003,'d',159,'89":0.0556,"90',483,'106',177,',"102',1109,1105,'167',1003,'e",a:0',674,'0556',1003,'f",',734,'108,krn:{"',692,'167',1003,'g",',454,'0359',674,226,1003,'h',159,'127',196,1003,'i",',22,1183,'j",',734,'0572,krn:{"59',483,814,1003,'k",ic:0.0315,',22,1183,'l",ic:0.0197',674,'0833',1003,'m",a:0,',22,1183,'n",a:0,',22,1183,'o",a:0',674,'0556',1003,'p",a:0,d:0.2',674,'0833',1003,'q",',454,'0359',674,'0833',1003,578,641,'krn:{"',692,'0556',1003,'s",a:0',674,'0556',1003,'t",',667,'0833',1003,'u",a:0',674,226,1003,'v",a:0,ic:0.0359',674,226,1003,'w",a:0,ic:0.0269',674,'0833',1003,'x",a:0',674,226,1003,'y",',454,'0359',674,'0556',1003,'z",a:0,ic:0.044',674,'0556},',22,'italic',45,'x131;",a:0',674,226,1003,'j",d:0.2',674,'0833},',22,'italic',45,'x2118',38,'d:0.2',674,99,22,994,24,921,922,'left:.3em; top:-.65em; font-size: 67%; ',924,'x2192',';</span>\',','ic:0.154,',937,'x0311;",ic:0.399,',22,'normal"}],cmsy10:[{c',921,922,'top:.1em; ',924,'x2212',926,'.1,',937,'xB7',898,'2,',28,':"&#xD7',38,28,921,922,'top:.3em; ',924,'x2A',926,',',28,':"&#xF7',38,28,':"&#x25CA;",',937,'xB1',640,28,':"&#x2213;",',937,'x2295;",',937,'x2296;",',937,'x2297;",',937,'x2298;",',937,'x2299;",',937,'x25EF;",',22,994,45,'x2218',898,'1,',22,'symbol2',45,'x2022',898,'2,',937,'x224D',640,22,'symbol2',45,'x2261',640,22,'symbol2',45,'x2286;",',937,'x2287;",',937,'x2264;",',937,'x2265;",',937,'x227C;",',937,'x227D;",',22,929,':"~",a:0,d:-0.2,',28,':"&#x2248',640,'d:-0.1,',937,'x2282;",',937,'x2283;",',937,'x226A;",',937,'x226B;",',937,'x227A;",',937,'x227B;",',937,'x2190;",a:-0.1,',22,'arrow1',45,'x2192;",a:-0.1,',22,'arrow1',45,'x2191',';",a:0.2,d:0',',',22,'arrow1a',45,'x2193',1437,',',22,'arrow1a',45,'x2194;",a:-0.1,',22,'arrow1',45,'x2197',640,22,'arrows',45,'x2198',640,22,'arrows',45,'x2243',640,22,'symbol2',45,'x21D0;",a:-0.1,',22,'arrow2',45,'x21D2;",a:-0.1,',22,'arrow2',45,'x21D1',1437,'.1,',22,'arrow1a',45,'x21D3',1437,'.1,',22,'arrow1a',45,'x21D4;",a:-0.1,',22,'arrow2',45,'x2196',640,22,'arrows',45,'x2199',640,22,'arrows',45,'x221D',640,28,921,973,974,'margin-right:-.','1em; ','position: relative; top',1167,924,'x2032',926,',',22,'lucida',45,'x221E',640,937,'x2208;",',937,'x220B;",',22,929,921,973,'150%; ',922,'top:.2em; ',924,'x25B3',1324,22,929,921,973,'150%; ',922,'top:.2em; ',924,'x25BD',1324,22,929,921,973,974,922,'top:.2em',977,'2,',28,921,973,'67%; ',1509,':-.15em; ',1507,'3em; ',924,'x22A2',1324,937,'x2200;",',937,'x2203;",',937,'xAC',898,'1,',937,'x2205;",',937,'x211C;",',937,'x2111;",',937,'x22A4;",',937,'x22A5;",',937,'x2135;",',22,929,':"A',159,'48":0.194},',22,'cal"},{c:"','B",ic:0.0304',',krn:{"48":0.','139},',22,1590,'C",ic:0.0583',1592,'139},',22,1590,'D",ic:0.',226,1592,'0833},',22,1590,'E",ic:0.0894',1592,99,22,1590,'F",ic:0.0993',1592,99,22,1590,'G",',734,'0593',1592,99,22,1590,'H",ic:0.00965',1592,99,22,1590,'I",ic:0.0738',1592,226,'},',22,1590,'J",',734,'185',1592,'167},',22,1590,'K",ic:0.0144',1592,'0556},',22,1590,'L',159,'48":0.139},',22,1590,'M',159,'48":0.139},',22,1590,'N",ic:0.147',1592,'0833},',22,1590,'O",ic:0.',226,1592,99,22,1590,'P",ic:0.0822',1592,'0833},',22,1590,'Q",d:0.2',1592,99,22,1590,'R',159,'48":0.0833},',22,1590,'S",ic:0.075',1592,'139},',22,1590,'T",ic:0.254',1592,226,'},',22,1590,'U",ic:0.0993',1592,'0833},',22,1590,'V",ic:0.0822',1592,226,'},',22,1590,'W",ic:0.0822',1592,'0833},',22,1590,'X",ic:0.146',1592,'139},',22,1590,'Y",ic:0.0822',1592,'0833},',22,1590,'Z",ic:0.0794',1592,'139},',22,'cal',45,'x22C3;",',937,'x22C2;",',937,'x228E;",',937,'x22C0;",',937,'x22C1;",',937,'x22A2;",',937,'x22A3;",',937,'x230A;",','a:',114,22,'lucida',45,'x230B;",','a:',114,22,'lucida',45,'x2308;",','a:',114,22,'lucida',45,'x2309;",','a:',114,22,'lucida',24,':"{",',103,28,':"}",',103,28,':"&#','x2329;",','a:',114,937,'x232A;",','a:',114,937,'x2223;",d',111,937,'x2225;",d',111,937,'x2195',1437,',',22,'arrow1a',45,'x21D5;",a:0.3,d:0,',22,'arrow1a',45,'x2216;",','a:0.3,d',111,937,'x2240;",',22,'symbol','"},{c:\'<span style="display:inline-block; ',922,'top:.8em">&#x221A',1324,'h:0.04,d:0.8,',937,'x2210;",a:0.4,',937,'x2207;",',22,'symbol',1802,922,973,'85%; ','left:-.1em; margin-right:-.','2em">&#x222B',926,'.4,d',111,'ic:0.111,',22,'lucida',45,'x2294;",',937,'x2293;",',937,'x2291;",',937,'x2292;",',937,'xA7;",d',111,28,':"&#x2020;",d',111,28,':"&#x2021;",d',111,28,':"&#xB6;",a:0.3,d',111,22,'lucida',45,'x2663;",',22,994,45,'x2662;",',22,994,45,'x2661;",',22,994,45,'x2660;",',22,994,'"}],cmex10:[{c',102,'h:0.04,d:1.16,n:','16,',22,'delim1','"},{c:")",',1865,'17,',22,'delim1','"},{c:"[",',1865,'104,',22,'delim1','"},{c:"]",',1865,'105,',22,'delim1',45,1740,1865,'106,',22,'delim1a',45,1746,1865,'107,',22,'delim1a',45,1752,1865,'108,',22,'delim1a',45,1758,1865,'109,',22,'delim1a',1802,'margin-left',':-.1em">{</','span>\',',1865,'110,',22,'delim1',1802,1507,'1em">}</',1911,1865,'111,',22,'delim1',45,1771,1865,'68,',22,'delim1b',45,1775,1865,'69,',22,'delim1b',45,'x2223',';",h:0.7,d:0.1,delim:{rep:','12},',937,'x2225',1938,'13},',22,929,122,1865,'46,',22,'delim1a',45,1795,1865,'47,',22,'delim1a',24,102,'h:0.04,d:1.76,n:','18,',22,'delim2',1869,1959,'19,',22,'delim2',24,102,'h:0.04,d:2.36,n:','32,',22,'delim3',1869,1970,'33,',22,'delim3',1874,1970,'34,',22,'delim3',1879,1970,'35,',22,'delim3',45,1740,1970,'36,',22,'delim3a',45,1746,1970,'37,',22,'delim3a',45,1752,1970,'38,',22,'delim3a',45,1758,1970,'39,',22,'delim3a',1802,922,1817,'1em">{</',1911,1970,'40,',22,'delim3',1802,922,'left:-.05em; ',1507,'1em">}</',1911,1970,'41,',22,'delim3',45,1771,1970,'42,',22,'delim3b',45,1775,1970,'43,',22,'delim3b',24,122,1970,'44,',22,'delim3a',45,1795,1970,'45,',22,'delim3a',24,102,'h:0.04,d:2.96,','n:48,',22,'delim4',1869,2058,'n:49,',22,'delim4',1874,2058,'n:50,',22,'delim4',1879,2058,'n:51,',22,'delim4',45,1740,2058,'n:52,',22,'delim4a',45,1746,2058,'n:53,',22,'delim4a',45,1752,2058,'n:54,',22,'delim4a',45,1758,2058,'n:55,',22,'delim4a',1802,922,1817,'1em">{</',1911,2058,'n:56,',22,'delim4',1802,922,1817,'1em">}</',1911,2058,'n:57,',22,'delim4',45,1771,2058,22,'delim4b',45,1775,2058,22,'delim4b',24,122,2058,22,'delim4a',45,1795,2058,22,'delim4a',24,122,1959,'30,',22,'delim2a',45,1795,1959,'31,',22,'delim2a',45,'xE6',';",h:1,delim:{top:','48,bot:64,rep:66},',22,'delimx',45,'xF6',2153,'49,bot:65,rep:67},',22,'delimx',45,'xE9',2153,'50,bot:52,rep:54},',22,'delimx',45,'xF9',2153,'51,bot:53,rep:55},',22,'delimx',45,'xEB',';",h:1,delim:{bot:','52,rep:54},',22,'delimx',45,'xFB',2177,'53,rep:55},',22,'delimx',45,'xEA',2153,'50,rep:54},',22,'delimx',45,'xFA',2153,'51,rep:55},',22,'delimx',45,'xEC',2153,'56,mid:60,bot:58,rep:62},',22,'delimx',45,'xFC',2153,'57,mid:61,bot:59,rep:62},',22,'delimx',45,'xEE',2153,'56,bot:58,rep:62},',22,'delimx',45,'xFE',2153,'57,bot:59,rep:62},',22,'delimx',45,'xED',';",h:1,delim:{rep:','63},',22,'delimx',45,'xFD',2225,'119},',22,'delimx',45,'xEF',2225,'62},',22,'delimx',1802,1909,':.14em; margin-right:.36em">|</',1911,'delim:{top:120,bot:121,rep:63},',28,':"&#xE8',2153,'56,bot:59,rep:62},',22,'delimx',45,'xF8',2153,'57,bot:58,rep:62},',22,'delimx',45,'xE7',2225,'66},tclass:"delimx"},{c'],
+  [':"&#','xF7;",h:1,delim:{rep:67},','tclass:"','delimx','"},{c:"&#','x2329;",','h:0.04,d:1.76,n:','28',',tclass:"','delim2b',4,'x232A;",',6,'29',8,9,4,'x2294',';",h:0,d:1,n:','71',8,'bigop1',4,'x2294',';",h:0.1,d:1.','5',8,'bigop2',4,'x222E',';",h:0,d:1.11,ic:0.095,n:','73',8,'bigop1c',4,'x222E;",h:0,d:2.22,ic:0.222',8,'bigop2c',4,'x2299',18,'75',8,21,4,'x2299',24,'5',8,27,4,'x2295',18,'77',8,21,4,'x2295',24,'5',8,27,4,'x2297',18,'79',8,21,4,'x2297',24,'5',8,27,4,'x2211',18,'88',8,'bigop1a',4,'x220F',18,'89',8,79,4,'x222B',30,'90',8,33,4,'x222A',18,'91',8,'bigop1b',4,'x2229',18,'92',8,97,4,'x228E',18,'93',8,97,4,'x22C0',18,'94',8,21,4,'x22C1',18,'95',8,21,4,'x2211',24,'6',8,'bigop2a',4,'x220F',24,'5',8,127,4,'x222B;",h:0,d:2.22,ic:0.222',8,37,4,'x222A',24,'5',8,'bigop2b',4,'x2229',24,'5',8,143,4,'x228E',24,'5',8,143,4,'x22C0',24,'5',8,27,4,'x22C1',24,'5',8,27,4,'x2210',18,'97',8,79,4,'x2210',24,'5',8,127,4,'xFE3F;",h:0.','8,d:0,w:0.65,n:99',8,'wide1',4,181,'85,w:1.1,n:100',8,'wide2',4,181,'99,w:1.65',8,'wide3','"},{c:"~",h:1,w:0.','5,n:102',8,'wide1a',195,'8,n:103',8,'wide2a','"},{c',':"~",h:0.99,w:1.3',8,'wide3a',203,':"[",',6,'20',8,'delim2',203,':"]",',6,'21',8,212,4,'x2308;",',6,'22',8,'delim2a',4,'x2309;",',6,'23',8,224,4,'x230A;",',6,'24',8,224,4,'x230B;",',6,'25',8,224,'"},{c:\'<span style="','display:inline-block','; ','position:relative; ','left',':-.1em','; margin-right:-.','1em">{</span>\',',6,'26',8,212,243,244,'; position:relative',249,'1em; ','left:-.05em">}</span>\',',6,'27',8,212,243,'font-size:','150%; ','position:relative; top:.','8em; ',244,'">&#x221A;</span>\',h:0.','04,d:1.16,n:113',8,'root',243,266,'220%; ',268,269,244,271,'04,d:1.76,n:114',8,274,243,266,'310%; ',268,'8em',249,'01em; ',244,271,'06,d:2.36,n:115',8,274,243,266,'400%; ',268,'8em',249,'025em; ',244,271,'08,d:2.96,n:116',8,274,243,266,'490%; ',268,'8em',249,'03em; ',244,271,'1,d:3.75,n:117',8,274,243,266,'580%; ',268,'775em',249,'04em; ',244,271,'12,d:4.5,n:118',8,274,243,266,'750%; ',268,'775em',249,'04em; ',244,271,'14,d:5.7',8,274,243,244,'; margin-left:.','04em">|</','span><span style="',244,347,'08em; margin-right:.125em">|</span>\',delim:{top:126,bot:127,rep:119},',2,'normal',4,'x2191',';",h:0.7,d:0,delim:{','top:120,rep:63},',2,'arrow1a',4,'x2193',357,'bot:121,rep:63},',2,360,243,'margin-left:-.','1em"></',349,268,'55em',249,'3em; ',244,'">&#x25DC',';</span>\',h:0.','05',8,'symbol',243,368,'3em"></',349,268,'55em',249,259,244,'">&#x25DD',377,'05',8,380,243,368,'1em"></',349,268,'15em',249,'3em; ',244,'">&#x25DF',377,'05',8,380,243,368,'3em"></',349,268,'15em',249,259,244,'">&#x25DE',377,'05',8,380,4,'x21D1',';",h:0.65,d:0,delim:{','top:126,rep:119},',2,360,4,'x21D3',425,'bot:127,rep:119},',2,360,'"}],cmti10:[{c:"&Gamma;",ic:0.133',8,'igreek"},{c:"&','Delta;",',2,437,'Theta;",ic:0.094',8,437,'Lambda;",',2,437,'Xi;",ic:0.153',8,437,'Pi;",ic:0.164',8,437,'Sigma;",ic:0.12',8,437,'Upsilon;",ic:0.111',8,437,'Phi;",ic:0.0599',8,437,'Psi;",ic:0.111',8,437,'Omega;",','ic:0.103',8,'igreek',203,':"ff','",ic:0.212,krn:{"39":0.104,"63":0.104,"33":0.104,"41":0.104,"93":0.104},lig:{"105":','14,"108":15},','tclass:"italic"},{c',':"fi','",ic:0.103,',473,':"fl',475,473,':"ffi',475,473,':"ffl',475,473,0,'x131;",a:0,','ic:0.','0767,',473,':"j",d:0.2,','ic:0.0374,',473,0,'x2CB;",',2,'iaccent',4,'x2CA;",ic:0.0969',8,497,4,'x2C7;",ic:0.083',8,497,4,'x2D8;",ic:0.108',8,497,4,'x2C9;",ic:0.103',8,497,4,'x2DA;",',2,497,'"},{c:"?",','d:0.17,w:0.46,',473,0,'xDF;",','ic:0.105,',473,0,'xE6;",a:0,','ic:0.0751,',473,0,'x153;",a:0,',527,473,0,'xF8;",','ic:0.0919,',473,0,'xC6;",','ic:0.12,',473,0,'x152;",','ic:0.12,',473,0,'xD8;",','ic:0.094,',473,':"?",krn:{"108":-0.','256,"76":-0.321},',473,':"!",','ic:0.124,lig:{"96":','60},',473,0,'x201D;",','ic:0.0696,',473,':"#",ic:0.0662,',473,':"$",',473,':"%",ic:0.136,',473,':"&amp;",','ic:0.0969,',473,0,'x2019;",ic:0.124,krn:{"63":0.102,"33":0.102},lig:{"39":34},',473,':"(",d:0.2,','ic:0.162,',473,':")",d:0.2,','ic:0.0369,',473,':"*",ic:0.149,',473,':"+",a:0.1,','ic:0.0369,',473,':",",a:-0.3,d:0.2,w:0.278,',473,':"-",a:0,ic:0.0283',',lig:{"45":','123},',473,':".",a:-0.25,',473,':"/",ic:0.162,',473,':"0",ic:0.136,',473,':"1",ic:0.136,',473,':"2",ic:0.136,',473,':"3",ic:0.136,',473,':"4",ic:0.136,',473,':"5",ic:0.136,',473,':"6",ic:0.136,',473,':"7",ic:0.136,',473,':"8",ic:0.136,',473,':"9",ic:0.136,',473,':":",ic:0.0582,',473,':";",ic:0.0582,',473,0,'xA1;",','ic:0.0756,',473,':"=",a:0,d:-0.1,','ic:0.0662,',473,0,'xBF;",',473,':"?",ic:0.122,','lig:{"96":','62},',473,':"@",ic:0.096,',473,':"A",','krn:{"110":-0.0256,"108":-0.0256,"114":-0.0256,"117":-0.0256,"109":-0.0256,"116":-0.0256,"105":-0.0256,"67":-0.0256,"79":-0.0256,"71":-0.0256,"104":-0.0256,"98":-0.0256,"85":-0.0256,"107":-0.0256,"118":-0.0256,"119":-0.0256,"81":-','0.0256,"84','":-0.0767,"','89',636,'86','":-0.102,"','87',640,'101','":-0.0511,"','97',644,'111',644,'100',644,'99',644,'103',644,'113','":-0.0511','},',473,':"B',475,473,':"C",','ic:0.145,',473,':"D",',547,'krn:{"88','":-0.0256,"','87',668,'65',668,'86',668,'89":-0.','0256},',473,':"E",ic:0.12,',473,':"F','",ic:0.133,krn:{"','111',636,'101',636,'117','":-0.0767,"114":-0.0767,"97":-0.0767,"','65',640,'79',668,'67',668,'71',668,'81":-0.0256','},',473,':"G",ic:0.0872,',473,':"H",ic:0.164,',473,':"I",ic:0.158,',473,':"J",ic:0.14,',473,':"K",',663,'krn:{"79',668,'67',668,'71',668,696,'},',473,':"L",krn:{"84',636,'89',636,'86',640,'87',640,'101',644,'97',644,'111',644,'100',644,'99',644,'103',644,'113',656,'},',473,':"M",ic:0.164,',473,':"N",ic:0.164,',473,':"O",',547,'krn:{"88',668,'87',668,'65',668,'86',668,675,'0256},',473,':"P',475,'krn:{"65":-0.0767},',473,':"Q",d:0.2,',547,473,':"R",ic:0.0387,',634,'0.0256,"84',636,'89',636,'86',640,'87',640,'101',644,'97',644,'111',644,'100',644,'99',644,'103',644,'113',656,'},',473,':"S",ic:0.12,',473,':"T',681,'121',636,'101',636,'111',687,'117',636,'65":-0.0767},',473,':"U",ic:0.164,',473,':"V",ic:0.','184,krn:{"','111',636,'101',636,'117',687,'65',640,'79',668,'67',668,'71',668,696,'},',473,':"W",ic:0.',809,'65":-0.0767},',473,':"X",ic:0.158,krn:{"79',668,'67',668,'71',668,696,'},',473,':"Y",ic:0.','194',',krn:{"101',636,'111',687,'117',636,'65":-0.0767},',473,':"Z",',663,473,':"[",d:0.1,','ic:0.188,',473,0,'x201C;",','ic:0.169,',473,':"]",d:0.1,','ic:0.105,',473,0,'x2C6;",ic:0.0665',8,497,4,'x2D9;",ic:0.118',8,497,4,'x2018;",',553,'92},',473,':"a','",a:0,ic:0.',489,473,':"b",ic:0.0631',842,644,'97',644,'111',644,'100',644,'99',644,'103',644,'113',656,'},',473,':"c',877,'0565',842,644,'97',644,'111',644,'100',644,'99',644,'103',644,'113',656,'},',473,':"d',475,'krn:{"108":','0.0511},',473,':"e',877,'0751',842,644,'97',644,'111',644,'100',644,'99',644,'103',644,'113',656,'},',473,':"f',471,'12,"102":11,"108":13},',473,':"g','",a:0,d:0.2,ic:0.','0885,',473,':"h",ic:0.',489,473,':"i",ic:0.102,',473,491,663,473,':"k",ic:0.','108,',473,':"l',475,918,'0.0511},',473,':"m',877,489,473,':"n',877,489,'krn:{"39":-0.102},',473,':"o',877,'0631',842,644,'97',644,'111',644,'100',644,'99',644,'103',644,'113',656,'},',473,':"p',945,'0631',842,644,'97',644,'111',644,'100',644,'99',644,'103',644,'113',656,'},',473,':"q',945,'0885,',473,':"r',877,'108',842,644,'97',644,'111',644,'100',644,'99',644,'103',644,'113',656,'},',473,':"s',877,'0821,',473,':"t",ic:0.0949,',473,':"u',877,489,473,':"v',877,957,473,':"w',877,957,918,'0.0511},',473,':"x',877,'12,',473,':"y',945,'0885,',473,':"z',877,'123,',473,0,'x2013',';",a:0.1,ic:0.','0921',586,'124},',473,0,'x2014',1068,'0921,',473,0,'x2DD;",ic:0.122',8,497,4,'x2DC;",ic:0.116',8,497,4,'xA8;",',2,497,'"}],cmbx10:[{c:"&Gamma',';",tclass:"bgreek"},{c:"&','Delta',1091,'Theta',1091,'Lambda',1091,'Xi',1091,'Pi',1091,'Sigma',1091,'Upsilon',1091,'Phi',1091,'Psi',1091,465,2,'bgreek',203,':"ff','",ic:0.0778,krn:{"39":0.0778,"63":0.0778,"33":0.0778,"41":0.0778,"93":0.0778},lig:{"105":','14,"108":15},','tclass:"bold"},{c',':"fi",',1117,':"fl",',1117,':"ffi",',1117,':"ffl",',1117,0,487,1117,491,1117,0,'x2CB',';",tclass:"baccent',4,'x2CA',1133,4,'x2C7',1133,4,'x2D8',1133,4,'x2C9',1133,4,'x2DA',1133,518,1117,0,522,1117,0,526,1117,0,530,1117,0,534,1117,0,538,1117,0,542,1117,0,546,1117,549,'278,"76":-0.319},',1117,552,628,'60},',1117,0,557,1117,':"#",',1117,':"$",',1117,':"%",',1117,566,1117,0,'x2019;",krn:{"63":0.111,"33":0.111},lig:{"39":34},',1117,572,1117,575,1117,':"*",',1117,580,1117,':",",a:-0.3,d:0.2,w:0.278,',1117,':"-",a:0',586,'123},',1117,':".",a:-0.25,',1117,':"/",',1117,':"0",',1117,':"1",',1117,':"2",',1117,':"3",',1117,':"4",',1117,':"5",',1117,':"6",',1117,':"7",',1117,':"8",',1117,':"9",',1117,':":",',1117,':";",',1117,0,618,1117,621,1117,0,'xBF;",',1117,':"?",',628,'62},',1117,':"@",',1117,':"A",krn:{"116','":-0.0278,"','67',1250,'79',1250,'71',1250,'85',1250,'81',1250,'84','":-0.0833,"','89',1262,'86":-0.','111,"87":-0.111},',1117,':"B",',1117,662,1117,':"D",krn:{"88',1250,'87',1250,'65',1250,'86',1250,675,'0278},',1117,':"E",',1117,':"F",krn:{"111',1262,'101',1262,'117','":-0.0833,"114":-0.0833,"97":-0.0833,"65":-0.','111,"79',1250,'67',1250,'71',1250,'81":-0.0278','},',1117,':"G",',1117,':"H",',1117,':"I",krn:{"73":0.0278},',1117,':"J",',1117,':"K",krn:{"79',1250,'67',1250,'71',1250,1297,'},',1117,':"L",krn:{"84',1262,'89',1262,1265,'111,"87":-0.111},',1117,':"M",',1117,':"N",',1117,':"O",krn:{"88',1250,'87',1250,'65',1250,'86',1250,675,'0278},',1117,':"P",krn:{"65',1262,'111',1250,'101',1250,'97',1250,'46',1262,'44":-0.0833},',1117,763,1117,':"R",krn:{"116',1250,'67',1250,'79',1250,'71',1250,'85',1250,'81',1250,'84',1262,'89',1262,1265,'111,"87":-0.111},',1117,':"S",',1117,':"T",krn:{"121',1250,'101',1262,'111',1290,'0833,"117":-0.0833','},',1117,':"U",',1117,808,'0139,krn:{"','111',1262,'101',1262,'117',1290,'111,"79',1250,'67',1250,'71',1250,1297,'},',1117,827,1386,'111',1262,'101',1262,'117',1290,'111,"79',1250,'67',1250,'71',1250,1297,'},',1117,':"X",krn:{"79',1250,'67',1250,'71',1250,1297,'},',1117,840,'025',842,1262,'111',1290,1380,'},',1117,850,1117,853,1117,0,857,1117,860,1117,0,'x2C6',1133,4,'x2D9',1133,4,872,628,'92},',1117,':"a','",a:0,krn:{"','118',1250,'106":0.','0556,"121',1250,'119":-0.','0278},',1117,':"b",krn:{"101','":0.0278,"','111',1468,'120',1250,'100',1468,'99',1468,'113',1468,'118',1250,1461,'0556,"121',1250,1464,'0278},',1117,':"c',1458,'104',1250,'107":-0.0278},',1117,':"d",',1117,':"e",a:0,',1117,':"f',1115,'12,"102":11,"108":13},',1117,':"g',945,1386,1461,'0278},',1117,':"h",krn:{"116',1250,'117',1250,'98',1250,'121',1250,'118',1250,1464,'0278},',1117,':"i",',1117,491,1117,':"k",krn:{"97":-0.0556,"101',1250,'97',1250,'111',1250,'99":-0.','0278},',1117,':"l",',1117,':"m',1458,'116',1250,'117',1250,'98',1250,'121',1250,'118',1250,1464,'0278},',1117,':"n',1458,'116',1250,'117',1250,'98',1250,'121',1250,'118',1250,1464,'0278},',1117,':"o",a:0',842,1468,'111',1468,'120',1250,'100',1468,'99',1468,'113',1468,'118',1250,1461,'0556,"121',1250,1464,'0278},',1117,':"p",a:0,d:0.2',842,1468,'111',1468,'120',1250,'100',1468,'99',1468,'113',1468,'118',1250,1461,'0556,"121',1250,1464,'0278},',1117,':"q",a:0,d:0.2,',1117,':"r",a:0,',1117,':"s",a:0,',1117,':"t",krn:{"121',1250,1464,'0278},',1117,':"u',1458,1464,'0278},',1117,':"v',877,1386,'97":-0.0556,"101',1250,'97',1250,'111',1250,1530,'0278},',1117,':"w',877,'0139',842,1250,'97',1250,'111',1250,1530,'0278},',1117,':"x",a:0,',1117,':"y',945,1386,'111',1250,'101',1250,'97',1250,'46',1262,'44":-0.0833},',1117,':"z",a:0,',1117,0,'x2013',1068,'0278',586,'124},',1117,0,'x2014',1068,'0278,',1117,0,'x2DD',1133,4,'x2DC',1133,4,'xA8',1133,'"}]});','jsMath.Setup.Styles({".typeset .','cmr10','":"font-family: ','serif','",".typeset .','italic":"font-style: italic',1690,'bold":"font-weight: bold',1690,'lucida','":"font-family: \'',1695,' sans unicode','\'",".typeset .','arial','":"font-family: \'Arial unicode MS',1699,'cal',1696,'Script MT\', \'Script MT Bold\', cursive',1690,'arrows',1701,1699,'arrow1',1701,1699,360,1701,'\'; ',268,'05em;left:-.15em',249,'15em','; display:inline-block",".typeset .','arrow2',1701,'\'; ',246,'top:-.',259,244,';",".typeset .','arrow3',1701,'\'; margin',':.1em',1690,380,1701,1699,'symbol2',1701,1699,'delim1','":"font-family: \'Times New Roman\'; font-','size: ','133%; ',268,'7em',1720,'delim1a',1696,'Lucida',1698,'\'; font-size: ','133%; ',268,'8em',1720,'delim1b',1701,1751,'133%; ',268,'7em',1720,212,1741,1742,'180%; ',268,'75em',1720,224,1696,'Lucida',1698,1751,'180%; ',268,'8em',1720,9,1701,1751,'180%; ',268,'7em',1720,'delim3',1741,1742,'250%; ',268,'725em',1720,'delim3a',1696,'Lucida',1698,1751,'250%; ',268,'775em',1720,'delim3b',1701,1751,'250%; ',268,'7em',1720,'delim4',1741,1742,'325%; ',268,'7em',1720,'delim4a',1696,'Lucida',1698,1751,'325%; ',268,'775em',1720,'delim4b',1701,1751,'325%; ',268,'7em',1720,3,1688,'Symbol',1690,'greek',1696,'Times New Roman',1699,468,1741,'style:italic',1690,1112,1741,'weight:bold',1690,21,1701,1751,'130','%; position: relative; top',': .7em; margin:-.05em',1720,79,1701,1751,'110',1852,': .85em; ',244,1728,97,1701,1751,'180',1852,': .6em',1720,33,1701,1751,'85',1852,': 1em',1720,27,1701,1751,'230',1852,': .6em; margin:-.05em',1720,127,1701,1751,'185',1852,': .75em',1720,143,1701,1751,'275',1852,': .55em',1720,37,1701,1751,'185',1852,': 1em',249,'1em',1720,184,1701,1751,'67',1852,':-.75em; ',244,1728,189,1701,1751,'110',1852,':-.4em; ',244,1728,194,1701,1751,'175',1852,':-.25em',1720,198,1741,1742,'75',1852,':-.5em',1720,202,1741,1742,'133',1852,':-.2em',1720,206,1741,1742,'200',1852,248,1720,274,1701,1731,'-right:-.075em',1720,'accent',1701,'\'; ',268,'05em; left:.','15em',1720,497,1701,'\'; ',268,1960,'15em; font-',1842,1720,'baccent',1701,'\'; ',268,1960,1968,1846,'; ',244,'"});','if(jsMath.browser=="','Mozilla"){jsMath.Update.TeXfonts({cmex10:{"48":{c',0,'xF8EB;"},"49":{c',0,'xF8F6;"},"50":{c',0,'xF8EE;"},"51":{c',0,'xF8F9;"},"52":{c',0,'xF8F0;"},"53":{c',0,'xF8FB;"},"54":{c',0,'xF8EF;"},"55":{c',0,'xF8FA;"},"56":{c',0,'xF8F1;"},"57":{c',0,'xF8FC;"},"58":{c',0,'xF8F3;"},"59":{c',0,'xF8FE;"},"60":{c',0,'xF8F2;"},"61":{c',0,'xF8FD;"},"62":{c',0,'xF8F4;"},"64":{c',0,'xF8ED;"},"65":{c',0,'xF8F8;"},"66":{c',0,'xF8EC;"},"67":{c',0,'xF8F7;"}}});',1686,'accent',1688,'Arial unicode MS; ',268,1960,'05em"})}',1981,'MSIE"){jsMath.Browser.msieFontBug=1}jsMath.Macro("not","\\\\mathrel{\\\\rlap{\\\\kern 3mu/}}");jsMath.Macro("bowtie","\\\\mathrel\\\\triangleright\\\\kern-6mu\\\\mathrel\\\\triangleleft");jsMath.Box.defaultH=0.8;']
+]);
\ No newline at end of file
diff --git a/htdocs/jsMath/jsMath-fallback-symbols.js b/htdocs/jsMath/jsMath-fallback-symbols.js
new file mode 100644
index 0000000000..8db31f49d7
--- /dev/null
+++ b/htdocs/jsMath/jsMath-fallback-symbols.js
@@ -0,0 +1,28 @@
+/*
+ *  jsMath-fallback-symbols.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file makes changes needed to use image fonts for symbols
+ *  but standard native fonts for letters and numbers.
+ *
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 2004-2006 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+jsMath.Script.Uncompress([
+  ['jsMath.','Add(','jsMath.Img',',{','UpdateTeXFonts',':function(_1){for(var _2 in _1){for(var _3 in _1[_2]){',0,'TeX[_2][_3',']=_1[_2][_3];',0,7,'].tclass="i"+_2;}}}});',2,'.',4,'({cmr10',':{"33":{c:"!",lig:{"96":60}},"35":{c:"#"},"36":{c:"$"},"37":{c:"%"},"38":{c:"&amp;"},"40":{c:"(",d:0.2},"41":{c:")",d:0.2},"42":{c',':"*",d:-0.3},"','43":{c:"+",a:0.1},"44":{c:",",a:-0.3','},"45":{c:"-",a:0',',lig:{"45":123}},"46":{c:".",a:-0.25},"47":{c',':"/"},"','48":{c:"0','"},"49":{c:"1"},"50":{c:"2"},"51":{c:"3"},"52":{c:"4"},"53":{c:"5"},"54":{c:"6"},"55":{c:"7"},"56":{c:"8"},"57":{c:"9"},"58":{c:":"},"59":{c:";"},"61":{c:"=",a:0,d:-0.1},"63":{c:"?",lig:{"96":62}},"64":{c:"@"},"65":{c:"A",krn:{"116','":-0.0278,"','67',24,'79',24,'71',24,'85',24,'81',24,'84":-0.0833,"89":-0.0833,"86":-0.111,"87":-0.111}},"','66":{c:"B','"},"','67":{c:"C',37,'68":{c:"D','",krn:{"','88',24,'87',24,'65',24,'86',24,'89','":-0.0278}},"','69":{c:"E',37,'70":{c:"F",','krn:{"111":-0.0833,"101":-0.0833,"117":-0.0833,"114":-0.0833,"97":-0.0833,"65":-0.111,"79":-0.0278,"67":-0.0278,"71":-0.0278,"81":-0.0278}},"','71":{c:"G',37,'72":{c:"H',37,'73":{c:"I',41,'73','":0.0278}},"','74":{c:"J',37,'75":{c:"K',41,'79',24,'67',24,'71',24,'81',51,'76":{c:"L",krn:{"',35,'77":{c:"M',37,'78":{c:"N',37,'79":{c:"O',41,'88',24,'87',24,'65',24,'86',24,'89',51,'80":{c:"P",','krn:{"65":-0.','0833,"111',24,'101',24,'97',24,'46":-0.0833,"44":-0.0833}},"','81":{c:"Q",d:','1},"82":{c:"R',41,'116',24,'67',24,'79',24,'71',24,'85',24,'81',24,35,'83":{c:"S',37,'84":{c:"T',41,'121',24,'101":-0.0833,"111":-0.0833,"114":-0.0833,"97":-0.0833,"65":-0.0833,"117":-0.0833}},"','85":{c:"U',37,'86":{c:"V",ic:0.','0139,',55,'87":{c:"W",ic:0.','0139,',55,'88":{c:"X",','krn:{"79',24,'67',24,'71',24,'81',51,'89":{c:"Y",ic:0.','025',',krn:{"',125,'90":{c:"Z',37,'91":{c:"[",d:0.1','},"93":{c:"]",d:0.1','},"97":{c:"a','",a:0,krn:{"','118',24,'106":0.0556,"121',24,'119',51,'98":{c:"b",','krn:{"101":0.0278,"111":0.0278,"120":-0.0278,"100":0.0278,"99":0.0278,"113":0.0278,"118":-0.0278,"106":0.0556,"121":-0.0278,"119":-0.0278}},"','99":{c:"c',152,'104',24,'107',51,'100":{c:"d',37,'101":{c:"e",a',':0},"102":{c:"f",ic:0.0778,krn:{"39":0.0778,"63":0.0778,"33":0.0778,"41":0.0778,"93":0.0778},lig:{"105":12,"102":11,"108":13}},"103":{c:"g",a:0,d:0.2,ic:0.0139,krn:{"106":0.0278}},"104":{c:"h",krn:{"116',24,'117',24,'98',24,'121',24,'118',24,'119',51,'105":{c:"i"},"106":{c:"j",d:','1},"107":{c:"k',41,'97','":-0.0556,"','101',24,'97',24,'111',24,'99',51,'108":{c:"l',37,'109":{c:"m',152,'116',24,'117',24,'98',24,'121',24,'118',24,'119',51,'110":{c:"n',152,'116',24,'117',24,'98',24,'121',24,'118',24,'119',51,'111":{c:"o",a:0,',160,'112":{c:"p",a:0,d:0.2,',160,'113":{c:"q",a:0,d:','1','},"114":{c:"r",a:0','},"','115":{c:"s",a:0','},"116":{c:"t',41,'121',24,'119',51,'117":{c:"u',152,'119',51,'118":{c:"v','",a:0,ic:0.','0139',145,'97',186,'101',24,'97',24,'111',24,'99',51,'119":{c:"w',245,'0139',145,'101',24,'97',24,'111',24,'99',51,'120":{c:"x",a:0','},"121":{c:"y','",a:0,d:0.2,ic:0.','0139',145,'111',24,'101',24,'97',24,102,'122":{c:"z",a:0','}},cmmi10:{"65":{c:"A',41,'127":0.139}},"',36,'",ic:0.','0502,','krn:{"127":0.0833}},"',38,287,'0715',145,'61',24,'59":-0.0556,"58":-0.0556,"127":0.','0833}},"','68":{c:"D',287,'0278',',krn:{"127":0.0556}},"',52,287,'0576,',289,54,'ic:0.139',',krn:{"61":-0.0556,"59":-0.111,"58":-0.111,"127":0.',297,56,'",',289,58,287,'0812',145,'61',186,296,'0556}},"','73":{c:"I",ic:0.','0785',145,'127":0.111}},"',64,287,'0962',308,'167}},"75":{c:"K',287,'0715',145,'61',186,296,320,'76":{c:"L",','krn:{"127":0.0278}},"',78,287,'109',145,'61',186,296,297,80,287,'109',145,'61":-0.0833,"61',24,296,297,'79":{c:"O',287,300,',',289,94,'ic:0.139',308,297,103,'0.2,',289,'82":{c:"R',287,'00773,',289,119,287,'0576',145,'61',186,296,297,'84":{c:"T",ic:0.','139',145,'61',24,296,297,126,287,'109',145,'59":-0.111,"58":-0.111,"61',186,'127',63,128,'222',',krn:{"59":-0.167,"58":-0.167,"61":-0.111}},"',131,'139',396,134,'ic:0.0785',145,'61":-0.0833,"61',24,296,297,143,'222',396,147,287,'0715',145,'61',186,296,297,'97":{c:"a",a:0},"98":{c:"b',37,'99":{c:"c",a:0',301,167,41,'89":0.0556,"90',186,'106":-0.111,"102":-0.167,"127":0.167}},"101":{c:"e",a:0',301,'102":{c:"f",d:','0.2,ic:0.','108',145,296,'167}},"103":{c:"g',272,'0359,',338,'104":{c:"h',41,'127',51,182,429,'0572',145,'59',186,'58":-0.',320,'107":{c:"k',287,'0315},"',195,287,'0197,',289,'109":{c:"m",a:0},"110":{c:"n",a:0},"111":{c:"o",a:0',301,227,289,'113":{c:"q',272,'0359,',289,'114":{c:"r',245,300,145,296,320,233,301,'116":{c:"t",',289,'117":{c:"u",a:0,',338,'118":{c:"v',245,'0359,',338,'119":{c:"w',245,'0269,',289,270,',',338,'121":{c:"y',272,'0359',301,'122":{c:"z',245,'044',145,'127":0.0556}}},cmsy10:{"0":{c:"&#x2212;",a:0.1}},cmti10:{"33":{c:"!",lig:{"96":60}},"35":{c:"#",ic:0.0662},"37":{c:"%",ic:0.136},"38":{c:"&amp;",ic:0.0969},"40":{c:"(",d:',429,'162},"41":{c:")",d:',429,'0369},"42":{c:"*",ic:0.149},"43":{c:"+",a:0.1,ic:0.0369},"44":{c:",",a:-0.3,d:0.2,w:0.278},"45":{c:"-",a:0,ic:0.0283',20,':"/",ic:0.162},"',22,'",ic:0.136},"','49":{c:"1',503,'50":{c:"2',503,'51":{c:"3',503,'52":{c:"4',503,'53":{c:"5',503,'54":{c:"6',503,'55":{c:"7',503,'56":{c:"8',503,'57":{c:"9',503,'58":{c:":",ic:0.0582},"59":{c:";",ic:0.0582},"61":{c:"=",a:0,d:-0.1,ic:0.0662},"63":{c:"?",ic:0.122,lig:{"96":62}},"64":{c:"@",ic:0.096},"65":{c:"A",','krn:{"110":-0.0256,"108":-0.0256,"114":-0.0256,"117":-0.0256,"109":-0.0256,"116":-0.0256,"105":-0.0256,"67":-0.0256,"79":-0.0256,"71":-0.0256,"104":-0.0256,"98":-0.0256,"85":-0.0256,"107":-0.0256,"118":-0.0256,"119":-0.0256,"81":-','0.0256,"84','":-0.0767,"','89',525,'86','":-0.102,"','87',529,'101":-0.0511,"97":-0.0511,"111":-0.0511,"100":-0.0511,"99":-0.0511,"103":-0.0511,"113":-0.0511}},"',36,'",ic:0.103','},"',38,287,'145},"','68":{c:"D','",ic:0.094,krn:{"88":-0.0256,"87":-0.0256,"65":-0.0256,"86":-0.0256,"89":-0.0256}},"',52,'",ic:0.12},"',54,'ic:0.133',145,'111',525,'101',525,'117','":-0.0767,"114":-0.0767,"97":-0.0767,"','65',529,'79":-0.0256,"67":-0.0256,"71":-0.0256,"81":-0.0256}},"',56,287,'0872},"',58,'",ic:0.164},"',321,'158},"',64,287,'14},"75":{c:"K',287,'145',145,554,76,'84',525,'89',525,'86',529,'87',529,532,78,559,80,559,'79":{c:"O',540,94,'ic:0.103',145,'65":-0.0767}},"',103,429,'094},"82":{c:"R',287,'0387,',523,'0.0256,"84',525,'89',525,'86',529,'87',529,532,119,542,379,'133',145,'121',525,'101',525,'111',551,'117',525,588,126,559,128,'184',145,'111',525,'101',525,'117',551,'65',529,554,131,'184',145,588,134,'ic:0.158',145,554,143,'194',145,'101',525,'111',551,'117',525,588,147,287,538,149,',ic:0.188',150,',ic:0.105},"97":{c:"a',245,'0767},"',159,'ic:0.0631',145,532,'99":{c:"c',245,'0565',145,532,167,534,145,'108":0.0511}},"','101":{c:"e',245,'0751',145,532,'102":{c:"f',287,'212',145,'39":0.104,"63":0.104,"33":0.104,"41":0.104,"93":0.104},lig:{"105":12,"102":11,"108":13}},"103":{c:"g',272,'0885},"','104":{c:"h',287,658,'105":{c:"i',287,'102},"106":{c:"j",d:',429,538,'107":{c:"k',287,'108},"',195,534,145,671,'109":{c:"m',245,658,'110":{c:"n',245,'0767',145,'39":-0.102}},"111":{c:"o',245,'0631',145,532,'112":{c:"p',272,'0631',145,532,'113":{c:"q',272,683,'114":{c:"r',245,'108',145,532,'115":{c:"s',245,'0821},"116":{c:"t',287,'0949},"117":{c:"u',245,658,'118":{c:"v',245,694,'119":{c:"w',245,'108',145,671,'120":{c:"x',245,'12},"121":{c:"y',272,683,'122":{c:"z',245,'123}},cmbx10',16,':"*"},"',18,',d:0.2,w:0.278},"45":{c:"-",a:0',20,':"/"},"',22,23,24,'67',24,'79',24,'71',24,'85',24,'81',24,35,36,37,38,37,'68":{c:"D',41,'88',24,'87',24,'65',24,'86',24,'89',51,52,37,54,55,56,37,58,37,'73":{c:"I',41,'73',63,64,37,'75":{c:"K',41,'79',24,'67',24,'71',24,'81',51,76,35,78,37,80,37,'79":{c:"O',41,'88',24,'87',24,'65',24,'86',24,'89',51,94,95,'0833,"111',24,'101',24,'97',24,102,103,'1},"82":{c:"R',41,'116',24,'67',24,'79',24,'71',24,'85',24,'81',24,35,119,37,'84":{c:"T',41,'121',24,125,126,37,128,'0139,',55,131,'0139,',55,134,'krn:{"79',24,'67',24,'71',24,'81',51,143,'025',145,125,147,37,149,150,'},"97":{c:"a',152,'118',24,'106":0.0556,"121',24,'119',51,159,160,'99":{c:"c',152,'104',24,'107',51,167,37,'101":{c:"e",a',170,24,'117',24,'98',24,'121',24,'118',24,'119',51,182,'1},"107":{c:"k',41,'97',186,'101',24,'97',24,'111',24,'99',51,195,37,'109":{c:"m',152,'116',24,'117',24,'98',24,'121',24,'118',24,'119',51,'110":{c:"n',152,'116',24,'117',24,'98',24,'121',24,'118',24,'119',51,225,160,227,160,229,'1',231,'},"',233,'},"116":{c:"t',41,'121',24,'119',51,'117":{c:"u',152,'119',51,'118":{c:"v',245,'0139',145,'97',186,'101',24,'97',24,'111',24,'99',51,'119":{c:"w',245,'0139',145,'101',24,'97',24,'111',24,'99',51,270,'},"121":{c:"y',272,'0139',145,'111',24,'101',24,'97',24,102,282,'}}});if(',0,'browser=="MSIE"&&',0,'platform=="mac"){','jsMath.Setup.Styles({".typeset .math":"font-style: normal",".typeset .typeset":"font-style: normal",".typeset .icmr10":"font-family: ','Times','",".typeset .icmmi10":"font-family: ',1020,'; font-style: italic",".typeset .icmbx10":"font-family: ',1020,'; font-weight: bold",".typeset .icmti10":"font-family: ',1020,'; font-style: italic"});}','else{',1019,'serif',1021,1030,1023,1030,1025,1030,1027,0,'Add(',2,',{symbols:[0,','1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,','34,39,60,62,92,94,95,96',',123,124,125,126,127',']});',2,'.SetFont',15,':',2,'.symbols',',cmmi10:[0,',1042,'33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,','91,92,93,94,95,96',1044,'],cmsy10:[',1042,1054,'65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122',1044,'],cmex10:["all"],cmti10:',2,1051,'.concat(36),cmbx10:',2,1051,'});',2,'.LoadFont("cm-fonts");']
+]);
diff --git a/htdocs/jsMath/jsMath-fallback-unix.js b/htdocs/jsMath/jsMath-fallback-unix.js
new file mode 100644
index 0000000000..543c1fdee6
--- /dev/null
+++ b/htdocs/jsMath/jsMath-fallback-unix.js
@@ -0,0 +1,29 @@
+/*
+ *  jsMath-fallback-unix.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file makes changes needed for when the TeX fonts are not available
+ *  with a browser under Unix.
+ *
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 2004-2006 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+jsMath.Script.Uncompress([
+  ['jsMath.Add(jsMath.TeX,{cmr10',':[{c:"&Gamma;",','tclass:"greek"},{c:"&','Delta;",',2,'Theta;",',2,'Lambda;",',2,'Xi;",',2,'Pi;",',2,'Sigma;",',2,'Upsilon;",',2,'Phi;",',2,'Psi;",',2,'Omega;",','tclass:"','greek','"},{c',':"ff','",ic:0.0778,krn:{"39":0.0778,"63":0.0778,"33":0.0778,"41":0.0778,"93":0.0778},lig:{"105":','14,"108":15},','tclass:"normal"},{c',':"fi",',28,':"fl",',28,':"ffi",',28,':"ffl",',28,':"&#','x131',';",a:0,',28,':"j",d:0.2,',28,37,'x60;",',22,'accent','"},{c:"&#','xB4;",',22,46,47,'x2C7;",',22,46,47,'x2D8;",',22,46,24,':"<span style=\\"','position:relative; top',':.1em\\">&#x2C9',';</span>",',22,46,47,'x2DA;",',22,46,47,'x0327;",',28,37,'xDF;",',28,37,'xE6',39,28,37,'x153',39,28,37,'xF8;",',28,37,'xC6;",',28,37,'x152;",',28,37,'xD8;",',28,':"?",krn:{"108":-0.278,"76":-0.319},',28,':"!",lig:{"96":60},',28,37,'x201D;",',28,':"#",',28,':"$",',28,':"%",',28,':"&amp;",',28,37,'x2019;",krn:{"63":0.111,"33":0.','111},','lig:{"39":34},',28,':"(",','d:0.2,',28,':")",',117,28,':"*",',28,':"+",a',':0.1,',28,':",",a:-','0.3,d:0.2,','w:0.278,',28,':"-",a:0,lig:{"45":123},',28,':".",a:-0.','25,',28,':"/",',28,':"0",',28,':"1",',28,':"2",',28,':"3",',28,':"4",',28,':"5",',28,':"6",',28,':"7",',28,':"8",',28,':"9",',28,':":",',28,':";",',28,37,'xA1;",',28,':"=",','a:0,d:-0.','1,',28,37,'xBF;",',28,':"?",lig:{"96":62},',28,':"@",',28,':"A','",krn:{"','116','":-0.0278,"','67',179,'79',179,'71',179,'85',179,'81',179,'84','":-0.0833,"','89',191,'86','":-0.111',',"87":-0.',113,28,':"B",',28,':"C",',28,':"D',177,'88',179,'87',179,'65',179,'86',179,'89','":-0.0278','},',28,':"E",',28,':"F',177,'111',191,'101',191,'117','":-0.0833,"114":-0.0833,"97":-0.0833,"65":-0.','111,"79',179,'67',179,'71',179,'81',214,'},',28,':"G",',28,':"H",',28,':"I',177,'73":0.','0278','},',28,':"J",',28,':"K',177,'79',179,'67',179,'71',179,'81',214,'},',28,':"L',177,'84',191,'89',191,'86',195,196,113,28,':"M",',28,':"N",',28,':"O',177,'88',179,'87',179,'65',179,'86',179,'89',214,'},',28,':"P',177,'65',191,'111',179,'101',179,'97',179,'46',191,'44":-0.0833},',28,':"Q",d:1,',28,':"R',177,'116',179,'67',179,'79',179,'71',179,'85',179,'81',179,'84',191,'89',191,'86',195,196,113,28,':"S",',28,':"T',177,'121',179,'101',191,'111',226,'0833,"117":-0.0833','},',28,':"U",',28,':"V",','ic:0.0139,krn:{"','111',191,'101',191,'117',226,'111,"79',179,'67',179,'71',179,'81',214,'},',28,':"W",',345,'111',191,'101',191,'117',226,'111,"79',179,'67',179,'71',179,'81',214,'},',28,':"X',177,'79',179,'67',179,'71',179,'81',214,'},',28,':"Y",ic:0.025,','krn:{"101',191,'111',226,339,'},',28,':"Z",',28,':"[",','d',125,28,37,'x201C;",',28,':"]",','d',125,28,37,'x2C6;",',22,46,47,'x2D9;",',22,46,47,'x2018;",lig:{"96":92},',28,':"a','",a:0,krn:{"','118',179,'106":0.','0556,"121',179,'119',214,'},',28,':"b',177,'101','":0.0278,"','111',438,'120',179,'100',438,'99',438,'113',438,'118',179,428,'0556,"121',179,'119',214,'},',28,':"c',425,'104',179,'107',214,'},',28,':"d",',28,':"e",a:0,',28,':"f',26,'12,"102":11,"108":13},',28,':"g",','a:0,d:0.2,ic:0.','0139,krn:{"',428,244,'},',28,':"h',177,'116',179,'117',179,'98',179,'121',179,'118',179,'119',214,'},',28,':"i",',28,41,28,':"k',177,'97','":-0.0556,"','101',179,'97',179,'111',179,'99',214,'},',28,':"l",',28,':"m',425,'116',179,'117',179,'98',179,'121',179,'118',179,'119',214,'},',28,':"n',425,'116',179,'117',179,'98',179,'121',179,'118',179,'119',214,'},',28,':"o',425,'101',438,'111',438,'120',179,'100',438,'99',438,'113',438,'118',179,428,'0556,"121',179,'119',214,'},',28,':"p",a:0,',117,393,438,'111',438,'120',179,'100',438,'99',438,'113',438,'118',179,428,'0556,"121',179,'119',214,'},',28,':"q",a:0,',117,28,':"','r",a:0,',28,':"s",a:0,',28,':"t',177,'121',179,'119',214,'},',28,':"u',425,'119',214,'},',28,':"v",a:0,',345,'97',504,'101',179,'97',179,'111',179,'99',214,'},',28,':"w",a:0,',345,'101',179,'97',179,'111',179,'99',214,'},',28,':"x",a:0,',28,':"y",',475,476,'111',179,'101',179,'97',179,'46',191,'44":-0.0833},',28,':"z",a:0,',28,37,'x2013',';",a:0.1,','ic:0.0278,','lig:{"45":124},',28,37,'x2014',662,663,28,37,'x2DD;",',22,46,47,'x2DC;",',22,46,47,'xA8;",',22,46,'"}],cmmi10',1,'ic:0.139',',krn:{"61":-0.0556,"59":-0.111,"58":-0.111,"127":0.','0833},',22,'igreek"},{c:"&',3,'krn:{"127":0.','167},',22,689,5,'ic:0.',244,',krn:{"127":0.','0833},',22,689,7,691,'167},',22,689,9,'ic:0.0757',698,'0833},',22,689,11,'ic:0.0812,krn:{"61',504,'59":-0.0556,"58":-0.0556,"127":0.','0556},',22,689,13,'ic:0.0576',698,'0833},',22,689,15,'ic:0.139',686,'0556},',22,689,17,691,'0833},',22,689,19,'ic:0.11,krn:{"61',504,716,'0556},',22,689,21,'ic:0.0502',698,'0833},',22,689,'alpha',';",a:0,ic:0.','0037',698,244,'},',2,'beta;",','d:0.2,ic:0.','0528',698,'0833},',2,'gamma;",',475,'0556,',2,'delta;",ic:0.0378,krn:{"',716,'0556},',2,'epsilon;",a:0',698,'0556},',22,'symbol"},{c',':"&zeta;",',758,'0738',698,'0833},',2,'eta;",',475,'0359',698,'0556},',2,'theta;",ic:0.',244,698,'0833},',2,'iota;",a:0',698,'0556},',2,'kappa',39,2,'lambda;",',2,'mu',39,'d:0.2',698,244,'},',2,'nu',751,'0637,krn:{"',716,244,'},',2,'xi;",',758,'046',698,113,2,'pi',751,'0359,',2,'rho',39,'d:0.2',698,'0833},',2,'sigma',751,824,'krn:{"59',504,'58":-0.0556','},',2,'tau',751,'113,krn:{"',716,244,'},',2,'upsilon',751,'0359',698,244,'},',2,'phi',662,'d:0.2',698,'0833},',2,'chi',39,'d:0.2',698,'0556},',2,'psi',662,758,'0359',698,113,2,'omega',751,824,2,'epsilon;",a:0',698,'0833},',22,'greek',47,'x3D1;",',691,'0833},',28,37,'x3D6',751,244,',',28,37,'x3F1',39,'d:0.2',698,'0833},',28,37,'x3C2;",',475,'0799',698,'0833},',28,37,'x3D5',662,'d:0.2',698,'0833},',28,37,'x21BC',';",a:0,d:-0.','2,',22,'harpoon',47,'x21BD',916,'1,',22,'harpoon',47,'x21C0',916,'2,',22,'harpoon',47,'x21C1',916,'1,',22,'harpoon',24,60,'font-size: 133%; ',61,':-.1em; margin:-.2em; left:-.05em\\">&#','x02D3',63,'a',125,22,'symbol"},{c:"<span style=\\"',940,61,942,'x02D2',63,'a',125,22,948,'font-size:50%\\">&#','x25B7',63,22,948,958,'x25C1',63,22,775,':"0",',28,':"1",',28,':"2",',28,':"3",',28,':"4",',28,':"5",',28,':"6",',28,':"7",',28,':"8",',28,':"9",',28,133,'3,',28,':",",a:-',128,28,':"&lt',662,28,136,'krn:{"1',504,'65',504,'77',504,'78',504,'89":0.0556,"90":-0.0556},',28,':"&gt',662,28,60,958,'x2605',63,'a:0,','tclass:"symbol"},{c:"&#','x2202;",ic:0.0556',698,'0833},',28,':"A",',691,'139','},tclass:"italic"},{c:"','B",ic:0.0502',698,'0833',1024,'C",ic:0.0715,krn:{"61',179,716,'0833',1024,'D",ic:0.',244,698,'0556',1024,'E",ic:0.0576',698,'0833',1024,'F",ic:0.139',686,'0833',1024,'G",',691,'0833',1024,'H",ic:0.0812,krn:{"61',504,716,'0556',1024,'I",ic:0.0785',698,'111',1024,'J",ic:0.0962',686,'167',1024,'K",ic:0.0715,krn:{"61',504,716,'0556',1024,'L",',691,244,1024,'M','",ic:0.109,krn:{"','61',504,716,'0833',1024,'N',1074,'61',191,'61',179,716,'0833',1024,'O",ic:0.',244,698,'0833',1024,'P",ic:0.139',686,'0833',1024,'Q",d:0.2',698,'0833',1024,'R",ic:0.00773',698,'0833',1024,'S",ic:0.0576,krn:{"61',504,716,'0833',1024,'T','",ic:0.139,krn:{"','61',179,716,'0833',1024,'U',1074,'59',195,',"58',195,',"61',504,'127":0.',244,1024,'V",ic:0.222,krn:{"59','":-0.167,"','58',1130,'61',195,1024,'W',1112,'59',1130,'58',1130,'61',195,1024,'X",ic:0.0785,krn:{"61',191,'61',179,716,'0833',1024,'Y",ic:0.222,krn:{"59',1130,'58',1130,'61',195,1024,'Z",ic:0.0715,krn:{"61',504,716,'0833},',22,'italic',47,'x266D;",',22,'symbol2',47,'x266E;",',22,'symbol2',47,'x266F;",',22,'symbol2',47,'x2323',916,'1,',28,37,'x2322',916,'1,',28,37,'x2113;",',691,113,22,775,':"a",a:0,',22,'italic"},{c:"','b",',22,1195,'c",a:0',698,'0556',1024,'d',177,'89":0.0556,"90',504,'106',195,',"102',1130,1126,'167',1024,'e",a:0',698,'0556',1024,'f",',758,'108,krn:{"',716,'167',1024,'g",',475,'0359',698,244,1024,'h',177,'127',214,1024,'i",',22,1195,'j",',758,'0572,krn:{"59',504,837,1024,'k",ic:0.0315,',22,1195,'l",ic:0.0197',698,'0833',1024,'m",a:0,',22,1195,'n",a:0,',22,1195,'o",a:0',698,'0556',1024,'p",a:0,d:0.2',698,'0833',1024,'q",',475,'0359',698,'0833',1024,599,663,'krn:{"',716,'0556',1024,'s",a:0',698,'0556',1024,'t",',691,'0833',1024,'u",a:0',698,244,1024,'v",a:0,ic:0.0359',698,244,1024,'w",a:0,ic:0.0269',698,'0833',1024,'x",a:0',698,244,1024,'y",',475,'0359',698,'0556',1024,'z",a:0,ic:0.044',698,'0556},',22,'italic',47,'x131;",a:0',698,244,1024,'j",d:0.2',698,'0833},',22,'italic',47,'x2118',39,'d:0.2',698,113,28,60,'position:relative; left: .4em; top: -.8em; font-size: 50%\\">&#x2192',63,'ic:0.154,',1016,'x0311;",ic:0.399,',22,'normal"}],cmsy10:[{c',37,'x2212',662,1016,'xB7',916,'2,',1016,'xD7',39,22,948,61,':.2em\\">&#x2A',63,'a:0,',1016,'xF7',39,1016,'x25CA;",',1016,'xB1',662,1016,'x2213;",',1016,'x2295;",',1016,'x2296;",',1016,'x2297;",',1016,'x2298;",',1016,'x2299;",',1016,'x25EF;",',22,948,61,':.25em;\\">&#xB0',63,166,'1,',1016,'x2022',916,'2,',1016,'x224D',662,1016,'x2261',662,1016,'x2286;",',1016,'x2287;",',1016,'x2264;",',1016,'x2265;",',1016,'x227C;",',1016,'x227D;",',22,775,':"~",',166,'2,',28,37,'x2248',662,'d:-0.1,',1016,'x2282;",',1016,'x2283;",',1016,'x226A;",',1016,'x226B;",',1016,'x227A;",',1016,'x227B;",',1016,'x2190',916,'15,',22,'arrows"},{c:"&#','x2192',916,'15,',22,1431,'x2191',';",h:1,',22,1431,'x2193',1438,22,1431,'x2194',39,22,1431,'x2197',1438,22,1431,'x2198',1438,22,1431,'x2243',662,1016,'x21D0',662,22,1431,'x21D2',662,22,1431,'x21D1;",h:0.9,d',125,22,1431,'x21D3;",h:0.9,d',125,22,1431,'x21D4',662,22,1431,'x2196',1438,22,1431,'x2199',1438,22,1431,'x221D',662,22,948,940,'margin-right',': -.1em; position: relative; top:.4em\\">&#x2032',63,'a:0,',1016,'x221E',662,1016,'x2208;",',1016,'x220B;",',1016,'x25B3;",',1016,'x25BD;",',22,775,136,22,948,'font-size:50%; ',61,':-.3em; ',1493,':-.2em\\">|</span>",a:0,',28,37,'x2200;",',1016,'x2203;",',1016,'xAC',916,'1,',22,'symbol1',47,'x2205;",',1016,'x211C;",',1016,'x2111;",',1016,'x22A4;",',1016,'x22A5;",',1016,'x2135;",',22,775,':"A',177,'48":0.194},',22,'cal"},{c:"','B",ic:0.0304',',krn:{"48":0.','139},',22,1547,'C",ic:0.0583',1549,'139},',22,1547,'D",ic:0.',244,1549,'0833},',22,1547,'E",ic:0.0894',1549,113,22,1547,'F",ic:0.0993',1549,113,22,1547,'G",',758,'0593',1549,113,22,1547,'H",ic:0.00965',1549,113,22,1547,'I",ic:0.0738',1549,244,'},',22,1547,'J",',758,'185',1549,'167},',22,1547,'K",ic:0.0144',1549,'0556},',22,1547,'L',177,'48":0.139},',22,1547,'M',177,'48":0.139},',22,1547,'N",ic:0.147',1549,'0833},',22,1547,'O",ic:0.',244,1549,113,22,1547,'P",ic:0.0822',1549,'0833},',22,1547,'Q",d:0.2',1549,113,22,1547,'R',177,'48":0.0833},',22,1547,'S",ic:0.075',1549,'139},',22,1547,'T",ic:0.254',1549,244,'},',22,1547,'U",ic:0.0993',1549,'0833},',22,1547,'V",ic:0.0822',1549,244,'},',22,1547,'W",ic:0.0822',1549,'0833},',22,1547,'X",ic:0.146',1549,'139},',22,1547,'Y",ic:0.0822',1549,'0833},',22,1547,'Z",ic:0.0794',1549,'139},',22,'cal',47,'x22C3;",',1016,'x22C2;",',1016,'x228E;",',1016,'x22C0;",',1016,'x22C1;",',1016,'x22A2;",',1016,'x22A3;",',22,'symbol2',47,'xF8F0;",','a:',128,28,37,'xF8FB;",','a:',128,28,37,'xF8EE;",','a:',128,28,37,'xF8F9;",','a:',128,28,':"{",',117,28,':"}",',117,28,37,'x3008;",','a:',128,28,37,'x3009;",','a:',128,28,':"|",d',125,22,'vertical"},{c',':"||",','d:0,',22,'vertical',47,'x2195',1438,'d:0.15,',22,1431,'x21D5;",a:0.2,d',125,22,1431,'x2216;",','a:0.3,d',125,28,37,'x2240;",',22,948,61,': .8em\\">&#x221A',63,'h:0.04,d:0.9,',28,37,'x2210;",a:0.4,',1016,'x2207;",',1016,'x222B',1438,'d',125,'ic:0.111,',22,'root',47,'x2294;",',1016,'x2293;",',1016,'x2291;",',1016,'x2292;",',1016,'xA7;",d',125,28,37,'x2020;",d',125,28,37,'x2021;",d',125,28,37,'xB6;",a:0.3,d',125,28,37,'x2663;",',1016,'x2666;",',1016,'x2665;",',1016,'x2660;",',22,'symbol"}],cmex10:[{c',116,'h:0.04,d:1.16,n:','16,',22,'delim1"},{c',119,1812,'17,',22,1815,402,1812,'104,',22,1815,409,1812,'105,',22,'delim1',47,'xF8F0",',1812,'106,',22,'delim1',47,1704,1812,'107,',22,'delim1',47,1709,1812,'108,',22,'delim1',47,1714,1812,'109,',22,1815,1718,1812,'110,',22,1815,1721,1812,'111,',22,'delim1',47,1725,1812,'68,',22,'delim1c',47,1730,1812,'69,',22,'delim1c',24,':"|",','h:0.7,d:0,delim:{rep:','12},',22,1737,1738,1879,'13},',22,1737,136,1812,'46,',22,'delim1b',47,1752,1812,'47,',22,'delim1b','"},{c:"(",','h:0.04,d:1.76,n:','18,',22,'delim2',24,119,1900,'19,',22,'delim2',1899,'h:0.04,d:2.36,n:','32,',22,'delim3"},{c',119,1911,'33,',22,1914,402,1911,'34,',22,1914,409,1911,'35,',22,'delim3',47,1699,1911,'36,',22,'delim3',47,1704,1911,'37,',22,'delim3',47,1709,1911,'38,',22,'delim3',47,1714,1911,'39,',22,1914,1718,1911,'40,',22,1914,1721,1911,'41,',22,'delim3',47,1725,1911,'42,',22,'delim3c',47,1730,1911,'43,',22,'delim3c',24,136,1911,'44,',22,'delim3b',47,1752,1911,'45,',22,'delim3b',1899,'h:0.04,d:2.96,','n:48,',22,'delim4"},{c',119,1989,'n:49,',22,1992,402,1989,'n:50,',22,1992,409,1989,'n:51,',22,'delim4',47,1699,1989,'n:52,',22,'delim4',47,1704,1989,'n:53,',22,'delim4',47,1709,1989,'n:54,',22,'delim4',47,1714,1989,'n:55,',22,1992,1718,1989,'n:56,',22,1992,1721,1989,'n:57,',22,'delim4',47,1725,1989,22,'delim4c',47,1730,1989,22,'delim4c',24,136,1989,22,'delim4b',47,1752,1989,22,'delim4b',24,136,1900,'30,',22,'delim2b',47,1752,1900,'31,',22,'delim2b',47,'xF8EB;",h:0.8,d:0.15,delim:{top:48,bot:64,rep:66},',22,'delim',24,':"&'],
+  ['#xF8F6',';",h:0.8,d:0.15,delim:{','top:','49,bot:65,rep:67','},tclass:"delim"},{c:"&#','xF8EE',1,2,'50,bot:52,rep:54',4,'xF8F9',1,2,'51,bot:53,rep:55',4,'xF8F0',1,'bot:52,rep:54',4,'xF8FB',1,'bot:53,rep:55',4,'xF8EF',1,2,'50,rep:54',4,'xF8FA',1,2,'51,rep:55',4,'xF8F1',1,2,'56,mid:60,bot:58,rep:62',4,'xF8FC',1,2,'57,mid:61,bot:59,rep:62',4,'xF8F3',1,'top:56,bot:','58,rep:62',4,'xF8FE',1,'top:57,bot:','59,rep:62',4,'xF8F2',1,'rep:63',4,'xF8FD',1,'rep:119',4,'xF8F4',1,'rep:62},tclass:"delim"},{c:"|",','h:0.65,d:0,delim:{top:','120,bot:121',',rep:63},tclass:"','vertical','"},{c:"&#','xF8ED',1,45,'59,rep:62',4,'xF8F8',1,50,'58,rep:62',4,'xF8EC',1,'rep:66',4,'xF8F7',1,'rep:67',4,'x3008;",','h:0.04,d:1.76,n:','28',',tclass:"','delim2c',68,'x3009;",',88,'29',90,91,68,'x2294',';",h:0,d:1,n:','71',90,'bigop1',68,'x2294',';",h:0.1,d:1.5,tclass:"','bigop2',68,'x222E',';",h:0,d:1.11,ic:0.095,n:','73',90,'bigop1c',68,'x222E;",h:0,d:2.22,ic:0.222',90,'bigop2c',68,'x2299',100,'75',90,103,68,'x2299',106,107,68,'x2295',100,'77',90,103,68,'x2295',106,107,68,'x2297',100,'79',90,103,68,'x2297',106,107,68,'x2211',100,'88',90,'bigop1a',68,'x220F',100,'89',90,153,68,'x222B',110,'90',90,113,68,'x222A',100,'91',90,'bigop1b',68,'x2229',100,'92',90,171,68,'x228E',100,'93',90,171,68,'x2227',100,'94',90,103,68,'x2228',100,'95',90,103,68,'x2211;",h:0.1,d:1.6',90,'bigop2a',68,'x220F',106,199,68,'x222B;",h:0,d:2.22,ic:0.222',90,117,68,'x222A',106,'bigop2b',68,'x2229',106,211,68,'x228E',106,211,68,'x2227',106,107,68,'x2228',106,107,68,'x2210',100,'97',90,153,68,'x2210',106,199,68,'xFE3F;",h:0.','722,w:0.65,n:99',90,'wide1',68,239,'85,w:1.1,n:100',90,'wide2',68,239,'99,w:1.65',90,'wide3',68,'x2053;",h:0.','722,w:0.75,n:102',90,'wide1a',68,254,'8,w:1.35,n:103',90,'wide2a',68,254,'99,w:2',90,'wide3a','"},{c:"[",',88,'20',90,'delim2','"},{c:"]",',88,'21',90,272,68,'xF8F0;",',88,'22',90,272,68,'xF8FB;",',88,'23',90,272,68,'xF8EE;",',88,'24',90,272,68,10,'",',88,'25',90,272,'"},{c:"{",',88,'26',90,272,'"},{c:"}",',88,'27',90,272,'"},{c:"<span style=\\"font-size: ','125','%; position:relative; top:.','95em','\\">&#x221A;</span>",h:0.','04,d:1.16,n:113',90,'root',313,'190',315,'925em',317,'04,d:1.76,n:114',90,320,313,'250',315,'925em',317,'06,d:2.36,n:115',90,320,313,'320',315,'92em',317,'08,d:2.96,n:116',90,320,313,'400',315,'92em',317,'1,d:3.75,n:117',90,320,313,'500',315,'9em',317,'12,d:4.5,n:118',90,320,313,'625',315,'9em',317,'14,d:5.7',90,320,'"},{c:"<span style=\\"margin:.001em\\">||</span>",',64,'126,bot:127',',rep:119},tclass:"',67,68,'x25B5;",h:0.','45,delim:{',2,'120',66,'arrow1',68,'x25BF;",h:0.',376,'bot:121',66,380,313,'67',315,'35em; margin-','left:-.5em\\">&#','x256D',';</span>",h:0.','1',90,'symbol',313,'67',315,390,'right:-.5em\\">&#','x256E',393,'1',90,396,313,'67',315,390,391,'x2570',393,'1',90,396,313,'67',315,390,401,'x256F',393,'1',90,396,68,375,'5,delim:{',2,'126',372,'arrow2',68,382,429,'bot:127',372,433,'"}],cmti10:[{c:"&Gamma;",ic:0.133,','tclass:"igreek"},{c:"&','Delta;",',441,'Theta;",','ic:0.094,',441,'Lambda;",',441,'Xi;",ic:0.153,',441,'Pi;",ic:0.164,',441,'Sigma;",ic',':0.12,',441,'Upsilon;",ic:0.111,',441,'Phi;",ic:0.0599,',441,'Psi;",ic:0.111,',441,'Omega;",ic:0.103',90,'igreek','"},{c:"ff','",ic:0.212,krn:{"39":0.104,"63":0.104,"33":0.104,"41":0.104,"93":0.104},lig:{"105":','14,"108":15},','tclass:"italic"},{c',':"fi','",ic:0.103,',468,':"fl',470,468,':"ffi',470,468,':"ffl',470,468,':"&#x131;",a:0,','ic:0.','0767,',468,':"j",d:0.2,','ic:0.0374,',468,':"&#x60;",','tclass:"iaccent"},{c:"&#','xB4;",ic:0.0969,',489,'x2C7;",ic:0.083,',489,'x2D8;",','ic:0.108,',489,'x2C9;",ic:0.103,',489,'x2DA;",tclass:"','iaccent','"},{c:"?",','d:0.17,w:0.46,',468,':"&#xDF;",','ic:0.105,',468,':"&#xE6;",a:0,','ic:0.0751,',468,':"&#x153;",a:0,',508,468,':"&#xF8;",','ic:0.0919,',468,':"&#xC6;",','ic',454,468,':"&#x152;",','ic',454,468,':"&#xD8;",',445,468,':"?",krn:{"108":-0.','256,"76":-0.321},',468,':"!",','ic:0.124,lig:{"96":','60},',468,':"&#x201D;",','ic:0.0696,',468,':"#",ic:0.0662,',468,':"$",',468,':"%",ic:0.136,',468,':"&amp;",','ic:0.0969,',468,':"&#x2019;",','ic:0.124,','krn:{"63":0.','102,"33":0.102},lig:{"39":34},',468,':"(",d:0.2,','ic:0.162,',468,':")",d:0.2,','ic:0.0369,',468,':"*",ic:0.149,',468,':"+",a:0.1,','ic:0.0369,',468,':",",a:-0.3,d:0.2,w:0.278,',468,':"-",a:0,ic:0.0283',',lig:{"45":','123},',468,':".",a:-0.25,',468,':"/",ic:0.162,',468,':"0",ic:0.136,',468,':"1",ic:0.136,',468,':"2",ic:0.136,',468,':"3",ic:0.136,',468,':"4",ic:0.136,',468,':"5",ic:0.136,',468,':"6",ic:0.136,',468,':"7",ic:0.136,',468,':"8",ic:0.136,',468,':"9",ic:0.136,',468,':":",ic:0.0582,',468,':";",ic:0.0582,',468,':"&#xA1;",','ic:0.0756,',468,':"=",a:0,d:-0.1,','ic:0.0662,',468,':"&#xBF;",',468,':"?",','ic:0.122,','lig:{"96":','62},',468,':"@",ic:0.096,',468,':"A",','krn:{"110":-0.0256,"108":-0.0256,"114":-0.0256,"117":-0.0256,"109":-0.0256,"116":-0.0256,"105":-0.0256,"67":-0.0256,"79":-0.0256,"71":-0.0256,"104":-0.0256,"98":-0.0256,"85":-0.0256,"107":-0.0256,"118":-0.0256,"119":-0.0256,"81":-','0.0256,"84','":-0.0767,"','89',614,'86','":-0.102,"','87',618,'101','":-0.0511,"','97',622,'111',622,'100',622,'99',622,'103',622,'113','":-0.0511','},',468,':"B',470,468,':"C",','ic:0.145,',468,':"D",',445,'krn:{"88','":-0.0256,"','87',646,'65',646,'86',646,'89":-0.','0256},',468,':"E",ic',454,468,':"F','",ic:0.133,krn:{"','111',614,'101',614,'117','":-0.0767,"114":-0.0767,"97":-0.0767,"','65',618,'79',646,'67',646,'71',646,'81":-0.0256','},',468,':"G",ic:0.0872,',468,':"H",ic:0.164,',468,':"I",ic:0.158,',468,':"J",ic:0.14,',468,':"K",',641,'krn:{"79',646,'67',646,'71',646,675,'},',468,':"L",krn:{"84',614,'89',614,'86',618,'87',618,'101',622,'97',622,'111',622,'100',622,'99',622,'103',622,'113',634,'},',468,':"M",ic:0.164,',468,':"N",ic:0.164,',468,':"O",',445,'krn:{"88',646,'87',646,'65',646,'86',646,653,'0256},',468,':"P',470,'krn:{"65":-0.0767},',468,':"Q",d:1,',445,468,':"R",ic:0.0387,',612,'0.0256,"84',614,'89',614,'86',618,'87',618,'101',622,'97',622,'111',622,'100',622,'99',622,'103',622,'113',634,'},',468,':"S",ic',454,468,':"T',660,'121',614,'101',614,'111',666,'117',614,'65":-0.0767},',468,':"U",ic:0.164,',468,':"V",ic:0.','184,krn:{"','111',614,'101',614,'117',666,'65',618,'79',646,'67',646,'71',646,675,'},',468,':"W",ic:0.',789,'65":-0.0767},',468,':"X",ic:0.158,krn:{"79',646,'67',646,'71',646,675,'},',468,':"Y",ic:0.','194',',krn:{"101',614,'111',666,'117',614,'65":-0.0767},',468,':"Z",',641,468,':"[",d:0.1,','ic:0.188,',468,':"&#x201C;",','ic:0.169,',468,':"]",d:0.1,','ic:0.105,',468,':"&#x2C6;",ic:0.0665,',489,'x2D9;",ic:0.118,',489,'x2018;",',531,'92},',468,':"a','",a:0,ic:0.',483,468,':"b",ic:0.0631',822,622,'97',622,'111',622,'100',622,'99',622,'103',622,'113',634,'},',468,':"c',851,'0565',822,622,'97',622,'111',622,'100',622,'99',622,'103',622,'113',634,'},',468,':"d',470,'krn:{"108":','0.0511},',468,':"e',851,'0751',822,622,'97',622,'111',622,'100',622,'99',622,'103',622,'113',634,'},',468,':"f',466,'12,"102":11,"108":13},',468,':"g','",a:0,d:0.2,ic:0.','0885,',468,':"h",ic:0.',483,468,':"i",ic:0.102,',468,485,641,468,':"k",',495,468,':"l',470,892,'0.0511},',468,':"m',851,483,468,':"n',851,483,'krn:{"39":-0.102},',468,':"o',851,'0631',822,622,'97',622,'111',622,'100',622,'99',622,'103',622,'113',634,'},',468,':"p',919,'0631',822,622,'97',622,'111',622,'100',622,'99',622,'103',622,'113',634,'},',468,':"q',919,'0885,',468,':"r',851,'108',822,622,'97',622,'111',622,'100',622,'99',622,'103',622,'113',634,'},',468,':"s',851,'0821,',468,':"t",ic:0.0949,',468,':"u',851,483,468,':"v',851,'108,',468,':"w',851,1020,892,'0.0511},',468,':"x',851,'12,',468,':"y',919,'0885,',468,':"z',851,'123,',468,':"&#x2013;",a:0.1,ic:0.','0921',565,'124},',468,':"&#x2014;",a:0.1,ic:0.','0921,',468,':"&#x2DD;",',605,489,'x2DC;",ic:0.116,',489,'xA8;",tclass:"',500,'"}],cmbx10:[{c:"&Gamma',';",tclass:"bgreek"},{c:"&','Delta',1056,'Theta',1056,'Lambda',1056,'Xi',1056,'Pi',1056,'Sigma',1056,'Upsilon',1056,'Phi',1056,'Psi',1056,'Omega;",tclass:"bgreek"},{c:"ff','",ic:0.0778,krn:{"39":0.0778,"63":0.0778,"33":0.0778,"41":0.0778,"93":0.0778},lig:{"105":','14,"108":15},','tclass:"bold"},{c',':"fi",',1078,':"fl",',1078,':"ffi",',1078,':"ffl",',1078,481,1078,485,1078,':"&#x60',';",tclass:"baccent"},{c:"&#','xB4',1092,'x2C7',1092,'x2D8',1092,'x2C9',1092,499,'baccent',501,1078,504,1078,507,1078,510,1078,513,1078,516,1078,520,1078,524,1078,527,'278,"76":-0.319},',1078,530,606,'60},',1078,534,1078,':"#",',1078,':"$",',1078,':"%",',1078,543,1078,546,548,'111,"33":0.111},lig:{"39":34},',1078,551,1078,554,1078,':"*",',1078,559,1078,':",",a:-0.3,d:0.2,w:0.278,',1078,':"-",a:0',565,'123},',1078,':".",a:-0.25,',1078,':"/",',1078,':"0",',1078,':"1",',1078,':"2",',1078,':"3",',1078,':"4",',1078,':"5",',1078,':"6",',1078,':"7",',1078,':"8",',1078,':"9",',1078,':":",',1078,':";",',1078,596,1078,599,1078,':"&#xBF;",',1078,604,606,'62},',1078,':"@",',1078,':"A",krn:{"116','":-0.0278,"','67',1195,'79',1195,'71',1195,'85',1195,'81',1195,'84','":-0.0833,"','89',1207,'86":-0.','111,"87":-0.111},',1078,':"B",',1078,640,1078,':"D",krn:{"88',1195,'87',1195,'65',1195,'86',1195,653,'0278},',1078,':"E",',1078,':"F",krn:{"111',1207,'101',1207,'117','":-0.0833,"114":-0.0833,"97":-0.0833,"65":-0.','111,"79',1195,'67',1195,'71',1195,'81":-0.0278','},',1078,':"G",',1078,':"H",',1078,':"I",krn:{"73":0.0278},',1078,':"J",',1078,':"K",krn:{"79',1195,'67',1195,'71',1195,1242,'},',1078,':"L",krn:{"84',1207,'89',1207,1210,'111,"87":-0.111},',1078,':"M",',1078,':"N",',1078,':"O",krn:{"88',1195,'87',1195,'65',1195,'86',1195,653,'0278},',1078,':"P",krn:{"65',1207,'111',1195,'101',1195,'97',1195,'46',1207,'44":-0.0833},',1078,742,1078,':"R",krn:{"116',1195,'67',1195,'79',1195,'71',1195,'85',1195,'81',1195,'84',1207,'89',1207,1210,'111,"87":-0.111},',1078,':"S",',1078,':"T",krn:{"121',1195,'101',1207,'111',1235,'0833,"117":-0.0833','},',1078,':"U",',1078,788,'0139,krn:{"','111',1207,'101',1207,'117',1235,'111,"79',1195,'67',1195,'71',1195,1242,'},',1078,807,1331,'111',1207,'101',1207,'117',1235,'111,"79',1195,'67',1195,'71',1195,1242,'},',1078,':"X",krn:{"79',1195,'67',1195,'71',1195,1242,'},',1078,820,'025',822,1207,'111',1235,1325,'},',1078,830,1078,833,1078,836,1078,839,1078,':"&#x2C6',1092,'x2D9',1092,846,606,'92},',1078,':"a','",a:0,krn:{"','118',1195,'106":0.','0556,"121',1195,'119":-0.','0278},',1078,':"b",krn:{"101','":0.0278,"','111',1409,'120',1195,'100',1409,'99',1409,'113',1409,'118',1195,1402,'0556,"121',1195,1405,'0278},',1078,':"c',1399,'104',1195,'107":-0.0278},',1078,':"d",',1078,':"e",a:0,',1078,':"f',1076,'12,"102":11,"108":13},',1078,':"g',919,1331,1402,'0278},',1078,':"h",krn:{"116',1195,'117',1195,'98',1195,'121',1195,'118',1195,1405,'0278},',1078,':"i",',1078,485,1078,':"k",krn:{"97":-0.0556,"101',1195,'97',1195,'111',1195,'99":-0.','0278},',1078,':"l",',1078,':"m',1399,'116',1195,'117',1195,'98',1195,'121',1195,'118',1195,1405,'0278},',1078,':"n',1399,'116',1195,'117',1195,'98',1195,'121',1195,'118',1195,1405,'0278},',1078,':"o",a:0',822,1409,'111',1409,'120',1195,'100',1409,'99',1409,'113',1409,'118',1195,1402,'0556,"121',1195,1405,'0278},',1078,':"p",a:0,d:0.2',822,1409,'111',1409,'120',1195,'100',1409,'99',1409,'113',1409,'118',1195,1402,'0556,"121',1195,1405,'0278},',1078,':"q",a:0,d:0.2,',1078,':"r",a:0,',1078,':"s",a:0,',1078,':"t",krn:{"121',1195,1405,'0278},',1078,':"u',1399,1405,'0278},',1078,':"v',851,1331,'97":-0.0556,"101',1195,'97',1195,'111',1195,1471,'0278},',1078,':"w',851,'0139',822,1195,'97',1195,'111',1195,1471,'0278},',1078,':"x",a:0,',1078,':"y',919,1331,'111',1195,'101',1195,'97',1195,'46',1207,'44":-0.0833},',1078,':"z",a:0,',1078,1040,'0278',565,'124},',1078,1045,'0278,',1078,':"&#x2DD',1092,'x2DC',1092,1053,1102,'"}]});','jsMath.Setup.Styles','({".typeset .math','":"font-style: ','normal','",".typeset .','italic',1622,1625,1624,'bold":"','font-weight: bold',1624,'cmr10','":"font-family: ','serif',1624,'cal',1633,'cursive',1624,'arrows','":"",".typeset .',380,1641,433,1641,'harpoon','":"font-size: ','125%",".typeset .',396,1641,'symbol2',1641,'delim1',1647,'133',315,'75em',1624,'delim1b',1647,'133',315,'8em; margin',': -.1em',1624,'delim1c',1647,'120',315,'8em',';",".typeset .',272,1647,'180',315,1657,1624,'delim2b',1647,'190',315,1663,': -.1em',1624,91,1647,'167',315,'8em',1671,'delim3',1647,'250',315,'725em',1624,'delim3b',1647,'250',315,1663,': -.1em',1624,'delim3c',1647,'240',315,'775em',1671,'delim4',1647,'325',315,'7em',1624,'delim4b',1647,'325',315,1663,': -.1em',1624,'delim4c',1647,'300',315,'8em',1671,'delim',1641,67,1641,'greek',1641,464,1622,1625,1624,'bgreek":"',1630,1624,103,1647,'133%; ','position: relative; top',': .85em; margin:-.05em',1624,153,1647,'100%; ',1745,': .775em',1671,171,1647,'160%; ',1745,': .7em','; margin:-.1em',1624,113,1647,'125%; ',1745,': .',1657,1759,1671,107,1647,'200%; ',1745,': .',1663,':-.07em',1624,199,1647,'175%; ',1745,1758,1671,211,1647,'270%; ',1745,': .62em',1759,1624,117,1647,'250%; ',1745,1758,'; margin:-.17em',1671,242,1647,'67%; ',1745,':-.8em',1624,247,1647,'110%; ',1745,':-.5em',1624,252,1647,'175%; ',1745,':-.32em',1624,257,1647,'75%; ',1745,1807,1624,262,1647,'133%; ',1745,': -.15em',1624,267,1647,'200%; ',1745,': -.05em',1624,320,1641,'accent":"',1745,': .02em',1624,500,'":"',1745,1837,'; font-style: ',1625,1624,1102,'":"',1745,1837,'; ',1630,'"});',1620,'();jsMath.Macro("not','","\\\\mathrel{\\\\','rlap{\\\\kern 4mu/}}");jsMath.Macro("joinrel',1855,'kern-2mu}");jsMath.Box.DelimExtend=jsMath.Box.DelimExtendRelative;jsMath.Box.defaultH=0.8;']
+]);
\ No newline at end of file
diff --git a/htdocs/jsMath/jsMath-fonts.tar.gz b/htdocs/jsMath/jsMath-fonts.tar.gz
new file mode 100644
index 0000000000..31946bb6f0
Binary files /dev/null and b/htdocs/jsMath/jsMath-fonts.tar.gz differ
diff --git a/htdocs/jsMath/jsMath-global-controls.html b/htdocs/jsMath/jsMath-global-controls.html
new file mode 100644
index 0000000000..0c5ffe7c1b
--- /dev/null
+++ b/htdocs/jsMath/jsMath-global-controls.html
@@ -0,0 +1,106 @@
+<html>
+<head>
+<!--
+ | jsMath-global-controls.html
+ |
+ | Part of the jsMath package for mathematics on the web.
+ | 
+ | This file by jsMath-global.html to open a small control panel
+ | at the top of the page.  The panel shows the URL and allows the
+ | user to refresh the page, print it, and so on.
+ | 
+ | ---------------------------------------------------------------------
+ | 
+ | Copyright 2006 by Davide P. Cervone
+ |
+ | Licensed under the Apache License, Version 2.0 (the "License");
+ | you may not use this file except in compliance with the License.
+ | You may obtain a copy of the License at
+ |
+ |     http://www.apache.org/licenses/LICENSE-2.0
+ |
+ | Unless required by applicable law or agreed to in writing, software
+ | distributed under the License is distributed on an "AS IS" BASIS,
+ | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ | See the License for the specific language governing permissions and
+ | limitations under the License.
+-->
+<style>
+  body  {border:0px; padding:0px; margin:0px}
+  div   {padding:0px; background: #CCCCCC; border:1px outset}
+  table {border:0px; padding:0px; margin:0px; width:100%}
+  input {font-size:70%}
+  #url  {margin-left:5px; padding:1px 0px 0px 2px}
+  #hide {margin-right:5px}
+</style>
+<script>
+var jsMath;
+if (window.location.search != '') {document.domain = window.location.search.substr(1)}
+try {jsMath = parent.jsMath} catch (err) {}
+</script>
+</head>
+<body>
+<!----------------------------------->
+<!--
+ | <script src="../../debug/console.js"></script>
+ | <script src="../../debug/show.js"></script>
+-->
+<!----------------------------------->
+<div id="panel">
+<table border="0">
+<tr><td width="99%" nowrap>
+<input type="text" style="width:75%" id="url">
+<input type="button" value="Go" onclick="jsMath.SetURL()"></td>
+<td width="1%" nowrap>
+<!----------------------------------->
+<!--<input type="button" value="Debug" onclick="debug()">-->
+<!----------------------------------->
+<input type="button" value="Print"    id="print"   onclick="jsMath.Print()">
+<input type="button" value="Reload"   id="reload"  onclick="jsMath.Reload()">
+<input type="button" value="Go Local" id="goLocal" onclick="jsMath.GoLocal()">
+<input type="button" value="Empty"    id="empty"   onclick="jsMath.Empty()">
+<input type="button" value="Hide"     id="hide"    onclick="setTimeout('jsMath.Hide()',10)"></small></td></tr>
+</table>
+</div>
+<script>
+if (jsMath) {
+
+jsMath.url = document.getElementById("url");
+jsMath.url.onkeypress = function (event) {
+  if (!event) {event = window.event}
+  var code = (event.which != null)? event.which:
+             (event.keyCode != null)? event.keyCode : event.charCode;
+  if (code == 13) {jsMath.SetURL(); return false}
+  return true;
+};
+if (jsMath.URL) {jsMath.url.value = jsMath.URL}
+
+jsMath.print  = document.getElementById("print");
+jsMath.reload = document.getElementById("reload");
+
+function Show() {
+  var div = document.all.panel;
+  var h = div.clientHeight + 2*div.clientTop;
+  if (h == 0 || h > 200 && attempts++ < 10)
+    {setTimeout("Show()",10*attempts); return}
+  parent.jsMath.SetControls(h+',*');
+}
+if (document.body.scrollHeight < 1) {
+  //
+  //  MSIE/Mac doesn't get the right scrollHeight until the
+  //  frame is fully renderred, which requires the frame
+  //  to be visible, and there is no telling when the rendering
+  //  is complete (it is AFTER the onload handler fires).
+  //
+  jsMath.print.disabled = true;
+  attempts = 0;
+  parent.document.body.rows = "50,*";
+  setTimeout("Show()",1);
+} else {
+  parent.jsMath.SetControls(document.body.scrollHeight+',*');
+}
+
+}
+</script>
+</body>
+</html>
diff --git a/htdocs/jsMath/jsMath-global.html b/htdocs/jsMath/jsMath-global.html
new file mode 100644
index 0000000000..1732662f2d
--- /dev/null
+++ b/htdocs/jsMath/jsMath-global.html
@@ -0,0 +1,414 @@
+<html>
+<head>
+<!--
+ | jsMath-global.html
+ |
+ | Part of the jsMath package for mathematics on the web.
+ | 
+ | This file is used to store persistent data across multiple
+ | documents, for example, the cookie data when files are loaded
+ | locally, or cached typset math data.
+ |
+ | The file opens a frameset with one frame containing the
+ | actual document to view, and stores the global data in the
+ | outer document.  That way, when the frame changes documents
+ | the global data is still available.
+ | 
+ | ---------------------------------------------------------------------
+ | 
+ | Copyright 2006 by Davide P. Cervone
+ |
+ | Licensed under the Apache License, Version 2.0 (the "License");
+ | you may not use this file except in compliance with the License.
+ | You may obtain a copy of the License at
+ |
+ |     http://www.apache.org/licenses/LICENSE-2.0
+ |
+ | Unless required by applicable law or agreed to in writing, software
+ | distributed under the License is distributed on an "AS IS" BASIS,
+ | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ | See the License for the specific language governing permissions and
+ | limitations under the License.
+-->
+<title>jsMath Global Frame</title>
+<style></style>
+
+<script>
+var jsMath = {
+  isGlobal:  1,  // to pervent FRAME from inheriting this jsMath
+  isOpera:   (window.opera != null && window.Packages != null),
+  isSafari:  (window.clientInformation && document.implementation.createCSSStyleSheet != null),
+  isMSIEmac: (screen.updateInterval != null && !window.SyntaxError && !window.print),
+  msieDelay: 1000,  // MSIE/mac delay time for checking for offsite pages
+
+  /***************************************************************/
+
+  /*
+   *  This will be shared with the jsMath in the frameset
+   */
+  Global: {
+    isHidden: 0,
+    cookie: '',
+    cache: {T: {}, D: {}, R: {}, B: {}},
+    ClearCache: function () {jsMath.Global.cache = {T: {}, D: {}, R: {}, B: {}}},
+    Init: function () {}
+  },
+
+  /*
+   *  Called by jsMath to attach to the Global data area.
+   */
+  Register: function (w) {
+    w.jsMath.Global = jsMath.Global;
+    w.jsMath.Controls.localSetCookie = jsMath.localSetCookie;
+    w.jsMath.Controls.localGetCookie = jsMath.localGetCookie;
+    if (window.location.protocol != 'mk:') {
+      document.title = w.document.title;
+      this.ShowURL(w.location);
+      jsMath.SetUnload();
+    }
+  },
+
+  /***************************************************************/
+
+  /*
+   *  Initialize the global data and load the contents of the frame
+   */
+  Init: function () {
+    if (this.inited) return;
+    this.controls = document.getElementById('jsMath_controls');
+    this.frame    = document.getElementById('jsMath_frame');
+    this.window   = this.FrameWindow();
+    var URL;
+    if (!this.isOpera) {try {URL = this.window.document.URL} catch (err) {}}
+    if (!URL || URL == "about:blank" || URL.match(/jsMath-global.html$/))
+      {this.frame.src = this.src}
+
+    this.Global.frame = this.frame;
+    this.Global.Show = this.Show;
+    this.Global.GoLocal = this.GoLocal;
+    if (this.hide) {this.Hide()}
+    this.inited = 1;
+  },
+
+  GetURL: function () {
+    var src = unescape(document.location.search.substr(1));
+    if (src == '') {src = unescape(document.location.hash.substr(1))}
+    src = src.replace(/\?(.*)/,'');
+    if (RegExp.$1) {this.Global.cookie = unescape(RegExp.$1)}
+    return src;
+  },
+
+  FrameWindow: function (force) {
+    if (this.window && !force) {return this.window}
+    if (this.frame.contentWindow) {return this.frame.contentWindow}
+    if (document.frames && document.frames.jsMath_frame) 
+      {return document.frames.jsMath_frame}
+    return null;
+  },
+
+  /*
+   *  Called whenever the FRAME loads a new file.
+   *  (Update the title, etc.)
+   */
+  Loaded: function () {
+    if (!jsMath.inited) {jsMath.Init()}
+    if (!jsMath.window) {jsMath.window = jsMath.FrameWindow()}
+    if (!jsMath.window || window.location.protocol == 'mk:') return;
+    var URL; try {URL = jsMath.frame.src} catch (err) {}
+    var title; try {title = jsMath.window.document.title} catch (err) {}
+    if (URL != null && URL == jsMath.URL) return;
+    if (title != null) {
+      document.title = title;
+      jsMath.ShowURL(jsMath.window.location);
+      jsMath.SetUnload();
+    } else {
+      jsMath.Offsite();
+    }
+  },
+
+  /*
+   *  Mark the page as offsite and can't be read
+   */
+  Offsite: function () {
+    document.title = "jsMath Global: Offsite document -- can't read title";
+    jsMath.ShowURL("(Offsite document -- cant' read URL)");
+    if (jsMath.print && !jsMath.Global.isHidden) {
+      jsMath.print.disabled  = true;
+      jsMath.reload.disabled = true;
+    }
+    jsMath.window = null;
+  },
+
+  //
+  //  Safari doesn't fire onload for offsite URL's, so use in unload
+  //  handler to look for these and mark them.
+  //  MSIE/mac doesn't fire onload events at all, so use unload
+  //  handler to simulate them.
+  //
+  SetUnload: function () {
+    if (jsMath.isMSIEmac || jsMath.isSafari) {
+      try {jsMath.oldUnload = jsMath.window.unload} catch (err) {}
+      try {jsMath.window.onunload = jsMath.Unload} catch (err) {}
+    }
+  },
+  Unload: function (event) {
+    if (jsMath.oldUnload) {jsMath.oldUnload(event)}
+    try {setTimeout('jsMath.StateChange(0)',1)} catch (err) {}
+  },
+  StateChange: function (i) {
+    jsMath.ShowURL(jsMath.window.location);
+    var state = 'unknown'; try {state = jsMath.window.document.readyState} catch (err) {};
+    if (state == 'unknown' || i++ == 20) {jsMath.Offsite(); return}
+    if (state != 'complete') {setTimeout('jsMath.StateChange('+i+')',50*i); return}
+    document.title = jsMath.window.document.title;
+    jsMath.ShowURL(jsMath.window.location);
+    if (window.location.host == jsMath.window.location.host) 
+      {jsMath.SetUnload(); return}
+    if (jsMath.isMSIEmac) {
+      jsMath.oldLocation = jsMath.window.location;
+      setTimeout('jsMath.MSIEcheckDocument()',jsMath.msieDelay);
+    }
+  },
+  MSIEcheckDocument: function () {
+    if (window.location.host == jsMath.window.location.host) {
+      jsMath.StateChange(0)
+    } else {
+      if (jsMath.oldLocation != jsMath.window.location) {
+        jsMath.ShowURL(jsMath.window.location);
+        document.title = jsMath.window.document.title;
+      }
+      setTimeout('jsMath.MSIEcheckDocument()',jsMath.msieDelay);
+    }
+  },
+
+  /*
+   *  Replacements for standard localSetCookie/localGetCookie that
+   *  use the global cache for storing the cookie data rather than
+   *  the document.location's search field.
+   */
+  localSetCookie: function (cookie,warn) {
+    if (cookie != "") {cookie = 'jsMath='+cookie}
+    if (cookie == jsMath.Global.cookie) return;
+    jsMath.Global.cookie = cookie;
+  },
+  localGetCookie: function () {return (jsMath.Global.cookie || "")},
+
+  /*
+   *  Set the URL in the controls window
+   */
+  ShowURL: function (URL) {
+    try {
+      jsMath.URL = URL; if (jsMath.url) {jsMath.url.value = URL}
+      if (jsMath.print && !jsMath.Global.isHidden) {
+        jsMath.print.disabled  = !window.print;
+        jsMath.reload.disabled = false;
+      }
+    } catch (err) {}
+  },
+  SetURL: function () {this.frame.src = jsMath.url.value},
+
+  /*
+   *  Handle actions for the document frame
+   */
+  Print: function () {if (this.window) {this.window.document.body.focus(); this.window.print()}},
+  Reload: function () {if (this.window) {this.window.location.reload()}},
+  GoLocal: function () {
+    if (jsMath.window) {
+      jsMath.UpdateCookie();
+      if (jsMath.isMSIEmac) {
+        alert("MSIE/Mac has a bug that causes it not to go local properly.  "
+            + "After you press OK below, your browser will appear to hang.  "
+            + "When this happens, press Command-. to cancel the action.  "
+            + "The window should clear and the page location will appear "
+            + "in the address area at the top of the screen.  Press the "
+            + "REFRESH button to load the page correctly.");
+      }
+      jsMath.location = jsMath.window.location;
+      if (jsMath.window.location.protocol == 'file:' && jsMath.Global.cookie)
+        {jsMath.location += '?' + escape(jsMath.Global.cookie)}
+      setTimeout('window.location = jsMath.location',1);
+      return;
+    }
+    alert("You are viewing a web page from a site other than the "
+        + "one where you loaded jsMath-Global, so jsMath can't read "
+        + "its URL to load it locally.\n\n"
+        + "Check to see if your browser has a contextual menu item to "
+        + "open the active frame in a separate window.");
+  },
+
+  /*
+   *  Read the cookie data, set the hiddenGlobal and global fields
+   *  and save the cookie again.
+   */
+  UpdateCookie: function () {
+    var cookie = []; var cookies = jsMath.window.document.cookie;
+    if (window.location.protocol == 'file:') {cookies = jsMath.Global.cookie}
+    if (cookies.match(/jsMath=([^;]+)/)) {
+      var data = RegExp.$1.split(/,/);
+      for (var i = 0; i < data.length; i++) {
+        var x = data[i].match(/(.*):(.*)/);
+        if (x[2].match(/^\d+$/)) {x[2] = 1*x[2]} // convert from string
+        cookie[x[1]] = x[2];
+      }
+    }
+    cookie.hiddenGlobal = jsMath.Global.isHidden;
+    cookie.global = "never"; cookies = [];
+    for (var id in cookie) {cookies[cookies.length] = id + ':' + cookie[id]}
+    cookies = cookies.join(',');
+    if (window.location.protocol == 'file:') {
+      jsMath.Global.cookie = 'jsMath='+cookies;
+    } else {
+      cookies += '; path=/';
+      if (cookie.keep && cookie.keep != '0D') {
+        var ms = {
+          D: 1000*60*60*24,
+          W: 1000*60*60*24*7,
+          M: 1000*60*60*24*30,
+          Y: 1000*60*60*24*365
+        };
+        var exp = new Date;
+        exp.setTime(exp.getTime() +
+            cookie.keep.substr(0,1) * ms[cookie.keep.substr(1,1)]);
+        cookies += '; expires=' + exp.toGMTString();
+      }
+      jsMath.window.document.cookie = 'jsMath='+cookies;
+    }
+  },
+
+  /*
+   *  Check if the control panel should be hidden
+   */
+  SetControls: function (rows) {
+    if (!jsMath.rows) {
+      jsMath.rows = rows;
+      var cookie = document.cookie;
+      if (String(window.location.protocol).match(/^(file|mk):$/))
+        {cookie = jsMath.Global.cookie}
+      if (cookie.match(/jsMath=([^;]+)/)) {cookie = RegExp.$1}
+      if (!cookie.match("hiddenGlobal:0")) {
+        if (this.inited) {setTimeout('jsMath.Hide()',1)} else {jsMath.hide = 1}
+        return;
+      }
+    }
+    document.body.rows = rows;
+  },
+
+  /*
+   *  Remove the frame that holds the control panel
+   */ 
+  Hide: function () {
+    if (jsMath.Global.isHidden) return;
+    if (this.isMSIEmac) {
+      //
+      //  MSIE/Mac can't remove the frame, so hide it (and the drag bar)
+      //
+      document.body.rows = "-6,*";
+    } else if (this.isOpera) {
+      //
+      //  Opera can remove it, but it is unstable for that, but
+      //  setting the size to -1 seems to remove it as well.
+      //
+      document.body.rows = "-1,*";
+    } else {
+      document.body.removeChild(this.controls);
+      document.body.rows = "*";
+      jsMath.window = jsMath.FrameWindow(1);
+    }
+    this.Global.isHidden = 1;
+  },
+
+  /*
+   *  Put back the control-panel frame
+   */
+  Show: function (bubble) {
+    if (!jsMath.Global.isHidden) {
+      if (bubble && jsMath.window) {jsMath.window.jsMath.Controls.Panel()}
+      return;
+    }
+    if (!jsMath.isMSIEmac) {
+      document.body.insertBefore(jsMath.controls,jsMath.frame);
+      //
+      //  Opera doesn't refresh the frames properly, so reload them
+      //
+      if (jsMath.isOpera) {
+        setTimeout(
+          'jsMath.controls.src = "about:blank";\n' +
+          'jsMath.controls.src = jsMath.root+"jsMath-global-controls.html"+jsMath.domain;\n' +
+          'jsMath.frame.src = jsMath.window.location;',1
+        );
+      }
+    }
+    document.body.rows = jsMath.rows;
+    jsMath.window = jsMath.FrameWindow(1);
+    jsMath.Global.isHidden = 0;
+  },
+
+  /*
+   *  Empty the cache
+   */
+  Empty: function () {
+    var OK = confirm('Really empty the equation cache?');
+    if (OK) {jsMath.Global.ClearCache()}
+  },
+
+  /*
+   *  Find the largest common domain between the source file
+   *  and the location of the jsMath files
+   */
+  Domain: function () {
+    this.domain = '';
+    // MSIE/Mac can't do domain changes, so don't bother trying
+    if (navigator.appName == 'Microsoft Internet Explorer' &&
+        !navigator.platform.match(/Mac/) && navigator.userProfile != null) return;
+    if (this.src == '') {
+      if (window == parent) return;
+      var oldDomain = document.domain;
+      try {
+        while (true) {
+          try {if (parent.document.title != null) return} catch (err) {}
+	  if (!document.domain.match(/\..*\./)) break;
+          document.domain = document.domain.replace(/^[^.]*\./,'');
+        }
+      } catch (err) {}
+      document.domain = oldDomain;
+    } else {
+      if (!this.src.match(new RegExp('^[^:]+:\/\/([^/]+)(:[0-9]+)?\/'))) return;
+      if (document.domain == RegExp.$1) return;
+      var src = RegExp.$1.split(/\./);
+      var loc = String(window.location.host).split(/\./);
+      var si, li; si = src.length-2; li = loc.length-2
+      while (si >= 0 && li >= 0 && src[si] == loc[li]) {li--; si--}
+      document.domain = src.slice(si+1).join('.');
+      this.domain = '?'+document.domain;
+    }
+  },
+
+  /*
+   *  Create the document content based on whether this is the initial
+   *  call to this file, or the secondary one
+   */
+  Content: function () {
+    if (this.src != '') {
+      this.root = (!this.isOpera) ? '' : 
+        String(window.location).replace(/\/jsMath-global.html\??.*/,'/');
+      document.writeln('<frameset rows="0,*" onload="jsMath.Init()">');
+      document.writeln('<frame src="'+this.root+'jsMath-global-controls.html'+this.domain+'" frameborder="0" scrolling="no" id="jsMath_controls" />');
+      document.writeln('<frame src="'+this.root+'jsMath-global.html" frameborder="0" onload="jsMath.Loaded()" id="jsMath_frame" />');
+      document.writeln('</frameset>');
+    } else {
+      document.writeln('<body><br/></body>');
+    }
+  }
+
+};
+
+</script>
+</head>
+
+<script>
+jsMath.src = jsMath.GetURL();
+jsMath.Domain();
+jsMath.Content();
+</script>
+
+</html>
diff --git a/htdocs/jsMath/jsMath-loader-omniweb4.js b/htdocs/jsMath/jsMath-loader-omniweb4.js
new file mode 100644
index 0000000000..051110eaf1
--- /dev/null
+++ b/htdocs/jsMath/jsMath-loader-omniweb4.js
@@ -0,0 +1,39 @@
+/*
+ *  jsMath-loader-omniweb4.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file synchronizes the jsMath-loader.html file with
+ *  the actual loading of the source javascript file.
+ *  OmniWeb 4 has a serious bug where the loader file is run
+ *  several times (and out of sequence), which plays havoc
+ *  with the Start() and End() calls.
+ *
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 2006 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+if (window.jsMath.Autoload) {
+  jsMath.Autoload.Script.endLoad();
+} else {
+  if (!window.phase2) {
+    jsMath.Script.Start();
+    window.phase2 = 1;
+  } else {
+    jsMath.Script.End();
+    jsMath.Script.endLoad();
+  }
+}
\ No newline at end of file
diff --git a/htdocs/jsMath/jsMath-loader-post.html b/htdocs/jsMath/jsMath-loader-post.html
new file mode 100644
index 0000000000..0de7cb9833
--- /dev/null
+++ b/htdocs/jsMath/jsMath-loader-post.html
@@ -0,0 +1,78 @@
+<html>
+<head>
+<!--
+ | jsMath-loader-post.html
+ |
+ | Part of the jsMath package for mathematics on the web.
+ | 
+ | This file is used for loading jsMath components in Firefox3 when
+ | used in a file: url from a directory other than the one containing 
+ | jsMath (gets around Firefox3's more restrictive same-origin policy.
+ | 
+ | ---------------------------------------------------------------------
+ | 
+ | Copyright 2008 by Davide P. Cervone
+ |
+ | Licensed under the Apache License, Version 2.0 (the "License");
+ | you may not use this file except in compliance with the License.
+ | You may obtain a copy of the License at
+ |
+ |     http://www.apache.org/licenses/LICENSE-2.0
+ |
+ | Unless required by applicable law or agreed to in writing, software
+ | distributed under the License is distributed on an "AS IS" BASIS,
+ | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ | See the License for the specific language governing permissions and
+ | limitations under the License.
+-->
+</head>
+<body>
+
+<script>
+var isCheck = 0;
+var url = location.search.substr(1); var ID = "jsMLD";
+if (url.substr(0,9) == "autoload=") {url = url.substr(9); ID = "jsMAL"}
+
+if (url == 'http://www.math.union.edu/locate/jsMath/jsMath/jsMath-version-check.js') {
+  //
+  // Handle version check separately
+  //
+  var jsMath = {Controls: {}}; isCheck = 1;
+  document.write('<script src="'+url+'"></'+'script>');
+} else if (url != "" && url.match(/\.js$/) && !url.match('(^|[/\\?#=])[a-z]+://')) {
+  //
+  //  Load the file and pass it to jsMath
+  //
+  var request = new XMLHttpRequest;
+  try {
+    request.open("GET",url,false);
+    request.send(null);
+    window.parent.postMessage(ID+":BGN:","*");
+    window.parent.postMessage(ID+":SCR:"+request.responseText,"*");
+    window.parent.postMessage(ID+":END:1","*");
+  } catch (err) {
+    window.parent.postMessage(ID+":ERR:Can't load "+url+": "+err.message,"*");
+  }
+} else {
+  window.parent.postMessage(ID+":END:","*");
+}
+</script>
+
+<script>
+//
+//  If we are loading the version check, pass it to jsMath
+//  and run the check.
+//
+if (isCheck) {
+  var fn = jsMath.Controls.TestVersion.toString();
+  window.parent.postMessage(ID+":SCR:" +
+    "jsMath.Controls.TestVersion = "+fn+";" +
+    "jsMath.Message.Clear(); jsMath.Message.doClear();" +
+    "jsMath.Controls.TestVersion()","*"
+  );
+  window.parent.postMessage(ID+":END:","*");
+}
+</script>
+
+</body>
+</html>
diff --git a/htdocs/jsMath/jsMath-loader.html b/htdocs/jsMath/jsMath-loader.html
new file mode 100644
index 0000000000..ae9c81ed26
--- /dev/null
+++ b/htdocs/jsMath/jsMath-loader.html
@@ -0,0 +1,92 @@
+<html>
+<head>
+<!--
+ | jsMath-loader.html
+ |
+ | Part of the jsMath package for mathematics on the web.
+ | 
+ | This file is used for jsMath components when the browser doesn't
+ | handle the XmlHttpRequest function, or when they must be obtained
+ | from a server other than the one serving the page that is using jsMath.
+ | 
+ | ---------------------------------------------------------------------
+ | 
+ | Copyright 2004-2006 by Davide P. Cervone
+ |
+ | Licensed under the Apache License, Version 2.0 (the "License");
+ | you may not use this file except in compliance with the License.
+ | You may obtain a copy of the License at
+ |
+ |     http://www.apache.org/licenses/LICENSE-2.0
+ |
+ | Unless required by applicable law or agreed to in writing, software
+ | distributed under the License is distributed on an "AS IS" BASIS,
+ | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ | See the License for the specific language governing permissions and
+ | limitations under the License.
+-->
+</head>
+<body>
+
+<script>
+var showWarning = 0;
+while (!window.jsMath && !showWarning) {
+  try {
+    window.jsMath = window.parent.jsMath;
+    if (!window.jsMath) {throw "no jsMath";}
+  } catch (err) {
+    showWarning = 1; pageDomain = '';
+    try {pageDomain = document.domain} catch (err) {}
+    //
+    // MSIE on Mac can't change document.domain, and 'try' won't
+    //   catch the error (Grrr!) so don't even attempt it.
+    //
+    if (pageDomain.match(/\..*\./) &&
+        (navigator.appName != 'Microsoft Internet Explorer' ||
+         !navigator.platform.match(/Mac/) || !navigator.userProfile || !document.all)) {
+      try {
+        document.domain = pageDomain.replace(/^[^.]*\./,'');
+        showWarning = 0;
+      } catch(err) {}
+    }
+  }
+}
+
+function Warning () {
+  alert(
+    "jsMath can't load one of its required components, because jsMath " +
+    "was not obtained from a server that is in the same domain as the " +
+    "page that loaded it."
+  );
+}
+
+isOmniWeb4 = (document.readyState == 'loading' &&
+              navigator.accentColorName != null &&
+              navigator.omniWebString == null);
+
+if (showWarning) {setTimeout("Warning()",1)} else {
+  debug = window.parent.debug; show = window.parent.show;
+  jsMath.Script.window = window; url = jsMath.Script.url;
+  if (isOmniWeb4) {
+    if (url != jsMath.Script.prevURL) {
+      jsMath.Script.prevURL = url;
+      document.writeln('<script src="'+jsMath.root+'jsMath-loader-omniweb4.js"><'+'/script>');
+      document.writeln('<script src="'+url+'"><'+'/script>');
+      document.writeln('<script src="'+jsMath.root+'jsMath-loader-omniweb4.js"><'+'/script>');
+    }
+  } else {
+    jsMath.Script.Start();
+    document.writeln('<script src="'+url+'"><'+'/script>');
+  }
+}
+</script>
+
+<script>
+if (window.jsMath && !isOmniWeb4) {
+  jsMath.Script.End();
+  jsMath.Script.endLoad();
+}
+</script>
+
+</body>
+</html>
diff --git a/htdocs/jsMath/jsMath-msie-mac.js b/htdocs/jsMath/jsMath-msie-mac.js
new file mode 100644
index 0000000000..cf19f76f07
--- /dev/null
+++ b/htdocs/jsMath/jsMath-msie-mac.js
@@ -0,0 +1,53 @@
+/*
+ *  jsMath-msie-mac.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file makes changes needed for use with MSIE on the Mac.
+ *
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 2004-2006 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+
+
+/*
+ *  MSIE crashes if it changes the page too quickly, so we add a
+ *  delay between processing math entries.  Unfortunately, this really
+ *  slows down math in MSIE on the mac.
+ */
+
+jsMath.Add(jsMath,{
+
+  msieProcess: jsMath.Process,
+  msieProcessBeforeShowing: jsMath.ProcessBeforeShowing,
+
+  Process: function () {
+    // we need to delay a bit before starting to process the page
+    //   in order to avoid an MSIE display bug
+    jsMath.Message.Set("Processing Math: 0%");
+    setTimeout('jsMath.msieProcess()',jsMath.Browser.delay);
+  },
+
+  ProcessBeforeShowing: function () {
+    // we need to delay a bit before starting to process the page
+    //   in order to avoid an MSIE display bug
+    setTimeout('jsMath.msieProcessBeforeShowing()',5*jsMath.Browser.delay);
+  }
+
+});
+
+jsMath.Browser.delay = 75;  // hope this is enough of a delay!
diff --git a/htdocs/jsMath/jsMath-old-browsers.js b/htdocs/jsMath/jsMath-old-browsers.js
new file mode 100644
index 0000000000..35dcf189a5
--- /dev/null
+++ b/htdocs/jsMath/jsMath-old-browsers.js
@@ -0,0 +1,58 @@
+/*
+ *  jsMath-old-browsers.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file makes changes needed by older versions of some browsers
+ *
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 2004-2006 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+jsMath.Add(jsMath.HTML,{
+  /*
+   *  Use the blank GIF image for spacing and rules
+   */
+  Blank: function (w,h,d,isRule) {
+    var style = '';
+    if (isRule) {
+      if (h*jsMath.em < 1.5) {h = '1px'} else {h = jsMath.HTML.Em(h)}
+      style = 'border-top:'+h+' solid;'; h = 0;
+    }
+    if (d == null) {d = 0}
+    style += 'width:'+this.Em(w)+'; height:'+this.Em(h+d)+';';
+    if (d) {style += 'vertical-align:'+this.Em(-d)}
+    return '<img src="'+jsMath.blank+'" style="'+style+'" />';
+  }
+});
+
+if (jsMath.browser == 'Konqueror') {
+  
+  jsMath.Package(jsMath.Box,{Remeasured: function() {return this}});
+
+  jsMath.Add(jsMath.HTML,{
+    Spacer: function (w) {
+      if (w == 0) {return ''};
+      return '<span style="margin-left:'+this.Em(w-jsMath.Browser.spaceWidth)+'">'
+             + '&nbsp;</span>';
+    }
+  });
+
+  jsMath.Browser.spaceWidth = this.EmBoxFor('&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;').w/5;
+
+}
+
+jsMath.styles['.typeset .spacer'] = '';
diff --git a/htdocs/jsMath/jsMath-ww.js b/htdocs/jsMath/jsMath-ww.js
new file mode 100644
index 0000000000..b2c9474662
--- /dev/null
+++ b/htdocs/jsMath/jsMath-ww.js
@@ -0,0 +1,85 @@
+/*
+ *  This file customizes jsMath for use with WeBWorK
+ */
+
+if (!window.jsMath || !window.jsMath.loaded) {
+
+  /*
+   *  WW customization of jsMath values
+   */
+
+  var jsMath = {
+
+    styles: {
+      '.math': 'font-family: serif; font-style: normal; color: grey; font-size: 75%'
+    },
+    Controls: {cookie: {scale: 133}},
+    Parser: {prototype: {macros: {
+      setlength:   ['Macro','',2],
+      boldsymbol:  ['Macro','{\\bf #1}',1],
+      verb:        ['Extension','verb']
+    }}},
+    Font: {},
+
+    //
+    //  Look for jsMath-ww.js file and replace by jsMath.js
+    //  Cause the jsMath.js file to be loaded
+    //
+    wwSource: function () {
+      var script = document.getElementsByTagName('SCRIPT');
+      var src = script[script.length-1].getAttribute('SRC');
+      if (src.match('(^|/)jsMath-ww.js$')) {
+        src = src.replace(/jsMath-ww.js$/,'jsMath.js');
+	document.write('<SCRIPT SRC="'+src+'"></SCRIPT>');
+      }
+    },
+
+    wwCount: 0,  // count if called more than once
+
+    wwProcess: function () {
+      if (this.wwCount > 1) return;
+      if (this.wwCount == 0) {
+        //
+        // This is the first call to jsMath, so install handler
+        //
+        if (window.addEventListener) {window.addEventListener("load",jsMath.wwOnLoad,false)}
+        else if (window.attachEvent) {window.attachEvent("onload",jsMath.wwOnLoad)}
+        else {window.onload = jsMath.wwOnLoad}
+        //
+        //  Process the page synchronously
+        //
+        this.wwProcessWW = jsMath.ProcessBeforeShowing;
+      } else {
+        //
+        //  There are multiple calls, so we're in the Library Browser
+        //  Process the page asynchronously
+        //
+        this.wwProcessWW = jsMath.Process;
+      }
+      this.wwCount++;
+    },
+
+    //
+    //  The actual onload handler calls whichever of the two
+    //  processing commands has been saved
+    //
+    wwOnLoad: function () {jsMath.wwProcessWW()}
+
+  };
+
+  if (window.noFontMessage) {jsMath.styles['#jsMath_Warning'] = "display: none"}
+  if (window.missingFontMessage) {jsMath.Font.message = missingFontMessage}
+  if (!window.processDoubleClicks) {jsMath.Click = {CheckDblClick: function () {}}}
+
+  //
+  //  Load jsMath.js
+  //
+  jsMath.wwSource();
+
+  //
+  //  Make sure answer boxes are above jsMath output
+  //  (avoids deep baselines in jsMath fonts)
+  //
+  document.write('<STYLE> .problem INPUT, .problem TEXTAREA {position: relative; z-index: 2} </STYLE>');
+
+}
diff --git a/htdocs/jsMath/jsMath.js b/htdocs/jsMath/jsMath.js
new file mode 100644
index 0000000000..4dc9cf00ba
--- /dev/null
+++ b/htdocs/jsMath/jsMath.js
@@ -0,0 +1,51 @@
+/*****************************************************************************
+ * 
+ *  jsMath: Mathematics on the Web
+ *  
+ *  This jsMath package makes it possible to display mathematics in HTML pages
+ *  that are viewable by a wide range of browsers on both the Mac and the IBM PC,
+ *  including browsers that don't process MathML.  See
+ *  
+ *            http://www.math.union.edu/locate/jsMath
+ *
+ *  for the latest version, and for documentation on how to use jsMath.
+ *
+ *  Copyright 2004-2010 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *  
+ *****************************************************************************/
+
+if (!window.jsMath) {jsMath = {}}
+if (!jsMath.Script) {jsMath.Script = {}}
+
+jsMath.Script.Uncompress = function (data) {
+  for (var k = 0; k <  data.length; k++) {
+    var d = data[k]; var n = d.length;
+    for (var i = 0; i < n; i++) {if (typeof(d[i]) == 'number') {d[i] = d[d[i]]}}
+    data[k] = d.join('');
+  }
+  eval(data.join(''));
+}
+
+//start = new Date().getTime();
+jsMath.Script.Uncompress([
+  ['if(!','window.','jsMath','||!',1,'jsMath.','loaded','){var ','jsMath_old','=',1,2,';',0,'document.','getElementById','||!',14,'childNodes||!',14,'createElement','){','alert("','The',' mathematics ','on this page requires W3C DOM support in its JavaScript. Unfortunately, your ','browser',' doesn\'t seem to have this.")}','else{',1,2,'={version:"3.6e",document:document,','window',':',32,',','platform',':(','navigator.',36,'.match(/','Mac/)?"mac":',38,36,40,'Win/)?"pc":"unix"),','sizes',':[50,60,70,85,100,120,144,173,207,249],styles:{".math','":{"font-family":"serif","font-style":"normal","font-weight":"normal','"},".typeset',48,'","line-height":"normal','","text-indent":"0px','","white-space":"','normal','"},".typeset .',54,48,'"},"div.','typeset','":{"text-align":"','center",margin:"1em 0px"},"span.',59,60,'left',49,' span',60,'left",border',':"0px",margin:"0px','",padding',':"0px"},"a .',59,' img, .',59,' a img','":{border:"0px','","border-bottom":"','1px solid',' blue;"},".',59,' .size0','":{"font-size":"','50','%"},".typeset .','size1',82,'60',84,'size2',82,'70',84,'size3',82,'85',84,'size4',82,'100',84,'size5',82,'120',84,'size6',82,'144',84,'size7',82,'173',84,'size8',82,'207',84,'size9',82,'249',84,'cmr10','":{"font-family":"jsMath-',121,', serif',55,'cmbx10',122,126,', ',2,'-cmr10',55,'cmti10',122,133,', ',2,131,55,'cmmi10',122,140,55,'cmsy10',122,144,55,'cmex10',122,148,55,'textit','":{"font-family":"','serif","','font-style":"italic',55,'textbf',153,'serif","font-weight":"bold',55,'link":{"','text-decoration":"none',55,'error',82,'90%","',155,'","background-color','":"#FFFFCC',70,':"1px','",border:"',78,' #CC0000',55,'blank','":{display:"','inline-block','",overflow:"','hidden',172,'0px none",width:"0px",height:"0px',55,'spacer',177,178,'"},"#','jsMath_hiddenSpan":{','visibility:"hidden",position:"absolute",','top:"0px",left:"0px',51,52,187,'jsMath_message','":{position:"fixed",bottom:"','1px",left:"2px',168,'":"#E6E6E6','",border:"solid 1px #959595",margin:"0px",padding:"','1px 8px','","z-index":"','102','",color:"black","font-size":"','small",width:"auto','"},"#jsMath_panel',195,'1.75em",right:"1.5em',70,':".8em 1.6em',168,'":"#DDDDDD',172,'outset 2px',201,'103",','width:"auto',203,'10pt","font-style":"',54,205,' .disabled":{color:"#888888',205,' .infoLink',82,'85%"},"#jsMath_panel *":{"','font-size":"inherit","font-style":"inherit","font-family":"inherit',51,205,' div":{"','background-color":"inherit",color:"inherit"},"#jsMath_panel ','span":{"',230,'td',76,70,69,'","',230,'tr',76,70,69,'","',230,'table',76,70,69,168,'":"inherit",color:"inherit",height:"auto",',216,187,'jsMath_button',195,'1px",right:"2px',168,'":"white',199,'0px 3px 1px 3px',201,'102",color:"black","',162,'","font-size":"x-',204,'",cursor:"hand"},"#',253,' *":{padding:"0px",border',69,51,'","',226,187,'jsMath_global":{"',155,187,'jsMath_noFont',' .message":{"text-align":"center",padding:".8em 1.6em",border:"3px solid #DD0000","background-color":"#FFF8F8",color:"#AA0000","font-size":"',204,187,'jsMath_noFont .link":{padding:"0px 5px 2px 5px',172,'2px outset',168,'":"#E8E8E8',203,'80%",',216,265,'jsMath_PrintWarning',277,'x-',204,'"},"@media print":{"#',253,177,'none',187,'jsMath_Warning',177,'none"}},"@media screen":{"#',289,177,'none"}}},Element',':function(','a){','return ',5,14,15,'("jsMath_"+a)},BBoxFor',304,'a','){this.','hidden.innerHTML','=\'<nobr><','span class="',59,'"><',316,'scale">\'+a+"</span></span></nobr>";var b=(',5,'Browser.','msieBBoxBug?this.','hidden.firstChild','.firstChild',':this.hidden',');var c={w:','b.offsetWidth',',h',326,'.offsetHeight','};this.',314,'="";',306,'c},EmBoxFor',304,'b){var a=',5,'Global.cache','.R;',0,'a[this.em',']){',343,']={}}',0,343,'][b]){','var c=','this.BBoxFor','(b);',343,'][b]={w:c.w/this.em,h:c.h/this.em}}',306,343,'][b]},Init',':function(){','if(',5,'Setup.inited','!=1){',0,5,361,'){',5,'Setup.','Body()}if(',5,361,'!=1){if(',5,361,'==-100','){return}',22,'It looks like ',2,' failed to set up properly (error code "+',5,361,'+").  I will try to keep going, but it could get ugly.");',5,361,'=1}}this.em=this.CurrentEm();','var a=',5,340,'.B;',0,343,']){',343,']={};',343,'].bb=',351,'("x");',350,343,'].bb.h;',343,'].d=',351,'("x"+',5,'HTML.Strut','(c/this.em)).h-c}',5,322,'italicCorrection=',343,'].ic;var g=',343,'].bb;var e=g.h;var f=',343,'].d;this.h=(e-f)/this.em;this.d=f/this.em;this.hd=this.h+','this.d;this.',368,'TeXfonts','();var b=this.EmBoxFor(\'<',316,121,'">M</span>\').w/2;this.TeX.M_height=b*(26/14);this.TeX.h=this.h;this.TeX.d=',419,'TeX.hd=this.hd;this.Img.Scale();',0,'this.initialized',313,368,'Sizes','();this.','Img.UpdateFonts()}this.p_height=(','this.TeX.cmex10[0].','h+',435,'d)/0.85;',429,'=1},ReInit',358,'if(this.','em!=this.CurrentEm()){this.Init()}},CurrentEm',358,387,351,'(\'<span style="\'+',5,322,'block+\';width:27em;height:1em','"></span>\').','w/27;if(a>0){',306,'a}',306,351,'(\'<img src="\'+',5,176,'+\'" style="width:13em;height:1em" />\').w/13},Loaded',358,'if(',8,7,'b=["Process","ProcessBeforeShowing","ProcessElement","ConvertTeX","ConvertTeX2","ConvertLaTeX","ConvertCustom","CustomSearch","Synchronize","Macro","document"];','for(var a=0;a<','b','.length;a++){','if(',8,'[b[a]]){','delete ',8,'[b[a]]}}}if(',8,'){this.Insert(',2,',',8,')}',8,'=null;',5,6,'=1},Add',304,'c,a){for(var b in a){','c[b]=a[b]}},Insert',304,487,'if(c[b]&&typeof(a[b])=="object"&&(','typeof(c[b])=="','object"||',492,'function")){this.Insert(c[b],a[b])}',28,'c[b]=a[b]}}},Package',304,'b,a',476,'b.prototype,a)}};',5,'Global={isLocal:1,cache:{','T:{},D:{},R:{},B',':{}},ClearCache',358,5,340,'={',504,':{}}},GoGlobal',304,338,'String(',5,1,'location',');var d=(',5,'isCHMmode','?"#":"?");if(b){a=a.replace(/\\?.*/,"")+"?"+b}',5,'Controls.','Reload(',5,'root+"',2,'-global.html"+d+escape(a))},Init',358,'if(',5,'Controls.cookie.','global=="always"&&!',5,'noGoGlobal','){if(',38,'accentColorName',376,0,5,32,'){',5,32,'=',32,'}',5,523,6,'=1;',5,523,'defaults.hiddenGlobal=null;this.GoGlobal(',5,523,'SetCookie(2))}},Register',358,387,5,1,'parent;',0,5,520,'){',5,520,'=(',5,1,517,'.protocol','=="mk:")}try{',0,5,520,313,'Domain()}if(a.',2,'&&a.',5,'isGlobal){a.',5,'Register(',5,32,')}}catch(b){',5,535,'=1}},Domain',358,'if(',38,'appName=="Microsoft Internet Explorer"&&',5,36,'=="mac"&&',38,'userProfile','!=null',376,'if(',5,14,'all&&!',5,1,'opera',376,'if(',32,'==parent',376,'var b=',5,14,'domain',';try{while(true){try{if(parent.',14,'title',602,'){return}}','catch(a){}',0,14,619,'.match(/\\..*\\./)){break}',5,14,619,'=',5,14,619,'.replace(/^[^.]*\\./,"")}}',625,5,14,619,'=b}};',5,'Script={request:null,Init',358,'if(!(',5,532,'asynch&&',5,532,'progress',')){if(',1,'XMLHttpRequest','){try{','this.request','=new ',655,'}catch(c){}if(',657,'&&',5,'root.match','(/^file:\\/\\//)){try{',657,'.open("GET",',5,526,5,'js",false);',657,'.send(null)}catch(','c){',657,'=null;if(',1,'postMessage&&',1,'addEventListener',313,'mustPost','=1;',5,1,680,'("message",',5,'Post.','Listener,false)}}}}',0,657,'&&',1,'ActiveXObject','&&!this.',682,7,'a=["MSXML2.XMLHTTP.6','.0","MSXML2.XMLHTTP','.5',700,'.4',700,'.3',700,'","Microsoft.XMLHTTP"];','for(var b=0;b<','a.length&&!',657,';b++){try{',657,658,695,'(a[b])}catch(c){}}}}',0,657,'||',5,368,'domainChanged',313,'Load=this.delayedLoad;this.needsBody=1}},Load',304,'b,a){','if(a){',5,'Message.Set("Loading "+','b);',5,'Script.','Delay(1);',5,'Script.Push(','this,"xmlRequest",b',');',5,734,5,'Message',',"Clear")}',28,5,734,735,')}},xmlRequest',304,'url){','this.blocking','=1;try{',657,667,'url,false);',657,673,'err){',749,'=0;if(',5,'Translate.','restart&&',5,'Translate.asynchronous){return""}throw Error("jsMath can\'t load the file \'"+url+"\'\\','nMessage: "+err.message)}if(',657,'.status',602,'&&(',657,766,'>=400||',657,766,'<0)){',749,'=0;if(',5,760,'restart&&',5,763,'nError status: "+',657,766,')}',0,'url','.match(/\\.js$/)){','return(',657,'.responseText',')}var tmpQueue','=this.queue;this.queue','=[];',5,1,'eval(',657,791,');',749,'=0;','this.queue=this.queue.','concat(','tmpQueue);this.Process();return""},cancelTimeout:30*1000,blocking:0,cancelTimer:null,needsBody:0,queue:[],Synchronize',304,'a,b','){if(typeof(','a)!="string"){',5,734,'null,a,b)}',28,5,734,5,32,',"eval",a)}},Push',304,'a,c,b',313,'queue[','this.queue.length',']=[a,c,b];if(!(',749,'||(this.needsBody&&!',5,14,'body','))){this.Process()}},Process',358,'while(',823,'&&!',749,7,'c=this.queue[0];',803,'slice(1);',387,'this.SaveQueue();var b=c[0];var e=c[1];var d=c[2];if(b){b[e](d)}',28,'if(e){e(d)}}this.','RestoreQueue','(a)}},SaveQueue',358,'var a',793,'=[];',306,'a},',844,304,'a){',803,804,'a)},delayedLoad',304,'a',313,'Push(','this,"','startLoad','",a)},',863,304,'a',7,'b=',5,14,20,'("iframe");b','.style.visibility="',180,'";b.style.','position="absolute";','b','.style.width="','0px";b','.style.height="','0px";if(',5,14,829,325,'){',5,14,829,'.insertBefore(','b,',5,14,829,325,')}',28,5,14,829,'.appendChild(','b)}',749,'=1;this.','url=a;if(a','.substr(0,',5,'root.length',')==',5,'root){a=a.substr(',5,909,')}',5,728,'a);this.cancelTimer=setTimeout("',5,731,'cancelLoad','()",this.cancelTimeout);',442,682,'){','b.src=',5,689,863,'(a,b)}',28,'if(a',788,926,5,526,2,'-loader.html"}',28,926,'this.url}}},','endLoad',304,'a){if(this.cancelTimer){clearTimeout(this.cancelTimer);this.cancelTimer=null}',5,689,942,'();',5,740,'.Clear();if(a!="cancel"){',749,'=0;this.Process','()}},Start',358,'this.tmpQueue',793,'=[]},End',358,803,804,956,');',472,956,'},',921,304,'b,',944,'if(b==null){b','="Can\'t load file"}if(a==null){a=2000}',5,740,'.Set(b);setTimeout(\'',5,731,942,'("cancel")\',a)},Delay',304,'a){',749,'=1;setTimeout("',5,731,'endDelay','()",a)},',986,358,749,953,'()},','imageCount',':0,WaitForImage',304,'b){',749,905,993,'++;',442,'img==null',313,'img=[]}',387,'new Image',433,'img[this.img.length]=a;a.onload=function(){if(--',5,731,993,'==0){',5,731,986,'()}};a.onerror=a.onload;a.onabort=a.onload;a.src=b},Uncompress',304,'data){for(var k=0;k<data.length;k++){var d=data[k];var n=d.length;for(var i=0;i<n;i++){if(typeof(d[i])=="number"){d[i]=d[d[i]]}}data[k]=d.join("")}',1,'eval(data.join(""))}};',5,'Post={',32,':null,Listener',304,'d){if(d.source!=',5,689,32,376,'var e=d.origin','.replace(/^file:\\/\\//,"");',387,14,619,1032,'if(e==null||e==""||e=="null"){e','="localhost"}if(','a==null||a==""||a=="null"){a',1038,'e!=a||!','d.data.substr(','0,6).match(/jsM(CP|LD|AL):/)){return}var b=',1042,'6,3).replace(/ /g,"");',350,1042,'10);if(',5,'Post.Commands[b',']){(',5,1050,'])(c)}},Commands:{SCR',304,'message){',5,1,'eval(message)},ERR',304,'a){',5,731,921,'(a,3000)},BGN',304,'a){',5,731,'Start()},END',304,'a){',726,5,731,'End()}',5,731,942,'()}},',863,304,'a,b',313,32,'=b.contentWindow;',0,'a',788,306,5,'root+a}',306,5,526,2,'-loader-post.html?"+a},',942,358,'this.',32,'=null}};',5,740,'={',176,':null,message:null,text:null,clear:null,Init',358,0,5,14,829,'||!',5,532,652,376,'this.message','=',5,'Element("message");',0,1118,'){if(',5,368,'stylesReady){',1118,'=',5,'Setup.DIV("','message",{visibility:"',180,'"},',5,'fixedDiv',')}',28,1118,'=',5,1131,'message",{',189,'bottom:"',196,'",','backgroundColor',':"#E6E6E6',199,200,'",zIndex:102,color:"black",fontSize:"',204,'"},',5,1136,')}}','this.text','=',5,14,'createTextNode','("");',1118,902,1158,');',1118,'.onmousedown=',5,760,'Cancel},Set',304,725,'if(this.clear){clearTimeout(this.clear',');this.clear=null}if(',5,532,652,'){',0,1158,313,'Init();',0,1158,624,'if(',5,322,'textNodeBug','){',1118,'.innerHTML','=b}',28,1158,'.nodeValue','=b}',1118,874,'visible";',726,1118,'.style.cursor','="pointer";',0,1118,1205,'){',1118,1205,'="hand"}',1118,'.title=" Cancel Processing of Math "}',28,1118,1205,'="";',1118,'.title=""}}',28,'if(b',907,'8)!="Loading "){',5,1,'status=b}}},Clear',358,1175,')}this.clear=setTimeout("',5,740,'.doClear()",1000)},doClear',358,442,'clear',313,'clear=null;',5,1,'status="";if(',1158,'){',1158,1198,'=""}if(',1118,'){',1118,874,180,'"}}},Blank',358,'if(','this.blank','||!',5,14,829,376,1256,'=',5,1131,176,'",{position',':(',5,322,'msiePositionFixedBug','?"absolute":"fixed"),',190,'",bottom:"0px",right:"0px",zIndex:101,',1148,':"white"},',5,1136,');if(',5,322,'msieBlankBug){',1256,1194,'="&nbsp;";',1256,879,'110%";',1256,881,'110%"}},UnBlank',358,'if(',1256,'){',5,14,829,'.removeChild(',1256,')}',1256,'=null}};',5,'Setup={',6,':[],DIV',304,'e,c,b){',971,'=',5,14,829,'}var d=',5,14,20,'("div");d.id="jsMath_"+e;','for(var a in c){','d.style[a]=c[a]}',0,'b.hasChildNodes){b',902,'d)}',28,'b',891,'d,b',325,')}',306,'d},Script',304,725,442,6,'[b]){return}',28,'this.',6,'[b]=1}',0,'b.match("^([a-zA-Z]+:/?)?/")){b=',5,'root+b}',5,731,'Load(b,a)},Hidden',358,5,180,'=this.DIV("Hidden",{',189,'top:0,left:0,border:0,padding:0,margin:0});',5,'hiddenTop=',5,180,';return},Source',358,'if(',5,'Autoload&&',5,'Autoload.root','){',5,'root=',5,1366,'}',28,5,'root="";',387,5,14,'getElementsByTagName("','script");',726,708,'a.','length;b++){','var d=a[b].src;if(d&&d.match("(^|/|\\\\\\\\)',5,'js$")){',5,1369,'d.replace','(/',5,'js$/,"");break}}}}if(',5,'root.charAt(','0)=="\\\\"){',5,1369,5,'root.replace','(/\\\\/g,"/")}if(',5,1395,'0)=="/"){if(',5,1395,'1)!="/"){',5,'root="//"+',5,14,517,'.host+',5,'root}',5,1369,5,14,517,574,'+',5,1415,28,0,5,664,'(/^[a-z]+:/i)){var d=','new String(',5,14,517,');',350,'new RegExp("/[^/]*/\\\\.\\\\./");',5,1369,1390,'(new RegExp("[^/]*$"),"")+',5,'root;while(',5,664,'(c)){',5,1369,5,1400,'(c,"/")}}}',5,'Img.',1369,5,526,'fonts/";',5,176,'=',5,526,176,'.gif";this.Domain()},Domain',358,'try{',5,14,619,'}catch(d',376,'var c="";',387,5,14,619,';if(',5,664,'("://([^/]*)/")){c=RegExp.$1}c=c.replace(/:\\d+$/,"");if(c==""||c==a',376,'if(',38,'appName=="Microsoft Internet Explorer"&&',5,36,'=="mac"&&',38,'onLine&&',38,601,'&&',5,14,'all',376,'c=c.split(/\\./);a=a.split(/\\./);if(c.length<2||a.length<2||','c[c.length-','1',']!=a[a.length-','1]||',1497,'2',1499,'2]){this.','DomainWarning','();return}var e=',1497,'2]+"."+',1497,'1];for(var b=3;b<=c.length&&b<=a.',1384,'if(',1497,'b',1499,'b]){break}e=',1497,'b]+"."+e}',5,14,619,'=e;this.',721,'=1},',1505,358,22,'In order for ',2,' to be able to load the additional components that it may need, the ',5,'js file must be ',6,' from a server in the same ',619,' as the page that contains it.  Because that is not the case for this page, the',24,'displayed here may not appear correctly.")},','EncodeFont',304,'c',7,'b=',5,'TeX[c];if(b[0].c',602,376,466,'128;a++){var d=b[a];b[a]=d[3];if(b[a]==null){b[a]={}}b[a].w=d[0];b[a].h=d[1];if(d[2]!=null){b[a].d=d[2]}b[a].c=',5,'TeX.encoding[a]}},Fonts',358,708,5,'TeX.fam','.',1384,387,5,1555,'[b];if(a',313,1539,'(a)}}},TeXfont',304,338,5,'TeX[b];if(a==null',376,'a.hd=',5,'EmBoxFor(\'<span class="\'+b+\'">\'+a[65].c','+"</span>").h;a.d=',5,1572,'+',5,408,'(a.hd)+"</span>").h-a.hd;a.h=a.hd-a.d;','if(b=="',140,'"){a.skewchar=','127}',28,1580,144,1582,'48}}},',421,358,466,5,1555,468,'if(',5,1555,'[a]){this.TeXfont(',5,1555,'[a])}}},Sizes',358,5,'TeXparams','=[];var b;var a;for(a=0;a<',5,46,468,5,1604,'[a]={}}for(b in ',5,'TeX',808,5,'TeX[b])!="object"){for(a=0;a<',5,46,468,5,1604,'[a][b]=',5,46,'[a]*',5,'TeX[b]/100}}}},Styles',304,'a){',0,'a){a=',5,'styles;a[".',59,' .scale"]={"font-size":',5,532,'scale+"%"};this.stylesReady=1}',5,734,862,'AddStyleSheet','",a);if(',5,322,'styleChangeDelay','){',5,734,5,'Script,"Delay",1)}},StyleString',304,'e',7,'a={},f;for(f in e){if(typeof e[f]==="string"){a[f]=e[f]}',28,'if(f',907,'1)==="@"){a[f]=','this.StyleString(','e[f])}',28,'if(e[f]!=null',7,'d=[];for(var c in e[f]){if(e[f][c]!=null){d[d.length]=c+": "+e[f][c]}}a[f]=d.join("; ")}}}}var b="";for(f in a){b+=f+" {"+a[f]+"}\\n"}',306,'b},',1642,304,'d',7,'b=',5,14,1379,'head")[0];if(',338,1660,'d);if(',5,14,'createStyleSheet){b.insertAdjacentHTML("beforeEnd",\'<','span style="display:','none">x</span><style type="text/css">\'+a+"</style>")}',28,350,5,14,20,'("style");c.type="text/css";c',902,5,14,1162,'(a));b',902,'c)}}',28,0,5,'noHEAD){',5,'noHEAD=1;',22,'Document is missing its <HEAD> section.  Style sheet can\'t be created without it.")}}},Body',358,442,'inited',376,'this.inited=-','1;',5,368,'Hidden();',1710,'2;',5,322,1184,1710,'3;if(',5,532,176,'){',5,740,'.Blank()}',1710,'4;',5,368,'Styles();',1710,'5;',5,523,1184,1710,'6;',5,734,5,'Setup,"User","pre-font");',1710,'7;',5,734,5,'Font,"Check");if(',5,'Font.register.length){',5,734,5,'Font,"LoadRegistered")}this.inited=1},User',304,'a){if(',5,'Setup.UserEvent[a',']){(',5,1760,'])()}},UserEvent:{"pre-font":null,onload:null}};',5,'Update={',421,304,'d){for(var a in d){for(var b in d[a]){for(var c in d[a',349,5,'TeX[a][b][c]=d[a][b][c]}}}},TeXfontCodes',304,'c){',1320,708,'c[a].',1384,5,'TeX[a][b].c=c[a][b]}}}};',5,'Browser={allowAbsolute:1,allowAbsoluteDelim:0,','separateSkips',':0,valignBug:0,operaHiddenFix:"",','msieCenterBugFix',':"",','msieInlineBlockFix',':"",msieSpaceFix:"",imgScale:1,renameOK:1,',1646,':0,delay:1,','processAtOnce',':16,version:0,','TestSpanHeight',358,5,314,'=\'<span><','span style="\'+this.block','+\';height:2em',';width:1px','"></span>x','</span>\';var b=',5,324,';',387,'b',325,';this.spanHeightVaries=(b',331,'>=a',331,'&&b',331,'>0);this.spanHeightTooBig=(b',331,'>a',331,');',5,314,'=""},','TestInlineBlock',358,'this.block="display',':-','moz-inline-box";','this.hasInlineBlock','=',5,'BBoxFor(\'<span style="\'+this.block','+\';width:10px;height:5px"></span>\').w>0;if','(',1828,'){',5,'styles[".typeset',' .',176,'"].display="-',1827,472,5,1837,' .spacer"].display','}',28,1825,':',178,'";',1828,'=',5,1831,1832,'(!',1828,624,'this.block+=";overflow:',180,'";var d=',5,'BBoxFor("x").h;this.mozInlineBlockBug=',5,1831,'+";height:"+d+\'px;width:1px',1801,'<',1798,'+";height:"+d+"px',1800,';vertical-align:-"+d+\'px',451,'h>2*d;this.widthAddsBorder=',5,1831,'+\';overflow:',180,';height:1px;width:10px',';border-left:','10px solid',451,'w>10;',350,5,1831,1867,1801,'\').h,b=',5,1831,1867,1881,78,1801,'\').h,a=',5,1831,1799,451,'h;this.msieBlockDepthBug=(c==d);','this.msieRuleDepthBug','=(b==d',');this.blankWidthBug=(','a==0)},','TestRenameOK',358,5,314,'="<span></span>";',387,5,324,';a.setAttribute("name","','jsMath_test','");this.renameOK=(',5,14,'getElementsByName("',1916,'").length>0);',5,314,1822,'TestStyleChange',358,5,314,'=\'<span ID="',1916,'">x</span>\';var b=',5,324,';',387,328,';',5,368,1642,'({"#',1916,'":"font-size:200%"});this.',1646,'=(',328,'==a);',5,314,1822,'VersionAtLeast',304,338,1430,'this.version',').split(".");','b=',1430,'b',1957,'if(b[1]==null){b[1]="0"}',306,'a[0]>b[0]||(a[0]==b[0]&&a[1]>=b[1])},Init',358,5,26,'="unknown";this.',1823,433,1793,433,1907,433,1926,433,'MSIE',433,'Mozilla',433,'Opera',433,'OmniWeb',433,'Safari',433,'Konqueror();if(','this.allowAbsoluteDelim','){',5,'Box.DelimExtend=',5,'Box.DelimExtendAbsolute;',5,'Box.Layout=',5,'Box.LayoutAbsolute}',28,5,'Box.DelimExtend=',5,'Box.DelimExtendRelative;',5,'Box.Layout=',5,'Box.LayoutRelative}',442,1783,'){',5,'HTML.Place=',5,'HTML.','PlaceSeparateSkips',';',5,'Typeset.prototype.','Place=',5,2017,2014,'}},MSIE',358,'if(',5,'BBoxFor("<!--[if ','IE]>IE','<![endif]-->").w','){',5,26,'="MSIE";if(',5,36,'=="pc"){this.','IE7=(',1,655,'!=null);this.','IE8=(',5,2026,'gte IE 8]>IE8',2028,'>0);','this.isReallyIE8','=(',5,14,'documentMode',2039,'quirks=(',5,14,'compatMode=="BackCompat");','this.msieMode','=(',5,14,2050,'||(this.quirks?5:7));this.msieStandard6=!this.quirks&&!this.IE7;',1988,905,1783,'=1',';this.buttonCheck=1;this.','msieBlankBug=1;this.','msieAccentBug',905,'msieRelativeClipBug','=1;this.msieDivWidthBug=1;this.',1271,905,'msieIntegralBug',905,'waitForImages',905,'msieAlphaBug','=!this.IE7;this.','alphaPrintBug',2079,1785,'="position:relative; ";this.',1787,'=" display:',178,';";this.msie8HeightBug=this.msieBBoxBug=(',2056,'==8',1905,2056,'!=8);this.msieSpaceFix=(',2046,'?\'<',1683,178,'; ','margin-right:-1px; width:1px"></span','>\':\'<span style="',2098,'>\');',5,'Macro("','joinrel','","\\\\mathrel{\\\\','kern-5mu}"),',5,'Parser.prototype.mathchardef.','mapstocharOrig','=',5,2108,'mapstochar;',472,5,2108,2113,5,2103,'mapstochar","\\\\','rlap{\\\\',2109,'\\\\,}\\\\kern1mu"),',5,1837,' .arial"]={"font-family":"\'Arial unicode MS\'"};',0,'this.IE7||this.quirks){',5,'styles["#jsMath_message"].',877,472,5,2130,'width;',5,'styles["#jsMath_panel"].',877,472,5,2137,'width;',5,'styles["#jsMath_button"].','width="1px";',5,2144,877,472,5,2144,'width;',5,1136,'=',5,1131,1136,1267,':"absolute",zIndex:101});',5,1,'attachEvent("','onscroll",',5,'Controls.MoveButton',');',5,1,2163,'onresize",',5,2166,');',5,2166,'()}',5,'styles["#jsMath_noFont .link"].','display="',178,'";',472,5,1837,1845,';',5,'styles[".tex2math_div','"]={};',5,'Add(',5,2189,'"],',5,'styles["div.',59,'"]);',5,2189,'"].width="100%";',5,2189,'"].',2180,178,'";',5,1837,'"]["letter-spacing"]="0";if(','screen.deviceXDPI','&&','screen.logicalXDPI','&&',2212,'!=',2214,313,'imgScale*=',2214,'/',2212,';',5,532,'alpha=0}if(',1903,'){',5,408,'=',5,'HTML.msieStrut}}',28,'if(',5,36,'=="mac"){this.msieAbsoluteBug',905,'msieButtonBug',2071,2067,'quirks=1;',5,368,'Script("',2,'-msie-mac.js");',5,'Parser.prototype.macros.angle=["Replace","ord",\'<font face="Symbol">&#x8B;</font>\',"',54,'"];',5,2137,'width="42em";',5,532,'printwarn=0}}this.',1791,'=Math.max(Math.floor((this.',1791,'+1)/2),1);',5,2103,'not',2105,2121,'kern3mu/}}");',5,'Macro("angle","\\\\raise1.','84pt','{\\\\kern2.5mu\\\\rlap{\\\\scriptstyle/}\\\\','kern.5pt\\\\','rule{.4em}{-','1.5pt}{1.84pt}\\\\kern2.5mu}")}},',1979,358,'if(',5,180,'.ATTRIBUTE_NODE&&',5,1,'directories){',5,26,'="',1979,'";if(',5,36,2035,2080,'=1}',1988,'=1;',5,2144,'cursor=',5,2179,'cursor="pointer",',5,2103,'not',2105,2121,'kern3mu/}}");',5,2271,'34pt',2273,2275,'1pt}{1.34pt}\\\\kern2.5mu}");if(',38,'vendor=="Firefox"){',1956,'=',38,'vendorSub}',28,'if(',38,'userAgent.match(" Firefox/([0-9.]+)([a-z ]|$)")){',1956,'=RegExp.$1}}',442,1952,'("3.0")){this.mozImageSizeBug=this.lineBreakBug=1}}},',1983,358,'if(',38,'accentColorName){',5,26,'="',1983,'";','this.allowAbsolute','=',1828,';',1988,'=',2341,';this.valignBug=!',2341,2066,1191,'=1;',5,'noChangeGlobal=1;',0,1828,'){',5,368,'Scri'],
+  ['pt("','jsMath','-old-browsers.js','")}}},Opera',':function(){','if(this.','spanHeightTooBig){',1,'.browser="','Opera";','var b=','navigator.userAgent.match','("Opera 7");','this.allowAbsolute=0;this.','delay=10;this.operaHiddenFix="[Processing]";if(b){',1,'.Setup.','Script','("',1,2,'")}','var a=','navigator.appVersion.match','(/^(\\d+\\.\\d+)/);if(a){','this.version=a','[1]}else{this.vesion=0}this.operaAbsoluteWidthBug=this.operaLineHeightBug=(a[1]>=9.5&&a[1]<9.6)}},Safari',4,'if(',23,'(/Safari\\//)){',1,8,'Safari";if(navigator.vendor','.match(/','Google/)){',1,8,'Chrome"}',22,11,'("Safari/([0-9]+)");a=(a)?a[1]:400;',25,';',1,'.TeX.','axis_height','+=0.05;this.','allowAbsoluteDelim=','a>=125;this.safariIFRAMEbug=a>=312&&a<412;this.safariButtonBug=a<412;this.safariImgBug=1;this.textNodeBug=1;this.lineBreakBug=a>=526;this.buttonCheck=a<500;this.styleChangeDelay=1;',1,'.Macro("not","\\\\mathrel{\\\\rlap{\\\\kern3.25mu/}}")}},','Konqueror',4,'if(','navigator.product','&&',55,'.match("',52,'")){',1,8,52,'";',13,48,'0;if(',11,'(/',52,'\\/(\\d+)\\.(\\d+)/)){if(RegExp.$1<3||(RegExp.$1==3&&RegExp.$2<3)){this.separateSkips=1;this.valignBug=1;',1,16,17,'("',1,2,'")}}',1,'.Add(',1,'.styles,{".typeset .cmr10":"','font-family: ',1,'-','cmr10, ',1,' cmr10',', serif','",".typeset .','cmbx10":"',83,1,'-cmbx10, ',1,' cmbx10, ',1,'-',86,1,88,90,'cmti10":"',83,1,'-cmti10, ',1,' cmti10, ',1,'-',86,1,88,90,'cmmi10":"',83,1,'-cmmi10, ',1,' cmmi10',90,'cmsy10":"',83,1,'-cmsy10, ',1,' cmsy10',90,'cmex10":"',83,1,'-cmex10',', ',1,' cmex10"});',1,'.Font.testFont','="',1,132,', ',1,' cmex10"}}};',1,'.Font={testFont:"',1,132,'",fallback:"symbol",register:[],message:"<b>No ',1,' TeX fonts ','found</b> -- using',' image fonts instead','.<br/>\\nThese may be slow and might not print well.<br/>\\nUse the ',1,' control panel to get additional information','.",','extra_message',':\'Extra',150,'not found: <b><span id="jsMath_ExtraFonts"></span></b><br/>Using',152,'.  This may be slow and might not print well.<br/>\\nUse the ',1,155,'.\',','print_message',':"To print higher-resolution math symbols, click the<br/>\\n<b>Hi-Res Fonts for Printing</b> button on the ',1,' control panel.<br/>\\n",','alpha_message',':"If the math symbols print as black boxes, turn off <b>image alpha channels</b><br/>\\nusing the <B>Options</B> pane of the ',1,169,'Test1',':function(','c,','f,d,e){if(f==null){f=124}if(d==null){d=2}if(e==null){e=""}var b=jsMath.BBoxFor(\'<span style="font-family: \'+e+c+\', serif">\'+jsMath.TeX[c][f].c+"</span>");var a=jsMath.BBoxFor(\'<span style="font-family: serif">\'+jsMath.TeX[c][f].c+"</span>");return(','b.w>d*a.w&&b.h!=0)},Test2',175,'c,',177,'a.w>d*b.w&&b.h!=0)},CheckTeX',4,22,1,'.BBoxFor(\'<span ','style="font-family',': \'+',1,137,'+\', serif">\'+',1,45,'cmex10[1].c+"</span>");',1,'.nofonts','=((a.w*3>a.h||a.h==0)&&!this.Test1("cmr10",null,null,"',1,'-"));if(!',1,196,'){return}},Check',4,22,1,'.Controls.','cookie;this.CheckTeX();if(',1,196,'){if(a.autofont||a','.font=="tex"){','a.font=this.fallback;if(a.warn){',1,'.nofontMessage=1;a.warn=0;',1,206,'SetCookie(0);if','(',1,'.window.NoFontMessage','){',1,220,'()}else{','this.Message(this.','message)}}}}else{if(a.autofont){a.font="tex"}if(a',211,'return}}if(',1,'.noImgFonts){','a.font="unicode"}if(a','.font=="unicode','"){',1,16,17,'("',1,'-fallback','-"+',1,'.platform+".js");',1,'.Box.TeXnonfallback=',1,'.Box.TeX',';',1,246,'=',1,'.Box.TeXfallback;return}','if(!a.print&&a.printwarn){this.','PrintMessage','((',1,'.Browser.','alphaPrintBug&&',1,206,'cookie.alpha)?this.',166,'+this.',170,':this.',166,')}if(',1,257,'waitForImages){',1,'.Script.','Push(',1,'.',17,',"WaitForImage",',1,'.blank)}if(a.font=="symbol"){',1,16,17,'("',1,239,'-symbols.js");',1,'.Box.TeXnonfallback=',1,246,';',1,246,'=',1,252,1,'.Img.SetFont','({cmr10:["all"],cmmi10:["all"],cmsy10:["all"],cmex10:["all"],cmbx10:["all"],cmti10:["all"]});',1,'.Img.LoadFont','("cm-fonts")},Message',175,'a){if(',1,'.Element("Warning',60,'return}',10,1,16,'DIV("Warning','",{});b.innerHTML=\'<center><table><tr><td><div ','id="jsMath_noFont"><div ','class="message">\'+a','+\'<div style="text-align:left"><span style="float:left; margin: 8px 0px 0px 20px"><span onclick="',1,206,'Panel()" ','title=" Open ','the ',1,' Control Panel',' " class="link">',1,323,'</span></span','><span style="margin: 8px 20px 0px 0px; float:right"><span onclick="',1,'.Font.','HideMessage','()" title=" Remove this font warning message',324,'Hide this Message',327,'></div><div style="height:6px"></div><br clear="all"/></div></','div><div style="width:22em; height:1px"></div></td></tr></table></center><hr/>\'},',331,4,22,1,306,'");if(a','){a.style.display="none"}},',254,175,304,1,'.Element','("PrintWarning',60,308,10,1,16,'DIV',350,313,315,'+\'</',337,'Register',175,'h,b){if(typeof(h)=="string"){h={name:h}}if(!',1,16,'inited&&!b){','this.register','[',368,'.length]=h;',308,'var i=h.name;',22,'i.replace(/10$/,"");var f=',1,45,'fam.length;if(h.prefix==null){h.prefix=""}if(!h.style){h.',187,': "+h.prefix+i+", serif"}if(!h.styles){h.styles={}}if(!h.macros){h.macros={}}',1,45,'fam[f]=i;',1,45,'famName[i]=f;h.macros[a]=["HandleFont",f];',1,80,1,'.Parser.prototype.macros,h.macros);h.styles[".typeset ."+i]=h.style;',1,16,'Styles(h.styles);if(',1,'.initialized){',1,272,'Push(',1,'.Setup,"TeXfont",i)}var c=',1,206,'cookie;var e=!',1,196,'&&h.test(i,h.testChar,h.testFactor,h.prefix);if(e&&c',211,'if(h.tex){h.tex(i,f,h)}',308,'if(!e&&c.warn&&c.font=="tex"&&!',1,196,'){if(!c.fonts.match("/"+i+"/")){c.fonts+=i+"/";',1,206,217,'(!',1,306,60,225,157,')}var g=',1,'.Element("ExtraFonts");if(g){if(g','.innerHTML','!=""){g',426,'+=","}g',426,'+=" "+h.prefix+i}}}if(c',232,'"||',1,230,'if(h.fallback){h.fallback(i,f,h)}',308,'var d={};if(c.font=="symbol"&&h.symbol!=null){d[i]=h.symbol(i,f,h)}else{d[i]=["all"]}',1,298,'(d);',1,301,'(i);if(',1,'.initialized){',1,272,'Push(',1,'.Img,"Scale");',1,272,'Push(',1,'.Img,"UpdateFonts")}},LoadRegistered',4,22,'0;while(a<',368,'.length){this.Register(',368,'[a++],1)}',368,'=[]},Load',175,'a){',1,16,17,'(this.URL(a))},URL',175,'a){','return ',1,'.Img.root+a+"/def.js"}};',1,'.Controls={cookie:{scale:100,font:"tex",autofont:1,scaleImg:0,alpha:1,warn:1,fonts:"/",printwarn:1,stayhires:0,button:1,progress:1,asynch:0,blank:0,print:0,keep:"0D",global:"auto",hiddenGlobal:1},','cookiePath',':"/",','noCookiePattern',':/^(file|mk):$/,Init',4,'this.panel=',1,16,'DIV("panel",{display:"none"},',1,'.fixedDiv);','if(!',1,257,'msieButtonBug){this.Button',224,'setTimeout("',1,206,'Button()",500)}},Panel',4,1,'.Translate.Cancel();',5,'loaded){this.Main',224,1,272,'delayedLoad(',1,'.root+"',1,'-controls.html")}},Button',4,22,1,16,'DIV("button",{},',1,489,'a.',320,1,323,' ";a',426,'=\'<span onclick="',1,206,'Panel()">',1,'</span>\';if(!',1,'.Global.','isLocal&&!',1,'.noShowGlobal){a',426,'+=\'<span id="jsMath_global" ',320,1,' Global Panel " onclick="',1,532,'Show(1)">Global&nbsp;</span>\'}if(a.offsetWidth<30){a.style.width="auto"}if(!','this.cookie','.button',344,'MoveButton',4,'var a=(',1,257,'quirks?document.body:document.documentElement);',1,'.fixedDiv.style.','left=a.scrollLeft+"px";',1,554,'top=a.scrollTop+a.clientHeight+"px";',1,554,'width=a.clientWidth+"px"},GetCookie',4,'if(','this.defaults','==null){',564,'={}}',1,80,564,',',544,');this.userSet={};var c=',1,'.document.cookie',';if(',1,'.window.location','.protocol.match(this.',481,')){c=this.','localGetCookie','();this.','isLocalCookie','=1}if(c',34,1,'=([^;]+)/)){var d=unescape(RegExp.$1).split(/,/);for(',10,'0;b<d.length;b++){',22,'d[b].match(/(.*):(.*)/);if(a[2].match(/^\\d+$/)){a[2]=1*a[2]}',544,'[a[1]]=a[2];this.userSet[a[1]]=1}}},',582,4,474,1,578,'.search.substr(1)},SetCookie',175,'f){var b=[];for(var e in ',544,'){if(',564,'[e]==null||',544,'[e]!=',564,'[e]){b[b.length]=e+":"+',544,'[e]}}b=b.join(",");',5,584,'){if(f==2){return"',1,'="+escape(b)}','this.','localSetCookie','(b,f)}else{b=escape(b);if(b==""){f=0}',5,479,'){b+="; path="+this.',479,'}',5,'cookieDomain','){b+="; domain="+this.',627,'}if(',544,'.keep!="0D"){var a={D',':1000*60*60*24',',W',633,'*7,M',633,'*30,Y',633,'*365};var d=new Date;d.setTime(d.getTime()+',544,'.keep.substr(','0,1)*a[',544,642,'1,1)]);b+="; expires="+d.toGMTString()}if(b!=""){',1,575,'="',1,'="+b;var c=',1,575,';if(f&&!c',34,1,'=/)){alert("Cookies must be enabled in order to save ',1,' options")}}}',474,'null},',619,175,'b,c){if(!c){',308,22,'String(',1,578,').replace(/\\?.*/,"");if(b!=""){a+="?',1,617,'if(a!=',1,578,'.href){this.Reload(a)}},Reload',175,'a){if(!this.loaded){',308,'this.loaded=0;',1,16,'inited=-100;',1,532,'ClearCache();if(a){',1,578,'.replace(a)}else{',1,578,'.reload()}}};',1,'.Click={CheckClick',175,'a){if(!a){a=',1,'.window.event}if','(a.altKey){',1,206,'Panel()}},CheckDblClick',175,'b){if(!b){b=',1,698,'(!',1,'.Click.DblClick){',1,'.Extension.Require("double-click",1);',22,'b;b={};for(var c in a){b[c]=a[c]}}',1,272,'Push(',1,'.Click,"DblClick",[b,this.alt])}};',1,'.TeX={thinmuskip:3/18,medmuskip:4/18,thickmuskip:5/18,x_height:0.430554,quad:1,num1:0.676508,num2:0.393732,num3:0.44373,denom1:0.685951,denom2:0.344841,sup1:0.412892,sup2:0.362892,sup3:0.288888,sub1:0.15,sub2:0.247217,sup_drop:0.386108,sub_drop:0.05,delim1:2.39,delim2:1,',46,':0.25,default_rule_thickness:0.06,big_op_spacing1:0.111111,big_op_spacing2:0.166666,big_op_spacing3:0.2,big_op_spacing4:0.6,big_op_spacing5:0.1,integer:6553.6,scriptspace:0.05,nulldelimiterspace:0.12,delimiterfactor:901,delimitershortfall:0.5,scale:1,atom:["ord","op","bin","rel","open","close","punct","ord"],fam:["cmr10","cmmi10","cmsy10","cmex10","cmti10","","cmbx10",""],famName:{cmr10:0,cmmi10:1,cmsy10:2,cmex10:3,cmti10:4,cmbx10:6},encoding:["&#xC0;","&#xC1;","&#xC2;","&#xC3;","&#xC4;","&#xC5;","&#xC6;","&#xC7;","&#xC8;","&#xC9;","&#xCA;","&#xCB;","&#xCC;","&#xCD;","&#xCE;","&#xCF;","&#xB0;","&#xD1;","&#xD2;","&#xD3;","&#xD4;","&#xD5;","&#xD6;","&#xB7;","&#xD8;","&#xD9;","&#xDA;","&#xDB;","&#xDC;","&#xB5;","&#xB6;","&#xDF;","&#xEF;","!","&#x22;","#","$","%","&#x26;","&#x27;","(",")","*","+",",","-",".","/","0","1","2","3","4","5","6","7","8","9",":",";","&#x3C;","=","&#x3E;","?","@","A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z","[","&#x5C;","]","^","_","`","a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z","{","|","}","&#x7E;","&#xFF;"],cmr10:[[0.625',',0.683],[0.','833',723,'778',723,'694',723,'667',723,'75',723,'722',723,'778',723,'722',723,'778',723,'722',723,'583',',0.694,0,{ic:0.0778,krn:{"39":0.0778,"63":0.0778,"33":0.0778,"41":0.0778,"93":0.0778},lig:{"105":','14,"108":15}}],[0.556',',0.694],[0.','556',747,'833',747,'833',747,'278',',0.431],[0.','306',',0.431,0.194],[0.','5',747,'5',747,'5,0.628],[0.5',747,'5,0.568],[0.75',747,'444,0,0.17],[0.5',747,'722',755,'778',755,'5,0.528,0.0972],[0.903,0.683],[1.01',723,'778,0.732,0.0486],[0.278',',0.431,0,{','krn:{"108":-0.278,"76":-0.319}}],[0.278',',0.694,0,{','lig:{"96":','60}}],[0.5',747,'833',',0.694,0.194],[','0.5',',0.75,0.0556],[0.','833',784,'778',747,'278',777,'krn:{"63":0.111,"33":0.111},lig:{"39":34}}],[0.389',',0.75,0.25],[0.','389',792,'5,0.75],[','0.778,0.583,0.0833],[','0.278,0.106',',0.194],[0.','333',775,'lig:{"45":','123}}],[',797,'],[0.5',792,'5,0.644','],[0.5,0.644],[0.5,0.','644',807,'644',807,'644',807,'644],[0.5,0.644],[0.278',755,'278',757,'278,0.5',798,'778',',0.367,-0.133],[','0.472,0.5',798,'472',777,778,'62}}],[0.778',747,'75',',0.683,0,{krn:{"','116','":-0.0278,"','67',832,'79',832,'71',832,'85',832,'81',832,'84":-0.0833,"89":-0.0833,"86":-0.111,"87":-0.111}}],[0.','708',723,'722',723,'764',830,'88',832,'87',832,'65',832,'86',832,'89":-','0.0278}}],[0.','681',723,'653',',0.683,0,{','krn:{"111":-0.0833,"101":-0.0833,"117":-0.0833,"114":-0.0833,"97":-0.0833,"65":-0.111,"79":-0.0278,"67":-0.0278,"71":-0.0278,"81":-0.0278}}],[','0.785',723,'75',723,'361',830,'73":',859,'514',723,'778',830,'79',832,'67',832,'71',832,'81":-',859,'625',830,843,'917',723,'75',723,'778',830,'88',832,'87',832,'65',832,'86',832,'89":-',859,'681',830,'65','":-0.0833,"','111',832,'101',832,'97',832,'46',907,'44":-0.','0833}}],[0.','778,0.683',798,'736',830,'116',832,'67',832,'79',832,'71',832,'85',832,'81',832,843,'556',723,'722',830,'121',832,'101',907,'111',907,'114',907,'97',907,'65',907,'117":-0.',917,'75',723,'75',',0.683,0,{ic:0.','0139,',864,'1.03',956,'0139,',864,'0.75',830,'79',832,'67',832,'71',832,'81":-',859,'75',956,'025,krn:{"101',907,'111',907,'114',907,'97',907,'65',907,951,917,'611',723,'278',792,'5',747,'278',792,'5',747,'278,0.668],[0.','278',777,778,'92}}],[0.5',775,'krn:{"118',832,'106":0.0556,"121',832,'119":-',859,'556,0.','694,0',',{krn:{"101":0.0278,"111":0.0278,"120":-0.0278,"100":0.0278,"99":0.0278,"113":0.0278,"118":-0.0278,"106":0.0556,"121":-0.0278,"119":-0.0278}}],[0.','444',775,'krn:{"104',832,'107":-',859,'556',747,'444',755,'306',745,'12,"102":11,"108":13}}],[0.5',',0.431,0.194,{','ic:0.','0139,krn:{"','106":',859,'556',777,'krn:{"116',832,'117',832,'98',832,'121',832,'118',832,'119":-',859,997,'306,0.668',798,'528',777,'krn:{"97','":-0.0556,"','101',832,'97',832,'111',832,'99":-',859,'278',747,'833',775,'krn:{"116',832,'117',832,'98',832,'121',832,'118',832,'119":-',859,'556',775,'krn:{"116',832,'117',832,'98',832,'121',832,'118',832,'119":-',859,'5,0.431,0',1011,1009,'431,0.194',1011,'528',757,'392',755,'394',755,'389,0.615,0,{krn:{"121',832,'119":-',859,'556',775,'krn:{"119":-',859,'528',',0.431,0,{ic:0.',1027,'97',1050,'101',832,'97',832,'111',832,'99":-',859,'722',1109,1027,'101',832,'97',832,'111',832,'99":-',859,'528',755,'528',1025,'ic:0.',1027,'111',832,'101',832,'97',832,'46',907,'44":-0.',917,'444',755,'5',1109,'0278,',801,'124}}],[1',1109,'0278}],[0.','5',747,'5,0.668],[0.5,0.668]],cmmi10:[[0.615',956,'139',',krn:{"61":-0.0556,"59":-0.111,"58":-0.111,"127":0.',917,'833',830,'127":0.167}}],[0.','763',956,1152,'krn:{"127":0.0833}}],[0.','694',830,1166,'742',956,'0757,',1170,'831',956,'0812,krn:{"61',1050,'59":-0.0556,"58":-0.0556,"127":0.','0556}}],[0.','78',956,'0576,',1170,'583',956,'139',1162,1183,'667',863,1170,'612',956,'11,krn:{"61',1050,1182,1183,'772',956,'0502,',1170,'64',1109,'0037,','krn:{"127":',859,'566',',0.694,0.194,{ic:0.','0528,',1170,'518',1025,'ic:0.0556','}],[0.444',777,'ic:0.0378,krn:{"',1182,1183,'406',775,'krn:{"127":0.0556}}],[0.','438',1212,'0738,',1170,'497',1025,'ic:0.0359',',',1225,'469',777,'ic:0.',1152,1170,'354',775,1225,'576',755,'583',747,'603',1025,1209,859,'494',1109,'0637,krn:{"',1182,'0278}}],[0.','438',1212,'046,',1209,'0.111}}],[0.','57',1109,'0359}],[0.','517',1025,1170,'571',1109,'0359,krn:{"59',1050,'58":-0.',1183,'437',1109,'113,krn:{"',1182,1255,'54',1109,'0359,',1209,859,'596,0.694,0.194,{',1170,'626',1025,1225,'651',1212,'0359,',1209,1260,'622',1109,1263,'466',775,1170,'591',777,1170,'828',1109,1156,'517',1025,1170,'363,0.431,0.0972,{ic:0.0799,',1170,'654',1025,1209,'0.0833}}],[1',821,'1',821,'1',821,'1',821,'0.278',',0.464,-0.0363],[','0.278',1322,'0.5,0.465,-0.0347],[',1325,'0.5',755,'5',755,'5',755,'5',757,'5',757,'5,0.',1092,807,1092,807,'431',798,'278,0.106],[',797,798,'778',',0.539,0.0391],[','0.5,0.75,0.25,{krn:{"1',1050,'65',1050,'77',1050,'78',1050,'89":0.0556,"90":-0.',1183,'778',1348,1325,'0.531',777,1217,',',1170,'75',830,'127":','0.','139}}],[0.','759',956,'0502,',1170,'715',956,'0715,krn:{"61',832,1182,917,'828',956,1152,1225,'738',956,'0576,',1170,'643',956,'139',1162,917,'786',863,1170,'831',956,'0812,krn:{"61',1050,1182,1183,'44',956,'0785,',1209,1260,'555',956,'0962',1162,'167}}],[0.','849',956,'0715,krn:{"61',1050,1182,1183,'681',830,1369,859,'97',956,'109,krn:{"','61',1050,1182,917,'803',956,1426,'61',907,'61',832,1182,917,'763',956,1152,1170,'642',956,'139',1162,917,'791,0.683,0.194,{',1170,'759',956,'00773,',1170,'613',956,'0576,krn:{"61',1050,1182,917,'584',956,'139,krn:{"61',832,1182,917,'683',956,1426,'59":-0.111,"',1271,'111,"61',1050,1369,859,'583',956,'222',',krn:{"59":-0.167,"58":-0.167,"61":-0.111}}],[0.','944',956,'139',1479,'828',956,'0785,krn:{"61',907,'61',832,1182,917,'581',956,'222',1479,'683',956,'0715,krn:{"61',1050,1182,917,'389,0.75],[0.389',782,'0.389',782,'1,0.358,-0.142],[',1506,'0.417',777,1209,1260,'529',755,'429',747,'433',775,1225,'52',777,'krn:{"89":0.0556,"90',1050,'106":-0.111,"102":-0.167,"',1166,'466',775,1225,'49',1212,'108,krn:{"',1182,1413,'477',1025,1232,',',1209,859,'576',777,'krn:{"127":-',859,'345,0.66],[0.412,0.66,0.194,{ic:0.0572,krn:{"59',1050,1271,1183,'521',777,'ic:0.0315}],[0.298',777,'ic:0.0197,',1170,'878',755,'6',755,'485',775,1225,'503',1025,1170,'446',1025,1232,',',1170,'451',1109,1152,'krn:{"',1182,1183,'469',775,1225,'361,0.615,0,{',1170,'572',775,1209,859,'485',1109,'0359,',1209,859,'716',1109,'0269,',1170,'572',775,1209,859,'49',1025,1232,',',1225,'465',1109,'044,',1225,'322',775,1209,859,'384',1025,1170,'636',1025,1209,1260,'5,0.714,0,{ic:0.154}],[0.278',777,'ic:0.399}]],cmsy10:[[',796,'0.278,0.444,-0.0556],[',796,1325,796,'0.5,0.444,-0.0556],[',796,796,796,796,796,796,796,'1',782,1624,1624,'0.778',1322,'0.778,0.464,-0.0363','],[0.778,0.636,0.136',1639,1639,1639,1639,1639,'],[0.778',821,'0.778,0.483,-0.0169],[0.778',1348,'0.778',1348,'1',1348,'1',1348,'0.778',1348,'0.778',1348,'1',821,'1',821,'0.5',782,'0.5',782,'1',821,'1',782,'1',782,'0.778',1322,'1',821,'1',821,'0.611',782,'0.611',782,'1',821,'1',782,'1',782,'0.778',755,'275,0.556],[1',755,'667',1348,'0.667',1348,'0.889',782,'0.889',782,'0',782,'0',821,'0.556',747,'556',747,'667',755,'5',784,'722',747,'722',747,'778',747,'778',747,'611',747,'798',830,'48":0.','194}}],[0.657',956,'0304',',krn:{"48":0.',1371,'527',956,'0583',1729,1371,'771',956,'0278',1729,917,'528',956,'0894',1729,'111}}],[0.','719',956,'0993',1729,1745,'595',',0.683,0.0972,{ic:0.','0593',1729,1745,'845',956,'00965',1729,1745,'545',956,'0738,krn:{"48":',859,'678',1752,'185',1729,1413,'762',956,'0144',1729,1183,'69',830,1725,'139}}],[1.2',830,1725,1371,'82',956,'147',1729,917,'796',956,1738,1729,1745,'696',956,'0822',1729,917,'817,0.683,0.0972,{krn:{"48":',1260,'848',830,1725,917,'606',956,'075',1729,1371,'545',956,'254,krn:{"48":',859,'626',956,'0993',1729,917,'613',956,'0822,krn:{"48":',859,'988',956,'0822',1729,917,'713',956,'146',1729,1371,'668',1752,'0822',1729,917,'725',956,'0794',1729,1371,'667,0.556],[0.',1841,1841,1841,1841,'611',747,'611',747,'444',792,'444',792,'444',792,'444',792,'5',792,'5',792,'389',792,'389',792,'278',792,'5',792,'5',792,'611',792,'5',792,'278',782,'0.833,0.04,0.96],[0.75',723,'833',723,'417',1212,'111}],[0.',1841,'667,0.556',1639,1639,'],[0.444',782,'0.444',782,'0.444',782,'0.611',782,'0.778,0.694,0.13','],[',1897,'],[',1897,'],[',1897,']],cmex10:[[0.458',',0.04,1.16,{n:','16}],[0.458',1905,'17}],[0.417',1905,'104}],[0.417',1905,'105','}],[0.472,0.04,1.16,{n:','106',1913,'107',1913,'108',1913,'109}],[0.583',1905,'110}],[0.583',1905,'111',1913,'68',1913,'69}],[0.333',',0,0.6,{delim:{rep:','12}}],[0.556',1929,'13}}],[0.578',1905,'46}],[0.578',1905,'47}],[0.597',',0.04,1.76,{n:','18}],[0.597',1937,'19}],[0.736',',0.04,2.36,{n:','32}],[0.736',1941,'33}],[0.528',1941,'34}],[0.528',1941,'35}],[0.583',1941,'36}],[0.583',1941,'37}],[0.583',1941,'38}],[0.583',1941,'39}],[0.75',1941,'40}],[0.75',1941,'41}],[0.75',1941,'42}],[0.75',1941,'43}],[1.04',1941,'44}],[1.04',1941,'45}],[0.792',',0.04,2.96,{n:','48}],[0.792',1969,'49}],[0.583',1969,'50}],[0.583',1969,'51}],[0.639',1969,'52}],[0.639',1969,'53}],[0.639',1969,'54}],[0.639',1969,'55}],[0.806',1969,'56}],[0.806',1969,'57}],[0.806',',0.04,2.96],[','0.806',1989,'1.28',1989,'1.28',1989,'0.811',1937,'30}],[0.811',1937,'31}],[0.875',',0.04,1.76,{delim:{top:','48,bot:64,rep:66}}],[0.875',2001,'49,bot:65,rep:67}}],[0.667',2001,'50,bot:52,rep:54}}],[0.667',2001,'51,bot:53,rep:55','}}],[0.667,0.04,1.76,{delim:{bot:','52,rep:54',2009,'53,rep:55','}}],[0.667,0,0.6,{delim:{top:','50,rep:54',2013,'51,rep:55','}}],[0.889,0,0.9,{delim:{top:','56,mid:60,bot:58,rep:62',2017,'57,mid:61,bot:59,rep:62',2017,'56,bot:58,rep:62',2017,'57,bot:59,rep:62','}}],[0.889,0,1.8,{delim:{rep:','63',2025,'119}}],[0.889,0,0.3,{delim:{rep:62',2013,'120,bot:121,rep:63}}],[0.875',2001,'56,bot:59,rep:62}}],[0.875',2001,'57,bot:58,rep:62}}],[0.875',1929,'66}}],[0.875',1929,'67}}],[0.611',1937,'28}],[0.611',1937,'29','}],[0.833,0,1,{n:','71}],[1.11',',0.1,1.5],[','0.472,0,1.11,{ic:0.194,n:','73}],[','0.556,0,2.22,{ic:0.444}],[1.11,0',',1,{n:75}],[1.51,0','.1,1.5],[1.11,0',',1,{n:77}],[1.51,0',2050,',1,{n:79}],[1.51',2045,'1.06,0,1,{n:88}],[0.944,0,1,{n:89}],[',2046,'90',2043,'91',2043,'92',2043,'93',2043,'94',2043,'95}],[1.44',2045,'1.28',2045,2048,2050,2050,2050,2050,'.1,1.5],[0.944,0,1,{n:97}],[1.28',2045,'0.556,0.722,0,{n:','99','}],[1,0.75,0,{n:','100}],[1.44,0.75],[',2078,'102',2080,'103}],[1.44,0.75],[0.472',1937,'20}],[0.472',1937,'21}],[0.528',1937,'22}'],
+  ['],[0.','528',',0.04,1.76,{n:','23}],[0.528',2,'24}],[0.528',2,'25}],[0.667',2,'26}],[0.667',2,'27','}],[1,0.04,','1.16,{n:113}],[1',2,'114',12,'2.36,{n:115',12,'2.96,{n:116}],[1.06,0,1.8,{delim:{top:118,bot:116,rep:117}}],[1.06,0,0.6],[1.06,0.04,0.56',0,'778',',0,0.6,{delim:{','top:126,','bot:127,rep:119','}}],[0.667',22,'top:120,rep:63}}],[0.667',22,'bot:121,rep:63}}],[0','.45,0.12],[0',30,30,30,'.778',22,23,'rep:119}}],[0.778',22,24,'}}]],cmti10:[[0.627',',0.683,0,{ic:0.','133}],[0.818,0.683',0,'767',41,'094}],[0.','692,0.683',0,'664',41,'153}],[0.743',41,'164}],[0.','716',41,'12}],[0.','767',41,'111}],[0.716',41,'0599}],[0.767',41,'111}],[0.716',41,'103}],[0.','613',',0.694',',0.194,{ic:0.','212,krn:{"39":0.104,"63":0.104,"33":0.104,"41":0.104,"93":0.104},lig:{"105":','14,"108":15}}],[0.','562',67,68,65,'588',67,68,65,'882',67,68,65,'894',67,68,65,'307',',0.431,0,{ic:0.','0767}],[0.','332,0.431',68,'0374}],[0.511',',0.694],[0.','511',',0.694,0,{ic:0.','0969','}],[0.511,0.','628',',0,{ic:0.','083}],[0.511',95,'108',97,'562',99,65,'831',93,'46,0,0.17',0,'537',67,68,'105}],[0.','716',88,'0751','}],[0.716',88,117,97,'528,0.0972,{ic:0.0919}],[0.883',41,56,'985',41,56,'767,0.732,0.0486,{ic:0.',46,'256,0.431,0,{krn:{"108":-0.256,"76":-0.321}}],[0.307',95,'124,lig:{"96":','60}}],[0.','514',95,'0696}],[0.818',67,68,'0662}],[0.769',93,'818',',0.75,0.0556',',{ic:0.136}],[0.','767',95,'0969}],[0.307',95,'124',',krn:{"','63":0.102,"33":0.102','},lig:{"39":34}}],[0.','409',',0.75,0.25,{ic:0.','162}],[0.409',153,'0369',97,'75',99,'149}],[0.767,0.562,0.0567,{ic:0.0369','}],[0.307,0.','106',',0.194],[0.','358',88,'0283,','lig:{"45":123}}],[0.','307,0.106',0,'511',153,'162',97,'644,0',',{ic:0.136}],[0.511,0.644,0',175,175,175,'.194',175,175,175,179,175,175,143,'307',88,'0582',161,'431',68,'0582',161,'5',68,'0756}],[0.767,0.367,-0.133,{ic:0.0662',97,'5',163,'511',95,'122,lig:{"96":62}}],[0.767',95,'096}],[0.743,0.683,0,{','krn:{"110":-0.0256,"108":-0.0256,"114":-0.0256,"117":-0.0256,"109":-0.0256,"116":-0.0256,"105":-0.0256,"67":-0.0256,"79":-0.0256,"71":-0.0256,"104":-0.0256,"98":-0.0256,"85":-0.0256,"107":-0.0256,"118":-0.0256,"119":-0.0256,"81":-','0.0256,"84','":-0.0767,"','89',208,'86','":-0.102,"','87',212,'101":-0.0511,"97":-0.0511,"111":-0.0511,"100":-0.0511,"99":-0.0511,"103":-0.0511,"113":-0.0511}}],[0.','704',41,65,'716',41,'145}],[0.','755',41,'094',149,'88','":-0.0256,"','87',227,'65',227,'86',227,'89','":-0.0256}}],[0.','678',41,56,'653',41,'133',149,'111',208,'101',208,'117','":-0.0767,"114":-0.0767,"97":-0.0767,"','65',212,'79":-0.0256,"67":-0.0256,"71":-0.0256,"81":-0.0256}}],[0.','774',41,'0872}],[0.743',41,53,'386',41,'158}],[0.525',41,'14}],[0.769',41,'145',149,251,'627,0.683,0,{krn:{"84',208,'89',208,'86',212,'87',212,215,'897',41,53,'743',41,53,'767',41,'094',149,'88',227,'87',227,'65',227,'86',227,'89',235,'678',41,'103',149,'65":-0.0767}}],[0.','767,0.683',68,46,'729',41,'0387,',206,'0.0256,"84',208,'89',208,'86',212,'87',212,215,'562',41,56,'716',41,'133',149,'121',208,'101',208,'111',248,'117',208,299,'743',41,53,'743',41,'184',149,'111',208,'101',208,'117',248,'65',212,251,'999',41,'184',149,299,'743',41,'158',149,251,'743',41,'194',149,'101',208,'111',248,'117',208,299,'613',41,221,'307',153,'188}],[0.514',95,'169}],[0.307',153,114,'511',95,'0665',161,'668',99,'118}],[0.307',95,132,'92}}],[0.','511',88,89,'46',95,'0631',149,215,'46',88,'0565',149,215,'511',95,'103',',krn:{"108":0.0511}}],[0.','46',88,117,149,215,'307',67,68,69,'12,"102":11,"108":13}}],[0.','46,0.431',68,'0885}],[0.','511',95,89,'307,0.655',99,'102',161,'655',68,221,'46',95,'108}],[0.','256',95,'103',405,'818',88,89,'562',88,'0767',149,'39":-0.102}}],[0.511',88,'0631',149,215,'511,0.431',68,'0631',149,215,'46,0.431',68,418,'422',88,'108',149,215,'409',88,'0821}],[0.332,0.615',99,'0949}],[0.537',88,89,'46',88,431,'664',88,'108',405,'464',88,56,'486,0.431',68,418,'409',88,'123}],[0.511',88,'0921',',lig:{"45":124}}],[1.','02',88,'0921}],[0.511',95,'122',97,'668',99,'116',97,'668',99,'105}]],cmbx10:[[0.692',',0.686],[0.','958',500,'894',500,'806',500,'767',500,'9',500,'831',500,'894',500,'831',500,'894',500,'831',500,'671',95,'109,krn:{"39":0.109,"63":0.109,"33":0.109,"41":0.109,"93":0.109},lig:{"105":',70,'639',93,'639',93,'958',93,'958',93,'319',',0.444],[0.','351,0.444',163,'575',93,'575',93,'575,0.','632',0,'575',93,541,'596',0,'869',93,'511,0,0.17',0,'597',93,'831',534,'894',534,541,'542,0.0972],[1.04,0.686],[1.17',500,'894,0.735,0.0486',0,'319',',0.444,0,{krn:{"','108":-0.319,"76":-0.378}}],[0.35',',0.694,0,{lig:{"96":',133,'603',93,'958',67,163,'575',142,0,'958',142,0,'894',93,'319',',0.694,0,{krn:{"','63":0.128,"33":0.128',151,'447',',0.75,0.25],[0.','447',587,541,'75',0,'894,0.633,0.133',0,'319,0.156',163,'383,0.444,0,{',167,595,0,'575',587,541,'644','],[0.575,0.644],[0.575,0.644',605,605,605,0,541,'644',0,'319',534,'319,0.444',163,'35,0.5',163,'894,0.391,-0.109',0,'543,0.5',163,'543',567,'62}}],[0.894',93,'869',',0.686,0,{krn:{"','116','":-0.0319,"','67',630,'79',630,'71',630,'85',630,'81',630,'84":-0.0958,"89":-0.0958,"86":-0.128,"87":-0.128}}],[','0.818',500,'831',500,'882',628,'88',630,'87',630,'65',630,'86',630,'89','":-0.0319}}],[0.','756',500,'724,0.686,0,{','krn:{"111":-0.0958,"101":-0.0958,"117":-0.0958,"114":-0.0958,"97":-0.0958,"65":-0.128,"79":-0.0319,"67":-0.0319,"71":-0.0319,"81":-0.0319}}],[','0.904',500,'9',500,'436',628,'73','":0.0319}}],[0.','594',500,'901',628,'79',630,'67',630,'71',630,'81',657,'692',628,641,'1.09',500,'9',500,'864',628,'88',630,'87',630,'65',630,'86',630,'89',657,'786',628,'65":-0.0958,"111',630,'101',630,'97',630,'46":-0.0958,"44":-0.0958}}],[0.','864,0.686',163,'862',628,'116',630,'67',630,'79',630,'71',630,'85',630,'81',630,641,'0.639',500,'8',628,'121',630,'101":-0.0958,"111":-0.0958,"114":-0.0958,"97":-0.0958,"65":-0.0958,"117":-0.0958}}],[0.','885',500,'869,0.686',99,'016,',661,'1.19,0.686',99,'016,',661,'0.869',628,'79',630,'67',630,'71',630,'81',657,'869,0.686',99,'0287',149,733,'703',500,'319',587,'603',93,'319',587,'575',93,'319',93,'319',567,388,'559',565,'118',630,'106":0.0639,"121',630,'119',657,'639',67,',0',',{krn:{"101":0.0319,"111":0.0319,"120":-0.0319,"100":0.0319,"99":0.0319,"113":0.0319,"118":-0.0319,"106":0.0639,"121":-0.0319,"119":-0.0319}}],[0.','511',565,'104',630,'107',657,'639',93,'527',534,'351',95,523,415,541,'444',68,'016',149,'106',669,'639',583,'116',630,'117',630,'98',630,'121',630,'118',630,'119',657,'319',93,'351',67,163,'607',583,'97":-0.0639,"101',630,'97',630,'111',630,'99',657,'319',93,'958',565,'116',630,'117',630,'98',630,'121',630,'118',630,'119',657,'639',565,'116',630,'117',630,'98',630,'121',630,'118',630,'119',657,541,'444,0',785,'639,0.444,0',179,785,'607,0.444',163,'474',534,'454',534,'447,0.635,0,{krn:{"121',630,'119',657,'639',565,'119',657,872,99,'016',149,'97":-0.0639,"101',630,'97',630,'111',630,'99',657,'831,0.444',99,'016',149,'101',630,'97',630,'111',630,'99',657,'607',534,872,68,'016',149,'111',630,'101',630,'97',630,709,'511',534,541,'444',99,'0319',486,'15,0.444',99,'0319}],[0.575',93,'575',93,'575',67,']]};','jsMath.Img','={fonts:[50,60,70,85,100,120,144,173,207,249,298,358,430],w:{"50":6.9,"60":8.3,"70":9.7,"85":11.8,"100":13.9,"120":16.7,"144":20,"173":24,"207":28.8,"249":34.6,"298":41.4,"358":49.8,"430":59.8},best:4,update:{},factor:1,loaded:0,SetFont',':function(','b){for(var a in b){if(!','this.update','[a]){',943,'[a]=[]}',943,'[a]=',943,'[a].concat(b[a])}},AddFont',941,'a,b){if(!',939,944,939,'[a]={}}jsMath.Add(',939,'[a],b)},UpdateFonts',':function(){','var e=',943,';','if(!this.loaded){','return}for(var a in e){for(var b=0;b<e[a].length;b++){var d=e[a][b];if(d=="all"){for(d in ','jsMath.TeX[','a]){',965,'a][d].img','={}}}else{',965,968,'={}}}}',943,'={}},BestSize',959,'var b=jsMath.em*this.factor;var a=','this.w[this.fonts[','0]];for(var c=1;c<this.fonts.length;c++){if(b<(',977,'c]]+2*a)/3){return c-1}a=',977,'c]]}return c-1},Scale',959,963,'return}this.best=this.BestSize();this.em=',939,'.w[this.fonts[this.best]];','this.scale','=(jsMath.em/this.em);','if(Math.abs(',988,'-1)<0.12){',988,'=1}},URL',941,'a,b,d){var c=(','jsMath.Controls.cookie.','alpha)?"/alpha/":"/plain/";if(d','==null){d','="def.js"}else{d="char"+d+".png"}if(b!=""){b+="/"}','return this.','root+a+c+b+d},LoadFont',941,'a){',963,'this.Init()}jsMath.Setup.Script(this.URL(a,""))},Init',959,'if(',997,'print||',997,'stayhires','){',997,'print=',997,1012,';this.factor*=3;if(!','jsMath.Controls.','isLocalCookie||!jsMath.Global.isLocal){',1019,'SetCookie(0)}if(','jsMath.Browser.','alphaPrintBug){',997,'alpha=0}}var b="0123456789ABCDEF";this.HexCode=[];for(var c=0;c<128;c++){var d=Math.floor(c/16);var a=c-16*d;this.HexCode[c]=b.charAt(d)+b.charAt(a)}this.loaded=1}};jsMath.HTML={Em',941,'a){',990,'a)<0.000001){a=0}var b=String(a);b=b.replace(/(\\.\\d\\d\\d).+/,"$1");return b+"em"},Spacer',941,'a){if(a==0){return""}return ',1023,'msieSpaceFix+\'<','span class="spacer" style="margin-','left:\'+this.Em(','a)+\'"></span>\'},Blank',941,'b,f,i,g){var a','="";var e="";','if(g){e+="border-left',':"+this.Em(','b)+" solid;";if(',1023,'widthAddsBorder){b=0}}if(b==0){if(',1023,'blankWidthBug){if(',1023,'quirks','){e+="width:1px',';";a=\'<',1035,'right:-1px"></span>\'}else{if(!g',1050,';margin-right:-1px;"}}}}else{e+="width',1042,'b)+";"}if(i==null){i=0}if(f){var c=this.Em(f+i);if(g&&f*jsMath.em<=1.5){c="1.5px";f=1.5/jsMath.em}e+="height:"+c+";"}if(',1023,'mozInlineBlockBug){i=-f}if(',1023,'msieBlockDepthBug','&&!g){i-=jsMath.d}if(i){e+="','vertical-align:"+','this.Em(-i)}return a+\'<span class="blank" ','style="\'+','e+\'"></span>\'},Rule',941,'a,b){if(b==null){b','=jsMath.TeX.default_rule_thickness}',1001,'Blank(a,b,0,1)},Strut',941,'a){',1001,'Blank(1,a,0,1)},msieStrut',941,'a){return','\'<img style="width:1px; height:\'+this.Em(a)+\'"/>\'},Class',941,'a,b){return\'<span class="\'+a','+\'">\'+b+"</span','>"},Place',941,'b,a,d){',990,'a)<0.0001){a=0}',990,'d)<0.0001){d=0}if(a||d){var c=\'<','span style="position',': relative',';\';if(a){c+=" margin-left',1042,'a)+";"}if(d){c+=" top:"+this.Em(-d)+";"}b=c',1081,'>"}return b},PlaceSeparateSkips',941,'e',',g,f,i,a,h){if(Math.abs(g)<0.0001){g=0}if(Math.abs(f)<0.0001){f=0}','if(f){var d=0;var c=0;','var b="";if(','i!=null){c=','a-h;d=i;b=" width',1042,'a-i)+";"}e=','this.Spacer','(d-c)+\'<',1089,1090,'; top:\'+this.Em(-f)+";left',1042,'c',')+";"+b+\'">\'+',1105,'(-d)+e+',1105,'(c)+"</span>"}if(g){e=',1105,'(g)+e}return e},PlaceAbsolute',941,'d',1098,'var c',1040,1100,1023,'msieRelativeClipBug&&',1101,1105,'(-i);g+=i;e=',1105,'(a-h)}if(',1023,'operaAbsoluteWidthBug){b=" width: "+this.Em(h+2)}d=\'<',1089,':absolute; ',1036,'g)+"; top',1042,'f',1112,'c+d+e+"&nbsp;</span>";','return d},','Absolute',941,'b,a,c,e,f){if(f!="none"){',990,'f)<0.0001){f=0}b=\'<',1089,1135,'top:\'+','jsMath.HTML.','Em(f)+\'; left:0em;">\'+b+"&nbsp;</span>"}if(e=="none"){e=0}b+=this.Blank((',1023,'lineBreakBug','?0:a),c-e,e);if(',1023,'msieAbsoluteBug){b=\'<',1089,':relative',';">\'+b+"</span>"}b=\'<',1089,1159,';\'+',1023,'msieInlineBlockFix',1081,'>";if(',1023,1154,'){b=\'<span style="display:inline-block; width:\'+',1151,'Em(a)+\'">\'+b+"</span>"}return b}};jsMath.Box=function(c,f,a,b,e){','if(e==null){','e=jsMath.d}this.type="typeset";this.w=a;this.h=b;this.d=e;this.bh=b;this.bd=e;this.x=0;this.y=0;this.mw=0;this.Mw=a;this.html=f;this.format=c};jsMath.Add(jsMath.Box,{defaultH:0,Null',959,'return ','new jsMath.Box("','null","",0,0,0)},Text',941,'l,k,b,m,j,i){var g=','jsMath.Typeset.AddClass(','k,l);g=','jsMath.Typeset.','AddStyle(','b,m,g);var c','=jsMath.EmBoxFor(','g);',960,1183,'TeX(b,m);var h=((k=="cmsy10"||k=="cmex10")?c.h-e.h:e.d*c.h/e.hd);var f=',1177,'text",l,c.w,c.h-h,h);f.style=b;f.size=m;f.tclass=k;if(i!=null){f.d=i*e.scale}else{f.d=0}if(j==null||j==1){f.h=0.9*e.M_height}else{f.h=1.1*e.x_height+e.scale*j}return f},TeX',941,'g,a,d,b){var h=',965,'a][g];if(h.d==null){h.d=0}if(h.h==null){h.h=0}if(h.img!=null&&h.c!=""){this.TeXIMG(a,g,',1183,'StyleSize(d,b))}var f=',1183,'TeX(d,b).scale;',960,1177,'text",h.c,h.w*f,h.h*f,h.d*f);e.style=d;e.size=b;if(h.tclass){e.tclass=h.tclass;if(h.img){e.bh=h.img.bh;e.bd=h.img.bd}else{e.bh=f*jsMath.h;e.bd=f*jsMath.d}}else{e.tclass=a;e.bh=f*',965,'a].h;e.bd=f*',965,'a].d;if(',1023,'msieFontBug&&','e','.html.match(/&#/)){','e','.html+=\'<span style="display:none">x</span','>\'}}return e},TeXfallback',941,'b,f,e,o){var m=',965,'f][b];if(!m.tclass){m.tclass=f}if(m.img!=null){',1001,'TeXnonfallback(b,f,e,o)}if(m.h!=null&&m.a==null){m.a=m.h-1.1*jsMath.TeX.x_height}var n=m.a;var l=m.d;var k=this.Text(m.c,m.tclass,e,o,n,l);var g=',1183,'TeX(e,o).scale;if(m.bh!=null){k.bh=m.bh*g;k.bd=m.bd*g}else{var j=k.bd+k.bh;var i=',1181,'k.tclass,k.html);i=',1183,1184,'e,o,i);k.bd',1186,'i+',1151,'Strut(j)).h-j;k.bh=j-k.bd;if(g==1){m.bh=k.bh;m.bd=k.bd}}if(jsMath.',1209,'k',1211,'k',1213,'>\'}return k},TeXIMG',941,'f,a,t){var o=',965,'f][a];if(o.img.size!=null&&o.img.size==t&&o.img.best!=null&&o.img.best==','jsMath.Img.best','){return}var g=(',939,'.scale!=1);var b=',1242,'+t-4;if(b<0){b=0;g=1','}else{if(','b>=','jsMath.Img.fonts','.length){','b=',1250,'.length-1',';g=1}}var s=',939,'[',1250,'[b]];var k=s[f][a];var i=1/',939,'.w[',1250,'[b]];if(b!=',1242,'+t-4){if(o.w!=null){i=o.w/k[0]}else{i*=',1250,'[t]/',1250,'[4]*',1250,'[',1242,']/',1250,'[b]}}var p=k[0]*i;var l=k[1]*i;var n=-k[2]*i;var q;var j=(o.w==null||Math.abs(o.w-p)<0.01)?"":" margin-right:"+',1151,'Em(o.w-p)+";";var e="";a=',939,'.HexCode[a];if(!g&&!',997,'scaleImg){if(',1023,'mozImageSizeBug||2*p<l||(',1023,'msieAlphaBug&&',997,'alpha)){e="height',':"+(k[1]*',1023,'imgScale',')+"px;"}e+=" width:"+(k[0]*',1023,1290,')+"px;";q=-k[2]+"px"}else{if(',1023,'mozImageSizeBug||2*p<l||(',1023,'msieAlphaBug&&',997,1287,':"+',1151,'Em(l*',1023,1290,')+";"}e+=" width:"+',1151,'Em(p*',1023,1290,')+";";q=',1151,'Em(n)}var r=(Math.abs(n)<0.01&&!',1023,'valignBug)?"":" ',1063,'q+";";var m=',939,'.URL(f,',1250,'[b],a);if(',1023,'msieAlphaBug&&',997,'alpha){','o.c=\'<img src="\'+','jsMath.blank+\'" ',1065,1023,'msieCenterBugFix+e+r+j','+" filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src=\'"+m+"\', sizingMethod=\'scale\');\\" />"}else{',1326,'m+\'" ',1065,1023,1330,'+\'" />\'}o.tclass="normal";o.img.bh=l+n;o.img.bd=-n;o.img.size=t;o.img.best=',1242,'},Space',941,1077,' ','new jsMath.Box("html",',1151,'Spacer(a),a,0,0)},Rule',941,'a,c){if(c==null){c',1069,'var b=',1151,'Rule(a,c);return ',1343,'b,a,c,0)},GetChar',941,'b,a){var d=',965,'a][b];','if(d.img!=null){this.TeXIMG(a,b',',4)}if(d.tclass',999,'.tclass=a}if(!d.computedW){d.w',1186,1181,'d.tclass,d.c)).w',';if(d.h',999,'.h=jsMath.Box.defaultH}if(','d.d',999,'.d=0}d.computedW=1}',1142,'DelimBestFit',941,'e,j,d,g){if(j==0&&d==0){return null}var i;var f;d','=jsMath.TeX.fam[','d];var a=(g.charAt(1)=="S");var b=(g.charAt(0)=="S");while(j!=null){i=',965,'d][j];if(i.h==null){i',1367,'i.d==null){i.d=0}f=i.h+i.d;if(i.delim','){return[j,d',',"",e]}if(a&&0.5*f>=e',1381,',"SS",0.5*f]}if(b&&0.7*f>=e',1381,',"S",0.7*f]}if(f>=e||i.n==null',1381,',"T",f]}j=i.n}return null},DelimExtendRelative',941,'k,x,r,A,e){var s=',965,'r][x];var q','=this.GetChar(s.delim.','top?s','.delim.top',':s.delim.rep,r);var ','b',1393,'rep,r);var p',1393,'bot?s','.delim.bot',1396,'f=',1181,'b.tclass,b.c);','var l=b.w;var v=b.h+b.d;var g;var d;var m;var o;var u;var t;if(s','.delim.mid){var ','z',1393,'mid,r);t','=Math.ceil((k-(','q.h+q.d)-(','z.h+z.d)-(p.h+p.d))/(2*(b.h+b.d',')));k=2*','t*(b.h+b.d)+(q.h+q.d)+(','z.h+z.d)+(p.h+p.d);if(e){g=0}else{g=k/2+A}d=g;m=',1151,'Place(',1181,'q.tclass,q.c),0,g-q.h',')+',1151,1419,1181,'p.tclass,p.c),-(','q.w+p.w)/2,g-(k-p.d))+',1151,1419,1181,'z.tclass,z.c),-(p.w+z.w)/2,g-(k+z.h-z.d)/2);o=(l-z','.w)/2;if(Math.abs(o)<0.0001){o=0}if(o){m+=jsMath.HTML.Spacer(o)}g-=q.h+q.d+b.h;for(u=0;u<t;u++){m+=jsMath.HTML.Place(f,-l,g-u*v)}','g-=k/2-b.h/2;for(u=0;u<t;u++){m+=',1151,1419,'f,-l,g-u*v)}}else{t',1412,1413,'p.h+p.d))/(b.h+b.d));if(q.h+q.d<0.9*(b.h+b.d)){t=Math.max(1,t)}k=',1416,'p.h+p.d);if(e){g=0}else{g=k/2+A}d=g;m=',1151,1419,1181,1421,');o=(l-q',1432,'m+=',1151,1419,1181,1426,'l+p.w)/2,d-(k-p.d))}if(e){v=q.h}else{v=k/2+A}var j=',1343,'m,b.w,v,k-v);j.bh=',965,'r].h;j.bd=',965,'r].d;return j},DelimExtendAbsolute',941,'k,v,p,z,d){var u=',965,'p];var q=u[v];var l;var o','=this.GetChar(q.delim.','top?q',1395,':q.delim.rep,p);var ','b',1464,'rep,p);var m',1464,'bot?q',1402,1467,'r;var t;var f;var e;var s;if(q',1408,'x',1464,'mid,p);r',1412,'o.h+o.d)-(','x.h+x.d-0.05',')-(','m.h+m.d-0.05','))/(2*(','b.h+b.d-0.05',1415,'r*(b.h+b.d-0.05)+(o.h+o.d)+(',1482,')+(',1484,');l=','jsMath.HTML.PlaceAbsolute(',1181,'o.tclass,o.c),0,0);t=',1486,';f=o.d-0.05+b.h;e=',1181,1406,'for(s=0;s<r;s++){l+=',1493,'e,0,f+s*t)}l+=',1493,1181,'x.tclass,x.c),0,f+r*t-b.h+x.h);f+=r*t+',1482,';for(s=0;s<r;s++){l+=',1493,'e,0,f+s*t)}l+=',1493,1181,'m.tclass,m.c),0,f+r*t-b.h+m.h)}','else{r',1412,1481,1484,'))/(',1486,'));k=',1488,1484,');l=',1493,1181,'o.tclass,o.c),0,0);t=',1486,';f=o.d-0.05+b.h;e=',1181,1406,'for(s=0;s<r;s++){l+=',1493,'e,0,f+s*t)}l+=',1493,1181,1512,'var j=o.w;if(d){t=o.h;f=0}else{t=k/2+z;f=t-o.h}if(',997,'font==="unicode"){if(',1023,'msie8HeightBug){','f-=jsMath.hd',1248,1023,1061,'){f+=jsMath.d}}}l=',1151,1143,'(l,j,u.h,"none",-f);var g=',1343,'l,b.w,t,k-t);g.bh=',965,'p].h;g.bd=',965,'p].d;return g},Delimiter',941,'b,h,c,g){var a=4;var f=',1183,'TeX(c,a);if(!h){',1001,'Space(f.nulldelimiterspace)}','var ','e=this.DelimBestFit(b,h[','2],h[1],c);if(e==null||e[3]<b){',1562,'4],h[3],c)}',1173,1001,1560,'if(e[2]==""){',1001,'DelimExtend(b,e[0],e[1],f.axis_height,g)}var d=jsMath.Box.TeX(e[0],e[1],e[2],a).Styled();if(!g){d.y=-((d.h+d.d)/2-d.d-f.axis_height)}',990,'d.y)<0.0001){d.y=0}if(d.y){d','=jsMath.Box.SetList','([d],e[2],a)}',1142,'GetCharCode',941,'b){var a',1375,'b[0]];',960,965,'a];var d=e[b[1]];',1358,'[1],4)}if(d.w',999,'.w',1186,1181,1364,'}if(d.font',999,'.font=a}',1142,'AddClass',941,'b,c,a){if(b==null){b=a}return ',1181,'b,c)},LayoutRelative',941,'z,J,B,k,l,p,G,A){if(B==null){B=[]}if(k==null){k=[]}if(l==null){l=[]}if(G==null){G=1}if(A==null){A=1}var L=jsMath.sizes[z]/100;var g=[];var v=[];var x=[];var e=-1000;var f=e;var m=e;var E;var C;var o',';for(E=0;E<J.length;E++){','if(l[E]==null){l[E]=0}o=J[E];v[E]=G*jsMath.h*L;x[E]=G*jsMath.d*L;for(C=0;C<o.length;C++){o[C]=o[C','].Remeasured();if(','o[C].h>v[E]){v[E]=o[C].h}if(o[C].d>x[E]){x[E]=o[C].d}if(C>=g',1251,'g[C]=o[C].w',1248,'o[C].w>g[C]){',1608,'}}if(o[C].bh>f){f=o[C].bh}if(o[C].bd>m){m=o[C].bd}}}if(l[J','.length]==null){','l[J.length]=0}if(f==e){f=0}if(m==e){m=0}var a=G','*(jsMath.hd-0.01)*','L;var u=(p||1)*L/6;var t="";var n=0;var I=0;var s;var F;var q;var r;var c;var b;for(C=0;C<g.length;C++){c=[];q=-v[0]-l[0];n=0',1603,'b=J[E][C','];if(b&&b.format!="null"){if(','B[C]=="l"){s=0',1248,'B[C]=="r"){s=g[C]-b.w}else{s=(g[C]-b.w)/2}}b.x=s-n;n=b.w+s;b.y=q;c[c.length]=b}if(E+1<J',1251,'q-=Math.max(a,x[E]+v[E+1])+u+l[E+1]}}if(k[C]==null){k[C]=L}if(c.length>0){r',1574,'(c,"T",z);t+=',1151,1419,'r.html,I,0);I=g[C]-r.w+k[C]}else{I+=k[C]}}s=-k[g',1254,'];q=(v',1254,')*u+l[0];for(E=0;E<g.length;E++){s+=g[E]+k[E]}for(E=0;E<v.length;E++){q','+=Math.max(a,','v[E]+x[E])+l[E+1]}F=q','/2+jsMath.TeX.axis_height;var ','K=q-F;t+=',1151,'Spacer(I-k[g',1254,']+A*L/6);t=',1151,1419,'t,A*L/6,F);r=',1343,'t,s+A*L/3,F,K);r.bh=f;r.bd=m;return r},LayoutAbsolute',941,'t,E,z,e,f,k,B,u){if(z==null){z=[]}',1173,'e=[]}if(f==null){f=[]}if(B==null){B=1}if(u==null){u=1}var G=jsMath.sizes[t]/100;var a=B',1615,'G;var p=(k||1)*G/6;var c=[];var q=[];var s=[];var r=0;var C;var n;var l;var A;var v;var g;','for(A=0;A<E.length;A++){','if(f[A]==null){f[A]=0}g=E[A];q[A]=B*jsMath.h*G;s[A]=B*jsMath.d*G;for(v=0;v<g.length;v++){g[v]=g[v',1605,'g[v].h>q[A]){q[A]=g[v].h}if(g[v].d>s[A]){s[A]=g[v].d}if(v>=c',1251,'c[v]=g[v].w',1248,'g[v].w>c[v]){',1658,'}}}}if(f[E',1613,'f[E.length]=0}l=(q',1254,')*p+f[0];for(A=0;A<q.length;A++){l',1634,'q[A]+s[A])+f[A+1]}C=l',1636,'F=l-C;var o="";var b;r=u*G/6;for(v=0;v<c.length;v++){l=q[0]-C+f[0];',1653,'b=E[A][v',1619,'z[v]&&z[v]=="','l"){n=0',1248,1674,'r"){n=c[v]-b.w}else{n=(c[v]-b.w)/2}}o+=',1493,'b.html,r+n,l-Math.max(0,b.bh-jsMath.h*G),b.mw,b.Mw,b.w)}if(A+1<E',1251,'l',1634,'s[A]+q[A+1])+p+f[A+1]}}if(e[v]==null){e[v]=G}r+=c[v]+e[v]}r=-e[c',1254,']+u*G/3;for(A=0;A<c.length;A++){r+=c[A]+e[A]}o=',1151,'Spacer(u*G/6',')+o+',1151,1688,');if(',1023,'spanHeightVaries){l=C-jsMath.h}else{l=0}if(',1023,1540,'l=F-jsMath.d}o=',1151,1143,'(o,r,C+F,F,l);var m=',1343,'o,r+u*G/3,C,F);return m},InternalMath',941,'h,l){if(!jsMath.safeHBoxes){h=h.replace(/@\\(([^)]*)\\)/g,"<$1>")}if(!h.match(/\\$|\\\\\\(/)){',1001,'Text(this.safeHTML(h),"normal","T",l).Styled()}',960,'0;var d=0;var g;var f="";var a=[];var b,j;while(e<h',1251,'g=h.charAt(e++);if(g','=="$"){if(f=="$"){','b=jsMath.Parse(h.slice(d,e-','1','),null,l);if(b.error){a[a.length]=this.Text(b.error,"error","T",l,1,0.2)}else{b.Atomize();a[a.length]=b.mlist.Typeset("T",l).Styled()}f="";d=e','}else{','j=this.safeHTML(h.slice(d',',e-1','));a[a.length]=this.Text(j,"normal","T",l,1,0.2);','f="$";d=e}}else{if(g=="\\\\"){',1710,'=="("&&f==""){',1716,',e-2',1718,'f=")";d=e',1248,'g==")"&&f==")"){',1712,'2',1714,'}}}}}',1716,1718,1001,'Set'],
+  ['List(a,"T",l)},safeHTML',':function(','a){if(','jsMath.','safeHBoxes){a=a.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;")}','return ','a},Set',1,'c,b,a',',d){if(','c&&c.type){if(c','.type=="','typeset"){',5,'c}if(c',11,'mlist"){c.mlist.','Atomize','(b,a);',5,'c.mlist','.Typeset(','b,a)}if(c',11,'text"){c=this.Text(c.text,c.tclass,b,a,c.ascend||null,c.descend||null);if(d!=0){c','.Styled()}',5,'c}c=this','.TeX(','c.c,c.font,b,a);if(d!=0){c',25,5,'c}',5,3,'Box.Null','()},SetList',1,'d,f,c){var a=[];var g;','for(var b=0;b<','d.length;b++){g=d[b];if(g',11,12,'g=','jsMath.mItem',21,'g)}a[a','.length]=','g}var e=new ','jsMath.Typeset','(a);',5,'e',21,'f,c)}});',3,'Package(',3,'Box,{Styled',':function(){','if(this.','format=="text"){','this.html','=',49,'.AddClass(','this.tclass',',',62,');',62,'=',49,'.AddStyle(','this.style',',this.size,',62,');delete ',66,';delete ',74,';this.format="html"}',5,'this},Remeasured',59,60,'w>0){var a=this.w;this.w=',3,'EmBoxFor(',62,').w;',60,'w','>this.Mw){this.Mw=this.w','}a=this.w/a;if(Math.abs(a-1)>0.05){this.h*=a;this.d*=a}}',5,'this}});',44,'=function(a',',b','){this.type','=a;',3,'Add(this,b)};',3,'Add(',44,',{Atom',1,'b,a){',5,'new ',44,'(b,{atom:1,nuc',':a})},TextAtom',1,'e,h,c,b,g','){var f=','new ',44,'(e,{atom:1,nuc:{type:"text",text:h,tclass:c}});if(b','!=null){f.nuc.','ascend=b}if(g',121,'descend=g}',5,'f},TeXAtom',1,'b,d,a){',5,'new ',44,113,':{type:"TeX",c:d,font:a}})},Fraction',1,'b,a,f,d,e,c){',5,'new ',44,'("fraction",{from:b,num:a,den:f,','thickness',':d,left:e,right:c})},Space',1,'a){',5,'new ',44,'("space",{w:a})},','Typeset',1,'a){',5,'new ',44,'("ord",{atom:1,nuc:a})},HTML',1,'a){',5,'new ',44,'("html",{html:a})}});',3,'mList','=function(d,a,b,c){','if(d){','this.mlist','=d}else{',165,'=[]}','if(c==null){c','="T"}if(b==null){b=4}','this.data','={openI:null,overI:null,overF:null,font:a,','size:b,style:c','};this.init={',173,'}};',3,'Package(',3,162,',{Add',1,'a){return(',165,'[','this.mlist.length',']=a)},Get',1,'a){',5,165,'[a]},Length',59,5,186,'},Last',59,'if(',186,'==0){',5,'null}',5,165,'[',186,'-1]},Range',1,'b,',2,'a==null){a=',186,'}',5,'new ',3,162,'(',165,'.slice(b,a+1))},Delete',1,'d,c){',169,'=d}if(',165,'.splice){',165,'.splice(d,c-d+1)}else{var a=[];',39,186,';b++){if(b<d||b>c){a[a',47,165,'[b]}}',165,'=a}},Open',1,'d){var c=this.Add(new ',44,'("boundary",{','data:',171,'}));var a=',171,';',171,'={};for(var b in a){',171,'[b]=a[b]}delete ',171,'.overI',79,171,'.overF;',171,'.openI=',186,'-1;if(d!=null){c.left=d}',5,'c},Close',1,'c){if(c!=null){c=new ',44,240,'right:c})}var e;var b=',171,'.openI;var f=',171,'.overI;var ','g=',171,254,171,'=',165,'[b].data;if(f){e=',44,'.Fraction(','g.name,{','type:"mlist",mlist:this.Range(','b+1,f-1)},{',280,'f)},g.',140,',g.left,g.right);if(c){var a=new ',3,162,'([',165,'[b],e,c]);e=',44,'.Atom("inner",{type:"mlist",mlist:a})}}else{var d=b+1;if(c){this.Add(c);d--}e=',44,'.Atom((c)?"inner":"ord",{',280,'d)})}this.Delete(b,this.Length());',5,'this.Add(e)},Over',59,'var b=',171,269,'c=',171,254,'var a=',44,278,'c.name,{',280,'open+1,b-1)},{',280,'b)},c.',140,',c.left,c.right);',165,'=[a]},',17,1,222,'var a;var e="";',74,'=d;this.size=c;',39,186,';b++){a=',165,'[b];a.delta=0;if(a',11,'choice"){',165,'=this.',17,'.choice(',74,',a,b,',165,');b--}else{',60,17,'[a.type]){var g=this.',17,'[a.type];g(',74,75,'a,e,this,b)}}e=a}if(a&&a',11,'bin"){a','.type="ord"}','if(',186,'>=2&&a',11,'boundary"&&',165,'[0].type=="boundary"){this.','AddDelimiters','(d,c)}},',357,1,'b,q){var p=-10000;var g=p;var k=p;for(var f=0;f<',186,';f++){var j=',165,'[f];if(j.atom||j',11,'box"){g','=Math.max(','g,j.nuc.h+j.nuc.y);k',368,'k,j.nuc.d-j.nuc.y)}}var e=',3,'TeX;var l=',49,28,'b,q).','axis_height',';var o',368,'g-l,k+l);var n',368,'Math.floor(e.integer*o/500)*e.delimiterfactor,e.integer*(2*o-e.delimitershortfall))/e.integer;var c=',165,'[0];var m=',165,'[',186,'-1];c.nuc=',3,'Box.Delimiter(','n,c.left,b);m.nuc=',3,390,'n,m.right,b);c.type="open";c.atom=1',79,'c.left;m.type="close";m.atom=1',79,'m.right},',148,1,'c,a){var b=new ',49,'(',165,');',5,'b',21,'c,a)}});',3,'Add(',3,162,'.prototype.',17,',{style',1,'d,c,a,e,b){b.','style=a.style},size',1,418,'size=a.size},phantom',1,8,'){var d=','a.nuc','=jsMath.Box.Set(','a.phantom',',c,b);if(a.h){d.','Remeasured();','d.html=',3,'HTML.Spacer','(d.w)}else{d.html="",d.w=d.Mw=d.mw=0}if(!a.v){','d.h=d.d=0','}d.bd=d.bh=0',79,428,';a.type="box"},','smash',1,8,425,'a.nuc',427,'a.smash',',c,b).',430,435,79,446,439,'raise',1,8,'){a.nuc',427,'a.nuc,c,b);var ','d=a.raise;','a.nuc.html','=',3,'HTML.Place(',460,',0,d,a.nuc.mw,a.nuc.Mw,a.nuc.w);a.nuc.h+=d;a.nuc.d-=d;a','.type="ord";','a.atom=1},lap',1,'d,c,a){var ','e',427,'a.nuc,','d,c).',430,'var b=[e];if(a.lap=="llap"){e.x=-e.w}','else{if(a.lap=="','rlap"){b[1]=',44,'.Space(-e.w)}',476,'ulap"){e.y=e.d;e.h=e.d=0}',476,'dlap"){e.y=-e.h;e.h=e.d=0}}}}a','.nuc=jsMath.Box.SetList','(b,d,c);if(a.lap=="ulap"||a.lap=="dlap"){a.nuc.h=a.nuc.d=0}a.type="box";delete a.atom},bin',1,'d,b,a,e){if(e&&e.type){var c=e.type;if(c=="bin"||c=="op"||c=="rel"||c=="open"||c=="punct"||c==""||(c=="',354,'e.left!="")){a.type="ord"}}else{a',349,'jsMath.mList.prototype.Atomize.SupSub(','d,b,a)},rel',1,8,9,'d.type&&','d',11,'bin"){d',349,491,8,')},close',1,8,9,496,'d',11,'bin"){d',349,491,8,')},punct',1,8,9,496,'d',11,'bin"){d',349,491,8,')},open',1,8,'){',491,8,')},inner',1,8,'){',491,8,')},','vcenter',1,8,'){var d',427,458,'e=',49,28,'c,b);d.y=e.',377,'-(d.h-d.d)/2;a.nuc=d;a',466,491,8,')},','overline',1,469,'g=',49,28,'d,c);var e',427,472,49,'.PrimeStyle(d),c).Remeasured();var b=g.default_rule_thickness;var f=jsMath.Box.Rule(e.w,b);f.x=-f.w;f.y','=e.h+3*b;a',484,'([e,f],d,c);a.nuc.','h+=b;a',466,491,'d,c,a)},','underline',1,469,'g=',49,28,'d,c);var e',427,472,49,564,'=-e.d-3*b-b;a',484,567,'d+=b;a',466,491,571,'radical',1,'b,m,g',425,49,28,'b,m);var k=',49,'.PrimeStyle(b);var ','f',427,'g.nuc,k,m).',430,'var l=d','.default_rule_thickness',';var c=l;if(b=="D"||b=="D\'"){c=d.x_height}var a=l+c/4;var e=',3,390,'f.h+f.d+a+l,[0,2,112,3,112],b,1);if(e.d>f.h+f.d+a){a=(a+e.d-f.h-f.d)/2}e.y=f.h+a;var j=',3,'Box.Rule(','f.w,l);j.y=e.y-l/2;j.h+=3*l/2;f.x=-f.w;var i=',49,'.UpStyle(',49,613,'b));var h',427,'g.root||null,i,m).',430,'if(g.root){h.y=0.55*(f.h+f.d+3*l+a)-f.d;e.x',368,'h.w-(11/18)*e.w,0);j.x=(7/18)*e.w;h.x=-(h.w+j.x)}g',484,'([e,h,j,f],b,m);g',466,491,'b,m,g)},accent',1,'b,q,j',117,49,28,'b,q);var m=',49,598,'i',427,'j.nuc,m,q);var o=i.w;var p;var k;var d=0;if(j.nuc',11,'TeX"){k=',3,'TeX[j.nuc.font];if(k[j.nuc.c].krn&&k.skewchar){p=k[j.nuc.c].krn[k.skewchar]}d=k[j.nuc.c].ic;if(d==null){d=0}}if(p==null){p=0}var l=j.accent[2];var e=',3,'TeX.fam[j.accent[1]];k=',3,'TeX[e];while(k[l].n&&k[k[l].n].w<=o){l=k[l].n}var n=Math.min(i.h,f.x_height);if(j.nuc',11,'TeX"){var ','h=',44,'.Atom("ord",j.nuc);h.sup=j.sup;h.sub=j.sub;h.delta=0;',491,'b,q,h);n+=(h.nuc.h-i.h);i=j.nuc=h.nuc',79,'j.sup',79,'j.sub}var g=',3,'Box',28,'l,e,b,q);g.y=i.h-n;g.x=-i.w+p+(o-g.w)/2;if(',3,'Browser.msieAccentBug){g.html+=',3,433,'(0.1);g.w+=0.1;g.Mw+=0.1}if(k[l].ic||d){g.x+=(d-(k[l].ic||0))*f.scale}j',484,'([i,g],b,q);if(j.nuc.w!=i.w){var a=',44,'.Space(','i.w-j.nuc.w);j',484,'([j.nuc,a],b,q)}j',466,491,'b,q,j)},op',1,'c,n,i',117,49,28,'c,n);var h;i.delta=0;var m=(c','.charAt(0)=="','D");if(i.limits==null&&m){i.limits=1}if(i.nuc',11,648,'b=',3,'TeX[i.nuc.font][','i.nuc.c];if(m&&b.n){i.nuc.c=b.n;b=',3,689,'b.n]}h=i.nuc',427,'i.nuc,c,n',');if(b.ic){i.delta=b.ic*f.scale;if(i.limits||!i.sub||',3,'Browser.msieIntegralBug','){h=i',484,'([h,',44,670,'i.delta)],c,n)}}h.y=-((h.h+h.d)/2-h.d-f.',377,');if(Math.abs(h.y)<0.0001){h.y=0}}if(!h){h=i.nuc',427,695,').Remeasured()}if(i.limits){var e=h.w;var k=h.w;var d=[h];var j=0;var l=0;if(i.sup){var g',427,'i.sup,',49,613,'c),n).',430,'g.x=((h.w-g.w)/2+i.delta/2)-k;j=f.big_op_spacing5;e',368,'e,g.w);k+=g.x+g.w;g.y=h.h+g.d+h.y+Math.max(f.big_op_spacing1,f.big_op_spacing3-g.d);d[d',47,'g',79,'i.sup}if(i.sub){var a',427,'i.sub,',49,'.DownStyle(','c),n).',430,'a.x=((h.w-a.w)/2-i.delta/2)-k;l=f.big_op_spacing5;e',368,'e,a.w);k+=a.x+a.w;a.y=-h.d-a.h+h.y-Math.max(f.big_op_spacing2,f.big_op_spacing4-a.h);d[d',47,'a',79,'i.sub}if(e>h.w){h.x=(e-h.w)/2;k+=h.x}if(k<e){d[d',47,44,670,'e-k)}i',484,'(d,c,n);i.nuc.h+=j;i.nuc.d+=l','}else{if(',3,698,'&&i.sub&&b&&b.ic){i',484,'([h,',3,'Box.Space(-b.ic*f.scale)],c,n)}else{if(h.y){i',484,'([h],c,n)}}',491,'c,n,i)}},ord',1,'a,j,g,b,f,e){if(g.nuc',11,'TeX"&&!g.sup&&!g.sub',425,'f.mlist[e+1];if(d&&d.atom&&d.type&&(d',11,'ord"||d',11,'op"||d',11,'bin"||d',11,'rel"||d',11,'open"||d',11,'close"||d',11,'punct")){if(d.nuc',11,'TeX"&&d.nuc.font==g.nuc.font){g.textsymbol=1;var h=',3,'TeX[g.nuc.font][g.nuc.c].krn;h*=',49,28,'a,j).scale;if(h&&h[d.nuc.c]){for(var c=f.mlist.length-1;c>e;c--){f.mlist[c+1]=f.mlist[c]}f.mlist[e+1]=',44,670,'h[d.nuc.c])}}}}',491,'a,j,g)},fraction',1,'x,n,c){var A=',49,28,'x,n);var l=0;if(c.',140,'!=null){l=c.',140,742,'c.from.match(/over/)){l=A',604,'}}var s=(x',683,'D");var g=(x=="D")?"T":(x=="D\'")?"T\'":',49,613,'x);var q=(s)?"T\'":',49,726,'x);var f',427,'c.num,g,n).',430,'var e',427,'c.den,q,n).',430,'var k;var j;var i;var o;var m;var h=(s)?A.delim1:A.delim2;var b=[',3,390,'h,c.left,x)];var y=',3,390,'h,c.right,x);if(f.w<e.w){f.x=(e.w-f.w)/2;e.x=-(f.w+f.x);i=e.w;b[1]=f;b[2]=e}else{e.x=(f.w-e.w)/2;f.x=-(e.w+e.x);i=f.w;b[1]=e;b[2]=f}if(s){k=A.num1;j=A.denom1}else{k=(l!=0)?A.num2:A.num3;j=A.denom2}if(l==0){o=(s)?7*A',604,':3*A',604,';m=(k-f.d',')-(e.h-j);if(m<o){','k+=(o-m)/2;j+=(o-m)/2}}else{o=(s)?3*l:l;var z=A.',377,';m=(k-f.d)-(z+l/2);if(m<o){k+=o-m}m=(z-l/2',824,'j+=o-m}var d=',3,610,'i,l);d.x=-i;d.y=z-l/2;b[b',47,'d}f.y=k;e.y=-j;b[b',47,'y;c',484,'(b,x,n);c',466,'c.atom=1',79,'c.num',79,'c.den;',491,'x,n,c)},SupSub',1,'e,w,k){var g=',49,28,'e,w);var o=k.nuc;var j=k.nuc',427,'k.nuc,e,w,0);if(j.format=="null"){j=k.nuc=',3,'Box.Text("","normal",e,w)}if(o',11,'TeX"){if(!k.textsymbol',425,3,'TeX[o.font][o.c];if(d.ic){k.delta=d.ic*g.scale;if(!k.sub){j=k',484,'([j,',3,'Box',670,'k.delta)],e,w);k.delta=0}}}else{k.delta=0}}if(!k.sup&&!k.sub){return}k.nuc.Styled();var h=',49,726,'e);var l=',49,613,'e);var c=',49,28,'l,w).sup_drop;var b=',49,28,'h,w).sub_drop;var n=0;var m=0;var f;if(o.type&&o.type!="text"&&o.type!="TeX"&&o.type!="null"){n=j.h-c;m=j.d+b}if(k.sub){var a',427,'k.sub,h,w);a=',3,'Box.SetList([','a,',44,'.Space(g.scriptspace)],e,w',')}if(!k.sup){a.y=-Math.max(m,g.sub1,a.h-(4/5)*',49,28,'h,w).x_height);k',484,'([j,a],e,w).Styled();delete k.sub;return}var i',427,'k.sup,l,w);i=',3,882,'i,',44,885,');if(e=="D"){f=g.sup1',742,'e','.charAt(','e','.length-1)=="\'"){','f=g.sup3}else{f=g.sup2}}n',368,'n,f,i.d+',49,28,'l,w).x_height/4);if(!k.sub){i.y=n;k',484,'([j,i],e,w',77,'k.sup;return}m',368,'m,',49,28,'h,w).sub2);var s=g',604,';if((n-i.d)-(a.h-m)<4*s){m=4*s+a.h-(n-i.d);f=(4/5)*g.x_height-(n-i.d);if(f>0){n+=f;m-=f}}i.',430,'a.',430,'i.y=n;a.y=-m;i.x=k.delta;if(i.w+i.x>a.w){i.x-=a.w;k',484,'([j,a,i],e,w)}else{a.x-=(i.w+i.x);k',484,'([j,i,a],e,w)}delete k.sup',79,'k.sub}});',49,98,100,'="typeset";',165,'=a};',3,'Add(',49,',{upStyle:{D:"S",T:"S","','D\'":"S\'","T\'":"S\'",S:"SS','",SS:"SS","','S\'":"SS\'","SS\'":"SS\'"},','downStyle:{D:"S\'",T:"S\'","',942,'\'",SS:"SS\'","',944,'UpStyle',1,'a){',5,'this.upStyle[a]},DownStyle',1,'a){',5,'this.downStyle[a]},PrimeStyle',1,2,'a',902,'a',904,5,'a}',5,'a+"\'"},StyleValue',1,'b,',2,'b=="S"||b=="S\'"){',5,'0.7*a}if(b=="SS"||b=="SS\'"){',5,'0.5*a}',5,'a},StyleSize',1,'b,a){if(b=="S"||b=="S\'"){a=Math.max(0,a-2)}else{if(b=="SS"||b=="SS\'"){a=Math.max(0,a-4)}}return ','a},TeX',1,979,3,'TeXparams[a]},AddStyle',1,8,'){if(c=="S"||c=="S\'"){b',368,'0,b-2)}else{if(c=="SS"||c=="SS\'"){b',368,'0,b-4)}}if(b!=4){a=\'<span class="size\'+b+\'">\'+a+"</span>"}',5,'a},AddClass',1,'a,b){if(a!=""&&a!="normal"){b=',3,'HTML.Class(a,b)}',5,'b}});',3,'Package(',49,',{DTsep:{ord',':{op:1,bin:2,rel:3,inner:1},','op',':{ord:1,op:1',',rel:3,inner:1},bin:{ord:2,op:2,open:2,inner:2},rel:{ord:3,op:3,open:3,inner:3},open:{},close',1004,'punct',1006,',rel:1,open:1,close',':1,punct:1,inner:1','},inner',1006,',bin:2,rel:3,open',1012,'}},SSsep:{ord:{op:1},op',1006,'},bin:{},rel:{},open:{},close:{op:1},punct:{},inner:{op:1}},sepW:["","thinmuskip","medmuskip","thickmuskip"],','GetSeparation',1,'a,d,b){if(a&&a.atom&&d.atom){var c=this.DTsep;if(b',683,'S"){c=this.SSsep}var e=c[a.type];if(e&&e[d.type]!=null){',5,3,'TeX[this.sepW[e[d.type]]]}}',5,'0},',148,1,222,74,323,'var g=-10000;this.w=0;this.mw=0;this.Mw=0;this.h=g;this.d=g;this.bh=this.h;this.bd=this.d;this.tbuf="";this.tx=0;',66,'="";','this.cbuf','="";this.hbuf="";this.hx=0;var a=null;var f;this.x=0;','this.dx=0;',39,186,';b++){f=a;a=',165,'[b];switch(a.type){case"size":','this.FlushClassed();','this.size=a.size;','a=f;break;case"','style":',1046,'if(',74,902,74,904,74,'=a.style+"\'"}else{',74,'=a.style}',1048,'space":if(typeof(a.w)=="object"){if(',74,902,'1)=="S"){a.w=0.5*a.w[0]/18',742,74,683,'S"){a.w=0.7*a.w[0]/18}else{a.w=a.w[0]/18}}}this.dx+=a.w-0;',1048,'html":',1046,'if(this.hbuf==""){this.hx=this.','x}','this.hbuf+=','a.html;a=f;break;default:if(!a.atom&&a.type!="box"){break}a.nuc.x+=this.dx+this.',1020,'(f,a,',74,');','if(a.nuc.x||a.nuc.y){','a.nuc',25,1040,'this.x=this.x+this.w;',60,'x','+a.nuc.x+a.nuc.','mw','<this.mw){this.mw=this.','x',1087,'mw}',60,'w',1087,'Mw',93,1087,'Mw}this.w+=a.nuc.w+a.nuc.x;if(a.nuc.',61,'if(',66,'!=a.nuc.tclass&&',66,'!=""){','this.FlushText','()}',60,'tbuf==""&&',1038,'==""){this.tx=this.x}this.tbuf+=',460,';',66,'=a.nuc.tclass}else{',1046,1080,'this.Place(a.nuc)}',1072,'x}',1074,460,'}this.h',368,'this.h,a.nuc.h+a.nuc.y);this.bh',368,'this.bh,a.nuc.bh);this.d',368,'this.d,a.nuc.d-a.nuc.y);this.bd',368,'this.bd,a.nuc.bd);break}}',1046,60,'dx){',1074,3,433,'(this.dx);this.w+=this.dx;',60,'w',93,'}',60,'w',1089,'w}}',60,'hbuf==""){',5,3,35,'()}',60,'h==g){this.h=0}',60,'d==g){this.d=0}var e=new ',3,'Box("html",this.hbuf,this.w,this.h,this.d);e.bh=this.bh;e.bd=this.bd;e.mw=this.mw;e.Mw=this.Mw;',5,'e},FlushText',59,60,'tbuf','==""){return}',1038,'+=',49,'.AddClass(',66,',this.tbuf);this.tbuf="";',66,'=""},FlushClassed',59,1106,'();',60,'cbuf',1164,1072,'tx}',1074,49,'.AddStyle(',74,75,1038,');',1038,'=""},Place',1,'b){var a=\'<','span style="position: relative',';\';if(b.x){a+=" margin-left:"+',3,'HTML.Em','(b.x)+";"}if(b.y){a+=" top:"+',3,1195,'(-b.y)+";"}b.html=a+\'">\'+b.html+"</span>";','b.h+=b.y;b.d-=b.y;b.x=0;b.y=0','},PlaceSeparateSkips',1,'b){if(b.y',425,'b.Mw-b.w;var c=b.mw;var a=b.Mw-b.mw;b.html=',3,433,'(c-d)+\'<',1192,'; top:\'+',3,1195,'(-b.y)+"; left:"+',3,1195,'(d)+"; width:"+',3,1195,'(a)+\';">\'+',3,433,'(-c)+b.html+',3,433,'(d)+"</span>"}if(b.x){b.html=',3,433,'(b.x)+b.html}',1200,'}});',3,'Parse',163,'var e=new ',3,'Parser','(d,a,b,c);e.Parse();',5,'e};',3,1236,163,'this.string=d;this.i=0;',165,'=new ',3,162,'(null,a,b,c)};',3,'Package(',3,1236,',{cmd:"\\\\",open:"{",close:"}",letter:/[a-z]/i,number:/[0-9]/,scriptargs:/^((math|text)..|mathcal|[hm]box)$/,mathchar:{"!":[5,0,33],"(":[4,0,40],")":[5,0,41],"*":[2,2,3],"+":[2,0,43],",":[6,1,59],"-":[2,2,0],".":[0,1,58],"/":[0,1,61],":":[3,0,58],";":[6,0,59],"<":[3,1,60],"=":[3,0,61],">":[3,1,62],"?":[5,0,63],"[":[4,0,91],"]":[5,0,93],"|":[0,2,106]},special:{"~":"Tilde","^":"HandleSuperscript",_:"HandleSubscript"," ":"Space","\\01','":"Space","\\','t',1254,'r',1254,'n":"Space","\'":"Prime","%":"HandleComment","&":"HandleEntry","#":"Hash"},mathchardef:{braceld:[0,3,122],bracerd:[0,3,123],bracelu:[0,3,124],braceru:[0,3,125],alpha:[0,1,11],beta:[0,1,12],gamma:[0,1,13],delta:[0,1,14],epsilon:[0,1,15],zeta:[0,1,16],eta:[0,1,17],theta:[0,1,18],iota:[0,1,19],kappa:[0,1,20],lambda:[0,1,21],mu:[0,1,22],nu:[0,1,23],xi:[0,1,24],pi:[0,1,25],rho:[0,1,26],sigma:[0,1,27],tau:[0,1,28],upsilon:[0,1,29],phi:[0,1,30],chi:[0,1,31],psi:[0,1,32],omega:[0,1,33],varepsilon:[0,1,34],vartheta:[0,1,35],varpi:[0,1,36],varrho:[0,1,37],varsigma:[0,1,38],varphi:[0,1,39],Gamma:[7,0,0],Delta:[7,0,1],Theta:[7,0,2],Lambda:[7,0,3],Xi:[7,0,4],Pi:[7,0,5],Sigma:[7,0,6],Upsilon:[7,0,7],Phi:[7,0,8],Psi:[7,0,9],Omega:[7,0,10],aleph:[0,2,64],imath:[0,1,123],jmath:[0,1,124],ell:[0,1,96],wp:[0,1,125],Re:[0,2,60],Im:[0,2,61],partial:[0,1,64],infty:[0,2,49],prime:[0,2,48],emptyset:[0,2,59],nabla:[0,2,114],surd:[1,2,112],top:[0,2,62],bot:[0,2,63],triangle:[0,2,52],forall:[0,2,56],exists:[0,2,57],neg:[0,2,58],lnot:[0,2,58],flat:[0,1,91],natural:[0,1,92],sharp:[0,1,93],clubsuit:[0,2,124],diamondsuit:[0,2,125],heartsuit:[0,2,126],spadesuit:[0,2,127],coprod:[1,3,96],bigvee:[1,3,87],bigwedge:[1,3,86],biguplus:[1,3,85],bigcap:[1,3,84],bigcup:[1,3,83],intop:[1,3,82],prod:[1,3,81],sum:[1,3,80],bigotimes:[1,3,78],bigoplus:[1,3,76],bigodot:[1,3,74],ointop:[1,3,72],bigsqcup:[1,3,70],smallint:[1,2,115],triangleleft:[2,1,47],triangleright:[2,1,46],bigtriangleup:[2,2,52],bigtriangledown:[2,2,53],wedge:[2,2,94],land:[2,2,94],vee:[2,2,95],lor:[2,2,95],cap:[2,2,92],cup:[2,2,91],ddagger:[2,2,122],dagger:[2,2,121],sqcap:[2,2,117],sqcup:[2,2,116],uplus:[2,2,93],amalg:[2,2,113],diamond:[2,2,5],bullet:[2,2,15],wr:[2,2,111],div:[2,2,4],odot:[2,2,12],oslash:[2,2,11],otimes:[2,2,10],ominus:[2,2,9],oplus:[2,2,8],mp:[2,2,7],pm:[2,2,6],circ:[2,2,14],bigcirc:[2,2,13],setminus:[2,2,110],cdot:[2,2,1],ast:[2,2,3],times:[2,2,2],star:[2,1,63],propto:[3,2,47],sqsubseteq:[3,2,118],sqsupseteq:[3,2,119],parallel:[3,2,107],mid:[3,2,106],dashv:[3,2,97],vdash:[3,2,96],leq:[3,2,20],le:[3,2,20],geq:[3,2,21],ge:[3,2,21],lt:[3,1,60],gt:[3,1,62],succ:[3,2,31],prec:[3,2,30],approx:[3,2,25],succeq:[3,2,23],preceq:[3,2,22],supset:[3,2,27],subset:[3,2,26],supseteq:[3,2,19],subseteq:[3,2,18],"in":[3,2,50],ni:[3,2,51],owns:[3,2,51],gg:[3,2,29],ll:[3,2,28],not:[3,2,54],sim:[3,2,24],simeq:[3,2,39],perp:[3,2,63],equiv:[3,2,17],asymp:[3,2,16],smile:[3,1,94],frown:[3,1,95],Leftrightarrow:[3,2,44],Leftarrow:[3,2,40],Rightarrow:[3,2,41],leftrightarrow:[3,2,36],leftarrow:[3,2,32],gets:[3,2,32],rightarrow:[3,2,33],to:[3,2,33],mapstochar:[3,2,55],leftharpoonup:[3,1,40],leftharpoondown:[3,1,41],rightharpoonup:[3,1,42],rightharpoondown:[3,1,43],nearrow:[3,2,37],searrow:[3,2,38],nwarrow:[3,2,45],swarrow:[3,2,46],minuschar:[3,2,0],hbarchar:[0,0,22],lhook:[3,1,44],rhook:[3,1,45],ldotp:[6,1,58],cdotp:[6,2,1],colon:[6,0,58],"#":[7,0,35],"$":[7,0,36],"%":[7,0,37],"&":[7,0,38]},delimiter:{"(":[0,0,40,3,0],")":[0,0,41,3,1],"[":[0,0,91,3,2],"]":[0,0,93,3,3],"<":[0,2,104,3,10],">":[0',',2,105,3,11],"\\\\','lt":[0',',2,104,3,10],"\\\\','gt":[0,2,105,3,11],"/":[0,0,47,3,14],"|":[0,2,106,3,12],".":[0,0,0,0,0],"\\\\":[','0,2,110,3,15],"\\\\','lmoustache":[4,3,122,3,64],"\\\\rmoustache":[5,3,123,3,65],"\\\\lgroup":[4,6,40,3,58],"\\\\rgroup":[5,6,41,3,59],"\\\\arrowvert','":[0,2,106,3,','60],"\\\\Arrowvert":[0,2,107,3,61],"\\\\bracevert',1266,'62],"\\\\Vert":[0,2,107,3,13],"\\\\|":[0,2,107,3,13],"\\\\vert',1266,'12],"\\\\uparrow":[3,2,34,3,120],"\\\\downarrow":[3,2,35,3,121],"\\\\updownarrow":[3,2,108,3,63],"\\\\Uparrow":[3,2,42,3,126],"\\\\Downarrow":[3,2,43,3,127],"\\\\Updownarrow":[3,2,109,3,119],"\\\\backslash":[',1264,'rangle":[5',1260,'langle":[4',1262,'rbrace":[5,2,103,3,9],"\\\\lbrace":[4,2,102,3,8],"\\\\}":[5,2,103,3,9],"\\\\{":[4,2,102,3,8],"\\\\rceil":[5,2,101,3,7],"\\\\lceil":[4,2,100,3,6],"\\\\rfloor":[5,2,99,3,5],"\\\\lfloor":[4,2,98,3,4],"\\\\lbrack":[0,0,91,3,2],"\\\\rbrack":[0,0,93,3,3]},macros:{displaystyle',':["HandleStyle","','D"],textstyle',1278,'T"],scriptstyle',1278,'S"],scriptscriptstyle',1278,'SS"],rm',':["HandleFont",','0],mit',1286,'1],oldstyle',1286,'1],cal',1286,'2],it',1286,'4],bf',1286,'6],font',':["Extension","','font"],left:"HandleLeft",right:"HandleRight",arcsin',':["NamedOp",0],','arccos',1300,'arctan',1300,'arg',1300,'cos',1300,'cosh',1300,'cot',1300,'coth',1300,'csc',1300,'deg',1300,'det',':"NamedOp",','dim',1300,'exp',1300,'gcd',1320,'hom',1300,'inf',1320,'ker',1300,'lg',1300,'lim',1320,'liminf',':["NamedOp",null,\'lim<span style="margin-left: \'+1/6+\'em"></span>','inf\'],limsup',1338,'sup\'],ln',1300,'log',1300,'max',1320,'min',1320,'Pr',1320,'sec',1300,'sin',1300,'sinh',1300,'sup',1320,'tan',1300,'tanh',1300,538,':["HandleAtom","',538,'"],',554,1364,554,'"],',572,1364,572,'"],over',':"HandleOver",','overwithdelims',1375,'atop',1375,'atopwithdelims',1375,'above',1375,'abovewithdelims',1375,'brace',':["HandleOver','","\\\\{","\\\\}"],brack',1387,'","[","]"],choose',1387,'","(",")"],overbrace',':["Extension","leaders"],','underbrace',1393,'overrightarrow',1393,'underrightarrow',1393,'overleftarrow',1393,'underleftarrow',1393,'overleftrightarrow',1393,'underleftrightarrow',1393,'overset',':["Extension","underset-overset"],','underset',1409,'llap',':"HandleLap",','rlap',1413,'ulap',1413,'dlap',1413,'raise:"RaiseLower",lower:"RaiseLower",moveleft',':"MoveLeftRight",','moveright',1421,'frac:"Frac",root:"Root",sqrt:"Sqrt",hbar',':["Macro","\\\\','hbarchar\\\\kern-.5em h"],ne',1425,'not="],neq',1425,'not="],notin',1425,'mathrel{\\\\','rlap{\\\\kern2mu/}}\\\\in"],cong',1425,1432,'lower2mu{\\\\mathrel{{\\\\rlap{=}\\\\raise6mu\\\\sim}}}}"],bmod',1425,'mathbin{\\\\rm mod}"],pmod',1425,'kern 18mu ({\\\\rm mod}\\\\,\\\\,#1)",1],"int":["Macro","\\\\intop\\\\nolimits"],oint',1425,'ointop\\\\nolimits"],doteq',1425,'buildrel\\\\textstyle.\\\\over="],ldots',1425,'mathinner{\\\\','ldotp\\\\ldotp\\\\ldotp}"],cdots',1425,1446,'cdotp\\\\cdotp\\\\cdotp}"],vdots',1425,1446,'rlap{\\\\raise8pt{.\\\\rule 0pt 6pt 0pt}}\\\\rlap{\\\\raise4pt{.}}.}"],ddots',1425,1446,'kern1mu\\\\raise7pt{\\\\rule 0pt 7pt 0pt .}\\\\kern2mu\\\\raise4pt{.}\\\\kern2mu\\\\raise1pt{.}\\\\kern1mu}"],joinrel',1425,1432,'kern-4mu}"],relbar',1425,1432,'smash-}"],Relbar',1425,'mathrel="],bowtie',1425,'mathrel\\\\triangleright\\\\joinrel\\\\mathrel\\\\triangleleft"],models',1425,'mathrel|\\\\joinrel="],mapsto',1425,1432,'mapstochar\\\\','rightarrow}"],rightleftharpoons',1425,538,'{\\\\',1432,'rlap{\\\\raise3mu{\\\\rightharpoonup}}}\\\\leftharpoondown}"],hookrightarrow',1425,'lhook','\\\\joinrel\\\\rightarrow','"],hookleftarrow',1425,'leftarrow\\\\joinrel\\\\','rhook"],Longrightarrow',1425,'Relbar\\\\joinrel\\\\','Rightarrow"],','longrightarrow',1425,'relbar',1480,'"],longleftarrow',1425,1483,'relbar"],Longleftarrow',1425,'Leftarrow\\\\joinrel\\\\','Relbar"],longmapsto',1425,1432,1471,'minuschar',1480,'}"],longleftrightarrow',1425,'leftarrow',1480,'"],','Longleftrightarrow',1425,1497,1487,'iff:["Macro","\\\\;\\\\',1509,'\\\\;"],mathcal',':["Macro","{\\\\','cal #1}",1],mathrm',1516,'rm #1}",1],mathbf',1516,'bf #1}",1],','mathbb',1516,1521,'mathit',1516,'it #1}",1],textrm',1425,'mathord{\\\\hbox{#1}}",1],textit',1425,'mathord{\\\\class{','textit','}{\\\\hbox{#1}}}",1],','textbf',1425,1531,1534,1533,'pmb',1425,'rlap{#1}\\\\kern1px{#1}",1],TeX:["Macro","T\\\\kern-.1667em\\\\lower.5ex{E}\\\\kern-.125em X"],limits:["Limits",1],nolimits:["Limits",0],",":["Spacer",1/6],":":["Spacer",1/6],">":["Spacer",2/9],";":["Spacer",5/18],"!":["Spacer",-1/6],enspace:["Spacer",1/2],quad:["Spacer",1],qquad:["Spacer",2],thinspace:["Spacer",1/6],negthinspace:["Spacer",-1/6],hskip:"Hskip",kern:"Hskip",rule:["Rule","colored"],space:["Rule","blank"],big',':["MakeBig","','ord",0.85],Big',1542,'ord",1.15],bigg',1542,'ord",1.45],Bigg',1542,'ord",1.75],bigl',1542,'open",0.85],Bigl',1542,'open",1.','15],biggl',1542,1553,'45],Biggl',1542,1553,'75],bigr',1542,'close",0.85],Bigr',1542,'close",1.','15],biggr',1542,1564,'45],Biggr',1542,1564,'75],bigm',1542,'rel",0.85],Bigm',1542,'rel",1.15],biggm',1542,'rel",1.45],Biggm',1542,'rel",1.75],mathord',1364,'ord"],mathop',1364,'op"],mathopen',1364,'open"],mathclose',1364,'close"],mathbin',1364,'bin"],mathrel',1364,'rel"],mathpunct',1364,'punct"],mathinner',1364,'inner"],','mathchoice',1298,1596,'"],buildrel:"BuildRel",hbox:"HBox",text:"HBox",mbox:"HBox",fbox',1298,'fbox"],strut:"Strut",mathstrut',1425,'vphantom{(}"],phantom:["Phantom",1,1],vphantom:["Phantom",1,0],hphantom:["Phantom",0,1],smash:"Smash",acute:["MathAccent",[7,0,19]],grave:["MathAccent",'],
+  ['[','7,0,','18]],ddot',':["MathAccent",[',1,'127]],tilde',3,1,'126]],bar',3,1,'22]],breve',3,1,'21]],check',3,1,'20]],hat',3,1,'94]],vec',3,'0,1,126]],dot',3,1,'95]],widetilde',3,'0,3,101]],widehat',3,'0,3,98]],_:["Replace","ord","_","normal",-0.4,0.1]," ":["Replace","','ord","&nbsp;","normal','"],angle:["Macro","\\\\kern2.5mu\\\\raise1.54pt{\\\\rlap{\\\\scriptstyle \\\\char{cmsy10}{54}}\\\\kern1pt\\\\rule{.45em}{-1.2pt}{1.54pt}\\\\kern2.5mu}"],matrix:"Matrix",array:"Matrix",pmatrix:["Matrix','","(",")","c"],','cases:["Matrix","\\\\{",".",["l","l"],null,2],eqalign',':["Matrix",null,null,["','r","l"],[5/18],3,"D"],displaylines',34,'c"],null,3,"D"],cr:"','HandleRow','","\\\\":"',38,'",newline:"',38,'",noalign:"','HandleNoAlign','",eqalignno',34,'r","l","r"],[5/8,3],3,"D"],','leqalignno',34,47,'begin:"Begin",end:"End",tiny',':["HandleSize",','0],Tiny',52,'1],scriptsize',52,'2],small',52,'3],normalsize',52,'4],large',52,'5],Large',52,'6],LARGE',52,'7],huge',52,'8],Huge',52,'9],dots:["Macro","\\\\ldots"],','newcommand',':["Extension","',72,'"],newenvironment',73,72,'"],def',73,72,'"],color',73,'HTML"],','href',73,'HTML"],"class":["','Extension','","',83,'style',73,83,'cssId',73,83,'unicode',73,83,'bbox',73,'bbox"],require:"Require","char":"Char"},','environments',':{array:"Array",matrix',':["Array','",null,null,"c"],pmatrix',104,32,'bmatrix',104,'","[","]","c"],Bmatrix',104,'","\\\\{","\\\\}","c"],vmatrix',104,'","\\\\vert","\\\\vert","c"],Vmatrix',104,'","\\\\Vert","\\\\Vert","c"],cases',104,'","\\\\{",".","ll",null,2],eqnarray:["','Array",null,null,"rcl",[5/18,5/18],3,"D','"],"eqnarray*":["',119,'"],equation:"Equation","equation*":"Equation",align',73,'AMSmath','"],"align','*":["Extension","AMSmath"],','aligned',73,124,'"],','multline',73,124,'"],"',131,126,'split',73,124,'"],gather',73,124,'"],"gather',126,'gathered',73,124,'"]},AddSpecial',':function(','a){for(var b in a){','jsMath.Parser.prototype','.special[',151,'[b]]=a[b]}},Error',149,'a){this.i=','this.string','.length;','if(a','.error){this.error=a','.error}','else{if(!','this',160,'}}},nextIsSpace',':function(){','return ','this.string.charAt(this.i',').match(/[ \\n\\r\\t]/)},trimSpaces',149,'a){if(typeof(a)!="string"){',167,'a}',167,'a.replace(/^\\s+|\\s+$/g',',"")},','Process',149,'a){var ','c=','this.mlist.data',';a','=jsMath.Parse(','a,c.font,c.size,c.style);if(a','.error){this.Error(','a);','return null','}if(a.mlist.Length()==','0){',187,188,'1','){var b=','a.mlist.','Last();if(','b.atom&&b.type=="ord"&&b.nuc&&!b.sub&&!b.sup&&(b.nuc.type=="text"||b.nuc.type=="TeX")){',167,'b.nuc}}return{type:"mlist",mlist:a.mlist}},GetCommand',':function(){var ','a=/^([a-z]+|.) ?/i;var b=a.exec(','this.string.slice(this.i','));if(b){this.i+=b[1].length;',167,'b[1]}','this.i++;','return" "},GetArgument',149,'b,d){while','(this.nextIsSpace()){this.i','++}','if(this.','i>=',157,'.length){','if(!d){','this.Error("','Missing',' argument for "+b)}',187,'}if(',168,')==this.close){',215,216,'Extra close brace','")}',187,'}if(',168,')==this.cmd){',205,167,'this.cmd+','this.GetCommand','()}if(',168,')!=this.open){',167,168,'++)}var a=++this.i;var e=1;var f="";','while(this.i<this.string.length){','f=',168,'++);if(f','==this.cmd){this.i++}else{if(','f==this.open){e++}else{if(f==this.close){','if(e==0){',216,225,'");',187,'}if(--e==0){',167,157,'.slice(a,this.i-1)}}}}}',216,'Missing close brace','");',187,'},','ProcessArg',149,'b){var ','a=','this.GetArgument(','b);','if(this.error){return',' null}','return this.Process(a)},','ProcessScriptArg',149,'c){','var a=',265,'c);',267,268,'if(a.charAt(0)==this.cmd',193,'a.substr(1);if(b=="frac"){a+="{"+',265,'b)+"}";',267,268,'a+="{"+',265,'b)+"}";',267,' null}}else{if(b','=="sqrt"){a+="["+','this.GetBrackets(','b)+"]";',267,268,'a+="{"+',265,'b)+"}";',267,289,'.match(this.scriptargs)){a+="{"+',265,'b)+"}";',267,' null}}}}}',269,'GetDelimiter',149,'a){while',209,'++}var b=',168,');',211,'i<',157,214,205,'if(b','==this.cmd){','b="\\\\"+',234,'(a);',267,' null}}','if(','this.delimiter[','b]!=null){',167,326,'b]}}',216,217,' or unrecognized delimiter for "+a);',187,'},GetDimen',149,'a,d){var ','b;var c=0;if',209,'++}if(',168,')=="{"){b=',265,'a)}else{b=',201,');c=1}',167,'this.ParseDimen(','b,a,c,d)},ParseDimen',149,'c,b,e,f){',273,'c.match(/^\\s*([-+]?(\\.\\d+|\\d+(\\.\\d*)?))(pt|em|ex|mu|px)/);if(!a){',216,217,' dimension or its units for "+b);',187,'}if(e){this.i+=a[0].length;if',209,'++}}var g=a[1]-0;if(a[4]=="px"){g/=jsMath.em','}else{if(a[4]=="','pt"){g/=10',361,'ex"){g*=','jsMath.TeX','.x_height',361,'mu"){if(f){g=g/18}else{g=[g,"mu"]}}}}}',167,'g},GetNext',166,'while',209,'++}',167,168,')},GetBrackets',149,179,'e','=this.GetNext();if(','e!="["){return""}var d=++this.i;var b=0;',241,'e=',168,'++);if(e=="{"){b++}else{if(e=="}"){','if(b==0){',216,225,' while looking for',' \']\'");',187,'}b--}else{if(e',245,'e=="]"){',387,167,157,'.slice(d,this.i-1)}}}}}}',216,'Couldn\'t find',' closing \']\' for argument to',' "+this.cmd','+a);',187,'},GetUpto',149,'b,d){while',209,'++}var g=this.i;var e=0;',241,'var f=',168,244,'=="{"){e++}else{if(f=="}"){',247,216,225,390,403,'+d);',187,'}e--}else{if(f',319,'if(',201,',this.i+','5)=="begin"){e++;this.i+=4}else{if(',201,427,'3)=="end"){if(e>0){e--;this.i+=2}}}',247,'if(',201,427,'d.length)==d){f=',168,'+d','.length);','if(f.match(/[^a-z]/i)||!d.match(/[a-z]/i)){',273,157,'.slice(g,this.i-1);this.i+=d',158,167,'a}}}this.i++}}}}',216,401,403,'+d+" for "+b);',187,'},','ProcessUpto',149,'b,c){var ','a=this.GetUpto(b,c);',267,268,269,'GetEnd',149,'c){var a="";var b="";while(b!=c){a+=this.GetUpto("begin{"+c+"}","end");',267,268,'b=','this.GetArgument(this.cmd','+"end");',267,324,167,'a},Space',':function(){},','Prime',149,'d',193,'this.mlist.',195,'b==null||(!b.atom&&b','.type!="box"&&','b','.type!="frac")){','b=','this.mlist.Add(jsMath.mItem.','Atom("ord",{type:null}))}','if(b.sup){',216,'Prime causes double exponent',': use braces to clarify");return','}var a','="";while(d=="\'"){a+=this.cmd+"prime";d',381,'d=="\'"){this.i++}}b.sup=this.',177,'(a);b.sup.isPrime=1},RaiseLower',149,179,'b','=this.GetDimen(this.cmd+','a,1);',267,'}var c','=this.ProcessScriptArg','(',233,'a);',267,'}if(a=="lower"){b=-b}','this.mlist.Add(new jsMath.mItem("','raise",{nuc:c,raise:b}))},MoveLeftRight',149,263,'a',499,'b,1);',267,'}var c',503,'(',233,'b);',267,'}if(b=="moveleft"){a=-a}',484,'Space(a','));',484,'Atom("ord",c));',484,'Space(-a))},Require',149,179,'b=',466,404,267,'}b=','jsMath.Extension','.URL(b);if(','jsMath.Setup.','loaded[b]){return}','this.Extension(null,[','b])},',87,149,'a,b){','jsMath.Translate','.restart=1;if(a','!=null){','delete ',151,'[b[1]||"macros"][a]}',538,'.Require(b[0],',547,'.asynchronous',');throw"restart"},Frac',149,263,'a','=this.ProcessArg(this.cmd+','b);',267,'}var c',561,'b);',267,'}',484,'Fraction("over",a,c))},Sqrt',149,263,'d=',291,233,'b);',267,490,561,'b);',267,'}var c=jsMath.mItem.Atom("','radical",a);','if(d!=""){c.root=this.',177,'(d);',267,'}}',477,'Add(c)},','Root',149,263,'d=this.',453,'(',233,'b,"of");',267,490,561,'b);',267,582,583,'c.root=d;',477,590,'BuildRel',149,179,'b=this.',453,'(',233,'a,"over");',267,'}var d',561,'a);',267,582,'op",d);c.limits=1;c.sup=b;',477,590,'MakeBig',149,337,'c=d[0];var b=d[1]*jsMath.p_height;var e','=this.GetDelimiter(this.cmd+','a);',267,'}',484,'Atom(c,','jsMath.Box.Delimiter(','b,e,"T")))},Char',149,263,'a=',466,'+b);',267,'}var c=',466,'+b);',267,'}if(!',365,'[a]){',365,'[a]=[];',542,'jsMath.Font.URL(a',')])}else{',484,'Typeset(','jsMath.Box.TeX(c-0,a,',181,'.style,',181,'.size)))}},Matrix',149,'b,h){var e=',181,';var a=',466,'+b);',267,'}var g=','new jsMath.','Parser(a','+this.cmd+"\\\\",null,','e.size,h[5]||"T");g.matrix=b;g.row=[];g.table=[];g.rspacing=[];g.Parse();if(g',185,'g);return}g.',38,'(',515,'var d','=jsMath.Box.','Layout(e.size,g.table,h[2]||null,h[3]||null,g.rspacing,h[4]||null);if(h[0]&&h[1]){',412,636,'d.h+d','.d-jsMath.hd/4,this.delimiter[','h[0]],"T");var c=',636,'d.h+d',686,'h[1]],"T");d',681,'SetList([','f,d,c],e.style,e.size)}',484,'Atom((h','[0]?"inner":"ord"),','d))},HandleEntry',149,'b){if(!this.matrix){this.Error(b','+" can only appear in a matrix or array");return}if(',181,'.openI',549,273,477,'Get(',181,'.openI);if','(a.left){',216,217,403,'+"right','")}else{',216,257,'")}}if(',181,'.overI',549,477,'Over()}var d=',181,';',477,'Atomize(','d.style,d.size);','var c=',477,657,728,'c.entry=d.entry;delete d.entry;if(!c.entry){c.entry={}}this.row[','this.row.length',']=c;this.mlist=',671,'mList(null,null,d.size,d.style)},',38,149,'a,c){var b;if(!this.matrix){','this.Error(this.cmd+a',701,'a=="\\\\"){b=',291,233,'a);',267,'}if(b){b=',348,'b,',233,'a,0,1)}}this.HandleEntry(a);if(!c||',734,'>1||this.row[0].format!="null"){this.table[this.table.length]=this.row}if(b){','this.rspacing[this.table.length',']=b}this.row=[]},',44,149,263,'a=',466,'+b);',267,644,'a.replace(/^.*(vskip|vspace)([^a-z])/i,"$2");if(c.length==a',214,'return}var ','e=',348,'c,',233,'RegExp.$1,0,1);',267,'}',755,']=(',755,']||0)+e},Array',149,455,'e=c[2];var i=c[3];if(!e){e=',466,'+"begin{"+b+"}");',267,'}}e=e.replace(/[^clr]/g,"");e=e.split("");var g=',181,666,'c[5]||"T";var k=this.GetEnd(b);',267,'}',412,671,'Parser(k',673,'g.size,a);f.matrix=b;f.row=[];f.table=[];f.rspacing=[];f.Parse();if(f',185,'f);return}f.',38,'(',515,'var h',681,'Layout(g.size,f.table,e,i,f.rspacing,c[4],c[6],c[7]);if(c[0]&&c[1]){var d=',636,'h.h+h',686,'c[0]],"T");var j=',636,'h.h+h',686,'c[1]],"T");h',681,693,'d,h,j],g.style,g.size)}',484,'Atom((c',697,'h))},Begin',149,179,'b=',466,404,267,'}if(b.match(/[^a-z*]/i)){this.Error(\'Invalid environment name "\'+b+\'"\');return}if(!this.',102,'[b]){this.Error(\'Unknown environment "\'+b+\'"\');return',644,'this.',102,'[b];if(typeof(','c',')=="string"){','c=[c]}this[c[0]](b,c.slice(1))},End',149,179,'b=',466,404,267,'}',741,'+"{"+b+"} without matching',403,'+"begin")},Equation',149,263,'a=this.GetEnd(b);',267,'}',157,'=a+',201,');this.i=0},Spacer',149,'b,a){',484,525,'-0))},Hskip',149,263,'a',499,'b);',267,'}',484,525,'))},HBox',149,179,'c=',466,404,267,'}var b',681,'InternalMath(c,',181,'.size);',484,657,'b))},Rule',149,'b,f){var a',499,515,267,'}var e',499,515,267,'}var g',499,515,267,'}e+=g;var c;if(e!=0){e=Math.max(1.05/jsMath.em,e)}if(e==0||a==0||f=="blank"){c=','jsMath.HTML.','Blank(a,e)}else{c=',898,'Rule(a,e)}if(g){c=\'<span style="vertical-align:\'+',898,'Em(-g)+\'">\'+c','+"</span>"}',484,657,671,'Box("html",c,a,e-g,g)))},Strut',199,'a=',181,'.size;var b',681,'Text("","normal","T",a).Styled();b.bh=b.bd=0;b.h=0.8;b.d=0.3;b.w=b.Mw=0;',484,657,'b))},Phantom',149,455,'a',561,'b);',267,'}',509,'phantom",{phantom:a,v:c[0],h:c[1]}))},Smash',149,455,'a',561,'b);',267,'}',509,'smash",{smash:a}))},MathAccent',149,'b,',179,'e',561,'b);',267,'}var d','=jsMath.mItem.','Atom("accent",e);d.accent=a[0];',477,'Add(d)},NamedOp',149,'c,f){var b=(c.match(/[^acegm-su-z]/))?1:0;var g=(c.match(/[gjpqy]/))?0.2:0;if(f[1]){c=f[1]}var e',944,'TextAtom("','op",c,',365,'.fam[0],b,g);if(f[0]!=null){e.limits=f[0]}',477,'Add(e)},Limits',149,'a,c',193,477,'Last();if(!b||b.type!="op"){',741,'+" is allowed only on operators");return}b.limits=c[0]},Macro',149,'b,d){var e=d[0];if(d[1]){var a=[];','for(var c=0;c<','d[1];c++){a[a.length]=',466,'+b);',267,'}}e=this.','SubstituteArgs','(a,e)}',157,'=','this.AddArgs(e,',201,'));this.i=0},',972,149,'b,',179,'f="";var e="";var g;var d=0;while(d<a',214,'g=a.charAt(d++);if(g',319,'f+=g+a.charAt(d++)}else{if(g=="#"){',985,'=="#"){f+=g}',162,'g.match(/[1-9]/)||g>b',214,216,'Illegal ','macro parameter ','reference");',187,'}e=this.AddArgs(',976,'f),b[g-1]);f=""}}else{f+=g}}}',167,976,'f)},AddArgs',149,856,'if(a.match','(/^[a-z]/i)&&b.match(/(^|[^\\\\])(\\\\\\\\)*\\\\[a-z]+$/i)){b+=" "}',167,'b+a},Replace',149,546,484,'TextAtom(','b[0],b[1],b[2','],b[3]))},Hash',149,'a){',216,'You can\'t use \'',995,'character #\' in math mode")},Tilde',149,'a){',484,951,30,'"))},HandleLap',149,179,612,261,'();',267,'}b=',509,'lap",{nuc:b,lap:a}))},HandleAtom',149,455,'a',561,'b);',267,'}',484,'Atom(c[0],a))},HandleMathCode',149,'a,b','){this.HandleTeXchar(',1014,'])},HandleTeXchar',149,'b,a,c){if(b==7&&',181,'.font',549,'a=',181,'.font}a=',365,'.fam[a];if(!',365,'[a]){',365,'[a]=[];',542,654,')])}else{',484,'TeXAtom(',365,'.atom[b],c,a))}},','HandleVariable',149,'a',1048,'7,1,','a.charCodeAt(0))},','HandleNumber',149,'a',1048,1,1077,'HandleOther',149,'a){',484,951,'ord",a,"normal"))},HandleComment',199,'a;',241,'a=',168,'++);if(a=="\\r"||a=="\\n"){return}}},HandleStyle',149,546,181,'.style=b[0];',509,'style",{style:b[0]}))},HandleSize',149,546,181,'.size=b[0];',509,'size",{size:b[0]}))},HandleFont',149,856,181,'.font=a[0]},HandleCS',199,'b=',234,'();',267,'}',211,'macros[b]){',273,'this','.macros',831,'a',833,'a=[a]}this[a[0]](b,a.slice(1','));return}',211,'mathchardef','[','b]){this.HandleMathCode(b,this.',1129,'[b]);return}if(',326,233,1131,'delimiter[',233,'b].slice(0,3',1127,216,'Unknown control sequence \'"+',233,'b+"\'")},HandleOpen',166,477,'Open()},HandleClose',166,'if(',181,703,'==null){',216,225,'");',767,'a=',477,'Get(',181,709,'(!a||a.left',1152,477,'Close()}else{',216,225,' or missing',403,714,'");return}},HandleLeft',149,179,'b',630,'a);',267,'}',477,'Open(b)},HandleRight',149,263,'c',630,'b);',267,490,'=',477,'Get(',181,709,'(a&&a.left',549,477,'Close(c)}else{',216,'Extra open brace or missing',403,'+"left")}},HandleOver',149,546,'if(',181,720,549,216,'Ambiguous use of',403,404,'return}',181,720,'=',477,'Length();',181,'.overF={name:a};if(b.length>0){',181,'.overF.','left=',326,'b[0]];',181,1220,'right=',326,'b[1]]}else{',1006,'(/withdelims$/)){',181,1220,'left',630,'a);',267,'}',181,1220,'right',630,'a);',267,'}}else{',181,1220,'left=null;',181,1220,1226,'null}}',1006,'(/^above/)){',181,1220,'thickness',499,'a,1);',267,1244,181,1220,'thickness=null}},HandleSuperscript',199,'a=',477,195,181,720,'==',477,'Length()){a=null}','if(a==null','||(!a.atom&&a',480,'a',482,'a=',484,485,'if(a.sup){if(a.sup.isPrime){a=',484,485,'else{',216,'Double exponent',489,'}}a.sup',503,'("superscript");',267,'}},HandleSubscript',199,'a=',477,195,181,720,'==',477,'Length()){a=null}',1273,'||(!a.atom&&a',480,'a',482,'a=',484,485,'if(a.sub){',216,'Double subscripts',489,'}a.sub',503,'("subscript");',267,'}},Parse',199,'b;',241,'b=',168,'++);',211,'mathchar[',1131,'mathchar[b])}else{',211,'special[b]){this[this',152,'b]](b)}else{',211,'letter','.test(b)){this.',1072,'(b)}else{',211,'number',1335,1078,1337,'this.',1084,'(b)}}}}}if(',181,703,549,273,477,'Get(',181,709,'(a.left){',216,217,403,714,715,216,257,'")}}if(',181,720,549,477,'Over()}},Atomize',199,'a=',477,'init;if(!this.error){',477,727,'a.style,a.size)}},Typeset',199,'f=',477,'init;var ',594,'typeset=',477,657,'f.style,f',880,267,'\'<span class="error">\'+this.error',904,'if(d.format=="null"){return""}d.Styled().Remeasured();var e=0;var c=0;if(d.bh>d.h&&','d.bh>jsMath.h+0.001','){e=1}if(d.bd>d.d&&d.bd>jsMath.d+0.001){e=1}if(d.h>jsMath.h||d.d>jsMath.d){c=1}var b=d.html;if(e){if(','jsMath.Browser.','allowAbsolute){var g=(',1389,'?jsMath.h-d.bh:0);b=',898,'Absolute(b,d.w,jsMath.h,0,g)}else{if(',1391,'valignBug){','b=\'<span style="line-height:\'+jsMath.HTML.Em(jsMath.d',')+\';">\'+b',904,162,1391,'operaLineHeightBug){',273,898,'Em(Math.max(0,d.bd-jsMath.hd)/3);',1399,')+"; position:relative; top:"+a+"; vertical-align:"+a+\'">\'+b+"</span>"}}}c=1}if(c){b+=',898,'Blank(0,d.h+0.05,d.d+0.05)}return\'<nobr><span class="scale">\'+b+"</span></nobr>"}});',151,'.AddSpecial({cmd:"HandleCS",open:"HandleOpen",close:"HandleClose"});','jsMath.Add(jsMath,{','Macro',149,179,'c=',151,1122,';c[a]=["Macro"];for(var b=1;b<arguments',158,'b++){c[a][c[a].length]=arguments[b]}}});',538,'={safeRequire:1,Macro',149,'a,',263,'c=',151,1122,';if(b',1152,'b=a}c[a]=["',87,'",b]},LaTeX',149,'b,',179,'c=',151,'.',102,';c[b]=["Extension",','a,"',102,'"]},Font',149,856,1273,'){a=b+"10"}var c=',151,1122,1444,654,')]},MathChar',149,'d,',179,'e=',365,'.famName[d','];if(e',1152,'e=',365,'.fam',158,365,'.fam[e]=d;',365,1462,']=e}var b=',151,'.',1129,';for(var f in a){b[f]=[a[f][0],e,a[f][1]]}},Require',149,856,211,'safeRequire&&(b.match(/\\.\\.\\/|[^-a-z0-9.\\/:_+=%~]/i)||(b.match(/:/)&&b.substr(0,jsMath.root.length)!=jsMath.root))){',540,'loaded[b]=1;return}',540,'Script(this.URL(b),a)},URL',149,'a){a=',175,',"");if(!a.match(/^([a-z]+:|\\/|fonts|extensions\\/)/i)){a="extensions/"+a}if(!a.match(/\\.js$/)){a+=".js"}',167,'a}};',1414,177,149,'a){',540,'Body();','jsMath.Script.','Push(',547,',"','Asynchronous','",a)},','ProcessBeforeShowing',149,'a){',540,1497,'var b=(','jsMath.Controls.cookie.','asynch?"',1502,'":"','Synchronous','");',1498,1499,547,',b,a)},','ProcessElement',149,'a){',540,1497,1498,1499,547,',"ProcessOne",a)}});',547,'={element:[],cancel:0,Parse',149,'d,c,',179,'b=','jsMath.Global.','cache[d];if(!','b[jsMath.em',']){',1537,']={}}',412,1537,'][c];if(!f||',179,'e',183,'c,null,null,d);e.Atomize();f=e.Typeset();if(!a){',1537,'][c]=f}}',167,'f},TextMode',149,'b,a){this.Parse("','T",b,a)},DisplayMode',149,1553,'D",b,a)},','GetElementText',149,'b){if(','b.childNodes.length','==1&&','b.childNodes[','0].nodeName==="#','comment"){',273,1563,'0].nodeValue.match(/^\\[CDATA\\[(.*)\\]\\]$/);if(a',549,167,'a[1]}}var c=this.','recursiveElementText','(b);b.alt=c;if(c.search("&")>=0){','c=c.replace(/&','lt;/g,"<");',1574,'gt;/g,">");',1574,'quot;/g,\'"\');',1574,'amp;/g,"&")}',167,'c},',1572,149,1560,'b.nodeValue',549,'if(b.nodeName!=="#',1565,167,1587,'}',167,1587,'.replace(/^\\[CDATA\\[((.|\\n)*)\\]\\]$/,"$1")}if(',1561,'===0){return" "}var c="";for(',273,'0;a<',1561,';a++){c+=this.',1572,'(',1563,'a])}',167,'c},ResetHidden',149,'a){a.innerHTML=\'<span id="jsMath_hiddenSpan" style="position:absolute"></span>\'+',1391,'operaHiddenFix;a','.className','="";','jsMath.hidden','=a.firstChild;if(!jsMath.BBoxFor("x").w){','jsMath.hidden=jsMath.hiddenTop','}jsMath.ReInit()},ConvertMath',149,'c,b,',179,594,1558,'(b);this.ResetHidden(b);if(d.match(/^\\s*\\\\nocache([^a-zA-Z])/)){a=true;d=d.replace(/\\s*\\\\nocache/,"")}',594,'Parse(c,d,a);b',1613,'="typeset";b.innerHTML=d},',1520,149,'c){this.restart=0;if(!c',1613,'.match(/(^| )math( |$)/)){',767,'a=(c',1613,'.toLowerCase','().match(/(^| )nocache( |$)/)!=null);try{var d=(c.tagName',1637,'()=="div"?"D":"T");this.ConvertMath(d,c,a);c.onclick=jsMath.Click.CheckClick;c.ondblclick=jsMath.Click.CheckDblClick}catch(e){if(c.alt',193,'c.alt;b=b.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;");c.innerHTML=b;c',1613,'="math";if(a){c',1613,'+=" nocache"}}',1617,'}},','ProcessElements',149,'b){',1498,'blocking=','1;',966,1391,'processAtOnce;c++,b++){if(b>=','this.element','.length||this.cancel){this.','ProcessComplete','();',211,'cancel){','jsMath.Message.','Set("',177,' Math: Canceled");',1664,'Clear()}',1498,1653,'0;',1498,177,'();return}','else{',273,1498,'SaveQueue();','this.ProcessElement(this.element[','b]);',211,'restart){',1498,1499,'this,"',1649,'",b);',1498,'RestoreQueue(a);',1498,1653,'0;setTimeout("',1498,177,'()",',1391,'delay);return}}}',1498,1690,'var d=Math.floor(100*b/',1658,439,'jsMath.Message.Set("Processing Math',': "+d+"%");setTimeout("',547,'.',1649,'("+b+")",',1391,'delay)},',1502,149,'a','){if(!jsMath.initialized){jsMath.Init()}this.element','=this.GetMathElements(','a);',1498,1653,'1;this.cancel=0;this',556,'=1;',1704,': 0%",1);setTimeout("',547,'.',1649,'(0)",',1391,1711,1514,149,856,1273,1715,1716,'b);a=0}this',556,'=0;while(a<',1658,214,1680,'a]);',211,'restart){','jsMath.Synchronize','("',547,'.',1514,'(null,"+a+")");',1498,177,1675,'a++}this.',1660,'(1)},ProcessOne',149,'a',1715,'=[a];this.',1514,'(null,0)},GetMathElements',149,'d){var b=[];var a;',215,'d=','jsMath.document','}if(typeof(d',833,'d=',1768,'.getElementById(d)}if(!','d.getElementsByTagName','){',187,644,1774,'("div','");for(a=0;a<c.length;a++){if(c[a].className&&c[a].className.match(/(^| )math( |$)/)){if(jsMath.Browser.renameOK&&d.getElementsByName){c[a].setAttribute("name","_jsMath_")}else{b[b.length]=c[a]}}}','c=',1774,'("span',1780,'if(',1391,'renameOK','&&d','.getElementsByName','){b=d',1789,'("_jsMath_',715,'if(',1615,'.sourceIndex','){b.sort(function(f,e){',167,'f',1796,'-e',1796,'})}}',167,'b},',1660,149,'c){if(',1391,1787,193,1768,1789,1792,'");for(',273,'b.length-1;a>=0;a--){b[a].removeAttribute("name")}}',1617,';',1658,'=[];this.restart=null;if(!c){',1704,': Done");',1664,'Clear()}',1664,'UnBlank();if(',1391,'safariImgBug&&(',1510,'font=="symbol"||',1510,'font=="image")){',211,'timeout){clearTimeout(this.timeout)}this.timeout=setTimeout("','jsMath.window.resizeBy','(-1,0); ',1836,'(1,0); ',547,'.timeout = null",2000)}},Cancel',166,547,'.cancel=1;if(',1498,'cancelTimer){',1498,'cancelLoad()}}};',1414,'ConvertTeX',149,'a){',1498,'Push(jsMath.tex2math,"',1850,1503,'ConvertTeX2',149,'a){',1498,1854,1857,1503,'ConvertLaTeX',149,'a){',1498,1854,1864,1503,'ConvertCustom',149,'a){',1498,1854,1871,1503,'CustomSearch',149,'c,b,a,d){',1498,1499,'null,function(){jsMath.tex2math.',1878,'(c,b,a,d)})},tex2math:{',1850,472,1857,472,1864,472,1871,472,1878,':function(){}}});',1746,'=',1498,'Synchronize;try{if(','window.parent','!=window&&window.jsMathAutoload){',1900,'.jsMath=jsMath;',1768,'=',1900,'.document;jsMath.window=',1900,'}}catch(err){}',1535,'Register();jsMath.Loaded();jsMath.Controls.GetCookie();',540,'Source();',1535,'Init();',1498,'Init();',540,'Fonts();if(',1768,'.body){',540,'Body()}',540,'User("onload")}};']
+
+]);
+//end = new Date().getTime();
+//alert(end-start);
diff --git a/htdocs/jsMath/local/macros.js b/htdocs/jsMath/local/macros.js
new file mode 100644
index 0000000000..974fba98bc
--- /dev/null
+++ b/htdocs/jsMath/local/macros.js
@@ -0,0 +1,17 @@
+/*
+ *  local/macros.js
+ *
+ *  Use jsMath.Macro() to declare your own local macro definitions here,
+ *  and add "local/macros.js" to the loadFiles array in easy/load.js so 
+ *  that they will be loaded automatically when jsMath is used.
+ *  
+ *  See http://www.math.union.edu/locate/jsMath/authors/macros.html
+ *  for details on defining macros for jsMath.
+ */
+
+//
+//   Examples:
+// 
+// jsMath.Macro('R','{\\bf R}');
+// jsMath.Macro('red','\\color{red}{#1}',1);
+// 
diff --git a/htdocs/jsMath/plugins/CHMmode.js b/htdocs/jsMath/plugins/CHMmode.js
new file mode 100644
index 0000000000..1bab915f05
--- /dev/null
+++ b/htdocs/jsMath/plugins/CHMmode.js
@@ -0,0 +1,85 @@
+/*
+ *  CHMmode.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file makes jsMath work with MicroSoft's HTML Help system
+ *  from within .chm files (compiled help archives).
+ *  
+ *  This file should be loaded BEFORE jsMath.js.
+ *
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 2006-2007 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+if (!window.jsMath) {window.jsMath = {}}
+if (!jsMath.Controls) {jsMath.Controls = {}}
+if (!jsMath.Controls.cookie) {jsMath.Controls.cookie = {}}
+
+jsMath.isCHMmode = 1;
+
+jsMath.noChangeGlobal = 1;
+jsMath.noShowGlobal = 1;
+jsMath.noImgFonts = 1;
+jsMath.Controls.cookie.global = 'always';
+jsMath.Controls.cookie.hiddenGlobal = 1;
+
+if (window.location.protocol == "mk:") {
+
+  /*
+   *  Work around bug in hh.exe that causes it to run at 100% CPU
+   *  and not exit if the page is reloaded after an IFRAME is used
+   *  to load the controls file, so fake it using XMLHttpRequest.
+   *  Load the data into a DIV instead of an IFRAME, and make sure
+   *  that the styles are correct for it.  Change the GetPanel()
+   *  call to hide the other panel and open the correct one.
+   */
+
+  jsMath.Controls.Init = function () {
+    this.controlPanels = jsMath.Setup.DIV("controlPanels");
+    if (!jsMath.Browser.msieButtonBug) {this.Button()}
+    else {setTimeout("jsMath.Controls.Button()",500)}
+  }
+  
+  jsMath.Controls.Panel = function () {
+    jsMath.Translate.Cancel();
+    jsMath.Setup.AddStyleSheet({
+      '#jsMath_options': jsMath.styles['#jsMath_panel'],
+      '#jsMath_options .disabled': jsMath.styles['#jsMath_panel .disabled'],
+      '#jsMath_options .infoLink': jsMath.styles['#jsMath_panel .infoLink']
+    });
+    if (this.loaded) {this.panel = jsMath.Element("panel"); this.Main(); return}
+    var html = jsMath.Script.xmlRequest(jsMath.root+"jsMath-controls.html");
+    var body = (html.match(/<body>([\s\S]*)<\/body>/))[1];
+    this.controlPanels.innerHTML = body;
+    var script = (body.match(/<script>([\s\S]*?)<\/script>/))[1];
+    jsMath.window.eval(script);
+    jsMath.Controls.GetPanel = function (name) {
+      if (this.panel) {this.panel.style.display = "none"}
+      this.panel = jsMath.Element(name);
+    }
+    jsMath.Controls.oldClose = jsMath.Controls.Close;
+    jsMath.Controls.Close = function () {this.oldClose(); this.panel = null}
+    jsMath.Element("options").style.display = "none";
+    jsMath.Controls.Main();
+    if (!jsMath.Browser.IE7 || jsMath.Browser.quirks) {
+      jsMath.window.attachEvent("onscroll",jsMath.Controls.MoveButton);
+      if (jsMath.Browser.IE7) jsMath.window.attachEvent("onresize",jsMath.Controls.MoveButton);
+    }
+  }
+  
+}
+
diff --git a/htdocs/jsMath/plugins/autoload.js b/htdocs/jsMath/plugins/autoload.js
new file mode 100644
index 0000000000..dc7b7f05b3
--- /dev/null
+++ b/htdocs/jsMath/plugins/autoload.js
@@ -0,0 +1,474 @@
+/*
+ *  autoload.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file is a plugin that checks if a page contains any math
+ *  that must be processed by jsMath, and only loads jsMath.js
+ *  when there is.
+ *  
+ *  You can control the items to look for via the variables
+ *  
+ *      jsMath.Autoload.findTeXstrings
+ *      jsMath.Autoload.findLaTeXstrings
+ *      jsMath.Autoload.findCustomStrings
+ *      jsMath.Autoload.findCustomSettings
+ *  
+ *  which control whether to look for TeX strings that will be converted
+ *  by jsMath.ConvertTeX(), or LaTeX strings that will be converted by
+ *  jsMath.ConvertLaTeX().  By default, the first is true and the second
+ *  and third are false.  The findCustomStrings can be used to specify your
+ *  own delimiters for in-line and display mathematics, e.g.
+ *  
+ *      jsMath.Autoload.findCustomStrings = [
+ *         '[math],'[/math]',          // start and end in-line math
+ *         '[display]','[/display]'    // start and end display math
+ *      ];
+ *  
+ *  Finally, findCustomSettings can be set to an object reference whose
+ *  name:value pairs control the individual search settings for tex2math.  
+ *  (See the plugins/tex2math.js file for more details).
+ *  
+ *  If any math strings are found, jsMath.js will be loaded automatically, 
+ *  but not loaded otherwise.  If any of the last four are set and TeX math
+ *  strings are found, then plugins/tex2ath.js will be loaded
+ *  automatically.  jsMath.Autoload.needsJsMath will be set to true or
+ *  false depending on whether jsMath needed to be loaded.
+ *  
+ *  The value of jsMath.Autoload.checkElement controls the element to be
+ *  searched by the autoload plug-in.  If unset, the complete document will
+ *  be searched.  If set to a string, the element with that name will be
+ *  searched.  If set to a DOM object, that object and its children will
+ *  be searched.
+ *  
+ *  Finally, there are two additional parameters that control files to
+ *  be loaded after jsMath.js, should it be needed.  These are
+ *  
+ *      jsMath.Autoload.loadFonts
+ *      jsMath.Autoload.loadFiles
+ *  
+ *  If jsMath.js is loaded, the fonts contained in the loadFonts array
+ *  will be loaded, and the JavaScript files listed in the loadFiles array
+ *  will be run.  Relative URL's are loaded based from the URL containing
+ *  jsMath.js.
+ *  
+ *  The autoload plugin can be loaded in the document HEAD or in the BODY. 
+ *  If it is loaded in the HEAD, you will need to call jsMath.Autoload.Check()
+ *  at the end of the BODY (say in the window.onload handler) in order to
+ *  get it to check the page for math that needs to be tagged, otherwise load
+ *  the file at the bottom of the BODY and it will run the check automatically.
+ *
+ *  You can call jsMath.Autoload.Run() after the check has been performed
+ *  in order to call the appropriate tex2math routines for the given Autoload
+ *  settings.  You can call jsMath.Autoload.Run() even when jsMath isn't loaded.
+ *  
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 2004-2006 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/*************************************************************************/
+
+/*
+ *  Make sure jsMath.Autoload is available
+ */
+if (!window.jsMath) {window.jsMath = {}}
+if (jsMath.Autoload == null) {jsMath.Autoload = {}}
+jsMath.Add = function (dst,src) {for (var id in src) {dst[id] = src[id]}};
+jsMath.document = document; // tex2math needs this
+
+jsMath.Add(jsMath.Autoload,{
+  
+  Script: {
+
+    request: null,  // XMLHttpRequest object (if we can get it)
+    iframe: null,   // the hidden iframe (if not)
+    operaXMLHttpRequestBug: (window.opera != null), // is Opera browser
+
+    /*
+     *  Get XMLHttpRequest object, if possible, and look up the URL root
+     *  (MSIE can't use xmlReuest to load local files, so avoid that)
+     */
+    Init: function () {
+      this.Root();
+      if (window.XMLHttpRequest) {
+        try {this.request = new XMLHttpRequest} catch (err) {}
+        // MSIE and FireFox3 can't use xmlRequest on local files,
+        // but we don't have jsMath.browser yet to tell, so use this check
+        if (this.request && window.location.protocol == "file:") {
+          try {
+            this.request.open("GET",jsMath.Autoload.root+"plugins/autoload.js",false);
+            this.request.send(null);
+          } catch (err) {
+            this.request = null;
+            //  Firefox3 has window.postMessage for inter-window communication. 
+            //  It can be used to handle the new file:// security model,
+            //  so set up the listener.
+            if (window.postMessage && window.addEventListener) {
+              this.mustPost = 1;
+              window.addEventListener("message",jsMath.Autoload.Post.Listener,false);
+            }
+          }
+        }
+      }
+      if (!this.request && window.ActiveXObject && !this.mustPost) {
+        var xml = ["MSXML2.XMLHTTP.6.0","MSXML2.XMLHTTP.5.0","MSXML2.XMLHTTP.4.0",
+                   "MSXML2.XMLHTTP.3.0","MSXML2.XMLHTTP","Microsoft.XMLHTTP"];
+        for (var i = 0; i < xml.length && !this.request; i++) {
+          try {this.request = new ActiveXObject(xml[i])} catch (err) {}
+        }
+      }
+    },
+
+    /*
+     *  Load an external JavaScript file
+     */
+    Load: function (url) {
+      if (this.request && !(this.operaXMLHttpRequestBug && url == 'jsMath.js')) {
+        setTimeout(function () {jsMath.Autoload.Script.xmlLoad(url)},1);
+      } else {
+        this.startLoad(url);
+      }
+    },
+
+    /*
+     *  Load an external JavaScript file via XMLHttpRequest
+     */
+    xmlLoad: function (url) {
+      try {
+        this.request.open("GET",jsMath.Autoload.root+url,false);
+        this.request.send(null);
+      } catch (err) {
+        throw Error("autoload: can't load the file '"+url+"'\n"
+            + "Message: "+err.message);
+      }
+      if (this.request.status && this.request.status >= 400) {
+        throw Error("autoload: can't load the file '"+url+"'\n"
+            + "Error status: "+this.request.status);
+      }
+      window.eval(this.request.responseText);
+      this.endLoad();
+    },
+
+    /*
+     *  Load an external JavaScript file via jsMath-autoload.html
+     */
+    startLoad: function (url) {
+      this.iframe = document.createElement('iframe');
+      this.iframe.style.visibility = 'hidden';
+      this.iframe.style.position = 'absolute';
+      this.iframe.style.width  = '0px';
+      this.iframe.style.height = '0px';
+      if (document.body.firstChild) {
+        document.body.insertBefore(this.iframe,document.body.firstChild);
+      } else {
+        document.body.appendChild(this.iframe);
+      }
+      this.url = url; setTimeout('jsMath.Autoload.Script.setURL()',100);
+    },
+    endLoad: function () {setTimeout('jsMath.Autoload.Script.AfterLoad()',1)},
+
+    /*
+     *  Use location.replace() to avoid browsers placing the file in
+     *  the history (and messing up the BACK button action).  Not
+     *  completely effective in Firefox 1.0.x.  Safari won't handle
+     *  replace() if the document is local (not sure if that's really
+     *  the issue, but that's the only time I see it).
+     */
+    setURL: function () {
+      if (this.mustPost) {
+        this.iframe.src = jsMath.Autoload.Post.startLoad(this.url,this.iframe);
+      } else {
+        var url = jsMath.Autoload.root+"jsMath-autoload.html";
+        var doc = this.iframe.contentDocument;
+        if (!doc && this.iframe.contentWindow) {doc = this.iframe.contentWindow.document}
+        if (navigator.vendor == "Apple Computer, Inc." &&
+            document.location.protocol == 'file:') {doc = null}
+        if (doc) {doc.location.replace(url)} else {this.iframe.src = url}
+      }
+    },
+
+    /*
+     *  Queue items that need to be postponed until jsMath has run
+     */
+    queue: [],
+    Push: function (name,data) {this.queue[this.queue.length] = [name,data]},
+    RunStack: function () {
+      if (this.tex2math) {jsMath.Autoload.Check2(); return}
+      for (var i = 0; i < this.queue.length; i++) {
+        var name = this.queue[i][0];
+        var data = this.queue[i][1];
+        if (data.length == 1) {jsMath[name](data[0])}
+          else {jsMath[name](data[0],data[1],data[2],data[3])}
+      }
+     this.queue = [];
+    },
+  
+    AfterLoad: function () {jsMath.Autoload.Script.RunStack()},
+
+    /*
+     *  Look up the jsMath root directory, if it is not already supplied
+     */
+    Root: function () {
+      if (jsMath.Autoload.root) return;
+      var script = document.getElementsByTagName('script');
+      if (script) {
+        for (var i = 0; i < script.length; i++) {
+          var src = script[i].src;
+          if (src && src.match('(^|/|\\\\)plugins/autoload.js$')) {
+            jsMath.Autoload.root = src.replace(/plugins\/autoload.js$/,'');
+            break;
+          }
+        }
+      }
+    }
+
+  },
+  
+  /*
+   *  Handle window.postMessage() events in Firefox3
+   */
+  Post: {
+    window: null,  // iframe we are ing to
+  
+    Listener: function (event) {
+      if (event.source != jsMath.Autoload.Post.window) return;
+      var domain = event.origin.replace(/^file:\/\//,'');
+      var ddomain = document.domain.replace(/^file:\/\//,'');
+      if (domain == null || domain == "" || domain == "null") {domain = "localhost"}
+      if (ddomain == null || ddomain == "" || ddomain == "null") {ddomain = "localhost"}
+      if (domain != ddomain || event.data.substr(0,6) != "jsMAL:") return;
+      var type = event.data.substr(6,3).replace(/ /g,'');
+      var message = event.data.substr(10);
+      if (jsMath.Autoload.Post.Commands[type]) (jsMath.Autoload.Post.Commands[type])(message);
+      // cancel event?
+    },
+  
+    /*
+     *  Commands that can be performed by the listener
+     */
+    Commands: {
+      SCR: function (message) {window.eval(message)},
+      ERR: function (message) {jsMath.Autoload.Script.endLoad()},
+      END: function (message) {jsMath.Autoload.Script.endLoad()}
+    },
+    
+    startLoad: function (url,iframe) {
+      this.window = iframe.contentWindow;
+      return jsMath.Autoload.root+"jsMath-loader-post.html?autoload="+url;
+    },
+  
+    endLoad: function () {
+      this.window = null;
+    }
+  },
+
+  
+  /**************************************************************/
+  
+  /*
+   *  Load tex2math first (so we can call its search functions
+   *  to look to see if anything needs to be turned into math)
+   *  if it is needed, otherwise go on to the second check.
+   */
+  Check: function () {
+    if (this.checked) return; this.checked = 1;
+    if ((this.findTeXstrings || this.findLaTeXstrings ||
+         this.findCustomStrings || this.findCustomSettings) &&
+         (!jsMath.tex2math || !jsMath.tex2math.loaded)) {
+      this.Script.tex2math = 1;
+      this.Script.Load('plugins/tex2math.js');
+    } else {
+      if (!jsMath.tex2math) {jsMath.tex2math = {}}
+      this.Check2();
+    }
+  },
+  ReCheck: function () {
+    if (jsMath.loaded) return;
+    this.InitStubs();
+    this.checked = 0;
+    this.Script.queue = [];
+    this.Check();
+  },
+
+  /*
+   *  Once tex2math is loaded, use it to check for math that
+   *  needs to be tagged for jsMath, and load jsMath if it is needed
+   */
+  Check2: function () {
+    this.Script.tex2math = 0; this.needsJsMath = 0;
+    if (this.checkElement == null) {this.checkElement = null}
+
+    if (this.findTeXstrings)     {jsMath.tex2math.ConvertTeX(this.checkElement)}
+    if (this.findLaTeXstrings)   {jsMath.tex2math.ConvertLaTeX(this.checkElement)}
+    if (this.findCustomSettings) {jsMath.tex2math.Convert(this.checkElement,this.findCustomSettings)}
+    if (this.findCustomStrings)  {
+      var s = this.findCustomStrings;
+      jsMath.tex2math.CustomSearch(s[0],s[1],s[2],s[3]);
+      jsMath.tex2math.ConvertCustom(this.checkElement);
+    }
+
+    this.needsJsMath = this.areMathElements(this.checkElement);
+    if (this.needsJsMath) {
+      this.LoadJsMath();
+    } else {
+      jsMath.Process = function () {};
+      jsMath.ProcessBeforeShowing = function () {};
+      jsMath.ProcessElement = function () {};
+      jsMath.ConvertTeX = function () {};
+      jsMath.ConvertTeX2 = function () {};
+      jsMath.ConvertLaTeX = function () {};
+      jsMath.ConvertCustom = function () {};
+      jsMath.CustomSearch = function () {};
+      jsMath.Macro = function () {};
+      jsMath.Synchronize = function (code,data) {
+        if (typeof(code) == 'string') {eval(code)} else {code(data)}
+      };
+      jsMath.Autoload.Script.RunStack(); // perform pending commands
+      jsMath.Autoload.setMessage();
+    }
+  },
+
+  /*
+   *  A callback used in the tex2math searches to signal that
+   *  some math has been found.
+   */
+  tex2mathCallback: function () {
+    jsMath.Autoload.needsJsMath = 1;
+    return false;
+  },
+
+  /*
+   *  jsMath.Autoload.Run() is now longer needed
+   */
+  Run: function (data) {},
+
+  /*
+   *  Look to see if there are SPAN or DIV elements of class "math".
+   */
+  areMathElements: function (obj) {
+    if (!obj) {obj = document}
+    if (typeof(obj) == 'string') {obj = document.getElementById(obj)}
+    if (!obj.getElementsByTagName) {return false}
+    var math = obj.getElementsByTagName('div');
+    for (var k = 0; k < math.length; k++) 
+      {if (math[k].className.match(/(^| )math( |$)/)) {return true}}
+    math = obj.getElementsByTagName('span');
+    for (var k = 0; k < math.length; k++) 
+      {if (math[k].className.match(/(^| )math( |$)/)) {return true}}
+    return false;
+  },
+
+  /*
+   *  When math tags are found, load the jsMath.js file,
+   *  and afterward, load any auxiliary files or fonts,
+   *  and then do any pending commands.
+   */
+  LoadJsMath: function () {
+    if (this.loading) return;
+    if (jsMath.loaded) {this.afterLoad(); return}
+    if (this.root) {
+      this.loading = 1;
+      this.setMessage('Loading jsMath...');
+      this.Script.AfterLoad = this.afterLoad;
+      this.Script.Load('jsMath.js');
+    } else {
+      alert("Can't determine URL for jsMath.js");
+    }
+  },
+  afterLoad: function () {
+    jsMath.Autoload.loading = 0;
+    //
+    //  Handle MSIE bug where jsMath.window both is and is not the actual window
+    //
+    if (jsMath.tex2math.window) {jsMath.tex2math.window.jsMath = jsMath}
+    if (jsMath.browser == 'MSIE') {window.onscroll = jsMath.window.onscroll};
+    var fonts = jsMath.Autoload.loadFonts;
+    if (fonts) {
+      if (typeof(fonts) != 'object') {fonts = [fonts]}
+      for (var i = 0; i < fonts.length; i++) {jsMath.Font.Load(fonts[i])}
+    }
+    var files = jsMath.Autoload.loadFiles;
+    if (files) {
+      if (typeof(files) != 'object') {files = [files]}
+      for (var i = 0; i < files.length; i++) {jsMath.Setup.Script(files[i])}
+    }
+    var macros = jsMath.Autoload.macros;
+    if (macros) {
+      for (var id in macros) {
+        if (typeof(macros[id]) == 'string') {
+          jsMath.Macro(id,macros[id]);
+        } else {
+          jsMath.Macro(id,macros[id][0],macros[id][1]);
+        }
+      }
+    }    
+    jsMath.Synchronize(function () {jsMath.Autoload.Script.RunStack()});
+    jsMath.Autoload.setMessage();
+  },
+
+  /*
+   *  Display a message in a small box at the bottom of the screen
+   */
+  setMessage: function (message) {
+    if (message) {
+      this.div = document.createElement('div');
+      if (!document.body.hasChildNodes) {document.body.appendChild(this.div)}
+        else {document.body.insertBefore(this.div,document.body.firstChild)}
+      var style = {
+        position:'fixed', bottom:'1px', left:'2px',
+        backgroundColor:'#E6E6E6', border:'solid 1px #959595',
+        margin:'0px', padding:'1px 8px', zIndex:102,
+        color:'black', fontSize:'75%', width:'auto'
+      };
+      for (var id in style) {this.div.style[id] = style[id]}
+      this.div.id = "jsMath_message";
+      this.div.appendChild(jsMath.document.createTextNode(message));
+    } else if (this.div) {
+      this.div.firstChild.nodeValue = "";
+      this.div.style.visibility = 'hidden';
+    }
+  },
+
+  /*
+   *  Queue these so we can do them after jsMath has been loaded
+   */
+  stubs: {
+    Process: function (data) {jsMath.Autoload.Script.Push('Process',[data])},
+    ProcessBeforeShowing: function (data) {jsMath.Autoload.Script.Push('ProcessBeforeShowing',[data])},
+    ProcessElement: function (data) {jsMath.Autoload.Script.Push('ProcessElement',[data])},
+    ConvertTeX: function (data) {jsMath.Autoload.Script.Push('ConvertTeX',[data])},
+    ConvertTeX2: function (data) {jsMath.Autoload.Script.Push('ConvertTeX2',[data])},
+    ConvertLaTeX: function (data) {jsMath.Autoload.Script.Push('ConvertLaTeX',[data])},
+    ConvertCustom: function (data) {jsMath.Autoload.Script.Push('ConvertCustom',[data])},
+    CustomSearch: function (d1,d2,d3,d4) {jsMath.Autoload.Script.Push('CustomSearch',[d1,d2,d3,d4])},
+    Synchronize: function (data) {jsMath.Autoload.Script.Push('Synchronize',[data])},
+    Macro: function (cs,def,params) {jsMath.Autoload.Script.Push('Macro',[cs,def,params])}
+  },
+
+  InitStubs: function () {jsMath.Add(jsMath,jsMath.Autoload.stubs)}
+  
+});
+
+/*
+ *  Initialize
+ */
+
+if (jsMath.Autoload.findTeXstrings == null)   {jsMath.Autoload.findTeXstrings = 0}
+if (jsMath.Autoload.findLaTeXstrings == null) {jsMath.Autoload.findLaTeXstrings = 0}
+
+jsMath.Autoload.Script.Init();
+jsMath.Autoload.InitStubs();
+if (document.body && !jsMath.Autoload.delayCheck) {jsMath.Autoload.Check()}
diff --git a/htdocs/jsMath/plugins/global.js b/htdocs/jsMath/plugins/global.js
new file mode 100644
index 0000000000..1fd26fe659
--- /dev/null
+++ b/htdocs/jsMath/plugins/global.js
@@ -0,0 +1,52 @@
+/*
+ *  plugins/global.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file call up the global frame, if it is not already in place.
+ *  
+ *  This should be called BEFORE loading jsMath.js
+ *
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 2006 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+if (!parent.jsMath || !parent.jsMath.isGlobal) {
+  var cookie = []; var cookies = document.cookies;
+  if (window.location.protocol == 'file:') {cookies = unescape(window.location.search.substr(1))}
+  else if (window.location.protocol == 'mk:') {cookies = unescape(window.location.hash.substr(1))}
+  if (cookies.match(/jsMath=([^;]+)/)) {
+    var data = RegExp.$1.split(/,/);
+    for (var i = 0; i < data.length; i++) {
+      var x = data[i].match(/(.*):(.*)/);
+      cookie[x[1]] = x[2];
+    }
+  }
+  if (cookie.global != "never" && !navigator.accentColorName) {
+    var script = document.getElementsByTagName('script');
+    if (script) {
+      for (var i = 0; i < script.length; i++) {
+        src = script[i].src;
+        if (src && src.match('(^|/)plugins/global.js$')) {
+          src = src.replace(/plugins\/global.js$/,'jsMath-global.html');
+          var sep = (window.location.protocol == 'mk:') ? '#' : '?';
+          window.location.replace(src + sep + escape(window.location));
+          break;
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/htdocs/jsMath/plugins/mimeTeX.js b/htdocs/jsMath/plugins/mimeTeX.js
new file mode 100644
index 0000000000..0a7f4626af
--- /dev/null
+++ b/htdocs/jsMath/plugins/mimeTeX.js
@@ -0,0 +1,221 @@
+/*
+ *  mimeTeX.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file makes jsMath more compatible with the mimeTeX program.
+ *  It does not make everything work, but it goes a long way.
+ *
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 2004-2006 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+
+/*
+ *  Treat ~ as space
+ */
+jsMath.Parser.prototype.nextIsSpace = function () {
+  return this.string.charAt(this.i) == ' ' ||
+         this.string.charAt(this.i) == '~';
+}
+jsMath.Parser.prototype.special['~'] = 'Space';
+
+/*
+ *  Implement \[ ... \], \( ... \), etc.
+ */
+jsMath.Macro('[','\\left[');  jsMath.Macro(']','\\right]');
+jsMath.Macro('(','\\left(');  jsMath.Macro(')','\\right)');
+jsMath.Macro('<','\\left<');  jsMath.Macro('>','\\right>');
+// can't do \. in a reasonable way
+jsMath.Parser.prototype.macros['|'] = ['HandleLR','|','|'];
+jsMath.Parser.prototype.macros['='] = ['HandleLR','\\|','\\|'];
+
+/*
+ *  Make non-standard \left{ and \right} work
+ */
+jsMath.Parser.prototype.delimiter['}'] = [5,2,0x67,3,0x09];
+jsMath.Parser.prototype.delimiter['{'] = [4,2,0x66,3,0x08];
+
+
+/*
+ *  Immitate mimeTeX \big... and \Big... ops
+ */
+
+// make the normal ones in text mode
+jsMath.Macro('int','\\intop\\nolimits');
+jsMath.Macro('oint','\\ointop\\nolimits');
+jsMath.Macro('sum','\\sumop\\nolimits');
+jsMath.Macro('prod','\\prodop\\nolimits');
+jsMath.Macro('coprod','\\coprodop\\nolimits');
+
+jsMath.Macro('bigint','\\bigintop\\nolimits'); 
+jsMath.Macro('bigoint','\\bigointop\\nolimits');
+jsMath.Macro('bigsum','\\bigsumop\\nolimits');
+jsMath.Macro('bigprod','\\bigprodop\\nolimits');
+jsMath.Macro('bigcoprod','\\bigcoprodop\\nolimits');
+
+jsMath.Macro('Bigint','\\bigintop\\limits');
+jsMath.Macro('Bigoint','\\bigointop\\limits');
+jsMath.Macro('Bigsum','\\bigsumop\\limits');
+jsMath.Macro('Bigprod','\\bigprodop\\limits');
+jsMath.Macro('Bigcoprod','\\bigcoprod\\limits');
+
+/*
+ *  The characters needed for the macros above
+ */
+jsMath.Parser.prototype.mathchardef['coprodop'] = [1,3,0x60];
+jsMath.Parser.prototype.mathchardef['prodop']   = [1,3,0x51];
+jsMath.Parser.prototype.mathchardef['sumop']    = [1,3,0x50];
+
+jsMath.Parser.prototype.mathchardef['bigintop']    = [1,3,0x5A];
+jsMath.Parser.prototype.mathchardef['bigointop']   = [1,3,0x49];
+jsMath.Parser.prototype.mathchardef['bigcoprodop'] = [1,3,0x61];
+jsMath.Parser.prototype.mathchardef['bigprodop']   = [1,3,0x59];
+jsMath.Parser.prototype.mathchardef['bigsumop']    = [1,3,0x58];
+
+/*
+ * Unlink the small versions so they don't enlarge in display mode
+ */
+jsMath.TeX['cmex10'][0x48].n = null;
+jsMath.TeX['cmex10'][0x50].n = null;
+jsMath.TeX['cmex10'][0x51].n = null;
+jsMath.TeX['cmex10'][0x52].n = null;
+jsMath.TeX['cmex10'][0x60].n = null;
+
+
+/*
+ *  Some other missing items
+ */
+jsMath.Macro('/','{}'); // insert an empty box \/
+jsMath.Macro('raisebox','\\raise #1px ',1); // convert to \raise
+jsMath.Macro('hfill','\\quad ',1); // punt
+jsMath.Macro('fbox','\\oldfbox{$#1$}',1); // do fbox in math mode
+
+/*
+ *  These get new JavaScript routines
+ */
+jsMath.Parser.prototype.macros['unitlength'] = 'unitlength';
+jsMath.Parser.prototype.macros['hspace']     = 'hspace';
+jsMath.Parser.prototype.macros['fs']         = 'fs';
+jsMath.Parser.prototype.macros['oldfbox']    = 'FBox';
+
+/*
+ *  Add some JavaScript functions to the parser
+ */
+jsMath.Package(jsMath.Parser,{
+  
+  /*
+   *  Implement \left x ... \right x
+   */
+  HandleLR: function (name,data) {
+    var arg = this.GetUpto(name,name); if (this.error) return;
+    this.string = '\\left'+data[0]+arg+'\\right'+data[1];
+    this.i = 0;
+  },
+
+  /*
+   *  Hold the unit length in mlist.data
+   */
+  unitlength: function (name) {
+    var n = this.GetArgument(this.cmd+name); if (this.error) return;
+    if (!n.match(/^-?(\d+(\.\d*)?|\.\d+)$/)) {
+      this.Error("Argument for "+this.cmd+name+" must be a number");
+      return;
+    }
+    this.mlist.data['unitlength'] = n;
+  },
+
+  /*
+   *  Get the length (converted to ems) and multiply by the unit length
+   */
+  hspace: function (name) {
+    var w = this.GetArgument(this.cmd+name); if (this.error) return;
+    if (!w.match(/^-?(\d+(\.\d*)?|\.\d+)$/)) {
+      this.Error("Argument for "+this.cmd+name+" must be a number");
+      return;
+    }
+    w /= jsMath.em
+    if (this.mlist.data['unitlength']) {w *= this.mlist.data['unitlength']}
+    this.mlist.Add(jsMath.mItem.Space(w));
+  },
+  
+  /*
+   *  Implement \fs{...} for font-size changing
+   */
+  fs: function (name) {
+    var n = this.GetArgument(this.cmd+name); if (this.error) return;
+    if (!n.match(/^[-+]?\d+$/)) {
+      this.Error("Argument for "+this.cmd+name+" must be an integer");
+      return;
+    }
+    if (n.match(/[-+]/)) {n = n - 0; n += this.mlist.data.size}
+    this.mlist.data.size = n = Math.max(0,Math.min(9,n));
+    this.mlist.Add(new jsMath.mItem('size',{size: n}));
+  },
+
+  /*
+   *  Repalce the Array function by one that accepts an optional
+   *  parameter for the column types, and that handle's mimeTeX's
+   *  "preamble" format.
+   */
+  Array: function (name,delim) {
+    var columns = delim[2]; var cspacing = delim[3];
+    if (!columns && this.GetNext() == '{') {
+      columns = this.GetArgument(this.cmd+'begin{'+name+'}');
+      if (this.error) return;
+    } else {
+      columns = '';
+    }
+    columns = columns.replace(/[^clr]/g,'');
+    columns = columns.split('');
+    var data = this.mlist.data; var style = delim[5] || 'T';
+    var arg = this.GetEnd(name); if (this.error) return;
+    if (arg.match(/\$/)) {arg = arg.replace(/^([^$]*)\$/,''); columns = RegExp.$1}
+    var parse = new jsMath.Parser(arg+this.cmd+'\\',null,data.size,style);
+    parse.matrix = name; parse.row = []; parse.table = []; parse.rspacing = [];
+    parse.Parse(); if (parse.error) {this.Error(parse); return}
+    parse.HandleRow(name,1);  // be sure the last row is recorded
+    var box = jsMath.Box.Layout(data.size,parse.table,columns,cspacing,parse.rspacing,delim[4]||null);
+    // Add parentheses, if needed
+    if (delim[0] && delim[1]) {
+      var left  = jsMath.Box.Delimiter(box.h+box.d-jsMath.hd/4,this.delimiter[delim[0]],'T');
+      var right = jsMath.Box.Delimiter(box.h+box.d-jsMath.hd/4,this.delimiter[delim[1]],'T');
+      box = jsMath.Box.SetList([left,box,right],data.style,data.size);
+    }
+    this.mlist.Add(jsMath.mItem.Atom((delim[0]? 'inner': 'ord'),box));
+  },
+
+  /*
+   *  Similarly for Matrix (used by \matrix and \array)
+   */
+  Matrix: function (name,delim) {
+    var data = this.mlist.data;
+    var arg = this.GetArgument(this.cmd+name); if (this.error) return;
+    if (arg.match(/\$/)) {arg = arg.replace(/^([^$]*)\$/,''); delim[2] = RegExp.$1}
+    var parse = new jsMath.Parser(arg+this.cmd+'\\',null,data.size,delim[5] || 'T');
+    parse.matrix = name; parse.row = []; parse.table = []; parse.rspacing = [];
+    parse.Parse(); if (parse.error) {this.Error(parse); return}
+    parse.HandleRow(name,1);  // be sure the last row is recorded
+    var box = jsMath.Box.Layout(data.size,parse.table,delim[2]||null,delim[3]||null,parse.rspacing,delim[4]||null);
+    // Add parentheses, if needed
+    if (delim[0] && delim[1]) {
+      var left  = jsMath.Box.Delimiter(box.h+box.d-jsMath.hd/4,this.delimiter[delim[0]],'T');
+      var right = jsMath.Box.Delimiter(box.h+box.d-jsMath.hd/4,this.delimiter[delim[1]],'T');
+      box = jsMath.Box.SetList([left,box,right],data.style,data.size);
+    }
+    this.mlist.Add(jsMath.mItem.Atom((delim[0]? 'inner': 'ord'),box));
+  }
+});
diff --git a/htdocs/jsMath/plugins/noCache.js b/htdocs/jsMath/plugins/noCache.js
new file mode 100644
index 0000000000..670257c8fe
--- /dev/null
+++ b/htdocs/jsMath/plugins/noCache.js
@@ -0,0 +1,71 @@
+/*
+ *  noCache.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file disables the equation cache that jsMath uses to
+ *  store the typeset versions of TeX code so that common expressions
+ *  won't need to be re-typeset.
+ *
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 2006 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+jsMath.Add(jsMath,{
+
+  /*
+   *  Get the width and height (in ems) of an HTML string
+   */
+  EmBoxFor: function (s) {
+    var bbox = this.BBoxFor(s);
+    return {w: bbox.w/this.em, h: bbox.h/this.em};
+  },
+
+  /*
+   *  For browsers that don't handle sizes of italics properly (MSIE)
+   */
+  EmBoxForItalics: function (s) {
+    var bbox = this.BBoxFor(s);
+    if (s.match(/<i>|class=\"(icm|italic|igreek|iaccent)/i)) {
+      bbox.w = this.BBoxFor(s+jsMath.Browser.italicString).w
+                - jsMath.Browser.italicCorrection;
+    }
+    return {w: bbox.w/this.em, h: bbox.h/this.em};
+  }
+  
+});
+
+jsMath.Add(jsMath.Translate,{
+
+  /*
+   *  Typeset a string in \textstyle and return the HTML for it
+   */
+  TextMode: function (s) {
+    var parse = jsMath.Parse(s,null,null,'T');
+    parse.Atomize();
+    return parse.Typeset();
+  },
+
+  /*
+   *  Typeset a string in \displaystyle and return the HTML for it
+   */
+  DisplayMode: function (s) {
+    var parse = jsMath.Parse(s,null,null,'D');
+    parse.Atomize();
+    return parse.Typeset();
+  }
+
+});
diff --git a/htdocs/jsMath/plugins/noGlobal.js b/htdocs/jsMath/plugins/noGlobal.js
new file mode 100644
index 0000000000..a5d64bec41
--- /dev/null
+++ b/htdocs/jsMath/plugins/noGlobal.js
@@ -0,0 +1,33 @@
+/*
+ *  noGlobal.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file disables the Go Global button.  It should be loaded
+ *  BEFORE jsMath.js.
+ *
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 2006 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+if (!window.jsMath) {window.jsMath = {}}
+if (!jsMath.Controls) {jsMath.Controls = {}}
+if (!jsMath.Controls.cookie) {jsMath.Controls.cookie = {}}
+
+jsMath.noGoGlobal = 1;
+jsMath.noChangeGlobal = 1;
+jsMath.noShowGlobal = 1;
+jsMath.Controls.cookie.global = 'never';
diff --git a/htdocs/jsMath/plugins/noImageFonts.js b/htdocs/jsMath/plugins/noImageFonts.js
new file mode 100644
index 0000000000..7caf4c2e5c
--- /dev/null
+++ b/htdocs/jsMath/plugins/noImageFonts.js
@@ -0,0 +1,41 @@
+/*
+ *  noImageFonts.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file indicates that no image fonts are available.
+ *  It should be loaded BEFORE jsMath.js is loaded.
+ *
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 2004-2009 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+if (!window.jsMath) {window.jsMath = {}}
+jsMath.noImgFonts = 1;
+
+if (!jsMath.Font) {jsMath.Font = {}}
+if (!jsMath.Font.message) {
+  jsMath.Font.message =
+    '<b>No jsMath TeX fonts found</b> -- using unicode fonts instead.<br/>\n'
+      + 'This may be slow and might not print well.<br/>\n'
+      + 'Use the jsMath control panel to get additional information.';
+}
+if (!jsMath.Font.extra_message) {
+  jsMath.Font.extra_message =
+    'Extra TeX fonts not found: <b><span id="jsMath_ExtraFonts"></span></b><br/>'
+      + 'Using unicode fonts instead.  This may be slow and might not print well.<br/>\n'
+      + 'Use the jsMath control panel to get additional information.';
+}
\ No newline at end of file
diff --git a/htdocs/jsMath/plugins/smallFonts.js b/htdocs/jsMath/plugins/smallFonts.js
new file mode 100644
index 0000000000..fd40fec7bd
--- /dev/null
+++ b/htdocs/jsMath/plugins/smallFonts.js
@@ -0,0 +1,70 @@
+/*
+ *  smallFonts.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file changes the sizes of fonts used in subscripts so that they
+ *  are larger.  This can be helpful if jsMath is used on a page with a
+ *  small font size, where the subscripts may tend to disappear.
+ *  It should be loaded BEFORE jsMath.js.
+ *
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 2006 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+if (!window.jsMath) {window.jsMath = {}}
+if (!jsMath.styles) {jsMath.styles = {}}
+if (!jsMath.Img) {jsMath.Img = {}}
+if (!jsMath.Box) {jsMath.Box = {}}
+if (!jsMath.Typeset) {jsMath.Typeset = {}}
+
+/*
+ *  Replace the smaller font sizes
+ */
+jsMath.sizes = [70, 77, 85, 92, 100, 120, 144, 173, 207, 249];
+jsMath.Img.fonts = [70, 70, 85, 85, 100, 120, 144, 173, 207, 249, 298, 358, 430];
+
+jsMath.styles['.typeset .size0'] = {'font-size': '70%'};
+jsMath.styles['.typeset .size1'] = {'font-size': '77%'};
+jsMath.styles['.typeset .size2'] = {'font-size': '85%'};
+jsMath.styles['.typeset .size3'] = {'font-size': '92%'};
+
+/*
+ *  Fix multiplication factors in these routines
+ */
+jsMath.Typeset.StyleValue = function (style,v) {
+  if (style == "S" || style == "S'")   {return .85*v}
+  if (style == "SS" || style == "SS'") {return .70*v}
+  return v;
+};
+
+jsMath.Box.DelimBestFit = function (H,c,font,style) {
+  if (c == 0 && font == 0) return null;
+  var C; var h; font = jsMath.TeX.fam[font];
+  var isSS = (style.charAt(1) == 'S');
+  var isS  = (style.charAt(0) == 'S');
+  while (c != null) {
+    C = jsMath.TeX[font][c];
+    if (C.h == null) {C.h = jsMath.Box.defaultH}; if (C.d == null) {C.d = 0}
+    h = C.h+C.d;
+    if (C.delim) {return [c,font,'',H]}
+    if (isSS && .70*h >= H) {return [c,font,'SS',.7*h]}
+    if (isS  && .85*h >= H) {return [c,font,'S',.85*h]}
+    if (h >= H || C.n == null) {return [c,font,'T',h]}
+    c = C.n;
+  }
+  return null;
+};
diff --git a/htdocs/jsMath/plugins/spriteImageFonts.js b/htdocs/jsMath/plugins/spriteImageFonts.js
new file mode 100644
index 0000000000..8d27aec3c0
--- /dev/null
+++ b/htdocs/jsMath/plugins/spriteImageFonts.js
@@ -0,0 +1,372 @@
+/*
+ *  plugins/spriteImageFonts.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file makes jsMath use single files for the image fonts
+ *  rather than individual images for each character.
+ *
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 2006 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+if (!window.jsMath) {window.jsMath = {}}
+
+jsMath.spriteImageFonts = {version: "1.1"};
+
+if (!jsMath.styles) {jsMath.styles = []}
+
+jsMath.styles['.typeset .img'] = {
+   position: 'relative',
+   display: 'inline-block',
+   overflow: 'hidden',
+  'background-repeat': 'no-repeat'
+};
+jsMath.styles['.typeset .img .xy'] = {
+  position: 'relative',
+  left: '0px', top: '0px'
+};
+
+// for Mozilla
+jsMath.styles['.typeset .mimg'] = {position: 'relative'};
+jsMath.styles['.typeset .mimg .size'] = {display: '-moz-inline-box'};
+jsMath.styles['.typeset .mimg .wh'] = {
+  position: 'absolute',
+  left: '0px', top: '0px',
+  overflow: 'hidden'
+};
+jsMath.styles['.typeset .mimg .xy'] = {
+  position: 'relative',
+  left: '0px', top: '0px'
+};
+// for MSIE
+jsMath.styles['.typeset .mimg .h'] = {
+  position: 'relative',
+  display: 'inline-block',
+  width: '0px'
+};
+
+/*
+ *  Replace the TeXIMG function with one that uses the sprite fonts
+ */
+if (!jsMath.Box) {jsMath.Box = {}}
+  jsMath.Box.TeXIMG = function (font,C,size) {
+    var c = jsMath.TeX[font][C];
+    if (c.img.reload && jsMath.Img[c.img.reload][font].loaded == 1)
+      {delete c.img.reload; c.img.size = null}
+    if (c.img.size != null && c.img.size == size &&
+        c.img.best != null && c.img.best == jsMath.Img.best) return;
+    var mustScale = (jsMath.Img.scale != 1);
+    var id = jsMath.Img.best + size - 4;
+    if (id < 0) {id = 0; mustScale = 1} else
+    if (id >= jsMath.Img.fonts.length) {id = jsMath.Img.fonts.length-1; mustScale = 1}
+    var imgFont = jsMath.Img[jsMath.Img.fonts[id]][font];
+    if (!imgFont.loaded && jsMath.Browser.waitForImages) {
+      // store information so several fonts can be loaded at once
+      jsMath.Img.mustLoad[jsMath.Img.mustLoad.length] = [font,jsMath.Img.fonts[id]];
+      imgFont.loaded = -1;
+    }
+    var img = imgFont[C];
+    var scale = 1/jsMath.Img.w[jsMath.Img.fonts[id]];
+    if (id != jsMath.Img.best + size - 4) {
+      if (c.w != null) {scale = c.w/img[0]} else {
+        scale *= jsMath.Img.fonts[size]/jsMath.Img.fonts[4]
+              *  jsMath.Img.fonts[jsMath.Img.best]/jsMath.Img.fonts[id];
+      }
+    }
+
+    // get the metrics for the character glyph
+    var bScale = jsMath.Browser.imgScale;
+    if (img[3] == null) {img[3] = 0}
+    var w = (img[0]-img[3])*scale; var h = img[1]*scale; var d = -img[2]*scale;
+    var x = img[3]-imgFont.x[C%16]; var y = img[1]-img[2]-imgFont.y[Math.floor(C/16)];
+    var wh; var xy; var v;
+    var ladjust = ""; var resize = ""; var vadjust; var wadjust;
+
+    if ((mustScale || jsMath.Controls.cookie.scaleImg) && !jsMath.Browser.operaImageFonts) {
+      w += 2/jsMath.em; h += 2/jsMath.em; d -= 1/jsMath.em; y += 1; x += 1; // try to adjust for rounding errors
+      resize = "width:"+jsMath.HTML.Em(imgFont.wh[0]*scale*bScale)+";";
+      wh = "width:"+jsMath.HTML.Em(w*bScale)+";height:"+jsMath.HTML.Em(h*bScale)+";";
+      xy = "left:"+jsMath.HTML.Em(x*scale*bScale)+";top:"+jsMath.HTML.Em(y*scale*bScale)+";";
+      vadjust = "vertical-align:"+jsMath.HTML.Em(d*bScale)+";";
+      v = jsMath.HTML.Em(h+d);
+      if (img[3]) {ladjust = "margin-left:"+jsMath.HTML.Em(-img[3]*scale*bScale)+";"}
+    } else {
+      if (jsMath.Browser.msieAlphaBug && jsMath.Controls.cookie.alpha) {
+        resize = "height:"+(imgFont.wh[1]*jsMath.Browser.imgScale)+"px;"
+               + "width:"+(imgFont.wh[0]*jsMath.Browser.imgScale)+"px;";
+      }
+      wh = "width:"+img[0]+"px; height:"+img[1]+"px;";
+      xy = "left:"+x+"px; top:"+y+"px;";
+      vadjust = "vertical-align:"+(-img[2])+"px;"; v = (img[1]-img[2])+"px";
+      if (img[3]) {ladjust = "margin-left:"+(-img[3])+"px;"}
+    }
+
+    wadjust = (c.w == null || Math.abs(c.w-w) < .01)? "" : " margin-right:"+jsMath.HTML.Em(c.w-w)+';';
+    if (img[2] == 0 || jsMath.Browser.valignBug) {vadjust = ""}
+
+    // get the image
+    var URL = jsMath.Img.URL(font,jsMath.Img.fonts[id],C); var IMG;
+    if (jsMath.Browser.msieAlphaBug && jsMath.Controls.cookie.alpha) {
+      IMG = '<span class="xy" style="'+xy+'">'
+          +   '<img src="'+jsMath.blank+'" style="' + resize
+          +      'filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='
+          +      "'" + URL + "', sizingMethod='scale'" + ');" />'
+          + '</span>';
+    } else {
+      IMG = '<img src="'+URL+'" class="xy" style="'+xy+resize+'" />';
+    }
+    if (imgFont.loaded == -1) {IMG = ""; c.img.reload = jsMath.Img.fonts[id]}
+
+    // get the HTML for cropping the image
+    c.c = this.IMG(IMG,wh,vadjust,wadjust,ladjust,v,x,y,URL);
+    c.tclass = "normal";
+    c.img.bh = h+d; c.img.bd = -d;
+    c.img.size = size; c.img.best = jsMath.Img.best;
+  };
+
+  /*
+   *  Default uses inline-box containing an image
+   */
+  jsMath.Box.IMG = function (IMG,wh,vadjust,wadjust,ladjust,v,x,y,URL) {
+    return '<span class="img" style="'+wh+vadjust+wadjust+ladjust+'">'
+             + IMG + '</span>' + jsMath.Browser.msieImgFontBBoxFix;
+  };
+
+  /*
+   *  Opera bug in inline-block alignment forces use of background image
+   */
+  jsMath.Box.IMG_opera = function (IMG,wh,vadjust,wadjust,ladjust,v,x,y,URL) {
+    var html = '<span class="img" style="background-image: url('+URL+');'
+             +    wh + vadjust + 'background-position: '+x+'px '+y+'px"></span>';
+    if (wadjust || ladjust)
+      {html = '<span style="'+wadjust+ladjust+'">' + html + '</span>'}
+    return html;
+  };
+
+  /*
+   *  Mozilla's -moz-inline-box has top aligned with baseline, so adjust
+   */
+  jsMath.Box.IMG_mozilla = function (IMG,wh,vadjust,wadjust,ladjust,v,x,y,URL) {
+    vadjust = "vertical-align:"+v+";";
+    var html = '<span class="mimg" style="'+vadjust+'">'
+             +   '<span class="size" style="'+wh+'"></span>'
+             +   '<span class="wh" style="'+wh+'">' + IMG + '</span>'
+             + '</span>';
+    if (wadjust || ladjust)
+      {html = '<span style="'+wadjust+ladjust+'">' + html + '</span>'}
+    return html;
+  };
+
+  /*
+   *  MSIE screws up vadjust on inline-box elements, so use absolute
+   *  positioning and an extra span to set the width and height
+   */
+  jsMath.Box.IMG_msie = function (IMG,wh,vadjust,wadjust,ladjust,v,x,y,URL) {
+    var html = '<span class="mimg">'
+             +   '<span class="h" style="height:'+v+'">'
+             +     '<span class="wh" style="'+wh+'">' + IMG + '</span>'
+             +   '</span>'
+             +   '<span class="img" style="'+wh+vadjust+'"></span>'
+             + '</span>';
+    if (wadjust || ladjust) {
+      html = jsMath.Browser.msieSpaceFix
+           +    '<span style="'+wadjust+ladjust+'">' + html + '</span>';
+    }
+    return html;
+  };
+
+if (!jsMath.Img) {jsMath.Img = {}}
+
+  /*
+   *  Called by the extra-font definition files to add an image font
+   *  into the mix (save offset data and image size)
+   */
+  jsMath.Img.AddFont = function (size,def) {
+    if (!jsMath.Img[size]) {jsMath.Img[size] = {}};
+    for (var font in def) {
+      def[font].x = def[font][128]; def[font].y = def[font][129];
+      def[font].wh = def[font][130];
+      delete def[font][128]; delete def[font][129]; delete def[font][130];
+    }
+    jsMath.Add(jsMath.Img[size],def);
+  };
+
+  /*
+   *  Get URL to directory for given font and size, based on the
+   *  user's alpha/plain setting
+   */
+  jsMath.Img.URL = function (name,size) {
+    if (size == null) {return this.root+name+'/font.js'}
+    var type = (jsMath.Controls.cookie.alpha) ? '/alpha/': '/plain/';
+    return this.root+name+type+size+'.png';
+  };
+
+  /*
+   *  Laod the data for an image font
+   */
+  jsMath.Img.LoadFont = function (name) {
+    if (jsMath.browser == 'OmniWeb' && !jsMath.Browser.hasInlineBlock) {
+      jsMath.noImgFonts = 1;
+      jsMath.Font.Check();
+      return;
+    }
+    if (!this.loaded) this.Init();
+    jsMath.Setup.Script(this.URL(name));
+  };
+  
+  /*
+   *  Setup for print mode
+   */
+  jsMath.Img.Init = function () {
+    if ((jsMath.Controls.cookie.print || jsMath.Controls.cookie.stayhires) && !jsMath.Browser.operaImgFonts) {
+      jsMath.Controls.cookie.print = jsMath.Controls.cookie.stayhires;
+      this.factor *= 3;
+      if (!jsMath.Controls.isLocalCookie || !jsMath.Global.isLocal) {jsMath.Controls.SetCookie(0)}
+      if (jsMath.Browser.alphaPrintBug) {jsMath.Controls.cookie.alpha = 0}
+    }
+    this.loaded = 1;
+    jsMath.Img.root = jsMath.root + "fonts-sprite/";
+    jsMath.version += "-sp" + jsMath.spriteImageFonts.version;
+  };
+
+
+if (!jsMath.Browser) {jsMath.Browser = {}}
+  /*
+   * Hook into initialization routine
+   */
+  jsMath.Browser.Init = function () {
+    jsMath.browser = 'unknown';
+    this.TestInlineBlock();
+    this.TestSpanHeight();
+    this.TestRenameOK();
+    this.TestStyleChange();
+
+    this.MSIE();
+    this.Mozilla();
+    this.Opera();
+    this.OmniWeb();
+    this.Safari();
+    this.Konqueror();
+    
+    this.ImgFontInit();
+    
+    //
+    // Change some routines depending on the browser
+    // 
+    if (this.allowAbsoluteDelim) {
+      jsMath.Box.DelimExtend = jsMath.Box.DelimExtendAbsolute;
+      jsMath.Box.Layout = jsMath.Box.LayoutAbsolute;
+    } else {
+      jsMath.Box.DelimExtend = jsMath.Box.DelimExtendRelative;
+      jsMath.Box.Layout = jsMath.Box.LayoutRelative;
+    }
+    
+    if (this.separateSkips) {
+      jsMath.HTML.Place = jsMath.HTML.PlaceSeparateSkips;
+      jsMath.Typeset.prototype.Place = jsMath.Typeset.prototype.PlaceSeparateSkips;
+    }
+  },
+
+  /*
+   *  These should be part of the regular browser
+   *  test functions
+   */
+  jsMath.Browser.ImgFontInit = function () {
+    this.msieImgFontBBoxFix = '';
+    if (jsMath.browser == 'Mozilla') {
+      if (!jsMath.Browser.VersionAtLeast("3.0")) {jsMath.Box.IMG = jsMath.Box.IMG_mozilla}
+    } else if (jsMath.browser == 'Opera') {
+      if (!jsMath.Browser.VersionAtLeast("9.50")) {
+        this.operaImageFonts = 1;
+        jsMath.Box.IMG = jsMath.Box.IMG_opera;
+      }
+    } else if (jsMath.browser == 'MSIE') {
+      if (jsMath.platform == 'mac') {
+        this.msieImgFontBBoxFix = '<span style="display:none">x</span>'
+      } else {
+        jsMath.Parser.prototype.oldTypeset = jsMath.Parser.prototype.Typeset;
+        jsMath.Parser.prototype.Typeset = jsMath.Parser.prototype.msieTypeset;
+        jsMath.Img.mustLoad = [];
+        this.msieImageFonts = 1;
+        jsMath.Controls.defaults.alpha = 0;
+        if (!jsMath.Controls.userSet.alpha) {jsMath.Controls.cookie.alpha = 0}
+        jsMath.Box.IMG = jsMath.Box.IMG_msie;
+      }
+    }
+  };
+
+if (!jsMath.Parser) {jsMath.Parser = {}}
+if (!jsMath.Parser.prototype) {jsMath.Parser.prototype = {}}
+  /*
+   *  Handle loading of image files needed for this equation
+   *  (avoids MSIE bug where it will request the image more
+   *  than once if it is used more than once before it is
+   *  loaded.)
+   */
+  jsMath.Parser.prototype.msieTypeset = function () {
+    var HTML = this.oldTypeset();
+    if (jsMath.Img.mustLoad.length > 0) {
+      for (var i = 0; i < jsMath.Img.mustLoad.length; i++) {
+        var IMG = jsMath.Img.URL(jsMath.Img.mustLoad[i][0],jsMath.Img.mustLoad[i][1]);
+        jsMath.Script.WaitForImage(IMG);
+        jsMath.Img[jsMath.Img.mustLoad[i][1]][jsMath.Img.mustLoad[i][0]].loaded = 1;
+      }
+      jsMath.Img.mustLoad = [];
+      jsMath.Translate.restart = 1;
+      throw "restart";
+    }
+    return HTML;
+  };
+
+/*
+ *  Override the control panel calls in order to
+ *  disable scaling in Opera.
+ */
+if (!jsMath.Controls) {jsMath.Controls = {}}
+  /*
+   *  Add Opera calls to loading of control panel
+   */
+  jsMath.Controls.Panel = function () {
+    jsMath.Translate.Cancel();
+    if (this.loaded) {
+      this.Main();
+    } else {
+      jsMath.Script.delayedLoad(jsMath.root+"jsMath-controls.html");
+      jsMath.Script.Push(this,"OperaInit");
+    }
+  };
+  
+  /*
+   *  Disable hi-res fonts and image scaling in Opera
+   */
+  jsMath.Controls.OperaMain = function (init) {
+    if (!init) {this.OldMain()}
+    jsMath.Element("_resolution").disabled = true;
+  };
+  
+  jsMath.Controls.OperaOptions = function () {
+    this.OldOptions();
+    jsMath.Element("_scaleImg").disabled = true;
+    jsMath.Element("_scaleImgText").className = "disabled";
+  };
+  
+  jsMath.Controls.OperaInit = function () {
+    if (!jsMath.Browser.operaImageFonts) return;
+    this.OldMain = this.Main; this.Main = this.OperaMain;
+    this.OldOptions = this.Options; this.Options = this.OperaOptions;
+    this.OperaMain(1);
+  };
diff --git a/htdocs/jsMath/plugins/tex2math.js b/htdocs/jsMath/plugins/tex2math.js
new file mode 100644
index 0000000000..8760e275c8
--- /dev/null
+++ b/htdocs/jsMath/plugins/tex2math.js
@@ -0,0 +1,409 @@
+/*
+ *  tex2math.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file is a plugin that searches text within a web page
+ *  for \(...\), \[...\], $...$ and $$...$$ and converts them to
+ *  the appropriate <SPAN CLASS="math">...</SPAN> or
+ *  <DIV CLASS="math">...</DIV> tags.
+ *
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 2004-2007 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+if (!jsMath.tex2math) {jsMath.tex2math = {}}  // make sure jsMath.tex2math is defined
+if (!jsMath.tex2math.loaded) {                // only load it once
+
+if (!jsMath.Controls) {jsMath.Controls = {}}
+if (!jsMath.Controls.cookie) {jsMath.Controls.cookie = {}}
+
+jsMath.Add(jsMath.tex2math,{
+  
+  loaded: 1,
+  window: window,
+
+  /*
+   *  Call the main conversion routine with appropriate flags
+   */
+
+  ConvertTeX: function (element) {
+    this.Convert(element,{
+      processSingleDollars: 1, processDoubleDollars: 1,
+      processSlashParens: 1, processSlashBrackets: 1,
+      processLaTeXenvironments: 0,
+      custom: 0, fixEscapedDollars: 1
+    });
+  },
+  
+  ConvertTeX2: function (element) {
+    this.Convert(element,{
+      processSingleDollars: 0, processDoubleDollars: 1,
+      processSlashParens: 1, processSlashBrackets: 1,
+      processLaTeXenvironments: 0,
+      custom: 0, fixEscapedDollars: 0
+    });
+  },
+  
+  ConvertLaTeX: function (element) {
+    this.Convert(element,{
+      processSingleDollars: 0, processDoubleDollars: 0,
+      processSlashParens: 1, processSlashBrackets: 1,
+      processLaTeXenvironments: 1,
+      custom: 0, fixEscapedDollars: 0
+    });
+  },
+  
+  ConvertCustom: function (element) {
+    this.Convert(element,{custom: 1, fixEscapedDollars: 0});
+  },
+  
+  /*******************************************************************/
+
+  /*
+   *  Define a custom search by indicating the
+   *  strings to use for starting and ending
+   *  in-line and display mathematics
+   */
+  CustomSearch: function (iOpen,iClose,dOpen,dClose) {
+    this.inLineOpen = iOpen; this.inLineClose = iClose;
+    this.displayOpen = dOpen; this.displayClose = dClose;
+    this.createPattern('customPattern',new RegExp(
+      '('+this.patternQuote(dOpen)+'|'
+         +this.patternQuote(iOpen)+'|'
+         +this.patternQuote(dClose)+'|'
+         +this.patternQuote(iClose)+'|\\\\.)','g'
+    ));
+  },
+  
+  patternQuote: function (s) {
+    s = s.replace(/([\^$(){}+*?\-|\[\]\:\\])/g,'\\$1');
+    return s;
+  },
+
+  /*
+   *  MSIE on the Mac doesn't handle lastIndex correctly, so
+   *  override it and implement it correctly.
+   */
+  createPattern: function (name,pattern) {
+    jsMath.tex2math[name] = pattern;
+    if (this.fixPatterns) {
+      pattern.oldExec = pattern.exec;
+      pattern.exec = this.msiePatternExec;
+    }
+  },
+  msiePatternExec: function (string) {
+    if (this.lastIndex == null) (this.lastIndex = 0);
+    var match = this.oldExec(string.substr(this.lastIndex));
+    if (match) {this.lastIndex += match.lastIndex}
+          else {this.lastIndex = null}
+    return match;
+  },
+
+  /*******************************************************************/
+
+  /*
+   *  Set up for the correct type of search, and recursively
+   *  convert the mathematics.  Disable tex2math if the cookie
+   *  isn't set, or of there is an element with ID of 'tex2math_off'.
+   */
+  Convert: function (element,flags) {
+    this.Init();
+    if (!element) {element = jsMath.document.body}
+    if (typeof(element) == 'string') {element = jsMath.document.getElementById(element)}
+    if (jsMath.Controls.cookie.tex2math && 
+        (!jsMath.tex2math.allowDisableTag || !jsMath.document.getElementById('tex2math_off'))) {
+      this.custom = 0; for (var i in flags) {this[i] = flags[i]}
+      if (this.custom) {
+        this.pattern = this.customPattern;
+        this.ProcessMatch = this.customProcessMatch;
+      } else {
+        this.pattern = this.stdPattern;
+        this.ProcessMatch = this.stdProcessMatch;
+      }
+      if (this.processDoubleDollars || this.processSingleDollars ||
+          this.processSlashParens   || this.processSlashBrackets ||
+          this.processLaTeXenvironments || this.custom) this.ScanElement(element);
+    }
+  },
+
+  /*
+   *  Recursively look through a document for text nodes that could
+   *  contain mathematics.
+   */
+  ScanElement: function (element,ignore) {
+    if (!element) {element = jsMath.document.body}
+    if (typeof(element) == 'string') {element = jsMath.document.getElementById(element)}
+    while (element) {
+      if (element.nodeName == '#text') {
+        if (!ignore) {element = this.ScanText(element)}
+      } else {
+        if (element.className == null) {element.className = ''}
+        if (element.firstChild && element.className != 'math') {
+          var off = ignore || element.className.match(/(^| )tex2math_ignore( |$)/) ||
+             (element.tagName && element.tagName.match(/^(script|noscript|style|textarea|pre|code)$/i));
+          off = off && !element.className.match(/(^| )tex2math_process( |$)/);
+          this.ScanElement(element.firstChild,off);
+        }
+      }
+      if (element) {element = element.nextSibling}
+    }
+  },
+  
+  /*
+   *  Looks through a text element for math delimiters and
+   *  process them.  If <BR> tags are found in the middle, they
+   *  are ignored (this is for BBS systems that have editors
+   *  that insert these automatically).
+   */
+  ScanText: function (element) {
+    if (element.nodeValue.replace(/\s+/,'') == '') {return element}
+    var match; var prev; this.search = {};
+    while (element) {
+      this.pattern.lastIndex = 0;
+      while (element && element.nodeName == '#text' &&
+            (match = this.pattern.exec(element.nodeValue))) {
+        this.pattern.match = match;
+        element = this.ProcessMatch(match[0],match.index,element);
+      }
+      if (this.search.matched) {element = this.EncloseMath(element)}
+      if (!element) {return null}
+      prev = element; element = element.nextSibling;
+      while (element && (element.nodeName.toLowerCase() == 'br' ||
+                         element.nodeName.toLowerCase() == "#comment"))
+        {prev = element; element = element.nextSibling}
+      if (!element || element.nodeName != '#text') {return prev}
+    }
+    return element;
+  },
+  
+  /*
+   *  If a matching end tag has been found, process the mathematics.
+   *  Otherwise, update the search data for the given delimiter,
+   *  or ignore it, as the item dictates.
+   */
+  stdProcessMatch: function (match,index,element) {
+    if (match == this.search.end) {
+      this.search.close = element;
+      this.search.cpos = this.pattern.lastIndex;
+      this.search.clength = (match.substr(0,4) == '\\end' ? 0 : match.length);
+      element = this.EncloseMath(element);
+    } else {
+      switch (match) {
+        case '\\(':
+          if ((this.search.end == null ||
+             (this.search.end != '$' && this.search.end != '$$')) &&
+              this.processSlashParens) {
+            this.ScanMark('span',element,'\\)');
+          }
+          break;
+
+        case '\\[':
+          if ((this.search.end == null ||
+             (this.search.end != '$' && this.search.end != '$$')) &&
+               this.processSlashBrackets) {
+            this.ScanMark('div',element,'\\]');
+          }
+          break;
+
+        case '$$':
+          if (this.processDoubleDollars) {
+            var type = (this.doubleDollarsAreInLine? 'span': 'div');
+            this.ScanMark(type,element,'$$');
+          }
+          break;
+
+        case '$':
+          if (this.search.end == null && this.processSingleDollars) {
+            this.ScanMark('span',element,'$');
+          }
+          break;
+
+        case '\\$':
+          if (this.search.end == null && this.fixEscapedDollars) {
+            element.nodeValue = element.nodeValue.substr(0,index)
+                              + element.nodeValue.substr(index+1);
+            this.pattern.lastIndex--;
+          }
+          break;
+          
+        case '\\\\':
+          break;
+
+        default:
+          if (match.substr(0,6) == '\\begin' && this.search.end == null &&
+              this.processLaTeXenvironments) {
+            this.ScanMark('div',element,'\\end'+match.substr(6));
+            this.search.olength = 0;
+          }
+          break;
+      }
+    }
+    return element;
+  },
+
+  /*
+   *  If a matching end tag has been found, process the mathematics.
+   *  Otherwise, update the search data for the given delimiter,
+   *  or ignore it, as the item dictates.
+   */
+  customProcessMatch: function (match,index,element) {
+    if (match == this.search.end) {
+      this.search.close = element;
+      this.search.clength = match.length;
+      this.search.cpos = this.pattern.lastIndex;
+      if (match == this.inLineOpen || match == this.displayOpen) {
+        element = this.EncloseMath(element);
+      } else {this.search.matched = 1}
+    } else if (match == this.inLineOpen) {
+      if (this.search.matched) {element = this.EncloseMath(element)}
+      this.ScanMark('span',element,this.inLineClose);
+    } else if (match == this.displayOpen) {
+      if (this.search.matched) {element = this.EncloseMath(element)}
+      this.ScanMark('div',element,this.displayClose);
+    }
+    return element;
+  },
+
+  /*
+   *  Return a structure that records the starting location
+   *  for the math element, and the end delimiter we want to find.
+   */
+  ScanMark: function (type,element,end) {
+    var len = this.pattern.match[1].length;
+    this.search = {
+      type: type, end: end, open: element, olength: len,
+      pos: this.pattern.lastIndex - len
+    };
+  },
+  
+  /*******************************************************************/
+
+  /*
+   *  Surround the mathematics by an appropriate
+   *  SPAN or DIV element marked as CLASS="math".
+   */
+  EncloseMath: function (element) {
+    var search = this.search; search.end = null;
+    var close = search.close;
+    if (search.cpos == close.length) {close = close.nextSibling}
+       else {close = close.splitText(search.cpos)}
+    if (!close) {close = jsMath.document.createTextNode("")}
+    if (element == search.close) {element = close}
+    var math = search.open.splitText(search.pos);
+    while (math.nextSibling && math.nextSibling != close) {
+      if (math.nextSibling.nodeValue !== null) {
+        if (math.nextSibling.nodeName.toLowerCase() === "#comment") {
+          math.nodeValue += math.nextSibling.nodeValue.replace(/^\[CDATA\[(.*)\]\]$/,"$1");
+        } else {
+          math.nodeValue += math.nextSibling.nodeValue;
+        }
+      } else {
+        math.nodeValue += ' ';
+      }
+      math.parentNode.removeChild(math.nextSibling);
+    }
+    var TeX = math.nodeValue.substr(search.olength,
+      math.nodeValue.length-search.olength-search.clength);
+    math.parentNode.removeChild(math);
+    math = this.createMathTag(search.type,TeX);
+    //
+    //  This is where older, buggy browsers can fail under unpredicatble 
+    //  circumstances, so we trap errors and at least get to continue
+    //  with the rest of the math.  (## should add error message ##)
+    //
+    try {
+      if (close && close.parentNode) {
+        close.parentNode.insertBefore(math,close);
+      } else if (search.open.nextSibling) {
+        search.open.parentNode.insertBefore(math,search.open.nextSibling);
+      } else {
+        search.open.parentNode.appendChild(math);
+      }
+    } catch (err) {}
+    this.search = {}; this.pattern.lastIndex = 0;
+    return math;
+  },
+    
+  /*
+   *  Create an element for the mathematics
+   */
+  createMathTag: function (type,text) {
+    var tag = jsMath.document.createElement(type); tag.className = "math";
+    var math = jsMath.document.createTextNode(text);
+    tag.appendChild(math);
+    return tag;
+  },
+
+  //
+  //  MSIE won't let you insert a DIV within tags that are supposed to
+  //  contain in-line data (like <P> or <SPAN>), so we have to fake it
+  //  using SPAN tags that force the formatting to work like DIV.  We
+  //  use a separate SPAN that is the full width of the containing
+  //  item, and that has the margins and centering from the div.typeset
+  //  style.
+  //
+  MSIEcreateMathTag: function (type,text) {
+    var tag = jsMath.document.createElement("span");
+    tag.className = "math";
+    text = text.replace(/</g,'&lt;').replace(/>/g,'&gt;');
+    if (type == 'div') {
+      tag.className = "tex2math_div";
+      text = '<span class="math">\\displaystyle{'+text+'}</span>';
+    }
+    tag.innerHTML = text;
+    return tag;
+  },
+  
+  /*******************************************************************/
+
+  Init: function () {
+    if (!jsMath.browser && document.all && !window.opera) {
+      jsMath.browser = 'MSIE';
+      jsMath.platform = (navigator.platform.match(/Mac/) ? "mac" :
+                         navigator.platform.match(/Win/) ? "pc" : "unix");
+    }
+    if (this.inited || !jsMath.browser) return;
+    /*
+     *  MSIE can't handle the DIV's properly, so we need to do it by
+     *  hand.  Use an extra SPAN that uses CSS to act like a DIV.
+     */
+    if (jsMath.browser == 'MSIE' && jsMath.platform == 'pc')
+      {this.createMathTag = this.MSIEcreateMathTag}
+    this.inited = 1;
+  },
+  
+  /*
+   *  Test to see if we need to override the pattern exec() call
+   *  (for MSIE on the Mac).
+   */
+  TestPatterns: function () {
+    var pattern = /a/g;
+    var match = pattern.exec("xax");
+    this.fixPatterns = (pattern.lastIndex != 2 && match.lastIndex == 2);
+  }
+  
+});
+
+/*
+ *  Initialize
+ */
+if (jsMath.Controls.cookie.tex2math == null) {jsMath.Controls.cookie.tex2math = 1}
+if (jsMath.tex2math.allowDisableTag == null) {jsMath.tex2math.allowDisableTag = 1}
+jsMath.tex2math.TestPatterns();
+jsMath.tex2math.createPattern('stdPattern',/(\\[\(\)\[\]$\\]|\$\$|\$|\\(begin|end)\{[^}]+\})/g);
+
+}
diff --git a/htdocs/jsMath/test/index-images.html b/htdocs/jsMath/test/index-images.html
new file mode 100644
index 0000000000..eef7a437d6
--- /dev/null
+++ b/htdocs/jsMath/test/index-images.html
@@ -0,0 +1,111 @@
+<HTML>
+<HEAD>
+<TITLE>jsMath (Test):  jsMath Image Mode Test Page</TITLE>
+<!-- Copyright (c) 2007 by Davide P. Cervone.  All rights reserved. -->
+<!-- *Document-Format:  jsMath -->
+<!-- *Navigation-Data:-->
+</HEAD>
+<BODY>
+
+<!-- *Navigation-links -->
+<TABLE WIDTH="100%" BORDER="1" CELLPADDING="2" CELLSPACING="1">
+<TR><TD BGCOLOR="#B8B8B8"><TABLE WIDTH="100%" BORDER="0" CELLPADDING="0" CELLSPACING="0">
+<TR><TD WIDTH="20%" ALIGN="LEFT" NOWRAP></TD>
+<TD ALIGN="CENTER" WIDTH="60%"><!
+><NOBR><B><SMALL><A HREF="../welcome.html">jsMath</A> (Test)</SMALL></B></NOBR><!
+></TD>
+<TD ALIGN="RIGHT" WIDTH="20%" HEIGHT="25" NOWRAP><!
+></TD></TR></TABLE>
+</TD></TR></TABLE>
+<p>
+<!BR>
+
+<!-- *Begin-Document-Body -->
+
+<SCRIPT>
+  jsMath = {
+    Controls: {cookie: {scale: 133, font:'image', autofont:0}},
+    Parser: {prototype: {
+      macros: {warning: ["Macro","\\color{##00CC00}{\\rm jsMath\\ image\\ mode\\ appears\\ to\\ be\\  working!}",1]}
+    }}
+  }
+</SCRIPT>
+<SCRIPT SRC="../jsMath.js"></SCRIPT>
+<NOSCRIPT>
+<DIV STYLE="color:#CC0000; text-align:center">
+<B>Warning: <A HREF="http://www.math.union.edu/locate/jsMath">jsMath</A>
+requires JavaScript to process the mathematics on this page.<BR>
+If your browser supports JavaScript, be sure it is enabled.<B>
+</DIV>
+<HR>
+</NOSCRIPT>
+
+<BLOCKQUOTE>
+
+<H1>jsMath Image Mode Test Page</H1>
+
+If you see typeset mathematics below, then jsMath Image Mode is working.  If you see
+TeX code instead, jsMath Image Mode is not working for you.
+<p>
+<!------------------------------------------------------------------------>
+<HR>
+
+
+<DIV CLASS="math">
+\left(\, \sum_{k=1}^n a_k b_k \right)^2 \le
+\left(\, \sum_{k=1}^n a_k^2 \right) \left(\, \sum_{k=1}^n b_k^2 \right)
+</DIV>
+<p>
+
+<DIV CLASS="math" STYLE="color:red">
+\warning{ &nbsp; &nbsp; &nbsp; jsMath image mode is not working! &nbsp; &nbsp; &nbsp; }
+</DIV>
+
+<!------------------------------------------------------------------------>
+<HR>
+<p>
+If the mathematics does not show up properly, you may not have not
+installed the <A
+HREF="http://www.math.union.edu/locate/jsMath/download/jsMath.html">jsMath
+image fonts</A> file correctly.  Follow the instructions on the linked
+page.
+<p>
+
+Once you have jsMath working, go on to the <A HREF="sample.html">sample
+page</A> to see if <CODE>easy/load.js</CODE> is configured properly.
+
+</BLOCKQUOTE>
+
+<SCRIPT>
+jsMath.Controls.cookie.autofont = 0;
+jsMath.Controls.cookie.font = "image";
+jsMath.Process(document);
+</SCRIPT>
+
+<!-- *End-Document-Body -->
+
+<!-- *jsMath-Common-Footer -->
+<!BR><p>
+<HR SIZE="3">
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" WIDTH="98%" ALIGN="CENTER">
+<TR VALIGN="MIDDLE"><TD BGCOLOR="#B8B8B8" WIDTH="50%">
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="8" ALIGN="CENTER">
+<TR VALIGN="MIDDLE">
+
+<TD><IMG SRC="jsMath40.jpg" ALT="[HOME]" BORDER="1" WIDTH="40" HEIGHT="40" HSPACE="5"></TD>
+<TD><SMALL>jsMath web pages<BR>
+Created:  14 Feb 2007<BR>
+<!-- hhmts start -->
+Last modified:  Jun 16, 2007 8:56:17 AM
+<!-- hhmts end -->
+<BR>
+Comments to:  <A HREF="mailto:dpvc@union.edu"><CODE>dpvc@union.edu</CODE></A><BR>
+</SMALL></TD>
+
+</TR></TABLE></TD>
+<TD WIDTH="100%" BGCOLOR="#B8B8B8">&nbsp;</TD>
+</TR></TABLE>
+<HR SIZE="3">
+
+</BODY>
+</HTML>
diff --git a/htdocs/jsMath/test/index.html b/htdocs/jsMath/test/index.html
new file mode 100644
index 0000000000..559d9e4fdb
--- /dev/null
+++ b/htdocs/jsMath/test/index.html
@@ -0,0 +1,114 @@
+<HTML>
+<HEAD>
+<TITLE>jsMath (Test):  jsMath Test Page</TITLE>
+<!-- Copyright (c) 2007 by Davide P. Cervone.  All rights reserved. -->
+<!-- *Document-Format:  jsMath -->
+<!-- *Navigation-Data:-->
+</HEAD>
+<BODY>
+
+<!-- *Navigation-links -->
+<TABLE WIDTH="100%" BORDER="1" CELLPADDING="2" CELLSPACING="1">
+<TR><TD BGCOLOR="#B8B8B8"><TABLE WIDTH="100%" BORDER="0" CELLPADDING="0" CELLSPACING="0">
+<TR><TD WIDTH="20%" ALIGN="LEFT" NOWRAP></TD>
+<TD ALIGN="CENTER" WIDTH="60%"><!
+><NOBR><B><SMALL><A HREF="../welcome.html">jsMath</A> (Test)</SMALL></B></NOBR><!
+></TD>
+<TD ALIGN="RIGHT" WIDTH="20%" HEIGHT="25" NOWRAP><!
+></TD></TR></TABLE>
+</TD></TR></TABLE>
+<p>
+<!BR>
+
+<!-- *Begin-Document-Body -->
+
+<SCRIPT>
+  jsMath = {
+    Controls: {
+      cookie: {scale: 133},
+      CheckVersion: function () {
+        jsMath.Script.delayedLoad('http://www.math.union.edu/locate/jsMath/jsMath/jsMath-version-check.js');
+      }
+    },
+    Parser: {prototype: {
+      macros: {warning: ["Macro","\\color{##00CC00}{\\rm jsMath\\ appears\\ to\\ be\\  working!}",1]}
+    }}
+  }
+</SCRIPT>
+<SCRIPT SRC="../plugins/noImageFonts.js"></SCRIPT>
+<SCRIPT SRC="../jsMath.js"></SCRIPT>
+<NOSCRIPT>
+<DIV STYLE="color:#CC0000; text-align:center">
+<B>Warning: <A HREF="http://www.math.union.edu/locate/jsMath">jsMath</A>
+requires JavaScript to process the mathematics on this page.<BR>
+If your browser supports JavaScript, be sure it is enabled.<B>
+</DIV>
+<HR>
+</NOSCRIPT>
+
+<BLOCKQUOTE>
+
+<DIV STYLE="float:right; width:auto; margin-top:.5em">
+<INPUT TYPE="button" VALUE="Check for Updates" ONCLICK="jsMath.Controls.CheckVersion()">
+</DIV>
+
+<H1>jsMath Test Page</H1>
+
+If you see typeset mathematics below, then jsMath is working.  If you see
+TeX code instead, jsMath is not working for you.
+<p>
+<!------------------------------------------------------------------------>
+<HR>
+
+
+<DIV CLASS="math">
+\left(\, \sum_{k=1}^n a_k b_k \right)^2 \le
+\left(\, \sum_{k=1}^n a_k^2 \right) \left(\, \sum_{k=1}^n b_k^2 \right)
+</DIV>
+<p>
+
+<DIV CLASS="math" STYLE="color:red">
+\warning{ &nbsp; &nbsp; &nbsp; jsMath is not working! &nbsp; &nbsp; &nbsp; }
+</DIV>
+
+<!------------------------------------------------------------------------>
+<HR>
+<p>
+
+Once you have jsMath working properly, view the <A
+HREF="index-images.html">image mode test page</A> to make sure that the
+image fallback mode is working as well.
+
+</BLOCKQUOTE>
+
+<SCRIPT>
+jsMath.Process(document);
+</SCRIPT>
+
+<!-- *End-Document-Body -->
+
+<!-- *jsMath-Common-Footer -->
+<!BR><p>
+<HR SIZE="3">
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" WIDTH="98%" ALIGN="CENTER">
+<TR VALIGN="MIDDLE"><TD BGCOLOR="#B8B8B8" WIDTH="50%">
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="8" ALIGN="CENTER">
+<TR VALIGN="MIDDLE">
+
+<TD><IMG SRC="jsMath40.jpg" ALT="[HOME]" BORDER="1" WIDTH="40" HEIGHT="40" HSPACE="5"></TD>
+<TD><SMALL>jsMath web pages<BR>
+Created:  14 Feb 2007<BR>
+<!-- hhmts start -->
+Last modified:  Feb 12, 2009 6:14:47 PM
+<!-- hhmts end -->
+<BR>
+Comments to:  <A HREF="mailto:dpvc@union.edu"><CODE>dpvc@union.edu</CODE></A><BR>
+</SMALL></TD>
+
+</TR></TABLE></TD>
+<TD WIDTH="100%" BGCOLOR="#B8B8B8">&nbsp;</TD>
+</TR></TABLE>
+<HR SIZE="3">
+
+</BODY>
+</HTML>
diff --git a/htdocs/jsMath/test/jsMath40.jpg b/htdocs/jsMath/test/jsMath40.jpg
new file mode 100644
index 0000000000..db5379477e
Binary files /dev/null and b/htdocs/jsMath/test/jsMath40.jpg differ
diff --git a/htdocs/jsMath/test/sample.html b/htdocs/jsMath/test/sample.html
new file mode 100644
index 0000000000..4497e7a35d
--- /dev/null
+++ b/htdocs/jsMath/test/sample.html
@@ -0,0 +1,165 @@
+<HTML>
+<HEAD>
+<TITLE>jsMath (Test):  jsMath Sample Page</TITLE>
+<!-- Copyright (c) 2007 by Davide P. Cervone.  All rights reserved. -->
+<!--
+ | -----------------------------------------------------------
+ | The following line loads and initializes jsMath.
+ | You may need to edit the load.js file to set the
+ | root URL for your site before this file will
+ | display properly
+ | -----------------------------------------------------------
+-->
+<SCRIPT SRC="../easy/load.js"></SCRIPT>
+</HEAD>
+<BODY>
+
+<!--
+ | -----------------------------------------------------------
+ | Include this NOSCRIPT block to inform users that JavaScript 
+ | is required if they don't have it enabled.
+ | -----------------------------------------------------------
+-->
+<NOSCRIPT>
+<DIV STYLE="color:#CC0000; text-align:center">
+<B>Warning: <A HREF="http://www.math.union.edu/locate/jsMath">jsMath</A>
+requires JavaScript to process the mathematics on this page.<BR>
+If your browser supports JavaScript, be sure it is enabled.<B>
+</DIV>
+<HR>
+</NOSCRIPT>
+
+<BLOCKQUOTE>
+
+<H1>jsMath Sample Page</H1>
+
+This is a sample file showing you how to use jsMath to display mathematics 
+in your web pages.  Be sure you have followed the <A
+HREF="http://www.math.union.edu/locate/jsMath/authors/installation.html">installation
+instructions</A> before loading this file.  Also, you may need to edit the
+<CODE>jsMath/easy/load.js</CODE> file to set the root URL for where jsMath 
+can be found on your web site.  The rest of this document gives examples of
+how to enter mathematics in your pages.  Depending on the settings in
+<CODE>jsMath/easy/load.js</CODE>, not all of the mathematics below will be 
+processed by jsMath.  Experiment with the settings in that file to see how 
+they work.
+<p>
+
+<HR>
+<p>
+
+<H2>Some mathematics using <CODE>tex2math</CODE></H2>
+
+The easiest way to enter mathematics is to use jsMath's <A
+HREF="http://www.math.union.edu/locate/jsMath/authors/tex2math.html">tex2math</A>
+plugin to identify the mathematics in your document by looking for <SPAN
+class="math">\rm\TeX</SPAN>-like math delimiters.  Here are some math
+equations using those markers.  Some inline math: $\sqrt{1-x^2}$ or \(ax^2+bx+c\), 
+and some displayed math:
+$$\int {1\over x}\,dx = \ln(x)+C$$
+and
+\[\sum_{i=1}^n i = {n(n+1)\over 2}.\]
+Note that the first of these will not be processed unless you have enabled
+<CODE>processSingleDollars</CODE> in <CODE>jsMath/easy/load.js</CODE>,
+which is disabled by default.  That is because a single dollar sign can
+appear in normal text (as in "That will cost from <SPAN>$</SPAN>3.50 to
+<SPAN>$</SPAN>5.00 to repair"), and you don't want jsMath to try to typeset
+the "3.50 to " as mathematics.
+<p>
+
+If you enable <CODE>processSingleDollars</CODE>, you might also want to
+enable <CODE>fixEscapedDollars</CODE>, so that it is possible to enter
+dollar signs by preceding them with a backslash.  Here's one that you can
+use to see the results of these settings:  \$ (an escaped dollar) and $x+1$
+(not escaped).
+<p>
+
+It is also possible to use your own custom delimiters for marking the
+mathematics within your pages.  If you uncomment the <CODE>customDelimiters</CODE>
+array in <CODE>jsMath/easy/load.js</CODE>, then the following math will be 
+typeset by jsMath:  some inline math [math]\sin(2\pi x)[/math] and some
+display math [display]x={-b\pm \sqrt{b^2-4ac}\over 2a}.[/display]
+You may change the delimiters to nearly anything you want, but they can not
+look like HTML tags, since some browsers will eliminate unknown tags, and
+jsMath doesn't get to look for the custom delimiters until <I>after</I> the
+browser has interpreted the page.
+<p>
+
+<DIV CLASS="tex2math_ignore"> 
+You can prevent the <CODE>tex2math</CODE> plugin from processing a portion
+of a page by enclosing it in a tag that is of
+<CODE>CLASS="tex2math_ignore"</CODE>.  Often, that tag will be a
+<CODE>DIV</CODE> or <CODE>SPAN</CODE>, but it can be anything.  This
+paragraph is wrapped in a DIV tag with
+<CODE>CLASS="tex2math_ignore"</CODE>, and so no math delimiters will be
+processed:  $f\colon X\to Y$, \(x^2 \gt 5\), $$1\over 1+x^2$$ and
+\[\matrix{a& b\cr c& d}.\]
+Note that this includes the processing of escaped dollars (\$) and 
+custom delimiters ([math]a \mapsto a^2[/math]) as well.
+This makes it possible to produce examples of how to enter mathematics on
+your site, for instance.
+</DIV>
+<P>
+JsMath will automatically ignore the text within
+<CODE>PRE</CODE> tags, so you can easily enter examples that way as well:
+<PRE>
+   $f\colon X\to Y$, \(x^2 \gt 5\),
+   $$1\over 1+x^2$$ and \[\matrix{a& b\cr c& d}.\]
+</PRE>
+<P>
+
+Note that since the &lt; and &gt; symbols are used to denote HTML tags,
+these can be hard to incorporate into your <SPAN CLASS="math">\rm\TeX</SPAN>
+code.  Often, putting spaces around the &lt; or &gt; will make it work, but
+it is probably better to use <CODE>\lt</CODE> and <CODE>\gt</CODE> instead.
+Also note that the <CODE>tex2math</CODE> plugin does not allow any HTML
+tags to be within the math delimiters, with the exception of
+<CODE>&lt;BR&gt;</CODE>, which is ignored.
+<p>
+
+See the <A
+HREF="http://www.math.union.edu/locate/jsMath/authors/tex2math.html">tex2math
+documentation</A> for more information.
+<p>
+
+<HR>
+<p>
+
+<H2>Mathematics without <CODE>tex2math</CODE></H2>
+<p>
+
+If you are not using <CODE>tex2math</CODE>, then you will need to enclose
+your mathematics within <CODE>SPAN</CODE> or <CODE>DIV</CODE> tags that
+are of <CODE>CLASS="math"</CODE>.  Use a <CODE>SPAN</CODE> for in-line math
+and a <CODE>DIV</CODE> for displayed math.  For instance, <SPAN
+CLASS="math">P = (x_1,\ldots,x_n)</SPAN> and 
+<DIV CLASS="math">
+  A = \left\lgroup\matrix{a_{11}& \cdots& a_{1m}\cr
+                \vdots& \ddots& \vdots\cr
+                a_{n1}& \cdots& a_{nm}\cr}\right\rgroup.
+</DIV>
+<p>
+<HR>
+<P>
+<H2>More information</H2>
+<p>
+
+See the <A HREF="http://www.math.union.edu/locate/jsMath/examples">jsMath
+example files</A> for more examples of using jsMath.  There are several <A
+HREF="http://www.math.union.edu/locate/jsMath/examples/extensions.html">extensions</A>
+to <SPAN CLASS="math">\rm\TeX</SPAN> that allow jsMath to interact better
+with HTML. These provide features such as colored text, tagging mathematics
+with CSS styles, and so on.
+<p>
+
+More information is available from the <A
+HREF="http://www.math.union.edu/locate/jsMath/authors">jsMath author's
+documentation</A> site.  JsMath also has a <A
+HREF="http://sourceforge.net/projects/jsmath/">home page at
+SourceForge</A>, and that includes <A
+HREF="http://sourceforge.net/forum/?group_id=172663">public forums</A>
+for jsMath where you can ask the jsMath user community for help.
+</BLOCKQUOTE>
+
+</BODY>
+</HTML>
diff --git a/htdocs/jsMath/uncompressed/def.js b/htdocs/jsMath/uncompressed/def.js
new file mode 100644
index 0000000000..0b5b6a199d
--- /dev/null
+++ b/htdocs/jsMath/uncompressed/def.js
@@ -0,0 +1,1442 @@
+jsMath.Img.AddFont(50,{
+  cmr10: [
+    [5,5,0], [6,6,0], [6,6,1], [5,6,0], [5,5,0], [6,5,0], [5,5,0], [6,5,0],
+    [5,5,0], [6,5,0], [5,5,0], [5,5,0], [4,5,0], [4,5,0], [6,5,0], [6,5,0],
+    [2,4,0], [3,6,2], [3,2,-3], [3,2,-3], [3,2,-3], [3,2,-3], [4,2,-3], [4,3,-3],
+    [3,3,2], [4,6,1], [5,5,1], [6,5,1], [4,5,1], [7,5,0], [7,6,1], [6,7,1],
+    [2,2,-1], [2,6,0], [3,3,-2], [6,7,2], [4,7,1], [6,7,1], [6,7,1], [2,3,-2],
+    [3,8,2], [3,8,2], [4,4,-2], [6,6,1], [2,3,2], [2,1,-1], [2,1,0], [4,8,2],
+    [4,6,1], [3,5,0], [4,5,0], [4,6,1], [4,5,0], [4,6,1], [4,6,1], [4,6,1],
+    [4,6,1], [4,6,1], [2,4,0], [2,6,2], [2,6,2], [6,3,0], [3,6,2], [3,5,0],
+    [6,6,1], [6,6,0], [5,5,0], [5,6,1], [5,5,0], [5,5,0], [5,5,0], [6,6,1],
+    [6,5,0], [3,5,0], [4,6,1], [6,5,0], [5,5,0], [7,5,0], [6,5,0], [6,6,1],
+    [5,5,0], [6,7,2], [6,6,1], [4,6,1], [5,5,0], [6,6,1], [6,6,1], [8,6,1],
+    [6,5,0], [6,5,0], [4,5,0], [2,8,2], [4,3,-2], [2,8,2], [3,2,-3], [2,2,-3],
+    [2,3,-2], [4,5,1], [4,6,1], [3,5,1], [4,6,1], [3,5,1], [3,5,0], [4,6,2],
+    [4,5,0], [2,5,0], [3,7,2], [4,5,0], [2,5,0], [6,4,0], [4,4,0], [4,5,1],
+    [4,6,2], [4,6,2], [3,4,0], [3,5,1], [3,6,1], [4,5,1], [4,5,1], [5,5,1],
+    [4,4,0], [4,6,2], [3,4,0], [4,1,-1], [7,1,-1], [3,2,-3], [3,1,-4], [3,2,-3]
+  ],
+  cmmi10: [
+    [6,5,0], [6,6,0], [6,6,1], [5,6,0], [6,5,0], [7,5,0], [6,5,0], [5,5,0],
+    [5,5,0], [5,5,0], [6,5,0], [5,5,1], [5,7,2], [4,6,2], [4,6,1], [3,5,1],
+    [4,7,2], [4,6,2], [4,6,1], [3,5,1], [4,5,1], [4,6,1], [4,6,2], [4,4,0],
+    [4,7,2], [4,5,1], [4,6,2], [4,5,1], [4,5,1], [4,5,1], [5,7,2], [5,6,2],
+    [5,7,2], [5,5,1], [3,5,1], [4,6,1], [6,5,1], [4,6,2], [3,5,1], [5,6,2],
+    [7,3,-1], [7,3,1], [7,3,-1], [7,3,1], [2,3,-1], [2,3,-1], [4,5,1], [4,5,1],
+    [4,5,1], [3,4,0], [4,4,0], [4,6,2], [4,6,2], [4,6,2], [4,6,1], [4,6,2],
+    [4,6,1], [4,6,2], [2,1,0], [2,3,2], [5,5,1], [4,8,2], [5,5,1], [4,4,0],
+    [4,7,1], [6,6,0], [6,5,0], [6,6,1], [6,5,0], [6,5,0], [6,5,0], [6,6,1],
+    [7,5,0], [4,5,0], [5,6,1], [7,5,0], [5,5,0], [8,5,0], [7,5,0], [6,6,1],
+    [6,5,0], [6,7,2], [6,6,1], [5,6,1], [5,5,0], [6,6,1], [6,6,1], [8,6,1],
+    [6,5,0], [6,5,0], [6,5,0], [3,7,1], [3,8,2], [3,8,2], [7,3,0], [7,3,0],
+    [3,6,1], [4,5,1], [3,6,1], [4,5,1], [4,6,1], [4,5,1], [4,7,2], [4,6,2],
+    [4,6,1], [3,6,1], [4,7,2], [4,6,1], [2,6,1], [6,5,1], [4,5,1], [4,5,1],
+    [5,6,2], [4,6,2], [4,5,1], [3,5,1], [3,6,1], [4,5,1], [4,5,1], [5,5,1],
+    [4,5,1], [4,6,2], [4,5,1], [3,5,1], [4,6,2], [5,6,2], [5,2,-3], [5,2,-3]
+  ],
+  cmsy10: [
+    [5,1,-1], [2,2,-1], [5,4,0], [4,4,0], [6,5,1], [4,4,0], [6,5,0], [6,6,2],
+    [6,6,1], [6,6,1], [6,6,1], [6,6,1], [6,6,1], [7,8,2], [4,4,0], [4,4,0],
+    [6,4,0], [6,4,0], [5,6,1], [5,6,1], [5,6,1], [5,6,1], [5,6,1], [5,6,1],
+    [6,3,0], [6,4,0], [5,5,1], [5,5,1], [7,5,1], [7,5,1], [5,5,1], [5,5,1],
+    [7,3,0], [7,3,0], [3,7,2], [3,7,2], [7,3,0], [7,7,2], [7,7,2], [6,4,0],
+    [7,5,1], [7,5,1], [5,7,2], [5,7,2], [7,5,1], [7,7,2], [7,7,2], [6,5,1],
+    [2,4,0], [7,5,1], [5,5,1], [5,5,1], [6,6,0], [6,6,2], [5,8,2], [1,4,0],
+    [4,6,1], [4,5,0], [5,3,0], [4,7,1], [5,7,1], [5,6,1], [6,5,0], [6,5,0],
+    [4,5,0], [6,7,1], [5,6,1], [4,6,1], [6,5,0], [4,6,1], [6,6,1], [5,6,1],
+    [6,6,1], [6,5,0], [6,6,1], [6,6,1], [5,6,1], [8,6,1], [8,7,1], [6,6,1],
+    [6,6,1], [6,6,1], [6,6,1], [5,6,1], [6,6,0], [6,6,1], [5,6,1], [8,6,1],
+    [6,5,0], [6,6,1], [6,5,0], [5,6,1], [5,6,1], [5,6,1], [5,6,1], [5,6,1],
+    [4,5,0], [4,5,0], [3,8,2], [2,8,2], [3,8,2], [2,8,2], [3,8,2], [3,8,2],
+    [3,8,2], [2,8,2], [2,8,2], [3,8,2], [3,8,2], [5,8,2], [4,8,2], [2,6,1],
+    [6,8,7], [5,5,0], [6,6,1], [4,8,2], [5,5,0], [5,5,0], [5,6,1], [5,6,1],
+    [3,7,2], [3,7,2], [3,7,2], [5,7,2], [6,7,1], [6,8,2], [6,7,1], [6,7,1]
+  ],
+  cmex10: [
+    [3,10,9], [3,10,9], [3,10,9], [2,10,9], [4,10,9], [2,10,9], [4,10,9], [2,10,9],
+    [4,10,9], [4,10,9], [3,10,9], [3,10,9], [2,6,5], [3,6,5], [4,10,9], [4,10,9],
+    [4,14,13], [3,14,13], [5,18,17], [4,18,17], [4,18,17], [2,18,17], [4,18,17], [3,18,17],
+    [4,18,17], [3,18,17], [5,18,17], [5,18,17], [5,18,17], [5,18,17], [7,18,17], [7,18,17],
+    [6,22,21], [4,22,21], [4,22,21], [3,22,21], [5,22,21], [3,22,21], [5,22,21], [3,22,21],
+    [5,22,21], [5,22,21], [5,22,21], [5,22,21], [9,22,21], [9,22,21], [6,14,13], [6,14,13],
+    [6,14,13], [5,14,13], [5,14,13], [3,14,13], [5,14,13], [3,14,13], [3,6,5], [3,6,5],
+    [6,8,7], [4,8,7], [6,8,7], [4,8,7], [4,14,13], [6,14,13], [4,4,3], [3,6,5],
+    [6,14,13], [5,14,13], [3,6,5], [5,6,5], [4,14,13], [4,14,13], [6,8,7], [8,11,10],
+    [5,9,8], [7,17,16], [8,8,7], [11,11,10], [8,8,7], [11,11,10], [8,8,7], [11,11,10],
+    [7,8,7], [7,8,7], [5,9,8], [6,8,7], [6,8,7], [6,8,7], [6,8,7], [6,8,7],
+    [10,11,10], [9,11,10], [7,17,16], [8,11,10], [8,11,10], [8,11,10], [8,11,10], [8,11,10],
+    [7,8,7], [9,11,10], [5,3,-3], [9,2,-4], [12,2,-4], [4,2,-4], [7,2,-4], [11,2,-4],
+    [4,14,13], [2,14,13], [4,14,13], [3,14,13], [4,14,13], [3,14,13], [4,14,13], [4,14,13],
+    [8,10,9], [8,14,13], [8,18,17], [8,22,21], [6,14,13], [6,6,5], [8,6,5], [4,6,5],
+    [4,6,5], [4,6,5], [5,3,2], [5,3,2], [5,3,0], [5,3,0], [6,6,5], [6,6,5]
+  ],
+  cmbx10: [
+    [5,5,0], [7,5,0], [6,6,1], [6,5,0], [6,5,0], [7,5,0], [6,5,0], [6,5,0],
+    [6,5,0], [6,5,0], [6,5,0], [6,5,0], [5,5,0], [5,5,0], [7,5,0], [7,5,0],
+    [2,4,0], [3,6,2], [3,2,-3], [4,2,-3], [4,2,-3], [4,2,-3], [4,2,-3], [4,2,-3],
+    [4,3,2], [4,6,1], [6,5,1], [7,5,1], [4,5,1], [8,5,0], [8,6,1], [6,7,1],
+    [3,2,-1], [2,5,0], [4,3,-2], [7,7,2], [4,7,1], [7,7,1], [6,6,1], [2,3,-2],
+    [3,8,2], [3,8,2], [4,4,-2], [6,6,1], [2,4,2], [3,1,-1], [2,2,0], [4,8,2],
+    [4,6,1], [4,5,0], [4,5,0], [4,6,1], [4,5,0], [4,6,1], [4,6,1], [4,6,1],
+    [4,6,1], [4,6,1], [2,4,0], [2,6,2], [2,6,2], [6,3,0], [4,6,2], [4,5,0],
+    [6,6,1], [6,5,0], [6,5,0], [6,6,1], [6,5,0], [6,5,0], [5,5,0], [6,6,1],
+    [7,5,0], [3,5,0], [4,6,1], [6,5,0], [5,5,0], [8,5,0], [7,5,0], [6,6,1],
+    [6,5,0], [6,7,2], [6,6,1], [5,6,1], [6,5,0], [6,6,1], [6,6,1], [9,6,1],
+    [6,5,0], [6,5,0], [5,5,0], [3,8,2], [4,3,-2], [2,8,2], [4,2,-3], [2,2,-3],
+    [2,3,-2], [4,5,1], [5,6,1], [4,5,1], [5,6,1], [4,5,1], [4,5,0], [4,6,2],
+    [5,5,0], [2,5,0], [3,7,2], [5,5,0], [3,5,0], [7,4,0], [5,4,0], [4,5,1],
+    [5,6,2], [5,6,2], [4,4,0], [3,5,1], [3,6,1], [5,5,1], [5,5,1], [6,5,1],
+    [5,4,0], [5,6,2], [4,4,0], [5,2,-1], [9,2,-1], [4,2,-3], [4,1,-4], [4,2,-3]
+  ],
+  cmti10: [
+    [5,5,0], [6,6,0], [6,6,1], [5,6,0], [6,5,0], [6,5,0], [6,5,0], [6,5,0],
+    [6,5,0], [6,5,0], [6,5,0], [7,7,2], [6,7,2], [6,7,2], [8,7,2], [8,7,2],
+    [3,5,1], [4,6,2], [4,2,-3], [4,2,-3], [4,2,-3], [4,2,-3], [4,2,-3], [5,3,-3],
+    [3,3,2], [6,7,2], [6,5,1], [6,5,1], [4,5,1], [7,5,0], [8,6,1], [6,7,1],
+    [3,2,-1], [3,6,0], [4,3,-2], [6,7,2], [5,6,1], [6,7,1], [6,7,1], [3,3,-2],
+    [4,8,2], [3,8,2], [5,4,-2], [6,5,1], [2,3,2], [3,1,-1], [2,1,0], [5,8,2],
+    [4,6,1], [4,5,0], [4,6,1], [4,6,1], [4,7,2], [4,6,1], [4,6,1], [5,6,1],
+    [4,6,1], [4,6,1], [3,4,0], [3,6,2], [3,6,2], [6,3,0], [4,6,2], [4,6,0],
+    [6,6,1], [5,6,0], [6,5,0], [6,6,1], [6,5,0], [6,5,0], [6,5,0], [6,6,1],
+    [6,5,0], [4,5,0], [5,6,1], [7,5,0], [5,5,0], [8,5,0], [6,5,0], [6,6,1],
+    [6,5,0], [6,7,2], [6,6,1], [5,6,1], [6,5,0], [6,6,1], [7,6,1], [8,6,1],
+    [6,5,0], [7,5,0], [5,5,0], [4,8,2], [5,3,-2], [4,8,2], [4,2,-3], [3,2,-3],
+    [3,3,-2], [4,5,1], [4,6,1], [4,5,1], [4,6,1], [4,5,1], [5,7,2], [4,6,2],
+    [4,6,1], [3,6,1], [4,7,2], [4,6,1], [3,6,1], [6,5,1], [5,5,1], [4,5,1],
+    [4,6,2], [4,6,2], [4,5,1], [3,5,1], [3,6,1], [4,5,1], [4,5,1], [5,5,1],
+    [4,5,1], [4,6,2], [4,5,1], [4,1,-1], [8,1,-1], [5,2,-3], [4,2,-3], [4,2,-3]
+  ]
+});
+
+jsMath.Img.AddFont(60,{
+  cmr10: [
+    [5,6,0], [7,6,0], [6,7,1], [6,6,0], [5,6,0], [6,6,0], [6,6,0], [6,6,0],
+    [6,6,0], [6,6,0], [6,6,0], [6,6,0], [5,6,0], [5,6,0], [7,6,0], [7,6,0],
+    [2,4,0], [3,6,2], [3,2,-4], [4,2,-4], [4,2,-4], [4,2,-4], [4,1,-4], [4,2,-4],
+    [3,3,2], [4,7,1], [6,5,1], [6,5,1], [4,6,1], [7,6,0], [8,7,1], [6,7,1],
+    [3,2,-2], [2,6,0], [3,3,-3], [7,8,2], [4,7,1], [7,7,1], [6,7,1], [2,3,-3],
+    [3,8,2], [3,8,2], [4,4,-2], [6,6,1], [2,3,2], [3,1,-1], [2,1,0], [4,8,2],
+    [4,7,1], [4,6,0], [4,6,0], [4,7,1], [4,6,0], [4,7,1], [4,7,1], [4,7,1],
+    [4,7,1], [4,7,1], [2,4,0], [2,6,2], [2,6,2], [6,2,-1], [4,6,2], [4,6,0],
+    [6,7,1], [6,6,0], [6,6,0], [6,7,1], [6,6,0], [6,6,0], [5,6,0], [6,7,1],
+    [6,6,0], [3,6,0], [4,7,1], [6,6,0], [5,6,0], [8,6,0], [6,6,0], [6,7,1],
+    [5,6,0], [6,8,2], [6,7,1], [4,7,1], [6,6,0], [6,7,1], [6,7,1], [9,7,1],
+    [6,6,0], [6,6,0], [5,6,0], [3,8,2], [4,3,-3], [2,8,2], [4,2,-4], [2,2,-4],
+    [2,3,-3], [4,5,1], [5,7,1], [4,5,1], [5,7,1], [4,5,1], [3,6,0], [4,6,2],
+    [5,6,0], [2,6,0], [3,8,2], [5,6,0], [3,6,0], [7,4,0], [5,4,0], [4,5,1],
+    [5,6,2], [5,6,2], [3,4,0], [3,5,1], [3,6,1], [5,5,1], [5,5,1], [6,5,1],
+    [5,4,0], [5,6,2], [4,4,0], [4,1,-2], [8,1,-2], [4,2,-4], [4,2,-4], [4,2,-4]
+  ],
+  cmmi10: [
+    [6,6,0], [7,6,0], [6,7,1], [6,6,0], [7,6,0], [8,6,0], [7,6,0], [6,6,0],
+    [6,6,0], [6,6,0], [7,6,0], [5,5,1], [5,8,2], [5,6,2], [4,7,1], [4,5,1],
+    [4,8,2], [4,6,2], [4,7,1], [3,5,1], [5,5,1], [5,7,1], [5,6,2], [5,4,0],
+    [4,8,2], [5,5,1], [5,6,2], [5,5,1], [5,5,1], [5,5,1], [5,8,2], [5,6,2],
+    [6,8,2], [5,5,1], [4,5,1], [5,7,1], [7,5,1], [5,6,2], [4,5,1], [5,6,2],
+    [8,4,-1], [8,4,1], [8,4,-1], [8,4,1], [2,3,-1], [2,3,-1], [4,6,1], [4,6,1],
+    [4,5,1], [4,4,0], [4,4,0], [4,6,2], [4,6,2], [4,6,2], [4,7,1], [4,6,2],
+    [4,7,1], [4,6,2], [2,1,0], [2,3,2], [6,6,1], [4,8,2], [6,6,1], [4,4,0],
+    [5,7,1], [6,6,0], [7,6,0], [7,7,1], [7,6,0], [7,6,0], [7,6,0], [7,7,1],
+    [8,6,0], [4,6,0], [6,7,1], [8,6,0], [6,6,0], [9,6,0], [8,6,0], [6,7,1],
+    [7,6,0], [6,8,2], [7,7,1], [6,7,1], [6,6,0], [7,7,1], [7,7,1], [9,7,1],
+    [7,6,0], [7,6,0], [6,6,0], [3,7,1], [3,8,2], [3,8,2], [8,2,-1], [8,3,-1],
+    [4,7,1], [4,5,1], [4,7,1], [4,5,1], [5,7,1], [4,5,1], [5,8,2], [4,6,2],
+    [5,7,1], [3,7,1], [5,8,2], [5,7,1], [3,7,1], [7,5,1], [5,5,1], [4,5,1],
+    [5,6,2], [4,6,2], [4,5,1], [4,5,1], [3,7,1], [5,5,1], [4,5,1], [6,5,1],
+    [5,5,1], [4,6,2], [4,5,1], [3,5,1], [4,6,2], [5,6,2], [5,2,-4], [6,2,-4]
+  ],
+  cmsy10: [
+    [6,2,-1], [2,2,-1], [6,4,0], [4,4,0], [6,6,1], [4,4,0], [6,6,0], [6,6,2],
+    [6,6,1], [6,6,1], [6,6,1], [6,6,1], [6,6,1], [8,8,2], [4,4,0], [4,4,0],
+    [6,4,0], [6,4,0], [6,8,2], [6,8,2], [6,8,2], [6,8,2], [6,8,2], [6,8,2],
+    [6,2,-1], [6,4,0], [6,6,1], [6,6,1], [8,6,1], [8,6,1], [6,6,1], [6,6,1],
+    [8,4,0], [8,4,0], [4,8,2], [4,8,2], [8,4,0], [8,8,2], [8,8,2], [6,4,0],
+    [8,6,1], [8,6,1], [5,8,2], [5,8,2], [8,6,1], [8,8,2], [8,8,2], [6,5,1],
+    [3,5,0], [8,5,1], [5,6,1], [5,6,1], [7,6,0], [7,6,2], [6,8,2], [1,4,0],
+    [5,7,1], [4,6,0], [5,3,0], [4,8,1], [6,7,1], [6,7,1], [6,6,0], [6,6,0],
+    [5,6,0], [7,7,1], [6,7,1], [5,7,1], [7,6,0], [5,7,1], [7,7,1], [5,7,1],
+    [7,7,1], [7,6,0], [7,7,1], [6,7,1], [6,7,1], [9,7,1], [9,8,1], [7,7,1],
+    [6,7,1], [7,7,1], [7,7,1], [6,7,1], [7,6,0], [7,7,1], [6,7,1], [9,7,1],
+    [7,6,0], [6,8,2], [7,6,0], [5,6,1], [5,6,1], [5,6,1], [5,6,1], [5,6,1],
+    [5,6,0], [5,6,0], [4,8,2], [3,8,2], [4,8,2], [3,8,2], [4,8,2], [4,8,2],
+    [3,8,2], [3,8,2], [2,8,2], [3,8,2], [4,10,3], [5,10,3], [4,8,2], [2,6,1],
+    [7,9,8], [6,6,0], [7,7,1], [4,8,2], [5,5,0], [5,5,0], [6,8,2], [6,8,2],
+    [3,8,2], [4,8,2], [4,8,2], [5,8,2], [6,8,2], [6,8,2], [6,7,1], [6,8,2]
+  ],
+  cmex10: [
+    [4,11,10], [3,11,10], [4,11,10], [2,11,10], [4,11,10], [3,11,10], [4,11,10], [3,11,10],
+    [4,11,10], [4,11,10], [4,11,10], [3,11,10], [2,6,5], [4,6,5], [5,11,10], [5,11,10],
+    [5,16,15], [4,16,15], [6,20,19], [5,20,19], [5,20,19], [3,20,19], [5,20,19], [3,20,19],
+    [5,20,19], [3,20,19], [5,20,19], [5,20,19], [6,20,19], [5,20,19], [8,20,19], [8,20,19],
+    [7,25,24], [5,25,24], [5,25,24], [3,25,24], [6,25,24], [3,25,24], [6,25,24], [3,25,24],
+    [6,25,24], [6,25,24], [6,25,24], [6,25,24], [10,25,24], [10,25,24], [7,16,15], [7,16,15],
+    [7,16,15], [5,16,15], [6,16,15], [3,16,15], [6,16,15], [3,16,15], [4,6,5], [3,6,5],
+    [6,9,8], [5,9,8], [6,9,8], [5,9,8], [5,16,15], [6,16,15], [5,4,3], [3,6,5],
+    [7,16,15], [5,16,15], [4,6,5], [5,6,5], [5,16,15], [4,16,15], [7,9,8], [9,13,12],
+    [5,10,9], [8,19,18], [9,9,8], [12,13,12], [9,9,8], [12,13,12], [9,9,8], [12,13,12],
+    [8,9,8], [8,9,8], [5,10,9], [7,9,8], [7,9,8], [7,9,8], [7,9,8], [7,9,8],
+    [12,13,12], [10,13,12], [8,19,18], [9,13,12], [9,13,12], [9,13,12], [9,13,12], [9,13,12],
+    [8,9,8], [10,13,12], [6,2,-4], [10,3,-4], [13,3,-4], [5,2,-4], [8,2,-4], [12,2,-4],
+    [4,16,15], [2,16,15], [5,16,15], [3,16,15], [5,16,15], [3,16,15], [5,16,15], [5,16,15],
+    [9,11,10], [9,16,15], [9,20,19], [9,25,24], [6,16,15], [6,6,5], [9,6,5], [5,6,5],
+    [5,6,5], [5,6,5], [5,3,2], [5,3,2], [5,3,0], [5,3,0], [6,6,5], [6,6,5]
+  ],
+  cmbx10: [
+    [6,6,0], [8,6,0], [7,7,1], [7,6,0], [6,6,0], [7,6,0], [7,6,0], [7,6,0],
+    [7,6,0], [7,6,0], [7,6,0], [6,6,0], [5,6,0], [5,6,0], [8,6,0], [8,6,0],
+    [3,4,0], [4,6,2], [3,2,-4], [4,2,-4], [4,2,-4], [4,2,-4], [4,1,-4], [5,2,-4],
+    [4,3,2], [5,7,1], [7,5,1], [7,5,1], [5,6,1], [9,6,0], [10,7,1], [7,7,1],
+    [3,2,-2], [3,6,0], [4,4,-2], [8,8,2], [5,7,1], [8,7,1], [7,7,1], [3,4,-2],
+    [4,8,2], [3,8,2], [4,4,-2], [7,8,2], [2,4,2], [3,2,-1], [2,2,0], [5,8,2],
+    [5,7,1], [4,6,0], [5,6,0], [5,7,1], [5,6,0], [5,7,1], [5,7,1], [5,7,1],
+    [5,7,1], [5,7,1], [2,4,0], [2,6,2], [3,6,2], [7,4,0], [4,6,2], [4,6,0],
+    [7,7,1], [7,6,0], [7,6,0], [7,7,1], [7,6,0], [6,6,0], [6,6,0], [7,7,1],
+    [7,6,0], [4,6,0], [5,7,1], [7,6,0], [6,6,0], [9,6,0], [7,6,0], [7,7,1],
+    [6,6,0], [7,8,2], [7,7,1], [5,7,1], [7,6,0], [7,7,1], [7,7,1], [10,7,1],
+    [7,6,0], [7,6,0], [6,6,0], [3,8,2], [5,4,-2], [2,8,2], [4,2,-4], [2,2,-4],
+    [2,4,-2], [5,5,1], [5,7,1], [4,5,1], [5,7,1], [4,5,1], [4,6,0], [5,6,2],
+    [5,6,0], [3,6,0], [4,8,2], [5,6,0], [3,6,0], [8,4,0], [5,4,0], [5,5,1],
+    [5,6,2], [5,6,2], [4,4,0], [4,5,1], [4,7,1], [5,5,1], [5,5,1], [7,5,1],
+    [5,4,0], [5,6,2], [4,4,0], [5,1,-2], [10,1,-2], [4,2,-4], [4,2,-4], [4,2,-4]
+  ],
+  cmti10: [
+    [6,6,0], [7,6,0], [7,7,1], [6,6,0], [7,6,0], [7,6,0], [7,6,0], [7,6,0],
+    [6,6,0], [7,6,0], [7,6,0], [8,8,2], [6,8,2], [7,8,2], [9,8,2], [9,8,2],
+    [3,5,1], [4,6,2], [4,2,-4], [5,2,-4], [5,2,-4], [5,2,-4], [5,1,-4], [6,2,-4],
+    [3,3,2], [6,8,2], [6,5,1], [6,5,1], [5,6,1], [8,6,0], [9,7,1], [7,7,1],
+    [3,2,-2], [3,6,0], [5,3,-3], [7,8,2], [6,7,1], [7,7,1], [7,7,1], [3,3,-3],
+    [5,8,2], [4,8,2], [5,4,-2], [7,6,1], [2,3,2], [3,1,-1], [2,1,0], [5,8,2],
+    [5,7,1], [4,6,0], [5,7,1], [5,7,1], [4,8,2], [5,7,1], [5,7,1], [5,7,1],
+    [5,7,1], [5,7,1], [3,4,0], [3,6,2], [3,6,2], [7,2,-1], [4,6,2], [5,6,0],
+    [7,7,1], [6,6,0], [6,6,0], [7,7,1], [7,6,0], [6,6,0], [6,6,0], [7,7,1],
+    [7,6,0], [5,6,0], [5,7,1], [7,6,0], [5,6,0], [9,6,0], [7,6,0], [7,7,1],
+    [6,6,0], [7,8,2], [6,7,1], [6,7,1], [7,6,0], [7,7,1], [7,7,1], [9,7,1],
+    [7,6,0], [7,6,0], [6,6,0], [4,8,2], [5,3,-3], [4,8,2], [5,2,-4], [3,2,-4],
+    [3,3,-3], [5,5,1], [4,7,1], [4,5,1], [5,7,1], [4,5,1], [5,8,2], [4,6,2],
+    [5,7,1], [3,7,1], [4,8,2], [5,7,1], [3,7,1], [7,5,1], [5,5,1], [5,5,1],
+    [5,6,2], [4,6,2], [4,5,1], [4,5,1], [3,7,1], [5,5,1], [4,5,1], [6,5,1],
+    [5,5,1], [5,6,2], [4,5,1], [5,1,-2], [9,1,-2], [5,2,-4], [5,2,-4], [5,2,-4]
+  ]
+});
+
+jsMath.Img.AddFont(70,{
+  cmr10: [
+    [6,7,0], [8,8,0], [8,9,1], [7,8,0], [7,7,0], [8,7,0], [7,7,0], [8,8,0],
+    [7,7,0], [8,7,0], [7,8,0], [7,8,0], [6,8,0], [6,8,0], [9,8,0], [9,8,0],
+    [3,5,0], [4,8,3], [3,2,-5], [4,2,-5], [4,2,-5], [4,2,-5], [5,1,-5], [5,3,-5],
+    [4,4,3], [5,9,1], [7,6,1], [8,6,1], [5,8,2], [9,7,0], [10,9,1], [8,9,1],
+    [3,2,-2], [2,8,0], [4,4,-3], [8,9,2], [5,9,1], [8,9,1], [8,9,1], [3,4,-3],
+    [4,11,3], [3,11,3], [5,5,-3], [8,7,1], [3,4,2], [3,2,-1], [2,2,0], [5,11,3],
+    [5,8,1], [5,7,0], [5,7,0], [5,8,1], [5,7,0], [5,8,1], [5,8,1], [5,8,1],
+    [5,8,1], [5,8,1], [2,5,0], [2,7,2], [2,8,3], [8,3,-1], [5,8,3], [5,8,0],
+    [8,9,1], [8,8,0], [7,7,0], [7,9,1], [8,7,0], [7,7,0], [7,7,0], [8,9,1],
+    [8,7,0], [4,7,0], [5,8,1], [8,7,0], [6,7,0], [9,7,0], [8,7,0], [8,9,1],
+    [7,7,0], [8,10,2], [8,8,1], [5,9,1], [7,7,0], [8,8,1], [8,8,1], [11,8,1],
+    [8,7,0], [8,7,0], [6,7,0], [3,11,3], [5,4,-3], [2,11,3], [4,2,-5], [2,2,-5],
+    [2,4,-3], [5,6,1], [6,8,1], [5,6,1], [6,8,1], [5,6,1], [4,8,0], [5,8,3],
+    [6,7,0], [3,7,0], [4,10,3], [6,7,0], [3,7,0], [9,5,0], [6,5,0], [5,6,1],
+    [6,7,2], [6,7,2], [4,5,0], [4,6,1], [4,8,1], [6,6,1], [6,6,1], [8,6,1],
+    [6,5,0], [6,8,3], [5,5,0], [5,1,-2], [10,1,-2], [5,2,-5], [5,2,-5], [4,2,-5]
+  ],
+  cmmi10: [
+    [8,7,0], [8,8,0], [8,9,1], [7,8,0], [8,7,0], [9,7,0], [9,7,0], [8,8,0],
+    [7,7,0], [7,7,0], [8,8,0], [7,6,1], [6,10,2], [6,8,3], [5,9,1], [4,6,1],
+    [5,10,3], [5,8,3], [5,9,1], [4,6,1], [6,6,1], [6,8,1], [6,8,3], [6,5,0],
+    [5,10,3], [6,6,1], [6,8,3], [6,6,1], [6,6,1], [6,6,1], [6,10,3], [6,8,3],
+    [7,10,3], [7,6,1], [5,6,1], [6,9,1], [9,6,1], [6,7,2], [5,7,2], [7,8,3],
+    [10,4,-2], [10,4,1], [10,4,-2], [10,4,1], [3,3,-2], [3,3,-2], [5,7,1], [5,7,1],
+    [5,6,1], [5,5,0], [5,5,0], [5,8,3], [5,7,2], [5,8,3], [5,8,1], [5,8,3],
+    [5,8,1], [5,8,3], [2,2,0], [3,4,2], [7,7,1], [5,11,3], [7,7,1], [5,5,0],
+    [6,9,1], [8,8,0], [8,7,0], [8,9,1], [9,7,0], [8,7,0], [8,7,0], [8,9,1],
+    [9,7,0], [5,7,0], [7,8,1], [9,7,0], [7,7,0], [11,7,0], [9,7,0], [8,9,1],
+    [8,7,0], [8,10,2], [8,8,1], [7,9,1], [8,7,0], [8,8,1], [8,8,1], [11,8,1],
+    [9,7,0], [8,7,0], [8,7,0], [4,9,1], [4,11,3], [4,11,3], [10,3,-1], [10,3,-1],
+    [4,9,1], [5,6,1], [5,8,1], [5,6,1], [6,8,1], [5,6,1], [6,11,3], [5,8,3],
+    [6,8,1], [3,8,1], [5,10,3], [6,8,1], [3,8,1], [9,6,1], [6,6,1], [5,6,1],
+    [6,7,2], [5,7,2], [5,6,1], [5,6,1], [4,8,1], [6,6,1], [5,6,1], [7,6,1],
+    [6,6,1], [5,8,3], [5,6,1], [3,6,1], [5,8,3], [7,8,3], [7,3,-5], [7,2,-5]
+  ],
+  cmsy10: [
+    [7,1,-2], [2,3,-1], [7,5,0], [5,5,0], [8,7,1], [5,5,0], [8,7,0], [8,7,2],
+    [8,7,1], [8,7,1], [8,7,1], [8,7,1], [8,7,1], [10,11,3], [5,5,0], [5,5,0],
+    [8,5,0], [8,5,0], [7,9,2], [7,9,2], [7,9,2], [7,9,2], [7,9,2], [7,9,2],
+    [8,3,-1], [8,5,0], [7,7,1], [7,7,1], [10,7,1], [10,7,1], [7,7,1], [7,7,1],
+    [10,5,0], [10,5,0], [5,9,2], [5,9,2], [10,5,0], [10,9,2], [10,9,2], [8,5,0],
+    [10,7,1], [10,7,1], [6,9,2], [6,9,2], [10,7,1], [10,9,2], [10,9,2], [8,6,1],
+    [3,6,0], [10,6,1], [6,7,1], [6,7,1], [9,8,0], [9,8,3], [7,11,3], [2,5,0],
+    [6,8,1], [5,7,0], [7,4,0], [5,9,1], [8,9,1], [7,9,1], [8,7,0], [8,7,0],
+    [6,7,0], [8,9,1], [7,9,1], [6,9,1], [8,7,0], [6,9,1], [9,8,1], [7,10,2],
+    [9,8,1], [8,7,0], [9,9,2], [8,9,1], [7,9,1], [12,9,1], [11,9,1], [8,9,1],
+    [8,8,1], [8,10,2], [9,8,1], [7,9,1], [8,8,0], [8,8,1], [7,8,1], [11,8,1],
+    [9,7,0], [8,9,2], [8,7,0], [7,7,1], [7,7,1], [7,7,1], [7,7,1], [7,7,1],
+    [6,7,0], [6,7,0], [5,11,3], [3,11,3], [5,11,3], [3,11,3], [5,11,3], [5,11,3],
+    [4,11,3], [3,11,3], [2,11,3], [4,11,3], [5,11,3], [6,11,3], [5,11,3], [3,7,1],
+    [9,11,10], [8,7,0], [8,8,1], [5,11,3], [7,6,0], [7,6,0], [8,9,2], [7,9,2],
+    [4,11,3], [4,11,3], [4,11,3], [6,9,2], [8,10,2], [8,10,2], [8,9,1], [8,10,2]
+  ],
+  cmex10: [
+    [5,13,12], [4,13,12], [4,13,12], [3,13,12], [5,13,12], [3,13,12], [5,13,12], [3,13,12],
+    [5,13,12], [5,13,12], [4,13,12], [4,13,12], [2,8,7], [5,8,7], [6,13,12], [6,13,12],
+    [6,19,18], [5,19,18], [7,25,24], [6,25,24], [6,25,24], [3,25,24], [6,25,24], [4,25,24],
+    [6,25,24], [4,25,24], [7,25,24], [7,25,24], [7,25,24], [7,25,24], [10,25,24], [10,25,24],
+    [8,31,30], [6,31,30], [6,31,30], [4,31,30], [7,31,30], [4,31,30], [7,31,30], [4,31,30],
+    [7,31,30], [7,31,30], [7,31,30], [7,31,30], [13,31,30], [13,31,30], [8,19,18], [8,19,18],
+    [9,19,18], [6,19,18], [7,19,18], [4,19,18], [7,19,18], [4,19,18], [4,8,7], [4,8,7],
+    [8,11,10], [6,11,10], [8,10,9], [6,10,9], [6,20,19], [8,20,19], [6,5,4], [4,8,7],
+    [9,19,18], [6,19,18], [5,8,7], [6,8,7], [6,19,18], [5,19,18], [8,11,10], [11,15,14],
+    [7,13,12], [10,24,23], [11,11,10], [15,15,14], [11,11,10], [15,15,14], [11,11,10], [15,15,14],
+    [10,11,10], [9,11,10], [7,13,12], [8,11,10], [8,11,10], [8,11,10], [8,11,10], [8,11,10],
+    [14,15,14], [13,15,14], [10,24,23], [11,15,14], [11,15,14], [11,15,14], [11,15,14], [11,15,14],
+    [9,11,10], [13,15,14], [7,3,-5], [12,3,-5], [16,3,-5], [6,2,-6], [10,2,-6], [15,2,-6],
+    [5,19,18], [3,19,18], [6,19,18], [4,19,18], [6,19,18], [4,19,18], [6,19,18], [6,19,18],
+    [11,13,12], [11,19,18], [11,25,24], [11,31,30], [8,19,18], [8,8,7], [11,7,6], [6,8,7],
+    [6,7,6], [6,7,6], [6,5,3], [6,5,3], [6,4,0], [6,4,0], [8,7,6], [8,7,6]
+  ],
+  cmbx10: [
+    [7,7,0], [9,7,0], [9,8,1], [8,7,0], [8,7,0], [9,7,0], [8,7,0], [9,7,0],
+    [8,7,0], [9,7,0], [8,7,0], [8,7,0], [7,7,0], [7,7,0], [10,7,0], [10,7,0],
+    [3,5,0], [4,7,2], [4,3,-5], [5,3,-5], [5,2,-5], [5,2,-5], [5,2,-5], [6,3,-5],
+    [5,3,2], [6,8,1], [8,6,1], [9,6,1], [6,8,2], [11,7,0], [12,8,1], [9,9,1],
+    [4,3,-2], [3,8,0], [5,4,-3], [9,9,2], [6,9,1], [9,9,1], [9,9,1], [3,4,-3],
+    [4,11,3], [4,11,3], [5,5,-3], [9,9,2], [3,4,2], [4,2,-1], [3,2,0], [6,11,3],
+    [6,8,1], [5,7,0], [6,7,0], [6,8,1], [6,7,0], [6,8,1], [6,8,1], [6,8,1],
+    [6,8,1], [6,8,1], [3,5,0], [3,7,2], [3,8,3], [9,3,-1], [5,7,2], [5,7,0],
+    [9,8,1], [9,7,0], [8,7,0], [8,8,1], [9,7,0], [8,7,0], [7,7,0], [9,8,1],
+    [9,7,0], [5,7,0], [6,8,1], [9,7,0], [7,7,0], [11,7,0], [9,7,0], [8,8,1],
+    [8,7,0], [9,9,2], [9,8,1], [6,8,1], [8,7,0], [9,8,1], [9,8,1], [12,8,1],
+    [9,7,0], [9,7,0], [7,7,0], [3,11,3], [6,4,-3], [2,11,3], [5,2,-5], [3,2,-5],
+    [3,4,-3], [6,6,1], [6,8,1], [5,6,1], [7,8,1], [5,6,1], [5,7,0], [6,8,3],
+    [7,7,0], [3,7,0], [4,9,2], [6,7,0], [3,7,0], [10,5,0], [7,5,0], [6,6,1],
+    [6,7,2], [7,7,2], [5,5,0], [5,6,1], [4,8,1], [7,6,1], [6,6,1], [9,6,1],
+    [6,5,0], [6,7,2], [5,5,0], [6,1,-2], [12,1,-2], [5,3,-5], [5,2,-5], [5,2,-5]
+  ],
+  cmti10: [
+    [8,7,0], [8,8,0], [8,9,1], [7,8,0], [8,7,0], [9,7,0], [8,7,0], [9,8,0],
+    [8,7,0], [9,7,0], [8,8,0], [9,11,3], [7,11,3], [8,11,3], [11,11,3], [11,11,3],
+    [4,6,1], [5,8,3], [5,2,-5], [6,2,-5], [6,2,-5], [6,2,-5], [6,1,-5], [7,3,-5],
+    [4,3,2], [7,11,3], [8,6,1], [8,6,1], [6,8,2], [10,7,0], [11,9,1], [9,9,1],
+    [4,2,-2], [4,8,0], [6,4,-3], [9,9,2], [7,9,1], [9,9,1], [9,9,1], [4,4,-3],
+    [6,11,3], [4,11,3], [6,5,-3], [8,7,1], [3,4,2], [4,2,-1], [3,2,0], [7,11,3],
+    [6,8,1], [5,7,0], [6,8,1], [6,8,1], [5,9,2], [6,8,1], [6,8,1], [7,8,1],
+    [6,8,1], [6,8,1], [4,5,0], [4,7,2], [4,8,3], [8,3,-1], [5,8,3], [6,8,0],
+    [8,9,1], [7,8,0], [8,7,0], [9,9,1], [8,7,0], [8,7,0], [8,7,0], [9,9,1],
+    [9,7,0], [6,7,0], [7,8,1], [9,7,0], [7,7,0], [11,7,0], [9,7,0], [8,9,1],
+    [8,7,0], [8,10,2], [8,8,1], [7,9,1], [9,7,0], [9,8,1], [9,8,1], [12,8,1],
+    [9,7,0], [9,7,0], [8,7,0], [5,11,3], [7,4,-3], [5,11,3], [6,2,-5], [4,2,-5],
+    [4,4,-3], [6,6,1], [5,8,1], [5,6,1], [6,8,1], [5,6,1], [6,11,3], [5,8,3],
+    [6,8,1], [4,8,1], [5,10,3], [6,8,1], [4,8,1], [9,6,1], [6,6,1], [6,6,1],
+    [6,7,2], [5,7,2], [5,6,1], [5,6,1], [4,8,1], [6,6,1], [5,6,1], [7,6,1],
+    [6,6,1], [6,8,3], [5,6,1], [6,1,-2], [11,1,-2], [6,2,-5], [6,2,-5], [6,2,-5]
+  ]
+});
+
+jsMath.Img.AddFont(85,{
+  cmr10: [
+    [7,9,0], [10,9,0], [9,10,1], [8,9,0], [8,9,0], [9,9,0], [8,9,0], [9,9,0],
+    [8,9,0], [9,9,0], [9,9,0], [8,9,0], [7,9,0], [7,9,0], [10,9,0], [10,9,0],
+    [3,6,0], [4,9,3], [4,3,-6], [5,3,-6], [5,2,-6], [5,3,-6], [6,2,-6], [6,3,-6],
+    [5,4,3], [6,10,1], [9,7,1], [9,7,1], [6,9,2], [11,9,0], [12,10,1], [9,10,1],
+    [4,2,-3], [3,9,0], [5,5,-4], [10,12,3], [6,10,1], [10,10,1], [9,10,1], [3,5,-4],
+    [4,12,3], [4,12,3], [6,6,-3], [9,8,1], [3,5,3], [4,1,-2], [3,2,0], [6,12,3],
+    [6,9,1], [6,8,0], [6,8,0], [6,9,1], [6,9,0], [6,9,1], [6,9,1], [6,10,1],
+    [6,9,1], [6,9,1], [3,6,0], [3,9,3], [3,9,3], [9,4,-1], [5,9,3], [5,9,0],
+    [9,10,1], [9,9,0], [8,9,0], [8,10,1], [9,9,0], [8,9,0], [8,9,0], [9,10,1],
+    [9,9,0], [4,9,0], [6,10,1], [9,9,0], [7,9,0], [11,9,0], [9,9,0], [9,10,1],
+    [8,9,0], [9,12,3], [9,10,1], [6,10,1], [9,9,0], [9,10,1], [9,10,1], [13,10,1],
+    [9,9,0], [9,9,0], [7,9,0], [4,12,3], [6,5,-4], [2,12,3], [5,3,-6], [3,3,-6],
+    [3,5,-4], [6,7,1], [7,10,1], [5,7,1], [7,10,1], [5,7,1], [5,9,0], [6,9,3],
+    [7,9,0], [3,9,0], [4,12,3], [7,9,0], [4,9,0], [10,6,0], [7,6,0], [6,7,1],
+    [7,9,3], [7,9,3], [5,6,0], [5,7,1], [4,9,1], [7,7,1], [7,7,1], [9,7,1],
+    [7,6,0], [7,9,3], [5,6,0], [6,1,-3], [12,1,-3], [6,3,-6], [5,3,-6], [5,3,-6]
+  ],
+  cmmi10: [
+    [9,9,0], [10,9,0], [9,10,1], [8,9,0], [10,9,0], [11,9,0], [10,9,0], [9,9,0],
+    [8,9,0], [9,9,0], [10,9,0], [8,7,1], [8,12,3], [7,9,3], [6,10,1], [5,7,1],
+    [6,12,3], [6,9,3], [6,10,1], [4,7,1], [7,7,1], [7,10,1], [7,9,3], [7,6,0],
+    [6,12,3], [7,7,1], [7,9,3], [7,7,1], [7,7,1], [7,7,1], [7,12,3], [8,9,3],
+    [8,12,3], [8,7,1], [6,7,1], [7,10,1], [10,7,1], [7,9,3], [5,8,2], [8,9,3],
+    [12,5,-2], [12,5,1], [12,5,-2], [12,5,1], [3,4,-2], [3,4,-2], [6,8,1], [6,8,1],
+    [6,7,1], [6,6,0], [6,6,0], [6,9,3], [6,9,3], [6,9,3], [6,9,1], [6,9,3],
+    [6,9,1], [6,9,3], [3,2,0], [3,5,3], [9,8,1], [6,12,3], [9,8,1], [6,6,0],
+    [7,10,1], [9,9,0], [10,9,0], [10,10,1], [10,9,0], [10,9,0], [10,9,0], [10,10,1],
+    [11,9,0], [6,9,0], [8,10,1], [11,9,0], [8,9,0], [13,9,0], [11,9,0], [9,10,1],
+    [10,9,0], [9,12,3], [10,10,1], [8,10,1], [9,9,0], [10,10,1], [10,10,1], [13,10,1],
+    [11,9,0], [10,9,0], [9,9,0], [4,10,1], [4,12,3], [4,12,3], [12,4,-1], [12,4,-1],
+    [5,10,1], [6,7,1], [5,10,1], [6,7,1], [7,10,1], [6,7,1], [7,12,3], [6,9,3],
+    [7,10,1], [4,9,1], [6,11,3], [7,10,1], [4,10,1], [11,7,1], [7,7,1], [6,7,1],
+    [7,9,3], [6,9,3], [6,7,1], [6,7,1], [4,9,1], [7,7,1], [6,7,1], [9,7,1],
+    [7,7,1], [6,9,3], [6,7,1], [4,7,1], [6,9,3], [8,9,3], [8,3,-6], [8,2,-6]
+  ],
+  cmsy10: [
+    [9,2,-2], [3,2,-2], [8,6,0], [6,6,0], [9,8,1], [6,6,0], [9,8,0], [9,8,2],
+    [9,8,1], [9,8,1], [9,8,1], [9,8,1], [9,8,1], [12,12,3], [6,6,0], [6,6,0],
+    [9,6,0], [9,6,0], [9,10,2], [9,10,2], [9,10,2], [9,10,2], [9,10,2], [9,10,2],
+    [9,4,-1], [9,6,0], [9,8,1], [9,8,1], [12,8,1], [12,8,1], [9,8,1], [9,8,1],
+    [12,6,0], [12,6,0], [6,12,3], [6,12,3], [12,6,0], [12,12,3], [12,12,3], [9,6,0],
+    [12,8,1], [12,8,1], [7,12,3], [7,12,3], [12,8,1], [12,12,3], [12,12,3], [9,7,1],
+    [4,7,0], [12,7,1], [7,8,1], [7,8,1], [10,9,0], [10,9,3], [8,12,3], [2,6,0],
+    [7,10,1], [6,9,0], [8,4,-1], [6,11,1], [9,10,1], [9,10,1], [9,8,0], [9,8,0],
+    [7,9,0], [10,10,1], [8,10,1], [7,10,1], [10,9,0], [7,10,1], [10,10,1], [8,11,2],
+    [10,10,1], [9,9,0], [11,11,2], [9,10,1], [8,10,1], [14,10,1], [13,11,1], [10,10,1],
+    [9,10,1], [10,11,2], [11,10,1], [8,10,1], [10,9,0], [10,10,1], [8,10,1], [13,10,1],
+    [10,9,0], [9,11,2], [10,9,0], [8,9,1], [8,9,1], [8,9,1], [8,9,1], [8,9,1],
+    [7,9,0], [7,9,0], [6,12,3], [4,12,3], [6,12,3], [4,12,3], [6,12,3], [6,12,3],
+    [4,12,3], [4,12,3], [2,12,3], [5,12,3], [6,14,4], [7,14,4], [6,12,3], [3,8,1],
+    [11,13,12], [9,9,0], [10,10,1], [6,12,3], [8,8,0], [8,8,0], [9,10,2], [9,10,2],
+    [5,12,3], [5,12,3], [5,12,3], [7,12,3], [9,11,2], [9,11,2], [9,10,1], [9,11,2]
+  ],
+  cmex10: [
+    [5,15,14], [4,15,14], [5,15,14], [3,15,14], [6,15,14], [4,15,14], [6,15,14], [4,15,14],
+    [6,15,14], [6,15,14], [5,15,14], [5,15,14], [3,9,8], [5,9,8], [7,15,14], [7,15,14],
+    [7,23,22], [5,23,22], [9,30,29], [7,30,29], [7,30,29], [4,30,29], [7,30,29], [4,30,29],
+    [7,30,29], [4,30,29], [8,30,29], [8,30,29], [8,30,29], [8,30,29], [12,30,29], [12,30,29],
+    [10,37,36], [7,37,36], [7,37,36], [4,37,36], [8,37,36], [5,37,36], [8,37,36], [5,37,36],
+    [8,37,36], [8,37,36], [9,37,36], [8,37,36], [15,37,36], [15,37,36], [10,23,22], [10,23,22],
+    [11,23,22], [7,23,22], [8,23,22], [5,23,22], [8,23,22], [5,23,22], [5,9,8], [5,9,8],
+    [9,12,11], [7,12,11], [9,12,11], [7,12,11], [7,23,22], [9,23,22], [7,5,4], [5,9,8],
+    [11,23,22], [7,23,22], [5,9,8], [7,9,8], [7,23,22], [6,23,22], [10,13,12], [13,18,17],
+    [8,15,14], [12,28,27], [13,13,12], [18,18,17], [13,13,12], [18,18,17], [13,13,12], [18,18,17],
+    [12,13,12], [11,13,12], [8,15,14], [10,13,12], [10,13,12], [10,13,12], [10,13,12], [10,13,12],
+    [17,18,17], [15,18,17], [12,28,27], [13,18,17], [13,18,17], [13,18,17], [13,18,17], [13,18,17],
+    [11,13,12], [15,18,17], [8,3,-6], [14,4,-6], [19,4,-6], [7,2,-7], [12,2,-7], [18,2,-7],
+    [6,23,22], [3,23,22], [7,23,22], [4,23,22], [7,23,22], [4,23,22], [7,23,22], [7,23,22],
+    [13,15,14], [13,23,22], [13,30,29], [13,37,36], [9,23,22], [9,9,8], [13,8,7], [7,9,8],
+    [7,9,8], [7,9,8], [7,5,3], [7,5,3], [7,5,0], [7,5,0], [9,9,8], [9,9,8]
+  ],
+  cmbx10: [
+    [8,9,0], [11,9,0], [10,10,1], [10,9,0], [9,9,0], [11,9,0], [10,9,0], [10,9,0],
+    [10,9,0], [10,9,0], [10,9,0], [9,9,0], [8,9,0], [8,9,0], [12,9,0], [12,9,0],
+    [4,6,0], [5,9,3], [5,3,-6], [6,3,-6], [6,2,-6], [6,3,-6], [6,2,-6], [7,3,-6],
+    [6,4,3], [7,10,1], [10,7,1], [11,7,1], [7,9,2], [13,9,0], [14,10,1], [10,10,1],
+    [4,2,-3], [4,9,0], [6,5,-4], [11,12,3], [7,10,1], [11,10,1], [11,10,1], [4,5,-4],
+    [5,12,3], [5,12,3], [6,6,-3], [10,10,2], [3,5,3], [4,2,-2], [3,2,0], [7,12,3],
+    [7,9,1], [6,8,0], [7,8,0], [7,9,1], [7,8,0], [7,9,1], [7,9,1], [7,10,1],
+    [7,9,1], [7,9,1], [3,6,0], [3,9,3], [4,9,3], [10,4,-1], [6,9,3], [6,9,0],
+    [10,10,1], [10,9,0], [10,9,0], [10,10,1], [10,9,0], [9,9,0], [9,9,0], [11,10,1],
+    [11,9,0], [5,9,0], [7,10,1], [11,9,0], [8,9,0], [13,9,0], [11,9,0], [10,10,1],
+    [9,9,0], [10,12,3], [11,10,1], [7,10,1], [10,9,0], [11,10,1], [11,10,1], [14,10,1],
+    [11,9,0], [11,9,0], [8,9,0], [4,12,3], [7,5,-4], [3,12,3], [6,3,-6], [3,3,-6],
+    [3,5,-4], [7,7,1], [8,10,1], [6,7,1], [8,10,1], [6,7,1], [6,9,0], [7,9,3],
+    [8,9,0], [4,9,0], [5,12,3], [8,9,0], [4,9,0], [12,6,0], [8,6,0], [7,7,1],
+    [8,9,3], [8,9,3], [6,6,0], [5,7,1], [5,9,1], [8,7,1], [7,7,1], [10,7,1],
+    [8,6,0], [7,9,3], [6,6,0], [7,1,-3], [14,1,-3], [6,3,-6], [6,2,-7], [6,3,-6]
+  ],
+  cmti10: [
+    [9,9,0], [10,9,0], [10,10,1], [8,9,0], [10,9,0], [11,9,0], [10,9,0], [10,9,0],
+    [9,9,0], [10,9,0], [10,9,0], [11,12,3], [9,12,3], [9,12,3], [12,12,3], [13,12,3],
+    [4,7,1], [5,9,3], [6,3,-6], [7,3,-6], [7,2,-6], [7,3,-6], [7,2,-6], [9,3,-6],
+    [5,4,3], [8,12,3], [9,7,1], [9,7,1], [7,9,2], [12,9,0], [13,10,1], [10,10,1],
+    [5,2,-3], [5,9,0], [7,5,-4], [10,12,3], [9,10,1], [11,10,1], [10,10,1], [5,5,-4],
+    [7,12,3], [5,12,3], [7,6,-3], [10,8,1], [3,5,3], [5,1,-2], [3,2,0], [8,12,3],
+    [7,9,1], [6,8,0], [7,9,1], [7,9,1], [6,11,3], [7,9,1], [7,9,1], [8,9,1],
+    [7,9,1], [7,9,1], [4,6,0], [4,9,3], [4,9,3], [10,4,-1], [6,9,3], [7,9,0],
+    [10,10,1], [9,9,0], [9,9,0], [10,10,1], [10,9,0], [9,9,0], [9,9,0], [10,10,1],
+    [11,9,0], [7,9,0], [8,10,1], [11,9,0], [8,9,0], [13,9,0], [11,9,0], [10,10,1],
+    [9,9,0], [10,12,3], [9,10,1], [8,10,1], [10,9,0], [11,10,1], [11,10,1], [14,10,1],
+    [10,9,0], [11,9,0], [9,9,0], [6,12,3], [8,5,-4], [6,12,3], [7,3,-6], [5,3,-6],
+    [5,5,-4], [7,7,1], [6,10,1], [6,7,1], [7,10,1], [6,7,1], [7,12,3], [6,9,3],
+    [7,10,1], [4,9,1], [6,11,3], [7,10,1], [4,10,1], [11,7,1], [8,7,1], [7,7,1],
+    [7,9,3], [6,9,3], [6,7,1], [6,7,1], [5,9,1], [7,7,1], [6,7,1], [9,7,1],
+    [7,7,1], [7,9,3], [6,7,1], [7,1,-3], [13,1,-3], [7,3,-6], [7,3,-6], [7,3,-6]
+  ]
+});
+
+jsMath.Img.AddFont(100,{
+  cmr10: [
+    [9,10,0], [11,11,0], [11,11,1], [10,11,0], [9,10,0], [11,10,0], [10,10,0], [11,10,0],
+    [10,10,0], [11,10,0], [10,10,0], [9,10,0], [8,10,0], [8,10,0], [12,10,0], [12,10,0],
+    [4,7,0], [4,10,3], [5,3,-7], [6,3,-7], [6,2,-7], [6,3,-7], [7,2,-7], [7,4,-7],
+    [6,4,3], [7,11,1], [10,8,1], [11,8,1], [7,10,2], [13,10,0], [14,11,1], [11,12,1],
+    [4,3,-3], [3,11,0], [5,5,-5], [11,13,3], [7,12,1], [11,12,1], [11,12,1], [3,5,-5],
+    [5,15,4], [5,15,4], [7,7,-4], [11,11,2], [3,5,3], [4,2,-2], [3,2,0], [7,15,4],
+    [7,11,1], [6,10,0], [7,10,0], [7,11,1], [7,10,0], [7,11,1], [7,11,1], [7,11,1],
+    [7,11,1], [7,11,1], [3,7,0], [3,10,3], [3,11,4], [11,5,-1], [6,10,3], [6,10,0],
+    [11,11,1], [11,11,0], [10,10,0], [10,11,1], [10,10,0], [10,10,0], [9,10,0], [11,11,1],
+    [11,10,0], [5,10,0], [7,11,1], [11,10,0], [9,10,0], [13,10,0], [11,10,0], [11,11,1],
+    [9,10,0], [11,13,3], [11,11,1], [7,11,1], [10,10,0], [11,11,1], [11,11,1], [15,11,1],
+    [11,10,0], [11,10,0], [8,10,0], [4,15,4], [7,5,-5], [3,15,4], [6,3,-7], [3,3,-7],
+    [3,5,-5], [7,8,1], [8,11,1], [6,8,1], [8,11,1], [6,8,1], [5,10,0], [7,10,3],
+    [8,10,0], [4,10,0], [4,13,3], [8,10,0], [4,10,0], [12,7,0], [8,7,0], [7,8,1],
+    [8,10,3], [8,10,3], [6,7,0], [6,8,1], [5,10,1], [8,8,1], [8,8,1], [10,8,1],
+    [8,7,0], [8,10,3], [6,7,0], [7,1,-3], [14,1,-3], [6,3,-7], [6,2,-8], [6,3,-7]
+  ],
+  cmmi10: [
+    [11,10,0], [12,11,0], [11,11,1], [10,11,0], [11,10,0], [13,10,0], [12,10,0], [10,10,0],
+    [9,10,0], [10,10,0], [11,10,0], [9,8,1], [9,13,3], [8,11,4], [7,11,1], [6,8,1],
+    [7,13,3], [7,11,4], [7,11,1], [5,8,1], [8,8,1], [8,11,1], [9,11,4], [8,7,0],
+    [7,13,3], [8,8,1], [8,11,4], [8,8,1], [8,8,1], [8,8,1], [9,13,3], [9,10,3],
+    [9,13,3], [9,8,1], [6,8,1], [8,11,1], [12,8,1], [8,10,3], [6,9,2], [9,11,4],
+    [14,5,-3], [14,5,1], [14,5,-3], [14,5,1], [4,4,-3], [4,4,-3], [7,9,1], [7,9,1],
+    [7,8,1], [6,7,0], [7,7,0], [7,11,4], [7,10,3], [7,11,4], [7,11,1], [7,11,4],
+    [7,11,1], [7,11,4], [3,2,0], [3,5,3], [10,9,1], [7,15,4], [10,9,1], [7,7,0],
+    [8,12,1], [11,11,0], [11,10,0], [11,11,1], [12,10,0], [11,10,0], [11,10,0], [11,11,1],
+    [13,10,0], [7,10,0], [9,11,1], [13,10,0], [9,10,0], [15,10,0], [13,10,0], [11,11,1],
+    [11,10,0], [11,13,3], [11,11,1], [10,11,1], [10,10,0], [11,11,1], [11,11,1], [15,11,1],
+    [12,10,0], [11,10,0], [11,10,0], [5,12,1], [5,15,4], [5,15,4], [14,5,-1], [14,5,-1],
+    [6,11,1], [7,8,1], [6,11,1], [7,8,1], [8,11,1], [7,8,1], [8,13,3], [7,10,3],
+    [8,11,1], [5,11,1], [7,13,3], [8,11,1], [4,11,1], [12,8,1], [8,8,1], [7,8,1],
+    [8,10,3], [7,10,3], [7,8,1], [6,8,1], [5,10,1], [8,8,1], [7,8,1], [10,8,1],
+    [8,8,1], [7,10,3], [7,8,1], [5,8,1], [7,10,3], [9,11,4], [9,3,-7], [10,3,-7]
+  ],
+  cmsy10: [
+    [10,1,-3], [3,3,-2], [9,7,0], [7,7,0], [11,9,1], [7,7,0], [11,10,0], [11,10,3],
+    [11,11,2], [11,11,2], [11,11,2], [11,11,2], [11,11,2], [14,15,4], [7,7,0], [7,7,0],
+    [11,7,0], [11,7,0], [10,11,2], [10,11,2], [10,11,2], [10,11,2], [10,11,2], [10,11,2],
+    [11,5,-1], [11,7,0], [10,9,1], [10,9,1], [14,9,1], [14,9,1], [10,9,1], [10,9,1],
+    [14,5,-1], [14,5,-1], [6,13,3], [6,13,3], [14,5,-1], [14,13,3], [14,13,3], [11,7,0],
+    [14,9,1], [14,9,1], [9,13,3], [9,13,3], [14,9,1], [14,13,3], [14,13,3], [11,8,1],
+    [4,8,0], [14,8,1], [9,9,1], [9,9,1], [12,11,0], [12,11,4], [9,15,4], [2,7,0],
+    [8,11,1], [7,10,0], [9,4,-1], [7,13,2], [10,12,1], [10,11,1], [11,10,0], [11,10,0],
+    [8,10,0], [12,12,1], [10,11,1], [8,11,1], [11,10,0], [8,11,1], [12,11,1], [9,12,2],
+    [12,11,1], [10,10,0], [12,12,2], [11,11,1], [10,11,1], [16,11,1], [15,12,1], [11,11,1],
+    [11,11,1], [12,12,2], [12,11,1], [9,11,1], [12,11,0], [11,11,1], [10,11,1], [15,11,1],
+    [12,10,0], [11,12,2], [11,10,0], [9,10,1], [9,10,1], [9,10,1], [9,10,1], [9,10,1],
+    [8,10,0], [8,10,0], [6,15,4], [4,15,4], [6,15,4], [4,15,4], [6,15,4], [6,15,4],
+    [5,15,4], [4,15,4], [3,15,4], [6,15,4], [6,15,4], [9,15,4], [7,15,4], [4,11,2],
+    [12,15,14], [10,10,0], [11,11,1], [7,15,4], [9,9,0], [9,9,0], [10,11,2], [10,11,2],
+    [6,13,3], [6,14,4], [6,13,3], [9,13,3], [11,13,2], [11,14,3], [11,12,1], [11,13,2]
+  ],
+  cmex10: [
+    [6,18,17], [5,18,17], [6,18,17], [3,18,17], [7,18,17], [4,18,17], [7,18,17], [4,18,17],
+    [7,18,17], [7,18,17], [6,18,17], [6,18,17], [3,10,9], [6,10,9], [8,18,17], [8,18,17],
+    [8,26,25], [6,26,25], [10,35,34], [8,35,34], [8,35,34], [4,35,34], [8,35,34], [5,35,34],
+    [8,35,34], [5,35,34], [9,35,34], [9,35,34], [10,35,34], [9,35,34], [14,35,34], [14,35,34],
+    [11,43,42], [8,43,42], [8,43,42], [5,43,42], [9,43,42], [6,43,42], [9,43,42], [6,43,42],
+    [10,43,42], [10,43,42], [10,43,42], [10,43,42], [18,43,42], [18,43,42], [11,26,25], [11,26,25],
+    [12,26,25], [9,26,25], [10,26,25], [5,26,25], [10,26,25], [5,26,25], [6,10,9], [5,10,9],
+    [11,14,13], [8,14,13], [11,14,13], [8,14,13], [8,27,26], [11,27,26], [8,6,5], [5,10,9],
+    [12,26,25], [9,26,25], [6,10,9], [9,10,9], [8,26,25], [7,26,25], [11,15,14], [15,21,20],
+    [9,17,16], [14,33,32], [15,15,14], [21,21,20], [15,15,14], [21,21,20], [15,15,14], [21,21,20],
+    [14,15,14], [13,15,14], [9,17,16], [11,15,14], [11,15,14], [11,15,14], [11,15,14], [11,15,14],
+    [20,21,20], [18,21,20], [14,33,32], [15,21,20], [15,21,20], [15,21,20], [15,21,20], [15,21,20],
+    [13,15,14], [18,21,20], [9,4,-7], [16,3,-8], [22,3,-8], [8,3,-8], [14,3,-8], [21,3,-8],
+    [7,26,25], [4,26,25], [8,26,25], [5,26,25], [8,26,25], [5,26,25], [8,26,25], [8,26,25],
+    [15,18,17], [15,26,25], [15,35,34], [15,43,42], [11,27,26], [11,10,9], [16,10,9], [8,10,9],
+    [8,10,9], [8,10,9], [8,5,3], [8,5,3], [8,5,0], [8,5,0], [11,10,9], [11,10,9]
+  ],
+  cmbx10: [
+    [9,10,0], [13,10,0], [12,11,1], [11,10,0], [11,10,0], [13,10,0], [11,10,0], [12,10,0],
+    [11,10,0], [12,10,0], [11,10,0], [11,10,0], [9,10,0], [9,10,0], [13,10,0], [13,10,0],
+    [4,7,0], [5,10,3], [5,3,-7], [7,3,-7], [7,3,-7], [7,3,-7], [7,2,-7], [8,3,-7],
+    [7,4,3], [8,11,1], [12,8,1], [13,8,1], [8,10,2], [15,10,0], [16,11,1], [12,12,1],
+    [5,3,-3], [4,10,0], [7,6,-4], [13,13,3], [8,12,1], [13,12,1], [12,11,1], [4,6,-4],
+    [6,15,4], [5,15,4], [7,7,-4], [12,11,2], [4,6,3], [5,2,-2], [4,3,0], [8,15,4],
+    [8,11,1], [7,10,0], [8,10,0], [8,11,1], [8,10,0], [8,11,1], [8,11,1], [8,11,1],
+    [8,11,1], [8,11,1], [4,7,0], [4,10,3], [4,10,3], [12,5,-1], [7,10,3], [7,10,0],
+    [12,11,1], [12,10,0], [11,10,0], [11,11,1], [12,10,0], [11,10,0], [10,10,0], [12,11,1],
+    [13,10,0], [6,10,0], [8,11,1], [12,10,0], [9,10,0], [15,10,0], [13,10,0], [12,11,1],
+    [11,10,0], [12,13,3], [13,11,1], [9,11,1], [11,10,0], [12,11,1], [12,11,1], [17,11,1],
+    [12,10,0], [12,10,0], [10,10,0], [5,15,4], [8,6,-4], [3,15,4], [7,3,-7], [4,3,-7],
+    [4,6,-4], [8,8,1], [9,11,1], [7,8,1], [9,11,1], [7,8,1], [7,10,0], [8,10,3],
+    [9,10,0], [4,10,0], [5,13,3], [9,10,0], [5,10,0], [14,7,0], [9,7,0], [8,8,1],
+    [9,10,3], [9,10,3], [7,7,0], [6,8,1], [6,10,1], [9,8,1], [9,8,1], [12,8,1],
+    [9,7,0], [9,10,3], [7,7,0], [9,2,-3], [17,2,-3], [7,3,-7], [7,2,-8], [7,3,-7]
+  ],
+  cmti10: [
+    [10,10,0], [11,11,0], [12,11,1], [9,11,0], [11,10,0], [12,10,0], [11,10,0], [12,10,0],
+    [11,10,0], [12,10,0], [11,10,0], [12,13,3], [10,13,3], [10,13,3], [14,13,3], [15,13,3],
+    [5,8,1], [6,10,3], [7,3,-7], [8,3,-7], [8,2,-7], [8,3,-7], [8,2,-7], [10,4,-7],
+    [5,4,3], [10,13,3], [11,8,1], [11,8,1], [8,10,2], [14,10,0], [15,11,1], [12,12,1],
+    [5,3,-3], [6,11,0], [8,5,-5], [12,13,3], [10,11,1], [12,12,1], [12,12,1], [6,5,-5],
+    [8,15,4], [6,15,4], [9,7,-4], [11,9,1], [4,5,3], [5,2,-2], [4,2,0], [9,15,4],
+    [8,11,1], [7,10,0], [8,11,1], [8,11,1], [7,13,3], [8,11,1], [8,11,1], [9,11,1],
+    [8,11,1], [8,11,1], [5,7,0], [5,10,3], [5,11,4], [11,5,-1], [7,11,4], [8,11,0],
+    [12,11,1], [10,11,0], [11,10,0], [12,11,1], [11,10,0], [11,10,0], [11,10,0], [12,11,1],
+    [12,10,0], [8,10,0], [9,11,1], [13,10,0], [9,10,0], [15,10,0], [12,10,0], [12,11,1],
+    [11,10,0], [12,13,3], [11,11,1], [9,11,1], [12,10,0], [12,11,1], [13,11,1], [16,11,1],
+    [12,10,0], [13,10,0], [10,10,0], [7,15,4], [9,5,-5], [7,15,4], [8,3,-7], [6,3,-7],
+    [6,5,-5], [8,8,1], [7,11,1], [7,8,1], [8,11,1], [7,8,1], [8,13,3], [7,10,3],
+    [8,11,1], [5,11,1], [6,13,3], [8,11,1], [5,11,1], [12,8,1], [9,8,1], [8,8,1],
+    [8,10,3], [7,10,3], [7,8,1], [6,8,1], [6,10,1], [8,8,1], [7,8,1], [10,8,1],
+    [8,8,1], [8,10,3], [7,8,1], [8,1,-3], [15,1,-3], [9,3,-7], [9,3,-7], [8,3,-7]
+  ]
+});
+
+jsMath.Img.AddFont(120,{
+  cmr10: [
+    [10,12,0], [14,13,0], [13,13,1], [12,13,0], [11,12,0], [13,12,0], [12,12,0], [13,12,0],
+    [12,12,0], [13,12,0], [12,12,0], [11,12,0], [9,12,0], [9,12,0], [14,12,0], [14,12,0],
+    [5,8,0], [5,12,4], [5,4,-8], [7,4,-8], [7,3,-8], [7,4,-8], [8,2,-9], [8,4,-9],
+    [7,5,4], [8,13,1], [12,9,1], [13,9,1], [8,12,2], [15,12,0], [17,13,1], [13,14,1],
+    [5,3,-4], [4,13,0], [6,6,-6], [14,16,4], [8,14,1], [14,14,1], [13,14,1], [4,6,-6],
+    [6,18,5], [5,18,5], [8,8,-5], [13,12,2], [4,6,4], [5,2,-3], [4,2,0], [8,18,5],
+    [8,13,1], [8,12,0], [8,12,0], [8,13,1], [8,12,0], [8,13,1], [8,13,1], [9,13,1],
+    [8,13,1], [8,13,1], [4,8,0], [4,12,4], [4,13,4], [13,5,-2], [8,13,4], [8,12,0],
+    [13,13,1], [13,13,0], [12,12,0], [12,13,1], [13,12,0], [12,12,0], [11,12,0], [13,13,1],
+    [13,12,0], [6,12,0], [8,13,1], [13,12,0], [10,12,0], [15,12,0], [13,12,0], [13,13,1],
+    [11,12,0], [13,16,4], [13,13,1], [9,13,1], [12,12,0], [13,13,1], [13,13,1], [18,13,1],
+    [13,12,0], [13,12,0], [10,12,0], [5,18,5], [8,6,-6], [3,18,5], [7,3,-9], [4,3,-9],
+    [4,6,-6], [9,9,1], [9,13,1], [8,9,1], [9,13,1], [8,9,1], [7,12,0], [9,12,4],
+    [10,12,0], [5,12,0], [5,16,4], [9,12,0], [5,12,0], [14,8,0], [10,8,0], [8,9,1],
+    [9,12,4], [9,12,4], [7,8,0], [7,9,1], [6,12,1], [10,9,1], [9,9,1], [12,9,1],
+    [9,8,0], [9,12,4], [7,8,0], [9,1,-4], [17,1,-4], [8,4,-8], [8,3,-9], [7,3,-9]
+  ],
+  cmmi10: [
+    [13,12,0], [14,13,0], [13,13,1], [12,13,0], [14,12,0], [15,12,0], [14,12,0], [12,12,0],
+    [11,12,0], [12,12,0], [14,12,0], [11,9,1], [11,16,4], [10,12,4], [8,14,1], [7,9,1],
+    [9,16,4], [9,12,4], [8,13,1], [6,9,1], [10,9,1], [10,13,1], [10,12,4], [9,8,0],
+    [8,16,4], [10,9,1], [9,12,4], [10,9,1], [9,9,1], [9,9,1], [10,16,4], [11,12,4],
+    [11,16,4], [11,9,1], [8,9,1], [10,13,1], [14,9,1], [9,12,4], [7,10,2], [11,12,4],
+    [17,6,-3], [17,6,1], [17,6,-3], [17,6,1], [4,5,-3], [4,5,-3], [9,10,1], [9,10,1],
+    [8,9,1], [8,8,0], [8,8,0], [8,12,4], [8,12,4], [8,12,4], [8,13,1], [9,12,4],
+    [8,13,1], [8,12,4], [4,2,0], [4,6,4], [12,11,1], [8,18,5], [12,11,1], [9,9,0],
+    [10,14,1], [13,13,0], [13,12,0], [13,13,1], [14,12,0], [14,12,0], [13,12,0], [13,13,1],
+    [15,12,0], [9,12,0], [11,13,1], [16,12,0], [11,12,0], [18,12,0], [15,12,0], [13,13,1],
+    [13,12,0], [13,16,4], [13,13,1], [11,13,1], [12,12,0], [13,13,1], [14,13,1], [18,13,1],
+    [15,12,0], [13,12,0], [13,12,0], [6,14,1], [6,17,4], [6,17,4], [17,5,-2], [17,5,-2],
+    [7,13,1], [9,9,1], [8,13,1], [8,9,1], [9,13,1], [8,9,1], [10,16,4], [9,12,4],
+    [10,13,1], [5,13,1], [8,16,4], [9,13,1], [5,13,1], [15,9,1], [10,9,1], [8,9,1],
+    [10,12,4], [8,12,4], [8,9,1], [8,9,1], [6,12,1], [10,9,1], [8,9,1], [12,9,1],
+    [9,9,1], [9,12,4], [8,9,1], [5,9,1], [8,12,4], [11,12,4], [11,5,-8], [12,3,-9]
+  ],
+  cmsy10: [
+    [12,2,-3], [4,3,-3], [11,9,0], [8,8,0], [13,11,1], [9,9,0], [13,12,0], [13,12,3],
+    [13,12,2], [13,12,2], [13,12,2], [13,12,2], [13,12,2], [17,17,4], [8,8,0], [8,8,0],
+    [13,9,0], [13,8,0], [12,14,3], [12,14,3], [12,14,3], [12,14,3], [12,14,3], [12,14,3],
+    [13,5,-2], [13,9,0], [12,11,1], [12,11,1], [17,12,2], [17,12,2], [12,11,1], [12,11,1],
+    [17,7,-1], [17,7,-1], [8,16,4], [8,16,4], [17,7,-1], [17,16,4], [17,16,4], [13,8,0],
+    [17,10,1], [17,10,1], [10,16,4], [10,16,4], [17,10,1], [17,16,4], [17,16,4], [13,9,1],
+    [5,10,0], [17,9,1], [10,11,1], [10,11,1], [15,13,0], [15,13,4], [11,17,4], [3,7,-1],
+    [10,13,1], [9,12,0], [11,6,-1], [8,16,2], [13,14,1], [12,13,1], [13,12,0], [13,12,0],
+    [10,12,0], [14,14,1], [12,13,1], [10,13,1], [14,12,0], [10,13,1], [15,13,1], [11,15,3],
+    [14,13,1], [12,12,0], [15,15,3], [13,13,1], [12,13,1], [19,13,1], [18,15,1], [14,13,1],
+    [13,13,1], [14,15,3], [15,13,1], [11,13,1], [14,13,0], [13,13,1], [12,13,1], [18,13,1],
+    [14,12,0], [13,15,3], [14,12,0], [11,12,1], [11,12,1], [11,12,1], [11,12,1], [11,12,1],
+    [10,12,0], [10,12,0], [8,18,5], [5,18,5], [8,18,5], [5,18,5], [8,18,5], [8,18,5],
+    [6,18,5], [5,18,5], [3,18,5], [7,18,5], [8,19,5], [10,19,5], [8,18,5], [4,12,2],
+    [15,18,17], [13,12,0], [14,13,1], [8,17,4], [11,11,0], [11,11,0], [13,14,3], [12,14,3],
+    [7,16,4], [7,16,4], [7,16,4], [10,16,4], [13,16,3], [13,16,3], [13,14,1], [13,16,3]
+  ],
+  cmex10: [
+    [8,21,20], [6,21,20], [7,21,20], [4,21,20], [8,21,20], [5,21,20], [8,21,20], [5,21,20],
+    [8,21,20], [8,21,20], [7,21,20], [7,21,20], [4,12,11], [7,12,11], [9,21,20], [9,21,20],
+    [10,31,30], [8,31,30], [12,42,41], [9,42,41], [9,42,41], [5,42,41], [10,42,41], [6,42,41],
+    [10,42,41], [6,42,41], [11,42,41], [11,42,41], [12,42,41], [11,42,41], [17,42,41], [17,42,41],
+    [13,52,51], [10,52,51], [10,52,51], [6,52,51], [11,52,51], [7,52,51], [11,52,51], [7,52,51],
+    [12,52,51], [12,52,51], [12,52,51], [12,52,51], [21,52,51], [21,52,51], [13,31,30], [13,31,30],
+    [15,32,31], [10,32,31], [12,31,30], [6,31,30], [12,31,30], [6,31,30], [7,12,11], [6,12,11],
+    [13,17,16], [9,17,16], [13,17,16], [9,17,16], [9,32,31], [13,32,31], [9,7,6], [7,12,11],
+    [15,31,30], [10,31,30], [7,12,11], [10,12,11], [9,31,30], [9,31,30], [14,18,17], [18,25,24],
+    [11,20,19], [17,39,38], [18,18,17], [25,25,24], [18,18,17], [25,25,24], [18,18,17], [25,25,24],
+    [17,18,17], [16,18,17], [11,20,19], [14,18,17], [14,18,17], [14,18,17], [14,18,17], [14,18,17],
+    [24,25,24], [21,25,24], [17,39,38], [18,25,24], [18,25,24], [18,25,24], [18,25,24], [18,25,24],
+    [16,18,17], [21,25,24], [11,4,-9], [19,5,-9], [26,5,-9], [10,3,-10], [17,3,-10], [25,3,-10],
+    [8,31,30], [5,31,30], [9,31,30], [6,31,30], [9,31,30], [6,31,30], [10,31,30], [10,31,30],
+    [18,21,20], [18,31,30], [18,42,41], [18,52,51], [13,32,31], [13,12,11], [19,11,10], [9,12,11],
+    [10,12,11], [10,12,11], [9,7,4], [10,7,4], [9,6,0], [10,6,0], [13,12,11], [13,12,11]
+  ],
+  cmbx10: [
+    [11,12,0], [16,12,0], [15,13,1], [13,12,0], [13,12,0], [15,12,0], [14,12,0], [15,12,0],
+    [14,12,0], [15,12,0], [14,12,0], [13,12,0], [11,12,0], [11,12,0], [16,12,0], [16,12,0],
+    [5,8,0], [6,12,4], [6,4,-8], [8,4,-8], [8,4,-8], [8,4,-8], [9,2,-9], [10,3,-9],
+    [8,5,4], [10,13,1], [14,9,1], [15,9,1], [10,12,2], [18,12,0], [20,13,1], [15,15,2],
+    [6,3,-4], [5,12,0], [8,7,-5], [16,16,4], [9,14,1], [16,14,1], [15,13,1], [5,7,-5],
+    [7,18,5], [6,18,5], [9,8,-5], [15,14,3], [5,7,4], [6,3,-2], [5,3,0], [9,18,5],
+    [9,13,1], [9,12,0], [9,12,0], [9,13,1], [10,12,0], [9,13,1], [9,13,1], [10,13,1],
+    [9,13,1], [9,13,1], [5,8,0], [5,12,4], [5,13,4], [15,6,-1], [9,13,4], [9,12,0],
+    [15,13,1], [15,12,0], [13,12,0], [14,13,1], [14,12,0], [13,12,0], [12,12,0], [15,13,1],
+    [15,12,0], [7,12,0], [9,13,1], [15,12,0], [11,12,0], [18,12,0], [15,12,0], [14,13,1],
+    [13,12,0], [14,16,4], [15,13,1], [10,13,1], [13,12,0], [15,13,1], [15,13,1], [20,13,1],
+    [15,12,0], [15,12,0], [11,12,0], [5,18,5], [10,7,-5], [4,18,5], [8,3,-9], [5,3,-9],
+    [5,7,-5], [10,9,1], [11,13,1], [9,9,1], [11,13,1], [9,9,1], [8,12,0], [10,12,4],
+    [11,12,0], [5,12,0], [6,16,4], [10,12,0], [5,12,0], [16,8,0], [11,8,0], [10,9,1],
+    [11,12,4], [11,12,4], [8,8,0], [8,9,1], [7,12,1], [11,9,1], [10,9,1], [14,9,1],
+    [10,8,0], [10,12,4], [8,8,0], [10,1,-4], [20,1,-4], [9,5,-8], [9,3,-9], [8,3,-9]
+  ],
+  cmti10: [
+    [13,12,0], [13,13,0], [14,13,1], [11,13,0], [13,12,0], [15,12,0], [14,12,0], [15,12,0],
+    [13,12,0], [15,12,0], [13,12,0], [14,16,4], [12,16,4], [12,16,4], [17,16,4], [18,16,4],
+    [6,9,1], [7,12,4], [8,4,-8], [10,4,-8], [10,3,-8], [10,4,-8], [10,2,-9], [12,4,-9],
+    [6,5,4], [11,16,4], [13,9,1], [13,9,1], [10,12,2], [17,12,0], [18,13,1], [14,15,2],
+    [6,3,-4], [7,13,0], [9,6,-6], [15,16,4], [12,13,1], [15,14,1], [14,14,1], [7,6,-6],
+    [9,18,5], [7,18,5], [10,8,-5], [13,11,1], [4,6,4], [6,2,-3], [4,2,0], [11,18,5],
+    [10,13,1], [8,12,0], [10,13,1], [10,13,1], [9,16,4], [10,13,1], [10,13,1], [11,13,1],
+    [10,13,1], [10,13,1], [6,8,0], [6,12,4], [6,13,4], [14,5,-2], [8,13,4], [10,13,0],
+    [14,13,1], [12,13,0], [13,12,0], [14,13,1], [14,12,0], [13,12,0], [13,12,0], [14,13,1],
+    [15,12,0], [9,12,0], [11,13,1], [15,12,0], [11,12,0], [18,12,0], [15,12,0], [14,13,1],
+    [13,12,0], [14,16,4], [13,13,1], [11,13,1], [14,12,0], [15,13,1], [15,13,1], [20,13,1],
+    [15,12,0], [15,12,0], [12,12,0], [8,18,5], [11,6,-6], [8,18,5], [9,3,-9], [7,3,-9],
+    [7,6,-6], [10,9,1], [8,13,1], [8,9,1], [10,13,1], [8,9,1], [9,16,4], [9,12,4],
+    [10,13,1], [6,13,1], [8,16,4], [9,13,1], [6,13,1], [15,9,1], [10,9,1], [9,9,1],
+    [9,12,4], [9,12,4], [9,9,1], [8,9,1], [7,12,1], [10,9,1], [9,9,1], [12,9,1],
+    [9,9,1], [9,12,4], [8,9,1], [10,1,-4], [18,1,-4], [10,4,-8], [10,3,-9], [10,3,-9]
+  ]
+});
+
+jsMath.Img.AddFont(144,{
+  cmr10: [
+    [12,14,0], [16,15,0], [15,16,1], [14,15,0], [13,14,0], [15,14,0], [14,14,0], [15,15,0],
+    [14,14,0], [15,14,0], [14,15,0], [13,15,0], [11,15,0], [11,15,0], [17,15,0], [17,15,0],
+    [5,9,0], [6,14,5], [6,4,-10], [8,4,-10], [8,3,-10], [8,4,-10], [9,1,-11], [10,5,-10],
+    [8,6,5], [10,16,1], [14,10,1], [15,10,1], [10,14,3], [18,14,0], [20,16,1], [15,17,2],
+    [6,3,-5], [4,15,0], [7,7,-7], [16,18,4], [9,17,2], [16,17,2], [15,16,1], [5,7,-7],
+    [7,20,5], [6,20,5], [9,9,-6], [15,14,2], [5,7,4], [6,2,-3], [4,3,0], [9,20,5],
+    [10,15,1], [9,14,0], [9,14,0], [10,15,1], [10,14,0], [9,15,1], [10,15,1], [10,15,1],
+    [10,15,1], [10,15,1], [4,9,0], [4,13,4], [4,15,5], [15,6,-2], [9,15,5], [9,15,0],
+    [15,16,1], [15,15,0], [14,14,0], [14,16,1], [15,14,0], [14,14,0], [13,14,0], [15,16,1],
+    [15,14,0], [7,14,0], [10,15,1], [15,14,0], [12,14,0], [18,14,0], [15,14,0], [15,16,1],
+    [13,14,0], [15,19,4], [15,15,1], [10,16,1], [14,14,0], [15,15,1], [15,15,1], [21,15,1],
+    [15,14,0], [15,14,0], [12,14,0], [6,20,5], [10,7,-7], [4,20,5], [8,4,-10], [4,3,-11],
+    [4,7,-7], [10,10,1], [11,15,1], [9,10,1], [11,15,1], [9,10,1], [8,15,0], [10,15,5],
+    [11,14,0], [5,14,0], [6,19,5], [11,14,0], [6,14,0], [17,9,0], [11,9,0], [10,10,1],
+    [11,13,4], [11,13,4], [8,9,0], [8,10,1], [7,14,1], [11,10,1], [11,10,1], [15,10,1],
+    [11,9,0], [11,14,5], [9,9,0], [10,1,-5], [20,1,-5], [9,4,-10], [9,3,-11], [8,3,-11]
+  ],
+  cmmi10: [
+    [15,14,0], [16,15,0], [15,16,1], [14,15,0], [16,14,0], [18,14,0], [17,14,0], [15,15,0],
+    [13,14,0], [14,14,0], [16,15,0], [13,10,1], [12,19,4], [11,14,5], [10,16,1], [8,10,1],
+    [10,19,5], [10,14,5], [10,16,1], [7,10,1], [11,10,1], [11,15,1], [12,14,5], [11,9,0],
+    [9,19,5], [12,10,1], [11,14,5], [12,10,1], [11,10,1], [11,10,1], [12,19,5], [12,14,5],
+    [13,19,5], [13,10,1], [9,11,1], [12,16,1], [17,10,1], [11,13,4], [9,12,3], [13,14,5],
+    [19,7,-4], [19,7,1], [19,7,-4], [19,7,1], [5,6,-4], [5,6,-4], [10,12,1], [10,12,1],
+    [10,11,1], [9,10,0], [9,10,0], [10,15,5], [10,14,4], [9,15,5], [10,15,1], [10,15,5],
+    [10,15,1], [10,15,5], [4,3,0], [5,7,4], [14,12,1], [9,20,5], [14,12,1], [10,10,0],
+    [12,16,1], [15,15,0], [16,14,0], [16,16,1], [17,14,0], [16,14,0], [16,14,0], [16,16,1],
+    [18,14,0], [10,14,0], [13,15,1], [18,14,0], [13,14,0], [21,14,0], [18,14,0], [15,16,1],
+    [16,14,0], [15,19,4], [16,15,1], [13,16,1], [15,14,0], [16,15,1], [16,15,1], [21,15,1],
+    [18,14,0], [16,14,0], [15,14,0], [7,16,1], [7,20,5], [7,20,5], [19,6,-2], [19,6,-2],
+    [8,16,1], [10,10,1], [9,15,1], [9,10,1], [11,15,1], [9,10,1], [12,20,5], [10,14,5],
+    [11,15,1], [6,15,1], [9,19,5], [11,15,1], [6,15,1], [17,10,1], [12,10,1], [10,10,1],
+    [11,13,4], [10,13,4], [9,10,1], [9,10,1], [7,14,1], [11,10,1], [10,10,1], [14,10,1],
+    [11,10,1], [10,14,5], [10,10,1], [6,10,1], [9,14,5], [13,15,5], [13,5,-10], [13,4,-10]
+  ],
+  cmsy10: [
+    [14,2,-4], [4,4,-3], [13,10,0], [9,10,0], [15,12,1], [10,10,0], [15,14,0], [15,14,4],
+    [15,14,2], [15,14,2], [15,14,2], [15,14,2], [15,14,2], [19,20,5], [9,8,-1], [9,8,-1],
+    [15,10,0], [15,10,0], [14,16,3], [14,16,3], [14,16,3], [14,16,3], [14,16,3], [14,16,3],
+    [15,6,-2], [15,9,-1], [14,12,1], [14,12,1], [19,14,2], [19,14,2], [14,12,1], [14,12,1],
+    [19,8,-1], [19,8,-1], [9,18,4], [9,18,4], [19,8,-1], [19,18,4], [19,18,4], [15,10,0],
+    [19,12,1], [19,12,1], [12,18,4], [12,18,4], [20,12,1], [19,18,4], [19,18,4], [15,10,1],
+    [6,12,0], [19,10,1], [12,12,1], [12,12,1], [17,15,0], [17,15,5], [13,20,5], [3,8,-1],
+    [12,15,1], [10,14,0], [13,7,-1], [10,18,2], [15,16,1], [14,16,1], [15,14,0], [15,14,0],
+    [12,14,0], [16,16,1], [14,16,1], [11,16,1], [16,14,0], [12,16,1], [17,15,1], [13,18,3],
+    [17,15,1], [14,14,0], [17,17,3], [15,16,1], [14,16,1], [23,16,1], [21,17,1], [16,16,1],
+    [15,15,1], [16,18,3], [17,15,1], [13,16,1], [16,15,0], [15,15,1], [14,15,1], [21,15,1],
+    [17,14,0], [15,17,3], [16,14,0], [13,13,1], [13,13,1], [13,13,1], [13,13,1], [13,13,1],
+    [12,14,0], [12,14,0], [9,20,5], [6,20,5], [9,20,5], [6,20,5], [9,20,5], [9,20,5],
+    [7,20,5], [6,20,5], [4,20,5], [8,20,5], [9,22,6], [12,22,6], [9,20,5], [5,14,2],
+    [18,21,20], [15,14,0], [16,15,1], [10,20,5], [13,12,0], [13,12,0], [15,16,3], [14,16,3],
+    [8,20,5], [8,20,5], [8,20,5], [12,18,4], [15,18,3], [15,19,4], [15,16,1], [15,18,3]
+  ],
+  cmex10: [
+    [9,25,24], [7,25,24], [8,25,24], [5,25,24], [9,25,24], [6,25,24], [9,25,24], [6,25,24],
+    [10,25,24], [10,25,24], [8,25,24], [8,25,24], [4,14,13], [9,14,13], [11,25,24], [11,25,24],
+    [12,37,36], [9,37,36], [14,49,48], [11,49,48], [11,49,48], [6,49,48], [12,49,48], [7,49,48],
+    [12,49,48], [7,49,48], [13,49,48], [13,49,48], [14,49,48], [13,49,48], [20,49,48], [20,49,48],
+    [16,61,60], [12,61,60], [12,61,60], [7,61,60], [13,61,60], [8,61,60], [13,61,60], [8,61,60],
+    [14,61,60], [14,61,60], [14,61,60], [14,61,60], [25,61,60], [25,61,60], [16,37,36], [16,37,36],
+    [17,37,36], [12,37,36], [14,37,36], [7,37,36], [14,37,36], [7,37,36], [8,14,13], [7,14,13],
+    [15,20,19], [11,20,19], [15,19,18], [11,19,18], [11,38,37], [15,38,37], [11,8,7], [8,14,13],
+    [17,37,36], [12,37,36], [9,14,13], [12,14,13], [11,37,36], [10,37,36], [16,21,20], [22,29,28],
+    [13,24,23], [19,46,45], [22,21,20], [30,29,28], [22,21,20], [30,29,28], [22,21,20], [30,29,28],
+    [20,21,20], [18,21,20], [13,24,23], [16,21,20], [16,21,20], [16,21,20], [16,21,20], [16,21,20],
+    [28,29,28], [25,29,28], [19,46,45], [22,29,28], [22,29,28], [22,29,28], [22,29,28], [22,29,28],
+    [18,21,20], [25,29,28], [13,4,-11], [22,5,-11], [30,5,-11], [12,3,-12], [20,3,-12], [29,3,-12],
+    [10,37,36], [5,37,36], [11,37,36], [7,37,36], [11,37,36], [7,37,36], [11,37,36], [11,37,36],
+    [21,25,24], [21,37,36], [21,49,48], [21,61,60], [15,37,36], [15,14,13], [22,13,12], [11,14,13],
+    [12,13,12], [12,13,12], [11,8,5], [11,8,5], [11,7,0], [11,7,0], [15,13,12], [15,13,12]
+  ],
+  cmbx10: [
+    [13,14,0], [18,14,0], [17,15,1], [16,14,0], [15,14,0], [18,14,0], [16,14,0], [17,14,0],
+    [16,14,0], [17,14,0], [16,14,0], [15,14,0], [13,14,0], [13,14,0], [19,14,0], [19,14,0],
+    [6,9,0], [8,13,4], [7,5,-10], [10,5,-10], [9,4,-10], [10,4,-10], [10,2,-11], [12,5,-10],
+    [9,5,4], [12,15,1], [16,11,1], [18,11,1], [11,15,3], [21,14,0], [23,15,1], [17,17,2],
+    [7,4,-5], [6,15,0], [10,8,-6], [18,18,4], [11,17,2], [18,17,2], [17,16,1], [6,8,-6],
+    [8,20,5], [7,20,5], [10,9,-6], [17,16,3], [5,8,4], [7,3,-3], [5,4,0], [11,20,5],
+    [11,15,1], [10,14,0], [11,14,0], [11,15,1], [11,14,0], [11,15,1], [11,15,1], [12,15,1],
+    [11,15,1], [11,15,1], [5,9,0], [5,13,4], [6,15,5], [17,6,-2], [10,14,4], [10,14,0],
+    [17,15,1], [17,14,0], [16,14,0], [16,15,1], [17,14,0], [15,14,0], [14,14,0], [17,15,1],
+    [18,14,0], [9,14,0], [11,15,1], [18,14,0], [13,14,0], [22,14,0], [18,14,0], [16,15,1],
+    [15,14,0], [17,18,4], [18,15,1], [12,15,1], [16,14,0], [17,15,1], [17,15,1], [24,15,1],
+    [17,14,0], [17,14,0], [13,14,0], [6,20,5], [12,8,-6], [4,20,5], [9,4,-10], [5,4,-10],
+    [5,8,-6], [12,11,1], [12,15,1], [10,11,1], [13,15,1], [10,11,1], [9,14,0], [12,15,5],
+    [13,14,0], [6,14,0], [8,18,4], [12,14,0], [6,14,0], [19,9,0], [13,9,0], [11,11,1],
+    [12,13,4], [13,13,4], [9,9,0], [9,11,1], [8,14,1], [13,10,1], [12,10,1], [17,10,1],
+    [12,9,0], [12,13,4], [10,9,0], [12,1,-5], [23,1,-5], [10,5,-10], [10,3,-11], [10,3,-11]
+  ],
+  cmti10: [
+    [15,14,0], [16,15,0], [16,16,1], [13,15,0], [16,14,0], [18,14,0], [16,14,0], [17,15,0],
+    [15,14,0], [17,14,0], [16,15,0], [17,20,5], [13,20,5], [14,20,5], [20,20,5], [20,20,5],
+    [7,10,1], [8,14,5], [9,4,-10], [12,4,-10], [11,3,-10], [12,4,-10], [12,1,-11], [14,5,-10],
+    [7,5,4], [13,20,5], [15,10,1], [15,10,1], [11,14,3], [20,14,0], [22,16,1], [17,17,2],
+    [7,3,-5], [8,15,0], [11,7,-7], [17,18,4], [14,16,1], [17,17,2], [17,16,1], [8,7,-7],
+    [11,20,5], [8,20,5], [12,9,-6], [16,14,2], [5,7,4], [7,2,-3], [5,3,0], [13,20,5],
+    [12,15,1], [10,14,0], [12,15,1], [12,15,1], [10,18,4], [12,15,1], [12,15,1], [13,15,1],
+    [12,15,1], [12,15,1], [7,9,0], [7,13,4], [7,15,5], [16,6,-2], [9,15,5], [12,15,0],
+    [16,16,1], [14,15,0], [15,14,0], [17,16,1], [16,14,0], [15,14,0], [15,14,0], [17,16,1],
+    [18,14,0], [11,14,0], [13,15,1], [18,14,0], [13,14,0], [21,14,0], [18,14,0], [16,16,1],
+    [15,14,0], [16,19,4], [15,15,1], [13,16,1], [17,14,0], [18,15,1], [18,15,1], [23,15,1],
+    [17,14,0], [18,14,0], [15,14,0], [9,20,5], [13,7,-7], [9,20,5], [11,4,-10], [8,3,-11],
+    [8,7,-7], [11,10,1], [10,15,1], [10,10,1], [12,15,1], [10,10,1], [11,20,5], [10,14,5],
+    [11,15,1], [7,15,1], [9,19,5], [11,15,1], [7,15,1], [17,10,1], [12,10,1], [11,10,1],
+    [11,13,4], [10,13,4], [10,10,1], [9,10,1], [8,14,1], [12,10,1], [10,10,1], [14,10,1],
+    [11,10,1], [11,14,5], [10,10,1], [12,1,-5], [21,1,-5], [12,4,-10], [12,3,-11], [11,3,-11]
+  ]
+});
+
+jsMath.Img.AddFont(173,{
+  cmr10: [
+    [14,17,0], [19,18,0], [18,18,1], [16,18,0], [15,17,0], [18,17,0], [16,17,0], [18,17,0],
+    [16,17,0], [18,17,0], [17,17,0], [16,17,0], [13,17,0], [13,17,0], [20,17,0], [20,17,0],
+    [6,11,0], [7,16,5], [8,5,-12], [10,5,-12], [10,4,-12], [10,5,-12], [11,2,-13], [12,6,-12],
+    [9,6,5], [12,18,1], [17,12,1], [18,12,1], [12,16,3], [21,17,0], [24,18,1], [18,20,2],
+    [7,4,-6], [5,18,0], [9,8,-9], [19,22,5], [11,20,2], [19,20,2], [18,19,1], [5,8,-9],
+    [8,24,6], [7,24,6], [11,11,-7], [18,16,2], [5,8,5], [7,2,-4], [5,3,0], [11,24,6],
+    [12,17,1], [11,16,0], [11,16,0], [11,17,1], [12,17,0], [11,17,1], [11,17,1], [12,18,1],
+    [11,17,1], [11,17,1], [5,11,0], [5,16,5], [5,18,6], [18,6,-3], [10,17,5], [10,17,0],
+    [18,18,1], [18,18,0], [16,17,0], [16,18,1], [17,17,0], [16,17,0], [15,17,0], [18,18,1],
+    [18,17,0], [8,17,0], [12,18,1], [18,17,0], [14,17,0], [22,17,0], [18,17,0], [18,18,1],
+    [15,17,0], [18,22,5], [18,18,1], [12,18,1], [17,17,0], [18,18,1], [18,18,1], [25,18,1],
+    [18,17,0], [18,17,0], [14,17,0], [7,24,6], [12,8,-9], [4,24,6], [10,5,-12], [5,4,-13],
+    [5,8,-9], [12,12,1], [13,18,1], [10,12,1], [13,18,1], [10,12,1], [9,17,0], [12,16,5],
+    [13,17,0], [6,17,0], [7,22,5], [13,17,0], [7,17,0], [20,11,0], [13,11,0], [12,12,1],
+    [13,16,5], [13,16,5], [9,11,0], [9,12,1], [8,16,1], [13,12,1], [13,12,1], [17,12,1],
+    [13,11,0], [13,16,5], [10,11,0], [12,1,-6], [24,1,-6], [11,5,-12], [10,4,-13], [10,4,-13]
+  ],
+  cmmi10: [
+    [18,17,0], [19,18,0], [18,18,1], [16,18,0], [19,17,0], [22,17,0], [20,17,0], [17,17,0],
+    [16,17,0], [17,17,0], [19,17,0], [15,12,1], [15,22,5], [14,17,6], [11,19,1], [10,12,1],
+    [12,22,5], [12,17,6], [11,18,1], [8,12,1], [14,12,1], [14,18,1], [14,17,6], [13,11,0],
+    [11,22,5], [14,12,1], [13,17,6], [14,12,1], [13,12,1], [13,12,1], [14,22,5], [15,16,5],
+    [16,22,5], [15,12,1], [11,12,1], [14,18,1], [20,12,1], [13,16,5], [10,14,3], [15,17,6],
+    [23,8,-5], [23,8,1], [23,8,-5], [23,8,1], [6,7,-5], [6,7,-5], [12,14,1], [12,14,1],
+    [12,12,1], [11,11,0], [11,11,0], [11,17,6], [12,17,5], [11,17,6], [11,17,1], [12,18,6],
+    [11,17,1], [11,17,6], [5,3,0], [5,8,5], [17,14,1], [11,24,6], [17,14,1], [12,12,0],
+    [14,19,1], [18,18,0], [19,17,0], [19,18,1], [20,17,0], [19,17,0], [19,17,0], [19,18,1],
+    [22,17,0], [12,17,0], [16,18,1], [22,17,0], [16,17,0], [26,17,0], [22,17,0], [18,18,1],
+    [19,17,0], [18,22,5], [19,18,1], [16,18,1], [17,17,0], [19,18,1], [19,18,1], [26,18,1],
+    [21,17,0], [19,17,0], [18,17,0], [8,19,1], [8,24,6], [8,24,6], [23,6,-3], [23,7,-3],
+    [10,18,1], [12,12,1], [10,18,1], [11,12,1], [13,18,1], [11,12,1], [14,22,5], [12,16,5],
+    [14,18,1], [8,17,1], [11,21,5], [13,18,1], [7,18,1], [21,12,1], [14,12,1], [12,12,1],
+    [13,16,5], [11,16,5], [11,12,1], [11,12,1], [8,17,1], [14,12,1], [12,12,1], [17,12,1],
+    [13,12,1], [12,16,5], [12,12,1], [8,12,1], [10,16,5], [15,17,6], [15,6,-12], [16,4,-12]
+  ],
+  cmsy10: [
+    [17,2,-5], [5,4,-4], [16,12,0], [11,12,0], [18,14,1], [12,12,0], [18,16,0], [18,16,4],
+    [18,16,2], [18,16,2], [18,16,2], [18,16,2], [18,16,2], [23,24,6], [11,10,-1], [11,10,-1],
+    [18,12,0], [18,12,0], [17,20,4], [17,20,4], [17,20,4], [17,20,4], [17,20,4], [17,20,4],
+    [18,6,-3], [18,11,-1], [17,14,1], [17,14,1], [23,16,2], [23,16,2], [17,14,1], [17,14,1],
+    [23,10,-1], [23,10,-1], [11,22,5], [11,22,5], [23,10,-1], [23,22,5], [23,22,5], [18,12,0],
+    [23,14,1], [23,14,1], [14,22,5], [14,22,5], [24,14,1], [23,22,5], [23,22,5], [18,12,1],
+    [7,13,-1], [23,12,1], [14,14,1], [14,14,1], [20,18,0], [20,18,6], [16,24,6], [3,10,-1],
+    [14,18,1], [12,17,0], [15,7,-2], [11,21,2], [18,19,1], [17,18,1], [18,16,0], [18,16,0],
+    [14,17,0], [20,20,2], [16,18,1], [13,18,1], [19,17,0], [14,18,1], [20,18,1], [15,20,3],
+    [20,19,2], [17,17,0], [21,20,3], [18,18,1], [16,18,1], [27,19,2], [25,21,2], [19,18,1],
+    [18,19,2], [19,20,3], [21,18,1], [16,18,1], [20,18,0], [18,18,1], [16,19,2], [25,19,2],
+    [20,17,0], [18,21,4], [19,17,0], [15,16,1], [15,16,1], [15,16,1], [15,16,1], [15,16,1],
+    [14,17,0], [14,17,0], [11,24,6], [7,24,6], [11,24,6], [7,24,6], [11,24,6], [11,24,6],
+    [8,24,6], [7,24,6], [4,24,6], [9,24,6], [11,26,7], [14,26,7], [11,24,6], [6,16,2],
+    [21,25,24], [18,17,0], [19,18,1], [12,24,6], [15,15,0], [15,15,0], [18,20,4], [17,20,4],
+    [9,22,5], [10,23,6], [10,22,5], [14,22,5], [18,22,4], [18,22,4], [18,19,1], [18,22,4]
+  ],
+  cmex10: [
+    [10,29,28], [8,29,28], [10,29,28], [6,29,28], [11,29,28], [7,29,28], [11,29,28], [7,29,28],
+    [12,29,28], [12,29,28], [10,29,28], [9,29,28], [5,16,15], [10,16,15], [13,29,28], [13,29,28],
+    [14,44,43], [10,44,43], [17,58,57], [13,58,57], [13,58,57], [7,58,57], [14,58,57], [8,58,57],
+    [14,58,57], [8,58,57], [15,58,57], [15,58,57], [16,58,57], [15,58,57], [24,58,57], [24,58,57],
+    [19,73,72], [14,73,72], [14,73,72], [8,73,72], [16,73,72], [9,73,72], [16,73,72], [9,73,72],
+    [16,73,72], [16,73,72], [17,73,72], [16,73,72], [30,73,72], [30,73,72], [19,44,43], [19,44,43],
+    [21,44,43], [14,44,43], [16,44,43], [9,44,43], [16,44,43], [9,44,43], [10,16,15], [9,16,15],
+    [18,23,22], [13,23,22], [18,23,22], [13,23,22], [13,45,44], [18,45,44], [13,9,8], [9,16,15],
+    [21,45,43], [14,45,43], [10,16,15], [14,16,15], [13,44,43], [12,44,43], [19,25,24], [26,35,34],
+    [15,28,27], [23,55,54], [26,25,24], [35,35,34], [26,25,24], [35,35,34], [26,25,24], [35,35,34],
+    [24,25,24], [22,25,24], [15,28,27], [19,25,24], [19,25,24], [19,25,24], [19,25,24], [19,25,24],
+    [34,35,34], [30,35,34], [23,55,54], [26,35,34], [26,35,34], [26,35,34], [26,35,34], [26,35,34],
+    [22,25,24], [30,35,34], [15,5,-13], [26,6,-13], [36,6,-13], [14,4,-14], [24,4,-14], [35,4,-14],
+    [11,44,43], [6,44,43], [13,44,43], [8,44,43], [13,44,43], [8,44,43], [14,44,43], [14,44,43],
+    [25,29,28], [25,44,43], [25,58,57], [25,73,72], [18,45,44], [18,16,15], [26,15,14], [13,16,15],
+    [14,16,15], [14,16,15], [13,9,6], [13,9,6], [13,9,0], [13,9,0], [18,16,15], [18,16,15]
+  ],
+  cmbx10: [
+    [16,17,0], [22,17,0], [20,18,1], [19,17,0], [18,17,0], [21,17,0], [19,17,0], [20,17,0],
+    [19,17,0], [20,17,0], [19,17,0], [18,17,0], [15,17,0], [15,17,0], [23,17,0], [23,17,0],
+    [7,11,0], [9,16,5], [9,5,-12], [11,5,-12], [11,4,-12], [12,5,-12], [12,2,-13], [14,5,-12],
+    [11,6,5], [14,18,1], [20,12,1], [21,12,1], [14,17,3], [25,17,0], [28,18,1], [20,20,2],
+    [8,4,-6], [7,17,0], [12,9,-8], [22,22,5], [13,20,2], [22,20,2], [21,18,1], [7,9,-8],
+    [10,24,6], [9,24,6], [12,11,-7], [20,20,4], [6,9,5], [8,3,-4], [6,4,0], [13,24,6],
+    [13,17,1], [12,16,0], [13,16,0], [13,17,1], [14,16,0], [13,17,1], [13,17,1], [14,18,1],
+    [13,17,1], [13,17,1], [6,11,0], [6,16,5], [7,17,5], [20,8,-2], [12,17,5], [12,17,0],
+    [20,18,1], [20,17,0], [19,17,0], [19,18,1], [20,17,0], [18,17,0], [17,17,0], [21,18,1],
+    [21,17,0], [10,17,0], [13,18,1], [21,17,0], [16,17,0], [26,17,0], [21,17,0], [20,18,1],
+    [18,17,0], [20,22,5], [21,18,1], [14,18,1], [19,17,0], [21,18,1], [21,18,1], [28,18,1],
+    [21,17,0], [21,17,0], [16,17,0], [8,24,6], [14,9,-8], [5,24,6], [11,5,-12], [6,5,-12],
+    [6,9,-8], [14,12,1], [15,18,1], [12,12,1], [15,18,1], [12,12,1], [11,17,0], [14,16,5],
+    [15,17,0], [7,17,0], [9,22,5], [15,17,0], [8,17,0], [23,11,0], [15,11,0], [14,12,1],
+    [15,16,5], [15,16,5], [11,11,0], [10,12,1], [10,17,1], [15,12,1], [14,12,1], [20,12,1],
+    [15,11,0], [14,16,5], [12,11,0], [14,2,-6], [28,2,-6], [12,6,-12], [12,3,-14], [12,4,-13]
+  ],
+  cmti10: [
+    [17,17,0], [19,18,0], [19,18,1], [16,18,0], [19,17,0], [21,17,0], [19,17,0], [20,17,0],
+    [18,17,0], [20,17,0], [19,17,0], [20,22,5], [16,22,5], [17,22,5], [23,22,5], [24,22,5],
+    [8,12,1], [9,16,5], [11,5,-12], [14,5,-12], [13,4,-12], [14,5,-12], [14,2,-13], [17,6,-12],
+    [9,6,5], [15,22,5], [18,12,1], [18,12,1], [14,16,3], [23,17,0], [26,18,1], [20,20,2],
+    [9,4,-6], [9,18,0], [13,8,-9], [20,22,5], [17,18,1], [21,20,2], [20,19,1], [9,8,-9],
+    [13,24,6], [10,24,6], [14,11,-7], [19,16,2], [6,8,5], [9,2,-4], [6,3,0], [15,24,6],
+    [14,17,1], [12,16,0], [14,17,1], [14,17,1], [12,21,5], [14,17,1], [14,17,1], [15,17,1],
+    [14,17,1], [14,17,1], [8,11,0], [8,16,5], [8,18,6], [19,6,-3], [11,18,6], [14,18,0],
+    [19,18,1], [17,18,0], [18,17,0], [20,18,1], [19,17,0], [18,17,0], [18,17,0], [20,18,1],
+    [21,17,0], [13,17,0], [15,18,1], [21,17,0], [15,17,0], [25,17,0], [21,17,0], [19,18,1],
+    [18,17,0], [19,22,5], [18,18,1], [16,18,1], [20,17,0], [21,18,1], [21,18,1], [27,18,1],
+    [20,17,0], [21,17,0], [17,17,0], [11,24,6], [15,8,-9], [10,24,6], [13,5,-12], [9,4,-13],
+    [9,8,-9], [13,12,1], [12,18,1], [12,12,1], [14,18,1], [12,12,1], [12,22,5], [12,16,5],
+    [13,18,1], [8,17,1], [10,21,5], [13,18,1], [8,18,1], [21,12,1], [15,12,1], [13,12,1],
+    [13,16,5], [12,16,5], [12,12,1], [11,12,1], [9,17,1], [14,12,1], [12,12,1], [17,12,1],
+    [13,12,1], [13,16,5], [12,12,1], [14,1,-6], [25,1,-6], [14,5,-12], [14,4,-13], [14,4,-13]
+  ]
+});
+
+jsMath.Img.AddFont(207,{
+  cmr10: [
+    [17,20,0], [23,21,0], [21,22,1], [20,21,0], [19,20,0], [21,20,0], [20,20,0], [21,21,0],
+    [20,20,0], [21,20,0], [20,21,0], [19,21,0], [16,21,0], [16,21,0], [24,21,0], [24,21,0],
+    [8,13,0], [9,19,6], [9,7,-14], [12,7,-14], [12,5,-14], [12,6,-15], [13,2,-16], [14,6,-15],
+    [11,7,6], [14,22,1], [21,14,1], [22,14,1], [14,19,3], [26,20,0], [29,22,1], [21,24,2],
+    [8,4,-8], [6,21,0], [11,10,-11], [23,27,6], [13,24,2], [23,24,2], [22,22,1], [6,10,-11],
+    [10,30,8], [9,30,8], [13,13,-9], [21,20,3], [6,10,6], [8,3,-5], [6,4,0], [13,30,8],
+    [14,21,1], [13,20,0], [14,20,0], [14,21,1], [14,20,0], [14,21,1], [14,21,1], [15,21,1],
+    [14,21,1], [14,21,1], [6,13,0], [6,19,6], [6,22,7], [21,8,-3], [13,21,6], [13,21,0],
+    [21,22,1], [21,21,0], [19,20,0], [20,22,1], [21,20,0], [19,20,0], [18,20,0], [22,22,1],
+    [21,20,0], [10,20,0], [14,21,1], [22,20,0], [17,20,0], [26,20,0], [21,20,0], [21,22,1],
+    [19,20,0], [22,27,6], [22,21,1], [15,22,1], [20,20,0], [21,21,1], [22,21,1], [30,21,1],
+    [22,20,0], [22,20,0], [17,20,0], [8,30,8], [14,10,-11], [5,30,8], [12,6,-15], [6,4,-16],
+    [6,10,-11], [15,14,1], [16,22,1], [13,14,1], [16,22,1], [13,14,1], [11,21,0], [15,20,6],
+    [16,21,0], [8,20,0], [9,26,6], [15,21,0], [8,21,0], [24,13,0], [16,13,0], [14,14,1],
+    [16,19,6], [16,19,6], [11,13,0], [11,14,1], [10,19,1], [16,14,1], [15,14,1], [21,14,1],
+    [15,13,0], [15,19,6], [12,13,0], [15,2,-7], [29,2,-7], [13,7,-14], [13,4,-16], [12,4,-16]
+  ],
+  cmmi10: [
+    [21,20,0], [23,21,0], [22,22,1], [20,21,0], [23,20,0], [26,20,0], [24,20,0], [21,21,0],
+    [19,20,0], [21,20,0], [23,21,0], [18,14,1], [18,27,6], [16,20,7], [14,22,1], [11,14,1],
+    [14,27,6], [15,20,7], [14,22,1], [10,14,1], [16,14,1], [16,22,1], [17,20,7], [16,13,0],
+    [13,27,6], [17,14,1], [15,20,7], [17,14,1], [15,14,1], [16,14,1], [17,27,6], [18,19,6],
+    [19,27,6], [18,14,1], [13,15,1], [17,22,1], [24,14,1], [15,19,6], [12,17,4], [18,20,7],
+    [28,9,-6], [28,9,1], [28,9,-6], [28,9,1], [7,8,-6], [7,8,-6], [14,16,1], [14,16,1],
+    [14,15,1], [13,14,0], [14,14,0], [14,21,7], [14,20,6], [14,21,7], [14,21,1], [15,21,7],
+    [14,21,1], [14,21,7], [6,4,0], [6,10,6], [21,18,2], [13,30,8], [21,18,2], [15,15,0],
+    [17,22,1], [21,21,0], [22,20,0], [23,22,1], [24,20,0], [23,20,0], [22,20,0], [23,22,1],
+    [26,20,0], [15,20,0], [19,21,1], [26,20,0], [19,20,0], [31,20,0], [26,20,0], [22,22,1],
+    [22,20,0], [22,27,6], [22,21,1], [19,22,1], [21,20,0], [23,21,1], [23,21,1], [31,21,1],
+    [25,20,0], [23,20,0], [21,20,0], [10,23,1], [9,29,7], [10,28,7], [28,8,-3], [28,9,-3],
+    [12,22,1], [15,14,1], [13,22,1], [13,14,1], [15,22,1], [13,14,1], [17,27,6], [14,19,6],
+    [16,22,1], [9,21,1], [13,26,6], [15,22,1], [8,22,1], [25,14,1], [17,14,1], [14,14,1],
+    [16,19,6], [14,19,6], [13,14,1], [13,14,1], [10,20,1], [16,14,1], [14,14,1], [21,14,1],
+    [16,14,1], [15,19,6], [14,14,1], [9,14,1], [12,19,6], [18,21,7], [19,7,-14], [19,5,-15]
+  ],
+  cmsy10: [
+    [21,2,-6], [6,4,-5], [19,15,0], [13,14,0], [21,17,1], [15,15,0], [21,20,0], [21,20,5],
+    [21,20,3], [21,20,3], [21,20,3], [21,20,3], [21,20,3], [28,28,7], [13,12,-1], [13,12,-1],
+    [21,15,0], [21,13,-1], [21,23,4], [21,23,4], [21,23,4], [21,23,4], [21,23,4], [21,23,4],
+    [21,8,-3], [21,13,-1], [21,18,2], [21,18,2], [28,19,2], [28,19,2], [21,18,2], [21,18,2],
+    [28,11,-2], [28,11,-2], [13,27,6], [13,27,6], [28,11,-2], [28,27,6], [28,27,6], [21,13,-1],
+    [28,17,1], [28,17,1], [17,27,6], [17,27,6], [28,17,1], [28,27,6], [28,27,6], [21,14,1],
+    [8,16,-1], [28,14,1], [17,18,2], [17,18,2], [25,21,0], [25,22,7], [19,28,7], [4,12,-1],
+    [17,22,1], [15,21,0], [18,9,-2], [14,26,3], [21,22,1], [21,22,1], [21,20,0], [21,20,0],
+    [17,21,0], [24,23,2], [20,22,1], [16,22,1], [23,20,0], [17,22,1], [25,21,1], [18,25,4],
+    [24,22,2], [20,20,0], [25,24,4], [22,22,1], [20,22,1], [33,23,2], [30,25,2], [23,22,1],
+    [22,22,2], [23,25,4], [25,21,1], [19,22,1], [24,21,0], [21,21,1], [20,22,2], [31,22,2],
+    [24,20,0], [21,24,4], [23,20,0], [18,19,1], [18,19,1], [18,19,1], [18,19,1], [18,19,1],
+    [17,21,0], [17,21,0], [13,30,8], [8,30,8], [13,30,8], [8,30,8], [13,30,8], [13,30,8],
+    [10,30,8], [9,30,8], [5,30,8], [11,30,8], [13,31,8], [17,31,8], [13,30,8], [7,20,3],
+    [25,30,28], [21,20,0], [23,21,1], [14,28,7], [18,18,0], [18,18,0], [21,23,4], [21,23,4],
+    [11,27,6], [12,28,7], [12,27,6], [17,27,6], [22,26,4], [21,27,5], [21,22,1], [21,26,4]
+  ],
+  cmex10: [
+    [12,36,34], [9,36,34], [12,36,34], [7,36,34], [14,36,34], [8,36,34], [14,36,34], [8,36,34],
+    [14,36,34], [14,36,34], [12,36,34], [11,36,34], [6,20,19], [12,20,19], [16,36,34], [16,36,34],
+    [17,54,52], [13,54,52], [21,71,69], [16,71,69], [15,71,69], [9,71,69], [17,71,69], [10,71,69],
+    [17,71,69], [10,71,69], [18,71,69], [18,71,69], [19,71,69], [19,71,69], [29,71,69], [29,71,69],
+    [22,88,86], [17,88,86], [17,88,86], [9,88,86], [19,88,86], [11,88,86], [19,88,86], [11,88,86],
+    [20,88,86], [20,88,86], [21,88,86], [20,88,86], [36,88,86], [36,88,86], [22,54,52], [22,54,52],
+    [25,54,52], [17,54,52], [20,54,52], [10,54,52], [20,54,52], [10,54,52], [12,19,18], [10,19,18],
+    [21,28,27], [15,28,27], [21,28,27], [15,28,27], [15,54,53], [21,54,53], [15,10,9], [11,19,18],
+    [25,54,52], [17,54,52], [12,19,18], [17,19,18], [16,54,52], [15,54,52], [23,30,29], [31,42,41],
+    [18,34,33], [28,66,65], [31,30,29], [43,42,41], [31,30,29], [43,42,41], [31,30,29], [43,42,41],
+    [29,30,29], [26,30,29], [18,34,33], [23,30,29], [23,30,29], [23,30,29], [23,30,29], [23,30,29],
+    [41,42,41], [36,42,41], [28,66,65], [31,42,41], [31,42,41], [31,42,41], [31,42,41], [31,42,41],
+    [26,30,29], [36,42,41], [18,6,-16], [31,7,-16], [43,7,-16], [17,4,-17], [29,4,-18], [42,4,-18],
+    [14,54,52], [8,54,52], [15,54,52], [9,54,52], [15,54,52], [9,54,52], [16,54,52], [16,54,52],
+    [30,36,34], [30,54,52], [30,71,69], [30,88,86], [22,54,53], [22,19,18], [32,19,17], [16,19,18],
+    [17,19,18], [17,19,18], [15,11,7], [15,11,7], [15,10,0], [15,10,0], [21,19,18], [21,19,18]
+  ],
+  cmbx10: [
+    [19,20,0], [27,21,0], [25,22,1], [23,21,0], [21,20,0], [25,20,0], [23,20,0], [25,21,0],
+    [23,20,0], [25,20,0], [23,21,0], [22,21,0], [18,21,0], [18,21,0], [27,21,0], [27,21,0],
+    [9,14,0], [10,20,6], [10,7,-14], [14,7,-14], [13,4,-15], [14,7,-14], [15,2,-16], [17,6,-15],
+    [13,7,6], [17,22,1], [24,15,1], [25,15,1], [16,21,4], [30,20,0], [33,22,1], [25,24,2],
+    [10,4,-8], [8,21,0], [14,12,-9], [26,27,6], [15,24,2], [26,24,2], [25,22,1], [8,12,-9],
+    [12,30,8], [10,30,8], [15,14,-8], [25,23,4], [8,11,6], [10,3,-5], [7,5,0], [15,30,8],
+    [16,20,1], [15,19,0], [15,19,0], [16,20,1], [16,20,0], [15,20,1], [16,20,1], [17,21,1],
+    [16,20,1], [16,20,1], [7,13,0], [7,19,6], [8,21,6], [25,9,-3], [14,21,6], [14,21,0],
+    [25,22,1], [24,21,0], [22,20,0], [23,22,1], [24,20,0], [21,20,0], [20,20,0], [25,22,1],
+    [25,20,0], [12,20,0], [16,21,1], [25,20,0], [19,20,0], [31,20,0], [25,20,0], [24,22,1],
+    [21,20,0], [24,27,6], [25,21,1], [17,22,1], [22,20,0], [25,21,1], [25,21,1], [34,21,1],
+    [25,20,0], [25,20,0], [19,20,0], [9,30,8], [17,12,-9], [6,30,8], [13,6,-15], [7,6,-15],
+    [7,12,-9], [17,15,1], [18,22,1], [14,15,1], [18,22,1], [15,15,1], [13,21,0], [17,20,6],
+    [18,21,0], [9,21,0], [10,27,6], [18,21,0], [9,21,0], [28,14,0], [18,14,0], [16,15,1],
+    [18,20,6], [18,20,6], [13,14,0], [13,15,1], [12,20,1], [18,15,1], [17,14,1], [24,14,1],
+    [17,13,0], [17,19,6], [14,13,0], [17,2,-7], [34,2,-7], [15,7,-14], [14,4,-17], [14,6,-15]
+  ],
+  cmti10: [
+    [21,20,0], [22,21,0], [23,22,1], [19,21,0], [22,20,0], [25,20,0], [23,20,0], [25,21,0],
+    [22,20,0], [24,20,0], [23,21,0], [23,27,6], [19,27,6], [20,27,6], [28,27,6], [29,27,6],
+    [10,14,1], [12,19,6], [13,7,-14], [16,7,-14], [16,5,-14], [17,6,-15], [17,2,-16], [20,6,-15],
+    [10,7,6], [18,27,6], [21,14,1], [21,14,1], [16,20,4], [28,20,0], [31,22,1], [24,24,2],
+    [10,4,-8], [11,21,0], [15,10,-11], [25,27,6], [21,22,1], [25,24,2], [24,22,1], [11,10,-11],
+    [15,30,8], [12,30,8], [17,13,-9], [22,19,2], [7,10,6], [10,3,-5], [7,4,0], [18,30,8],
+    [17,21,1], [14,20,0], [16,21,1], [17,21,1], [14,26,6], [17,21,1], [17,21,1], [19,21,1],
+    [17,21,1], [17,21,1], [9,13,0], [9,19,6], [10,22,7], [23,8,-3], [13,22,7], [16,21,0],
+    [23,22,1], [21,21,0], [22,20,0], [24,22,1], [23,20,0], [22,20,0], [22,20,0], [24,22,1],
+    [25,20,0], [15,20,0], [19,21,1], [25,20,0], [19,20,0], [30,20,0], [25,20,0], [23,22,1],
+    [22,20,0], [23,27,6], [21,21,1], [19,22,1], [24,20,0], [25,21,1], [26,21,1], [33,21,1],
+    [24,20,0], [26,20,0], [21,20,0], [13,30,8], [18,10,-11], [12,30,8], [16,6,-15], [11,4,-16],
+    [11,10,-11], [16,14,1], [14,22,1], [14,14,1], [17,22,1], [14,14,1], [15,27,6], [15,19,6],
+    [16,22,1], [10,21,1], [13,26,6], [15,22,1], [9,22,1], [25,14,1], [17,14,1], [15,14,1],
+    [15,19,6], [15,19,6], [15,14,1], [13,14,1], [11,20,1], [17,14,1], [15,14,1], [21,14,1],
+    [16,14,1], [15,19,6], [14,14,1], [16,2,-7], [31,2,-7], [17,7,-14], [17,4,-16], [16,4,-16]
+  ]
+});
+
+jsMath.Img.AddFont(249,{
+  cmr10: [
+    [20,24,0], [27,25,0], [25,25,1], [23,25,0], [22,24,0], [25,24,0], [23,24,0], [25,24,0],
+    [23,24,0], [25,24,0], [24,24,0], [22,24,0], [18,24,0], [18,24,0], [28,24,0], [28,24,0],
+    [9,16,0], [10,23,7], [10,7,-17], [14,7,-17], [13,5,-17], [14,7,-17], [15,2,-19], [16,7,-18],
+    [13,8,7], [17,25,1], [24,17,1], [26,17,1], [16,23,4], [30,24,0], [34,25,1], [25,28,2],
+    [9,5,-9], [7,25,0], [12,11,-13], [27,31,7], [16,28,2], [27,28,2], [25,26,1], [7,11,-13],
+    [12,35,9], [10,35,9], [15,16,-10], [25,23,3], [7,11,7], [10,3,-6], [7,4,0], [16,35,9],
+    [16,24,1], [15,23,0], [16,23,0], [16,24,1], [17,24,0], [16,24,1], [16,24,1], [17,24,1],
+    [16,24,1], [16,24,1], [7,15,0], [7,22,7], [7,25,8], [25,9,-4], [15,24,7], [15,24,0],
+    [25,25,1], [25,25,0], [23,24,0], [23,25,1], [25,24,0], [23,24,0], [21,24,0], [25,25,1],
+    [25,24,0], [12,24,0], [16,25,1], [26,24,0], [20,24,0], [30,24,0], [25,24,0], [25,25,1],
+    [22,24,0], [25,31,7], [25,25,1], [17,25,1], [24,24,0], [25,25,1], [25,25,1], [35,25,1],
+    [25,24,0], [26,24,0], [20,24,0], [9,35,9], [16,11,-13], [6,35,9], [14,6,-18], [7,4,-19],
+    [7,11,-13], [17,17,1], [18,25,1], [15,17,1], [18,25,1], [15,17,1], [13,24,0], [17,23,7],
+    [19,24,0], [9,23,0], [10,30,7], [18,24,0], [9,24,0], [28,16,0], [19,16,0], [17,17,1],
+    [18,23,7], [18,23,7], [13,16,0], [13,17,1], [12,22,1], [19,17,1], [18,16,1], [24,16,1],
+    [18,15,0], [18,22,7], [14,15,0], [17,2,-8], [34,2,-8], [15,7,-17], [15,4,-19], [14,4,-19]
+  ],
+  cmmi10: [
+    [25,24,0], [27,25,0], [26,25,1], [23,25,0], [27,24,0], [30,24,0], [28,24,0], [24,24,0],
+    [22,24,0], [24,24,0], [27,24,0], [21,17,1], [21,31,7], [19,24,8], [16,26,1], [13,16,1],
+    [17,31,7], [17,24,8], [16,25,1], [12,17,1], [19,17,1], [19,25,1], [20,24,8], [18,16,0],
+    [16,31,7], [20,16,1], [18,24,8], [20,16,1], [18,16,1], [18,17,1], [20,31,7], [21,23,7],
+    [22,31,7], [21,17,1], [15,17,1], [20,25,1], [28,16,1], [18,23,7], [14,20,4], [22,24,8],
+    [33,11,-7], [33,11,1], [33,11,-7], [33,11,1], [8,9,-7], [8,9,-7], [17,19,1], [17,19,1],
+    [16,17,1], [15,16,0], [16,16,0], [16,24,8], [17,23,7], [16,24,8], [16,24,1], [17,24,8],
+    [16,24,1], [16,24,8], [7,4,0], [7,11,7], [24,21,2], [16,35,9], [24,21,2], [17,17,0],
+    [20,26,1], [25,25,0], [26,24,0], [26,25,1], [28,24,0], [27,24,0], [26,24,0], [26,25,1],
+    [30,24,0], [17,24,0], [22,25,1], [31,24,0], [22,24,0], [36,24,0], [30,24,0], [26,25,1],
+    [26,24,0], [26,31,7], [26,25,1], [22,25,1], [24,24,0], [26,25,1], [27,25,1], [36,25,1],
+    [29,24,0], [26,24,0], [25,24,0], [12,27,1], [11,33,8], [12,33,8], [33,9,-4], [33,9,-4],
+    [14,25,1], [17,17,1], [15,25,1], [15,17,1], [18,25,1], [15,17,1], [19,31,7], [17,23,7],
+    [19,25,1], [10,24,1], [15,30,7], [18,25,1], [9,25,1], [29,17,1], [20,17,1], [16,17,1],
+    [19,23,7], [16,23,7], [15,17,1], [15,17,1], [12,23,1], [19,17,1], [16,17,1], [24,17,1],
+    [18,17,1], [17,23,7], [16,17,1], [10,17,1], [14,23,7], [22,24,8], [22,8,-17], [23,5,-18]
+  ],
+  cmsy10: [
+    [24,3,-7], [7,5,-6], [22,17,0], [15,15,-1], [25,21,2], [17,17,0], [25,23,0], [25,23,6],
+    [25,23,3], [25,23,3], [25,23,3], [25,23,3], [25,23,3], [33,33,8], [16,15,-1], [16,15,-1],
+    [25,17,0], [25,15,-1], [24,27,5], [24,27,5], [24,27,5], [24,27,5], [24,27,5], [24,27,5],
+    [25,9,-4], [25,16,-1], [24,21,2], [24,21,2], [33,23,3], [33,23,3], [24,21,2], [24,21,2],
+    [33,13,-2], [33,13,-2], [15,31,7], [15,31,7], [33,13,-2], [33,31,7], [33,31,7], [25,15,-1],
+    [33,19,1], [33,19,1], [20,31,7], [20,31,7], [33,19,1], [33,31,7], [33,31,7], [25,17,1],
+    [9,18,-1], [33,17,1], [20,21,2], [20,21,2], [29,25,0], [29,25,8], [22,33,8], [5,13,-2],
+    [19,25,1], [17,24,0], [21,10,-3], [16,30,3], [25,26,1], [24,25,1], [25,23,0], [25,23,0],
+    [19,24,0], [28,27,2], [23,25,1], [19,25,1], [27,24,0], [20,25,1], [29,26,2], [21,29,5],
+    [28,26,2], [23,24,0], [29,29,5], [25,25,1], [23,25,1], [38,26,2], [35,29,2], [27,25,1],
+    [25,26,2], [27,29,5], [29,25,1], [22,25,1], [28,25,0], [25,25,1], [23,26,2], [36,26,2],
+    [28,24,0], [25,29,5], [27,24,0], [21,22,1], [21,22,1], [21,22,1], [21,22,1], [21,22,1],
+    [19,24,0], [19,24,0], [15,35,9], [10,35,9], [15,35,9], [10,35,9], [15,35,9], [15,35,9],
+    [12,35,9], [10,35,9], [6,35,9], [13,35,9], [15,37,10], [20,37,10], [16,35,9], [8,23,3],
+    [29,35,33], [25,24,0], [27,26,2], [17,33,8], [21,21,0], [21,21,0], [25,27,5], [24,27,5],
+    [13,31,7], [14,32,8], [14,31,7], [20,31,7], [26,30,5], [25,31,6], [25,27,2], [25,30,5]
+  ],
+  cmex10: [
+    [15,42,40], [11,42,40], [14,42,40], [8,42,40], [16,42,40], [10,42,40], [16,42,40], [10,42,40],
+    [16,42,40], [16,42,40], [14,42,40], [13,42,40], [7,23,22], [14,23,22], [18,42,40], [18,42,40],
+    [20,62,60], [15,62,60], [24,83,81], [18,83,81], [18,83,81], [10,83,81], [20,83,81], [12,83,81],
+    [20,83,81], [12,83,81], [22,83,81], [22,83,81], [23,83,81], [22,83,81], [34,83,81], [34,83,81],
+    [26,103,101], [19,103,101], [20,103,101], [11,103,101], [22,103,101], [13,103,101], [22,103,101], [13,103,101],
+    [23,103,101], [23,103,101], [24,103,101], [23,103,101], [42,103,101], [42,103,101], [26,62,60], [26,62,60],
+    [29,63,61], [20,63,61], [23,62,60], [12,62,60], [23,62,60], [12,62,60], [14,22,21], [12,22,21],
+    [25,32,31], [18,32,31], [25,32,31], [18,32,31], [18,63,62], [25,63,62], [18,12,11], [13,22,21],
+    [29,62,60], [20,62,60], [14,22,21], [20,22,21], [18,62,60], [17,62,60], [27,35,34], [36,49,48],
+    [21,39,38], [33,77,76], [36,35,34], [50,49,48], [36,35,34], [50,49,48], [36,35,34], [50,49,48],
+    [34,35,34], [31,35,34], [21,39,38], [27,35,34], [27,35,34], [27,35,34], [27,35,34], [27,35,34],
+    [48,49,48], [42,49,48], [33,77,76], [36,49,48], [36,49,48], [36,49,48], [36,49,48], [36,49,48],
+    [31,35,34], [42,49,48], [21,7,-19], [36,8,-19], [51,8,-19], [19,5,-20], [34,5,-21], [50,5,-21],
+    [16,62,60], [9,62,60], [18,62,60], [11,62,60], [18,62,60], [11,62,60], [19,62,60], [19,62,60],
+    [35,42,40], [35,62,60], [35,83,81], [35,103,101], [26,63,62], [26,23,22], [37,22,20], [18,22,21],
+    [19,22,21], [19,22,21], [17,13,8], [18,13,8], [17,12,0], [18,12,0], [25,22,21], [25,22,21]
+  ],
+  cmbx10: [
+    [22,24,0], [31,24,0], [29,25,1], [27,24,0], [25,23,0], [30,24,0], [27,24,0], [29,24,0],
+    [27,24,0], [29,24,0], [27,24,0], [26,24,0], [21,24,0], [21,24,0], [32,24,0], [32,24,0],
+    [10,16,0], [12,23,7], [12,7,-17], [16,7,-17], [15,6,-17], [16,7,-17], [17,3,-18], [19,6,-18],
+    [15,8,7], [20,25,1], [28,17,1], [30,17,1], [19,23,4], [35,24,0], [39,25,1], [29,29,3],
+    [11,5,-9], [9,24,0], [16,13,-11], [31,31,7], [18,28,2], [31,28,2], [29,25,1], [9,13,-11],
+    [13,35,9], [12,35,9], [17,16,-10], [29,27,5], [9,13,7], [11,5,-5], [9,6,0], [18,35,9],
+    [18,24,1], [17,23,0], [18,23,0], [18,24,1], [19,23,0], [18,24,1], [18,24,1], [19,24,1],
+    [18,24,1], [18,24,1], [9,16,0], [9,23,7], [9,24,7], [29,11,-3], [17,24,7], [17,24,0],
+    [29,25,1], [29,24,0], [26,24,0], [27,25,1], [28,24,0], [25,24,0], [23,24,0], [29,25,1],
+    [30,24,0], [14,24,0], [18,25,1], [29,24,0], [22,24,0], [36,24,0], [30,24,0], [28,25,1],
+    [25,24,0], [28,31,7], [30,25,1], [20,25,1], [26,23,0], [29,25,1], [29,25,1], [40,25,1],
+    [29,24,0], [29,24,0], [22,24,0], [10,35,9], [20,13,-11], [7,35,9], [16,7,-17], [9,6,-18],
+    [9,13,-11], [19,17,1], [21,25,1], [17,17,1], [21,25,1], [17,17,1], [15,24,0], [19,23,7],
+    [21,24,0], [10,24,0], [12,31,7], [20,24,0], [10,24,0], [32,16,0], [21,16,0], [19,17,1],
+    [21,23,7], [21,23,7], [16,16,0], [15,17,1], [13,23,1], [21,17,1], [20,17,1], [28,17,1],
+    [20,16,0], [20,23,7], [16,16,0], [20,2,-8], [40,2,-8], [17,8,-17], [17,5,-19], [17,6,-18]
+  ],
+  cmti10: [
+    [25,24,0], [26,25,0], [27,25,1], [22,25,0], [26,24,0], [29,24,0], [27,24,0], [29,24,0],
+    [25,24,0], [29,24,0], [26,24,0], [27,31,7], [22,31,7], [23,31,7], [33,31,7], [34,31,7],
+    [12,17,1], [13,23,7], [15,7,-17], [19,7,-17], [19,5,-17], [20,7,-17], [20,2,-19], [23,7,-18],
+    [12,8,7], [21,31,7], [25,17,1], [25,17,1], [19,23,4], [33,24,0], [36,25,1], [28,29,3],
+    [12,5,-9], [13,25,0], [18,11,-13], [29,31,7], [24,25,1], [29,28,2], [28,26,1], [13,11,-13],
+    [18,35,9], [13,35,9], [20,16,-10], [26,21,2], [8,11,7], [12,3,-6], [8,4,0], [21,35,9],
+    [19,24,1], [16,23,0], [19,24,1], [20,24,1], [17,30,7], [20,24,1], [20,24,1], [22,24,1],
+    [19,24,1], [19,24,1], [11,15,0], [11,22,7], [11,25,8], [27,9,-4], [16,25,8], [19,25,0],
+    [27,25,1], [24,25,0], [25,24,0], [28,25,1], [27,24,0], [26,24,0], [25,24,0], [28,25,1],
+    [29,24,0], [18,24,0], [22,25,1], [30,24,0], [22,24,0], [35,24,0], [29,24,0], [27,25,1],
+    [25,24,0], [27,31,7], [25,25,1], [22,25,1], [28,24,0], [29,25,1], [30,25,1], [39,25,1],
+    [29,24,0], [30,24,0], [24,24,0], [16,35,9], [21,11,-13], [14,35,9], [18,6,-18], [13,4,-19],
+    [13,11,-13], [19,17,1], [16,25,1], [16,17,1], [20,25,1], [16,17,1], [17,31,7], [17,23,7],
+    [19,25,1], [12,24,1], [15,30,7], [18,25,1], [11,25,1], [29,17,1], [20,17,1], [18,17,1],
+    [18,23,7], [17,23,7], [17,17,1], [15,17,1], [13,23,1], [20,17,1], [17,17,1], [24,17,1],
+    [18,17,1], [18,23,7], [16,17,1], [19,2,-8], [36,2,-8], [20,7,-17], [20,4,-19], [19,4,-19]
+  ]
+});
+
+jsMath.Img.AddFont(298,{
+  cmr10: [
+    [24,28,0], [33,30,0], [30,30,1], [28,30,0], [26,28,0], [30,28,0], [28,28,0], [30,29,0],
+    [28,28,0], [30,28,0], [28,29,0], [26,29,0], [22,29,0], [22,29,0], [33,29,0], [33,29,0],
+    [11,19,0], [11,28,9], [13,9,-20], [17,9,-20], [16,6,-21], [17,8,-21], [18,3,-22], [20,8,-22],
+    [16,10,9], [20,30,1], [29,20,1], [31,20,1], [20,27,5], [36,28,0], [41,30,1], [30,34,3],
+    [11,6,-11], [8,30,0], [15,13,-16], [32,37,8], [19,34,3], [32,34,3], [30,31,1], [9,13,-16],
+    [14,42,11], [12,42,11], [18,18,-13], [30,28,4], [9,13,8], [12,4,-7], [8,5,0], [19,42,11],
+    [19,29,1], [18,28,0], [19,28,0], [19,29,1], [20,28,0], [19,29,1], [19,29,1], [20,29,1],
+    [19,29,1], [19,29,1], [8,18,0], [8,26,8], [8,30,9], [30,11,-5], [18,30,9], [18,29,0],
+    [30,30,1], [30,30,0], [27,28,0], [28,30,1], [29,28,0], [27,28,0], [26,28,0], [31,30,1],
+    [30,28,0], [14,28,0], [20,29,1], [31,28,0], [24,28,0], [37,28,0], [30,28,0], [30,30,1],
+    [26,28,0], [30,37,8], [31,29,1], [21,30,1], [29,28,0], [30,29,1], [30,29,1], [42,29,1],
+    [30,28,0], [31,28,0], [23,28,0], [11,42,11], [20,13,-16], [7,42,11], [16,7,-22], [8,5,-23],
+    [8,13,-16], [21,20,1], [22,30,1], [18,20,1], [22,30,1], [18,20,1], [15,29,0], [20,28,9],
+    [22,29,0], [11,28,0], [11,37,9], [21,29,0], [11,29,0], [34,19,0], [22,19,0], [20,20,1],
+    [22,27,8], [22,27,8], [15,19,0], [15,20,1], [14,27,1], [22,20,1], [21,19,1], [29,19,1],
+    [22,18,0], [21,27,9], [17,18,0], [21,2,-10], [41,2,-10], [18,8,-21], [18,5,-23], [17,5,-23]
+  ],
+  cmmi10: [
+    [30,28,0], [33,30,0], [31,30,1], [28,30,0], [32,28,0], [37,28,0], [34,28,0], [29,29,0],
+    [27,28,0], [29,28,0], [33,29,0], [25,20,1], [25,37,8], [23,28,9], [19,31,1], [16,19,1],
+    [20,38,9], [21,28,9], [19,30,1], [14,20,1], [23,20,1], [23,30,1], [24,28,9], [22,19,0],
+    [19,38,9], [24,19,1], [21,28,9], [24,19,1], [21,19,1], [22,20,1], [24,38,9], [25,28,9],
+    [27,38,9], [25,20,1], [18,20,1], [23,30,1], [34,19,1], [21,27,8], [17,24,5], [26,28,9],
+    [39,12,-9], [39,13,1], [39,12,-9], [39,13,1], [10,11,-9], [10,11,-9], [20,22,1], [20,22,1],
+    [19,20,1], [18,19,0], [19,19,0], [19,28,9], [20,28,8], [19,28,9], [19,29,1], [20,28,9],
+    [19,29,1], [19,28,9], [8,5,0], [9,13,8], [29,25,2], [19,42,11], [29,25,2], [21,20,0],
+    [24,31,1], [30,30,0], [31,28,0], [32,30,1], [33,28,0], [32,28,0], [31,28,0], [32,30,1],
+    [37,28,0], [21,28,0], [26,29,1], [37,28,0], [27,28,0], [43,28,0], [37,28,0], [31,30,1],
+    [31,28,0], [31,37,8], [31,29,1], [27,30,1], [29,28,0], [32,29,1], [32,29,1], [43,29,1],
+    [35,28,0], [32,28,0], [30,28,0], [14,32,1], [13,39,9], [14,39,9], [39,11,-5], [39,11,-5],
+    [17,30,1], [21,20,1], [18,30,1], [18,20,1], [22,30,1], [18,20,1], [23,38,9], [20,28,9],
+    [23,30,1], [13,29,1], [18,37,9], [21,30,1], [11,30,1], [35,20,1], [24,20,1], [20,20,1],
+    [23,27,8], [19,27,8], [18,20,1], [18,20,1], [14,27,1], [23,20,1], [20,20,1], [29,20,1],
+    [22,20,1], [21,28,9], [20,20,1], [13,20,1], [16,28,9], [26,28,9], [26,9,-21], [27,6,-22]
+  ],
+  cmsy10: [
+    [29,3,-9], [8,5,-8], [26,21,0], [18,19,-1], [30,24,2], [21,21,0], [30,28,0], [30,28,7],
+    [30,28,4], [30,28,4], [30,28,4], [30,28,4], [30,28,4], [39,39,9], [19,17,-2], [19,17,-2],
+    [30,20,0], [30,19,-1], [29,33,6], [29,33,6], [29,33,6], [29,33,6], [29,33,6], [29,33,6],
+    [30,11,-5], [30,18,-2], [29,25,2], [29,25,2], [39,27,3], [39,27,3], [29,25,2], [29,25,2],
+    [39,16,-2], [39,16,-2], [18,37,8], [18,37,8], [39,16,-2], [39,37,8], [39,38,9], [30,19,-1],
+    [39,24,2], [39,24,2], [24,37,8], [24,37,8], [40,24,2], [39,37,8], [39,38,9], [30,20,1],
+    [11,22,-1], [39,20,1], [24,25,2], [24,25,2], [34,30,0], [34,30,9], [27,39,9], [6,16,-2],
+    [23,30,1], [21,29,0], [26,12,-3], [19,36,4], [30,31,1], [29,30,1], [30,28,0], [30,28,0],
+    [23,29,0], [33,33,3], [28,30,1], [22,30,1], [32,28,0], [24,30,1], [34,30,2], [25,34,5],
+    [34,30,2], [28,28,0], [35,33,5], [31,30,1], [27,30,1], [46,32,3], [43,35,3], [32,30,1],
+    [31,31,3], [33,35,6], [35,29,1], [27,30,1], [33,30,0], [30,30,2], [28,30,2], [43,30,2],
+    [34,28,0], [30,34,6], [32,28,0], [26,26,1], [26,26,1], [26,26,1], [26,26,1], [26,26,1],
+    [23,29,0], [23,29,0], [18,42,11], [12,42,11], [18,42,11], [12,42,11], [18,42,11], [18,42,11],
+    [14,42,11], [12,42,11], [7,42,11], [16,42,11], [18,44,12], [24,44,12], [19,42,11], [10,28,4],
+    [35,42,40], [30,28,0], [33,30,2], [20,39,9], [25,25,0], [25,25,0], [30,33,6], [29,33,6],
+    [16,38,9], [16,38,9], [16,38,9], [24,37,8], [31,36,6], [30,37,7], [30,32,2], [30,36,6]
+  ],
+  cmex10: [
+    [17,50,48], [13,50,48], [17,50,48], [9,50,48], [19,50,48], [12,50,48], [19,50,48], [12,50,48],
+    [20,50,48], [20,50,48], [17,50,48], [16,50,48], [8,27,26], [17,27,26], [22,50,48], [22,50,48],
+    [23,75,73], [18,75,73], [29,99,97], [22,99,97], [22,99,97], [12,99,97], [24,99,97], [14,99,97],
+    [24,99,97], [14,99,97], [26,99,97], [26,99,97], [27,99,97], [26,99,97], [41,99,97], [41,99,97],
+    [32,124,122], [23,124,122], [24,124,122], [13,124,122], [26,124,122], [15,124,122], [26,124,122], [15,124,122],
+    [28,124,122], [28,124,122], [29,124,122], [28,124,122], [51,124,122], [51,124,122], [31,75,73], [31,75,73],
+    [35,75,73], [24,75,73], [28,75,73], [14,75,73], [28,75,73], [14,75,73], [17,26,25], [14,26,25],
+    [30,39,38], [21,39,38], [30,38,37], [21,38,37], [21,76,75], [30,76,75], [21,14,13], [15,26,25],
+    [35,76,73], [24,76,73], [17,27,26], [24,27,26], [22,75,73], [21,75,73], [32,42,41], [44,59,58],
+    [25,47,46], [39,93,92], [44,42,41], [60,59,58], [44,42,41], [60,59,58], [44,42,41], [60,59,58],
+    [41,42,41], [37,42,41], [25,47,46], [32,42,41], [32,42,41], [32,42,41], [32,42,41], [32,42,41],
+    [57,59,58], [51,59,58], [39,93,92], [44,59,58], [44,59,58], [44,59,58], [44,59,58], [44,59,58],
+    [37,42,41], [51,59,58], [24,8,-23], [43,9,-23], [61,9,-23], [23,6,-24], [41,6,-25], [60,6,-25],
+    [19,75,73], [11,75,73], [21,75,73], [13,75,73], [21,75,73], [13,75,73], [23,75,73], [23,75,73],
+    [42,50,48], [42,75,73], [42,99,97], [42,124,122], [31,75,74], [31,27,26], [45,26,24], [22,26,25],
+    [23,26,25], [23,26,25], [20,14,9], [21,14,9], [20,14,0], [21,14,0], [30,26,25], [30,26,25]
+  ],
+  cmbx10: [
+    [27,28,0], [37,29,0], [34,30,1], [32,29,0], [30,28,0], [36,28,0], [32,29,0], [34,29,0],
+    [32,29,0], [34,29,0], [32,29,0], [31,29,0], [25,29,0], [25,29,0], [38,29,0], [38,29,0],
+    [12,19,0], [14,28,9], [14,9,-20], [19,9,-20], [19,6,-21], [20,9,-20], [21,3,-22], [23,8,-21],
+    [19,10,9], [24,30,1], [33,20,1], [36,20,1], [23,28,5], [42,29,0], [47,30,1], [34,34,3],
+    [14,6,-11], [11,29,0], [19,15,-14], [37,37,8], [21,34,3], [37,34,3], [35,30,1], [11,15,-14],
+    [16,42,11], [14,42,11], [21,19,-12], [34,32,6], [11,15,8], [14,5,-7], [10,7,0], [21,42,11],
+    [22,28,1], [21,27,0], [22,27,0], [22,28,1], [23,27,0], [22,28,1], [22,28,1], [23,29,1],
+    [22,28,1], [22,28,1], [10,19,0], [10,27,8], [11,30,9], [34,13,-4], [20,30,9], [20,29,0],
+    [34,30,1], [34,29,0], [31,29,0], [32,30,1], [34,29,0], [30,28,0], [28,28,0], [35,30,1],
+    [36,29,0], [17,29,0], [22,30,1], [35,29,0], [27,29,0], [44,29,0], [36,29,0], [33,30,1],
+    [30,29,0], [33,37,8], [36,30,1], [24,30,1], [32,28,0], [35,30,1], [35,30,1], [48,30,1],
+    [35,29,0], [35,29,0], [27,29,0], [13,42,11], [24,15,-14], [8,42,11], [19,8,-21], [10,7,-22],
+    [10,15,-14], [23,20,1], [25,30,1], [20,20,1], [25,30,1], [21,20,1], [18,29,0], [23,28,9],
+    [26,29,0], [12,29,0], [14,38,9], [25,29,0], [13,29,0], [39,19,0], [26,19,0], [23,20,1],
+    [25,27,8], [25,27,8], [19,19,0], [18,20,1], [16,28,1], [26,20,1], [24,20,1], [33,20,1],
+    [24,19,0], [24,28,9], [19,19,0], [24,2,-10], [48,2,-10], [21,9,-21], [20,5,-24], [20,7,-22]
+  ],
+  cmti10: [
+    [29,28,0], [31,30,0], [33,30,1], [27,30,0], [31,28,0], [35,28,0], [33,28,0], [35,29,0],
+    [30,28,0], [34,28,0], [32,29,0], [34,38,9], [27,38,9], [29,38,9], [40,38,9], [41,38,9],
+    [14,20,1], [16,28,9], [18,9,-20], [23,9,-20], [23,6,-20], [24,8,-21], [24,3,-22], [28,8,-22],
+    [14,9,8], [25,38,9], [30,20,1], [30,20,1], [23,28,5], [39,28,0], [44,30,1], [34,34,3],
+    [15,6,-11], [16,30,0], [21,13,-16], [34,37,8], [29,30,1], [35,34,3], [33,31,1], [16,13,-16],
+    [22,42,11], [16,42,11], [24,18,-13], [31,26,3], [10,13,8], [14,3,-7], [10,5,0], [26,42,11],
+    [23,29,1], [19,28,0], [23,29,1], [24,29,1], [20,36,8], [24,29,1], [24,29,1], [26,29,1],
+    [23,29,1], [23,29,1], [13,18,0], [13,26,8], [14,30,9], [32,11,-5], [19,30,9], [23,30,0],
+    [33,30,1], [29,30,0], [31,28,0], [34,30,1], [32,28,0], [31,28,0], [31,28,0], [34,30,1],
+    [35,28,0], [21,28,0], [26,29,1], [36,28,0], [26,28,0], [42,28,0], [35,28,0], [33,30,1],
+    [30,28,0], [33,37,8], [30,29,1], [26,30,1], [34,28,0], [35,29,1], [36,29,1], [47,29,1],
+    [34,28,0], [36,28,0], [29,28,0], [19,42,11], [26,13,-16], [16,42,11], [22,8,-21], [15,5,-23],
+    [15,13,-16], [22,20,1], [19,30,1], [20,20,1], [23,30,1], [20,20,1], [21,38,9], [20,28,9],
+    [22,30,1], [14,28,1], [17,36,9], [21,30,1], [13,30,1], [35,20,1], [25,20,1], [21,20,1],
+    [21,27,8], [21,27,8], [21,20,1], [18,20,1], [16,27,1], [23,20,1], [21,20,1], [29,20,1],
+    [22,20,1], [22,28,9], [20,20,1], [23,2,-10], [43,2,-10], [24,9,-20], [24,5,-23], [23,5,-23]
+  ]
+});
+
+jsMath.Img.AddFont(358,{
+  cmr10: [
+    [29,34,0], [39,36,0], [36,37,2], [33,36,0], [31,34,0], [36,34,0], [33,34,0], [36,35,0],
+    [33,34,0], [36,34,0], [34,35,0], [31,35,0], [26,35,0], [26,35,0], [40,35,0], [40,35,0],
+    [13,22,0], [13,33,11], [15,11,-24], [20,11,-24], [19,7,-25], [20,9,-25], [22,2,-27], [24,10,-26],
+    [18,11,10], [24,36,1], [34,23,1], [37,23,1], [23,32,5], [43,34,0], [49,37,2], [36,40,3],
+    [13,7,-13], [10,36,0], [17,15,-19], [39,44,10], [22,40,3], [39,40,3], [36,38,2], [11,15,-19],
+    [17,50,13], [15,50,13], [22,22,-15], [36,34,5], [10,16,10], [14,3,-9], [10,6,0], [22,50,13],
+    [23,35,2], [21,33,0], [22,33,0], [23,35,2], [24,34,0], [22,35,2], [23,35,2], [24,36,2],
+    [23,35,2], [23,35,2], [10,22,0], [10,32,10], [10,36,11], [36,12,-6], [21,36,11], [21,35,0],
+    [36,36,1], [36,36,0], [32,34,0], [33,37,2], [35,34,0], [32,34,0], [30,34,0], [37,37,2],
+    [36,34,0], [17,34,0], [23,36,2], [37,34,0], [29,34,0], [44,34,0], [36,34,0], [36,37,2],
+    [31,34,0], [36,45,10], [36,36,2], [25,37,2], [34,34,0], [36,36,2], [36,36,2], [50,36,2],
+    [36,34,0], [37,34,0], [28,34,0], [13,50,13], [23,15,-19], [8,50,13], [19,8,-26], [10,6,-27],
+    [10,15,-19], [25,23,1], [26,35,1], [21,23,1], [26,35,1], [21,23,1], [18,35,0], [24,34,11],
+    [27,34,0], [13,33,0], [13,44,11], [26,34,0], [13,34,0], [40,22,0], [27,22,0], [24,23,1],
+    [26,32,10], [26,32,10], [18,22,0], [18,23,1], [17,32,1], [27,23,1], [25,23,1], [35,23,1],
+    [26,22,0], [25,33,11], [20,22,0], [25,2,-12], [49,2,-12], [21,10,-25], [21,5,-28], [20,6,-27]
+  ],
+  cmmi10: [
+    [36,34,0], [39,36,0], [37,37,2], [33,36,0], [39,34,0], [44,34,0], [40,34,0], [35,35,0],
+    [32,34,0], [34,34,0], [39,35,0], [30,23,1], [29,45,10], [27,33,11], [23,36,1], [19,23,1],
+    [24,46,11], [25,33,11], [23,36,1], [16,23,1], [27,23,1], [27,35,1], [29,33,11], [26,22,0],
+    [22,46,11], [28,23,1], [25,33,11], [28,23,1], [26,23,1], [26,23,1], [29,45,11], [30,33,11],
+    [32,45,11], [30,23,1], [22,25,2], [28,36,1], [41,23,1], [25,32,10], [21,28,6], [31,33,11],
+    [47,15,-11], [47,15,1], [47,15,-11], [47,15,1], [11,12,-11], [11,12,-11], [24,26,1], [24,26,1],
+    [23,25,2], [21,23,0], [22,23,0], [23,34,11], [24,33,10], [22,34,11], [23,35,2], [24,34,11],
+    [23,35,2], [23,34,11], [10,6,0], [10,16,10], [34,29,2], [22,50,13], [34,29,2], [25,24,0],
+    [28,38,2], [36,36,0], [38,34,0], [38,37,2], [40,34,0], [38,34,0], [37,34,0], [38,37,2],
+    [44,34,0], [25,34,0], [32,36,2], [44,34,0], [32,34,0], [52,34,0], [44,34,0], [37,37,2],
+    [37,34,0], [37,45,10], [37,36,2], [32,37,2], [35,34,0], [38,36,2], [38,36,2], [52,36,2],
+    [42,34,0], [38,34,0], [36,34,0], [17,39,2], [16,47,11], [17,47,11], [47,13,-6], [47,13,-6],
+    [20,36,1], [25,23,1], [21,35,1], [22,23,1], [26,35,1], [22,23,1], [28,46,11], [24,33,11],
+    [27,35,1], [15,34,1], [21,44,11], [25,35,1], [13,35,1], [42,23,1], [28,23,1], [23,23,1],
+    [27,32,10], [23,32,10], [22,23,1], [21,23,1], [17,32,1], [27,23,1], [23,23,1], [34,23,1],
+    [26,23,1], [25,33,11], [23,23,1], [15,23,1], [19,33,11], [31,34,11], [31,10,-25], [32,7,-26]
+  ],
+  cmsy10: [
+    [34,3,-11], [10,6,-9], [31,25,0], [22,22,-1], [36,28,2], [24,24,0], [36,33,0], [36,34,9],
+    [36,34,5], [36,34,5], [36,34,5], [36,34,5], [36,34,5], [47,47,11], [22,20,-2], [22,20,-2],
+    [36,24,0], [36,22,-1], [34,39,7], [34,39,7], [34,39,7], [34,39,7], [34,39,7], [34,39,7],
+    [36,12,-6], [36,22,-2], [34,29,2], [34,29,2], [47,32,4], [47,32,4], [34,29,2], [34,29,2],
+    [47,18,-3], [47,18,-3], [21,44,10], [21,44,10], [47,18,-3], [47,45,10], [47,44,10], [36,22,-1],
+    [47,28,2], [47,28,2], [29,44,10], [29,44,10], [48,28,2], [47,45,10], [47,44,10], [36,23,1],
+    [13,26,-2], [47,23,1], [29,29,2], [29,29,2], [41,36,0], [41,36,11], [32,47,11], [7,19,-3],
+    [28,36,2], [25,34,0], [30,14,-4], [23,42,4], [35,38,2], [34,36,1], [36,33,0], [36,33,0],
+    [28,34,0], [40,39,3], [33,37,2], [27,37,2], [38,34,0], [28,37,2], [41,36,2], [30,41,6],
+    [41,37,3], [34,34,0], [42,40,6], [36,37,2], [33,37,2], [55,38,3], [50,41,3], [39,37,2],
+    [36,37,3], [39,42,7], [42,36,2], [32,37,2], [40,36,0], [35,36,2], [33,37,3], [51,37,3],
+    [40,34,0], [36,41,7], [38,34,0], [30,32,2], [30,32,2], [30,32,2], [30,32,2], [30,32,2],
+    [28,34,0], [28,34,0], [21,50,13], [14,50,13], [21,50,13], [14,50,13], [21,50,13], [21,50,13],
+    [17,50,13], [14,50,13], [8,50,13], [18,50,13], [21,52,14], [29,52,14], [22,50,13], [11,34,5],
+    [42,50,48], [35,34,0], [39,36,2], [24,47,11], [30,30,0], [30,30,0], [35,39,7], [34,39,7],
+    [19,46,11], [19,46,11], [19,46,11], [29,44,10], [37,43,7], [36,44,8], [36,38,2], [36,43,7]
+  ],
+  cmex10: [
+    [21,59,57], [15,59,57], [20,59,57], [11,59,57], [22,59,57], [14,59,57], [22,59,57], [14,59,57],
+    [23,59,57], [23,59,57], [20,59,57], [19,59,57], [10,33,31], [21,33,31], [26,59,57], [26,59,57],
+    [28,89,87], [21,89,87], [35,118,116], [26,118,116], [26,118,116], [14,118,116], [28,118,116], [17,118,116],
+    [28,118,116], [17,118,116], [31,118,116], [31,118,116], [32,118,116], [31,118,116], [49,118,116], [49,118,116],
+    [38,147,145], [28,147,145], [28,147,145], [16,147,145], [31,147,145], [18,147,145], [31,147,145], [18,147,145],
+    [33,147,145], [33,147,145], [35,148,146], [33,148,146], [60,147,145], [60,147,145], [37,89,87], [37,89,87],
+    [42,89,87], [29,89,87], [33,89,87], [17,89,87], [33,89,87], [17,89,87], [20,31,30], [17,31,30],
+    [36,46,45], [25,46,45], [36,46,45], [25,46,45], [25,90,89], [36,90,89], [25,17,16], [18,31,30],
+    [42,90,87], [29,90,87], [20,31,30], [29,31,30], [26,89,87], [25,89,87], [39,50,49], [52,70,69],
+    [30,56,55], [47,110,109], [52,50,49], [72,70,69], [52,50,49], [72,70,69], [52,50,49], [72,70,69],
+    [49,50,49], [44,50,49], [30,56,55], [39,50,49], [39,50,49], [39,50,49], [39,50,49], [39,50,49],
+    [68,70,69], [60,70,69], [47,110,109], [52,70,69], [52,70,69], [52,70,69], [52,70,69], [52,70,69],
+    [44,50,49], [60,70,69], [29,10,-27], [51,10,-28], [72,10,-28], [28,7,-29], [49,7,-30], [71,7,-30],
+    [23,89,87], [12,89,87], [25,89,87], [15,89,87], [25,89,87], [15,89,87], [27,89,87], [27,89,87],
+    [50,59,57], [50,89,87], [50,118,116], [50,148,146], [37,90,89], [37,32,31], [53,31,29], [26,31,30],
+    [28,31,30], [28,31,30], [25,17,11], [25,17,11], [25,17,0], [25,17,0], [36,31,30], [36,31,30]
+  ],
+  cmbx10: [
+    [32,34,0], [45,35,0], [41,36,1], [38,35,0], [36,34,0], [43,34,0], [38,34,0], [41,35,0],
+    [38,34,0], [41,34,0], [39,35,0], [37,35,0], [30,35,0], [30,35,0], [46,35,0], [46,35,0],
+    [15,23,0], [17,33,10], [17,11,-24], [23,11,-24], [22,7,-25], [23,10,-24], [25,3,-27], [28,9,-26],
+    [22,11,10], [28,36,1], [40,24,1], [43,24,1], [27,34,6], [50,34,0], [56,36,1], [41,40,3],
+    [16,7,-13], [13,35,0], [23,18,-16], [44,44,10], [25,40,3], [44,40,3], [41,36,1], [13,18,-16],
+    [19,50,13], [17,50,13], [25,22,-15], [41,39,7], [13,18,10], [16,6,-8], [12,8,0], [25,50,13],
+    [26,34,1], [25,33,0], [26,33,0], [26,34,1], [27,33,0], [26,34,1], [26,34,1], [28,35,1],
+    [26,34,1], [26,34,1], [12,22,0], [12,32,10], [13,36,11], [41,15,-5], [24,35,10], [24,35,0],
+    [41,36,1], [41,35,0], [37,34,0], [38,36,1], [41,34,0], [36,34,0], [34,34,0], [42,36,1],
+    [43,34,0], [20,34,0], [26,35,1], [42,34,0], [32,34,0], [52,34,0], [43,34,0], [40,36,1],
+    [36,34,0], [40,45,10], [43,35,1], [29,36,1], [38,34,0], [42,35,1], [42,35,1], [58,35,1],
+    [41,34,0], [42,34,0], [32,34,0], [15,50,13], [28,18,-16], [10,50,13], [22,9,-25], [12,9,-26],
+    [12,18,-16], [28,24,1], [30,35,1], [24,24,1], [30,35,1], [25,24,1], [22,35,0], [28,33,10],
+    [31,34,0], [15,35,0], [17,45,10], [29,34,0], [15,34,0], [46,23,0], [31,23,0], [27,24,1],
+    [30,33,10], [30,33,10], [22,23,0], [21,24,1], [19,33,1], [31,24,1], [29,23,1], [40,23,1],
+    [29,22,0], [29,32,10], [23,22,0], [29,3,-12], [57,3,-12], [25,10,-25], [24,6,-28], [24,9,-26]
+  ],
+  cmti10: [
+    [35,34,0], [37,36,0], [39,37,2], [32,36,0], [37,34,0], [42,34,0], [39,34,0], [41,35,0],
+    [36,34,0], [41,34,0], [38,35,0], [40,46,11], [32,46,11], [34,46,11], [47,46,11], [49,46,11],
+    [17,23,1], [18,33,11], [22,11,-24], [27,11,-24], [27,7,-24], [28,9,-25], [28,2,-27], [33,10,-26],
+    [17,11,10], [30,46,11], [36,23,1], [36,23,1], [27,33,6], [47,34,0], [52,37,2], [41,40,3],
+    [17,7,-13], [19,36,0], [26,15,-19], [41,44,10], [35,36,1], [42,40,3], [40,38,2], [19,15,-19],
+    [26,50,13], [19,50,13], [29,22,-15], [37,31,3], [11,16,10], [17,3,-9], [11,6,0], [31,50,13],
+    [28,35,2], [23,33,0], [27,35,2], [28,35,2], [24,43,10], [28,35,2], [28,35,2], [31,35,2],
+    [28,35,2], [28,35,2], [15,22,0], [15,32,10], [16,36,11], [39,12,-6], [22,36,11], [27,36,0],
+    [39,36,1], [34,36,0], [36,34,0], [40,37,2], [38,34,0], [37,34,0], [36,34,0], [40,37,2],
+    [42,34,0], [25,34,0], [31,36,2], [43,34,0], [31,34,0], [50,34,0], [42,34,0], [39,37,2],
+    [36,34,0], [39,45,10], [36,36,2], [31,37,2], [40,34,0], [42,36,2], [43,36,2], [56,36,2],
+    [41,34,0], [43,34,0], [35,34,0], [22,50,13], [30,15,-19], [19,50,13], [26,8,-26], [18,6,-27],
+    [18,15,-19], [27,23,1], [23,35,1], [24,23,1], [28,35,1], [23,23,1], [25,46,11], [24,33,11],
+    [27,35,1], [17,34,1], [20,44,11], [25,35,1], [15,35,1], [42,23,1], [29,23,1], [25,23,1],
+    [25,32,10], [25,32,10], [24,23,1], [21,23,1], [19,32,1], [28,23,1], [25,23,1], [35,23,1],
+    [26,23,1], [26,33,11], [23,23,1], [27,2,-12], [51,2,-12], [29,11,-24], [29,6,-27], [27,6,-27]
+  ]
+});
+
+jsMath.Img.AddFont(430,{
+  cmr10: [
+    [35,41,0], [47,43,0], [43,44,2], [39,43,0], [37,40,0], [43,41,0], [40,41,0], [43,42,0],
+    [40,41,0], [43,41,0], [40,42,0], [38,42,0], [32,42,0], [32,42,0], [48,42,0], [48,42,0],
+    [15,27,0], [16,40,13], [18,12,-30], [24,12,-30], [23,8,-30], [24,11,-30], [26,3,-32], [28,12,-31],
+    [22,13,12], [28,43,1], [41,28,1], [45,28,1], [28,39,7], [52,41,0], [59,44,2], [43,48,4],
+    [16,8,-16], [12,43,0], [21,18,-23], [46,53,12], [27,49,4], [46,49,4], [43,45,2], [13,18,-23],
+    [20,60,15], [18,60,15], [26,27,-18], [43,40,5], [12,19,12], [17,4,-11], [12,7,0], [27,60,15],
+    [28,42,2], [25,40,0], [27,40,0], [27,42,2], [28,40,0], [27,42,2], [27,42,2], [29,42,2],
+    [27,42,2], [27,42,2], [12,26,0], [12,38,12], [12,43,13], [43,15,-7], [25,43,13], [25,42,0],
+    [43,43,1], [43,43,0], [39,41,0], [40,44,2], [42,41,0], [39,41,0], [36,41,0], [44,44,2],
+    [43,41,0], [20,41,0], [28,43,2], [44,41,0], [35,41,0], [52,41,0], [43,41,0], [43,44,2],
+    [37,41,0], [43,54,12], [44,43,2], [30,44,2], [41,40,0], [43,43,2], [44,43,2], [60,43,2],
+    [43,41,0], [44,41,0], [34,41,0], [16,60,15], [28,18,-23], [10,60,15], [23,10,-31], [12,7,-33],
+    [12,18,-23], [30,28,1], [31,42,1], [25,28,1], [32,42,1], [25,28,1], [22,42,0], [29,40,13],
+    [32,41,0], [15,40,0], [16,53,13], [31,41,0], [16,41,0], [48,27,0], [32,27,0], [28,28,1],
+    [31,39,12], [32,39,12], [22,27,0], [22,28,1], [20,38,1], [32,28,1], [30,27,1], [42,27,1],
+    [31,26,0], [30,39,13], [24,26,0], [30,2,-15], [59,2,-15], [25,12,-30], [25,7,-33], [24,7,-33]
+  ],
+  cmmi10: [
+    [43,41,0], [47,43,0], [44,44,2], [40,43,0], [46,40,0], [52,41,0], [48,41,0], [42,42,0],
+    [38,41,0], [41,41,0], [47,42,0], [36,28,1], [35,54,12], [33,40,13], [27,43,1], [23,27,1],
+    [28,55,13], [30,40,13], [27,43,1], [20,28,1], [33,28,1], [33,42,1], [34,40,13], [31,27,0],
+    [27,55,13], [34,27,1], [30,40,13], [34,27,1], [31,27,1], [31,28,1], [34,54,13], [36,40,13],
+    [38,54,13], [36,28,1], [26,29,2], [34,43,1], [49,27,1], [30,39,12], [25,34,7], [37,40,13],
+    [56,18,-13], [56,17,1], [56,18,-13], [56,17,1], [14,15,-13], [14,15,-13], [28,31,1], [28,31,1],
+    [28,29,2], [25,27,0], [27,27,0], [27,40,13], [28,40,12], [27,40,13], [27,42,2], [29,41,13],
+    [27,42,2], [27,40,13], [12,7,0], [12,19,12], [41,35,3], [27,60,15], [41,35,3], [30,29,0],
+    [34,45,2], [43,43,0], [45,41,0], [45,44,2], [48,41,0], [46,41,0], [45,41,0], [45,44,2],
+    [52,41,0], [30,41,0], [38,43,2], [53,41,0], [38,41,0], [62,41,0], [52,41,0], [44,44,2],
+    [45,41,0], [44,54,12], [45,43,2], [39,44,2], [42,40,0], [45,43,2], [46,43,2], [62,43,2],
+    [51,41,0], [45,41,0], [43,41,0], [20,47,2], [19,56,13], [20,56,13], [56,15,-7], [56,16,-7],
+    [24,43,1], [30,28,1], [25,42,1], [26,28,1], [31,42,1], [26,28,1], [33,55,13], [28,40,13],
+    [33,42,1], [18,40,1], [25,52,13], [30,42,1], [16,42,1], [51,28,1], [34,28,1], [28,28,1],
+    [31,39,12], [27,39,12], [26,28,1], [25,28,1], [20,38,1], [33,28,1], [28,28,1], [41,28,1],
+    [32,28,1], [29,40,13], [28,28,1], [18,28,1], [23,40,13], [37,40,13], [37,13,-30], [39,9,-31]
+  ],
+  cmsy10: [
+    [41,3,-13], [12,7,-11], [38,29,0], [26,26,-2], [43,34,2], [29,29,0], [43,40,0], [43,40,10],
+    [43,40,5], [43,40,5], [43,40,5], [43,40,5], [43,40,5], [56,56,13], [27,24,-3], [27,24,-3],
+    [43,29,0], [43,26,-2], [41,47,9], [41,47,9], [41,47,9], [41,47,9], [41,47,9], [41,47,9],
+    [43,15,-7], [43,26,-3], [41,35,3], [41,35,3], [56,38,4], [56,38,4], [41,35,3], [41,35,3],
+    [56,22,-4], [56,22,-4], [26,53,12], [26,53,12], [56,22,-4], [56,54,12], [56,53,12], [43,26,-2],
+    [56,33,2], [56,33,2], [35,53,12], [35,53,12], [57,33,2], [56,54,12], [56,53,12], [43,28,1],
+    [16,31,-2], [56,28,1], [35,35,3], [35,35,3], [49,43,0], [49,43,13], [38,56,13], [8,23,-3],
+    [33,43,2], [30,41,0], [36,16,-5], [27,51,5], [43,45,2], [41,43,1], [43,40,0], [43,40,0],
+    [33,41,0], [48,46,3], [40,44,2], [32,44,2], [46,41,0], [34,44,2], [49,43,2], [36,50,8],
+    [49,44,3], [40,41,0], [50,49,8], [44,44,2], [39,44,2], [66,45,3], [60,49,3], [46,44,2],
+    [44,44,3], [47,50,8], [50,43,2], [38,44,2], [48,43,0], [42,43,2], [39,44,3], [62,44,3],
+    [48,41,0], [43,49,8], [46,41,0], [36,38,2], [36,38,2], [36,38,2], [36,38,2], [36,38,2],
+    [33,41,0], [33,41,0], [25,60,15], [16,60,15], [25,60,15], [16,60,15], [26,60,15], [26,60,15],
+    [20,60,15], [17,60,15], [10,60,15], [22,60,15], [26,63,17], [35,63,17], [27,60,15], [14,40,5],
+    [51,60,57], [43,41,0], [47,43,2], [28,56,13], [36,36,0], [36,36,0], [43,47,9], [41,47,9],
+    [23,55,13], [23,55,13], [23,55,13], [35,53,12], [45,51,8], [43,53,10], [43,45,2], [43,51,8]
+  ],
+  cmex10: [
+    [25,72,69], [18,72,69], [24,72,69], [13,72,69], [27,72,69], [16,72,69], [27,72,69], [16,72,69],
+    [28,72,69], [28,72,69], [24,72,69], [22,72,69], [12,39,37], [25,39,37], [31,72,69], [31,72,69],
+    [34,107,104], [25,107,104], [42,143,140], [32,143,140], [31,143,140], [17,143,140], [34,143,140], [20,143,140],
+    [34,143,140], [20,143,140], [37,143,140], [37,143,140], [39,143,140], [37,143,140], [59,143,140], [59,143,140],
+    [45,178,175], [33,178,175], [34,178,175], [19,178,175], [37,178,175], [22,178,175], [37,178,175], [22,178,175],
+    [39,178,175], [39,178,175], [42,178,175], [40,178,175], [73,178,175], [73,178,175], [45,107,104], [45,107,104],
+    [50,108,105], [35,108,105], [39,107,104], [21,107,104], [39,107,104], [21,107,104], [24,37,36], [21,37,36],
+    [43,55,54], [30,55,54], [43,55,54], [30,55,54], [30,108,107], [43,108,107], [30,20,19], [21,37,36],
+    [50,107,104], [35,107,104], [24,37,36], [35,37,36], [31,107,104], [30,107,104], [46,60,59], [63,84,83],
+    [36,67,66], [56,133,132], [63,60,59], [86,84,83], [63,60,59], [86,84,83], [63,60,59], [86,84,83],
+    [59,60,59], [53,60,59], [36,67,66], [46,60,59], [46,60,59], [46,60,59], [46,60,59], [46,60,59],
+    [82,84,83], [73,84,83], [56,133,132], [63,84,83], [63,84,83], [63,84,83], [63,84,83], [63,84,83],
+    [53,60,59], [73,84,83], [35,11,-33], [61,13,-33], [87,13,-33], [33,8,-35], [59,9,-36], [86,9,-36],
+    [27,107,104], [15,107,104], [31,107,104], [18,107,104], [31,107,104], [18,107,104], [33,107,104], [33,107,104],
+    [61,72,69], [61,107,104], [61,143,140], [61,178,175], [44,109,107], [44,39,37], [64,38,35], [31,37,36],
+    [33,37,36], [33,37,36], [30,21,13], [29,21,13], [30,20,0], [29,20,0], [43,37,36], [43,37,36]
+  ],
+  cmbx10: [
+    [38,41,0], [54,42,0], [49,43,1], [46,42,0], [43,40,0], [51,41,0], [46,41,0], [49,42,0],
+    [46,41,0], [49,41,0], [46,42,0], [45,42,0], [36,42,0], [36,42,0], [55,42,0], [55,42,0],
+    [17,27,0], [20,39,12], [20,12,-30], [27,12,-30], [27,9,-30], [28,12,-29], [30,4,-32], [33,11,-31],
+    [26,13,12], [34,43,1], [48,28,1], [51,28,1], [32,40,7], [60,41,0], [68,43,1], [49,49,4],
+    [19,8,-16], [15,42,0], [28,21,-20], [53,53,12], [31,49,4], [53,49,4], [50,43,1], [15,21,-20],
+    [23,60,15], [20,60,15], [30,27,-18], [49,46,8], [15,22,12], [19,6,-10], [14,10,0], [31,60,15],
+    [32,40,1], [30,39,0], [31,39,0], [32,40,1], [32,39,0], [31,40,1], [32,40,1], [33,41,1],
+    [32,40,1], [32,40,1], [14,27,0], [15,39,12], [15,43,13], [49,18,-6], [29,42,12], [29,42,0],
+    [49,43,1], [49,42,0], [45,41,0], [46,43,1], [49,41,0], [43,41,0], [40,41,0], [50,43,1],
+    [51,41,0], [24,41,0], [32,42,1], [51,41,0], [38,41,0], [63,41,0], [51,41,0], [48,43,1],
+    [43,41,0], [48,54,12], [51,42,1], [34,43,1], [45,40,0], [50,42,1], [50,42,1], [69,42,1],
+    [50,41,0], [51,41,0], [39,41,0], [18,60,15], [34,21,-20], [12,60,15], [27,10,-31], [14,10,-31],
+    [14,21,-20], [33,28,1], [36,42,1], [29,28,1], [36,42,1], [30,28,1], [26,42,0], [33,39,12],
+    [37,41,0], [17,41,0], [20,53,12], [35,41,0], [18,41,0], [56,27,0], [37,27,0], [32,28,1],
+    [36,39,12], [36,39,12], [27,27,0], [25,28,1], [23,39,1], [37,28,1], [35,28,1], [48,28,1],
+    [35,27,0], [35,39,12], [28,27,0], [34,3,-15], [68,3,-15], [29,12,-30], [29,7,-34], [28,9,-32]
+  ],
+  cmti10: [
+    [42,41,0], [45,43,0], [47,44,2], [38,43,0], [45,40,0], [51,41,0], [47,41,0], [50,42,0],
+    [44,41,0], [49,41,0], [45,42,0], [47,55,13], [38,55,13], [40,55,13], [57,55,13], [58,55,13],
+    [20,28,1], [22,40,13], [26,13,-29], [33,13,-29], [32,9,-29], [34,11,-30], [34,3,-32], [40,12,-31],
+    [20,13,12], [37,55,13], [43,28,1], [43,28,1], [33,39,7], [57,41,0], [63,44,2], [49,48,4],
+    [21,8,-16], [23,43,0], [31,18,-23], [49,53,12], [42,43,1], [50,49,4], [48,45,2], [22,18,-23],
+    [31,60,15], [23,60,15], [35,27,-18], [45,37,4], [14,19,12], [20,4,-11], [14,7,0], [37,60,15],
+    [33,42,2], [28,40,0], [33,42,2], [34,42,2], [28,52,12], [34,42,2], [34,42,2], [37,42,2],
+    [33,42,2], [33,42,2], [18,26,0], [18,38,12], [19,43,13], [46,15,-7], [27,43,13], [33,43,0],
+    [47,43,1], [41,43,0], [44,41,0], [48,44,2], [46,41,0], [44,41,0], [44,41,0], [48,44,2],
+    [51,41,0], [30,41,0], [37,43,2], [51,41,0], [37,41,0], [60,41,0], [51,41,0], [47,44,2],
+    [44,41,0], [47,54,12], [43,43,2], [38,44,2], [48,40,0], [51,43,2], [52,43,2], [67,43,2],
+    [49,41,0], [52,41,0], [42,41,0], [27,60,15], [36,18,-23], [23,60,15], [31,10,-31], [22,7,-33],
+    [22,18,-23], [32,28,1], [28,42,1], [28,28,1], [34,42,1], [28,28,1], [29,55,13], [29,40,13],
+    [32,42,1], [20,40,1], [25,52,13], [30,42,1], [19,42,1], [50,28,1], [35,28,1], [31,28,1],
+    [31,39,12], [30,39,12], [29,28,1], [25,28,1], [22,38,1], [34,28,1], [30,28,1], [42,28,1],
+    [31,28,1], [31,40,13], [28,28,1], [33,2,-15], [62,2,-15], [34,13,-29], [34,7,-33], [33,7,-33]
+  ]
+});
diff --git a/htdocs/jsMath/uncompressed/font.js b/htdocs/jsMath/uncompressed/font.js
new file mode 100644
index 0000000000..51f0a2fe63
--- /dev/null
+++ b/htdocs/jsMath/uncompressed/font.js
@@ -0,0 +1,1677 @@
+jsMath.Img.AddFont(50,{
+  cmr10: [
+    [4,5,0], [6,5,0], [5,6,1], [5,5,0], [5,5,0], [5,5,0], [5,5,0], [5,5,0],
+    [5,5,0], [5,5,0], [5,5,0], [5,5,0], [4,5,0], [4,5,0], [6,5,0], [6,5,0],
+    [2,3,0], [3,5,2,1], [2,2,-3], [2,2,-3,-1], [2,2,-3,-1], [3,2,-3], [3,2,-3], [2,2,-3,-2],
+    [2,2,2,-1], [4,5,0], [5,4,0], [6,4,0], [4,5,1], [6,5,0], [7,6,1], [5,6,1],
+    [2,1,-2], [2,5,0], [3,2,-3], [6,7,2], [4,6,1], [6,7,1], [5,6,1], [2,2,-3],
+    [3,7,2], [2,7,2], [3,4,-2], [5,5,1], [2,2,1], [2,1,-1], [2,1,0], [3,7,2],
+    [4,6,1], [3,5,0], [4,5,0], [4,6,1], [4,5,0], [4,6,1], [4,6,1], [4,6,1],
+    [4,6,1], [4,6,1], [2,3,0], [2,4,1], [2,6,2], [5,3,0], [3,6,2], [3,5,0],
+    [5,5,0], [5,5,0], [5,5,0], [5,6,1], [5,5,0], [5,5,0], [5,5,0], [5,6,1],
+    [5,5,0], [3,5,0], [3,6,1], [5,5,0], [4,5,0], [6,5,0], [5,5,0], [5,6,1],
+    [5,5,0], [5,7,2], [5,6,1], [4,6,1], [5,5,0], [5,6,1], [5,5,0], [7,5,0],
+    [7,5,0,2], [5,5,0], [4,5,0], [2,8,2], [3,3,-2,-1], [2,8,2], [2,1,-4,-1], [2,1,-4],
+    [2,3,-2], [4,4,0], [4,5,0], [3,4,0], [4,5,0], [3,4,0], [3,5,0], [4,5,2],
+    [4,5,0], [2,5,0], [3,7,2,1], [4,5,0], [2,5,0], [6,3,0], [4,3,0], [4,4,0],
+    [4,5,2], [4,5,2], [3,3,0], [3,4,0], [3,5,0], [4,3,0], [4,3,0], [5,3,0],
+    [4,3,0], [4,5,2], [3,3,0], [4,1,-1], [7,1,-1], [2,2,-3,-1], [3,1,-4], [3,1,-4],
+    [3,11,20,28,37,45,54,63,71,80,88,97,105,114,122,131],
+    [9,17,26,34,42,51,59,67],
+    [141,73]
+  ],
+  cmmi10: [
+    [5,5,0], [6,5,0], [6,6,1], [5,5,0], [6,5,0], [6,5,0], [6,5,0], [5,5,0],
+    [5,5,0], [5,5,0], [6,5,0], [5,3,0], [4,6,1], [4,5,2], [3,5,0], [3,3,0],
+    [4,7,2], [4,5,2], [4,5,0], [3,3,0], [4,3,0], [4,5,0], [4,5,2], [4,3,0],
+    [3,7,2], [4,3,0], [4,5,2], [4,3,0], [4,3,0], [4,3,0], [4,7,2], [4,5,2],
+    [5,7,2], [5,3,0], [3,5,1], [4,5,0], [6,3,0], [4,5,2], [3,4,1], [5,5,2],
+    [7,3,-1], [9,2,0,2], [7,3,-1], [9,2,0,2], [4,3,-1,2], [2,3,-1], [4,4,0], [4,4,0],
+    [4,5,1], [3,3,0], [4,4,0], [4,6,2], [4,6,2], [3,5,2], [4,6,1], [4,5,2],
+    [4,6,1], [4,6,2], [2,1,0], [2,2,1], [5,5,1], [3,7,2], [5,5,1], [4,4,0],
+    [4,6,1], [5,5,0], [6,5,0], [6,6,1], [6,5,0], [6,5,0], [6,5,0], [6,6,1],
+    [6,5,0], [4,5,0], [5,6,1], [6,5,0], [5,5,0], [7,5,0], [8,5,0,2], [6,6,1],
+    [6,5,0], [6,7,2], [6,6,1], [5,6,1], [5,5,0], [6,6,1], [6,5,0], [7,5,0],
+    [8,5,0,2], [6,5,0], [5,5,0], [3,5,0], [3,7,2], [3,7,2], [7,2,-1], [9,2,-1,2],
+    [3,5,0], [4,3,0], [3,5,0], [3,3,0], [4,5,0], [3,3,0], [4,7,2], [4,5,2],
+    [4,5,0], [2,5,0], [3,7,2], [4,5,0], [2,5,0], [6,3,0], [4,3,0], [4,3,0],
+    [4,5,2], [3,5,2], [3,3,0], [3,3,0], [3,5,0], [4,3,0], [4,3,0], [5,3,0],
+    [4,3,0], [4,5,2], [3,3,0], [2,3,0], [3,5,2], [5,5,2], [4,2,-3,-1], [3,1,-4,-2],
+    [3,11,19,28,36,44,53,61,69,77,86,94,102,111,119,127],
+    [9,17,26,34,42,51,59,67],
+    [137,73]
+  ],
+  cmsy10: [
+    [5,1,-1], [2,1,-1], [4,4,0,-1], [3,4,0], [5,5,1], [4,4,0], [5,5,0], [5,5,1],
+    [5,5,1], [5,5,1], [5,5,1], [5,5,1], [5,5,1], [7,7,2], [3,4,0], [3,4,0],
+    [5,4,0], [5,4,0], [5,6,1], [5,6,1], [5,6,1], [5,6,1], [5,6,1], [5,6,1],
+    [5,2,-1], [5,4,0], [5,5,1], [5,5,1], [7,5,1], [7,5,1], [5,5,1], [5,5,1],
+    [7,3,0], [7,3,0], [3,7,2], [3,7,2], [7,3,0], [7,7,2], [7,7,2], [5,4,0],
+    [7,4,0], [7,4,0], [4,7,2], [4,7,2], [7,4,0], [7,7,2], [7,7,2], [5,3,0],
+    [2,4,0], [7,3,0], [4,5,1], [4,5,1], [6,5,0], [6,6,2], [4,7,2,-1], [1,3,0],
+    [4,5,0], [4,5,0], [5,3,0], [4,7,1], [5,6,1], [5,5,0], [5,5,0], [5,5,0],
+    [4,5,0], [6,6,1], [5,6,1], [4,6,1], [6,5,0], [4,6,1], [6,6,1], [5,6,1],
+    [6,6,1], [5,5,0], [6,6,1], [5,6,1], [5,6,1], [8,6,1], [9,7,1,2], [6,6,1],
+    [6,6,1], [6,6,1], [6,6,1], [5,6,1], [6,5,0], [6,6,1,1], [5,6,1], [8,6,1],
+    [6,5,0], [5,6,1], [6,5,0], [5,5,1], [5,5,0], [5,5,1], [5,4,0], [5,4,0],
+    [4,5,0], [4,5,0], [2,8,2,-1], [2,8,2], [2,8,2,-1], [2,8,2], [3,8,2], [3,8,2],
+    [3,8,2], [2,8,2], [2,7,2], [3,8,2], [3,8,2], [4,8,2], [3,8,2], [2,5,1],
+    [6,8,7], [5,5,0], [6,6,1], [4,7,2], [5,4,0], [5,5,0], [5,6,1], [5,6,1],
+    [3,7,2], [3,7,2], [3,7,2], [4,7,2], [6,6,1], [5,6,1], [5,6,1], [5,6,1],
+    [3,13,23,33,43,53,63,73,83,93,103,113,123,133,142,152],
+    [9,24,38,52,66,80,95,109],
+    [164,121]
+  ],
+  cmex10: [
+    [6,9,8,3], [3,9,8], [2,10,9,-1], [2,10,9], [2,10,9,-1], [2,10,9], [2,9,8,-1], [2,9,8],
+    [2,9,8,-1], [2,9,8,-1], [3,9,8], [3,9,8], [1,5,5,-1], [2,5,5,-1], [4,9,8], [4,9,8],
+    [7,14,13,3], [3,14,13], [4,18,17,-1], [4,18,17], [3,18,17,-1], [2,18,17], [3,18,17,-1], [3,18,17],
+    [3,18,17,-1], [3,18,17], [4,18,17,-1], [4,18,17,-1], [4,18,17,-1], [5,18,17], [7,18,17], [7,18,17],
+    [9,22,21,3], [4,22,21], [3,22,21,-1], [3,22,21], [4,22,21,-1], [3,22,21], [4,22,21,-1], [3,22,21],
+    [4,22,21,-1], [4,22,21,-1], [4,22,21,-1], [5,22,21], [9,22,21], [9,22,21], [6,14,13], [6,14,13],
+    [9,14,13,3], [5,14,13], [3,14,13,-2], [3,14,13], [3,14,13,-2], [3,14,13], [1,5,5,-2], [2,5,5,-1],
+    [3,7,7,-2], [3,7,7,-1], [3,7,7,-2], [3,7,7,-1], [3,13,13,-1], [3,13,13,-2], [2,3,3,-2], [1,5,5,-2],
+    [9,14,13,3], [5,14,13], [1,5,5,-2], [2,5,5,-3], [4,14,13], [4,14,13], [6,7,7], [8,10,10],
+    [5,8,8], [7,16,16], [8,7,7], [11,10,10], [11,7,7,3], [11,10,10], [11,7,7,3], [11,10,10],
+    [10,8,7,3], [7,7,7], [5,8,8], [6,7,7], [6,7,7], [6,7,7], [6,7,7], [6,7,7],
+    [10,10,10], [9,10,10], [7,16,16], [8,10,10], [8,10,10], [8,10,10], [8,10,10], [8,10,10],
+    [10,8,7,3], [9,10,10], [4,1,-4], [7,2,-4], [10,2,-4], [4,1,-4], [7,2,-4], [10,2,-4],
+    [6,19,13,3], [2,14,13], [3,14,13,-1], [3,14,13], [3,14,13,-1], [3,14,13], [3,14,13,-1], [3,14,13,-1],
+    [10,9,8,3], [6,13,13,-1], [6,17,17,-1], [6,21,21,-1], [5,13,13,-1], [2,5,5,-4], [4,5,4,-4], [3,5,5,-1],
+    [3,5,5,-1], [4,4,4], [5,3,2,1], [4,3,2], [4,3,0], [4,3,0], [5,5,5], [5,4,4],
+    [3,16,28,41,53,66,78,91,103,116,129,141,154,166,179,191],
+    [11,42,72,103,134,165,196,226],
+    [205,256]
+  ],
+  cmbx10: [
+    [5,5,0], [7,5,0], [6,5,0], [6,5,0], [5,5,0], [6,5,0], [6,5,0], [6,5,0],
+    [6,5,0], [6,5,0], [6,5,0], [6,5,0], [5,5,0], [5,5,0], [7,5,0], [7,5,0],
+    [2,4,0], [3,6,2,1], [3,2,-3], [3,2,-3,-1], [2,2,-3,-1], [4,2,-3], [4,2,-3], [2,2,-3,-2],
+    [2,2,2,-1], [4,5,0], [6,4,0], [6,4,0], [4,5,1], [7,5,0], [8,6,1], [6,6,1],
+    [3,1,-2], [2,5,0], [4,3,-2], [7,7,2], [4,6,1], [7,7,1], [6,5,0], [2,3,-2],
+    [3,8,2], [3,8,2], [4,4,-2], [6,6,1], [2,2,1], [3,1,-1], [2,1,0], [4,8,2],
+    [4,5,0], [4,5,0], [4,5,0], [4,5,0], [4,5,0], [4,5,0], [4,5,0], [4,5,0],
+    [4,5,0], [4,5,0], [2,3,0], [2,4,1], [2,6,2], [6,3,0], [4,6,2], [4,5,0],
+    [6,5,0], [6,5,0], [6,5,0], [6,5,0], [6,5,0], [5,5,0], [5,5,0], [6,5,0],
+    [6,5,0], [3,5,0], [4,6,1], [6,5,0], [5,5,0], [8,5,0], [6,5,0], [6,5,0],
+    [5,5,0], [6,7,2], [6,5,0], [4,5,0], [6,5,0], [6,5,0], [6,5,0], [8,5,0],
+    [6,5,0], [6,5,0], [5,5,0], [2,8,2], [3,3,-2,-1], [2,8,2], [2,2,-3,-1], [2,2,-3],
+    [2,3,-2], [4,4,0], [5,5,0], [4,4,0], [5,5,0], [4,4,0], [3,5,0], [4,6,2],
+    [5,5,0], [2,5,0], [3,7,2,1], [4,5,0], [2,5,0], [7,4,0], [5,4,0], [4,4,0],
+    [5,6,2], [5,6,2], [3,4,0], [3,4,0], [3,5,0], [5,4,0], [4,4,0], [6,4,0],
+    [4,4,0], [4,6,2], [4,4,0], [4,1,-1], [8,1,-1], [3,2,-3,-1], [4,1,-4], [4,2,-3],
+    [3,13,23,33,42,52,62,72,82,92,102,111,121,131,141,151],
+    [9,17,26,34,42,51,59,67],
+    [162,73]
+  ],
+  cmti10: [
+    [5,5,0], [6,5,0], [5,6,1,-1], [5,5,0], [6,5,0], [6,5,0], [6,5,0], [5,5,0,-1],
+    [5,5,0,-1], [5,5,0,-1], [6,5,0], [6,7,2], [5,7,2], [5,7,2], [7,7,2], [9,7,2,2],
+    [3,3,0], [4,5,2,1], [1,2,-3,-2], [2,2,-3,-2], [2,2,-3,-2], [2,2,-3,-2], [2,2,-3,-2], [2,2,-3,-3],
+    [2,2,2,-1], [4,7,2], [5,3,0], [5,3,0], [4,5,1], [7,5,0], [6,6,1,-1], [8,6,1,2],
+    [3,1,-2], [3,5,0], [3,2,-3,-1], [5,7,2,-1], [5,5,0], [5,7,1,-1], [6,6,1], [2,2,-3,-1],
+    [3,7,2,-1], [3,7,2], [3,3,-2,-1], [5,5,1,-1], [2,3,2], [3,1,-1], [2,1,0], [5,8,2],
+    [4,6,1], [3,5,0,-1], [4,6,1], [4,6,1], [4,7,2], [4,6,1], [4,6,1], [4,5,0,-1],
+    [4,6,1], [4,6,1], [2,3,0], [2,5,2], [3,6,2], [5,3,0,-1], [3,6,2], [3,5,0,-1],
+    [5,5,0,-1], [5,5,0], [6,5,0], [5,6,1,-1], [6,5,0], [6,5,0], [6,5,0], [5,6,1,-1],
+    [6,5,0], [4,5,0], [5,6,1], [6,5,0], [5,5,0], [7,5,0], [6,5,0], [5,6,1,-1],
+    [5,5,0], [5,7,2,-1], [5,6,1], [5,6,1], [5,5,0,-1], [5,6,1,-1], [5,5,0,-1], [7,5,0,-1],
+    [8,5,0,2], [5,5,0,-1], [5,5,0], [3,8,2], [2,3,-2,-2], [3,8,2], [2,1,-4,-2], [2,1,-4,-1],
+    [2,3,-2,-1], [4,3,0], [4,5,0], [4,3,0], [4,5,0], [4,3,0], [4,7,2], [4,5,2],
+    [4,5,0], [3,5,0], [4,7,2,1], [4,5,0], [2,5,0], [6,3,0], [4,3,0], [4,3,0],
+    [4,5,2], [4,5,2], [4,3,0], [3,3,0], [3,5,0], [4,3,0], [4,3,0], [5,3,0],
+    [4,3,0], [4,5,2], [3,3,0], [3,1,-1,-1], [6,1,-1,-1], [6,4,-1,2], [2,1,-4,-2], [2,1,-4,-2],
+    [3,11,20,28,37,45,54,62,71,79,88,96,105,113,122,130],
+    [9,17,26,34,42,51,59,67],
+    [140,73]
+  ]
+});
+
+jsMath.Img.AddFont(60,{
+  cmr10: [
+    [5,6,0], [7,6,0], [6,7,1], [6,6,0], [5,6,0], [6,6,0], [6,6,0], [6,6,0],
+    [6,6,0], [6,6,0], [6,6,0], [5,6,0], [4,6,0], [4,6,0], [7,6,0], [7,6,0],
+    [2,4,0], [3,6,2,1], [2,2,-4,-1], [2,2,-4,-1], [2,1,-4,-1], [4,2,-4], [4,1,-4], [2,2,-4,-2],
+    [2,2,2,-1], [4,6,0], [6,5,1], [6,4,0], [4,5,1], [7,6,0], [8,7,1], [6,7,1],
+    [2,1,-2], [2,6,0], [3,3,-3], [6,8,2], [4,7,1], [7,7,1], [6,7,1], [2,3,-3],
+    [3,8,2], [3,8,2], [4,4,-2], [6,6,1], [2,3,2], [3,1,-1], [2,1,0], [4,8,2],
+    [4,7,1], [4,6,0], [4,6,0], [4,7,1], [4,6,0], [4,7,1], [4,7,1], [4,7,1],
+    [4,7,1], [4,7,1], [2,4,0], [2,6,2], [2,6,2], [6,2,-1], [4,6,2], [4,6,0],
+    [6,7,1], [6,6,0], [6,6,0], [6,7,1], [6,6,0], [6,6,0], [5,6,0], [6,7,1],
+    [6,6,0], [3,6,0], [4,7,1], [6,6,0], [5,6,0], [7,6,0], [6,6,0], [6,7,1],
+    [5,6,0], [6,8,2], [6,7,1], [4,7,1], [6,6,0], [6,7,1], [6,6,0], [8,6,0],
+    [6,6,0], [6,6,0], [5,6,0], [2,8,2], [3,3,-3,-1], [2,8,2], [2,2,-4,-1], [2,2,-4],
+    [2,3,-3], [4,5,1], [5,7,1], [4,4,0], [4,6,0], [4,4,0], [3,6,0], [4,6,2],
+    [5,6,0], [2,6,0], [3,8,2,1], [4,6,0], [2,6,0], [7,4,0], [5,4,0], [4,4,0],
+    [5,6,2], [4,6,2], [3,4,0], [3,5,1], [3,5,0], [5,4,0], [4,4,0], [6,4,0],
+    [4,4,0], [4,6,2], [4,4,0], [4,1,-2], [8,1,-2], [3,2,-4,-1], [4,2,-4], [2,2,-4,-1],
+    [3,14,24,34,44,55,65,75,85,95,106,116,126,136,147,157],
+    [11,21,31,41,51,61,71,81],
+    [169,87]
+  ],
+  cmmi10: [
+    [6,6,0], [7,6,0], [6,7,1], [6,6,0], [7,6,0], [7,6,0], [7,6,0], [6,6,0],
+    [5,6,0], [6,6,0], [7,6,0], [5,5,1], [5,8,2], [5,6,2], [4,6,0], [3,4,0],
+    [4,8,2], [4,6,2], [4,6,0], [3,4,0], [5,4,0], [5,6,0], [5,6,2], [5,4,0],
+    [4,8,2], [5,4,0], [4,6,2], [5,5,1], [4,4,0], [5,4,0], [5,8,2], [5,6,2],
+    [5,8,2], [5,4,0], [4,5,1], [5,6,0], [7,4,0], [4,6,2], [4,5,1], [5,6,2],
+    [8,3,-1], [8,3,0], [8,3,-1], [8,3,0], [2,3,-1], [2,3,-1], [4,4,0], [4,4,0],
+    [4,5,1], [3,4,0,-1], [4,4,0], [4,6,2], [4,6,2], [4,6,2], [4,7,1], [4,6,2],
+    [4,7,1], [4,6,2], [2,1,0], [2,3,2], [6,6,1], [4,8,2], [6,6,1], [4,4,0],
+    [5,7,1], [6,6,0], [6,6,0], [6,7,1], [7,6,0], [6,6,0], [6,6,0], [6,7,1],
+    [7,6,0], [4,6,0], [5,7,1], [7,6,0], [5,6,0], [9,6,0], [9,6,0,2], [6,7,1],
+    [6,6,0], [6,8,2], [6,7,1], [6,7,1], [6,6,0], [6,7,1], [6,6,0], [9,6,0],
+    [9,6,0,2], [6,6,0], [6,6,0], [3,6,0], [3,8,2], [3,8,2], [8,2,-1], [8,2,-1],
+    [4,6,0], [4,4,0], [4,6,0], [4,5,1], [4,6,0], [4,4,0], [5,8,2], [4,6,2],
+    [5,6,0], [3,6,0], [3,8,2], [4,6,0], [2,6,0], [7,4,0], [5,4,0], [4,5,1],
+    [4,6,2], [4,6,2], [4,4,0], [4,5,1], [3,5,0], [5,4,0], [4,4,0], [6,4,0],
+    [5,4,0], [4,6,2], [4,4,0], [3,4,0], [3,6,2], [5,6,2], [4,2,-4,-1], [4,2,-4,-2],
+    [3,13,23,33,43,53,63,73,83,93,103,113,123,133,143,153],
+    [11,21,31,41,51,61,71,81],
+    [164,87]
+  ],
+  cmsy10: [
+    [5,2,-1,-1], [2,2,-1], [4,4,0,-1], [4,4,0], [6,6,1], [4,4,0], [6,6,0], [6,6,2],
+    [6,6,1], [6,6,1], [6,6,1], [6,6,1], [6,6,1], [8,8,2], [4,4,0], [4,4,0],
+    [6,4,0], [6,4,0], [6,8,2], [6,8,2], [6,7,2], [6,7,2], [6,7,2], [6,7,2],
+    [6,2,-1], [6,4,0], [6,6,1], [6,6,1], [8,6,1], [8,6,1], [5,6,1,-1], [6,6,1],
+    [8,4,0], [8,4,0], [4,8,2], [4,8,2], [8,4,0], [8,8,2], [8,8,2], [6,4,0],
+    [8,6,1], [8,6,1], [5,8,2], [5,8,2], [8,6,1], [8,8,2], [8,8,2], [6,4,0],
+    [2,5,0], [8,4,0], [5,6,1], [5,6,1], [7,6,0], [7,6,2], [4,8,2,-1], [1,4,0],
+    [5,6,0], [4,6,0], [5,3,0], [4,7,1], [6,7,1], [6,7,1], [6,6,0], [6,6,0],
+    [5,6,0], [7,7,1], [6,7,1], [5,7,1], [7,6,0], [5,7,1], [7,7,1], [5,7,1],
+    [7,7,1], [5,6,0], [7,7,1], [6,7,1], [5,7,1], [9,7,1], [9,8,1,1], [7,7,1],
+    [6,7,1], [6,7,1,-1], [7,7,1], [6,7,1], [7,6,0], [7,7,1,1], [6,7,1], [9,7,1],
+    [7,6,0], [6,7,1], [6,6,0], [5,6,1], [5,5,0], [5,6,1], [5,5,0], [5,5,0],
+    [5,6,0], [5,6,0], [3,8,2,-1], [3,8,2], [3,8,2,-1], [3,8,2], [3,8,2,-1], [3,8,2],
+    [2,8,2,-1], [3,8,2], [1,8,2,-1], [2,8,2,-1], [4,8,2], [5,8,2], [4,8,2], [2,6,1],
+    [7,9,8], [6,6,0], [7,7,1], [4,8,2], [5,5,0], [5,5,0], [6,8,2], [6,8,2],
+    [3,8,2], [3,8,2], [3,8,2], [5,8,2], [6,7,1], [6,8,2], [6,7,1], [6,7,1],
+    [3,15,27,39,51,63,75,87,99,111,123,135,147,159,171,183],
+    [11,28,45,62,80,97,114,131],
+    [196,145]
+  ],
+  cmex10: [
+    [3,10,9,-1], [3,11,10], [2,11,10,-1], [2,11,10], [3,11,10,-1], [3,10,10], [3,11,10,-1], [3,10,9],
+    [3,11,10,-1], [3,11,10,-1], [3,9,9], [3,11,10], [1,5,5,-1], [3,5,5,-1], [4,10,10], [4,10,9],
+    [4,15,14,-1], [4,15,14], [5,20,19,-1], [5,20,19], [2,20,19,-2], [3,20,19], [3,20,19,-2], [3,20,19],
+    [3,20,19,-2], [3,20,19], [4,20,19,-1], [4,20,19,-1], [5,20,19,-1], [5,20,19], [8,20,19], [8,20,19],
+    [5,25,24,-1], [5,25,24], [3,25,24,-2], [3,25,24], [3,25,24,-2], [3,25,24], [3,25,24,-2], [3,25,24],
+    [5,25,24,-1], [5,25,24,-1], [5,25,24,-1], [5,25,24,-1], [10,25,24], [10,25,24], [6,15,14], [6,15,14],
+    [5,16,15,-2], [5,16,15], [4,15,14,-2], [3,15,14], [4,16,15,-2], [3,16,15], [2,5,5,-2], [1,5,5,-2],
+    [3,8,8,-3], [3,8,8,-1], [3,9,8,-3], [3,9,8,-1], [3,16,15,-1], [3,16,15,-3], [1,4,3,-3], [1,5,5,-2],
+    [5,15,14,-2], [5,15,14], [2,5,5,-2], [2,5,5,-3], [4,15,14,-1], [4,15,14], [7,8,8], [9,12,12],
+    [5,9,9], [8,18,18], [9,8,8], [12,12,12], [9,8,8], [12,12,12], [9,8,8], [12,12,12],
+    [8,8,8], [7,8,8], [5,9,9], [7,8,8], [7,8,8], [7,8,8], [7,8,8], [7,8,8],
+    [11,12,12], [10,12,12], [8,18,18], [9,12,12], [9,12,12], [9,12,12], [9,12,12], [9,12,12],
+    [7,8,8], [10,12,12], [5,2,-4], [8,2,-4], [12,3,-4], [5,1,-5], [8,1,-5], [12,1,-5],
+    [3,16,15,-1], [2,16,15], [3,15,15,-1], [3,16,15], [3,15,14,-1], [3,15,14], [4,15,14,-1], [4,15,14,-1],
+    [7,10,10,-1], [7,14,14,-1], [7,19,19,-1], [7,24,24,-1], [5,15,15,-1], [1,5,5,-5], [4,6,5,-5], [3,5,5,-2],
+    [4,5,5,-1], [4,5,5,-1], [5,3,2,1], [5,3,2,1], [5,3,0,1], [5,3,0,1], [6,5,5], [6,5,5],
+    [4,19,34,49,64,79,94,109,124,139,154,169,184,199,215,230],
+    [13,50,87,124,161,198,235,272],
+    [246,308]
+  ],
+  cmbx10: [
+    [5,6,0], [7,6,0], [7,7,1], [6,6,0], [6,6,0], [7,6,0], [6,6,0], [7,6,0],
+    [7,6,0], [7,6,0], [7,6,0], [6,6,0], [5,6,0], [5,6,0], [8,6,0], [8,6,0],
+    [3,4,0], [4,6,2,1], [2,2,-4,-1], [2,2,-4,-2], [3,2,-4,-1], [3,2,-4,-1], [4,1,-4], [3,2,-4,-2],
+    [3,2,2,-1], [5,6,0], [7,4,0], [7,4,0], [5,6,1], [8,6,0], [9,7,1], [7,7,1],
+    [3,2,-2], [2,6,0], [4,4,-2], [7,8,2], [4,7,1], [8,7,1], [7,7,1], [2,3,-3],
+    [3,8,2], [3,8,2], [4,4,-2], [7,6,1], [2,4,2], [3,2,-1], [2,2,0], [4,8,2],
+    [5,6,0], [4,6,0], [5,6,0], [5,7,1], [5,6,0], [5,6,0], [5,7,1], [5,6,0],
+    [5,7,1], [5,6,0], [2,4,0], [2,6,2], [2,6,2], [7,4,0], [4,6,2], [4,6,0],
+    [7,6,0], [7,6,0], [6,6,0], [7,7,1], [7,6,0], [6,6,0], [6,6,0], [7,7,1],
+    [7,6,0], [4,6,0], [5,7,1], [7,6,0], [6,6,0], [9,6,0], [7,6,0], [7,7,1],
+    [6,6,0], [7,8,2], [7,7,1], [5,7,1], [6,6,0], [7,7,1], [7,6,0], [10,6,0],
+    [7,6,0], [7,6,0], [6,6,0], [2,8,2,-1], [4,4,-2,-1], [2,8,2], [3,2,-4,-1], [2,2,-4],
+    [2,4,-2], [5,4,0], [5,6,0], [4,4,0], [5,6,0], [4,4,0], [4,6,0], [5,6,2],
+    [5,6,0], [3,6,0], [4,8,2,1], [5,6,0], [3,6,0], [8,4,0], [5,4,0], [5,4,0],
+    [5,6,2], [5,6,2], [4,4,0], [4,4,0], [3,5,0], [5,4,0], [5,4,0], [7,4,0],
+    [5,4,0], [5,6,2], [4,4,0], [5,1,-2], [9,1,-2], [3,2,-4,-1], [3,2,-4,-1], [3,2,-4,-1],
+    [3,15,27,39,51,63,75,86,98,110,122,134,146,157,169,181],
+    [11,21,31,41,51,61,71,81],
+    [194,87]
+  ],
+  cmti10: [
+    [6,6,0], [6,6,0], [6,7,1,-1], [5,6,0], [6,6,0], [7,6,0], [7,6,0], [6,6,0,-1],
+    [5,6,0,-1], [6,6,0,-1], [6,6,0], [7,8,2,1], [6,8,2,1], [6,8,2,1], [9,8,2,1], [9,8,2,1],
+    [3,4,0], [4,6,2,1], [2,2,-4,-2], [3,2,-4,-2], [3,1,-4,-2], [3,2,-4,-2], [3,1,-4,-2], [3,2,-4,-3],
+    [2,2,2,-1], [6,8,2,1], [6,4,0], [6,4,0], [4,5,1], [8,6,0], [8,7,1,-1], [9,7,1,2],
+    [3,1,-2], [2,6,0,-1], [3,3,-3,-1], [6,8,2,-1], [6,6,0], [6,7,1,-1], [6,7,1,-1], [1,3,-3,-2],
+    [3,8,2,-1], [3,8,2], [4,4,-2,-1], [5,6,1,-1], [2,3,2], [3,1,-1], [1,1,0,-1], [5,8,2],
+    [4,7,1,-1], [3,6,0,-1], [5,7,1], [5,7,1], [4,8,2], [5,7,1], [4,7,1,-1], [4,7,1,-1],
+    [5,7,1], [5,7,1], [2,4,0,-1], [3,6,2], [3,6,2], [6,2,-1,-1], [4,6,2], [4,6,0,-1],
+    [6,7,1,-1], [6,6,0], [6,6,0], [6,7,1,-1], [7,6,0], [6,6,0], [6,6,0], [6,7,1,-1],
+    [7,6,0], [4,6,0], [5,7,1], [7,6,0], [5,6,0], [8,6,0], [7,6,0], [6,7,1,-1],
+    [6,6,0], [6,8,2,-1], [6,7,1], [5,7,1], [6,6,0,-1], [6,7,1,-1], [6,6,0,-1], [8,6,0,-1],
+    [9,6,0,2], [6,6,0,-1], [6,6,0], [4,8,2], [3,3,-3,-2], [3,8,2], [2,2,-4,-2], [1,2,-4,-2],
+    [2,3,-3,-1], [5,4,0], [3,6,0,-1], [4,4,0], [5,6,0], [4,4,0], [5,8,2,1], [4,6,2],
+    [5,6,0], [3,6,0], [4,8,2,1], [4,6,0], [3,6,0], [7,4,0], [5,4,0], [4,4,0],
+    [4,6,2], [4,6,2], [4,4,0], [4,5,1], [3,5,0], [5,4,0], [4,4,0], [6,4,0],
+    [4,4,0], [4,6,2], [4,4,0], [4,1,-2,-1], [7,1,-2,-1], [3,2,-4,-2], [3,2,-4,-2], [3,2,-4,-2],
+    [3,14,24,34,44,54,64,75,85,95,105,115,126,136,146,156],
+    [11,21,31,41,51,61,71,81],
+    [168,87]
+  ]
+});
+
+jsMath.Img.AddFont(70,{
+  cmr10: [
+    [6,7,0], [8,7,0], [8,8,1], [7,7,0], [7,7,0], [7,7,0], [7,7,0], [8,7,0],
+    [7,7,0], [7,7,0], [7,7,0], [7,7,0], [6,7,0], [6,7,0], [8,7,0], [8,7,0],
+    [3,5,0], [4,7,2,1], [2,2,-5,-1], [2,2,-5,-2], [3,2,-5,-1], [3,2,-5,-1], [5,1,-5], [3,3,-5,-2],
+    [3,2,2,-1], [5,7,0], [7,6,1], [8,6,1], [5,7,1], [9,7,0], [10,8,1], [8,9,1],
+    [3,2,-2], [2,8,0], [4,3,-4], [8,9,2], [5,9,1], [8,9,1], [8,9,1], [2,3,-4],
+    [3,10,2,-1], [3,10,2], [5,5,-3], [8,7,1], [2,3,2], [3,2,-1], [2,1,0], [5,10,2],
+    [5,8,1], [3,7,0,-1], [5,7,0], [5,8,1], [5,7,0], [5,8,1], [5,8,1], [5,8,1],
+    [5,10,1], [5,10,1], [2,5,0], [2,7,2], [2,7,2], [8,3,-1], [5,7,2], [5,9,0],
+    [8,8,1], [7,7,0], [7,7,0], [7,8,1], [7,7,0], [7,7,0], [6,7,0], [8,8,1],
+    [7,7,0], [4,7,0], [5,8,1], [8,7,0], [6,7,0], [9,7,0], [7,7,0], [8,8,1],
+    [7,7,0], [8,9,2], [8,8,1], [5,8,1], [7,7,0], [7,8,1], [8,8,1], [10,8,1],
+    [10,7,0,2], [8,7,0], [6,7,0], [2,10,2,-1], [4,3,-4,-1], [2,10,2], [3,2,-5,-1], [2,2,-5],
+    [2,3,-4], [5,5,0], [6,7,0], [4,6,1], [6,8,1], [5,6,1], [4,7,0], [5,7,2],
+    [6,7,0], [3,7,0], [4,9,2,1], [5,9,0], [3,7,0], [8,9,0], [6,5,0], [5,6,1],
+    [6,7,2], [6,7,2], [4,5,0], [4,5,0], [4,7,1], [6,6,1], [5,5,0], [7,5,0],
+    [5,5,0], [5,7,2], [4,5,0], [5,1,-2], [10,1,-2], [4,2,-5,-1], [3,2,-5,-1], [3,2,-5,-1],
+    [4,16,28,40,52,64,76,88,99,111,123,135,147,159,171,183],
+    [13,24,36,47,59,71,82,94],
+    [197,102]
+  ],
+  cmmi10: [
+    [8,7,0], [8,7,0], [8,8,1], [7,7,0], [8,7,0], [9,7,0], [8,7,0], [7,7,0],
+    [7,7,0], [7,7,0], [8,7,0], [6,6,1], [6,9,2], [6,7,2], [5,8,0], [4,6,1],
+    [5,9,2], [5,7,2], [5,8,1], [4,6,1], [6,6,1], [6,7,0], [6,7,2], [6,5,0],
+    [5,9,2], [6,5,0], [5,7,2], [6,5,0], [5,5,0], [6,6,1], [6,9,2], [6,7,2],
+    [7,9,2], [6,6,1], [5,6,1], [6,8,1], [8,5,0], [5,7,2], [4,6,1], [7,7,2],
+    [10,3,-2], [12,3,0,2], [10,3,-2], [10,3,0], [5,3,-2,2], [3,3,-2], [5,5,0], [5,5,0],
+    [5,6,1], [3,5,0,-1], [5,5,0], [5,7,2], [5,7,2], [5,7,2], [5,8,1], [5,7,2],
+    [5,8,1], [5,7,2], [2,1,0], [2,3,2], [6,7,1,-1], [5,10,2], [6,7,1,-1], [5,5,0],
+    [6,9,1], [7,7,0], [8,7,0], [8,8,1], [8,7,0], [8,7,0], [8,7,0], [8,8,1],
+    [9,7,0], [5,7,0], [7,8,1], [9,7,0], [7,7,0], [11,7,0], [11,7,0,2], [8,8,1],
+    [8,7,0], [8,9,2], [8,8,1], [7,8,1], [7,7,0], [8,8,1], [8,8,1], [11,8,1],
+    [11,7,0,2], [8,7,0], [8,7,0], [4,9,1], [4,9,2], [4,9,2], [10,3,-1], [12,3,-1,2],
+    [4,7,0], [5,6,1], [5,8,1], [5,5,0], [6,8,1], [5,5,0], [6,9,2], [5,7,2],
+    [6,7,0], [3,7,0], [4,9,2], [5,7,0], [3,7,0], [9,5,0], [6,6,1], [5,5,0],
+    [6,7,2,1], [5,7,2], [5,5,0], [5,5,0], [4,8,1], [6,6,1], [5,6,1], [7,6,1],
+    [6,6,1], [5,7,2], [5,5,0], [3,5,0], [5,7,2,1], [7,7,2], [5,2,-5,-2], [5,2,-5,-2],
+    [4,15,27,39,50,62,74,85,97,108,120,132,143,155,167,178],
+    [13,24,36,47,59,71,82,94],
+    [191,102]
+  ],
+  cmsy10: [
+    [6,1,-2,-1], [2,1,-2], [6,5,0,-1], [5,5,0], [8,7,1], [5,5,0], [8,7,0], [8,7,2],
+    [8,7,1], [8,7,1], [8,7,1], [8,7,1], [8,7,1], [10,11,3], [5,5,0], [5,5,0],
+    [8,5,0], [8,5,0], [7,9,2], [6,9,2,-1], [6,9,2,-1], [6,9,2,-1], [6,9,2,-1], [7,9,2],
+    [8,3,-1], [8,5,0], [7,7,1], [6,7,1,-1], [10,7,1], [10,7,1], [6,7,1,-1], [6,7,1,-1],
+    [10,5,0], [10,5,0], [5,9,2], [5,9,2], [10,5,0], [10,9,2], [10,9,2], [8,5,0],
+    [10,5,0], [10,5,0], [6,9,2], [6,9,2], [10,7,1], [10,9,2], [10,9,2], [8,6,1],
+    [3,6,0], [10,6,1], [6,7,1], [5,7,1,-1], [9,7,0], [9,7,2], [6,9,2,-1], [2,5,0],
+    [6,8,1], [5,7,0], [7,3,-1], [5,9,1], [7,9,1], [7,8,1], [8,7,0], [8,7,0],
+    [6,7,0], [8,9,1], [7,8,1], [6,8,1], [8,7,0], [6,8,1], [9,8,1], [6,9,2],
+    [8,8,1], [7,7,0], [9,9,2], [8,8,1], [7,8,1], [11,8,1], [13,9,1,3], [8,8,1],
+    [8,8,1], [7,9,2,-1], [9,8,1], [7,8,1], [8,8,0], [8,8,1,1], [7,8,1], [11,8,1],
+    [8,7,0], [8,9,2], [8,7,0], [7,7,1], [7,7,1], [7,7,1], [6,7,1], [6,7,1],
+    [6,7,0], [6,7,0], [4,11,3,-1], [3,11,3], [4,11,3,-1], [3,11,3], [3,11,3,-1], [3,11,3,-1],
+    [3,11,3,-1], [3,11,3], [1,11,3,-1], [3,11,3,-1], [3,11,3,-1], [6,11,3], [5,11,3], [3,7,1],
+    [9,11,10], [7,7,0], [8,8,1], [5,11,3], [6,6,0], [6,6,0], [7,9,2], [7,9,2],
+    [4,9,2], [4,9,2], [4,9,2], [6,9,2], [8,10,2], [8,10,2], [8,9,1], [8,10,2],
+    [4,18,32,46,60,74,88,102,116,130,144,158,172,186,199,213],
+    [13,33,53,73,93,113,133,152],
+    [229,169]
+  ],
+  cmex10: [
+    [3,13,12,-1], [3,13,12], [2,13,12,-2], [3,13,12], [3,13,12,-2], [3,13,12], [3,13,12,-2], [3,13,12],
+    [4,13,12,-1], [4,13,12,-1], [3,13,12,-1], [4,13,12], [1,8,7,-1], [4,8,7,-1], [6,13,12], [6,13,12],
+    [5,19,18,-1], [5,19,18], [5,25,24,-2], [6,25,24], [4,25,24,-2], [3,25,24], [4,25,24,-2], [4,25,24],
+    [4,25,24,-2], [4,25,24], [6,25,24,-1], [6,25,24,-1], [6,25,24,-1], [6,25,24,-1], [10,25,24], [10,25,24],
+    [6,31,30,-2], [6,31,30], [4,31,30,-2], [4,31,30], [5,31,30,-2], [4,31,30], [5,31,30,-2], [4,31,30],
+    [6,31,30,-1], [6,31,30,-1], [6,31,30,-1], [6,31,30,-1], [13,31,30], [13,31,30], [8,19,18], [8,19,18],
+    [7,19,18,-2], [6,19,18], [4,19,18,-3], [4,19,18], [4,19,18,-3], [4,19,18], [1,6,6,-3], [2,6,6,-2],
+    [5,10,10,-3], [4,10,10,-1], [5,10,9,-3], [4,10,9,-1], [4,20,19,-1], [4,20,19,-3], [2,5,4,-3], [1,6,6,-3],
+    [7,19,18,-2], [6,19,18], [2,8,7,-2], [2,8,7,-4], [5,19,18,-1], [4,19,18,-1], [8,10,10], [11,14,14],
+    [6,12,12], [10,23,23], [11,10,10], [15,14,14], [14,10,10,3], [15,14,14], [14,10,10,3], [15,14,14],
+    [10,10,10], [9,10,10], [6,12,12], [8,10,10], [8,10,10], [8,10,10], [8,10,10], [8,10,10],
+    [14,14,14], [13,14,14], [10,23,23], [11,14,14], [11,14,14], [11,14,14], [11,14,14], [11,14,14],
+    [9,10,10], [13,14,14], [6,3,-5], [10,3,-5], [15,3,-5], [9,3,-5,3], [10,2,-6], [15,2,-6],
+    [3,19,18,-2], [3,19,18], [3,19,18,-2], [3,19,18], [3,19,18,-2], [3,19,18], [5,19,18,-1], [5,19,18,-1],
+    [10,13,12,-1], [10,19,18,-1], [10,25,24,-1], [10,31,30,-1], [7,19,18,-1], [1,7,6,-7], [4,7,6,-7], [4,6,6,-2],
+    [5,6,6,-1], [5,6,6,-1], [6,4,2,1], [6,5,3,1], [6,4,0,1], [6,4,0,1], [8,6,6], [8,6,6],
+    [4,22,39,57,75,92,110,127,145,162,180,198,215,233,250,268],
+    [15,58,101,145,188,231,274,317],
+    [287,359]
+  ],
+  cmbx10: [
+    [7,7,0], [9,7,0], [9,8,1], [8,7,0], [8,7,0], [9,7,0], [8,7,0], [9,7,0],
+    [8,7,0], [9,7,0], [8,7,0], [8,7,0], [6,7,0], [6,7,0], [10,7,0], [10,7,0],
+    [3,5,0], [4,7,2,1], [3,2,-5,-1], [3,2,-5,-2], [4,2,-5,-1], [4,2,-5,-1], [5,2,-5], [3,2,-5,-3],
+    [4,2,2,-1], [6,7,0], [8,5,0], [9,5,0], [6,7,1], [10,7,0], [11,8,1], [12,9,1,3],
+    [4,2,-2], [2,7,0,-1], [5,4,-3], [9,9,2], [5,9,1], [9,9,1], [9,8,1], [3,4,-3],
+    [3,10,2,-1], [4,10,2], [5,5,-3], [9,9,2], [3,4,2], [4,2,-1], [3,2,0], [5,10,2],
+    [6,8,1], [5,7,0], [6,7,0], [6,8,1], [6,7,0], [6,8,1], [6,8,1], [6,7,0],
+    [6,10,1], [6,10,1], [3,5,0], [3,7,2], [2,7,2,-1], [9,3,-1], [5,7,2], [5,9,0],
+    [9,7,0], [9,7,0], [8,7,0], [8,8,1], [9,7,0], [8,7,0], [7,7,0], [9,8,1],
+    [9,7,0], [4,7,0], [6,8,1], [9,7,0], [7,7,0], [11,7,0], [9,7,0], [8,8,1],
+    [8,7,0], [8,9,2], [9,8,1], [6,8,1], [8,7,0], [9,8,1], [9,7,0], [12,7,0],
+    [12,7,0,3], [9,7,0], [7,7,0], [2,10,2,-1], [5,4,-3,-1], [2,10,2], [4,2,-5,-1], [3,2,-5],
+    [3,4,-3], [6,5,0], [6,7,0], [5,5,0], [6,7,0], [5,5,0], [5,7,0], [6,7,2],
+    [7,7,0], [3,7,0], [4,9,2,1], [6,9,0], [3,7,0], [10,9,0], [7,5,0], [6,5,0],
+    [6,7,2], [6,7,2], [5,5,0], [5,5,0], [4,7,0], [7,5,0], [6,5,0], [8,5,0],
+    [6,5,0], [6,7,2], [5,5,0], [6,1,-2], [12,1,-2], [8,5,-2,3], [4,2,-5,-1], [4,2,-5,-1],
+    [4,18,32,46,59,73,87,101,115,128,142,156,170,184,198,211],
+    [13,24,36,47,59,71,82,94],
+    [227,102]
+  ],
+  cmti10: [
+    [7,7,0], [8,7,0], [7,8,1,-1], [7,7,0], [8,7,0], [9,7,0], [7,7,0,-1], [7,7,0,-2],
+    [7,7,0,-1], [6,7,0,-2], [7,7,0,-1], [9,9,2,1], [7,9,2,1], [8,9,2,1], [11,9,2,1], [11,9,2,1],
+    [3,5,0,-1], [5,7,2,1], [2,2,-5,-3], [3,2,-5,-3], [3,2,-5,-3], [4,2,-5,-2], [4,1,-5,-2], [3,3,-5,-4],
+    [3,2,2,-1], [7,9,2,1], [7,6,1,-1], [7,6,1,-1], [6,7,1], [10,7,0], [10,8,1,-1], [10,9,1,2],
+    [3,2,-2,-1], [3,8,0,-1], [4,3,-4,-2], [8,9,2,-1], [6,8,1,-1], [8,9,1,-1], [7,9,1,-1], [2,3,-4,-2],
+    [4,10,2,-1], [4,10,2], [4,5,-3,-2], [7,7,1,-1], [3,3,2], [3,2,-1,-1], [2,1,0,-1], [6,10,2],
+    [5,8,1,-1], [4,7,0,-1], [5,8,1,-1], [5,8,1,-1], [5,9,2], [5,8,1,-1], [5,8,1,-1], [6,8,1,-1],
+    [5,10,1,-1], [6,10,1], [2,5,0,-1], [3,7,2], [4,7,2], [7,3,-1,-1], [5,7,2], [6,9,0],
+    [7,8,1,-1], [7,7,0], [8,7,0], [7,8,1,-1], [8,7,0], [8,7,0], [8,7,0], [7,8,1,-1],
+    [9,7,0], [5,7,0], [6,8,1,-1], [9,7,0], [7,7,0], [10,7,0], [9,7,0], [7,8,1,-1],
+    [8,7,0], [7,9,2,-1], [8,8,1], [7,8,1], [7,7,0,-1], [7,8,1,-2], [7,8,1,-2], [9,8,1,-2],
+    [11,7,0,2], [7,7,0,-2], [7,7,0], [5,10,2], [4,3,-4,-2], [3,10,2,-1], [4,2,-5,-2], [2,2,-5,-2],
+    [2,3,-4,-2], [5,6,1,-1], [4,8,1,-1], [4,6,1,-1], [5,8,1,-1], [4,6,1,-1], [6,9,2,1], [5,7,2],
+    [6,7,0], [3,7,0,-1], [5,9,2,1], [5,9,0], [2,7,0,-1], [9,9,0], [5,5,0,-1], [4,6,1,-1],
+    [5,7,2], [4,7,2,-1], [4,5,0,-1], [5,5,0], [3,7,0,-1], [5,6,1,-1], [4,6,1,-1], [6,6,1,-1],
+    [6,6,1], [4,7,2,-1], [5,5,0], [5,1,-2,-1], [10,1,-2,-1], [8,5,-2,2], [4,2,-5,-2], [4,2,-5,-2],
+    [4,16,28,40,51,63,75,87,99,111,123,135,146,158,170,182],
+    [13,24,36,47,59,71,82,94],
+    [195,102]
+  ]
+});
+
+jsMath.Img.AddFont(85,{
+  cmr10: [
+    [7,9,0], [10,9,0], [9,10,1], [8,9,0], [8,9,0], [9,9,0], [8,9,0], [9,9,0],
+    [8,9,0], [9,9,0], [8,9,0], [8,9,0], [7,9,0], [7,9,0], [10,9,0], [10,9,0],
+    [3,6,0], [4,9,3,1], [3,3,-6,-1], [3,3,-6,-2], [4,2,-6,-1], [4,3,-6,-1], [4,2,-6,-1], [3,3,-6,-3],
+    [4,3,3,-1], [6,10,1], [9,7,1], [9,7,1], [6,8,1], [11,9,0], [12,10,1], [12,10,1,3],
+    [3,2,-3], [2,9,0,-1], [5,5,-4], [10,12,3], [6,10,1], [10,10,1], [9,10,1], [2,5,-4,-1],
+    [3,12,3,-1], [4,12,3], [6,5,-4], [9,8,1], [2,5,3,-1], [4,1,-2], [2,2,0,-1], [6,12,3],
+    [6,9,1], [4,8,0,-1], [6,8,0], [6,9,1], [6,8,0], [6,9,1], [6,9,1], [6,9,1],
+    [6,9,1], [6,9,1], [2,6,0,-1], [2,9,3,-1], [2,9,3,-1], [9,4,-1], [5,9,3], [5,9,0],
+    [9,10,1], [9,9,0], [8,9,0], [8,10,1], [9,9,0], [8,9,0], [8,9,0], [9,10,1],
+    [9,9,0], [4,9,0], [6,10,1], [9,9,0], [7,9,0], [11,9,0], [9,9,0], [9,10,1],
+    [8,9,0], [9,12,3], [9,10,1], [6,10,1], [9,9,0], [9,10,1], [9,10,1], [12,10,1],
+    [9,9,0], [9,9,0], [7,9,0], [2,12,3,-1], [5,5,-4,-1], [2,12,3], [4,2,-6,-1], [2,2,-6,-1],
+    [3,5,-4], [6,7,1], [7,10,1], [5,7,1], [7,10,1], [5,7,1], [5,9,0], [6,9,3],
+    [7,9,0], [3,8,0], [4,11,3,1], [6,9,0], [3,9,0], [10,6,0], [7,6,0], [6,7,1],
+    [7,9,3], [7,9,3], [5,6,0], [5,7,1], [4,9,1], [7,7,1], [6,6,0], [9,6,0],
+    [7,6,0], [6,9,3], [5,6,0], [6,1,-3], [12,1,-3], [8,6,-3,3], [4,1,-7,-1], [4,2,-6,-1],
+    [5,19,34,48,63,77,92,106,121,135,150,164,179,193,208,222],
+    [16,30,45,59,73,87,101,115],
+    [239,125]
+  ],
+  cmmi10: [
+    [9,9,0], [10,9,0], [9,10,1], [8,9,0], [10,9,0], [11,9,0], [10,9,0], [9,9,0],
+    [8,9,0], [9,9,0], [9,9,0,-1], [8,7,1], [7,12,3], [7,9,3], [6,10,1], [5,7,1],
+    [6,12,3], [6,9,3], [6,9,0], [4,7,1], [7,7,1], [7,10,1], [7,9,3], [7,6,0],
+    [6,12,3], [7,6,0], [6,9,3], [7,7,1], [6,7,1], [7,7,1], [7,12,3], [7,9,3],
+    [8,12,3], [8,7,1], [5,7,1], [7,10,1], [10,7,1], [6,9,3], [5,8,2], [8,9,3],
+    [12,4,-2], [15,4,0,3], [15,4,-2,3], [15,4,0,3], [6,4,-2,3], [3,4,-2], [6,6,0], [6,6,0],
+    [6,7,1], [4,6,0,-1], [6,6,0], [6,9,3], [6,9,3], [6,9,3], [6,9,1], [6,9,3],
+    [6,9,1], [6,9,3], [2,2,0,-1], [2,5,3,-1], [8,8,1,-1], [6,12,3], [8,8,1,-1], [6,6,0],
+    [7,10,1], [9,9,0], [9,9,0], [9,10,1], [10,9,0], [10,9,0], [9,9,0], [9,10,1],
+    [11,9,0], [6,9,0], [8,10,1], [11,9,0], [8,9,0], [12,9,0], [14,9,0,3], [9,10,1],
+    [9,9,0], [9,12,3], [9,10,1], [8,10,1], [9,9,0], [9,10,1], [8,10,1,-1], [12,10,1],
+    [13,9,0,3], [9,9,0], [9,9,0], [4,10,1], [3,12,3,-1], [4,12,3], [12,4,-1], [15,4,-1,3],
+    [5,10,1], [6,7,1], [5,10,1], [6,7,1], [6,10,1], [5,7,1], [7,12,3], [6,9,3],
+    [7,9,0], [4,8,0], [6,11,3,1], [6,10,1], [3,10,1], [11,7,1], [7,7,1], [6,7,1],
+    [7,9,3,1], [6,9,3], [6,6,0], [5,7,1], [4,9,1], [7,7,1], [6,7,1], [9,7,1],
+    [7,7,1], [6,9,3], [6,7,1], [4,6,0], [6,9,3,1], [8,9,3], [6,3,-6,-2], [5,2,-6,-3],
+    [5,19,33,47,61,75,89,104,118,132,146,160,174,188,202,216],
+    [16,30,45,59,73,87,101,115],
+    [232,125]
+  ],
+  cmsy10: [
+    [8,2,-2,-1], [2,2,-2,-1], [7,6,0,-1], [6,6,0], [9,8,1], [6,6,0], [9,8,0], [9,8,2],
+    [9,8,1], [9,8,1], [9,8,1], [9,8,1], [9,8,1], [12,12,3], [6,6,0], [6,6,0],
+    [9,6,0], [9,6,0], [8,10,2,-1], [8,10,2,-1], [8,10,2,-1], [8,10,2,-1], [8,10,2,-1], [8,10,2,-1],
+    [9,4,-1], [9,6,0], [8,8,1,-1], [8,8,1,-1], [12,8,1], [12,8,1], [8,8,1,-1], [8,8,1,-1],
+    [11,4,-1,-1], [11,4,-1], [4,11,3,-1], [4,11,2,-1], [10,4,-1,-1], [12,12,3], [12,12,3], [9,6,0],
+    [11,8,1,-1], [11,8,1], [7,12,3], [7,12,3], [12,8,1], [12,12,3], [12,12,3], [9,7,1],
+    [3,7,0], [12,7,1], [6,8,1,-1], [6,8,1,-1], [10,9,0], [10,9,3], [7,12,3,-1], [2,6,0],
+    [7,10,1], [6,9,0], [8,4,-1], [6,11,1], [9,10,1], [9,10,1], [9,8,0], [9,8,0],
+    [7,9,0], [10,10,1], [8,10,1], [7,10,1], [10,9,0], [7,10,1], [10,10,1], [8,11,2],
+    [10,10,1], [9,9,0,1], [10,11,2], [9,10,1], [8,10,1], [14,10,1], [13,11,1,1], [10,10,1],
+    [9,10,1], [9,11,2,-1], [10,10,1], [8,10,1], [10,9,0], [10,10,1,1], [8,10,1], [13,10,1],
+    [10,9,0], [9,11,2], [9,9,0], [8,8,1], [8,9,1], [8,8,1], [8,8,1], [8,7,0],
+    [7,9,0], [7,9,0], [3,12,3,-2], [4,12,3], [3,12,3,-2], [4,12,3], [4,12,3,-1], [4,12,3,-1],
+    [3,12,3,-1], [4,12,3], [1,12,3,-1], [4,12,3,-1], [4,12,3,-1], [7,14,4], [6,12,3], [3,8,1],
+    [10,13,12,-1], [9,9,0], [10,10,1], [6,12,3], [8,7,0], [8,8,0], [8,10,2,-1], [9,10,2],
+    [5,12,3], [5,12,3], [5,12,3], [7,12,3], [9,11,2], [9,11,2], [9,10,1], [9,11,2],
+    [5,22,39,56,73,90,107,124,141,157,174,191,208,225,242,259],
+    [17,41,65,90,114,138,162,186],
+    [278,206]
+  ],
+  cmex10: [
+    [4,15,14,-1], [4,15,14], [3,15,14,-2], [3,15,14], [4,15,14,-2], [4,15,14], [4,15,14,-2], [4,15,14],
+    [5,15,14,-1], [5,15,14,-1], [4,15,14,-1], [4,15,14,-1], [2,8,8,-1], [4,9,8,-1], [7,15,14], [7,15,14],
+    [5,22,21,-2], [5,22,21], [7,30,29,-2], [7,30,29], [4,30,29,-3], [4,30,29], [4,30,29,-3], [4,30,29],
+    [4,30,29,-3], [4,30,29], [7,30,29,-1], [7,30,29,-1], [7,30,29,-1], [7,30,29,-1], [12,30,29], [12,30,29],
+    [7,37,36,-2], [7,37,36], [4,37,36,-3], [4,37,36], [5,37,36,-3], [5,37,36], [5,37,36,-3], [5,37,36],
+    [7,37,36,-1], [7,37,36,-1], [8,37,36,-1], [7,37,36,-1], [15,37,36], [15,37,36], [9,22,21], [9,22,21],
+    [7,23,22,-3], [7,23,22], [5,23,22,-3], [5,23,22], [5,23,22,-3], [5,23,22], [2,8,8,-3], [2,8,8,-3],
+    [5,11,11,-4], [4,11,11,-2], [5,12,11,-4], [4,12,11,-2], [4,23,22,-2], [5,23,22,-4], [2,5,4,-4], [2,7,7,-3],
+    [7,22,21,-3], [7,22,21], [2,9,8,-3], [2,9,8,-5], [6,22,21,-1], [5,22,21,-1], [10,12,12], [13,17,17],
+    [8,14,14], [12,27,27], [13,12,12], [18,17,17], [13,12,12], [18,17,17], [13,12,12], [18,17,17],
+    [12,12,12], [11,12,12], [8,14,14], [10,12,12], [10,12,12], [10,12,12], [10,12,12], [10,12,12],
+    [17,17,17], [15,17,17], [12,27,27], [13,17,17], [13,17,17], [13,17,17], [13,17,17], [13,17,17],
+    [11,12,12], [15,17,17], [7,3,-6], [12,3,-7], [18,3,-7], [7,2,-7], [12,2,-7], [18,2,-7],
+    [4,23,22,-2], [3,23,22], [4,23,22,-2], [4,23,22], [4,22,21,-2], [4,23,22], [6,22,21,-1], [6,22,21,-1],
+    [12,15,14,-1], [12,22,21,-1], [12,30,29,-1], [12,37,36,-1], [8,23,22,-1], [1,9,8,-8], [5,8,7,-8], [4,8,8,-3],
+    [6,7,7,-1], [6,7,7,-1], [7,5,3,1], [7,5,3,1], [7,4,0,1], [7,4,0,1], [9,8,8], [9,7,7],
+    [5,27,48,69,91,112,133,155,176,197,219,240,261,283,304,325],
+    [19,72,124,177,229,281,334,386],
+    [349,437]
+  ],
+  cmbx10: [
+    [8,9,0], [11,9,0], [10,10,1], [10,9,0], [9,9,0], [11,9,0], [10,9,0], [10,9,0],
+    [10,9,0], [10,9,0], [10,9,0], [9,9,0], [8,9,0], [8,9,0], [11,9,0], [11,9,0],
+    [4,6,0], [5,9,3,1], [3,3,-6,-1], [3,3,-6,-3], [5,2,-6,-1], [5,3,-6,-1], [5,2,-6,-1], [4,3,-6,-3],
+    [5,3,3,-1], [7,9,0], [10,7,1], [11,7,1], [7,9,2], [12,9,0], [13,10,1,-1], [10,10,1],
+    [4,2,-3], [2,9,0,-1], [6,5,-4], [11,12,3], [7,10,1], [11,10,1], [10,10,1], [2,5,-4,-1],
+    [4,12,3,-1], [4,12,3], [5,6,-3,-1], [10,10,2], [2,5,3,-1], [4,2,-2], [2,2,0,-1], [6,12,3],
+    [7,9,1], [5,8,0,-1], [7,8,0], [7,9,1], [7,8,0], [7,9,1], [7,9,1], [7,9,0],
+    [7,9,1], [7,9,1], [2,6,0,-1], [2,9,3,-1], [2,9,3,-1], [10,4,-1], [6,9,3], [6,9,0],
+    [10,10,1], [10,9,0], [9,9,0], [10,10,1], [10,9,0], [9,9,0], [8,9,0], [10,10,1],
+    [11,9,0], [5,9,0], [7,10,1], [11,9,0], [8,9,0], [13,9,0], [11,9,0], [10,10,1],
+    [9,9,0], [10,12,3], [11,10,1], [7,10,1], [9,9,0], [10,10,1], [10,9,0], [14,9,0],
+    [10,9,0], [11,9,0], [8,9,0], [3,12,3,-1], [6,5,-4,-1], [3,12,3], [5,3,-6,-1], [2,3,-6,-1],
+    [3,5,-4], [7,7,1], [8,9,0], [6,6,0], [8,10,1], [6,7,1], [6,9,0], [7,9,3],
+    [8,9,0], [4,9,0], [5,12,3,1], [7,9,0], [4,9,0], [12,6,0], [8,6,0], [7,7,1],
+    [8,9,3], [8,9,3], [6,6,0], [5,7,1], [5,8,0], [8,7,1], [7,6,0], [10,6,0],
+    [7,6,0], [7,9,3], [6,6,0], [7,1,-3], [14,1,-3], [5,3,-6,-1], [5,2,-7,-1], [5,3,-6,-1],
+    [5,22,38,55,72,89,106,122,139,156,173,190,206,223,240,257],
+    [16,30,45,59,73,87,101,115],
+    [275,125]
+  ],
+  cmti10: [
+    [9,9,0], [8,9,0,-1], [9,10,1,-1], [8,9,0], [8,9,0,-1], [10,9,0], [9,9,0,-1], [8,9,0,-2],
+    [8,9,0,-1], [8,9,0,-2], [8,9,0,-1], [10,12,3,1], [9,12,3,1], [9,12,3,1], [12,12,3,1], [13,12,3,1],
+    [3,7,1,-1], [5,9,3,1], [3,3,-6,-3], [3,3,-6,-4], [4,2,-6,-3], [4,3,-6,-3], [4,2,-6,-3], [3,3,-6,-5],
+    [3,3,3,-1], [8,12,3,1], [8,7,1,-1], [8,7,1,-1], [6,8,1,-1], [12,9,0], [10,10,1,-2], [13,10,1,3],
+    [3,2,-3,-1], [4,9,0,-1], [5,5,-4,-2], [9,12,3,-1], [8,10,1,-1], [9,10,1,-1], [9,10,1,-1], [3,5,-4,-2],
+    [5,12,3,-1], [5,12,3], [5,5,-4,-2], [8,8,1,-1], [2,5,3,-1], [3,1,-2,-1], [2,2,0,-1], [8,12,3],
+    [6,9,1,-1], [5,8,0,-1], [6,9,1,-1], [6,9,1,-1], [6,11,3], [6,9,1,-1], [6,9,1,-1], [7,9,1,-1],
+    [6,9,1,-1], [6,9,1,-1], [3,6,0,-1], [3,9,3,-1], [4,9,3], [9,4,-1,-1], [5,9,3,-1], [5,9,0,-2],
+    [9,10,1,-1], [9,9,0], [9,9,0], [9,10,1,-1], [10,9,0], [9,9,0], [9,9,0], [9,10,1,-1],
+    [10,9,0], [6,9,0], [7,10,1,-1], [10,9,0], [8,9,0], [12,9,0], [10,9,0], [9,10,1,-1],
+    [9,9,0], [9,12,3,-1], [9,10,1], [7,10,1,-1], [8,9,0,-2], [8,10,1,-2], [9,10,1,-2], [10,10,1,-2],
+    [13,9,0,3], [9,9,0,-2], [8,9,0,-1], [5,12,3,-1], [5,5,-4,-3], [6,12,3,1], [4,3,-6,-3], [2,2,-6,-3],
+    [3,5,-4,-2], [6,7,1,-1], [5,10,1,-1], [5,7,1,-1], [6,10,1,-1], [5,7,1,-1], [7,12,3,1], [6,9,3],
+    [6,9,0,-1], [3,9,1,-1], [6,11,3,1], [5,10,1,-1], [3,9,0,-1], [9,7,1,-1], [6,7,1,-1], [6,7,1,-1],
+    [7,9,3], [5,9,3,-1], [5,6,0,-1], [4,7,1,-1], [4,9,1,-1], [6,7,1,-1], [5,7,1,-1], [8,7,1,-1],
+    [7,7,1], [6,9,3,-1], [6,7,1], [6,1,-3,-1], [11,1,-3,-1], [10,6,-3,3], [4,2,-6,-3], [4,2,-6,-3],
+    [5,19,34,48,62,77,91,106,120,135,149,163,178,192,207,221],
+    [16,30,45,59,73,87,101,115],
+    [237,125]
+  ]
+});
+
+jsMath.Img.AddFont(100,{
+  cmr10: [
+    [9,10,0], [11,10,0], [11,11,1], [10,10,0], [9,10,0], [10,10,0], [10,10,0], [10,10,0],
+    [10,10,0], [9,10,0,168], [10,10,0], [9,10,0], [8,10,0], [8,10,0], [12,10,0], [12,10,0],
+    [4,7,0], [4,10,3,1], [3,3,-7,-1], [3,3,-7,-3], [5,2,-7,-1], [5,3,-7,-1], [5,2,-7,-1], [3,3,-7,-4],
+    [4,3,3,-2], [7,11,1], [10,8,1], [11,8,1], [7,10,2], [13,10,0], [13,11,1,-1], [11,12,1],
+    [4,2,-4], [2,10,0,-1], [5,5,-5], [11,13,3], [7,12,1], [11,12,1], [11,11,1], [2,5,-5,-1],
+    [4,15,4,-1], [3,15,4,-1], [5,7,-4,-1], [10,9,1], [2,5,3,-1], [4,2,-2], [2,2,0,-1], [7,15,4],
+    [7,11,1], [5,10,0,-1], [7,10,0], [7,11,1], [7,10,0], [7,11,1], [7,11,1], [7,11,1],
+    [7,11,1], [7,11,1], [2,6,0,-1], [2,9,3,-1], [2,10,3,-1], [10,5,-1], [6,10,3], [6,10,0],
+    [11,11,1], [10,10,0], [10,10,0], [10,11,1], [10,10,0], [9,10,0], [9,10,0], [11,11,1],
+    [10,10,0], [5,10,0], [7,11,1], [11,10,0], [9,10,0], [13,10,0], [10,10,0], [11,11,1],
+    [9,10,0], [11,13,3], [11,11,1], [7,11,1], [10,10,0], [10,11,1], [11,11,1], [14,11,1],
+    [11,10,0], [11,10,0], [8,10,0], [3,15,4,-1], [5,5,-5,-2], [3,15,4], [5,3,-7,-1], [2,2,-8,-1],
+    [2,5,-5,-1], [7,8,1], [8,11,1], [6,8,1], [8,11,1], [6,8,1], [5,10,0], [7,10,3],
+    [8,10,0], [4,10,0], [4,13,3,1], [8,10,0], [4,10,0], [12,7,0], [8,7,0], [7,8,1],
+    [8,10,3], [8,10,3], [5,7,0], [5,8,1], [5,10,1], [8,8,1], [7,6,0], [10,6,0],
+    [8,6,0], [7,9,3], [6,6,0], [7,1,-3], [14,1,-3], [5,3,-7,-1], [5,2,-8,-1], [5,2,-8,-1],
+    [6,23,40,57,74,91,108,125,142,159,176,193,210,227,244,262],
+    [19,36,52,69,85,102,119,135],
+    [281,146]
+  ],
+  cmmi10: [
+    [10,10,0], [11,10,0], [11,11,1], [10,10,0], [11,10,0], [13,10,0], [11,10,0,-1], [10,10,0],
+    [9,10,0], [10,10,0], [10,10,0,-1], [9,8,1], [9,13,3], [8,10,3], [7,11,1], [6,7,1],
+    [7,13,3], [7,10,3], [7,11,1], [5,8,1], [8,8,1], [8,11,1], [8,9,3], [8,7,0],
+    [7,13,3], [8,7,1], [7,10,3], [8,7,1], [8,7,1], [8,8,1], [8,13,3], [9,10,3],
+    [9,13,3], [9,8,1], [6,8,1], [8,11,1], [12,7,1], [6,10,3,-1], [6,9,2], [9,10,3],
+    [14,4,-3], [14,4,0], [14,4,-3], [17,4,0,3], [3,4,-3], [3,4,-3], [7,7,0], [7,7,0],
+    [7,8,1], [5,7,0,-1], [7,7,0], [7,10,3], [7,10,3], [7,10,3], [7,11,1], [7,10,3],
+    [7,11,1], [7,10,3], [2,2,0,-1], [2,5,3,-1], [9,9,1,-1], [7,15,4], [9,9,1,-1], [7,7,0],
+    [8,11,1], [10,10,0], [11,10,0], [11,11,1], [12,10,0], [11,10,0], [11,10,0], [11,11,1],
+    [13,10,0], [7,10,0], [8,11,1,-1], [13,10,0], [9,10,0], [15,10,0], [16,10,0,3], [11,11,1],
+    [11,10,0], [11,13,3], [11,11,1], [9,11,1], [10,10,0], [10,11,1,-1], [11,11,1], [14,11,1],
+    [15,10,0,3], [11,10,0], [10,10,0], [5,12,1], [4,13,3,-1], [5,13,3], [12,4,-1,-1], [12,4,-2,-1],
+    [6,11,1], [7,8,1], [6,11,1], [6,8,1], [8,11,1], [6,8,1], [8,13,3], [7,10,3],
+    [8,11,1], [4,11,1], [7,13,3,1], [7,11,1], [4,11,1], [12,8,1], [8,8,1], [7,8,1],
+    [8,10,3,1], [7,10,3], [6,8,1], [6,8,1], [5,10,1], [8,8,1], [7,8,1], [10,8,1],
+    [8,8,1], [7,10,3], [7,8,1], [4,8,1], [6,10,3,1], [8,10,3,-1], [7,3,-7,-2], [6,3,-7,-3],
+    [6,22,39,55,72,89,105,122,138,155,172,188,205,221,238,255],
+    [19,36,52,69,85,102,119,135],
+    [273,146]
+  ],
+  cmsy10: [
+    [9,1,-3,-1], [2,3,-2,-1], [7,7,0,-2], [5,7,0,-1], [10,9,1], [7,7,0], [10,10,0], [10,10,3],
+    [11,11,2], [11,11,2], [11,11,2], [11,11,2], [11,11,2], [14,13,3], [7,7,0], [7,7,0],
+    [10,7,0], [10,7,0], [9,11,2,-1], [9,11,2,-1], [9,11,2,-1], [9,11,2,-1], [9,11,2,-1], [9,11,2,-1],
+    [11,5,-1], [10,7,0], [9,9,1,-1], [9,9,1,-1], [14,9,1], [14,9,1], [9,9,1,-1], [9,9,1,-1],
+    [13,5,-1,-1], [13,5,-1], [5,13,3,-1], [5,13,3,-1], [12,5,-1,-1], [14,13,3], [14,13,3], [10,7,0],
+    [13,9,1,-1], [13,9,1], [8,13,3], [8,13,3], [14,9,1], [14,13,3], [14,13,3], [10,8,1],
+    [4,8,0], [14,8,1], [7,9,1,-1], [8,9,1,-1], [12,10,0], [12,10,3], [7,13,3,-2], [2,5,-1],
+    [8,11,1], [7,10,0], [9,4,-1], [7,12,1], [10,11,1], [10,11,1], [9,10,0,-1], [10,10,0],
+    [8,10,0], [11,11,1], [10,11,1], [8,11,1], [11,10,0], [8,11,1], [12,11,1], [9,12,2],
+    [12,11,1], [10,10,0,1], [12,12,2], [11,11,1], [9,11,1], [16,11,1], [15,12,1,1], [11,11,1],
+    [11,11,1], [10,12,2,-1], [12,11,1], [9,11,1], [11,10,0], [11,11,1,1], [10,11,1], [15,11,1],
+    [12,10,0], [10,12,2], [11,10,0], [9,10,1], [9,10,1], [9,10,1], [8,10,1,-1], [9,10,1],
+    [8,10,0], [8,10,0], [4,15,4,-2], [4,15,4], [4,15,4,-2], [4,15,4], [5,15,4,-1], [5,15,4,-1],
+    [4,15,4,-1], [4,15,4], [2,15,4,-1], [5,15,4,-1], [5,15,4,-1], [8,15,4], [7,15,4], [4,11,2],
+    [11,15,14,-1], [10,10,0], [11,11,1], [7,13,3], [9,9,0], [9,9,0], [9,11,2,-1], [9,11,2,-1],
+    [5,13,3,-1], [6,13,3], [6,13,3], [8,13,3], [11,13,2], [10,14,3], [11,11,1], [11,13,2],
+    [6,26,46,66,86,106,125,145,165,185,205,225,245,265,285,305],
+    [20,48,77,105,134,162,190,219],
+    [327,243]
+  ],
+  cmex10: [
+    [4,18,17,-2], [5,18,17], [4,18,17,-2], [3,18,17], [5,18,17,-2], [4,18,17], [5,18,17,-2], [4,18,17],
+    [6,18,17,-1], [6,18,17,-1], [5,18,17,-1], [5,18,17,-1], [1,10,9,-2], [4,10,9,-2], [8,18,17], [8,17,16],
+    [6,26,25,-2], [6,26,25], [8,34,33,-2], [8,34,33], [5,34,33,-3], [4,34,33], [5,34,33,-3], [5,34,33],
+    [5,34,33,-3], [5,34,33], [8,34,33,-1], [8,34,33,-1], [8,34,33,-1], [8,34,33,-1], [14,34,33], [14,34,33],
+    [8,43,42,-3], [8,43,42], [5,43,42,-3], [5,43,42], [6,43,42,-3], [6,43,42], [6,43,42,-3], [6,43,42],
+    [8,43,42,-2], [8,43,42,-2], [8,43,42,-2], [9,43,42,-1], [17,43,42], [17,43,42], [11,26,25], [11,26,25],
+    [8,26,25,-4], [9,26,25], [6,26,25,-4], [5,26,25], [6,26,25,-4], [5,26,25], [2,9,9,-4], [2,9,9,-3],
+    [5,13,13,-5], [6,13,13,-2], [5,14,13,-5], [6,14,13,-2], [6,27,26,-2], [5,27,26,-5], [3,6,5,-5], [1,9,9,-4],
+    [8,26,25,-4], [9,26,25], [2,10,9,-4], [3,10,9,-6], [7,26,25,-1], [6,26,25,-1], [11,14,14], [15,20,20],
+    [9,16,16], [14,31,31], [15,14,14], [21,20,20], [15,14,14], [21,20,20], [15,14,14], [21,20,20],
+    [14,14,14], [13,14,14], [9,16,16], [11,14,14], [11,14,14], [11,14,14], [11,14,14], [11,14,14],
+    [20,20,20], [18,20,20], [14,31,31], [15,20,20], [15,20,20], [15,20,20], [15,20,20], [15,20,20],
+    [13,14,14], [18,20,20], [8,3,-8], [14,3,-8], [21,3,-8], [8,3,-8], [14,3,-8], [20,3,-8],
+    [4,26,25,-3], [4,26,25], [5,26,25,-3], [5,26,25], [5,26,25,-3], [5,26,25], [7,26,25,-1], [7,26,25,-1],
+    [14,18,17,-1], [14,26,25,-1], [14,34,33,-1], [14,43,42,-1], [10,26,25,-1], [2,10,9,-9], [6,9,8,-9], [5,9,9,-3],
+    [7,9,9,-1], [7,9,9,-1], [8,5,3,1], [8,5,3,1], [8,5,0,1], [8,5,0,1], [11,9,9], [11,9,9],
+    [6,31,56,82,107,132,157,182,207,232,257,282,307,332,358,383],
+    [23,84,146,208,269,331,392,454],
+    [410,514]
+  ],
+  cmbx10: [
+    [9,10,0], [13,10,0], [12,11,1], [11,10,0], [10,10,0], [12,10,0], [10,10,0,-1], [11,10,0,-1],
+    [11,10,0], [11,10,0,-1], [11,10,0], [11,10,0], [9,10,0], [9,10,0], [13,10,0], [13,10,0],
+    [4,7,0], [5,10,3,1], [4,3,-7,-1], [4,3,-7,-3], [4,2,-7,-2], [6,3,-7,-1], [6,2,-7,-1], [4,3,-7,-4],
+    [6,3,3,-1], [8,10,0], [12,8,1], [12,8,1], [8,10,2], [14,10,0], [15,11,1,-1], [12,12,1],
+    [5,2,-4], [3,10,0,-1], [7,6,-4], [12,13,3,-1], [8,12,1], [13,12,1], [12,11,1], [3,5,-5,-1],
+    [5,15,4,-1], [4,15,4,-1], [6,7,-4,-1], [11,11,2,-1], [3,6,3,-1], [5,2,-2], [3,3,0,-1], [6,15,4,-1],
+    [8,11,1], [6,10,0,-1], [8,10,0], [8,11,1], [8,10,0], [8,11,1], [8,11,1], [7,11,1,-1],
+    [8,11,1], [8,11,1], [3,7,0,-1], [3,10,3,-1], [3,10,3,-1], [11,5,-1,-1], [6,10,3,-1], [6,10,0,-1],
+    [12,11,1], [12,10,0], [11,10,0], [11,11,1], [12,10,0], [10,10,0], [10,10,0], [12,11,1],
+    [12,10,0], [6,10,0], [8,11,1], [12,10,0], [9,10,0], [15,10,0], [12,10,0], [12,11,1],
+    [10,10,0], [12,13,3], [12,11,1], [8,11,1], [11,10,0], [12,11,1], [12,10,0], [17,10,0],
+    [12,10,0], [12,10,0], [8,10,0,-1], [3,15,4,-1], [6,6,-4,-2], [3,15,4], [4,3,-7,-2], [3,3,-7,-1],
+    [4,6,-4], [8,7,0], [9,10,0], [7,7,0], [9,11,1], [7,7,0], [7,10,0], [8,10,3],
+    [9,10,0], [4,10,0], [5,13,3,1], [9,10,0], [5,10,0], [14,7,0], [9,7,0], [8,7,0],
+    [9,10,3], [9,10,3], [7,7,0], [6,8,1], [6,10,1], [9,7,0], [8,7,0], [12,7,0],
+    [9,7,0], [8,10,3], [7,7,0], [8,2,-3], [16,2,-3], [5,3,-7,-2], [6,2,-8,-1], [6,3,-7,-1],
+    [6,26,45,65,85,104,124,144,164,183,203,223,243,262,282,302],
+    [19,36,52,69,85,102,119,135],
+    [324,146]
+  ],
+  cmti10: [
+    [9,10,0,-1], [10,10,0,-1], [9,11,1,-2], [9,10,0], [10,10,0,-1], [11,10,0,-1], [10,10,0,-1], [9,10,0,-3],
+    [9,10,0,-2], [9,10,0,-3], [10,10,0,-1], [12,13,3,1], [10,13,3,1], [10,13,3,1], [14,13,3,1], [15,13,3,1],
+    [4,8,1,-1], [6,10,3,1], [2,3,-7,-4], [4,3,-7,-4], [4,2,-7,-4], [4,3,-7,-4], [5,2,-7,-3], [4,3,-7,-6],
+    [4,3,3,-1], [9,13,3,1], [9,8,1,-1], [9,8,1,-1], [7,10,2,-1], [13,10,0,-1], [13,11,1,-2], [15,12,1,3],
+    [4,2,-4,-1], [5,10,0,-1], [6,5,-5,-2], [11,13,3,-1], [9,11,1,-1], [10,12,1,-2], [11,11,1,-1], [3,5,-5,-3],
+    [6,15,4,-2], [6,15,4], [6,7,-4,-2], [9,9,1,-2], [3,5,3,-1], [4,2,-2,-1], [2,2,0,-1], [9,15,4],
+    [7,11,1,-1], [6,10,0,-1], [7,11,1,-1], [7,11,1,-1], [7,13,3], [7,11,1,-1], [7,11,1,-1], [7,11,1,-2],
+    [7,11,1,-1], [7,11,1,-1], [4,6,0,-1], [4,9,3,-1], [5,10,3], [10,5,-1,-1], [6,10,3,-1], [6,10,0,-2],
+    [9,11,1,-2], [9,10,0,-1], [10,10,0,-1], [10,11,1,-2], [10,10,0,-1], [10,10,0,-1], [10,10,0,-1], [10,11,1,-2],
+    [11,10,0,-1], [7,10,0], [8,11,1,-1], [11,10,0,-1], [8,10,0,-1], [13,10,0,-1], [11,10,0,-1], [9,11,1,-2],
+    [10,10,0,-1], [9,13,3,-2], [9,11,1,-1], [8,11,1,-1], [10,10,0,-2], [10,11,1,-2], [9,11,1,-3], [12,11,1,-3],
+    [15,10,0,3], [10,10,0,-3], [9,10,0,-1], [6,15,4,-1], [6,5,-5,-3], [6,15,4,1], [5,3,-7,-3], [2,2,-8,-3],
+    [3,5,-5,-2], [7,8,1,-1], [6,11,1,-1], [6,8,1,-1], [7,11,1,-1], [6,8,1,-1], [8,13,3,1], [7,10,3],
+    [7,11,1,-1], [4,11,1,-1], [6,13,3,1], [6,11,1,-1], [4,11,1,-1], [11,8,1,-1], [8,8,1,-1], [7,8,1,-1],
+    [8,10,3], [6,10,3,-1], [6,8,1,-1], [5,8,1,-1], [5,10,1,-1], [7,8,1,-1], [6,8,1,-1], [9,8,1,-1],
+    [8,8,1], [7,10,3,-1], [6,8,1,-1], [7,1,-3,-1], [14,1,-3,-1], [11,7,-3,3], [5,2,-8,-3], [5,2,-8,-3],
+    [6,23,40,56,73,90,107,124,141,158,175,192,209,226,243,260],
+    [19,36,52,69,85,102,119,135],
+    [279,146]
+  ]
+});
+
+jsMath.Img.AddFont(120,{
+  cmr10: [
+    [10,12,0], [14,12,0], [12,13,1,-1], [12,13,0], [11,12,0], [13,12,0], [11,12,0,-1], [12,12,0,-1],
+    [11,12,0,-1], [12,12,0,-1], [12,12,0], [11,12,0], [9,12,0], [9,12,0], [14,12,0], [14,12,0],
+    [5,8,0], [5,12,4,1], [4,4,-8,-1], [4,4,-8,-3], [5,3,-8,-2], [6,4,-8,-1], [7,1,-9,-1], [4,4,-9,-4],
+    [5,4,4,-2], [8,13,1], [12,9,1], [13,9,1], [8,11,2], [15,12,0], [16,13,1,-1], [12,14,1,-1],
+    [5,3,-4], [3,13,0,-1], [6,6,-6], [13,16,4,-1], [7,14,1,-1], [13,14,1,-1], [13,14,1], [3,6,-6,-1],
+    [5,17,4,-1], [4,17,4,-1], [7,8,-5,-1], [12,12,2,-1], [3,6,4,-1], [5,2,-3], [3,2,0,-1], [7,17,4,-1],
+    [8,13,1], [7,12,0,-1], [8,12,0], [8,13,1], [8,12,0], [8,13,1], [8,13,1], [8,13,1,-1],
+    [8,13,1], [8,13,1], [3,8,0,-1], [3,12,4,-1], [3,13,4,-1], [12,5,-2,-1], [6,13,4,-1], [6,12,0,-1],
+    [12,13,1,-1], [13,13,0], [11,12,0], [11,13,1,-1], [12,12,0], [11,12,0], [11,12,0], [12,13,1,-1],
+    [13,12,0], [6,12,0], [8,13,1], [13,12,0], [10,12,0], [15,12,0], [13,12,0], [12,13,1,-1],
+    [11,12,0], [12,16,4,-1], [13,13,1], [8,13,1,-1], [12,12,0], [13,13,1], [13,13,1], [18,13,1],
+    [13,12,0], [13,12,0], [9,12,0,-1], [3,17,4,-2], [6,6,-6,-2], [3,17,4], [5,3,-9,-2], [3,3,-9,-1],
+    [3,6,-6,-1], [9,9,1], [9,13,1], [7,9,1], [9,13,1], [7,9,1], [6,12,0], [9,12,4],
+    [9,12,0], [5,12,0], [5,16,4,1], [9,12,0], [5,12,0], [14,8,0], [9,8,0], [8,9,1],
+    [9,12,4], [9,12,4], [7,8,0], [7,9,1], [6,12,1], [9,9,1], [9,9,1], [12,9,1],
+    [9,8,0], [9,12,4], [7,8,0], [9,1,-4], [17,1,-4], [6,4,-8,-2], [6,3,-9,-1], [6,3,-9,-1],
+    [7,27,48,68,89,109,130,150,171,191,211,232,252,273,293,314],
+    [22,42,61,81,101,121,141,161],
+    [337,175]
+  ],
+  cmmi10: [
+    [13,12,0], [13,13,0,-1], [13,13,1], [12,12,0], [13,12,0,-1], [15,12,0], [13,12,0,-1], [12,12,0],
+    [11,12,0], [12,12,0], [13,12,0,-1], [11,9,1], [10,16,4], [10,12,4], [8,14,1], [7,9,1],
+    [8,16,4], [9,12,4], [8,13,1], [5,9,1,-1], [9,9,1,-1], [9,13,1,-1], [10,12,4], [8,8,0,-1],
+    [8,16,4], [10,9,1], [9,12,4], [10,9,1], [9,9,1], [9,9,1], [10,16,4], [10,12,4],
+    [11,16,4], [11,9,1], [8,9,1], [10,13,1], [14,9,1], [8,12,4,-1], [7,10,2], [11,12,4],
+    [15,6,-3,-1], [15,6,1,-1], [15,6,-3,-1], [15,6,1,-1], [3,4,-4,-1], [3,5,-3,-1], [8,9,0], [8,9,0],
+    [8,9,1], [6,8,0,-1], [8,8,0], [8,12,4], [8,12,4], [8,12,4], [8,13,1], [8,12,4,-1],
+    [8,13,1], [8,12,4], [3,2,0,-1], [3,6,4,-1], [11,11,1,-1], [7,17,4,-1], [11,11,1,-1], [9,9,0],
+    [10,14,1], [13,13,0], [13,12,0], [13,13,1], [14,12,0], [13,12,0], [13,12,0], [13,13,1],
+    [15,12,0], [9,12,0], [10,13,1,-1], [15,12,0], [11,12,0], [18,12,0], [18,12,0,3], [13,13,1],
+    [13,12,0], [13,16,4], [13,13,1], [10,13,1,-1], [12,12,0], [12,13,1,-1], [12,13,1,-1], [17,13,1,-1],
+    [18,12,0,3], [13,12,0], [12,12,0,-1], [6,14,1], [5,17,4,-1], [5,16,4,-1], [15,5,-2,-1], [15,5,-2,-1],
+    [7,13,1], [9,9,1], [7,13,1], [8,9,1], [9,13,1], [8,9,1], [9,16,4,-1], [8,12,4],
+    [9,13,1,-1], [5,13,1], [8,16,4,1], [8,13,1,-1], [5,13,1], [15,9,1], [10,9,1], [8,9,1],
+    [10,12,4,1], [8,12,4], [8,9,1], [7,9,1], [6,12,1], [10,9,1], [8,9,1], [12,9,1],
+    [9,9,1], [9,12,4], [8,9,1], [5,9,1], [8,12,4,1], [10,12,4,-1], [8,4,-8,-3], [7,3,-9,-4],
+    [7,27,46,66,86,106,126,146,166,186,206,226,246,266,286,306],
+    [22,42,61,81,101,121,141,161],
+    [328,175]
+  ],
+  cmsy10: [
+    [11,2,-3,-1], [3,3,-3,-1], [9,9,0,-2], [7,8,0,-1], [12,10,1,-1], [9,9,0], [12,12,0,-1], [12,12,3,-1],
+    [12,12,2,-1], [12,12,2,-1], [12,12,2,-1], [12,12,2,-1], [12,12,2,-1], [15,17,4,-1], [7,7,-1,-1], [7,7,-1,-1],
+    [12,9,0,-1], [12,8,0,-1], [11,14,3,-1], [11,14,3,-1], [11,14,3,-1], [11,14,3,-1], [11,14,3,-1], [11,14,3,-1],
+    [12,5,-2,-1], [12,8,-1,-1], [11,11,1,-1], [11,11,1,-1], [15,11,1,-1], [15,11,1,-1], [11,11,1,-1], [11,11,1,-1],
+    [15,7,-1,-1], [15,7,-1,-1], [7,16,4,-1], [7,16,4,-1], [15,7,-1,-1], [15,16,4,-1], [15,16,4,-1], [12,8,0,-1],
+    [15,10,1,-1], [15,10,1,-1], [10,16,4], [10,16,4], [17,10,1], [15,16,4,-1], [15,16,4,-1], [12,9,1,-1],
+    [5,10,0], [15,9,1,-1], [9,11,1,-1], [9,11,1,-1], [13,13,0,-1], [13,13,4,-1], [9,17,4,-2], [1,7,-1,-1],
+    [10,13,1], [8,12,0,-1], [10,5,-1,-1], [8,15,2], [12,14,1], [11,13,1,-1], [12,12,0,-1], [12,12,0,-1],
+    [9,12,0,-1], [14,14,1], [12,13,1], [9,13,1], [13,12,0], [10,13,1], [14,13,1], [11,14,2],
+    [14,13,1], [12,12,0,1], [15,14,2], [13,13,1], [11,13,1], [19,13,1], [18,15,1,1], [13,13,1,-1],
+    [13,13,1], [12,15,3,-2], [14,13,1], [11,13,1], [14,13,0], [13,13,1,1], [12,13,1], [18,13,1],
+    [14,12,0], [13,15,3], [13,12,0], [10,12,1,-1], [10,12,1,-1], [10,12,1,-1], [10,12,1,-1], [10,12,1,-1],
+    [9,12,0,-1], [9,12,0,-1], [4,18,5,-3], [5,18,5], [5,18,5,-3], [5,18,5], [7,18,5,-1], [7,18,5,-1],
+    [5,18,5,-1], [4,18,5,-1], [1,18,5,-2], [5,18,5,-2], [7,18,5,-1], [10,18,5], [7,18,5,-1], [3,12,2,-1],
+    [14,18,17,-1], [12,12,0], [14,13,1], [7,17,4,-1], [10,11,0,-1], [10,11,0,-1], [11,14,3,-1], [11,14,3,-1],
+    [6,16,4,-1], [6,16,4,-1], [6,16,4,-1], [9,16,4,-1], [13,16,3], [12,16,3,-1], [12,14,1,-1], [12,16,3,-1],
+    [7,31,55,79,103,127,151,174,198,222,246,270,294,318,342,366],
+    [23,57,91,125,159,193,227,261],
+    [392,290]
+  ],
+  cmex10: [
+    [5,21,20,-2], [6,21,20], [4,21,20,-3], [4,21,20], [5,21,20,-3], [5,21,20], [5,21,20,-3], [5,21,20],
+    [6,21,20,-2], [6,21,20,-2], [6,21,20,-1], [6,21,20,-1], [2,12,11,-2], [5,12,11,-2], [8,21,20,-1], [8,21,20,-1],
+    [7,31,30,-3], [8,31,30], [9,42,41,-3], [9,41,40], [5,42,41,-4], [5,42,41], [6,42,41,-4], [6,42,41],
+    [6,42,41,-4], [6,42,41], [9,41,40,-2], [9,42,41,-2], [9,41,40,-2], [10,41,40,-1], [16,41,40,-1], [16,41,40,-1],
+    [9,52,51,-4], [10,52,51], [6,52,51,-4], [6,52,51], [7,52,51,-4], [7,52,51], [7,52,51,-4], [7,52,51],
+    [10,52,51,-2], [10,52,51,-2], [10,52,51,-2], [11,52,51,-1], [20,52,51,-1], [20,52,51,-1], [12,31,30,-1], [12,31,30,-1],
+    [10,32,31,-5], [10,32,31], [7,31,30,-5], [6,31,30], [7,31,30,-5], [6,31,30], [2,11,11,-5], [2,11,11,-4],
+    [7,16,16,-6], [7,16,16,-2], [7,17,16,-6], [6,17,16,-3], [7,32,31,-2], [7,32,31,-6], [3,7,6,-6], [1,11,11,-5],
+    [10,31,30,-5], [10,31,30], [2,12,11,-5], [2,12,11,-8], [7,31,30,-2], [8,31,30,-1], [13,17,17,-1], [17,24,24,-1],
+    [10,19,19,-1], [15,38,38,-1], [17,17,17,-1], [24,24,24,-1], [17,17,17,-1], [24,24,24,-1], [17,17,17,-1], [24,24,24,-1],
+    [16,17,17,-1], [14,17,17,-1], [10,19,19,-1], [13,17,17,-1], [13,17,17,-1], [13,17,17,-1], [13,17,17,-1], [13,17,17,-1],
+    [23,24,24,-1], [20,24,24,-1], [15,38,38,-1], [17,24,24,-1], [17,24,24,-1], [17,24,24,-1], [17,24,24,-1], [17,24,24,-1],
+    [14,17,17,-1], [20,24,24,-1], [10,4,-9], [17,4,-9], [25,4,-9], [10,3,-10], [17,3,-10], [25,3,-10],
+    [5,31,30,-3], [5,31,30], [6,31,30,-3], [6,31,30], [6,31,30,-3], [6,31,30], [8,31,30,-2], [8,31,30,-2],
+    [16,21,20,-2], [16,31,30,-2], [16,42,41,-2], [16,52,51,-2], [11,32,31,-2], [2,12,11,-11], [8,11,10,-11], [5,11,11,-4],
+    [9,11,11,-1], [8,10,10,-2], [9,6,4,1], [9,6,4,1], [9,6,0,1], [9,6,0,1], [12,11,11,-1], [12,10,10,-1],
+    [7,38,68,98,128,158,188,218,248,278,309,339,369,399,429,459],
+    [26,100,174,248,322,396,470,544],
+    [492,616]
+  ],
+  cmbx10: [
+    [11,12,0], [15,12,0,-1], [14,13,1,-1], [13,12,0], [13,12,0], [15,12,0], [12,12,0,-1], [13,12,0,-1],
+    [12,12,0,-1], [13,12,0,-1], [13,12,0,-1], [13,12,0], [11,12,0], [11,12,0], [16,12,0], [16,12,0],
+    [5,8,0], [6,12,4,1], [4,4,-8,-2], [4,4,-8,-4], [6,2,-9,-2], [7,4,-8,-1], [8,2,-9,-1], [5,3,-9,-5],
+    [6,4,4,-2], [10,13,1], [14,9,1], [15,9,1], [10,12,2], [18,12,0], [19,13,1,-1], [14,14,1,-1],
+    [6,3,-4], [4,12,0,-1], [8,6,-6], [15,16,4,-1], [8,14,1,-1], [15,14,1,-1], [15,13,1], [4,6,-6,-1],
+    [6,17,4,-1], [5,17,4,-1], [8,8,-5,-1], [13,14,3,-1], [4,7,4,-1], [6,2,-3], [3,3,0,-1], [8,17,4,-1],
+    [9,13,1], [8,12,0,-1], [8,12,0,-1], [9,13,1], [10,12,0], [8,12,1,-1], [9,13,1], [9,13,1,-1],
+    [9,13,1], [9,13,1], [3,8,0,-1], [4,12,4,-1], [4,13,4,-1], [13,6,-1,-1], [8,13,4,-1], [8,12,0,-1],
+    [14,13,1,-1], [14,12,0], [13,12,0], [12,13,1,-1], [14,12,0], [13,12,0], [12,12,0], [14,13,1,-1],
+    [15,12,0], [7,12,0], [9,13,1], [15,12,0], [11,12,0], [18,12,0], [15,12,0], [13,13,1,-1],
+    [13,12,0], [13,16,4,-1], [15,13,1], [9,13,1,-1], [13,12,0], [15,13,1], [15,13,1], [20,13,1],
+    [15,12,0], [15,12,0], [10,12,0,-1], [3,17,4,-2], [8,7,-5,-2], [4,17,4], [6,3,-9,-2], [3,3,-9,-1],
+    [3,7,-5,-1], [10,9,1], [11,13,1], [8,9,1], [11,13,1], [9,9,1], [8,12,0], [10,12,4],
+    [11,12,0], [5,12,0], [6,16,4,1], [10,12,0], [5,12,0], [16,8,0], [11,8,0], [10,9,1],
+    [11,12,4], [11,12,4], [8,8,0], [7,9,1], [7,12,1], [11,9,1], [10,8,0], [14,8,0],
+    [10,8,0], [10,12,4], [8,8,0], [10,1,-4], [20,1,-4], [7,4,-8,-2], [7,2,-10,-1], [7,3,-9,-1],
+    [7,31,54,78,102,125,149,173,196,220,244,268,291,315,339,362],
+    [22,42,61,81,101,121,141,161],
+    [388,175]
+  ],
+  cmti10: [
+    [11,12,0,-1], [12,12,0,-1], [12,13,1,-2], [10,13,0,-1], [12,12,0,-1], [14,12,0,-1], [13,12,0,-1], [12,12,0,-3],
+    [11,12,0,-2], [11,12,0,-3], [12,12,0,-1], [14,16,4,1], [12,16,4,1], [12,16,4,1], [17,16,4,1], [17,16,4,1],
+    [5,9,1,-1], [7,12,4,1], [3,4,-8,-5], [5,4,-8,-5], [5,3,-8,-4], [6,4,-8,-4], [6,1,-9,-4], [4,4,-9,-8],
+    [5,4,4,-1], [11,16,4,1], [12,9,1,-1], [12,9,1,-1], [9,11,2,-1], [15,12,0,-1], [16,13,1,-2], [17,14,1,3],
+    [5,3,-4,-1], [5,13,0,-2], [6,6,-6,-3], [12,16,4,-2], [11,13,1,-1], [13,14,1,-2], [12,14,1,-2], [4,6,-6,-3],
+    [7,17,4,-2], [7,17,4], [7,8,-5,-3], [11,11,1,-2], [3,6,4,-1], [5,2,-3,-1], [2,2,0,-2], [11,17,4],
+    [8,13,1,-2], [6,12,0,-2], [9,13,1,-1], [9,13,1,-1], [8,16,4], [9,13,1,-1], [8,13,1,-2], [9,13,1,-2],
+    [9,13,1,-1], [9,13,1,-1], [4,8,0,-2], [5,12,4,-1], [5,13,4,-1], [12,5,-2,-2], [7,13,4,-1], [7,13,0,-3],
+    [12,13,1,-2], [11,13,0,-1], [12,12,0,-1], [12,13,1,-2], [13,12,0,-1], [12,12,0,-1], [12,12,0,-1], [12,13,1,-2],
+    [14,12,0,-1], [8,12,0,-1], [10,13,1,-1], [14,12,0,-1], [10,12,0,-1], [16,12,0,-1], [14,12,0,-1], [12,13,1,-2],
+    [12,12,0,-1], [12,16,4,-2], [12,13,1,-1], [10,13,1,-1], [11,12,0,-3], [12,13,1,-3], [12,13,1,-3], [16,13,1,-3],
+    [17,12,0,3], [12,12,0,-3], [11,12,0,-1], [7,17,4,-1], [7,6,-6,-4], [7,17,4,1], [5,3,-9,-4], [3,3,-9,-4],
+    [3,6,-6,-3], [8,9,1,-1], [6,13,1,-2], [7,9,1,-1], [9,13,1,-1], [6,9,1,-2], [9,16,4,1], [8,12,4,-1],
+    [8,13,1,-1], [5,12,1,-1], [7,16,4,1], [8,13,1,-1], [5,13,1,-1], [14,9,1,-1], [9,9,1,-1], [8,9,1,-1],
+    [9,12,4], [8,12,4,-1], [8,9,1,-1], [6,9,1,-1], [6,12,1,-1], [9,9,1,-1], [8,9,1,-1], [11,9,1,-1],
+    [8,9,1,-1], [8,12,4,-1], [7,9,1,-1], [9,1,-4,-1], [16,1,-4,-2], [13,8,-4,3], [6,3,-9,-4], [6,3,-9,-4],
+    [7,27,47,68,88,109,129,149,170,190,210,231,251,271,292,312],
+    [22,42,61,81,101,121,141,161],
+    [335,175]
+  ]
+});
+
+jsMath.Img.AddFont(144,{
+  cmr10: [
+    [12,14,0], [15,15,0,-1], [14,16,1,-1], [14,15,0], [13,14,0], [15,14,0], [13,14,0,-1], [14,15,0,-1],
+    [13,14,0,-1], [14,14,0,-1], [13,15,0,-1], [13,15,0], [11,15,0], [11,15,0], [16,15,0], [16,15,0],
+    [5,9,0], [6,14,5,1], [4,4,-10,-2], [4,4,-10,-4], [6,3,-10,-2], [6,4,-10,-2], [8,1,-11,-1], [5,5,-10,-5],
+    [6,5,5,-2], [10,16,1], [13,10,1,-1], [15,10,1], [10,13,2], [18,14,0], [19,15,1,-1], [14,16,1,-1],
+    [6,3,-5], [3,15,0,-1], [7,6,-8], [15,18,4,-1], [8,16,1,-1], [15,17,2,-1], [15,16,1], [4,6,-8,-1],
+    [5,20,5,-2], [5,20,5,-1], [8,9,-6,-1], [14,14,2,-1], [3,7,4,-1], [6,2,-3], [3,3,0,-1], [8,20,5,-1],
+    [10,15,1], [8,14,0,-1], [8,14,0,-1], [10,15,1], [10,14,0], [8,15,1,-1], [10,15,1], [9,15,1,-1],
+    [10,15,1], [10,15,1], [3,9,0,-1], [3,13,4,-1], [3,15,5,-1], [14,6,-2,-1], [8,15,5,-1], [8,15,0,-1],
+    [14,16,1,-1], [15,15,0], [13,14,0], [13,16,1,-1], [15,14,0], [13,14,0], [13,14,0], [14,16,1,-1],
+    [15,14,0], [7,14,0], [10,15,1], [15,14,0], [12,14,0], [18,14,0], [15,14,0], [14,16,1,-1],
+    [13,14,0], [14,19,4,-1], [15,15,1], [9,16,1,-1], [14,14,0], [15,15,1], [15,15,1], [21,15,1],
+    [15,14,0], [15,14,0], [11,14,0,-1], [4,20,5,-2], [7,7,-7,-3], [4,20,5], [6,3,-11,-2], [3,3,-11,-1],
+    [3,7,-7,-1], [10,10,1], [11,15,1], [9,10,1], [11,15,1], [9,10,1], [8,15,0], [10,14,5],
+    [11,14,0], [5,14,0], [6,19,5,1], [11,14,0], [5,14,0], [17,9,0], [11,9,0], [10,10,1],
+    [11,13,4], [11,13,4], [8,9,0], [8,10,1], [7,14,1], [11,10,1], [11,10,1], [14,10,1],
+    [11,9,0], [11,13,4], [8,9,0], [10,1,-5], [20,1,-5], [7,4,-10,-2], [8,3,-11,-1], [6,3,-11,-2],
+    [8,33,57,82,106,131,155,180,205,229,254,278,303,327,352,377],
+    [26,50,74,98,122,145,169,193],
+    [404,209]
+  ],
+  cmmi10: [
+    [15,14,0], [15,15,0,-1], [14,16,1,-1], [14,15,0], [15,14,0,-1], [18,14,0], [15,14,0,-1], [14,14,0],
+    [13,14,0], [14,14,0], [15,15,0,-1], [12,10,1], [12,18,4], [11,14,5], [9,16,1], [7,10,1,-1],
+    [10,19,5], [10,14,5], [10,15,1], [6,10,1,-1], [10,10,1,-1], [10,15,1,-1], [12,14,5], [10,9,0,-1],
+    [9,19,5], [12,10,1], [10,14,5], [12,10,1], [11,10,1], [11,10,1], [11,18,4,-1], [12,14,5],
+    [13,18,4], [13,10,1], [9,10,1], [12,16,1], [17,10,1], [9,13,4,-1], [9,12,3], [12,14,5,-1],
+    [18,7,-4,-1], [18,7,1,-1], [18,7,-4,-1], [18,7,1,-1], [4,6,-4,-1], [4,6,-4,-1], [10,10,0], [10,10,0],
+    [10,10,1], [7,9,0,-2], [8,9,0,-1], [10,14,5], [10,14,4], [8,14,5,-1], [10,15,1], [9,15,5,-1],
+    [10,15,1], [10,14,5], [3,3,0,-1], [3,7,4,-1], [13,12,1,-1], [8,20,5,-1], [13,12,1,-1], [10,10,0],
+    [12,16,1], [15,15,0], [16,14,0], [15,16,1,-1], [17,14,0], [16,14,0], [15,14,0], [15,16,1,-1],
+    [18,14,0], [10,14,0], [12,15,1,-1], [18,14,0], [13,14,0], [21,14,0], [18,14,0], [14,16,1,-1],
+    [15,14,0], [14,19,4,-1], [15,15,1], [12,16,1,-1], [14,14,0], [15,15,1,-1], [15,15,1,-1], [20,15,1,-1],
+    [17,14,0], [16,14,0], [14,14,0,-1], [6,16,1,-1], [6,20,5,-1], [6,20,5,-1], [18,6,-2,-1], [18,6,-2,-1],
+    [8,15,1], [10,10,1], [8,15,1,-1], [9,10,1], [11,15,1], [9,10,1], [10,19,4,-1], [10,14,5],
+    [10,15,1,-1], [6,15,1], [9,19,5,1], [10,15,1,-1], [6,15,1], [17,10,1], [12,10,1], [10,10,1],
+    [11,13,4,1], [9,13,4], [9,10,1], [8,10,1,-1], [7,14,1], [11,10,1], [10,10,1], [14,10,1],
+    [11,10,1], [10,14,5], [9,10,1,-1], [6,10,1], [9,14,5,1], [12,14,5,-1], [10,5,-10,-3], [8,4,-10,-5],
+    [8,32,56,80,104,128,151,175,199,223,247,271,295,319,343,367],
+    [26,50,74,98,122,145,169,193],
+    [393,209]
+  ],
+  cmsy10: [
+    [13,2,-4,-1], [3,2,-4,-1], [10,10,0,-3], [8,10,0,-1], [14,12,1,-1], [10,10,0], [14,14,0,-1], [14,14,4,-1],
+    [14,14,2,-1], [14,14,2,-1], [14,14,2,-1], [14,14,2,-1], [14,14,2,-1], [18,20,5,-1], [8,8,-1,-1], [8,8,-1,-1],
+    [14,10,0,-1], [14,10,0,-1], [13,16,3,-1], [13,16,3,-1], [13,16,3,-1], [13,16,3,-1], [13,16,3,-1], [13,16,3,-1],
+    [14,6,-2,-1], [14,9,-1,-1], [13,12,1,-1], [13,12,1,-1], [18,14,2,-1], [18,14,2,-1], [13,12,1,-1], [13,12,1,-1],
+    [18,8,-1,-1], [18,8,-1,-1], [8,18,4,-1], [8,18,4,-1], [18,8,-1,-1], [18,18,4,-1], [18,18,4,-1], [14,10,0,-1],
+    [18,12,1,-1], [18,12,1,-1], [12,18,4], [12,18,4], [19,12,1], [18,18,4,-1], [18,18,4,-1], [14,10,1,-1],
+    [6,11,-1], [18,10,1,-1], [11,12,1,-1], [11,12,1,-1], [16,15,0,-1], [16,15,5,-1], [11,20,5,-2], [2,8,-1,-1],
+    [11,15,1], [9,14,0,-1], [12,7,-1,-1], [9,18,2], [14,16,1,-1], [13,16,1,-1], [14,14,0,-1], [14,14,0,-1],
+    [11,14,0,-1], [16,16,1], [14,16,1], [11,15,1], [16,14,0], [12,16,1], [17,15,1], [12,18,3],
+    [17,15,1], [14,14,0,1], [16,17,3,-1], [15,16,1], [13,16,1], [23,15,1], [21,17,1,1], [15,15,1,-1],
+    [15,15,1], [14,18,3,-2], [17,15,1], [13,16,1], [16,15,0], [15,15,1,1], [14,15,1], [21,15,1],
+    [16,14,0,-1], [15,17,3], [16,14,0], [12,13,1,-1], [12,13,1,-1], [12,13,1,-1], [11,13,1,-1], [12,13,1,-1],
+    [10,14,0,-1], [11,14,0,-1], [6,20,5,-3], [6,20,5], [6,20,5,-3], [6,20,5], [8,20,5,-1], [8,20,5,-1],
+    [5,20,5,-2], [5,20,5,-1], [2,20,5,-2], [6,20,5,-2], [8,22,6,-1], [12,22,6], [8,20,5,-1], [4,14,2,-1],
+    [16,21,20,-1], [15,14,0], [15,15,1,-1], [9,20,5,-1], [12,12,0,-1], [12,12,0,-1], [14,16,3,-1], [13,16,3,-1],
+    [7,20,5,-1], [7,19,5,-1], [7,18,4,-1], [11,18,4,-1], [15,18,3], [14,19,4,-1], [14,16,1,-1], [14,18,3,-1],
+    [8,37,66,95,123,152,181,209,238,267,295,324,353,382,410,439],
+    [27,68,109,150,191,232,273,314],
+    [471,348]
+  ],
+  cmex10: [
+    [6,24,23,-3], [6,24,23,-1], [4,25,24,-4], [5,25,24], [5,25,24,-4], [6,25,24], [5,25,24,-4], [6,25,24],
+    [8,25,24,-2], [8,25,24,-2], [6,25,24,-2], [7,24,23,-1], [2,14,13,-2], [7,14,13,-2], [10,25,24,-1], [10,24,23,-1],
+    [9,37,36,-3], [9,37,36], [10,49,48,-4], [11,49,48], [6,49,48,-5], [6,49,48], [7,49,48,-5], [7,49,48],
+    [7,49,48,-5], [7,49,48], [11,49,48,-2], [11,49,48,-2], [11,49,48,-2], [11,49,48,-2], [19,49,48,-1], [19,49,48,-1],
+    [11,61,60,-4], [12,61,60], [7,61,60,-5], [7,61,60], [8,61,60,-5], [8,61,60], [8,61,60,-5], [8,61,60],
+    [12,61,60,-2], [12,61,60,-2], [12,61,60,-2], [12,61,60,-2], [24,61,60,-1], [24,61,60,-1], [14,37,36,-1], [14,37,36,-1],
+    [12,37,36,-5], [12,37,36], [8,37,36,-6], [7,37,36], [8,37,36,-6], [7,37,36], [2,12,12,-6], [2,12,12,-5],
+    [8,19,19,-7], [8,19,19,-3], [8,19,18,-7], [8,19,18,-3], [8,38,37,-3], [8,38,37,-7], [4,8,7,-7], [2,12,12,-6],
+    [12,37,36,-5], [12,37,36], [3,14,13,-5], [3,14,13,-9], [9,36,35,-2], [9,37,36,-1], [15,20,20,-1], [21,28,28,-1],
+    [12,23,23,-1], [18,45,45,-1], [20,20,20,-1], [28,28,28,-1], [20,20,20,-1], [28,28,28,-1], [20,20,20,-1], [28,28,28,-1],
+    [19,20,20,-1], [17,20,20,-1], [12,23,23,-1], [15,20,20,-1], [15,20,20,-1], [15,20,20,-1], [15,20,20,-1], [15,20,20,-1],
+    [27,28,28,-1], [24,28,28,-1], [18,45,45,-1], [21,28,28,-1], [21,28,28,-1], [21,28,28,-1], [20,28,28,-1], [20,28,28,-1],
+    [17,20,20,-1], [24,28,28,-1], [12,4,-11], [20,5,-11], [29,5,-11], [11,3,-12], [20,3,-12], [29,3,-12],
+    [5,37,36,-4], [5,37,36], [7,37,36,-4], [6,37,36], [7,37,36,-4], [6,37,36], [9,37,36,-2], [9,37,36,-2],
+    [19,25,24,-2], [19,37,36,-2], [19,49,48,-2], [19,61,60,-2], [13,37,36,-2], [1,14,13,-14], [8,13,12,-14], [6,12,12,-5],
+    [9,12,12,-2], [9,12,12,-2], [11,8,5,1], [11,8,5,1], [11,7,0,1], [11,7,0,1], [14,12,12,-1], [14,12,12,-1],
+    [9,45,81,117,154,190,226,262,298,334,370,406,443,479,515,551],
+    [31,120,209,297,386,475,564,652],
+    [591,739]
+  ],
+  cmbx10: [
+    [13,14,0], [17,14,0,-1], [16,15,1,-1], [16,14,0], [14,14,0,-1], [18,14,0], [15,14,0,-1], [16,14,0,-1],
+    [15,14,0,-1], [16,14,0,-1], [15,14,0,-1], [15,14,0], [12,14,0], [12,14,0], [19,14,0], [19,14,0],
+    [5,9,0,-1], [8,13,4,2], [5,4,-10,-2], [5,4,-10,-5], [7,3,-10,-2], [8,4,-10,-2], [9,2,-11,-1], [5,4,-10,-6],
+    [7,4,4,-2], [12,15,1], [16,10,1], [18,10,1], [11,13,2], [21,14,0], [22,15,1,-1], [16,16,1,-1],
+    [7,3,-5], [3,15,0,-2], [10,7,-7], [17,18,4,-1], [10,17,2,-1], [17,17,2,-1], [16,15,1,-1], [4,7,-7,-1],
+    [6,20,5,-2], [6,20,5,-1], [9,9,-6,-1], [16,16,3,-1], [4,8,4,-1], [7,3,-3], [4,4,0,-1], [10,20,5,-1],
+    [11,15,1], [9,13,0,-1], [10,14,0,-1], [10,15,1,-1], [11,14,0], [10,14,1,-1], [10,15,1,-1], [11,15,1,-1],
+    [10,15,1,-1], [10,15,1,-1], [4,9,0,-1], [4,13,4,-1], [3,15,5,-2], [16,6,-2,-1], [9,14,4,-1], [9,14,0,-1],
+    [16,15,1,-1], [17,14,0], [15,14,0], [15,15,1,-1], [17,14,0], [15,14,0], [14,14,0], [16,15,1,-1],
+    [18,14,0], [8,14,0], [11,15,1], [17,14,0], [13,14,0], [21,14,0], [18,14,0], [15,15,1,-1],
+    [15,14,0], [16,18,4,-1], [18,15,1], [11,15,1,-1], [16,14,0], [17,15,1], [17,15,1], [24,15,1],
+    [17,14,0], [17,14,0], [12,14,0,-1], [4,20,5,-2], [10,8,-6,-2], [4,20,5], [7,4,-10,-2], [4,4,-10,-1],
+    [4,8,-6,-1], [12,10,1], [12,15,1], [10,10,1], [12,15,1], [10,10,1], [9,14,0], [12,13,4],
+    [13,14,0], [5,14,0,-1], [8,18,4,2], [12,14,0], [5,14,0,-1], [19,9,0], [13,9,0], [11,10,1],
+    [12,13,4], [12,13,4], [9,9,0], [9,10,1], [8,14,1], [13,10,1], [12,9,0], [17,9,0],
+    [12,9,0], [12,13,4], [10,9,0], [12,1,-5], [23,1,-5], [7,5,-10,-3], [8,3,-11,-2], [8,3,-11,-2],
+    [8,37,65,94,122,150,179,207,236,264,293,321,349,378,406,435],
+    [26,50,74,98,122,145,169,193],
+    [466,209]
+  ],
+  cmti10: [
+    [13,14,0,-1], [14,15,0,-1], [13,16,1,-3], [12,15,0,-1], [14,14,0,-1], [16,14,0,-1], [15,14,0,-1], [13,15,0,-4],
+    [12,14,0,-3], [13,14,0,-4], [14,15,0,-2], [17,19,4,1], [13,19,4,1], [14,19,4,1], [20,20,5,1], [20,20,5,1],
+    [6,10,1,-1], [8,13,4,1], [4,4,-10,-5], [5,4,-10,-6], [6,3,-10,-5], [7,4,-10,-5], [8,1,-11,-4], [5,5,-10,-9],
+    [5,4,4,-2], [13,19,4,1], [14,10,1,-1], [13,10,1,-2], [10,13,2,-1], [18,14,0,-1], [18,16,1,-3], [15,17,2,-2],
+    [5,3,-5,-2], [6,15,0,-2], [8,6,-8,-3], [15,18,4,-2], [13,16,1,-1], [14,17,2,-3], [14,16,1,-2], [4,6,-8,-4],
+    [8,20,5,-3], [8,20,5], [8,9,-6,-4], [12,13,2,-3], [4,7,4,-1], [6,2,-3,-1], [3,3,0,-2], [13,20,5],
+    [10,15,1,-2], [8,14,0,-2], [10,15,1,-1], [11,15,1,-1], [9,18,4,-1], [10,15,1,-2], [10,15,1,-2], [10,15,1,-3],
+    [9,15,1,-2], [9,15,1,-2], [4,9,0,-2], [5,13,4,-1], [6,15,5,-1], [14,6,-2,-2], [8,15,5,-1], [8,15,0,-3],
+    [13,16,1,-3], [13,15,0,-1], [14,14,0,-1], [14,16,1,-3], [15,14,0,-1], [14,14,0,-1], [14,14,0,-1], [14,16,1,-3],
+    [16,14,0,-1], [9,14,0,-1], [12,15,1,-1], [17,14,0,-1], [12,14,0,-1], [19,14,0,-1], [16,14,0,-1], [13,16,1,-3],
+    [14,14,0,-1], [13,19,4,-3], [14,15,1,-1], [12,16,1,-1], [13,14,0,-3], [13,15,1,-4], [14,15,1,-4], [18,15,1,-4],
+    [21,14,0,4], [14,14,0,-4], [13,14,0,-1], [8,20,5,-1], [8,7,-7,-5], [9,20,5,1], [6,4,-10,-5], [3,3,-11,-5],
+    [4,6,-8,-4], [9,10,1,-2], [8,15,1,-2], [8,10,1,-2], [10,15,1,-2], [8,10,1,-2], [10,19,4,1], [9,14,5,-1],
+    [10,15,1,-1], [6,14,1,-1], [9,18,4,1], [9,15,1,-1], [5,15,1,-1], [16,10,1,-1], [11,10,1,-1], [9,10,1,-2],
+    [11,13,4], [8,13,4,-2], [9,10,1,-1], [8,10,1,-1], [7,14,1,-1], [11,10,1,-1], [9,10,1,-1], [13,10,1,-1],
+    [10,10,1,-1], [10,13,4,-1], [9,10,1,-1], [9,1,-5,-2], [19,1,-5,-2], [7,4,-10,-5], [7,3,-11,-5], [6,3,-11,-5],
+    [8,32,57,81,106,130,155,179,204,228,252,277,301,326,350,375],
+    [26,50,74,98,122,145,169,193],
+    [402,209]
+  ]
+});
+
+jsMath.Img.AddFont(173,{
+  cmr10: [
+    [14,17,0], [18,18,0,-1], [17,18,1,-1], [16,18,0], [14,17,0,-1], [18,17,0], [15,17,0,-1], [17,17,0,-1],
+    [15,17,0,-1], [17,17,0,-1], [16,17,0,-1], [15,17,0], [13,17,0], [13,17,0], [20,17,0], [20,17,0],
+    [6,11,0], [6,16,5,1], [5,5,-12,-2], [5,5,-12,-5], [6,4,-12,-3], [8,5,-12,-2], [10,2,-13,-1], [6,5,-13,-6],
+    [6,5,5,-3], [12,18,1], [16,12,1,-1], [18,12,1], [12,16,3], [21,17,0], [23,18,1,-1], [17,20,2,-1],
+    [7,4,-6], [3,18,0,-2], [9,8,-9], [18,22,5,-1], [10,20,2,-1], [18,20,2,-1], [17,19,1,-1], [3,8,-9,-2],
+    [6,24,6,-2], [6,24,6,-1], [10,11,-7,-1], [17,16,2,-1], [3,8,5,-2], [7,2,-4], [3,3,0,-2], [10,24,6,-1],
+    [11,17,1], [8,16,0,-2], [10,16,0,-1], [10,17,1,-1], [12,17,0], [10,17,1,-1], [10,17,1,-1], [11,18,1,-1],
+    [10,17,1,-1], [10,17,1,-1], [3,11,0,-2], [3,16,5,-2], [3,18,6,-2], [17,6,-3,-1], [9,17,5,-1], [9,17,0,-1],
+    [17,18,1,-1], [18,18,0], [16,17,0], [15,18,1,-1], [17,17,0], [16,17,0], [15,17,0], [17,18,1,-1],
+    [18,17,0], [8,17,0], [11,18,1,-1], [18,17,0], [14,17,0], [22,17,0], [18,17,0], [17,18,1,-1],
+    [15,17,0], [17,22,5,-1], [18,18,1], [11,18,1,-1], [17,17,0], [18,18,1], [18,18,1], [25,18,1],
+    [18,17,0], [18,17,0], [13,17,0,-1], [5,24,6,-2], [9,8,-9,-3], [4,24,6], [6,4,-13,-3], [3,3,-13,-2],
+    [4,8,-9,-1], [11,12,1,-1], [13,18,1], [10,12,1], [13,18,1], [10,12,1], [9,17,0], [12,16,5],
+    [13,17,0], [6,16,0], [6,21,5,1], [13,17,0], [7,17,0], [20,11,0], [13,11,0], [12,12,1],
+    [13,16,5], [13,16,5], [9,11,0], [9,12,1], [8,16,1], [13,12,1], [13,12,1], [17,12,1],
+    [13,11,0], [13,16,5], [10,11,0], [12,1,-6], [24,1,-6], [7,5,-12,-3], [8,3,-13,-2], [8,3,-13,-2],
+    [10,39,69,98,128,157,187,216,246,275,305,334,364,393,423,453],
+    [32,61,90,118,147,176,204,233],
+    [485,253]
+  ],
+  cmmi10: [
+    [17,17,0,-1], [18,18,0,-1], [17,18,1,-1], [16,18,0], [18,17,0,-1], [20,17,0,-1], [19,17,0,-1], [17,17,0],
+    [16,17,0], [17,17,0], [18,17,0,-1], [14,12,1,-1], [15,22,5], [13,16,5], [10,18,1,-1], [8,12,1,-1],
+    [11,22,5,-1], [12,17,6], [10,18,1,-1], [7,12,1,-1], [12,12,1,-1], [12,18,1,-1], [14,17,6], [12,11,0,-1],
+    [11,22,5], [14,12,1], [12,17,6], [14,12,1], [13,12,1], [13,12,1], [13,22,5,-1], [15,16,5],
+    [16,22,5], [15,12,1], [11,12,1], [14,18,1], [20,12,1], [11,16,5,-1], [10,14,3], [14,17,6,-1],
+    [22,8,-5,-1], [22,8,1,-1], [22,8,-5,-1], [22,8,1,-1], [5,7,-5,-1], [5,7,-5,-1], [12,12,0], [12,12,0],
+    [10,12,1,-1], [8,11,0,-2], [10,11,0,-1], [10,17,6,-1], [12,17,5], [10,17,6,-1], [10,17,1,-1], [11,17,6,-1],
+    [10,17,1,-1], [10,17,6,-1], [3,3,0,-2], [3,8,5,-2], [15,14,1,-2], [10,24,6,-1], [15,14,1,-2], [12,12,0],
+    [13,19,1,-1], [18,18,0], [18,17,0,-1], [18,18,1,-1], [19,17,0,-1], [18,17,0,-1], [17,17,0,-1], [18,18,1,-1],
+    [20,17,0,-1], [12,17,0], [14,18,1,-1], [21,17,0,-1], [15,17,0,-1], [24,17,0,-1], [20,17,0,-1], [17,18,1,-1],
+    [18,17,0,-1], [17,22,5,-1], [17,18,1,-1], [15,18,1,-1], [17,17,0], [18,18,1,-1], [18,18,1,-1], [24,18,1,-1],
+    [25,17,0,4], [18,17,0,-1], [17,17,0,-1], [7,19,1,-1], [7,24,6,-1], [7,24,6,-1], [22,6,-3,-1], [22,7,-3,-1],
+    [10,18,1], [11,12,1,-1], [9,18,1,-1], [10,12,1,-1], [12,18,1,-1], [10,12,1,-1], [13,22,5,-1], [12,16,5],
+    [12,18,1,-1], [7,17,1], [11,21,5,1], [12,18,1,-1], [6,18,1,-1], [21,12,1], [14,12,1], [11,12,1,-1],
+    [13,16,5,1], [10,16,5,-1], [11,12,1], [9,12,1,-1], [8,16,1], [13,12,1], [12,12,1], [17,12,1],
+    [13,12,1], [12,16,5], [11,12,1,-1], [7,12,1], [10,16,5,1], [14,17,6,-1], [11,5,-12,-4], [10,3,-13,-6],
+    [10,38,67,96,124,153,182,211,239,268,297,326,354,383,412,440],
+    [32,61,90,118,147,176,204,233],
+    [472,253]
+  ],
+  cmsy10: [
+    [15,2,-5,-2], [3,4,-4,-2], [12,12,0,-3], [10,11,0,-1], [17,14,1,-1], [12,12,0], [17,16,0,-1], [17,16,4,-1],
+    [17,16,2,-1], [17,16,2,-1], [17,16,2,-1], [17,16,2,-1], [17,16,2,-1], [22,24,6,-1], [10,10,-1,-1], [10,10,-1,-1],
+    [17,12,0,-1], [17,12,0,-1], [15,20,4,-2], [15,20,4,-2], [15,20,4,-2], [15,20,4,-2], [15,20,4,-2], [15,20,4,-2],
+    [17,6,-3,-1], [17,11,-1,-1], [15,14,1,-2], [15,14,1,-2], [22,16,2,-1], [22,16,2,-1], [15,14,1,-2], [15,14,1,-2],
+    [22,10,-1,-1], [22,10,-1,-1], [10,22,5,-1], [10,22,5,-1], [22,10,-1,-1], [22,22,5,-1], [22,22,5,-1], [17,12,0,-1],
+    [22,14,1,-1], [22,14,1,-1], [14,22,5], [14,22,5], [22,14,1,-1], [22,22,5,-1], [22,22,5,-1], [17,12,1,-1],
+    [7,13,-1], [22,12,1,-1], [12,14,1,-2], [12,14,1,-2], [19,18,0,-1], [19,18,6,-1], [13,24,6,-3], [2,10,-1,-1],
+    [14,18,1], [11,17,0,-1], [14,7,-2,-1], [10,21,2,-1], [16,19,1,-1], [16,18,1,-1], [17,16,0,-1], [17,16,0,-1],
+    [13,17,0,-1], [19,20,2], [16,18,1], [13,18,1], [19,17,0], [14,18,1], [20,18,1], [14,20,3,-1],
+    [20,19,2], [17,17,0,1], [19,20,3,-1], [18,18,1], [16,18,1], [27,19,2], [25,21,2,1], [18,18,1,-1],
+    [18,19,2], [17,20,3,-2], [20,18,1], [16,18,1], [19,18,0], [18,18,1,1], [15,18,1,-1], [24,18,1,-1],
+    [19,17,0,-1], [18,21,4], [18,17,0,-1], [14,16,1,-1], [14,16,1,-1], [14,16,1,-1], [14,16,1,-1], [14,16,1,-1],
+    [13,17,0,-1], [13,17,0,-1], [6,24,6,-4], [7,24,6], [6,24,6,-4], [7,24,6], [9,24,6,-2], [9,24,6,-1],
+    [6,24,6,-2], [6,24,6,-1], [2,24,6,-2], [6,24,6,-3], [10,26,7,-1], [14,26,7], [10,24,6,-1], [5,16,2,-1],
+    [20,24,23,-1], [17,17,0], [18,18,1,-1], [11,24,6,-1], [14,15,0,-1], [14,15,0,-1], [16,20,4,-2], [16,20,4,-1],
+    [8,22,5,-1], [9,23,6,-1], [9,22,5,-1], [13,22,5,-1], [18,22,4], [17,22,4,-1], [17,19,1,-1], [17,22,4,-1],
+    [10,45,79,114,148,183,217,252,286,321,355,390,424,459,493,528],
+    [34,83,132,181,230,279,329,378],
+    [565,419]
+  ],
+  cmex10: [
+    [7,29,28,-3], [7,29,28,-1], [6,29,28,-4], [6,29,28], [7,29,28,-4], [7,29,28], [7,29,28,-4], [7,29,28],
+    [10,29,28,-2], [10,29,28,-2], [8,29,28,-2], [8,29,28,-1], [2,16,15,-3], [7,16,15,-3], [12,29,28,-1], [12,29,28,-1],
+    [10,44,43,-4], [9,44,43,-1], [12,58,57,-5], [12,58,57,-1], [7,58,57,-6], [7,58,57], [8,58,57,-6], [8,58,57],
+    [8,58,57,-6], [8,58,57], [12,58,57,-3], [12,58,57,-3], [13,58,57,-3], [13,58,57,-2], [23,58,57,-1], [23,58,57,-1],
+    [14,72,71,-5], [14,72,71], [8,72,71,-6], [8,72,71], [9,72,71,-6], [9,72,71], [9,72,71,-6], [9,72,71],
+    [13,72,71,-3], [13,72,71,-3], [14,72,71,-3], [14,72,71,-2], [29,72,71,-1], [29,72,71,-1], [17,44,43,-1], [17,44,43,-1],
+    [14,44,43,-7], [14,44,43], [9,44,43,-7], [9,44,43], [9,44,43,-7], [9,44,43], [3,15,15,-7], [3,15,15,-6],
+    [9,22,22,-9], [9,22,22,-4], [9,23,22,-9], [9,23,22,-4], [9,45,44,-4], [9,45,44,-9], [4,9,8,-9], [2,15,15,-7],
+    [13,45,43,-7], [14,45,43], [3,16,15,-7], [3,16,15,-11], [11,44,43,-2], [10,44,43,-2], [18,24,24,-1], [25,34,34,-1],
+    [14,27,27,-1], [22,54,54,-1], [25,24,24,-1], [34,34,34,-1], [25,24,24,-1], [34,34,34,-1], [25,24,24,-1], [34,34,34,-1],
+    [23,24,24,-1], [21,24,24,-1], [14,27,27,-1], [18,24,24,-1], [18,24,24,-1], [18,24,24,-1], [18,24,24,-1], [18,24,24,-1],
+    [33,34,34,-1], [29,34,34,-1], [22,54,54,-1], [25,34,34,-1], [25,34,34,-1], [25,34,34,-1], [25,34,34,-1], [25,34,34,-1],
+    [21,24,24,-1], [29,34,34,-1], [14,5,-13], [24,6,-13], [35,6,-13], [14,4,-14], [24,3,-15], [35,3,-15],
+    [6,44,43,-5], [6,44,43], [8,44,43,-5], [8,44,43], [8,44,43,-5], [8,44,43], [12,44,43,-2], [12,44,43,-2],
+    [23,29,28,-2], [23,44,43,-2], [23,58,57,-2], [23,72,71,-2], [16,45,44,-2], [2,16,15,-16], [10,15,14,-16], [7,15,15,-6],
+    [12,15,15,-2], [12,15,15,-2], [12,9,6,1], [13,9,6,1], [12,8,0,1], [13,8,0,1], [17,15,15,-1], [17,15,15,-1],
+    [11,54,98,141,184,228,271,315,358,401,445,488,532,575,619,662],
+    [39,145,252,358,465,571,678,785],
+    [709,888]
+  ],
+  cmbx10: [
+    [16,17,0], [21,17,0,-1], [19,18,1,-1], [18,17,0,-1], [17,17,0,-1], [21,17,0], [18,17,0,-1], [19,17,0,-1],
+    [18,17,0,-1], [19,17,0,-1], [18,17,0,-1], [18,17,0], [15,17,0], [15,17,0], [23,17,0], [23,17,0],
+    [6,11,0,-1], [9,16,5,2], [6,5,-12,-2], [6,5,-12,-5], [8,4,-12,-3], [10,5,-12,-2], [10,2,-13,-2], [7,5,-12,-7],
+    [8,5,5,-3], [14,18,1], [20,12,1], [21,12,1], [13,17,3], [24,17,0,-1], [26,18,1,-2], [19,20,2,-1],
+    [8,4,-6], [4,17,0,-2], [11,9,-8,-1], [21,22,5,-1], [12,20,2,-1], [21,20,2,-1], [19,18,1,-1], [5,9,-8,-2],
+    [8,24,6,-2], [8,24,6,-1], [11,11,-7,-1], [19,20,4,-1], [4,9,5,-2], [8,3,-4], [4,4,0,-2], [12,24,6,-1],
+    [12,17,1,-1], [10,16,0,-2], [12,16,0,-1], [12,17,1,-1], [13,16,0], [12,17,1,-1], [12,17,1,-1], [13,18,1,-1],
+    [12,17,1,-1], [12,17,1,-1], [4,11,0,-2], [4,16,5,-2], [4,17,5,-2], [19,8,-2,-1], [11,17,5,-1], [11,17,0,-1],
+    [19,18,1,-1], [19,17,0,-1], [19,17,0], [18,18,1,-1], [20,17,0], [18,17,0], [17,17,0], [20,18,1,-1],
+    [21,17,0], [10,17,0], [13,18,1], [21,17,0], [16,17,0], [25,17,0,-1], [21,17,0], [19,18,1,-1],
+    [18,17,0], [19,22,5,-1], [21,18,1], [13,18,1,-1], [18,17,0,-1], [20,18,1,-1], [21,18,1], [28,18,1],
+    [20,17,0], [21,17,0], [15,17,0,-1], [4,24,6,-3], [11,9,-8,-3], [5,24,6], [8,5,-12,-3], [4,4,-13,-2],
+    [5,9,-8,-1], [14,12,1], [15,18,1], [12,12,1], [15,18,1], [12,12,1], [10,17,0,-1], [14,16,5],
+    [14,17,0,-1], [6,17,0,-1], [9,22,5,2], [15,17,0], [6,17,0,-1], [22,11,0,-1], [14,11,0,-1], [13,12,1],
+    [15,16,5], [15,16,5], [11,11,0], [10,12,1], [10,17,1], [14,12,1,-1], [14,12,1], [20,12,1],
+    [14,11,0], [14,16,5], [11,11,0], [14,1,-6], [28,1,-6], [9,5,-12,-3], [10,3,-14,-2], [10,4,-13,-2],
+    [10,44,78,112,147,181,215,249,283,317,352,386,420,454,488,522],
+    [32,61,90,118,147,176,204,233],
+    [560,253]
+  ],
+  cmti10: [
+    [16,17,0,-1], [17,18,0,-1], [16,18,1,-3], [15,18,0,-1], [17,17,0,-1], [20,17,0,-1], [17,17,0,-2], [15,17,0,-5],
+    [15,17,0,-3], [15,17,0,-5], [17,17,0,-2], [20,22,5,1], [16,22,5,1], [17,22,5,1], [23,22,5,1], [24,22,5,1],
+    [6,12,1,-2], [9,16,5,1], [4,5,-12,-7], [6,5,-12,-8], [7,3,-12,-6], [8,5,-12,-6], [9,2,-13,-5], [5,5,-13,-11],
+    [6,5,5,-2], [15,22,5,1], [16,12,1,-2], [16,12,1,-2], [13,16,3,-1], [22,17,0,-1], [23,18,1,-3], [24,20,2,4],
+    [7,4,-6,-2], [7,18,0,-2], [9,8,-9,-4], [18,22,5,-2], [15,18,1,-2], [18,20,2,-3], [17,19,1,-3], [4,8,-9,-5],
+    [10,24,6,-3], [10,24,6], [10,11,-7,-4], [15,16,2,-3], [5,8,5,-1], [7,2,-4,-2], [4,3,0,-2], [15,24,6],
+    [12,17,1,-2], [9,16,0,-2], [12,17,1,-2], [12,17,1,-2], [11,21,5,-1], [12,17,1,-2], [12,17,1,-2], [12,17,1,-3],
+    [12,17,1,-2], [12,17,1,-2], [6,11,0,-2], [7,16,5,-1], [7,18,6,-1], [17,6,-3,-2], [9,18,6,-2], [10,18,0,-4],
+    [16,18,1,-3], [16,18,0,-1], [17,17,0,-1], [17,18,1,-3], [18,17,0,-1], [17,17,0,-1], [17,17,0,-1], [17,18,1,-3],
+    [20,17,0,-1], [11,17,0,-1], [13,18,1,-2], [20,17,0,-1], [14,17,0,-1], [23,17,0,-1], [20,17,0,-1], [16,18,1,-3],
+    [17,17,0,-1], [16,22,5,-3], [17,18,1,-1], [15,18,1,-1], [16,17,0,-4], [17,18,1,-4], [16,18,1,-5], [22,18,1,-5],
+    [24,17,0,4], [16,17,0,-5], [15,17,0,-2], [10,24,6,-1], [9,8,-9,-6], [10,24,6,1], [7,4,-13,-6], [3,3,-13,-6],
+    [4,8,-9,-5], [11,12,1,-2], [9,18,1,-2], [10,12,1,-2], [12,18,1,-2], [10,12,1,-2], [12,22,5,1], [11,16,5,-1],
+    [12,18,1,-1], [6,17,1,-2], [10,21,5,1], [11,18,1,-1], [6,18,1,-2], [19,12,1,-2], [12,12,1,-2], [11,12,1,-2],
+    [13,16,5], [10,16,5,-2], [10,12,1,-2], [9,12,1,-1], [7,16,1,-2], [12,12,1,-2], [10,12,1,-2], [15,12,1,-2],
+    [12,12,1,-1], [11,16,5,-2], [10,12,1,-1], [12,1,-6,-2], [22,1,-6,-3], [8,5,-12,-6], [8,3,-13,-6], [8,3,-13,-6],
+    [10,39,68,98,127,156,186,215,245,274,303,333,362,391,421,450],
+    [32,61,90,118,147,176,204,233],
+    [482,253]
+  ]
+});
+
+jsMath.Img.AddFont(207,{
+  cmr10: [
+    [16,20,0,-1], [22,21,0,-1], [20,22,1,-1], [20,21,0], [18,20,0,-1], [20,20,0,-1], [19,20,0,-1], [20,21,0,-1],
+    [19,20,0,-1], [20,20,0,-1], [19,21,0,-1], [19,21,0], [16,21,0], [16,21,0], [24,21,0], [24,21,0],
+    [7,13,0,-1], [9,19,6,2], [6,6,-15,-3], [6,6,-15,-6], [8,4,-15,-3], [9,6,-15,-3], [11,2,-16,-2], [6,6,-15,-8],
+    [8,6,6,-3], [14,22,1], [20,14,1,-1], [22,14,1], [13,19,3,-1], [26,20,0], [27,22,1,-2], [20,24,2,-1],
+    [8,4,-8], [4,21,0,-2], [9,10,-11,-1], [22,27,6,-1], [12,24,2,-1], [22,24,2,-1], [20,22,1,-1], [4,9,-11,-2],
+    [8,30,8,-2], [8,30,8,-1], [11,13,-9,-2], [20,20,3,-1], [4,9,6,-2], [8,3,-5], [4,3,0,-2], [12,30,8,-1],
+    [13,21,1,-1], [11,20,0,-2], [12,20,0,-1], [13,21,1,-1], [14,20,0], [12,21,1,-1], [13,21,1,-1], [13,21,1,-1],
+    [13,21,1,-1], [13,21,1,-1], [4,13,0,-2], [4,19,6,-2], [4,22,7,-2], [20,8,-3,-1], [11,21,6,-1], [11,21,0,-1],
+    [20,22,1,-1], [21,21,0], [18,20,0,-1], [19,22,1,-1], [20,20,0,-1], [18,20,0,-1], [17,20,0,-1], [21,22,1,-1],
+    [20,20,0,-1], [10,20,0], [13,21,1,-1], [21,20,0,-1], [16,20,0,-1], [25,20,0,-1], [20,20,0,-1], [20,22,1,-1],
+    [18,20,0,-1], [21,27,6,-1], [21,21,1,-1], [14,22,1,-1], [19,20,0,-1], [20,21,1,-1], [22,21,1], [30,21,1],
+    [21,20,0], [22,20,0], [16,20,0,-1], [5,30,8,-3], [10,9,-11,-4], [5,30,8], [8,5,-15,-3], [4,4,-16,-2],
+    [4,9,-11,-2], [14,14,1,-1], [16,22,1], [11,14,1,-1], [15,22,1,-1], [12,14,1], [10,21,0,-1], [14,20,6],
+    [16,21,0], [7,20,0,-1], [9,26,6,2], [15,21,0], [7,21,0,-1], [24,13,0], [16,13,0], [14,14,1],
+    [16,19,6], [15,19,6,-1], [11,13,0], [10,14,1,-1], [10,19,1], [15,14,1,-1], [15,14,1], [21,14,1],
+    [15,13,0], [15,19,6], [12,13,0], [15,1,-7], [29,1,-7], [10,6,-15,-3], [10,4,-16,-2], [9,4,-16,-3],
+    [12,47,82,118,153,188,223,259,294,329,365,400,435,471,506,541],
+    [37,72,106,140,175,209,243,278],
+    [580,301]
+  ],
+  cmmi10: [
+    [20,20,0,-1], [22,21,0,-1], [21,22,1,-1], [19,21,0,-1], [22,20,0,-1], [25,20,0,-1], [23,20,0,-1], [21,21,0],
+    [19,20,0], [20,20,0], [21,21,0,-2], [17,14,1,-1], [18,27,6], [16,20,7], [13,22,1,-1], [10,14,1,-1],
+    [13,27,6,-1], [15,20,7], [13,22,1,-1], [9,14,1,-1], [15,14,1,-1], [15,22,1,-1], [17,20,7], [15,13,0,-1],
+    [13,27,6], [17,14,1], [15,20,7], [16,14,1,-1], [15,14,1], [16,14,1], [16,26,6,-1], [17,19,6,-1],
+    [19,26,6], [18,14,1], [13,15,1], [17,22,1], [24,14,1], [13,19,6,-2], [12,17,4], [17,20,7,-1],
+    [27,9,-6,-1], [27,9,1,-1], [27,9,-6,-1], [27,9,1,-1], [6,8,-6,-1], [6,8,-6,-1], [14,16,1], [14,16,1],
+    [13,15,1,-1], [11,13,0,-2], [12,14,0,-1], [13,21,7,-1], [14,20,6], [12,20,7,-1], [13,21,1,-1], [13,21,7,-1],
+    [13,21,1,-1], [13,21,7,-1], [4,3,0,-2], [4,9,6,-2], [18,18,2,-2], [12,30,8,-1], [18,17,1,-2], [15,14,0],
+    [16,22,1,-1], [20,21,0,-1], [21,20,0,-1], [21,22,1,-1], [23,20,0,-1], [22,20,0,-1], [21,20,0,-1], [21,22,1,-1],
+    [25,20,0,-1], [14,20,0,-1], [17,21,1,-2], [25,20,0,-1], [18,20,0,-1], [30,20,0,-1], [25,20,0,-1], [21,22,1,-1],
+    [21,20,0,-1], [21,27,6,-1], [21,21,1,-1], [18,22,1,-1], [21,20,0], [20,21,1,-2], [22,21,1,-1], [30,21,1,-1],
+    [29,20,0,4], [21,20,0,-1], [20,20,0,-1], [9,23,1,-1], [7,28,7,-2], [9,28,7,-1], [27,8,-3,-1], [27,8,-3,-1],
+    [12,22,1], [14,14,1,-1], [11,22,1,-1], [12,14,1,-1], [14,22,1,-1], [12,14,1,-1], [15,27,6,-1], [14,19,6],
+    [15,22,1,-1], [9,21,1], [13,26,6,1], [14,22,1,-1], [7,22,1,-1], [25,14,1], [17,14,1], [13,14,1,-1],
+    [16,19,6,1], [12,19,6,-1], [13,14,1], [12,14,1,-1], [10,20,1], [16,14,1], [14,14,1], [20,14,1],
+    [16,14,1], [15,19,6], [13,14,1,-1], [9,14,1], [12,19,6,1], [16,20,7,-2], [13,6,-15,-5], [12,5,-15,-7],
+    [11,46,80,115,149,183,218,252,286,321,355,390,424,458,493,527],
+    [37,72,106,140,175,209,243,278],
+    [565,301]
+  ],
+  cmsy10: [
+    [19,2,-6,-2], [4,4,-5,-2], [15,15,0,-4], [11,13,-1,-2], [20,17,1,-1], [15,15,0], [20,20,0,-1], [20,20,5,-1],
+    [20,20,3,-1], [20,20,3,-1], [20,20,3,-1], [20,20,3,-1], [20,20,3,-1], [27,28,7,-1], [12,12,-1,-1], [12,12,-1,-1],
+    [20,14,0,-1], [20,13,-1,-1], [19,23,4,-2], [19,23,4,-2], [19,23,4,-2], [19,23,4,-2], [19,23,4,-2], [19,23,4,-2],
+    [20,8,-3,-1], [20,13,-1,-1], [19,18,2,-2], [19,18,2,-2], [27,19,2,-1], [27,19,2,-1], [19,18,2,-2], [18,17,1,-2],
+    [27,11,-2,-1], [27,11,-2,-1], [11,26,6,-2], [11,26,6,-2], [27,11,-2,-1], [27,27,6,-1], [27,26,6,-1], [20,13,-1,-1],
+    [27,17,1,-1], [27,17,1,-1], [17,26,6], [17,27,6], [27,17,1,-1], [27,27,6,-1], [27,26,6,-1], [20,14,1,-1],
+    [7,16,-1,-1], [27,14,1,-1], [15,18,2,-2], [15,18,2,-2], [23,21,0,-1], [23,22,7,-1], [15,28,7,-4], [3,12,-1,-1],
+    [17,22,1], [14,21,0,-1], [17,9,-2,-1], [13,26,3,-1], [20,22,1,-1], [19,22,1,-1], [20,20,0,-1], [20,20,0,-1],
+    [15,20,0,-1], [23,23,2], [19,22,1,-1], [16,22,1], [23,20,0], [17,22,1], [24,21,1], [17,25,4,-1],
+    [24,22,2], [20,20,0,1], [24,24,4,-1], [21,22,1,-1], [18,22,1,-1], [33,23,2], [30,25,2,1], [22,22,1,-1],
+    [22,22,2], [20,25,4,-3], [25,21,1], [19,22,1], [23,21,0], [21,21,1,1], [19,22,2,-1], [29,22,2,-1],
+    [23,20,0,-1], [21,24,4], [22,20,0,-1], [17,19,1,-1], [17,19,1,-1], [17,19,1,-1], [17,19,1,-1], [17,19,1,-1],
+    [15,20,0,-1], [16,21,0,-1], [8,30,8,-5], [8,30,8], [8,30,8,-5], [8,30,8], [11,30,8,-2], [11,30,8,-2],
+    [7,30,8,-3], [7,30,8,-1], [2,30,8,-3], [8,30,8,-3], [11,31,8,-2], [17,31,8], [12,30,8,-1], [6,20,3,-1],
+    [23,30,28,-2], [20,20,0,-1], [22,21,1,-1], [13,28,7,-1], [17,18,0,-1], [17,18,0,-1], [19,23,4,-2], [20,23,4,-1],
+    [9,27,6,-2], [11,28,7,-1], [11,27,6,-1], [16,27,6,-1], [22,25,4], [20,26,5,-1], [20,22,1,-1], [20,25,4,-1],
+    [12,53,95,136,177,218,260,301,342,384,425,466,507,549,590,631],
+    [39,98,157,216,274,333,392,451],
+    [676,500]
+  ],
+  cmex10: [
+    [8,36,34,-4], [8,36,34,-1], [7,36,34,-5], [7,36,34], [8,36,34,-5], [8,36,34], [8,36,34,-5], [8,36,34],
+    [11,36,34,-3], [11,36,34,-3], [10,36,34,-2], [9,36,34,-2], [2,19,18,-4], [8,19,18,-4], [14,36,34,-1], [14,36,34,-1],
+    [12,53,51,-5], [11,53,51,-1], [15,71,69,-6], [15,71,69,-1], [8,71,69,-7], [8,71,69], [10,71,69,-7], [10,71,69],
+    [10,71,69,-7], [10,71,69], [15,71,69,-3], [15,71,69,-3], [16,71,69,-3], [16,71,69,-2], [28,71,69,-1], [28,71,69,-1],
+    [16,88,86,-6], [16,88,86,-1], [9,88,86,-8], [9,88,86], [11,88,86,-8], [11,88,86], [11,88,86,-8], [11,88,86],
+    [16,88,86,-4], [16,88,86,-4], [17,88,86,-4], [17,88,86,-3], [35,88,86,-1], [35,88,86,-1], [21,53,51,-1], [21,53,51,-1],
+    [17,54,52,-8], [16,54,52,-1], [11,53,51,-9], [10,53,51], [11,53,51,-9], [10,53,51], [3,18,18,-9], [3,18,18,-7],
+    [10,27,27,-11], [10,27,27,-5], [10,27,26,-11], [10,28,27,-5], [10,54,53,-5], [10,54,53,-11], [4,10,9,-11], [2,18,18,-9],
+    [17,53,51,-8], [16,53,51,-1], [4,19,18,-8], [4,19,18,-13], [13,53,51,-3], [13,53,51,-2], [22,29,29,-1], [30,41,41,-1],
+    [17,33,33,-1], [27,65,65,-1], [30,29,29,-1], [42,41,41,-1], [30,29,29,-1], [42,41,41,-1], [30,29,29,-1], [42,41,41,-1],
+    [28,29,29,-1], [25,29,29,-1], [17,33,33,-1], [22,29,29,-1], [22,29,29,-1], [22,29,29,-1], [22,29,29,-1], [22,29,29,-1],
+    [40,41,41,-1], [35,41,41,-1], [27,65,65,-1], [30,41,41,-1], [30,41,41,-1], [30,41,41,-1], [30,41,41,-1], [30,41,41,-1],
+    [25,29,29,-1], [35,41,41,-1], [17,6,-16], [29,7,-16], [42,7,-16], [16,4,-17], [29,4,-18], [42,4,-18],
+    [8,53,51,-6], [8,53,51], [9,53,51,-6], [9,53,51], [9,53,51,-6], [9,53,51], [13,53,51,-3], [13,53,51,-3],
+    [27,35,34,-3], [27,52,51,-3], [27,70,69,-3], [27,87,86,-3], [19,54,53,-3], [2,19,18,-20], [12,19,17,-20], [9,18,18,-7],
+    [14,18,18,-3], [14,18,18,-3], [15,11,7,1], [15,11,7,1], [15,10,0,1], [15,10,0,1], [20,18,18,-1], [20,18,18,-1],
+    [13,65,117,169,221,273,325,377,428,480,532,584,636,688,740,792],
+    [45,173,300,428,555,683,810,938],
+    [849,1062]
+  ],
+  cmbx10: [
+    [18,20,0,-1], [25,21,0,-1], [23,22,1,-1], [22,21,0,-1], [20,20,0,-1], [24,20,0,-1], [22,20,0,-1], [23,21,0,-1],
+    [22,20,0,-1], [23,20,0,-1], [22,21,0,-1], [22,21,0], [18,21,0], [18,21,0], [27,21,0], [27,21,0],
+    [8,13,0,-1], [10,19,6,2], [7,7,-14,-3], [7,7,-14,-7], [9,4,-15,-4], [11,7,-14,-3], [13,2,-16,-2], [7,6,-15,-9],
+    [10,6,6,-3], [16,22,1,-1], [23,15,1,-1], [24,15,1,-1], [16,19,3], [29,20,0,-1], [31,22,1,-2], [23,24,2,-1],
+    [10,4,-8], [6,21,0,-2], [13,11,-10,-1], [25,27,6,-1], [14,24,2,-1], [25,24,2,-1], [24,22,1,-1], [6,11,-10,-2],
+    [8,30,8,-3], [9,30,8,-1], [13,14,-8,-2], [23,23,4,-1], [6,11,6,-2], [10,3,-5], [5,5,0,-2], [14,30,8,-1],
+    [15,20,1,-1], [13,19,0,-2], [14,19,0,-1], [15,20,1,-1], [16,19,0], [14,20,1,-1], [15,20,1,-1], [16,21,1,-1],
+    [15,20,1,-1], [15,20,1,-1], [5,13,0,-2], [5,19,6,-2], [6,21,6,-2], [23,9,-3,-1], [13,21,6,-1], [13,21,0,-1],
+    [23,22,1,-1], [23,21,0,-1], [21,20,0,-1], [22,22,1,-1], [23,20,0,-1], [20,20,0,-1], [19,20,0,-1], [24,22,1,-1],
+    [24,20,0,-1], [11,20,0,-1], [16,21,1], [24,20,0,-1], [18,20,0,-1], [30,20,0,-1], [24,20,0,-1], [23,22,1,-1],
+    [20,20,0,-1], [23,27,6,-1], [24,21,1,-1], [16,22,1,-1], [21,20,0,-1], [24,21,1,-1], [25,21,1], [34,21,1],
+    [24,20,0,-1], [25,20,0], [18,20,0,-1], [6,30,8,-3], [13,10,-10,-4], [6,30,8], [10,5,-15,-3], [5,6,-15,-2],
+    [6,10,-10,-1], [16,15,1,-1], [17,22,1,-1], [13,15,1,-1], [17,22,1,-1], [15,15,1], [12,21,0,-1], [16,20,6,-1],
+    [17,21,0,-1], [8,21,0,-1], [10,27,6,2], [16,21,0,-1], [8,21,0,-1], [27,13,0,-1], [17,13,0,-1], [16,15,1],
+    [17,19,6,-1], [17,19,6,-1], [12,13,0,-1], [11,15,1,-1], [12,20,1], [17,14,1,-1], [17,14,1], [24,14,1],
+    [17,13,0], [17,19,6], [13,13,0,-1], [17,2,-7], [34,2,-7], [11,6,-15,-4], [11,4,-17,-3], [11,5,-16,-3],
+    [12,53,94,135,175,216,257,298,339,380,421,462,502,543,584,625],
+    [37,72,106,140,175,209,243,278],
+    [670,301]
+  ],
+  cmti10: [
+    [20,20,0,-1], [20,21,0,-2], [19,22,1,-4], [18,21,0,-1], [20,20,0,-2], [24,20,0,-1], [21,20,0,-2], [19,21,0,-6],
+    [18,20,0,-4], [18,20,0,-6], [20,21,0,-2], [23,27,6,1], [19,27,6,1], [20,27,6,1], [28,27,6,1], [29,27,6,1],
+    [8,14,1,-2], [11,19,6,1], [5,7,-14,-8], [6,7,-14,-10], [8,5,-14,-8], [9,5,-15,-8], [11,2,-16,-6], [7,6,-15,-13],
+    [7,6,6,-3], [18,27,6,1], [19,14,1,-2], [18,14,1,-3], [14,19,3,-2], [27,20,0,-1], [27,22,1,-4], [21,24,2,-3],
+    [8,4,-8,-2], [8,21,0,-3], [10,10,-11,-5], [21,27,6,-3], [19,22,1,-2], [21,24,2,-4], [21,22,1,-3], [5,10,-11,-6],
+    [11,30,8,-4], [12,30,8], [12,13,-9,-5], [18,18,2,-4], [5,9,6,-2], [8,2,-5,-2], [4,3,0,-3], [18,30,8],
+    [14,21,1,-3], [11,20,0,-3], [14,21,1,-2], [15,21,1,-2], [13,26,6,-1], [14,21,1,-3], [14,21,1,-3], [14,21,1,-4],
+    [14,21,1,-2], [13,21,1,-3], [6,13,0,-3], [7,19,6,-2], [9,22,7,-1], [20,8,-3,-3], [11,22,7,-2], [11,21,0,-5],
+    [19,22,1,-4], [19,21,0,-1], [20,20,0,-2], [20,22,1,-4], [22,20,0,-1], [21,20,0,-1], [21,20,0,-1], [20,22,1,-4],
+    [24,20,0,-1], [14,20,0,-1], [16,21,1,-2], [24,20,0,-1], [17,20,0,-1], [27,20,0,-2], [24,20,0,-1], [19,22,1,-4],
+    [21,20,0,-1], [19,27,6,-4], [20,21,1,-1], [17,22,1,-2], [19,20,0,-5], [20,21,1,-5], [20,21,1,-6], [27,21,1,-6],
+    [28,20,0,4], [21,20,0,-5], [19,20,0,-2], [11,30,8,-2], [10,9,-11,-8], [12,30,8,1], [8,5,-15,-7], [4,4,-16,-7],
+    [5,9,-11,-6], [13,14,1,-3], [11,22,1,-3], [11,14,1,-3], [14,22,1,-3], [11,14,1,-3], [15,27,6,1], [14,19,6,-1],
+    [14,22,1,-2], [8,20,1,-2], [12,25,6,1], [13,22,1,-2], [7,22,1,-2], [23,14,1,-2], [15,14,1,-2], [12,14,1,-3],
+    [15,19,6], [12,19,6,-3], [13,14,1,-2], [11,14,1,-2], [9,20,1,-2], [15,14,1,-2], [13,14,1,-2], [19,14,1,-2],
+    [14,14,1,-1], [13,19,6,-2], [12,14,1,-2], [14,1,-7,-2], [27,1,-7,-3], [10,7,-14,-7], [10,4,-16,-7], [9,4,-16,-7],
+    [12,47,82,117,152,187,222,257,293,328,363,398,433,468,503,539],
+    [37,72,106,140,175,209,243,278],
+    [577,301]
+  ]
+});
+
+jsMath.Img.AddFont(249,{
+  cmr10: [
+    [19,24,0,-1], [26,25,0,-1], [24,25,1,-1], [22,25,0,-1], [21,23,0,-1], [24,24,0,-1], [21,24,0,-2], [23,24,0,-2],
+    [22,24,0,-1], [23,24,0,-2], [22,24,0,-1], [21,24,0,-1], [17,24,0,-1], [17,24,0,-1], [27,24,0,-1], [27,24,0,-1],
+    [8,15,0,-1], [10,22,7,2], [7,7,-17,-3], [7,7,-17,-7], [9,5,-17,-4], [11,7,-17,-3], [13,2,-19,-2], [7,7,-18,-9],
+    [9,7,7,-4], [15,25,1,-1], [23,17,1,-1], [25,17,1,-1], [15,22,4,-1], [29,24,0,-1], [32,25,1,-2], [24,27,2,-1],
+    [8,5,-9,-1], [4,25,0,-3], [11,11,-13,-1], [25,31,7,-2], [14,28,2,-1], [26,28,2,-1], [24,26,1,-1], [4,11,-13,-3],
+    [9,35,9,-3], [8,35,9,-2], [13,16,-10,-2], [23,23,3,-2], [4,11,7,-3], [10,3,-6], [4,4,0,-3], [13,35,9,-2],
+    [15,24,1,-1], [12,23,0,-3], [15,23,0,-1], [15,24,1,-1], [15,23,0,-1], [15,24,1,-1], [15,24,1,-1], [15,24,1,-2],
+    [15,24,1,-1], [15,24,1,-1], [4,15,0,-3], [4,22,7,-3], [4,25,8,-3], [23,9,-4,-2], [14,24,7,-1], [14,24,0,-1],
+    [24,25,1,-1], [24,25,0,-1], [22,24,0,-1], [22,25,1,-1], [23,24,0,-1], [22,24,0,-1], [20,24,0,-1], [24,25,1,-1],
+    [24,24,0,-1], [11,24,0,-1], [15,25,1,-1], [24,24,0,-1], [19,24,0,-1], [29,24,0,-1], [24,24,0,-1], [24,25,1,-1],
+    [21,24,0,-1], [24,31,7,-1], [24,25,1,-1], [16,25,1,-1], [23,23,0,-1], [24,25,1,-1], [25,25,1], [35,25,1],
+    [25,24,0], [26,24,0], [18,24,0,-1], [5,35,9,-4], [11,11,-13,-5], [6,35,9], [9,6,-18,-4], [4,4,-19,-3],
+    [5,11,-13,-2], [16,17,1,-1], [17,25,1,-1], [13,17,1,-1], [17,25,1,-1], [14,17,1,-1], [12,24,0,-1], [16,23,7,-1],
+    [18,24,0,-1], [8,23,0,-1], [10,30,7,2], [17,24,0,-1], [8,24,0,-1], [27,15,0,-1], [18,15,0,-1], [15,17,1,-1],
+    [17,22,7,-1], [17,22,7,-1], [12,15,0,-1], [12,17,1,-1], [12,22,1], [18,16,1,-1], [18,16,1], [24,16,1],
+    [18,15,0], [18,22,7], [13,15,0,-1], [17,2,-8], [34,2,-8], [11,7,-17,-4], [11,4,-19,-3], [11,4,-19,-3],
+    [14,56,99,141,184,226,269,311,354,396,439,481,524,566,609,651],
+    [46,87,128,170,211,253,294,335],
+    [698,363]
+  ],
+  cmmi10: [
+    [24,24,0,-1], [26,25,0,-1], [25,25,1,-1], [22,25,0,-1], [26,23,0,-1], [29,24,0,-1], [26,24,0,-2], [23,24,0,-1],
+    [22,24,0], [23,24,0,-1], [25,24,0,-2], [20,16,1,-1], [20,31,7], [19,23,8], [15,26,1,-1], [12,16,1,-1],
+    [15,31,7,-1], [16,23,8,-1], [15,25,1,-1], [10,16,1,-1], [18,16,1,-1], [18,25,1,-1], [19,23,8,-1], [17,15,0,-1],
+    [16,31,7], [19,16,1,-1], [16,23,8,-1], [19,16,1,-1], [17,16,1,-1], [17,16,1,-1], [19,31,7,-1], [20,22,7,-1],
+    [21,31,7,-1], [21,16,1], [15,17,1], [18,25,1,-1], [27,16,1,-1], [15,22,7,-2], [13,19,4,-1], [20,23,8,-1],
+    [31,11,-7,-1], [31,11,1,-1], [31,11,-7,-1], [31,11,1,-1], [7,9,-7,-1], [7,9,-7,-1], [16,19,1], [16,19,1,-1],
+    [15,17,1,-1], [12,16,0,-3], [15,16,0,-1], [15,24,8,-1], [15,23,7,-1], [15,24,8,-1], [15,24,1,-1], [16,24,8,-1],
+    [15,24,1,-1], [15,24,8,-1], [4,4,0,-3], [4,11,7,-3], [22,21,2,-2], [13,35,9,-2], [22,21,2,-2], [17,17,0],
+    [19,26,1,-1], [24,25,0,-1], [25,24,0,-1], [25,25,1,-1], [27,24,0,-1], [25,24,0,-1], [25,24,0,-1], [25,25,1,-1],
+    [29,24,0,-1], [16,24,0,-1], [20,25,1,-2], [30,24,0,-1], [21,24,0,-1], [35,24,0,-1], [29,24,0,-1], [25,25,1,-1],
+    [25,24,0,-1], [25,31,7,-1], [25,25,1,-1], [21,25,1,-1], [24,23,0], [24,25,1,-2], [25,25,1,-2], [35,25,1,-1],
+    [28,24,0,-1], [25,24,0,-1], [23,24,0,-2], [11,27,1,-1], [9,33,8,-2], [11,33,8,-1], [30,9,-4,-2], [30,9,-4,-2],
+    [14,25,1], [16,16,1,-1], [14,25,1,-1], [14,16,1,-1], [17,25,1,-1], [14,16,1,-1], [18,31,7,-1], [17,22,7],
+    [18,25,1,-1], [9,24,1,-1], [15,30,7,1], [17,25,1,-1], [8,25,1,-1], [28,16,1,-1], [19,16,1,-1], [15,16,1,-1],
+    [18,22,7,1], [15,22,7,-1], [14,16,1,-1], [14,16,1,-1], [12,23,1], [18,16,1,-1], [15,16,1,-1], [23,16,1,-1],
+    [17,16,1,-1], [16,22,7,-1], [15,16,1,-1], [9,16,1,-1], [14,22,7,1], [19,24,8,-2], [16,8,-17,-6], [13,5,-18,-9],
+    [14,55,96,138,179,221,262,303,345,386,427,469,510,551,593,634],
+    [46,87,128,170,211,253,294,335],
+    [679,363]
+  ],
+  cmsy10: [
+    [22,3,-7,-2], [4,5,-6,-3], [17,17,0,-5], [13,15,-1,-2], [23,19,1,-2], [17,17,0], [23,23,0,-2], [23,23,6,-2],
+    [24,23,3,-1], [24,23,3,-1], [24,23,3,-1], [24,23,3,-1], [24,23,3,-1], [31,33,8,-1], [14,15,-1,-1], [14,15,-1,-1],
+    [23,17,0,-2], [23,15,-1,-2], [22,27,5,-2], [22,27,5,-2], [22,27,5,-2], [22,27,5,-2], [22,27,5,-2], [22,27,5,-2],
+    [24,9,-4,-1], [23,16,-1,-2], [22,21,2,-2], [22,21,2,-2], [30,23,3,-2], [30,23,3,-2], [22,21,2,-2], [22,21,2,-2],
+    [30,13,-2,-2], [30,13,-2,-2], [13,31,7,-2], [13,31,7,-2], [30,13,-2,-2], [31,31,7,-2], [31,31,7,-2], [24,15,-1,-1],
+    [30,19,1,-2], [30,19,1,-2], [19,31,7,-1], [19,31,7,-1], [32,19,1,-1], [31,31,7,-1], [31,31,7,-1], [24,16,1,-1],
+    [8,18,-1,-1], [31,16,1,-1], [18,21,2,-2], [18,21,2,-2], [27,25,0,-2], [27,25,8,-2], [18,33,8,-4], [4,13,-2,-1],
+    [19,25,1], [15,24,0,-2], [19,10,-3,-2], [15,30,3,-1], [24,26,1,-1], [23,25,1,-1], [23,23,0,-2], [23,23,0,-2],
+    [18,24,0,-1], [26,27,2,-1], [22,25,1,-1], [19,25,1], [26,24,0], [19,25,1,-1], [29,26,2], [20,28,4,-1],
+    [28,26,2], [23,24,0,1], [28,28,4,-1], [24,25,1,-1], [22,25,1,-1], [37,26,2,-1], [35,29,2,1], [25,25,1,-2],
+    [25,26,2], [24,29,5,-3], [29,25,1], [22,25,1], [26,25,0,-1], [25,25,1,1], [22,26,2,-1], [35,26,2,-1],
+    [27,24,0,-1], [24,29,5,-1], [25,24,0,-1], [20,22,1,-1], [20,22,1,-1], [20,22,1,-1], [19,22,1,-2], [19,22,1,-2],
+    [18,24,0,-1], [17,24,0,-2], [10,35,9,-5], [10,35,9], [10,35,9,-5], [10,35,9], [13,35,9,-2], [13,35,9,-2],
+    [9,35,9,-3], [8,35,9,-2], [2,35,9,-4], [9,35,9,-4], [13,37,10,-2], [19,37,10,-1], [13,35,9,-2], [7,23,3,-1],
+    [27,35,33,-2], [24,24,0,-1], [26,26,2,-1], [15,33,8,-1], [19,21,0,-2], [19,21,0,-2], [22,27,5,-3], [22,27,5,-2],
+    [11,31,7,-2], [12,32,8,-2], [12,31,7,-2], [19,31,7,-1], [25,30,5,-1], [23,31,6,-2], [24,27,2,-1], [24,30,5,-1],
+    [14,64,114,163,213,263,312,362,412,461,511,561,610,660,710,759],
+    [48,119,190,260,331,402,472,543],
+    [814,603]
+  ],
+  cmex10: [
+    [9,42,40,-5], [10,42,40,-1], [8,42,40,-6], [8,42,40], [10,42,40,-6], [10,42,40], [10,42,40,-6], [10,42,40],
+    [12,42,40,-4], [12,42,40,-4], [11,42,40,-3], [11,42,40,-2], [3,22,21,-4], [10,22,21,-4], [16,42,40,-2], [16,42,40,-2],
+    [13,62,60,-6], [14,62,60,-1], [17,83,81,-7], [17,83,81,-1], [10,83,81,-8], [10,83,81], [12,83,81,-8], [12,83,81],
+    [12,83,81,-8], [12,83,81], [17,83,81,-4], [17,83,81,-4], [19,83,81,-4], [19,83,81,-3], [32,83,81,-2], [32,83,81,-2],
+    [18,103,101,-8], [18,103,101,-1], [11,103,101,-9], [11,103,101], [13,103,101,-9], [13,103,101], [13,103,101,-9], [13,103,101],
+    [19,103,101,-4], [19,103,101,-4], [20,103,101,-4], [20,103,101,-3], [40,103,101,-2], [40,103,101,-2], [24,62,60,-2], [24,62,60,-2],
+    [20,63,61,-9], [19,63,61,-1], [12,62,60,-11], [12,62,60], [12,62,60,-11], [12,62,60], [3,21,21,-11], [3,21,21,-9],
+    [12,31,31,-13], [13,31,31,-5], [12,32,31,-13], [13,32,31,-5], [13,63,62,-5], [12,63,62,-13], [5,12,11,-13], [3,21,21,-10],
+    [20,62,60,-9], [19,62,60,-1], [5,22,21,-9], [4,22,21,-16], [15,62,60,-3], [14,62,60,-3], [26,34,34,-1], [35,48,48,-1],
+    [19,38,38,-2], [31,76,76,-1], [35,34,34,-1], [49,48,48,-1], [35,34,34,-1], [49,48,48,-1], [35,34,34,-1], [49,48,48,-1],
+    [33,34,34,-1], [30,34,34,-1], [19,38,38,-2], [26,34,34,-1], [26,34,34,-1], [26,34,34,-1], [25,34,34,-2], [25,34,34,-2],
+    [46,48,48,-1], [41,48,48,-1], [31,76,76,-1], [35,48,48,-1], [35,48,48,-1], [35,48,48,-1], [34,48,48,-2], [35,48,48,-1],
+    [30,34,34,-1], [41,48,48,-1], [19,7,-19], [34,8,-19], [49,8,-19], [19,5,-20], [34,5,-21], [49,5,-21],
+    [9,62,60,-7], [9,62,60], [11,62,60,-7], [11,62,60], [11,62,60,-7], [11,62,60], [15,62,60,-4], [15,62,60,-4],
+    [32,42,40,-3], [32,62,60,-3], [32,83,81,-3], [32,103,101,-3], [23,63,62,-3], [3,22,21,-23], [14,22,20,-23], [10,21,21,-8],
+    [16,21,21,-3], [16,21,21,-3], [17,13,8,1], [18,13,8,1], [17,12,0,1], [18,12,0,1], [24,21,21,-1], [24,21,21,-1],
+    [16,78,141,203,265,328,390,453,515,578,640,703,765,828,890,953],
+    [55,209,362,515,669,822,976,1129],
+    [1021,1278]
+  ],
+  cmbx10: [
+    [21,24,0,-1], [29,24,0,-2], [27,25,1,-2], [25,24,0,-1], [24,23,0,-1], [29,24,0,-1], [24,24,0,-2], [27,24,0,-2],
+    [24,24,0,-2], [27,24,0,-2], [26,24,0,-1], [25,24,0,-1], [20,24,0,-1], [20,24,0,-1], [31,24,0,-1], [31,24,0,-1],
+    [9,16,0,-1], [12,23,7,2], [8,7,-17,-4], [8,7,-17,-8], [11,6,-17,-4], [13,7,-17,-3], [15,3,-18,-2], [9,6,-18,-10],
+    [11,7,7,-4], [19,25,1,-1], [27,17,1,-1], [29,17,1,-1], [18,23,4,-1], [34,24,0,-1], [37,25,1,-2], [27,28,2,-2],
+    [11,5,-9], [6,24,0,-3], [15,13,-11,-1], [29,31,7,-2], [16,28,2,-2], [29,28,2,-2], [28,25,1,-1], [7,13,-11,-2],
+    [10,35,9,-3], [10,35,9,-2], [15,16,-10,-2], [27,27,5,-2], [7,13,7,-2], [11,5,-5], [6,6,0,-2], [16,35,9,-2],
+    [17,24,1,-1], [15,23,0,-2], [17,23,0,-1], [17,24,1,-1], [18,23,0,-1], [16,24,1,-2], [17,24,1,-1], [17,24,1,-2],
+    [17,24,1,-1], [17,24,1,-1], [6,16,0,-2], [7,23,7,-2], [6,24,7,-3], [27,11,-3,-2], [15,24,7,-2], [15,24,0,-2],
+    [27,25,1,-2], [28,24,0,-1], [25,24,0,-1], [24,25,1,-2], [27,24,0,-1], [24,24,0,-1], [22,24,0,-1], [27,25,1,-2],
+    [29,24,0,-1], [13,24,0,-1], [18,25,1], [28,24,0,-1], [21,24,0,-1], [35,24,0,-1], [29,24,0,-1], [26,25,1,-2],
+    [24,24,0,-1], [26,31,7,-2], [29,25,1,-1], [18,25,1,-2], [25,23,0,-1], [28,25,1,-1], [29,25,1], [40,25,1],
+    [28,24,0,-1], [29,24,0], [20,24,0,-2], [6,35,9,-4], [16,13,-11,-4], [7,35,9], [11,6,-18,-4], [6,6,-18,-2],
+    [6,13,-11,-2], [18,17,1,-1], [20,25,1,-1], [16,17,1,-1], [20,25,1,-1], [16,17,1,-1], [14,24,0,-1], [18,23,7,-1],
+    [20,24,0,-1], [9,24,0,-1], [12,31,7,2], [19,24,0,-1], [9,24,0,-1], [31,16,0,-1], [20,16,0,-1], [18,17,1,-1],
+    [20,23,7,-1], [20,23,7,-1], [14,16,0,-1], [14,17,1,-1], [13,23,1], [20,17,1,-1], [20,17,1], [28,17,1],
+    [20,16,0], [20,23,7], [15,16,0,-1], [20,2,-8], [39,2,-8], [13,8,-17,-4], [14,4,-20,-3], [13,6,-18,-3],
+    [14,64,113,162,211,260,309,359,408,457,506,555,604,653,703,752],
+    [46,87,128,170,211,253,294,335],
+    [806,363]
+  ],
+  cmti10: [
+    [22,24,0,-2], [24,25,0,-2], [22,25,1,-5], [20,25,0,-2], [24,23,0,-2], [27,24,0,-2], [25,24,0,-2], [22,24,0,-7],
+    [20,24,0,-5], [21,24,0,-7], [23,24,0,-3], [27,31,7,1], [22,31,7,1], [23,31,7,1], [33,31,7,1], [33,31,7,1],
+    [10,16,1,-2], [13,22,7,2], [6,7,-17,-9], [8,7,-17,-11], [10,5,-17,-9], [11,7,-17,-9], [12,1,-19,-8], [7,7,-18,-16],
+    [9,7,7,-3], [21,31,7,1], [22,16,1,-3], [22,16,1,-3], [17,23,4,-2], [31,24,0,-2], [31,25,1,-5], [24,28,2,-4],
+    [9,5,-9,-3], [10,25,0,-3], [12,11,-13,-6], [25,31,7,-4], [21,25,1,-3], [24,28,2,-5], [24,26,1,-4], [6,11,-13,-7],
+    [13,35,9,-5], [13,35,9], [14,16,-10,-6], [22,21,2,-4], [6,11,7,-2], [9,3,-6,-3], [5,4,0,-3], [21,35,9],
+    [15,24,1,-4], [12,23,0,-4], [17,24,1,-2], [17,24,1,-3], [15,30,7,-1], [17,24,1,-3], [16,24,1,-4], [17,24,1,-5],
+    [16,24,1,-3], [16,24,1,-3], [8,15,0,-3], [9,22,7,-2], [9,25,8,-2], [23,9,-4,-4], [13,25,8,-2], [13,25,0,-6],
+    [22,25,1,-5], [22,25,0,-2], [23,24,0,-2], [23,25,1,-5], [25,24,0,-2], [24,24,0,-2], [23,24,0,-2], [23,25,1,-5],
+    [27,24,0,-2], [15,24,0,-2], [19,25,1,-3], [28,24,0,-2], [20,24,0,-2], [32,24,0,-2], [27,24,0,-2], [22,25,1,-5],
+    [23,24,0,-2], [22,31,7,-5], [23,25,1,-2], [20,25,1,-2], [22,23,0,-6], [23,25,1,-6], [23,25,1,-7], [31,25,1,-7],
+    [33,24,0,5], [24,24,0,-6], [22,24,0,-2], [13,35,9,-2], [12,11,-13,-9], [14,35,9,1], [9,6,-18,-9], [5,4,-19,-8],
+    [6,11,-13,-7], [16,16,1,-3], [13,25,1,-3], [13,16,1,-3], [16,25,1,-3], [13,16,1,-3], [17,31,7,1], [16,22,7,-1],
+    [17,25,1,-2], [10,24,-294,-2], [15,30,7,2], [15,25,1,-2], [8,25,1,-3], [27,16,1,-2], [18,16,1,-2], [15,16,1,-3],
+    [18,22,7], [14,22,7,-3], [15,16,1,-2], [13,16,1,-2], [10,23,1,-3], [17,16,1,-2], [15,16,1,-2], [22,16,1,-2],
+    [17,16,1,-1], [16,22,7,-2], [14,16,1,-2], [16,2,-8,-3], [32,2,-8,-4], [11,7,-17,-9], [12,4,-19,-8], [10,4,-19,-9],
+    [14,56,98,141,183,225,267,310,352,394,437,479,521,563,606,648],
+    [46,87,128,170,211,253,294,335],
+    [694,363]
+  ]
+});
+
+jsMath.Img.AddFont(298,{
+  cmr10: [
+    [23,28,0,-1], [31,30,0,-2], [28,30,1,-2], [27,30,0,-1], [25,28,0,-1], [29,28,0,-1], [26,28,0,-2], [28,29,0,-2],
+    [26,28,0,-2], [28,28,0,-2], [27,29,0,-1], [25,29,0,-1], [21,29,0,-1], [21,29,0,-1], [32,29,0,-1], [32,29,0,-1],
+    [10,19,0,-1], [11,28,9,2], [8,8,-21,-4], [8,8,-21,-8], [11,5,-21,-5], [13,8,-21,-4], [16,3,-22,-2], [9,8,-22,-11],
+    [10,9,9,-5], [19,30,1,-1], [28,20,1,-1], [30,20,1,-1], [18,26,4,-1], [35,28,0,-1], [39,30,1,-2], [28,34,3,-2],
+    [10,5,-11,-1], [5,30,0,-3], [14,13,-16,-1], [30,37,8,-2], [17,34,3,-2], [30,34,3,-2], [29,31,1,-1], [6,13,-16,-3],
+    [10,42,11,-4], [10,42,11,-2], [16,18,-13,-2], [28,28,4,-2], [6,13,8,-3], [12,3,-7], [5,5,0,-3], [17,42,11,-2],
+    [18,29,1,-1], [15,28,0,-3], [17,28,0,-2], [18,29,1,-1], [19,28,0,-1], [17,29,1,-2], [18,29,1,-1], [18,29,1,-2],
+    [18,29,1,-1], [18,29,1,-1], [5,18,0,-3], [5,26,8,-3], [5,30,9,-3], [28,10,-5,-2], [15,30,9,-2], [15,29,0,-2],
+    [28,30,1,-2], [29,30,0,-1], [26,28,0,-1], [26,30,1,-2], [28,28,0,-1], [26,28,0,-1], [24,28,0,-1], [29,30,1,-2],
+    [29,28,0,-1], [13,28,0,-1], [19,29,1,-1], [30,28,0,-1], [23,28,0,-1], [35,28,0,-1], [29,28,0,-1], [28,30,1,-2],
+    [25,28,0,-1], [28,37,8,-2], [29,29,1,-1], [19,30,1,-2], [27,28,0,-1], [29,29,1,-1], [30,29,1], [42,29,1],
+    [29,28,0,-1], [31,28,0], [21,28,0,-2], [7,42,11,-4], [14,13,-16,-6], [7,42,11], [11,7,-22,-5], [5,5,-23,-3],
+    [5,13,-16,-3], [20,20,1,-1], [21,30,1,-1], [16,20,1,-1], [21,30,1,-1], [16,20,1,-1], [14,29,0,-1], [19,28,9,-1],
+    [21,29,0,-1], [10,28,0,-1], [11,37,9,2], [20,29,0,-1], [10,29,0,-1], [33,19,0,-1], [21,19,0,-1], [19,20,1,-1],
+    [21,27,8,-1], [21,27,8,-1], [14,19,0,-1], [14,20,1,-1], [14,27,1], [21,20,1,-1], [21,19,1], [29,19,1],
+    [22,18,0], [21,27,9], [16,18,0,-1], [21,2,-10], [41,2,-10], [13,8,-21,-5], [14,5,-23,-3], [13,5,-23,-4],
+    [17,67,118,169,220,271,322,373,423,474,525,576,627,678,729,780],
+    [55,104,154,203,253,302,352,401],
+    [835,434]
+  ],
+  cmmi10: [
+    [29,28,0,-1], [31,30,0,-2], [29,30,1,-2], [27,30,0,-1], [30,28,0,-2], [35,28,0,-1], [31,28,0,-2], [28,29,0,-1],
+    [26,28,0,-1], [28,28,0,-1], [30,29,0,-3], [24,20,1,-1], [24,37,8,-1], [23,28,9], [18,31,1,-1], [15,19,1,-1],
+    [19,38,9,-1], [20,28,9,-1], [18,30,1,-1], [12,20,1,-2], [21,20,1,-2], [21,30,1,-2], [23,27,9,-1], [20,19,0,-2],
+    [18,38,9,-1], [23,19,1,-1], [20,28,9,-1], [23,19,1,-1], [20,19,1,-1], [21,20,1,-1], [22,38,9,-2], [24,28,9,-1],
+    [25,38,9,-1], [25,19,1], [17,20,1,-1], [22,30,1,-1], [33,19,1,-1], [18,27,8,-3], [16,24,5,-1], [24,28,9,-2],
+    [37,12,-9,-2], [37,13,1,-2], [37,12,-9,-2], [37,13,1,-2], [7,10,-9,-2], [8,10,-9,-2], [19,22,1,-1], [19,22,1,-1],
+    [18,20,1,-1], [15,19,0,-3], [18,19,0,-1], [18,28,9,-1], [19,27,8,-1], [17,28,9,-2], [18,29,1,-1], [18,28,9,-2],
+    [18,29,1,-1], [18,28,9,-1], [5,5,0,-3], [6,13,8,-3], [26,25,2,-3], [17,42,11,-2], [26,25,2,-3], [21,20,0],
+    [23,31,1,-1], [29,30,0,-1], [30,28,0,-1], [30,30,1,-2], [32,28,0,-1], [31,28,0,-1], [30,28,0,-1], [30,30,1,-2],
+    [36,28,0,-1], [20,28,0,-1], [24,29,1,-2], [36,28,0,-1], [26,28,0,-1], [42,28,0,-1], [36,28,0,-1], [29,30,1,-2],
+    [30,28,0,-1], [29,37,8,-2], [30,29,1,-1], [25,30,1,-2], [28,28,0,-1], [30,29,1,-2], [30,29,1,-2], [41,29,1,-2],
+    [34,28,0,-1], [31,28,0,-1], [28,28,0,-2], [12,32,1,-2], [10,39,9,-3], [12,39,9,-2], [37,11,-5,-2], [37,11,-5,-2],
+    [17,30,1], [20,20,1,-1], [16,30,1,-1], [17,20,1,-1], [20,30,1,-1], [17,20,1,-1], [21,38,9,-2], [20,28,9],
+    [21,30,1,-2], [11,28,1,-1], [18,36,9,1], [19,30,1,-2], [10,30,1,-1], [34,20,1,-1], [23,20,1,-1], [19,20,1,-1],
+    [23,27,8,2], [18,27,8,-1], [17,20,1,-1], [16,20,1,-2], [13,27,1,-1], [22,20,1,-1], [19,20,1,-1], [28,20,1,-1],
+    [21,20,1,-1], [20,28,9,-1], [18,20,1,-1], [11,20,1,-1], [16,28,9,1], [23,28,9,-3], [19,9,-21,-7], [17,6,-22,-10],
+    [16,66,115,165,214,264,313,363,412,462,511,561,610,660,709,759],
+    [55,104,154,203,253,302,352,401],
+    [813,434]
+  ],
+  cmsy10: [
+    [26,3,-9,-3], [5,5,-8,-3], [20,20,0,-6], [16,18,-1,-2], [28,24,2,-2], [20,20,0], [28,28,0,-2], [28,28,7,-2],
+    [28,28,4,-2], [28,28,4,-2], [28,28,4,-2], [28,28,4,-2], [28,28,4,-2], [37,39,9,-2], [17,17,-2,-2], [17,17,-2,-2],
+    [28,20,0,-2], [28,18,-1,-2], [26,33,6,-3], [26,33,6,-3], [26,32,6,-3], [26,32,6,-3], [26,32,6,-3], [26,32,6,-3],
+    [28,10,-5,-2], [28,18,-2,-2], [26,25,2,-3], [26,25,2,-3], [37,27,3,-2], [37,27,3,-2], [26,24,2,-3], [26,24,2,-3],
+    [37,15,-3,-2], [37,15,-3,-2], [15,37,8,-3], [15,37,8,-3], [37,15,-3,-2], [37,37,8,-2], [37,37,8,-2], [28,18,-1,-2],
+    [37,23,1,-2], [37,23,1,-2], [23,37,8,-1], [23,37,8,-1], [39,23,1,-1], [37,37,8,-2], [37,37,8,-2], [28,20,1,-2],
+    [10,22,-1,-1], [37,20,1,-2], [21,25,2,-3], [21,25,2,-3], [32,30,0,-2], [32,30,9,-2], [22,39,9,-5], [3,16,-2,-2],
+    [23,30,1], [19,29,0,-2], [23,12,-3,-2], [18,36,4,-1], [28,31,1,-2], [27,30,1,-2], [28,28,0,-2], [28,28,0,-2],
+    [21,29,0,-2], [32,32,2,-1], [27,30,1,-1], [22,30,1], [32,28,0], [23,30,1,-1], [34,30,2], [24,34,5,-1],
+    [34,30,2], [27,28,0,1], [34,33,5,-1], [29,30,1,-1], [26,30,1,-1], [45,31,2,-1], [42,34,2,2], [30,30,1,-2],
+    [30,30,2], [29,35,6,-4], [35,29,1], [27,30,1], [32,30,0,-1], [30,30,2,1], [26,30,2,-1], [42,30,2,-1],
+    [32,28,0,-2], [29,34,6,-1], [31,28,0,-1], [23,26,1,-2], [23,26,1,-2], [23,26,1,-2], [23,26,1,-2], [23,26,1,-2],
+    [21,29,0,-2], [21,29,0,-2], [11,42,11,-7], [11,42,11], [11,42,11,-7], [10,42,11,-1], [15,42,11,-3], [15,42,11,-3],
+    [10,42,11,-4], [10,42,11,-2], [3,42,11,-4], [10,42,11,-5], [15,44,12,-3], [23,44,12,-1], [17,42,11,-2], [7,28,4,-2],
+    [32,42,40,-3], [29,28,0,-1], [31,30,2,-2], [18,39,9,-2], [23,25,0,-2], [23,25,0,-2], [27,33,6,-3], [27,33,6,-2],
+    [14,38,9,-2], [14,38,9,-2], [14,38,9,-2], [22,37,8,-2], [30,36,6,-1], [28,37,7,-2], [28,32,2,-2], [28,36,6,-2],
+    [17,77,136,196,255,314,374,433,493,552,612,671,730,790,849,909],
+    [58,142,227,311,396,481,565,650],
+    [974,721]
+  ],
+  cmex10: [
+    [11,50,48,-6], [12,50,48,-1], [9,50,48,-8], [9,50,48], [11,50,48,-8], [11,50,48], [11,50,48,-8], [11,50,48],
+    [16,50,48,-4], [16,50,48,-4], [12,50,48,-4], [13,50,48,-3], [3,27,26,-5], [12,27,26,-5], [20,50,48,-2], [20,50,48,-2],
+    [16,75,73,-7], [17,75,73,-1], [21,99,97,-8], [21,99,97,-1], [11,99,97,-10], [12,99,97], [14,99,97,-10], [14,99,97],
+    [14,99,97,-10], [14,99,97], [21,99,97,-5], [21,99,97,-5], [22,99,97,-5], [22,99,97,-4], [39,99,97,-2], [39,99,97,-2],
+    [22,124,122,-9], [22,124,122,-1], [13,124,122,-11], [13,124,122], [15,124,122,-11], [15,124,122], [15,124,122,-11], [15,124,122],
+    [23,124,122,-5], [23,124,122,-5], [24,124,122,-5], [24,124,122,-4], [48,124,122,-2], [48,124,122,-2], [29,75,73,-2], [29,74,72,-2],
+    [24,75,73,-11], [23,75,73,-1], [14,75,73,-13], [14,75,73], [14,75,73,-13], [14,75,73], [4,25,25,-13], [3,25,25,-11],
+    [15,38,38,-15], [14,38,38,-7], [15,38,37,-15], [14,38,37,-7], [14,76,75,-7], [15,76,75,-15], [6,14,13,-15], [3,25,25,-12],
+    [24,75,73,-11], [23,75,73,-1], [6,26,25,-11], [5,26,25,-19], [18,75,73,-4], [18,75,73,-3], [30,41,41,-2], [42,58,58,-2],
+    [23,46,46,-2], [37,92,92,-2], [42,41,41,-2], [58,58,58,-2], [42,41,41,-2], [58,58,58,-2], [42,41,41,-2], [58,58,58,-2],
+    [39,41,41,-2], [35,41,41,-2], [23,46,46,-2], [30,41,41,-2], [30,41,41,-2], [30,41,41,-2], [30,41,41,-2], [30,41,41,-2],
+    [55,58,58,-2], [49,58,58,-2], [37,92,92,-2], [42,58,58,-2], [42,58,58,-2], [42,58,58,-2], [42,58,58,-2], [42,58,58,-2],
+    [35,41,41,-2], [49,58,58,-2], [23,8,-23], [41,9,-23], [60,9,-23], [23,6,-24], [41,6,-25], [59,6,-25],
+    [10,75,73,-9], [10,75,73], [12,75,73,-9], [13,75,73], [12,75,73,-9], [13,75,73], [19,75,73,-4], [19,75,73,-4],
+    [38,50,48,-4], [38,75,73,-4], [38,99,97,-4], [38,124,122,-4], [27,75,74,-4], [3,27,26,-28], [16,26,24,-28], [12,25,25,-10],
+    [19,25,25,-4], [19,25,25,-4], [20,14,9,1], [21,14,9,1], [20,14,0,1], [21,14,0,1], [28,25,25,-2], [28,25,25,-2],
+    [19,93,168,243,318,392,467,542,617,692,766,841,916,991,1066,1140],
+    [66,249,433,617,800,984,1167,1351],
+    [1222,1530]
+  ],
+  cmbx10: [
+    [26,28,0,-1], [35,29,0,-2], [32,30,1,-2], [31,29,0,-1], [28,28,0,-2], [35,28,0,-1], [30,29,0,-2], [32,29,0,-2],
+    [30,29,0,-2], [32,29,0,-2], [30,29,0,-2], [30,29,0,-1], [24,29,0,-1], [24,29,0,-1], [37,29,0,-1], [37,29,0,-1],
+    [11,19,0,-1], [14,28,9,3], [10,8,-21,-4], [10,8,-21,-9], [13,6,-21,-5], [15,9,-20,-4], [18,3,-22,-3], [10,7,-22,-13],
+    [13,9,9,-5], [23,30,1,-1], [32,20,1,-1], [35,20,1,-1], [22,28,5,-1], [41,29,0,-1], [44,30,1,-3], [32,34,3,-2],
+    [14,6,-11], [7,29,0,-4], [18,15,-14,-1], [35,37,8,-2], [19,34,3,-2], [35,34,3,-2], [33,30,1,-2], [8,15,-14,-3],
+    [12,42,11,-4], [12,42,11,-2], [18,19,-12,-3], [32,32,6,-2], [8,15,8,-3], [13,5,-7], [7,7,0,-3], [19,42,11,-2],
+    [21,28,1,-1], [18,27,0,-3], [20,27,0,-2], [20,28,1,-2], [22,27,0,-1], [20,28,1,-2], [20,28,1,-2], [21,29,1,-2],
+    [20,28,1,-2], [20,28,1,-2], [7,19,0,-3], [7,27,8,-3], [7,30,9,-4], [32,13,-4,-2], [18,30,9,-2], [18,29,0,-2],
+    [32,30,1,-2], [33,29,0,-1], [30,29,0,-1], [30,30,1,-2], [33,29,0,-1], [29,28,0,-1], [27,28,0,-1], [33,30,1,-2],
+    [35,29,0,-1], [16,29,0,-1], [21,30,1,-1], [34,29,0,-1], [26,29,0,-1], [43,29,0,-1], [35,29,0,-1], [31,30,1,-2],
+    [29,29,0,-1], [31,37,8,-2], [35,30,1,-1], [22,30,1,-2], [30,28,0,-1], [34,30,1,-1], [34,30,1,-1], [47,30,1,-1],
+    [34,29,0,-1], [35,29,0], [25,29,0,-2], [7,42,11,-5], [19,15,-14,-5], [7,42,11,-1], [13,8,-21,-5], [7,7,-22,-3],
+    [8,15,-14,-2], [22,20,1,-1], [24,30,1,-1], [19,20,1,-1], [24,30,1,-1], [20,20,1,-1], [17,29,0,-1], [22,28,9,-1],
+    [25,29,0,-1], [11,29,0,-1], [14,38,9,3], [24,29,0,-1], [11,29,0,-1], [38,19,0,-1], [25,19,0,-1], [22,20,1,-1],
+    [24,27,8,-1], [24,27,8,-1], [18,19,0,-1], [16,20,1,-1], [16,27,1], [25,20,1,-1], [23,20,1,-1], [32,20,1,-1],
+    [24,19,0], [24,28,9], [18,19,0,-1], [24,2,-10], [48,2,-10], [16,9,-21,-5], [16,5,-24,-4], [16,7,-22,-4],
+    [17,76,135,194,253,311,370,429,488,547,606,664,723,782,841,900],
+    [55,104,154,203,253,302,352,401],
+    [964,434]
+  ],
+  cmti10: [
+    [27,28,0,-2], [28,30,0,-3], [27,30,1,-6], [25,30,0,-2], [28,28,0,-3], [33,28,0,-2], [29,28,0,-3], [27,29,0,-8],
+    [24,28,0,-6], [26,28,0,-8], [28,29,0,-4], [32,38,9,1], [26,38,9,1], [27,38,9,1], [39,38,9,1], [40,38,9,1],
+    [11,20,1,-3], [16,28,9,2], [6,9,-20,-12], [9,9,-20,-14], [11,6,-20,-11], [13,8,-21,-11], [15,3,-22,-9], [9,8,-22,-19],
+    [10,8,8,-4], [25,38,9,1], [27,20,1,-3], [26,20,1,-4], [21,27,5,-2], [37,28,0,-2], [37,30,1,-6], [30,34,3,-4],
+    [11,5,-11,-3], [12,30,0,-4], [14,13,-16,-7], [30,37,8,-4], [26,30,1,-3], [29,34,3,-6], [28,31,1,-5], [7,13,-16,-9],
+    [16,42,11,-6], [16,42,11], [16,18,-13,-8], [26,26,3,-5], [7,13,8,-3], [11,3,-7,-3], [6,5,0,-4], [26,42,11],
+    [19,29,1,-4], [15,28,0,-4], [20,29,1,-3], [20,29,1,-3], [19,36,8,-1], [20,29,1,-4], [20,29,1,-4], [20,29,1,-6],
+    [19,29,1,-4], [19,29,1,-4], [9,18,0,-4], [10,26,8,-3], [12,30,9,-2], [28,10,-5,-4], [16,30,9,-3], [15,30,0,-8],
+    [27,30,1,-6], [27,30,0,-2], [29,28,0,-2], [28,30,1,-6], [30,28,0,-2], [29,28,0,-2], [28,28,0,-2], [28,30,1,-6],
+    [33,28,0,-2], [19,28,0,-2], [23,29,1,-3], [34,28,0,-2], [24,28,0,-2], [39,28,0,-2], [33,28,0,-2], [27,30,1,-6],
+    [28,28,0,-2], [27,37,8,-6], [28,29,1,-2], [23,30,1,-3], [26,28,0,-7], [27,29,1,-8], [28,29,1,-8], [37,29,1,-8],
+    [40,28,0,6], [28,28,0,-8], [26,28,0,-3], [16,42,11,-3], [14,13,-16,-11], [16,42,11,1], [11,7,-22,-11], [5,5,-23,-10],
+    [7,13,-16,-8], [18,20,1,-4], [15,30,1,-4], [16,20,1,-4], [19,30,1,-4], [16,20,1,-4], [20,38,9,1], [18,28,9,-2],
+    [19,30,1,-3], [11,28,1,-3], [17,36,9,2], [18,30,1,-3], [10,30,1,-3], [32,20,1,-3], [21,20,1,-3], [17,20,1,-4],
+    [21,27,8], [17,27,8,-4], [17,20,1,-3], [15,20,1,-3], [13,27,1,-3], [20,20,1,-3], [18,20,1,-3], [26,20,1,-3],
+    [20,20,1,-2], [19,28,9,-3], [17,20,1,-2], [20,2,-10,-3], [38,2,-10,-5], [13,9,-20,-11], [14,5,-23,-10], [12,5,-23,-11],
+    [17,67,118,168,219,270,320,371,421,472,522,573,624,674,725,775],
+    [55,104,154,203,253,302,352,401],
+    [831,434]
+  ]
+});
+
+jsMath.Img.AddFont(358,{
+  cmr10: [
+    [28,34,0,-1], [37,35,0,-2], [34,36,1,-2], [32,35,0,-1], [29,34,0,-2], [35,34,0,-1], [31,34,0,-2], [34,35,0,-2],
+    [31,34,0,-2], [34,34,0,-2], [32,35,0,-2], [30,35,0,-1], [25,35,0,-1], [25,35,0,-1], [39,35,0,-1], [39,35,0,-1],
+    [12,22,0,-1], [13,32,10,2], [10,10,-25,-5], [10,10,-25,-10], [13,7,-25,-6], [16,9,-25,-4], [18,2,-27,-3], [10,10,-26,-13],
+    [12,9,10,-6], [23,36,1,-1], [32,23,1,-2], [36,23,1,-1], [22,31,5,-1], [42,34,0,-1], [46,37,2,-3], [34,39,3,-2],
+    [12,6,-13,-1], [6,35,0,-4], [16,15,-19,-1], [36,44,10,-2], [20,40,3,-2], [36,40,3,-2], [34,38,2,-2], [7,15,-19,-4],
+    [13,50,13,-4], [13,50,13,-2], [19,22,-15,-3], [34,33,4,-2], [6,16,10,-4], [14,3,-9], [6,6,0,-4], [20,50,13,-2],
+    [22,35,2,-1], [17,33,0,-4], [20,33,0,-2], [21,35,2,-2], [23,34,0,-1], [20,35,2,-2], [21,35,2,-2], [22,35,1,-2],
+    [21,35,2,-2], [21,34,1,-2], [6,22,0,-4], [6,32,10,-4], [6,36,11,-4], [34,12,-6,-2], [19,35,10,-2], [19,35,0,-2],
+    [34,36,1,-2], [35,35,0,-1], [31,34,0,-1], [31,37,2,-2], [34,34,0,-1], [31,34,0,-1], [29,34,0,-1], [34,37,2,-2],
+    [35,34,0,-1], [16,34,0,-1], [21,35,1,-2], [36,34,0,-1], [28,34,0,-1], [43,34,0,-1], [35,34,0,-1], [34,36,1,-2],
+    [30,34,0,-1], [34,45,10,-2], [35,35,1,-1], [23,37,2,-2], [33,34,0,-1], [35,35,1,-1], [36,35,1], [50,35,1],
+    [35,34,0,-1], [37,34,0], [26,34,0,-2], [8,50,13,-5], [16,15,-19,-7], [7,50,13,-1], [14,8,-26,-5], [6,6,-27,-4],
+    [7,15,-19,-3], [23,23,1,-2], [25,35,1,-1], [20,23,1,-1], [25,35,1,-1], [20,23,1,-1], [17,35,0,-1], [23,34,11,-1],
+    [26,34,0,-1], [12,33,0,-1], [13,43,10,2], [24,34,0,-1], [12,34,0,-1], [39,22,0,-1], [26,22,0,-1], [23,23,1,-1],
+    [25,32,10,-1], [25,32,10,-1], [17,22,0,-1], [17,23,1,-1], [16,32,1,-1], [26,23,1,-1], [25,23,1], [35,23,1],
+    [26,22,0], [25,32,10], [19,22,0,-1], [25,2,-12], [49,2,-12], [15,10,-25,-6], [17,5,-28,-4], [15,6,-27,-5],
+    [20,81,142,203,264,325,387,448,509,570,631,692,753,814,875,937],
+    [64,124,183,243,302,362,421,481],
+    [1003,521]
+  ],
+  cmmi10: [
+    [34,34,0,-2], [37,35,0,-2], [35,37,2,-2], [32,35,0,-1], [36,34,0,-2], [42,34,0,-2], [38,34,0,-2], [34,35,0,-1],
+    [31,34,0,-1], [33,34,0,-1], [36,35,0,-3], [28,23,1,-2], [28,45,10,-1], [27,33,11], [21,36,1,-2], [17,23,1,-2],
+    [22,45,10,-2], [24,33,11,-1], [21,36,1,-2], [14,23,1,-2], [25,23,1,-2], [25,35,1,-2], [27,33,11,-1], [24,22,0,-2],
+    [21,45,10,-1], [27,23,1,-1], [24,33,11,-1], [27,23,1,-1], [24,23,1,-1], [25,23,1,-1], [26,44,10,-2], [28,32,10,-1],
+    [31,44,10,-1], [30,23,1], [20,25,2,-1], [27,36,1,-1], [39,23,1,-1], [22,32,10,-3], [19,28,6,-1], [29,33,11,-2],
+    [45,14,-11,-2], [45,15,1,-2], [45,14,-11,-2], [45,15,1,-2], [9,12,-11,-2], [9,12,-11,-2], [23,26,1,-1], [23,26,1,-1],
+    [21,25,2,-2], [17,23,0,-4], [20,23,0,-2], [21,34,11,-2], [22,33,10,-1], [20,34,11,-2], [21,35,2,-2], [22,34,11,-2],
+    [21,35,2,-2], [21,34,11,-2], [6,6,0,-4], [6,16,10,-4], [30,29,2,-4], [20,50,13,-2], [30,29,2,-4], [25,24,0],
+    [26,36,1,-2], [35,35,0,-1], [35,34,0,-2], [36,37,2,-2], [38,34,0,-2], [37,34,0,-1], [36,34,0,-1], [36,37,2,-2],
+    [42,34,0,-2], [24,34,0,-1], [28,35,1,-3], [43,34,0,-1], [30,34,0,-2], [50,34,0,-2], [42,34,0,-2], [35,37,2,-2],
+    [35,34,0,-2], [35,45,10,-2], [35,35,1,-2], [30,37,2,-2], [34,34,0,-1], [35,36,2,-3], [36,35,1,-2], [50,35,1,-2],
+    [41,34,0,-1], [37,34,0,-1], [34,34,0,-2], [15,38,1,-2], [13,47,11,-3], [15,46,11,-2], [45,13,-6,-2], [45,13,-6,-2],
+    [20,36,1], [23,23,1,-2], [19,35,1,-2], [19,23,1,-2], [24,35,1,-2], [19,23,1,-2], [25,45,10,-2], [24,32,10],
+    [25,35,1,-2], [14,34,1,-1], [21,43,10,1], [23,35,1,-2], [11,35,1,-2], [41,23,1,-1], [27,23,1,-1], [21,23,1,-2],
+    [26,32,10,2], [20,32,10,-2], [21,23,1,-1], [19,23,1,-2], [16,32,1,-1], [26,23,1,-1], [22,23,1,-1], [33,23,1,-1],
+    [25,23,1,-1], [23,32,10,-1], [21,23,1,-2], [14,23,1,-1], [19,32,10,1], [28,34,11,-3], [22,10,-25,-9], [19,7,-26,-13],
+    [20,79,139,198,258,317,377,436,495,555,614,674,733,793,852,912],
+    [64,124,183,243,302,362,421,481],
+    [977,521]
+  ],
+  cmsy10: [
+    [30,3,-11,-4], [6,6,-9,-4], [24,24,0,-7], [19,22,-1,-3], [34,28,2,-2], [24,24,0], [34,33,0,-2], [34,34,9,-2],
+    [34,33,4,-2], [34,33,4,-2], [34,33,4,-2], [34,33,4,-2], [34,33,4,-2], [45,47,11,-2], [20,20,-2,-2], [20,20,-2,-2],
+    [34,24,0,-2], [34,22,-1,-2], [30,39,7,-4], [30,39,7,-4], [30,38,7,-4], [30,39,7,-4], [30,38,7,-4], [30,39,7,-4],
+    [34,12,-6,-2], [34,22,-2,-2], [30,29,2,-4], [30,29,2,-4], [45,32,4,-2], [45,32,4,-2], [30,29,2,-4], [30,29,2,-4],
+    [45,18,-3,-2], [45,18,-3,-2], [18,44,10,-3], [18,44,10,-3], [45,18,-3,-2], [45,45,10,-2], [45,44,10,-2], [34,22,-1,-2],
+    [45,28,2,-2], [45,28,2,-2], [28,44,10,-1], [28,44,10,-1], [47,28,2,-1], [45,45,10,-2], [45,44,10,-2], [34,23,1,-2],
+    [12,26,-2,-1], [45,23,1,-2], [25,29,2,-4], [25,29,2,-4], [38,35,0,-3], [39,36,11,-2], [26,46,11,-6], [4,19,-3,-2],
+    [28,35,1], [23,34,0,-2], [28,14,-4,-2], [21,42,4,-2], [33,38,2,-2], [32,36,1,-2], [34,33,0,-2], [34,33,0,-2],
+    [26,34,0,-2], [38,39,3,-1], [32,37,2,-1], [27,37,2], [37,34,0,-1], [27,37,2,-1], [41,36,2], [28,41,6,-2],
+    [39,37,3,-1], [33,34,0,2], [39,40,6,-2], [35,37,2,-1], [31,37,2,-1], [54,38,3,-1], [50,41,3,2], [37,37,2,-2],
+    [35,37,3,-1], [34,42,7,-5], [40,36,2,-1], [32,37,2], [38,36,0,-1], [35,36,2,1], [32,37,3,-1], [50,37,3,-1],
+    [38,34,0,-2], [35,41,7,-1], [37,34,0,-1], [28,32,2,-2], [28,31,1,-2], [28,32,2,-2], [28,31,1,-2], [28,31,1,-2],
+    [25,34,0,-2], [26,34,0,-2], [13,50,13,-8], [13,50,13,-1], [13,50,13,-8], [13,50,13,-1], [18,50,13,-3], [18,50,13,-3],
+    [12,50,13,-5], [12,50,13,-2], [3,50,13,-5], [12,50,13,-6], [18,52,14,-3], [28,52,14,-1], [20,50,13,-2], [9,33,4,-2],
+    [39,49,47,-3], [34,34,0,-1], [37,36,2,-2], [21,46,11,-2], [27,30,0,-3], [27,30,0,-3], [31,39,7,-4], [31,39,7,-3],
+    [16,45,10,-3], [17,46,11,-2], [17,45,10,-2], [27,44,10,-2], [36,43,7,-1], [34,44,8,-2], [34,38,2,-2], [34,43,7,-2],
+    [21,92,164,235,306,378,449,521,592,663,735,806,878,949,1020,1092],
+    [68,170,271,373,475,576,678,780],
+    [1170,865]
+  ],
+  cmex10: [
+    [14,59,57,-7], [13,59,57,-2], [11,59,57,-9], [10,59,57,-1], [13,59,57,-9], [13,59,57,-1], [13,59,57,-9], [13,59,57,-1],
+    [18,59,57,-5], [18,59,57,-5], [16,59,57,-4], [16,59,57,-3], [3,32,31,-7], [14,32,31,-7], [24,59,57,-2], [24,59,57,-2],
+    [20,89,87,-8], [20,89,87,-1], [25,118,116,-10], [25,118,116,-1], [14,118,116,-12], [14,118,116], [16,118,116,-12], [17,118,116],
+    [16,118,116,-12], [17,118,116], [25,118,116,-6], [25,118,116,-6], [26,118,116,-6], [27,118,116,-4], [47,118,116,-2], [47,118,116,-2],
+    [26,147,145,-11], [27,147,145,-1], [15,147,145,-13], [15,147,145], [18,147,145,-13], [18,147,145], [18,147,145,-13], [18,147,145],
+    [26,147,145,-7], [26,147,145,-7], [29,147,145,-6], [28,147,145,-5], [58,147,145,-2], [58,147,145,-2], [35,89,87,-2], [35,89,87,-2],
+    [28,89,87,-14], [28,89,87,-1], [17,89,87,-16], [17,89,87], [17,89,87,-16], [17,89,87], [4,30,30,-16], [4,30,30,-13],
+    [18,45,45,-18], [17,45,45,-8], [18,45,44,-18], [17,45,44,-8], [17,90,89,-8], [18,90,89,-18], [7,17,16,-18], [3,30,30,-15],
+    [28,90,87,-14], [28,90,87,-1], [6,31,30,-14], [6,31,30,-23], [21,89,87,-5], [21,89,87,-4], [36,49,49,-2], [50,69,69,-2],
+    [28,55,55,-2], [45,109,109,-2], [50,49,49,-2], [70,69,69,-2], [50,49,49,-2], [70,69,69,-2], [50,49,49,-2], [70,69,69,-2],
+    [47,49,49,-2], [42,49,49,-2], [28,55,55,-2], [36,49,49,-2], [36,49,49,-2], [36,49,49,-2], [36,49,49,-2], [36,49,49,-2],
+    [66,69,69,-2], [58,69,69,-2], [45,109,109,-2], [50,69,69,-2], [50,69,69,-2], [50,69,69,-2], [50,69,69,-2], [50,69,69,-2],
+    [42,49,49,-2], [58,69,69,-2], [29,10,-27,1], [49,10,-28], [71,10,-28], [27,7,-29], [49,7,-30], [71,7,-30],
+    [12,89,87,-11], [12,89,87], [14,89,87,-11], [15,89,87], [14,89,87,-11], [15,89,87], [22,89,87,-5], [22,89,87,-5],
+    [45,59,57,-5], [45,89,87,-5], [45,118,116,-5], [45,147,145,-5], [32,90,89,-5], [3,32,31,-34], [19,31,29,-34], [14,30,30,-12],
+    [23,30,30,-5], [23,30,30,-5], [25,17,11,2], [25,17,11,1], [25,17,0,2], [25,17,0,1], [34,30,30,-2], [34,29,29,-2],
+    [22,112,202,292,382,472,561,651,741,831,921,1011,1100,1190,1280,1370],
+    [78,298,519,740,960,1181,1401,1622],
+    [1468,1836]
+  ],
+  cmbx10: [
+    [31,34,0,-1], [42,35,0,-2], [38,36,1,-3], [36,35,0,-2], [34,34,0,-2], [42,34,0,-1], [35,34,0,-3], [38,35,0,-3],
+    [35,34,0,-3], [38,34,0,-3], [37,35,0,-2], [36,35,0,-1], [29,35,0,-1], [29,35,0,-1], [45,35,0,-1], [45,35,0,-1],
+    [12,22,0,-2], [17,32,10,3], [12,10,-25,-5], [12,10,-25,-11], [16,7,-25,-6], [18,10,-24,-5], [22,3,-27,-3], [13,9,-26,-15],
+    [16,10,10,-6], [27,36,1,-1], [39,24,1,-1], [42,24,1,-1], [26,32,5,-1], [48,34,0,-2], [52,36,1,-4], [38,40,3,-3],
+    [15,7,-13,-1], [9,35,0,-4], [22,18,-16,-1], [41,44,10,-3], [22,40,3,-3], [41,40,3,-3], [39,36,1,-2], [9,18,-16,-4],
+    [14,50,13,-5], [14,50,13,-3], [22,22,-15,-3], [38,38,7,-3], [9,18,10,-4], [16,6,-8], [8,8,0,-4], [22,50,13,-3],
+    [24,34,1,-2], [21,32,0,-4], [24,33,0,-2], [24,34,1,-2], [26,33,0,-1], [24,33,1,-2], [24,34,1,-2], [25,35,1,-3],
+    [24,34,1,-2], [24,34,1,-2], [8,22,0,-4], [8,32,10,-4], [9,35,10,-4], [38,15,-5,-3], [21,35,10,-3], [21,35,0,-3],
+    [38,36,1,-3], [39,35,0,-2], [36,34,0,-1], [35,36,1,-3], [39,34,0,-1], [35,34,0,-1], [32,34,0,-1], [39,36,1,-3],
+    [42,34,0,-1], [19,34,0,-1], [25,35,1,-1], [41,34,0,-1], [31,34,0,-1], [50,34,0,-2], [42,34,0,-1], [37,36,1,-3],
+    [35,34,0,-1], [37,45,10,-3], [41,35,1,-1], [26,36,1,-3], [35,34,0,-2], [41,35,1,-1], [41,35,1,-1], [56,35,1,-1],
+    [40,34,0,-1], [42,34,0], [29,34,0,-3], [9,50,13,-6], [22,18,-16,-6], [9,50,13,-1], [16,8,-26,-6], [8,8,-26,-4],
+    [9,18,-16,-3], [27,24,1,-1], [29,35,1,-1], [23,24,1,-1], [29,35,1,-1], [24,24,1,-1], [20,35,0,-2], [27,33,10,-1],
+    [29,34,0,-2], [12,34,0,-2], [17,44,10,3], [28,34,0,-1], [13,34,0,-2], [44,22,0,-2], [29,22,0,-2], [26,24,1,-1],
+    [29,32,10,-1], [29,32,10,-1], [21,22,0,-1], [20,24,1,-1], [18,33,1,-1], [29,23,1,-2], [28,23,1,-1], [39,23,1,-1],
+    [28,22,0,-1], [28,32,10,-1], [22,22,0,-1], [29,3,-12], [57,3,-12], [17,10,-25,-7], [20,6,-28,-4], [19,7,-27,-5],
+    [21,91,162,233,303,374,445,516,586,657,728,798,869,940,1010,1081],
+    [64,124,183,243,302,362,421,481],
+    [1158,521]
+  ],
+  cmti10: [
+    [32,34,0,-3], [34,35,0,-3], [32,37,2,-7], [30,35,0,-2], [34,34,0,-3], [39,34,0,-3], [35,34,0,-4], [31,35,0,-10],
+    [29,34,0,-7], [31,34,0,-10], [34,35,0,-4], [40,45,10,2], [32,45,10,2], [34,45,10,2], [47,45,10,2], [49,45,10,2],
+    [13,23,1,-4], [18,32,10,2], [8,10,-24,-14], [11,11,-24,-16], [14,7,-24,-13], [15,9,-25,-13], [17,2,-27,-11], [10,9,-26,-23],
+    [12,10,10,-5], [30,45,10,1], [32,23,1,-4], [31,23,1,-5], [24,33,6,-3], [45,34,0,-2], [44,37,2,-8], [36,40,3,-5],
+    [13,7,-13,-4], [14,35,0,-5], [18,15,-19,-8], [36,44,10,-5], [31,36,1,-4], [35,40,3,-7], [34,37,2,-6], [9,15,-19,-10],
+    [19,50,13,-7], [18,50,13,-1], [20,22,-15,-9], [31,31,3,-6], [8,16,10,-3], [13,3,-9,-4], [6,6,0,-5], [30,50,13,-1],
+    [23,35,2,-5], [18,33,0,-5], [23,34,1,-4], [24,35,2,-4], [22,43,10,-2], [23,34,1,-5], [23,34,1,-5], [24,34,1,-7],
+    [24,35,2,-4], [23,34,1,-5], [10,22,0,-5], [12,32,10,-3], [14,36,11,-2], [33,12,-6,-5], [18,36,11,-4], [18,35,0,-9],
+    [32,36,1,-7], [32,35,0,-2], [33,34,0,-3], [33,37,2,-7], [35,34,0,-3], [34,34,0,-3], [33,34,0,-3], [33,37,2,-7],
+    [39,34,0,-3], [23,34,0,-2], [27,36,2,-4], [39,34,0,-3], [28,34,0,-3], [46,34,0,-3], [39,34,0,-3], [32,37,2,-7],
+    [33,34,0,-3], [32,45,10,-7], [33,36,2,-3], [28,37,2,-3], [32,34,0,-8], [33,36,2,-9], [33,35,1,-10], [45,36,2,-10],
+    [48,34,0,7], [34,34,0,-9], [31,34,0,-4], [19,50,13,-3], [17,15,-19,-13], [19,50,13,1], [13,8,-26,-13], [6,6,-27,-12],
+    [8,15,-19,-10], [22,23,1,-5], [18,35,1,-5], [18,23,1,-5], [23,35,1,-5], [18,23,1,-5], [25,45,10,2], [22,32,10,-2],
+    [24,35,1,-3], [13,34,1,-4], [20,43,10,2], [22,35,1,-3], [11,35,1,-4], [38,23,1,-4], [25,23,1,-4], [20,23,1,-5],
+    [25,32,10], [20,32,10,-5], [20,23,1,-4], [18,23,1,-3], [15,32,1,-4], [24,23,1,-4], [21,23,1,-4], [31,23,1,-4],
+    [24,23,1,-2], [22,32,10,-4], [20,23,1,-3], [23,2,-12,-4], [45,2,-12,-6], [16,11,-24,-13], [16,6,-27,-12], [14,6,-27,-13],
+    [20,81,141,202,263,324,385,445,506,567,628,688,749,810,871,932],
+    [64,124,183,243,302,362,421,481],
+    [998,521]
+  ]
+});
+
+jsMath.Img.AddFont(430,{
+  cmr10: [
+    [33,41,0,-2], [45,43,0,-2], [40,44,2,-3], [38,43,0,-1], [35,40,0,-2], [41,41,0,-2], [37,41,0,-3], [40,42,0,-3],
+    [37,41,0,-3], [40,41,0,-3], [38,42,0,-2], [36,42,0,-1], [31,42,0,-1], [31,42,0,-1], [47,42,0,-1], [47,42,0,-1],
+    [13,26,0,-2], [16,39,13,3], [12,12,-30,-6], [11,12,-30,-12], [16,8,-30,-7], [19,11,-30,-5], [22,2,-33,-4], [12,11,-32,-16],
+    [15,11,12,-7], [27,43,1,-1], [39,28,1,-2], [44,28,1,-1], [26,38,6,-2], [51,41,0,-1], [54,44,2,-4], [40,48,4,-3],
+    [15,7,-16,-1], [7,43,0,-5], [19,18,-23,-2], [43,53,12,-3], [24,49,4,-3], [43,49,4,-3], [41,45,2,-2], [8,18,-23,-5],
+    [15,60,15,-5], [14,60,15,-3], [23,27,-18,-3], [40,40,5,-3], [7,19,12,-5], [17,4,-11], [7,7,0,-5], [24,60,15,-3],
+    [26,42,2,-2], [20,40,0,-5], [24,40,0,-3], [25,42,2,-2], [27,40,0,-1], [24,42,2,-3], [25,42,2,-2], [26,42,2,-3],
+    [25,42,2,-2], [25,42,2,-2], [7,26,0,-5], [7,38,12,-5], [7,43,13,-5], [40,15,-7,-3], [22,43,13,-3], [22,42,0,-3],
+    [40,43,1,-3], [42,43,0,-1], [37,41,0,-2], [37,44,2,-3], [40,41,0,-2], [37,41,0,-2], [34,41,0,-2], [41,44,2,-3],
+    [41,41,0,-2], [19,41,0,-1], [26,43,2,-2], [42,41,0,-2], [33,41,0,-2], [50,41,0,-2], [41,41,0,-2], [40,44,2,-3],
+    [35,41,0,-2], [40,54,12,-3], [42,43,2,-2], [27,44,2,-3], [39,40,0,-2], [41,43,2,-2], [43,43,2,-1], [59,43,2,-1],
+    [42,41,0,-1], [44,41,0], [30,41,0,-3], [8,60,15,-7], [19,18,-23,-9], [9,60,15,-1], [16,9,-32,-7], [7,7,-33,-5],
+    [8,18,-23,-4], [28,28,1,-2], [30,42,1,-1], [23,28,1,-2], [30,42,1,-2], [24,28,1,-1], [19,42,0,-2], [28,40,13,-1],
+    [31,41,0,-1], [13,40,0,-2], [16,53,13,3], [30,41,0,-1], [13,41,0,-2], [47,27,0,-1], [31,27,0,-1], [27,28,1,-1],
+    [30,39,12,-1], [30,39,12,-2], [21,26,0,-1], [20,28,1,-2], [19,38,1,-1], [31,27,1,-1], [29,27,1,-1], [41,27,1,-1],
+    [31,26,0], [29,39,13,-1], [23,26,0,-1], [30,2,-15], [59,2,-15], [18,12,-30,-7], [20,7,-33,-5], [18,7,-33,-6],
+    [24,97,171,244,317,391,464,538,611,684,758,831,904,978,1051,1125],
+    [77,149,220,292,363,434,506,577],
+    [1205,625]
+  ],
+  cmmi10: [
+    [41,41,0,-2], [44,43,0,-3], [42,44,2,-2], [38,43,0,-2], [43,40,0,-3], [50,41,0,-2], [45,41,0,-3], [41,42,0,-1],
+    [37,41,0,-1], [40,41,0,-1], [43,42,0,-4], [34,28,1,-2], [34,54,12,-1], [31,40,13,-1], [25,43,1,-2], [21,27,1,-2],
+    [26,55,13,-2], [29,40,13,-1], [25,43,1,-2], [17,27,1,-3], [30,27,1,-3], [30,42,1,-3], [33,39,13,-1], [28,26,0,-3],
+    [26,54,13,-1], [33,27,1,-1], [29,40,13,-1], [32,27,1,-2], [30,27,1,-1], [30,27,1,-1], [32,53,12,-2], [34,39,13,-1],
+    [37,53,12,-1], [36,27,1], [25,29,2,-1], [32,43,1,-1], [48,27,1,-1], [26,39,12,-4], [24,34,7,-1], [34,39,13,-3],
+    [53,18,-13,-3], [53,17,1,-3], [53,18,-13,-3], [53,17,1,-3], [10,15,-13,-3], [11,15,-13,-3], [27,31,1,-1], [27,31,1,-1],
+    [26,29,2,-2], [20,27,0,-5], [25,27,0,-2], [25,40,13,-2], [27,40,12,-1], [24,40,13,-3], [25,42,2,-2], [26,41,13,-3],
+    [25,42,2,-2], [25,40,13,-2], [7,7,0,-5], [7,19,12,-5], [37,35,3,-4], [24,60,15,-3], [37,35,3,-4], [30,28,-1],
+    [32,45,2,-2], [41,43,0,-2], [43,41,0,-2], [42,44,2,-3], [46,41,0,-2], [43,41,0,-2], [43,41,0,-2], [42,44,2,-3],
+    [50,41,0,-2], [28,41,0,-2], [34,43,2,-4], [51,41,0,-2], [36,41,0,-2], [60,41,0,-2], [50,41,0,-2], [42,44,2,-2],
+    [43,41,0,-2], [42,54,12,-2], [43,43,2,-2], [35,44,2,-3], [41,40,0,-1], [41,43,2,-4], [43,43,2,-3], [59,43,2,-3],
+    [50,41,0,-1], [43,41,0,-2], [40,41,0,-3], [17,47,2,-3], [15,56,13,-4], [17,56,13,-3], [53,15,-7,-3], [53,16,-7,-3],
+    [24,43,1], [28,28,1,-2], [23,42,1,-2], [24,28,1,-2], [29,42,1,-2], [24,28,1,-2], [30,54,12,-3], [28,40,13],
+    [30,42,1,-3], [17,40,1,-1], [25,52,13,1], [27,42,1,-3], [14,42,1,-2], [49,28,1,-1], [33,28,1,-1], [26,28,1,-2],
+    [31,38,12,2], [25,39,12,-2], [25,28,1,-1], [22,28,1,-3], [19,38,1,-1], [31,27,1,-1], [27,27,1,-1], [40,27,1,-1],
+    [31,28,1,-1], [28,39,13,-1], [26,27,1,-2], [17,27,1,-1], [23,39,13,1], [33,40,13,-4], [27,13,-30,-10], [24,9,-31,-15],
+    [24,95,167,238,309,381,452,524,595,666,738,809,880,952,1023,1095],
+    [77,149,220,292,363,434,506,577],
+    [1172,625]
+  ],
+  cmsy10: [
+    [36,3,-13,-5], [7,7,-11,-5], [30,29,0,-8], [23,26,-2,-3], [40,34,2,-3], [29,29,0], [40,40,0,-3], [40,40,10,-3],
+    [40,40,5,-3], [40,40,5,-3], [40,40,5,-3], [40,40,5,-3], [40,40,5,-3], [53,56,13,-3], [24,24,-3,-3], [24,24,-3,-3],
+    [40,28,-1,-3], [40,26,-2,-3], [37,47,9,-4], [37,47,9,-4], [37,47,9,-4], [37,47,9,-4], [37,47,9,-4], [37,47,9,-4],
+    [40,15,-7,-3], [40,26,-3,-3], [37,35,3,-4], [37,35,3,-4], [53,38,4,-3], [53,38,4,-3], [37,35,3,-4], [37,35,3,-4],
+    [53,22,-4,-3], [53,22,-4,-3], [22,53,12,-4], [22,53,12,-4], [53,22,-4,-3], [53,53,12,-3], [53,53,12,-3], [40,26,-2,-3],
+    [53,33,2,-3], [53,33,2,-3], [34,53,12,-1], [34,53,12,-1], [55,33,2,-2], [53,54,12,-3], [53,53,12,-3], [40,28,1,-3],
+    [15,31,-2,-1], [53,28,1,-3], [31,35,3,-4], [31,35,3,-4], [46,43,0,-3], [46,43,13,-3], [30,56,13,-8], [5,23,-3,-3],
+    [33,43,2], [27,41,0,-3], [33,16,-5,-3], [25,51,5,-2], [40,45,2,-2], [38,43,1,-3], [40,40,0,-3], [40,40,0,-3],
+    [30,41,0,-3], [46,46,3,-1], [39,44,2,-1], [32,44,2], [45,41,0,-1], [33,44,2,-1], [48,43,2,-1], [34,49,7,-2],
+    [48,44,3,-1], [40,41,0,2], [48,48,7,-2], [43,44,2,-1], [38,44,2,-1], [65,45,3,-1], [60,49,3,2], [43,44,2,-3],
+    [43,44,3,-1], [41,50,8,-6], [49,43,2,-1], [37,44,2,-1], [46,43,0,-1], [42,43,2,1], [37,44,3,-2], [60,44,3,-2],
+    [45,41,0,-3], [42,49,8,-1], [44,41,0,-2], [33,38,2,-3], [33,38,2,-3], [33,38,2,-3], [33,38,2,-3], [33,38,2,-3],
+    [30,41,0,-3], [30,41,0,-3], [15,60,15,-10], [15,60,15,-1], [15,60,15,-10], [15,60,15,-1], [22,60,15,-4], [22,60,15,-4],
+    [14,60,15,-6], [14,60,15,-3], [3,60,15,-7], [15,60,15,-7], [22,62,16,-4], [34,62,16,-1], [24,60,15,-3], [10,40,5,-3],
+    [47,60,57,-4], [40,41,0,-2], [45,43,2,-2], [25,56,13,-3], [33,36,0,-3], [33,36,0,-3], [38,47,9,-5], [38,47,9,-3],
+    [18,55,13,-4], [20,55,13,-3], [20,54,12,-3], [32,53,12,-3], [44,51,8,-1], [40,53,10,-3], [40,45,2,-3], [40,51,8,-3],
+    [25,111,196,282,368,454,539,625,711,797,882,968,1054,1140,1225,1311],
+    [82,204,326,448,570,692,814,936],
+    [1404,1039]
+  ],
+  cmex10: [
+    [16,72,69,-9], [16,72,69,-2], [13,72,69,-11], [12,72,69,-1], [16,72,69,-11], [15,72,69,-1], [16,72,69,-11], [15,72,69,-1],
+    [22,72,69,-6], [22,72,69,-6], [19,72,69,-5], [18,72,69,-4], [4,39,37,-8], [17,39,37,-8], [28,72,69,-3], [28,72,69,-3],
+    [23,107,104,-10], [23,107,104,-2], [30,143,140,-12], [30,143,140,-2], [17,143,140,-14], [17,143,140], [20,143,140,-14], [20,143,140],
+    [20,143,140,-14], [20,143,140], [30,143,140,-7], [30,143,140,-7], [32,143,140,-7], [32,143,140,-5], [56,143,140,-3], [56,143,140,-3],
+    [32,178,175,-13], [31,178,175,-2], [18,178,175,-16], [19,178,175], [21,178,175,-16], [22,178,175], [21,178,175,-16], [22,178,175],
+    [31,178,175,-8], [31,178,175,-8], [34,178,175,-8], [34,178,175,-6], [69,178,175,-3], [69,178,175,-3], [42,107,104,-3], [42,107,104,-3],
+    [33,108,105,-17], [33,108,105,-2], [20,107,104,-19], [21,107,104], [20,107,104,-19], [21,107,104], [5,37,36,-19], [5,37,36,-16],
+    [21,54,54,-22], [20,54,54,-10], [21,54,53,-22], [20,54,53,-10], [20,108,107,-10], [21,108,107,-22], [8,20,19,-22], [3,37,36,-18],
+    [33,107,104,-17], [33,107,104,-2], [7,37,36,-17], [8,37,36,-27], [25,107,104,-6], [25,107,104,-5], [43,59,59,-3], [60,83,83,-3],
+    [33,66,66,-3], [53,132,132,-3], [60,59,59,-3], [83,83,83,-3], [60,59,59,-3], [83,83,83,-3], [60,59,59,-3], [83,83,83,-3],
+    [56,59,59,-3], [50,59,59,-3], [33,66,66,-3], [43,59,59,-3], [43,59,59,-3], [43,59,59,-3], [43,59,59,-3], [43,59,59,-3],
+    [79,83,83,-3], [69,83,83,-3], [53,132,132,-3], [60,83,83,-3], [60,83,83,-3], [60,83,83,-3], [60,83,83,-3], [60,83,83,-3],
+    [50,59,59,-3], [69,83,83,-3], [34,11,-33,1], [60,12,-34,1], [86,12,-34], [33,8,-35], [59,9,-36], [85,9,-36],
+    [14,107,104,-13], [14,107,104,-1], [17,107,104,-13], [17,107,104,-1], [17,107,104,-13], [17,107,104,-1], [26,107,104,-7], [26,107,104,-7],
+    [55,72,69,-6], [55,107,104,-6], [55,143,140,-6], [55,178,175,-6], [38,109,107,-6], [3,39,37,-41], [23,38,35,-41], [16,37,36,-15],
+    [27,36,36,-6], [27,36,36,-6], [30,21,13,2], [29,21,13,1], [30,20,0,2], [29,20,0,1], [40,36,36,-3], [40,35,35,-3],
+    [27,135,243,350,458,566,674,782,890,998,1106,1213,1321,1429,1537,1645],
+    [93,358,623,888,1153,1418,1683,1947],
+    [1762,2205]
+  ],
+  cmbx10: [
+    [36,41,0,-2], [50,42,0,-3], [46,43,1,-3], [44,42,0,-2], [41,40,0,-2], [49,41,0,-2], [43,41,0,-3], [46,42,0,-3],
+    [43,41,0,-3], [46,41,0,-3], [43,42,0,-3], [43,42,0,-1], [35,42,0,-1], [35,42,0,-1], [54,42,0,-1], [54,42,0,-1],
+    [15,27,0,-2], [20,39,12,4], [13,12,-30,-7], [13,12,-30,-14], [18,9,-30,-8], [22,12,-29,-6], [26,4,-32,-4], [15,11,-31,-18],
+    [19,12,12,-7], [32,43,1,-2], [46,28,1,-2], [50,28,1,-1], [31,40,7,-1], [58,41,0,-2], [63,43,1,-4], [46,48,4,-3],
+    [18,8,-16,-1], [10,42,0,-5], [26,21,-20,-2], [50,53,12,-3], [28,49,4,-3], [50,49,4,-3], [48,43,1,-2], [11,21,-20,-4],
+    [17,60,15,-6], [17,60,15,-3], [26,27,-18,-4], [46,46,8,-3], [11,22,12,-4], [19,6,-10], [10,10,0,-4], [28,60,15,-3],
+    [30,40,1,-2], [25,39,0,-5], [28,39,0,-3], [29,40,1,-2], [31,39,0,-1], [28,40,1,-3], [29,40,1,-2], [30,41,1,-3],
+    [29,40,1,-2], [29,40,1,-2], [10,27,0,-4], [11,39,12,-4], [10,43,13,-5], [46,18,-6,-3], [26,42,12,-3], [26,42,0,-3],
+    [46,43,1,-3], [47,42,0,-2], [43,41,0,-2], [43,43,1,-3], [47,41,0,-2], [41,41,0,-2], [38,41,0,-2], [47,43,1,-3],
+    [49,41,0,-2], [22,41,0,-2], [31,42,1,-1], [49,41,0,-2], [36,41,0,-2], [60,41,0,-2], [49,41,0,-2], [45,43,1,-3],
+    [41,41,0,-2], [45,54,12,-3], [49,42,1,-2], [31,43,1,-3], [43,40,0,-2], [48,42,1,-2], [49,42,1,-1], [68,42,1,-1],
+    [48,41,0,-2], [50,41,0,-1], [35,41,0,-3], [11,60,15,-7], [26,21,-20,-8], [11,60,15,-1], [19,10,-31,-7], [10,10,-31,-4],
+    [11,21,-20,-3], [32,28,1,-1], [34,42,1,-2], [27,28,1,-2], [34,42,1,-2], [29,28,1,-1], [24,42,0,-2], [32,39,12,-1],
+    [35,41,0,-2], [15,41,0,-2], [20,53,12,4], [33,41,0,-2], [16,41,0,-2], [54,27,0,-2], [35,27,0,-2], [31,28,1,-1],
+    [34,39,12,-2], [34,39,12,-2], [24,27,0,-2], [23,28,1,-2], [22,39,1,-1], [35,28,1,-2], [34,28,1,-1], [47,28,1,-1],
+    [34,27,0,-1], [34,39,12,-1], [27,27,0,-1], [34,3,-15], [68,3,-15], [21,12,-30,-8], [23,7,-34,-5], [22,9,-32,-6],
+    [25,110,195,280,364,449,534,619,704,789,874,959,1043,1128,1213,1298],
+    [77,149,220,292,363,434,506,577],
+    [1390,625],
+  ],
+  cmti10: [
+    [39,41,0,-3], [41,43,0,-4], [39,44,2,-8], [35,43,0,-3], [41,40,0,-4], [48,41,0,-3], [43,41,0,-4], [38,42,0,-12],
+    [34,41,0,-9], [37,41,0,-12], [40,42,0,-5], [47,55,13,2], [38,55,13,2], [40,55,13,2], [56,55,13,2], [58,55,13,2],
+    [15,28,1,-5], [21,39,13,2], [9,12,-29,-17], [13,12,-29,-20], [16,9,-29,-16], [18,11,-30,-16], [21,2,-33,-13], [12,12,-31,-28],
+    [14,12,12,-6], [37,55,13,2], [38,28,1,-5], [37,28,1,-6], [29,39,7,-4], [53,41,0,-3], [53,44,2,-9], [42,48,4,-7],
+    [16,8,-16,-5], [17,43,0,-6], [21,18,-23,-10], [43,53,12,-6], [37,43,1,-5], [42,49,4,-8], [41,45,2,-7], [9,18,-23,-13],
+    [22,60,15,-9], [22,60,15,-1], [24,27,-18,-11], [37,37,4,-8], [10,19,12,-4], [15,4,-11,-5], [7,7,0,-6], [36,60,15,-1],
+    [27,42,2,-6], [21,40,0,-7], [28,42,2,-5], [29,42,2,-5], [26,52,12,-2], [28,42,2,-6], [27,42,2,-7], [29,42,2,-8],
+    [28,42,2,-5], [27,42,2,-6], [12,26,0,-6], [14,38,12,-4], [16,43,13,-3], [40,15,-7,-6], [21,43,13,-5], [22,43,0,-11],
+    [39,43,1,-8], [38,43,0,-3], [41,41,0,-3], [40,44,2,-8], [43,41,0,-3], [41,41,0,-3], [41,41,0,-3], [40,44,2,-8],
+    [48,41,0,-3], [27,41,0,-3], [32,43,2,-5], [48,41,0,-3], [34,41,0,-3], [56,41,0,-4], [48,41,0,-3], [39,44,2,-8],
+    [40,41,0,-3], [39,54,12,-8], [40,43,2,-3], [34,44,2,-4], [38,40,0,-10], [40,43,2,-11], [40,43,2,-12], [54,43,2,-12],
+    [57,41,0,8], [40,41,0,-12], [38,41,0,-4], [23,60,15,-4], [20,18,-23,-16], [23,60,15,996], [16,10,-31,-15], [7,7,-33,-15],
+    [10,18,-23,-12], [26,27,1,-6], [21,42,1,-6], [22,28,1,-6], [27,42,1,-6], [22,28,1,-6], [29,54,12,2], [26,39,13,-3],
+    [28,42,1,-4], [15,40,1,-5], [23,52,13,2], [26,42,1,-4], [13,42,1,-5], [45,28,1,-5], [30,28,1,-5], [24,28,1,-6],
+    [31,38,12], [24,38,12,-6], [24,28,1,-5], [21,28,1,-4], [17,38,1,-5], [28,28,1,-5], [25,28,1,-5], [37,28,1,-5],
+    [28,28,1,-3], [26,40,13,-5], [25,28,1,-3], [28,2,-15,-5], [55,2,-15,-7], [18,11,-30,-16], [20,7,-33,-14], [17,7,-33,-16],
+    [24,97,170,243,316,389,462,535,608,681,754,827,900,973,1046,1119],
+    [77,149,220,292,363,434,506,577],
+    [1198,625]
+  ]
+});
+
diff --git a/htdocs/jsMath/uncompressed/jsMath-fallback-mac.js b/htdocs/jsMath/uncompressed/jsMath-fallback-mac.js
new file mode 100644
index 0000000000..a45476f372
--- /dev/null
+++ b/htdocs/jsMath/uncompressed/jsMath-fallback-mac.js
@@ -0,0 +1,970 @@
+/*
+ *  jsMath-fallback-mac.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file makes changes needed for when the TeX fonts are not available
+ *  with a browser on the Mac.
+ *
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 2004-2010 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+
+
+/********************************************************************
+ *
+ *  Here we replace the TeX character mappings by equivalent unicode
+ *  points when possible, and adjust the character dimensions
+ *  based on the fonts we hope we get them from (the styles are set
+ *  to try to use the best characters available in the standard
+ *  fonts).
+ */
+
+jsMath.Add(jsMath.TeX,{
+
+  cmr10: [
+    // 00 - 0F
+    {c: '&Gamma;', tclass: 'greek'},
+    {c: '&Delta;', tclass: 'greek'},
+    {c: '&Theta;', tclass: 'greek'},
+    {c: '&Lambda;', tclass: 'greek'},
+    {c: '&Xi;', tclass: 'greek'},
+    {c: '&Pi;', tclass: 'greek'},
+    {c: '&Sigma;', tclass: 'greek'},
+    {c: '&Upsilon;', tclass: 'greek'},
+    {c: '&Phi;', tclass: 'greek'},
+    {c: '&Psi;', tclass: 'greek'},
+    {c: '&Omega;', tclass: 'greek'},
+    {c: 'ff', ic: 0.0778, krn: {'39': 0.0778, '63': 0.0778, '33': 0.0778, '41': 0.0778, '93': 0.0778}, lig: {'105': 14, '108': 15}, tclass: 'normal'},
+    {c: 'fi', tclass: 'normal'},
+    {c: 'fl', tclass: 'normal'},
+    {c: 'ffi', tclass: 'normal'},
+    {c: 'ffl', tclass: 'normal'},
+    // 10 - 1F
+    {c: '&#x131;', a:0, tclass: 'normal'},
+    {c: 'j', d:.2, tclass: 'normal'},
+    {c: '&#x60;', tclass: 'accent'},
+    {c: '&#xB4;', tclass: 'accent'},
+    {c: '&#x2C7;', tclass: 'accent'},
+    {c: '&#x2D8;', tclass: 'accent'},
+    {c: '<span style="position:relative; top:.1em">&#x2C9;</span>', tclass: 'accent'},
+    {c: '&#x2DA;', tclass: 'accent'},
+    {c: '&#x0327;', tclass: 'normal'},
+    {c: '&#xDF;', tclass: 'normal'},
+    {c: '&#xE6;', a:0, tclass: 'normal'},
+    {c: '&#x153;', a:0, tclass: 'normal'},
+    {c: '&#xF8;', tclass: 'normal'},
+    {c: '&#xC6;', tclass: 'normal'},
+    {c: '&#x152;', tclass: 'normal'},
+    {c: '&#xD8;', tclass: 'normal'},
+    // 20 - 2F
+    {c: '?', krn: {'108': -0.278, '76': -0.319}, tclass: 'normal'},
+    {c: '!', lig: {'96': 60}, tclass: 'normal'},
+    {c: '&#x201D;', tclass: 'normal'},
+    {c: '#', tclass: 'normal'},
+    {c: '$', tclass: 'normal'},
+    {c: '%', tclass: 'normal'},
+    {c: '&amp;', tclass: 'normal'},
+    {c: '&#x2019;', krn: {'63': 0.111, '33': 0.111}, lig: {'39': 34}, tclass: 'normal'},
+    {c: '(', d:.2, tclass: 'normal'},
+    {c: ')', d:.2, tclass: 'normal'},
+    {c: '*', tclass: 'normal'},
+    {c: '+', a:.1, tclass: 'normal'},
+    {c: ',', a:-.3, d:.2, w: 0.278, tclass: 'normal'},
+    {c: '-', a:0, lig: {'45': 123}, tclass: 'normal'},
+    {c: '.', a:-.25, tclass: 'normal'},
+    {c: '/', tclass: 'normal'},
+    // 30 - 3F
+    {c: '0', tclass: 'normal'},
+    {c: '1', tclass: 'normal'},
+    {c: '2', tclass: 'normal'},
+    {c: '3', tclass: 'normal'},
+    {c: '4', tclass: 'normal'},
+    {c: '5', tclass: 'normal'},
+    {c: '6', tclass: 'normal'},
+    {c: '7', tclass: 'normal'},
+    {c: '8', tclass: 'normal'},
+    {c: '9', tclass: 'normal'},
+    {c: ':', tclass: 'normal'},
+    {c: ';', tclass: 'normal'},
+    {c: '&#xA1;', tclass: 'normal'},
+    {c: '=', a:0, d:-.1, tclass: 'normal'},
+    {c: '&#xBF;', tclass: 'normal'},
+    {c: '?', lig: {'96': 62}, tclass: 'normal'},
+    // 40 - 4F
+    {c: '@', tclass: 'normal'},
+    {c: 'A', krn: {'116': -0.0278, '67': -0.0278, '79': -0.0278, '71': -0.0278, '85': -0.0278, '81': -0.0278, '84': -0.0833, '89': -0.0833, '86': -0.111, '87': -0.111}, tclass: 'normal'},
+    {c: 'B', tclass: 'normal'},
+    {c: 'C', tclass: 'normal'},
+    {c: 'D', krn: {'88': -0.0278, '87': -0.0278, '65': -0.0278, '86': -0.0278, '89': -0.0278}, tclass: 'normal'},
+    {c: 'E', tclass: 'normal'},
+    {c: 'F', krn: {'111': -0.0833, '101': -0.0833, '117': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.111, '79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}, tclass: 'normal'},
+    {c: 'G', tclass: 'normal'},
+    {c: 'H', tclass: 'normal'},
+    {c: 'I', krn: {'73': 0.0278}, tclass: 'normal'},
+    {c: 'J', tclass: 'normal'},
+    {c: 'K', krn: {'79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}, tclass: 'normal'},
+    {c: 'L', krn: {'84': -0.0833, '89': -0.0833, '86': -0.111, '87': -0.111}, tclass: 'normal'},
+    {c: 'M', tclass: 'normal'},
+    {c: 'N', tclass: 'normal'},
+    {c: 'O', krn: {'88': -0.0278, '87': -0.0278, '65': -0.0278, '86': -0.0278, '89': -0.0278}, tclass: 'normal'},
+    // 50 - 5F
+    {c: 'P', krn: {'65': -0.0833, '111': -0.0278, '101': -0.0278, '97': -0.0278, '46': -0.0833, '44': -0.0833}, tclass: 'normal'},
+    {c: 'Q', d:.1, tclass: 'normal'},
+    {c: 'R', krn: {'116': -0.0278, '67': -0.0278, '79': -0.0278, '71': -0.0278, '85': -0.0278, '81': -0.0278, '84': -0.0833, '89': -0.0833, '86': -0.111, '87': -0.111}, tclass: 'normal'},
+    {c: 'S', tclass: 'normal'},
+    {c: 'T', krn: {'121': -0.0278, '101': -0.0833, '111': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.0833, '117': -0.0833}, tclass: 'normal'},
+    {c: 'U', tclass: 'normal'},
+    {c: 'V', ic: 0.0139, krn: {'111': -0.0833, '101': -0.0833, '117': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.111, '79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}, tclass: 'normal'},
+    {c: 'W', ic: 0.0139, krn: {'111': -0.0833, '101': -0.0833, '117': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.111, '79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}, tclass: 'normal'},
+    {c: 'X', krn: {'79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}, tclass: 'normal'},
+    {c: 'Y', ic: 0.025, krn: {'101': -0.0833, '111': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.0833, '117': -0.0833}, tclass: 'normal'},
+    {c: 'Z', tclass: 'normal'},
+    {c: '[', d:.1, tclass: 'normal'},
+    {c: '&#x201C;', tclass: 'normal'},
+    {c: ']', d:.1, tclass: 'normal'},
+    {c: '&#x2C6;', tclass: 'accent'},
+    {c: '&#x2D9;', tclass: 'accent'},
+    // 60 - 6F
+    {c: '&#x2018;', lig: {'96': 92}, tclass: 'normal'},
+    {c: 'a', a:0, krn: {'118': -0.0278, '106': 0.0556, '121': -0.0278, '119': -0.0278}, tclass: 'normal'},
+    {c: 'b', krn: {'101': 0.0278, '111': 0.0278, '120': -0.0278, '100': 0.0278, '99': 0.0278, '113': 0.0278, '118': -0.0278, '106': 0.0556, '121': -0.0278, '119': -0.0278}, tclass: 'normal'},
+    {c: 'c', a:0, krn: {'104': -0.0278, '107': -0.0278}, tclass: 'normal'},
+    {c: 'd', tclass: 'normal'},
+    {c: 'e', a:0, tclass: 'normal'},
+    {c: 'f', ic: 0.0778, krn: {'39': 0.0778, '63': 0.0778, '33': 0.0778, '41': 0.0778, '93': 0.0778}, lig: {'105': 12, '102': 11, '108': 13}, tclass: 'normal'},
+    {c: 'g', a:0, d:.2, ic: 0.0139, krn: {'106': 0.0278}, tclass: 'normal'},
+    {c: 'h', krn: {'116': -0.0278, '117': -0.0278, '98': -0.0278, '121': -0.0278, '118': -0.0278, '119': -0.0278}, tclass: 'normal'},
+    {c: 'i', tclass: 'normal'},
+    {c: 'j', d:.2, tclass: 'normal'},
+    {c: 'k', krn: {'97': -0.0556, '101': -0.0278, '97': -0.0278, '111': -0.0278, '99': -0.0278}, tclass: 'normal'},
+    {c: 'l', tclass: 'normal'},
+    {c: 'm', a:0, krn: {'116': -0.0278, '117': -0.0278, '98': -0.0278, '121': -0.0278, '118': -0.0278, '119': -0.0278}, tclass: 'normal'},
+    {c: 'n', a:0, krn: {'116': -0.0278, '117': -0.0278, '98': -0.0278, '121': -0.0278, '118': -0.0278, '119': -0.0278}, tclass: 'normal'},
+    {c: 'o', a:0, krn: {'101': 0.0278, '111': 0.0278, '120': -0.0278, '100': 0.0278, '99': 0.0278, '113': 0.0278, '118': -0.0278, '106': 0.0556, '121': -0.0278, '119': -0.0278}, tclass: 'normal'},
+    // 70 - 7F
+    {c: 'p', a:0, d:.2, krn: {'101': 0.0278, '111': 0.0278, '120': -0.0278, '100': 0.0278, '99': 0.0278, '113': 0.0278, '118': -0.0278, '106': 0.0556, '121': -0.0278, '119': -0.0278}, tclass: 'normal'},
+    {c: 'q', a:0, d:.2, tclass: 'normal'},
+    {c: 'r', a:0, tclass: 'normal'},
+    {c: 's', a:0, tclass: 'normal'},
+    {c: 't', krn: {'121': -0.0278, '119': -0.0278}, tclass: 'normal'},
+    {c: 'u', a:0, krn: {'119': -0.0278}, tclass: 'normal'},
+    {c: 'v', a:0, ic: 0.0139, krn: {'97': -0.0556, '101': -0.0278, '97': -0.0278, '111': -0.0278, '99': -0.0278}, tclass: 'normal'},
+    {c: 'w', a:0, ic: 0.0139, krn: {'101': -0.0278, '97': -0.0278, '111': -0.0278, '99': -0.0278}, tclass: 'normal'},
+    {c: 'x', a:0, tclass: 'normal'},
+    {c: 'y', a:0, d:.2, ic: 0.0139, krn: {'111': -0.0278, '101': -0.0278, '97': -0.0278, '46': -0.0833, '44': -0.0833}, tclass: 'normal'},
+    {c: 'z', a:0, tclass: 'normal'},
+    {c: '&#x2013;', a:.1, ic: 0.0278, lig: {'45': 124}, tclass: 'normal'},
+    {c: '&#x2014;', a:.1, ic: 0.0278, tclass: 'normal'},
+    {c: '&#x2DD;', tclass: 'accent'},
+    {c: '&#x2DC;', tclass: 'accent'},
+    {c: '&#xA8;', tclass: 'accent'}
+  ],
+  
+  cmmi10: [
+    // 00 - 0F
+    {c: '&Gamma;', ic: 0.139, krn: {'61': -0.0556, '59': -0.111, '58': -0.111, '127': 0.0833}, tclass: 'igreek'},
+    {c: '&Delta;', krn: {'127': 0.167}, tclass: 'igreek'},
+    {c: '&Theta;', ic: 0.0278, krn: {'127': 0.0833}, tclass: 'igreek'},
+    {c: '&Lambda;', krn: {'127': 0.167}, tclass: 'igreek'},
+    {c: '&Xi;', ic: 0.0757, krn: {'127': 0.0833}, tclass: 'igreek'},
+    {c: '&Pi;', ic: 0.0812, krn: {'61': -0.0556, '59': -0.0556, '58': -0.0556, '127': 0.0556}, tclass: 'igreek'},
+    {c: '&Sigma;', ic: 0.0576, krn: {'127': 0.0833}, tclass: 'igreek'},
+    {c: '&Upsilon;', ic: 0.139, krn: {'61': -0.0556, '59': -0.111, '58': -0.111, '127': 0.0556}, tclass: 'igreek'},
+    {c: '&Phi;', krn: {'127': 0.0833}, tclass: 'igreek'},
+    {c: '&Psi;', ic: 0.11, krn: {'61': -0.0556, '59': -0.0556, '58': -0.0556, '127': 0.0556}, tclass: 'igreek'},
+    {c: '&Omega;', ic: 0.0502, krn: {'127': 0.0833}, tclass: 'igreek'},
+    {c: '&alpha;', a:.1, ic: 0.0037, krn: {'127': 0.0278}, tclass: 'greek'},
+    {c: '&beta;', d:.1, ic: 0.0528, krn: {'127': 0.0833}, tclass: 'greek'},
+    {c: '&gamma;', a:.1, d:.1, ic: 0.0556, tclass: 'greek'},
+    {c: '&delta;', ic: 0.0378, krn: {'59': -0.0556, '58': -0.0556, '127': 0.0556}, tclass: 'greek'},
+    {c: '&epsilon;', a:0, krn: {'127': 0.0556}, tclass: 'lucida'},
+    // 10 - 1F
+    {c: '&zeta;', d:.1, ic: 0.0738, krn: {'127': 0.0833}, tclass: 'greek'},
+    {c: '&eta;', a:.1, d:.1, ic: 0.0359, krn: {'127': 0.0556}, tclass: 'greek'},
+    {c: '&theta;', ic: 0.0278, krn: {'127': 0.0833}, tclass: 'greek'},
+    {c: '&iota;', a:.1, krn: {'127': 0.0556}, tclass: 'greek'},
+    {c: '&kappa;', a:.1, tclass: 'greek'},
+    {c: '&lambda;', tclass: 'greek'},
+    {c: '&mu;', a:.1, d:.1, krn: {'127': 0.0278}, tclass: 'greek'},
+    {c: '&nu;', a:.1, ic: 0.0637, krn: {'59': -0.0556, '58': -0.0556, '127': 0.0278}, tclass: 'greek'},
+    {c: '&xi;', d:.1, ic: 0.046, krn: {'127': 0.111}, tclass: 'greek'},
+    {c: '&pi;', a:.1, ic: 0.0359, tclass: 'greek'},
+    {c: '&rho;', a:.1, d:.1, krn: {'127': 0.0833}, tclass: 'greek'},
+    {c: '&sigma;', a:.1, ic: 0.0359, krn: {'59': -0.0556, '58': -0.0556}, tclass: 'greek'},
+    {c: '&tau;', a:.1, ic: 0.113, krn: {'59': -0.0556, '58': -0.0556, '127': 0.0278}, tclass: 'greek'},
+    {c: '&upsilon;', a:.1, ic: 0.0359, krn: {'127': 0.0278}, tclass: 'greek'},
+    {c: '&phi;', a:.3, d:.1, krn: {'127': 0.0833}, tclass: 'greek'},
+    {c: '&chi;', a:.1, d:.1, krn: {'127': 0.0556}, tclass: 'greek'},
+    // 20 - 2F
+    {c: '&psi;', a:.3, d:.1, ic: 0.0359, krn: {'127': 0.111}, tclass: 'greek'},
+    {c: '&omega;', a:.1, ic: 0.0359, tclass: 'greek'},
+    {c: '&epsilon;', a:.1, krn: {'127': 0.0833}, tclass: 'greek'},
+    {c: '&#x3D1;', krn: {'127': 0.0833}, tclass: 'greek'},
+    {c: '&#x3D6;', a:.1, ic: 0.0278, tclass: 'lucida'},
+    {c: '&#x3F1;', a:.1, d:.2, krn: {'127': 0.0833}, tclass: 'lucida'},
+    {c: '&#x3C2;', a:.1, d:.2, ic: 0.0799, krn: {'127': 0.0833}, tclass: 'greek'},
+    {c: '&#x3D5;', a:.1, d:.1, krn: {'127': 0.0833}, tclass: 'greek'},
+    {c: '&#x21BC;', a:0, d:-.2, tclass: 'harpoon'},
+    {c: '&#x21BD;', a:0, d:-.1, tclass: 'harpoon'},
+    {c: '&#x21C0;', a:0, d:-.2, tclass: 'harpoon'},
+    {c: '&#x21C1;', a:0, d:-.1, tclass: 'harpoon'},
+    {c: '<span style="font-size: 133%; position:relative; top:.1em; margin:-.2em; left:-.05em">&#x02D3;</span>', a:.1, tclass: 'lucida'},
+    {c: '<span style="font-size: 133%; position:relative; top:.1em; margin:-.2em; left:-.05em">&#x02D2;</span>', a:.1, tclass: 'lucida'},
+    {c: '<span style="font-size:50%">&#x25B7;</span>', a:0, tclass: 'symbol'},
+    {c: '<span style="font-size:50%">&#x25C1;</span>', a:0, tclass: 'symbol'},
+    // 30 - 3F
+    {c: '0', tclass: 'normal'},
+    {c: '1', tclass: 'normal'},
+    {c: '2', tclass: 'normal'},
+    {c: '3', tclass: 'normal'},
+    {c: '4', tclass: 'normal'},
+    {c: '5', tclass: 'normal'},
+    {c: '6', tclass: 'normal'},
+    {c: '7', tclass: 'normal'},
+    {c: '8', tclass: 'normal'},
+    {c: '9', tclass: 'normal'},
+    {c: '.', a:-.3, tclass: 'normal'},
+    {c: ',', a:-.3, d:.2, tclass: 'normal'},
+    {c: '&lt;', a:.1, tclass: 'normal'},
+    {c: '<span style="font-size:133%; position:relative; top:.1em">/</span>', d:.1, krn: {'1': -0.0556, '65': -0.0556, '77': -0.0556, '78': -0.0556, '89': 0.0556, '90': -0.0556}, tclass: 'normal'},
+    {c: '&gt;', a:.1, tclass: 'normal'},
+    {c: '<span style="font-size:50%">&#x2605;</span>', a:0, tclass: 'symbol'},
+    // 40 - 4F
+    {c: '&#x2202;', ic: 0.0556, krn: {'127': 0.0833}, tclass: 'normal'},
+    {c: 'A', krn: {'127': 0.139}, tclass: 'italic'},
+    {c: 'B', ic: 0.0502, krn: {'127': 0.0833}, tclass: 'italic'},
+    {c: 'C', ic: 0.0715, krn: {'61': -0.0278, '59': -0.0556, '58': -0.0556, '127': 0.0833}, tclass: 'italic'},
+    {c: 'D', ic: 0.0278, krn: {'127': 0.0556}, tclass: 'italic'},
+    {c: 'E', ic: 0.0576, krn: {'127': 0.0833}, tclass: 'italic'},
+    {c: 'F', ic: 0.139, krn: {'61': -0.0556, '59': -0.111, '58': -0.111, '127': 0.0833}, tclass: 'italic'},
+    {c: 'G', krn: {'127': 0.0833}, tclass: 'italic'},
+    {c: 'H', ic: 0.0812, krn: {'61': -0.0556, '59': -0.0556, '58': -0.0556, '127': 0.0556}, tclass: 'italic'},
+    {c: 'I', ic: 0.0785, krn: {'127': 0.111}, tclass: 'italic'},
+    {c: 'J', ic: 0.0962, krn: {'61': -0.0556, '59': -0.111, '58': -0.111, '127': 0.167}, tclass: 'italic'},
+    {c: 'K', ic: 0.0715, krn: {'61': -0.0556, '59': -0.0556, '58': -0.0556, '127': 0.0556}, tclass: 'italic'},
+    {c: 'L', krn: {'127': 0.0278}, tclass: 'italic'},
+    {c: 'M', ic: 0.109, krn: {'61': -0.0556, '59': -0.0556, '58': -0.0556, '127': 0.0833}, tclass: 'italic'},
+    {c: 'N', ic: 0.109, krn: {'61': -0.0833, '61': -0.0278, '59': -0.0556, '58': -0.0556, '127': 0.0833}, tclass: 'italic'},
+    {c: 'O', ic: 0.0278, krn: {'127': 0.0833}, tclass: 'italic'},
+    // 50 - 5F
+    {c: 'P', ic: 0.139, krn: {'61': -0.0556, '59': -0.111, '58': -0.111, '127': 0.0833}, tclass: 'italic'},
+    {c: 'Q', d:.2, krn: {'127': 0.0833}, tclass: 'italic'},
+    {c: 'R', ic: 0.00773, krn: {'127': 0.0833}, tclass: 'italic'},
+    {c: 'S', ic: 0.0576, krn: {'61': -0.0556, '59': -0.0556, '58': -0.0556, '127': 0.0833}, tclass: 'italic'},
+    {c: 'T', ic: 0.139, krn: {'61': -0.0278, '59': -0.0556, '58': -0.0556, '127': 0.0833}, tclass: 'italic'},
+    {c: 'U', ic: 0.109, krn: {'59': -0.111, '58': -0.111, '61': -0.0556, '127': 0.0278}, tclass: 'italic'},
+    {c: 'V', ic: 0.222, krn: {'59': -0.167, '58': -0.167, '61': -0.111}, tclass: 'italic'},
+    {c: 'W', ic: 0.139, krn: {'59': -0.167, '58': -0.167, '61': -0.111}, tclass: 'italic'},
+    {c: 'X', ic: 0.0785, krn: {'61': -0.0833, '61': -0.0278, '59': -0.0556, '58': -0.0556, '127': 0.0833}, tclass: 'italic'},
+    {c: 'Y', ic: 0.222, krn: {'59': -0.167, '58': -0.167, '61': -0.111}, tclass: 'italic'},
+    {c: 'Z', ic: 0.0715, krn: {'61': -0.0556, '59': -0.0556, '58': -0.0556, '127': 0.0833}, tclass: 'italic'},
+    {c: '&#x266D;', tclass: 'symbol2'},
+    {c: '&#x266E;', tclass: 'symbol2'},
+    {c: '&#x266F;', tclass: 'symbol2'},
+    {c: '<span style="position: relative; top:.5em">&#x2323;</span>', a:0, d:-.1, tclass: 'normal'},
+    {c: '<span style="position: relative; top:-.3em">&#x2322;</span>', a:0, d:-.1, tclass: 'normal'},
+    // 60 - 6F
+    {c: '<span style="margin:-.2em">&#x2113;</span>', krn: {'127': 0.111}, tclass: 'symbol'},
+    {c: 'a', a:0, tclass: 'italic'},
+    {c: 'b', tclass: 'italic'},
+    {c: 'c', a:0, krn: {'127': 0.0556}, tclass: 'italic'},
+    {c: 'd', krn: {'89': 0.0556, '90': -0.0556, '106': -0.111, '102': -0.167, '127': 0.167}, tclass: 'italic'},
+    {c: 'e', a:0, krn: {'127': 0.0556}, tclass: 'italic'},
+    {c: 'f', d:.2, ic: 0.108, krn: {'59': -0.0556, '58': -0.0556, '127': 0.167}, tclass: 'italic'},
+    {c: 'g', a:0, d:.2, ic: 0.0359, krn: {'127': 0.0278}, tclass: 'italic'},
+    {c: 'h', krn: {'127': -0.0278}, tclass: 'italic'},
+    {c: 'i', tclass: 'italic'},
+    {c: 'j', d:.2, ic: 0.0572, krn: {'59': -0.0556, '58': -0.0556}, tclass: 'italic'},
+    {c: 'k', ic: 0.0315, tclass: 'italic'},
+    {c: 'l', ic: 0.0197, krn: {'127': 0.0833}, tclass: 'italic'},
+    {c: 'm', a:0, tclass: 'italic'},
+    {c: 'n', a:0, tclass: 'italic'},
+    {c: 'o', a:0, krn: {'127': 0.0556}, tclass: 'italic'},
+    // 70 - 7F
+    {c: 'p', a:0, d:.2, krn: {'127': 0.0833}, tclass: 'italic'},
+    {c: 'q', a:0, d:.2, ic: 0.0359, krn: {'127': 0.0833}, tclass: 'italic'},
+    {c: 'r', a:0, ic: 0.0278, krn: {'59': -0.0556, '58': -0.0556, '127': 0.0556}, tclass: 'italic'},
+    {c: 's', a:0, krn: {'127': 0.0556}, tclass: 'italic'},
+    {c: 't', krn: {'127': 0.0833}, tclass: 'italic'},
+    {c: 'u', a:0, krn: {'127': 0.0278}, tclass: 'italic'},
+    {c: 'v', a:0, ic: 0.0359, krn: {'127': 0.0278}, tclass: 'italic'},
+    {c: 'w', a:0, ic: 0.0269, krn: {'127': 0.0833}, tclass: 'italic'},
+    {c: 'x', a:0, krn: {'127': 0.0278}, tclass: 'italic'},
+    {c: 'y', a:0, d:.2, ic: 0.0359, krn: {'127': 0.0556}, tclass: 'italic'},
+    {c: 'z', a:0, ic: 0.044, krn: {'127': 0.0556}, tclass: 'italic'},
+    {c: '&#x131;', a:0, krn: {'127': 0.0278}, tclass: 'italic'},
+    {c: '&#x237;', a:0, d:.2, krn: {'127': 0.0833}, tclass: 'italic'},
+    {c: '&#x2118;', d:0, krn: {'127': 0.111}, tclass: 'asymbol'},
+    {c: '<span style="position:relative; left: .4em; top: -.8em; font-size: 50%">&#x2192;</span>', ic: 0.154, tclass: 'symbol'},
+    {c: '&#x0311;', ic: 0.399, tclass: 'normal'}
+  ],
+
+  cmsy10: [
+    // 00 - 0F
+    {c: '&#x2212;', a:.1, tclass: 'symbol'},
+    {c: '&#xB7;', a:0, d:-.2, tclass: 'symbol'},
+    {c: '&#xD7;', a:0, tclass: 'symbol'},
+    {c: '<span style="position:relative; top:.3em">&#x2A;</span>', a:0, tclass: 'symbol'},
+    {c: '&#xF7;', a:0, tclass: 'symbol'},
+    {c: '&#x25CA;', tclass: 'lucida'},
+    {c: '&#xB1;', a:.1, tclass: 'symbol'},
+    {c: '&#x2213;', tclass: 'symbol'},
+    {c: '&#x2295;', tclass: 'symbol'},
+    {c: '&#x2296;', tclass: 'symbol'},
+    {c: '&#x2297;', tclass: 'symbol'},
+    {c: '&#x2298;', tclass: 'symbol'},
+    {c: '&#x2299;', tclass: 'symbol3'},
+    {c: '&#x25EF;', tclass: 'symbol'},
+    {c: '<span style="position:relative; top:.25em;">&#xB0;</span>', a:.3, d:-.3, tclass: 'symbol'},
+    {c: '&#x2022;', a:.2, d:-.25, tclass: 'symbol'},
+    // 10 - 1F
+    {c: '&#x224D;', a:.1, tclass: 'symbol'},
+    {c: '&#x2261;', a:.1, tclass: 'symbol'},
+    {c: '&#x2286;', tclass: 'symbol'},
+    {c: '&#x2287;', tclass: 'symbol'},
+    {c: '&#x2264;', tclass: 'symbol'},
+    {c: '&#x2265;', tclass: 'symbol'},
+    {c: '&#x2AAF;', tclass: 'symbol'},
+    {c: '&#x2AB0;', tclass: 'symbol'},
+    {c: '~', a:0, d: -.2, tclass: 'normal'},
+    {c: '&#x2248;', a:.1, d:-.1, tclass: 'symbol'},
+    {c: '&#x2282;', tclass: 'symbol'},
+    {c: '&#x2283;', tclass: 'symbol'},
+    {c: '&#x226A;', tclass: 'symbol'},
+    {c: '&#x226B;', tclass: 'symbol'},
+    {c: '&#x227A;', tclass: 'symbol'},
+    {c: '&#x227B;', tclass: 'symbol'},
+    // 20 - 2F
+    {c: '&#x2190;', a:0, d:-.15, tclass: 'arrows'},
+    {c: '&#x2192;', a:0, d:-.15, tclass: 'arrows'},
+    {c: '&#x2191;', h:.85, tclass: 'arrow1a'},
+    {c: '&#x2193;', h:.85, tclass: 'arrow1a'},
+    {c: '&#x2194;', a:0, tclass: 'arrow1'},
+    {c: '&#x2197;', h:.85, d:.1, tclass: 'arrows'},
+    {c: '&#x2198;', h:.85, d:.1, tclass: 'arrows'},
+    {c: '&#x2243;', a: .1, tclass: 'symbol'},
+    {c: '&#x21D0;', a:.1, tclass: 'arrows'},
+    {c: '&#x21D2;', a:.1, tclass: 'arrows'},
+    {c: '&#x21D1;', h:.7, tclass: 'asymbol'},
+    {c: '&#x21D3;', h:.7, tclass: 'asymbol'},
+    {c: '&#x21D4;', a:.1, tclass: 'arrows'},
+    {c: '&#x2196;', h:.85, d:.1, tclass: 'arrows'},
+    {c: '&#x2199;', h:.85, d:.1, tclass: 'arrows'},
+    {c: '&#x221D;', a:.1, d:-.1, tclass: 'symbol'},
+    // 30 - 3F
+    {c: '<span style="font-size: 133%; margin-right: -.1em; position: relative; top:.4em">&#x2032;</span>', a: 0, tclass: 'lucida'},
+    {c: '&#x221E;', a:.1, tclass: 'symbol'},
+    {c: '&#x2208;', tclass: 'symbol'},
+    {c: '&#x220B;', tclass: 'symbol'},
+    {c: '&#x25B3;', tclass: 'symbol'},
+    {c: '&#x25BD;', tclass: 'symbol'},
+    {c: '/', tclass: 'symbol'},
+    {c: '<span style="font-size:50%; position:relative; top:-.3em; margin-right:-.2em">|</span>', a:0, tclass: 'normal'},
+    {c: '&#x2200;', tclass: 'symbol'},
+    {c: '&#x2203;', tclass: 'symbol'},
+    {c: '&#xAC;', a:0, d:-.1, tclass: 'symbol1'},
+    {c: '&#x2205;', tclass: 'symbol'},
+    {c: '&#x211C;', tclass: 'asymbol'},
+    {c: '&#x2111;', tclass: 'asymbol'},
+    {c: '&#x22A4;', tclass: 'symbol'},
+    {c: '&#x22A5;', tclass: 'symbol'},
+    // 40 - 4F
+    {c: '&#x2135;', tclass: 'symbol'},
+    {c: 'A', krn: {'48': 0.194}, tclass: 'cal'},
+    {c: 'B', ic: 0.0304, krn: {'48': 0.139}, tclass: 'cal'},
+    {c: 'C', ic: 0.0583, krn: {'48': 0.139}, tclass: 'cal'},
+    {c: 'D', ic: 0.0278, krn: {'48': 0.0833}, tclass: 'cal'},
+    {c: 'E', ic: 0.0894, krn: {'48': 0.111}, tclass: 'cal'},
+    {c: 'F', ic: 0.0993, krn: {'48': 0.111}, tclass: 'cal'},
+    {c: 'G', d:.2, ic: 0.0593, krn: {'48': 0.111}, tclass: 'cal'},
+    {c: 'H', ic: 0.00965, krn: {'48': 0.111}, tclass: 'cal'},
+    {c: 'I', ic: 0.0738, krn: {'48': 0.0278}, tclass: 'cal'},
+    {c: 'J', d:.2, ic: 0.185, krn: {'48': 0.167}, tclass: 'cal'},
+    {c: 'K', ic: 0.0144, krn: {'48': 0.0556}, tclass: 'cal'},
+    {c: 'L', krn: {'48': 0.139}, tclass: 'cal'},
+    {c: 'M', krn: {'48': 0.139}, tclass: 'cal'},
+    {c: 'N', ic: 0.147, krn: {'48': 0.0833}, tclass: 'cal'},
+    {c: 'O', ic: 0.0278, krn: {'48': 0.111}, tclass: 'cal'},
+    // 50 - 5F
+    {c: 'P', ic: 0.0822, krn: {'48': 0.0833}, tclass: 'cal'},
+    {c: 'Q', d:.2, krn: {'48': 0.111}, tclass: 'cal'},
+    {c: 'R', krn: {'48': 0.0833}, tclass: 'cal'},
+    {c: 'S', ic: 0.075, krn: {'48': 0.139}, tclass: 'cal'},
+    {c: 'T', ic: 0.254, krn: {'48': 0.0278}, tclass: 'cal'},
+    {c: 'U', ic: 0.0993, krn: {'48': 0.0833}, tclass: 'cal'},
+    {c: 'V', ic: 0.0822, krn: {'48': 0.0278}, tclass: 'cal'},
+    {c: 'W', ic: 0.0822, krn: {'48': 0.0833}, tclass: 'cal'},
+    {c: 'X', ic: 0.146, krn: {'48': 0.139}, tclass: 'cal'},
+    {c: 'Y', ic: 0.0822, krn: {'48': 0.0833}, tclass: 'cal'},
+    {c: 'Z', ic: 0.0794, krn: {'48': 0.139}, tclass: 'cal'},
+    {c: '&#x22C3;', tclass: 'symbol'},
+    {c: '&#x22C2;', tclass: 'symbol'},
+    {c: '&#x228E;', tclass: 'symbol'},
+    {c: '&#x22C0;', tclass: 'symbol'},
+    {c: '&#x22C1;', tclass: 'symbol'},
+    // 60 - 6F
+    {c: '&#x22A2;', tclass: 'symbol'},
+    {c: '&#x22A3;', tclass: 'symbol'},
+    {c: '&#x23A3;', h:1, d:.3, tclass: 'asymbol'},
+    {c: '&#x23A6;', h:1, d:.3, tclass: 'asymbol'},
+    {c: '&#x23A1;', h:1, d:.3, tclass: 'asymbol'},
+    {c: '&#x23A4;', h:1, d:.3, tclass: 'asymbol'},
+    {c: '{', d:.2, tclass: 'normal'},
+    {c: '}', d:.2, tclass: 'normal'},
+    {c: '&#x27E8;', h:.9, d:.1, tclass: 'asymbol'},
+    {c: '&#x27E9;', h:.9, d:.1, tclass: 'asymbol'},
+    {c: '|', d:.2, tclass: 'vertical'},
+    {c: '||', d:.2, tclass: 'vertical'},
+    {c: '&#x2195;', d:.1, tclass: 'arrow1'},
+    {c: '&#x21D5;', d:.1, tclass: 'arrow1'},
+    {c: '<span style="margin:-.1em">&#x2216;</span>', a:.3, d:.1, tclass: 'lucida'},
+    {c: '&#x2240;', tclass: 'asymbol'},
+    // 70 - 7F
+    {c: '<span style="position:relative; top: .86em">&#x221A;</span>', h:.04, d:.9, tclass: 'lucida'},
+    {c: '&#x2210;', d:.1, tclass: 'symbol'},
+    {c: '&#x2207;', tclass: 'symbol'},
+    {c: '&#x222B;', h:1, d:.1, ic: 0.111, tclass: 'root'},
+    {c: '&#x2294;', tclass: 'symbol'},
+    {c: '&#x2293;', tclass: 'symbol'},
+    {c: '&#x2291;', tclass: 'symbol'},
+    {c: '&#x2292;', tclass: 'symbol'},
+    {c: '&#xA7;', d:.1, tclass: 'normal'},
+    {c: '&#x2020;', d:.1, tclass: 'normal'},
+    {c: '&#x2021;', d:.1, tclass: 'normal'},
+    {c: '&#xB6;', a:.3, d:.1, tclass: 'lucida'},
+    {c: '&#x2663;', tclass: 'symbol'},
+    {c: '&#x2666;', tclass: 'symbol'},
+    {c: '&#x2665;', tclass: 'symbol'},
+    {c: '&#x2660;', tclass: 'symbol'}
+  ],
+
+  cmex10: [
+    // 00 - 0F
+    {c: '(', h: 0.04, d: 1.16, n: 16, tclass: 'delim1'},
+    {c: ')', h: 0.04, d: 1.16, n: 17, tclass: 'delim1'},
+    {c: '[', h: 0.04, d: 1.16, n: 104, tclass: 'delim1'},
+    {c: ']', h: 0.04, d: 1.16, n: 105, tclass: 'delim1'},
+    {c: '&#x23A3', h: 0.04, d: 1.16, n: 106, tclass: 'delim1a'},
+    {c: '&#x23A6;', h: 0.04, d: 1.16, n: 107, tclass: 'delim1a'},
+    {c: '&#x23A1;', h: 0.04, d: 1.16, n: 108, tclass: 'delim1a'},
+    {c: '&#x23A4;', h: 0.04, d: 1.16, n: 109, tclass: 'delim1a'},
+    {c: '{', h: 0.04, d: 1.16, n: 110, tclass: 'delim1'},
+    {c: '}', h: 0.04, d: 1.16, n: 111, tclass: 'delim1'},
+    {c: '&#x3008;', h: 0.04, d: 1.16, n: 68, tclass: 'delim1c'},
+    {c: '&#x3009;', h: 0.04, d: 1.16, n: 69, tclass: 'delim1c'},
+    {c: '|', h:.7, d:.15, delim: {rep: 12}, tclass: 'vertical1'},
+    {c: '||', h:.7, d:.15, delim: {rep: 13}, tclass: 'vertical1'},
+    {c: '&#x2215;', h: 0.04, d: 1.16, n: 46, tclass: 'delim1b'},
+    {c: '&#x2216;', h: 0.04, d: 1.16, n: 47, tclass: 'delim1b'},
+    // 10 - 1F
+    {c: '(', h: 0.04, d: 1.76, n: 18, tclass: 'delim2'},
+    {c: ')', h: 0.04, d: 1.76, n: 19, tclass: 'delim2'},
+    {c: '(', h: 0.04, d: 2.36, n: 32, tclass: 'delim3'},
+    {c: ')', h: 0.04, d: 2.36, n: 33, tclass: 'delim3'},
+    {c: '[', h: 0.04, d: 2.36, n: 34, tclass: 'delim3'},
+    {c: ']', h: 0.04, d: 2.36, n: 35, tclass: 'delim3'},
+    {c: '&#x23A3;', h: 0.04, d: 2.36, n: 36, tclass: 'delim3a'},
+    {c: '&#x23A6;', h: 0.04, d: 2.36, n: 37, tclass: 'delim3a'},
+    {c: '&#x23A1;', h: 0.04, d: 2.36, n: 38, tclass: 'delim3a'},
+    {c: '&#x23A4;', h: 0.04, d: 2.36, n: 39, tclass: 'delim3a'},
+    {c: '<span style="margin: -.1em">{</span>', h: 0.04, d: 2.36, n: 40, tclass: 'delim3'},
+    {c: '<span style="margin: -.1em">}</span>', h: 0.04, d: 2.36, n: 41, tclass: 'delim3'},
+    {c: '&#x3008;', h: 0.04, d: 2.36, n: 42, tclass: 'delim3c'},
+    {c: '&#x3009;', h: 0.04, d: 2.36, n: 43, tclass: 'delim3c'},
+    {c: '&#x2215;', h: 0.04, d: 2.36, n: 44, tclass: 'delim3b'},
+    {c: '&#x2216;', h: 0.04, d: 2.36, n: 45, tclass: 'delim3b'},
+    // 20 - 2F
+    {c: '(', h: 0.04, d: 2.96, n: 48, tclass: 'delim4'},
+    {c: ')', h: 0.04, d: 2.96, n: 49, tclass: 'delim4'},
+    {c: '[', h: 0.04, d: 2.96, n: 50, tclass: 'delim4'},
+    {c: ']', h: 0.04, d: 2.96, n: 51, tclass: 'delim4'},
+    {c: '&#x23A3;', h: 0.04, d: 2.96, n: 52, tclass: 'delim4a'},
+    {c: '&#x23A6;', h: 0.04, d: 2.96, n: 53, tclass: 'delim4a'},
+    {c: '&#x23A1;', h: 0.04, d: 2.96, n: 54, tclass: 'delim4a'},
+    {c: '&#x23A4;', h: 0.04, d: 2.96, n: 55, tclass: 'delim4a'},
+    {c: '<span style="margin: -.1em">{</span>', h: 0.04, d: 2.96, n: 56, tclass: 'delim4'},
+    {c: '<span style="margin: -.1em">}</span>', h: 0.04, d: 2.96, n: 57, tclass: 'delim4'},
+    {c: '&#x3008;', h: 0.04, d: 2.96, tclass: 'delim4c'},
+    {c: '&#x3009;', h: 0.04, d: 2.96, tclass: 'delim4c'},
+    {c: '&#x2215;', h: 0.04, d: 2.96, tclass: 'delim4b'},
+    {c: '&#x2216;', h: 0.04, d: 2.96, tclass: 'delim4b'},
+    {c: '&#x2215;', h: 0.04, d: 1.76, n: 30, tclass: 'delim2b'},
+    {c: '&#x2216;', h: 0.04, d: 1.76, n: 31, tclass: 'delim2b'},
+    // 30 - 3F
+    {c: '&#x239B;', h: 1, d: .2, delim: {top: 48, bot: 64, rep: 66}, tclass: 'asymbol'},
+    {c: '&#x239E;', h: 1, d: .2, delim: {top: 49, bot: 65, rep: 67}, tclass: 'asymbol'},
+    {c: '&#x23A1;', h: 1, d: .2, delim: {top: 50, bot: 52, rep: 54}, tclass: 'asymbol'},
+    {c: '&#x23A4;', h: 1, d: .2, delim: {top: 51, bot: 53, rep: 55}, tclass: 'asymbol'},
+    {c: '&#x23A3;', h: 1, d: .2, delim: {bot: 52, rep: 54}, tclass: 'asymbol'},
+    {c: '&#x23A6;', h: 1, d: .2, delim: {bot: 53, rep: 55}, tclass: 'asymbol'},
+    {c: '&#x23A2;', h: 1, d: .2, delim: {top: 50, rep: 54}, tclass: 'asymbol'},
+    {c: '&#x23A5;', h: 1, d: .2, delim: {top: 51, rep: 55}, tclass: 'asymbol'},
+    {c: '&#x23A7;', h: 1, d: .2, delim: {top: 56, mid: 60, bot: 58, rep: 62}, tclass: 'asymbol'},
+    {c: '&#x23AB;', h: 1, d: .2, delim: {top: 57, mid: 61, bot: 59, rep: 62}, tclass: 'asymbol'},
+    {c: '&#x23A9;', h: 1, d: .2, delim: {top: 56, bot: 58, rep: 62}, tclass: 'asymbol'},
+    {c: '&#x23AD;', h: 1, d: .2, delim: {top: 57, bot: 59, rep: 62}, tclass: 'asymbol'},
+    {c: '&#x23A8;', h: 1, d: .2, delim: {rep: 63}, tclass: 'asymbol'},
+    {c: '&#x23AC;', h: 1, d: .2, delim: {rep: 119}, tclass: 'asymbol'},
+    {c: '&#x23AA;', h: 1, d: .2, delim: {rep: 62}, tclass: 'asymbol'},
+    {c: '&#x23AA;', h: .95, d: .05, delim: {top: 120, bot: 121, rep: 63}, tclass: 'arrow1a'},
+    // 40 - 4F
+    {c: '&#x239D;', h: 1, d: .2, delim: {top: 56, bot: 59, rep: 62}, tclass: 'asymbol'},
+    {c: '&#x23A0;', h: 1, d: .2, delim: {top: 57, bot: 58, rep: 62}, tclass: 'asymbol'},
+    {c: '&#x239C;', h: 1, d: .2, delim: {rep: 66}, tclass: 'asymbol'},
+    {c: '&#x239F;', h: 1, d: .2, delim: {rep: 67}, tclass: 'asymbol'},
+    {c: '&#x3008;', h: 0.04, d: 1.76, n: 28, tclass: 'delim2c'},
+    {c: '&#x3009;', h: 0.04, d: 1.76, n: 29, tclass: 'delim2c'},
+    {c: '&#x2294;', h: -.2, d: 1, n: 71, tclass: 'bigop1'},
+    {c: '&#x2294;', h: -.1, d: 1.2, tclass: 'bigop2'},
+    {c: '&#x222E;', h: 0, d: 1.11, ic: 0.095, n: 73, tclass: 'bigop1c'},
+    {c: '&#x222E;', h: 0, d: 2.22, ic: 0.222, tclass: 'bigop2c'},
+    {c: '&#x2299;', h: 0, d: 1, n: 75, tclass: 'bigop1'},
+    {c: '&#x2299;', h: 0.1, d: 1.2, tclass: 'bigop2'},
+    {c: '&#x2295;', h: .2, d: .9, n: 77, tclass: 'bigop1'},
+    {c: '&#x2295;', h: 0.4, d: 1.2, tclass: 'bigop2'},
+    {c: '&#x2297;', h: .2, d: .9, n: 79, tclass: 'bigop1'},
+    {c: '&#x2297;', h: 0.4, d: 1.2, tclass: 'bigop2'},
+    // 50 - 5F
+    {c: '&#x2211;', h: 0, d: 1, n: 88, tclass: 'bigop1a'},
+    {c: '&#x220F;', h: 0, d: 1, n: 89, tclass: 'bigop1a'},
+    {c: '&#x222B;', h: 0, d: 1.11, ic: 0.095, n: 90, tclass: 'bigop1c'},
+    {c: '&#x222A;', h: 0, d: 1, n: 91, tclass: 'bigop1b'},
+    {c: '&#x2229;', h: 0, d: 1, n: 92, tclass: 'bigop1b'},
+    {c: '&#x228E;', h: -.2, d: 1.1, n: 93, tclass: 'bigop1b'},
+    {c: '&#x2227;', h: 0, d: 1, n: 94, tclass: 'bigop1'},
+    {c: '&#x2228;', h: 0, d: 1, n: 95, tclass: 'bigop1'},
+    {c: '&#x2211;', h: 0.1, d: 1.6, tclass: 'bigop2a'},
+    {c: '&#x220F;', h: 0.1, d: 1.6, tclass: 'bigop2a'},
+    {c: '&#x222B;', h: 0, d: 2.22, ic: 0.222, tclass: 'bigop2c'},
+    {c: '&#x222A;', h: 0.1, d: 1.5, tclass: 'bigop2b'},
+    {c: '&#x2229;', h: 0.1, d: 1.5, tclass: 'bigop2b'},
+    {c: '&#x228E;', h: -0.3, d: 1.6, tclass: 'bigop2b'},
+    {c: '&#x2227;', h: 0.1, d: 1.2, tclass: 'bigop2'},
+    {c: '&#x2228;', h: 0.1, d: 1.2, tclass: 'bigop2'},
+    // 60 - 6F
+    {c: '&#x2210;', h: 0, d: .9, n: 97, tclass: 'bigop1a'},
+    {c: '&#x2210;', h: 0.1, d: 1.4, tclass: 'bigop2a'},
+    {c: '&#xFE3F;', h: 0.722, w: .65, n: 99, tclass: 'wide1'},
+    {c: '&#xFE3F;', h: 0.85, w: 1.1, n: 100, tclass: 'wide2'},
+    {c: '&#xFE3F;', h: 0.99, w: 1.65, tclass: 'wide3'},
+    {c: '&#x2053;', h: 0.722, w: .75, n: 102, tclass: 'wide1a'},
+    {c: '&#x2053;', h: 0.8, w: 1.35, n: 103, tclass: 'wide2a'},
+    {c: '&#x2053;', h: 0.99, w: 2, tclass: 'wide3a'},
+    {c: '[', h: 0.04, d: 1.76, n: 20, tclass: 'delim2'},
+    {c: ']', h: 0.04, d: 1.76, n: 21, tclass: 'delim2'},
+    {c: '&#x23A3;', h: 0.04, d: 1.76, n: 22, tclass: 'delim2a'},
+    {c: '&#x23A6;', h: 0.04, d: 1.76, n: 23, tclass: 'delim2a'},
+    {c: '&#x23A1;', h: 0.04, d: 1.76, n: 24, tclass: 'delim2a'},
+    {c: '&#x23A4;', h: 0.04, d: 1.76, n: 25, tclass: 'delim2a'},
+    {c: '<span style="margin: -.1em">{</span>', h: 0.04, d: 1.76, n: 26, tclass: 'delim2'},
+    {c: '<span style="margin: -.1em">}</span>', h: 0.04, d: 1.76, n: 27, tclass: 'delim2'},
+    // 70 - 7F
+    {c: '<span style="font-size: 125%; position:relative; top:.95em">&#x221A;</span>', h: 0.04, d: 1.16, n: 113, tclass: 'root'},
+    {c: '<span style="font-size: 190%; position:relative; top:.925em">&#x221A;</span>', h: 0.04, d: 1.76, n: 114, tclass: 'root'},
+    {c: '<span style="font-size: 250%; position:relative; top:.925em">&#x221A;</span>', h: 0.06, d: 2.36, n: 115, tclass: 'root'},
+    {c: '<span style="font-size: 320%; position:relative; top:.92em">&#x221A;</span>', h: 0.08, d: 2.96, n: 116, tclass: 'root'},
+    {c: '<span style="font-size: 400%; position:relative; top:.92em">&#x221A;</span>', h: 0.1, d: 3.75, n: 117, tclass: 'root'},
+    {c: '<span style="font-size: 500%; position:relative; top:.9em">&#x221A;</span>', h: .12, d: 4.5, n: 118, tclass: 'root'},
+    {c: '<span style="font-size: 625%; position:relative; top:.9em">&#x221A;</span>', h: .14, d: 5.7, tclass: 'root'},
+    {c: '<span style="font-size:130%">&#x2016;</span>', h:.9, delim: {top: 126, bot: 127, rep: 119}, tclass: 'asymbol'},
+    {c: '&#x2191;', h:.9, d:0, delim: {top: 120, rep: 63}, tclass: 'arrow1a'},
+    {c: '&#x2193;', h:.9, d:0, delim: {bot: 121, rep: 63}, tclass: 'arrow1a'},
+    {c: '<span style="font-size: 67%; position:relative; top:.35em; margin-left:-.5em">&#x256D;</span>', h:.1, tclass: 'symbol'},
+    {c: '<span style="font-size: 67%; position:relative; top:.35em; margin-right:-.5em">&#x256E;</span>', h:.1, tclass: 'symbol'},
+    {c: '<span style="font-size: 67%; position:relative; top:.35em; margin-left:-.5em">&#x2570;</span>', h:.1, tclass: 'symbol'},
+    {c: '<span style="font-size: 67%; position:relative; top:.35em; margin-right:-.5em">&#x256F;</span>', h:.1, tclass: 'symbol'},
+    {c: '&#x21D1;', h:.7, delim: {top: 126, rep: 119}, tclass: 'asymbol'},
+    {c: '&#x21D3;', h:.7, delim: {bot: 127, rep: 119}, tclass: 'asymbol'}
+  ],
+  
+  cmti10: [
+    // 00 - 0F
+    {c: '&Gamma;', ic: 0.133, tclass: 'igreek'},
+    {c: '&Delta;', tclass: 'igreek'},
+    {c: '&Theta;', ic: 0.094, tclass: 'igreek'},
+    {c: '&Lambda;', tclass: 'igreek'},
+    {c: '&Xi;', ic: 0.153, tclass: 'igreek'},
+    {c: '&Pi;', ic: 0.164, tclass: 'igreek'},
+    {c: '&Sigma;', ic: 0.12, tclass: 'igreek'},
+    {c: '&Upsilon;', ic: 0.111, tclass: 'igreek'},
+    {c: '&Phi;', ic: 0.0599, tclass: 'igreek'},
+    {c: '&Psi;', ic: 0.111, tclass: 'igreek'},
+    {c: '&Omega;', ic: 0.103, tclass: 'igreek'},
+    {c: 'ff', ic: 0.212, krn: {'39': 0.104, '63': 0.104, '33': 0.104, '41': 0.104, '93': 0.104}, lig: {'105': 14, '108': 15}, tclass: 'italic'},
+    {c: 'fi', ic: 0.103, tclass: 'italic'},
+    {c: 'fl', ic: 0.103, tclass: 'italic'},
+    {c: 'ffi', ic: 0.103, tclass: 'italic'},
+    {c: 'ffl', ic: 0.103, tclass: 'italic'},
+    // 10 - 1F
+    {c: '&#x131;', a:0, ic: 0.0767, tclass: 'italic'},
+    {c: 'j', d:.2, ic: 0.0374, tclass: 'italic'},
+    {c: '&#x60;', tclass: 'iaccent'},
+    {c: '&#xB4;', ic: 0.0969, tclass: 'iaccent'},
+    {c: '&#x2C7;', ic: 0.083, tclass: 'iaccent'},
+    {c: '&#x2D8;', ic: 0.108, tclass: 'iaccent'},
+    {c: '&#x2C9;', ic: 0.103, tclass: 'iaccent'},
+    {c: '&#x2DA;', tclass: 'iaccent'},
+    {c: '?', d: 0.17, w: 0.46, tclass: 'italic'},
+    {c: '&#xDF;', ic: 0.105, tclass: 'italic'},
+    {c: '&#xE6;', a:0, ic: 0.0751, tclass: 'italic'},
+    {c: '&#x153;', a:0, ic: 0.0751, tclass: 'italic'},
+    {c: '&#xF8;', ic: 0.0919, tclass: 'italic'},
+    {c: '&#xC6;', ic: 0.12, tclass: 'italic'},
+    {c: '&#x152;', ic: 0.12, tclass: 'italic'},
+    {c: '&#xD8;', ic: 0.094, tclass: 'italic'},
+    // 20 - 2F
+    {c: '?', krn: {'108': -0.256, '76': -0.321}, tclass: 'italic'},
+    {c: '!', ic: 0.124, lig: {'96': 60}, tclass: 'italic'},
+    {c: '&#x201D;', ic: 0.0696, tclass: 'italic'},
+    {c: '#', ic: 0.0662, tclass: 'italic'},
+    {c: '$', tclass: 'italic'},
+    {c: '%', ic: 0.136, tclass: 'italic'},
+    {c: '&amp;', ic: 0.0969, tclass: 'italic'},
+    {c: '&#x2019;', ic: 0.124, krn: {'63': 0.102, '33': 0.102}, lig: {'39': 34}, tclass: 'italic'},
+    {c: '(', d:.2, ic: 0.162, tclass: 'italic'},
+    {c: ')', d:.2, ic: 0.0369, tclass: 'italic'},
+    {c: '*', ic: 0.149, tclass: 'italic'},
+    {c: '+', a:.1, ic: 0.0369, tclass: 'italic'},
+    {c: ',', a:-.3, d:.2, w: 0.278, tclass: 'italic'},
+    {c: '-', a:0, ic: 0.0283, lig: {'45': 123}, tclass: 'italic'},
+    {c: '.', a:-.25, tclass: 'italic'},
+    {c: '/', ic: 0.162, tclass: 'italic'},
+    // 30 - 3F
+    {c: '0', ic: 0.136, tclass: 'italic'},
+    {c: '1', ic: 0.136, tclass: 'italic'},
+    {c: '2', ic: 0.136, tclass: 'italic'},
+    {c: '3', ic: 0.136, tclass: 'italic'},
+    {c: '4', ic: 0.136, tclass: 'italic'},
+    {c: '5', ic: 0.136, tclass: 'italic'},
+    {c: '6', ic: 0.136, tclass: 'italic'},
+    {c: '7', ic: 0.136, tclass: 'italic'},
+    {c: '8', ic: 0.136, tclass: 'italic'},
+    {c: '9', ic: 0.136, tclass: 'italic'},
+    {c: ':', ic: 0.0582, tclass: 'italic'},
+    {c: ';', ic: 0.0582, tclass: 'italic'},
+    {c: '&#xA1;', ic: 0.0756, tclass: 'italic'},
+    {c: '=', a:0, d:-.1, ic: 0.0662, tclass: 'italic'},
+    {c: '&#xBF;', tclass: 'italic'},
+    {c: '?', ic: 0.122, lig: {'96': 62}, tclass: 'italic'},
+    // 40 - 4F
+    {c: '@', ic: 0.096, tclass: 'italic'},
+    {c: 'A', krn: {'110': -0.0256, '108': -0.0256, '114': -0.0256, '117': -0.0256, '109': -0.0256, '116': -0.0256, '105': -0.0256, '67': -0.0256, '79': -0.0256, '71': -0.0256, '104': -0.0256, '98': -0.0256, '85': -0.0256, '107': -0.0256, '118': -0.0256, '119': -0.0256, '81': -0.0256, '84': -0.0767, '89': -0.0767, '86': -0.102, '87': -0.102, '101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}, tclass: 'italic'},
+    {c: 'B', ic: 0.103, tclass: 'italic'},
+    {c: 'C', ic: 0.145, tclass: 'italic'},
+    {c: 'D', ic: 0.094, krn: {'88': -0.0256, '87': -0.0256, '65': -0.0256, '86': -0.0256, '89': -0.0256}, tclass: 'italic'},
+    {c: 'E', ic: 0.12, tclass: 'italic'},
+    {c: 'F', ic: 0.133, krn: {'111': -0.0767, '101': -0.0767, '117': -0.0767, '114': -0.0767, '97': -0.0767, '65': -0.102, '79': -0.0256, '67': -0.0256, '71': -0.0256, '81': -0.0256}, tclass: 'italic'},
+    {c: 'G', ic: 0.0872, tclass: 'italic'},
+    {c: 'H', ic: 0.164, tclass: 'italic'},
+    {c: 'I', ic: 0.158, tclass: 'italic'},
+    {c: 'J', ic: 0.14, tclass: 'italic'},
+    {c: 'K', ic: 0.145, krn: {'79': -0.0256, '67': -0.0256, '71': -0.0256, '81': -0.0256}, tclass: 'italic'},
+    {c: 'L', krn: {'84': -0.0767, '89': -0.0767, '86': -0.102, '87': -0.102, '101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}, tclass: 'italic'},
+    {c: 'M', ic: 0.164, tclass: 'italic'},
+    {c: 'N', ic: 0.164, tclass: 'italic'},
+    {c: 'O', ic: 0.094, krn: {'88': -0.0256, '87': -0.0256, '65': -0.0256, '86': -0.0256, '89': -0.0256}, tclass: 'italic'},
+    // 50 - 5F
+    {c: 'P', ic: 0.103, krn: {'65': -0.0767}, tclass: 'italic'},
+    {c: 'Q', d:.1, ic: 0.094, tclass: 'italic'},
+    {c: 'R', ic: 0.0387, krn: {'110': -0.0256, '108': -0.0256, '114': -0.0256, '117': -0.0256, '109': -0.0256, '116': -0.0256, '105': -0.0256, '67': -0.0256, '79': -0.0256, '71': -0.0256, '104': -0.0256, '98': -0.0256, '85': -0.0256, '107': -0.0256, '118': -0.0256, '119': -0.0256, '81': -0.0256, '84': -0.0767, '89': -0.0767, '86': -0.102, '87': -0.102, '101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}, tclass: 'italic'},
+    {c: 'S', ic: 0.12, tclass: 'italic'},
+    {c: 'T', ic: 0.133, krn: {'121': -0.0767, '101': -0.0767, '111': -0.0767, '114': -0.0767, '97': -0.0767, '117': -0.0767, '65': -0.0767}, tclass: 'italic'},
+    {c: 'U', ic: 0.164, tclass: 'italic'},
+    {c: 'V', ic: 0.184, krn: {'111': -0.0767, '101': -0.0767, '117': -0.0767, '114': -0.0767, '97': -0.0767, '65': -0.102, '79': -0.0256, '67': -0.0256, '71': -0.0256, '81': -0.0256}, tclass: 'italic'},
+    {c: 'W', ic: 0.184, krn: {'65': -0.0767}, tclass: 'italic'},
+    {c: 'X', ic: 0.158, krn: {'79': -0.0256, '67': -0.0256, '71': -0.0256, '81': -0.0256}, tclass: 'italic'},
+    {c: 'Y', ic: 0.194, krn: {'101': -0.0767, '111': -0.0767, '114': -0.0767, '97': -0.0767, '117': -0.0767, '65': -0.0767}, tclass: 'italic'},
+    {c: 'Z', ic: 0.145, tclass: 'italic'},
+    {c: '[', d:.1, ic: 0.188, tclass: 'italic'},
+    {c: '&#x201C;', ic: 0.169, tclass: 'italic'},
+    {c: ']', d:.1, ic: 0.105, tclass: 'italic'},
+    {c: '&#x2C6;', ic: 0.0665, tclass: 'iaccent'},
+    {c: '&#x2D9;', ic: 0.118, tclass: 'iaccent'},
+    // 60 - 6F
+    {c: '&#x2018;', ic: 0.124, lig: {'96': 92}, tclass: 'italic'},
+    {c: 'a', a:0, ic: 0.0767, tclass: 'italic'},
+    {c: 'b', ic: 0.0631, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}, tclass: 'italic'},
+    {c: 'c', a:0, ic: 0.0565, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}, tclass: 'italic'},
+    {c: 'd', ic: 0.103, krn: {'108': 0.0511}, tclass: 'italic'},
+    {c: 'e', a:0, ic: 0.0751, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}, tclass: 'italic'},
+    {c: 'f', ic: 0.212, krn: {'39': 0.104, '63': 0.104, '33': 0.104, '41': 0.104, '93': 0.104}, lig: {'105': 12, '102': 11, '108': 13}, tclass: 'italic'},
+    {c: 'g', a:0, d:.2, ic: 0.0885, tclass: 'italic'},
+    {c: 'h', ic: 0.0767, tclass: 'italic'},
+    {c: 'i', ic: 0.102, tclass: 'italic'},
+    {c: 'j', d:.2, ic: 0.145, tclass: 'italic'},
+    {c: 'k', ic: 0.108, tclass: 'italic'},
+    {c: 'l', ic: 0.103, krn: {'108': 0.0511}, tclass: 'italic'},
+    {c: 'm', a:0, ic: 0.0767, tclass: 'italic'},
+    {c: 'n', a:0, ic: 0.0767, krn: {'39': -0.102}, tclass: 'italic'},
+    {c: 'o', a:0, ic: 0.0631, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}, tclass: 'italic'},
+    // 70 - 7F
+    {c: 'p', a:0, d:.2, ic: 0.0631, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}, tclass: 'italic'},
+    {c: 'q', a:0, d:.2, ic: 0.0885, tclass: 'italic'},
+    {c: 'r', a:0, ic: 0.108, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}, tclass: 'italic'},
+    {c: 's', a:0, ic: 0.0821, tclass: 'italic'},
+    {c: 't', ic: 0.0949, tclass: 'italic'},
+    {c: 'u', a:0, ic: 0.0767, tclass: 'italic'},
+    {c: 'v', a:0, ic: 0.108, tclass: 'italic'},
+    {c: 'w', a:0, ic: 0.108, krn: {'108': 0.0511}, tclass: 'italic'},
+    {c: 'x', a:0, ic: 0.12, tclass: 'italic'},
+    {c: 'y', a:0, d:.2, ic: 0.0885, tclass: 'italic'},
+    {c: 'z', a:0, ic: 0.123, tclass: 'italic'},
+    {c: '&#x2013;', a:.1, ic: 0.0921, lig: {'45': 124}, tclass: 'italic'},
+    {c: '&#x2014;', a:.1, ic: 0.0921, tclass: 'italic'},
+    {c: '&#x2DD;', ic: 0.122, tclass: 'iaccent'},
+    {c: '&#x2DC;', ic: 0.116, tclass: 'iaccent'},
+    {c: '&#xA8;', tclass: 'iaccent'}
+  ],
+  
+  cmbx10: [
+    // 00 - 0F
+    {c: '&Gamma;', tclass: 'bgreek'},
+    {c: '&Delta;', tclass: 'bgreek'},
+    {c: '&Theta;', tclass: 'bgreek'},
+    {c: '&Lambda;', tclass: 'bgreek'},
+    {c: '&Xi;', tclass: 'bgreek'},
+    {c: '&Pi;', tclass: 'bgreek'},
+    {c: '&Sigma;', tclass: 'bgreek'},
+    {c: '&Upsilon;', tclass: 'bgreek'},
+    {c: '&Phi;', tclass: 'bgreek'},
+    {c: '&Psi;', tclass: 'bgreek'},
+    {c: '&Omega;', tclass: 'bgreek'},
+    {c: 'ff', ic: 0.0778, krn: {'39': 0.0778, '63': 0.0778, '33': 0.0778, '41': 0.0778, '93': 0.0778}, lig: {'105': 14, '108': 15}, tclass: 'bold'},
+    {c: 'fi', tclass: 'bold'},
+    {c: 'fl', tclass: 'bold'},
+    {c: 'ffi', tclass: 'bold'},
+    {c: 'ffl', tclass: 'bold'},
+    // 10 - 1F
+    {c: '&#x131;', a:0, tclass: 'bold'},
+    {c: 'j', d:.2, tclass: 'bold'},
+    {c: '&#x60;', tclass: 'baccent'},
+    {c: '&#xB4;', tclass: 'baccent'},
+    {c: '&#x2C7;', tclass: 'baccent'},
+    {c: '&#x2D8;', tclass: 'baccent'},
+    {c: '&#x2C9;', tclass: 'baccent'},
+    {c: '&#x2DA;', tclass: 'baccent'},
+    {c: '?', tclass: 'bold'},
+    {c: '&#xDF;', tclass: 'bold'},
+    {c: '&#xE6;', a:0, tclass: 'bold'},
+    {c: '&#x153;', a:0, tclass: 'bold'},
+    {c: '&#xF8;', tclass: 'bold'},
+    {c: '&#xC6;', tclass: 'bold'},
+    {c: '&#x152;', tclass: 'bold'},
+    {c: '&#xD8;', tclass: 'bold'},
+    // 20 - 2F
+    {c: '?', krn: {'108': -0.278, '76': -0.319}, tclass: 'bold'},
+    {c: '!', lig: {'96': 60}, tclass: 'bold'},
+    {c: '&#x201D;', tclass: 'bold'},
+    {c: '#', tclass: 'bold'},
+    {c: '$', tclass: 'bold'},
+    {c: '%', tclass: 'bold'},
+    {c: '&amp;', tclass: 'bold'},
+    {c: '&#x2019;', krn: {'63': 0.111, '33': 0.111}, lig: {'39': 34}, tclass: 'bold'},
+    {c: '(', d:.2, tclass: 'bold'},
+    {c: ')', d:.2, tclass: 'bold'},
+    {c: '*', tclass: 'bold'},
+    {c: '+', a:.1, tclass: 'bold'},
+    {c: ',', a:-.3, d:.2, w: 0.278, tclass: 'bold'},
+    {c: '-', a:0, lig: {'45': 123}, tclass: 'bold'},
+    {c: '.', a:-.25, tclass: 'bold'},
+    {c: '/', tclass: 'bold'},
+    // 30 - 3F
+    {c: '0', tclass: 'bold'},
+    {c: '1', tclass: 'bold'},
+    {c: '2', tclass: 'bold'},
+    {c: '3', tclass: 'bold'},
+    {c: '4', tclass: 'bold'},
+    {c: '5', tclass: 'bold'},
+    {c: '6', tclass: 'bold'},
+    {c: '7', tclass: 'bold'},
+    {c: '8', tclass: 'bold'},
+    {c: '9', tclass: 'bold'},
+    {c: ':', tclass: 'bold'},
+    {c: ';', tclass: 'bold'},
+    {c: '&#xA1;', tclass: 'bold'},
+    {c: '=', a:0, d:-.1, tclass: 'bold'},
+    {c: '&#xBF;', tclass: 'bold'},
+    {c: '?', lig: {'96': 62}, tclass: 'bold'},
+    // 40 - 4F
+    {c: '@', tclass: 'bold'},
+    {c: 'A', krn: {'116': -0.0278, '67': -0.0278, '79': -0.0278, '71': -0.0278, '85': -0.0278, '81': -0.0278, '84': -0.0833, '89': -0.0833, '86': -0.111, '87': -0.111}, tclass: 'bold'},
+    {c: 'B', tclass: 'bold'},
+    {c: 'C', tclass: 'bold'},
+    {c: 'D', krn: {'88': -0.0278, '87': -0.0278, '65': -0.0278, '86': -0.0278, '89': -0.0278}, tclass: 'bold'},
+    {c: 'E', tclass: 'bold'},
+    {c: 'F', krn: {'111': -0.0833, '101': -0.0833, '117': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.111, '79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}, tclass: 'bold'},
+    {c: 'G', tclass: 'bold'},
+    {c: 'H', tclass: 'bold'},
+    {c: 'I', krn: {'73': 0.0278}, tclass: 'bold'},
+    {c: 'J', tclass: 'bold'},
+    {c: 'K', krn: {'79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}, tclass: 'bold'},
+    {c: 'L', krn: {'84': -0.0833, '89': -0.0833, '86': -0.111, '87': -0.111}, tclass: 'bold'},
+    {c: 'M', tclass: 'bold'},
+    {c: 'N', tclass: 'bold'},
+    {c: 'O', krn: {'88': -0.0278, '87': -0.0278, '65': -0.0278, '86': -0.0278, '89': -0.0278}, tclass: 'bold'},
+    // 50 - 5F
+    {c: 'P', krn: {'65': -0.0833, '111': -0.0278, '101': -0.0278, '97': -0.0278, '46': -0.0833, '44': -0.0833}, tclass: 'bold'},
+    {c: 'Q', d:.1, tclass: 'bold'},
+    {c: 'R', krn: {'116': -0.0278, '67': -0.0278, '79': -0.0278, '71': -0.0278, '85': -0.0278, '81': -0.0278, '84': -0.0833, '89': -0.0833, '86': -0.111, '87': -0.111}, tclass: 'bold'},
+    {c: 'S', tclass: 'bold'},
+    {c: 'T', krn: {'121': -0.0278, '101': -0.0833, '111': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.0833, '117': -0.0833}, tclass: 'bold'},
+    {c: 'U', tclass: 'bold'},
+    {c: 'V', ic: 0.0139, krn: {'111': -0.0833, '101': -0.0833, '117': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.111, '79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}, tclass: 'bold'},
+    {c: 'W', ic: 0.0139, krn: {'111': -0.0833, '101': -0.0833, '117': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.111, '79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}, tclass: 'bold'},
+    {c: 'X', krn: {'79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}, tclass: 'bold'},
+    {c: 'Y', ic: 0.025, krn: {'101': -0.0833, '111': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.0833, '117': -0.0833}, tclass: 'bold'},
+    {c: 'Z', tclass: 'bold'},
+    {c: '[', d:.1, tclass: 'bold'},
+    {c: '&#x201C;', tclass: 'bold'},
+    {c: ']', d:.1, tclass: 'bold'},
+    {c: '&#x2C6;', tclass: 'baccent'},
+    {c: '&#x2D9;', tclass: 'baccent'},
+    // 60 - 6F
+    {c: '&#x2018;', lig: {'96': 92}, tclass: 'bold'},
+    {c: 'a', a:0, krn: {'118': -0.0278, '106': 0.0556, '121': -0.0278, '119': -0.0278}, tclass: 'bold'},
+    {c: 'b', krn: {'101': 0.0278, '111': 0.0278, '120': -0.0278, '100': 0.0278, '99': 0.0278, '113': 0.0278, '118': -0.0278, '106': 0.0556, '121': -0.0278, '119': -0.0278}, tclass: 'bold'},
+    {c: 'c', a:0, krn: {'104': -0.0278, '107': -0.0278}, tclass: 'bold'},
+    {c: 'd', tclass: 'bold'},
+    {c: 'e', a:0, tclass: 'bold'},
+    {c: 'f', ic: 0.0778, krn: {'39': 0.0778, '63': 0.0778, '33': 0.0778, '41': 0.0778, '93': 0.0778}, lig: {'105': 12, '102': 11, '108': 13}, tclass: 'bold'},
+    {c: 'g', a:0, d:.2, ic: 0.0139, krn: {'106': 0.0278}, tclass: 'bold'},
+    {c: 'h', krn: {'116': -0.0278, '117': -0.0278, '98': -0.0278, '121': -0.0278, '118': -0.0278, '119': -0.0278}, tclass: 'bold'},
+    {c: 'i', tclass: 'bold'},
+    {c: 'j', d:.2, tclass: 'bold'},
+    {c: 'k', krn: {'97': -0.0556, '101': -0.0278, '97': -0.0278, '111': -0.0278, '99': -0.0278}, tclass: 'bold'},
+    {c: 'l', tclass: 'bold'},
+    {c: 'm', a:0, krn: {'116': -0.0278, '117': -0.0278, '98': -0.0278, '121': -0.0278, '118': -0.0278, '119': -0.0278}, tclass: 'bold'},
+    {c: 'n', a:0, krn: {'116': -0.0278, '117': -0.0278, '98': -0.0278, '121': -0.0278, '118': -0.0278, '119': -0.0278}, tclass: 'bold'},
+    {c: 'o', a:0, krn: {'101': 0.0278, '111': 0.0278, '120': -0.0278, '100': 0.0278, '99': 0.0278, '113': 0.0278, '118': -0.0278, '106': 0.0556, '121': -0.0278, '119': -0.0278}, tclass: 'bold'},
+    // 70 - 7F
+    {c: 'p', a:0, d:.2, krn: {'101': 0.0278, '111': 0.0278, '120': -0.0278, '100': 0.0278, '99': 0.0278, '113': 0.0278, '118': -0.0278, '106': 0.0556, '121': -0.0278, '119': -0.0278}, tclass: 'bold'},
+    {c: 'q', a:0, d:.2, tclass: 'bold'},
+    {c: 'r', a:0, tclass: 'bold'},
+    {c: 's', a:0, tclass: 'bold'},
+    {c: 't', krn: {'121': -0.0278, '119': -0.0278}, tclass: 'bold'},
+    {c: 'u', a:0, krn: {'119': -0.0278}, tclass: 'bold'},
+    {c: 'v', a:0, ic: 0.0139, krn: {'97': -0.0556, '101': -0.0278, '97': -0.0278, '111': -0.0278, '99': -0.0278}, tclass: 'bold'},
+    {c: 'w', a:0, ic: 0.0139, krn: {'101': -0.0278, '97': -0.0278, '111': -0.0278, '99': -0.0278}, tclass: 'bold'},
+    {c: 'x', a:0, tclass: 'bold'},
+    {c: 'y', a:0, d:.2, ic: 0.0139, krn: {'111': -0.0278, '101': -0.0278, '97': -0.0278, '46': -0.0833, '44': -0.0833}, tclass: 'bold'},
+    {c: 'z', a:0, tclass: 'bold'},
+    {c: '&#x2013;', a:.1, ic: 0.0278, lig: {'45': 124}, tclass: 'bold'},
+    {c: '&#x2014;', a:.1, ic: 0.0278, tclass: 'bold'},
+    {c: '&#x2DD;', tclass: 'baccent'},
+    {c: '&#x2DC;', tclass: 'baccent'},
+    {c: '&#xA8;', tclass: 'baccent'}
+  ]
+});
+
+
+jsMath.Setup.Styles({
+    '.typeset .cmr10':          "font-family: serif",
+    '.typeset .italic':         "font-style: italic",
+    '.typeset .bold':           "font-weight: bold",
+    '.typeset .lucida':         "font-family: 'Lucida Grande'",
+    '.typeset .asymbol':        "font-family: 'Apple Symbols'; font-size: 125%",
+    '.typeset .cal':            "font-family: 'Apple Chancery'",
+    '.typeset .arrows':         "font-family: 'Hiragino Mincho Pro'",
+    '.typeset .Arrows':         "font-family: 'AppleGothic'",
+    '.typeset .arrow1':         "font-family: 'Hiragino Mincho Pro'; position: relative; top: .075em; margin: -1px",
+    '.typeset .arrow1a':        "font-family: 'Hiragino Mincho Pro'; margin:-.3em",
+    '.typeset .harpoon':        "font-family: AppleGothic; font-size: 90%",
+    '.typeset .symbol':         "font-family: 'Hiragino Mincho Pro'",
+    '.typeset .symbol2':        "font-family: 'Hiragino Mincho Pro'; margin:-.2em",
+    '.typeset .symbol3':        "font-family: AppleGothic",
+    '.typeset .delim1':         "font-family: Times; font-size: 133%; position:relative; top:.7em",
+    '.typeset .delim1a':        "font-family: 'Apple Symbols'; font-size: 125%; position:relative; top:.75em",
+    '.typeset .delim1b':        "font-family: 'Hiragino Mincho Pro'; font-size: 133%; position:relative; top:.8em; margin: -.1em",
+    '.typeset .delim1c':        "font-family: Symbol; font-size: 120%; position:relative; top:.8em;",
+    '.typeset .delim2':         "font-family: Baskerville; font-size: 180%; position:relative; top:.75em",
+    '.typeset .delim2a':        "font-family: 'Apple Symbols'; font-size: 175%; position:relative; top:.8em",
+    '.typeset .delim2b':        "font-family: 'Hiragino Mincho Pro'; font-size: 190%; position:relative; top:.8em; margin: -.1em",
+    '.typeset .delim2c':        "font-family: Symbol; font-size: 167%; position:relative; top:.8em;",
+    '.typeset .delim3':         "font-family: Baskerville; font-size: 250%; position:relative; top:.725em",
+    '.typeset .delim3a':        "font-family: 'Apple Symbols'; font-size: 240%; position:relative; top:.78em",
+    '.typeset .delim3b':        "font-family: 'Hiragino Mincho Pro'; font-size: 250%; position:relative; top:.8em; margin: -.1em",
+    '.typeset .delim3c':        "font-family: symbol; font-size: 240%; position:relative; top:.775em;",
+    '.typeset .delim4':         "font-family: Baskerville; font-size: 325%; position:relative; top:.7em",
+    '.typeset .delim4a':        "font-family: 'Apple Symbols'; font-size: 310%; position:relative; top:.75em",
+    '.typeset .delim4b':        "font-family: 'Hiragino Mincho Pro'; font-size: 325%; position:relative; top:.8em; margin: -.1em",
+    '.typeset .delim4c':        "font-family: Symbol; font-size: 300%; position:relative; top:.8em;",
+    '.typeset .vertical':       "font-family: Copperplate",
+    '.typeset .vertical1':      "font-family: Copperplate; font-size: 85%; margin: .15em;",
+    '.typeset .vertical2':      "font-family: Copperplate; font-size: 85%; margin: .17em;",
+    '.typeset .greek':          "font-family: 'Hiragino Mincho Pro', serif; margin-left:-.2em; margin-right:-.2em;",
+    '.typeset .igreek':         "font-family: 'Hiragino Mincho Pro', serif; font-style:italic; margin-left:-.2em; margin-right:-.1em",
+    '.typeset .bgreek':         "font-family: 'Hiragino Mincho Pro', serif; font-weight:bold",
+    '.typeset .bigop1':         "font-family: 'Hiragino Mincho Pro'; font-size: 133%; position: relative; top: .7em; margin:-.05em",
+    '.typeset .bigop1a':        "font-family: Baskerville; font-size: 100%; position: relative; top: .775em;",
+    '.typeset .bigop1b':        "font-family: 'Hiragino Mincho Pro'; font-size: 160%; position: relative; top: .67em; margin:-.1em",
+    '.typeset .bigop1c':        "font-family: 'Apple Symbols'; font-size: 125%; position: relative; top: .75em; margin:-.1em;",
+    '.typeset .bigop2':         "font-family: 'Hiragino Mincho Pro'; font-size: 200%; position: relative; top: .6em; margin:-.07em",
+    '.typeset .bigop2a':        "font-family: Baskerville; font-size: 175%; position: relative; top: .67em;",
+    '.typeset .bigop2b':        "font-family: 'Hiragino Mincho Pro'; font-size: 270%; position: relative; top: .62em; margin:-.1em",
+    '.typeset .bigop2c':        "font-family: 'Apple Symbols'; font-size: 250%; position: relative; top: .7em; margin:-.17em;",
+    '.typeset .wide1':          "font-size: 67%; position: relative; top:-.8em",
+    '.typeset .wide2':          "font-size: 110%; position: relative; top:-.5em",
+    '.typeset .wide3':          "font-size: 175%; position: relative; top:-.32em",
+    '.typeset .wide1a':         "font-size: 75%; position: relative; top:-.5em",
+    '.typeset .wide2a':         "font-size: 133%; position: relative; top: -.15em",
+    '.typeset .wide3a':         "font-size: 200%; position: relative; top: -.05em",
+    '.typeset .root':           "font-family: Baskerville;",
+    '.typeset .accent':         "position: relative; top: .02em",
+    '.typeset .iaccent':        "position: relative; top: .02em; font-style:italic",
+    '.typeset .baccent':        "position: relative; top: .02em; font-weight:bold"
+});
+
+//
+//  Adjust for OmniWeb
+//
+if (jsMath.browser == 'OmniWeb') {
+  jsMath.Update.TeXfonts({
+    cmsy10: {
+      '55':  {c: '<span style="font-size: 75%; position:relative; left:.3em; top:-.15em; margin-left:-.3em">&#x02EB;</span>'},
+      '104': {c: '<span style="position:relative; top:.2em; margin-left:-.55em">&#x3008;</span>'},
+      '105': {c: '<span style="position:relative; top:.2em; margin-right:-.55em">&#x3009;</span>'}
+    }
+  });
+  
+  jsMath.Setup.Styles({
+    '.typeset .arrow2':   'font-family: Symbol; font-size: 100%; position: relative; top: -.1em; margin:-1px'
+  });
+  
+}
+
+//
+//  Adjust for Opera
+//
+if (jsMath.browser == 'Opera') {
+  jsMath.Setup.Styles({
+    '.typeset .bigop1c': "margin:0pt .12em 0pt 0pt;",
+    '.typeset .bigop2c': "margin:0pt .12em 0pt 0pt;"
+  });
+}
+
+if (jsMath.browser == 'Mozilla') {jsMath.Setup.Script('jsMath-fallback-mac-mozilla.js')}
+if (jsMath.browser == 'MSIE') {jsMath.Setup.Script('jsMath-fallback-mac-msie.js')}
+
+
+/*
+ *  No access to TeX "not" character, so fake this
+ */
+jsMath.Macro('not','\\mathrel{\\rlap{\\kern 4mu/}}');
+
+jsMath.Box.defaultH = 0.8;
+
diff --git a/htdocs/jsMath/uncompressed/jsMath-fallback-pc.js b/htdocs/jsMath/uncompressed/jsMath-fallback-pc.js
new file mode 100644
index 0000000000..f7fb8ba0f8
--- /dev/null
+++ b/htdocs/jsMath/uncompressed/jsMath-fallback-pc.js
@@ -0,0 +1,971 @@
+/*
+ *  jsMath-fallback-pc.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file makes changes needed for when the TeX fonts are not available
+ *  with a browser on the PC.
+ *
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 2004-2010 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+
+
+/********************************************************************
+ *
+ *  Here we replace the TeX character mappings by equivalent unicode
+ *  points when possible, and adjust the character dimensions
+ *  based on the fonts we hope we get them from (the styles are set
+ *  to try to use the best characters available in the standard
+ *  fonts).
+ */
+
+jsMath.Add(jsMath.TeX,{
+
+  cmr10: [
+    // 00 - 0F
+    {c: '&Gamma;', tclass: 'greek'},
+    {c: '&Delta;', tclass: 'greek'},
+    {c: '&Theta;', tclass: 'greek'},
+    {c: '&Lambda;', tclass: 'greek'},
+    {c: '&Xi;', tclass: 'greek'},
+    {c: '&Pi;', tclass: 'greek'},
+    {c: '&Sigma;', tclass: 'greek'},
+    {c: '&Upsilon;', tclass: 'greek'},
+    {c: '&Phi;', tclass: 'greek'},
+    {c: '&Psi;', tclass: 'greek'},
+    {c: '&Omega;', tclass: 'greek'},
+    {c: 'ff', ic: 0.0778, krn: {'39': 0.0778, '63': 0.0778, '33': 0.0778, '41': 0.0778, '93': 0.0778}, lig: {'105': 14, '108': 15}, tclass: 'normal'},
+    {c: 'fi', tclass: 'normal'},
+    {c: 'fl', tclass: 'normal'},
+    {c: 'ffi', tclass: 'normal'},
+    {c: 'ffl', tclass: 'normal'},
+    // 10 - 1F
+    {c: '&#x131;', a:0, tclass: 'normal'},
+    {c: 'j', d:.2, tclass: 'normal'},
+    {c: '&#x2CB;', tclass: 'accent'},
+    {c: '&#x2CA;', tclass: 'accent'},
+    {c: '&#x2C7;', tclass: 'accent'},
+    {c: '&#x2D8;', tclass: 'accent'},
+    {c: '&#x2C9;', tclass: 'accent'},
+    {c: '&#x2DA;', tclass: 'accent'},
+    {c: '&#x0327;', tclass: 'normal'},
+    {c: '&#xDF;', tclass: 'normal'},
+    {c: '&#xE6;', a:0, tclass: 'normal'},
+    {c: '&#x153;', a:0, tclass: 'normal'},
+    {c: '&#xF8;', tclass: 'normal'},
+    {c: '&#xC6;', tclass: 'normal'},
+    {c: '&#x152;', tclass: 'normal'},
+    {c: '&#xD8;', tclass: 'normal'},
+    // 20 - 2F
+    {c: '?', krn: {'108': -0.278, '76': -0.319}, tclass: 'normal'},
+    {c: '!', lig: {'96': 60}, tclass: 'normal'},
+    {c: '&#x201D;', tclass: 'normal'},
+    {c: '#', tclass: 'normal'},
+    {c: '$', tclass: 'normal'},
+    {c: '%', tclass: 'normal'},
+    {c: '&amp;', tclass: 'normal'},
+    {c: '&#x2019;', krn: {'63': 0.111, '33': 0.111}, lig: {'39': 34}, tclass: 'normal'},
+    {c: '(', d:.2, tclass: 'normal'},
+    {c: ')', d:.2, tclass: 'normal'},
+    {c: '*', tclass: 'normal'},
+    {c: '+', a:.1, tclass: 'normal'},
+    {c: ',', a:-.3, d:.2, w: 0.278, tclass: 'normal'},
+    {c: '-', a:0, lig: {'45': 123}, tclass: 'normal'},
+    {c: '.', a:-.25, tclass: 'normal'},
+    {c: '/', tclass: 'normal'},
+    // 30 - 3F
+    {c: '0', tclass: 'normal'},
+    {c: '1', tclass: 'normal'},
+    {c: '2', tclass: 'normal'},
+    {c: '3', tclass: 'normal'},
+    {c: '4', tclass: 'normal'},
+    {c: '5', tclass: 'normal'},
+    {c: '6', tclass: 'normal'},
+    {c: '7', tclass: 'normal'},
+    {c: '8', tclass: 'normal'},
+    {c: '9', tclass: 'normal'},
+    {c: ':', tclass: 'normal'},
+    {c: ';', tclass: 'normal'},
+    {c: '&#xA1;', tclass: 'normal'},
+    {c: '=', a:0, d:-.1, tclass: 'normal'},
+    {c: '&#xBF;', tclass: 'normal'},
+    {c: '?', lig: {'96': 62}, tclass: 'normal'},
+    // 40 - 4F
+    {c: '@', tclass: 'normal'},
+    {c: 'A', krn: {'116': -0.0278, '67': -0.0278, '79': -0.0278, '71': -0.0278, '85': -0.0278, '81': -0.0278, '84': -0.0833, '89': -0.0833, '86': -0.111, '87': -0.111}, tclass: 'normal'},
+    {c: 'B', tclass: 'normal'},
+    {c: 'C', tclass: 'normal'},
+    {c: 'D', krn: {'88': -0.0278, '87': -0.0278, '65': -0.0278, '86': -0.0278, '89': -0.0278}, tclass: 'normal'},
+    {c: 'E', tclass: 'normal'},
+    {c: 'F', krn: {'111': -0.0833, '101': -0.0833, '117': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.111, '79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}, tclass: 'normal'},
+    {c: 'G', tclass: 'normal'},
+    {c: 'H', tclass: 'normal'},
+    {c: 'I', krn: {'73': 0.0278}, tclass: 'normal'},
+    {c: 'J', tclass: 'normal'},
+    {c: 'K', krn: {'79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}, tclass: 'normal'},
+    {c: 'L', krn: {'84': -0.0833, '89': -0.0833, '86': -0.111, '87': -0.111}, tclass: 'normal'},
+    {c: 'M', tclass: 'normal'},
+    {c: 'N', tclass: 'normal'},
+    {c: 'O', krn: {'88': -0.0278, '87': -0.0278, '65': -0.0278, '86': -0.0278, '89': -0.0278}, tclass: 'normal'},
+    // 50 - 5F
+    {c: 'P', krn: {'65': -0.0833, '111': -0.0278, '101': -0.0278, '97': -0.0278, '46': -0.0833, '44': -0.0833}, tclass: 'normal'},
+    {c: 'Q', d:.2, tclass: 'normal'},
+    {c: 'R', krn: {'116': -0.0278, '67': -0.0278, '79': -0.0278, '71': -0.0278, '85': -0.0278, '81': -0.0278, '84': -0.0833, '89': -0.0833, '86': -0.111, '87': -0.111}, tclass: 'normal'},
+    {c: 'S', tclass: 'normal'},
+    {c: 'T', krn: {'121': -0.0278, '101': -0.0833, '111': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.0833, '117': -0.0833}, tclass: 'normal'},
+    {c: 'U', tclass: 'normal'},
+    {c: 'V', ic: 0.0139, krn: {'111': -0.0833, '101': -0.0833, '117': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.111, '79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}, tclass: 'normal'},
+    {c: 'W', ic: 0.0139, krn: {'111': -0.0833, '101': -0.0833, '117': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.111, '79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}, tclass: 'normal'},
+    {c: 'X', krn: {'79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}, tclass: 'normal'},
+    {c: 'Y', ic: 0.025, krn: {'101': -0.0833, '111': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.0833, '117': -0.0833}, tclass: 'normal'},
+    {c: 'Z', tclass: 'normal'},
+    {c: '[', d:.1, tclass: 'normal'},
+    {c: '&#x201C;', tclass: 'normal'},
+    {c: ']', d:.1, tclass: 'normal'},
+    {c: '&#x2C6;', tclass: 'accent'},
+    {c: '&#x2D9;', tclass: 'accent'},
+    // 60 - 6F
+    {c: '&#x2018;', lig: {'96': 92}, tclass: 'normal'},
+    {c: 'a', a:0, krn: {'118': -0.0278, '106': 0.0556, '121': -0.0278, '119': -0.0278}, tclass: 'normal'},
+    {c: 'b', krn: {'101': 0.0278, '111': 0.0278, '120': -0.0278, '100': 0.0278, '99': 0.0278, '113': 0.0278, '118': -0.0278, '106': 0.0556, '121': -0.0278, '119': -0.0278}, tclass: 'normal'},
+    {c: 'c', a:0, krn: {'104': -0.0278, '107': -0.0278}, tclass: 'normal'},
+    {c: 'd', tclass: 'normal'},
+    {c: 'e', a:0, tclass: 'normal'},
+    {c: 'f', ic: 0.0778, krn: {'39': 0.0778, '63': 0.0778, '33': 0.0778, '41': 0.0778, '93': 0.0778}, lig: {'105': 12, '102': 11, '108': 13}, tclass: 'normal'},
+    {c: 'g', a:0, d:.2, ic: 0.0139, krn: {'106': 0.0278}, tclass: 'normal'},
+    {c: 'h', krn: {'116': -0.0278, '117': -0.0278, '98': -0.0278, '121': -0.0278, '118': -0.0278, '119': -0.0278}, tclass: 'normal'},
+    {c: 'i', tclass: 'normal'},
+    {c: 'j', d:.2, tclass: 'normal'},
+    {c: 'k', krn: {'97': -0.0556, '101': -0.0278, '97': -0.0278, '111': -0.0278, '99': -0.0278}, tclass: 'normal'},
+    {c: 'l', tclass: 'normal'},
+    {c: 'm', a:0, krn: {'116': -0.0278, '117': -0.0278, '98': -0.0278, '121': -0.0278, '118': -0.0278, '119': -0.0278}, tclass: 'normal'},
+    {c: 'n', a:0, krn: {'116': -0.0278, '117': -0.0278, '98': -0.0278, '121': -0.0278, '118': -0.0278, '119': -0.0278}, tclass: 'normal'},
+    {c: 'o', a:0, krn: {'101': 0.0278, '111': 0.0278, '120': -0.0278, '100': 0.0278, '99': 0.0278, '113': 0.0278, '118': -0.0278, '106': 0.0556, '121': -0.0278, '119': -0.0278}, tclass: 'normal'},
+    // 70 - 7F
+    {c: 'p', a:0, d:.2, krn: {'101': 0.0278, '111': 0.0278, '120': -0.0278, '100': 0.0278, '99': 0.0278, '113': 0.0278, '118': -0.0278, '106': 0.0556, '121': -0.0278, '119': -0.0278}, tclass: 'normal'},
+    {c: 'q', a:0, d:.2, tclass: 'normal'},
+    {c: 'r', a:0, tclass: 'normal'},
+    {c: 's', a:0, tclass: 'normal'},
+    {c: 't', krn: {'121': -0.0278, '119': -0.0278}, tclass: 'normal'},
+    {c: 'u', a:0, krn: {'119': -0.0278}, tclass: 'normal'},
+    {c: 'v', a:0, ic: 0.0139, krn: {'97': -0.0556, '101': -0.0278, '97': -0.0278, '111': -0.0278, '99': -0.0278}, tclass: 'normal'},
+    {c: 'w', a:0, ic: 0.0139, krn: {'101': -0.0278, '97': -0.0278, '111': -0.0278, '99': -0.0278}, tclass: 'normal'},
+    {c: 'x', a:0, tclass: 'normal'},
+    {c: 'y', a:0, d:.2, ic: 0.0139, krn: {'111': -0.0278, '101': -0.0278, '97': -0.0278, '46': -0.0833, '44': -0.0833}, tclass: 'normal'},
+    {c: 'z', a:0, tclass: 'normal'},
+    {c: '&#x2013;', a:.1, ic: 0.0278, lig: {'45': 124}, tclass: 'normal'},
+    {c: '&#x2014;', a:.1, ic: 0.0278, tclass: 'normal'},
+    {c: '&#x2DD;', tclass: 'accent'},
+    {c: '&#x2DC;', tclass: 'accent'},
+    {c: '&#xA8;', tclass: 'accent'}
+  ],
+  
+  cmmi10: [
+    // 00 - 0F
+    {c: '&Gamma;', ic: 0.139, krn: {'61': -0.0556, '59': -0.111, '58': -0.111, '127': 0.0833}, tclass: 'igreek'},
+    {c: '&Delta;', krn: {'127': 0.167}, tclass: 'igreek'},
+    {c: '&Theta;', ic: 0.0278, krn: {'127': 0.0833}, tclass: 'igreek'},
+    {c: '&Lambda;', krn: {'127': 0.167}, tclass: 'igreek'},
+    {c: '&Xi;', ic: 0.0757, krn: {'127': 0.0833}, tclass: 'igreek'},
+    {c: '&Pi;', ic: 0.0812, krn: {'61': -0.0556, '59': -0.0556, '58': -0.0556, '127': 0.0556}, tclass: 'igreek'},
+    {c: '&Sigma;', ic: 0.0576, krn: {'127': 0.0833}, tclass: 'igreek'},
+    {c: '&Upsilon;', ic: 0.139, krn: {'61': -0.0556, '59': -0.111, '58': -0.111, '127': 0.0556}, tclass: 'igreek'},
+    {c: '&Phi;', krn: {'127': 0.0833}, tclass: 'igreek'},
+    {c: '&Psi;', ic: 0.11, krn: {'61': -0.0556, '59': -0.0556, '58': -0.0556, '127': 0.0556}, tclass: 'igreek'},
+    {c: '&Omega;', ic: 0.0502, krn: {'127': 0.0833}, tclass: 'igreek'},
+    {c: '&alpha;', a:0, ic: 0.0037, krn: {'127': 0.0278}, tclass: 'greek'},
+    {c: '&beta;', d:.2, ic: 0.0528, krn: {'127': 0.0833}, tclass: 'greek'},
+    {c: '&gamma;', a:0, d:.2, ic: 0.0556, tclass: 'greek'},
+    {c: '&delta;', ic: 0.0378, krn: {'59': -0.0556, '58': -0.0556, '127': 0.0556}, tclass: 'greek'},
+    {c: '&epsilon;', a:0, krn: {'127': 0.0556}, tclass: 'lucida'},
+    // 10 - 1F
+    {c: '&zeta;', d:.2, ic: 0.0738, krn: {'127': 0.0833}, tclass: 'greek'},
+    {c: '&eta;', a:0, d:.2, ic: 0.0359, krn: {'127': 0.0556}, tclass: 'greek'},
+    {c: '&theta;', ic: 0.0278, krn: {'127': 0.0833}, tclass: 'greek'},
+    {c: '&iota;', a:0, krn: {'127': 0.0556}, tclass: 'greek'},
+    {c: '&kappa;', a:0, tclass: 'greek'},
+    {c: '&lambda;', tclass: 'greek'},
+    {c: '&mu;', a:0, d:.2, krn: {'127': 0.0278}, tclass: 'greek'},
+    {c: '&nu;', a:0, ic: 0.0637, krn: {'59': -0.0556, '58': -0.0556, '127': 0.0278}, tclass: 'greek'},
+    {c: '&xi;', d:.2, ic: 0.046, krn: {'127': 0.111}, tclass: 'greek'},
+    {c: '&pi;', a:0, ic: 0.0359, tclass: 'greek'},
+    {c: '&rho;', a:0, d:.2, krn: {'127': 0.0833}, tclass: 'greek'},
+    {c: '&sigma;', a:0, ic: 0.0359, krn: {'59': -0.0556, '58': -0.0556}, tclass: 'greek'},
+    {c: '&tau;', a:0, ic: 0.113, krn: {'59': -0.0556, '58': -0.0556, '127': 0.0278}, tclass: 'greek'},
+    {c: '&upsilon;', a:0, ic: 0.0359, krn: {'127': 0.0278}, tclass: 'greek'},
+    {c: '&phi;', a:.1, d:.2, krn: {'127': 0.0833}, tclass: 'greek'},
+    {c: '&chi;', a:0, d:.2, krn: {'127': 0.0556}, tclass: 'greek'},
+    // 20 - 2F
+    {c: '&psi;', a:.1, d:.2, ic: 0.0359, krn: {'127': 0.111}, tclass: 'greek'},
+    {c: '&omega;', a:0, ic: 0.0359, tclass: 'greek'},
+    {c: '&epsilon;', a:0, krn: {'127': 0.0833}, tclass: 'greek'},
+    {c: '&#x3D1;', krn: {'127': 0.0833}, tclass: 'lucida'},
+    {c: '&#x3D6;', a:0, ic: 0.0278, tclass: 'lucida'},
+    {c: '&#x3F1;', a:0, d:.2, krn: {'127': 0.0833}, tclass: 'lucida'},
+    {c: '&#x3C2;', a:0, d:.2, ic: 0.0799, krn: {'127': 0.0833}, tclass: 'lucida'},
+    {c: '&#x3D5;', a:.1, d:.2, krn: {'127': 0.0833}, tclass: 'lucida'},
+    {c: '&#x21BC;', a:0, d:-.2, tclass: 'arrows'},
+    {c: '&#x21BD;', a:0, d:-.1, tclass: 'arrows'},
+    {c: '&#x21C0;', a:0, d:-.2, tclass: 'arrows'},
+    {c: '&#x21C1;', a:0, d:-.1, tclass: 'arrows'},
+    {c: '<span style="position:relative; top:-.1em; display:inline-block">&#x02D3;</span>', a:.1, tclass: 'symbol'},
+    {c: '<span style="position:relative; top:-.1em; display:inline-block">&#x02D2;</span>', a:.1, tclass: 'symbol'},
+    {c: '&#x25B9;', tclass: 'symbol'},
+    {c: '&#x25C3;', tclass: 'symbol'},
+    // 30 - 3F
+    {c: '0', tclass: 'normal'},
+    {c: '1', tclass: 'normal'},
+    {c: '2', tclass: 'normal'},
+    {c: '3', tclass: 'normal'},
+    {c: '4', tclass: 'normal'},
+    {c: '5', tclass: 'normal'},
+    {c: '6', tclass: 'normal'},
+    {c: '7', tclass: 'normal'},
+    {c: '8', tclass: 'normal'},
+    {c: '9', tclass: 'normal'},
+    {c: '.', a:-.3, tclass: 'normal'},
+    {c: ',', a:-.3, d:.2, tclass: 'normal'},
+    {c: '&lt;', a:.1, tclass: 'normal'},
+    {c: '<span style="font-size:133%; position:relative; top:.1em; display:inline-block">/</span>', d:.1, krn: {'1': -0.0556, '65': -0.0556, '77': -0.0556, '78': -0.0556, '89': 0.0556, '90': -0.0556}, tclass: 'normal'},
+    {c: '&gt;', a:.1, tclass: 'normal'},
+    {c: '&#x22C6;', a:0, tclass: 'arial'},
+    // 40 - 4F
+    {c: '&#x2202;', ic: 0.0556, krn: {'127': 0.0833}, tclass: 'normal'},
+    {c: 'A', krn: {'127': 0.139}, tclass: 'italic'},
+    {c: 'B', ic: 0.0502, krn: {'127': 0.0833}, tclass: 'italic'},
+    {c: 'C', ic: 0.0715, krn: {'61': -0.0278, '59': -0.0556, '58': -0.0556, '127': 0.0833}, tclass: 'italic'},
+    {c: 'D', ic: 0.0278, krn: {'127': 0.0556}, tclass: 'italic'},
+    {c: 'E', ic: 0.0576, krn: {'127': 0.0833}, tclass: 'italic'},
+    {c: 'F', ic: 0.139, krn: {'61': -0.0556, '59': -0.111, '58': -0.111, '127': 0.0833}, tclass: 'italic'},
+    {c: 'G', krn: {'127': 0.0833}, tclass: 'italic'},
+    {c: 'H', ic: 0.0812, krn: {'61': -0.0556, '59': -0.0556, '58': -0.0556, '127': 0.0556}, tclass: 'italic'},
+    {c: 'I', ic: 0.0785, krn: {'127': 0.111}, tclass: 'italic'},
+    {c: 'J', ic: 0.0962, krn: {'61': -0.0556, '59': -0.111, '58': -0.111, '127': 0.167}, tclass: 'italic'},
+    {c: 'K', ic: 0.0715, krn: {'61': -0.0556, '59': -0.0556, '58': -0.0556, '127': 0.0556}, tclass: 'italic'},
+    {c: 'L', krn: {'127': 0.0278}, tclass: 'italic'},
+    {c: 'M', ic: 0.109, krn: {'61': -0.0556, '59': -0.0556, '58': -0.0556, '127': 0.0833}, tclass: 'italic'},
+    {c: 'N', ic: 0.109, krn: {'61': -0.0833, '61': -0.0278, '59': -0.0556, '58': -0.0556, '127': 0.0833}, tclass: 'italic'},
+    {c: 'O', ic: 0.0278, krn: {'127': 0.0833}, tclass: 'italic'},
+    // 50 - 5F
+    {c: 'P', ic: 0.139, krn: {'61': -0.0556, '59': -0.111, '58': -0.111, '127': 0.0833}, tclass: 'italic'},
+    {c: 'Q', d:.2, krn: {'127': 0.0833}, tclass: 'italic'},
+    {c: 'R', ic: 0.00773, krn: {'127': 0.0833}, tclass: 'italic'},
+    {c: 'S', ic: 0.0576, krn: {'61': -0.0556, '59': -0.0556, '58': -0.0556, '127': 0.0833}, tclass: 'italic'},
+    {c: 'T', ic: 0.139, krn: {'61': -0.0278, '59': -0.0556, '58': -0.0556, '127': 0.0833}, tclass: 'italic'},
+    {c: 'U', ic: 0.109, krn: {'59': -0.111, '58': -0.111, '61': -0.0556, '127': 0.0278}, tclass: 'italic'},
+    {c: 'V', ic: 0.222, krn: {'59': -0.167, '58': -0.167, '61': -0.111}, tclass: 'italic'},
+    {c: 'W', ic: 0.139, krn: {'59': -0.167, '58': -0.167, '61': -0.111}, tclass: 'italic'},
+    {c: 'X', ic: 0.0785, krn: {'61': -0.0833, '61': -0.0278, '59': -0.0556, '58': -0.0556, '127': 0.0833}, tclass: 'italic'},
+    {c: 'Y', ic: 0.222, krn: {'59': -0.167, '58': -0.167, '61': -0.111}, tclass: 'italic'},
+    {c: 'Z', ic: 0.0715, krn: {'61': -0.0556, '59': -0.0556, '58': -0.0556, '127': 0.0833}, tclass: 'italic'},
+    {c: '&#x266D;', tclass: 'symbol'},
+    {c: '&#x266E;', tclass: 'symbol'},
+    {c: '&#x266F;', tclass: 'symbol'},
+    {c: '<span style="position:relative; top:-.3em; font-size:75%; display:inline-block">&#x203F;</span>', a:0, d:-.1, tclass: 'arial'},
+    {c: '<span style="position:relative; top:.4em; font-size:75%; display:inline-block">&#x2040;</span>', a:0, d:-.1, tclass: 'arial'},
+    // 60 - 6F
+    {c: '&#x2113;', krn: {'127': 0.111}, tclass: 'italic'},
+    {c: 'a', a:0, tclass: 'italic'},
+    {c: 'b', tclass: 'italic'},
+    {c: 'c', a:0, krn: {'127': 0.0556}, tclass: 'italic'},
+    {c: 'd', krn: {'89': 0.0556, '90': -0.0556, '106': -0.111, '102': -0.167, '127': 0.167}, tclass: 'italic'},
+    {c: 'e', a:0, krn: {'127': 0.0556}, tclass: 'italic'},
+    {c: 'f', d:.2, ic: 0.108, krn: {'59': -0.0556, '58': -0.0556, '127': 0.167}, tclass: 'italic'},
+    {c: 'g', a:0, d:.2, ic: 0.0359, krn: {'127': 0.0278}, tclass: 'italic'},
+    {c: 'h', krn: {'127': -0.0278}, tclass: 'italic'},
+    {c: 'i', tclass: 'italic'},
+    {c: 'j', d:.2, ic: 0.0572, krn: {'59': -0.0556, '58': -0.0556}, tclass: 'italic'},
+    {c: 'k', ic: 0.0315, tclass: 'italic'},
+    {c: 'l', ic: 0.0197, krn: {'127': 0.0833}, tclass: 'italic'},
+    {c: 'm', a:0, tclass: 'italic'},
+    {c: 'n', a:0, tclass: 'italic'},
+    {c: 'o', a:0, krn: {'127': 0.0556}, tclass: 'italic'},
+    // 70 - 7F
+    {c: 'p', a:0, d:.2, krn: {'127': 0.0833}, tclass: 'italic'},
+    {c: 'q', a:0, d:.2, ic: 0.0359, krn: {'127': 0.0833}, tclass: 'italic'},
+    {c: 'r', a:0, ic: 0.0278, krn: {'59': -0.0556, '58': -0.0556, '127': 0.0556}, tclass: 'italic'},
+    {c: 's', a:0, krn: {'127': 0.0556}, tclass: 'italic'},
+    {c: 't', krn: {'127': 0.0833}, tclass: 'italic'},
+    {c: 'u', a:0, krn: {'127': 0.0278}, tclass: 'italic'},
+    {c: 'v', a:0, ic: 0.0359, krn: {'127': 0.0278}, tclass: 'italic'},
+    {c: 'w', a:0, ic: 0.0269, krn: {'127': 0.0833}, tclass: 'italic'},
+    {c: 'x', a:0, krn: {'127': 0.0278}, tclass: 'italic'},
+    {c: 'y', a:0, d:.2, ic: 0.0359, krn: {'127': 0.0556}, tclass: 'italic'},
+    {c: 'z', a:0, ic: 0.044, krn: {'127': 0.0556}, tclass: 'italic'},
+    {c: '&#x131;', a:0, krn: {'127': 0.0278}, tclass: 'italic'},
+    {c: 'j', d:.2, krn: {'127': 0.0833}, tclass: 'italic'},
+    {c: '&#x2118;', a:0, d:.2, krn: {'127': 0.111}, tclass: 'arial'},
+    {c: '<span style="position:relative; left:.3em; top:-.65em; font-size: 67%; display:inline-block">&#x2192;</span>', ic: 0.154, tclass: 'symbol'},
+    {c: '&#x0311;', ic: 0.399, tclass: 'normal'}
+  ],
+
+  cmsy10: [
+    // 00 - 0F
+    {c: '<span style="position:relative; top:.1em; display:inline-block">&#x2212;</span>', a:.1, tclass: 'symbol'},
+    {c: '&#xB7;', a:0, d:-.2, tclass: 'normal'},
+    {c: '&#xD7;', a:0, tclass: 'normal'},
+    {c: '<span style="position:relative; top:.3em; display:inline-block">&#x2A;</span>', a:0, tclass: 'normal'},
+    {c: '&#xF7;', a:0, tclass: 'normal'},
+    {c: '&#x25CA;', tclass: 'symbol'},
+    {c: '&#xB1;', a:.1, tclass: 'normal'},
+    {c: '&#x2213;', tclass: 'symbol'},
+    {c: '&#x2295;', tclass: 'symbol'},
+    {c: '&#x2296;', tclass: 'symbol'},
+    {c: '&#x2297;', tclass: 'symbol'},
+    {c: '&#x2298;', tclass: 'symbol'},
+    {c: '&#x2299;', tclass: 'symbol'},
+    {c: '&#x25EF;', tclass: 'arial'},
+    {c: '&#x2218;', a:0, d:-.1, tclass: 'symbol2'},
+    {c: '&#x2022;', a:0, d:-.2, tclass: 'symbol'},
+    // 10 - 1F
+    {c: '&#x224D;', a:.1, tclass: 'symbol2'},
+    {c: '&#x2261;', a:.1, tclass: 'symbol2'},
+    {c: '&#x2286;', tclass: 'symbol'},
+    {c: '&#x2287;', tclass: 'symbol'},
+    {c: '&#x2264;', tclass: 'symbol'},
+    {c: '&#x2265;', tclass: 'symbol'},
+    {c: '&#x227C;', tclass: 'symbol'},
+    {c: '&#x227D;', tclass: 'symbol'},
+    {c: '~', a:0, d: -.2, tclass: 'normal'},
+    {c: '&#x2248;', a:.1, d:-.1, tclass: 'symbol'},
+    {c: '&#x2282;', tclass: 'symbol'},
+    {c: '&#x2283;', tclass: 'symbol'},
+    {c: '&#x226A;', tclass: 'symbol'},
+    {c: '&#x226B;', tclass: 'symbol'},
+    {c: '&#x227A;', tclass: 'symbol'},
+    {c: '&#x227B;', tclass: 'symbol'},
+    // 20 - 2F
+    {c: '&#x2190;', a:-.1, tclass: 'arrow1'},
+    {c: '&#x2192;', a:-.1, tclass: 'arrow1'},
+    {c: '&#x2191;', a:.2, d:0, tclass: 'arrow1a'},
+    {c: '&#x2193;', a:.2, d:0, tclass: 'arrow1a'},
+    {c: '&#x2194;', a:-.1, tclass: 'arrow1'},
+    {c: '&#x2197;', a:.1, tclass: 'arrows'},
+    {c: '&#x2198;', a:.1, tclass: 'arrows'},
+    {c: '&#x2243;', a: .1, tclass: 'symbol2'},
+    {c: '&#x21D0;', a:-.1, tclass: 'arrow2'},
+    {c: '&#x21D2;', a:-.1, tclass: 'arrow2'},
+    {c: '&#x21D1;', a:.2, d:.1, tclass: 'arrow1a'},
+    {c: '&#x21D3;', a:.2, d:.1, tclass: 'arrow1a'},
+    {c: '&#x21D4;', a:-.1, tclass: 'arrow2'},
+    {c: '&#x2196;', a:.1, tclass: 'arrows'},
+    {c: '&#x2199;', a:.1, tclass: 'arrows'},
+    {c: '&#x221D;', a:.1, tclass: 'normal'},
+    // 30 - 3F
+    {c: '<span style="font-size:133%; margin-right:-.1em; position: relative; top:.4em; display:inline-block">&#x2032;</span>', a: 0, tclass: 'lucida'},
+    {c: '&#x221E;', a:.1, tclass: 'symbol'},
+    {c: '&#x2208;', tclass: 'symbol'},
+    {c: '&#x220B;', tclass: 'symbol'},
+    {c: '<span style="font-size:150%; position:relative; top:.2em; display:inline-block">&#x25B3;</span>', tclass: 'symbol'},
+    {c: '<span style="font-size:150%; position:relative; top:.2em; display:inline-block">&#x25BD;</span>', tclass: 'symbol'},
+    {c: '<span style="font-size:133%; position:relative; top:.2em; display:inline-block">/</span>', d:.2, tclass: 'normal'},
+    {c: '<span style="font-size:67%; position: relative; top:-.15em; margin-right:-.3em; display:inline-block">&#x22A2;</span>', tclass: 'symbol'},
+    {c: '&#x2200;', tclass: 'symbol'},
+    {c: '&#x2203;', tclass: 'symbol'},
+    {c: '&#xAC;', a:0, d:-.1, tclass: 'symbol'},
+    {c: '&#x2205;', tclass: 'symbol'},
+    {c: '&#x211C;', tclass: 'symbol'},
+    {c: '&#x2111;', tclass: 'symbol'},
+    {c: '&#x22A4;', tclass: 'symbol'},
+    {c: '&#x22A5;', tclass: 'symbol'},
+    // 40 - 4F
+    {c: '&#x2135;', tclass: 'symbol'},
+    {c: 'A', krn: {'48': 0.194}, tclass: 'cal'},
+    {c: 'B', ic: 0.0304, krn: {'48': 0.139}, tclass: 'cal'},
+    {c: 'C', ic: 0.0583, krn: {'48': 0.139}, tclass: 'cal'},
+    {c: 'D', ic: 0.0278, krn: {'48': 0.0833}, tclass: 'cal'},
+    {c: 'E', ic: 0.0894, krn: {'48': 0.111}, tclass: 'cal'},
+    {c: 'F', ic: 0.0993, krn: {'48': 0.111}, tclass: 'cal'},
+    {c: 'G', d:.2, ic: 0.0593, krn: {'48': 0.111}, tclass: 'cal'},
+    {c: 'H', ic: 0.00965, krn: {'48': 0.111}, tclass: 'cal'},
+    {c: 'I', ic: 0.0738, krn: {'48': 0.0278}, tclass: 'cal'},
+    {c: 'J', d:.2, ic: 0.185, krn: {'48': 0.167}, tclass: 'cal'},
+    {c: 'K', ic: 0.0144, krn: {'48': 0.0556}, tclass: 'cal'},
+    {c: 'L', krn: {'48': 0.139}, tclass: 'cal'},
+    {c: 'M', krn: {'48': 0.139}, tclass: 'cal'},
+    {c: 'N', ic: 0.147, krn: {'48': 0.0833}, tclass: 'cal'},
+    {c: 'O', ic: 0.0278, krn: {'48': 0.111}, tclass: 'cal'},
+    // 50 - 5F
+    {c: 'P', ic: 0.0822, krn: {'48': 0.0833}, tclass: 'cal'},
+    {c: 'Q', d:.2, krn: {'48': 0.111}, tclass: 'cal'},
+    {c: 'R', krn: {'48': 0.0833}, tclass: 'cal'},
+    {c: 'S', ic: 0.075, krn: {'48': 0.139}, tclass: 'cal'},
+    {c: 'T', ic: 0.254, krn: {'48': 0.0278}, tclass: 'cal'},
+    {c: 'U', ic: 0.0993, krn: {'48': 0.0833}, tclass: 'cal'},
+    {c: 'V', ic: 0.0822, krn: {'48': 0.0278}, tclass: 'cal'},
+    {c: 'W', ic: 0.0822, krn: {'48': 0.0833}, tclass: 'cal'},
+    {c: 'X', ic: 0.146, krn: {'48': 0.139}, tclass: 'cal'},
+    {c: 'Y', ic: 0.0822, krn: {'48': 0.0833}, tclass: 'cal'},
+    {c: 'Z', ic: 0.0794, krn: {'48': 0.139}, tclass: 'cal'},
+    {c: '&#x22C3;', tclass: 'symbol'},
+    {c: '&#x22C2;', tclass: 'symbol'},
+    {c: '&#x228E;', tclass: 'symbol'},
+    {c: '&#x22C0;', tclass: 'symbol'},
+    {c: '&#x22C1;', tclass: 'symbol'},
+    // 60 - 6F
+    {c: '&#x22A2;', tclass: 'symbol'},
+    {c: '&#x22A3;', tclass: 'symbol'},
+    {c: '&#x230A;', a:.3, d:.2, tclass: 'lucida'},
+    {c: '&#x230B;', a:.3, d:.2, tclass: 'lucida'},
+    {c: '&#x2308;', a:.3, d:.2, tclass: 'lucida'},
+    {c: '&#x2309;', a:.3, d:.2, tclass: 'lucida'},
+    {c: '{', d:.2, tclass: 'normal'},
+    {c: '}', d:.2, tclass: 'normal'},
+    {c: '&#x2329;', a:.3, d:.2, tclass: 'symbol'},
+    {c: '&#x232A;', a:.3, d:.2, tclass: 'symbol'},
+    {c: '&#x2223;', d:.1, tclass: 'symbol'},
+    {c: '&#x2225;', d:.1, tclass: 'symbol'},
+    {c: '&#x2195;', a:.2, d:0, tclass: 'arrow1a'},
+    {c: '&#x21D5;', a:.3, d:0, tclass: 'arrow1a'},
+    {c: '&#x2216;', a:.3, d:.1, tclass: 'symbol'},
+    {c: '&#x2240;', tclass: 'symbol'},
+    // 70 - 7F
+    {c: '<span style="display:inline-block; position:relative; top:.8em">&#x221A;</span>', h:.04, d:.8, tclass: 'symbol'},
+    {c: '&#x2210;', a:.4, tclass: 'symbol'},
+    {c: '&#x2207;', tclass: 'symbol'},
+    {c: '<span style="display:inline-block; position:relative; font-size:85%; left:-.1em; margin-right:-.2em">&#x222B;</span>', a:.4, d:.1, ic: 0.111, tclass: 'lucida'},
+    {c: '&#x2294;', tclass: 'symbol'},
+    {c: '&#x2293;', tclass: 'symbol'},
+    {c: '&#x2291;', tclass: 'symbol'},
+    {c: '&#x2292;', tclass: 'symbol'},
+    {c: '&#xA7;', d:.1, tclass: 'normal'},
+    {c: '&#x2020;', d:.1, tclass: 'normal'},
+    {c: '&#x2021;', d:.1, tclass: 'normal'},
+    {c: '&#xB6;', a:.3, d:.1, tclass: 'lucida'},
+    {c: '&#x2663;', tclass: 'arial'},
+    {c: '&#x2662;', tclass: 'arial'},
+    {c: '&#x2661;', tclass: 'arial'},
+    {c: '&#x2660;', tclass: 'arial'}
+  ],
+
+  cmex10: [
+    // 00 - 0F
+    {c: '(', h: 0.04, d: 1.16, n: 16, tclass: 'delim1'},
+    {c: ')', h: 0.04, d: 1.16, n: 17, tclass: 'delim1'},
+    {c: '[', h: 0.04, d: 1.16, n: 104, tclass: 'delim1'},
+    {c: ']', h: 0.04, d: 1.16, n: 105, tclass: 'delim1'},
+    {c: '&#x230A;', h: 0.04, d: 1.16, n: 106, tclass: 'delim1a'},
+    {c: '&#x230B;', h: 0.04, d: 1.16, n: 107, tclass: 'delim1a'},
+    {c: '&#x2308;', h: 0.04, d: 1.16, n: 108, tclass: 'delim1a'},
+    {c: '&#x2309;', h: 0.04, d: 1.16, n: 109, tclass: 'delim1a'},
+    {c: '<span style="display:inline-block; margin-left:-.1em">{</span>', h: 0.04, d: 1.16, n: 110, tclass: 'delim1'},
+    {c: '<span style="display:inline-block; margin-right:-.1em">}</span>', h: 0.04, d: 1.16, n: 111, tclass: 'delim1'},
+    {c: '&#x2329;', h: 0.04, d: 1.16, n: 68, tclass: 'delim1b'},
+    {c: '&#x232A;', h: 0.04, d: 1.16, n: 69, tclass: 'delim1b'},
+    {c: '&#x2223;', h:.7, d:.1, delim: {rep: 12}, tclass: 'symbol'},
+    {c: '&#x2225;', h:.7, d:.1, delim: {rep: 13}, tclass: 'symbol'},
+    {c: '/', h: 0.04, d: 1.16, n: 46, tclass: 'delim1a'},
+    {c: '&#x2216;', h: 0.04, d: 1.16, n: 47, tclass: 'delim1a'},
+    // 10 - 1F
+    {c: '(', h: 0.04, d: 1.76, n: 18, tclass: 'delim2'},
+    {c: ')', h: 0.04, d: 1.76, n: 19, tclass: 'delim2'},
+    {c: '(', h: 0.04, d: 2.36, n: 32, tclass: 'delim3'},
+    {c: ')', h: 0.04, d: 2.36, n: 33, tclass: 'delim3'},
+    {c: '[', h: 0.04, d: 2.36, n: 34, tclass: 'delim3'},
+    {c: ']', h: 0.04, d: 2.36, n: 35, tclass: 'delim3'},
+    {c: '&#x230A;', h: 0.04, d: 2.36, n: 36, tclass: 'delim3a'},
+    {c: '&#x230B;', h: 0.04, d: 2.36, n: 37, tclass: 'delim3a'},
+    {c: '&#x2308;', h: 0.04, d: 2.36, n: 38, tclass: 'delim3a'},
+    {c: '&#x2309;', h: 0.04, d: 2.36, n: 39, tclass: 'delim3a'},
+    {c: '<span style="display:inline-block; position:relative; left:-.1em; margin-right:-.1em">{</span>', h: 0.04, d: 2.36, n: 40, tclass: 'delim3'},
+    {c: '<span style="display:inline-block; position:relative; left:-.05em; margin-right:-.1em">}</span>', h: 0.04, d: 2.36, n: 41, tclass: 'delim3'},
+    {c: '&#x2329;', h: 0.04, d: 2.36, n: 42, tclass: 'delim3b'},
+    {c: '&#x232A;', h: 0.04, d: 2.36, n: 43, tclass: 'delim3b'},
+    {c: '/', h: 0.04, d: 2.36, n: 44, tclass: 'delim3a'},
+    {c: '&#x2216;', h: 0.04, d: 2.36, n: 45, tclass: 'delim3a'},
+    // 20 - 2F
+    {c: '(', h: 0.04, d: 2.96, n: 48, tclass: 'delim4'},
+    {c: ')', h: 0.04, d: 2.96, n: 49, tclass: 'delim4'},
+    {c: '[', h: 0.04, d: 2.96, n: 50, tclass: 'delim4'},
+    {c: ']', h: 0.04, d: 2.96, n: 51, tclass: 'delim4'},
+    {c: '&#x230A;', h: 0.04, d: 2.96, n: 52, tclass: 'delim4a'},
+    {c: '&#x230B;', h: 0.04, d: 2.96, n: 53, tclass: 'delim4a'},
+    {c: '&#x2308;', h: 0.04, d: 2.96, n: 54, tclass: 'delim4a'},
+    {c: '&#x2309;', h: 0.04, d: 2.96, n: 55, tclass: 'delim4a'},
+    {c: '<span style="display:inline-block; position:relative; left:-.1em; margin-right:-.1em">{</span>', h: 0.04, d: 2.96, n: 56, tclass: 'delim4'},
+    {c: '<span style="display:inline-block; position:relative; left:-.1em; margin-right:-.1em">}</span>', h: 0.04, d: 2.96, n: 57, tclass: 'delim4'},
+    {c: '&#x2329;', h: 0.04, d: 2.96, tclass: 'delim4b'},
+    {c: '&#x232A;', h: 0.04, d: 2.96, tclass: 'delim4b'},
+    {c: '/', h: 0.04, d: 2.96, tclass: 'delim4a'},
+    {c: '&#x2216;', h: 0.04, d: 2.96, tclass: 'delim4a'},
+    {c: '/', h: 0.04, d: 1.76, n: 30, tclass: 'delim2a'},
+    {c: '&#x2216;', h: 0.04, d: 1.76, n: 31, tclass: 'delim2a'},
+    // 30 - 3F
+    {c: '&#xE6;', h: 1, delim: {top: 48, bot: 64, rep: 66}, tclass: 'delimx'},
+    {c: '&#xF6;', h: 1, delim: {top: 49, bot: 65, rep: 67}, tclass: 'delimx'},
+    {c: '&#xE9;', h: 1, delim: {top: 50, bot: 52, rep: 54}, tclass: 'delimx'},
+    {c: '&#xF9;', h: 1, delim: {top: 51, bot: 53, rep: 55}, tclass: 'delimx'},
+    {c: '&#xEB;', h: 1, delim: {bot: 52, rep: 54}, tclass: 'delimx'},
+    {c: '&#xFB;', h: 1, delim: {bot: 53, rep: 55}, tclass: 'delimx'},
+    {c: '&#xEA;', h: 1, delim: {top: 50, rep: 54}, tclass: 'delimx'},
+    {c: '&#xFA;', h: 1, delim: {top: 51, rep: 55}, tclass: 'delimx'},
+    {c: '&#xEC;', h: 1, delim: {top: 56, mid: 60, bot: 58, rep: 62}, tclass: 'delimx'},
+    {c: '&#xFC;', h: 1, delim: {top: 57, mid: 61, bot: 59, rep: 62}, tclass: 'delimx'},
+    {c: '&#xEE;', h: 1, delim: {top: 56, bot: 58, rep: 62}, tclass: 'delimx'},
+    {c: '&#xFE;', h: 1, delim: {top: 57, bot: 59, rep: 62}, tclass: 'delimx'},
+    {c: '&#xED;', h: 1, delim: {rep: 63}, tclass: 'delimx'},
+    {c: '&#xFD;', h: 1, delim: {rep: 119}, tclass: 'delimx'},
+    {c: '&#xEF;', h: 1, delim: {rep: 62}, tclass: 'delimx'},
+    {c: '<span style="display:inline-block; margin-left:.14em; margin-right:.36em">|</span>', delim: {top: 120, bot: 121, rep: 63}, tclass: 'normal'},
+    // 40 - 4F
+    {c: '&#xE8;', h: 1, delim: {top: 56, bot: 59, rep: 62}, tclass: 'delimx'},
+    {c: '&#xF8;', h: 1, delim: {top: 57, bot: 58, rep: 62}, tclass: 'delimx'},
+    {c: '&#xE7;', h: 1, delim: {rep: 66}, tclass: 'delimx'},
+    {c: '&#xF7;', h: 1, delim: {rep: 67}, tclass: 'delimx'},
+    {c: '&#x2329;', h: 0.04, d: 1.76, n: 28, tclass: 'delim2b'},
+    {c: '&#x232A;', h: 0.04, d: 1.76, n: 29, tclass: 'delim2b'},
+    {c: '&#x2294;', h: 0, d: 1, n: 71, tclass: 'bigop1'},
+    {c: '&#x2294;', h: 0.1, d: 1.5, tclass: 'bigop2'},
+    {c: '&#x222E;', h: 0, d: 1.11, ic: 0.095, n: 73, tclass: 'bigop1c'},
+    {c: '&#x222E;', h: 0, d: 2.22, ic: 0.222, tclass: 'bigop2c'},
+    {c: '&#x2299;', h: 0, d: 1, n: 75, tclass: 'bigop1'},
+    {c: '&#x2299;', h: 0.1, d: 1.5, tclass: 'bigop2'},
+    {c: '&#x2295;', h: 0, d: 1, n: 77, tclass: 'bigop1'},
+    {c: '&#x2295;', h: 0.1, d: 1.5, tclass: 'bigop2'},
+    {c: '&#x2297;', h: 0, d: 1, n: 79, tclass: 'bigop1'},
+    {c: '&#x2297;', h: 0.1, d: 1.5, tclass: 'bigop2'},
+    // 50 - 5F
+    {c: '&#x2211;', h: 0, d: 1, n: 88, tclass: 'bigop1a'},
+    {c: '&#x220F;', h: 0, d: 1, n: 89, tclass: 'bigop1a'},
+    {c: '&#x222B;', h: 0, d: 1.11, ic: 0.095, n: 90, tclass: 'bigop1c'},
+    {c: '&#x222A;', h: 0, d: 1, n: 91, tclass: 'bigop1b'},
+    {c: '&#x2229;', h: 0, d: 1, n: 92, tclass: 'bigop1b'},
+    {c: '&#x228E;', h: 0, d: 1, n: 93, tclass: 'bigop1b'},
+    {c: '&#x22C0;', h: 0, d: 1, n: 94, tclass: 'bigop1'},
+    {c: '&#x22C1;', h: 0, d: 1, n: 95, tclass: 'bigop1'},
+    {c: '&#x2211;', h: 0.1, d: 1.6, tclass: 'bigop2a'},
+    {c: '&#x220F;', h: 0.1, d: 1.5, tclass: 'bigop2a'},
+    {c: '&#x222B;', h: 0, d: 2.22, ic: 0.222, tclass: 'bigop2c'},
+    {c: '&#x222A;', h: 0.1, d: 1.5, tclass: 'bigop2b'},
+    {c: '&#x2229;', h: 0.1, d: 1.5, tclass: 'bigop2b'},
+    {c: '&#x228E;', h: 0.1, d: 1.5, tclass: 'bigop2b'},
+    {c: '&#x22C0;', h: 0.1, d: 1.5, tclass: 'bigop2'},
+    {c: '&#x22C1;', h: 0.1, d: 1.5, tclass: 'bigop2'},
+    // 60 - 6F
+    {c: '&#x2210;', h: 0, d: 1, n: 97, tclass: 'bigop1a'},
+    {c: '&#x2210;', h: 0.1, d: 1.5, tclass: 'bigop2a'},
+    {c: '&#xFE3F;', h: 0.8, d:0, w: .65, n: 99, tclass: 'wide1'},
+    {c: '&#xFE3F;', h: 0.85, w: 1.1, n: 100, tclass: 'wide2'},
+    {c: '&#xFE3F;', h: 0.99, w: 1.65, tclass: 'wide3'},
+    {c: '~', h: 1, w: .5, n: 102, tclass: 'wide1a'},
+    {c: '~', h: 1, w: .8, n: 103, tclass: 'wide2a'},
+    {c: '~', h: 0.99, w: 1.3, tclass: 'wide3a'},
+    {c: '[', h: 0.04, d: 1.76, n: 20, tclass: 'delim2'},
+    {c: ']', h: 0.04, d: 1.76, n: 21, tclass: 'delim2'},
+    {c: '&#x2308;', h: 0.04, d: 1.76, n: 22, tclass: 'delim2a'},
+    {c: '&#x2309;', h: 0.04, d: 1.76, n: 23, tclass: 'delim2a'},
+    {c: '&#x230A;', h: 0.04, d: 1.76, n: 24, tclass: 'delim2a'},
+    {c: '&#x230B;', h: 0.04, d: 1.76, n: 25, tclass: 'delim2a'},
+    {c: '<span style="display:inline-block; position:relative; left:-.1em; margin-right:-.1em">{</span>', h: 0.04, d: 1.76, n: 26, tclass: 'delim2'},
+    {c: '<span style="display:inline-block; position:relative; margin-right:-.1em; left:-.05em">}</span>', h: 0.04, d: 1.76, n: 27, tclass: 'delim2'},
+    // 70 - 7F
+    {c: '<span style="font-size:150%; position:relative; top:.8em; display:inline-block">&#x221A;</span>', h: 0.04, d: 1.16, n: 113, tclass: 'root'},
+    {c: '<span style="font-size:220%; position:relative; top:.8em; display:inline-block">&#x221A;</span>', h: 0.04, d: 1.76, n: 114, tclass: 'root'},
+    {c: '<span style="font-size:310%; position:relative; top:.8em; margin-right:-.01em; display:inline-block">&#x221A;</span>', h: 0.06, d: 2.36, n: 115, tclass: 'root'},
+    {c: '<span style="font-size:400%; position:relative; top:.8em; margin-right:-.025em; display:inline-block">&#x221A;</span>', h: 0.08, d: 2.96, n: 116, tclass: 'root'},
+    {c: '<span style="font-size:490%; position:relative; top:.8em; margin-right:-.03em; display:inline-block">&#x221A;</span>', h: 0.1, d: 3.75, n: 117, tclass: 'root'},
+    {c: '<span style="font-size:580%; position:relative; top:.775em; margin-right:-.04em; display:inline-block">&#x221A;</span>', h: .12, d: 4.5, n: 118, tclass: 'root'},
+    {c: '<span style="font-size:750%; position:relative; top:.775em; margin-right:-.04em; display:inline-block">&#x221A;</span>', h: .14, d: 5.7, tclass: 'root'},
+    {c: '<span style="display:inline-block; margin-left:.04em">|</span><span style="display:inline-block; margin-left:.08em; margin-right:.125em">|</span>', delim: {top: 126, bot: 127, rep: 119}, tclass: 'normal'},
+    {c: '&#x2191;', h:.7, d:0, delim: {top: 120, rep: 63}, tclass: 'arrow1a'},
+    {c: '&#x2193;', h:.7, d:0, delim: {bot: 121, rep: 63}, tclass: 'arrow1a'},
+    {c: '<span style="margin-left:-.1em"></span><span style="position:relative; top:.55em; margin-right:-.3em; display:inline-block">&#x25DC;</span>', h: 0.05, tclass: 'symbol'},
+    {c: '<span style="margin-left:-.3em"></span><span style="position:relative; top:.55em; margin-right:-.1em; display:inline-block">&#x25DD;</span>', h: 0.05, tclass: 'symbol'},
+    {c: '<span style="margin-left:-.1em"></span><span style="position:relative; top:.15em; margin-right:-.3em; display:inline-block">&#x25DF;</span>', h: 0.05, tclass: 'symbol'},
+    {c: '<span style="margin-left:-.3em"></span><span style="position:relative; top:.15em; margin-right:-.1em; display:inline-block">&#x25DE;</span>', h: 0.05, tclass: 'symbol'},
+    {c: '&#x21D1;', h: .65, d:0, delim: {top: 126, rep: 119}, tclass: 'arrow1a'},
+    {c: '&#x21D3;', h: .65, d:0, delim: {bot: 127, rep: 119}, tclass: 'arrow1a'}
+  ],
+  
+  cmti10: [
+    // 00 - 0F
+    {c: '&Gamma;', ic: 0.133, tclass: 'igreek'},
+    {c: '&Delta;', tclass: 'igreek'},
+    {c: '&Theta;', ic: 0.094, tclass: 'igreek'},
+    {c: '&Lambda;', tclass: 'igreek'},
+    {c: '&Xi;', ic: 0.153, tclass: 'igreek'},
+    {c: '&Pi;', ic: 0.164, tclass: 'igreek'},
+    {c: '&Sigma;', ic: 0.12, tclass: 'igreek'},
+    {c: '&Upsilon;', ic: 0.111, tclass: 'igreek'},
+    {c: '&Phi;', ic: 0.0599, tclass: 'igreek'},
+    {c: '&Psi;', ic: 0.111, tclass: 'igreek'},
+    {c: '&Omega;', ic: 0.103, tclass: 'igreek'},
+    {c: 'ff', ic: 0.212, krn: {'39': 0.104, '63': 0.104, '33': 0.104, '41': 0.104, '93': 0.104}, lig: {'105': 14, '108': 15}, tclass: 'italic'},
+    {c: 'fi', ic: 0.103, tclass: 'italic'},
+    {c: 'fl', ic: 0.103, tclass: 'italic'},
+    {c: 'ffi', ic: 0.103, tclass: 'italic'},
+    {c: 'ffl', ic: 0.103, tclass: 'italic'},
+    // 10 - 1F
+    {c: '&#x131;', a:0, ic: 0.0767, tclass: 'italic'},
+    {c: 'j', d:.2, ic: 0.0374, tclass: 'italic'},
+    {c: '&#x2CB;', tclass: 'iaccent'},
+    {c: '&#x2CA;', ic: 0.0969, tclass: 'iaccent'},
+    {c: '&#x2C7;', ic: 0.083, tclass: 'iaccent'},
+    {c: '&#x2D8;', ic: 0.108, tclass: 'iaccent'},
+    {c: '&#x2C9;', ic: 0.103, tclass: 'iaccent'},
+    {c: '&#x2DA;', tclass: 'iaccent'},
+    {c: '?', d: 0.17, w: 0.46, tclass: 'italic'},
+    {c: '&#xDF;', ic: 0.105, tclass: 'italic'},
+    {c: '&#xE6;', a:0, ic: 0.0751, tclass: 'italic'},
+    {c: '&#x153;', a:0, ic: 0.0751, tclass: 'italic'},
+    {c: '&#xF8;', ic: 0.0919, tclass: 'italic'},
+    {c: '&#xC6;', ic: 0.12, tclass: 'italic'},
+    {c: '&#x152;', ic: 0.12, tclass: 'italic'},
+    {c: '&#xD8;', ic: 0.094, tclass: 'italic'},
+    // 20 - 2F
+    {c: '?', krn: {'108': -0.256, '76': -0.321}, tclass: 'italic'},
+    {c: '!', ic: 0.124, lig: {'96': 60}, tclass: 'italic'},
+    {c: '&#x201D;', ic: 0.0696, tclass: 'italic'},
+    {c: '#', ic: 0.0662, tclass: 'italic'},
+    {c: '$', tclass: 'italic'},
+    {c: '%', ic: 0.136, tclass: 'italic'},
+    {c: '&amp;', ic: 0.0969, tclass: 'italic'},
+    {c: '&#x2019;', ic: 0.124, krn: {'63': 0.102, '33': 0.102}, lig: {'39': 34}, tclass: 'italic'},
+    {c: '(', d:.2, ic: 0.162, tclass: 'italic'},
+    {c: ')', d:.2, ic: 0.0369, tclass: 'italic'},
+    {c: '*', ic: 0.149, tclass: 'italic'},
+    {c: '+', a:.1, ic: 0.0369, tclass: 'italic'},
+    {c: ',', a:-.3, d:.2, w: 0.278, tclass: 'italic'},
+    {c: '-', a:0, ic: 0.0283, lig: {'45': 123}, tclass: 'italic'},
+    {c: '.', a:-.25, tclass: 'italic'},
+    {c: '/', ic: 0.162, tclass: 'italic'},
+    // 30 - 3F
+    {c: '0', ic: 0.136, tclass: 'italic'},
+    {c: '1', ic: 0.136, tclass: 'italic'},
+    {c: '2', ic: 0.136, tclass: 'italic'},
+    {c: '3', ic: 0.136, tclass: 'italic'},
+    {c: '4', ic: 0.136, tclass: 'italic'},
+    {c: '5', ic: 0.136, tclass: 'italic'},
+    {c: '6', ic: 0.136, tclass: 'italic'},
+    {c: '7', ic: 0.136, tclass: 'italic'},
+    {c: '8', ic: 0.136, tclass: 'italic'},
+    {c: '9', ic: 0.136, tclass: 'italic'},
+    {c: ':', ic: 0.0582, tclass: 'italic'},
+    {c: ';', ic: 0.0582, tclass: 'italic'},
+    {c: '&#xA1;', ic: 0.0756, tclass: 'italic'},
+    {c: '=', a:0, d:-.1, ic: 0.0662, tclass: 'italic'},
+    {c: '&#xBF;', tclass: 'italic'},
+    {c: '?', ic: 0.122, lig: {'96': 62}, tclass: 'italic'},
+    // 40 - 4F
+    {c: '@', ic: 0.096, tclass: 'italic'},
+    {c: 'A', krn: {'110': -0.0256, '108': -0.0256, '114': -0.0256, '117': -0.0256, '109': -0.0256, '116': -0.0256, '105': -0.0256, '67': -0.0256, '79': -0.0256, '71': -0.0256, '104': -0.0256, '98': -0.0256, '85': -0.0256, '107': -0.0256, '118': -0.0256, '119': -0.0256, '81': -0.0256, '84': -0.0767, '89': -0.0767, '86': -0.102, '87': -0.102, '101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}, tclass: 'italic'},
+    {c: 'B', ic: 0.103, tclass: 'italic'},
+    {c: 'C', ic: 0.145, tclass: 'italic'},
+    {c: 'D', ic: 0.094, krn: {'88': -0.0256, '87': -0.0256, '65': -0.0256, '86': -0.0256, '89': -0.0256}, tclass: 'italic'},
+    {c: 'E', ic: 0.12, tclass: 'italic'},
+    {c: 'F', ic: 0.133, krn: {'111': -0.0767, '101': -0.0767, '117': -0.0767, '114': -0.0767, '97': -0.0767, '65': -0.102, '79': -0.0256, '67': -0.0256, '71': -0.0256, '81': -0.0256}, tclass: 'italic'},
+    {c: 'G', ic: 0.0872, tclass: 'italic'},
+    {c: 'H', ic: 0.164, tclass: 'italic'},
+    {c: 'I', ic: 0.158, tclass: 'italic'},
+    {c: 'J', ic: 0.14, tclass: 'italic'},
+    {c: 'K', ic: 0.145, krn: {'79': -0.0256, '67': -0.0256, '71': -0.0256, '81': -0.0256}, tclass: 'italic'},
+    {c: 'L', krn: {'84': -0.0767, '89': -0.0767, '86': -0.102, '87': -0.102, '101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}, tclass: 'italic'},
+    {c: 'M', ic: 0.164, tclass: 'italic'},
+    {c: 'N', ic: 0.164, tclass: 'italic'},
+    {c: 'O', ic: 0.094, krn: {'88': -0.0256, '87': -0.0256, '65': -0.0256, '86': -0.0256, '89': -0.0256}, tclass: 'italic'},
+    // 50 - 5F
+    {c: 'P', ic: 0.103, krn: {'65': -0.0767}, tclass: 'italic'},
+    {c: 'Q', d:.2, ic: 0.094, tclass: 'italic'},
+    {c: 'R', ic: 0.0387, krn: {'110': -0.0256, '108': -0.0256, '114': -0.0256, '117': -0.0256, '109': -0.0256, '116': -0.0256, '105': -0.0256, '67': -0.0256, '79': -0.0256, '71': -0.0256, '104': -0.0256, '98': -0.0256, '85': -0.0256, '107': -0.0256, '118': -0.0256, '119': -0.0256, '81': -0.0256, '84': -0.0767, '89': -0.0767, '86': -0.102, '87': -0.102, '101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}, tclass: 'italic'},
+    {c: 'S', ic: 0.12, tclass: 'italic'},
+    {c: 'T', ic: 0.133, krn: {'121': -0.0767, '101': -0.0767, '111': -0.0767, '114': -0.0767, '97': -0.0767, '117': -0.0767, '65': -0.0767}, tclass: 'italic'},
+    {c: 'U', ic: 0.164, tclass: 'italic'},
+    {c: 'V', ic: 0.184, krn: {'111': -0.0767, '101': -0.0767, '117': -0.0767, '114': -0.0767, '97': -0.0767, '65': -0.102, '79': -0.0256, '67': -0.0256, '71': -0.0256, '81': -0.0256}, tclass: 'italic'},
+    {c: 'W', ic: 0.184, krn: {'65': -0.0767}, tclass: 'italic'},
+    {c: 'X', ic: 0.158, krn: {'79': -0.0256, '67': -0.0256, '71': -0.0256, '81': -0.0256}, tclass: 'italic'},
+    {c: 'Y', ic: 0.194, krn: {'101': -0.0767, '111': -0.0767, '114': -0.0767, '97': -0.0767, '117': -0.0767, '65': -0.0767}, tclass: 'italic'},
+    {c: 'Z', ic: 0.145, tclass: 'italic'},
+    {c: '[', d:.1, ic: 0.188, tclass: 'italic'},
+    {c: '&#x201C;', ic: 0.169, tclass: 'italic'},
+    {c: ']', d:.1, ic: 0.105, tclass: 'italic'},
+    {c: '&#x2C6;', ic: 0.0665, tclass: 'iaccent'},
+    {c: '&#x2D9;', ic: 0.118, tclass: 'iaccent'},
+    // 60 - 6F
+    {c: '&#x2018;', ic: 0.124, lig: {'96': 92}, tclass: 'italic'},
+    {c: 'a', a:0, ic: 0.0767, tclass: 'italic'},
+    {c: 'b', ic: 0.0631, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}, tclass: 'italic'},
+    {c: 'c', a:0, ic: 0.0565, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}, tclass: 'italic'},
+    {c: 'd', ic: 0.103, krn: {'108': 0.0511}, tclass: 'italic'},
+    {c: 'e', a:0, ic: 0.0751, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}, tclass: 'italic'},
+    {c: 'f', ic: 0.212, krn: {'39': 0.104, '63': 0.104, '33': 0.104, '41': 0.104, '93': 0.104}, lig: {'105': 12, '102': 11, '108': 13}, tclass: 'italic'},
+    {c: 'g', a:0, d:.2, ic: 0.0885, tclass: 'italic'},
+    {c: 'h', ic: 0.0767, tclass: 'italic'},
+    {c: 'i', ic: 0.102, tclass: 'italic'},
+    {c: 'j', d:.2, ic: 0.145, tclass: 'italic'},
+    {c: 'k', ic: 0.108, tclass: 'italic'},
+    {c: 'l', ic: 0.103, krn: {'108': 0.0511}, tclass: 'italic'},
+    {c: 'm', a:0, ic: 0.0767, tclass: 'italic'},
+    {c: 'n', a:0, ic: 0.0767, krn: {'39': -0.102}, tclass: 'italic'},
+    {c: 'o', a:0, ic: 0.0631, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}, tclass: 'italic'},
+    // 70 - 7F
+    {c: 'p', a:0, d:.2, ic: 0.0631, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}, tclass: 'italic'},
+    {c: 'q', a:0, d:.2, ic: 0.0885, tclass: 'italic'},
+    {c: 'r', a:0, ic: 0.108, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}, tclass: 'italic'},
+    {c: 's', a:0, ic: 0.0821, tclass: 'italic'},
+    {c: 't', ic: 0.0949, tclass: 'italic'},
+    {c: 'u', a:0, ic: 0.0767, tclass: 'italic'},
+    {c: 'v', a:0, ic: 0.108, tclass: 'italic'},
+    {c: 'w', a:0, ic: 0.108, krn: {'108': 0.0511}, tclass: 'italic'},
+    {c: 'x', a:0, ic: 0.12, tclass: 'italic'},
+    {c: 'y', a:0, d:.2, ic: 0.0885, tclass: 'italic'},
+    {c: 'z', a:0, ic: 0.123, tclass: 'italic'},
+    {c: '&#x2013;', a:.1, ic: 0.0921, lig: {'45': 124}, tclass: 'italic'},
+    {c: '&#x2014;', a:.1, ic: 0.0921, tclass: 'italic'},
+    {c: '&#x2DD;', ic: 0.122, tclass: 'iaccent'},
+    {c: '&#x2DC;', ic: 0.116, tclass: 'iaccent'},
+    {c: '&#xA8;', tclass: 'iaccent'}
+  ],
+  
+  cmbx10: [
+    // 00 - 0F
+    {c: '&Gamma;', tclass: 'bgreek'},
+    {c: '&Delta;', tclass: 'bgreek'},
+    {c: '&Theta;', tclass: 'bgreek'},
+    {c: '&Lambda;', tclass: 'bgreek'},
+    {c: '&Xi;', tclass: 'bgreek'},
+    {c: '&Pi;', tclass: 'bgreek'},
+    {c: '&Sigma;', tclass: 'bgreek'},
+    {c: '&Upsilon;', tclass: 'bgreek'},
+    {c: '&Phi;', tclass: 'bgreek'},
+    {c: '&Psi;', tclass: 'bgreek'},
+    {c: '&Omega;', tclass: 'bgreek'},
+    {c: 'ff', ic: 0.0778, krn: {'39': 0.0778, '63': 0.0778, '33': 0.0778, '41': 0.0778, '93': 0.0778}, lig: {'105': 14, '108': 15}, tclass: 'bold'},
+    {c: 'fi', tclass: 'bold'},
+    {c: 'fl', tclass: 'bold'},
+    {c: 'ffi', tclass: 'bold'},
+    {c: 'ffl', tclass: 'bold'},
+    // 10 - 1F
+    {c: '&#x131;', a:0, tclass: 'bold'},
+    {c: 'j', d:.2, tclass: 'bold'},
+    {c: '&#x2CB;', tclass: 'baccent'},
+    {c: '&#x2CA;', tclass: 'baccent'},
+    {c: '&#x2C7;', tclass: 'baccent'},
+    {c: '&#x2D8;', tclass: 'baccent'},
+    {c: '&#x2C9;', tclass: 'baccent'},
+    {c: '&#x2DA;', tclass: 'baccent'},
+    {c: '?', tclass: 'bold'},
+    {c: '&#xDF;', tclass: 'bold'},
+    {c: '&#xE6;', a:0, tclass: 'bold'},
+    {c: '&#x153;', a:0, tclass: 'bold'},
+    {c: '&#xF8;', tclass: 'bold'},
+    {c: '&#xC6;', tclass: 'bold'},
+    {c: '&#x152;', tclass: 'bold'},
+    {c: '&#xD8;', tclass: 'bold'},
+    // 20 - 2F
+    {c: '?', krn: {'108': -0.278, '76': -0.319}, tclass: 'bold'},
+    {c: '!', lig: {'96': 60}, tclass: 'bold'},
+    {c: '&#x201D;', tclass: 'bold'},
+    {c: '#', tclass: 'bold'},
+    {c: '$', tclass: 'bold'},
+    {c: '%', tclass: 'bold'},
+    {c: '&amp;', tclass: 'bold'},
+    {c: '&#x2019;', krn: {'63': 0.111, '33': 0.111}, lig: {'39': 34}, tclass: 'bold'},
+    {c: '(', d:.2, tclass: 'bold'},
+    {c: ')', d:.2, tclass: 'bold'},
+    {c: '*', tclass: 'bold'},
+    {c: '+', a:.1, tclass: 'bold'},
+    {c: ',', a:-.3, d:.2, w: 0.278, tclass: 'bold'},
+    {c: '-', a:0, lig: {'45': 123}, tclass: 'bold'},
+    {c: '.', a:-.25, tclass: 'bold'},
+    {c: '/', tclass: 'bold'},
+    // 30 - 3F
+    {c: '0', tclass: 'bold'},
+    {c: '1', tclass: 'bold'},
+    {c: '2', tclass: 'bold'},
+    {c: '3', tclass: 'bold'},
+    {c: '4', tclass: 'bold'},
+    {c: '5', tclass: 'bold'},
+    {c: '6', tclass: 'bold'},
+    {c: '7', tclass: 'bold'},
+    {c: '8', tclass: 'bold'},
+    {c: '9', tclass: 'bold'},
+    {c: ':', tclass: 'bold'},
+    {c: ';', tclass: 'bold'},
+    {c: '&#xA1;', tclass: 'bold'},
+    {c: '=', a:0, d:-.1, tclass: 'bold'},
+    {c: '&#xBF;', tclass: 'bold'},
+    {c: '?', lig: {'96': 62}, tclass: 'bold'},
+    // 40 - 4F
+    {c: '@', tclass: 'bold'},
+    {c: 'A', krn: {'116': -0.0278, '67': -0.0278, '79': -0.0278, '71': -0.0278, '85': -0.0278, '81': -0.0278, '84': -0.0833, '89': -0.0833, '86': -0.111, '87': -0.111}, tclass: 'bold'},
+    {c: 'B', tclass: 'bold'},
+    {c: 'C', tclass: 'bold'},
+    {c: 'D', krn: {'88': -0.0278, '87': -0.0278, '65': -0.0278, '86': -0.0278, '89': -0.0278}, tclass: 'bold'},
+    {c: 'E', tclass: 'bold'},
+    {c: 'F', krn: {'111': -0.0833, '101': -0.0833, '117': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.111, '79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}, tclass: 'bold'},
+    {c: 'G', tclass: 'bold'},
+    {c: 'H', tclass: 'bold'},
+    {c: 'I', krn: {'73': 0.0278}, tclass: 'bold'},
+    {c: 'J', tclass: 'bold'},
+    {c: 'K', krn: {'79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}, tclass: 'bold'},
+    {c: 'L', krn: {'84': -0.0833, '89': -0.0833, '86': -0.111, '87': -0.111}, tclass: 'bold'},
+    {c: 'M', tclass: 'bold'},
+    {c: 'N', tclass: 'bold'},
+    {c: 'O', krn: {'88': -0.0278, '87': -0.0278, '65': -0.0278, '86': -0.0278, '89': -0.0278}, tclass: 'bold'},
+    // 50 - 5F
+    {c: 'P', krn: {'65': -0.0833, '111': -0.0278, '101': -0.0278, '97': -0.0278, '46': -0.0833, '44': -0.0833}, tclass: 'bold'},
+    {c: 'Q', d:.2, tclass: 'bold'},
+    {c: 'R', krn: {'116': -0.0278, '67': -0.0278, '79': -0.0278, '71': -0.0278, '85': -0.0278, '81': -0.0278, '84': -0.0833, '89': -0.0833, '86': -0.111, '87': -0.111}, tclass: 'bold'},
+    {c: 'S', tclass: 'bold'},
+    {c: 'T', krn: {'121': -0.0278, '101': -0.0833, '111': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.0833, '117': -0.0833}, tclass: 'bold'},
+    {c: 'U', tclass: 'bold'},
+    {c: 'V', ic: 0.0139, krn: {'111': -0.0833, '101': -0.0833, '117': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.111, '79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}, tclass: 'bold'},
+    {c: 'W', ic: 0.0139, krn: {'111': -0.0833, '101': -0.0833, '117': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.111, '79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}, tclass: 'bold'},
+    {c: 'X', krn: {'79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}, tclass: 'bold'},
+    {c: 'Y', ic: 0.025, krn: {'101': -0.0833, '111': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.0833, '117': -0.0833}, tclass: 'bold'},
+    {c: 'Z', tclass: 'bold'},
+    {c: '[', d:.1, tclass: 'bold'},
+    {c: '&#x201C;', tclass: 'bold'},
+    {c: ']', d:.1, tclass: 'bold'},
+    {c: '&#x2C6;', tclass: 'baccent'},
+    {c: '&#x2D9;', tclass: 'baccent'},
+    // 60 - 6F
+    {c: '&#x2018;', lig: {'96': 92}, tclass: 'bold'},
+    {c: 'a', a:0, krn: {'118': -0.0278, '106': 0.0556, '121': -0.0278, '119': -0.0278}, tclass: 'bold'},
+    {c: 'b', krn: {'101': 0.0278, '111': 0.0278, '120': -0.0278, '100': 0.0278, '99': 0.0278, '113': 0.0278, '118': -0.0278, '106': 0.0556, '121': -0.0278, '119': -0.0278}, tclass: 'bold'},
+    {c: 'c', a:0, krn: {'104': -0.0278, '107': -0.0278}, tclass: 'bold'},
+    {c: 'd', tclass: 'bold'},
+    {c: 'e', a:0, tclass: 'bold'},
+    {c: 'f', ic: 0.0778, krn: {'39': 0.0778, '63': 0.0778, '33': 0.0778, '41': 0.0778, '93': 0.0778}, lig: {'105': 12, '102': 11, '108': 13}, tclass: 'bold'},
+    {c: 'g', a:0, d:.2, ic: 0.0139, krn: {'106': 0.0278}, tclass: 'bold'},
+    {c: 'h', krn: {'116': -0.0278, '117': -0.0278, '98': -0.0278, '121': -0.0278, '118': -0.0278, '119': -0.0278}, tclass: 'bold'},
+    {c: 'i', tclass: 'bold'},
+    {c: 'j', d:.2, tclass: 'bold'},
+    {c: 'k', krn: {'97': -0.0556, '101': -0.0278, '97': -0.0278, '111': -0.0278, '99': -0.0278}, tclass: 'bold'},
+    {c: 'l', tclass: 'bold'},
+    {c: 'm', a:0, krn: {'116': -0.0278, '117': -0.0278, '98': -0.0278, '121': -0.0278, '118': -0.0278, '119': -0.0278}, tclass: 'bold'},
+    {c: 'n', a:0, krn: {'116': -0.0278, '117': -0.0278, '98': -0.0278, '121': -0.0278, '118': -0.0278, '119': -0.0278}, tclass: 'bold'},
+    {c: 'o', a:0, krn: {'101': 0.0278, '111': 0.0278, '120': -0.0278, '100': 0.0278, '99': 0.0278, '113': 0.0278, '118': -0.0278, '106': 0.0556, '121': -0.0278, '119': -0.0278}, tclass: 'bold'},
+    // 70 - 7F
+    {c: 'p', a:0, d:.2, krn: {'101': 0.0278, '111': 0.0278, '120': -0.0278, '100': 0.0278, '99': 0.0278, '113': 0.0278, '118': -0.0278, '106': 0.0556, '121': -0.0278, '119': -0.0278}, tclass: 'bold'},
+    {c: 'q', a:0, d:.2, tclass: 'bold'},
+    {c: 'r', a:0, tclass: 'bold'},
+    {c: 's', a:0, tclass: 'bold'},
+    {c: 't', krn: {'121': -0.0278, '119': -0.0278}, tclass: 'bold'},
+    {c: 'u', a:0, krn: {'119': -0.0278}, tclass: 'bold'},
+    {c: 'v', a:0, ic: 0.0139, krn: {'97': -0.0556, '101': -0.0278, '97': -0.0278, '111': -0.0278, '99': -0.0278}, tclass: 'bold'},
+    {c: 'w', a:0, ic: 0.0139, krn: {'101': -0.0278, '97': -0.0278, '111': -0.0278, '99': -0.0278}, tclass: 'bold'},
+    {c: 'x', a:0, tclass: 'bold'},
+    {c: 'y', a:0, d:.2, ic: 0.0139, krn: {'111': -0.0278, '101': -0.0278, '97': -0.0278, '46': -0.0833, '44': -0.0833}, tclass: 'bold'},
+    {c: 'z', a:0, tclass: 'bold'},
+    {c: '&#x2013;', a:.1, ic: 0.0278, lig: {'45': 124}, tclass: 'bold'},
+    {c: '&#x2014;', a:.1, ic: 0.0278, tclass: 'bold'},
+    {c: '&#x2DD;', tclass: 'baccent'},
+    {c: '&#x2DC;', tclass: 'baccent'},
+    {c: '&#xA8;', tclass: 'baccent'}
+  ]
+});
+
+
+jsMath.Setup.Styles({
+    '.typeset .cmr10':   "font-family: serif",
+    '.typeset .italic':  "font-style: italic",
+    '.typeset .bold':    "font-weight: bold",
+    '.typeset .lucida':  "font-family: 'lucida sans unicode'",
+    '.typeset .arial':   "font-family: 'Arial unicode MS'",
+    '.typeset .cal':     "font-family: 'Script MT', 'Script MT Bold', cursive",
+    '.typeset .arrows':  "font-family: 'Arial unicode MS'",
+    '.typeset .arrow1':  "font-family: 'Arial unicode MS'",
+    '.typeset .arrow1a': "font-family: 'Arial unicode MS'; position:relative; top:.05em;left:-.15em; margin-right:-.15em; display:inline-block",
+    '.typeset .arrow2':  "font-family: 'Arial unicode MS'; position:relative; top:-.1em; display:inline-block;",
+    '.typeset .arrow3':  "font-family: 'Arial unicode MS'; margin:.1em",
+    '.typeset .symbol':  "font-family: 'Arial unicode MS'",
+    '.typeset .symbol2': "font-family: 'Arial unicode MS'",
+    '.typeset .delim1':  "font-family: 'Times New Roman'; font-size: 133%; position:relative; top:.7em; display:inline-block",
+    '.typeset .delim1a': "font-family: 'Lucida sans unicode'; font-size: 133%; position:relative; top:.8em; display:inline-block",
+    '.typeset .delim1b': "font-family: 'Arial unicode MS'; font-size: 133%; position:relative; top:.7em; display:inline-block",
+    '.typeset .delim2':  "font-family: 'Times New Roman'; font-size: 180%; position:relative; top:.75em; display:inline-block",
+    '.typeset .delim2a': "font-family: 'Lucida sans unicode'; font-size: 180%; position:relative; top:.8em; display:inline-block",
+    '.typeset .delim2b': "font-family: 'Arial unicode MS'; font-size: 180%; position:relative; top:.7em; display:inline-block",
+    '.typeset .delim3':  "font-family: 'Times New Roman'; font-size: 250%; position:relative; top:.725em; display:inline-block",
+    '.typeset .delim3a': "font-family: 'Lucida sans unicode'; font-size: 250%; position:relative; top:.775em; display:inline-block",
+    '.typeset .delim3b': "font-family: 'Arial unicode MS'; font-size: 250%; position:relative; top:.7em; display:inline-block",
+    '.typeset .delim4':  "font-family: 'Times New Roman'; font-size: 325%; position:relative; top:.7em; display:inline-block",
+    '.typeset .delim4a': "font-family: 'Lucida sans unicode'; font-size: 325%; position:relative; top:.775em; display:inline-block",
+    '.typeset .delim4b': "font-family: 'Arial unicode MS'; font-size: 325%; position:relative; top:.7em; display:inline-block",
+    '.typeset .delimx':  "font-family: Symbol",
+    '.typeset .greek':   "font-family: 'Times New Roman'",
+    '.typeset .igreek':  "font-family: 'Times New Roman'; font-style:italic",
+    '.typeset .bgreek':  "font-family: 'Times New Roman'; font-weight:bold",
+    '.typeset .bigop1':  "font-family: 'Arial unicode MS'; font-size: 130%; position: relative; top: .7em; margin:-.05em; display:inline-block",
+    '.typeset .bigop1a': "font-family: 'Arial unicode MS'; font-size: 110%; position: relative; top: .85em; display:inline-block;",
+    '.typeset .bigop1b': "font-family: 'Arial unicode MS'; font-size: 180%; position: relative; top: .6em; display:inline-block",
+    '.typeset .bigop1c': "font-family: 'Arial unicode MS'; font-size: 85%; position: relative; top: 1em; display:inline-block",
+    '.typeset .bigop2':  "font-family: 'Arial unicode MS'; font-size: 230%; position: relative; top: .6em; margin:-.05em; display:inline-block",
+    '.typeset .bigop2a': "font-family: 'Arial unicode MS'; font-size: 185%; position: relative; top: .75em; display:inline-block",
+    '.typeset .bigop2b': "font-family: 'Arial unicode MS'; font-size: 275%; position: relative; top: .55em; display:inline-block",
+    '.typeset .bigop2c': "font-family: 'Arial unicode MS'; font-size: 185%; position: relative; top: 1em; margin-right:-.1em; display:inline-block",
+    '.typeset .wide1':   "font-family: 'Arial unicode MS'; font-size: 67%; position: relative; top:-.75em; display:inline-block;",
+    '.typeset .wide2':   "font-family: 'Arial unicode MS'; font-size: 110%; position: relative; top:-.4em; display:inline-block;",
+    '.typeset .wide3':   "font-family: 'Arial unicode MS'; font-size: 175%; position: relative; top:-.25em; display:inline-block",
+    '.typeset .wide1a':  "font-family: 'Times New Roman'; font-size: 75%; position: relative; top:-.5em; display:inline-block",
+    '.typeset .wide2a':  "font-family: 'Times New Roman'; font-size: 133%; position: relative; top:-.2em; display:inline-block",
+    '.typeset .wide3a':  "font-family: 'Times New Roman'; font-size: 200%; position: relative; top:-.1em; display:inline-block",
+    '.typeset .root':    "font-family: 'Arial unicode MS'; margin-right:-.075em; display:inline-block",
+    '.typeset .accent':  "font-family: 'Arial unicode MS'; position:relative; top:.05em; left:.15em; display:inline-block",
+    '.typeset .iaccent': "font-family: 'Arial unicode MS'; position:relative; top:.05em; left:.15em; font-style:italic; display:inline-block",
+    '.typeset .baccent': "font-family: 'Arial unicode MS'; position:relative; top:.05em; left:.15em; font-weight:bold; display:inline-block"
+});
+
+//
+// adjust for Mozilla
+//
+if (jsMath.browser == 'Mozilla') {
+  jsMath.Update.TeXfonts({
+    cmex10: {
+      '48': {c: '&#xF8EB;'},
+      '49': {c: '&#xF8F6;'},
+      '50': {c: '&#xF8EE;'},
+      '51': {c: '&#xF8F9;'},
+      '52': {c: '&#xF8F0;'},
+      '53': {c: '&#xF8FB;'},
+      '54': {c: '&#xF8EF;'},
+      '55': {c: '&#xF8FA;'},
+      '56': {c: '&#xF8F1;'},
+      '57': {c: '&#xF8FC;'},
+      '58': {c: '&#xF8F3;'},
+      '59': {c: '&#xF8FE;'},
+      '60': {c: '&#xF8F2;'},
+      '61': {c: '&#xF8FD;'},
+      '62': {c: '&#xF8F4;'},
+      '64': {c: '&#xF8ED;'},
+      '65': {c: '&#xF8F8;'},
+      '66': {c: '&#xF8EC;'},
+      '67': {c: '&#xF8F7;'}
+    }
+  });
+  jsMath.Setup.Styles({
+      '.typeset .accent':  'font-family: Arial unicode MS; position:relative; top:.05em; left:.05em'
+  });
+}
+
+//
+// adjust for MSIE
+//
+if (jsMath.browser == "MSIE") {
+  jsMath.Browser.msieFontBug = 1;
+}
+
+/*
+ *  No access to TeX "not" character, so fake this
+ *  Also ajust the bowtie spacing
+ */
+jsMath.Macro('not','\\mathrel{\\rlap{\\kern 3mu/}}');
+jsMath.Macro('bowtie','\\mathrel\\triangleright\\kern-6mu\\mathrel\\triangleleft');
+
+jsMath.Box.defaultH = 0.8;
diff --git a/htdocs/jsMath/uncompressed/jsMath-fallback-symbols.js b/htdocs/jsMath/uncompressed/jsMath-fallback-symbols.js
new file mode 100644
index 0000000000..05e56e65df
--- /dev/null
+++ b/htdocs/jsMath/uncompressed/jsMath-fallback-symbols.js
@@ -0,0 +1,415 @@
+/*
+ *  jsMath-fallback-symbols.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file makes changes needed to use image fonts for symbols
+ *  but standard native fonts for letters and numbers.
+ *
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 2004-2006 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+jsMath.Add(jsMath.Img,{
+  UpdateTeXFonts: function (change) {
+    for (var font in change) {
+      for (var code in change[font]) {
+        jsMath.TeX[font][code] = change[font][code];
+        jsMath.TeX[font][code].tclass = 'i' + font;
+      }
+    }
+  }
+});
+
+
+jsMath.Img.UpdateTeXFonts({
+  cmr10:  {
+    '33': {c: '!', lig: {'96': 60}},
+    '35': {c: '#'},
+    '36': {c: '$'},
+    '37': {c: '%'},
+    '38': {c: '&amp;'},
+    '40': {c: '(', d:.2},
+    '41': {c: ')', d:.2},
+    '42': {c: '*', d:-.3},
+    '43': {c: '+', a:.1},
+    '44': {c: ',', a:-.3},
+    '45': {c: '-', a:0, lig: {'45': 123}},
+    '46': {c: '.', a:-.25},
+    '47': {c: '/'},
+    '48': {c: '0'},
+    '49': {c: '1'},
+    '50': {c: '2'},
+    '51': {c: '3'},
+    '52': {c: '4'},
+    '53': {c: '5'},
+    '54': {c: '6'},
+    '55': {c: '7'},
+    '56': {c: '8'},
+    '57': {c: '9'},
+    '58': {c: ':'},
+    '59': {c: ';'},
+    '61': {c: '=', a:0, d:-.1},
+    '63': {c: '?', lig: {'96': 62}},
+    '64': {c: '@'},
+    '65': {c: 'A', krn: {'116': -0.0278, '67': -0.0278, '79': -0.0278, '71': -0.0278, '85': -0.0278, '81': -0.0278, '84': -0.0833, '89': -0.0833, '86': -0.111, '87': -0.111}},
+    '66': {c: 'B'},
+    '67': {c: 'C'},
+    '68': {c: 'D', krn: {'88': -0.0278, '87': -0.0278, '65': -0.0278, '86': -0.0278, '89': -0.0278}},
+    '69': {c: 'E'},
+    '70': {c: 'F', krn: {'111': -0.0833, '101': -0.0833, '117': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.111, '79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}},
+    '71': {c: 'G'},
+    '72': {c: 'H'},
+    '73': {c: 'I', krn: {'73': 0.0278}},
+    '74': {c: 'J'},
+    '75': {c: 'K', krn: {'79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}},
+    '76': {c: 'L', krn: {'84': -0.0833, '89': -0.0833, '86': -0.111, '87': -0.111}},
+    '77': {c: 'M'},
+    '78': {c: 'N'},
+    '79': {c: 'O', krn: {'88': -0.0278, '87': -0.0278, '65': -0.0278, '86': -0.0278, '89': -0.0278}},
+    '80': {c: 'P', krn: {'65': -0.0833, '111': -0.0278, '101': -0.0278, '97': -0.0278, '46': -0.0833, '44': -0.0833}},
+    '81': {c: 'Q', d: 1},
+    '82': {c: 'R', krn: {'116': -0.0278, '67': -0.0278, '79': -0.0278, '71': -0.0278, '85': -0.0278, '81': -0.0278, '84': -0.0833, '89': -0.0833, '86': -0.111, '87': -0.111}},
+    '83': {c: 'S'},
+    '84': {c: 'T', krn: {'121': -0.0278, '101': -0.0833, '111': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.0833, '117': -0.0833}},
+    '85': {c: 'U'},
+    '86': {c: 'V', ic: 0.0139, krn: {'111': -0.0833, '101': -0.0833, '117': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.111, '79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}},
+    '87': {c: 'W', ic: 0.0139, krn: {'111': -0.0833, '101': -0.0833, '117': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.111, '79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}},
+    '88': {c: 'X', krn: {'79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}},
+    '89': {c: 'Y', ic: 0.025, krn: {'101': -0.0833, '111': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.0833, '117': -0.0833}},
+    '90': {c: 'Z'},
+    '91': {c: '[', d:.1},
+    '93': {c: ']', d:.1},
+    '97': {c: 'a', a:0, krn: {'118': -0.0278, '106': 0.0556, '121': -0.0278, '119': -0.0278}},
+    '98': {c: 'b', krn: {'101': 0.0278, '111': 0.0278, '120': -0.0278, '100': 0.0278, '99': 0.0278, '113': 0.0278, '118': -0.0278, '106': 0.0556, '121': -0.0278, '119': -0.0278}},
+    '99': {c: 'c', a:0, krn: {'104': -0.0278, '107': -0.0278}},
+    '100': {c: 'd'},
+    '101': {c: 'e', a:0},
+    '102': {c: 'f', ic: 0.0778, krn: {'39': 0.0778, '63': 0.0778, '33': 0.0778, '41': 0.0778, '93': 0.0778}, lig: {'105': 12, '102': 11, '108': 13}},
+    '103': {c: 'g', a:0, d:.2, ic: 0.0139, krn: {'106': 0.0278}},
+    '104': {c: 'h', krn: {'116': -0.0278, '117': -0.0278, '98': -0.0278, '121': -0.0278, '118': -0.0278, '119': -0.0278}},
+    '105': {c: 'i'},
+    '106': {c: 'j', d:1},
+    '107': {c: 'k', krn: {'97': -0.0556, '101': -0.0278, '97': -0.0278, '111': -0.0278, '99': -0.0278}},
+    '108': {c: 'l'},
+    '109': {c: 'm', a:0, krn: {'116': -0.0278, '117': -0.0278, '98': -0.0278, '121': -0.0278, '118': -0.0278, '119': -0.0278}},
+    '110': {c: 'n', a:0, krn: {'116': -0.0278, '117': -0.0278, '98': -0.0278, '121': -0.0278, '118': -0.0278, '119': -0.0278}},
+    '111': {c: 'o', a:0, krn: {'101': 0.0278, '111': 0.0278, '120': -0.0278, '100': 0.0278, '99': 0.0278, '113': 0.0278, '118': -0.0278, '106': 0.0556, '121': -0.0278, '119': -0.0278}},
+    '112': {c: 'p', a:0, d:.2, krn: {'101': 0.0278, '111': 0.0278, '120': -0.0278, '100': 0.0278, '99': 0.0278, '113': 0.0278, '118': -0.0278, '106': 0.0556, '121': -0.0278, '119': -0.0278}},
+    '113': {c: 'q', a:0, d:1},
+    '114': {c: 'r', a:0},
+    '115': {c: 's', a:0},
+    '116': {c: 't', krn: {'121': -0.0278, '119': -0.0278}},
+    '117': {c: 'u', a:0, krn: {'119': -0.0278}},
+    '118': {c: 'v', a:0, ic: 0.0139, krn: {'97': -0.0556, '101': -0.0278, '97': -0.0278, '111': -0.0278, '99': -0.0278}},
+    '119': {c: 'w', a:0, ic: 0.0139, krn: {'101': -0.0278, '97': -0.0278, '111': -0.0278, '99': -0.0278}},
+    '120': {c: 'x', a:0},
+    '121': {c: 'y', a:0, d:.2, ic: 0.0139, krn: {'111': -0.0278, '101': -0.0278, '97': -0.0278, '46': -0.0833, '44': -0.0833}},
+    '122': {c: 'z', a:0}
+  },
+  cmmi10:  {
+    '65': {c: 'A', krn: {'127': 0.139}},
+    '66': {c: 'B', ic: 0.0502, krn: {'127': 0.0833}},
+    '67': {c: 'C', ic: 0.0715, krn: {'61': -0.0278, '59': -0.0556, '58': -0.0556, '127': 0.0833}},
+    '68': {c: 'D', ic: 0.0278, krn: {'127': 0.0556}},
+    '69': {c: 'E', ic: 0.0576, krn: {'127': 0.0833}},
+    '70': {c: 'F', ic: 0.139, krn: {'61': -0.0556, '59': -0.111, '58': -0.111, '127': 0.0833}},
+    '71': {c: 'G', krn: {'127': 0.0833}},
+    '72': {c: 'H', ic: 0.0812, krn: {'61': -0.0556, '59': -0.0556, '58': -0.0556, '127': 0.0556}},
+    '73': {c: 'I', ic: 0.0785, krn: {'127': 0.111}},
+    '74': {c: 'J', ic: 0.0962, krn: {'61': -0.0556, '59': -0.111, '58': -0.111, '127': 0.167}},
+    '75': {c: 'K', ic: 0.0715, krn: {'61': -0.0556, '59': -0.0556, '58': -0.0556, '127': 0.0556}},
+    '76': {c: 'L', krn: {'127': 0.0278}},
+    '77': {c: 'M', ic: 0.109, krn: {'61': -0.0556, '59': -0.0556, '58': -0.0556, '127': 0.0833}},
+    '78': {c: 'N', ic: 0.109, krn: {'61': -0.0833, '61': -0.0278, '59': -0.0556, '58': -0.0556, '127': 0.0833}},
+    '79': {c: 'O', ic: 0.0278, krn: {'127': 0.0833}},
+    '80': {c: 'P', ic: 0.139, krn: {'61': -0.0556, '59': -0.111, '58': -0.111, '127': 0.0833}},
+    '81': {c: 'Q', d:.2, krn: {'127': 0.0833}},
+    '82': {c: 'R', ic: 0.00773, krn: {'127': 0.0833}},
+    '83': {c: 'S', ic: 0.0576, krn: {'61': -0.0556, '59': -0.0556, '58': -0.0556, '127': 0.0833}},
+    '84': {c: 'T', ic: 0.139, krn: {'61': -0.0278, '59': -0.0556, '58': -0.0556, '127': 0.0833}},
+    '85': {c: 'U', ic: 0.109, krn: {'59': -0.111, '58': -0.111, '61': -0.0556, '127': 0.0278}},
+    '86': {c: 'V', ic: 0.222, krn: {'59': -0.167, '58': -0.167, '61': -0.111}},
+    '87': {c: 'W', ic: 0.139, krn: {'59': -0.167, '58': -0.167, '61': -0.111}},
+    '88': {c: 'X', ic: 0.0785, krn: {'61': -0.0833, '61': -0.0278, '59': -0.0556, '58': -0.0556, '127': 0.0833}},
+    '89': {c: 'Y', ic: 0.222, krn: {'59': -0.167, '58': -0.167, '61': -0.111}},
+    '90': {c: 'Z', ic: 0.0715, krn: {'61': -0.0556, '59': -0.0556, '58': -0.0556, '127': 0.0833}},
+    '97': {c: 'a', a:0},
+    '98': {c: 'b'},
+    '99': {c: 'c', a:0, krn: {'127': 0.0556}},
+    '100': {c: 'd', krn: {'89': 0.0556, '90': -0.0556, '106': -0.111, '102': -0.167, '127': 0.167}},
+    '101': {c: 'e', a:0, krn: {'127': 0.0556}},
+    '102': {c: 'f', d:.2, ic: 0.108, krn: {'59': -0.0556, '58': -0.0556, '127': 0.167}},
+    '103': {c: 'g', a:0, d:.2, ic: 0.0359, krn: {'127': 0.0278}},
+    '104': {c: 'h', krn: {'127': -0.0278}},
+    '105': {c: 'i'},
+    '106': {c: 'j', d:.2, ic: 0.0572, krn: {'59': -0.0556, '58': -0.0556}},
+    '107': {c: 'k', ic: 0.0315},
+    '108': {c: 'l', ic: 0.0197, krn: {'127': 0.0833}},
+    '109': {c: 'm', a:0},
+    '110': {c: 'n', a:0},
+    '111': {c: 'o', a:0, krn: {'127': 0.0556}},
+    '112': {c: 'p', a:0, d:.2, krn: {'127': 0.0833}},
+    '113': {c: 'q', a:0, d:.2, ic: 0.0359, krn: {'127': 0.0833}},
+    '114': {c: 'r', a:0, ic: 0.0278, krn: {'59': -0.0556, '58': -0.0556, '127': 0.0556}},
+    '115': {c: 's', a:0, krn: {'127': 0.0556}},
+    '116': {c: 't', krn: {'127': 0.0833}},
+    '117': {c: 'u', a:0, krn: {'127': 0.0278}},
+    '118': {c: 'v', a:0, ic: 0.0359, krn: {'127': 0.0278}},
+    '119': {c: 'w', a:0, ic: 0.0269, krn: {'127': 0.0833}},
+    '120': {c: 'x', a:0, krn: {'127': 0.0278}},
+    '121': {c: 'y', a:0, d:.2, ic: 0.0359, krn: {'127': 0.0556}},
+    '122': {c: 'z', a:0, ic: 0.044, krn: {'127': 0.0556}}
+  },
+  cmsy10: {
+    '0': {c:'&#x2212;', a:.1}
+  },
+  cmti10: {
+    '33': {c: '!', lig: {'96': 60}},
+    '35': {c: '#', ic: 0.0662},
+    '37': {c: '%', ic: 0.136},
+    '38': {c: '&amp;', ic: 0.0969},
+    '40': {c: '(', d:.2, ic: 0.162},
+    '41': {c: ')', d:.2, ic: 0.0369},
+    '42': {c: '*', ic: 0.149},
+    '43': {c: '+', a:.1, ic: 0.0369},
+    '44': {c: ',', a:-.3, d:.2, w: 0.278},
+    '45': {c: '-', a:0, ic: 0.0283, lig: {'45': 123}},
+    '46': {c: '.', a:-.25},
+    '47': {c: '/', ic: 0.162},
+    '48': {c: '0', ic: 0.136},
+    '49': {c: '1', ic: 0.136},
+    '50': {c: '2', ic: 0.136},
+    '51': {c: '3', ic: 0.136},
+    '52': {c: '4', ic: 0.136},
+    '53': {c: '5', ic: 0.136},
+    '54': {c: '6', ic: 0.136},
+    '55': {c: '7', ic: 0.136},
+    '56': {c: '8', ic: 0.136},
+    '57': {c: '9', ic: 0.136},
+    '58': {c: ':', ic: 0.0582},
+    '59': {c: ';', ic: 0.0582},
+    '61': {c: '=', a:0, d:-.1, ic: 0.0662},
+    '63': {c: '?', ic: 0.122, lig: {'96': 62}},
+    '64': {c: '@', ic: 0.096},
+    '65': {c: 'A', krn: {'110': -0.0256, '108': -0.0256, '114': -0.0256, '117': -0.0256, '109': -0.0256, '116': -0.0256, '105': -0.0256, '67': -0.0256, '79': -0.0256, '71': -0.0256, '104': -0.0256, '98': -0.0256, '85': -0.0256, '107': -0.0256, '118': -0.0256, '119': -0.0256, '81': -0.0256, '84': -0.0767, '89': -0.0767, '86': -0.102, '87': -0.102, '101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}},
+    '66': {c: 'B', ic: 0.103},
+    '67': {c: 'C', ic: 0.145},
+    '68': {c: 'D', ic: 0.094, krn: {'88': -0.0256, '87': -0.0256, '65': -0.0256, '86': -0.0256, '89': -0.0256}},
+    '69': {c: 'E', ic: 0.12},
+    '70': {c: 'F', ic: 0.133, krn: {'111': -0.0767, '101': -0.0767, '117': -0.0767, '114': -0.0767, '97': -0.0767, '65': -0.102, '79': -0.0256, '67': -0.0256, '71': -0.0256, '81': -0.0256}},
+    '71': {c: 'G', ic: 0.0872},
+    '72': {c: 'H', ic: 0.164},
+    '73': {c: 'I', ic: 0.158},
+    '74': {c: 'J', ic: 0.14},
+    '75': {c: 'K', ic: 0.145, krn: {'79': -0.0256, '67': -0.0256, '71': -0.0256, '81': -0.0256}},
+    '76': {c: 'L', krn: {'84': -0.0767, '89': -0.0767, '86': -0.102, '87': -0.102, '101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}},
+    '77': {c: 'M', ic: 0.164},
+    '78': {c: 'N', ic: 0.164},
+    '79': {c: 'O', ic: 0.094, krn: {'88': -0.0256, '87': -0.0256, '65': -0.0256, '86': -0.0256, '89': -0.0256}},
+    '80': {c: 'P', ic: 0.103, krn: {'65': -0.0767}},
+    '81': {c: 'Q', d:.2, ic: 0.094},
+    '82': {c: 'R', ic: 0.0387, krn: {'110': -0.0256, '108': -0.0256, '114': -0.0256, '117': -0.0256, '109': -0.0256, '116': -0.0256, '105': -0.0256, '67': -0.0256, '79': -0.0256, '71': -0.0256, '104': -0.0256, '98': -0.0256, '85': -0.0256, '107': -0.0256, '118': -0.0256, '119': -0.0256, '81': -0.0256, '84': -0.0767, '89': -0.0767, '86': -0.102, '87': -0.102, '101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}},
+    '83': {c: 'S', ic: 0.12},
+    '84': {c: 'T', ic: 0.133, krn: {'121': -0.0767, '101': -0.0767, '111': -0.0767, '114': -0.0767, '97': -0.0767, '117': -0.0767, '65': -0.0767}},
+    '85': {c: 'U', ic: 0.164},
+    '86': {c: 'V', ic: 0.184, krn: {'111': -0.0767, '101': -0.0767, '117': -0.0767, '114': -0.0767, '97': -0.0767, '65': -0.102, '79': -0.0256, '67': -0.0256, '71': -0.0256, '81': -0.0256}},
+    '87': {c: 'W', ic: 0.184, krn: {'65': -0.0767}},
+    '88': {c: 'X', ic: 0.158, krn: {'79': -0.0256, '67': -0.0256, '71': -0.0256, '81': -0.0256}},
+    '89': {c: 'Y', ic: 0.194, krn: {'101': -0.0767, '111': -0.0767, '114': -0.0767, '97': -0.0767, '117': -0.0767, '65': -0.0767}},
+    '90': {c: 'Z', ic: 0.145},
+    '91': {c: '[', d:.1, ic: 0.188},
+    '93': {c: ']', d:.1, ic: 0.105},
+    '97': {c: 'a', a:0, ic: 0.0767},
+    '98': {c: 'b', ic: 0.0631, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}},
+    '99': {c: 'c', a:0, ic: 0.0565, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}},
+    '100': {c: 'd', ic: 0.103, krn: {'108': 0.0511}},
+    '101': {c: 'e', a:0, ic: 0.0751, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}},
+    '102': {c: 'f', ic: 0.212, krn: {'39': 0.104, '63': 0.104, '33': 0.104, '41': 0.104, '93': 0.104}, lig: {'105': 12, '102': 11, '108': 13}},
+    '103': {c: 'g', a:0, d:.2, ic: 0.0885},
+    '104': {c: 'h', ic: 0.0767},
+    '105': {c: 'i', ic: 0.102},
+    '106': {c: 'j', d:.2, ic: 0.145},
+    '107': {c: 'k', ic: 0.108},
+    '108': {c: 'l', ic: 0.103, krn: {'108': 0.0511}},
+    '109': {c: 'm', a:0, ic: 0.0767},
+    '110': {c: 'n', a:0, ic: 0.0767, krn: {'39': -0.102}},
+    '111': {c: 'o', a:0, ic: 0.0631, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}},
+    '112': {c: 'p', a:0, d:.2, ic: 0.0631, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}},
+    '113': {c: 'q', a:0, d:.2, ic: 0.0885},
+    '114': {c: 'r', a:0, ic: 0.108, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}},
+    '115': {c: 's', a:0, ic: 0.0821},
+    '116': {c: 't', ic: 0.0949},
+    '117': {c: 'u', a:0, ic: 0.0767},
+    '118': {c: 'v', a:0, ic: 0.108},
+    '119': {c: 'w', a:0, ic: 0.108, krn: {'108': 0.0511}},
+    '120': {c: 'x', a:0, ic: 0.12},
+    '121': {c: 'y', a:0, d:.2, ic: 0.0885},
+    '122': {c: 'z', a:0, ic: 0.123}
+  },
+  cmbx10: {
+    '33': {c: '!', lig: {'96': 60}},
+    '35': {c: '#'},
+    '36': {c: '$'},
+    '37': {c: '%'},
+    '38': {c: '&amp;'},
+    '40': {c: '(', d:.2},
+    '41': {c: ')', d:.2},
+    '42': {c: '*'},
+    '43': {c: '+', a:.1},
+    '44': {c: ',', a:-.3, d:.2, w: 0.278},
+    '45': {c: '-', a:0, lig: {'45': 123}},
+    '46': {c: '.', a:-.25},
+    '47': {c: '/'},
+    '48': {c: '0'},
+    '49': {c: '1'},
+    '50': {c: '2'},
+    '51': {c: '3'},
+    '52': {c: '4'},
+    '53': {c: '5'},
+    '54': {c: '6'},
+    '55': {c: '7'},
+    '56': {c: '8'},
+    '57': {c: '9'},
+    '58': {c: ':'},
+    '59': {c: ';'},
+    '61': {c: '=', a:0, d:-.1},
+    '63': {c: '?', lig: {'96': 62}},
+    '64': {c: '@'},
+    '65': {c: 'A', krn: {'116': -0.0278, '67': -0.0278, '79': -0.0278, '71': -0.0278, '85': -0.0278, '81': -0.0278, '84': -0.0833, '89': -0.0833, '86': -0.111, '87': -0.111}},
+    '66': {c: 'B'},
+    '67': {c: 'C'},
+    '68': {c: 'D', krn: {'88': -0.0278, '87': -0.0278, '65': -0.0278, '86': -0.0278, '89': -0.0278}},
+    '69': {c: 'E'},
+    '70': {c: 'F', krn: {'111': -0.0833, '101': -0.0833, '117': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.111, '79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}},
+    '71': {c: 'G'},
+    '72': {c: 'H'},
+    '73': {c: 'I', krn: {'73': 0.0278}},
+    '74': {c: 'J'},
+    '75': {c: 'K', krn: {'79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}},
+    '76': {c: 'L', krn: {'84': -0.0833, '89': -0.0833, '86': -0.111, '87': -0.111}},
+    '77': {c: 'M'},
+    '78': {c: 'N'},
+    '79': {c: 'O', krn: {'88': -0.0278, '87': -0.0278, '65': -0.0278, '86': -0.0278, '89': -0.0278}},
+    '80': {c: 'P', krn: {'65': -0.0833, '111': -0.0278, '101': -0.0278, '97': -0.0278, '46': -0.0833, '44': -0.0833}},
+    '81': {c: 'Q', d: 1},
+    '82': {c: 'R', krn: {'116': -0.0278, '67': -0.0278, '79': -0.0278, '71': -0.0278, '85': -0.0278, '81': -0.0278, '84': -0.0833, '89': -0.0833, '86': -0.111, '87': -0.111}},
+    '83': {c: 'S'},
+    '84': {c: 'T', krn: {'121': -0.0278, '101': -0.0833, '111': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.0833, '117': -0.0833}},
+    '85': {c: 'U'},
+    '86': {c: 'V', ic: 0.0139, krn: {'111': -0.0833, '101': -0.0833, '117': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.111, '79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}},
+    '87': {c: 'W', ic: 0.0139, krn: {'111': -0.0833, '101': -0.0833, '117': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.111, '79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}},
+    '88': {c: 'X', krn: {'79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}},
+    '89': {c: 'Y', ic: 0.025, krn: {'101': -0.0833, '111': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.0833, '117': -0.0833}},
+    '90': {c: 'Z'},
+    '91': {c: '[', d:.1},
+    '93': {c: ']', d:.1},
+    '97': {c: 'a', a:0, krn: {'118': -0.0278, '106': 0.0556, '121': -0.0278, '119': -0.0278}},
+    '98': {c: 'b', krn: {'101': 0.0278, '111': 0.0278, '120': -0.0278, '100': 0.0278, '99': 0.0278, '113': 0.0278, '118': -0.0278, '106': 0.0556, '121': -0.0278, '119': -0.0278}},
+    '99': {c: 'c', a:0, krn: {'104': -0.0278, '107': -0.0278}},
+    '100': {c: 'd'},
+    '101': {c: 'e', a:0},
+    '102': {c: 'f', ic: 0.0778, krn: {'39': 0.0778, '63': 0.0778, '33': 0.0778, '41': 0.0778, '93': 0.0778}, lig: {'105': 12, '102': 11, '108': 13}},
+    '103': {c: 'g', a:0, d:.2, ic: 0.0139, krn: {'106': 0.0278}},
+    '104': {c: 'h', krn: {'116': -0.0278, '117': -0.0278, '98': -0.0278, '121': -0.0278, '118': -0.0278, '119': -0.0278}},
+    '105': {c: 'i'},
+    '106': {c: 'j', d:1},
+    '107': {c: 'k', krn: {'97': -0.0556, '101': -0.0278, '97': -0.0278, '111': -0.0278, '99': -0.0278}},
+    '108': {c: 'l'},
+    '109': {c: 'm', a:0, krn: {'116': -0.0278, '117': -0.0278, '98': -0.0278, '121': -0.0278, '118': -0.0278, '119': -0.0278}},
+    '110': {c: 'n', a:0, krn: {'116': -0.0278, '117': -0.0278, '98': -0.0278, '121': -0.0278, '118': -0.0278, '119': -0.0278}},
+    '111': {c: 'o', a:0, krn: {'101': 0.0278, '111': 0.0278, '120': -0.0278, '100': 0.0278, '99': 0.0278, '113': 0.0278, '118': -0.0278, '106': 0.0556, '121': -0.0278, '119': -0.0278}},
+    '112': {c: 'p', a:0, d:.2, krn: {'101': 0.0278, '111': 0.0278, '120': -0.0278, '100': 0.0278, '99': 0.0278, '113': 0.0278, '118': -0.0278, '106': 0.0556, '121': -0.0278, '119': -0.0278}},
+    '113': {c: 'q', a:0, d:1},
+    '114': {c: 'r', a:0},
+    '115': {c: 's', a:0},
+    '116': {c: 't', krn: {'121': -0.0278, '119': -0.0278}},
+    '117': {c: 'u', a:0, krn: {'119': -0.0278}},
+    '118': {c: 'v', a:0, ic: 0.0139, krn: {'97': -0.0556, '101': -0.0278, '97': -0.0278, '111': -0.0278, '99': -0.0278}},
+    '119': {c: 'w', a:0, ic: 0.0139, krn: {'101': -0.0278, '97': -0.0278, '111': -0.0278, '99': -0.0278}},
+    '120': {c: 'x', a:0},
+    '121': {c: 'y', a:0, d:.2, ic: 0.0139, krn: {'111': -0.0278, '101': -0.0278, '97': -0.0278, '46': -0.0833, '44': -0.0833}},
+    '122': {c: 'z', a:0}
+  }
+});
+
+
+if (jsMath.browser == 'MSIE' && jsMath.platform == 'mac') {
+  jsMath.Setup.Styles({
+    '.typeset .math':       'font-style: normal',
+    '.typeset .typeset':    'font-style: normal',
+    '.typeset .icmr10':     'font-family: Times',
+    '.typeset .icmmi10':    'font-family: Times; font-style: italic',
+    '.typeset .icmbx10':    'font-family: Times; font-weight: bold',
+    '.typeset .icmti10':    'font-family: Times; font-style: italic'
+  });
+} else {
+  jsMath.Setup.Styles({
+    '.typeset .math':       'font-style: normal',
+    '.typeset .typeset':    'font-style: normal',
+    '.typeset .icmr10':     'font-family: serif',
+    '.typeset .icmmi10':    'font-family: serif; font-style: italic',
+    '.typeset .icmbx10':    'font-family: serif; font-weight: bold',
+    '.typeset .icmti10':    'font-family: serif; font-style: italic'
+  });
+}
+
+
+jsMath.Add(jsMath.Img,{
+  symbols: [
+      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15,
+     16, 17, 18, 19, 20, 21, 22, 23,   24, 25, 26, 27, 28, 29, 30, 31,
+     32,     34,                 39,
+                                                       60,     62,
+
+                                                       92,     94, 95,
+     96,
+                                                  123,124,125,126,127
+  ]
+});
+
+/*
+ *  for now, use images for everything
+ */
+jsMath.Img.SetFont({
+   cmr10:  jsMath.Img.symbols,
+   cmmi10: [
+      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15,
+     16, 17, 18, 19, 20, 21, 22, 23,   24, 25, 26, 27, 28, 29, 30, 31,
+     32, 33, 34, 35, 36, 37, 38, 39,   40, 41, 42, 43, 44, 45, 46, 47,
+     48, 49, 50, 51, 52, 53, 54, 55,   56, 57, 58, 59, 60, 61, 62, 63,
+     64, 
+                                                   91, 92, 93, 94, 95,
+     96,
+                                                  123,124,125,126,127
+   ],
+   cmsy10: [
+          1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15,
+     16, 17, 18, 19, 20, 21, 22, 23,   24, 25, 26, 27, 28, 29, 30, 31,
+     32, 33, 34, 35, 36, 37, 38, 39,   40, 41, 42, 43, 44, 45, 46, 47,
+     48, 49, 50, 51, 52, 53, 54, 55,   56, 57, 58, 59, 60, 61, 62, 63,
+     64, 65, 66, 67, 68, 69, 70, 71,   72, 73, 74, 75, 76, 77, 78, 79,
+     80, 81, 82, 83, 84, 85, 86, 87,   88, 89, 90, 91, 92, 93, 94, 95,
+     96, 97, 98, 99,100,101,102,103,  104,105,106,107,108,109,110,111,
+    112,113,114,115,116,117,118,119,  120,121,122,123,124,125,126,127
+   ],
+   cmex10: ['all'],
+   cmti10: jsMath.Img.symbols.concat(36),
+   cmbx10: jsMath.Img.symbols
+});
+
+jsMath.Img.LoadFont('cm-fonts');
+
diff --git a/htdocs/jsMath/uncompressed/jsMath-fallback-unix.js b/htdocs/jsMath/uncompressed/jsMath-fallback-unix.js
new file mode 100644
index 0000000000..63e7856a61
--- /dev/null
+++ b/htdocs/jsMath/uncompressed/jsMath-fallback-unix.js
@@ -0,0 +1,935 @@
+/*
+ *  jsMath-fallback-mac.js
+ *  
+ *  Part of the jsMath package for mathematics on the web.
+ *
+ *  This file makes changes needed for when the TeX fonts are not available
+ *  with a browser on the Mac.
+ *
+ *  ---------------------------------------------------------------------
+ *
+ *  Copyright 2004-2006 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+
+
+/********************************************************************
+ *
+ *  Here we replace the TeX character mappings by equivalent unicode
+ *  points when possible, and adjust the character dimensions
+ *  based on the fonts we hope we get them from (the styles are set
+ *  to try to use the best characters available in the standard
+ *  fonts).
+ */
+
+jsMath.Add(jsMath.TeX,{
+
+  cmr10: [
+    // 00 - 0F
+    {c: '&Gamma;', tclass: 'greek'},
+    {c: '&Delta;', tclass: 'greek'},
+    {c: '&Theta;', tclass: 'greek'},
+    {c: '&Lambda;', tclass: 'greek'},
+    {c: '&Xi;', tclass: 'greek'},
+    {c: '&Pi;', tclass: 'greek'},
+    {c: '&Sigma;', tclass: 'greek'},
+    {c: '&Upsilon;', tclass: 'greek'},
+    {c: '&Phi;', tclass: 'greek'},
+    {c: '&Psi;', tclass: 'greek'},
+    {c: '&Omega;', tclass: 'greek'},
+    {c: 'ff', ic: 0.0778, krn: {'39': 0.0778, '63': 0.0778, '33': 0.0778, '41': 0.0778, '93': 0.0778}, lig: {'105': 14, '108': 15}, tclass: 'normal'},
+    {c: 'fi', tclass: 'normal'},
+    {c: 'fl', tclass: 'normal'},
+    {c: 'ffi', tclass: 'normal'},
+    {c: 'ffl', tclass: 'normal'},
+    // 10 - 1F
+    {c: '&#x131;', a:0, tclass: 'normal'},
+    {c: 'j', d:.2, tclass: 'normal'},
+    {c: '&#x60;', tclass: 'accent'},
+    {c: '&#xB4;', tclass: 'accent'},
+    {c: '&#x2C7;', tclass: 'accent'},
+    {c: '&#x2D8;', tclass: 'accent'},
+    {c: '<span style="position:relative; top:.1em">&#x2C9;</span>', tclass: 'accent'},
+    {c: '&#x2DA;', tclass: 'accent'},
+    {c: '&#x0327;', tclass: 'normal'},
+    {c: '&#xDF;', tclass: 'normal'},
+    {c: '&#xE6;', a:0, tclass: 'normal'},
+    {c: '&#x153;', a:0, tclass: 'normal'},
+    {c: '&#xF8;', tclass: 'normal'},
+    {c: '&#xC6;', tclass: 'normal'},
+    {c: '&#x152;', tclass: 'normal'},
+    {c: '&#xD8;', tclass: 'normal'},
+    // 20 - 2F
+    {c: '?', krn: {'108': -0.278, '76': -0.319}, tclass: 'normal'},
+    {c: '!', lig: {'96': 60}, tclass: 'normal'},
+    {c: '&#x201D;', tclass: 'normal'},
+    {c: '#', tclass: 'normal'},
+    {c: '$', tclass: 'normal'},
+    {c: '%', tclass: 'normal'},
+    {c: '&amp;', tclass: 'normal'},
+    {c: '&#x2019;', krn: {'63': 0.111, '33': 0.111}, lig: {'39': 34}, tclass: 'normal'},
+    {c: '(', d:.2, tclass: 'normal'},
+    {c: ')', d:.2, tclass: 'normal'},
+    {c: '*', tclass: 'normal'},
+    {c: '+', a:.1, tclass: 'normal'},
+    {c: ',', a:-.3, d:.2, w: 0.278, tclass: 'normal'},
+    {c: '-', a:0, lig: {'45': 123}, tclass: 'normal'},
+    {c: '.', a:-.25, tclass: 'normal'},
+    {c: '/', tclass: 'normal'},
+    // 30 - 3F
+    {c: '0', tclass: 'normal'},
+    {c: '1', tclass: 'normal'},
+    {c: '2', tclass: 'normal'},
+    {c: '3', tclass: 'normal'},
+    {c: '4', tclass: 'normal'},
+    {c: '5', tclass: 'normal'},
+    {c: '6', tclass: 'normal'},
+    {c: '7', tclass: 'normal'},
+    {c: '8', tclass: 'normal'},
+    {c: '9', tclass: 'normal'},
+    {c: ':', tclass: 'normal'},
+    {c: ';', tclass: 'normal'},
+    {c: '&#xA1;', tclass: 'normal'},
+    {c: '=', a:0, d:-.1, tclass: 'normal'},
+    {c: '&#xBF;', tclass: 'normal'},
+    {c: '?', lig: {'96': 62}, tclass: 'normal'},
+    // 40 - 4F
+    {c: '@', tclass: 'normal'},
+    {c: 'A', krn: {'116': -0.0278, '67': -0.0278, '79': -0.0278, '71': -0.0278, '85': -0.0278, '81': -0.0278, '84': -0.0833, '89': -0.0833, '86': -0.111, '87': -0.111}, tclass: 'normal'},
+    {c: 'B', tclass: 'normal'},
+    {c: 'C', tclass: 'normal'},
+    {c: 'D', krn: {'88': -0.0278, '87': -0.0278, '65': -0.0278, '86': -0.0278, '89': -0.0278}, tclass: 'normal'},
+    {c: 'E', tclass: 'normal'},
+    {c: 'F', krn: {'111': -0.0833, '101': -0.0833, '117': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.111, '79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}, tclass: 'normal'},
+    {c: 'G', tclass: 'normal'},
+    {c: 'H', tclass: 'normal'},
+    {c: 'I', krn: {'73': 0.0278}, tclass: 'normal'},
+    {c: 'J', tclass: 'normal'},
+    {c: 'K', krn: {'79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}, tclass: 'normal'},
+    {c: 'L', krn: {'84': -0.0833, '89': -0.0833, '86': -0.111, '87': -0.111}, tclass: 'normal'},
+    {c: 'M', tclass: 'normal'},
+    {c: 'N', tclass: 'normal'},
+    {c: 'O', krn: {'88': -0.0278, '87': -0.0278, '65': -0.0278, '86': -0.0278, '89': -0.0278}, tclass: 'normal'},
+    // 50 - 5F
+    {c: 'P', krn: {'65': -0.0833, '111': -0.0278, '101': -0.0278, '97': -0.0278, '46': -0.0833, '44': -0.0833}, tclass: 'normal'},
+    {c: 'Q', d: 1, tclass: 'normal'},
+    {c: 'R', krn: {'116': -0.0278, '67': -0.0278, '79': -0.0278, '71': -0.0278, '85': -0.0278, '81': -0.0278, '84': -0.0833, '89': -0.0833, '86': -0.111, '87': -0.111}, tclass: 'normal'},
+    {c: 'S', tclass: 'normal'},
+    {c: 'T', krn: {'121': -0.0278, '101': -0.0833, '111': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.0833, '117': -0.0833}, tclass: 'normal'},
+    {c: 'U', tclass: 'normal'},
+    {c: 'V', ic: 0.0139, krn: {'111': -0.0833, '101': -0.0833, '117': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.111, '79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}, tclass: 'normal'},
+    {c: 'W', ic: 0.0139, krn: {'111': -0.0833, '101': -0.0833, '117': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.111, '79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}, tclass: 'normal'},
+    {c: 'X', krn: {'79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}, tclass: 'normal'},
+    {c: 'Y', ic: 0.025, krn: {'101': -0.0833, '111': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.0833, '117': -0.0833}, tclass: 'normal'},
+    {c: 'Z', tclass: 'normal'},
+    {c: '[', d:.1, tclass: 'normal'},
+    {c: '&#x201C;', tclass: 'normal'},
+    {c: ']', d:.1, tclass: 'normal'},
+    {c: '&#x2C6;', tclass: 'accent'},
+    {c: '&#x2D9;', tclass: 'accent'},
+    // 60 - 6F
+    {c: '&#x2018;', lig: {'96': 92}, tclass: 'normal'},
+    {c: 'a', a:0, krn: {'118': -0.0278, '106': 0.0556, '121': -0.0278, '119': -0.0278}, tclass: 'normal'},
+    {c: 'b', krn: {'101': 0.0278, '111': 0.0278, '120': -0.0278, '100': 0.0278, '99': 0.0278, '113': 0.0278, '118': -0.0278, '106': 0.0556, '121': -0.0278, '119': -0.0278}, tclass: 'normal'},
+    {c: 'c', a:0, krn: {'104': -0.0278, '107': -0.0278}, tclass: 'normal'},
+    {c: 'd', tclass: 'normal'},
+    {c: 'e', a:0, tclass: 'normal'},
+    {c: 'f', ic: 0.0778, krn: {'39': 0.0778, '63': 0.0778, '33': 0.0778, '41': 0.0778, '93': 0.0778}, lig: {'105': 12, '102': 11, '108': 13}, tclass: 'normal'},
+    {c: 'g', a:0, d:.2, ic: 0.0139, krn: {'106': 0.0278}, tclass: 'normal'},
+    {c: 'h', krn: {'116': -0.0278, '117': -0.0278, '98': -0.0278, '121': -0.0278, '118': -0.0278, '119': -0.0278}, tclass: 'normal'},
+    {c: 'i', tclass: 'normal'},
+    {c: 'j', d:.2, tclass: 'normal'},
+    {c: 'k', krn: {'97': -0.0556, '101': -0.0278, '97': -0.0278, '111': -0.0278, '99': -0.0278}, tclass: 'normal'},
+    {c: 'l', tclass: 'normal'},
+    {c: 'm', a:0, krn: {'116': -0.0278, '117': -0.0278, '98': -0.0278, '121': -0.0278, '118': -0.0278, '119': -0.0278}, tclass: 'normal'},
+    {c: 'n', a:0, krn: {'116': -0.0278, '117': -0.0278, '98': -0.0278, '121': -0.0278, '118': -0.0278, '119': -0.0278}, tclass: 'normal'},
+    {c: 'o', a:0, krn: {'101': 0.0278, '111': 0.0278, '120': -0.0278, '100': 0.0278, '99': 0.0278, '113': 0.0278, '118': -0.0278, '106': 0.0556, '121': -0.0278, '119': -0.0278}, tclass: 'normal'},
+    // 70 - 7F
+    {c: 'p', a:0, d:.2, krn: {'101': 0.0278, '111': 0.0278, '120': -0.0278, '100': 0.0278, '99': 0.0278, '113': 0.0278, '118': -0.0278, '106': 0.0556, '121': -0.0278, '119': -0.0278}, tclass: 'normal'},
+    {c: 'q', a:0, d:.2, tclass: 'normal'},
+    {c: 'r', a:0, tclass: 'normal'},
+    {c: 's', a:0, tclass: 'normal'},
+    {c: 't', krn: {'121': -0.0278, '119': -0.0278}, tclass: 'normal'},
+    {c: 'u', a:0, krn: {'119': -0.0278}, tclass: 'normal'},
+    {c: 'v', a:0, ic: 0.0139, krn: {'97': -0.0556, '101': -0.0278, '97': -0.0278, '111': -0.0278, '99': -0.0278}, tclass: 'normal'},
+    {c: 'w', a:0, ic: 0.0139, krn: {'101': -0.0278, '97': -0.0278, '111': -0.0278, '99': -0.0278}, tclass: 'normal'},
+    {c: 'x', a:0, tclass: 'normal'},
+    {c: 'y', a:0, d:.2, ic: 0.0139, krn: {'111': -0.0278, '101': -0.0278, '97': -0.0278, '46': -0.0833, '44': -0.0833}, tclass: 'normal'},
+    {c: 'z', a:0, tclass: 'normal'},
+    {c: '&#x2013;', a:.1, ic: 0.0278, lig: {'45': 124}, tclass: 'normal'},
+    {c: '&#x2014;', a:.1, ic: 0.0278, tclass: 'normal'},
+    {c: '&#x2DD;', tclass: 'accent'},
+    {c: '&#x2DC;', tclass: 'accent'},
+    {c: '&#xA8;', tclass: 'accent'}
+  ],
+  
+  cmmi10: [
+    // 00 - 0F
+    {c: '&Gamma;', ic: 0.139, krn: {'61': -0.0556, '59': -0.111, '58': -0.111, '127': 0.0833}, tclass: 'igreek'},
+    {c: '&Delta;', krn: {'127': 0.167}, tclass: 'igreek'},
+    {c: '&Theta;', ic: 0.0278, krn: {'127': 0.0833}, tclass: 'igreek'},
+    {c: '&Lambda;', krn: {'127': 0.167}, tclass: 'igreek'},
+    {c: '&Xi;', ic: 0.0757, krn: {'127': 0.0833}, tclass: 'igreek'},
+    {c: '&Pi;', ic: 0.0812, krn: {'61': -0.0556, '59': -0.0556, '58': -0.0556, '127': 0.0556}, tclass: 'igreek'},
+    {c: '&Sigma;', ic: 0.0576, krn: {'127': 0.0833}, tclass: 'igreek'},
+    {c: '&Upsilon;', ic: 0.139, krn: {'61': -0.0556, '59': -0.111, '58': -0.111, '127': 0.0556}, tclass: 'igreek'},
+    {c: '&Phi;', krn: {'127': 0.0833}, tclass: 'igreek'},
+    {c: '&Psi;', ic: 0.11, krn: {'61': -0.0556, '59': -0.0556, '58': -0.0556, '127': 0.0556}, tclass: 'igreek'},
+    {c: '&Omega;', ic: 0.0502, krn: {'127': 0.0833}, tclass: 'igreek'},
+    {c: '&alpha;', a:0, ic: 0.0037, krn: {'127': 0.0278}, tclass: 'greek'},
+    {c: '&beta;', d:.2, ic: 0.0528, krn: {'127': 0.0833}, tclass: 'greek'},
+    {c: '&gamma;', a:0, d:.2, ic: 0.0556, tclass: 'greek'},
+    {c: '&delta;', ic: 0.0378, krn: {'59': -0.0556, '58': -0.0556, '127': 0.0556}, tclass: 'greek'},
+    {c: '&epsilon;', a:0, krn: {'127': 0.0556}, tclass: 'symbol'},
+    // 10 - 1F
+    {c: '&zeta;', d:.2, ic: 0.0738, krn: {'127': 0.0833}, tclass: 'greek'},
+    {c: '&eta;', a:0, d:.2, ic: 0.0359, krn: {'127': 0.0556}, tclass: 'greek'},
+    {c: '&theta;', ic: 0.0278, krn: {'127': 0.0833}, tclass: 'greek'},
+    {c: '&iota;', a:0, krn: {'127': 0.0556}, tclass: 'greek'},
+    {c: '&kappa;', a:0, tclass: 'greek'},
+    {c: '&lambda;', tclass: 'greek'},
+    {c: '&mu;', a:0, d:.2, krn: {'127': 0.0278}, tclass: 'greek'},
+    {c: '&nu;', a:0, ic: 0.0637, krn: {'59': -0.0556, '58': -0.0556, '127': 0.0278}, tclass: 'greek'},
+    {c: '&xi;', d:.2, ic: 0.046, krn: {'127': 0.111}, tclass: 'greek'},
+    {c: '&pi;', a:0, ic: 0.0359, tclass: 'greek'},
+    {c: '&rho;', a:0, d:.2, krn: {'127': 0.0833}, tclass: 'greek'},
+    {c: '&sigma;', a:0, ic: 0.0359, krn: {'59': -0.0556, '58': -0.0556}, tclass: 'greek'},
+    {c: '&tau;', a:0, ic: 0.113, krn: {'59': -0.0556, '58': -0.0556, '127': 0.0278}, tclass: 'greek'},
+    {c: '&upsilon;', a:0, ic: 0.0359, krn: {'127': 0.0278}, tclass: 'greek'},
+    {c: '&phi;', a:.1, d:.2, krn: {'127': 0.0833}, tclass: 'greek'},
+    {c: '&chi;', a:0, d:.2, krn: {'127': 0.0556}, tclass: 'greek'},
+    // 20 - 2F
+    {c: '&psi;', a:.1, d:.2, ic: 0.0359, krn: {'127': 0.111}, tclass: 'greek'},
+    {c: '&omega;', a:0, ic: 0.0359, tclass: 'greek'},
+    {c: '&epsilon;', a:0, krn: {'127': 0.0833}, tclass: 'greek'},
+    {c: '&#x3D1;', krn: {'127': 0.0833}, tclass: 'normal'},
+    {c: '&#x3D6;', a:0, ic: 0.0278, tclass: 'normal'},
+    {c: '&#x3F1;', a:0, d:.2, krn: {'127': 0.0833}, tclass: 'normal'},
+    {c: '&#x3C2;', a:0, d:.2, ic: 0.0799, krn: {'127': 0.0833}, tclass: 'normal'},
+    {c: '&#x3D5;', a:.1, d:.2, krn: {'127': 0.0833}, tclass: 'normal'},
+    {c: '&#x21BC;', a:0, d:-.2, tclass: 'harpoon'},
+    {c: '&#x21BD;', a:0, d:-.1, tclass: 'harpoon'},
+    {c: '&#x21C0;', a:0, d:-.2, tclass: 'harpoon'},
+    {c: '&#x21C1;', a:0, d:-.1, tclass: 'harpoon'},
+    {c: '<span style="font-size: 133%; position:relative; top:-.1em; margin:-.2em; left:-.05em">&#x02D3;</span>', a:.1, tclass: 'symbol'},
+    {c: '<span style="font-size: 133%; position:relative; top:-.1em; margin:-.2em; left:-.05em">&#x02D2;</span>', a:.1, tclass: 'symbol'},
+    {c: '<span style="font-size:50%">&#x25B7;</span>', tclass: 'symbol'},
+    {c: '<span style="font-size:50%">&#x25C1;</span>', tclass: 'symbol'},
+    // 30 - 3F
+    {c: '0', tclass: 'normal'},
+    {c: '1', tclass: 'normal'},
+    {c: '2', tclass: 'normal'},
+    {c: '3', tclass: 'normal'},
+    {c: '4', tclass: 'normal'},
+    {c: '5', tclass: 'normal'},
+    {c: '6', tclass: 'normal'},
+    {c: '7', tclass: 'normal'},
+    {c: '8', tclass: 'normal'},
+    {c: '9', tclass: 'normal'},
+    {c: '.', a:-.3, tclass: 'normal'},
+    {c: ',', a:-.3, d:.2, tclass: 'normal'},
+    {c: '&lt;', a:.1, tclass: 'normal'},
+    {c: '/', krn: {'1': -0.0556, '65': -0.0556, '77': -0.0556, '78': -0.0556, '89': 0.0556, '90': -0.0556}, tclass: 'normal'},
+    {c: '&gt;', a:.1, tclass: 'normal'},
+    {c: '<span style="font-size:50%">&#x2605;</span>', a:0, tclass: 'symbol'},
+    // 40 - 4F
+    {c: '&#x2202;', ic: 0.0556, krn: {'127': 0.0833}, tclass: 'normal'},
+    {c: 'A', krn: {'127': 0.139}, tclass: 'italic'},
+    {c: 'B', ic: 0.0502, krn: {'127': 0.0833}, tclass: 'italic'},
+    {c: 'C', ic: 0.0715, krn: {'61': -0.0278, '59': -0.0556, '58': -0.0556, '127': 0.0833}, tclass: 'italic'},
+    {c: 'D', ic: 0.0278, krn: {'127': 0.0556}, tclass: 'italic'},
+    {c: 'E', ic: 0.0576, krn: {'127': 0.0833}, tclass: 'italic'},
+    {c: 'F', ic: 0.139, krn: {'61': -0.0556, '59': -0.111, '58': -0.111, '127': 0.0833}, tclass: 'italic'},
+    {c: 'G', krn: {'127': 0.0833}, tclass: 'italic'},
+    {c: 'H', ic: 0.0812, krn: {'61': -0.0556, '59': -0.0556, '58': -0.0556, '127': 0.0556}, tclass: 'italic'},
+    {c: 'I', ic: 0.0785, krn: {'127': 0.111}, tclass: 'italic'},
+    {c: 'J', ic: 0.0962, krn: {'61': -0.0556, '59': -0.111, '58': -0.111, '127': 0.167}, tclass: 'italic'},
+    {c: 'K', ic: 0.0715, krn: {'61': -0.0556, '59': -0.0556, '58': -0.0556, '127': 0.0556}, tclass: 'italic'},
+    {c: 'L', krn: {'127': 0.0278}, tclass: 'italic'},
+    {c: 'M', ic: 0.109, krn: {'61': -0.0556, '59': -0.0556, '58': -0.0556, '127': 0.0833}, tclass: 'italic'},
+    {c: 'N', ic: 0.109, krn: {'61': -0.0833, '61': -0.0278, '59': -0.0556, '58': -0.0556, '127': 0.0833}, tclass: 'italic'},
+    {c: 'O', ic: 0.0278, krn: {'127': 0.0833}, tclass: 'italic'},
+    // 50 - 5F
+    {c: 'P', ic: 0.139, krn: {'61': -0.0556, '59': -0.111, '58': -0.111, '127': 0.0833}, tclass: 'italic'},
+    {c: 'Q', d:.2, krn: {'127': 0.0833}, tclass: 'italic'},
+    {c: 'R', ic: 0.00773, krn: {'127': 0.0833}, tclass: 'italic'},
+    {c: 'S', ic: 0.0576, krn: {'61': -0.0556, '59': -0.0556, '58': -0.0556, '127': 0.0833}, tclass: 'italic'},
+    {c: 'T', ic: 0.139, krn: {'61': -0.0278, '59': -0.0556, '58': -0.0556, '127': 0.0833}, tclass: 'italic'},
+    {c: 'U', ic: 0.109, krn: {'59': -0.111, '58': -0.111, '61': -0.0556, '127': 0.0278}, tclass: 'italic'},
+    {c: 'V', ic: 0.222, krn: {'59': -0.167, '58': -0.167, '61': -0.111}, tclass: 'italic'},
+    {c: 'W', ic: 0.139, krn: {'59': -0.167, '58': -0.167, '61': -0.111}, tclass: 'italic'},
+    {c: 'X', ic: 0.0785, krn: {'61': -0.0833, '61': -0.0278, '59': -0.0556, '58': -0.0556, '127': 0.0833}, tclass: 'italic'},
+    {c: 'Y', ic: 0.222, krn: {'59': -0.167, '58': -0.167, '61': -0.111}, tclass: 'italic'},
+    {c: 'Z', ic: 0.0715, krn: {'61': -0.0556, '59': -0.0556, '58': -0.0556, '127': 0.0833}, tclass: 'italic'},
+    {c: '&#x266D;', tclass: 'symbol2'},
+    {c: '&#x266E;', tclass: 'symbol2'},
+    {c: '&#x266F;', tclass: 'symbol2'},
+    {c: '&#x2323;', a:0, d:-.1, tclass: 'normal'},
+    {c: '&#x2322;', a:0, d:-.1, tclass: 'normal'},
+    // 60 - 6F
+    {c: '&#x2113;', krn: {'127': 0.111}, tclass: 'symbol'},
+    {c: 'a', a:0, tclass: 'italic'},
+    {c: 'b', tclass: 'italic'},
+    {c: 'c', a:0, krn: {'127': 0.0556}, tclass: 'italic'},
+    {c: 'd', krn: {'89': 0.0556, '90': -0.0556, '106': -0.111, '102': -0.167, '127': 0.167}, tclass: 'italic'},
+    {c: 'e', a:0, krn: {'127': 0.0556}, tclass: 'italic'},
+    {c: 'f', d:.2, ic: 0.108, krn: {'59': -0.0556, '58': -0.0556, '127': 0.167}, tclass: 'italic'},
+    {c: 'g', a:0, d:.2, ic: 0.0359, krn: {'127': 0.0278}, tclass: 'italic'},
+    {c: 'h', krn: {'127': -0.0278}, tclass: 'italic'},
+    {c: 'i', tclass: 'italic'},
+    {c: 'j', d:.2, ic: 0.0572, krn: {'59': -0.0556, '58': -0.0556}, tclass: 'italic'},
+    {c: 'k', ic: 0.0315, tclass: 'italic'},
+    {c: 'l', ic: 0.0197, krn: {'127': 0.0833}, tclass: 'italic'},
+    {c: 'm', a:0, tclass: 'italic'},
+    {c: 'n', a:0, tclass: 'italic'},
+    {c: 'o', a:0, krn: {'127': 0.0556}, tclass: 'italic'},
+    // 70 - 7F
+    {c: 'p', a:0, d:.2, krn: {'127': 0.0833}, tclass: 'italic'},
+    {c: 'q', a:0, d:.2, ic: 0.0359, krn: {'127': 0.0833}, tclass: 'italic'},
+    {c: 'r', a:0, ic: 0.0278, krn: {'59': -0.0556, '58': -0.0556, '127': 0.0556}, tclass: 'italic'},
+    {c: 's', a:0, krn: {'127': 0.0556}, tclass: 'italic'},
+    {c: 't', krn: {'127': 0.0833}, tclass: 'italic'},
+    {c: 'u', a:0, krn: {'127': 0.0278}, tclass: 'italic'},
+    {c: 'v', a:0, ic: 0.0359, krn: {'127': 0.0278}, tclass: 'italic'},
+    {c: 'w', a:0, ic: 0.0269, krn: {'127': 0.0833}, tclass: 'italic'},
+    {c: 'x', a:0, krn: {'127': 0.0278}, tclass: 'italic'},
+    {c: 'y', a:0, d:.2, ic: 0.0359, krn: {'127': 0.0556}, tclass: 'italic'},
+    {c: 'z', a:0, ic: 0.044, krn: {'127': 0.0556}, tclass: 'italic'},
+    {c: '&#x131;', a:0, krn: {'127': 0.0278}, tclass: 'italic'},
+    {c: 'j', d:.2, krn: {'127': 0.0833}, tclass: 'italic'},
+    {c: '&#x2118;', a:0, d:.2, krn: {'127': 0.111}, tclass: 'normal'},
+    {c: '<span style="position:relative; left: .4em; top: -.8em; font-size: 50%">&#x2192;</span>', ic: 0.154, tclass: 'symbol'},
+    {c: '&#x0311;', ic: 0.399, tclass: 'normal'}
+  ],
+
+  cmsy10: [
+    // 00 - 0F
+    {c: '&#x2212;', a:.1, tclass: 'symbol'},
+    {c: '&#xB7;', a:0, d:-.2, tclass: 'symbol'},
+    {c: '&#xD7;', a:0, tclass: 'symbol'},
+    {c: '<span style="position:relative; top:.2em">&#x2A;</span>', a:0, tclass: 'symbol'},
+    {c: '&#xF7;', a:0, tclass: 'symbol'},
+    {c: '&#x25CA;', tclass: 'symbol'},
+    {c: '&#xB1;', a:.1, tclass: 'symbol'},
+    {c: '&#x2213;', tclass: 'symbol'},
+    {c: '&#x2295;', tclass: 'symbol'},
+    {c: '&#x2296;', tclass: 'symbol'},
+    {c: '&#x2297;', tclass: 'symbol'},
+    {c: '&#x2298;', tclass: 'symbol'},
+    {c: '&#x2299;', tclass: 'symbol'},
+    {c: '&#x25EF;', tclass: 'symbol'},
+    {c: '<span style="position:relative; top:.25em;">&#xB0;</span>', a:0, d:-.1, tclass: 'symbol'},
+    {c: '&#x2022;', a:0, d:-.2, tclass: 'symbol'},
+    // 10 - 1F
+    {c: '&#x224D;', a:.1, tclass: 'symbol'},
+    {c: '&#x2261;', a:.1, tclass: 'symbol'},
+    {c: '&#x2286;', tclass: 'symbol'},
+    {c: '&#x2287;', tclass: 'symbol'},
+    {c: '&#x2264;', tclass: 'symbol'},
+    {c: '&#x2265;', tclass: 'symbol'},
+    {c: '&#x227C;', tclass: 'symbol'},
+    {c: '&#x227D;', tclass: 'symbol'},
+    {c: '~', a:0, d: -.2, tclass: 'normal'},
+    {c: '&#x2248;', a:.1, d:-.1, tclass: 'symbol'},
+    {c: '&#x2282;', tclass: 'symbol'},
+    {c: '&#x2283;', tclass: 'symbol'},
+    {c: '&#x226A;', tclass: 'symbol'},
+    {c: '&#x226B;', tclass: 'symbol'},
+    {c: '&#x227A;', tclass: 'symbol'},
+    {c: '&#x227B;', tclass: 'symbol'},
+    // 20 - 2F
+    {c: '&#x2190;', a:0, d:-.15, tclass: 'arrows'},
+    {c: '&#x2192;', a:0, d:-.15, tclass: 'arrows'},
+    {c: '&#x2191;', h:1, tclass: 'arrows'},
+    {c: '&#x2193;', h:1, tclass: 'arrows'},
+    {c: '&#x2194;', a:0, tclass: 'arrows'},
+    {c: '&#x2197;', h:1, tclass: 'arrows'},
+    {c: '&#x2198;', h:1, tclass: 'arrows'},
+    {c: '&#x2243;', a: .1, tclass: 'symbol'},
+    {c: '&#x21D0;', a:.1, tclass: 'arrows'},
+    {c: '&#x21D2;', a:.1, tclass: 'arrows'},
+    {c: '&#x21D1;', h:.9, d:.1, tclass: 'arrows'},
+    {c: '&#x21D3;', h:.9, d:.1, tclass: 'arrows'},
+    {c: '&#x21D4;', a:.1, tclass: 'arrows'},
+    {c: '&#x2196;', h:1, tclass: 'arrows'},
+    {c: '&#x2199;', h:1, tclass: 'arrows'},
+    {c: '&#x221D;', a:.1, tclass: 'symbol'},
+    // 30 - 3F
+    {c: '<span style="font-size: 133%; margin-right: -.1em; position: relative; top:.4em">&#x2032;</span>', a: 0, tclass: 'symbol'},
+    {c: '&#x221E;', a:.1, tclass: 'symbol'},
+    {c: '&#x2208;', tclass: 'symbol'},
+    {c: '&#x220B;', tclass: 'symbol'},
+    {c: '&#x25B3;', tclass: 'symbol'},
+    {c: '&#x25BD;', tclass: 'symbol'},
+    {c: '/', tclass: 'symbol'},
+    {c: '<span style="font-size:50%; position:relative; top:-.3em; margin-right:-.2em">|</span>', a:0, tclass: 'normal'},
+    {c: '&#x2200;', tclass: 'symbol'},
+    {c: '&#x2203;', tclass: 'symbol'},
+    {c: '&#xAC;', a:0, d:-.1, tclass: 'symbol1'},
+    {c: '&#x2205;', tclass: 'symbol'},
+    {c: '&#x211C;', tclass: 'symbol'},
+    {c: '&#x2111;', tclass: 'symbol'},
+    {c: '&#x22A4;', tclass: 'symbol'},
+    {c: '&#x22A5;', tclass: 'symbol'},
+    // 40 - 4F
+    {c: '&#x2135;', tclass: 'symbol'},
+    {c: 'A', krn: {'48': 0.194}, tclass: 'cal'},
+    {c: 'B', ic: 0.0304, krn: {'48': 0.139}, tclass: 'cal'},
+    {c: 'C', ic: 0.0583, krn: {'48': 0.139}, tclass: 'cal'},
+    {c: 'D', ic: 0.0278, krn: {'48': 0.0833}, tclass: 'cal'},
+    {c: 'E', ic: 0.0894, krn: {'48': 0.111}, tclass: 'cal'},
+    {c: 'F', ic: 0.0993, krn: {'48': 0.111}, tclass: 'cal'},
+    {c: 'G', d:.2, ic: 0.0593, krn: {'48': 0.111}, tclass: 'cal'},
+    {c: 'H', ic: 0.00965, krn: {'48': 0.111}, tclass: 'cal'},
+    {c: 'I', ic: 0.0738, krn: {'48': 0.0278}, tclass: 'cal'},
+    {c: 'J', d:.2, ic: 0.185, krn: {'48': 0.167}, tclass: 'cal'},
+    {c: 'K', ic: 0.0144, krn: {'48': 0.0556}, tclass: 'cal'},
+    {c: 'L', krn: {'48': 0.139}, tclass: 'cal'},
+    {c: 'M', krn: {'48': 0.139}, tclass: 'cal'},
+    {c: 'N', ic: 0.147, krn: {'48': 0.0833}, tclass: 'cal'},
+    {c: 'O', ic: 0.0278, krn: {'48': 0.111}, tclass: 'cal'},
+    // 50 - 5F
+    {c: 'P', ic: 0.0822, krn: {'48': 0.0833}, tclass: 'cal'},
+    {c: 'Q', d:.2, krn: {'48': 0.111}, tclass: 'cal'},
+    {c: 'R', krn: {'48': 0.0833}, tclass: 'cal'},
+    {c: 'S', ic: 0.075, krn: {'48': 0.139}, tclass: 'cal'},
+    {c: 'T', ic: 0.254, krn: {'48': 0.0278}, tclass: 'cal'},
+    {c: 'U', ic: 0.0993, krn: {'48': 0.0833}, tclass: 'cal'},
+    {c: 'V', ic: 0.0822, krn: {'48': 0.0278}, tclass: 'cal'},
+    {c: 'W', ic: 0.0822, krn: {'48': 0.0833}, tclass: 'cal'},
+    {c: 'X', ic: 0.146, krn: {'48': 0.139}, tclass: 'cal'},
+    {c: 'Y', ic: 0.0822, krn: {'48': 0.0833}, tclass: 'cal'},
+    {c: 'Z', ic: 0.0794, krn: {'48': 0.139}, tclass: 'cal'},
+    {c: '&#x22C3;', tclass: 'symbol'},
+    {c: '&#x22C2;', tclass: 'symbol'},
+    {c: '&#x228E;', tclass: 'symbol'},
+    {c: '&#x22C0;', tclass: 'symbol'},
+    {c: '&#x22C1;', tclass: 'symbol'},
+    // 60 - 6F
+    {c: '&#x22A2;', tclass: 'symbol'},
+    {c: '&#x22A3;', tclass: 'symbol2'},
+    {c: '&#xF8F0;', a:.3, d:.2, tclass: 'normal'},
+    {c: '&#xF8FB;', a:.3, d:.2, tclass: 'normal'},
+    {c: '&#xF8EE;', a:.3, d:.2, tclass: 'normal'},
+    {c: '&#xF8F9;', a:.3, d:.2, tclass: 'normal'},
+    {c: '{', d:.2, tclass: 'normal'},
+    {c: '}', d:.2, tclass: 'normal'},
+    {c: '&#x3008;', a:.3, d:.2, tclass: 'normal'},
+    {c: '&#x3009;', a:.3, d:.2, tclass: 'normal'},
+    {c: '|', d:.1, tclass: 'vertical'},
+    {c: '||', d:0, tclass: 'vertical'},
+    {c: '&#x2195;', h:1, d:.15, tclass: 'arrows'},
+    {c: '&#x21D5;', a:.2, d:.1, tclass: 'arrows'},
+    {c: '&#x2216;', a:.3, d:.1, tclass: 'normal'},
+    {c: '&#x2240;', tclass: 'symbol'},
+    // 70 - 7F
+    {c: '<span style="position:relative; top: .8em">&#x221A;</span>', h:.04, d:.9, tclass: 'normal'},
+    {c: '&#x2210;', a:.4, tclass: 'symbol'},
+    {c: '&#x2207;', tclass: 'symbol'},
+    {c: '&#x222B;', h:1, d:.1, ic: 0.111, tclass: 'root'},
+    {c: '&#x2294;', tclass: 'symbol'},
+    {c: '&#x2293;', tclass: 'symbol'},
+    {c: '&#x2291;', tclass: 'symbol'},
+    {c: '&#x2292;', tclass: 'symbol'},
+    {c: '&#xA7;', d:.1, tclass: 'normal'},
+    {c: '&#x2020;', d:.1, tclass: 'normal'},
+    {c: '&#x2021;', d:.1, tclass: 'normal'},
+    {c: '&#xB6;', a:.3, d:.1, tclass: 'normal'},
+    {c: '&#x2663;', tclass: 'symbol'},
+    {c: '&#x2666;', tclass: 'symbol'},
+    {c: '&#x2665;', tclass: 'symbol'},
+    {c: '&#x2660;', tclass: 'symbol'}
+  ],
+
+  cmex10: [
+    // 00 - 0F
+    {c: '(', h: 0.04, d: 1.16, n: 16, tclass: 'delim1'},
+    {c: ')', h: 0.04, d: 1.16, n: 17, tclass: 'delim1'},
+    {c: '[', h: 0.04, d: 1.16, n: 104, tclass: 'delim1'},
+    {c: ']', h: 0.04, d: 1.16, n: 105, tclass: 'delim1'},
+    {c: '&#xF8F0', h: 0.04, d: 1.16, n: 106, tclass: 'delim1'},
+    {c: '&#xF8FB;', h: 0.04, d: 1.16, n: 107, tclass: 'delim1'},
+    {c: '&#xF8EE;', h: 0.04, d: 1.16, n: 108, tclass: 'delim1'},
+    {c: '&#xF8F9;', h: 0.04, d: 1.16, n: 109, tclass: 'delim1'},
+    {c: '{', h: 0.04, d: 1.16, n: 110, tclass: 'delim1'},
+    {c: '}', h: 0.04, d: 1.16, n: 111, tclass: 'delim1'},
+    {c: '&#x3008;', h: 0.04, d: 1.16, n: 68, tclass: 'delim1c'},
+    {c: '&#x3009;', h: 0.04, d: 1.16, n: 69, tclass: 'delim1c'},
+    {c: '|', h:.7, d:0, delim: {rep: 12}, tclass: 'vertical'},
+    {c: '||', h:.7, d:0, delim: {rep: 13}, tclass: 'vertical'},
+    {c: '/', h: 0.04, d: 1.16, n: 46, tclass: 'delim1b'},
+    {c: '&#x2216;', h: 0.04, d: 1.16, n: 47, tclass: 'delim1b'},
+    // 10 - 1F
+    {c: '(', h: 0.04, d: 1.76, n: 18, tclass: 'delim2'},
+    {c: ')', h: 0.04, d: 1.76, n: 19, tclass: 'delim2'},
+    {c: '(', h: 0.04, d: 2.36, n: 32, tclass: 'delim3'},
+    {c: ')', h: 0.04, d: 2.36, n: 33, tclass: 'delim3'},
+    {c: '[', h: 0.04, d: 2.36, n: 34, tclass: 'delim3'},
+    {c: ']', h: 0.04, d: 2.36, n: 35, tclass: 'delim3'},
+    {c: '&#xF8F0;', h: 0.04, d: 2.36, n: 36, tclass: 'delim3'},
+    {c: '&#xF8FB;', h: 0.04, d: 2.36, n: 37, tclass: 'delim3'},
+    {c: '&#xF8EE;', h: 0.04, d: 2.36, n: 38, tclass: 'delim3'},
+    {c: '&#xF8F9;', h: 0.04, d: 2.36, n: 39, tclass: 'delim3'},
+    {c: '{', h: 0.04, d: 2.36, n: 40, tclass: 'delim3'},
+    {c: '}', h: 0.04, d: 2.36, n: 41, tclass: 'delim3'},
+    {c: '&#x3008;', h: 0.04, d: 2.36, n: 42, tclass: 'delim3c'},
+    {c: '&#x3009;', h: 0.04, d: 2.36, n: 43, tclass: 'delim3c'},
+    {c: '/', h: 0.04, d: 2.36, n: 44, tclass: 'delim3b'},
+    {c: '&#x2216;', h: 0.04, d: 2.36, n: 45, tclass: 'delim3b'},
+    // 20 - 2F
+    {c: '(', h: 0.04, d: 2.96, n: 48, tclass: 'delim4'},
+    {c: ')', h: 0.04, d: 2.96, n: 49, tclass: 'delim4'},
+    {c: '[', h: 0.04, d: 2.96, n: 50, tclass: 'delim4'},
+    {c: ']', h: 0.04, d: 2.96, n: 51, tclass: 'delim4'},
+    {c: '&#xF8F0;', h: 0.04, d: 2.96, n: 52, tclass: 'delim4'},
+    {c: '&#xF8FB;', h: 0.04, d: 2.96, n: 53, tclass: 'delim4'},
+    {c: '&#xF8EE;', h: 0.04, d: 2.96, n: 54, tclass: 'delim4'},
+    {c: '&#xF8F9;', h: 0.04, d: 2.96, n: 55, tclass: 'delim4'},
+    {c: '{', h: 0.04, d: 2.96, n: 56, tclass: 'delim4'},
+    {c: '}', h: 0.04, d: 2.96, n: 57, tclass: 'delim4'},
+    {c: '&#x3008;', h: 0.04, d: 2.96, tclass: 'delim4c'},
+    {c: '&#x3009;', h: 0.04, d: 2.96, tclass: 'delim4c'},
+    {c: '/', h: 0.04, d: 2.96, tclass: 'delim4b'},
+    {c: '&#x2216;', h: 0.04, d: 2.96, tclass: 'delim4b'},
+    {c: '/', h: 0.04, d: 1.76, n: 30, tclass: 'delim2b'},
+    {c: '&#x2216;', h: 0.04, d: 1.76, n: 31, tclass: 'delim2b'},
+    // 30 - 3F
+    {c: '&#xF8EB;', h: .8, d: .15, delim: {top: 48, bot: 64, rep: 66}, tclass: 'delim'},
+    {c: '&#xF8F6;', h: .8, d: .15, delim: {top: 49, bot: 65, rep: 67}, tclass: 'delim'},
+    {c: '&#xF8EE;', h: .8, d: .15, delim: {top: 50, bot: 52, rep: 54}, tclass: 'delim'},
+    {c: '&#xF8F9;', h: .8, d: .15, delim: {top: 51, bot: 53, rep: 55}, tclass: 'delim'},
+    {c: '&#xF8F0;', h: .8, d: .15, delim: {bot: 52, rep: 54}, tclass: 'delim'},
+    {c: '&#xF8FB;', h: .8, d: .15, delim: {bot: 53, rep: 55}, tclass: 'delim'},
+    {c: '&#xF8EF;', h: .8, d: .15, delim: {top: 50, rep: 54}, tclass: 'delim'},
+    {c: '&#xF8FA;', h: .8, d: .15, delim: {top: 51, rep: 55}, tclass: 'delim'},
+    {c: '&#xF8F1;', h: .8, d: .15, delim: {top: 56, mid: 60, bot: 58, rep: 62}, tclass: 'delim'},
+    {c: '&#xF8FC;', h: .8, d: .15, delim: {top: 57, mid: 61, bot: 59, rep: 62}, tclass: 'delim'},
+    {c: '&#xF8F3;', h: .8, d: .15, delim: {top: 56, bot: 58, rep: 62}, tclass: 'delim'},
+    {c: '&#xF8FE;', h: .8, d: .15, delim: {top: 57, bot: 59, rep: 62}, tclass: 'delim'},
+    {c: '&#xF8F2;', h: .8, d: .15, delim: {rep: 63}, tclass: 'delim'},
+    {c: '&#xF8FD;', h: .8, d: .15, delim: {rep: 119}, tclass: 'delim'},
+    {c: '&#xF8F4;', h: .8, d: .15, delim: {rep: 62}, tclass: 'delim'},
+    {c: '|', h: .65, d: 0, delim: {top: 120, bot: 121, rep: 63}, tclass: 'vertical'},
+    // 40 - 4F
+    {c: '&#xF8ED;', h: .8, d: .15, delim: {top: 56, bot: 59, rep: 62}, tclass: 'delim'},
+    {c: '&#xF8F8;', h: .8, d: .15, delim: {top: 57, bot: 58, rep: 62}, tclass: 'delim'},
+    {c: '&#xF8EC;', h: .8, d: .15, delim: {rep: 66}, tclass: 'delim'},
+    {c: '&#xF8F7;', h: .8, d: .15, delim: {rep: 67}, tclass: 'delim'},
+    {c: '&#x3008;', h: 0.04, d: 1.76, n: 28, tclass: 'delim2c'},
+    {c: '&#x3009;', h: 0.04, d: 1.76, n: 29, tclass: 'delim2c'},
+    {c: '&#x2294;', h: 0, d: 1, n: 71, tclass: 'bigop1'},
+    {c: '&#x2294;', h: 0.1, d: 1.5, tclass: 'bigop2'},
+    {c: '&#x222E;', h: 0, d: 1.11, ic: 0.095, n: 73, tclass: 'bigop1c'},
+    {c: '&#x222E;', h: 0, d: 2.22, ic: 0.222, tclass: 'bigop2c'},
+    {c: '&#x2299;', h: 0, d: 1, n: 75, tclass: 'bigop1'},
+    {c: '&#x2299;', h: 0.1, d: 1.5, tclass: 'bigop2'},
+    {c: '&#x2295;', h: 0, d: 1, n: 77, tclass: 'bigop1'},
+    {c: '&#x2295;', h: 0.1, d: 1.5, tclass: 'bigop2'},
+    {c: '&#x2297;', h: 0, d: 1, n: 79, tclass: 'bigop1'},
+    {c: '&#x2297;', h: 0.1, d: 1.5, tclass: 'bigop2'},
+    // 50 - 5F
+    {c: '&#x2211;', h: 0, d: 1, n: 88, tclass: 'bigop1a'},
+    {c: '&#x220F;', h: 0, d: 1, n: 89, tclass: 'bigop1a'},
+    {c: '&#x222B;', h: 0, d: 1.11, ic: 0.095, n: 90, tclass: 'bigop1c'},
+    {c: '&#x222A;', h: 0, d: 1, n: 91, tclass: 'bigop1b'},
+    {c: '&#x2229;', h: 0, d: 1, n: 92, tclass: 'bigop1b'},
+    {c: '&#x228E;', h: 0, d: 1, n: 93, tclass: 'bigop1b'},
+    {c: '&#x2227;', h: 0, d: 1, n: 94, tclass: 'bigop1'},
+    {c: '&#x2228;', h: 0, d: 1, n: 95, tclass: 'bigop1'},
+    {c: '&#x2211;', h: 0.1, d: 1.6, tclass: 'bigop2a'},
+    {c: '&#x220F;', h: 0.1, d: 1.5, tclass: 'bigop2a'},
+    {c: '&#x222B;', h: 0, d: 2.22, ic: 0.222, tclass: 'bigop2c'},
+    {c: '&#x222A;', h: 0.1, d: 1.5, tclass: 'bigop2b'},
+    {c: '&#x2229;', h: 0.1, d: 1.5, tclass: 'bigop2b'},
+    {c: '&#x228E;', h: 0.1, d: 1.5, tclass: 'bigop2b'},
+    {c: '&#x2227;', h: 0.1, d: 1.5, tclass: 'bigop2'},
+    {c: '&#x2228;', h: 0.1, d: 1.5, tclass: 'bigop2'},
+    // 60 - 6F
+    {c: '&#x2210;', h: 0, d: 1, n: 97, tclass: 'bigop1a'},
+    {c: '&#x2210;', h: 0.1, d: 1.5, tclass: 'bigop2a'},
+    {c: '&#xFE3F;', h: 0.722, w: .65, n: 99, tclass: 'wide1'},
+    {c: '&#xFE3F;', h: 0.85, w: 1.1, n: 100, tclass: 'wide2'},
+    {c: '&#xFE3F;', h: 0.99, w: 1.65, tclass: 'wide3'},
+    {c: '&#x2053;', h: 0.722, w: .75, n: 102, tclass: 'wide1a'},
+    {c: '&#x2053;', h: 0.8, w: 1.35, n: 103, tclass: 'wide2a'},
+    {c: '&#x2053;', h: 0.99, w: 2, tclass: 'wide3a'},
+    {c: '[', h: 0.04, d: 1.76, n: 20, tclass: 'delim2'},
+    {c: ']', h: 0.04, d: 1.76, n: 21, tclass: 'delim2'},
+    {c: '&#xF8F0;', h: 0.04, d: 1.76, n: 22, tclass: 'delim2'},
+    {c: '&#xF8FB;', h: 0.04, d: 1.76, n: 23, tclass: 'delim2'},
+    {c: '&#xF8EE;', h: 0.04, d: 1.76, n: 24, tclass: 'delim2'},
+    {c: '&#xF8F9', h: 0.04, d: 1.76, n: 25, tclass: 'delim2'},
+    {c: '{', h: 0.04, d: 1.76, n: 26, tclass: 'delim2'},
+    {c: '}', h: 0.04, d: 1.76, n: 27, tclass: 'delim2'},
+    // 70 - 7F
+    {c: '<span style="font-size: 125%; position:relative; top:.95em">&#x221A;</span>', h: 0.04, d: 1.16, n: 113, tclass: 'root'},
+    {c: '<span style="font-size: 190%; position:relative; top:.925em">&#x221A;</span>', h: 0.04, d: 1.76, n: 114, tclass: 'root'},
+    {c: '<span style="font-size: 250%; position:relative; top:.925em">&#x221A;</span>', h: 0.06, d: 2.36, n: 115, tclass: 'root'},
+    {c: '<span style="font-size: 320%; position:relative; top:.92em">&#x221A;</span>', h: 0.08, d: 2.96, n: 116, tclass: 'root'},
+    {c: '<span style="font-size: 400%; position:relative; top:.92em">&#x221A;</span>', h: 0.1, d: 3.75, n: 117, tclass: 'root'},
+    {c: '<span style="font-size: 500%; position:relative; top:.9em">&#x221A;</span>', h: .12, d: 4.5, n: 118, tclass: 'root'},
+    {c: '<span style="font-size: 625%; position:relative; top:.9em">&#x221A;</span>', h: .14, d: 5.7, tclass: 'root'},
+    {c: '<span style="margin:.001em">||</span>', h:.65, d:0, delim: {top: 126, bot: 127, rep: 119}, tclass: 'vertical'},
+    {c: '&#x25B5;', h:.45, delim: {top: 120, rep: 63}, tclass: 'arrow1'},
+    {c: '&#x25BF;', h:.45, delim: {bot: 121, rep: 63}, tclass: 'arrow1'},
+    {c: '<span style="font-size: 67%; position:relative; top:.35em; margin-left:-.5em">&#x256D;</span>', h:.1, tclass: 'symbol'},
+    {c: '<span style="font-size: 67%; position:relative; top:.35em; margin-right:-.5em">&#x256E;</span>', h:.1, tclass: 'symbol'},
+    {c: '<span style="font-size: 67%; position:relative; top:.35em; margin-left:-.5em">&#x2570;</span>', h:.1, tclass: 'symbol'},
+    {c: '<span style="font-size: 67%; position:relative; top:.35em; margin-right:-.5em">&#x256F;</span>', h:.1, tclass: 'symbol'},
+    {c: '&#x25B5;', h:.5, delim: {top: 126, rep: 119}, tclass: 'arrow2'},
+    {c: '&#x25BF;', h:.5, delim: {bot: 127, rep: 119}, tclass: 'arrow2'}
+  ],
+  
+  cmti10: [
+    // 00 - 0F
+    {c: '&Gamma;', ic: 0.133, tclass: 'igreek'},
+    {c: '&Delta;', tclass: 'igreek'},
+    {c: '&Theta;', ic: 0.094, tclass: 'igreek'},
+    {c: '&Lambda;', tclass: 'igreek'},
+    {c: '&Xi;', ic: 0.153, tclass: 'igreek'},
+    {c: '&Pi;', ic: 0.164, tclass: 'igreek'},
+    {c: '&Sigma;', ic: 0.12, tclass: 'igreek'},
+    {c: '&Upsilon;', ic: 0.111, tclass: 'igreek'},
+    {c: '&Phi;', ic: 0.0599, tclass: 'igreek'},
+    {c: '&Psi;', ic: 0.111, tclass: 'igreek'},
+    {c: '&Omega;', ic: 0.103, tclass: 'igreek'},
+    {c: 'ff', ic: 0.212, krn: {'39': 0.104, '63': 0.104, '33': 0.104, '41': 0.104, '93': 0.104}, lig: {'105': 14, '108': 15}, tclass: 'italic'},
+    {c: 'fi', ic: 0.103, tclass: 'italic'},
+    {c: 'fl', ic: 0.103, tclass: 'italic'},
+    {c: 'ffi', ic: 0.103, tclass: 'italic'},
+    {c: 'ffl', ic: 0.103, tclass: 'italic'},
+    // 10 - 1F
+    {c: '&#x131;', a:0, ic: 0.0767, tclass: 'italic'},
+    {c: 'j', d:.2, ic: 0.0374, tclass: 'italic'},
+    {c: '&#x60;', tclass: 'iaccent'},
+    {c: '&#xB4;', ic: 0.0969, tclass: 'iaccent'},
+    {c: '&#x2C7;', ic: 0.083, tclass: 'iaccent'},
+    {c: '&#x2D8;', ic: 0.108, tclass: 'iaccent'},
+    {c: '&#x2C9;', ic: 0.103, tclass: 'iaccent'},
+    {c: '&#x2DA;', tclass: 'iaccent'},
+    {c: '?', d: 0.17, w: 0.46, tclass: 'italic'},
+    {c: '&#xDF;', ic: 0.105, tclass: 'italic'},
+    {c: '&#xE6;', a:0, ic: 0.0751, tclass: 'italic'},
+    {c: '&#x153;', a:0, ic: 0.0751, tclass: 'italic'},
+    {c: '&#xF8;', ic: 0.0919, tclass: 'italic'},
+    {c: '&#xC6;', ic: 0.12, tclass: 'italic'},
+    {c: '&#x152;', ic: 0.12, tclass: 'italic'},
+    {c: '&#xD8;', ic: 0.094, tclass: 'italic'},
+    // 20 - 2F
+    {c: '?', krn: {'108': -0.256, '76': -0.321}, tclass: 'italic'},
+    {c: '!', ic: 0.124, lig: {'96': 60}, tclass: 'italic'},
+    {c: '&#x201D;', ic: 0.0696, tclass: 'italic'},
+    {c: '#', ic: 0.0662, tclass: 'italic'},
+    {c: '$', tclass: 'italic'},
+    {c: '%', ic: 0.136, tclass: 'italic'},
+    {c: '&amp;', ic: 0.0969, tclass: 'italic'},
+    {c: '&#x2019;', ic: 0.124, krn: {'63': 0.102, '33': 0.102}, lig: {'39': 34}, tclass: 'italic'},
+    {c: '(', d:.2, ic: 0.162, tclass: 'italic'},
+    {c: ')', d:.2, ic: 0.0369, tclass: 'italic'},
+    {c: '*', ic: 0.149, tclass: 'italic'},
+    {c: '+', a:.1, ic: 0.0369, tclass: 'italic'},
+    {c: ',', a:-.3, d:.2, w: 0.278, tclass: 'italic'},
+    {c: '-', a:0, ic: 0.0283, lig: {'45': 123}, tclass: 'italic'},
+    {c: '.', a:-.25, tclass: 'italic'},
+    {c: '/', ic: 0.162, tclass: 'italic'},
+    // 30 - 3F
+    {c: '0', ic: 0.136, tclass: 'italic'},
+    {c: '1', ic: 0.136, tclass: 'italic'},
+    {c: '2', ic: 0.136, tclass: 'italic'},
+    {c: '3', ic: 0.136, tclass: 'italic'},
+    {c: '4', ic: 0.136, tclass: 'italic'},
+    {c: '5', ic: 0.136, tclass: 'italic'},
+    {c: '6', ic: 0.136, tclass: 'italic'},
+    {c: '7', ic: 0.136, tclass: 'italic'},
+    {c: '8', ic: 0.136, tclass: 'italic'},
+    {c: '9', ic: 0.136, tclass: 'italic'},
+    {c: ':', ic: 0.0582, tclass: 'italic'},
+    {c: ';', ic: 0.0582, tclass: 'italic'},
+    {c: '&#xA1;', ic: 0.0756, tclass: 'italic'},
+    {c: '=', a:0, d:-.1, ic: 0.0662, tclass: 'italic'},
+    {c: '&#xBF;', tclass: 'italic'},
+    {c: '?', ic: 0.122, lig: {'96': 62}, tclass: 'italic'},
+    // 40 - 4F
+    {c: '@', ic: 0.096, tclass: 'italic'},
+    {c: 'A', krn: {'110': -0.0256, '108': -0.0256, '114': -0.0256, '117': -0.0256, '109': -0.0256, '116': -0.0256, '105': -0.0256, '67': -0.0256, '79': -0.0256, '71': -0.0256, '104': -0.0256, '98': -0.0256, '85': -0.0256, '107': -0.0256, '118': -0.0256, '119': -0.0256, '81': -0.0256, '84': -0.0767, '89': -0.0767, '86': -0.102, '87': -0.102, '101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}, tclass: 'italic'},
+    {c: 'B', ic: 0.103, tclass: 'italic'},
+    {c: 'C', ic: 0.145, tclass: 'italic'},
+    {c: 'D', ic: 0.094, krn: {'88': -0.0256, '87': -0.0256, '65': -0.0256, '86': -0.0256, '89': -0.0256}, tclass: 'italic'},
+    {c: 'E', ic: 0.12, tclass: 'italic'},
+    {c: 'F', ic: 0.133, krn: {'111': -0.0767, '101': -0.0767, '117': -0.0767, '114': -0.0767, '97': -0.0767, '65': -0.102, '79': -0.0256, '67': -0.0256, '71': -0.0256, '81': -0.0256}, tclass: 'italic'},
+    {c: 'G', ic: 0.0872, tclass: 'italic'},
+    {c: 'H', ic: 0.164, tclass: 'italic'},
+    {c: 'I', ic: 0.158, tclass: 'italic'},
+    {c: 'J', ic: 0.14, tclass: 'italic'},
+    {c: 'K', ic: 0.145, krn: {'79': -0.0256, '67': -0.0256, '71': -0.0256, '81': -0.0256}, tclass: 'italic'},
+    {c: 'L', krn: {'84': -0.0767, '89': -0.0767, '86': -0.102, '87': -0.102, '101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}, tclass: 'italic'},
+    {c: 'M', ic: 0.164, tclass: 'italic'},
+    {c: 'N', ic: 0.164, tclass: 'italic'},
+    {c: 'O', ic: 0.094, krn: {'88': -0.0256, '87': -0.0256, '65': -0.0256, '86': -0.0256, '89': -0.0256}, tclass: 'italic'},
+    // 50 - 5F
+    {c: 'P', ic: 0.103, krn: {'65': -0.0767}, tclass: 'italic'},
+    {c: 'Q', d: 1, ic: 0.094, tclass: 'italic'},
+    {c: 'R', ic: 0.0387, krn: {'110': -0.0256, '108': -0.0256, '114': -0.0256, '117': -0.0256, '109': -0.0256, '116': -0.0256, '105': -0.0256, '67': -0.0256, '79': -0.0256, '71': -0.0256, '104': -0.0256, '98': -0.0256, '85': -0.0256, '107': -0.0256, '118': -0.0256, '119': -0.0256, '81': -0.0256, '84': -0.0767, '89': -0.0767, '86': -0.102, '87': -0.102, '101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}, tclass: 'italic'},
+    {c: 'S', ic: 0.12, tclass: 'italic'},
+    {c: 'T', ic: 0.133, krn: {'121': -0.0767, '101': -0.0767, '111': -0.0767, '114': -0.0767, '97': -0.0767, '117': -0.0767, '65': -0.0767}, tclass: 'italic'},
+    {c: 'U', ic: 0.164, tclass: 'italic'},
+    {c: 'V', ic: 0.184, krn: {'111': -0.0767, '101': -0.0767, '117': -0.0767, '114': -0.0767, '97': -0.0767, '65': -0.102, '79': -0.0256, '67': -0.0256, '71': -0.0256, '81': -0.0256}, tclass: 'italic'},
+    {c: 'W', ic: 0.184, krn: {'65': -0.0767}, tclass: 'italic'},
+    {c: 'X', ic: 0.158, krn: {'79': -0.0256, '67': -0.0256, '71': -0.0256, '81': -0.0256}, tclass: 'italic'},
+    {c: 'Y', ic: 0.194, krn: {'101': -0.0767, '111': -0.0767, '114': -0.0767, '97': -0.0767, '117': -0.0767, '65': -0.0767}, tclass: 'italic'},
+    {c: 'Z', ic: 0.145, tclass: 'italic'},
+    {c: '[', d:.1, ic: 0.188, tclass: 'italic'},
+    {c: '&#x201C;', ic: 0.169, tclass: 'italic'},
+    {c: ']', d:.1, ic: 0.105, tclass: 'italic'},
+    {c: '&#x2C6;', ic: 0.0665, tclass: 'iaccent'},
+    {c: '&#x2D9;', ic: 0.118, tclass: 'iaccent'},
+    // 60 - 6F
+    {c: '&#x2018;', ic: 0.124, lig: {'96': 92}, tclass: 'italic'},
+    {c: 'a', a:0, ic: 0.0767, tclass: 'italic'},
+    {c: 'b', ic: 0.0631, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}, tclass: 'italic'},
+    {c: 'c', a:0, ic: 0.0565, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}, tclass: 'italic'},
+    {c: 'd', ic: 0.103, krn: {'108': 0.0511}, tclass: 'italic'},
+    {c: 'e', a:0, ic: 0.0751, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}, tclass: 'italic'},
+    {c: 'f', ic: 0.212, krn: {'39': 0.104, '63': 0.104, '33': 0.104, '41': 0.104, '93': 0.104}, lig: {'105': 12, '102': 11, '108': 13}, tclass: 'italic'},
+    {c: 'g', a:0, d:.2, ic: 0.0885, tclass: 'italic'},
+    {c: 'h', ic: 0.0767, tclass: 'italic'},
+    {c: 'i', ic: 0.102, tclass: 'italic'},
+    {c: 'j', d:.2, ic: 0.145, tclass: 'italic'},
+    {c: 'k', ic: 0.108, tclass: 'italic'},
+    {c: 'l', ic: 0.103, krn: {'108': 0.0511}, tclass: 'italic'},
+    {c: 'm', a:0, ic: 0.0767, tclass: 'italic'},
+    {c: 'n', a:0, ic: 0.0767, krn: {'39': -0.102}, tclass: 'italic'},
+    {c: 'o', a:0, ic: 0.0631, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}, tclass: 'italic'},
+    // 70 - 7F
+    {c: 'p', a:0, d:.2, ic: 0.0631, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}, tclass: 'italic'},
+    {c: 'q', a:0, d:.2, ic: 0.0885, tclass: 'italic'},
+    {c: 'r', a:0, ic: 0.108, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}, tclass: 'italic'},
+    {c: 's', a:0, ic: 0.0821, tclass: 'italic'},
+    {c: 't', ic: 0.0949, tclass: 'italic'},
+    {c: 'u', a:0, ic: 0.0767, tclass: 'italic'},
+    {c: 'v', a:0, ic: 0.108, tclass: 'italic'},
+    {c: 'w', a:0, ic: 0.108, krn: {'108': 0.0511}, tclass: 'italic'},
+    {c: 'x', a:0, ic: 0.12, tclass: 'italic'},
+    {c: 'y', a:0, d:.2, ic: 0.0885, tclass: 'italic'},
+    {c: 'z', a:0, ic: 0.123, tclass: 'italic'},
+    {c: '&#x2013;', a:.1, ic: 0.0921, lig: {'45': 124}, tclass: 'italic'},
+    {c: '&#x2014;', a:.1, ic: 0.0921, tclass: 'italic'},
+    {c: '&#x2DD;', ic: 0.122, tclass: 'iaccent'},
+    {c: '&#x2DC;', ic: 0.116, tclass: 'iaccent'},
+    {c: '&#xA8;', tclass: 'iaccent'}
+  ],
+  
+  cmbx10: [
+    // 00 - 0F
+    {c: '&Gamma;', tclass: 'bgreek'},
+    {c: '&Delta;', tclass: 'bgreek'},
+    {c: '&Theta;', tclass: 'bgreek'},
+    {c: '&Lambda;', tclass: 'bgreek'},
+    {c: '&Xi;', tclass: 'bgreek'},
+    {c: '&Pi;', tclass: 'bgreek'},
+    {c: '&Sigma;', tclass: 'bgreek'},
+    {c: '&Upsilon;', tclass: 'bgreek'},
+    {c: '&Phi;', tclass: 'bgreek'},
+    {c: '&Psi;', tclass: 'bgreek'},
+    {c: '&Omega;', tclass: 'bgreek'},
+    {c: 'ff', ic: 0.0778, krn: {'39': 0.0778, '63': 0.0778, '33': 0.0778, '41': 0.0778, '93': 0.0778}, lig: {'105': 14, '108': 15}, tclass: 'bold'},
+    {c: 'fi', tclass: 'bold'},
+    {c: 'fl', tclass: 'bold'},
+    {c: 'ffi', tclass: 'bold'},
+    {c: 'ffl', tclass: 'bold'},
+    // 10 - 1F
+    {c: '&#x131;', a:0, tclass: 'bold'},
+    {c: 'j', d:.2, tclass: 'bold'},
+    {c: '&#x60;', tclass: 'baccent'},
+    {c: '&#xB4;', tclass: 'baccent'},
+    {c: '&#x2C7;', tclass: 'baccent'},
+    {c: '&#x2D8;', tclass: 'baccent'},
+    {c: '&#x2C9;', tclass: 'baccent'},
+    {c: '&#x2DA;', tclass: 'baccent'},
+    {c: '?', tclass: 'bold'},
+    {c: '&#xDF;', tclass: 'bold'},
+    {c: '&#xE6;', a:0, tclass: 'bold'},
+    {c: '&#x153;', a:0, tclass: 'bold'},
+    {c: '&#xF8;', tclass: 'bold'},
+    {c: '&#xC6;', tclass: 'bold'},
+    {c: '&#x152;', tclass: 'bold'},
+    {c: '&#xD8;', tclass: 'bold'},
+    // 20 - 2F
+    {c: '?', krn: {'108': -0.278, '76': -0.319}, tclass: 'bold'},
+    {c: '!', lig: {'96': 60}, tclass: 'bold'},
+    {c: '&#x201D;', tclass: 'bold'},
+    {c: '#', tclass: 'bold'},
+    {c: '$', tclass: 'bold'},
+    {c: '%', tclass: 'bold'},
+    {c: '&amp;', tclass: 'bold'},
+    {c: '&#x2019;', krn: {'63': 0.111, '33': 0.111}, lig: {'39': 34}, tclass: 'bold'},
+    {c: '(', d:.2, tclass: 'bold'},
+    {c: ')', d:.2, tclass: 'bold'},
+    {c: '*', tclass: 'bold'},
+    {c: '+', a:.1, tclass: 'bold'},
+    {c: ',', a:-.3, d:.2, w: 0.278, tclass: 'bold'},
+    {c: '-', a:0, lig: {'45': 123}, tclass: 'bold'},
+    {c: '.', a:-.25, tclass: 'bold'},
+    {c: '/', tclass: 'bold'},
+    // 30 - 3F
+    {c: '0', tclass: 'bold'},
+    {c: '1', tclass: 'bold'},
+    {c: '2', tclass: 'bold'},
+    {c: '3', tclass: 'bold'},
+    {c: '4', tclass: 'bold'},
+    {c: '5', tclass: 'bold'},
+    {c: '6', tclass: 'bold'},
+    {c: '7', tclass: 'bold'},
+    {c: '8', tclass: 'bold'},
+    {c: '9', tclass: 'bold'},
+    {c: ':', tclass: 'bold'},
+    {c: ';', tclass: 'bold'},
+    {c: '&#xA1;', tclass: 'bold'},
+    {c: '=', a:0, d:-.1, tclass: 'bold'},
+    {c: '&#xBF;', tclass: 'bold'},
+    {c: '?', lig: {'96': 62}, tclass: 'bold'},
+    // 40 - 4F
+    {c: '@', tclass: 'bold'},
+    {c: 'A', krn: {'116': -0.0278, '67': -0.0278, '79': -0.0278, '71': -0.0278, '85': -0.0278, '81': -0.0278, '84': -0.0833, '89': -0.0833, '86': -0.111, '87': -0.111}, tclass: 'bold'},
+    {c: 'B', tclass: 'bold'},
+    {c: 'C', tclass: 'bold'},
+    {c: 'D', krn: {'88': -0.0278, '87': -0.0278, '65': -0.0278, '86': -0.0278, '89': -0.0278}, tclass: 'bold'},
+    {c: 'E', tclass: 'bold'},
+    {c: 'F', krn: {'111': -0.0833, '101': -0.0833, '117': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.111, '79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}, tclass: 'bold'},
+    {c: 'G', tclass: 'bold'},
+    {c: 'H', tclass: 'bold'},
+    {c: 'I', krn: {'73': 0.0278}, tclass: 'bold'},
+    {c: 'J', tclass: 'bold'},
+    {c: 'K', krn: {'79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}, tclass: 'bold'},
+    {c: 'L', krn: {'84': -0.0833, '89': -0.0833, '86': -0.111, '87': -0.111}, tclass: 'bold'},
+    {c: 'M', tclass: 'bold'},
+    {c: 'N', tclass: 'bold'},
+    {c: 'O', krn: {'88': -0.0278, '87': -0.0278, '65': -0.0278, '86': -0.0278, '89': -0.0278}, tclass: 'bold'},
+    // 50 - 5F
+    {c: 'P', krn: {'65': -0.0833, '111': -0.0278, '101': -0.0278, '97': -0.0278, '46': -0.0833, '44': -0.0833}, tclass: 'bold'},
+    {c: 'Q', d: 1, tclass: 'bold'},
+    {c: 'R', krn: {'116': -0.0278, '67': -0.0278, '79': -0.0278, '71': -0.0278, '85': -0.0278, '81': -0.0278, '84': -0.0833, '89': -0.0833, '86': -0.111, '87': -0.111}, tclass: 'bold'},
+    {c: 'S', tclass: 'bold'},
+    {c: 'T', krn: {'121': -0.0278, '101': -0.0833, '111': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.0833, '117': -0.0833}, tclass: 'bold'},
+    {c: 'U', tclass: 'bold'},
+    {c: 'V', ic: 0.0139, krn: {'111': -0.0833, '101': -0.0833, '117': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.111, '79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}, tclass: 'bold'},
+    {c: 'W', ic: 0.0139, krn: {'111': -0.0833, '101': -0.0833, '117': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.111, '79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}, tclass: 'bold'},
+    {c: 'X', krn: {'79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}, tclass: 'bold'},
+    {c: 'Y', ic: 0.025, krn: {'101': -0.0833, '111': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.0833, '117': -0.0833}, tclass: 'bold'},
+    {c: 'Z', tclass: 'bold'},
+    {c: '[', d:.1, tclass: 'bold'},
+    {c: '&#x201C;', tclass: 'bold'},
+    {c: ']', d:.1, tclass: 'bold'},
+    {c: '&#x2C6;', tclass: 'baccent'},
+    {c: '&#x2D9;', tclass: 'baccent'},
+    // 60 - 6F
+    {c: '&#x2018;', lig: {'96': 92}, tclass: 'bold'},
+    {c: 'a', a:0, krn: {'118': -0.0278, '106': 0.0556, '121': -0.0278, '119': -0.0278}, tclass: 'bold'},
+    {c: 'b', krn: {'101': 0.0278, '111': 0.0278, '120': -0.0278, '100': 0.0278, '99': 0.0278, '113': 0.0278, '118': -0.0278, '106': 0.0556, '121': -0.0278, '119': -0.0278}, tclass: 'bold'},
+    {c: 'c', a:0, krn: {'104': -0.0278, '107': -0.0278}, tclass: 'bold'},
+    {c: 'd', tclass: 'bold'},
+    {c: 'e', a:0, tclass: 'bold'},
+    {c: 'f', ic: 0.0778, krn: {'39': 0.0778, '63': 0.0778, '33': 0.0778, '41': 0.0778, '93': 0.0778}, lig: {'105': 12, '102': 11, '108': 13}, tclass: 'bold'},
+    {c: 'g', a:0, d:.2, ic: 0.0139, krn: {'106': 0.0278}, tclass: 'bold'},
+    {c: 'h', krn: {'116': -0.0278, '117': -0.0278, '98': -0.0278, '121': -0.0278, '118': -0.0278, '119': -0.0278}, tclass: 'bold'},
+    {c: 'i', tclass: 'bold'},
+    {c: 'j', d:.2, tclass: 'bold'},
+    {c: 'k', krn: {'97': -0.0556, '101': -0.0278, '97': -0.0278, '111': -0.0278, '99': -0.0278}, tclass: 'bold'},
+    {c: 'l', tclass: 'bold'},
+    {c: 'm', a:0, krn: {'116': -0.0278, '117': -0.0278, '98': -0.0278, '121': -0.0278, '118': -0.0278, '119': -0.0278}, tclass: 'bold'},
+    {c: 'n', a:0, krn: {'116': -0.0278, '117': -0.0278, '98': -0.0278, '121': -0.0278, '118': -0.0278, '119': -0.0278}, tclass: 'bold'},
+    {c: 'o', a:0, krn: {'101': 0.0278, '111': 0.0278, '120': -0.0278, '100': 0.0278, '99': 0.0278, '113': 0.0278, '118': -0.0278, '106': 0.0556, '121': -0.0278, '119': -0.0278}, tclass: 'bold'},
+    // 70 - 7F
+    {c: 'p', a:0, d:.2, krn: {'101': 0.0278, '111': 0.0278, '120': -0.0278, '100': 0.0278, '99': 0.0278, '113': 0.0278, '118': -0.0278, '106': 0.0556, '121': -0.0278, '119': -0.0278}, tclass: 'bold'},
+    {c: 'q', a:0, d:.2, tclass: 'bold'},
+    {c: 'r', a:0, tclass: 'bold'},
+    {c: 's', a:0, tclass: 'bold'},
+    {c: 't', krn: {'121': -0.0278, '119': -0.0278}, tclass: 'bold'},
+    {c: 'u', a:0, krn: {'119': -0.0278}, tclass: 'bold'},
+    {c: 'v', a:0, ic: 0.0139, krn: {'97': -0.0556, '101': -0.0278, '97': -0.0278, '111': -0.0278, '99': -0.0278}, tclass: 'bold'},
+    {c: 'w', a:0, ic: 0.0139, krn: {'101': -0.0278, '97': -0.0278, '111': -0.0278, '99': -0.0278}, tclass: 'bold'},
+    {c: 'x', a:0, tclass: 'bold'},
+    {c: 'y', a:0, d:.2, ic: 0.0139, krn: {'111': -0.0278, '101': -0.0278, '97': -0.0278, '46': -0.0833, '44': -0.0833}, tclass: 'bold'},
+    {c: 'z', a:0, tclass: 'bold'},
+    {c: '&#x2013;', a:.1, ic: 0.0278, lig: {'45': 124}, tclass: 'bold'},
+    {c: '&#x2014;', a:.1, ic: 0.0278, tclass: 'bold'},
+    {c: '&#x2DD;', tclass: 'baccent'},
+    {c: '&#x2DC;', tclass: 'baccent'},
+    {c: '&#xA8;', tclass: 'baccent'}
+  ]
+});
+
+jsMath.Setup.Styles({
+    '.typeset .math':           'font-style: normal',
+    '.typeset .italic':         'font-style: italic',
+    '.typeset .bold':           'font-weight: bold',
+    '.typeset .cmr10':          'font-family: serif',
+    '.typeset .cal':            'font-family: cursive',
+    '.typeset .arrows':         '',
+    '.typeset .arrow1':         '',
+    '.typeset .arrow2':         '',
+    '.typeset .harpoon':        'font-size: 125%',
+    '.typeset .symbol':         '',
+    '.typeset .symbol2':        '',
+    '.typeset .delim1':         'font-size: 133%; position:relative; top:.75em',
+    '.typeset .delim1b':        'font-size: 133%; position:relative; top:.8em; margin: -.1em',
+    '.typeset .delim1c':        'font-size: 120%; position:relative; top:.8em;',
+    '.typeset .delim2':         'font-size: 180%; position:relative; top:.75em',
+    '.typeset .delim2b':        'font-size: 190%; position:relative; top:.8em; margin: -.1em',
+    '.typeset .delim2c':        'font-size: 167%; position:relative; top:.8em;',
+    '.typeset .delim3':         'font-size: 250%; position:relative; top:.725em',
+    '.typeset .delim3b':        'font-size: 250%; position:relative; top:.8em; margin: -.1em',
+    '.typeset .delim3c':        'font-size: 240%; position:relative; top:.775em;',
+    '.typeset .delim4':         'font-size: 325%; position:relative; top:.7em',
+    '.typeset .delim4b':        'font-size: 325%; position:relative; top:.8em; margin: -.1em',
+    '.typeset .delim4c':        'font-size: 300%; position:relative; top:.8em;',
+    '.typeset .delim':          '',
+    '.typeset .vertical':       '',
+    '.typeset .greek':          '',
+    '.typeset .igreek':         'font-style: italic',
+    '.typeset .bgreek':         'font-weight: bold',
+    '.typeset .bigop1':         'font-size: 133%; position: relative; top: .85em; margin:-.05em',
+    '.typeset .bigop1a':        'font-size: 100%; position: relative; top: .775em;',
+    '.typeset .bigop1b':        'font-size: 160%; position: relative; top: .7em; margin:-.1em',
+    '.typeset .bigop1c':        'font-size: 125%; position: relative; top: .75em; margin:-.1em;',
+    '.typeset .bigop2':         'font-size: 200%; position: relative; top: .8em; margin:-.07em',
+    '.typeset .bigop2a':        'font-size: 175%; position: relative; top: .7em;',
+    '.typeset .bigop2b':        'font-size: 270%; position: relative; top: .62em; margin:-.1em',
+    '.typeset .bigop2c':        'font-size: 250%; position: relative; top: .7em; margin:-.17em;',
+    '.typeset .wide1':          'font-size: 67%; position: relative; top:-.8em',
+    '.typeset .wide2':          'font-size: 110%; position: relative; top:-.5em',
+    '.typeset .wide3':          'font-size: 175%; position: relative; top:-.32em',
+    '.typeset .wide1a':         'font-size: 75%; position: relative; top:-.5em',
+    '.typeset .wide2a':         'font-size: 133%; position: relative; top: -.15em',
+    '.typeset .wide3a':         'font-size: 200%; position: relative; top: -.05em',
+    '.typeset .root':           '',
+    '.typeset .accent':         'position: relative; top: .02em',
+    '.typeset .iaccent':        'position: relative; top: .02em; font-style: italic',
+    '.typeset .baccent':        'position: relative; top: .02em; font-weight: bold'
+});
+
+
+jsMath.Setup.Styles();
+
+/*
+ *  No access to TeX "not" character, so fake this
+ */
+jsMath.Macro('not','\\mathrel{\\rlap{\\kern 4mu/}}');
+jsMath.Macro('joinrel','\\mathrel{\\kern-2mu}');
+
+
+jsMath.Box.DelimExtend = jsMath.Box.DelimExtendRelative;
+
+jsMath.Box.defaultH = 0.8;
diff --git a/htdocs/jsMath/uncompressed/jsMath.js b/htdocs/jsMath/uncompressed/jsMath.js
new file mode 100644
index 0000000000..3080cea643
--- /dev/null
+++ b/htdocs/jsMath/uncompressed/jsMath.js
@@ -0,0 +1,6577 @@
+/*****************************************************************************
+ * 
+ *  jsMath: Mathematics on the Web
+ *  
+ *  This jsMath package makes it possible to display mathematics in HTML pages
+ *  that are viewable by a wide range of browsers on both the Mac and the IBM PC,
+ *  including browsers that don't process MathML.  See
+ *  
+ *            http://www.math.union.edu/locate/jsMath
+ *
+ *  for the latest version, and for documentation on how to use jsMath.
+ *
+ *  Copyright 2004-2010 by Davide P. Cervone
+ * 
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *  
+ *****************************************************************************/
+
+/*
+ *  Prevent running everything again if this file is loaded twice
+ */
+if (!window.jsMath || !window.jsMath.loaded) {
+
+var jsMath_old = window.jsMath;  // save user customizations
+
+//
+// debugging routine
+// 
+/* 
+ * function ShowObject (obj,spaces) {
+ *   var s = ''; if (!spaces) {spaces = ""}
+ *   for (var i in obj) {
+ *     if (obj[i] != null) {
+ *       if (typeof(obj[i]) == "object") {
+ *         s += spaces + i + ": {\n"
+ *           + ShowObject(obj[i],spaces + '  ')
+ *           + spaces + "}\n";
+ *       } else if (typeof(obj[i]) != "function") {
+ *         s += spaces + i + ': ' + obj[i] + "\n";
+ *       }
+ *     }
+ *   }
+ *   return s;
+ * }
+ */
+
+/***************************************************************************/
+//
+//  Check for DOM support
+//
+if (!document.getElementById || !document.childNodes || !document.createElement) {
+  alert('The mathematics on this page requires W3C DOM support in its JavaScript. '
+      + 'Unfortunately, your browser doesn\'t seem to have this.');
+} else {
+
+/***************************************************************************/
+
+window.jsMath = {
+  
+  version: "3.6e",  // change this if you edit the file, but don't edit this file
+  
+  document: document,  // the document loading jsMath
+  window: window,      // the window of the of loading document
+  
+  platform: (navigator.platform.match(/Mac/) ? "mac" :
+             navigator.platform.match(/Win/) ? "pc" : "unix"),
+  
+  // Font sizes for \tiny, \small, etc. (must match styles below)
+  sizes: [50, 60, 70, 85, 100, 120, 144, 173, 207, 249],
+
+  //
+  //  The styles needed for the TeX fonts and other jsMath elements
+  //
+  styles: {
+    '.math': {                  // unprocessed mathematics
+      'font-family': 'serif',
+      'font-style':  'normal',
+      'font-weight': 'normal'
+    },
+
+    '.typeset': {               // final typeset mathematics
+      'font-family': 'serif',
+      'font-style':  'normal',
+      'font-weight': 'normal',
+      'line-height': 'normal',
+      'text-indent': '0px',
+      'white-space': 'normal'
+    },
+    
+    '.typeset .normal': {       // \hbox contents style
+      'font-family': 'serif',
+      'font-style':  'normal',
+      'font-weight': 'normal'
+    },
+    
+    'div.typeset': {            // display mathematics
+      'text-align':  'center',
+       margin:       '1em 0px'
+    },
+    
+    'span.typeset': {           // in-line mathematics
+      'text-align':  'left'
+    },
+    
+    '.typeset span': {          // prevent outside CSS from setting these
+      'text-align':  'left',
+       border:       '0px',
+       margin:       '0px',
+       padding:      '0px'
+    },
+    
+    'a .typeset img, .typeset a img': {   // links in image mode
+       border: '0px',
+      'border-bottom': '1px solid blue;'
+    },
+
+    // Font sizes
+    '.typeset .size0': {'font-size': '50%'},  // tiny (\scriptscriptsize)
+    '.typeset .size1': {'font-size': '60%'},  //       (50% of \large for consistency)
+    '.typeset .size2': {'font-size': '70%'},  // scriptsize
+    '.typeset .size3': {'font-size': '85%'},  // small (70% of \large for consistency)
+    '.typeset .size4': {'font-size': '100%'}, // normalsize
+    '.typeset .size5': {'font-size': '120%'}, // large
+    '.typeset .size6': {'font-size': '144%'}, // Large
+    '.typeset .size7': {'font-size': '173%'}, // LARGE
+    '.typeset .size8': {'font-size': '207%'}, // huge
+    '.typeset .size9': {'font-size': '249%'}, // Huge
+  
+    // TeX fonts
+    '.typeset .cmr10':  {'font-family': 'jsMath-cmr10, serif'},
+    '.typeset .cmbx10': {'font-family': 'jsMath-cmbx10, jsMath-cmr10'},
+    '.typeset .cmti10': {'font-family': 'jsMath-cmti10, jsMath-cmr10'},
+    '.typeset .cmmi10': {'font-family': 'jsMath-cmmi10'},
+    '.typeset .cmsy10': {'font-family': 'jsMath-cmsy10'},
+    '.typeset .cmex10': {'font-family': 'jsMath-cmex10'},
+    
+    '.typeset .textit': {'font-family': 'serif', 'font-style': 'italic'},
+    '.typeset .textbf': {'font-family': 'serif', 'font-weight': 'bold'},
+    
+    '.typeset .link':   {'text-decoration': 'none'},  // links in mathematics
+
+    '.typeset .error':  {      // in-line error messages
+      'font-size':        '90%',
+      'font-style':       'italic',
+      'background-color': '#FFFFCC',
+       padding:           '1px',
+       border:            '1px solid #CC0000'
+    },
+
+    '.typeset .blank': {       // internal use
+      display:  'inline-block',
+      overflow: 'hidden',
+      border:   '0px none',
+      width:    '0px',
+      height:   '0px'
+    },
+    '.typeset .spacer': {      // internal use
+      display: 'inline-block'
+    },
+    
+    '#jsMath_hiddenSpan': {    // used for measuring BBoxes
+       visibility:    'hidden',
+       position:      'absolute',
+       top:           '0px',
+       left:          '0px',
+      'line-height':  'normal',
+      'text-indent':  '0px'
+    },
+
+    '#jsMath_message': {      // percentage complete message
+       position:   'fixed',
+       bottom:     '1px',
+       left:       '2px',
+      'background-color': '#E6E6E6',
+       border:     'solid 1px #959595',
+       margin:     '0px',
+       padding:    '1px 8px',
+      'z-index':   '102',
+       color:      'black',
+      'font-size': 'small',
+       width:      'auto'
+    },
+
+    '#jsMath_panel': {        // control panel
+       position:    'fixed',
+       bottom:      '1.75em',
+       right:       '1.5em',
+       padding:     '.8em 1.6em',
+      'background-color': '#DDDDDD',
+       border:      'outset 2px',
+      'z-index':    '103',
+       width:       'auto',
+       color:       'black',
+      'font-size':  '10pt',
+      'font-style': 'normal'
+    },
+    '#jsMath_panel .disabled': {color: '#888888'},   // disabled items in the panel
+    '#jsMath_panel .infoLink': {'font-size': '85%'}, // links to web pages
+
+    // avoid CSS polution from outside the panel
+    '#jsMath_panel *':  {
+      'font-size':   'inherit',
+      'font-style':  'inherit',
+      'font-family': 'inherit',
+      'line-height': 'normal'
+    },
+    '#jsMath_panel div':   {'background-color': 'inherit', color: 'inherit'},
+    '#jsMath_panel span':  {'background-color': 'inherit', color: 'inherit'},
+    '#jsMath_panel td': {
+       border: '0px', padding: '0px', margin: '0px',
+      'background-color': 'inherit', color: 'inherit'
+    },
+    '#jsMath_panel tr': {
+       border: '0px', padding: '0px', margin: '0px',
+      'background-color': 'inherit', color: 'inherit'
+    },
+    '#jsMath_panel table': {
+       border: '0px', padding: '0px', margin: '0px',
+      'background-color': 'inherit', color: 'inherit',
+       height: 'auto', width: 'auto'
+    },
+    
+    '#jsMath_button': {  // the jsMath floating button (to open control panel)
+       position:   'fixed',
+       bottom:     '1px',
+       right:      '2px',
+      'background-color': 'white',
+       border:     'solid 1px #959595',
+       margin:     '0px',
+       padding:    '0px 3px 1px 3px',
+      'z-index':   '102',
+       color:      'black',
+      'text-decoration':  'none',
+      'font-size': 'x-small',
+       width:      'auto',
+       cursor:     'hand'
+    },
+    '#jsMath_button *': {
+      padding: '0px', border: '0px', margin: '0px', 'line-height': 'normal',
+      'font-size': 'inherit', 'font-style': 'inherit', 'font-family': 'inherit'
+    },
+    
+    '#jsMath_global': {'font-style': 'italic'},  // 'global' in jsMath button
+
+    '#jsMath_noFont .message': {  // missing font message window
+      'text-align': 'center',
+       padding:     '.8em 1.6em',
+       border:      '3px solid #DD0000',
+      'background-color': '#FFF8F8',
+       color:       '#AA0000',
+      'font-size':  'small',
+       width:       'auto'
+    },
+    '#jsMath_noFont .link': {
+       padding:    '0px 5px 2px 5px',
+       border:     '2px outset',
+      'background-color': '#E8E8E8',
+       color:      'black',
+      'font-size': '80%',
+       width:      'auto',
+       cursor:     'hand'
+    },
+
+    '#jsMath_PrintWarning .message': {  // warning on print pages
+      'text-align': 'center',
+       padding: '.8em 1.6em',
+       border: '3px solid #DD0000',
+      'background-color': '#FFF8F8',
+       color: '#AA0000',
+      'font-size': 'x-small',
+       width: 'auto'
+    },
+
+    '@media print': {
+      '#jsMath_button': {display: 'none'},
+      '#jsMath_Warning': {display: 'none'}
+    },
+                         
+    '@media screen': {
+      '#jsMath_PrintWarning': {display:'none'}
+    }
+
+  },
+  
+
+  /***************************************************************************/
+
+  /*
+   *  Get a jsMath DOM element
+   */
+  Element: function (name) {return jsMath.document.getElementById('jsMath_'+name)},
+  
+  /*
+   *  Get the width and height (in pixels) of an HTML string
+   */
+  BBoxFor: function (s) {
+    this.hidden.innerHTML = 
+      '<nobr><span class="typeset"><span class="scale">'+s+'</span></span></nobr>';
+    var math = (jsMath.Browser.msieBBoxBug ? this.hidden.firstChild.firstChild : this.hidden);
+    var bbox = {w: math.offsetWidth, h: this.hidden.offsetHeight};
+    this.hidden.innerHTML = '';
+    return bbox;
+  },
+
+  /*
+   *  Get the width and height (in ems) of an HTML string.
+   *  Check the cache first to see if we've already measured it.
+   */
+  EmBoxFor: function (s) {
+    var cache = jsMath.Global.cache.R;
+    if (!cache[this.em]) {cache[this.em] = {}}
+    if (!cache[this.em][s]) {
+      var bbox = this.BBoxFor(s);
+      cache[this.em][s] = {w: bbox.w/this.em, h: bbox.h/this.em};
+    }
+    return cache[this.em][s];
+  },
+
+  /*
+   *  Initialize jsMath.  This determines the em size, and a variety
+   *  of other parameters used throughout jsMath.
+   */
+  Init: function () {
+    if (jsMath.Setup.inited != 1) {
+      if (!jsMath.Setup.inited) {jsMath.Setup.Body()}
+      if (jsMath.Setup.inited != 1) {
+        if (jsMath.Setup.inited == -100) return;
+        alert("It looks like jsMath failed to set up properly (error code "
+               + jsMath.Setup.inited + ").  "
+               + "I will try to keep going, but it could get ugly.");
+        jsMath.Setup.inited = 1;
+      }
+    }
+    this.em = this.CurrentEm();
+    var cache = jsMath.Global.cache.B;
+    if (!cache[this.em]) {
+      cache[this.em] = {};
+      cache[this.em].bb = this.BBoxFor('x'); var hh = cache[this.em].bb.h;
+      cache[this.em].d = this.BBoxFor('x'+jsMath.HTML.Strut(hh/this.em)).h - hh;
+    }
+    jsMath.Browser.italicCorrection = cache[this.em].ic;
+    var bb = cache[this.em].bb; var h = bb.h; var d = cache[this.em].d
+    this.h = (h-d)/this.em; this.d = d/this.em;
+    this.hd = this.h + this.d;
+
+    this.Setup.TeXfonts();
+    
+    var x_height = this.EmBoxFor('<span class="cmr10">M</span>').w/2;
+    this.TeX.M_height = x_height*(26/14);
+    this.TeX.h = this.h; this.TeX.d = this.d; this.TeX.hd = this.hd;
+    
+    this.Img.Scale();
+    if (!this.initialized) {
+      this.Setup.Sizes();
+      this.Img.UpdateFonts();
+    }
+
+    // factor for \big and its brethren
+    this.p_height = (this.TeX.cmex10[0].h + this.TeX.cmex10[0].d) / .85;
+
+    this.initialized = 1;
+  },
+  
+  /*
+   *  Get the x size and if it has changed, reinitialize the sizes
+   */
+  ReInit: function () {
+    if (this.em != this.CurrentEm()) {this.Init()}
+  },
+  
+  /*
+   *  Find the em size in effect at the current text location
+   */
+  CurrentEm: function () {
+    var em = this.BBoxFor('<span style="'+jsMath.Browser.block+';width:27em;height:1em"></span>').w/27;
+    if (em > 0) {return em}
+    // handle older browsers
+    return this.BBoxFor('<img src="'+jsMath.blank+'" style="width:13em;height:1em" />').w/13;
+  },
+  
+  /*
+   *  Mark jsMath as loaded and copy any user-provided overrides
+   */
+  Loaded: function () {
+    if (jsMath_old) {
+      var override = ['Process', 'ProcessBeforeShowing','ProcessElement',
+        'ConvertTeX','ConvertTeX2','ConvertLaTeX','ConvertCustom',
+        'CustomSearch', 'Synchronize', 'Macro', 'document'];
+      for (var i = 0; i < override.length; i++) {
+        if (jsMath_old[override[i]]) {delete jsMath_old[override[i]]}
+      }
+    }
+    if (jsMath_old) {this.Insert(jsMath,jsMath_old)}
+    jsMath_old = null;
+    jsMath.loaded = 1;
+  },
+  
+  /*
+   *  Manage JavaScript objects:
+   *  
+   *      Add:        add/replace items in an object
+   *      Insert:     add items to an object
+   *      Package:    add items to an object prototype
+   */
+  Add: function (dst,src) {for (var id in src) {dst[id] = src[id]}},
+  Insert: function (dst,src) {
+    for (var id in src) {
+      if (dst[id] && typeof(src[id]) == 'object'
+                  && (typeof(dst[id]) == 'object'
+                  ||  typeof(dst[id]) == 'function')) {
+        this.Insert(dst[id],src[id]);
+      } else {
+        dst[id] = src[id];
+      }
+    }
+  },
+  Package: function (obj,def) {this.Insert(obj.prototype,def)}
+
+};
+
+
+/***************************************************************************/
+
+  /*
+   *  Implements items associated with the global cache.
+   *
+   *  This object will be replaced by a global version when 
+   *  (and if) jsMath-global.html is loaded.
+   */
+jsMath.Global = {
+    isLocal: 1,  // a local copy if jsMath-global.html hasn't been loaded
+    cache: {T: {}, D: {}, R: {}, B: {}},
+
+    /*
+     *  Clear the global (or local) cache
+     */
+    ClearCache: function () {jsMath.Global.cache = {T: {}, D: {}, R: {}, B: {}}},
+
+    /*
+     *  Initiate global mode
+     */
+    GoGlobal: function (cookie) {
+      var url = String(jsMath.window.location);
+      var c = (jsMath.isCHMmode ? '#' : '?');
+      if (cookie) {url = url.replace(/\?.*/,'') + '?' + cookie}
+      jsMath.Controls.Reload(jsMath.root + "jsMath-global.html" + c +escape(url));
+    },
+
+    /*
+     *  Check if we need to go to global mode
+     */
+    Init: function () {
+      if (jsMath.Controls.cookie.global == "always" && !jsMath.noGoGlobal) {
+        if (navigator.accentColorName) return; // OmniWeb crashes on GoGlobal
+        if (!jsMath.window) {jsMath.window = window}
+        jsMath.Controls.loaded = 1;
+        jsMath.Controls.defaults.hiddenGlobal = null;
+        this.GoGlobal(jsMath.Controls.SetCookie(2));
+      }
+    },
+
+    /*
+     *  Try to register with a global.html window that contains us
+     */
+    Register: function () {
+      var parent = jsMath.window.parent;
+      if (!jsMath.isCHMmode)
+        {jsMath.isCHMmode = (jsMath.window.location.protocol == 'mk:')}
+      try {
+        if (!jsMath.isCHMmode) this.Domain();
+        if (parent.jsMath && parent.jsMath.isGlobal)
+          {parent.jsMath.Register(jsMath.window)}
+      } catch (err) {jsMath.noGoGlobal = 1}
+    },
+
+    /*
+     *  If we're not the parent window, try to set the domain to
+     *  match the parent's domain (so we can use the Global data
+     *  if the surrounding frame is a Global frame).
+     */
+    Domain: function () {
+      // MSIE/Mac can't do domain changes, so don't bother trying
+      if (navigator.appName == 'Microsoft Internet Explorer' &&
+          jsMath.platform == 'mac' && navigator.userProfile != null) return;
+      // MSIE/PC can do domain change, but gets mixed up if we don't
+      //  find a domain that works, and then can't look in window.location
+      //  any longer.  So don't try, since we can't afford to leave it confused.
+      if (jsMath.document.all && !jsMath.window.opera) return;
+
+      if (window == parent) return;
+      var oldDomain = jsMath.document.domain;
+      try {
+        while (true) {
+          try {if (parent.document.title != null) return} catch (err) {}
+          if (!document.domain.match(/\..*\./)) break;
+          jsMath.document.domain = jsMath.document.domain.replace(/^[^.]*\./,'');
+        }
+      } catch (err) {}
+      jsMath.document.domain = oldDomain;
+    }
+
+};
+  
+
+
+/***************************************************************************/
+
+/*
+ *
+ *  Implement loading of remote scripts using XMLHttpRequest, if
+ *  possible, otherwise use a hidden IFRAME and fake it.  That
+ *  method runs asynchronously, which causes lots of headaches.
+ *  Solve these using Push command, which queues actions
+ *  until files have loaded.
+ */
+
+jsMath.Script = {
+
+  request: null, // the XMLHttpRequest object
+
+  /*
+   *  Create the XMLHttpRequest object, if we can.
+   *  Otherwise, use the iframe-based fallback method.
+   */
+  Init: function () {
+    if (!(jsMath.Controls.cookie.asynch && jsMath.Controls.cookie.progress)) {
+      if (window.XMLHttpRequest) {
+        try {this.request = new XMLHttpRequest} catch (err) {}
+        // MSIE and FireFox3 can't use xmlRequest on local files,
+        // but we don't have jsMath.browser yet to tell, so use this check
+        if (this.request && jsMath.root.match(/^file:\/\//)) {
+          try {
+            this.request.open("GET",jsMath.root+"jsMath.js",false);
+            this.request.send(null);
+          } catch (err) {
+            this.request = null;
+            //  Firefox3 has window.postMessage for inter-window communication. 
+            //  It can be used to handle the new file:// security model,
+            //  so set up the listener.
+            if (window.postMessage && window.addEventListener) {
+              this.mustPost = 1;
+              jsMath.window.addEventListener("message",jsMath.Post.Listener,false);
+            }
+          }
+        }
+      }
+      if (!this.request && window.ActiveXObject && !this.mustPost) {
+        var xml = ["MSXML2.XMLHTTP.6.0","MSXML2.XMLHTTP.5.0","MSXML2.XMLHTTP.4.0",
+                   "MSXML2.XMLHTTP.3.0","MSXML2.XMLHTTP","Microsoft.XMLHTTP"];
+        for (var i = 0; i < xml.length && !this.request; i++) {
+          try {this.request = new ActiveXObject(xml[i])} catch (err) {}
+        }
+      }
+    }
+    //
+    //  Use the delayed-script fallback for MSIE/Mac and old versions
+    //  of several browsers (Opera 7.5, OmniWeb 4.5).
+    //
+    if (!this.request || jsMath.Setup.domainChanged)
+      {this.Load = this.delayedLoad; this.needsBody = 1}
+  },
+
+  /*
+   *  Load a script and evaluate it in the window's context
+   */
+  Load: function (url,show) {
+    if (show) {
+      jsMath.Message.Set("Loading "+url);
+      jsMath.Script.Delay(1);
+      jsMath.Script.Push(this,'xmlRequest',url);
+      jsMath.Script.Push(jsMath.Message,'Clear');
+    } else {
+      jsMath.Script.Push(this,'xmlRequest',url);
+    }
+  },
+
+  /*
+   *  Load a URL and run the contents of the file
+   */
+  xmlRequest: function (url) {
+    this.blocking = 1;
+//    this.debug('xmlRequest: '+url);
+    try {
+      this.request.open("GET",url,false);
+      this.request.send(null);
+    } catch (err) {
+      this.blocking = 0;
+      if (jsMath.Translate.restart && jsMath.Translate.asynchronous) {return ""}
+      throw Error("jsMath can't load the file '"+url+"'\n"
+          + "Message: "+err.message);
+    }
+    if (this.request.status != null && (this.request.status >= 400 || this.request.status < 0)) {
+      // Do we need to deal with redirected links?
+      this.blocking = 0;
+      if (jsMath.Translate.restart && jsMath.Translate.asynchronous) {return ""}
+      throw Error("jsMath can't load the file '"+url+"'\n"
+          + "Error status: "+this.request.status);
+    }
+    if (!url.match(/\.js$/)) {return(this.request.responseText)}
+    var tmpQueue = this.queue; this.queue = [];
+//    this.debug('xml Eval ['+tmpQueue.length+']');
+    jsMath.window.eval(this.request.responseText);
+//    this.debug('xml Done ['+this.queue.length+' + '+tmpQueue.length+']');
+    this.blocking = 0; this.queue = this.queue.concat(tmpQueue);
+    this.Process();
+    return "";
+  },
+
+  /********************************************************************
+   *
+   *  Implement asynchronous loading and execution of scripts
+   *  (via hidden IFRAME) interleved with other JavaScript commands
+   *  that must be synchronized with the file loading.  (Basically, this
+   *  is for MSIE/Mac and Opera 7.5, which don't have XMLHttpRequest.)
+   */
+
+  cancelTimeout: 30*1000,   // delay for canceling load (30 sec)
+
+  blocking: 0,       // true when an asynchronous action is being performed
+  cancelTimer: null, // timer to cancel load if it takes too long
+  needsBody: 0,      // true if loading files requires BODY to be present
+  
+  queue: [],         // the stack of pending actions
+
+  /*
+   *  Provide mechanism for synchronizing with the asynchronous jsMath
+   *  file-loading mechanism.  'code' can be a string or a function.
+   */
+  Synchronize: function (code,data) {
+    if (typeof(code) != 'string') {jsMath.Script.Push(null,code,data)}
+      else {jsMath.Script.Push(jsMath.window,'eval',code)}
+  },
+  
+  /*
+   *  Queue a function to be processed.
+   *  If nothing is being loaded, do the pending commands.
+   */
+  Push: function (object,method,data) {
+//  this.debug('Pushing: '+method+' at '+this.queue.length); // debug
+    this.queue[this.queue.length] = [object,method,data];
+    if (!(this.blocking || (this.needsBody && !jsMath.document.body))) this.Process();
+  },
+
+  /*
+   *  Do any pending functions (stopping if a file load is started)
+   */
+  Process: function () {
+    while (this.queue.length && !this.blocking) {
+      var call = this.queue[0]; this.queue = this.queue.slice(1);
+      var savedQueue = this.SaveQueue();
+      var object = call[0]; var method = call[1]; var data = call[2];
+//    this.debug('Calling: '+method+' ['+savedQueue.length+']'); // debug
+      if (object) {object[method](data)} else if (method) {method(data)}
+//    this.debug('Done:    '+method+' ['+this.queue.length+' + '+savedQueue.length+'] ('+this.blocking+')'); // debug
+      this.RestoreQueue(savedQueue);
+    }
+  },
+  
+  /*
+   *  Allows pushes to occur at the FRONT of the queue
+   *  (so a command acts as a single unit, including anything
+   *  that it pushes on to the command stack)
+   */
+  SaveQueue: function () {
+    var queue = this.queue;
+    this.queue = [];
+    return queue;
+  },
+  RestoreQueue: function (queue) {
+    this.queue = this.queue.concat(queue);
+  },
+  
+  /*
+   *  Handle loading of scripts that run asynchronously
+   */
+  delayedLoad: function (url) {
+//    this.debug('Loading: '+url);
+    this.Push(this,'startLoad',url);
+  },
+  startLoad: function (url) {
+    var iframe = jsMath.document.createElement('iframe');
+    iframe.style.visibility = 'hidden';
+    iframe.style.position = 'absolute';
+    iframe.style.width = '0px';
+    iframe.style.height = '0px';
+    if (jsMath.document.body.firstChild) {
+      jsMath.document.body.insertBefore(iframe,jsMath.document.body.firstChild);
+    } else {
+      jsMath.document.body.appendChild(iframe);
+    }
+    this.blocking = 1; this.url = url;
+    if (url.substr(0,jsMath.root.length) == jsMath.root)
+      {url = url.substr(jsMath.root.length)}
+    jsMath.Message.Set("Loading "+url);
+    this.cancelTimer = setTimeout('jsMath.Script.cancelLoad()',this.cancelTimeout);
+    if (this.mustPost)           {iframe.src = jsMath.Post.startLoad(url,iframe)}
+    else if (url.match(/\.js$/)) {iframe.src = jsMath.root+"jsMath-loader.html"}
+    else                         {iframe.src = this.url}
+  },
+  endLoad: function (action) {
+    if (this.cancelTimer) {clearTimeout(this.cancelTimer); this.cancelTimer = null}
+    jsMath.Post.endLoad();
+    jsMath.Message.Clear();
+    if (action != 'cancel') {this.blocking = 0; this.Process()}
+  },
+  
+  Start: function () {
+//    this.debug('Starting: ['+this.queue.length+'] '+this.url);
+    this.tmpQueue = this.queue; this.queue = [];
+  },
+  End:   function () {
+//    this.debug('Ending:   ['+this.queue.length+' + '+this.tmpQueue.length+'] '+this.url);
+    this.queue = this.queue.concat(this.tmpQueue); delete this.tmpQueue;
+  },
+
+  /*
+   *  If the loading takes too long, cancel it and end the load.
+   */
+  cancelLoad: function (message,delay) {
+    if (this.cancelTimer) {clearTimeout(this.cancelTimer); this.cancelTimer = null}
+    if (message == null) {message = "Can't load file"}
+    if (delay == null) {delay = 2000}
+    jsMath.Message.Set(message);
+    setTimeout('jsMath.Script.endLoad("cancel")',delay);
+  },
+
+  /*
+   *  Perform a delay (to let the browser catch up)
+   */
+  Delay: function (time) {
+    this.blocking = 1;
+    setTimeout('jsMath.Script.endDelay()',time);
+  },
+  endDelay: function () {
+//    this.debug('endDelay');
+    this.blocking = 0;
+    this.Process();
+  },
+  
+  /*
+   *  Load an image and wait for it
+   *  (so MSIE won't load extra copies of it)
+   */
+  imageCount: 0,
+  WaitForImage: function (file) {
+    this.blocking = 1; this.imageCount++;
+    if (this.img == null) {this.img = []}
+    var img = new Image(); this.img[this.img.length] = img;
+    img.onload = function () {if (--jsMath.Script.imageCount == 0) jsMath.Script.endDelay()}
+    img.onerror = img.onload; img.onabort = img.onload;
+    img.src = file;
+  },
+  
+  /*
+   *  The code uncompressor
+   */
+  Uncompress: function (data) {
+    for (var k = 0; k <  data.length; k++) {
+      var d = data[k]; var n = d.length;
+      for (var i = 0; i < n; i++) {if (typeof(d[i]) == 'number') {d[i] = d[d[i]]}}
+      data[k] = d.join('');
+    }
+    window.eval(data.join(''));
+  }
+  
+  /*
+   *  for debugging the event queue
+   */
+  /* 
+   * ,debug: function (message) {
+   *   if (jsMath.document.body && jsMath.window.debug) {jsMath.window.debug(message)}
+   *     else {alert(message)}
+   * }
+   */
+
+};
+
+/***************************************************************************/
+
+/*
+ *  Handle window.postMessage() events in Firefox3
+ */
+
+jsMath.Post = {
+  window: null,  // iframe we are listening to
+  
+  Listener: function (event) {
+    if (event.source != jsMath.Post.window) return;
+    var domain = event.origin.replace(/^file:\/\//,'');
+    var ddomain = document.domain.replace(/^file:\/\//,'');
+    if (domain == null || domain == "" || domain == "null") {domain = "localhost"}
+    if (ddomain == null || ddomain == "" || ddomain == "null") {ddomain = "localhost"}
+    if (domain != ddomain || !event.data.substr(0,6).match(/jsM(CP|LD|AL):/)) return;
+    var type = event.data.substr(6,3).replace(/ /g,'');
+    var message = event.data.substr(10);
+    if (jsMath.Post.Commands[type]) (jsMath.Post.Commands[type])(message);
+    // cancel event?
+  },
+  
+  /*
+   *  Commands that can be performed by the listener
+   */
+  Commands: {
+    SCR: function (message) {jsMath.window.eval(message)},
+    ERR: function (message) {jsMath.Script.cancelLoad(message,3000)},
+    BGN: function (message) {jsMath.Script.Start()},
+    END: function (message) {if (message) jsMath.Script.End(); jsMath.Script.endLoad()}
+  },
+  
+  startLoad: function (url,iframe) {
+    this.window = iframe.contentWindow;
+    if (!url.match(/\.js$/)) {return jsMath.root+url}
+    return jsMath.root+"jsMath-loader-post.html?"+url;
+  },
+  endLoad: function () {this.window = null}
+};
+
+/***************************************************************************/
+
+/*
+ *  Message and screen blanking facility
+ */
+
+jsMath.Message = {
+  
+  blank: null,    // the div to blank out the screen
+  message: null,  // the div for the messages
+  text: null,     // the text node for messages
+  clear: null,    // timer for clearing message
+
+  /*
+   *  Create the elements needed for the message box
+   */
+  Init: function () {
+    if (!jsMath.document.body || !jsMath.Controls.cookie.progress) return;
+    this.message = jsMath.Element('message');
+    if (!this.message) {
+      if (jsMath.Setup.stylesReady) {
+        this.message = jsMath.Setup.DIV('message',{visibility:'hidden'},jsMath.fixedDiv);
+      } else {
+        this.message = jsMath.Setup.DIV('message',{
+          visibility:'hidden', position:'absolute', bottom:'1px', left:'2px',
+          backgroundColor:'#E6E6E6', border:'solid 1px #959595',
+          margin:'0px', padding:'1px 8px', zIndex:102,
+          color:'black', fontSize:'small', width:'auto'
+        },jsMath.fixedDiv);
+      }
+    }
+    this.text = jsMath.document.createTextNode('');
+    this.message.appendChild(this.text);
+    this.message.onmousedown = jsMath.Translate.Cancel;
+  },
+  
+  /*
+   *  Set the contents of the message box, or use the window status line
+   */
+  Set: function (text,canCancel) {
+    if (this.clear) {clearTimeout(this.clear); this.clear = null}
+    if (jsMath.Controls.cookie.progress) {
+      if (!this.text) {this.Init(); if (!this.text) return}
+      if (jsMath.Browser.textNodeBug) {this.message.innerHTML = text}
+        else {this.text.nodeValue = text}
+      this.message.style.visibility = 'visible';
+      if (canCancel) {
+        this.message.style.cursor = 'pointer';
+        if (!this.message.style.cursor) {this.message.style.cursor = 'hand'}
+        this.message.title = ' Cancel Processing of Math ';
+      } else {
+        this.message.style.cursor = '';
+        this.message.title = '';
+      }
+    } else {
+      if (text.substr(0,8) != "Loading ") {jsMath.window.status = text}
+    }
+  },
+  
+  /*
+   *  Clear the message box or status line
+   */
+  Clear: function () {
+    if (this.clear) {clearTimeout(this.clear)}
+    this.clear = setTimeout("jsMath.Message.doClear()",1000);
+  },
+  doClear: function () {
+    if (this.clear) {
+      this.clear = null;
+      jsMath.window.status = '';
+      if (this.text) {this.text.nodeValue = ''}
+      if (this.message) {this.message.style.visibility = 'hidden'}
+    }
+  },
+  
+  
+  /*
+   *  Put up a DIV that covers the window so that the
+   *  "flicker" of processing the mathematics will not be visible
+   */
+  Blank: function () {
+    if (this.blank || !jsMath.document.body) return;
+    this.blank = jsMath.Setup.DIV("blank",{
+      position:(jsMath.Browser.msiePositionFixedBug? 'absolute': 'fixed'),
+      top:'0px', left:'0px', bottom:'0px', right:'0px',
+      zIndex:101, backgroundColor:'white'
+    },jsMath.fixedDiv);
+    if (jsMath.Browser.msieBlankBug) {
+      this.blank.innerHTML = '&nbsp;';
+      this.blank.style.width = "110%";
+      this.blank.style.height = "110%";
+    }
+  },
+  
+  UnBlank: function () {
+    if (this.blank) {jsMath.document.body.removeChild(this.blank)}
+    this.blank = null;
+  }
+};
+
+
+/***************************************************************************/
+
+/*
+ *  Miscellaneous setup and initialization
+ */
+jsMath.Setup = {
+  
+  loaded: [],  // array of files already loaded
+  
+  /*
+   *  Insert a DIV at the top of the page with given ID,
+   *  attributes, and style settings
+   */
+  DIV: function (id,styles,parent) {
+    if (parent == null) {parent = jsMath.document.body}
+    var div = jsMath.document.createElement('div');
+    div.id = 'jsMath_'+id;
+    for (var i in styles) {div.style[i]= styles[i]}
+    if (!parent.hasChildNodes) {parent.appendChild(div)}
+      else {parent.insertBefore(div,parent.firstChild)}
+    return div;
+  },
+  
+  /*
+   *  Source a jsMath JavaScript file (only load any given file once)
+   */
+  Script: function (file,show) {
+    if (this.loaded[file]) {return} else {this.loaded[file] = 1}
+    if (!file.match('^([a-zA-Z]+:/?)?/')) {file = jsMath.root + file}
+    jsMath.Script.Load(file,show);
+  },
+  
+  /*
+   *  Use a hidden <DIV> for measuring the BBoxes of things
+   */
+  Hidden: function () {
+    jsMath.hidden = this.DIV("Hidden",{
+      visibility: 'hidden', position:"absolute",
+      top:0, left:0, border:0, padding:0, margin:0
+    });
+    jsMath.hiddenTop = jsMath.hidden;
+    return;
+  },
+
+  /*
+   *  Find the root URL for the jsMath files (so we can load
+   *  the other .js and .gif files)
+   */
+  Source: function () {
+    if (jsMath.Autoload && jsMath.Autoload.root) {
+      jsMath.root = jsMath.Autoload.root;
+    } else {
+      jsMath.root = '';
+      var script = jsMath.document.getElementsByTagName('script');
+      if (script) {
+        for (var i = 0; i < script.length; i++) {
+          var src = script[i].src;
+          if (src && src.match('(^|/|\\\\)jsMath.js$')) {
+            jsMath.root = src.replace(/jsMath.js$/,'');
+            break;
+          }
+        }
+      }
+    }
+    if (jsMath.root.charAt(0) == '\\') {jsMath.root = jsMath.root.replace(/\\/g,'/')}
+    if (jsMath.root.charAt(0) == '/') {
+      if (jsMath.root.charAt(1) != '/')
+        {jsMath.root = '//' + jsMath.document.location.host + jsMath.root}
+      jsMath.root = jsMath.document.location.protocol + jsMath.root;
+    } else if (!jsMath.root.match(/^[a-z]+:/i)) {
+      var src = new String(jsMath.document.location);
+      var pattern = new RegExp('/[^/]*/\\.\\./')
+      jsMath.root = src.replace(new RegExp('[^/]*$'),'') + jsMath.root;
+      while (jsMath.root.match(pattern))
+        {jsMath.root = jsMath.root.replace(pattern,'/')}
+    }
+    jsMath.Img.root = jsMath.root + "fonts/";
+    jsMath.blank = jsMath.root + "blank.gif";
+    this.Domain();
+  },
+  
+  /*
+   *  Find the most restricted common domain for the main
+   *  page and jsMath.  Report an error if jsMath is outside
+   *  the domain of the calling page.
+   */
+  Domain: function () {
+    try {jsMath.document.domain} catch (err) {return}
+    var jsDomain = ''; var pageDomain = jsMath.document.domain;
+    if (jsMath.root.match('://([^/]*)/')) {jsDomain = RegExp.$1}
+    jsDomain = jsDomain.replace(/:\d+$/,'');
+    if (jsDomain == "" || jsDomain == pageDomain) return;
+    //
+    // MSIE on the Mac can't change jsMath.document.domain and 'try' won't
+    //   catch the error (Grrr!), so exit for them.
+    //
+    if (navigator.appName == 'Microsoft Internet Explorer' &&
+        jsMath.platform == 'mac' && navigator.onLine &&
+        navigator.userProfile && jsMath.document.all) return;
+    jsDomain = jsDomain.split(/\./); pageDomain = pageDomain.split(/\./);
+    if (jsDomain.length < 2 || pageDomain.length < 2 ||
+        jsDomain[jsDomain.length-1] != pageDomain[pageDomain.length-1] ||
+        jsDomain[jsDomain.length-2] != pageDomain[pageDomain.length-2]) {
+      this.DomainWarning();
+      return;
+    }
+    var domain = jsDomain[jsDomain.length-2] + '.' + jsDomain[jsDomain.length-1];
+    for (var i = 3; i <= jsDomain.length && i <= pageDomain.length; i++) {
+      if (jsDomain[jsDomain.length-i] != pageDomain[pageDomain.length-i]) break;
+      domain = jsDomain[jsDomain.length-i] + '.' + domain;
+    }
+    jsMath.document.domain = domain;
+    this.domainChanged = 1;
+  },
+
+  DomainWarning: function () {
+    alert("In order for jsMath to be able to load the additional "
+        + "components that it may need, the jsMath.js file must be "
+        + "loaded from a server in the same domain as the page that "
+        + "contains it.  Because that is not the case for this page, "
+        + "the mathematics displayed here may not appear correctly.");
+  },
+  
+  /*
+   *  Initialize a font's encoding array
+   */
+  EncodeFont: function (name) {
+    var font = jsMath.TeX[name];
+    if (font[0].c != null) return;
+    for (var k = 0; k < 128; k++) {
+      var data = font[k]; font[k] = data[3];
+      if (font[k] == null) {font[k] = {}};
+      font[k].w = data[0]; font[k].h = data[1];
+      if (data[2] != null) {font[k].d = data[2]}
+      font[k].c = jsMath.TeX.encoding[k];
+    }
+  },
+  
+  /*
+   *  Initialize the encodings for all fonts
+   */
+  Fonts: function () {
+    for (var i = 0; i < jsMath.TeX.fam.length; i++) {
+      var name = jsMath.TeX.fam[i];
+      if (name) {this.EncodeFont(name)}
+    }
+  },
+  
+  /*
+   *  Look up the default height and depth for a TeX font
+   *  and set the skewchar
+   */
+  TeXfont: function (name) {
+    var font = jsMath.TeX[name]; if (font == null) return;
+    font.hd = jsMath.EmBoxFor('<span class="'+name+'">'+font[65].c+'</span>').h;
+    font.d  = jsMath.EmBoxFor('<span class="'+name+'">'+font[65].c+jsMath.HTML.Strut(font.hd)+'</span>').h - font.hd;
+    font.h = font.hd - font.d;
+    if (name == 'cmmi10') {font.skewchar = 0177} 
+    else if (name == 'cmsy10') {font.skewchar = 060}
+  },
+
+  /*
+   *  Init all the TeX fonts
+   */
+  TeXfonts: function () {
+    for (var i = 0; i < jsMath.TeX.fam.length; i++) 
+      {if (jsMath.TeX.fam[i]) {this.TeXfont(jsMath.TeX.fam[i])}}
+  },
+
+  /*
+   *  Compute font parameters for various sizes
+   */
+  Sizes: function () {
+    jsMath.TeXparams = []; var i; var j;
+    for (j=0; j < jsMath.sizes.length; j++) {jsMath.TeXparams[j] = {}}
+    for (i in jsMath.TeX) {
+      if (typeof(jsMath.TeX[i]) != 'object') {
+        for (j=0; j < jsMath.sizes.length; j++) {
+          jsMath.TeXparams[j][i] = jsMath.sizes[j]*jsMath.TeX[i]/100;
+        }
+      }
+    }
+  },
+
+  /*
+   *  Send the style definitions to the browser (these may be adjusted
+   *  by the browser-specific code)
+   */
+  Styles: function (styles) {
+    if (!styles) {
+      styles = jsMath.styles;
+      styles['.typeset .scale'] = {'font-size': jsMath.Controls.cookie.scale+'%'};
+      this.stylesReady = 1;
+    }
+    jsMath.Script.Push(this,'AddStyleSheet',styles);
+    if (jsMath.Browser.styleChangeDelay) {jsMath.Script.Push(jsMath.Script,'Delay',1)}
+  },
+  
+  /*
+   *  Make a style string from a hash of style definitions, which are
+   *  either strings themselves or hashes of style settings.
+   */
+  StyleString: function (styles) {
+    var styleString = {}, id;
+    for (id in styles) {
+      if (typeof styles[id] === 'string') {
+        styleString[id] = styles[id];
+      } else if (id.substr(0,1) === '@') {
+        styleString[id] = this.StyleString(styles[id]);
+      } else if (styles[id] != null) {
+        var style = [];
+        for (var name in styles[id]) {
+          if (styles[id][name] != null)
+            {style[style.length] = name + ': ' + styles[id][name]}
+        }
+        styleString[id] = style.join('; ');
+      }
+    }
+    var string = '';
+    for (id in styleString) {string += id + " {"+styleString[id]+"}\n"}
+    return string;
+  },
+  
+  AddStyleSheet: function (styles) {
+    var head = jsMath.document.getElementsByTagName('head')[0];
+    if (head) {
+      var string = this.StyleString(styles);
+      if (jsMath.document.createStyleSheet) {// check for MSIE
+        head.insertAdjacentHTML('beforeEnd',
+            '<span style="display:none">x</span>'  // MSIE needs this for some reason
+            + '<style type="text/css">'+string+'</style>');
+      } else {
+        var style = jsMath.document.createElement('style'); style.type = "text/css";
+        style.appendChild(jsMath.document.createTextNode(string));
+        head.appendChild(style);
+      }
+    } else if (!jsMath.noHEAD) {
+      jsMath.noHEAD = 1;
+      alert("Document is missing its <HEAD> section.  Style sheet can't be created without it.");
+    }
+  },
+
+  /*
+   *  Do the initialization that requires the <body> to be in place.
+   */
+  Body: function () {
+    if (this.inited) return;
+    
+    this.inited = -1;
+
+    jsMath.Setup.Hidden(); this.inited = -2;
+    jsMath.Browser.Init(); this.inited = -3;
+
+    // blank screen if necessary
+    if (jsMath.Controls.cookie.blank) {jsMath.Message.Blank()}; this.inited = -4;
+
+    jsMath.Setup.Styles(); this.inited = -5;
+    jsMath.Controls.Init(); this.inited = -6;
+    
+    // do user-specific initialization
+    jsMath.Script.Push(jsMath.Setup,'User','pre-font'); this.inited = -7;
+
+    // make sure browser-specific loads are done before this
+    jsMath.Script.Push(jsMath.Font,'Check');
+    if (jsMath.Font.register.length)
+      {jsMath.Script.Push(jsMath.Font,'LoadRegistered')}
+
+    this.inited = 1;
+  },
+  
+  /*
+   *  Web page author can override the entries to the UserEvent hash 
+   *  functions that will be run at various times during jsMath's setup
+   *  process.
+   */
+  User: function (when) {
+    if (jsMath.Setup.UserEvent[when]) {(jsMath.Setup.UserEvent[when])()}
+  },
+  
+  UserEvent: {
+    "pre-font": null,  // after browser is set up but before fonts are tested
+    "onload": null     // after jsMath.js is loaded and finished running
+  }
+  
+};
+
+jsMath.Update = {
+
+  /*
+   *  Update specific parameters for a limited number of font entries
+   */
+  TeXfonts: function (change) {
+    for (var font in change) {
+      for (var code in change[font]) {
+        for (var id in change[font][code]) {
+          jsMath.TeX[font][code][id] = change[font][code][id];
+        }
+      }
+    }
+  },
+  
+  /*
+   *  Update the character code for every character in a list
+   *  of fonts
+   */
+  TeXfontCodes: function (change) {
+    for (var font in change) {
+      for (var i = 0; i < change[font].length; i++) {
+        jsMath.TeX[font][i].c = change[font][i];
+      }
+    }
+  }
+  
+};
+
+/***************************************************************************/
+
+/*
+ *  Implement browser-specific checks
+ */
+
+jsMath.Browser = {
+
+  allowAbsolute: 1,           // tells if browser can nest absolutely positioned
+                              //   SPANs inside relative SPANs
+  allowAbsoluteDelim: 0,      // OK to use absolute placement for building delims?
+  separateSkips: 0,           // MSIE doesn't do negative left margins, and
+                              //   Netscape doesn't combine skips well
+
+  valignBug: 0,               // Konqueror doesn't nest vertical-align
+  operaHiddenFix: '',         // for Opera to fix bug with math in tables
+  msieCenterBugFix: '',       // for MSIE centering bug with image fonts
+  msieInlineBlockFix: '',     // for MSIE alignment bug in non-quirks mode
+  msieSpaceFix: '',           // for MSIE to avoid dropping empty spans
+  imgScale: 1,                // MSI scales images for 120dpi screens, so compensate
+
+  renameOK: 1,                // tells if brower will find a tag whose name
+                              //   has been set via setAttributes
+  styleChangeDelay: 0,        // true if style changes need a delay in order
+                              //   for them to be available
+
+  delay: 1,                   // delay for asynchronous math processing
+  processAtOnce: 16,          // number of math elements to process before screen update
+  
+  version: 0,                 // browser version number (when needed)
+
+  /*
+   *  Determine if the "top" of a <SPAN> is always at the same height
+   *  or varies with the height of the rest of the line (MSIE).
+   */
+  TestSpanHeight: function () {
+    jsMath.hidden.innerHTML = '<span><span style="'+this.block+';height:2em;width:1px"></span>x</span>';
+    var span = jsMath.hidden.firstChild;
+    var img  = span.firstChild;
+    this.spanHeightVaries = (span.offsetHeight >= img.offsetHeight && span.offsetHeight > 0);
+    this.spanHeightTooBig = (span.offsetHeight > img.offsetHeight);
+    jsMath.hidden.innerHTML = '';
+  },
+  
+  /*
+   *  Determine if an inline-block with 0 width is OK or not
+   *  and decide whether to use spans or images for spacing
+   */
+  TestInlineBlock: function () {
+    this.block = "display:-moz-inline-box";
+    this.hasInlineBlock = jsMath.BBoxFor('<span style="'+this.block+';width:10px;height:5px"></span>').w > 0;
+    if (this.hasInlineBlock) {
+      jsMath.styles['.typeset .blank'].display = '-moz-inline-box';
+      delete jsMath.styles['.typeset .spacer'].display;
+    } else {
+      this.block = "display:inline-block";
+      this.hasInlineBlock = jsMath.BBoxFor('<span style="'+this.block+';width:10px;height:5px"></span>').w > 0;
+      if (!this.hasInlineBlock) return;
+    }
+    this.block += ';overflow:hidden';
+    var h = jsMath.BBoxFor('x').h;
+    this.mozInlineBlockBug = jsMath.BBoxFor(
+       '<span style="'+this.block+';height:'+h+'px;width:1px"></span>x'+
+       '<span style="'+this.block+';height:'+h+'px;width:1px;vertical-align:-'+h+'px"></span>').h > 2*h;
+    this.widthAddsBorder = jsMath.BBoxFor('<span style="'+this.block+
+        ';overflow:hidden;height:1px;width:10px;border-left:10px solid"></span>').w > 10;
+    var h1 = jsMath.BBoxFor('<span style="'+this.block+';height:'+h+'px;width:1px"></span>x').h,
+        h2 = jsMath.BBoxFor('<span style="'+this.block+';height:'+h+'px;width:1px;border-left:1px solid"></span>x').h,
+        h3 = jsMath.BBoxFor('<span style="'+this.block+';height:2em"></span>').h;
+    this.msieBlockDepthBug = (h1 == h);
+    this.msieRuleDepthBug = (h2 == h);
+    this.blankWidthBug = (h3 == 0);
+  },
+  
+  /*
+   *  Determine if the NAME attribute of a tag can be changed
+   *  using the setAttribute function, and then be properly
+   *  returned by getElementByName.
+   */
+  TestRenameOK: function () {
+    jsMath.hidden.innerHTML = '<span></span>';
+    var test = jsMath.hidden.firstChild;
+    test.setAttribute('name','jsMath_test');
+    this.renameOK = (jsMath.document.getElementsByName('jsMath_test').length > 0);
+    jsMath.hidden.innerHTML = '';
+  },
+  
+  /*
+   *  See if style changes occur immediately, or if we need to delay
+   *  in order to let them take effect.
+   */
+  TestStyleChange: function () {
+    jsMath.hidden.innerHTML = '<span ID="jsMath_test">x</span>';
+    var span = jsMath.hidden.firstChild;
+    var w = span.offsetWidth;
+    jsMath.Setup.AddStyleSheet({'#jsMath_test': 'font-size:200%'});
+    this.styleChangeDelay = (span.offsetWidth == w);
+    jsMath.hidden.innerHTML = '';
+  },
+  
+  /*
+   *  Perform a version check on a standard version string
+   */
+  VersionAtLeast: function (v) {
+    var bv = new String(this.version).split('.');
+    v = new String(v).split('.'); if (v[1] == null) {v[1] = '0'}
+    return bv[0] > v[0] || (bv[0] == v[0] && bv[1] >= v[1]);
+  },
+
+  /*
+   *  Test for browser characteristics, and adjust things
+   *  to overcome specific browser bugs
+   */
+  Init: function () {
+    jsMath.browser = 'unknown';
+    this.TestInlineBlock();
+    this.TestSpanHeight();
+    this.TestRenameOK();
+    this.TestStyleChange();
+
+    this.MSIE();
+    this.Mozilla();
+    this.Opera();
+    this.OmniWeb();
+    this.Safari();
+    this.Konqueror();
+    
+    //
+    // Change some routines depending on the browser
+    // 
+    if (this.allowAbsoluteDelim) {
+      jsMath.Box.DelimExtend = jsMath.Box.DelimExtendAbsolute;
+      jsMath.Box.Layout = jsMath.Box.LayoutAbsolute;
+    } else {
+      jsMath.Box.DelimExtend = jsMath.Box.DelimExtendRelative;
+      jsMath.Box.Layout = jsMath.Box.LayoutRelative;
+    }
+    
+    if (this.separateSkips) {
+      jsMath.HTML.Place = jsMath.HTML.PlaceSeparateSkips;
+      jsMath.Typeset.prototype.Place = jsMath.Typeset.prototype.PlaceSeparateSkips;
+    }
+  },
+  
+  //
+  //  Handle bug-filled Internet Explorer
+  //
+  MSIE: function () {
+    if (jsMath.BBoxFor("<!--[if IE]>IE<![endif]-->").w) {
+      jsMath.browser = 'MSIE';
+      if (jsMath.platform == 'pc') {
+        this.IE7 = (window.XMLHttpRequest != null);
+        this.IE8 = (jsMath.BBoxFor("<!--[if gte IE 8]>IE8<![endif]-->").w > 0);
+        this.isReallyIE8 = (jsMath.document.documentMode != null);
+        this.quirks = (jsMath.document.compatMode == "BackCompat");
+        this.msieMode = (jsMath.document.documentMode || (this.quirks ? 5 : 7));
+        this.msieStandard6 = !this.quirks && !this.IE7;
+        this.allowAbsoluteDelim = 1; this.separateSkips = 1;
+        this.buttonCheck = 1; this.msieBlankBug = 1;
+        this.msieAccentBug = 1; this.msieRelativeClipBug = 1;
+        this.msieDivWidthBug = 1; this.msiePositionFixedBug = 1;
+        this.msieIntegralBug = 1; this.waitForImages = 1;
+        this.msieAlphaBug = !this.IE7; this.alphaPrintBug = !this.IE7;
+        this.msieCenterBugFix = 'position:relative; ';
+        this.msieInlineBlockFix = ' display:inline-block;';
+        this.msie8HeightBug = this.msieBBoxBug = (this.msieMode == 8);
+        this.blankWidthBug = (this.msieMode != 8);
+        this.msieSpaceFix = (this.isReallyIE8 ?
+            '<span style="display:inline-block; margin-right:-1px; width:1px"></span>' :
+            '<span style="margin-right:-1px; width:1px"></span>');
+        jsMath.Macro('joinrel','\\mathrel{\\kern-5mu}'),
+        jsMath.Parser.prototype.mathchardef.mapstocharOrig = jsMath.Parser.prototype.mathchardef.mapstochar;
+        delete jsMath.Parser.prototype.mathchardef.mapstochar;
+        jsMath.Macro('mapstochar','\\rlap{\\mapstocharOrig\\,}\\kern1mu'),
+        jsMath.styles['.typeset .arial'] = {'font-family': "'Arial unicode MS'"};
+        if (!this.IE7 || this.quirks) {
+          // MSIE doesn't implement fixed positioning, so use absolute
+          jsMath.styles['#jsMath_message'].position = 'absolute';
+          delete jsMath.styles['#jsMath_message'].width;
+          jsMath.styles['#jsMath_panel'].position = 'absolute';
+          delete jsMath.styles['#jsMath_panel'].width;
+          jsMath.styles['#jsMath_button'].width = '1px';
+          jsMath.styles['#jsMath_button'].position = 'absolute'
+          delete jsMath.styles['#jsMath_button'].width;
+	  jsMath.fixedDiv = jsMath.Setup.DIV("fixedDiv",{position:'absolute', zIndex: 101});
+	  jsMath.window.attachEvent("onscroll",jsMath.Controls.MoveButton);
+	  jsMath.window.attachEvent("onresize",jsMath.Controls.MoveButton);
+	  jsMath.Controls.MoveButton();
+	}
+        // Make MSIE put borders around the whole button
+        jsMath.styles['#jsMath_noFont .link'].display = "inline-block";
+        // MSIE needs this NOT to be inline-block
+        delete jsMath.styles['.typeset .spacer'].display;
+        // MSIE can't insert DIV's into text nodes, so tex2math must use SPAN's to fake DIV's
+        jsMath.styles['.tex2math_div'] = {}; jsMath.Add(jsMath.styles['.tex2math_div'],jsMath.styles['div.typeset']);
+        jsMath.styles['.tex2math_div'].width = '100%';
+        jsMath.styles['.tex2math_div'].display = 'inline-block';
+        // Reduce occurrance of zoom bug in IE7
+        jsMath.styles['.typeset']['letter-spacing'] = '0';
+        // MSIE will rescale images if the DPIs differ
+        if (screen.deviceXDPI && screen.logicalXDPI 
+             && screen.deviceXDPI != screen.logicalXDPI) {
+          this.imgScale *= screen.logicalXDPI/screen.deviceXDPI;
+          jsMath.Controls.cookie.alpha = 0;
+        }
+        //  IE8 doesn't puts ALL boxes at the bottom rather than on the baseline
+        if (this.msieRuleDepthBug) {jsMath.HTML.Strut = jsMath.HTML.msieStrut}
+      } else if (jsMath.platform == 'mac') {
+        this.msieAbsoluteBug = 1; this.msieButtonBug = 1;
+        this.msieDivWidthBug = 1; this.msieBlankBug = 1;
+        this.quirks = 1;
+        jsMath.Setup.Script('jsMath-msie-mac.js');
+        jsMath.Parser.prototype.macros.angle = ['Replace','ord','<font face="Symbol">&#x8B;</font>','normal'];
+        jsMath.styles['#jsMath_panel'].width = '42em';
+        jsMath.Controls.cookie.printwarn = 0; // MSIE/Mac doesn't handle '@media screen'
+      }
+      this.processAtOnce = Math.max(Math.floor((this.processAtOnce+1)/2),1);
+      jsMath.Macro('not','\\mathrel{\\rlap{\\kern3mu/}}');
+      jsMath.Macro('angle','\\raise1.84pt{\\kern2.5mu\\rlap{\\scriptstyle/}\\kern.5pt\\rule{.4em}{-1.5pt}{1.84pt}\\kern2.5mu}');
+    }
+  },
+
+  //
+  //  Handle Netscape/Mozilla (any flavor)
+  //
+  Mozilla: function () {
+    if (jsMath.hidden.ATTRIBUTE_NODE && jsMath.window.directories) {
+      jsMath.browser = 'Mozilla';
+      if (jsMath.platform == 'pc') {this.alphaPrintBug = 1}
+      this.allowAbsoluteDelim = 1;
+      jsMath.styles['#jsMath_button'].cursor = jsMath.styles['#jsMath_noFont .link'].cursor = 'pointer',
+      jsMath.Macro('not','\\mathrel{\\rlap{\\kern3mu/}}');
+      jsMath.Macro('angle','\\raise1.34pt{\\kern2.5mu\\rlap{\\scriptstyle/}\\rule{.4em}{-1pt}{1.34pt}\\kern2.5mu}');
+      if (navigator.vendor == 'Firefox') {
+        this.version = navigator.vendorSub;
+      } else if (navigator.userAgent.match(' Firefox/([0-9.]+)([a-z ]|$)')) {
+        this.version = RegExp.$1;
+      }
+      if (this.VersionAtLeast("3.0")) {this.mozImageSizeBug = this.lineBreakBug = 1}
+    }
+  },
+  
+  //
+  //  Handle OmniWeb
+  //
+  OmniWeb: function () {
+    if (navigator.accentColorName) {
+      jsMath.browser = 'OmniWeb';
+      this.allowAbsolute = this.hasInlineBlock;
+      this.allowAbsoluteDelim = this.allowAbsolute;
+      this.valignBug = !this.allowAbsolute;
+      this.buttonCheck = 1; this.textNodeBug = 1;
+      jsMath.noChangeGlobal = 1; // OmniWeb craches on GoGlobal
+      if (!this.hasInlineBlock) {jsMath.Setup.Script('jsMath-old-browsers.js')}
+    }
+  },
+    
+  //
+  //  Handle Opera
+  //
+  Opera: function () {
+    if (this.spanHeightTooBig) {
+      jsMath.browser = 'Opera';
+      var isOld = navigator.userAgent.match("Opera 7");
+      this.allowAbsolute = 0;
+      this.delay = 10;
+      this.operaHiddenFix = '[Processing]';
+      if (isOld) {jsMath.Setup.Script('jsMath-old-browsers.js')}
+      var version = navigator.appVersion.match(/^(\d+\.\d+)/);
+      if (version) {this.version = version[1]} else {this.vesion = 0}
+      this.operaAbsoluteWidthBug = this.operaLineHeightBug = (version[1] >= 9.5 && version[1] < 9.6);
+    }
+  },
+
+  //
+  //  Handle Safari
+  //
+  Safari: function () {
+    if (navigator.appVersion.match(/Safari\//)) {
+      jsMath.browser = 'Safari';
+      if (navigator.vendor.match(/Google/)) {jsMath.browser = 'Chrome'}
+      var version = navigator.userAgent.match("Safari/([0-9]+)");
+      version = (version)? version[1] : 400; this.version = version;
+      jsMath.TeX.axis_height += .05;
+      this.allowAbsoluteDelim = version >= 125;
+      this.safariIFRAMEbug = version >= 312 && version < 412;
+      this.safariButtonBug = version < 412;
+      this.safariImgBug = 1; this.textNodeBug = 1;
+      this.lineBreakBug = version >= 526;
+      this.buttonCheck = version < 500;
+      this.styleChangeDelay = 1;
+      jsMath.Macro('not','\\mathrel{\\rlap{\\kern3.25mu/}}');
+    }
+  },
+  
+  //
+  //  Handle Konqueror
+  //
+  Konqueror: function () {
+    if (navigator.product && navigator.product.match("Konqueror")) {
+      jsMath.browser = 'Konqueror';
+      this.allowAbsolute = 0;
+      this.allowAbsoluteDelim = 0;
+      if (navigator.userAgent.match(/Konqueror\/(\d+)\.(\d+)/)) {
+        if (RegExp.$1 < 3 || (RegExp.$1 == 3 && RegExp.$2 < 3)) {
+          this.separateSkips = 1;
+          this.valignBug = 1;
+          jsMath.Setup.Script('jsMath-old-browsers.js');
+        }
+      }
+      //  Apparently, Konqueror wants the names without the hyphen
+      jsMath.Add(jsMath.styles,{
+        '.typeset .cmr10':  'font-family: jsMath-cmr10, jsMath cmr10, serif',
+        '.typeset .cmbx10': 'font-family: jsMath-cmbx10, jsMath cmbx10, jsMath-cmr10, jsMath cmr10',
+        '.typeset .cmti10': 'font-family: jsMath-cmti10, jsMath cmti10, jsMath-cmr10, jsMath cmr10',
+        '.typeset .cmmi10': 'font-family: jsMath-cmmi10, jsMath cmmi10',
+        '.typeset .cmsy10': 'font-family: jsMath-cmsy10, jsMath cmsy10',
+        '.typeset .cmex10': 'font-family: jsMath-cmex10, jsMath cmex10'
+      });
+      jsMath.Font.testFont = "jsMath-cmex10, jsMath cmex10";
+    }
+  }
+
+};
+
+/***************************************************************************/
+
+/*
+ *  Implement font check and messages
+ */
+jsMath.Font = {
+  
+  testFont: "jsMath-cmex10",
+  fallback: "symbol", // the default fallback method
+  register: [],       // list of fonts registered before jsMath.Init()
+
+  // the HTML for the missing font message
+  message:    
+    '<b>No jsMath TeX fonts found</b> -- using image fonts instead.<br/>\n'
+      + 'These may be slow and might not print well.<br/>\n'
+      + 'Use the jsMath control panel to get additional information.',
+      
+  extra_message:
+    'Extra TeX fonts not found: <b><span id="jsMath_ExtraFonts"></span></b><br/>'
+      + 'Using image fonts instead.  This may be slow and might not print well.<br/>\n'
+      + 'Use the jsMath control panel to get additional information.',
+
+  print_message:
+    'To print higher-resolution math symbols, click the<br/>\n'
+       + '<b>Hi-Res Fonts for Printing</b> button on the jsMath control panel.<br/>\n',
+
+  alpha_message:
+    'If the math symbols print as black boxes, turn off <b>image alpha channels</b><br/>\n'
+       + 'using the <B>Options</B> pane of the jsMath control panel.<br/>\n',
+  
+  /*
+   *  Look to see if a font is found.
+   *  Check the character in a given position, and see if it is
+   *  wider than the usual one in that position.
+   */
+  Test1: function (name,n,factor,prefix) {
+    if (n == null) {n = 0x7C}; if (factor == null) {factor = 2}; if (prefix == null) {prefix = ''}
+    var wh1 = jsMath.BBoxFor('<span style="font-family: '+prefix+name+', serif">'+jsMath.TeX[name][n].c+'</span>');
+    var wh2 = jsMath.BBoxFor('<span style="font-family: serif">'+jsMath.TeX[name][n].c+'</span>');
+    //alert([wh1.w,wh2.w,wh1.h,factor*wh2.w]);
+    return (wh1.w > factor*wh2.w && wh1.h != 0);
+  },
+
+  Test2: function (name,n,factor,prefix) {
+    if (n == null) {n = 0x7C}; if (factor == null) {factor = 2}; if (prefix == null) {prefix = ''}
+    var wh1 = jsMath.BBoxFor('<span style="font-family: '+prefix+name+', serif">'+jsMath.TeX[name][n].c+'</span>');
+    var wh2 = jsMath.BBoxFor('<span style="font-family: serif">'+jsMath.TeX[name][n].c+'</span>');
+    //alert([wh2.w,wh1.w,wh1.h,factor*wh1.w]);
+    return (wh2.w > factor*wh1.w && wh1.h != 0);
+  },
+  
+  /*
+   *  Check for the new jsMath versions of the fonts (blacker with
+   *  different encoding) and if not found, look for old-style fonts.
+   *  If they are found, load the BaKoMa encoding information.
+   */
+  CheckTeX: function () {
+    var wh = jsMath.BBoxFor('<span style="font-family: '+jsMath.Font.testFont+', serif">'+jsMath.TeX.cmex10[1].c+'</span>');
+    jsMath.nofonts = ((wh.w*3 > wh.h || wh.h == 0) && !this.Test1('cmr10',null,null,'jsMath-'));
+    if (!jsMath.nofonts) return;
+    /* 
+     * if (jsMath.browser != 'Mozilla' ||
+     *      (jsMath.platform == "mac" &&
+     *        (!jsMath.Browser.VersionAtLeast(1.5) || jsMath.Browser.VersionAtLeast(3.0))) ||
+     *      (jsMath.platform != "mac" && !jsMath.Browser.VersionAtLeast(3.0))) {
+     *   wh = jsMath.BBoxFor('<span style="font-family: CMEX10, serif">'+jsMath.TeX.cmex10[1].c+'</span>');
+     *   jsMath.nofonts = ((wh.w*3 > wh.h || wh.h == 0) && !this.Test1('cmr10'));
+     *   if (!jsMath.nofonts) {jsMath.Setup.Script("jsMath-BaKoMa-fonts.js")}
+     * }
+     */
+  },
+  
+  /*
+   *  Check for the availability of TeX fonts.  We do this by looking at
+   *  the width and height of a character in the cmex10 font.  The cmex10
+   *  font has depth considerably greater than most characters' widths (the
+   *  whole font has the depth of the character with greatest depth).  This
+   *  is not the case for most fonts, so if we can access cmex10, the
+   *  height of a character should be much bigger than the width.
+   *  Otherwise, if we don't have cmex10, we'll get a character in another
+   *  font with normal height and width.  In this case, we insert a message
+   *  pointing the user to the jsMath site, and load one of the fallback
+   *  definitions.
+   *  
+   */
+  Check: function () {
+    var cookie = jsMath.Controls.cookie;
+    this.CheckTeX();
+    if (jsMath.nofonts) {
+      if (cookie.autofont || cookie.font == 'tex') {
+        cookie.font = this.fallback;
+        if (cookie.warn) {
+          jsMath.nofontMessage = 1;
+          cookie.warn = 0; jsMath.Controls.SetCookie(0);
+          if (jsMath.window.NoFontMessage) {jsMath.window.NoFontMessage()}
+                               else {this.Message(this.message)}
+        }
+      }
+    } else {
+      if (cookie.autofont) {cookie.font = 'tex'}
+      if (cookie.font == 'tex') return;
+    }
+    if (jsMath.noImgFonts) {cookie.font = 'unicode'}
+    if (cookie.font == 'unicode') {
+      jsMath.Setup.Script('jsMath-fallback-'+jsMath.platform+'.js');
+      jsMath.Box.TeXnonfallback = jsMath.Box.TeX;
+      jsMath.Box.TeX = jsMath.Box.TeXfallback;
+      return;
+    }
+    if (!cookie.print && cookie.printwarn) {
+      this.PrintMessage(
+        (jsMath.Browser.alphaPrintBug && jsMath.Controls.cookie.alpha) ?
+          this.print_message + this.alpha_message : this.print_message);
+    }
+    if (jsMath.Browser.waitForImages) {
+      jsMath.Script.Push(jsMath.Script,"WaitForImage",jsMath.blank);
+    }
+    if (cookie.font == 'symbol') {
+      jsMath.Setup.Script('jsMath-fallback-symbols.js');
+      jsMath.Box.TeXnonfallback = jsMath.Box.TeX;
+      jsMath.Box.TeX = jsMath.Box.TeXfallback;
+      return;
+    }
+    jsMath.Img.SetFont({
+      cmr10:  ['all'], cmmi10: ['all'], cmsy10: ['all'],
+      cmex10: ['all'], cmbx10: ['all'], cmti10: ['all']
+    });
+    jsMath.Img.LoadFont('cm-fonts');
+  },
+
+  /*
+   *  The message for when no TeX fonts.  You can eliminate this message
+   *  by including
+   *  
+   *      <script>jsMath = {Font: {Message: function () {}}}</script>
+   *
+   *  in your HTML file, before loading jsMath.js, if you want.  But this
+   *  means the user may not know that he or she can get a better version
+   *  of your page.
+   */
+  Message: function (message) {
+    if (jsMath.Element("Warning")) return;
+    var div = jsMath.Setup.DIV("Warning",{});
+    div.innerHTML = 
+      '<center><table><tr><td>'
+      + '<div id="jsMath_noFont"><div class="message">' + message
+      + '<div style="text-align:left"><span style="float:left; margin: 8px 0px 0px 20px">'
+      + '<span onclick="jsMath.Controls.Panel()" title=" Open the jsMath Control Panel " class="link">jsMath Control Panel</span>'
+      + '</span><span style="margin: 8px 20px 0px 0px; float:right">'
+      + '<span onclick="jsMath.Font.HideMessage()" title=" Remove this font warning message " class="link">Hide this Message</span>'
+      + '</span></div><div style="height:6px"></div><br clear="all"/></div></div>'
+      + '<div style="width:22em; height:1px"></div>'
+      + '</td></tr></table></center><hr/>';
+  },
+  
+  HideMessage: function () {
+    var message = jsMath.Element("Warning");
+    if (message) {message.style.display = "none"}
+  },
+  
+  PrintMessage: function (message) {
+    if (jsMath.Element("PrintWarning")) return;
+    var div = jsMath.Setup.DIV("PrintWarning",{});
+    div.innerHTML = 
+      '<center><table><tr><td>'
+      + '<div class="message">' + message + '</div>'
+      + '<div style="width:22em; height:1px"></div>'
+      + '</td></tr></table></center><hr/>';
+  },
+  
+  /*
+   *  Register an extra font so jsMath knows about it
+   */
+  Register: function (data,force) {
+    if (typeof(data) == 'string') {data = {name: data}}
+    if (!jsMath.Setup.inited && !force) {
+      this.register[this.register.length] = data;
+      return;
+    }
+    var fontname = data.name; var name = fontname.replace(/10$/,'');
+    var fontfam = jsMath.TeX.fam.length;
+    if (data.prefix == null) {data.prefix = ""}
+    if (!data.style) {data.style = "font-family: "+data.prefix+fontname+", serif"}
+    if (!data.styles) {data.styles = {}}
+    if (!data.macros) {data.macros = {}}
+    /*
+     *  Register font family
+     */
+    jsMath.TeX.fam[fontfam] = fontname;
+    jsMath.TeX.famName[fontname] = fontfam;
+    data.macros[name] = ['HandleFont',fontfam];
+    jsMath.Add(jsMath.Parser.prototype.macros,data.macros);
+    /*
+     *  Set up styles
+     */
+    data.styles['.typeset .'+fontname] = data.style;
+    jsMath.Setup.Styles(data.styles);
+    if (jsMath.initialized) {jsMath.Script.Push(jsMath.Setup,'TeXfont',fontname)}
+    /*
+     *  Check for font and give message if missing
+     */
+    var cookie = jsMath.Controls.cookie;
+    var hasTeXfont = !jsMath.nofonts &&
+                      data.test(fontname,data.testChar,data.testFactor,data.prefix);
+    if (hasTeXfont && cookie.font == 'tex') {
+      if (data.tex) {data.tex(fontname,fontfam,data)}
+      return;
+    }
+    if (!hasTeXfont && cookie.warn && cookie.font == 'tex' && !jsMath.nofonts) {
+      if (!cookie.fonts.match("/"+fontname+"/")) {
+        cookie.fonts += fontname + "/"; jsMath.Controls.SetCookie(0);
+        if (!jsMath.Element("Warning")) this.Message(this.extra_message);
+        var extra = jsMath.Element("ExtraFonts");
+        if (extra) {
+          if (extra.innerHTML != "") {extra.innerHTML += ','}
+          extra.innerHTML += " " + data.prefix+fontname;
+        }
+      }
+    }
+    if (cookie.font == 'unicode' || jsMath.noImgFonts) {
+      if (data.fallback) {data.fallback(fontname,fontfam,data)}
+      return;
+    }
+    //  Image fonts
+    var font = {};
+    if (cookie.font == 'symbol' && data.symbol != null) {
+      font[fontname] = data.symbol(fontname,fontfam,data);
+    } else {
+      font[fontname] = ['all'];
+    }
+    jsMath.Img.SetFont(font);
+    jsMath.Img.LoadFont(fontname);
+    if (jsMath.initialized) {
+      jsMath.Script.Push(jsMath.Img,'Scale');
+      jsMath.Script.Push(jsMath.Img,'UpdateFonts');
+    }
+  },
+  /*
+   *  If fonts are registered before jsMath.Init() is called, jsMath.em
+   *  will not be available, so they need to be delayed.
+   */
+  LoadRegistered: function () {
+    var i = 0;
+    while (i < this.register.length) {this.Register(this.register[i++],1)}
+    this.register = [];
+  },
+
+  /*
+   *  Load a font
+   */
+  Load: function (name) {jsMath.Setup.Script(this.URL(name))},
+  URL: function (name) {return jsMath.Img.root+name+'/def.js'}
+  
+};
+
+/***************************************************************************/
+
+/*
+ *  Implements the jsMath control panel.
+ *  Much of the code is in jsMath-controls.html, which is
+ *  loaded into a hidden IFRAME on demand
+ */
+jsMath.Controls = {
+
+  //  Data stored in the jsMath cookie
+  cookie: {
+    scale: 100,
+    font: 'tex', autofont: 1, scaleImg: 0, alpha: 1,
+    warn: 1, fonts: '/', printwarn: 1, stayhires: 0,
+    button: 1, progress: 1, asynch: 0, blank: 0,
+    print: 0, keep: '0D', global: 'auto', hiddenGlobal: 1
+  },
+  
+  cookiePath: '/',  // can also set cookieDomain
+  noCookiePattern: /^(file|mk):$/,  // pattern for handling cookies locally
+  
+  
+  /*
+   *  Create the HTML needed for control panel
+   */
+  Init: function () {
+    this.panel = jsMath.Setup.DIV("panel",{display:'none'},jsMath.fixedDiv);
+    if (!jsMath.Browser.msieButtonBug) {this.Button()}
+      else {setTimeout("jsMath.Controls.Button()",500)}
+  },
+
+  /*
+   *  Load the control panel
+   */
+  Panel: function () {
+    jsMath.Translate.Cancel();
+    if (this.loaded) {this.Main()}
+      else {jsMath.Script.delayedLoad(jsMath.root+"jsMath-controls.html")}
+  },
+  
+  /*
+   *  Create the control panel button
+   */
+  Button: function () {
+    var button = jsMath.Setup.DIV("button",{},jsMath.fixedDiv);
+    button.title = ' Open jsMath Control Panel ';
+    button.innerHTML = 
+      '<span onclick="jsMath.Controls.Panel()">jsMath</span>';
+    if (!jsMath.Global.isLocal && !jsMath.noShowGlobal) {
+      button.innerHTML +=
+        '<span id="jsMath_global" title=" Open jsMath Global Panel " '
+          + 'onclick="jsMath.Global.Show(1)">Global&nbsp;</span>';
+    }
+    if (button.offsetWidth < 30) {button.style.width = "auto"}
+    if (!this.cookie.button) {button.style.display = "none"}
+  },
+  
+  /*
+   *  Since MSIE doesn't handle position:float, we need to have the
+   *  window repositioned every time the window scrolls.  We do that
+   *  putting the floating elements into a window-sized DIV, but
+   *  absolutely positioned, and then move the DIV.
+   */
+  MoveButton: function () {
+    var body = (jsMath.Browser.quirks ? document.body : document.documentElement);
+    jsMath.fixedDiv.style.left = body.scrollLeft + 'px';
+    jsMath.fixedDiv.style.top = body.scrollTop + body.clientHeight + 'px';
+    jsMath.fixedDiv.style.width = body.clientWidth + 'px';
+//    jsMath.fixedDiv.style.top = body.scrollTop + 'px';
+//    jsMath.fixedDiv.style.height = body.clientHeight + 'px';
+  },
+
+  /*
+   *  Get the cookie data from the browser
+   *  (for file: references, use url '?' syntax)
+   */
+  GetCookie: function () {
+    // save the current cookie settings as the defaults
+    if (this.defaults == null) {this.defaults = {}}
+    jsMath.Add(this.defaults,this.cookie); this.userSet = {};
+    // get the browser's cookie data
+    var cookies = jsMath.document.cookie;
+    if (jsMath.window.location.protocol.match(this.noCookiePattern)) {
+      cookies = this.localGetCookie();
+      this.isLocalCookie = 1;
+    }
+    if (cookies.match(/jsMath=([^;]+)/)) {
+      var data = unescape(RegExp.$1).split(/,/);
+      for (var i = 0; i < data.length; i++) {
+        var x = data[i].match(/(.*):(.*)/);
+        if (x[2].match(/^\d+$/)) {x[2] = 1*x[2]} // convert from string
+        this.cookie[x[1]] = x[2];
+        this.userSet[x[1]] = 1;
+      }
+    }
+  },
+  localGetCookie: function () {
+    return jsMath.window.location.search.substr(1);
+  },
+  
+  /*
+   *  Save the cookie data in the browser
+   *  (for file: urls, append data like CGI reference)
+   */
+  SetCookie: function (warn) {
+    var cookie = [];
+    for (var id in this.cookie) {
+      if (this.defaults[id] == null || this.cookie[id] != this.defaults[id])
+        {cookie[cookie.length] = id + ':' + this.cookie[id]}
+    }
+    cookie = cookie.join(',');
+    if (this.isLocalCookie) {
+      if (warn == 2) {return 'jsMath='+escape(cookie)}
+      this.localSetCookie(cookie,warn);
+    } else {
+      cookie = escape(cookie);
+      if (cookie == '') {warn = 0}
+      if (this.cookiePath) {cookie += '; path='+this.cookiePath}
+      if (this.cookieDomain) {cookie += '; domain='+this.cookieDomain}
+      if (this.cookie.keep != '0D') {
+        var ms = {
+          D: 1000*60*60*24,
+          W: 1000*60*60*24*7,
+          M: 1000*60*60*24*30,
+          Y: 1000*60*60*24*365
+        };
+        var exp = new Date;
+        exp.setTime(exp.getTime() +
+            this.cookie.keep.substr(0,1) * ms[this.cookie.keep.substr(1,1)]);
+        cookie += '; expires=' + exp.toGMTString();
+      }
+      if (cookie != '') {
+        jsMath.document.cookie = 'jsMath='+cookie;
+        var cookies = jsMath.document.cookie;
+        if (warn && !cookies.match(/jsMath=/))
+          {alert("Cookies must be enabled in order to save jsMath options")}
+      }
+    }
+    return null;
+  },
+  localSetCookie: function (cookie,warn) {
+    if (!warn) return;
+    var href = String(jsMath.window.location).replace(/\?.*/,"");
+    if (cookie != '') {href += '?jsMath=' + escape(cookie)}
+    if (href != jsMath.window.location.href) {this.Reload(href)}
+  },
+  
+  /*
+   *  Reload the page (with the given URL)
+   */
+  Reload: function (url) {
+    if (!this.loaded) return;
+    this.loaded = 0; jsMath.Setup.inited = -100;
+    jsMath.Global.ClearCache();
+    if (url) {jsMath.window.location.replace(url)}
+        else {jsMath.window.location.reload()}
+  }
+  
+};
+
+/***************************************************************************/
+
+/*
+ *  Implements the actions for clicking and double-clicking
+ *  on math formulas
+ */
+jsMath.Click = {
+  
+  /*
+   *  Handle clicking on math to get control panel
+   */
+  CheckClick: function (event) {
+    if (!event) {event = jsMath.window.event}
+    if (event.altKey) jsMath.Controls.Panel();
+  },
+  
+  /*
+   *  Handle double-click for seeing TeX code
+   */
+
+  CheckDblClick: function (event) {
+    if (!event) {event = jsMath.window.event}
+    if (!jsMath.Click.DblClick) {
+      jsMath.Extension.Require('double-click',1);
+      // Firefox clears the event, so copy it
+      var tmpEvent = event; event = {};
+      for (var id in tmpEvent) {event[id] = tmpEvent[id]}
+    }
+    jsMath.Script.Push(jsMath.Click,'DblClick',[event,this.alt]);
+  }
+  
+};
+
+/***************************************************************************/
+
+/*
+ *  The TeX font information
+ */
+jsMath.TeX = {
+
+  //
+  //  The TeX font parameters
+  //
+  thinmuskip:   3/18,
+  medmuskip:    4/18,
+  thickmuskip:  5/18,
+
+  x_height:    .430554,
+  quad:        1,
+  num1:        .676508,
+  num2:        .393732,
+  num3:        .44373,
+  denom1:      .685951,
+  denom2:      .344841,
+  sup1:        .412892,
+  sup2:        .362892,
+  sup3:        .288888,
+  sub1:        .15,
+  sub2:        .247217,
+  sup_drop:    .386108,
+  sub_drop:    .05,
+  delim1:     2.39,
+  delim2:     1.0,
+  axis_height: .25,
+  default_rule_thickness: .06,
+  big_op_spacing1:  .111111,
+  big_op_spacing2:  .166666,
+  big_op_spacing3:  .2,
+  big_op_spacing4:  .6,
+  big_op_spacing5:  .1,
+
+  integer:          6553.6,     // conversion of em's to TeX internal integer
+  scriptspace:         .05,
+  nulldelimiterspace:  .12,
+  delimiterfactor:     901,
+  delimitershortfall:   .5,
+  scale:                 1,     //  scaling factor for font dimensions
+ 
+  //  The TeX math atom types (see Appendix G of the TeXbook)
+  atom: ['ord', 'op', 'bin', 'rel', 'open', 'close', 'punct', 'ord'],
+
+  //  The TeX font families
+  fam: ['cmr10','cmmi10','cmsy10','cmex10','cmti10','','cmbx10',''],
+  famName: {cmr10:0, cmmi10:1, cmsy10:2, cmex10:3, cmti10:4, cmbx10:6},
+
+  //  Encoding used by jsMath fonts
+  encoding: [
+    '&#xC0;', '&#xC1;', '&#xC2;', '&#xC3;', '&#xC4;', '&#xC5;', '&#xC6;', '&#xC7;',
+    '&#xC8;', '&#xC9;', '&#xCA;', '&#xCB;', '&#xCC;', '&#xCD;', '&#xCE;', '&#xCF;',
+
+    '&#xB0;', '&#xD1;', '&#xD2;', '&#xD3;', '&#xD4;', '&#xD5;', '&#xD6;', '&#xB7;',
+    '&#xD8;', '&#xD9;', '&#xDA;', '&#xDB;', '&#xDC;', '&#xB5;', '&#xB6;', '&#xDF;',
+
+    '&#xEF;', '!', '&#x22;', '#', '$', '%', '&#x26;', '&#x27;',
+    '(', ')', '*', '+', ',', '-', '.', '/',
+
+    '0', '1', '2', '3', '4', '5', '6', '7',
+    '8', '9', ':', ';', '&#x3C;', '=', '&#x3E;', '?',
+
+    '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G',
+    'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
+
+    'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
+    'X', 'Y', 'Z', '[', '&#x5C;', ']', '^', '_',
+
+    '`', 'a', 'b', 'c', 'd', 'e', 'f', 'g',
+    'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
+
+    'p', 'q', 'r', 's', 't', 'u', 'v', 'w',
+    'x', 'y', 'z', '{', '|', '}', '&#x7E;', '&#xFF;'
+  ],
+
+  /*
+   *  The following are the TeX font mappings and metrics.  The metric
+   *  information comes directly from the TeX .tfm files.  Browser-specific
+   *  adjustments are made to these tables in the Browser.Init() routine
+   */
+  cmr10: [
+    [0.625,0.683], [0.833,0.683], [0.778,0.683], [0.694,0.683],
+    [0.667,0.683], [0.75,0.683], [0.722,0.683], [0.778,0.683],
+    [0.722,0.683], [0.778,0.683], [0.722,0.683],
+    [0.583,0.694,0,{ic: 0.0778, krn: {'39': 0.0778, '63': 0.0778, '33': 0.0778, '41': 0.0778, '93': 0.0778}, lig: {'105': 14, '108': 15}}],
+    [0.556,0.694], [0.556,0.694], [0.833,0.694], [0.833,0.694],
+
+    [0.278,0.431], [0.306,0.431,0.194], [0.5,0.694], [0.5,0.694],
+    [0.5,0.628], [0.5,0.694], [0.5,0.568], [0.75,0.694],
+    [0.444,0,0.17], [0.5,0.694], [0.722,0.431], [0.778,0.431],
+    [0.5,0.528,0.0972], [0.903,0.683], [1.01,0.683], [0.778,0.732,0.0486],
+
+    [0.278,0.431,0,{krn: {'108': -0.278, '76': -0.319}}],
+    [0.278,0.694,0,{lig: {'96': 60}}],
+    [0.5,0.694], [0.833,0.694,0.194], [0.5,0.75,0.0556],
+    [0.833,0.75,0.0556], [0.778,0.694],
+    [0.278,0.694,0,{krn: {'63': 0.111, '33': 0.111}, lig: {'39': 34}}],
+    [0.389,0.75,0.25], [0.389,0.75,0.25], [0.5,0.75],
+    [0.778,0.583,0.0833], [0.278,0.106,0.194],
+    [0.333,0.431,0,{lig: {'45': 123}}],
+    [0.278,0.106], [0.5,0.75,0.25],
+
+    [0.5,0.644], [0.5,0.644], [0.5,0.644], [0.5,0.644],
+    [0.5,0.644], [0.5,0.644], [0.5,0.644], [0.5,0.644],
+    [0.5,0.644], [0.5,0.644], [0.278,0.431], [0.278,0.431,0.194],
+    [0.278,0.5,0.194], [0.778,0.367,-0.133], [0.472,0.5,0.194],
+    [0.472,0.694,0,{lig: {'96': 62}}],
+
+    [0.778,0.694],
+    [0.75,0.683,0,{krn: {'116': -0.0278, '67': -0.0278, '79': -0.0278, '71': -0.0278, '85': -0.0278, '81': -0.0278, '84': -0.0833, '89': -0.0833, '86': -0.111, '87': -0.111}}],
+    [0.708,0.683], [0.722,0.683],
+    [0.764,0.683,0,{krn: {'88': -0.0278, '87': -0.0278, '65': -0.0278, '86': -0.0278, '89': -0.0278}}],
+    [0.681,0.683],
+    [0.653,0.683,0,{krn: {'111': -0.0833, '101': -0.0833, '117': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.111, '79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}}],
+    [0.785,0.683], [0.75,0.683], [0.361,0.683,0,{krn: {'73': 0.0278}}],
+    [0.514,0.683],
+    [0.778,0.683,0,{krn: {'79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}}],
+    [0.625,0.683,0,{krn: {'84': -0.0833, '89': -0.0833, '86': -0.111, '87': -0.111}}],
+    [0.917,0.683], [0.75,0.683],
+    [0.778,0.683,0,{krn: {'88': -0.0278, '87': -0.0278, '65': -0.0278, '86': -0.0278, '89': -0.0278}}],
+
+    [0.681,0.683,0,{krn: {'65': -0.0833, '111': -0.0278, '101': -0.0278, '97': -0.0278, '46': -0.0833, '44': -0.0833}}],
+    [0.778,0.683,0.194],
+    [0.736,0.683,0,{krn: {'116': -0.0278, '67': -0.0278, '79': -0.0278, '71': -0.0278, '85': -0.0278, '81': -0.0278, '84': -0.0833, '89': -0.0833, '86': -0.111, '87': -0.111}}],
+    [0.556,0.683],
+    [0.722,0.683,0,{krn: {'121': -0.0278, '101': -0.0833, '111': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.0833, '117': -0.0833}}],
+    [0.75,0.683],
+    [0.75,0.683,0,{ic: 0.0139, krn: {'111': -0.0833, '101': -0.0833, '117': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.111, '79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}}],
+    [1.03,0.683,0,{ic: 0.0139, krn: {'111': -0.0833, '101': -0.0833, '117': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.111, '79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}}],
+    [0.75,0.683,0,{krn: {'79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}}],
+    [0.75,0.683,0,{ic: 0.025, krn: {'101': -0.0833, '111': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.0833, '117': -0.0833}}],
+    [0.611,0.683], [0.278,0.75,0.25], [0.5,0.694],
+    [0.278,0.75,0.25], [0.5,0.694], [0.278,0.668],
+
+    [0.278,0.694,0,{lig: {'96': 92}}],
+    [0.5,0.431,0,{krn: {'118': -0.0278, '106': 0.0556, '121': -0.0278, '119': -0.0278}}],
+    [0.556,0.694,0,{krn: {'101': 0.0278, '111': 0.0278, '120': -0.0278, '100': 0.0278, '99': 0.0278, '113': 0.0278, '118': -0.0278, '106': 0.0556, '121': -0.0278, '119': -0.0278}}],
+    [0.444,0.431,0,{krn: {'104': -0.0278, '107': -0.0278}}],
+    [0.556,0.694], [0.444,0.431],
+    [0.306,0.694,0,{ic: 0.0778, krn: {'39': 0.0778, '63': 0.0778, '33': 0.0778, '41': 0.0778, '93': 0.0778}, lig: {'105': 12, '102': 11, '108': 13}}],
+    [0.5,0.431,0.194,{ic: 0.0139, krn: {'106': 0.0278}}],
+    [0.556,0.694,0,{krn: {'116': -0.0278, '117': -0.0278, '98': -0.0278, '121': -0.0278, '118': -0.0278, '119': -0.0278}}],
+    [0.278,0.668], [0.306,0.668,0.194],
+    [0.528,0.694,0,{krn: {'97': -0.0556, '101': -0.0278, '97': -0.0278, '111': -0.0278, '99': -0.0278}}],
+    [0.278,0.694],
+    [0.833,0.431,0,{krn: {'116': -0.0278, '117': -0.0278, '98': -0.0278, '121': -0.0278, '118': -0.0278, '119': -0.0278}}],
+    [0.556,0.431,0,{krn: {'116': -0.0278, '117': -0.0278, '98': -0.0278, '121': -0.0278, '118': -0.0278, '119': -0.0278}}],
+    [0.5,0.431,0,{krn: {'101': 0.0278, '111': 0.0278, '120': -0.0278, '100': 0.0278, '99': 0.0278, '113': 0.0278, '118': -0.0278, '106': 0.0556, '121': -0.0278, '119': -0.0278}}],
+
+    [0.556,0.431,0.194,{krn: {'101': 0.0278, '111': 0.0278, '120': -0.0278, '100': 0.0278, '99': 0.0278, '113': 0.0278, '118': -0.0278, '106': 0.0556, '121': -0.0278, '119': -0.0278}}],
+    [0.528,0.431,0.194], [0.392,0.431], [0.394,0.431],
+    [0.389,0.615,0,{krn: {'121': -0.0278, '119': -0.0278}}],
+    [0.556,0.431,0,{krn: {'119': -0.0278}}],
+    [0.528,0.431,0,{ic: 0.0139, krn: {'97': -0.0556, '101': -0.0278, '97': -0.0278, '111': -0.0278, '99': -0.0278}}],
+    [0.722,0.431,0,{ic: 0.0139, krn: {'101': -0.0278, '97': -0.0278, '111': -0.0278, '99': -0.0278}}],
+    [0.528,0.431],
+    [0.528,0.431,0.194,{ic: 0.0139, krn: {'111': -0.0278, '101': -0.0278, '97': -0.0278, '46': -0.0833, '44': -0.0833}}],
+    [0.444,0.431], [0.5,0.431,0,{ic: 0.0278, lig: {'45': 124}}],
+    [1,0.431,0,{ic: 0.0278}], [0.5,0.694], [0.5,0.668], [0.5,0.668]
+  ],
+  
+  cmmi10: [
+    [0.615,0.683,0,{ic: 0.139, krn: {'61': -0.0556, '59': -0.111, '58': -0.111, '127': 0.0833}}],
+    [0.833,0.683,0,{krn: {'127': 0.167}}],
+    [0.763,0.683,0,{ic: 0.0278, krn: {'127': 0.0833}}],
+    [0.694,0.683,0,{krn: {'127': 0.167}}],
+    [0.742,0.683,0,{ic: 0.0757, krn: {'127': 0.0833}}],
+    [0.831,0.683,0,{ic: 0.0812, krn: {'61': -0.0556, '59': -0.0556, '58': -0.0556, '127': 0.0556}}],
+    [0.78,0.683,0,{ic: 0.0576, krn: {'127': 0.0833}}],
+    [0.583,0.683,0,{ic: 0.139, krn: {'61': -0.0556, '59': -0.111, '58': -0.111, '127': 0.0556}}],
+    [0.667,0.683,0,{krn: {'127': 0.0833}}],
+    [0.612,0.683,0,{ic: 0.11, krn: {'61': -0.0556, '59': -0.0556, '58': -0.0556, '127': 0.0556}}],
+    [0.772,0.683,0,{ic: 0.0502, krn: {'127': 0.0833}}],
+    [0.64,0.431,0,{ic: 0.0037, krn: {'127': 0.0278}}],
+    [0.566,0.694,0.194,{ic: 0.0528, krn: {'127': 0.0833}}],
+    [0.518,0.431,0.194,{ic: 0.0556}],
+    [0.444,0.694,0,{ic: 0.0378, krn: {'59': -0.0556, '58': -0.0556, '127': 0.0556}}],
+    [0.406,0.431,0,{krn: {'127': 0.0556}}],
+
+    [0.438,0.694,0.194,{ic: 0.0738, krn: {'127': 0.0833}}],
+    [0.497,0.431,0.194,{ic: 0.0359, krn: {'127': 0.0556}}],
+    [0.469,0.694,0,{ic: 0.0278, krn: {'127': 0.0833}}],
+    [0.354,0.431,0,{krn: {'127': 0.0556}}],
+    [0.576,0.431], [0.583,0.694],
+    [0.603,0.431,0.194,{krn: {'127': 0.0278}}],
+    [0.494,0.431,0,{ic: 0.0637, krn: {'59': -0.0556, '58': -0.0556, '127': 0.0278}}],
+    [0.438,0.694,0.194,{ic: 0.046, krn: {'127': 0.111}}],
+    [0.57,0.431,0,{ic: 0.0359}],
+    [0.517,0.431,0.194,{krn: {'127': 0.0833}}],
+    [0.571,0.431,0,{ic: 0.0359, krn: {'59': -0.0556, '58': -0.0556}}],
+    [0.437,0.431,0,{ic: 0.113, krn: {'59': -0.0556, '58': -0.0556, '127': 0.0278}}],
+    [0.54,0.431,0,{ic: 0.0359, krn: {'127': 0.0278}}],
+    [0.596,0.694,0.194,{krn: {'127': 0.0833}}],
+    [0.626,0.431,0.194,{krn: {'127': 0.0556}}],
+
+    [0.651,0.694,0.194,{ic: 0.0359, krn: {'127': 0.111}}],
+    [0.622,0.431,0,{ic: 0.0359}],
+    [0.466,0.431,0,{krn: {'127': 0.0833}}],
+    [0.591,0.694,0,{krn: {'127': 0.0833}}],
+    [0.828,0.431,0,{ic: 0.0278}],
+    [0.517,0.431,0.194,{krn: {'127': 0.0833}}],
+    [0.363,0.431,0.0972,{ic: 0.0799, krn: {'127': 0.0833}}],
+    [0.654,0.431,0.194,{krn: {'127': 0.0833}}],
+    [1,0.367,-0.133], [1,0.367,-0.133], [1,0.367,-0.133], [1,0.367,-0.133], 
+    [0.278,0.464,-0.0363], [0.278,0.464,-0.0363], [0.5,0.465,-0.0347], [0.5,0.465,-0.0347],
+
+    [0.5,0.431], [0.5,0.431], [0.5,0.431], [0.5,0.431,0.194],
+    [0.5,0.431,0.194], [0.5,0.431,0.194], [0.5,0.644], [0.5,0.431,0.194],
+    [0.5,0.644], [0.5,0.431,0.194], [0.278,0.106], [0.278,0.106,0.194],
+    [0.778,0.539,0.0391],
+    [0.5,0.75,0.25,{krn: {'1': -0.0556, '65': -0.0556, '77': -0.0556, '78': -0.0556, '89': 0.0556, '90': -0.0556}}],
+    [0.778,0.539,0.0391], [0.5,0.465,-0.0347],
+
+    [0.531,0.694,0,{ic: 0.0556, krn: {'127': 0.0833}}],
+    [0.75,0.683,0,{krn: {'127': 0.139}}],
+    [0.759,0.683,0,{ic: 0.0502, krn: {'127': 0.0833}}],
+    [0.715,0.683,0,{ic: 0.0715, krn: {'61': -0.0278, '59': -0.0556, '58': -0.0556, '127': 0.0833}}],
+    [0.828,0.683,0,{ic: 0.0278, krn: {'127': 0.0556}}],
+    [0.738,0.683,0,{ic: 0.0576, krn: {'127': 0.0833}}],
+    [0.643,0.683,0,{ic: 0.139, krn: {'61': -0.0556, '59': -0.111, '58': -0.111, '127': 0.0833}}],
+    [0.786,0.683,0,{krn: {'127': 0.0833}}],
+    [0.831,0.683,0,{ic: 0.0812, krn: {'61': -0.0556, '59': -0.0556, '58': -0.0556, '127': 0.0556}}],
+    [0.44,0.683,0,{ic: 0.0785, krn: {'127': 0.111}}],
+    [0.555,0.683,0,{ic: 0.0962, krn: {'61': -0.0556, '59': -0.111, '58': -0.111, '127': 0.167}}],
+    [0.849,0.683,0,{ic: 0.0715, krn: {'61': -0.0556, '59': -0.0556, '58': -0.0556, '127': 0.0556}}],
+    [0.681,0.683,0,{krn: {'127': 0.0278}}],
+    [0.97,0.683,0,{ic: 0.109, krn: {'61': -0.0556, '59': -0.0556, '58': -0.0556, '127': 0.0833}}],
+    [0.803,0.683,0,{ic: 0.109, krn: {'61': -0.0833, '61': -0.0278, '59': -0.0556, '58': -0.0556, '127': 0.0833}}],
+    [0.763,0.683,0,{ic: 0.0278, krn: {'127': 0.0833}}],
+
+    [0.642,0.683,0,{ic: 0.139, krn: {'61': -0.0556, '59': -0.111, '58': -0.111, '127': 0.0833}}],
+    [0.791,0.683,0.194,{krn: {'127': 0.0833}}],
+    [0.759,0.683,0,{ic: 0.00773, krn: {'127': 0.0833}}],
+    [0.613,0.683,0,{ic: 0.0576, krn: {'61': -0.0556, '59': -0.0556, '58': -0.0556, '127': 0.0833}}],
+    [0.584,0.683,0,{ic: 0.139, krn: {'61': -0.0278, '59': -0.0556, '58': -0.0556, '127': 0.0833}}],
+    [0.683,0.683,0,{ic: 0.109, krn: {'59': -0.111, '58': -0.111, '61': -0.0556, '127': 0.0278}}],
+    [0.583,0.683,0,{ic: 0.222, krn: {'59': -0.167, '58': -0.167, '61': -0.111}}],
+    [0.944,0.683,0,{ic: 0.139, krn: {'59': -0.167, '58': -0.167, '61': -0.111}}],
+    [0.828,0.683,0,{ic: 0.0785, krn: {'61': -0.0833, '61': -0.0278, '59': -0.0556, '58': -0.0556, '127': 0.0833}}],
+    [0.581,0.683,0,{ic: 0.222, krn: {'59': -0.167, '58': -0.167, '61': -0.111}}],
+    [0.683,0.683,0,{ic: 0.0715, krn: {'61': -0.0556, '59': -0.0556, '58': -0.0556, '127': 0.0833}}],
+    [0.389,0.75], [0.389,0.694,0.194], [0.389,0.694,0.194],
+    [1,0.358,-0.142], [1,0.358,-0.142],
+
+    [0.417,0.694,0,{krn: {'127': 0.111}}],
+    [0.529,0.431], [0.429,0.694], [0.433,0.431,0,{krn: {'127': 0.0556}}],
+    [0.52,0.694,0,{krn: {'89': 0.0556, '90': -0.0556, '106': -0.111, '102': -0.167, '127': 0.167}}],
+    [0.466,0.431,0,{krn: {'127': 0.0556}}],
+    [0.49,0.694,0.194,{ic: 0.108, krn: {'59': -0.0556, '58': -0.0556, '127': 0.167}}],
+    [0.477,0.431,0.194,{ic: 0.0359, krn: {'127': 0.0278}}],
+    [0.576,0.694,0,{krn: {'127': -0.0278}}], [0.345,0.66],
+    [0.412,0.66,0.194,{ic: 0.0572, krn: {'59': -0.0556, '58': -0.0556}}],
+    [0.521,0.694,0,{ic: 0.0315}], [0.298,0.694,0,{ic: 0.0197, krn: {'127': 0.0833}}],
+    [0.878,0.431], [0.6,0.431], [0.485,0.431,0,{krn: {'127': 0.0556}}],
+
+    [0.503,0.431,0.194,{krn: {'127': 0.0833}}],
+    [0.446,0.431,0.194,{ic: 0.0359, krn: {'127': 0.0833}}],
+    [0.451,0.431,0,{ic: 0.0278, krn: {'59': -0.0556, '58': -0.0556, '127': 0.0556}}],
+    [0.469,0.431,0,{krn: {'127': 0.0556}}], [0.361,0.615,0,{krn: {'127': 0.0833}}],
+    [0.572,0.431,0,{krn: {'127': 0.0278}}],
+    [0.485,0.431,0,{ic: 0.0359, krn: {'127': 0.0278}}],
+    [0.716,0.431,0,{ic: 0.0269, krn: {'127': 0.0833}}],
+    [0.572,0.431,0,{krn: {'127': 0.0278}}],
+    [0.49,0.431,0.194,{ic: 0.0359, krn: {'127': 0.0556}}],
+    [0.465,0.431,0,{ic: 0.044, krn: {'127': 0.0556}}],
+    [0.322,0.431,0,{krn: {'127': 0.0278}}],
+    [0.384,0.431,0.194,{krn: {'127': 0.0833}}],
+    [0.636,0.431,0.194,{krn: {'127': 0.111}}],
+    [0.5,0.714,0,{ic: 0.154}], [0.278,0.694,0,{ic: 0.399}]
+  ],
+
+  cmsy10: [
+    [0.778,0.583,0.0833], [0.278,0.444,-0.0556], [0.778,0.583,0.0833],
+    [0.5,0.465,-0.0347], [0.778,0.583,0.0833], [0.5,0.444,-0.0556],
+    [0.778,0.583,0.0833], [0.778,0.583,0.0833], [0.778,0.583,0.0833],
+    [0.778,0.583,0.0833], [0.778,0.583,0.0833], [0.778,0.583,0.0833],
+    [0.778,0.583,0.0833], [1,0.694,0.194], [0.5,0.444,-0.0556], [0.5,0.444,-0.0556],
+
+    [0.778,0.464,-0.0363], [0.778,0.464,-0.0363], [0.778,0.636,0.136],
+    [0.778,0.636,0.136], [0.778,0.636,0.136], [0.778,0.636,0.136],
+    [0.778,0.636,0.136], [0.778,0.636,0.136], [0.778,0.367,-0.133],
+    [0.778,0.483,-0.0169], [0.778,0.539,0.0391], [0.778,0.539,0.0391],
+    [1,0.539,0.0391], [1,0.539,0.0391], [0.778,0.539,0.0391], [0.778,0.539,0.0391],
+
+    [1,0.367,-0.133], [1,0.367,-0.133], [0.5,0.694,0.194], [0.5,0.694,0.194],
+    [1,0.367,-0.133], [1,0.694,0.194], [1,0.694,0.194], [0.778,0.464,-0.0363],
+    [1,0.367,-0.133], [1,0.367,-0.133], [0.611,0.694,0.194], [0.611,0.694,0.194],
+    [1,0.367,-0.133], [1,0.694,0.194], [1,0.694,0.194], [0.778,0.431],
+
+    [0.275,0.556], [1,0.431], [0.667,0.539,0.0391], [0.667,0.539,0.0391],
+    [0.889,0.694,0.194], [0.889,0.694,0.194], [0,0.694,0.194], [0,0.367,-0.133],
+    [0.556,0.694], [0.556,0.694], [0.667,0.431], [0.5,0.75,0.0556],
+    [0.722,0.694], [0.722,0.694], [0.778,0.694], [0.778,0.694],
+
+    [0.611,0.694], [0.798,0.683,0,{krn: {'48': 0.194}}],
+    [0.657,0.683,0,{ic: 0.0304, krn: {'48': 0.139}}],
+    [0.527,0.683,0,{ic: 0.0583, krn: {'48': 0.139}}],
+    [0.771,0.683,0,{ic: 0.0278, krn: {'48': 0.0833}}],
+    [0.528,0.683,0,{ic: 0.0894, krn: {'48': 0.111}}],
+    [0.719,0.683,0,{ic: 0.0993, krn: {'48': 0.111}}],
+    [0.595,0.683,0.0972,{ic: 0.0593, krn: {'48': 0.111}}],
+    [0.845,0.683,0,{ic: 0.00965, krn: {'48': 0.111}}],
+    [0.545,0.683,0,{ic: 0.0738, krn: {'48': 0.0278}}],
+    [0.678,0.683,0.0972,{ic: 0.185, krn: {'48': 0.167}}],
+    [0.762,0.683,0,{ic: 0.0144, krn: {'48': 0.0556}}],
+    [0.69,0.683,0,{krn: {'48': 0.139}}], [1.2,0.683,0,{krn: {'48': 0.139}}],
+    [0.82,0.683,0,{ic: 0.147, krn: {'48': 0.0833}}],
+    [0.796,0.683,0,{ic: 0.0278, krn: {'48': 0.111}}],
+
+    [0.696,0.683,0,{ic: 0.0822, krn: {'48': 0.0833}}],
+    [0.817,0.683,0.0972,{krn: {'48': 0.111}}],
+    [0.848,0.683,0,{krn: {'48': 0.0833}}],
+    [0.606,0.683,0,{ic: 0.075, krn: {'48': 0.139}}],
+    [0.545,0.683,0,{ic: 0.254, krn: {'48': 0.0278}}],
+    [0.626,0.683,0,{ic: 0.0993, krn: {'48': 0.0833}}],
+    [0.613,0.683,0,{ic: 0.0822, krn: {'48': 0.0278}}],
+    [0.988,0.683,0,{ic: 0.0822, krn: {'48': 0.0833}}],
+    [0.713,0.683,0,{ic: 0.146, krn: {'48': 0.139}}],
+    [0.668,0.683,0.0972,{ic: 0.0822, krn: {'48': 0.0833}}],
+    [0.725,0.683,0,{ic: 0.0794, krn: {'48': 0.139}}],
+    [0.667,0.556], [0.667,0.556], [0.667,0.556], [0.667,0.556], [0.667,0.556],
+
+    [0.611,0.694], [0.611,0.694], [0.444,0.75,0.25], [0.444,0.75,0.25],
+    [0.444,0.75,0.25], [0.444,0.75,0.25], [0.5,0.75,0.25], [0.5,0.75,0.25],
+    [0.389,0.75,0.25], [0.389,0.75,0.25], [0.278,0.75,0.25], [0.5,0.75,0.25],
+    [0.5,0.75,0.25], [0.611,0.75,0.25], [0.5,0.75,0.25], [0.278,0.694,0.194],
+
+    [0.833,0.04,0.96], [0.75,0.683], [0.833,0.683], [0.417,0.694,0.194,{ic: 0.111}],
+    [0.667,0.556], [0.667,0.556], [0.778,0.636,0.136], [0.778,0.636,0.136],
+    [0.444,0.694,0.194], [0.444,0.694,0.194], [0.444,0.694,0.194],
+    [0.611,0.694,0.194], [0.778,0.694,0.13], [0.778,0.694,0.13],
+    [0.778,0.694,0.13], [0.778,0.694,0.13]
+  ],
+
+  cmex10: [
+    [0.458,0.04,1.16,{n: 16}], [0.458,0.04,1.16,{n: 17}],
+    [0.417,0.04,1.16,{n: 104}], [0.417,0.04,1.16,{n: 105}],
+    [0.472,0.04,1.16,{n: 106}], [0.472,0.04,1.16,{n: 107}],
+    [0.472,0.04,1.16,{n: 108}], [0.472,0.04,1.16,{n: 109}],
+    [0.583,0.04,1.16,{n: 110}], [0.583,0.04,1.16,{n: 111}],
+    [0.472,0.04,1.16,{n: 68}], [0.472,0.04,1.16,{n: 69}],
+    [0.333,0,0.6,{delim: {rep: 12}}], [0.556,0,0.6,{delim: {rep: 13}}],
+    [0.578,0.04,1.16,{n: 46}], [0.578,0.04,1.16,{n: 47}],
+
+    [0.597,0.04,1.76,{n: 18}], [0.597,0.04,1.76,{n: 19}],
+    [0.736,0.04,2.36,{n: 32}], [0.736,0.04,2.36,{n: 33}],
+    [0.528,0.04,2.36,{n: 34}], [0.528,0.04,2.36,{n: 35}],
+    [0.583,0.04,2.36,{n: 36}], [0.583,0.04,2.36,{n: 37}],
+    [0.583,0.04,2.36,{n: 38}], [0.583,0.04,2.36,{n: 39}],
+    [0.75,0.04,2.36,{n: 40}], [0.75,0.04,2.36,{n: 41}],
+    [0.75,0.04,2.36,{n: 42}], [0.75,0.04,2.36,{n: 43}],
+    [1.04,0.04,2.36,{n: 44}], [1.04,0.04,2.36,{n: 45}],
+
+    [0.792,0.04,2.96,{n: 48}], [0.792,0.04,2.96,{n: 49}],
+    [0.583,0.04,2.96,{n: 50}], [0.583,0.04,2.96,{n: 51}],
+    [0.639,0.04,2.96,{n: 52}], [0.639,0.04,2.96,{n: 53}],
+    [0.639,0.04,2.96,{n: 54}], [0.639,0.04,2.96,{n: 55}],
+    [0.806,0.04,2.96,{n: 56}], [0.806,0.04,2.96,{n: 57}],
+    [0.806,0.04,2.96], [0.806,0.04,2.96],
+    [1.28,0.04,2.96], [1.28,0.04,2.96],
+    [0.811,0.04,1.76,{n: 30}], [0.811,0.04,1.76,{n: 31}],
+
+    [0.875,0.04,1.76,{delim: {top: 48, bot: 64, rep: 66}}],
+    [0.875,0.04,1.76,{delim: {top: 49, bot: 65, rep: 67}}],
+    [0.667,0.04,1.76,{delim: {top: 50, bot: 52, rep: 54}}],
+    [0.667,0.04,1.76,{delim: {top: 51, bot: 53, rep: 55}}],
+    [0.667,0.04,1.76,{delim: {bot: 52, rep: 54}}],
+    [0.667,0.04,1.76,{delim: {bot: 53, rep: 55}}],
+    [0.667,0,0.6,{delim: {top: 50, rep: 54}}],
+    [0.667,0,0.6,{delim: {top: 51, rep: 55}}],
+    [0.889,0,0.9,{delim: {top: 56, mid: 60, bot: 58, rep: 62}}],
+    [0.889,0,0.9,{delim: {top: 57, mid: 61, bot: 59, rep: 62}}],
+    [0.889,0,0.9,{delim: {top: 56, bot: 58, rep: 62}}],
+    [0.889,0,0.9,{delim: {top: 57, bot: 59, rep: 62}}],
+    [0.889,0,1.8,{delim: {rep: 63}}],
+    [0.889,0,1.8,{delim: {rep: 119}}],
+    [0.889,0,0.3,{delim: {rep: 62}}],
+    [0.667,0,0.6,{delim: {top: 120, bot: 121, rep: 63}}],
+
+    [0.875,0.04,1.76,{delim: {top: 56, bot: 59, rep: 62}}],
+    [0.875,0.04,1.76,{delim: {top: 57, bot: 58, rep: 62}}],
+    [0.875,0,0.6,{delim: {rep: 66}}], [0.875,0,0.6,{delim: {rep: 67}}],
+    [0.611,0.04,1.76,{n: 28}], [0.611,0.04,1.76,{n: 29}],
+    [0.833,0,1,{n: 71}], [1.11,0.1,1.5], [0.472,0,1.11,{ic: 0.194, n: 73}],
+    [0.556,0,2.22,{ic: 0.444}], [1.11,0,1,{n: 75}], [1.51,0.1,1.5],
+    [1.11,0,1,{n: 77}], [1.51,0.1,1.5], [1.11,0,1,{n: 79}], [1.51,0.1,1.5],
+
+    [1.06,0,1,{n: 88}], [0.944,0,1,{n: 89}], [0.472,0,1.11,{ic: 0.194, n: 90}],
+    [0.833,0,1,{n: 91}], [0.833,0,1,{n: 92}], [0.833,0,1,{n: 93}],
+    [0.833,0,1,{n: 94}], [0.833,0,1,{n: 95}], [1.44,0.1,1.5],
+    [1.28,0.1,1.5], [0.556,0,2.22,{ic: 0.444}], [1.11,0.1,1.5],
+    [1.11,0.1,1.5], [1.11,0.1,1.5], [1.11,0.1,1.5], [1.11,0.1,1.5],
+
+    [0.944,0,1,{n: 97}], [1.28,0.1,1.5], [0.556,0.722,0,{n: 99}],
+    [1,0.75,0,{n: 100}], [1.44,0.75], [0.556,0.722,0,{n: 102}],
+    [1,0.75,0,{n: 103}], [1.44,0.75], [0.472,0.04,1.76,{n: 20}],
+    [0.472,0.04,1.76,{n: 21}], [0.528,0.04,1.76,{n: 22}],
+    [0.528,0.04,1.76,{n: 23}], [0.528,0.04,1.76,{n: 24}],
+    [0.528,0.04,1.76,{n: 25}], [0.667,0.04,1.76,{n: 26}],
+    [0.667,0.04,1.76,{n: 27}],
+
+    [1,0.04,1.16,{n: 113}], [1,0.04,1.76,{n: 114}], [1,0.04,2.36,{n: 115}],
+    [1,0.04,2.96,{n: 116}], [1.06,0,1.8,{delim: {top: 118, bot: 116, rep: 117}}],
+    [1.06,0,0.6], [1.06,0.04,0.56],
+    [0.778,0,0.6,{delim: {top: 126, bot: 127, rep: 119}}],
+    [0.667,0,0.6,{delim: {top: 120, rep: 63}}],
+    [0.667,0,0.6,{delim: {bot: 121, rep: 63}}],
+    [0.45,0.12], [0.45,0.12], [0.45,0.12], [0.45,0.12],
+    [0.778,0,0.6,{delim: {top: 126, rep: 119}}],
+    [0.778,0,0.6,{delim: {bot: 127, rep: 119}}]
+  ],
+  
+  cmti10: [
+    [0.627,0.683,0,{ic: 0.133}], [0.818,0.683], [0.767,0.683,0,{ic: 0.094}],
+    [0.692,0.683], [0.664,0.683,0,{ic: 0.153}], [0.743,0.683,0,{ic: 0.164}],
+    [0.716,0.683,0,{ic: 0.12}], [0.767,0.683,0,{ic: 0.111}],
+    [0.716,0.683,0,{ic: 0.0599}], [0.767,0.683,0,{ic: 0.111}],
+    [0.716,0.683,0,{ic: 0.103}],
+    [0.613,0.694,0.194,{ic: 0.212, krn: {'39': 0.104, '63': 0.104, '33': 0.104, '41': 0.104, '93': 0.104}, lig: {'105': 14, '108': 15}}],
+    [0.562,0.694,0.194,{ic: 0.103}], [0.588,0.694,0.194,{ic: 0.103}],
+    [0.882,0.694,0.194,{ic: 0.103}], [0.894,0.694,0.194,{ic: 0.103}],
+
+    [0.307,0.431,0,{ic: 0.0767}], [0.332,0.431,0.194,{ic: 0.0374}],
+    [0.511,0.694], [0.511,0.694,0,{ic: 0.0969}], [0.511,0.628,0,{ic: 0.083}],
+    [0.511,0.694,0,{ic: 0.108}], [0.511,0.562,0,{ic: 0.103}], [0.831,0.694],
+    [0.46,0,0.17], [0.537,0.694,0.194,{ic: 0.105}], [0.716,0.431,0,{ic: 0.0751}],
+    [0.716,0.431,0,{ic: 0.0751}], [0.511,0.528,0.0972,{ic: 0.0919}],
+    [0.883,0.683,0,{ic: 0.12}], [0.985,0.683,0,{ic: 0.12}],
+    [0.767,0.732,0.0486,{ic: 0.094}],
+
+    [0.256,0.431,0,{krn: {'108': -0.256, '76': -0.321}}],
+    [0.307,0.694,0,{ic: 0.124, lig: {'96': 60}}],
+    [0.514,0.694,0,{ic: 0.0696}], [0.818,0.694,0.194,{ic: 0.0662}],
+    [0.769,0.694], [0.818,0.75,0.0556,{ic: 0.136}],
+    [0.767,0.694,0,{ic: 0.0969}],
+    [0.307,0.694,0,{ic: 0.124, krn: {'63': 0.102, '33': 0.102}, lig: {'39': 34}}],
+    [0.409,0.75,0.25,{ic: 0.162}], [0.409,0.75,0.25,{ic: 0.0369}],
+    [0.511,0.75,0,{ic: 0.149}], [0.767,0.562,0.0567,{ic: 0.0369}],
+    [0.307,0.106,0.194], [0.358,0.431,0,{ic: 0.0283, lig: {'45': 123}}],
+    [0.307,0.106], [0.511,0.75,0.25,{ic: 0.162}],
+
+    [0.511,0.644,0,{ic: 0.136}], [0.511,0.644,0,{ic: 0.136}],
+    [0.511,0.644,0,{ic: 0.136}], [0.511,0.644,0,{ic: 0.136}],
+    [0.511,0.644,0.194,{ic: 0.136}], [0.511,0.644,0,{ic: 0.136}],
+    [0.511,0.644,0,{ic: 0.136}], [0.511,0.644,0.194,{ic: 0.136}],
+    [0.511,0.644,0,{ic: 0.136}], [0.511,0.644,0,{ic: 0.136}],
+    [0.307,0.431,0,{ic: 0.0582}], [0.307,0.431,0.194,{ic: 0.0582}],
+    [0.307,0.5,0.194,{ic: 0.0756}], [0.767,0.367,-0.133,{ic: 0.0662}],
+    [0.511,0.5,0.194], [0.511,0.694,0,{ic: 0.122, lig: {'96': 62}}],
+
+    [0.767,0.694,0,{ic: 0.096}],
+    [0.743,0.683,0,{krn: {'110': -0.0256, '108': -0.0256, '114': -0.0256, '117': -0.0256, '109': -0.0256, '116': -0.0256, '105': -0.0256, '67': -0.0256, '79': -0.0256, '71': -0.0256, '104': -0.0256, '98': -0.0256, '85': -0.0256, '107': -0.0256, '118': -0.0256, '119': -0.0256, '81': -0.0256, '84': -0.0767, '89': -0.0767, '86': -0.102, '87': -0.102, '101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}}],
+    [0.704,0.683,0,{ic: 0.103}], [0.716,0.683,0,{ic: 0.145}],
+    [0.755,0.683,0,{ic: 0.094, krn: {'88': -0.0256, '87': -0.0256, '65': -0.0256, '86': -0.0256, '89': -0.0256}}],
+    [0.678,0.683,0,{ic: 0.12}],
+    [0.653,0.683,0,{ic: 0.133, krn: {'111': -0.0767, '101': -0.0767, '117': -0.0767, '114': -0.0767, '97': -0.0767, '65': -0.102, '79': -0.0256, '67': -0.0256, '71': -0.0256, '81': -0.0256}}],
+    [0.774,0.683,0,{ic: 0.0872}], [0.743,0.683,0,{ic: 0.164}],
+    [0.386,0.683,0,{ic: 0.158}], [0.525,0.683,0,{ic: 0.14}],
+    [0.769,0.683,0,{ic: 0.145, krn: {'79': -0.0256, '67': -0.0256, '71': -0.0256, '81': -0.0256}}],
+    [0.627,0.683,0,{krn: {'84': -0.0767, '89': -0.0767, '86': -0.102, '87': -0.102, '101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}}],
+    [0.897,0.683,0,{ic: 0.164}], [0.743,0.683,0,{ic: 0.164}],
+    [0.767,0.683,0,{ic: 0.094, krn: {'88': -0.0256, '87': -0.0256, '65': -0.0256, '86': -0.0256, '89': -0.0256}}],
+
+    [0.678,0.683,0,{ic: 0.103, krn: {'65': -0.0767}}],
+    [0.767,0.683,0.194,{ic: 0.094}],
+    [0.729,0.683,0,{ic: 0.0387, krn: {'110': -0.0256, '108': -0.0256, '114': -0.0256, '117': -0.0256, '109': -0.0256, '116': -0.0256, '105': -0.0256, '67': -0.0256, '79': -0.0256, '71': -0.0256, '104': -0.0256, '98': -0.0256, '85': -0.0256, '107': -0.0256, '118': -0.0256, '119': -0.0256, '81': -0.0256, '84': -0.0767, '89': -0.0767, '86': -0.102, '87': -0.102, '101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}}],
+    [0.562,0.683,0,{ic: 0.12}],
+    [0.716,0.683,0,{ic: 0.133, krn: {'121': -0.0767, '101': -0.0767, '111': -0.0767, '114': -0.0767, '97': -0.0767, '117': -0.0767, '65': -0.0767}}],
+    [0.743,0.683,0,{ic: 0.164}],
+    [0.743,0.683,0,{ic: 0.184, krn: {'111': -0.0767, '101': -0.0767, '117': -0.0767, '114': -0.0767, '97': -0.0767, '65': -0.102, '79': -0.0256, '67': -0.0256, '71': -0.0256, '81': -0.0256}}],
+    [0.999,0.683,0,{ic: 0.184, krn: {'65': -0.0767}}],
+    [0.743,0.683,0,{ic: 0.158, krn: {'79': -0.0256, '67': -0.0256, '71': -0.0256, '81': -0.0256}}],
+    [0.743,0.683,0,{ic: 0.194, krn: {'101': -0.0767, '111': -0.0767, '114': -0.0767, '97': -0.0767, '117': -0.0767, '65': -0.0767}}],
+    [0.613,0.683,0,{ic: 0.145}], [0.307,0.75,0.25,{ic: 0.188}],
+    [0.514,0.694,0,{ic: 0.169}], [0.307,0.75,0.25,{ic: 0.105}],
+    [0.511,0.694,0,{ic: 0.0665}], [0.307,0.668,0,{ic: 0.118}],
+
+    [0.307,0.694,0,{ic: 0.124, lig: {'96': 92}}], [0.511,0.431,0,{ic: 0.0767}],
+    [0.46,0.694,0,{ic: 0.0631, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}}],
+    [0.46,0.431,0,{ic: 0.0565, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}}],
+    [0.511,0.694,0,{ic: 0.103, krn: {'108': 0.0511}}],
+    [0.46,0.431,0,{ic: 0.0751, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}}],
+    [0.307,0.694,0.194,{ic: 0.212, krn: {'39': 0.104, '63': 0.104, '33': 0.104, '41': 0.104, '93': 0.104}, lig: {'105': 12, '102': 11, '108': 13}}],
+    [0.46,0.431,0.194,{ic: 0.0885}], [0.511,0.694,0,{ic: 0.0767}],
+    [0.307,0.655,0,{ic: 0.102}], [0.307,0.655,0.194,{ic: 0.145}],
+    [0.46,0.694,0,{ic: 0.108}], [0.256,0.694,0,{ic: 0.103, krn: {'108': 0.0511}}],
+    [0.818,0.431,0,{ic: 0.0767}], [0.562,0.431,0,{ic: 0.0767, krn: {'39': -0.102}}],
+    [0.511,0.431,0,{ic: 0.0631, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}}],
+
+    [0.511,0.431,0.194,{ic: 0.0631, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}}],
+    [0.46,0.431,0.194,{ic: 0.0885}],
+    [0.422,0.431,0,{ic: 0.108, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}}],
+    [0.409,0.431,0,{ic: 0.0821}], [0.332,0.615,0,{ic: 0.0949}],
+    [0.537,0.431,0,{ic: 0.0767}], [0.46,0.431,0,{ic: 0.108}],
+    [0.664,0.431,0,{ic: 0.108, krn: {'108': 0.0511}}],
+    [0.464,0.431,0,{ic: 0.12}], [0.486,0.431,0.194,{ic: 0.0885}],
+    [0.409,0.431,0,{ic: 0.123}], [0.511,0.431,0,{ic: 0.0921, lig: {'45': 124}}],
+    [1.02,0.431,0,{ic: 0.0921}], [0.511,0.694,0,{ic: 0.122}],
+    [0.511,0.668,0,{ic: 0.116}], [0.511,0.668,0,{ic: 0.105}]
+  ],
+  
+  cmbx10: [
+    [0.692,0.686], [0.958,0.686], [0.894,0.686], [0.806,0.686],
+    [0.767,0.686], [0.9,0.686], [0.831,0.686], [0.894,0.686],
+    [0.831,0.686], [0.894,0.686], [0.831,0.686],
+    [0.671,0.694,0,{ic: 0.109, krn: {'39': 0.109, '63': 0.109, '33': 0.109, '41': 0.109, '93': 0.109}, lig: {'105': 14, '108': 15}}],
+    [0.639,0.694], [0.639,0.694], [0.958,0.694], [0.958,0.694],
+
+    [0.319,0.444], [0.351,0.444,0.194], [0.575,0.694], [0.575,0.694],
+    [0.575,0.632], [0.575,0.694], [0.575,0.596], [0.869,0.694],
+    [0.511,0,0.17], [0.597,0.694], [0.831,0.444], [0.894,0.444],
+    [0.575,0.542,0.0972], [1.04,0.686], [1.17,0.686], [0.894,0.735,0.0486],
+
+    [0.319,0.444,0,{krn: {'108': -0.319, '76': -0.378}}],
+    [0.35,0.694,0,{lig: {'96': 60}}], [0.603,0.694], [0.958,0.694,0.194],
+    [0.575,0.75,0.0556], [0.958,0.75,0.0556], [0.894,0.694],
+    [0.319,0.694,0,{krn: {'63': 0.128, '33': 0.128}, lig: {'39': 34}}],
+    [0.447,0.75,0.25], [0.447,0.75,0.25], [0.575,0.75], [0.894,0.633,0.133],
+    [0.319,0.156,0.194], [0.383,0.444,0,{lig: {'45': 123}}],
+    [0.319,0.156], [0.575,0.75,0.25],
+
+    [0.575,0.644], [0.575,0.644], [0.575,0.644], [0.575,0.644],
+    [0.575,0.644], [0.575,0.644], [0.575,0.644], [0.575,0.644],
+    [0.575,0.644], [0.575,0.644], [0.319,0.444], [0.319,0.444,0.194],
+    [0.35,0.5,0.194], [0.894,0.391,-0.109], [0.543,0.5,0.194],
+    [0.543,0.694,0,{lig: {'96': 62}}],
+
+    [0.894,0.694],
+    [0.869,0.686,0,{krn: {'116': -0.0319, '67': -0.0319, '79': -0.0319, '71': -0.0319, '85': -0.0319, '81': -0.0319, '84': -0.0958, '89': -0.0958, '86': -0.128, '87': -0.128}}],
+    [0.818,0.686], [0.831,0.686],
+    [0.882,0.686,0,{krn: {'88': -0.0319, '87': -0.0319, '65': -0.0319, '86': -0.0319, '89': -0.0319}}],
+    [0.756,0.686],
+    [0.724,0.686,0,{krn: {'111': -0.0958, '101': -0.0958, '117': -0.0958, '114': -0.0958, '97': -0.0958, '65': -0.128, '79': -0.0319, '67': -0.0319, '71': -0.0319, '81': -0.0319}}],
+    [0.904,0.686], [0.9,0.686], [0.436,0.686,0,{krn: {'73': 0.0319}}],
+    [0.594,0.686],
+    [0.901,0.686,0,{krn: {'79': -0.0319, '67': -0.0319, '71': -0.0319, '81': -0.0319}}],
+    [0.692,0.686,0,{krn: {'84': -0.0958, '89': -0.0958, '86': -0.128, '87': -0.128}}],
+    [1.09,0.686], [0.9,0.686],
+    [0.864,0.686,0,{krn: {'88': -0.0319, '87': -0.0319, '65': -0.0319, '86': -0.0319, '89': -0.0319}}],
+
+    [0.786,0.686,0,{krn: {'65': -0.0958, '111': -0.0319, '101': -0.0319, '97': -0.0319, '46': -0.0958, '44': -0.0958}}],
+    [0.864,0.686,0.194],
+    [0.862,0.686,0,{krn: {'116': -0.0319, '67': -0.0319, '79': -0.0319, '71': -0.0319, '85': -0.0319, '81': -0.0319, '84': -0.0958, '89': -0.0958, '86': -0.128, '87': -0.128}}],
+    [0.639,0.686],
+    [0.8,0.686,0,{krn: {'121': -0.0319, '101': -0.0958, '111': -0.0958, '114': -0.0958, '97': -0.0958, '65': -0.0958, '117': -0.0958}}],
+    [0.885,0.686],
+    [0.869,0.686,0,{ic: 0.016, krn: {'111': -0.0958, '101': -0.0958, '117': -0.0958, '114': -0.0958, '97': -0.0958, '65': -0.128, '79': -0.0319, '67': -0.0319, '71': -0.0319, '81': -0.0319}}],
+    [1.19,0.686,0,{ic: 0.016, krn: {'111': -0.0958, '101': -0.0958, '117': -0.0958, '114': -0.0958, '97': -0.0958, '65': -0.128, '79': -0.0319, '67': -0.0319, '71': -0.0319, '81': -0.0319}}],
+    [0.869,0.686,0,{krn: {'79': -0.0319, '67': -0.0319, '71': -0.0319, '81': -0.0319}}],
+    [0.869,0.686,0,{ic: 0.0287, krn: {'101': -0.0958, '111': -0.0958, '114': -0.0958, '97': -0.0958, '65': -0.0958, '117': -0.0958}}],
+    [0.703,0.686], [0.319,0.75,0.25], [0.603,0.694], [0.319,0.75,0.25],
+    [0.575,0.694], [0.319,0.694],
+
+    [0.319,0.694,0,{lig: {'96': 92}}],
+    [0.559,0.444,0,{krn: {'118': -0.0319, '106': 0.0639, '121': -0.0319, '119': -0.0319}}],
+    [0.639,0.694,0,{krn: {'101': 0.0319, '111': 0.0319, '120': -0.0319, '100': 0.0319, '99': 0.0319, '113': 0.0319, '118': -0.0319, '106': 0.0639, '121': -0.0319, '119': -0.0319}}],
+    [0.511,0.444,0,{krn: {'104': -0.0319, '107': -0.0319}}],
+    [0.639,0.694], [0.527,0.444],
+    [0.351,0.694,0,{ic: 0.109, krn: {'39': 0.109, '63': 0.109, '33': 0.109, '41': 0.109, '93': 0.109}, lig: {'105': 12, '102': 11, '108': 13}}],
+    [0.575,0.444,0.194,{ic: 0.016, krn: {'106': 0.0319}}],
+    [0.639,0.694,0,{krn: {'116': -0.0319, '117': -0.0319, '98': -0.0319, '121': -0.0319, '118': -0.0319, '119': -0.0319}}],
+    [0.319,0.694], [0.351,0.694,0.194],
+    [0.607,0.694,0,{krn: {'97': -0.0639, '101': -0.0319, '97': -0.0319, '111': -0.0319, '99': -0.0319}}],
+    [0.319,0.694],
+    [0.958,0.444,0,{krn: {'116': -0.0319, '117': -0.0319, '98': -0.0319, '121': -0.0319, '118': -0.0319, '119': -0.0319}}],
+    [0.639,0.444,0,{krn: {'116': -0.0319, '117': -0.0319, '98': -0.0319, '121': -0.0319, '118': -0.0319, '119': -0.0319}}],
+    [0.575,0.444,0,{krn: {'101': 0.0319, '111': 0.0319, '120': -0.0319, '100': 0.0319, '99': 0.0319, '113': 0.0319, '118': -0.0319, '106': 0.0639, '121': -0.0319, '119': -0.0319}}],
+
+    [0.639,0.444,0.194,{krn: {'101': 0.0319, '111': 0.0319, '120': -0.0319, '100': 0.0319, '99': 0.0319, '113': 0.0319, '118': -0.0319, '106': 0.0639, '121': -0.0319, '119': -0.0319}}],
+    [0.607,0.444,0.194], [0.474,0.444], [0.454,0.444],
+    [0.447,0.635,0,{krn: {'121': -0.0319, '119': -0.0319}}],
+    [0.639,0.444,0,{krn: {'119': -0.0319}}],
+    [0.607,0.444,0,{ic: 0.016, krn: {'97': -0.0639, '101': -0.0319, '97': -0.0319, '111': -0.0319, '99': -0.0319}}],
+    [0.831,0.444,0,{ic: 0.016, krn: {'101': -0.0319, '97': -0.0319, '111': -0.0319, '99': -0.0319}}],
+    [0.607,0.444],
+    [0.607,0.444,0.194,{ic: 0.016, krn: {'111': -0.0319, '101': -0.0319, '97': -0.0319, '46': -0.0958, '44': -0.0958}}],
+    [0.511,0.444], [0.575,0.444,0,{ic: 0.0319, lig: {'45': 124}}],
+    [1.15,0.444,0,{ic: 0.0319}], [0.575,0.694], [0.575,0.694], [0.575,0.694]
+  ]
+};
+
+/***************************************************************************/
+
+/*
+ *  Implement image-based fonts for fallback method
+ */
+jsMath.Img = {
+  
+  // font sizes available
+  fonts: [50, 60, 70, 85, 100, 120, 144, 173, 207, 249, 298, 358, 430],
+    
+  // em widths for the various font size directories
+  w: {'50': 6.9, '60': 8.3, '70': 9.7, '85': 11.8, '100': 13.9,
+      '120': 16.7, '144': 20.0, '173': 24.0, '207': 28.8, '249': 34.6,
+      '298': 41.4, '358': 49.8, '430': 59.8},
+        
+  best: 4,     // index of best font size in the fonts list    
+  update: {},  // fonts to update (see UpdateFonts below)
+  factor: 1,   // factor by which to shrink images (for better printing)
+  loaded: 0,   // image fonts are loaded
+
+  // add characters to be drawn using images
+  SetFont: function (change) {
+    for (var font in change) {
+      if (!this.update[font]) {this.update[font] = []}
+      this.update[font] = this.update[font].concat(change[font]);
+    }
+  },
+
+  /*
+   *  Called by the exta-font definition files to add an image font
+   *  into the mix
+   */
+  AddFont: function (size,def) {
+    if (!jsMath.Img[size]) {jsMath.Img[size] = {}};
+    jsMath.Add(jsMath.Img[size],def);
+  },
+    
+  /*
+   *  Update font(s) to use image data rather than native fonts
+   *  It looks in the jsMath.Img.update array to find the names
+   *  of the fonts to udpate, and the arrays of character codes
+   *  to set (or 'all' to change every character);
+   */
+  UpdateFonts: function () {
+    var change = this.update; if (!this.loaded) return;
+    for (var font in change) {
+      for (var i = 0; i < change[font].length; i++) {
+        var c = change[font][i];
+        if (c == 'all') {for (c in jsMath.TeX[font]) {jsMath.TeX[font][c].img = {}}}
+          else {jsMath.TeX[font][c].img = {}}
+      }
+    }
+    this.update = {};
+  },
+  
+  /*
+   *  Find the font size that best fits our current font
+   *  (this is the directory name for the img files used
+   *  in some fallback modes).
+   */
+  BestSize: function () {
+    var w = jsMath.em * this.factor;
+    var m = this.w[this.fonts[0]];
+    for (var i = 1; i < this.fonts.length; i++) {
+      if (w < (this.w[this.fonts[i]] + 2*m) / 3) {return i-1}
+      m = this.w[this.fonts[i]];
+    }
+    return i-1;
+  },
+
+  /*
+   *  Get the scaling factor for the image fonts
+   */
+  Scale: function () {
+    if (!this.loaded) return;
+    this.best = this.BestSize();
+    this.em = jsMath.Img.w[this.fonts[this.best]];
+    this.scale = (jsMath.em/this.em);
+    if (Math.abs(this.scale - 1) < .12) {this.scale = 1}
+  },
+
+  /*
+   *  Get URL to directory for given font and size, based on the
+   *  user's alpha/plain setting
+   */
+  URL: function (name,size,C) {
+    var type = (jsMath.Controls.cookie.alpha) ? '/alpha/': '/plain/';
+    if (C == null) {C = "def.js"} else {C = 'char'+C+'.png'}
+    if (size != "") {size += '/'}
+    return this.root+name+type+size+C;
+  },
+
+  /*
+   *  Laod the data for an image font
+   */
+  LoadFont: function (name) {
+    if (!this.loaded) this.Init();
+    jsMath.Setup.Script(this.URL(name,""));
+  },
+  
+  /*
+   *  Setup for print mode, and create the hex code table
+   */
+  Init: function () {
+    if (jsMath.Controls.cookie.print || jsMath.Controls.cookie.stayhires) {
+      jsMath.Controls.cookie.print = jsMath.Controls.cookie.stayhires;
+      this.factor *= 3;
+      if (!jsMath.Controls.isLocalCookie || !jsMath.Global.isLocal) {jsMath.Controls.SetCookie(0)}
+      if (jsMath.Browser.alphaPrintBug) {jsMath.Controls.cookie.alpha = 0}
+    }
+    var codes = '0123456789ABCDEF';
+    this.HexCode = [];
+    for (var i = 0; i < 128; i++) {
+      var h = Math.floor(i/16); var l = i - 16*h;
+      this.HexCode[i] = codes.charAt(h)+codes.charAt(l);
+    }
+    this.loaded = 1;
+  }
+  
+};
+
+/***************************************************************************/
+
+/*
+ *  jsMath.HTML handles creation of most of the HTML needed for
+ *  presenting mathematics in HTML pages.
+ */
+
+jsMath.HTML = {
+  
+  /*
+   *  Produce a string version of a measurement in ems,
+   *  showing only a limited number of digits, and 
+   *  using 0 when the value is near zero.
+   */
+  Em: function (m) {
+    if (Math.abs(m) < .000001) {m = 0}
+    var s = String(m); s = s.replace(/(\.\d\d\d).+/,'$1');
+    return s+'em'
+  },
+
+  /*
+   *  Create a horizontal space of width w
+   */
+  Spacer: function (w) {
+    if (w == 0) {return ''};
+    return jsMath.Browser.msieSpaceFix+'<span class="spacer" style="margin-left:'+this.Em(w)+'"></span>';
+  },
+  
+  /*
+   *  Create a blank rectangle of the given size
+   *  If the height is small, it is converted to pixels so that it
+   *  will not disappear at small font sizes.
+   */
+  
+  Blank: function (w,h,d,isRule) {
+    var backspace = ''; var style = ''
+    if (isRule) {
+      style += 'border-left:'+this.Em(w)+' solid;';
+      if (jsMath.Browser.widthAddsBorder) {w = 0};
+    }
+    if (w == 0) {
+      if (jsMath.Browser.blankWidthBug) {
+        if (jsMath.Browser.quirks) {
+          style += 'width:1px;';
+          backspace = '<span class="spacer" style="margin-right:-1px"></span>'
+        } else if (!isRule) {
+          style += 'width:1px;margin-right:-1px;';
+        }
+      }
+    } else {style += 'width:'+this.Em(w)+';'}
+    if (d == null) {d = 0}
+    if (h) {
+      var H = this.Em(h+d);
+      if (isRule && h*jsMath.em <= 1.5) {H = "1.5px"; h = 1.5/jsMath.em}
+      style += 'height:'+H+';';
+    }
+    if (jsMath.Browser.mozInlineBlockBug) {d = -h}
+    if (jsMath.Browser.msieBlockDepthBug && !isRule) {d -= jsMath.d}
+    if (d) {style += 'vertical-align:'+this.Em(-d)}
+    return backspace+'<span class="blank" style="'+style+'"></span>';
+  },
+
+  /*
+   *  Create a rule line for fractions, etc.
+   */
+  Rule: function (w,h) {
+    if (h == null) {h = jsMath.TeX.default_rule_thickness}
+    return this.Blank(w,h,0,1);
+  },
+
+  /*
+   *  Create a strut for measuring position of baseline
+   */
+  Strut: function (h) {return this.Blank(1,h,0,1)},
+  msieStrut: function (h) {
+    return '<img style="width:1px; height:'+this.Em(h)+'"/>'
+  },
+  
+  /*
+   *  Add a <SPAN> tag to activate a specific CSS class
+   */
+  Class: function (tclass,html) {
+    return '<span class="'+tclass+'">'+html+'</span>';
+  },
+  
+  /*
+   *  Use a <SPAN> to place some HTML at a specific position.
+   *  (This can be replaced by the ones below to overcome
+   *   some browser-specific bugs.)
+   */
+  Place: function (html,x,y) {
+    if (Math.abs(x) < .0001) {x = 0}
+    if (Math.abs(y) < .0001) {y = 0}
+    if (x || y) {
+      var span = '<span style="position: relative;';
+      if (x) {span += ' margin-left:'+this.Em(x)+';'}
+      if (y) {span += ' top:'+this.Em(-y)+';'}
+      html = span + '">' + html + '</span>';
+    }
+    return html;
+  },
+  
+  /*
+   *  For MSIE on Windows, backspacing must be done in a separate
+   *  <SPAN>, otherwise the contents will be clipped.  Netscape
+   *  also doesn't combine vertical and horizontal spacing well.
+   *  Here the x and y positioning are done in separate <SPAN> tags
+   */
+  PlaceSeparateSkips: function (html,x,y,mw,Mw,w) {
+    if (Math.abs(x) < .0001) {x = 0}
+    if (Math.abs(y) < .0001) {y = 0}
+    if (y) {
+      var lw = 0; var rw = 0; var width = "";
+      if (mw != null) {
+        rw = Mw - w; lw = mw;
+        width = ' width:'+this.Em(Mw-mw)+';';
+      }
+      html = 
+        this.Spacer(lw-rw) +
+        '<span style="position: relative; '
+            + 'top:'+this.Em(-y)+';'
+            + 'left:'+this.Em(rw)+';'
+            + width + '">' +
+          this.Spacer(-lw) +
+          html +
+          this.Spacer(rw) +
+        '</span>'
+    }
+    if (x) {html = this.Spacer(x) + html}
+    return html;
+  },
+  
+  /*
+   *  Place a SPAN with absolute coordinates
+   */
+  PlaceAbsolute: function (html,x,y,mw,Mw,w) {
+    if (Math.abs(x) < .0001) {x = 0}
+    if (Math.abs(y) < .0001) {y = 0}
+    var leftSpace = ""; var rightSpace = ""; var width = "";
+    if (jsMath.Browser.msieRelativeClipBug && mw != null) {
+      leftSpace  = this.Spacer(-mw); x += mw;
+      rightSpace = this.Spacer(Mw-w);
+    }
+    if (jsMath.Browser.operaAbsoluteWidthBug) {width = " width: "+this.Em(w+2)}
+    html =
+      '<span style="position:absolute; left:'+this.Em(x)+'; '
+            + 'top:'+this.Em(y)+';'+width+'">' +
+        leftSpace + html + rightSpace +
+        '&nbsp;' + //  space normalizes line height in script styles
+      '</span>';
+    return html;
+  },
+
+  Absolute: function(html,w,h,d,y) {
+    if (y != "none") {
+      if (Math.abs(y) < .0001) {y = 0}
+      html = '<span style="position:absolute; '
+               + 'top:'+jsMath.HTML.Em(y)+'; left:0em;">'
+               + html + '&nbsp;' // space normalizes line height in script styles
+             + '</span>';
+    }
+    if (d == "none") {d = 0}
+    html += this.Blank((jsMath.Browser.lineBreakBug ? 0 : w),h-d,d);
+    if (jsMath.Browser.msieAbsoluteBug) {           // for MSIE (Mac)
+      html = '<span style="position:relative;">' + html + '</span>';
+    }
+    html = '<span style="position:relative;'
+         +   jsMath.Browser.msieInlineBlockFix
+         + '">' + html + '</span>';
+    if (jsMath.Browser.lineBreakBug)
+      {html = '<span style="display:inline-block; width:'+jsMath.HTML.Em(w)+'">'+html+'</span>'}
+    return html;
+  }
+
+};
+
+
+/***************************************************************************/
+
+/*
+ *  jsMath.Box handles TeX's math boxes and jsMath's equivalent of hboxes.
+ */
+
+jsMath.Box = function (format,text,w,h,d) {
+  if (d == null) {d = jsMath.d}
+  this.type = 'typeset';
+  this.w = w; this.h = h; this.d = d; this.bh = h; this.bd = d;
+  this.x = 0; this.y = 0; this.mw = 0; this.Mw = w;
+  this.html = text; this.format = format;
+};
+
+
+jsMath.Add(jsMath.Box,{
+  
+  defaultH: 0, // default height for characters with none specified
+
+  /*
+   *  An empty box
+   */
+  Null: function () {return new jsMath.Box('null','',0,0,0)},
+
+  /*
+   *  A box containing only text whose class and style haven't been added
+   *  yet (so that we can combine ones with the same styles).  It gets
+   *  the text dimensions, if needed.  (In general, this has been
+   *  replaced by TeX() below, but is still used in fallback mode.)
+   */
+  Text: function (text,tclass,style,size,a,d) {
+    var html = jsMath.Typeset.AddClass(tclass,text);
+        html = jsMath.Typeset.AddStyle(style,size,html);
+    var BB = jsMath.EmBoxFor(html); var TeX = jsMath.Typeset.TeX(style,size);
+    var bd = ((tclass == 'cmsy10' || tclass == 'cmex10')? BB.h-TeX.h: TeX.d*BB.h/TeX.hd);
+    var box = new jsMath.Box('text',text,BB.w,BB.h-bd,bd);
+    box.style = style; box.size = size; box.tclass = tclass;
+    if (d != null) {box.d = d*TeX.scale} else {box.d = 0}
+    if (a == null || a == 1) {box.h = .9*TeX.M_height}
+      else {box.h = 1.1*TeX.x_height + TeX.scale*a}
+    return box;
+  },
+
+  /*
+   *  Produce a box containing a given TeX character from a given font.
+   *  The box is a text box (like the ones above), so that characters from
+   *  the same font can be combined.
+   */
+  TeX: function (C,font,style,size) {
+    var c = jsMath.TeX[font][C];
+    if (c.d == null) {c.d = 0}; if (c.h == null) {c.h = 0}
+    if (c.img != null && c.c != '') this.TeXIMG(font,C,jsMath.Typeset.StyleSize(style,size));
+    var scale = jsMath.Typeset.TeX(style,size).scale;
+    var box = new jsMath.Box('text',c.c,c.w*scale,c.h*scale,c.d*scale);
+    box.style = style; box.size = size;
+    if (c.tclass) {
+      box.tclass = c.tclass;
+      if (c.img) {box.bh = c.img.bh; box.bd = c.img.bd}
+            else {box.bh = scale*jsMath.h; box.bd = scale*jsMath.d}
+    } else {
+      box.tclass = font;
+      box.bh = scale*jsMath.TeX[font].h;
+      box.bd = scale*jsMath.TeX[font].d;
+      if (jsMath.Browser.msieFontBug && box.html.match(/&#/)) {
+        // hack to avoid font changing back to the default
+        // font when a unicode reference is not followed
+        // by a letter or number
+        box.html += '<span style="display:none">x</span>';
+      }
+    }
+    return box;
+  },
+
+  /*
+   *  In fallback modes, handle the fact that we don't have the
+   *  sizes of the characters precomputed
+   */
+  TeXfallback: function (C,font,style,size) {
+    var c = jsMath.TeX[font][C]; if (!c.tclass) {c.tclass = font}
+    if (c.img != null) {return this.TeXnonfallback(C,font,style,size)}
+    if (c.h != null && c.a == null) {c.a = c.h-1.1*jsMath.TeX.x_height}
+    var a = c.a; var d = c.d; // avoid Firefox warnings
+    var box = this.Text(c.c,c.tclass,style,size,a,d);
+    var scale = jsMath.Typeset.TeX(style,size).scale;
+    if (c.bh != null) {
+      box.bh = c.bh*scale;
+      box.bd = c.bd*scale;
+    } else {
+      var h = box.bd+box.bh;
+      var html = jsMath.Typeset.AddClass(box.tclass,box.html);
+          html = jsMath.Typeset.AddStyle(style,size,html);
+      box.bd = jsMath.EmBoxFor(html + jsMath.HTML.Strut(h)).h - h;
+      box.bh = h - box.bd;
+      if (scale == 1) {c.bh = box.bh; c.bd = box.bd}
+    }
+    if (jsMath.msieFontBug && box.html.match(/&#/))
+      {box.html += '<span style="display:none">x</span>'}
+    return box;
+  },
+
+  /*
+   *  Set the character's string to the appropriate image file
+   */
+  TeXIMG: function (font,C,size) {
+    var c = jsMath.TeX[font][C];
+    if (c.img.size != null && c.img.size == size &&
+        c.img.best != null && c.img.best == jsMath.Img.best) return;
+    var mustScale = (jsMath.Img.scale != 1);
+    var id = jsMath.Img.best + size - 4;
+    if (id < 0) {id = 0; mustScale = 1} else
+    if (id >= jsMath.Img.fonts.length) {id = jsMath.Img.fonts.length-1; mustScale = 1}
+    var imgFont = jsMath.Img[jsMath.Img.fonts[id]];
+    var img = imgFont[font][C];
+    var scale = 1/jsMath.Img.w[jsMath.Img.fonts[id]];
+    if (id != jsMath.Img.best + size - 4) {
+      if (c.w != null) {scale = c.w/img[0]} else {
+        scale *= jsMath.Img.fonts[size]/jsMath.Img.fonts[4]
+              *  jsMath.Img.fonts[jsMath.Img.best]/jsMath.Img.fonts[id];
+      }
+    }
+    var w = img[0]*scale; var h = img[1]*scale; var d = -img[2]*scale; var v;
+    var wadjust = (c.w == null || Math.abs(c.w-w) < .01)? "" : " margin-right:"+jsMath.HTML.Em(c.w-w)+';';
+    var resize = ""; C = jsMath.Img.HexCode[C];
+    if (!mustScale && !jsMath.Controls.cookie.scaleImg) {
+      if (jsMath.Browser.mozImageSizeBug || 2*w < h || 
+         (jsMath.Browser.msieAlphaBug && jsMath.Controls.cookie.alpha))
+           {resize = "height:"+(img[1]*jsMath.Browser.imgScale)+'px;'}
+      resize += " width:"+(img[0]*jsMath.Browser.imgScale)+'px;'
+      v = -img[2]+'px';
+    } else {
+      if (jsMath.Browser.mozImageSizeBug || 2*w < h ||
+         (jsMath.Browser.msieAlphaBug && jsMath.Controls.cookie.alpha))
+           {resize = "height:"+jsMath.HTML.Em(h*jsMath.Browser.imgScale)+';'}
+      resize += " width:"+jsMath.HTML.Em(w*jsMath.Browser.imgScale)+';'
+      v = jsMath.HTML.Em(d);
+    }
+    var vadjust = (Math.abs(d) < .01 && !jsMath.Browser.valignBug)?
+                         "": " vertical-align:"+v+';';
+    var URL = jsMath.Img.URL(font,jsMath.Img.fonts[id],C);
+    if (jsMath.Browser.msieAlphaBug && jsMath.Controls.cookie.alpha) {
+      c.c = '<img src="'+jsMath.blank+'" '
+               + 'style="'+jsMath.Browser.msieCenterBugFix
+               + resize + vadjust + wadjust
+               + ' filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src=' + "'"
+               + URL + "', sizingMethod='scale'" + ');" />';
+    } else {
+      c.c = '<img src="'+URL+'" style="'+jsMath.Browser.msieCenterBugFix
+                  + resize + vadjust + wadjust + '" />';
+    }
+    c.tclass = "normal";
+    c.img.bh = h+d; c.img.bd = -d;
+    c.img.size = size; c.img.best = jsMath.Img.best;
+  },
+  
+  /*
+   *  A box containing a spacer of a specific width
+   */
+  Space: function (w) {
+    return new jsMath.Box('html',jsMath.HTML.Spacer(w),w,0,0);
+  },
+
+  /*
+   *  A box containing a horizontal rule
+   */
+  Rule: function (w,h) {
+    if (h == null) {h = jsMath.TeX.default_rule_thickness}
+    var html = jsMath.HTML.Rule(w,h);
+    return new jsMath.Box('html',html,w,h,0);
+  },
+
+  /*
+   *  Get a character from a TeX font, and make sure that it has
+   *  its metrics specified.
+   */
+  GetChar: function (code,font) {
+    var c = jsMath.TeX[font][code];
+    if (c.img != null) {this.TeXIMG(font,code,4)}
+    if (c.tclass == null) {c.tclass = font}
+    if (!c.computedW) {
+      c.w = jsMath.EmBoxFor(jsMath.Typeset.AddClass(c.tclass,c.c)).w;
+      if (c.h == null) {c.h = jsMath.Box.defaultH}; if (c.d == null) {c.d = 0}
+      c.computedW = 1;
+    }
+    return c;
+  },
+  
+  /*
+   *  Locate the TeX delimiter character that matches a given height.
+   *  Return the character, font, style and actual height used.
+   */
+  DelimBestFit: function (H,c,font,style) {
+    if (c == 0 && font == 0) return null;
+    var C; var h; font = jsMath.TeX.fam[font];
+    var isSS = (style.charAt(1) == 'S');
+    var isS  = (style.charAt(0) == 'S');
+    while (c != null) {
+      C = jsMath.TeX[font][c];
+      if (C.h == null) {C.h = jsMath.Box.defaultH}; if (C.d == null) {C.d = 0}
+      h = C.h+C.d;
+      if (C.delim) {return [c,font,'',H]}
+      if (isSS && .5*h >= H) {return [c,font,'SS',.5*h]}
+      if (isS  && .7*h >= H) {return [c,font,'S',.7*h]}
+      if (h >= H || C.n == null) {return [c,font,'T',h]}
+      c = C.n;
+    }
+    return null;
+  },
+  
+  /*
+   *  Create the HTML needed for a stretchable delimiter of a given height,
+   *  either centered or not.  This version uses relative placement (i.e.,
+   *  backspaces, not line-breaks).  This works with more browsers, but
+   *  if the font size changes, the backspacing may not be right, so the
+   *  delimiters may become jagged.
+   */
+  DelimExtendRelative: function (H,c,font,a,nocenter) {
+    var C = jsMath.TeX[font][c];
+    var top = this.GetChar(C.delim.top? C.delim.top: C.delim.rep,font);
+    var rep = this.GetChar(C.delim.rep,font);
+    var bot = this.GetChar(C.delim.bot? C.delim.bot: C.delim.rep,font);
+    var ext = jsMath.Typeset.AddClass(rep.tclass,rep.c);
+    var w = rep.w; var h = rep.h+rep.d
+    var y; var Y; var html; var dx; var i; var n;
+    if (C.delim.mid) {// braces
+      var mid = this.GetChar(C.delim.mid,font);
+      n = Math.ceil((H-(top.h+top.d)-(mid.h+mid.d)-(bot.h+bot.d))/(2*(rep.h+rep.d)));
+      H = 2*n*(rep.h+rep.d) + (top.h+top.d) + (mid.h+mid.d) + (bot.h+bot.d);
+      if (nocenter) {y = 0} else {y = H/2+a}; Y = y;
+      html = jsMath.HTML.Place(jsMath.Typeset.AddClass(top.tclass,top.c),0,y-top.h)
+           + jsMath.HTML.Place(jsMath.Typeset.AddClass(bot.tclass,bot.c),-(top.w+bot.w)/2,y-(H-bot.d))
+           + jsMath.HTML.Place(jsMath.Typeset.AddClass(mid.tclass,mid.c),-(bot.w+mid.w)/2,y-(H+mid.h-mid.d)/2);
+      dx = (w-mid.w)/2; if (Math.abs(dx) < .0001) {dx = 0}
+      if (dx) {html += jsMath.HTML.Spacer(dx)}
+      y -= top.h+top.d + rep.h;
+      for (i = 0; i < n; i++) {html += jsMath.HTML.Place(ext,-w,y-i*h)}
+      y -= H/2 - rep.h/2;
+      for (i = 0; i < n; i++) {html += jsMath.HTML.Place(ext,-w,y-i*h)}
+    } else {// everything else
+      n = Math.ceil((H - (top.h+top.d) - (bot.h+bot.d))/(rep.h+rep.d));
+      // make sure two-headed arrows have an extender
+      if (top.h+top.d < .9*(rep.h+rep.d)) {n = Math.max(1,n)}
+      H = n*(rep.h+rep.d) + (top.h+top.d) + (bot.h+bot.d);
+      if (nocenter) {y = 0} else {y = H/2+a}; Y = y;
+      html = jsMath.HTML.Place(jsMath.Typeset.AddClass(top.tclass,top.c),0,y-top.h)
+      dx = (w-top.w)/2; if (Math.abs(dx) < .0001) {dx = 0}
+      if (dx) {html += jsMath.HTML.Spacer(dx)}
+      y -= top.h+top.d + rep.h;
+      for (i = 0; i < n; i++) {html += jsMath.HTML.Place(ext,-w,y-i*h)}
+      html += jsMath.HTML.Place(jsMath.Typeset.AddClass(bot.tclass,bot.c),-(w+bot.w)/2,Y-(H-bot.d));
+    }
+    if (nocenter) {h = top.h} else {h = H/2+a}
+    var box = new jsMath.Box('html',html,rep.w,h,H-h);
+    box.bh = jsMath.TeX[font].h; box.bd = jsMath.TeX[font].d;
+    return box;
+  },
+
+  /*
+   *  Create the HTML needed for a stretchable delimiter of a given height,
+   *  either centered or not.  This version uses absolute placement (i.e.,
+   *  line-breaks, not backspacing).  This gives more reliable results,
+   *  but doesn't work with all browsers.
+   */
+  DelimExtendAbsolute: function (H,c,font,a,nocenter) {
+    var Font = jsMath.TeX[font];
+    var C = Font[c]; var html;
+    var top = this.GetChar(C.delim.top? C.delim.top: C.delim.rep,font);
+    var rep = this.GetChar(C.delim.rep,font);
+    var bot = this.GetChar(C.delim.bot? C.delim.bot: C.delim.rep,font);
+    var n; var h; var y; var ext; var i;
+    
+    if (C.delim.mid) {// braces
+      var mid = this.GetChar(C.delim.mid,font);
+      n = Math.ceil((H-(top.h+top.d)-(mid.h+mid.d-.05)-(bot.h+bot.d-.05))/(2*(rep.h+rep.d-.05)));
+      H = 2*n*(rep.h+rep.d-.05) + (top.h+top.d) + (mid.h+mid.d-.05) + (bot.h+bot.d-.05);
+      
+      html = jsMath.HTML.PlaceAbsolute(jsMath.Typeset.AddClass(top.tclass,top.c),0,0);
+      h = rep.h+rep.d - .05; y = top.d-.05 + rep.h;
+      ext = jsMath.Typeset.AddClass(rep.tclass,rep.c)
+      for (i = 0; i < n; i++) {html += jsMath.HTML.PlaceAbsolute(ext,0,y+i*h)}
+      html += jsMath.HTML.PlaceAbsolute(jsMath.Typeset.AddClass(mid.tclass,mid.c),0,y+n*h-rep.h+mid.h);
+      y += n*h + mid.h+mid.d - .05;
+      for (i = 0; i < n; i++) {html += jsMath.HTML.PlaceAbsolute(ext,0,y+i*h)}
+      html += jsMath.HTML.PlaceAbsolute(jsMath.Typeset.AddClass(bot.tclass,bot.c),0,y+n*h-rep.h+bot.h);
+    } else {// all others
+      n = Math.ceil((H - (top.h+top.d) - (bot.h+bot.d-.05))/(rep.h+rep.d-.05));
+      H = n*(rep.h+rep.d-.05) + (top.h+top.d) + (bot.h+bot.d-.05);
+
+      html = jsMath.HTML.PlaceAbsolute(jsMath.Typeset.AddClass(top.tclass,top.c),0,0);
+      h = rep.h+rep.d-.05; y = top.d-.05 + rep.h;
+      ext = jsMath.Typeset.AddClass(rep.tclass,rep.c);
+      for (i = 0; i < n; i++) {html += jsMath.HTML.PlaceAbsolute(ext,0,y+i*h)}
+      html += jsMath.HTML.PlaceAbsolute(jsMath.Typeset.AddClass(bot.tclass,bot.c),0,y+n*h-rep.h+bot.h);
+    }
+    
+    var w = top.w;
+    if (nocenter) {h = top.h; y = 0} else {h = H/2 + a; y = h - top.h}
+    if (jsMath.Controls.cookie.font === "unicode") {
+      if (jsMath.Browser.msie8HeightBug) {y -= jsMath.hd}
+      else if (jsMath.Browser.msieBlockDepthBug) {y += jsMath.d}
+    }
+    html = jsMath.HTML.Absolute(html,w,Font.h,"none",-y);
+    var box = new jsMath.Box('html',html,rep.w,h,H-h);
+    box.bh = jsMath.TeX[font].h; box.bd = jsMath.TeX[font].d;
+    return box;
+  },
+  
+  /*
+   *  Get the HTML for a given delimiter of a given height.
+   *  It will return either a single character, if one exists, or the
+   *  more complex HTML needed for a stretchable delimiter.
+   */
+  Delimiter: function (H,delim,style,nocenter) {
+    var size = 4;  //### pass this?
+    var TeX = jsMath.Typeset.TeX(style,size);
+    if (!delim) {return this.Space(TeX.nulldelimiterspace)}
+    var CFSH = this.DelimBestFit(H,delim[2],delim[1],style);
+    if (CFSH == null || CFSH[3] < H) 
+      {CFSH = this.DelimBestFit(H,delim[4],delim[3],style)}
+    if (CFSH == null) {return this.Space(TeX.nulldelimiterspace)}
+    if (CFSH[2] == '')
+      {return this.DelimExtend(H,CFSH[0],CFSH[1],TeX.axis_height,nocenter)}
+    var box = jsMath.Box.TeX(CFSH[0],CFSH[1],CFSH[2],size).Styled();
+    if (!nocenter) {box.y = -((box.h+box.d)/2 - box.d - TeX.axis_height)}
+    if (Math.abs(box.y) < .0001) {box.y = 0}
+    if (box.y) {box = jsMath.Box.SetList([box],CFSH[2],size)}
+    return box;
+  },
+  
+  /*
+   *  Get a character by its TeX charcode, and make sure its width
+   *  is specified.
+   */
+  GetCharCode: function (code) {
+    var font = jsMath.TeX.fam[code[0]];
+    var Font = jsMath.TeX[font];
+    var c = Font[code[1]];
+    if (c.img != null) {this.TeXIMG(font,code[1],4)}
+    if (c.w == null) {c.w = jsMath.EmBoxFor(jsMath.Typeset.AddClass(c.tclass,c.c)).w}
+    if (c.font == null) {c.font = font}
+    return c;
+  },
+
+  /*
+   * Add the class to the html, and use the font if there isn't one
+   * specified already
+   */
+
+  AddClass: function (tclass,html,font) {
+    if (tclass == null) {tclass = font}
+    return jsMath.Typeset.AddClass(tclass,html);
+  },
+  
+  /*
+   *  Create the HTML for an alignment (e.g., array or matrix)
+   *  Since the widths are not really accurate (they are based on pixel
+   *  widths not the sub-pixel widths of the actual characters), there
+   *  is some drift involved.  We lay out the table column by column
+   *  to help reduce the problem.
+   *  
+   *  ###  still need to allow users to specify row and column attributes,
+   *       and do things like \span and \multispan  ###
+   */
+  LayoutRelative: function (size,table,align,cspacing,rspacing,vspace,useStrut,addWidth) {
+    if (align == null) {align = []}
+    if (cspacing == null) {cspacing = []}
+    if (rspacing == null) {rspacing = []}
+    if (useStrut == null) {useStrut = 1}
+    if (addWidth == null) {addWidth = 1}
+    
+    // get row and column maximum dimensions
+    var scale = jsMath.sizes[size]/100;
+    var W = []; var H = []; var D = [];
+    var unset = -1000; var bh = unset; var bd = unset;
+    var i; var j; var row;
+    for (i = 0; i < table.length; i++) {
+      if (rspacing[i] == null) {rspacing[i] = 0}
+      row = table[i];
+      H[i] = useStrut*jsMath.h*scale; D[i] = useStrut*jsMath.d*scale;
+      for (j = 0; j < row.length; j++) {
+        row[j] = row[j].Remeasured();
+        if (row[j].h > H[i]) {H[i] = row[j].h}
+        if (row[j].d > D[i]) {D[i] = row[j].d}
+        if (j >= W.length) {W[j] = row[j].w}
+        else if (row[j].w > W[j]) {W[j] = row[j].w}
+        if (row[j].bh > bh) {bh = row[j].bh}
+        if (row[j].bd > bd) {bd = row[j].bd}
+      }
+    }
+    if (rspacing[table.length] == null) {rspacing[table.length] = 0}
+    if (bh == unset) {bh = 0}; if (bd == unset) {bd = 0}
+
+    // lay out the columns
+    var HD = useStrut*(jsMath.hd-.01)*scale;
+    var dy = (vspace || 1) * scale/6;
+    var html = ''; var pW = 0; var cW = 0;
+    var w; var h; var y;
+    var box; var mlist; var entry;
+    for (j = 0; j < W.length; j++) {
+      mlist = []; y = -H[0]-rspacing[0]; pW = 0;
+      for (i = 0; i < table.length; i++) {
+        entry = table[i][j];
+        if (entry && entry.format != 'null') {
+          if (align[j] == 'l') {w = 0} else
+          if (align[j] == 'r') {w = W[j] - entry.w} else
+            {w = (W[j] - entry.w)/2}
+          entry.x = w - pW; pW = entry.w + w; entry.y = y;
+          mlist[mlist.length] = entry;
+        }
+        if (i+1 < table.length) {y -= Math.max(HD,D[i]+H[i+1]) + dy + rspacing[i+1]}
+      }
+      if (cspacing[j] == null) cspacing[j] = scale;
+      if (mlist.length > 0) {
+        box = jsMath.Box.SetList(mlist,'T',size);
+        html += jsMath.HTML.Place(box.html,cW,0);
+        cW = W[j] - box.w + cspacing[j];
+      } else {cW += cspacing[j]}
+    }
+    
+    // get the full width and height
+    w = -cspacing[W.length-1]; y = (H.length-1)*dy + rspacing[0];
+    for (i = 0; i < W.length; i++) {w += W[i] + cspacing[i]}
+    for (i = 0; i < H.length; i++) {y += Math.max(HD,H[i]+D[i]) + rspacing[i+1]}
+    h = y/2 + jsMath.TeX.axis_height; var d = y-h;
+    
+    // adjust the final row width, and vcenter the table
+    //   (add 1/6em at each side for the \,)
+    html += jsMath.HTML.Spacer(cW-cspacing[W.length-1] + addWidth*scale/6);
+    html = jsMath.HTML.Place(html,addWidth*scale/6,h);
+    box = new jsMath.Box('html',html,w+addWidth*scale/3,h,d);
+    box.bh = bh; box.bd = bd;
+    return box;
+  },
+
+  /*
+   *  Create the HTML for an alignment (e.g., array or matrix)
+   *  Use absolute position for elements in the array.
+   *  
+   *  ###  still need to allow users to specify row and column attributes,
+   *       and do things like \span and \multispan  ###
+   */
+  LayoutAbsolute: function (size,table,align,cspacing,rspacing,vspace,useStrut,addWidth) {
+    if (align == null) {align = []}
+    if (cspacing == null) {cspacing = []}
+    if (rspacing == null) {rspacing = []}
+    if (useStrut == null) {useStrut = 1}
+    if (addWidth == null) {addWidth = 1}
+    // get row and column maximum dimensions
+    var scale = jsMath.sizes[size]/100;
+    var HD = useStrut*(jsMath.hd-.01)*scale;
+    var dy = (vspace || 1) * scale/6;
+    var W = []; var H = []; var D = [];
+    var w = 0; var h; var x; var y;
+    var i; var j; var row;
+    for (i = 0; i < table.length; i++) {
+      if (rspacing[i] == null) {rspacing[i] = 0}
+      row = table[i];
+      H[i] = useStrut*jsMath.h*scale; D[i] = useStrut*jsMath.d*scale;
+      for (j = 0; j < row.length; j++) {
+        row[j] = row[j].Remeasured();
+        if (row[j].h > H[i]) {H[i] = row[j].h}
+        if (row[j].d > D[i]) {D[i] = row[j].d}
+        if (j >= W.length) {W[j] = row[j].w}
+        else if (row[j].w > W[j]) {W[j] = row[j].w}
+      }
+    }
+    if (rspacing[table.length] == null) {rspacing[table.length] = 0}
+
+    // get the height and depth of the centered table
+    y = (H.length-1)*dy + rspacing[0];
+    for (i = 0; i < H.length; i++) {y += Math.max(HD,H[i]+D[i]) + rspacing[i+1]}
+    h = y/2 + jsMath.TeX.axis_height; var d = y - h;
+
+    // lay out the columns
+    var html = ''; var entry; w = addWidth*scale/6;
+    for (j = 0; j < W.length; j++) {
+      y = H[0]-h + rspacing[0];
+      for (i = 0; i < table.length; i++) {
+        entry = table[i][j];
+        if (entry && entry.format != 'null') {
+          if (align[j] && align[j] == 'l') {x = 0} else
+          if (align[j] && align[j] == 'r') {x = W[j] - entry.w} else
+            {x = (W[j] - entry.w)/2}
+          html += jsMath.HTML.PlaceAbsolute(entry.html,w+x,
+                    y-Math.max(0,entry.bh-jsMath.h*scale),
+                    entry.mw,entry.Mw,entry.w);
+        }
+        if (i+1 < table.length) {y += Math.max(HD,D[i]+H[i+1]) + dy + rspacing[i+1]}
+      }
+      if (cspacing[j] == null) cspacing[j] = scale;
+      w += W[j] + cspacing[j];
+    }
+    
+    // get the full width
+    w = -cspacing[W.length-1]+addWidth*scale/3;
+    for (i = 0; i < W.length; i++) {w += W[i] + cspacing[i]}
+
+    html = jsMath.HTML.Spacer(addWidth*scale/6)+html+jsMath.HTML.Spacer(addWidth*scale/6);
+    if (jsMath.Browser.spanHeightVaries) {y = h-jsMath.h} else {y = 0}
+    if (jsMath.Browser.msie8HeightBug) {y = d-jsMath.d}
+    html = jsMath.HTML.Absolute(html,w,h+d,d,y);
+    var box = new jsMath.Box('html',html,w+addWidth*scale/3,h,d);
+    return box;
+  },
+
+  /*
+   *  Look for math within \hbox and other non-math text
+   */
+  InternalMath: function (text,size) {
+    if (!jsMath.safeHBoxes) {text = text.replace(/@\(([^)]*)\)/g,'<$1>')}
+    if (!text.match(/\$|\\\(/)) 
+      {return this.Text(this.safeHTML(text),'normal','T',size).Styled()}
+
+    var i = 0; var k = 0; var c; var match = '';
+    var mlist = []; var parse, s;
+    while (i < text.length) {
+      c = text.charAt(i++);
+      if (c == '$') {
+        if (match == '$') {
+          parse = jsMath.Parse(text.slice(k,i-1),null,size);
+          if (parse.error) {
+            mlist[mlist.length] = this.Text(parse.error,'error','T',size,1,.2);
+          } else {
+            parse.Atomize();
+            mlist[mlist.length] = parse.mlist.Typeset('T',size).Styled();
+          }
+          match = ''; k = i;
+        } else {
+          s = this.safeHTML(text.slice(k,i-1));
+          mlist[mlist.length] = this.Text(s,'normal','T',size,1,.2);
+          match = '$'; k = i;
+        }
+      } else if (c == '\\') {
+        c = text.charAt(i++);
+        if (c == '(' && match == '') {
+          s = this.safeHTML(text.slice(k,i-2));
+          mlist[mlist.length] = this.Text(s,'normal','T',size,1,.2);
+          match = ')'; k = i;
+        } else if (c == ')' && match == ')') {
+          parse = jsMath.Parse(text.slice(k,i-2),null,size);
+          if (parse.error) {
+            mlist[mlist.length] = this.Text(parse.error,'error','T',size,1,.2);
+          } else {
+            parse.Atomize();
+            mlist[mlist.length] = parse.mlist.Typeset('T',size).Styled();
+          }
+          match = ''; k = i;
+        }
+      }
+    }
+    s = this.safeHTML(text.slice(k));
+    mlist[mlist.length] = this.Text(s,'normal','T',size,1,.2);
+    return this.SetList(mlist,'T',size);
+  },
+  
+  /*
+   *  Quote HTML characters if we are in safe mode
+   */
+  safeHTML: function (s) {
+    if (jsMath.safeHBoxes) {
+      s = s.replace(/&/g,'&amp;')
+           .replace(/</g,'&lt;')
+           .replace(/>/g,'&gt;');
+    }
+    return s;
+  },
+  
+  /*
+   *  Convert an abitrary box to a typeset box.  I.e., make an
+   *  HTML version of the contents of the box, at its desired (x,y)
+   *  position.
+   */
+  Set: function (box,style,size,addstyle) {
+    if (box && box.type) {
+      if (box.type == 'typeset') {return box}
+      if (box.type == 'mlist') {
+        box.mlist.Atomize(style,size);
+        return box.mlist.Typeset(style,size);
+      }
+      if (box.type == 'text') {
+        box = this.Text(box.text,box.tclass,style,size,box.ascend||null,box.descend||null);
+        if (addstyle != 0) {box.Styled()}
+        return box;
+      }
+      box = this.TeX(box.c,box.font,style,size);
+      if (addstyle != 0) {box.Styled()}
+      return box;
+    }
+    return jsMath.Box.Null();
+  },
+
+  /*
+   *  Convert a list of boxes to a single typeset box.  I.e., finalize
+   *  the HTML for the list of boxes, properly spaced and positioned.
+   */
+  SetList: function (boxes,style,size) {
+    var mlist = []; var box;
+    for (var i = 0; i < boxes.length; i++) {
+      box = boxes[i];
+      if (box.type == 'typeset') {box = jsMath.mItem.Typeset(box)}
+      mlist[mlist.length] = box;
+    }
+    var typeset = new jsMath.Typeset(mlist);
+    return typeset.Typeset(style,size);
+  }
+
+});
+
+
+jsMath.Package(jsMath.Box,{
+
+  /*
+   *  Add the class and style to a text box (i.e., finalize the
+   *  unpositioned HTML for the box).
+   */
+  Styled: function () {
+    if (this.format == 'text') {
+      this.html = jsMath.Typeset.AddClass(this.tclass,this.html);
+      this.html = jsMath.Typeset.AddStyle(this.style,this.size,this.html);
+      delete this.tclass; delete this.style;
+      this.format = 'html';
+    }
+    return this;
+  },
+  
+  /*
+   *  Recompute the box width to make it more accurate.
+   */
+  Remeasured: function () {
+    if (this.w > 0) {
+      var w = this.w; this.w = jsMath.EmBoxFor(this.html).w;
+      if (this.w > this.Mw) {this.Mw = this.w}
+      w = this.w/w; if (Math.abs(w-1) > .05) {this.h *= w; this.d *= w}
+    }
+    return this;
+  }
+
+});
+
+
+/***************************************************************************/
+
+/*
+ *  mItems are the building blocks of mLists (math lists) used to
+ *  store the information about a mathematical expression.  These are
+ *  basically the items listed in the TeXbook in Appendix G (plus some
+ *  minor extensions).
+ */
+jsMath.mItem = function (type,def) {
+  this.type = type;
+  jsMath.Add(this,def);
+}
+
+jsMath.Add(jsMath.mItem,{
+
+  /*
+   *  A general atom (given a nucleus for the atom)
+   */
+  Atom: function (type,nucleus) {
+    return new jsMath.mItem(type,{atom: 1, nuc: nucleus});
+  },
+
+  /*
+   *  An atom whose nucleus is a piece of text, in a given
+   *  class, with a given additional height and depth
+   */
+  TextAtom: function (type,text,tclass,a,d) {
+    var atom = new jsMath.mItem(type,{
+      atom: 1,
+      nuc: {
+        type: 'text',
+        text: text,
+        tclass: tclass
+      }
+    });
+    if (a != null) {atom.nuc.ascend = a}
+    if (d != null) {atom.nuc.descend = d}
+    return atom;
+  },
+  
+  /*
+   *  An atom whose nucleus is a TeX character in a specific font
+   */
+  TeXAtom: function (type,c,font) {
+    return new jsMath.mItem(type,{
+      atom: 1,
+      nuc: {
+        type: 'TeX',
+        c: c,
+        font: font
+      }
+    });
+  },
+
+  /*
+   *  A generalized fraction atom, with given delimiters, rule
+   *  thickness, and a numerator and denominator.
+   */
+  Fraction: function (name,num,den,thickness,left,right) {
+    return new jsMath.mItem('fraction',{
+      from: name, num: num, den: den,
+      thickness: thickness, left: left, right: right
+    });
+  },
+
+  /*
+   *  An atom that inserts some glue
+   */
+  Space: function (w) {return new jsMath.mItem('space',{w: w})},
+
+  /*
+   *  An atom that contains a typeset box (like an hbox or vbox)
+   */
+  Typeset: function (box) {return new jsMath.mItem('ord',{atom:1, nuc: box})},
+  
+  /*
+   *  An atom that contains some finished HTML (acts like a typeset box)
+   */
+  HTML: function (html) {return new jsMath.mItem('html',{html: html})}
+
+});
+
+/***************************************************************************/
+
+/*
+ *  mLists are lists of mItems, and encode the contents of
+ *  mathematical expressions and sub-expressions.  They act as
+ *  the expression "stack" as the mathematics is parsed, and
+ *  contain some state information, like the position of the
+ *  most recent open paren and \over command, and the current font.
+ */
+jsMath.mList = function (list,font,size,style) {
+  if (list) {this.mlist = list} else {this.mlist = []}
+  if (style == null) {style = 'T'}; if (size == null) {size = 4}
+  this.data = {openI: null, overI: null, overF: null,
+               font: font, size: size, style: style};
+  this.init = {size: size, style: style};
+}
+
+jsMath.Package(jsMath.mList,{
+
+  /*
+   *  Add an mItem to the list
+   */
+  Add: function (box) {return (this.mlist[this.mlist.length] = box)},
+  
+  /*
+   *  Get the i-th mItem from the list
+   */
+  Get: function (i) {return this.mlist[i]},
+  
+  /*
+   *  Get the length of the list
+   */
+  Length: function() {return this.mlist.length},
+
+  /*
+   *  Get the tail mItem of the list
+   */
+  Last: function () {
+    if (this.mlist.length == 0) {return null}
+    return this.mlist[this.mlist.length-1]
+  },
+
+  /*
+   *  Get a sublist of an mList
+   */
+  Range: function (i,j) {
+    if (j == null) {j = this.mlist.length}
+    return new jsMath.mList(this.mlist.slice(i,j+1));
+  },
+
+  /*
+   *  Remove a range of mItems from the list.
+   */
+  Delete: function (i,j) {
+    if (j == null) {j = i}
+    if (this.mlist.splice) {this.mlist.splice(i,j-i+1)} else {
+      var mlist = [];
+      for (var k = 0; k < this.mlist.length; k++)
+        {if (k < i || k > j) {mlist[mlist.length] = this.mlist[k]}}
+      this.mlist = mlist;
+    }
+  },
+
+  /*
+   *  Add an open brace and maintain the stack information
+   *  about the previous open brace so we can recover it
+   *  when this one os closed.
+   */
+  Open: function (left) {
+    var box = this.Add(new jsMath.mItem('boundary',{data: this.data}));
+    var olddata = this.data;
+    this.data = {}; for (var i in olddata) {this.data[i] = olddata[i]}
+    delete this.data.overI; delete this.data.overF;
+    this.data.openI = this.mlist.length-1;
+    if (left != null) {box.left = left}
+    return box;
+  },
+
+  /*
+   *  Attempt to close a brace.  Recover the stack information
+   *  about previous open braces and \over commands.  If there was an
+   *  \over (or \above, etc) in this set of braces, create a fraction
+   *  atom from the two halves, otherwise create an inner or ord
+   *  from the contents of the braces.
+   *  Remove the braced material from the list and add the newly
+   *  created atom (the fraction, inner or ord).
+   */
+  Close: function (right) {
+    if (right != null) {right = new jsMath.mItem('boundary',{right: right})}
+    var atom; var open = this.data.openI;
+    var over = this.data.overI; var from = this.data.overF;
+    this.data  = this.mlist[open].data;
+    if (over) {
+      atom = jsMath.mItem.Fraction(from.name,
+        {type: 'mlist', mlist: this.Range(open+1,over-1)},
+        {type: 'mlist', mlist: this.Range(over)},
+        from.thickness,from.left,from.right);
+      if (right) {
+        var mlist = new jsMath.mList([this.mlist[open],atom,right]);
+        atom = jsMath.mItem.Atom('inner',{type: 'mlist', mlist: mlist});
+      }
+    } else {
+      var openI = open+1; if (right) {this.Add(right); openI--}
+      atom = jsMath.mItem.Atom((right)?'inner':'ord',
+                  {type: 'mlist', mlist: this.Range(openI)});
+    }
+    this.Delete(open,this.Length());
+    return this.Add(atom);
+  },
+
+  /*
+   *  Create a generalized fraction from an mlist that
+   *  contains an \over (or \above, etc).
+   */
+  Over: function () {
+    var over = this.data.overI; var from = this.data.overF;
+    var atom = jsMath.mItem.Fraction(from.name,
+      {type: 'mlist', mlist: this.Range(open+1,over-1)},
+      {type: 'mlist', mlist: this.Range(over)},
+      from.thickness,from.left,from.right);
+    this.mlist = [atom];
+  },
+
+  /*
+   *  Take a raw mList (that has been produced by parsing some TeX
+   *  expression), and perform the modifications outlined in
+   *  Appendix G of the TeXbook.  
+   */
+  Atomize: function (style,size) {
+    var mitem; var prev = '';
+    this.style = style; this.size = size;
+    for (var i = 0; i < this.mlist.length; i++) {
+      mitem = this.mlist[i]; mitem.delta = 0;
+      if (mitem.type == 'choice') 
+        {this.mlist = this.Atomize.choice(this.style,mitem,i,this.mlist); i--}
+      else if (this.Atomize[mitem.type]) {
+        var f = this.Atomize[mitem.type]; // Opera needs separate name
+        f(this.style,this.size,mitem,prev,this,i);
+      }
+      prev = mitem;
+    }
+    if (mitem && mitem.type == 'bin') {mitem.type = 'ord'}
+    if (this.mlist.length >= 2 && mitem.type == 'boundary' &&
+        this.mlist[0].type == 'boundary') {this.AddDelimiters(style,size)}
+  },
+
+  /*
+   *  For a list that has boundary delimiters as its first and last
+   *  entries, we replace the boundary atoms by open and close
+   *  atoms whose nuclii are the specified delimiters properly sized
+   *  for the contents of the list.  (Rule 19)
+   */
+  AddDelimiters: function(style,size) {
+    var unset = -10000; var h = unset; var d = unset;
+    for (var i = 0; i < this.mlist.length; i++) {
+      var mitem = this.mlist[i];
+      if (mitem.atom || mitem.type == 'box') {
+        h = Math.max(h,mitem.nuc.h+mitem.nuc.y);
+        d = Math.max(d,mitem.nuc.d-mitem.nuc.y);
+      }
+    }
+    var TeX = jsMath.TeX; var a = jsMath.Typeset.TeX(style,size).axis_height;
+    var delta = Math.max(h-a,d+a);
+    var H =  Math.max(Math.floor(TeX.integer*delta/500)*TeX.delimiterfactor,
+                      TeX.integer*(2*delta-TeX.delimitershortfall))/TeX.integer;
+    var left = this.mlist[0]; var right = this.mlist[this.mlist.length-1];
+    left.nuc = jsMath.Box.Delimiter(H,left.left,style);
+    right.nuc = jsMath.Box.Delimiter(H,right.right,style);
+    left.type = 'open'; left.atom = 1; delete left.left;
+    right.type = 'close'; right.atom = 1; delete right.right;
+  },
+  
+  /*
+   *  Typeset a math list to produce final HTML for the list.
+   */
+  Typeset: function (style,size) {
+    var typeset = new jsMath.Typeset(this.mlist);
+    return typeset.Typeset(style,size);
+  }
+
+});
+
+
+/*
+ *  These routines implement the main rules given in Appendix G of the
+ *  TeXbook
+ */
+
+jsMath.Add(jsMath.mList.prototype.Atomize,{
+
+  /*
+   *  Handle \displaystyle, \textstyle, etc.
+   */
+  style: function (style,size,mitem,prev,mlist) {
+    mlist.style = mitem.style;
+  },
+  
+  /*
+   *  Handle \tiny, \small, etc.
+   */
+  size: function (style,size,mitem,prev,mlist) {
+    mlist.size = mitem.size;
+  },
+  
+  /*
+   *  Create empty boxes of the proper sizes for the various
+   *  phantom-type commands
+   */
+  phantom: function (style,size,mitem) {
+    var box = mitem.nuc = jsMath.Box.Set(mitem.phantom,style,size);
+    if (mitem.h) {box.Remeasured(); box.html = jsMath.HTML.Spacer(box.w)}
+      else {box.html = '', box.w = box.Mw = box.mw = 0;}
+    if (!mitem.v) {box.h = box.d = 0}
+    box.bd = box.bh = 0;
+    delete mitem.phantom;
+    mitem.type = 'box';
+  },
+  
+  /*
+   *  Create a box of zero height and depth containing the
+   *  contents of the atom
+   */
+  smash: function (style,size,mitem) {
+    var box = mitem.nuc = jsMath.Box.Set(mitem.smash,style,size).Remeasured();
+    box.h = box.d = 0;
+    delete mitem.smash;
+    mitem.type = 'box';
+  },
+
+  /*
+   *  Move a box up or down vertically
+   */
+  raise: function (style,size,mitem) {
+    mitem.nuc = jsMath.Box.Set(mitem.nuc,style,size);
+    var y = mitem.raise;
+    mitem.nuc.html =
+      jsMath.HTML.Place(mitem.nuc.html,0,y,mitem.nuc.mw,mitem.nuc.Mw,mitem.nuc.w);
+    mitem.nuc.h += y; mitem.nuc.d -= y;
+    mitem.type = 'ord'; mitem.atom = 1;
+  },
+
+  /*
+   *  Hide the size of a box so that it laps to the left or right, or
+   *  up or down.
+   */
+  lap: function (style,size,mitem) {
+    var box = jsMath.Box.Set(mitem.nuc,style,size).Remeasured();
+    var mlist = [box];
+    if (mitem.lap == 'llap') {box.x = -box.w} else
+    if (mitem.lap == 'rlap') {mlist[1] = jsMath.mItem.Space(-box.w)} else
+    if (mitem.lap == 'ulap') {box.y = box.d; box.h = box.d = 0} else
+    if (mitem.lap == 'dlap') {box.y = -box.h; box.h = box.d = 0}
+    mitem.nuc = jsMath.Box.SetList(mlist,style,size);
+    if (mitem.lap == 'ulap' || mitem.lap == 'dlap') {mitem.nuc.h = mitem.nuc.d = 0}
+    mitem.type = 'box'; delete mitem.atom;
+  },
+
+  /*
+   *  Handle a Bin atom. (Rule 5)
+   */
+  bin: function (style,size,mitem,prev) {
+    if (prev && prev.type) {
+      var type  = prev.type;
+      if (type == 'bin' || type == 'op' || type == 'rel' ||
+          type == 'open' || type == 'punct' || type == '' ||
+          (type == 'boundary' && prev.left != '')) {mitem.type = 'ord'}
+    } else {mitem.type = 'ord'}
+    jsMath.mList.prototype.Atomize.SupSub(style,size,mitem);
+  },
+
+  /*
+   *  Handle a Rel atom.  (Rule 6)
+   */
+  rel: function (style,size,mitem,prev) {
+    if (prev.type && prev.type == 'bin') {prev.type = 'ord'}
+    jsMath.mList.prototype.Atomize.SupSub(style,size,mitem);
+  },
+
+  /*
+   *  Handle a Close atom.  (Rule 6)
+   */
+  close: function (style,size,mitem,prev) {
+    if (prev.type && prev.type == 'bin') {prev.type = 'ord'}
+    jsMath.mList.prototype.Atomize.SupSub(style,size,mitem);
+  },
+
+  /*
+   *  Handle a Punct atom.  (Rule 6)
+   */
+  punct: function (style,size,mitem,prev) {
+    if (prev.type && prev.type == 'bin') {prev.type = 'ord'}
+    jsMath.mList.prototype.Atomize.SupSub(style,size,mitem);
+  },
+
+  /*
+   *  Handle an Open atom.  (Rule 7)
+   */
+  open: function (style,size,mitem) {
+    jsMath.mList.prototype.Atomize.SupSub(style,size,mitem);
+  },
+
+  /*
+   *  Handle an Inner atom.  (Rule 7)
+   */
+  inner: function (style,size,mitem) {
+    jsMath.mList.prototype.Atomize.SupSub(style,size,mitem);
+  },
+
+  /*
+   *  Handle a Vcent atom.  (Rule 8)
+   */
+  vcenter: function (style,size,mitem) {
+    var box = jsMath.Box.Set(mitem.nuc,style,size);
+    var TeX = jsMath.Typeset.TeX(style,size);
+    box.y = TeX.axis_height - (box.h-box.d)/2;
+    mitem.nuc = box; mitem.type = 'ord';
+    jsMath.mList.prototype.Atomize.SupSub(style,size,mitem);
+  },
+
+  /*
+   *  Handle an Over atom.  (Rule 9)
+   */
+  overline: function (style,size,mitem) {
+    var TeX = jsMath.Typeset.TeX(style,size);
+    var box = jsMath.Box.Set(mitem.nuc,jsMath.Typeset.PrimeStyle(style),size).Remeasured();
+    var t = TeX.default_rule_thickness;
+    var rule = jsMath.Box.Rule(box.w,t);
+    rule.x = -rule.w; rule.y = box.h + 3*t;
+    mitem.nuc = jsMath.Box.SetList([box,rule],style,size);
+    mitem.nuc.h += t;
+    mitem.type = 'ord';
+    jsMath.mList.prototype.Atomize.SupSub(style,size,mitem);
+  },
+
+  /*
+   *  Handle an Under atom.  (Rule 10)
+   */
+  underline: function (style,size,mitem) {
+    var TeX = jsMath.Typeset.TeX(style,size);
+    var box = jsMath.Box.Set(mitem.nuc,jsMath.Typeset.PrimeStyle(style),size).Remeasured();
+    var t = TeX.default_rule_thickness;
+    var rule = jsMath.Box.Rule(box.w,t);
+    rule.x = -rule.w; rule.y = -box.d - 3*t - t;
+    mitem.nuc = jsMath.Box.SetList([box,rule],style,size);
+    mitem.nuc.d += t;
+    mitem.type = 'ord';
+    jsMath.mList.prototype.Atomize.SupSub(style,size,mitem);
+  },
+
+  /*
+   *  Handle a Rad atom.  (Rule 11 plus stuff for \root..\of)
+   */
+  radical: function (style,size,mitem) {
+    var TeX = jsMath.Typeset.TeX(style,size);
+    var Cp = jsMath.Typeset.PrimeStyle(style);
+    var box = jsMath.Box.Set(mitem.nuc,Cp,size).Remeasured();
+    var t = TeX.default_rule_thickness;
+    var p = t; if (style == 'D' || style == "D'") {p = TeX.x_height}
+    var r = t + p/4; 
+    var surd = jsMath.Box.Delimiter(box.h+box.d+r+t,[0,2,0x70,3,0x70],style,1);
+//    if (surd.h > 0) {t = surd.h} // thickness of rule is height of surd character
+    if (surd.d > box.h+box.d+r) {r = (r+surd.d-box.h-box.d)/2}
+    surd.y = box.h+r;
+    var rule = jsMath.Box.Rule(box.w,t);
+    rule.y = surd.y-t/2; rule.h += 3*t/2; box.x = -box.w;
+    var Cr = jsMath.Typeset.UpStyle(jsMath.Typeset.UpStyle(style));
+    var root = jsMath.Box.Set(mitem.root || null,Cr,size).Remeasured();
+    if (mitem.root) {
+      root.y = .55*(box.h+box.d+3*t+r)-box.d;
+      surd.x = Math.max(root.w-(11/18)*surd.w,0);
+      rule.x = (7/18)*surd.w;
+      root.x = -(root.w+rule.x);
+    }
+    mitem.nuc = jsMath.Box.SetList([surd,root,rule,box],style,size);
+    mitem.type = 'ord';
+    jsMath.mList.prototype.Atomize.SupSub(style,size,mitem);
+  },
+
+  /*
+   *  Handle an Acc atom.  (Rule 12)
+   */
+  accent: function (style,size,mitem) {
+    var TeX = jsMath.Typeset.TeX(style,size);
+    var Cp = jsMath.Typeset.PrimeStyle(style);
+    var box = jsMath.Box.Set(mitem.nuc,Cp,size);
+    var u = box.w; var s; var Font; var ic = 0;
+    if (mitem.nuc.type == 'TeX') {
+      Font = jsMath.TeX[mitem.nuc.font];
+      if (Font[mitem.nuc.c].krn && Font.skewchar)
+        {s = Font[mitem.nuc.c].krn[Font.skewchar]}
+      ic = Font[mitem.nuc.c].ic; if (ic == null) {ic = 0}
+    }
+    if (s == null) {s = 0}
+    
+    var c = mitem.accent[2];
+    var font = jsMath.TeX.fam[mitem.accent[1]]; Font = jsMath.TeX[font];
+    while (Font[c].n && Font[Font[c].n].w <= u) {c = Font[c].n}
+    
+    var delta = Math.min(box.h,TeX.x_height);
+    if (mitem.nuc.type == 'TeX') {
+      var nitem = jsMath.mItem.Atom('ord',mitem.nuc);
+      nitem.sup = mitem.sup; nitem.sub = mitem.sub; nitem.delta = 0;
+      jsMath.mList.prototype.Atomize.SupSub(style,size,nitem);
+      delta += (nitem.nuc.h - box.h);
+      box = mitem.nuc = nitem.nuc;
+      delete mitem.sup; delete mitem.sub;
+    }
+    var acc = jsMath.Box.TeX(c,font,style,size);
+    acc.y = box.h - delta; acc.x = -box.w + s + (u-acc.w)/2;
+    if (jsMath.Browser.msieAccentBug) 
+      {acc.html += jsMath.HTML.Spacer(.1); acc.w += .1; acc.Mw += .1}
+    if (Font[c].ic || ic) {acc.x += (ic - (Font[c].ic||0)) * TeX.scale}
+
+    mitem.nuc = jsMath.Box.SetList([box,acc],style,size);
+    if (mitem.nuc.w != box.w) {
+      var space = jsMath.mItem.Space(box.w-mitem.nuc.w);
+      mitem.nuc = jsMath.Box.SetList([mitem.nuc,space],style,size);
+    }
+    mitem.type = 'ord';
+    jsMath.mList.prototype.Atomize.SupSub(style,size,mitem);
+  },
+
+  /*
+   *  Handle an Op atom.  (Rules 13 and 13a)
+   */
+  op: function (style,size,mitem) {
+    var TeX = jsMath.Typeset.TeX(style,size); var box;
+    mitem.delta = 0; var isD = (style.charAt(0) == 'D');
+    if (mitem.limits == null && isD) {mitem.limits = 1}
+
+    if (mitem.nuc.type == 'TeX') {
+      var C = jsMath.TeX[mitem.nuc.font][mitem.nuc.c];
+      if (isD && C.n) {mitem.nuc.c = C.n; C = jsMath.TeX[mitem.nuc.font][C.n]}
+      box = mitem.nuc = jsMath.Box.Set(mitem.nuc,style,size);
+      if (C.ic) {
+        mitem.delta = C.ic * TeX.scale;
+        if (mitem.limits || !mitem.sub || jsMath.Browser.msieIntegralBug) {
+          box = mitem.nuc = jsMath.Box.SetList([box,jsMath.mItem.Space(mitem.delta)],style,size);
+        }
+      }
+      box.y = -((box.h+box.d)/2 - box.d - TeX.axis_height);
+      if (Math.abs(box.y) < .0001) {box.y = 0}
+    }
+    
+    if (!box) {box = mitem.nuc = jsMath.Box.Set(mitem.nuc,style,size).Remeasured()}
+    if (mitem.limits) {
+      var W = box.w; var x = box.w;
+      var mlist = [box]; var dh = 0; var dd = 0;
+      if (mitem.sup) {
+        var sup = jsMath.Box.Set(mitem.sup,jsMath.Typeset.UpStyle(style),size).Remeasured();
+        sup.x = ((box.w-sup.w)/2 + mitem.delta/2) - x; dh = TeX.big_op_spacing5;
+        W = Math.max(W,sup.w); x += sup.x + sup.w;
+        sup.y = box.h+sup.d + box.y +
+                    Math.max(TeX.big_op_spacing1,TeX.big_op_spacing3-sup.d);
+        mlist[mlist.length] = sup; delete mitem.sup;
+      }
+      if (mitem.sub) {
+        var sub = jsMath.Box.Set(mitem.sub,jsMath.Typeset.DownStyle(style),size).Remeasured();
+        sub.x = ((box.w-sub.w)/2 - mitem.delta/2) - x; dd = TeX.big_op_spacing5;
+        W = Math.max(W,sub.w); x += sub.x + sub.w;
+        sub.y = -box.d-sub.h + box.y -
+                   Math.max(TeX.big_op_spacing2,TeX.big_op_spacing4-sub.h);
+        mlist[mlist.length] = sub; delete mitem.sub;
+      }
+      if (W > box.w) {box.x = (W-box.w)/2; x += box.x}
+      if (x < W) {mlist[mlist.length] = jsMath.mItem.Space(W-x)}
+      mitem.nuc = jsMath.Box.SetList(mlist,style,size);
+      mitem.nuc.h += dh; mitem.nuc.d += dd;
+    } else {
+      if (jsMath.Browser.msieIntegralBug && mitem.sub && C && C.ic) 
+        {mitem.nuc = jsMath.Box.SetList([box,jsMath.Box.Space(-C.ic*TeX.scale)],style,size)}
+      else if (box.y) {mitem.nuc = jsMath.Box.SetList([box],style,size)}
+      jsMath.mList.prototype.Atomize.SupSub(style,size,mitem);
+    }
+  },
+
+  /*
+   *  Handle an Ord atom.  (Rule 14)
+   */
+  ord: function (style,size,mitem,prev,mList,i) {
+    if (mitem.nuc.type == 'TeX' && !mitem.sup && !mitem.sub) {
+      var nitem = mList.mlist[i+1];
+      if (nitem && nitem.atom && nitem.type &&
+          (nitem.type == 'ord' || nitem.type == 'op' || nitem.type == 'bin' ||
+           nitem.type == 'rel' || nitem.type == 'open' ||
+           nitem.type == 'close' || nitem.type == 'punct')) {
+        if (nitem.nuc.type == 'TeX' && nitem.nuc.font == mitem.nuc.font) {
+          mitem.textsymbol = 1;
+          var krn = jsMath.TeX[mitem.nuc.font][mitem.nuc.c].krn;
+          krn *= jsMath.Typeset.TeX(style,size).scale;
+          if (krn && krn[nitem.nuc.c]) {
+            for (var k = mList.mlist.length-1; k > i; k--)
+              {mList.mlist[k+1] = mList.mlist[k]}
+            mList.mlist[i+1] = jsMath.mItem.Space(krn[nitem.nuc.c]);
+          }
+        }
+      }
+    }
+    jsMath.mList.prototype.Atomize.SupSub(style,size,mitem);
+  },
+
+  /*
+   *  Handle a generalized fraction.  (Rules 15 to 15e)
+   */
+  fraction: function (style,size,mitem) {
+    var TeX = jsMath.Typeset.TeX(style,size); var t = 0;
+    if (mitem.thickness != null) {t = mitem.thickness}
+    else if (mitem.from.match(/over/)) {t = TeX.default_rule_thickness}
+    var isD = (style.charAt(0) == 'D');
+    var Cn = (style == 'D')? 'T': (style == "D'")? "T'": jsMath.Typeset.UpStyle(style);
+    var Cd = (isD)? "T'": jsMath.Typeset.DownStyle(style);
+    var num = jsMath.Box.Set(mitem.num,Cn,size).Remeasured();
+    var den = jsMath.Box.Set(mitem.den,Cd,size).Remeasured();
+
+    var u; var v; var w; var p; var r;
+    var H = (isD)? TeX.delim1 : TeX.delim2;
+    var mlist = [jsMath.Box.Delimiter(H,mitem.left,style)]
+    var right = jsMath.Box.Delimiter(H,mitem.right,style);
+
+    if (num.w < den.w) {
+      num.x = (den.w-num.w)/2;
+      den.x = -(num.w + num.x);
+      w = den.w; mlist[1] = num; mlist[2] = den;
+    } else {
+      den.x = (num.w-den.w)/2;
+      num.x = -(den.w + den.x);
+      w = num.w; mlist[1] = den; mlist[2] = num;
+    }
+    if (isD) {u = TeX.num1; v = TeX.denom1} else {
+      u = (t != 0)? TeX.num2: TeX.num3;
+      v = TeX.denom2;
+    }
+    if (t == 0) {// atop
+      p = (isD)? 7*TeX.default_rule_thickness: 3*TeX.default_rule_thickness;
+      r = (u - num.d) - (den.h - v);
+      if (r < p) {u += (p-r)/2; v += (p-r)/2}
+    } else {// over
+      p = (isD)? 3*t: t; var a = TeX.axis_height;
+      r = (u-num.d)-(a+t/2); if (r < p) {u += p-r}
+      r = (a-t/2)-(den.h-v); if (r < p) {v += p-r}
+      var rule = jsMath.Box.Rule(w,t); rule.x = -w; rule.y = a - t/2;
+      mlist[mlist.length] = rule;
+    }
+    num.y = u; den.y = -v;
+
+    mlist[mlist.length] = right;
+    mitem.nuc = jsMath.Box.SetList(mlist,style,size);
+    mitem.type = 'ord'; mitem.atom = 1;
+    delete mitem.num; delete mitem.den;
+    jsMath.mList.prototype.Atomize.SupSub(style,size,mitem);
+  },
+
+  /*
+   *  Add subscripts and superscripts.  (Rules 17-18f)
+   */
+  SupSub: function (style,size,mitem) {
+    var TeX = jsMath.Typeset.TeX(style,size);
+    var nuc = mitem.nuc;
+    var box = mitem.nuc = jsMath.Box.Set(mitem.nuc,style,size,0);
+    if (box.format == 'null') 
+      {box = mitem.nuc = jsMath.Box.Text('','normal',style,size)}
+
+    if (nuc.type == 'TeX') {
+      if (!mitem.textsymbol) {
+        var C = jsMath.TeX[nuc.font][nuc.c];
+        if (C.ic) {
+          mitem.delta = C.ic * TeX.scale;
+          if (!mitem.sub) {
+            box = mitem.nuc = jsMath.Box.SetList([box,jsMath.Box.Space(mitem.delta)],style,size);
+            mitem.delta = 0;
+          }
+        }
+      } else {mitem.delta = 0}
+    }
+
+    if (!mitem.sup && !mitem.sub) return;
+    mitem.nuc.Styled();
+    
+    var Cd = jsMath.Typeset.DownStyle(style);
+    var Cu = jsMath.Typeset.UpStyle(style);
+    var q = jsMath.Typeset.TeX(Cu,size).sup_drop;
+    var r = jsMath.Typeset.TeX(Cd,size).sub_drop;
+    var u = 0; var v = 0; var p;
+    if (nuc.type && nuc.type != 'text' && nuc.type != 'TeX' && nuc.type != 'null')
+      {u = box.h - q; v = box.d + r}
+
+    if (mitem.sub) {
+      var sub = jsMath.Box.Set(mitem.sub,Cd,size);
+      sub = jsMath.Box.SetList([sub,jsMath.mItem.Space(TeX.scriptspace)],style,size);
+    }
+
+    if (!mitem.sup) {
+      sub.y = -Math.max(v,TeX.sub1,sub.h-(4/5)*jsMath.Typeset.TeX(Cd,size).x_height);
+      mitem.nuc = jsMath.Box.SetList([box,sub],style,size).Styled(); delete mitem.sub;
+      return;
+    }
+
+    var sup = jsMath.Box.Set(mitem.sup,Cu,size);
+    sup = jsMath.Box.SetList([sup,jsMath.mItem.Space(TeX.scriptspace)],style,size);
+    if (style == 'D') {p = TeX.sup1}
+    else if (style.charAt(style.length-1) == "'") {p = TeX.sup3}
+    else {p = TeX.sup2}
+    u = Math.max(u,p,sup.d+jsMath.Typeset.TeX(Cu,size).x_height/4);
+
+    if (!mitem.sub) {
+      sup.y = u;
+      mitem.nuc = jsMath.Box.SetList([box,sup],style,size); delete mitem.sup;
+      return;
+    }
+
+    v = Math.max(v,jsMath.Typeset.TeX(Cd,size).sub2);
+    var t = TeX.default_rule_thickness;
+    if ((u-sup.d) - (sub.h -v) < 4*t) {
+      v = 4*t + sub.h - (u-sup.d);
+      p = (4/5)*TeX.x_height - (u-sup.d);
+      if (p > 0) {u += p; v -= p}
+    }
+    sup.Remeasured(); sub.Remeasured();
+    sup.y = u; sub.y = -v; sup.x = mitem.delta;
+    if (sup.w+sup.x > sub.w)
+      {sup.x -= sub.w; mitem.nuc = jsMath.Box.SetList([box,sub,sup],style,size)} else
+      {sub.x -= (sup.w+sup.x); mitem.nuc = jsMath.Box.SetList([box,sup,sub],style,size)}
+
+    delete mitem.sup; delete mitem.sub;
+  }
+
+});
+
+
+/***************************************************************************/
+
+/*
+ *  The Typeset object handles most of the TeX-specific processing
+ */
+
+jsMath.Typeset = function (mlist) {
+  this.type = 'typeset';
+  this.mlist = mlist;
+}
+
+jsMath.Add(jsMath.Typeset,{
+
+  /*
+   *  The "C-uparrow" style table (TeXbook, p. 441)
+   */
+  upStyle: {
+    D: "S", T: "S",  "D'": "S'", "T'": "S'",
+    S: "SS",  SS: "SS",  "S'": "SS'", "SS'": "SS'"
+  },
+
+  /*
+   *  The "C-downarrow" style table (TeXbook, p. 441)
+   */
+  downStyle: {
+    D: "S'", T: "S'",  "D'": "S'", "T'": "S'",
+    S: "SS'",  SS: "SS'",  "S'": "SS'", "SS'": "SS'"
+  },
+
+  /*
+   *  Get the various styles given the current style
+   *  (see TeXbook, p. 441)
+   */
+  UpStyle: function (style) {return this.upStyle[style]},
+  DownStyle: function (style) {return this.downStyle[style]},
+  PrimeStyle: function (style) {
+    if (style.charAt(style.length-1) == "'") {return style}
+    return style + "'"
+  },
+
+  /*
+   *  A value scaled to the appropriate size for scripts
+   */
+  StyleValue: function (style,v) {
+    if (style == "S" || style == "S'")   {return .7*v}
+    if (style == "SS" || style == "SS'") {return .5*v}
+    return v;
+  },
+  
+  /*
+   *  Return the size associated with a given style and size
+   */
+  StyleSize: function (style,size) {
+    if      (style == "S" || style == "S'")   {size = Math.max(0,size-2)}
+    else if (style == "SS" || style == "SS'") {size = Math.max(0,size-4)}
+    return size;
+  },
+
+  /*
+   *  Return the font parameter table for the given style
+   */
+  TeX: function (style,size) {
+    if      (style == "S" || style == "S'")   {size = Math.max(0,size-2)}
+    else if (style == "SS" || style == "SS'") {size = Math.max(0,size-4)}
+    return jsMath.TeXparams[size];
+  },
+
+
+  /*
+   *  Add the CSS class for the given TeX style
+   */
+  AddStyle: function (style,size,html) {
+    if      (style == "S" || style == "S'")   {size = Math.max(0,size-2)}
+    else if (style == "SS" || style == "SS'") {size = Math.max(0,size-4)}
+    if (size != 4) {html = '<span class="size'+size+'">' + html + '</span>'}
+    return html;
+  },
+
+  /*
+   *  Add the font class, if needed
+   */
+  AddClass: function (tclass,html) {
+    if (tclass != '' && tclass != 'normal') {html = jsMath.HTML.Class(tclass,html)}
+    return html;
+  }
+
+});
+
+
+jsMath.Package(jsMath.Typeset,{
+  
+  /*
+   *  The spacing tables for inter-atom spacing
+   *  (See rule 20, and Chapter 18, p 170)
+   */
+  DTsep: {
+    ord: {op: 1, bin: 2, rel: 3, inner: 1},
+    op:  {ord: 1, op: 1, rel: 3, inner: 1},
+    bin: {ord: 2, op: 2, open: 2, inner: 2},
+    rel: {ord: 3, op: 3, open: 3, inner: 3},
+    open: {},
+    close: {op: 1, bin:2, rel: 3, inner: 1},
+    punct: {ord: 1, op: 1, rel: 1, open: 1, close: 1, punct: 1, inner: 1},
+    inner: {ord: 1, op: 1, bin: 2, rel: 3, open: 1, punct: 1, inner: 1}
+  },
+
+  SSsep: {
+    ord: {op: 1},
+    op:  {ord: 1, op: 1},
+    bin: {},
+    rel: {},
+    open: {},
+    close: {op: 1},
+    punct: {},
+    inner: {op: 1}
+  },
+
+  /*
+   *  The sizes used in the tables above
+   */
+  sepW: ['','thinmuskip','medmuskip','thickmuskip'],
+  
+  
+  /*
+   *  Find the amount of separation to use between two adjacent
+   *  atoms in the given style
+   */
+  GetSeparation: function (l,r,style) {
+    if (l && l.atom && r.atom) {
+      var table = this.DTsep; if (style.charAt(0) == "S") {table = this.SSsep}
+      var row = table[l.type];
+      if (row && row[r.type] != null) {return jsMath.TeX[this.sepW[row[r.type]]]}
+    }
+    return 0;
+  },
+
+  /*
+   *  Typeset an mlist (i.e., turn it into HTML).
+   *  Here, text items of the same class and style are combined
+   *  to reduce the number of <SPAN> tags used (though it is still
+   *  huge).  Spaces are combined, when possible.
+   *  ###  More needs to be done with that.  ###
+   *  The width of the final box is recomputed at the end, since
+   *  the final width is not necessarily the sum of the widths of
+   *  the individual parts (widths are in pixels, but the browsers
+   *  puts pieces together using sub-pixel accuracy).
+   */
+  Typeset: function (style,size) {
+    this.style = style; this.size = size; var unset = -10000
+    this.w = 0; this.mw = 0; this.Mw = 0;
+    this.h = unset; this.d = unset;
+    this.bh = this.h; this.bd = this.d;
+    this.tbuf = ''; this.tx = 0; this.tclass = '';
+    this.cbuf = ''; this.hbuf = ''; this.hx = 0;
+    var mitem = null; var prev; this.x = 0; this.dx = 0;
+
+    for (var i = 0; i < this.mlist.length; i++) {
+      prev = mitem; mitem = this.mlist[i];
+      switch (mitem.type) {
+
+        case 'size':
+          this.FlushClassed();
+          this.size = mitem.size;
+          mitem = prev; // hide this from TeX
+          break;
+
+        case 'style':
+          this.FlushClassed();
+          if (this.style.charAt(this.style.length-1) == "'")
+            {this.style = mitem.style + "'"} else {this.style = mitem.style}
+          mitem = prev; // hide this from TeX
+          break;
+
+        case 'space':
+          if (typeof(mitem.w) == 'object') {
+            if (this.style.charAt(1) == 'S') {mitem.w = .5*mitem.w[0]/18}
+            else if (this.style.charAt(0) == 'S') {mitem.w = .7*mitem.w[0]/18}
+            else {mitem.w = mitem.w[0]/18}
+          }
+          this.dx += mitem.w-0; // mitem.w is sometimes a string?
+          mitem = prev; // hide this from TeX
+          break;
+          
+        case 'html':
+          this.FlushClassed();
+          if (this.hbuf == '') {this.hx = this.x}
+          this.hbuf += mitem.html;
+          mitem = prev; // hide this from TeX
+          break;
+          
+        default:   // atom
+          if (!mitem.atom && mitem.type != 'box') break;
+          mitem.nuc.x += this.dx + this.GetSeparation(prev,mitem,this.style);
+          if (mitem.nuc.x || mitem.nuc.y) mitem.nuc.Styled();
+          this.dx = 0; this.x = this.x + this.w;
+          if (this.x + mitem.nuc.x + mitem.nuc.mw < this.mw) 
+            {this.mw = this.x + mitem.nuc.x + mitem.nuc.mw}
+          if (this.w + mitem.nuc.x + mitem.nuc.Mw > this.Mw)
+            {this.Mw = this.w + mitem.nuc.x + mitem.nuc.Mw}
+          this.w += mitem.nuc.w + mitem.nuc.x;
+          if (mitem.nuc.format == 'text') {
+            if (this.tclass != mitem.nuc.tclass && this.tclass != '') this.FlushText();
+            if (this.tbuf == '' && this.cbuf == '') {this.tx = this.x}
+            this.tbuf += mitem.nuc.html; this.tclass = mitem.nuc.tclass;
+          } else  {
+            this.FlushClassed();
+            if (mitem.nuc.x || mitem.nuc.y) this.Place(mitem.nuc);
+            if (this.hbuf == '') {this.hx = this.x}
+            this.hbuf += mitem.nuc.html;
+          }
+          this.h = Math.max(this.h,mitem.nuc.h+mitem.nuc.y); this.bh = Math.max(this.bh,mitem.nuc.bh);
+          this.d = Math.max(this.d,mitem.nuc.d-mitem.nuc.y); this.bd = Math.max(this.bd,mitem.nuc.bd);
+          break;
+      }
+    }
+
+    this.FlushClassed(); // make sure scaling is included
+    if (this.dx) {
+      this.hbuf += jsMath.HTML.Spacer(this.dx); this.w += this.dx;
+      if (this.w > this.Mw) {this.Mw = this.w}
+      if (this.w < this.mw) {this.mw = this.w}
+    }
+    if (this.hbuf == '') {return jsMath.Box.Null()}
+    if (this.h == unset) {this.h = 0}
+    if (this.d == unset) {this.d = 0}
+    var box = new jsMath.Box('html',this.hbuf,this.w,this.h,this.d);
+    box.bh = this.bh; box.bd = this.bd;
+    box.mw = this.mw; box.Mw = this.Mw;
+    return box;
+  },
+
+  /*
+   *  Add the font to the buffered text and move it to the
+   *  classed-text buffer.
+   */
+  FlushText: function () {
+    if (this.tbuf == '') return;
+    this.cbuf += jsMath.Typeset.AddClass(this.tclass,this.tbuf);
+    this.tbuf = ''; this.tclass = '';
+  },
+
+  /*
+   *  Add the script or scriptscript style to the text and
+   *  move it to the HTML buffer
+   */
+  FlushClassed: function () {
+    this.FlushText();
+    if (this.cbuf == '') return;
+    if (this.hbuf == '') {this.hx = this.tx}
+    this.hbuf += jsMath.Typeset.AddStyle(this.style,this.size,this.cbuf);
+    this.cbuf = '';
+  },
+
+  /*
+   *  Add a <SPAN> to position an item's HTML, and
+   *  adjust the item's height and depth.
+   *  (This may be replaced buy one of the following browser-specific
+   *   versions by Browser.Init().)
+   */
+  Place: function (item) {
+    var html = '<span style="position: relative;';
+    if (item.x) {html += ' margin-left:'+jsMath.HTML.Em(item.x)+';'}
+    if (item.y) {html += ' top:'+jsMath.HTML.Em(-item.y)+';'}
+    item.html = html + '">' + item.html + '</span>';
+    item.h += item.y; item.d -= item.y;
+    item.x = 0; item.y = 0;
+  },
+  
+  /*
+   *  For MSIE on Windows, backspacing must be done in a separate
+   *  <SPAN>, otherwise the contents will be clipped.  Netscape
+   *  also doesn't combine vertical and horizontal spacing well.
+   *  Here, the horizontal and vertical spacing are done separately.
+   */
+
+  PlaceSeparateSkips: function (item) {
+    if (item.y) {
+      var rw = item.Mw - item.w; var lw = item.mw;
+      var W = item.Mw - item.mw;
+      item.html = 
+        jsMath.HTML.Spacer(lw-rw) +
+        '<span style="position: relative; '
+            + 'top:'+jsMath.HTML.Em(-item.y)+'; '
+            + 'left:'+jsMath.HTML.Em(rw)+'; width:'+jsMath.HTML.Em(W)+';">' +
+          jsMath.HTML.Spacer(-lw) +
+          item.html +
+          jsMath.HTML.Spacer(rw) + 
+        '</span>'
+    }
+    if (item.x) {item.html = jsMath.HTML.Spacer(item.x) + item.html}
+    item.h += item.y; item.d -= item.y;
+    item.x = 0; item.y = 0;
+  }
+
+});
+
+
+
+/***************************************************************************/
+
+/*
+ *  The Parse object handles the parsing of the TeX input string, and creates
+ *  the mList to be typeset by the Typeset object above.
+ */
+
+jsMath.Parse = function (s,font,size,style) {
+  var parse = new jsMath.Parser(s,font,size,style);
+  parse.Parse();
+  return parse;
+}
+
+jsMath.Parser = function (s,font,size,style) {
+  this.string = s; this.i = 0;
+  this.mlist = new jsMath.mList(null,font,size,style);
+}
+
+jsMath.Package(jsMath.Parser,{
+  
+  // special characters
+  cmd:   '\\',
+  open:  '{',
+  close: '}',
+  
+  // patterns for letters and numbers
+  letter:  /[a-z]/i,
+  number:  /[0-9]/,
+  //  pattern for macros to ^ and _ that should be read with arguments
+  scriptargs: /^((math|text)..|mathcal|[hm]box)$/,
+  
+  //  the \mathchar definitions (see Appendix B of the TeXbook).
+  mathchar: {
+    '!': [5,0,0x21],
+    '(': [4,0,0x28],
+    ')': [5,0,0x29],
+    '*': [2,2,0x03], // \ast
+    '+': [2,0,0x2B],
+    ',': [6,1,0x3B],
+    '-': [2,2,0x00],
+    '.': [0,1,0x3A],
+    '/': [0,1,0x3D],
+    ':': [3,0,0x3A],
+    ';': [6,0,0x3B],
+    '<': [3,1,0x3C],
+    '=': [3,0,0x3D],
+    '>': [3,1,0x3E],
+    '?': [5,0,0x3F],
+    '[': [4,0,0x5B],
+    ']': [5,0,0x5D],
+//  '{': [4,2,0x66],
+//  '}': [5,2,0x67],
+    '|': [0,2,0x6A]
+  },
+
+  //  handle special \catcode characters
+  special: {
+    '~':   'Tilde',
+    '^':   'HandleSuperscript',
+    '_':   'HandleSubscript',
+    ' ':   'Space',
+    '\01': 'Space',
+    "\t":  'Space',
+    "\r":  'Space',
+    "\n":  'Space',
+    "'":   'Prime',
+    '%':   'HandleComment',
+    '&':   'HandleEntry',
+    '#':   'Hash'
+  },
+
+  // the \mathchardef table (see Appendix B of the TeXbook).
+  mathchardef: {
+  // brace parts
+    braceld:      [0,3,0x7A],
+    bracerd:      [0,3,0x7B],
+    bracelu:      [0,3,0x7C],
+    braceru:      [0,3,0x7D],
+
+  // Greek letters
+    alpha:        [0,1,0x0B],
+    beta:         [0,1,0x0C],
+    gamma:        [0,1,0x0D],
+    delta:        [0,1,0x0E],
+    epsilon:      [0,1,0x0F],
+    zeta:         [0,1,0x10],
+    eta:          [0,1,0x11],
+    theta:        [0,1,0x12],
+    iota:         [0,1,0x13],
+    kappa:        [0,1,0x14],
+    lambda:       [0,1,0x15],
+    mu:           [0,1,0x16],
+    nu:           [0,1,0x17],
+    xi:           [0,1,0x18],
+    pi:           [0,1,0x19],
+    rho:          [0,1,0x1A],
+    sigma:        [0,1,0x1B],
+    tau:          [0,1,0x1C],
+    upsilon:      [0,1,0x1D],
+    phi:          [0,1,0x1E],
+    chi:          [0,1,0x1F],
+    psi:          [0,1,0x20],
+    omega:        [0,1,0x21],
+    varepsilon:   [0,1,0x22],
+    vartheta:     [0,1,0x23],
+    varpi:        [0,1,0x24],
+    varrho:       [0,1,0x25],
+    varsigma:     [0,1,0x26],
+    varphi:       [0,1,0x27],
+    
+    Gamma:        [7,0,0x00],
+    Delta:        [7,0,0x01],
+    Theta:        [7,0,0x02],
+    Lambda:       [7,0,0x03],
+    Xi:           [7,0,0x04],
+    Pi:           [7,0,0x05],
+    Sigma:        [7,0,0x06],
+    Upsilon:      [7,0,0x07],
+    Phi:          [7,0,0x08],
+    Psi:          [7,0,0x09],
+    Omega:        [7,0,0x0A],
+
+  // Ord symbols
+    aleph:        [0,2,0x40],
+    imath:        [0,1,0x7B],
+    jmath:        [0,1,0x7C],
+    ell:          [0,1,0x60],
+    wp:           [0,1,0x7D],
+    Re:           [0,2,0x3C],
+    Im:           [0,2,0x3D],
+    partial:      [0,1,0x40],
+    infty:        [0,2,0x31],
+    prime:        [0,2,0x30],
+    emptyset:     [0,2,0x3B],
+    nabla:        [0,2,0x72],
+    surd:         [1,2,0x70],
+    top:          [0,2,0x3E],
+    bot:          [0,2,0x3F],
+    triangle:     [0,2,0x34],
+    forall:       [0,2,0x38],
+    exists:       [0,2,0x39],
+    neg:          [0,2,0x3A],
+    lnot:         [0,2,0x3A],
+    flat:         [0,1,0x5B],
+    natural:      [0,1,0x5C],
+    sharp:        [0,1,0x5D],
+    clubsuit:     [0,2,0x7C],
+    diamondsuit:  [0,2,0x7D],
+    heartsuit:    [0,2,0x7E],
+    spadesuit:    [0,2,0x7F],
+
+  // big ops
+    coprod:      [1,3,0x60],
+    bigvee:      [1,3,0x57],
+    bigwedge:    [1,3,0x56],
+    biguplus:    [1,3,0x55],
+    bigcap:      [1,3,0x54],
+    bigcup:      [1,3,0x53],
+    intop:       [1,3,0x52], 
+    prod:        [1,3,0x51],
+    sum:         [1,3,0x50],
+    bigotimes:   [1,3,0x4E],
+    bigoplus:    [1,3,0x4C],
+    bigodot:     [1,3,0x4A],
+    ointop:      [1,3,0x48],
+    bigsqcup:    [1,3,0x46],
+    smallint:    [1,2,0x73],
+
+  // binary operations
+    triangleleft:      [2,1,0x2F],
+    triangleright:     [2,1,0x2E],
+    bigtriangleup:     [2,2,0x34],
+    bigtriangledown:   [2,2,0x35],
+    wedge:       [2,2,0x5E],
+    land:        [2,2,0x5E],
+    vee:         [2,2,0x5F],
+    lor:         [2,2,0x5F],
+    cap:         [2,2,0x5C],
+    cup:         [2,2,0x5B],
+    ddagger:     [2,2,0x7A],
+    dagger:      [2,2,0x79],
+    sqcap:       [2,2,0x75],
+    sqcup:       [2,2,0x74],
+    uplus:       [2,2,0x5D],
+    amalg:       [2,2,0x71],
+    diamond:     [2,2,0x05],
+    bullet:      [2,2,0x0F],
+    wr:          [2,2,0x6F],
+    div:         [2,2,0x04],
+    odot:        [2,2,0x0C],
+    oslash:      [2,2,0x0B],
+    otimes:      [2,2,0x0A],
+    ominus:      [2,2,0x09],
+    oplus:       [2,2,0x08],
+    mp:          [2,2,0x07],
+    pm:          [2,2,0x06],
+    circ:        [2,2,0x0E],
+    bigcirc:     [2,2,0x0D],
+    setminus:    [2,2,0x6E], // for set difference A\setminus B
+    cdot:        [2,2,0x01],
+    ast:         [2,2,0x03],
+    times:       [2,2,0x02],
+    star:        [2,1,0x3F],
+
+  // Relations
+    propto:      [3,2,0x2F],
+    sqsubseteq:  [3,2,0x76],
+    sqsupseteq:  [3,2,0x77],
+    parallel:    [3,2,0x6B],
+    mid:         [3,2,0x6A],
+    dashv:       [3,2,0x61],
+    vdash:       [3,2,0x60],
+    leq:         [3,2,0x14],
+    le:          [3,2,0x14],
+    geq:         [3,2,0x15],
+    ge:          [3,2,0x15],
+    lt:          [3,1,0x3C],  // extra since < and > are hard
+    gt:          [3,1,0x3E],  //   to get in HTML
+    succ:        [3,2,0x1F],
+    prec:        [3,2,0x1E],
+    approx:      [3,2,0x19],
+    succeq:      [3,2,0x17],
+    preceq:      [3,2,0x16],
+    supset:      [3,2,0x1B],
+    subset:      [3,2,0x1A],
+    supseteq:    [3,2,0x13],
+    subseteq:    [3,2,0x12],
+    'in':        [3,2,0x32],
+    ni:          [3,2,0x33],
+    owns:        [3,2,0x33],
+    gg:          [3,2,0x1D],
+    ll:          [3,2,0x1C],
+    not:         [3,2,0x36],
+    sim:         [3,2,0x18],
+    simeq:       [3,2,0x27],
+    perp:        [3,2,0x3F],
+    equiv:       [3,2,0x11],
+    asymp:       [3,2,0x10],
+    smile:       [3,1,0x5E],
+    frown:       [3,1,0x5F],
+
+  // Arrows
+    Leftrightarrow:   [3,2,0x2C],
+    Leftarrow:        [3,2,0x28],
+    Rightarrow:       [3,2,0x29],
+    leftrightarrow:   [3,2,0x24],
+    leftarrow:        [3,2,0x20],
+    gets:             [3,2,0x20],
+    rightarrow:       [3,2,0x21],
+    to:               [3,2,0x21],
+    mapstochar:       [3,2,0x37],
+    leftharpoonup:    [3,1,0x28],
+    leftharpoondown:  [3,1,0x29],
+    rightharpoonup:   [3,1,0x2A],
+    rightharpoondown: [3,1,0x2B],
+    nearrow:          [3,2,0x25],
+    searrow:          [3,2,0x26],
+    nwarrow:          [3,2,0x2D],
+    swarrow:          [3,2,0x2E],
+
+    minuschar:  [3,2,0x00], // for longmapsto
+    hbarchar:   [0,0,0x16], // for \hbar
+    lhook:      [3,1,0x2C],
+    rhook:      [3,1,0x2D],
+
+    ldotp:      [6,1,0x3A], // ldot as a punctuation mark
+    cdotp:      [6,2,0x01], // cdot as a punctuation mark
+    colon:      [6,0,0x3A], // colon as a punctuation mark
+
+    '#':        [7,0,0x23],
+    '$':        [7,0,0x24],
+    '%':        [7,0,0x25],
+    '&':        [7,0,0x26]
+  },
+  
+  // The delimiter table (see Appendix B of the TeXbook)
+  delimiter: {
+    '(':                [0,0,0x28,3,0x00],
+    ')':                [0,0,0x29,3,0x01],
+    '[':                [0,0,0x5B,3,0x02],
+    ']':                [0,0,0x5D,3,0x03],
+    '<':                [0,2,0x68,3,0x0A],
+    '>':                [0,2,0x69,3,0x0B],
+    '\\lt':             [0,2,0x68,3,0x0A],  // extra since < and > are
+    '\\gt':             [0,2,0x69,3,0x0B],  //  hard to get in HTML
+    '/':                [0,0,0x2F,3,0x0E],
+    '|':                [0,2,0x6A,3,0x0C],
+    '.':                [0,0,0x00,0,0x00],
+    '\\':               [0,2,0x6E,3,0x0F],
+    '\\lmoustache':     [4,3,0x7A,3,0x40],  // top from (, bottom from )
+    '\\rmoustache':     [5,3,0x7B,3,0x41],  // top from ), bottom from (
+    '\\lgroup':         [4,6,0x28,3,0x3A],  // extensible ( with sharper tips
+    '\\rgroup':         [5,6,0x29,3,0x3B],  // extensible ) with sharper tips
+    '\\arrowvert':      [0,2,0x6A,3,0x3C],  // arrow without arrowheads
+    '\\Arrowvert':      [0,2,0x6B,3,0x3D],  // double arrow without arrowheads
+//  '\\bracevert':      [0,7,0x7C,3,0x3E],  // the vertical bar that extends braces
+    '\\bracevert':      [0,2,0x6A,3,0x3E],  // we don't load tt, so use | instead
+    '\\Vert':           [0,2,0x6B,3,0x0D],
+    '\\|':              [0,2,0x6B,3,0x0D],
+    '\\vert':           [0,2,0x6A,3,0x0C],
+    '\\uparrow':        [3,2,0x22,3,0x78],
+    '\\downarrow':      [3,2,0x23,3,0x79],
+    '\\updownarrow':    [3,2,0x6C,3,0x3F],
+    '\\Uparrow':        [3,2,0x2A,3,0x7E],
+    '\\Downarrow':      [3,2,0x2B,3,0x7F],
+    '\\Updownarrow':    [3,2,0x6D,3,0x77],
+    '\\backslash':      [0,2,0x6E,3,0x0F],  // for double coset G\backslash H
+    '\\rangle':         [5,2,0x69,3,0x0B],
+    '\\langle':         [4,2,0x68,3,0x0A],
+    '\\rbrace':         [5,2,0x67,3,0x09],
+    '\\lbrace':         [4,2,0x66,3,0x08],
+    '\\}':              [5,2,0x67,3,0x09],
+    '\\{':              [4,2,0x66,3,0x08],
+    '\\rceil':          [5,2,0x65,3,0x07],
+    '\\lceil':          [4,2,0x64,3,0x06],
+    '\\rfloor':         [5,2,0x63,3,0x05],
+    '\\lfloor':         [4,2,0x62,3,0x04],
+    '\\lbrack':         [0,0,0x5B,3,0x02],
+    '\\rbrack':         [0,0,0x5D,3,0x03]
+  },
+
+  /*
+   *  The basic macros for plain TeX.
+   *
+   *  When the control sequence on the left is called, the JavaScript
+   *  funtion on the right is called, with the name of the control sequence
+   *  as its first parameter (this way, the same function can be called by
+   *  several different control sequences to do similar actions, and the
+   *  function can still tell which TeX command was issued).  If the right
+   *  is an array, the first entry is the routine to call, and the
+   *  remaining entries in the array are parameters to pass to the function
+   *  as the second parameter (they are in an array reference).
+   *  
+   *  Note:  TeX macros as defined by the user are discussed below.
+   */
+  macros: {
+    displaystyle:      ['HandleStyle','D'],
+    textstyle:         ['HandleStyle','T'],
+    scriptstyle:       ['HandleStyle','S'],
+    scriptscriptstyle: ['HandleStyle','SS'],
+    
+    rm:                ['HandleFont',0],
+    mit:               ['HandleFont',1],
+    oldstyle:          ['HandleFont',1],
+    cal:               ['HandleFont',2],
+    it:                ['HandleFont',4],
+    bf:                ['HandleFont',6],
+    
+    font:              ['Extension','font'],
+    
+    left:              'HandleLeft',
+    right:             'HandleRight',
+
+    arcsin:       ['NamedOp',0],
+    arccos:       ['NamedOp',0],
+    arctan:       ['NamedOp',0],
+    arg:          ['NamedOp',0],
+    cos:          ['NamedOp',0],
+    cosh:         ['NamedOp',0],
+    cot:          ['NamedOp',0],
+    coth:         ['NamedOp',0],
+    csc:          ['NamedOp',0],
+    deg:          ['NamedOp',0],
+    det:           'NamedOp',
+    dim:          ['NamedOp',0],
+    exp:          ['NamedOp',0],
+    gcd:           'NamedOp',
+    hom:          ['NamedOp',0],
+    inf:           'NamedOp',
+    ker:          ['NamedOp',0],
+    lg:           ['NamedOp',0],
+    lim:           'NamedOp',
+    liminf:       ['NamedOp',null,'lim<span style="margin-left: '+1/6+'em"></span>inf'],
+    limsup:       ['NamedOp',null,'lim<span style="margin-left: '+1/6+'em"></span>sup'],
+    ln:           ['NamedOp',0],
+    log:          ['NamedOp',0],
+    max:           'NamedOp',
+    min:           'NamedOp',
+    Pr:            'NamedOp',
+    sec:          ['NamedOp',0],
+    sin:          ['NamedOp',0],
+    sinh:         ['NamedOp',0],
+    sup:           'NamedOp',
+    tan:          ['NamedOp',0],
+    tanh:         ['NamedOp',0],
+
+    vcenter:        ['HandleAtom','vcenter'],
+    overline:       ['HandleAtom','overline'],
+    underline:      ['HandleAtom','underline'],
+    over:            'HandleOver',
+    overwithdelims:  'HandleOver',
+    atop:            'HandleOver',
+    atopwithdelims:  'HandleOver',
+    above:           'HandleOver',
+    abovewithdelims: 'HandleOver',
+    brace:           ['HandleOver','\\{','\\}'],
+    brack:           ['HandleOver','[',']'],
+    choose:          ['HandleOver','(',')'],
+    
+    overbrace:       ['Extension','leaders'],
+    underbrace:      ['Extension','leaders'],
+    overrightarrow:  ['Extension','leaders'],
+    underrightarrow: ['Extension','leaders'],
+    overleftarrow:   ['Extension','leaders'],
+    underleftarrow:  ['Extension','leaders'],
+    overleftrightarrow:  ['Extension','leaders'],
+    underleftrightarrow: ['Extension','leaders'],
+    overset:         ['Extension','underset-overset'],
+    underset:        ['Extension','underset-overset'],
+
+    llap:            'HandleLap',
+    rlap:            'HandleLap',
+    ulap:            'HandleLap',
+    dlap:            'HandleLap',
+    raise:           'RaiseLower',
+    lower:           'RaiseLower',
+    moveleft:        'MoveLeftRight',
+    moveright:       'MoveLeftRight',
+
+    frac:            'Frac',
+    root:            'Root',
+    sqrt:            'Sqrt',
+
+    //  TeX substitution macros
+    hbar:               ['Macro','\\hbarchar\\kern-.5em h'],
+    ne:                 ['Macro','\\not='],
+    neq:                ['Macro','\\not='],
+    notin:              ['Macro','\\mathrel{\\rlap{\\kern2mu/}}\\in'],
+    cong:               ['Macro','\\mathrel{\\lower2mu{\\mathrel{{\\rlap{=}\\raise6mu\\sim}}}}'],
+    bmod:               ['Macro','\\mathbin{\\rm mod}'],
+    pmod:               ['Macro','\\kern 18mu ({\\rm mod}\\,\\,#1)',1],
+    'int':              ['Macro','\\intop\\nolimits'],
+    oint:               ['Macro','\\ointop\\nolimits'],
+    doteq:              ['Macro','\\buildrel\\textstyle.\\over='],
+    ldots:              ['Macro','\\mathinner{\\ldotp\\ldotp\\ldotp}'],
+    cdots:              ['Macro','\\mathinner{\\cdotp\\cdotp\\cdotp}'],
+    vdots:              ['Macro','\\mathinner{\\rlap{\\raise8pt{.\\rule 0pt 6pt 0pt}}\\rlap{\\raise4pt{.}}.}'],
+    ddots:              ['Macro','\\mathinner{\\kern1mu\\raise7pt{\\rule 0pt 7pt 0pt .}\\kern2mu\\raise4pt{.}\\kern2mu\\raise1pt{.}\\kern1mu}'],
+    joinrel:            ['Macro','\\mathrel{\\kern-4mu}'],
+    relbar:             ['Macro','\\mathrel{\\smash-}'], // \smash, because - has the same height as +
+    Relbar:             ['Macro','\\mathrel='],
+    bowtie:             ['Macro','\\mathrel\\triangleright\\joinrel\\mathrel\\triangleleft'],
+    models:             ['Macro','\\mathrel|\\joinrel='],
+    mapsto:             ['Macro','\\mathrel{\\mapstochar\\rightarrow}'],
+    rightleftharpoons:  ['Macro','\\vcenter{\\mathrel{\\rlap{\\raise3mu{\\rightharpoonup}}}\\leftharpoondown}'],
+    hookrightarrow:     ['Macro','\\lhook\\joinrel\\rightarrow'],
+    hookleftarrow:      ['Macro','\\leftarrow\\joinrel\\rhook'],
+    Longrightarrow:     ['Macro','\\Relbar\\joinrel\\Rightarrow'],
+    longrightarrow:     ['Macro','\\relbar\\joinrel\\rightarrow'],
+    longleftarrow:      ['Macro','\\leftarrow\\joinrel\\relbar'],
+    Longleftarrow:      ['Macro','\\Leftarrow\\joinrel\\Relbar'],
+    longmapsto:         ['Macro','\\mathrel{\\mapstochar\\minuschar\\joinrel\\rightarrow}'],
+    longleftrightarrow: ['Macro','\\leftarrow\\joinrel\\rightarrow'],
+    Longleftrightarrow: ['Macro','\\Leftarrow\\joinrel\\Rightarrow'],
+    iff:                ['Macro','\\;\\Longleftrightarrow\\;'],
+    mathcal:            ['Macro','{\\cal #1}',1],
+    mathrm:             ['Macro','{\\rm #1}',1],
+    mathbf:             ['Macro','{\\bf #1}',1],
+    mathbb:             ['Macro','{\\bf #1}',1],
+    mathit:             ['Macro','{\\it #1}',1],
+    textrm:             ['Macro','\\mathord{\\hbox{#1}}',1],
+    textit:             ['Macro','\\mathord{\\class{textit}{\\hbox{#1}}}',1],
+    textbf:             ['Macro','\\mathord{\\class{textbf}{\\hbox{#1}}}',1],
+    pmb:                ['Macro','\\rlap{#1}\\kern1px{#1}',1],
+
+    TeX:                ['Macro','T\\kern-.1667em\\lower.5ex{E}\\kern-.125em X'],
+
+    limits:       ['Limits',1],
+    nolimits:     ['Limits',0],
+
+    ',':          ['Spacer',1/6],
+    ':':          ['Spacer',1/6],  // for LaTeX
+    '>':          ['Spacer',2/9],
+    ';':          ['Spacer',5/18],
+    '!':          ['Spacer',-1/6],
+    enspace:      ['Spacer',1/2],
+    quad:         ['Spacer',1],
+    qquad:        ['Spacer',2],
+    thinspace:    ['Spacer',1/6],
+    negthinspace: ['Spacer',-1/6],
+    
+    hskip:         'Hskip',
+    kern:          'Hskip',
+    rule:          ['Rule','colored'],
+    space:         ['Rule','blank'],
+    
+    big:        ['MakeBig','ord',0.85],
+    Big:        ['MakeBig','ord',1.15],
+    bigg:       ['MakeBig','ord',1.45],
+    Bigg:       ['MakeBig','ord',1.75],
+    bigl:       ['MakeBig','open',0.85],
+    Bigl:       ['MakeBig','open',1.15],
+    biggl:      ['MakeBig','open',1.45],
+    Biggl:      ['MakeBig','open',1.75],
+    bigr:       ['MakeBig','close',0.85],
+    Bigr:       ['MakeBig','close',1.15],
+    biggr:      ['MakeBig','close',1.45],
+    Biggr:      ['MakeBig','close',1.75],
+    bigm:       ['MakeBig','rel',0.85],
+    Bigm:       ['MakeBig','rel',1.15],
+    biggm:      ['MakeBig','rel',1.45],
+    Biggm:      ['MakeBig','rel',1.75],
+    
+    mathord:    ['HandleAtom','ord'],
+    mathop:     ['HandleAtom','op'],
+    mathopen:   ['HandleAtom','open'],
+    mathclose:  ['HandleAtom','close'],
+    mathbin:    ['HandleAtom','bin'],
+    mathrel:    ['HandleAtom','rel'],
+    mathpunct:  ['HandleAtom','punct'],
+    mathinner:  ['HandleAtom','inner'],
+    
+    mathchoice: ['Extension','mathchoice'],
+    buildrel:   'BuildRel',
+    
+    hbox:       'HBox',
+    text:       'HBox',
+    mbox:       'HBox',
+    fbox:       ['Extension','fbox'],
+
+    strut:      'Strut',
+    mathstrut:  ['Macro','\\vphantom{(}'],
+    phantom:    ['Phantom',1,1],
+    vphantom:   ['Phantom',1,0],
+    hphantom:   ['Phantom',0,1],
+    smash:      'Smash',
+    
+    acute:      ['MathAccent', [7,0,0x13]],
+    grave:      ['MathAccent', [7,0,0x12]],
+    ddot:       ['MathAccent', [7,0,0x7F]],
+    tilde:      ['MathAccent', [7,0,0x7E]],
+    bar:        ['MathAccent', [7,0,0x16]],
+    breve:      ['MathAccent', [7,0,0x15]],
+    check:      ['MathAccent', [7,0,0x14]],
+    hat:        ['MathAccent', [7,0,0x5E]],
+    vec:        ['MathAccent', [0,1,0x7E]],
+    dot:        ['MathAccent', [7,0,0x5F]],
+    widetilde:  ['MathAccent', [0,3,0x65]],
+    widehat:    ['MathAccent', [0,3,0x62]],
+
+    '_':        ['Replace','ord','_','normal',-.4,.1],
+    ' ':        ['Replace','ord','&nbsp;','normal'],
+//  angle:      ['Replace','ord','&#x2220;','normal'],
+    angle:      ['Macro','\\kern2.5mu\\raise1.54pt{\\rlap{\\scriptstyle \\char{cmsy10}{54}}\\kern1pt\\rule{.45em}{-1.2pt}{1.54pt}\\kern2.5mu}'],
+        
+    matrix:     'Matrix',
+    array:      'Matrix',  // ### still need to do alignment options ###
+    pmatrix:    ['Matrix','(',')','c'],
+    cases:      ['Matrix','\\{','.',['l','l'],null,2],
+    eqalign:    ['Matrix',null,null,['r','l'],[5/18],3,'D'],
+    displaylines: ['Matrix',null,null,['c'],null,3,'D'],
+    cr:         'HandleRow',
+    '\\':       'HandleRow',
+    newline:    'HandleRow',
+    noalign:    'HandleNoAlign',
+    eqalignno:  ['Matrix',null,null,['r','l','r'],[5/8,3],3,'D'],
+    leqalignno: ['Matrix',null,null,['r','l','r'],[5/8,3],3,'D'],
+    
+    //  LaTeX
+    begin:      'Begin',
+    end:        'End',
+    tiny:       ['HandleSize',0],
+    Tiny:       ['HandleSize',1],  // non-standard
+    scriptsize: ['HandleSize',2],
+    small:      ['HandleSize',3],
+    normalsize: ['HandleSize',4],
+    large:      ['HandleSize',5],
+    Large:      ['HandleSize',6],
+    LARGE:      ['HandleSize',7],
+    huge:       ['HandleSize',8],
+    Huge:       ['HandleSize',9],
+    dots:       ['Macro','\\ldots'],
+    
+    newcommand:     ['Extension','newcommand'],
+    newenvironment: ['Extension','newcommand'],
+    def:            ['Extension','newcommand'],
+
+    //  Extensions to TeX
+    color:      ['Extension','HTML'],
+    href:       ['Extension','HTML'],
+    'class':    ['Extension','HTML'],
+    style:      ['Extension','HTML'],
+    cssId:      ['Extension','HTML'],
+    unicode:    ['Extension','HTML'],
+    bbox:       ['Extension','bbox'],
+    
+    require:    'Require',
+    
+    //  debugging and test routines
+    'char':     'Char'
+  },
+  
+  /*
+   *  LaTeX environments
+   */
+  environments: {
+    array:        'Array',
+    matrix:       ['Array',null,null,'c'],
+    pmatrix:      ['Array','(',')','c'],
+    bmatrix:      ['Array','[',']','c'],
+    Bmatrix:      ['Array','\\{','\\}','c'],
+    vmatrix:      ['Array','\\vert','\\vert','c'],
+    Vmatrix:      ['Array','\\Vert','\\Vert','c'],
+    cases:        ['Array','\\{','.','ll',null,2],
+    eqnarray:     ['Array',null,null,'rcl',[5/18,5/18],3,'D'],
+    'eqnarray*':  ['Array',null,null,'rcl',[5/18,5/18],3,'D'],
+    equation:     'Equation',
+    'equation*':  'Equation',
+
+    align:        ['Extension','AMSmath'],
+    'align*':     ['Extension','AMSmath'],
+    aligned:      ['Extension','AMSmath'],
+    multline:     ['Extension','AMSmath'],
+    'multline*':  ['Extension','AMSmath'],
+    split:        ['Extension','AMSmath'],
+    gather:       ['Extension','AMSmath'],
+    'gather*':    ['Extension','AMSmath'],
+    gathered:     ['Extension','AMSmath']
+  },
+
+
+  /***************************************************************************/
+
+  /*
+   *  Add special characters to list above.  (This makes it possible
+   *  to define them in a variable that the user can change.)
+   */
+  AddSpecial: function (obj) {
+    for (var id in obj) {
+      jsMath.Parser.prototype.special[jsMath.Parser.prototype[id]] = obj[id];
+    }
+  },
+
+  /*
+   *  Throw an error
+   */
+  Error: function (s) {
+    this.i = this.string.length;
+    if (s.error) {this.error = s.error} else {
+      if (!this.error) {this.error = s}
+    }
+  },
+
+  /***************************************************************************/
+
+  /*
+   *  Check if the next character is a space
+   */
+  nextIsSpace: function () {
+    return this.string.charAt(this.i).match(/[ \n\r\t]/);
+  },
+  
+  /*
+   *  Trim spaces from a string
+   */
+  trimSpaces: function (text) {
+    if (typeof(text) != 'string') {return text}
+    return text.replace(/^\s+|\s+$/g,'');
+  },
+
+  /*
+   *  Parse a substring to get its mList, and return it.
+   *  Check that no errors occured
+   */
+  Process: function (arg) {
+    var data = this.mlist.data;
+    arg = jsMath.Parse(arg,data.font,data.size,data.style);
+      if (arg.error) {this.Error(arg); return null}
+    if (arg.mlist.Length() == 0) {return null}
+    if (arg.mlist.Length() == 1) {
+      var atom = arg.mlist.Last();
+      if (atom.atom && atom.type == 'ord' && atom.nuc &&
+         !atom.sub && !atom.sup && (atom.nuc.type == 'text' || atom.nuc.type == 'TeX'))
+             {return atom.nuc}
+    }
+    return {type: 'mlist', mlist: arg.mlist};
+  },
+
+  /*
+   *  Get and return a control-sequence name from the TeX string
+   */
+  GetCommand: function () {
+    var letter = /^([a-z]+|.) ?/i;
+    var cmd = letter.exec(this.string.slice(this.i));
+    if (cmd) {this.i += cmd[1].length; return cmd[1]}
+    this.i++; return " ";
+  },
+
+  /*
+   *  Get and return a TeX argument (either a single character or control sequence,
+   *  or the contents of the next set of braces).
+   */
+  GetArgument: function (name,noneOK) {
+    while (this.nextIsSpace()) {this.i++}
+    if (this.i >= this.string.length) {if (!noneOK) this.Error("Missing argument for "+name); return null}
+    if (this.string.charAt(this.i) == this.close) {if (!noneOK) this.Error("Extra close brace"); return null}
+    if (this.string.charAt(this.i) == this.cmd) {this.i++; return this.cmd+this.GetCommand()}
+    if (this.string.charAt(this.i) != this.open) {return this.string.charAt(this.i++)}
+    var j = ++this.i; var pcount = 1; var c = '';
+    while (this.i < this.string.length) {
+      c = this.string.charAt(this.i++);
+      if (c == this.cmd) {this.i++}
+      else if (c == this.open) {pcount++}
+      else if (c == this.close) {
+        if (pcount == 0) {this.Error("Extra close brace"); return null}
+        if (--pcount == 0) {return this.string.slice(j,this.i-1)}
+      }
+    }
+    this.Error("Missing close brace");
+    return null;
+  },
+
+  /*
+   *  Get an argument and process it into an mList
+   */
+  ProcessArg: function (name) {
+    var arg = this.GetArgument(name); if (this.error) {return null}
+    return this.Process(arg);
+  },
+  
+  /*
+   *  Get and process an argument for a super- or subscript.
+   *  (read extra args for \frac, \sqrt, \mathrm, etc.)
+   *  This handles these macros as special cases, so is really
+   *  rather a hack.  A more general method for indicating
+   *  how to handle macros in scripts needs to be developed.
+   */
+  ProcessScriptArg: function (name) {
+    var arg = this.GetArgument(name); if (this.error) {return null}
+    if (arg.charAt(0) == this.cmd) {
+      var csname = arg.substr(1);
+      if (csname == "frac") {
+        arg += '{'+this.GetArgument(csname)+'}'; if (this.error) {return null}
+        arg += '{'+this.GetArgument(csname)+'}'; if (this.error) {return null}
+      } else if (csname == "sqrt") {
+        arg += '['+this.GetBrackets(csname)+']'; if (this.error) {return null}
+        arg += '{'+this.GetArgument(csname)+'}'; if (this.error) {return null}
+      } else if (csname.match(this.scriptargs)) {
+        arg += '{'+this.GetArgument(csname)+'}'; if (this.error) {return null}
+      }
+    }
+    return this.Process(arg);
+  },
+
+  /*
+   *  Get the name of a delimiter (check it in the delimiter list).
+   */
+  GetDelimiter: function (name) {
+    while (this.nextIsSpace()) {this.i++}
+    var c = this.string.charAt(this.i);
+    if (this.i < this.string.length) {
+      this.i++;
+      if (c == this.cmd) {c = '\\'+this.GetCommand(name); if (this.error) return null}
+      if (this.delimiter[c] != null) {return this.delimiter[c]}
+    }
+    this.Error("Missing or unrecognized delimiter for "+name);
+    return null;
+  },
+  
+  /*
+   *  Get a dimension (including its units).
+   *  Convert the dimen to em's, except for mu's, which must be
+   *  converted when typeset.
+   */
+  GetDimen: function (name,nomu) {
+    var rest; var advance = 0;
+    if (this.nextIsSpace()) {this.i++}
+    if (this.string.charAt(this.i) == '{') {
+      rest = this.GetArgument(name);
+    } else {
+      rest = this.string.slice(this.i);
+      advance = 1;
+    }
+    return this.ParseDimen(rest,name,advance,nomu);
+  },
+  
+  ParseDimen: function (dimen,name,advance,nomu) {
+    var match = dimen.match(/^\s*([-+]?(\.\d+|\d+(\.\d*)?))(pt|em|ex|mu|px)/);
+    if (!match) {this.Error("Missing dimension or its units for "+name); return null}
+    if (advance) {
+      this.i += match[0].length;
+      if (this.nextIsSpace()) {this.i++}
+    }
+    var d = match[1]-0;
+    if (match[4] == 'px') {d /= jsMath.em}
+    else if (match[4] == 'pt') {d /= 10}
+    else if (match[4] == 'ex') {d *= jsMath.TeX.x_height}
+    else if (match[4] == 'mu') {if (nomu) {d = d/18} else {d = [d,'mu']}}
+    return d;
+  },
+
+  /*
+   *  Get the next non-space character
+   */
+  GetNext: function () {
+    while (this.nextIsSpace()) {this.i++}
+    return this.string.charAt(this.i);
+  },
+  
+  /*
+   *  Get an optional LaTeX argument in brackets
+   */
+  GetBrackets: function (name) {
+    var c = this.GetNext(); if (c != '[') return '';
+    var start = ++this.i; var pcount = 0;
+    while (this.i < this.string.length) {
+      c = this.string.charAt(this.i++);
+      if (c == '{') {pcount++}
+      else if (c == '}') {
+        if (pcount == 0)
+          {this.Error("Extra close brace while looking for ']'"); return null}
+        pcount --;
+      } else if (c == this.cmd) {
+        this.i++;
+      } else if (c == ']') {
+        if (pcount == 0) {return this.string.slice(start,this.i-1)}
+      }
+    }
+    this.Error("Couldn't find closing ']' for argument to "+this.cmd+name);
+    return null;
+  },
+  
+  /*
+   *  Get everything up to the given control sequence name (token)
+   */
+  GetUpto: function (name,token) {
+    while (this.nextIsSpace()) {this.i++}
+    var start = this.i; var pcount = 0;
+    while (this.i < this.string.length) {
+      var c = this.string.charAt(this.i++);
+      if (c == '{') {pcount++}
+      else if (c == '}') {
+        if (pcount == 0)
+          {this.Error("Extra close brace while looking for "+this.cmd+token); return null}
+        pcount --;
+      } else if (c == this.cmd) {
+        // really need separate counter for begin/end
+        // and it should really be a stack (new pcount for each begin)
+        if (this.string.slice(this.i,this.i+5) == "begin") {pcount++; this.i+=4}
+        else if (this.string.slice(this.i,this.i+3) == "end") {
+          if (pcount > 0) {pcount--; this.i += 2}
+        }
+        if (pcount == 0)  {
+          if (this.string.slice(this.i,this.i+token.length) == token) {
+            c = this.string.charAt(this.i+token.length);
+            if (c.match(/[^a-z]/i) || !token.match(/[a-z]/i)) {
+              var arg = this.string.slice(start,this.i-1);
+              this.i += token.length;
+              return arg;
+            }
+          }
+        }
+        this.i++;
+      }
+    }
+    this.Error("Couldn't find "+this.cmd+token+" for "+name);
+    return null;
+  },
+
+  /*
+   *  Get a parameter delimited by a control sequence, and
+   *  process it to get its mlist
+   */
+  ProcessUpto: function (name,token) {
+    var arg = this.GetUpto(name,token); if (this.error) return null;
+    return this.Process(arg);
+  },
+
+  /*
+   *  Get everything up to \end{env}
+   */
+  GetEnd: function (env) {
+    var body = ''; var name = '';
+    while (name != env) {
+      body += this.GetUpto('begin{'+env+'}','end'); if (this.error) return null;
+      name = this.GetArgument(this.cmd+'end'); if (this.error) return null;
+    }
+    return body;
+  },
+  
+
+  /***************************************************************************/
+
+
+  /*
+   *  Ignore spaces
+   */
+  Space: function () {},
+
+  /*
+   *  Collect together any primes and convert them to a superscript
+   */
+  Prime: function (c) {
+    var base = this.mlist.Last();
+    if (base == null || (!base.atom && base.type != 'box' && base.type != 'frac'))
+       {base = this.mlist.Add(jsMath.mItem.Atom('ord',{type:null}))}
+    if (base.sup) {this.Error("Prime causes double exponent: use braces to clarify"); return}
+    var sup = '';
+    while (c == "'") {sup += this.cmd+'prime'; c = this.GetNext(); if (c == "'") {this.i++}}
+    base.sup = this.Process(sup);
+    base.sup.isPrime = 1;
+  },
+
+  /*
+   *  Raise or lower its parameter by a given amount
+   *  @@@ Note that this is different from TeX, which requires an \hbox @@@
+   *  ### make this work with mu's ###
+   */
+  RaiseLower: function (name) {
+    var h = this.GetDimen(this.cmd+name,1); if (this.error) return;
+    var box = this.ProcessScriptArg(this.cmd+name); if (this.error) return;
+    if (name == 'lower') {h = -h}
+    this.mlist.Add(new jsMath.mItem('raise',{nuc: box, raise: h}));
+  },
+  
+  /*
+   *  Shift an expression to the right or left
+   *  @@@ Note that this is different from TeX, which requires a \vbox @@@
+   *  ### make this work with mu's ###
+   */
+  MoveLeftRight: function (name) {
+    var x = this.GetDimen(this.cmd+name,1); if (this.error) return;
+    var box = this.ProcessScriptArg(this.cmd+name); if (this.error) return;
+    if (name == 'moveleft') {x = -x}
+    this.mlist.Add(jsMath.mItem.Space(x));
+    this.mlist.Add(jsMath.mItem.Atom('ord',box));
+    this.mlist.Add(jsMath.mItem.Space(-x));
+  },
+
+  /*
+   *  Load an extension if it has not already been loaded
+   */
+  Require: function (name) {
+    var file = this.GetArgument(this.cmd+name); if (this.error) return;
+    file = jsMath.Extension.URL(file);
+    if (jsMath.Setup.loaded[file]) return;
+    this.Extension(null,[file]);
+  },
+  
+  /*
+   *  Load an extension file and restart processing the math
+   */
+  Extension: function (name,data) {
+    jsMath.Translate.restart = 1;
+    if (name != null) {delete jsMath.Parser.prototype[data[1]||'macros'][name]}
+    jsMath.Extension.Require(data[0],jsMath.Translate.asynchronous);
+    throw "restart";
+  },
+  
+  /*
+   *  Implements \frac{num}{den}
+   */
+  Frac: function (name) {
+    var num = this.ProcessArg(this.cmd+name); if (this.error) return;
+    var den = this.ProcessArg(this.cmd+name); if (this.error) return;
+    this.mlist.Add(jsMath.mItem.Fraction('over',num,den));
+  },
+  
+  /*
+   *  Implements \sqrt[n]{...}
+   */
+  Sqrt: function (name) {
+    var n = this.GetBrackets(this.cmd+name); if (this.error) return;
+    var arg = this.ProcessArg(this.cmd+name); if (this.error) return;
+    var box = jsMath.mItem.Atom('radical',arg);
+    if (n != '') {box.root = this.Process(n); if (this.error) return}
+    this.mlist.Add(box);
+  },
+
+  /*
+   *  Implements \root...\of{...}
+   */
+  Root: function (name) {
+    var n = this.ProcessUpto(this.cmd+name,'of'); if (this.error) return;
+    var arg = this.ProcessArg(this.cmd+name); if (this.error) return;
+    var box = jsMath.mItem.Atom('radical',arg);
+    box.root = n; this.mlist.Add(box);
+  },
+  
+
+  /*
+   *  Implements \buildrel...\over{...}
+   */
+  BuildRel: function (name) {
+    var top = this.ProcessUpto(this.cmd+name,'over'); if (this.error) return;
+    var bot = this.ProcessArg(this.cmd+name); if (this.error) return;
+    var op = jsMath.mItem.Atom('op',bot);
+    op.limits = 1; op.sup = top;
+    this.mlist.Add(op);
+  },
+
+  /*
+   *  Create a delimiter of the type and size specified in the parameters
+   */
+  MakeBig: function (name,data) {
+    var type = data[0]; var h = data[1] * jsMath.p_height;
+    var delim = this.GetDelimiter(this.cmd+name); if (this.error) return;
+    this.mlist.Add(jsMath.mItem.Atom(type,jsMath.Box.Delimiter(h,delim,'T')));
+  },
+  
+  /*
+   *  Insert the specified character in the given font.
+   *  (Try to load the font if it is not already available.)
+   */
+  Char: function (name) {
+    var font = this.GetArgument(this.cmd+name); if (this.error) return;
+    var n = this.GetArgument(this.cmd+name); if (this.error) return;
+    if (!jsMath.TeX[font]) {
+      jsMath.TeX[font] = [];
+      this.Extension(null,[jsMath.Font.URL(font)]);
+    } else {
+      this.mlist.Add(jsMath.mItem.Typeset(jsMath.Box.TeX(n-0,font,this.mlist.data.style,this.mlist.data.size)));
+    }
+  },
+  
+  /*
+   *  Create an array or matrix.
+   */
+  Matrix: function (name,delim) {
+    var data = this.mlist.data;
+    var arg = this.GetArgument(this.cmd+name); if (this.error) return;
+    var parse = new jsMath.Parser(arg+this.cmd+'\\',null,data.size,delim[5] || 'T');
+    parse.matrix = name; parse.row = []; parse.table = []; parse.rspacing = [];
+    parse.Parse(); if (parse.error) {this.Error(parse); return}
+    parse.HandleRow(name,1);  // be sure the last row is recorded
+    var box = jsMath.Box.Layout(data.size,parse.table,delim[2]||null,delim[3]||null,parse.rspacing,delim[4]||null);
+    // Add parentheses, if needed
+    if (delim[0] && delim[1]) {
+      var left  = jsMath.Box.Delimiter(box.h+box.d-jsMath.hd/4,this.delimiter[delim[0]],'T');
+      var right = jsMath.Box.Delimiter(box.h+box.d-jsMath.hd/4,this.delimiter[delim[1]],'T');
+      box = jsMath.Box.SetList([left,box,right],data.style,data.size);
+    }
+    this.mlist.Add(jsMath.mItem.Atom((delim[0]? 'inner': 'ord'),box));
+  },
+  
+  /*
+   *  When we see an '&', try to add a matrix entry to the row data.
+   *  (Use all the data in the current mList, and then clear it)
+   */
+  HandleEntry: function (name) {
+    if (!this.matrix) 
+      {this.Error(name+" can only appear in a matrix or array"); return}
+    if (this.mlist.data.openI != null) {
+      var open = this.mlist.Get(this.mlist.data.openI);
+      if (open.left) {this.Error("Missing "+this.cmd+"right")}
+        else {this.Error("Missing close brace")}
+    }
+    if (this.mlist.data.overI != null) {this.mlist.Over()}
+    var data = this.mlist.data;
+    this.mlist.Atomize(data.style,data.size);
+    var box = this.mlist.Typeset(data.style,data.size);
+    box.entry = data.entry; delete data.entry; if (!box.entry) {box.entry = {}};
+    this.row[this.row.length] = box;
+    this.mlist = new jsMath.mList(null,null,data.size,data.style); 
+  },
+  
+  /*
+   *  When we see a \cr or \\, try to add a row to the table
+   */
+  HandleRow: function (name,last) {
+    var dimen;
+    if (!this.matrix) {this.Error(this.cmd+name+" can only appear in a matrix or array"); return}
+    if (name == "\\") {
+      dimen = this.GetBrackets(this.cmd+name); if (this.error) return;
+      if (dimen) {dimen = this.ParseDimen(dimen,this.cmd+name,0,1)}
+    }
+    this.HandleEntry(name);
+    if (!last || this.row.length > 1 || this.row[0].format != 'null')
+      {this.table[this.table.length] = this.row}
+    if (dimen) {this.rspacing[this.table.length] = dimen}
+    this.row = [];
+  },
+  
+  /*
+   *  Look for \vskip or \vspace in \noalign parameters
+   */
+  HandleNoAlign: function (name) {
+    var arg = this.GetArgument(this.cmd+name); if (this.error) return;
+    var skip = arg.replace(/^.*(vskip|vspace)([^a-z])/i,'$2');
+    if (skip.length == arg.length) return;
+    var d = this.ParseDimen(skip,this.cmd+RegExp.$1,0,1); if (this.error) return;
+    this.rspacing[this.table.length] = (this.rspacing[this.table.length] || 0) + d;
+  },
+  
+  /*
+   *  LaTeX array environment
+   */
+  Array: function (name,delim) {
+    var columns = delim[2]; var cspacing = delim[3];
+    if (!columns) {
+      columns = this.GetArgument(this.cmd+'begin{'+name+'}');
+      if (this.error) return;
+    }
+    columns = columns.replace(/[^clr]/g,'');
+    columns = columns.split('');
+    var data = this.mlist.data; var style = delim[5] || 'T';
+    var arg = this.GetEnd(name); if (this.error) return;
+    var parse = new jsMath.Parser(arg+this.cmd+'\\',null,data.size,style);
+    parse.matrix = name; parse.row = []; parse.table = []; parse.rspacing = [];
+    parse.Parse(); if (parse.error) {this.Error(parse); return}
+    parse.HandleRow(name,1);  // be sure the last row is recorded
+    var box = jsMath.Box.Layout(data.size,parse.table,columns,cspacing,parse.rspacing,delim[4],delim[6],delim[7]);
+    // Add parentheses, if needed
+    if (delim[0] && delim[1]) {
+      var left  = jsMath.Box.Delimiter(box.h+box.d-jsMath.hd/4,this.delimiter[delim[0]],'T');
+      var right = jsMath.Box.Delimiter(box.h+box.d-jsMath.hd/4,this.delimiter[delim[1]],'T');
+      box = jsMath.Box.SetList([left,box,right],data.style,data.size);
+    }
+    this.mlist.Add(jsMath.mItem.Atom((delim[0]? 'inner': 'ord'),box));
+  },
+  
+  /*
+   *  LaTeX \begin{env}
+   */
+  Begin: function (name) {
+    var env = this.GetArgument(this.cmd+name); if (this.error) return;
+    if (env.match(/[^a-z*]/i)) {this.Error('Invalid environment name "'+env+'"'); return}
+    if (!this.environments[env]) {this.Error('Unknown environment "'+env+'"'); return}
+    var cmd = this.environments[env];
+    if (typeof(cmd) == "string") {cmd = [cmd]}
+    this[cmd[0]](env,cmd.slice(1));
+  },
+  
+  /*
+   *  LaTeX \end{env}
+   */
+  End: function (name) {
+    var env = this.GetArgument(this.cmd+name); if (this.error) return;
+    this.Error(this.cmd+name+'{'+env+'} without matching '+this.cmd+'begin');
+  },
+  
+  /*
+   *  LaTeX equation environment (just remove the environment)
+   */
+  Equation: function (name) {
+    var arg = this.GetEnd(name); if (this.error) return;
+    this.string = arg+this.string.slice(this.i); this.i = 0;
+  },
+
+  /*
+   *  Add a fixed amount of horizontal space
+   */
+  Spacer: function (name,w) {
+    this.mlist.Add(jsMath.mItem.Space(w-0));
+  },
+  
+  /*
+   *  Add horizontal space given by the argument
+   */
+  Hskip: function (name) {
+    var w = this.GetDimen(this.cmd+name); if (this.error) return;
+    this.mlist.Add(jsMath.mItem.Space(w));
+  },
+
+  /*
+   *  Typeset the argument as plain text rather than math.
+   */
+  HBox: function (name) {
+    var text = this.GetArgument(this.cmd+name); if (this.error) return;
+    var box = jsMath.Box.InternalMath(text,this.mlist.data.size);
+    this.mlist.Add(jsMath.mItem.Typeset(box));
+  },
+  
+  /*
+   *  Insert a rule of a particular width, height and depth
+   *  This replaces \hrule and \vrule
+   *  @@@ not a standard TeX command, and all three parameters must be given @@@
+   */
+  Rule: function (name,style) {
+    var w = this.GetDimen(this.cmd+name,1); if (this.error) return;
+    var h = this.GetDimen(this.cmd+name,1); if (this.error) return;
+    var d = this.GetDimen(this.cmd+name,1); if (this.error) return;
+    h += d; var html;
+    if (h != 0) {h = Math.max(1.05/jsMath.em,h)}
+    if (h == 0 || w == 0 || style == "blank")
+      {html = jsMath.HTML.Blank(w,h)} else {html = jsMath.HTML.Rule(w,h)}
+    if (d) {
+      html = '<span style="vertical-align:'+jsMath.HTML.Em(-d)+'">'
+           +  html + '</span>';
+    }
+    this.mlist.Add(jsMath.mItem.Typeset(new jsMath.Box('html',html,w,h-d,d)));
+  },
+  
+  /*
+   *  Inserts an empty box of a specific height and depth
+   */
+  Strut: function () {
+    var size = this.mlist.data.size;
+    var box = jsMath.Box.Text('','normal','T',size).Styled();
+    box.bh = box.bd = 0; box.h = .8; box.d = .3; box.w = box.Mw = 0;
+    this.mlist.Add(jsMath.mItem.Typeset(box));
+  },
+  
+  /*
+   *  Handles \phantom, \vphantom and \hphantom
+   */
+  Phantom: function (name,data) {
+    var arg = this.ProcessArg(this.cmd+name); if (this.error) return;
+    this.mlist.Add(new jsMath.mItem('phantom',{phantom: arg, v: data[0], h: data[1]}));
+  },
+  
+  /*
+   *  Implements \smash
+   */
+  Smash: function (name,data) {
+    var arg = this.ProcessArg(this.cmd+name); if (this.error) return;
+    this.mlist.Add(new jsMath.mItem('smash',{smash: arg}));
+  },
+  
+  /*
+   *  Puts an accent on the following argument
+   */
+  MathAccent: function (name,accent) {
+    var c = this.ProcessArg(this.cmd+name); if (this.error) return;
+    var atom = jsMath.mItem.Atom('accent',c); atom.accent = accent[0];
+    this.mlist.Add(atom);
+  },
+
+  /*
+   *  Handles functions and operators like sin, cos, sum, etc.
+   */
+  NamedOp: function (name,data) {
+    var a = (name.match(/[^acegm-su-z]/)) ? 1: 0;
+    var d = (name.match(/[gjpqy]/)) ? .2: 0;
+    if (data[1]) {name = data[1]}
+    var box = jsMath.mItem.TextAtom('op',name,jsMath.TeX.fam[0],a,d);
+    if (data[0] != null) {box.limits = data[0]}
+    this.mlist.Add(box);
+  },
+
+  /*
+   *  Implements \limits
+   */
+  Limits: function (name,data) {
+    var atom = this.mlist.Last();
+    if (!atom || atom.type != 'op') 
+      {this.Error(this.cmd+name+" is allowed only on operators"); return}
+    atom.limits = data[0];
+  },
+
+  /*
+   *  Implements macros like those created by \def.  The named control
+   *  sequence is replaced by the string given as the first data value.
+   *  If there is a second data value, this specifies how many arguments
+   *  the macro uses, and in this case, those arguments are substituted
+   *  for #1, #2, etc. within the replacement string.
+   *  
+   *  See the jsMath.Macro() command below for more details.
+   *  The "newcommand" extension implements \newcommand and \def
+   *  and are loaded automatically if needed.
+   */
+  Macro: function (name,data) {
+    var text = data[0];
+    if (data[1]) {
+      var args = [];
+      for (var i = 0; i < data[1]; i++)
+        {args[args.length] = this.GetArgument(this.cmd+name); if (this.error) return}
+      text = this.SubstituteArgs(args,text);
+    }
+    this.string = this.AddArgs(text,this.string.slice(this.i));
+    this.i = 0;
+  },
+  
+  /*
+   *  Replace macro paramters with their values
+   */
+  SubstituteArgs: function (args,string) {
+    var text = ''; var newstring = ''; var c; var i = 0;
+    while (i < string.length) {
+      c = string.charAt(i++);
+      if (c == this.cmd) {text += c + string.charAt(i++)}
+      else if (c == '#') {
+        c = string.charAt(i++);
+        if (c == "#") {text += c} else {
+          if (!c.match(/[1-9]/) || c > args.length)
+            {this.Error("Illegal macro parameter reference"); return null}
+          newstring = this.AddArgs(this.AddArgs(newstring,text),args[c-1]);
+          text = '';
+        }
+      } else {text += c}
+    }
+    return this.AddArgs(newstring,text);
+  },
+  
+  /*
+   *  Make sure that macros are followed by a space if their names
+   *  could accidentally be continued into the following text.
+   */
+  AddArgs: function (s1,s2) {
+    if (s2.match(/^[a-z]/i) && s1.match(/(^|[^\\])(\\\\)*\\[a-z]+$/i)) {s1 += ' '}
+    return s1+s2;
+  },
+  
+  /*
+   *  Replace the control sequence with the given text
+   */
+  Replace: function (name,data) {
+    this.mlist.Add(jsMath.mItem.TextAtom(data[0],data[1],data[2],data[3]));
+  },
+  
+  /*
+   *  Error for # (must use \#)
+   */
+  Hash: function (name) {
+    this.Error("You can't use 'macro parameter character #' in math mode");
+  },
+  
+  /*
+   *  Insert space for ~
+   */
+  Tilde: function (name) {
+    this.mlist.Add(jsMath.mItem.TextAtom('ord','&nbsp;','normal'));
+  },
+
+  /*
+   *  Implements \llap, \rlap, etc.
+   */
+  HandleLap: function (name) {
+    var box = this.ProcessArg(); if (this.error) return;
+    box = this.mlist.Add(new jsMath.mItem('lap',{nuc: box, lap: name}));
+  },
+
+  /*
+   *  Adds the argument as a specific type of atom (for commands like
+   *  \overline, etc.)
+   */
+  HandleAtom: function (name,data) {
+    var arg = this.ProcessArg(this.cmd+name); if (this.error) return;
+    this.mlist.Add(jsMath.mItem.Atom(data[0],arg));
+  },
+
+
+  /*
+   *  Process the character associated with a specific \mathcharcode
+   */
+  HandleMathCode: function (name,code) {
+    this.HandleTeXchar(code[0],code[1],code[2]);
+  },
+  
+  /*
+   *  Add a specific character from a TeX font (use the current
+   *  font if the type is 7 (variable) or the font is not specified)
+   *  Load the font if it is not already loaded.
+   */
+  HandleTeXchar: function (type,font,code) {
+    if (type == 7 && this.mlist.data.font != null) {font = this.mlist.data.font}
+    font = jsMath.TeX.fam[font];
+    if (!jsMath.TeX[font]) {
+      jsMath.TeX[font] = [];
+      this.Extension(null,[jsMath.Font.URL(font)]);
+    } else {
+      this.mlist.Add(jsMath.mItem.TeXAtom(jsMath.TeX.atom[type],code,font));
+    }
+  },
+
+  /*
+   *  Add a TeX variable character or number
+   */
+  HandleVariable: function (c) {this.HandleTeXchar(7,1,c.charCodeAt(0))},
+  HandleNumber: function (c) {this.HandleTeXchar(7,0,c.charCodeAt(0))},
+
+  /*
+   *  For unmapped characters, just add them in as normal
+   *  (non-TeX) characters
+   */
+  HandleOther: function (c) {
+    this.mlist.Add(jsMath.mItem.TextAtom('ord',c,'normal'));
+  },
+  
+  /*
+   *  Ignore comments in TeX data
+   *  ### Some browsers remove the newlines, so this might cause
+   *      extra stuff to be ignored; look into this ###
+   */
+  HandleComment: function () {
+    var c;
+    while (this.i < this.string.length) {
+      c = this.string.charAt(this.i++);
+      if (c == "\r" || c == "\n") return;
+    }
+  },
+
+  /*
+   *  Add a style change (e.g., \displaystyle, etc)
+   */
+  HandleStyle: function (name,style) {
+    this.mlist.data.style = style[0];
+    this.mlist.Add(new jsMath.mItem('style',{style: style[0]}));
+  },
+  
+  /*
+   *  Implements \small, \large, etc.
+   */
+  HandleSize: function (name,size) {
+    this.mlist.data.size = size[0];
+    this.mlist.Add(new jsMath.mItem('size',{size: size[0]}));
+  },
+
+  /*
+   *  Set the current font (e.g., \rm, etc)
+   */
+  HandleFont: function (name,font) {
+    this.mlist.data.font = font[0];
+  },
+
+  /*
+   *  Look for and process a control sequence
+   */
+  HandleCS: function () {
+    var cmd = this.GetCommand(); if (this.error) return;
+    if (this.macros[cmd]) {
+      var macro = this.macros[cmd];
+      if (typeof(macro) == "string") {macro = [macro]}
+      this[macro[0]](cmd,macro.slice(1)); return;
+    }
+    if (this.mathchardef[cmd]) {
+      this.HandleMathCode(cmd,this.mathchardef[cmd]);
+      return;
+    }
+    if (this.delimiter[this.cmd+cmd]) {
+      this.HandleMathCode(cmd,this.delimiter[this.cmd+cmd].slice(0,3))
+      return;
+    }
+    this.Error("Unknown control sequence '"+this.cmd+cmd+"'");
+  },
+
+  /*
+   *  Process open and close braces
+   */
+  HandleOpen: function () {this.mlist.Open()},
+  HandleClose: function () {
+    if (this.mlist.data.openI == null) {this.Error("Extra close brace"); return}
+    var open = this.mlist.Get(this.mlist.data.openI);
+    if (!open || open.left == null) {this.mlist.Close()}
+      else {this.Error("Extra close brace or missing "+this.cmd+"right"); return}
+  },
+
+  /*
+   *  Implements \left
+   */
+  HandleLeft: function (name) {
+    var left = this.GetDelimiter(this.cmd+name); if (this.error) return;
+    this.mlist.Open(left);
+  },
+
+  /*
+   *  Implements \right
+   */
+  HandleRight: function (name) {
+    var right = this.GetDelimiter(this.cmd+name); if (this.error) return;
+    var open = this.mlist.Get(this.mlist.data.openI);
+    if (open && open.left != null) {this.mlist.Close(right)}
+      else {this.Error("Extra open brace or missing "+this.cmd+"left");}
+  },
+
+  /*
+   *  Implements generalized fractions (\over, \above, etc.)
+   */
+  HandleOver: function (name,data) {
+    if (this.mlist.data.overI != null) 
+      {this.Error('Ambiguous use of '+this.cmd+name); return}
+    this.mlist.data.overI = this.mlist.Length();
+    this.mlist.data.overF = {name: name};
+    if (data.length > 0) {
+      this.mlist.data.overF.left  = this.delimiter[data[0]];
+      this.mlist.data.overF.right = this.delimiter[data[1]];
+    } else if (name.match(/withdelims$/)) {
+      this.mlist.data.overF.left  = this.GetDelimiter(this.cmd+name); if (this.error) return;
+      this.mlist.data.overF.right = this.GetDelimiter(this.cmd+name); if (this.error) return;
+    } else {
+      this.mlist.data.overF.left  = null;
+      this.mlist.data.overF.right = null;
+    }
+    if (name.match(/^above/)) {
+      this.mlist.data.overF.thickness = this.GetDimen(this.cmd+name,1);
+      if (this.error) return;
+    } else {
+      this.mlist.data.overF.thickness = null; 
+    }
+  },
+
+  /*
+   *  Add a superscript to the preceeding atom
+   */
+  HandleSuperscript: function () {
+    var base = this.mlist.Last();
+    if (this.mlist.data.overI == this.mlist.Length()) {base = null}
+    if (base == null || (!base.atom && base.type != 'box' && base.type != 'frac'))
+       {base = this.mlist.Add(jsMath.mItem.Atom('ord',{type:null}))}
+    if (base.sup) {
+      if (base.sup.isPrime) {base = this.mlist.Add(jsMath.mItem.Atom('ord',{type:null}))}
+        else {this.Error("Double exponent: use braces to clarify"); return}
+    }
+    base.sup = this.ProcessScriptArg('superscript'); if (this.error) return;
+  },
+
+  /*
+   *  Add a subscript to the preceeding atom
+   */
+  HandleSubscript: function () {
+    var base = this.mlist.Last();
+    if (this.mlist.data.overI == this.mlist.Length()) {base = null}
+    if (base == null || (!base.atom && base.type != 'box' && base.type != 'frac'))
+       {base = this.mlist.Add(jsMath.mItem.Atom('ord',{type:null}))}
+    if (base.sub) {this.Error("Double subscripts: use braces to clarify"); return}
+    base.sub = this.ProcessScriptArg('subscript'); if (this.error) return;
+  },
+
+  /*
+   *  Parse a TeX math string, handling macros, etc.
+   */
+  Parse: function () {
+    var c;
+    while (this.i < this.string.length) {
+      c = this.string.charAt(this.i++);
+      if (this.mathchar[c]) {this.HandleMathCode(c,this.mathchar[c])}
+      else if (this.special[c]) {this[this.special[c]](c)}
+      else if (this.letter.test(c)) {this.HandleVariable(c)}
+      else if (this.number.test(c)) {this.HandleNumber(c)}
+      else {this.HandleOther(c)}
+    }
+    if (this.mlist.data.openI != null) {
+      var open = this.mlist.Get(this.mlist.data.openI);
+      if (open.left) {this.Error("Missing "+this.cmd+"right")}
+        else {this.Error("Missing close brace")}
+    }
+    if (this.mlist.data.overI != null) {this.mlist.Over()}
+  },
+
+  /*
+   *  Perform the processing of Appendix G
+   */
+  Atomize: function () {
+    var data = this.mlist.init;
+    if (!this.error) this.mlist.Atomize(data.style,data.size)
+  },
+
+  /*
+   *  Produce the final HTML.
+   *  
+   *  We have to wrap the HTML it appropriate <SPAN> tags to hide its
+   *  actual dimensions when these don't match the TeX dimensions of the
+   *  results.  We also include an image to force the results to take up
+   *  the right amount of space.  The results may need to be vertically
+   *  adjusted to make the baseline appear in the correct place.
+   */
+  Typeset: function () {
+    var data = this.mlist.init;
+    var box = this.typeset = this.mlist.Typeset(data.style,data.size);
+    if (this.error) {return '<span class="error">'+this.error+'</span>'}
+    if (box.format == 'null') {return ''};
+
+    box.Styled().Remeasured(); var isSmall = 0; var isBig = 0;
+    if (box.bh > box.h && box.bh > jsMath.h+.001) {isSmall = 1}
+    if (box.bd > box.d && box.bd > jsMath.d+.001) {isSmall = 1}
+    if (box.h > jsMath.h || box.d > jsMath.d) {isBig = 1}
+    
+    var html = box.html;
+    if (isSmall) {// hide the extra size
+      if (jsMath.Browser.allowAbsolute) {
+        var y = (box.bh > jsMath.h+.001 ? jsMath.h - box.bh : 0);
+        html = jsMath.HTML.Absolute(html,box.w,jsMath.h,0,y);
+      } else if (jsMath.Browser.valignBug) {
+        // remove line height
+        html = '<span style="line-height:'+jsMath.HTML.Em(jsMath.d)+';">'
+             +    html + '</span>';
+      } else if (!jsMath.Browser.operaLineHeightBug) {
+        // remove line height and try to hide the depth
+        var dy = jsMath.HTML.Em(Math.max(0,box.bd-jsMath.hd)/3);
+        html = '<span style="line-height:'+jsMath.HTML.Em(jsMath.d)+';'
+               + ' position:relative; top:'+dy+'; vertical-align:'+dy
+               + '">' + html + '</span>';
+      }
+      isBig = 1;
+    }
+    if (isBig) {
+      // add height and depth to the line
+      //   (force a little extra to separate lines if needed)
+      html += jsMath.HTML.Blank(0,box.h+.05,box.d+.05);
+    }
+    return '<nobr><span class="scale">'+html+'</span></nobr>';
+  }
+
+});
+
+/*
+ *  Make these characters special (and call the given routines)
+ */
+jsMath.Parser.prototype.AddSpecial({
+  cmd:   'HandleCS',
+  open:  'HandleOpen',
+  close: 'HandleClose'
+});
+
+
+/*
+ *  The web-page author can call jsMath.Macro to create additional
+ *  TeX macros for use within his or her mathematics.  See the
+ *  author's documentation for more details.
+ */
+
+jsMath.Add(jsMath,{
+  Macro: function (name) {
+    var macro = jsMath.Parser.prototype.macros;
+    macro[name] = ['Macro'];
+    for (var i = 1; i < arguments.length; i++) 
+      {macro[name][macro[name].length] = arguments[i]}
+  }
+});
+
+/*
+ *  Use these commands to create macros that load
+ *  JavaScript files and reprocess the mathematics when
+ *  the file is loaded.  This lets you to have macros or
+ *  LaTeX environments that autoload their own definitions
+ *  only when they are needed, saving initial download time
+ *  on pages where they are not used.  See the author's
+ *  documentation for more details.
+ *
+ */
+
+jsMath.Extension = {
+
+  safeRequire: 1,   // disables access to files outside of jsMath/extensions
+  
+  Macro: function (name,file) {
+    var macro = jsMath.Parser.prototype.macros;
+    if (file == null) {file = name}
+    macro[name] = ['Extension',file];
+  },
+
+  LaTeX: function (env,file) {
+    var latex = jsMath.Parser.prototype.environments;
+    latex[env] = ['Extension',file,'environments'];
+  },
+
+  Font: function (name,font) {
+    if (font == null) {font = name + "10"}
+    var macro = jsMath.Parser.prototype.macros;
+    macro[name] = ['Extension',jsMath.Font.URL(font)];
+  },
+  
+  MathChar: function (font,defs) {
+    var fam = jsMath.TeX.famName[font];
+    if (fam == null) {
+      fam = jsMath.TeX.fam.length;
+      jsMath.TeX.fam[fam] = font;
+      jsMath.TeX.famName[font] = fam;
+    }
+    var mathchardef = jsMath.Parser.prototype.mathchardef;
+    for (var c in defs) {mathchardef[c] = [defs[c][0],fam,defs[c][1]]}
+  },
+
+  Require: function (file,show) {
+    if (this.safeRequire && (file.match(/\.\.\/|[^-a-z0-9.\/:_+=%~]/i) ||
+         (file.match(/:/) && file.substr(0,jsMath.root.length) != jsMath.root))) {
+      jsMath.Setup.loaded[file] = 1;
+      return;
+    }
+    jsMath.Setup.Script(this.URL(file),show);
+  },
+  
+  URL: function (file) {
+    file = file.replace(/^\s+|\s+$/g,'');
+    if (!file.match(/^([a-z]+:|\/|fonts|extensions\/)/i)) {file = 'extensions/'+file}
+    if (!file.match(/\.js$/)) {file += '.js'}
+    return file;
+  }
+}
+
+
+/***************************************************************************/
+
+/*
+ *  These routines look through the web page for math elements to process.
+ *  There are two main entry points you can call:
+ *  
+ *      <script> jsMath.Process() </script>
+ *  or
+ *      <script> jsMath.ProcessBeforeShowing() </script>
+ *
+ *  The first will process the page asynchronously (so the user can start
+ *  reading the top of the file while jsMath is still processing the bottom)
+ *  while the second does not update until all the mathematics is typeset.
+ */
+
+jsMath.Add(jsMath,{
+  /*
+   *  Call this at the bottom of your HTML page to have the
+   *  mathematics typeset asynchronously.  This lets the user
+   *  start reading the mathematics while the rest of the page
+   *  is being processed.
+   */
+  Process: function (obj) {
+    jsMath.Setup.Body();
+    jsMath.Script.Push(jsMath.Translate,'Asynchronous',obj);
+  },
+  
+  /*
+   *  Call this at the bottom of your HTML page to have the
+   *  mathematics typeset before the page is displayed.
+   *  This can take a long time, so the user could cancel the
+   *  page before it is complete; use it with caution, and only
+   *  when there is a relatively small amount of math on the page.
+   */
+  ProcessBeforeShowing: function (obj) {
+    jsMath.Setup.Body();
+    var method = (jsMath.Controls.cookie.asynch ? "Asynchronous": "Synchronous");
+    jsMath.Script.Push(jsMath.Translate,method,obj);
+  },
+  
+  /*
+   *  Process the contents of a single element.  It must be of
+   *  class "math".
+   */
+  ProcessElement: function (obj) {
+    jsMath.Setup.Body();
+    jsMath.Script.Push(jsMath.Translate,'ProcessOne',obj);
+  }
+  
+});
+
+jsMath.Translate = {
+
+  element: [],  // the list of math elements on the page
+  cancel: 0,    // set to 1 to cancel asynchronous processing
+  
+  /*
+   *  Parse a TeX string in Text or Display mode and return
+   *  the HTML for it (taking it from the cache, if available)
+   */
+  Parse: function (style,s,noCache) {
+    var cache = jsMath.Global.cache[style];
+    if (!cache[jsMath.em]) {cache[jsMath.em] = {}}
+    var HTML = cache[jsMath.em][s];
+    if (!HTML || noCache) {
+      var parse = jsMath.Parse(s,null,null,style);
+      parse.Atomize(); HTML = parse.Typeset();
+      if (!noCache) {cache[jsMath.em][s] = HTML}
+    }
+    return HTML;
+  },
+
+  TextMode:    function (s,noCache) {this.Parse('T',s,noCache)},
+  DisplayMode: function (s,noCache) {this.Parse('D',s,noCache)},
+  
+  /*
+   *  Return the text of a given DOM element
+   */
+  GetElementText: function (element) {
+    if (element.childNodes.length == 1 && element.childNodes[0].nodeName === "#comment") {
+      var result = element.childNodes[0].nodeValue.match(/^\[CDATA\[(.*)\]\]$/);
+      if (result != null) {return result[1]};
+    }
+    var text = this.recursiveElementText(element);
+    element.alt = text;
+    if (text.search('&') >= 0) {
+      text = text.replace(/&lt;/g,'<');
+      text = text.replace(/&gt;/g,'>');
+      text = text.replace(/&quot;/g,'"');
+      text = text.replace(/&amp;/g,'&');
+    }
+    return text;
+  },
+  recursiveElementText: function (element) {
+    if (element.nodeValue != null) {
+      if (element.nodeName !== "#comment") {return element.nodeValue}
+      return element.nodeValue.replace(/^\[CDATA\[((.|\n)*)\]\]$/,"$1");
+    }
+    if (element.childNodes.length === 0) {return " "}
+    var text = '';
+    for (var i = 0; i < element.childNodes.length; i++) 
+      {text += this.recursiveElementText(element.childNodes[i])}
+    return text;
+  },
+  
+  /*
+   *  Move hidden to the location of the math element to be
+   *  processed and reinitialize sizes for that location.
+   */
+  ResetHidden: function (element) {
+    element.innerHTML =
+      '<span id="jsMath_hiddenSpan" style="position:absolute"></span>'
+        + jsMath.Browser.operaHiddenFix; // needed by Opera in tables
+    element.className = '';
+    jsMath.hidden = element.firstChild;
+    if (!jsMath.BBoxFor("x").w) {jsMath.hidden = jsMath.hiddenTop}
+    jsMath.ReInit();
+  },
+
+  
+  /*
+   *  Typeset the contents of an element in \textstyle or \displaystyle
+   */
+  ConvertMath: function (style,element,noCache) {
+    var text = this.GetElementText(element);
+    this.ResetHidden(element);
+    if (text.match(/^\s*\\nocache([^a-zA-Z])/))
+      {noCache = true; text = text.replace(/\s*\\nocache/,'')}
+    text = this.Parse(style,text,noCache);
+    element.className = 'typeset';
+    element.innerHTML = text;
+  },
+
+  /*
+   *  Process a math element
+   */
+  ProcessElement: function (element) {
+    this.restart = 0;
+    if (!element.className.match(/(^| )math( |$)/)) return; // don't reprocess elements
+    var noCache = (element.className.toLowerCase().match(/(^| )nocache( |$)/) != null);
+    try {
+      var style = (element.tagName.toLowerCase() == 'div' ? 'D' : 'T');
+      this.ConvertMath(style,element,noCache);
+      element.onclick = jsMath.Click.CheckClick;
+      element.ondblclick = jsMath.Click.CheckDblClick;
+    } catch (err) {
+      if (element.alt) {
+        var tex = element.alt;
+        tex = tex.replace(/&/g,'&amp;')
+                 .replace(/</g,'&lt;')
+                 .replace(/>/g,'&gt;');
+        element.innerHTML = tex;
+        element.className = 'math';
+        if (noCache) {element.className += ' nocache'}
+      }
+      jsMath.hidden = jsMath.hiddenTop;
+    }
+  },
+
+  /*
+   *  Asynchronously process all the math elements starting with
+   *  the k-th one.  Do them in blocks of 8 (more efficient than one
+   *  at a time, but still allows screen updates periodically).
+   */
+  ProcessElements: function (k) {
+    jsMath.Script.blocking = 1;
+    for (var i = 0; i < jsMath.Browser.processAtOnce; i++, k++) {
+      if (k >= this.element.length || this.cancel) {
+        this.ProcessComplete();
+        if (this.cancel) {
+          jsMath.Message.Set("Process Math: Canceled");
+          jsMath.Message.Clear()
+        }
+        jsMath.Script.blocking = 0;
+        jsMath.Script.Process();
+        return;
+      } else {
+        var savedQueue = jsMath.Script.SaveQueue();
+        this.ProcessElement(this.element[k]);
+        if (this.restart) {
+          jsMath.Script.Push(this,'ProcessElements',k);
+          jsMath.Script.RestoreQueue(savedQueue);
+          jsMath.Script.blocking = 0;
+          setTimeout('jsMath.Script.Process()',jsMath.Browser.delay);
+          return;
+        }
+      }
+    }
+    jsMath.Script.RestoreQueue(savedQueue);
+    var p = Math.floor(100 * k / this.element.length);
+    jsMath.Message.Set('Processing Math: '+p+'%');
+    setTimeout('jsMath.Translate.ProcessElements('+k+')',jsMath.Browser.delay);
+  },
+
+  /*
+   *  Start the asynchronous processing of mathematics
+   */
+  Asynchronous: function (obj) {
+    if (!jsMath.initialized) {jsMath.Init()}
+    this.element = this.GetMathElements(obj);
+    jsMath.Script.blocking = 1;
+    this.cancel = 0; this.asynchronous = 1;
+    jsMath.Message.Set('Processing Math: 0%',1);
+    setTimeout('jsMath.Translate.ProcessElements(0)',jsMath.Browser.delay);
+  },
+  
+  /*
+   *  Do synchronous processing of mathematics
+   */
+  Synchronous: function (obj,i) {
+    if (i == null) {
+      if (!jsMath.initialized) {jsMath.Init()}
+      this.element = this.GetMathElements(obj);
+      i = 0;
+    }
+    this.asynchronous = 0;
+    while (i < this.element.length) {
+      this.ProcessElement(this.element[i]);
+      if (this.restart) {
+        jsMath.Synchronize('jsMath.Translate.Synchronous(null,'+i+')');
+        jsMath.Script.Process();
+        return;
+      }
+      i++;
+    }
+    this.ProcessComplete(1);
+  },
+
+  /*
+   *  Synchronously process the contents of a single element
+   */
+  ProcessOne: function (obj) {
+    if (!jsMath.initialized) {jsMath.Init()}
+    this.element = [obj];
+    this.Synchronous(null,0);
+  },
+  
+  /*
+   *  Look up all the math elements on the page and
+   *  put them in a list sorted from top to bottom of the page
+   */
+  GetMathElements: function (obj) {
+    var element = []; var k;
+    if (!obj) {obj = jsMath.document}
+    if (typeof(obj) == 'string') {obj = jsMath.document.getElementById(obj)}
+    if (!obj.getElementsByTagName) return null;
+    var math = obj.getElementsByTagName('div');
+    for (k = 0; k < math.length; k++) {
+      if (math[k].className && math[k].className.match(/(^| )math( |$)/)) {
+        if (jsMath.Browser.renameOK && obj.getElementsByName) 
+               {math[k].setAttribute('name','_jsMath_')}
+          else {element[element.length] = math[k]}
+      }
+    }
+    math = obj.getElementsByTagName('span');
+    for (k = 0; k < math.length; k++) {
+      if (math[k].className && math[k].className.match(/(^| )math( |$)/)) {
+        if (jsMath.Browser.renameOK && obj.getElementsByName) 
+               {math[k].setAttribute('name','_jsMath_')}
+          else {element[element.length] = math[k]}
+      }
+    }
+    // this gets the SPAN and DIV elements interleaved in order
+    if (jsMath.Browser.renameOK && obj.getElementsByName) {
+      element = obj.getElementsByName('_jsMath_');
+    } else if (jsMath.hidden.sourceIndex) {
+      element.sort(function (a,b) {return a.sourceIndex - b.sourceIndex});
+    }
+    return element;
+  },
+
+  /*
+   *  Remove the window message about processing math
+   *  and clean up any marked <SPAN> or <DIV> tags
+   */
+  ProcessComplete: function (noMessage) {
+    if (jsMath.Browser.renameOK) {
+      var element = jsMath.document.getElementsByName('_jsMath_');
+      for (var i = element.length-1; i >= 0; i--) {
+        element[i].removeAttribute('name');
+      }
+    }
+    jsMath.hidden = jsMath.hiddenTop;
+    this.element = []; this.restart = null;
+    if (!noMessage) {
+      jsMath.Message.Set('Processing Math: Done');
+      jsMath.Message.Clear();
+    }
+    jsMath.Message.UnBlank();
+    if (jsMath.Browser.safariImgBug &&
+        (jsMath.Controls.cookie.font == 'symbol' ||
+         jsMath.Controls.cookie.font == 'image')) {
+      //
+      //  For Safari, the images don't always finish
+      //  updating, so nudge the window to cause a
+      //  redraw.  (Hack!)
+      //
+      if (this.timeout) {clearTimeout(this.timeout)}
+      this.timeout = setTimeout("jsMath.window.resizeBy(-1,0); "
+                              + "jsMath.window.resizeBy(1,0); "
+                              + "jsMath.Translate.timeout = null",2000);
+    }
+  },
+  
+  /*
+   *  Cancel procesing elements
+   */
+  Cancel: function () {
+    jsMath.Translate.cancel = 1;
+    if (jsMath.Script.cancelTimer) {jsMath.Script.cancelLoad()}
+  }
+  
+};
+
+jsMath.Add(jsMath,{
+  //
+  //  Synchronize these with the loading of the tex2math plugin.
+  //
+  ConvertTeX: function (element) {jsMath.Script.Push(jsMath.tex2math,'ConvertTeX',element)},
+  ConvertTeX2: function (element) {jsMath.Script.Push(jsMath.tex2math,'ConvertTeX2',element)},
+  ConvertLaTeX: function (element) {jsMath.Script.Push(jsMath.tex2math,'ConvertLaTeX',element)},
+  ConvertCustom: function (element) {jsMath.Script.Push(jsMath.tex2math,'ConvertCustom',element)},
+  CustomSearch: function (om,cm,od,cd) {jsMath.Script.Push(null,function () {jsMath.tex2math.CustomSearch(om,cm,od,cd)})},
+  tex2math: {
+    ConvertTeX: function () {},
+    ConvertTeX2: function () {},
+    ConvertLaTeX: function () {},
+    ConvertCustom: function () {},
+    CustomSearch: function () {}
+  }
+});
+jsMath.Synchronize = jsMath.Script.Synchronize;
+
+/***************************************************************************/
+
+
+/*
+ *  Initialize things
+ */
+try {
+  if (window.parent != window && window.jsMathAutoload) {
+    window.parent.jsMath = jsMath;
+    jsMath.document = window.parent.document;
+    jsMath.window = window.parent;
+  }
+} catch (err) {}
+
+ 
+jsMath.Global.Register();
+jsMath.Loaded();
+jsMath.Controls.GetCookie();
+jsMath.Setup.Source();
+jsMath.Global.Init();
+jsMath.Script.Init();
+jsMath.Setup.Fonts();
+if (jsMath.document.body) {jsMath.Setup.Body()}
+jsMath.Setup.User("onload");
+
+}}
diff --git a/htdocs/show-source.cgi b/htdocs/show-source.cgi
new file mode 100644
index 0000000000..5ef8268932
--- /dev/null
+++ b/htdocs/show-source.cgi
@@ -0,0 +1,72 @@
+#!/usr/bin/env perl
+
+print "Content-type:  text/HTML\n\n";
+
+$file = $ENV{PATH_INFO};
+
+Error("Can't load specified file") if ($file =~ m!(\.\./|//|:|~)!);
+Error("Can't load specified file") if ($file !~ m!\.p[lg]$!);
+
+
+#$root = '/usr/local/WeBWorK';
+$root = '/opt/webwork/';
+$filedir = $file; $filedir =~ s!/[^/]+$!!;
+$file =~ s!.*/!!;
+
+@PGdirs = (
+  "../templates$filedir",
+  "../templates/macros",
+#  "$root/local/macros",
+  "$root/pg/macros",
+);
+
+foreach $dir (@PGdirs) {ShowSource("$dir/$file") if (-e "$dir/$file")}
+
+Error("Can't find specified file",join(",",@PGdirs).": ".$file);
+
+sub Error {
+  print "<HTML>\n<HEAD>\n<TITLE>Show-Source Error</TITLE>\n</HEAD>\n";
+  print "<BODY>\n\n<H1>Show-Source Error:</H1>\n\n";
+  print join("\n",@_),"\n";
+  print "</BODY>\n</HTML>";
+  exit;
+}
+
+sub ShowSource {
+  my $file = shift;
+  my $name = $file; $name =~ s!.*/!!;
+
+  open(PGFILE,$file);
+  $program = join('',<PGFILE>);
+  close(PGFILE);
+
+  $program =~ s/&/\&amp;/g;
+  $program =~ s/</\&lt;/g;
+  $program =~ s/>/\&gt;/g;
+  $program =~ s/\t/        /g;
+  print "<HTML>\n<HEAD>\n<TITLE>Problem Source Code</TITLE>\n</HEAD>\n";
+  print "<BODY>\n\n<H1>Source Code for <CODE>$name</CODE>:</H1>\n\n";
+  print "<HR>\n<BLOCKQUOTE>\n";
+  print "<PRE>";
+  print MarkSource($program);
+  print "</PRE>\n";
+  print "</BLOCKQUOTE>\n<HR>\n";
+  print "</BODY>\n</HTML>\n";
+  exit;
+}
+
+sub MarkSource {
+  my $program = shift;
+  local $cgi = $ENV{SCRIPT_NAME};
+  $program =~ s/loadMacros *\(([^\)]*)\)/MakeLinks($1)/ge;
+  return $program;
+}
+
+sub MakeLinks {
+  my $macros = shift;
+  $macros =~ s!"([^\"<]*)"!"<A HREF="$cgi$filedir/\1">\1</A>"!g;
+  $macros =~ s!'([^\'<]*)'!'<A HREF="$cgi$filedir/\1">\1</A>'!g;
+  return 'loadMacros('.$macros.')';
+}
+
+1;
diff --git a/htdocs/site_info.txt b/htdocs/site_info.txt
new file mode 100644
index 0000000000..7cd4c0eb99
--- /dev/null
+++ b/htdocs/site_info.txt
@@ -0,0 +1,5 @@
+This is the webwork2/htdocs/site_info.txt  file.
+You can put site information here.
+
+
+
diff --git a/htdocs/tmp/README b/htdocs/tmp/README
new file mode 100644
index 0000000000..6beacb7643
--- /dev/null
+++ b/htdocs/tmp/README
@@ -0,0 +1,3 @@
+$CVSHeader$
+
+Web-accessible temporary files are stored in this directory.
diff --git a/htdocs/tmp/equations/README b/htdocs/tmp/equations/README
new file mode 100644
index 0000000000..9967464ff4
--- /dev/null
+++ b/htdocs/tmp/equations/README
@@ -0,0 +1,3 @@
+$CVSHeader$
+
+Equation images are stored in this directory.
diff --git a/lib/Apache/AuthenWeBWorK.pm b/lib/Apache/AuthenWeBWorK.pm
new file mode 100644
index 0000000000..cb6d5fa512
--- /dev/null
+++ b/lib/Apache/AuthenWeBWorK.pm
@@ -0,0 +1,173 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/Apache/AuthenWeBWorK.pm,v 1.2 2006/06/28 16:19:57 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package Apache::AuthenWeBWorK;
+
+=head1 NAME
+
+Apache::AuthenWeBWorK - Authenticate against WeBWorK::Authen framework.
+
+=head1 CONFIGURATION
+
+ PerlSetVar authen_webwork_root /path/to/webwork2
+ PerlSetVar authen_webwork_course "some-course-id"
+ PerlSetVar authen_webwork_module "WeBWorK::Authen::something"
+
+=cut
+
+use strict;
+use warnings;
+#use Apache::Constants qw(:common);
+use Apache2::Const -compile => qw(OK DECLINED HTTP_UNAUTHORIZED);
+use Apache2::Access ();
+use Apache2::RequestUtil ();
+
+use WeBWorK::Debug;
+use WeBWorK::Request;
+use WeBWorK::ContentGenerator;
+use WeBWorK::DB;
+use WeBWorK::Authz;
+use WeBWorK::Utils qw/runtime_use/;
+
+################################################################################
+
+=head1 APACHE AUTHEN HANDLER
+
+=over
+
+=item handler($r)
+
+=cut
+
+sub handler($) {
+	my ($apache) = @_;
+	my $r = new WeBWorK::Request($apache);
+	
+	my ($res, $sent_pw) = $r->get_basic_auth_pw;
+	return $res unless $res == Apache2::Const::OK;
+	
+	my $webwork_root = $r->dir_config('authen_webwork_root');
+	my $webwork_course = $r->dir_config('authen_webwork_course');
+	
+	return fail($r, "authen_webwork_root not set")
+		unless defined $webwork_root and $webwork_root ne "";
+	return fail($r, "authen_webwork_course not set")
+		unless defined $webwork_course and $webwork_course ne "";
+	
+	# FIXME most of this build-up code is yoinked from lib/WeBWorK.pm
+	# needs to be factored out somehow
+	# (for example, the authen module selection code probably belongs in a factory)
+	
+	my $ce = eval { new WeBWorK::CourseEnvironment({
+		webwork_dir => $webwork_root,
+		courseName => $webwork_course,
+	}) };
+	$@ and return fail($r, "failed to initialize the course environment: $@");
+	$r->ce($ce);
+	
+	my $authz = new WeBWorK::Authz($r);
+	$r->authz($authz);
+	
+	# figure out which authentication module to use
+	my $user_authen_module;
+	my $proctor_authen_module;
+	if (ref $ce->{authen}{user_module} eq "HASH") {
+		if (exists $ce->{authen}{user_module}{$ce->{dbLayoutName}}) {
+			$user_authen_module = $ce->{authen}{user_module}{$ce->{dbLayoutName}};
+		} else {
+			$user_authen_module = $ce->{authen}{user_module}{"*"};
+		}
+	} else {
+		$user_authen_module = $ce->{authen}{user_module};
+	}
+	
+	runtime_use $user_authen_module;
+	my $authen = $user_authen_module->new($r);
+	$r->authen($authen);
+	
+	my $db = new WeBWorK::DB($ce->{dbLayout});
+	$r->db($db);
+	
+	# now, here's the problem... WeBWorK::Authen looks at $r->params directly, whereas we
+	# need to look at $user and $sent_pw. this is a perfect opportunity for a mixin, i think.
+	my $authenOK;
+	{
+		no warnings 'redefine';
+		local *WeBWorK::Authen::get_credentials   = \&Authen::WeBWorK::HTTPBasic::get_credentials;
+		local *WeBWorK::Authen::maybe_send_cookie = \&Authen::WeBWorK::HTTPBasic::noop;
+		local *WeBWorK::Authen::maybe_kill_cookie = \&Authen::WeBWorK::HTTPBasic::noop;
+		local *WeBWorK::Authen::set_params        = \&Authen::WeBWorK::HTTPBasic::noop;
+		
+		$authenOK = $authen->verify;
+	}
+	
+	
+	debug("verify said: '$authenOK'");
+	
+	if ($authenOK) {
+		debug("this will work!!!");
+		#return OK;
+		return Apache2::Const::OK;
+	} else {
+		#return AUTH_REQUIRED;
+		return Apache2::Const::HTTP_UNAUTHORIZED;
+	}
+}
+
+sub fail {
+	my ($r, $msg) = @_;
+		$r->note_basic_auth_failure;
+		$r->log_reason($msg, $r->filename);
+		#return AUTH_REQUIRED;
+		return Apache2::Const::HTTP_UNAUTHORIZED;
+}
+
+=back
+
+=cut
+
+package Authen::WeBWorK::HTTPBasic;
+
+use strict;
+use warnings;
+use Apache2::Const -compile => qw(OK DECLINED HTTP_UNAUTHORIZED);
+use Apache2::Access ();
+use Apache2::RequestUtil ();
+#use Apache::Constants qw(:common);
+use WeBWorK::Debug;
+
+sub get_credentials {
+	my ($self) = @_;
+	my $r = $self->{r};
+	
+	my ($res, $sent_pw) = $r->get_basic_auth_pw;
+	#return unless $res == OK;
+	return unless $res == Apache2::Const::OK;
+	my $user_id = $r->user;
+	#my $user_id = $r->connection->user;
+	
+	#if (defined $r->connection->user) {
+	if (defined $r->user) {
+		$self->{user_id} = $r->user;
+		$self->{password} = $sent_pw;
+		$self->{credential_source} = "http_basic";
+		return 1;
+	}
+}
+
+sub noop {}
+
+1;
diff --git a/lib/Apache/WeBWorK.pm b/lib/Apache/WeBWorK.pm
index 31d9252b73..77b176c007 100644
--- a/lib/Apache/WeBWorK.pm
+++ b/lib/Apache/WeBWorK.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
 # $CVSHeader$
 # 
 # This program is free software; you can redistribute it and/or modify it under
@@ -15,146 +15,209 @@
 ################################################################################
 
 package Apache::WeBWorK;
-#use base qw(DB);
 
 =head1 NAME
 
-Apache::WeBWorK - mod_perl handler for WeBWorK.
+Apache::WeBWorK - mod_perl handler for WeBWorK 2.
 
 =head1 CONFIGURATION
 
 This module should be installed as a Handler for the location selected for
-WeBWorK on your webserver. Here is an example of a stanza that can be added to
-your httpd.conf file to achieve this:
-
- <IfModule mod_perl.c>
- 	PerlFreshRestart On
- 	<Location /webwork2>
- 		SetHandler perl-script
- 		PerlHandler Apache::WeBWorK
- 	
- 		PerlSetVar webwork_root WEBWORK_DIR/webwork-modperl
- 		PerlSetVar pg_root /WEBWORK_DIR/pg
- 		
- 		<Perl>
- 			use lib 'WEBWORK_DIR/webwork-modperl/lib';
- 			use lib 'WEBWORK_DIR/pg/lib';
- 		</Perl>
- 	</Location>
- </IfModule>
+WeBWorK on your webserver. Refer to the file F<conf/webwork.apache-config> for
+details.
 
 =cut
 
 use strict;
 use warnings;
+use HTML::Entities;
+use Date::Format;
 use WeBWorK;
 
+use mod_perl;
+use constant MP2 => ( exists $ENV{MOD_PERL_API_VERSION} and $ENV{MOD_PERL_API_VERSION} >= 2 );
+
+# load correct modules
+BEGIN {
+	if (MP2) {
+		require Apache2::Log;
+		Apache2::Log->import;
+	} else {
+		require Apache::Log;
+		Apache::Log->import;
+	}
+}
+
+################################################################################
+
+=head1 APACHE REQUEST HANDLER
+
+=over
+
+=item handler($r)
+
+=cut
+
 sub handler($) {
 	my ($r) = @_;
+	my $log = $r->log;
+	my $uri = $r->uri;
 	
-	my $result;
-	{ # limit the scope of signal localization
-		# the __WARN__ handler stores warnings for later retrieval
-		local $SIG{__WARN__} = sub {
+	# the warning handler accumulates warnings in $r->notes("warnings") for
+	# later cumulative reporting
+	my $warning_handler;
+	if (MP2) {
+		$warning_handler = sub {
+			my ($warning) = @_;
+			chomp $warning;
+			
+			my $warnings = $r->notes->get("warnings");
+			$warnings .= "$warning\n";
+			#my $backtrace = join("\n",backtrace());
+			#$warnings .= "$backtrace\n\n";
+			$r->notes->set(warnings => $warnings);
+			
+			$log->warn("[$uri] $warning");
+		};
+	} else {
+		$warning_handler = sub {
 			my ($warning) = @_;
+			chomp $warning;
+			
 			my $warnings = $r->notes("warnings");
 			$warnings .= "$warning\n";
+			#my $backtrace = join("\n",backtrace());
+			#$warnings .= "$backtrace\n\n";
 			$r->notes("warnings" => $warnings);
-			warn $warning; # send it to the log
+			
+			$log->warn("[$uri] $warning");
 		};
 		
-		# the __DIE__ handler stores the call stack at the time of an error
-		local $SIG{__DIE__} = sub {
-			my ($error) = @_;
-			# Traces are still causing problems
-			#my $trace = join "\n", Apache::WeBWorK->backtrace();
-			#$r->notes("lastCallStack" => $trace);
-			die $error;
+		# the exception handler generates a backtrace when catching an exception
+		my @backtrace;
+		my $exception_handler = sub {
+			@backtrace = backtrace();
+			die @_;
 		};
-		
-		$result = eval { WeBWorK::dispatch($r) };
 	}
 	
+	# the exception handler generates a backtrace when catching an exception
+	my @backtrace;
+	my $exception_handler = sub {
+		@backtrace = backtrace();
+		die @_;
+	};
+	
+	my $result = do {
+		local $SIG{__WARN__} = $warning_handler;
+		local $SIG{__DIE__} = $exception_handler;
+		
+		eval { WeBWorK::dispatch($r) };
+	};
+	
 	if ($@) {
-		print STDERR "uncaught exception in Apache::WeBWorK::handler: $@";
-		my $message = message($r, $@);
+		my $exception = $@;
+		
+		my $warnings = MP2 ? $r->notes->get("warnings") : $r->notes("warnings");
+		my $htmlMessage = htmlMessage($r, $warnings, $exception, @backtrace);
 		unless ($r->bytes_sent) {
 			$r->content_type("text/html");
-			$r->send_http_header;
-			$message = "<html><body>$message</body></html>";
+			$r->send_http_header unless MP2; # not needed for Apache2
+			$htmlMessage = "<html><body>$htmlMessage</body></html>";
 		}
-		$r->print($message);
-		$r->exit;
+		print $htmlMessage;
+		
+		# log the error to the apache error log
+		my $textMessage = textMessage($r, $warnings, $exception, @backtrace);
+		$log->error($textMessage);
 	}
 	
 	return $result;
 }
 
-sub htmlBacktrace(@) {
-	foreach (@_) {
-		s/\</&lt;/g;
-		s/\>/&gt;/g;
-		$_ = "<li><tt>$_</tt></li>";
-	}
-	return join "\n", @_;
-}
+=back
 
-sub htmlWarningsList(@) {
-	foreach (@_) {
-		next unless m/\S/;
-		s/\</&lt;/g;
-		s/\>/&gt;/g;
-		$_ = "<li><tt>$_</tt></li>";
+=cut
+
+################################################################################
+
+=head1 ERROR HANDLING ROUTINES
+
+=over
+
+=item backtrace()
+
+Produce a stack-frame traceback for the calls up through the ones in
+Apache::WeBWorK.
+
+=cut
+
+sub backtrace {
+	my $frame = 2;
+	my @trace;
+	
+	while (my ($pkg, $file, $line, $subname) = caller($frame++)) {
+		last if $pkg eq "Apache::WeBWorK";
+		push @trace, "in $subname called at line $line of $file";
 	}
-	return join "\n", @_;
+	
+	return @trace;
 }
 
-sub htmlEscape($) {
-	$_[0] =~ s/\</&lt;/g;
-	$_[0] =~ s/\>/&gt;/g;
-	return $_[0];
-}
+=back
+
+=cut
+
+################################################################################
+
+=head1 ERROR OUTPUT FUNCTIONS
 
-sub message($$) {
-	my ($r, $exception) = @_;
+=over
+
+=item htmlMessage($r, $warnings, $exception, @backtrace)
+
+Format a message for HTML output reporting an exception, backtrace, and any
+associated warnings.
+
+=cut
+
+sub htmlMessage($$$@) {
+	my ($r, $warnings, $exception, @backtrace) = @_;
 	
+	$warnings = htmlEscape($warnings);
 	$exception = htmlEscape($exception);
+	
+	my @warnings = defined $warnings ? split m|&lt;br /&gt;|, $warnings : ();  #fragile
+	$warnings = htmlWarningsList(@warnings);
+	my $backtrace = htmlBacktrace(@backtrace);
+	
 	my $admin = ($ENV{SERVER_ADMIN}
-		? "(<a href=\"mailto:$ENV{SERVER_ADMIN}\">$ENV{SERVER_ADMIN}</a>)"
+		? " (<a href=\"mailto:$ENV{SERVER_ADMIN}\">$ENV{SERVER_ADMIN}</a>)"
 		: "");
-	my $context = $r->notes("lastCallStack")
-		? htmlBacktrace(split m/\n/, $r->notes("lastCallStack"))
-		: "";
-	my $warnings = $r->notes("warnings")
-		? htmlWarningsList(split m/\n/, $r->notes("warnings"))
-		: "";
-	my $method = $r->method;
-	my $uri = $r->uri;
+	my $time = time2str("%a %b %d %H:%M:%S %Y", time);
+	my $method = htmlEscape( $r->method  );
+	my $uri = htmlEscape(  $r->uri );
 	my $headers = do {
-		my %headers = $r->headers_in;
-		join("", map { "<tr><td><small>$_</small></td><td><small>$headers{$_}</small></td></tr>" } keys %headers);
+		my %headers = MP2 ? %{$r->headers_in} : $r->headers_in;
+		join("", map { "<tr><td><small>" . htmlEscape($_). "</small></td><td><small>" .
+		                htmlEscape($headers{$_}) . " </small></td></tr>" } keys %headers);
 	};
 	
 	return <<EOF;
-<div align="left">
- <h1>Software Error</h1>
- <p>An error has occured while trying to process your request. For help, please
- send mail to this site's webmaster $admin giving the following information
- about the error and the date and time that the error occured. Some hints:</p>
- <ul>
-  <li>An error about an <tt>undefined value</tt> often means that you asked for
-  an object (like a user, problem set, or problem) that does not exist, and the
-  we (the programmers) were negligent in checking for that.</li>
-  <li>An error about <tt>permission denied</tt> might suggest that the web
-  server does not have permission to read or write a file or directory.</li>
- </ul>
- <h2>Error message</h2>
- <p><tt>$exception</tt></p>
- <h2>Call stack</h2>
- <ul>$context</ul>
- <h2>Warnings</h2>
+<div style="text-align:left">
+ <h2>WeBWorK error</h2>
+ <p>An error occured while processing your request. For help, please send mail
+ to this site's webmaster$admin, including all of the following information as
+ well as what what you were doing when the error occured.</p>
+ <p>$time</p>
+ <h3>Warning messages</h3>
  <ul>$warnings</ul>
- <h2>Request information</h2>
+ <h3>Error messages</h3>
+ <blockquote style="color:red"><code>$exception</code></blockquote>
+ <h3>Call stack</h3>
+   <p>The information below can help locate the source of the problem.</p>
+   <ul>$backtrace</ul>
+ <h3>Request information</h3>
  <table border="1">
   <tr><td>Method</td><td>$method</td></tr>
   <tr><td>URI</td><td>$uri</td></tr>
@@ -168,4 +231,99 @@ sub message($$) {
 EOF
 }
 
+=item textMessage($r, $warnings, $exception, @backtrace)
+
+Format a message for HTML output reporting an exception, backtrace, and any
+associated warnings.
+
+=cut
+
+sub textMessage($$$@) {
+	my ($r, $warnings, $exception, @backtrace) = @_;
+	
+	#my @warnings = defined $warnings ? split m/\n+/, $warnings : ();
+	#$warnings = textWarningsList(@warnings);
+	chomp $exception;
+	my $backtrace = textBacktrace(@backtrace);
+	my $uri = $r->uri;
+	
+	return "[$uri] $exception\n$backtrace";
+}
+
+=item htmlBacktrace(@frames)
+
+Formats a list of stack frames in a backtrace as list items for HTML output.
+
+=cut
+
+sub htmlBacktrace(@) {
+	my (@frames) = @_;
+	foreach my $frame (@frames) {
+		$frame = htmlEscape($frame);
+		$frame = "<li><code>$frame</code></li>";
+	}
+	return join "\n", @frames;
+}
+
+=item textBacktrace(@frames)
+
+Formats a list of stack frames in a backtrace as list items for text output.
+
+=cut
+
+sub textBacktrace(@) {
+	my (@frames) = @_;
+	foreach my $frame (@frames) {
+		$frame = " * $frame";
+	}
+	return join "\n", @frames;
+}
+
+=item htmlWarningsList(@warnings)
+
+Formats a list of warning strings as list items for HTML output.
+
+=cut
+
+sub htmlWarningsList(@) {
+	my (@warnings) = @_;
+	foreach my $warning (@warnings) {
+		$warning = htmlEscape($warning);
+		$warning = "<li><code>$warning</code></li>";
+	}
+	return join "\n", @warnings;
+}
+
+=item textWarningsList(@warnings)
+
+Formats a list of warning strings as list items for text output.
+
+=cut
+
+sub textWarningsList(@) {
+	my (@warnings) = @_;
+	foreach my $warning (@warnings) {
+		$warning = " * $warning";
+	}
+	return join "\n", @warnings;
+}
+
+=item htmlEscape($string)
+
+Protect characters that would be interpreted as HTML entities. Then, replace
+line breaks with HTML "<br />" tags.
+
+=cut
+
+sub htmlEscape($) {
+	my ($string) = @_;
+	$string = encode_entities($string);
+	$string =~ s|\n|<br />|g;
+	return $string;
+}
+
+=back
+
+=cut
+
 1;
diff --git a/lib/MySOAP.pm b/lib/MySOAP.pm
new file mode 100644
index 0000000000..0fd13573ae
--- /dev/null
+++ b/lib/MySOAP.pm
@@ -0,0 +1,73 @@
+package MySOAP;
+
+use constant DEBUG =>0;
+
+  use Apache::Request;
+  use Apache::Constants qw(:common);
+  use Apache::File ();
+  use SOAP::Transport::HTTP;
+
+  my $server = SOAP::Transport::HTTP::Apache
+    -> dispatch_to('RQP');
+
+  sub handler { 
+    my $save = $_[0];
+    my $r = Apache::Request->instance($_[0]);
+    
+    my $header = $r->as_string;
+    my $args = $r->args;
+    my $content = $r->content;
+    my $body="";
+    # this will read everything, but then it won't be available for SOAP
+    my $r2 = Apache::Request->instance($save) if DEBUG;
+    $r2->read($body, $r2->header_in('Content-length')) if DEBUG;
+    #
+    local(*DEBUGLOG);
+    open DEBUGLOG, ">>/home/gage/debug_info.txt" || die "can't open debug file";
+    
+    
+    
+    
+    ################
+    # Handle a wsdl rquest
+    ################
+    my %args_hash = $r->args;
+   if (exists $args_hash{wsdl}) {
+    	$r->print( $wsdl);
+    	print DEBUGLOG "----------start-------------\n";
+    	print DEBUGLOG "handle wsdl request\n";
+    	print DEBUGLOG "\n-header =\n $header\n" ;
+    	
+    	
+    	my $wsdl = `cat /home/gage/rqp.wsdl`;
+    	$r->content_type('application/wsdl+xml');
+    	$r->send_http_header;
+    	$r->print( $wsdl);
+ 
+    	
+    	print DEBUGLOG "---end--- \n";
+    	close(DEBUGLOG);
+    	return OK;
+    ###############
+    # Handle SOAP request
+    ###############  	
+    } else {
+		print DEBUGLOG "----------start-------------\n";
+		print DEBUGLOG "handle soap request\n";
+		print DEBUGLOG "\n-header =\n $header\n" ; #if DEBUG;
+		print DEBUGLOG "args=  $args\n";
+		print DEBUGLOG "\nbody= $body\n" if DEBUG;
+		
+		$server->handler(@_);
+		
+		print DEBUGLOG "---end--- \n";
+		close(DEBUGLOG);
+
+    }
+    
+    
+
+
+  };
+
+1;
diff --git a/lib/RQP.pm b/lib/RQP.pm
new file mode 100644
index 0000000000..cc1bc98021
--- /dev/null
+++ b/lib/RQP.pm
@@ -0,0 +1,130 @@
+#!/usr/local/bin/perl   -w
+
+
+use SOAP::Lite +trace; 
+#+trace =>
+#[parameters,trace=>sub{ local($|=1); print LOG "start>>", 
+#WebworkWebservice::pretty_print_rh(\@_ ),"<<stop\n\n"; }];
+
+
+
+use WebworkWebservice;
+package RQP;
+@ISA =   (SOAP::Server::Parameters);
+local(*MYLOG);
+
+use WeBWorK::Utils::Tasks qw(fake_set fake_problem);
+use RQP::Render;
+
+our $WW_DIRECTORY = $WebworkWebservice::WW_DIRECTORY;
+our $PG_DIRECTORY = $WebworkWebservice::PG_DIRECTORY;
+our $COURSENAME   = $WebworkWebservice::COURSENAME;
+our $HOST_NAME    = $WebworkWebservice::HOST_NAME;
+our $HOSTURL      ="http://$HOST_NAME:8002"; #FIXME
+our $ce           =$WebworkWebservice::SeedCE;
+# create a local course environment for some course
+    $ce           = WeBWorK::CourseEnvironment->new($WW_DIRECTORY, "", "", $COURSENAME);
+#print "\$ce = \n", WeBWorK::Utils::pretty_print_rh($ce);
+our $db = WeBWorK::DB->new($ce->{dbLayout});
+
+#print MYLOG "restarting server\n\n";
+sub test {
+	open MYLOG, ">>/home/gage/debug_info.txt" ;
+	local($|=1);
+	my $som = pop;
+	my $self = shift;
+	my $rh_parameter = $som->method;
+	#$som->match('/');
+	#print MYLOG "headers\n", WebworkWebservice::pretty_print_rh($rh_parameter),"\n";
+	#warn "parameters ", WebworkWebservice::pretty_print_rh($rh_parameter);
+	#my $params = $som->paramsall();
+	#warn "params ", join(" ", @{$params});
+	print MYLOG "body ", WebworkWebservice::pretty_print_rh($som->body);
+	close(MYLOG);
+	return "test hi bye";
+}
+
+sub RQP_ServerInformation {
+	my $class = shift;
+	my $soap_som = pop;
+	my $rh_params= $soap_som->method;
+	local(*DEBUGLOG);
+    open DEBUGLOG, ">>/home/gage/debug_info.txt" || die "can't open debug file";
+	print DEBUGLOG "--RQP_ServerInformation\n";
+
+	$rh_out = { 'identifier'       => 'http://www.openwebwork.org',
+                 'name'            => 'WeBWorK',
+                 'description'     => 'WeBWorK server.  See http://webwork.math.rochester.edu',
+                 'cloning'         => 0,
+                 'implicitCloning' => 1,
+                 'rendering'       => 1,
+                 'itemFormats'     => ['pg'],
+                 'renderFormats'   => ['xml'],
+                 input            => '<hr>'.WebworkWebservice::pretty_print_rh($rh_params).'<hr>',
+	};
+	return $rh_out;
+}
+
+sub RQP_ItemInformation {
+	my $class = shift;
+	my $soap_som = pop;
+	my $rh_params= $soap_som->method;
+	local(*DEBUGLOG);
+    open DEBUGLOG, ">>/home/gage/debug_info.txt" || die "can't open debug file";
+    print DEBUGLOG "--RQP_ItemInformation\n";
+	my $format = 'HTML';
+	my $sourceErrors = ''; 
+	$rh_out = {
+	    'format'            => $format,
+       'sourceErrors'       => $sourceErrors,
+       'template'           => 1,
+       'adaptive'           => 1,
+       'timeDependent'      => 0,
+       'canComputeScore'   => 1,
+       'solutionAvailable'  => 0,
+       'hintAvailable'      => 0,
+       'validationPossible' => 1,
+       'maxScore'           => 1,
+       'length'             => 1,
+       input                => '<hr>'.WebworkWebservice::pretty_print_rh($rh_params).'<hr>',
+	};
+	close(DEBUGLOG);
+	return $rh_out;
+}
+
+sub RQP_ProcessTemplate {
+
+
+}
+
+sub RQP_Clone  {
+
+}
+sub RQP_SessionInformation {
+	my $class = shift;
+	my $soap_som = pop;
+	my $rh_params= $soap_som->method;
+	local(*DEBUGLOG);
+    open DEBUGLOG, ">>/home/gage/debug_info.txt" || die "can't open debug file";
+	print DEBUGLOG "--RQP_SessionInformation\n";
+	my $templatevars = $rh_params->{templatevars};
+	$templatevars->{seed}=4321;
+	my $correctResponses = [];
+	$rh_out = {
+		'outcomevars'      => {id=>45},
+		'templatevars'     => $templatevars,
+		'correctResponses' => $correctResponses,
+		input              => '<hr>'.WebworkWebservice::pretty_print_rh($rh_params).'<hr>',
+	};
+	close(DEBUGLOG);
+	return $rh_out;
+}
+
+
+sub RQP_Render  {
+	RQP::Render::RQP_Render(@_);
+
+}
+
+
+1;
diff --git a/lib/RQP/Render.pm b/lib/RQP/Render.pm
new file mode 100644
index 0000000000..16b031f8a2
--- /dev/null
+++ b/lib/RQP/Render.pm
@@ -0,0 +1,150 @@
+#!/usr/local/bin/perl   -w
+
+package RQP::Render;
+@ISA = qw( RQP );
+use WebworkWebservice;
+use WeBWorK::Utils::Tasks qw(fake_set fake_problem);
+
+our $WW_DIRECTORY = $WebworkWebservice::WW_DIRECTORY;
+our $PG_DIRECTORY = $WebworkWebservice::PG_DIRECTORY;
+our $COURSENAME   = $WebworkWebservice::COURSENAME;
+our $HOST_NAME    = $WebworkWebservice::HOST_NAME;
+our $HOSTURL      ="http://$HOST_NAME:8002"; #FIXME
+our $ce           =$WebworkWebservice::SeedCE;
+# create a local course environment for some course
+    $ce           = WeBWorK::CourseEnvironment->new($WW_DIRECTORY, "", "", $COURSENAME);
+#print "\$ce = \n", WeBWorK::Utils::pretty_print_rh($ce);
+our $db = WeBWorK::DB->new($ce->{dbLayout});
+
+sub RQP_Render  {
+	my $class = shift;
+	my $soap_som = pop;
+	my $rh_params= $soap_som->method;
+
+	local(*DEBUGLOG);
+    open DEBUGLOG, ">>/home/gage/debug_info.txt" || die "can't open debug file";
+	print DEBUGLOG "--RQP_Render\n";
+	#my $output = WebworkWebservice::pretty_print_rh(\%parameters);
+	my $source = $rh_params->{source};
+	$source =~s/</&lt;/g;
+	$source =~s/>/&gt;/g;
+	my $output = "the first element is ". $self. " and the last ". ref($envelope)."\n\n";
+	$output .= WebworkWebservice::pretty_print_rh($rh_params);
+	
+	my %templatevars = @{$rh_params->{templatevars}};
+	my $templatevars =\%templatevars;
+	print DEBUGLOG "templateVars (", join("|", @{$rh_params->{templateVars}}),")\n";
+
+	#############
+	# Default environment
+	#############
+	my $userName    = "foobar";
+	my $user        = $db->getUser($userName);
+	my $key         = "asdfasdfasdf";
+	
+	my $problemNumber =  (defined($templatevars->{envir}->{probNum})   )    ? $templatevars->{envir}->{probNum}      : 1 ;
+	my $problemSeed   =  (defined($templatevars->{envir}->{problemSeed}))   ? $templatevars->{envir}->{problemSeed}  : 1 ;
+	my $psvn          =  (defined($templatevars->{envir}->{psvn})      )    ? $templatevars->{envir}->{psvn}         : 1234 ;
+	my $problemStatus =  $templatevars->{problem_state}->{recorded_score}|| 0 ;
+	my $problemValue  =  (defined($templatevars->{envir}->{problemValue}))   ? $templatevars->{envir}->{problemValue}  : 1 ;
+	my $num_correct   =  $templatevars->{problem_state}->{num_correct}   || 0 ;
+	my $num_incorrect =  $templatevars->{problem_state}->{num_incorrect} || 0 ;
+	my $problemAttempted = ($num_correct && $num_incorrect);
+	my $lastAnswer    = '';
+	########
+	# set
+	########
+	my $setRecord        = initializeDefaultSet($db);
+	
+	########
+	# problem
+	########
+	my $problemRecord    = initializeDefaultProblem($db);
+
+	
+
+	my $formFields  = {};
+	my $translationOptions = {};
+	my $rh_envir = WeBWorK::PG::defineProblemEnvir(
+		$class,    
+		$ce,
+		$user,
+		$key,
+		$setRecord,
+		$problemRecord,
+		$setRecord->psvn,
+		$formFields,
+		$translationOptions,
+	);
+	
+	$templatevars->{envir} = $rh_envir;
+	#hack -- root is a restricted term
+	$templatevars->{envir}->{__files__} = '';
+	$templatevars->{envir}->{problemSeed}++;
+
+	##############
+	my @templatevars = %$templatevars;
+	my $rh_out = {
+		templateVars     => packRQParray($templatevars),
+		index            => 'index',
+		advanceState     => 0,
+		embedPrefix      => 'AnSwErAnSwEr',
+		appletBase       => 'unknown',
+		mediaBase        => 'unknown url',
+		renderFormat     => 'HTML',
+		modalFormat      => 'dvipng',
+		persistentData   => 'this is a string',
+		outcomeVars      => [{identifier=>'id',values=>345}],
+		output           => packRQParray($output),
+		source           => $source,
+		input            => '<hr>'.WebworkWebservice::pretty_print_rh($rh_params).'<hr>',
+	
+	};
+	print DEBUGLOG $output;
+	close(DEBUGLOG);
+	return $rh_out;
+
+}
+sub packRQParray {
+	my $rh_hash=shift;
+	my @array = ();
+	foreach $key (keys %{$rh_hash}) {
+		push @array, {identifier => $key, values => $rh_hash->{$key}};
+	}
+	\@array;
+}
+sub initializeDefaultSet {
+	my $db = shift;
+
+	my $setName       = 'set0';
+	my $setRecord   = fake_set($db);
+	$setRecord->set_id($setName);
+	$setRecord->set_header("defaultHeader");
+	$setRecord->hardcopy_header("defaultHeader");
+	$setRecord->open_date(time()-60*60*24*7); #  one week ago
+	$setRecord->due_date(time()+60*60*24*7*2); # in two weeks
+	$setRecord->answer_date(time()+60*60*24*7*3); # in three weeks
+	$setRecord->psvn(0);
+	$setRecord;
+}
+
+sub initializeDefaultProblem {
+		my $db                = shift;
+		my $userName             = 'foobar';
+		my $problemNumber        = 0;
+		my $setName              = 'set0';
+		my $problemRecord        = fake_problem($db);
+		$problemRecord->user_id($userName);
+		$problemRecord->problem_id(0);
+		$problemRecord->set_id($setName);
+		$problemRecord->problem_seed(0);
+		$problemRecord->status(0);
+		$problemRecord->value(1);
+		$problemRecord->attempted(0);
+		$problemRecord->last_answer('');
+		$problemRecord->num_correct(0);
+		$problemRecord->num_incorrect(0);
+		$problemRecord;
+
+}
+1;
\ No newline at end of file
diff --git a/lib/WWSafe.pm b/lib/WWSafe.pm
new file mode 100644
index 0000000000..24b4c97f0e
--- /dev/null
+++ b/lib/WWSafe.pm
@@ -0,0 +1,627 @@
+package WWSafe;
+
+use 5.003_11;
+use strict;
+
+$Safe::VERSION = "2.16";
+
+# *** Don't declare any lexicals above this point ***
+#
+# This function should return a closure which contains an eval that can't
+# see any lexicals in scope (apart from __ExPr__ which is unavoidable)
+
+sub lexless_anon_sub {
+		 # $_[0] is package;
+		 # $_[1] is strict flag;
+    my $__ExPr__ = $_[2];   # must be a lexical to create the closure that
+			    # can be used to pass the value into the safe
+			    # world
+
+    # Create anon sub ref in root of compartment.
+    # Uses a closure (on $__ExPr__) to pass in the code to be executed.
+    # (eval on one line to keep line numbers as expected by caller)
+    eval sprintf
+    'package %s; %s strict; sub { @_=(); eval q[my $__ExPr__;] . $__ExPr__; }',
+		$_[0], $_[1] ? 'use' : 'no';
+}
+
+use Carp;
+BEGIN { eval q{
+    use Carp::Heavy;
+} }
+
+use Opcode 1.01, qw(
+    opset opset_to_ops opmask_add
+    empty_opset full_opset invert_opset verify_opset
+    opdesc opcodes opmask define_optag opset_to_hex
+);
+
+*ops_to_opset = \&opset;   # Temporary alias for old Penguins
+
+
+my $default_root  = 0;
+# share *_ and functions defined in universal.c
+# Don't share stuff like *UNIVERSAL:: otherwise code from the
+# compartment can 0wn functions in UNIVERSAL
+my $default_share = [qw[
+    *_
+    &PerlIO::get_layers
+    &UNIVERSAL::isa
+    &UNIVERSAL::can
+    &UNIVERSAL::VERSION
+    &utf8::is_utf8
+    &utf8::valid
+    &utf8::encode
+    &utf8::decode
+    &utf8::upgrade
+    &utf8::downgrade
+    &utf8::native_to_unicode
+    &utf8::unicode_to_native
+], ($] >= 5.008001 && qw[
+    &Regexp::DESTROY
+]), ($] >= 5.010 && qw[
+    &re::is_regexp
+    &re::regname
+    &re::regnames
+    &re::regnames_count
+    &Tie::Hash::NamedCapture::FETCH
+    &Tie::Hash::NamedCapture::STORE
+    &Tie::Hash::NamedCapture::DELETE
+    &Tie::Hash::NamedCapture::CLEAR
+    &Tie::Hash::NamedCapture::EXISTS
+    &Tie::Hash::NamedCapture::FIRSTKEY
+    &Tie::Hash::NamedCapture::NEXTKEY
+    &Tie::Hash::NamedCapture::SCALAR
+    &Tie::Hash::NamedCapture::flags
+    &UNIVERSAL::DOES
+    &version::()
+    &version::new
+    &version::(""
+    &version::stringify
+    &version::(0+
+    &version::numify
+    &version::normal
+    &version::(cmp
+    &version::(<=>
+    &version::vcmp
+    &version::(bool
+    &version::boolean
+    &version::(nomethod
+    &version::noop
+    &version::is_alpha
+    &version::qv
+]), ($] >= 5.011 && qw[
+    &re::regexp_pattern
+])];
+
+sub new {
+    my($class, $root, $mask) = @_;
+    my $obj = {};
+    bless $obj, $class;
+
+    if (defined($root)) {
+	croak "Can't use \"$root\" as root name"
+	    if $root =~ /^main\b/ or $root !~ /^\w[:\w]*$/;
+	$obj->{Root}  = $root;
+	$obj->{Erase} = 0;
+    }
+    else {
+	$obj->{Root}  = "Safe::Root".$default_root++;
+	$obj->{Erase} = 1;
+    }
+
+    # use permit/deny methods instead till interface issues resolved
+    # XXX perhaps new Safe 'Root', mask => $mask, foo => bar, ...;
+    croak "Mask parameter to new no longer supported" if defined $mask;
+    $obj->permit_only(':default');
+
+    # We must share $_ and @_ with the compartment or else ops such
+    # as split, length and so on won't default to $_ properly, nor
+    # will passing argument to subroutines work (via @_). In fact,
+    # for reasons I don't completely understand, we need to share
+    # the whole glob *_ rather than $_ and @_ separately, otherwise
+    # @_ in non default packages within the compartment don't work.
+    $obj->share_from('main', $default_share);
+    Opcode::_safe_pkg_prep($obj->{Root}) if($Opcode::VERSION > 1.04);
+    return $obj;
+}
+
+sub DESTROY {
+    my $obj = shift;
+    $obj->erase('DESTROY') if $obj->{Erase};
+}
+
+sub erase {
+    my ($obj, $action) = @_;
+    my $pkg = $obj->root();
+    my ($stem, $leaf);
+
+    no strict 'refs';
+    $pkg = "main::$pkg\::";	# expand to full symbol table name
+    ($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
+
+    # The 'my $foo' is needed! Without it you get an
+    # 'Attempt to free unreferenced scalar' warning!
+    my $stem_symtab = *{$stem}{HASH};
+
+    #warn "erase($pkg) stem=$stem, leaf=$leaf";
+    #warn " stem_symtab hash ".scalar(%$stem_symtab)."\n";
+	# ", join(', ', %$stem_symtab),"\n";
+
+#    delete $stem_symtab->{$leaf};
+
+    my $leaf_glob   = $stem_symtab->{$leaf};
+    my $leaf_symtab = *{$leaf_glob}{HASH};
+#    warn " leaf_symtab ", join(', ', %$leaf_symtab),"\n";
+    %$leaf_symtab = ();
+    #delete $leaf_symtab->{'__ANON__'};
+    #delete $leaf_symtab->{'foo'};
+    #delete $leaf_symtab->{'main::'};
+#    my $foo = undef ${"$stem\::"}{"$leaf\::"};
+
+    if ($action and $action eq 'DESTROY') {
+        delete $stem_symtab->{$leaf};
+    } else {
+        $obj->share_from('main', $default_share);
+    }
+    1;
+}
+
+
+sub reinit {
+    my $obj= shift;
+    $obj->erase;
+    $obj->share_redo;
+}
+
+sub root {
+    my $obj = shift;
+    croak("Safe root method now read-only") if @_;
+    return $obj->{Root};
+}
+
+
+sub mask {
+    my $obj = shift;
+    return $obj->{Mask} unless @_;
+    $obj->deny_only(@_);
+}
+
+# v1 compatibility methods
+sub trap   { shift->deny(@_)   }
+sub untrap { shift->permit(@_) }
+
+sub deny {
+    my $obj = shift;
+    $obj->{Mask} |= opset(@_);
+}
+sub deny_only {
+    my $obj = shift;
+    $obj->{Mask} = opset(@_);
+}
+
+sub permit {
+    my $obj = shift;
+    # XXX needs testing
+    $obj->{Mask} &= invert_opset opset(@_);
+}
+sub permit_only {
+    my $obj = shift;
+    $obj->{Mask} = invert_opset opset(@_);
+}
+
+
+sub dump_mask {
+    my $obj = shift;
+    print opset_to_hex($obj->{Mask}),"\n";
+}
+
+
+
+sub share {
+    my($obj, @vars) = @_;
+    $obj->share_from(scalar(caller), \@vars);
+}
+
+sub share_from {
+    my $obj = shift;
+    my $pkg = shift;
+    my $vars = shift;
+    my $no_record = shift || 0;
+    my $root = $obj->root();
+    croak("vars not an array ref") unless ref $vars eq 'ARRAY';
+    no strict 'refs';
+    # Check that 'from' package actually exists
+    croak("Package \"$pkg\" does not exist")
+	unless keys %{"$pkg\::"};
+    my $arg;
+    foreach $arg (@$vars) {
+	# catch some $safe->share($var) errors:
+	my ($var, $type);
+	$type = $1 if ($var = $arg) =~ s/^(\W)//;
+	# warn "share_from $pkg $type $var";
+	*{$root."::$var"} = (!$type)       ? \&{$pkg."::$var"}
+			  : ($type eq '&') ? \&{$pkg."::$var"}
+			  : ($type eq '$') ? \${$pkg."::$var"}
+			  : ($type eq '@') ? \@{$pkg."::$var"}
+			  : ($type eq '%') ? \%{$pkg."::$var"}
+			  : ($type eq '*') ?  *{$pkg."::$var"}
+			  : croak(qq(Can't share "$type$var" of unknown type));
+    }
+    $obj->share_record($pkg, $vars) unless $no_record or !$vars;
+}
+
+sub share_record {
+    my $obj = shift;
+    my $pkg = shift;
+    my $vars = shift;
+    my $shares = \%{$obj->{Shares} ||= {}};
+    # Record shares using keys of $obj->{Shares}. See reinit.
+    @{$shares}{@$vars} = ($pkg) x @$vars if @$vars;
+}
+sub share_redo {
+    my $obj = shift;
+    my $shares = \%{$obj->{Shares} ||= {}};
+    my($var, $pkg);
+    while(($var, $pkg) = each %$shares) {
+	# warn "share_redo $pkg\:: $var";
+	$obj->share_from($pkg,  [ $var ], 1);
+    }
+}
+sub share_forget {
+    delete shift->{Shares};
+}
+
+sub varglob {
+    my ($obj, $var) = @_;
+    no strict 'refs';
+    return *{$obj->root()."::$var"};
+}
+
+
+sub reval {
+    my ($obj, $expr, $strict) = @_;
+    my $root = $obj->{Root};
+
+    my $evalsub = lexless_anon_sub($root,$strict, $expr);
+    return Opcode::_safe_call_sv($root, $obj->{Mask}, $evalsub);
+}
+
+sub rdo {
+    my ($obj, $file) = @_;
+    my $root = $obj->{Root};
+
+    my $evalsub = eval
+	    sprintf('package %s; sub { @_ = (); do $file }', $root);
+    return Opcode::_safe_call_sv($root, $obj->{Mask}, $evalsub);
+}
+
+
+1;
+
+__END__
+
+=head1 NAME
+
+Safe - Compile and execute code in restricted compartments
+
+=head1 SYNOPSIS
+
+  use WWSafe;
+
+  $compartment = new Safe;
+
+  $compartment->permit(qw(time sort :browse));
+
+  $result = $compartment->reval($unsafe_code);
+
+=head1 DESCRIPTION
+
+The Safe extension module allows the creation of compartments
+in which perl code can be evaluated. Each compartment has
+
+=over 8
+
+=item a new namespace
+
+The "root" of the namespace (i.e. "main::") is changed to a
+different package and code evaluated in the compartment cannot
+refer to variables outside this namespace, even with run-time
+glob lookups and other tricks.
+
+Code which is compiled outside the compartment can choose to place
+variables into (or I<share> variables with) the compartment's namespace
+and only that data will be visible to code evaluated in the
+compartment.
+
+By default, the only variables shared with compartments are the
+"underscore" variables $_ and @_ (and, technically, the less frequently
+used %_, the _ filehandle and so on). This is because otherwise perl
+operators which default to $_ will not work and neither will the
+assignment of arguments to @_ on subroutine entry.
+
+=item an operator mask
+
+Each compartment has an associated "operator mask". Recall that
+perl code is compiled into an internal format before execution.
+Evaluating perl code (e.g. via "eval" or "do 'file'") causes
+the code to be compiled into an internal format and then,
+provided there was no error in the compilation, executed.
+Code evaluated in a compartment compiles subject to the
+compartment's operator mask. Attempting to evaluate code in a
+compartment which contains a masked operator will cause the
+compilation to fail with an error. The code will not be executed.
+
+The default operator mask for a newly created compartment is
+the ':default' optag.
+
+It is important that you read the L<Opcode> module documentation
+for more information, especially for detailed definitions of opnames,
+optags and opsets.
+
+Since it is only at the compilation stage that the operator mask
+applies, controlled access to potentially unsafe operations can
+be achieved by having a handle to a wrapper subroutine (written
+outside the compartment) placed into the compartment. For example,
+
+    $cpt = new Safe;
+    sub wrapper {
+        # vet arguments and perform potentially unsafe operations
+    }
+    $cpt->share('&wrapper');
+
+=back
+
+
+=head1 WARNING
+
+The authors make B<no warranty>, implied or otherwise, about the
+suitability of this software for safety or security purposes.
+
+The authors shall not in any case be liable for special, incidental,
+consequential, indirect or other similar damages arising from the use
+of this software.
+
+Your mileage will vary. If in any doubt B<do not use it>.
+
+
+=head2 RECENT CHANGES
+
+The interface to the Safe module has changed quite dramatically since
+version 1 (as supplied with Perl5.002). Study these pages carefully if
+you have code written to use Safe version 1 because you will need to
+makes changes.
+
+
+=head2 Methods in class Safe
+
+To create a new compartment, use
+
+    $cpt = new Safe;
+
+Optional argument is (NAMESPACE), where NAMESPACE is the root namespace
+to use for the compartment (defaults to "Safe::Root0", incremented for
+each new compartment).
+
+Note that version 1.00 of the Safe module supported a second optional
+parameter, MASK.  That functionality has been withdrawn pending deeper
+consideration. Use the permit and deny methods described below.
+
+The following methods can then be used on the compartment
+object returned by the above constructor. The object argument
+is implicit in each case.
+
+
+=over 8
+
+=item permit (OP, ...)
+
+Permit the listed operators to be used when compiling code in the
+compartment (in I<addition> to any operators already permitted).
+
+You can list opcodes by names, or use a tag name; see
+L<Opcode/"Predefined Opcode Tags">.
+
+=item permit_only (OP, ...)
+
+Permit I<only> the listed operators to be used when compiling code in
+the compartment (I<no> other operators are permitted).
+
+=item deny (OP, ...)
+
+Deny the listed operators from being used when compiling code in the
+compartment (other operators may still be permitted).
+
+=item deny_only (OP, ...)
+
+Deny I<only> the listed operators from being used when compiling code
+in the compartment (I<all> other operators will be permitted).
+
+=item trap (OP, ...)
+
+=item untrap (OP, ...)
+
+The trap and untrap methods are synonyms for deny and permit
+respectfully.
+
+=item share (NAME, ...)
+
+This shares the variable(s) in the argument list with the compartment.
+This is almost identical to exporting variables using the L<Exporter>
+module.
+
+Each NAME must be the B<name> of a non-lexical variable, typically
+with the leading type identifier included. A bareword is treated as a
+function name.
+
+Examples of legal names are '$foo' for a scalar, '@foo' for an
+array, '%foo' for a hash, '&foo' or 'foo' for a subroutine and '*foo'
+for a glob (i.e.  all symbol table entries associated with "foo",
+including scalar, array, hash, sub and filehandle).
+
+Each NAME is assumed to be in the calling package. See share_from
+for an alternative method (which share uses).
+
+=item share_from (PACKAGE, ARRAYREF)
+
+This method is similar to share() but allows you to explicitly name the
+package that symbols should be shared from. The symbol names (including
+type characters) are supplied as an array reference.
+
+    $safe->share_from('main', [ '$foo', '%bar', 'func' ]);
+
+
+=item varglob (VARNAME)
+
+This returns a glob reference for the symbol table entry of VARNAME in
+the package of the compartment. VARNAME must be the B<name> of a
+variable without any leading type marker. For example,
+
+    $cpt = new Safe 'Root';
+    $Root::foo = "Hello world";
+    # Equivalent version which doesn't need to know $cpt's package name:
+    ${$cpt->varglob('foo')} = "Hello world";
+
+
+=item reval (STRING)
+
+This evaluates STRING as perl code inside the compartment.
+
+The code can only see the compartment's namespace (as returned by the
+B<root> method). The compartment's root package appears to be the
+C<main::> package to the code inside the compartment.
+
+Any attempt by the code in STRING to use an operator which is not permitted
+by the compartment will cause an error (at run-time of the main program
+but at compile-time for the code in STRING).  The error is of the form
+"'%s' trapped by operation mask...".
+
+If an operation is trapped in this way, then the code in STRING will
+not be executed. If such a trapped operation occurs or any other
+compile-time or return error, then $@ is set to the error message, just
+as with an eval().
+
+If there is no error, then the method returns the value of the last
+expression evaluated, or a return statement may be used, just as with
+subroutines and B<eval()>. The context (list or scalar) is determined
+by the caller as usual.
+
+This behaviour differs from the beta distribution of the Safe extension
+where earlier versions of perl made it hard to mimic the return
+behaviour of the eval() command and the context was always scalar.
+
+Some points to note:
+
+If the entereval op is permitted then the code can use eval "..." to
+'hide' code which might use denied ops. This is not a major problem
+since when the code tries to execute the eval it will fail because the
+opmask is still in effect. However this technique would allow clever,
+and possibly harmful, code to 'probe' the boundaries of what is
+possible.
+
+Any string eval which is executed by code executing in a compartment,
+or by code called from code executing in a compartment, will be eval'd
+in the namespace of the compartment. This is potentially a serious
+problem.
+
+Consider a function foo() in package pkg compiled outside a compartment
+but shared with it. Assume the compartment has a root package called
+'Root'. If foo() contains an eval statement like eval '$foo = 1' then,
+normally, $pkg::foo will be set to 1.  If foo() is called from the
+compartment (by whatever means) then instead of setting $pkg::foo, the
+eval will actually set $Root::pkg::foo.
+
+This can easily be demonstrated by using a module, such as the Socket
+module, which uses eval "..." as part of an AUTOLOAD function. You can
+'use' the module outside the compartment and share an (autoloaded)
+function with the compartment. If an autoload is triggered by code in
+the compartment, or by any code anywhere that is called by any means
+from the compartment, then the eval in the Socket module's AUTOLOAD
+function happens in the namespace of the compartment. Any variables
+created or used by the eval'd code are now under the control of
+the code in the compartment.
+
+A similar effect applies to I<all> runtime symbol lookups in code
+called from a compartment but not compiled within it.
+
+
+
+=item rdo (FILENAME)
+
+This evaluates the contents of file FILENAME inside the compartment.
+See above documentation on the B<reval> method for further details.
+
+=item root (NAMESPACE)
+
+This method returns the name of the package that is the root of the
+compartment's namespace.
+
+Note that this behaviour differs from version 1.00 of the Safe module
+where the root module could be used to change the namespace. That
+functionality has been withdrawn pending deeper consideration.
+
+=item mask (MASK)
+
+This is a get-or-set method for the compartment's operator mask.
+
+With no MASK argument present, it returns the current operator mask of
+the compartment.
+
+With the MASK argument present, it sets the operator mask for the
+compartment (equivalent to calling the deny_only method).
+
+=back
+
+
+=head2 Some Safety Issues
+
+This section is currently just an outline of some of the things code in
+a compartment might do (intentionally or unintentionally) which can
+have an effect outside the compartment.
+
+=over 8
+
+=item Memory
+
+Consuming all (or nearly all) available memory.
+
+=item CPU
+
+Causing infinite loops etc.
+
+=item Snooping
+
+Copying private information out of your system. Even something as
+simple as your user name is of value to others. Much useful information
+could be gleaned from your environment variables for example.
+
+=item Signals
+
+Causing signals (especially SIGFPE and SIGALARM) to affect your process.
+
+Setting up a signal handler will need to be carefully considered
+and controlled.  What mask is in effect when a signal handler
+gets called?  If a user can get an imported function to get an
+exception and call the user's signal handler, does that user's
+restricted mask get re-instated before the handler is called?
+Does an imported handler get called with its original mask or
+the user's one?
+
+=item State Changes
+
+Ops such as chdir obviously effect the process as a whole and not just
+the code in the compartment. Ops such as rand and srand have a similar
+but more subtle effect.
+
+=back
+
+=head2 AUTHOR
+
+Originally designed and implemented by Malcolm Beattie.
+
+Reworked to use the Opcode module and other changes added by Tim Bunce.
+
+Currently maintained by the Perl 5 Porters, <perl5-porters@perl.org>.
+
+=cut
+
diff --git a/lib/WeBWorK.pm b/lib/WeBWorK.pm
index 3dadcece3e..d7fc724447 100644
--- a/lib/WeBWorK.pm
+++ b/lib/WeBWorK.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK.pm,v 1.104 2010/05/15 18:44:26 gage 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
@@ -20,7 +20,6 @@ package WeBWorK;
 
 WeBWorK - Dispatch requests to the appropriate content generator.
 
-
 =head1 SYNOPSIS
 
  my $r = Apache->request;
@@ -33,147 +32,215 @@ C<WeBWorK> is the dispatcher for the WeBWorK system. Given an Apache request
 object, it performs authentication and determines which subclass of
 C<WeBWorK::ContentGenerator> to call.
 
-=head1 REQUEST FORMAT
-
- FIXME: write this part
- summary: the URI controls 
-
 =cut
 
-
-BEGIN { $main::VERSION = "2.0"; }
-
-my $timingON = 0;
+BEGIN { $main::VERSION = "2.4.9"; }
 
 use strict;
 use warnings;
-use Apache::Constants qw(:common REDIRECT DONE);
-use Apache::Request;
+use Time::HiRes qw/time/;
+use WeBWorK::Localize;
+# load WeBWorK::Constants before anything else
+# this sets package variables in several packages
+use WeBWorK::Constants;
+
 use WeBWorK::Authen;
 use WeBWorK::Authz;
 use WeBWorK::CourseEnvironment;
 use WeBWorK::DB;
-use WeBWorK::Timing;
+use WeBWorK::Debug;
+use WeBWorK::Request;
 use WeBWorK::Upload;
-use WeBWorK::Utils qw(runtime_use);
-
-=head1 THE C<&dispatch> FUNCTION
-
-The C<&dispatch> function takes an Apache request object (REQUEST) and returns
-an apache status code. Below is an overview of its operation:
+use WeBWorK::URLPath;
+use WeBWorK::CGI;
+use WeBWorK::Utils qw(runtime_use writeTimingLogEntry);
+
+use mod_perl;
+use constant MP2 => ( exists $ENV{MOD_PERL_API_VERSION} and $ENV{MOD_PERL_API_VERSION} >= 2 );
+
+# Apache2 needs upload class
+BEGIN {
+	if (MP2) {
+		require Apache2::Upload;
+		Apache2::Upload->import();
+		require Apache2::RequestUtil;
+		Apache2::RequestUtil->import();
+	}
+}
 
-=over
+use constant LOGIN_MODULE => "WeBWorK::ContentGenerator::Login";
+use constant PROCTOR_LOGIN_MODULE => "WeBWorK::ContentGenerator::LoginProctor";
+
+BEGIN {
+	# pre-compile all content generators
+	# Login and LoginProctor need to be handled separately, since they don't have paths
+	map { eval "require $_"; die $@ if $@ }
+		WeBWorK::URLPath->all_modules,
+		LOGIN_MODULE,
+		PROCTOR_LOGIN_MODULE;
+	# other candidates for preloading:
+	# - DB Record, Schema, and Driver classes (esp. Driver::SQL as it loads DBI)
+	# - CourseManagement subclasses (ditto. sql_single.pm)
+	# - WeBWorK::PG::Local, which loads WeBWorK::PG::Translator
+	# - Authen subclasses
+}
 
-=cut
+our %SeedCE;
 
 sub dispatch($) {
 	my ($apache) = @_;
-	my $r = Apache::Request->new($apache);
-		# have to deal with unpredictable GET or POST data, and sift
-		# through it for the key. So use Apache::Request
+	my $r = WeBWorK::Request->new($apache);
 	
-	# This stuff is pretty much copied out of the O'Reilly mod_perl book.
-	# It's for figuring out the basepath. I may change this up if I find a
-	# better way to do it.
-	my $path_info = $r->path_info || "";
-	$path_info =~ s!/+!/!g; # strip multiple forward slashes
-	my $current_uri = $r->uri;
-	my $args = $r->args;
+	my $method = $r->method;
+	my $location = $r->location;
+	my $uri = $r->uri;
+	my $path_info = $r->path_info | "";
+	my $args = $r->args || "";
+	my $dir_config = $r->dir_config;
+	my %conf_vars = map { $_ => $dir_config->{$_} } grep { /^webwork_/ } keys %$dir_config;
+	@SeedCE{keys %conf_vars} = values %conf_vars;
 	
-	my ($urlRoot) = $current_uri =~ m/^(.*)$path_info/;
-
-=item Ensure that the URI ends with a "/"
-
-Parts of WeBWorK assume that the current URI of a request ends with a "/". If
-this is not the case, a redirection is issued to add the "/". This action will
-discard any POST data associated with the request, so it is essential that all
-POST requests include a "/" at the end of the URI.
-
-=cut
-
-	# If it's a valid WeBWorK URI, it ends in a /.  This is assumed
-	# alllll over the place.
-	unless (substr($current_uri,-1) eq '/') {
-		$r->header_out(Location => "$current_uri/" . ($args ? "?$args" : ""));
-		return REDIRECT;
-		# *** any post data gets lost here -- fix that.
-		# (actually, it's not a problem, since all URLs generated
-		# from within the system have trailing slashes, and we don't  
-		# need POST data from outside the system anyway!)
+	debug("\n\n===> Begin " . __PACKAGE__ . "::dispatch() <===\n\n");
+	debug("Hi, I'm the new dispatcher!\n");
+	debug(("-" x 80) . "\n");
+	
+	debug("Okay, I got some basic information:\n");
+	debug("The apache location is $location\n");
+	debug("The request method is $method\n");
+	debug("The URI is $uri\n");
+	debug("The path-info is $path_info\n");
+	debug("The argument string is $args\n");
+	#debug("The WeBWorK root directory is $webwork_root\n");
+	#debug("The PG root directory is $pg_root\n");
+	debug(("-" x 80) . "\n");
+	
+	debug("The first thing we need to do is munge the path a little:\n");
+	
+	######################################################################
+	# Create a URLPath  object
+	######################################################################
+	my ($path) = $uri =~ m/$location(.*)/;
+	$path = "/" if $path eq ""; # no path at all
+	
+	debug("We can't trust the path-info, so we make our own path.\n");
+	debug("path-info claims: $path_info\n");
+	debug("but it's really: $path\n");
+	debug("(if it's empty, we set it to \"/\".)\n");
+	
+	$path =~ s|/+|/|g;
+	debug("...and here it is without repeated slashes: $path\n");
+	
+	# lookbehind assertion for "not a slash"
+	# matches the boundary after the last char
+	$path =~ s|(?<=[^/])$|/|;
+	debug("...and here it is with a trailing slash: $path\n");
+	
+	debug(("-" x 80) . "\n");
+	
+	debug("Now we need to look at the path a little to figure out where we are\n");
+	
+	debug("-------------------- call to WeBWorK::URLPath::newFromPath\n");
+	my $urlPath = WeBWorK::URLPath->newFromPath($path, $r);
+	                            # pointer to parent request for access to the $ce and language translation ability
+	                            # need to add this pointer whenever a new URLPath is created.
+	debug("-------------------- call to WeBWorK::URLPath::newFromPath\n");
+	
+	unless ($urlPath) {
+		debug("This path is invalid... see you later!\n");
+		die "The path '$path' is not valid.\n";
 	}
 	
-	# Create the @components array, which contains the path specified in the URL
-	my($junk, @components) = split "/", $path_info;
-	my $webwork_root = $r->dir_config('webwork_root'); # From a PerlSetVar in httpd.conf
-	my $pg_root = $r->dir_config('pg_root'); # From a PerlSetVar in httpd.conf
-	my $course = shift @components;
-
-=item Read the course environment
-
-C<WeBWorK::CourseEnvironment> is used to read the F<global.conf> configuration
-file. If a course name was given in the request's URI, it is passed to
-C<WeBWorK::CourseEnvironment>. In this case, the course-specific configuration
-file (usually F<course.conf>) is also read by C<WeBWorK::CourseEnvironment> at
-this point.
-
-See also L<WeBWorK::CourseEnvironment>.
-
-=cut
-
-	# Try to get the course environment.
-	my $ce = eval {WeBWorK::CourseEnvironment->new($webwork_root, $urlRoot, $pg_root, $course);};
-	if ($@) { # If there was an error getting the requested course
-		die "Failed to read course environment for $course: $@";
+	my $displayModule = $urlPath->module;
+	my %displayArgs = $urlPath->args;
+	
+	unless ($displayModule) {
+		debug("The display module is empty, so we can DECLINE here.\n");
+		die "No display module found for path '$path'.";
 	}
-
-=item If no course was given, go to the site home page
-
-If the URI did not include the name of a course, a redirection is issued to the
-site home page, given but the course environemnt variable
-C<$ce-E<gt>{webworkURLs}-E<gt>{home}>.
-
-=cut
-
-	# If no course was specified, redirect to the home URL
-	unless (defined $course) {
-		$r->header_out(Location => $ce->{webworkURLs}->{home});
-		return REDIRECT;
+	
+	debug("The display module for this path is: $displayModule\n");
+	debug("...and here are the arguments we'll pass to it:\n");
+	foreach my $key (keys %displayArgs) {
+		debug("\t$key => $displayArgs{$key}\n");
 	}
-
-=item If the given course does not exist, fail
-
-If the URI did include the name of a course, but the course directory was not
-found, an exception is thrown.
-
-=cut
-
-	# Freak out if the requested course doesn't exist.  For now, this is just a
-	# check to see if the course directory exists.
-	my $courseDir = $ce->{webworkDirs}->{courses} . "/$course";
-	unless (-e $courseDir) {
-		die "Course directory for $course ($courseDir) not found. Perhaps the course does not exist?";
+	
+	my $selfPath = $urlPath->path;
+	my $parent = $urlPath->parent;
+	my $parentPath = $parent ? $parent->path : "<no parent>";
+	
+	debug("Reconstructing the original path gets us: $selfPath\n");
+	debug("And we can generate the path to our parent, too: $parentPath\n");
+	debug("(We could also figure out who our children are, but we'd need to supply additional arguments.)\n");
+	debug(("-" x 80) . "\n");
+	
+	debug("The URLPath looks good, we'll add it to the request.\n");
+	$r->urlpath($urlPath);
+	
+	debug("Now we want to look at the parameters we got.\n");
+	
+	debug("The raw params:\n");
+	foreach my $key ($r->param) {
+		my @vals = $r->param($key);
+		my $vals = join(", ", map { "'$_'" } @vals);
+		debug("\t$key => $vals\n");
+	}
+	
+	#mungeParams($r);
+	#
+	#debug("The munged params:\n");
+	#foreach my $key ($r->param) {
+	#	debug("\t$key\n");
+	#	debug("\t\t$_\n") foreach $r->param($key);
+	#}
+	
+	debug(("-" x 80) . "\n");
+	
+	my $apache_hostname = $r->hostname;
+	my $apache_port     = $r->get_server_port;
+	my $apache_is_ssl   = ($r->subprocess_env('https') ? 1 : "");
+	my $apache_root_url;
+	if ($apache_is_ssl) {
+		$apache_root_url = "https://$apache_hostname";
+		$apache_root_url .= ":$apache_port" if $apache_port != 443;
+	} else {
+		$apache_root_url = "http://$apache_hostname";
+		$apache_root_url .= ":$apache_port" if $apache_port != 80;
+	}
+	
+	
+	####################################################################
+	# Create Course Environment    $ce
+	####################################################################
+	debug("We need to get a course environment (with or without a courseID!)\n");
+	my $ce = eval { new WeBWorK::CourseEnvironment({
+		%SeedCE,
+		courseName => $displayArgs{courseID},
+		# this is kind of a hack, but it's really the only sane way to get this
+		# server information into the PG box
+		apache_hostname => $apache_hostname,
+		apache_port => $apache_port,
+		apache_is_ssl => $apache_is_ssl,
+		apache_root_url => $apache_root_url,
+	}) };
+	$@ and die "Failed to initialize course environment: $@\n";
+	debug("Here's the course environment: $ce\n");
+	$r->ce($ce);
+	
+	
+	######################
+	# Localizing language
+	######################
+	my $language= $ce->{language} || "en";
+	# $r->language_handle( WeBWorK::Localize->get_handle($language) );
+	$r->language_handle( WeBWorK::Localize::getLoc($language) );
+
+	my @uploads;
+	if (MP2) {
+		my $upload_table = $r->upload;
+		@uploads = values %$upload_table if defined $upload_table;
+	} else {
+		@uploads = $r->upload;
 	}
-
-=item Initialize the database system
-
-A C<WeBWorK::DB> object is created from the current course environment.
-
-See also L<WeBWorK::DB>.
-
-=cut
-
-	# Bring up a connection to the database (for Authen/Authz, and eventually
-	# to be passed to content generators, when we clean this file up).
-	my $db = WeBWorK::DB->new($ce);
-
-=item Capture any uploads
-
-Before checking authentication, we store any uploads sent by the client
-and replace them with parameters referencing the stored uploads.
-
-=cut
-
-	my @uploads = $r->upload;
 	foreach my $u (@uploads) {
 		# make sure it's a "real" upload
 		next unless $u->filename;
@@ -188,252 +255,321 @@ and replace them with parameters referencing the stored uploads.
 		my $hash = $upload->hash;
 		$r->param($u->name => "$id $hash");
 	}
-
-=item Check authentication
-
-Use C<WeBWorK::Authen> to verify that the remote user has authenticated.
-
-See also L<WeBWorK::Authen>.
-
-=cut
-
-	### Begin dispatching ###
 	
-	my $contentGenerator = "";
-	my @arguments = ();
+	# create these out here. they should fail if they don't have the right information
+	# this lets us not be so careful about whether these objects are defined when we use them.
+	# instead, we just create the behavior that if they don't have a valid $db they fail.
+	my $authz = new WeBWorK::Authz($r);
+	$r->authz($authz);
+	
+	# figure out which authentication modules to use
+	#my $user_authen_module;
+	#my $proctor_authen_module;
+	#if (ref $ce->{authen}{user_module} eq "HASH") {
+	#	if (exists $ce->{authen}{user_module}{$ce->{dbLayoutName}}) {
+	#		$user_authen_module = $ce->{authen}{user_module}{$ce->{dbLayoutName}};
+	#	} else {
+	#		$user_authen_module = $ce->{authen}{user_module}{"*"};
+	#	}
+	#} else {
+	#	$user_authen_module = $ce->{authen}{user_module};
+	#}
+	#if (ref $ce->{authen}{proctor_module} eq "HASH") {
+	#	if (exists $ce->{authen}{proctor_module}{$ce->{dbLayoutName}}) {
+	#		$proctor_authen_module = $ce->{authen}{proctor_module}{$ce->{dbLayoutName}};
+	#	} else {
+	#		$proctor_authen_module = $ce->{authen}{proctor_module}{"*"};
+	#	}
+	#} else {
+	#	$proctor_authen_module = $ce->{authen}{proctor_module};
+	#}
+	
+	my $user_authen_module = WeBWorK::Authen::class($ce, "user_module");
+	
+	runtime_use $user_authen_module;
+	my $authen = $user_authen_module->new($r);
+	debug("Using user_authen_module $user_authen_module: $authen\n");
+	$r->authen($authen);
+	
+	my $db;
+	
+	if ($displayArgs{courseID}) {
+		debug("We got a courseID from the URLPath, now we can do some stuff:\n");
 		
-	# WeBWorK::Authen::verify erases the passwd field and sets the key field
-	# if login is successful.
-	if (!WeBWorK::Authen->new($r, $ce, $db)->verify) {
-		$contentGenerator = "WeBWorK::ContentGenerator::Login";
-		@arguments = ();
-	}
-	else {
-
-=item Determine if the user is allowed to set C<effectiveUser>
-
-Use C<WeBWorK::Authz> to determine if the user is allowed to set
-C<effectiveUser>. If so, set it to the requested value (or set it to the real
-user name if no value is supplied). If not, set it to the real user name.
-
-See also L<WeBWorK::Authz>.
-
-=cut
-
-		# After we are authenticated, there are some things that need to be
-		# sorted out, Authorization-wize, before we start dispatching to individual
-		# content generators.
-		my $user = $r->param("user");
-		my $effectiveUser = $r->param("effectiveUser") || $user;
-		my $authz = WeBWorK::Authz->new($r, $ce, $db);
-		my $su_authorized = $authz->hasPermissions($user, "become_student", $effectiveUser);
-		$effectiveUser = $user unless $su_authorized;
-		$r->param("effectiveUser", $effectiveUser);
-
-=item Determine the appropriate subclass of C<WeBWorK::ContentGenerator> to call based on the URI.
-
-The dispatcher implements a virtual heirarchy that looks like this:
-
- $courseID ($courseID) - list of sets
- 	hardcopy (Hardcopy Generator) - generate hardcopy for user/set pairs
- 	options (User Options) - change email address and password
- 	feedback (Feedback) - send feedback to professor via email
- 	logout (Logout) - expire session and erase authentication tokens
- 	test (Test) - display request information
- 	quiz_mode (Quiz) - "quiz" containing all problems from a set
- 	instructor (Instructor Tools) - main menu for instructor tools
- 		add_users (Add Users) - to be removed
- 		scoring (Scoring Tools) - generate scoring files for problem sets
- 		scoringDownload - send a scoring file to the client
-  		scoring_totals - ???
-		users (Users) - view/edit users
- 			$userID ($userID) - user detail for given user
- 				sets (Assigned Sets) - view/edit sets assigned to given user
- 		sets (Sets) - list of sets, add new sets, delete existing sets
- 			$setID - view/edit the given set
- 				problems (Problems) - view/edit problems in the given set
- 					$problemID - this is where the pg problem editor SHOULD be
- 				users (Users Assigned) - view/edit users to whom the given set is assigned
- 		pgProblemEditor (Problem Source) - edit the source of a problem
- 		send_mail (Mail Merge) - send mail to users in course
- 		show_answers (Answers Submitted) - show submitted answers
- 		stats (Statistics) - show statistics
- 		files (File Transfer) - transfer files to/from the client
- 	$setID ($setID) - list of problems in the given set
- 		$problemID ($problemID) - interactive display of problem
-
-=cut
-
-		my $arg = shift @components;
-		if (not defined $arg) { # We want the list of problem sets
-			$contentGenerator = "WeBWorK::ContentGenerator::ProblemSets";
-			@arguments = ();
-		}
-		elsif ($arg eq "hardcopy") {
-			my $setID = shift @components;
-			$contentGenerator = "WeBWorK::ContentGenerator::Hardcopy";
-			@arguments = ($setID);
+		unless (-e $ce->{courseDirs}->{root}) {
+			die "Course '$displayArgs{courseID}' not found: $!";
 		}
-		elsif ($arg eq "options") {
-			$contentGenerator = "WeBWorK::ContentGenerator::Options";
-			@arguments = ();
-		}
-		elsif ($arg eq "feedback") {
-			$contentGenerator = "WeBWorK::ContentGenerator::Feedback";
-			@arguments = ();
-		}
-		elsif ($arg eq "logout") {
-			$contentGenerator = "WeBWorK::ContentGenerator::Logout";
-			@arguments = ();
-		}
-		elsif ($arg eq "test") {
-			$contentGenerator = "WeBWorK::ContentGenerator::Test";
-			@arguments = ();
-		}
-		elsif ($arg eq "quiz_mode" ) {
-			$contentGenerator = "WeBWorK::ContentGenerator::GatewayQuiz";
-			@arguments = @components;
-		}
-		elsif ($arg eq "instructor") {
-			my $instructorArgument = shift @components;
+		
+		debug("...we can create a database object...\n");
+		$db = new WeBWorK::DB($ce->{dbLayout});
+		debug("(here's the DB handle: $db)\n");
+		$r->db($db);
+		
+		my $authenOK = $authen->verify;
+		if ($authenOK) {
+			my $userID = $r->param("user");
+			debug("Hi, $userID, glad you made it.\n");
 			
-			if (not defined $instructorArgument) {
-				$contentGenerator = "WeBWorK::ContentGenerator::Instructor::Index";
-				@arguments = ();
-			}
-			elsif ($instructorArgument eq "add_users") {
-				$contentGenerator = "WeBWorK::ContentGenerator::Instructor::AddUsers";
-				@arguments = ();
-			}
-			elsif ($instructorArgument eq "scoring") {
-				$contentGenerator = "WeBWorK::ContentGenerator::Instructor::Scoring";
-				@arguments = ();
-			}
-# 			elsif ($instructorArgument eq "scoring_totals") {
-# 				$contentGenerator = "WeBWorK::ContentGenerator::Instructor::ScoringTotals";
-# 				@arguments = ();
-# 			}
-			elsif ($instructorArgument eq "scoringDownload") {
-				$contentGenerator = "WeBWorK::ContentGenerator::Instructor::ScoringDownload";
-				@arguments = ();
-			}
-			elsif ($instructorArgument eq "users") {
-				my $userID = shift @components;
-				
-				if (defined $userID) {
-					my $userArg = shift @components;
-					if (defined $userArg) {
-						if ($userArg eq "sets") {
-							$contentGenerator = "WeBWorK::ContentGenerator::Instructor::SetsAssignedToUser";
-							@arguments = ($userID);
-						}
-					}
-					else {
-						$contentGenerator = "WeBWorK::ContentGenerator::Instructor::UserDetail";
-						@arguments = ($userID);
-					}
-				}
-				else {
-					$contentGenerator = "WeBWorK::ContentGenerator::Instructor::UserList";
-					@arguments = ();
+			# tell authorizer to cache this user's permission level
+			$authz->setCachedUser($userID);
+			
+			debug("Now we deal with the effective user:\n");
+			my $eUserID = $r->param("effectiveUser") || $userID;
+			debug("userID=$userID eUserID=$eUserID\n");
+			if ($userID ne $eUserID) {
+				debug("userID and eUserID differ... seeing if userID has 'become_student' permission.\n");
+				my $su_authorized = $authz->hasPermissions($userID, "become_student");
+				if ($su_authorized) {
+					debug("Ok, looks like you're allowed to become $eUserID. Whoopie!\n");
+				} else {
+					debug("Uh oh, you're not allowed to become $eUserID. Nice try!\n");
+					die "You are not allowed to act as another user.\n";
 				}
 			}
-			elsif ($instructorArgument eq "sets") {
-				my $setID = shift @components;
+			
+			# set effectiveUser in case it was changed or not set to begin with
+			$r->param("effectiveUser" => $eUserID);
+			
+			# if we're doing a proctored test, after the user has been authenticated
+			# we need to also check on the proctor.  note that in the gateway quiz
+			# module we double check this, to be sure that someone isn't taking a
+			# proctored quiz but calling the unproctored ContentGenerator
+			my $urlProducedPath = $urlPath->path();
+			if ( $urlProducedPath =~ /proctored_quiz_mode/i ) {
+				my $proctor_authen_module = WeBWorK::Authen::class($ce, "proctor_module");
+				runtime_use $proctor_authen_module;
+				my $authenProctor = $proctor_authen_module->new($r);
+				debug("Using proctor_authen_module $proctor_authen_module: $authenProctor\n");
+			    my $procAuthOK = $authenProctor->verify();
 				
-				if (defined $setID) {
-					my $setArg = shift @components;
-					
-					if (defined $setArg) {
-						if ($setArg eq "problems") {
-							$contentGenerator = "WeBWorK::ContentGenerator::Instructor::ProblemList";
-							@arguments = ($setID);
-						}
-						elsif ($setArg eq "users") {
-							$contentGenerator = "WeBWorK::ContentGenerator::Instructor::Assigner";
-							@arguments = ($setID);
-						}
-					}
-					else {
-						$contentGenerator = "WeBWorK::ContentGenerator::Instructor::ProblemSetEditor";
-						@arguments = ($setID);
-					}
-				}
-				else {
-					$contentGenerator = "WeBWorK::ContentGenerator::Instructor::ProblemSetList";
-					@arguments = ();
-
+				if (not $procAuthOK) {
+					$displayModule = PROCTOR_LOGIN_MODULE;
 				}
 			}
-			elsif ($instructorArgument eq "pgProblemEditor") {
-				$contentGenerator = "WeBWorK::ContentGenerator::Instructor::PGProblemEditor";
-				@arguments = @components;
-			}
-			elsif ($instructorArgument eq "send_mail") {
-				$contentGenerator = "WeBWorK::ContentGenerator::Instructor::SendMail";
-				@arguments = @components;
-			}
-			elsif ($instructorArgument eq "show_answers") {
-				$contentGenerator = "WeBWorK::ContentGenerator::Instructor::ShowAnswers";
-				@arguments = @components;
-			}
-			elsif ($instructorArgument eq "stats") {
-				$contentGenerator = "WeBWorK::ContentGenerator::Instructor::Stats";
-				@arguments = @components;
-			}
-			elsif ($instructorArgument eq "files") {
-				$contentGenerator = "WeBWorK::ContentGenerator::Instructor::FileXfer";
-				@arguments = @components;
-			}
+		} else {
+			debug("Bad news: authentication failed!\n");
+			$displayModule = LOGIN_MODULE;
+			debug("set displayModule to $displayModule\n");
 		}
-		else {
-			# $arg is a set ID
-			my $setID = $arg;
-			my $problemID = shift @components;
-			
-			if (defined $problemID) {
-				$contentGenerator = "WeBWorK::ContentGenerator::Problem";
-				@arguments = ($setID, $problemID);
-			}
-			else {
-				$contentGenerator = "WeBWorK::ContentGenerator::ProblemSet";
-				@arguments = ($setID);
+	}
+	
+	# store the time before we invoke the content generator
+	my $cg_start = time; # this is Time::HiRes's time, which gives floating point values
+	
+	debug(("-" x 80) . "\n");
+	debug("Finally, we'll load the display module...\n");
+	
+	runtime_use($displayModule);
+	
+	debug("...instantiate it...\n");
+	
+	my $instance = $displayModule->new($r);
+	
+	debug("...and call it:\n");
+	debug("-------------------- call to ${displayModule}::go\n");
+	
+	my $result = $instance->go();
+	
+	debug("-------------------- call to ${displayModule}::go\n");
+	
+	my $cg_end = time;
+	my $cg_duration = $cg_end - $cg_start;
+	writeTimingLogEntry($ce, "[".$r->uri."]", sprintf("runTime = %.3f sec", $cg_duration)." ".$ce->{dbLayoutName}, "");
+	
+	debug("returning result: " . (defined $result ? $result : "UNDEF") . "\n");
+	    #@LimitedPolynomial::BOP::ISA; #FIXME this  is needed to zero out 
+	    #@LimitedPolynomial::UOP::ISA;
+	    #\@LimitedPolynomial::BOP::ISA and prevent error messages of the form 
+	    #[Sat May 15 14:23:08 2010] [warn] [client 127.0.0.1] [/webwork2/gage_course/test_set/6/] 
+	    #Can't locate package LimitedPolynomial::BOP for @LimitedPolynomial::BOP::add::ISA at /opt/webwork/webwork2/lib/Apache/WeBWorK.pm line 115., referer: http://localhost/webwork2/gage_course/test_set/6/ no one knows why
+	return $result;
+}
+
+sub mungeParams {
+	my ($r) = @_;
+	
+	my @paramQueue;
+	
+	# remove all the params from the request, and store them in the param queue
+	foreach my $key ($r->param) {
+		push @paramQueue, [ $key => [ $r->param($key) ] ];
+		$r->parms->unset($key)
+	}
+	
+	# exhaust the param queue, decoding encoded params
+	while (@paramQueue) {
+		my ($key, $values) = @{ shift @paramQueue };
+		
+		if ($key =~ m/\,/) {
+			# we have multiple params encoded in a single param
+			# split them up and add them to the end of the queue
+			push @paramQueue, map { [ $_, $values ] } split m/\,/, $key;
+		} elsif ($key =~ m/\:/) {
+			# we have a whole param encoded in a key
+			# split it up and add it to the end of the queue
+			my ($newKey, $newValue) = split m/\:/, $key;
+			push @paramQueue, [ $newKey, [ $newValue ] ];
+		} else {
+			# this is a "normal" param
+			# add it to the param list
+			if (defined $r->param($key)) {
+				# the param already exists -- append the values we have
+				$r->param($key => [ $r->param($key), @$values ]);
+			} else {
+				# the param doesn't exist -- create it with the values we have
+				$r->param($key => $values);
 			}
 		}
 	}
+}
 
-=item Call the selected content generator
 
-Instantiate the selected subclass of content generator and call its C<&go> method. Store the result.
+# labeled_input subroutine
+#
+# Creates a form input element with a label added to the correct place.
+# Takes in up to six parameters:
+#
+# -type (type of input element), -name (name of input element), -id (id of the input element), -value (value of the input element), -label_text (the text on the label), -label_id (the id of the label)
+#
+# If any of the parameters are not specified, they default to "none". 
+#
+# UPDATE: updated lable tags so that their "for" property will point to the id of the element that they are labeling. This means that entering an id for the input element becomes essentially mandatory if you want the tag to work correctly.
 
-=cut
+# DEPRECATED - see below
 
-	my $result;
-	if ($contentGenerator) {
-		runtime_use($contentGenerator);
-		my $cg = $contentGenerator->new($r, $ce, $db);
-		
-		$WeBWorK::timer = WeBWorK::Timing->new("${contentGenerator}::go(@arguments)") if $timingON == 1;
-		$WeBWorK::timer->start if $timingON == 1;
-		
-		$result = $cg->go(@arguments);
-		
-		$WeBWorK::timer->stop if $timingON == 1;
-		$WeBWorK::timer->save if $timingON == 1;
-	} else {
-		$result = NOT_FOUND;
+# sub labeled_input
+# {
+	# my %param = (-type=>"none", -name=>"none", -value=>"none", -id=>"none", -label_text=>"none", -label_id=>"none", @_);
+	
+	# if($param{-type} eq "text" or $param{-type} eq "password" or $param{-type} eq "file"){
+		# return CGI::label({-id=>$param{-label_id}, -for=>$param{-id}},$param{-label_text}).CGI::input({-type=>$param{-type}, -name=>$param{-name}, -value=>$param{-value}, -id=>$param{-id}}).CGI::br();
+	# }
+	# elsif($param{-type} eq "checkbox" or $param{-type} eq "radio"){
+		# return CGI::input({-type=>$param{-type}, -name=>$param{-name}, -value=>$param{-value}, -id=>$param{-id}}).CGI::label({-id=>$param{-label_id}, -for=>$param{-id}},$param{-label_text}).CGI::br();
+	# }
+	# elsif($param{-type} eq "submit" or $param{-type} eq "button" or $param{-type} eq "reset"){
+		# return CGI::input({-type=>$param{-type}, -name=>$param{-name}, -value=>$param{-value}, -id=>$param{-id}}).CGI::br();
+	# }
+	# else{
+		# return "Not a valid input type";
+	# }
+# }
+
+
+# CGI_labeled_input subroutine
+
+# A replacement to the labeled_input subroutine above, created when it was determined that the old subroutine was limited in that it did not allow for attributes other than the ones that it specified.
+
+# This subroutine rectifies that problem by taking in attributes for the input elements and label elements as hashes and simply entering them into the CGI routines, which already support attributes as hash parameters.
+
+# The way it attaches label tags is similar to the labeled_input subroutine.
+
+# This subroutine has also been expanded to be able to handle select elements.
+
+# Five parameters are taken in as a hash: -type (specifying the type of the input element), -id (specifying the id of the input element), -label_text (specifying the text to go in the label), -input_attr (a hash specifying any additional attributes for the input element, if any), and -label_attr (a hash specifying additional attributes for the label element, if any).
+
+# As before, all parameters are optional, with the scalar parameters defaulting to "none" and the hash parameters defaulting to empty. 
+
+
+sub CGI_labeled_input
+{
+	my %param = (-type=>"none", -id=>"none", -label_text=>"none", -input_attr=>{}, -label_attr=>{}, @_);
+	
+	$param{-input_attr}{-type} = $param{-type};
+	$param{-input_attr}{-id} = $param{-id};
+	$param{-label_attr}{-for} = $param{-id};
+	
+	if($param{-type} eq "text" or $param{-type} eq "password" or $param{-type} eq "file"){
+		return CGI::label($param{-label_attr},$param{-label_text}).CGI::input($param{-input_attr});
+	}
+	elsif($param{-type} eq "checkbox" or $param{-type} eq "radio"){
+		return CGI::input($param{-input_attr}).CGI::label($param{-label_attr},$param{-label_text});
+	}
+	elsif($param{-type} eq "submit" or $param{-type} eq "button" or $param{-type} eq "reset"){
+		return CGI::input($param{-input_attr});
 	}
+	elsif($param{-type} eq "select"){
+		return CGI::label($param{-label_attr},$param{-label_text}).CGI::popup_menu($param{-input_attr});
+	}
+	elsif($param{-type} eq "textarea"){
+		return CGI::label($param{-label_attr},$param{-label_text}).CGI::br().CGI::br().CGI::textarea($param{-input_attr});
+	}
+	else{
+		"Not a valid input type";
+	}
+}
 
-=item Return the result of calling the content generator
+# split_cap subroutine - ghe3
 
-The return value of the content generator's C<&go> function is returned.
+# A sort of wrapper for the built-in split function which uses capital letters as a delimiter, and returns a string containing the separated substrings separated by a whitespace.  Used to make actionID's more readable.
 
-=cut
+sub split_cap
+{
+	my $str = shift;
+	
+	my @str_arr = split(//,$str);
+	my $count = scalar(@str_arr);
+	
+	my $i = 0;
+	my $prev = 0;
+	my @result = ();
+	my $hasCapital = 0;
+	foreach(@str_arr){
+		if($_ =~ /[A-Z]/){
+			$hasCapital = 1;
+			push(@result, join("", @str_arr[$prev..$i-1]));
+			$prev = $i;
+		}
+		$i++;
+	}
+	
+	unless($hasCapital){
+		return $str;
+	}
+	else{
+		push(@result, join("", @str_arr[$prev..$count-1]));	
+		return join(" ",@result);
+	}
+}
+
+# underscore_to_whitespace subroutine
 
+# a simple subroutine for converting underscores in a given string to whitespace
+
+sub underscore_to_whitespace{
+	my $str = shift;
+	
+	my @strArr = split("",$str);
+	foreach(@strArr){
+		if($_ eq "_"){
+			$_ = " "
+		}
+	}
+	
+	my $result = join("",@strArr);
+	
 	return $result;
 }
 
-=back
+sub remove_duplicates{
+	my @arr = @_;
+	
+	my %unique;
+	my @result;
+	
+	foreach(@arr){
+		if(defined $unique{$_}){
+			next;
+		}
+		else{
+			push(@result, $_);
+			$unique{$_} = "seen";
+		}
+	}
+	
+	return @result;
+	
+}
 
 =head1 AUTHOR
 
diff --git a/lib/WeBWorK/Authen.pm b/lib/WeBWorK/Authen.pm
index 537aa77342..81c0968a53 100644
--- a/lib/WeBWorK/Authen.pm
+++ b/lib/WeBWorK/Authen.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/Authen.pm,v 1.62 2007/03/06 22:03:15 glarose 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
@@ -20,235 +20,737 @@ package WeBWorK::Authen;
 
 WeBWorK::Authen - Check user identity, manage session keys.
 
+=head1 SYNOPSIS
+
+ # get the name of the appropriate Authen class, based on the %authen hash in $ce
+ my $class_name = WeBWorK::Authen::class($ce, "user_module");
+ 
+ # load that class
+ require $class_name;
+ 
+ # create an authen object
+ my $authen = $class_name->new($r);
+ 
+ # verify credentials
+ $authen->verify or die "Authentication failed";
+ 
+ # verification status is stored for quick retrieval later
+ my $auth_ok = $authen->was_verified;
+ 
+ # for some reason, you might want to clear that cache
+ $authen->forget_verification;
+
+=head1 DESCRIPTION
+
+WeBWorK::Authen is the base class for all WeBWorK authentication classes. It
+provides default authentication behavior which can be selectively overridden in
+subclasses.
+
 =cut
 
 use strict;
 use warnings;
+use WeBWorK::Cookie;
+use Date::Format;
+use Socket qw/unpack_sockaddr_in inet_ntoa/; # for logging
+use WeBWorK::Debug;
+use WeBWorK::Utils qw/writeCourseLog/;
+use WeBWorK::Localize;
+use URI::Escape;
 
-sub new($$$) {
-	my $invocant = shift;
-	my $class = ref($invocant) || $invocant;
-	my $self = {};
-	($self->{r}, $self->{ce}, $self->{db}) = @_;
-	bless $self, $class;
-	return $self;
-}
+use mod_perl;
+use constant MP2 => ( exists $ENV{MOD_PERL_API_VERSION} and $ENV{MOD_PERL_API_VERSION} >= 2 );
 
-# um, this isn't used. move it to Utils?
-#sub generatePassword($$$) {
-#	my ($self, $userID, $clearPassword) = @_;
-#	my $salt = join("", ('.','/','0'..'9','A'..'Z','a'..'z')[rand 64, rand 64]);
-#	my $cryptPassword = crypt($clearPassword, $salt);
-#	return WeBWorK::DB::Record::Password->new(user_id=>$userID, password=>$password);
-#}
 
-sub checkPassword($$$) {
-	my ($self, $userID, $possibleClearPassword) = @_;
-	my $Password = $self->{db}->getPassword($userID); # checked
-	return 0 unless defined $Password;
-	my $possibleCryptPassword = crypt($possibleClearPassword, $Password->password());
-	return $possibleCryptPassword eq $Password->password();
-}
+#####################
+## WeBWorK-tr modification
+## If GENERIC_ERROR_MESSAGE is constant, we can't translate it
 
-sub generateKey($$) {
-	my ($self, $userID) = @_;
-	my @chars = @{ $self->{ce}->{sessionKeyChars} };
-	my $length = $self->{ce}->{sessionKeyLength};
-	srand;
-	my $key = join ("", @chars[map rand(@chars), 1 .. $length]);
-	return WeBWorK::DB::Record::Key->new(user_id=>$userID, key=>$key, timestamp=>time);
+#use vars qw($GENERIC_ERROR_MESSAGE);
+our $GENERIC_ERROR_MESSAGE = "";  # define in new
+
+## WeBWorK-tr end modification 
+#####################
+
+use constant COOKIE_LIFESPAN => 60*60*24*30; # 30 days
+#use constant GENERIC_ERROR_MESSAGE => "Invalid user ID or password.";
+
+
+BEGIN {
+	if (MP2) {
+		require APR::SockAddr;
+		APR::SockAddr->import();
+		require Apache2::Connection;
+		Apache2::Connection->import();
+		require APR::Request::Error;
+		APR::Request::Error->import;
+	}
 }
 
-sub checkKey($$$) {
-	my ($self, $userID, $possibleKey) = @_;
-	my $Key = $self->{db}->getKey($userID); # checked
-	return 0 unless defined $Key;
-	if (time <= $Key->timestamp()+$self->{ce}->{sessionKeyTimeout}) {
-		if ($possibleKey eq $Key->key()) {
-			# unexpired and matches -- update timestamp
-			$Key->timestamp(time);
-			$self->{db}->putKey($Key);
-			return 1;
+################################################################################
+# Public API
+################################################################################
+
+=head1 FACTORY
+
+=over
+
+=item class($ce, $type)
+
+This subroutine consults the given WeBWorK::CourseEnvironment object to
+determine which WeBWorK::Authen subclass should be used. $type can be any key
+given in the %authen hash in the course environment. If the type is not found in
+the %authen hash, an exception is thrown.
+
+=cut
+
+sub class {
+	my ($ce, $type) = @_;
+	
+	if (exists $ce->{authen}{$type}) {
+		if (ref $ce->{authen}{$type} eq "HASH") {
+			if (exists $ce->{authen}{$type}{$ce->{dbLayoutName}}) {
+				return $ce->{authen}{$type}{$ce->{dbLayoutName}};
+			} elsif (exists $ce->{authen}{$type}{"*"}) {
+				return $ce->{authen}{$type}{"*"};
+			} else {
+				die "authentication type '$type' in %authen hash in course environemnt has no entry for db layout '", $ce->{dbLayoutName}, "' and no default entry (*)";
+			}
 		} else {
-			# unexpired but doesn't match -- leave timestamp alone
-			# we do this to keep an attacker from keeping someone's session
-			# alive. (yeah, we don't match IPs.)
-			return 0;
+			return $ce->{authen}{$type};
 		}
 	} else {
-		# expired -- delete key
-		$self->{db}->deleteKey($userID);
-		return 0;
+		die "authentication type '$type' not found in course environment \%authen hash";
 	}
 }
 
-sub unexpiredKeyExists($$) {
-	my ($self, $userID) = @_;
-	my $Key = $self->{db}->getKey($userID); # checked
-	return 0 unless defined $Key;
-	if (time <= $Key->timestamp()+$self->{ce}->{sessionKeyTimeout}) {
-		# unexpired, but leave timestamp alone
-		return 1;
-	} else {
-		# expired -- delete key
-		$self->{db}->deleteKey($userID);
-		return 0;
-	}
+=back
+
+=cut
+
+=head1 CONSTRUCTOR
+
+=over
+
+=item new($r)
+
+Instantiates a new WeBWorK::Authen object for the given WeBWorK::Requst ($r).
+
+=cut
+
+sub new {
+	my ($invocant, $r) = @_;
+	my $class = ref($invocant) || $invocant;
+	my $self = {
+		r => $r,
+	};
+	#initialize
+	$GENERIC_ERROR_MESSAGE = $r->maketext("Invalid user ID or password.");
+	bless $self, $class;
+	return $self;
 }
 
-# verify will return 1 if the person is who they say the are.
-# If the verification failed because of of invalid authentication data,
-# a note will be written in the request explaining why it failed.
-# If the request failed because no authentication data was provided, however,
-# no note will be written, as this is expected to happen whenever someone
-# types in a URL manually, and is not considered an error condition.
-sub verify($) {
+=back
+
+=cut
+
+=head1 METHODS
+
+=over
+
+=cut
+
+sub verify {
+	debug("BEGIN VERIFY");
 	my $self = shift;
 	my $r = $self->{r};
-	my $ce = $self->{ce};
-	my $db = $self->{db};
 	
-	my $practiceUserPrefix = $ce->{practiceUserPrefix};
-	my $debugPracticeUser = $ce->{debugPracticeUser};
+	my $result = $self->do_verify;
+	my $error = $self->{error};
+	my $log_error = $self->{log_error};
 	
-	my $user = $r->param('user');
-	my $passwd = $r->param('passwd');
-	my $key = $r->param('key');
-	my $force_passwd_authen = $r->param('force_passwd_authen');
+	$self->{was_verified} = $result ? 1 : 0;
 	
-	my $error;
-	my $failWithoutError = 0;
+	if ($self->can("site_fixup")) {
+		$self->site_fixup;
+	}
 	
-	VERIFY: {
-		# This block is here so we can "last" out of it when we've
-		# decided whether we're going to succeed or fail.
-		
-		# no authentication data was given. this is OK.
-		unless (defined $user or defined $passwd or defined $key) {
-			$failWithoutError = 1;
-			last VERIFY;
+	if ($result) {
+		$self->write_log_entry("LOGIN OK") if $self->{initial_login};
+		$self->maybe_send_cookie;
+		$self->set_params;
+	} else {
+		if (defined $log_error) {
+			$self->write_log_entry("LOGIN FAILED $log_error");
 		}
-		
-		if (defined $user and $force_passwd_authen) {
-			$failWithoutError = 1;
-			last VERIFY;
+		$self->maybe_kill_cookie;
+		if ($error) {
+			MP2 ? $r->notes->set(authen_error => $error) : $r->notes("authen_error" => $error);
 		}
+	}
+	
+	debug("END VERIFY");
+	return $result;
+}
+
+=item was_verified()
+
+Returns true if verify() returned true the last time it was called.
+
+=cut
+
+sub was_verified {
+	my ($self) = @_;
+	
+	return 1 if exists $self->{was_verified} and $self->{was_verified};
+	return 0;
+}
+
+=item forget_verification()
+
+Future calls to was_verified() will return false, until verify() is called again and succeeds.
+
+=cut
+
+sub forget_verification {
+	my ($self) = @_;
+	
+	$self->{was_verified} = 0;
+}
+
+=back
+
+=cut
+
+################################################################################
+# Helper functions (called by verify)
+################################################################################
+
+sub do_verify {
+	my $self = shift;
+	my $r = $self->{r};
+	my $ce = $r->ce;
+	my $db = $r->db;
+	
+	return 0 unless $db;
+	
+	return 0 unless $self->get_credentials;
+	
+	return 0 unless $self->check_user;
+	
+	my $practiceUserPrefix = $ce->{practiceUserPrefix};
+	if (defined($self->{login_type}) && $self->{login_type} eq "guest"){
+		return $self->verify_practice_user;
+	} else {
+		return $self->verify_normal_user;
+	}
+}
+
+sub get_credentials {
+	my ($self) = @_;
+	my $r = $self->{r};
+	my $ce = $r->ce;
+	my $db = $r->db;
+	
+	# allow guest login: if the "Guest Login" button was clicked, we find an unused
+	# practice user and create a session for it.
+	if ($r->param("login_practice_user")) {
+		my $practiceUserPrefix = $ce->{practiceUserPrefix};
+		# DBFIX search should happen in database
+		my @guestUserIDs = grep m/^$practiceUserPrefix/, $db->listUsers;
+		my @GuestUsers = $db->getUsers(@guestUserIDs);
+		my @allowedGuestUsers = grep { $ce->status_abbrev_has_behavior($_->status, "allow_course_access") } @GuestUsers;
+		my @allowedGestUserIDs = map { $_->user_id } @allowedGuestUsers;
 		
-		# no user was supplied.  somebody's building their own GET
-		unless ($user) {
-			$error = "You must specify a username.";
-			last VERIFY;
+		foreach my $userID (@allowedGestUserIDs) {
+			if (not $self->unexpired_session_exists($userID)) {
+				my $newKey = $self->create_session($userID);
+				$self->{initial_login} = 1;
+				
+				$self->{user_id} = $userID;
+				$self->{session_key} = $newKey;
+				$self->{login_type} = "guest";
+				$self->{credential_source} = "none";
+				debug("guest user '", $userID. "' key '", $newKey. "'");
+				return 1;
+			}
 		}
 		
-		# it's a practice user.
-		if ($practiceUserPrefix and $user =~ /^$practiceUserPrefix/) {
-			# we're not interested in a practice user's password
-			$r->param("passwd", "");
-			
-			# it's a practice user that doesn't exist.
-			unless (defined $db->getUser($user)) { # checked
-				$error = "That practice account does not exist.";
-				last VERIFY;
+		$self->{log_error} = "no guest logins are available";
+		$self->{error} = "No guest logins are available. Please try again in a few minutes.";
+		return 0;
+	}
+	
+	# at least the user ID is available in request parameters
+	if (defined $r->param("user")) {
+		$self->{user_id} = $r->param("user");
+		$self->{session_key} = $r->param("key");
+		$self->{password} = $r->param("passwd");
+		$self->{login_type} = "normal";
+		$self->{credential_source} = "params";
+		debug("params user '", $self->{user_id}, "' password '", $self->{password}, "' key '", $self->{session_key}, "'");
+		return 1;
+	}
+	
+	my ($cookieUser, $cookieKey) = $self->fetchCookie;
+	if (defined $cookieUser) {
+		$self->{user_id} = $cookieUser;
+		$self->{session_key} = $cookieKey;
+		$self->{login_type} = "normal";
+		$self->{credential_source} = "cookie";
+		debug("cookie user '", $self->{user_id}, "' key '", $self->{session_key}, "'");
+		return 1;
+	}
+}
+
+sub check_user {
+	my $self = shift;
+	my $r = $self->{r};
+	my $ce = $r->ce;
+	my $db = $r->db;
+	my $authz = $r->authz;
+	
+	my $user_id = $self->{user_id};
+	
+	if (defined $user_id and $user_id eq "") {
+		$self->{log_error} = "no user id specified";
+		$self->{error} = $r->maketext("You must specify a user ID.");
+		return 0;
+	}
+	
+	my $User = $db->getUser($user_id);
+	
+	unless ($User) {
+		$self->{log_error} = "user unknown";
+		$self->{error} = $GENERIC_ERROR_MESSAGE;
+		return 0;
+	}
+	
+	# FIXME "fix invalid status values" used to be here, but it needs to move to $db->getUser
+	
+	unless ($ce->status_abbrev_has_behavior($User->status, "allow_course_access")) {
+		$self->{log_error} = "user not allowed course access";
+		$self->{error} = $GENERIC_ERROR_MESSAGE;
+		return 0;
+	}
+	
+	unless ($authz->hasPermissions($user_id, "login")) {
+		$self->{log_error} = "user not permitted to login";
+		$self->{error} = $GENERIC_ERROR_MESSAGE;
+		return 0;
+	}
+	
+	return 1;
+}
+
+sub verify_practice_user {
+	my $self = shift;
+	my $r = $self->{r};
+	my $ce = $r->ce;
+	
+	my $user_id = $self->{user_id};
+	my $session_key = $self->{session_key};
+	
+	my ($sessionExists, $keyMatches, $timestampValid) = $self->check_session($user_id, $session_key, 1);
+	debug("sessionExists='", $sessionExists, "' keyMatches='", $keyMatches, "' timestampValid='", $timestampValid, "'");
+	
+	if ($sessionExists) {
+		if ($keyMatches) {
+			if ($timestampValid) {
+				return 1;
+			} else {
+				$self->{session_key} = $self->create_session($user_id);
+				$self->{initial_login} = 1;
+				return 1;
 			}
-			
-			# we've got a key.
-			if ($key) {
-				if ($self->checkKey($user, $key)) {
-					# they key was valid.
-					last VERIFY;
+		} else {
+			if ($timestampValid) {
+				my $debugPracticeUser = $ce->{debugPracticeUser};
+				if (defined $debugPracticeUser and $user_id eq $debugPracticeUser) {
+					$self->{session_key} = $self->create_session($user_id);
+					$self->{initial_login} = 1;
+					return 1;
 				} else {
-					# the key was invalid.
-					$error = "Your session has timed out due to inactivity. You must login again.";
-					last VERIFY;
+					$self->{log_error} = "guest account in use";
+					$self->{error} = "That guest account is in use.";
+					return 0;
 				}
+			} else {
+				$self->{session_key} = $self->create_session($user_id);
+				$self->{initial_login} = 1;
+				return 1;
 			}
-			
-			# -- here we know that a key was not supplied. --
-			
-			# it's the debug user.
-			if ($debugPracticeUser and $user eq $debugPracticeUser) {
-				# clobber any existing session, valid or not.
-				my $Key = $self->generateKey($user);
-				eval { $db->deleteKey($user) };
-				$db->addKey($Key);
-				$r->param("key", $Key->key());
-				last VERIFY;
-			}
-			
-			# an unexpired key exists -- the account is in use.
-			if ($self->unexpiredKeyExists($user)) {
-				$error = "That practice account is in use.";
-				last VERIFY;
-			}
-			
-			# here we know the account is not in use, so we
-			# generate a new  session key (unexpiredKeyExists
-			# deleted any expired key) and succeed!
-			my $Key = $self->generateKey($user);
-			$db->addKey($Key);
-			$r->param("key", $Key->key());
-			last VERIFY;
 		}
+	} else {
+		$self->{session_key} = $self->create_session($user_id);
+		$self->{initial_login} = 1;
+		return 1;
+	}
+}
+
+sub verify_normal_user {
+	my $self = shift;
+	my $r = $self->{r};
+	
+	my $user_id = $self->{user_id};
+	my $session_key = $self->{session_key};
+	
+	my ($sessionExists, $keyMatches, $timestampValid) = $self->check_session($user_id, $session_key, 1);
+	debug("sessionExists='", $sessionExists, "' keyMatches='", $keyMatches, "' timestampValid='", $timestampValid, "'");
+	
+	if ($keyMatches and $timestampValid) {
+		return 1;
+	} else {
+		my $auth_result = $self->authenticate;
 		
-		# -- here we know it's a regular user. --
-		
-		# a key was supplied.
-		if ($key) {
-			# we're not interested in a user's password if they're
-			# supplying a key
-			$r->param("passwd", "");
-			
-			if ($self->checkKey($user, $key)) {
-				# valid key, so succeed.
-				last VERIFY;
-			} else {
-				# invalid key. the login page doesn't propogate the key,
-				# so we know this is an expired session.
-				$error = "Your session has timed out due to inactivity. You must login again.";
-				last VERIFY;
+		if ($auth_result > 0) {
+			$self->{session_key} = $self->create_session($user_id);
+			$self->{initial_login} = 1;
+			return 1;
+		} elsif ($auth_result == 0) {
+			$self->{log_error} = "authentication failed";
+			$self->{error} = $GENERIC_ERROR_MESSAGE;
+			return 0;
+		} else { # ($auth_result < 0) => required data was not present
+			if ($keyMatches and not $timestampValid) {
+				$self->{error} = $r->maketext("Your session has timed out due to inactivity. Please log in again.");
 			}
+			return 0;
 		}
-		
-		# a password was supplied.
-		if ($passwd) {
-			if ($self->checkPassword($user, $passwd)) {
-				# valid password, so create a new session. (we don't want
-				# to reuse an old one, duh.)
-				my $Key = $self->generateKey($user);
-				eval { $db->deleteKey($user) };
-				$db->addKey($Key);
-				$r->param("key", $Key->key());
-				# also delete the password
-				$r->param("passwd", "");
-				last VERIFY;
+	}
+}
+
+#  1 == authentication succeeded
+#  0 == required data was present, but authentication failed
+# -1 == required data was not present (i.e. password missing)
+sub authenticate {
+	my $self = shift;
+	my $r = $self->{r};
+	
+	my $user_id = $self->{user_id};
+	my $password = $self->{password};
+	
+	if (defined $password) {
+		return $self->checkPassword($user_id, $password);
+	} else {
+		return -1;
+	}
+}
+
+sub maybe_send_cookie {
+	my $self = shift;
+	my $r = $self->{r};
+	
+	my ($cookie_user, $cookie_key) = $self->fetchCookie;
+	
+	# we send a cookie if any of these conditions are met:
+	
+	# (a) a cookie was used for authentication
+	my $used_cookie = ($self->{credential_source} eq "cookie");
+	
+	# (b) a cookie was sent but not used for authentication, and the
+	#     credentials used for authentication were the same as those in
+	#     the cookie
+	my $unused_valid_cookie = ($self->{credential_source} ne "cookie"
+		and defined $cookie_user and $self->{user_id} eq $cookie_user
+		and defined $cookie_key and $self->{session_key} eq $cookie_key);
+	
+	# (c) the user asked to have a cookie sent and is not a guest user.
+	my $user_requests_cookie = ($self->{login_type} ne "guest"
+		and $r->param("send_cookie"));
+	
+	debug("used_cookie='", $used_cookie, "' unused_valid_cookie='", $unused_valid_cookie, "' user_requests_cookie='", $user_requests_cookie, "'");
+	
+	if ($used_cookie or $unused_valid_cookie or $user_requests_cookie) {
+		$self->sendCookie($self->{user_id}, $self->{session_key});
+	} else {
+		$self->killCookie;
+	}
+}
+
+sub maybe_kill_cookie {
+	my $self = shift;
+	$self->killCookie(@_);
+}
+
+sub set_params {
+	my $self = shift;
+	my $r = $self->{r};
+	
+	# A2 - params are not non-modifiable, with no explanation or workaround given in docs. WTF!
+	$r->param("user", $self->{user_id});
+	$r->param("key", $self->{session_key});
+	$r->param("passwd", "");
+	
+	debug("params user='", $r->param("user"), "' key='", $r->param("key"), "' passwd='", $r->param("passwd"), "'");
+}
+
+################################################################################
+# Password management
+################################################################################
+
+sub checkPassword {
+	my ($self, $userID, $possibleClearPassword) = @_;
+	my $db = $self->{r}->db;
+	
+	my $Password = $db->getPassword($userID); # checked
+	if (defined $Password) {
+		# check against WW password database
+		my $possibleCryptPassword = crypt $possibleClearPassword, $Password->password;
+		if ($possibleCryptPassword eq $Password->password) {
+			$self->write_log_entry("AUTH WWDB: password accepted");
+			return 1;
+		} else {
+			if ($self->can("site_checkPassword")) {
+				$self->write_log_entry("AUTH WWDB: password rejected, deferring to site_checkPassword");
+				return $self->site_checkPassword($userID, $possibleClearPassword);
 			} else {
-				# incorrect password. fail.
-				$error = "Incorrect username or password.";
-				last VERIFY;
+				$self->write_log_entry("AUTH WWDB: password rejected");
+				return 0;
 			}
 		}
-		
-		# neither a key or a password were supplied.
-		$error = "You must enter a password."
+	} else {
+		$self->write_log_entry("AUTH WWDB: user has no password record");
+		return 0;
 	}
+}
+
+# Site-specific password checking
+# 
+# The site_checkPassword routine can be used to provide a hook to your institution's
+# authentication system. If authentication against the  course's password database, the
+# method $self->site_checkPassword($userID, $clearTextPassword) is called. If this
+# method returns a true value, authentication succeeds.
+# 
+# Here is an example site_checkPassword which checks the password against the Ohio State
+# popmail server:
+# 	sub site_checkPassword {
+# 		my ($self, $userID, $clearTextPassword) = @_;
+# 		use Net::POP3;
+# 		my $pop = Net::POP3->new('pop.service.ohio-state.edu', Timeout => 60);
+# 		if ($pop->login($userID, $clearTextPassword)) {
+# 			return 1;
+# 		}
+# 		return 0;
+# 	}
+# 
+# Since you have access to the WeBWorK::Authen object, the possibilities are limitless!
+# This example checks the password against the system password database and updates the
+# user's password in the course database if it succeeds:
+# 	sub site_checkPassword {
+# 		my ($self, $userID, $clearTextPassword) = @_;
+# 		my $realCryptPassword = (getpwnam $userID)[1] or return 0;
+# 		my $possibleCryptPassword = crypt($possibleClearPassword, $realCryptPassword); # user real PW as salt
+# 		if ($possibleCryptPassword eq $realCryptPassword) {
+# 			# update WeBWorK password
+# 			use WeBWorK::Utils qw(cryptPassword);
+# 			my $db = $self->{r}->db;
+# 			my $Password = $db->getPassword($userID);
+# 			my $pass = cryptPassword($clearTextPassword);
+# 			$Password->password($pass);
+# 			$db->putPassword($Password);
+# 			return 1;
+# 		} else {
+# 			return 0;
+# 		}
+# 	}
+
+################################################################################
+# Session key management
+################################################################################
+
+sub unexpired_session_exists {
+	my ($self, $userID) = @_;
+	my $ce = $self->{r}->ce;
+	my $db = $self->{r}->db;
 	
-	if (defined $error) {
-		$r->notes("authen_error",$error);
-		return 0;
+	my $Key = $db->getKey($userID); # checked
+	return 0 unless defined $Key;
+	if (time <= $Key->timestamp()+$ce->{sessionKeyTimeout}) {
+		# unexpired, but leave timestamp alone
+		return 1;
 	} else {
-		return not $failWithoutError;
+		# expired -- delete key
+		# NEW: no longer delete the key here -- a user re-visiting with a formerly-valid key should
+		# always get a "session expired" message. formerly, if they i.e. reload the login screen
+		# the message disappears, which is confusing (i claim ;)
+		#$db->deleteKey($userID);
+		return 0;
+	}
+}
+
+# clobbers any existing session for this $userID
+# if $newKey is not specified, a random key is generated
+# the key is returned
+sub create_session {
+	my ($self, $userID, $newKey) = @_;
+	my $ce = $self->{r}->ce;
+	my $db = $self->{r}->db;
+	
+	my $timestamp = time;
+	unless ($newKey) {
+		my @chars = @{ $ce->{sessionKeyChars} };
+		my $length = $ce->{sessionKeyLength};
+		
+		srand;
+		$newKey = join ("", @chars[map rand(@chars), 1 .. $length]);
 	}
 	
-	# Whatever you do, don't delete this!
-	critical($r);
+	my $Key = $db->newKey(user_id=>$userID, key=>$newKey, timestamp=>$timestamp);
+	# DBFIXME this should be a REPLACE
+	eval { $db->deleteKey($userID) };
+	$db->addKey($Key);
+	return $newKey;
 }
 
-1;
+# returns ($sessionExists, $keyMatches, $timestampValid)
+# if $updateTimestamp is true, the timestamp on a valid session is updated
+sub check_session {
+	my ($self, $userID, $possibleKey, $updateTimestamp) = @_;
+	my $ce = $self->{r}->ce;
+	my $db = $self->{r}->db;
+	
+	my $Key = $db->getKey($userID); # checked
+	return 0 unless defined $Key;
+	
+	my $keyMatches = (defined $possibleKey and $possibleKey eq $Key->key);
+	my $timestampValid = (time <= $Key->timestamp()+$ce->{sessionKeyTimeout});
+	
+	if ($keyMatches and $timestampValid and $updateTimestamp) {
+		$Key->timestamp(time);
+		$db->putKey($Key);
+	}
+	
+	return (1, $keyMatches, $timestampValid);
+}
+
+################################################################################
+# Cookie management
+################################################################################
+
+sub fetchCookie {
+	my $self = shift;
+	my $r = $self->{r};
+	my $ce = $r->ce;
+	my $urlpath = $r->urlpath;
+	
+	my $courseID = $urlpath->arg("courseID");
+	
+	# AP2 - Apache2::Cookie needs $r, Apache::Cookie doesn't
+    #my %cookies = WeBWorK::Cookie->fetch( MP2 ? $r : () );
+    #my $cookie = $cookies{"WeBWorKCourseAuthen.$courseID"};
+	
+	my $cookie = undef;
+	if (MP2) {
+		
+		my $jar = undef;
+ 		eval {
+       			$jar = $r->jar; #table of cookies
+  		};
+  		if (ref $@ and $@->isa("APR::Request::Error") ) {
+			debug("Error parsing cookies, will use a partial result");
+     			$jar = $@->jar; # table of successfully parsed cookies
+  		};
+		if ($jar) {
+			$cookie = uri_unescape( $jar->get("WeBWorKCourseAuthen.$courseID") );
+		};
+	} else {
+		my %cookies = WeBWorK::Cookie->fetch();
+		$cookie = $cookies{"WeBWorKCourseAuthen.$courseID"};
+		if ($cookie) {
+			debug("found a cookie for this course: '", $cookie->as_string, "'");
+			$cookie = $cookie->value;
+		}
+	}
+
+	if ($cookie) {
+        #debug("found a cookie for this course: '", $cookie->as_string, "'");
+        #debug("cookie has this value: '", $cookie->value, "'");
+        #my ($userID, $key) = split "\t", $cookie->value;
+        debug("cookie has this value: '", $cookie, "'");
+        my ($userID, $key) = split "\t", $cookie;
+		if (defined $userID and defined $key and $userID ne "" and $key ne "") {
+			debug("looks good, returning userID='$userID' key='$key'");
+			return $userID, $key;
+		} else {
+			debug("malformed cookie. returning nothing.");
+			return;
+		}
+	} else {
+		debug("found no cookie for this course. returning nothing.");
+		return;
+	}
+}
+
+sub sendCookie {
+	my ($self, $userID, $key) = @_;
+	my $r = $self->{r};
+	my $ce = $r->ce;
+	
+	my $courseID = $r->urlpath->arg("courseID");
+	
+	my $expires = time2str("%a, %d-%h-%Y %H:%M:%S %Z", time+COOKIE_LIFESPAN, "GMT");
+	my $cookie = WeBWorK::Cookie->new($r,
+		-name    => "WeBWorKCourseAuthen.$courseID",
+		-value   => "$userID\t$key",
+		-expires => $expires,
+		-domain  => $r->hostname,
+		-path    => $ce->{webworkURLRoot},
+		-secure  => 0,
+	);
+	
+	debug("about to add Set-Cookie header with this string: '", $cookie->as_string, "'");
+	$r->headers_out->set("Set-Cookie" => $cookie->as_string);
+}
 
-__END__
+sub killCookie {
+	my ($self) = @_;
+	my $r = $self->{r};
+	my $ce = $r->ce;
+	
+	my $courseID = $r->urlpath->arg("courseID");
+	
+	my $expires = time2str("%a, %d-%h-%Y %H:%M:%S %Z", time-60*60*24, "GMT");
+	my $cookie = WeBWorK::Cookie->new($r,
+		-name => "WeBWorKCourseAuthen.$courseID",
+		-value => "\t",
+		-expires => $expires,
+		-domain => $r->hostname,
+		-path => $ce->{webworkURLRoot},
+		-secure => 0,
+	);
+	
+	debug("about to add Set-Cookie header with this string: '", $cookie->as_string, "'");
+	$r->headers_out->set("Set-Cookie" => $cookie->as_string);
+}
 
-=head1 AUTHOR
+################################################################################
+# Utilities
+################################################################################
 
-Written by Dennis Lambe Jr., malsyned (at) math.rochester.edu, and Sam Hathaway, sh002i (at) math.rochester.edu.
+sub write_log_entry {
+	my ($self, $message) = @_;
+	my $r = $self->{r};
+	my $ce = $r->ce;
+	
+	my $user_id = defined $self->{user_id} ? $self->{user_id} : "";
+	my $login_type = defined $self->{login_type} ? $self->{login_type} : "";
+	my $credential_source = defined $self->{credential_source} ? $self->{credential_source} : "";
+	
+	my ($remote_host, $remote_port);
+	if (MP2) {
+		$remote_host = $r->connection->remote_addr->ip_get || "UNKNOWN";
+		$remote_port = $r->connection->remote_addr->port || "UNKNOWN";
+	} else {
+		($remote_port, $remote_host) = unpack_sockaddr_in($r->connection->remote_addr);
+		$remote_host = defined $remote_host ? inet_ntoa($remote_host) : "UNKNOWN";
+		$remote_port = "UNKNOWN" unless defined $remote_port;
+	}
+	my $user_agent = $r->headers_in->{"User-Agent"};
+	
+	my $log_msg = "$message user_id=$user_id login_type=$login_type credential_source=$credential_source host=$remote_host port=$remote_port UA=$user_agent";
+	debug("Writing to login log: '$log_msg'.\n");
+	writeCourseLog($ce, "login_log", $log_msg);
+}
 
-=cut
+1;
diff --git a/lib/WeBWorK/Authen/Cosign.pm b/lib/WeBWorK/Authen/Cosign.pm
new file mode 100644
index 0000000000..d1b8d152ff
--- /dev/null
+++ b/lib/WeBWorK/Authen/Cosign.pm
@@ -0,0 +1,137 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/Authen/Cosign.pm,v 1.2 2007/03/27 17:06:04 glarose 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::Authen::Cosign;
+use base qw/WeBWorK::Authen/;
+
+=head1 NAME
+
+WeBWorK::Authen::Cosign - Authentication plug in for cosign
+
+to use: include in global.conf or course.conf
+  $authen{user_module} = "WeBWorK::Authen::Cosign";
+and add /webwork2 or /webwork2/courseName as a CosignProtected
+Location
+
+if $r->ce->{cosignoff} is set for a course, authentication reverts
+to standard WeBWorK authentication.
+
+=cut
+
+use strict;
+use warnings;
+use WeBWorK::Debug;
+
+# this is similar to the method in the base class, except that cosign 
+# ensures that we don't get to the address without a login.  this means
+# that we can't allow guest logins, but don't have to do any password
+# checking or cookie management.
+
+sub get_credentials {
+	my ($self) = @_;
+	my $r = $self->{r};
+	my $ce = $r->ce;
+	my $db = $r->db;
+	
+	if ( $ce->{cosignoff} ) {
+		return $self->SUPER::get_credentials( @_ );
+	} else {
+		if ( defined( $ENV{'REMOTE_USER'} ) ) {
+			$self->{'user_id'} = $ENV{'REMOTE_USER'};
+			$self->{r}->param("user", $ENV{'REMOTE_USER'});
+		} else {
+			return 0;
+		}
+		# set external auth parameter so that Login.pm knows
+		#    not to rely on internal logins if there's a check_user
+		#    failure.
+		$self->{external_auth} = 1;
+
+		# the session key isn't used (cosign is managing this 
+		#    for us), and we want to force checking against the 
+		#    site_checkPassword
+		$self->{'session_key'} = undef;
+		$self->{'password'} = 1;
+		$self->{'credential_source'} = "params";
+
+		return 1;
+	}
+}
+
+sub site_checkPassword { 
+	my ( $self, $userID, $clearTextPassword ) = @_;
+
+	if ( $self->{r}->ce->{cosignoff} ) {
+		return $self->SUPER::checkPassword( @_ );
+	} else {
+		# this is easy; if we're here at all, we've authenticated
+		# through cosign
+		return 1;
+	}
+}
+
+# disable cookie functionality
+sub maybe_send_cookie {
+	my ($self, @args) = @_;
+	if ( $self->{r}->ce->{cosignoff} ) {
+		return $self->SUPER::maybe_send_cookie( @_ );
+	} else {
+		# nothing to do here
+	}
+}
+sub fetchCookie {
+	my ($self, @args) = @_;
+	if ( $self->{r}->ce->{cosignoff} ) {
+		return $self->SUPER::fetchCookie( @_ );
+	} else {
+		# nothing to do here
+	}
+}
+sub sendCookie {
+	my ($self, @args) = @_;
+	if ( $self->{r}->ce->{cosignoff} ) {
+		return $self->SUPER::sendCookie( @_ );
+	} else {
+		# nothing to do here
+	}
+}
+sub killCookie {
+	my ($self, @args) = @_;
+	if ( $self->{r}->ce->{cosignoff} ) {
+		return $self->SUPER::killCookie( @_ );
+	} else {
+		# nothing to do here
+	}
+}
+
+# this is a bit of a cheat, because it does the redirect away from the
+#   logout script or what have you, but I don't see a way around that.
+sub forget_verification { 
+	my ($self, @args) = @_;
+	my $r = $self->{r};
+
+	if ( $r->ce->{cosignoff} ) {
+		return $self->SUPER::forget_verification( @_ );
+	} else {
+		$self->{was_verified} = 0;
+#		$r->headers_out->{"Location"} = $r->ce->{cosign_logout_script};
+#		$r->send_http_header;
+#		return;
+		$self->{redirect} = $r->ce->{cosign_logout_script};
+	}
+}
+
+1;
diff --git a/lib/WeBWorK/Authen/LDAP.pm b/lib/WeBWorK/Authen/LDAP.pm
new file mode 100644
index 0000000000..190c8ecf8d
--- /dev/null
+++ b/lib/WeBWorK/Authen/LDAP.pm
@@ -0,0 +1,127 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/Authen/LDAP.pm,v 1.4 2007/08/13 22:59:54 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::Authen::LDAP;
+use base qw/WeBWorK::Authen/;
+
+use strict;
+use warnings;
+use WeBWorK::Debug;
+use Net::LDAP qw/LDAP_INVALID_CREDENTIALS/;
+
+sub checkPassword {
+	my ($self, $userID, $possibleClearPassword) = @_;
+	my $ce = $self->{r}->ce;
+	my $failover = $ce->{authen}{ldap_options}{failover};
+	
+	debug("LDAP module is doing the password checking.\n");
+	
+	# check against LDAP server
+	my $ret = $self->ldap_authen_uid($userID, $possibleClearPassword);
+	return 1 if ($ret == 1);
+
+    #return 0 if ($userID !~ /admin/);
+	
+	# optional: fail over to superclass checkPassword
+	if (($failover eq "all" or $failover == 1) || ($failover eq "local" and $ret < 0)) {
+		$self->write_log_entry("AUTH LDAP: authentication failed, deferring to superclass");
+		return $self->SUPER::checkPassword($userID, $possibleClearPassword);
+	}
+	
+	# fail by default
+	return 0;
+}
+
+sub ldap_authen_uid {
+	my ($self, $uid, $password) = @_;
+	my $ce = $self->{r}->ce;
+	my $hosts = $ce->{authen}{ldap_options}{net_ldap_hosts};
+	my $opts = $ce->{authen}{ldap_options}{net_ldap_opts};
+	my $base = $ce->{authen}{ldap_options}{net_ldap_base};
+        my $searchdn = $ce->{authen}{ldap_options}{searchDN};
+	my $bindAccount = $ce->{authen}{ldap_options}{bindAccount};
+        my $bindpassword = $ce->{authen}{ldap_options}{bindPassword};
+	# Be backwards-compatible with releases that hardcode this value.
+	my $rdn = "sAMAccountName";
+	if (defined $ce->{authen}{ldap_options}{net_ldap_rdn}) {
+		$rdn = $ce->{authen}{ldap_options}{net_ldap_rdn};
+	}
+
+
+	
+	# connect to LDAP server
+	my $ldap = new Net::LDAP($hosts, @$opts);
+	if (not defined $ldap) {
+		warn "AUTH LDAP: couldn't connect to any of ", join(", ", @$hosts), ".\n";
+		return 0;
+	}
+	
+	my $msg;
+	
+	
+	if($bindAccount){
+        # bind with a bind USER
+        	$msg = $ldap->bind( $searchdn, password => $bindpassword );
+        	if ($msg->is_error) {
+                	warn "AUTH LDAP: bind error ", $msg->code, ": ", $msg->error_text, ".\n";
+                	return 0;
+		}
+	}
+	else{
+	# bind anonymously
+		$msg = $ldap->bind;
+		if ($msg->is_error) {
+			warn "AUTH LDAP: bind error ", $msg->code, ": ", $msg->error_text, ".\n";
+			return 0;
+		}	
+	}
+	
+	# look up user's DN
+	$msg = $ldap->search(base => $base, filter => "$rdn=$uid");
+	if ($msg->is_error) {
+		warn "AUTH LDAP: search error ", $msg->code, ": ", $msg->error_text, ".\n",$searchdn,"\n",$base,"\n",$uid,"\n";
+		return 0;
+	}
+	if ($msg->count > 1) {
+		warn "AUTH LDAP: more than one result returned when searching for UID '$uid'.\n";
+		return 0;
+	}
+	if ($msg->count == 0) {
+		$self->write_log_entry("AUTH LDAP: UID not found");
+		return -1;
+	}
+	my $dn = $msg->shift_entry->dn;
+	if (not defined $dn) {
+		warn "AUTH LDAP: got null DN when looking up UID '$uid'.\n";
+		return 0;
+	}
+	
+	# re-bind as user. if that works, we've authenticated!
+	$msg = $ldap->bind($dn, password => $password);
+	if ($msg->code == LDAP_INVALID_CREDENTIALS) {
+		$self->write_log_entry("AUTH LDAP: server rejected password for UID.");
+		return 0;
+	}
+	if ($msg->is_error) {
+		warn "AUTH LDAP: bind error ", $msg->code, ": ", $msg->error_text, ".\n";
+		return 0;
+	}
+	
+	# it worked! we win!
+	return 1;
+}
+
+1;
diff --git a/lib/WeBWorK/Authen/Moodle.pm b/lib/WeBWorK/Authen/Moodle.pm
new file mode 100644
index 0000000000..37f752e8b4
--- /dev/null
+++ b/lib/WeBWorK/Authen/Moodle.pm
@@ -0,0 +1,262 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/Authen/Moodle.pm,v 1.14 2007/02/14 19:08:46 gage 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::Authen::Moodle;
+use base qw/WeBWorK::Authen/;
+
+=head1 NAME
+
+WeBWorK::Authen::Moodle - Allow moodle cookies to be used for WeBWorK authentication.
+
+=cut
+
+=for comment
+
+TODO
+
+* Modules that modify data that's being taken from moodle should check for "alternative URLs" in the
+CE that can point back to the moodle installation. operations include: change password, change user
+data, change permission level, add user, delete user. Run this for a rough estimate:
+	pcregrep -r '\$db->(add|put)(User|Password|PermissionLevel)\b' lib
+
+=cut
+
+use strict;
+use warnings;
+use Digest::MD5 qw/md5_hex/;
+use WeBWorK::Cookie;
+use WeBWorK::Debug;
+use Date::Parse; # for moodle 1.7 date parsing
+
+use mod_perl;
+use constant MP2 => ( exists $ENV{MOD_PERL_API_VERSION} and $ENV{MOD_PERL_API_VERSION} >= 2 );
+
+sub new {
+	my $self = shift->SUPER::new(@_);
+	
+	$self->init_mdl_session;
+	
+	return $self;
+}
+
+# call superclass get_credentials. if no credentials were found, look for a moodle cooke.
+# if a moodle cookie is found, a new webwork session is created and the session key is used.
+# (this is similar to what happens when a guest user is selected.)
+sub get_credentials {
+	my $self = shift;
+	my $r = $self->{r};
+	
+	my $super_result = $self->SUPER::get_credentials;
+	if ($super_result) {
+		debug("Superclass's get_credentials found credentials. Using them.\n");
+		return $super_result;
+	}
+	
+	my ($moodle_user_id, $moodle_expiration_time) = $self->fetch_moodle_session;
+	#debug("fetch_moodle_session returned: moodle_user_id='$moodle_user_id' moodle_expiration_time='$moodle_expiration_time'.\n"); # causes errors when undefined
+	
+	if (defined $moodle_user_id and defined $moodle_expiration_time and time <= $moodle_expiration_time) {
+		my $newKey = $self->create_session($moodle_user_id);
+		debug("Unexpired moodle session found. Created new WeBWorK session with newKey='$newKey'.\n");
+		
+		$self->{user_id} = $moodle_user_id;
+		$self->{session_key} = $newKey;
+		$self->{login_type} = "normal";
+		$self->{credential_source} = "moodle";
+		return 1;
+	} else {
+		debug("No moodle session found or moodle session expired. No credentials to be had.\n");
+		warn("No moodle session found or moodle sessioin expired.  If this happens repeatedly and you are constantly being asked
+		      to log back in ask your moodle admin to check that the Moodle item: 
+		      Server -> Session Handling -> dbsessions (Use database for session information) has been checked.");
+	}
+	
+	return 0;
+}
+
+# extend the moodle session if authentication succeeded
+sub site_fixup {
+	my $self = shift;
+	
+	if ($self->was_verified) {
+		debug("User was verified, updating moodle session.\n");
+		$self->update_moodle_session;
+	}
+}
+
+# we assume that the database is set up to use the moodle password table, which uses MD5 passwords.
+# this is overridden to accommodate this.
+sub checkPassword {
+	my ($self, $userID, $possibleClearPassword) = @_;
+	my $db = $self->{r}->db;
+	
+	debug("Moodle module is doing the password checking.\n");
+	
+	my $Password = $db->getPassword($userID); # checked
+	if (defined $Password) {
+		# check against Moodle password database
+		my $possibleMD5Password = md5_hex($possibleClearPassword);
+		debug("Hashed password from supplied cleartext: '$possibleMD5Password'.\n");
+		debug("Hashed password from Password record: '", $Password->password, "'.\n");
+		if ($possibleMD5Password eq $Password->password) {
+			$self->write_log_entry("AUTH MDL: password accepted");
+			return 1;
+		} else {
+			if ($self->can("site_checkPassword")) {
+				$self->write_log_entry("AUTH MDL: password rejected, deferring to site_checkPassword");
+				return $self->site_checkPassword($userID, $possibleClearPassword);
+			} else {
+				$self->write_log_entry("AUTH MDL: password rejected");
+				return 0;
+			}
+		}
+		
+	}
+}
+
+sub check_session {
+	my ($self, $user_id, $session_key, $update_timestamp) = @_;
+	
+	my ($sessionExists, $keyMatches, $timestampValid) = $self->SUPER::check_session($user_id, $session_key, $update_timestamp);
+	debug("SUPER::check_session returned: sessionExists='", $sessionExists, "' keyMatches='", $keyMatches, "' timestampValid='", $timestampValid, "'");
+	
+	if ($update_timestamp and $sessionExists and $keyMatches and not $timestampValid) {
+		debug("special case: webwork key matches an expired session (check for a unexpired moodle session)");
+		my ($moodle_user_id, $moodle_expiration_time) = $self->fetch_moodle_session;
+		debug("fetch_moodle_session returned: moodle_user_id='$moodle_user_id' moodle_expiration_time='$moodle_expiration_time'.\n");
+		if (defined $moodle_user_id and $moodle_user_id eq $user_id
+				and defined $moodle_expiration_time and time <= $moodle_expiration_time) {
+			$self->{session_key} = $self->create_session($moodle_user_id);
+			$timestampValid = 1;
+		}
+	}
+	
+	return $sessionExists, $keyMatches, $timestampValid;
+}
+
+################################################################################
+
+use DBI;
+use PHP::Serialization qw/unserialize/;
+
+use constant DEFAULT_EXPIRY => 7200;
+
+sub init_mdl_session {
+	my $self = shift;
+	
+	# version-specific stuff
+	$self->{moodle17} = $self->{r}->ce->{authen}{moodle_options}{moodle17};
+	$self->{sql_session_table} = $self->{moodle17} ? "sessions2" : "sessions";
+	$self->{sql_data_field} = $self->{moodle17} ? "sessdata" : "data";
+	
+	$self->{mdl_dbh} = DBI->connect_cached(
+		$self->{r}->ce->{authen}{moodle_options}{dsn},
+		$self->{r}->ce->{authen}{moodle_options}{username},
+		$self->{r}->ce->{authen}{moodle_options}{password},
+		{
+			PrintError => 0,
+			RaiseError => 1,
+		},
+	);
+	die $DBI::errstr unless defined $self->{mdl_dbh};
+}
+
+sub fetch_moodle_session {
+	# fetches the basic information from the moodle session.
+	# returns the user name and expiration time of the moodle session
+	# Note that we don't worry about the user being in this course at this point.
+	# That is taken care of in Schema::Moodle::User.
+	my ($self) = @_;
+	my $r = $self->{r};
+	my $db = $r->db;
+	
+	my %cookies = WeBWorK::Cookie->fetch( MP2 ? $r : () );
+	my $cookie = $cookies{"MoodleSession"};
+	return unless $cookie;
+	
+	my $session_table = $self->prefix_table($self->{sql_session_table});
+	my $data_field = $self->{sql_data_field};
+	my $stmt = "SELECT `expiry`,`$data_field` FROM `$session_table` WHERE `sesskey`=?";
+	my @bind_vals = $cookie->value;
+	
+	my $sth = $self->{mdl_dbh}->prepare_cached($stmt, undef, 3); # 3: see DBI docs
+	$sth->execute(@bind_vals);
+	my $row = $sth->fetchrow_arrayref;
+	$sth->finish;
+	return unless defined $row;
+	
+	my ($expires, $data_string) = @$row;
+	
+	# Moodle 1.7 stores expiry as a DATETIME, but WeBWorK wants a UNIX timestamp.
+	$expires = str2time($expires) if $self->{moodle17};
+	
+	my $data = unserialize_session($data_string);
+	my $username = $data->{"USER"}{"username"};
+	
+	return $username, $expires;
+}
+
+sub update_moodle_session {
+	# extend the timeout of the current moodle session, if one exists.
+	my ($self) = @_;
+	my $r = $self->{r};
+	my $db = $r->db;
+	
+	my %cookies = WeBWorK::Cookie->fetch( MP2 ? $r : () );
+	my $cookie = $cookies{"MoodleSession"};
+	return unless $cookie;
+	
+	my $config_table = $self->prefix_table("config");
+	my $value = "IFNULL((SELECT `value` FROM `$config_table` WHERE `name`=?),?)+?";
+	
+	# Moodle 1.7 stores expiry as a DATETIME, but WeBWorK supplies a UNIX timestamp.
+	$value = "FROM_UNIXTIME($value)" if $self->{moodle17};
+	
+	my $session_table = $self->prefix_table($self->{sql_session_table});
+	my $stmt = "UPDATE `$session_table` SET `expiry`=$value WHERE `sesskey`=?";
+	my @bind_vals = ("sessiontimeout", DEFAULT_EXPIRY, time, $cookie->value);
+	
+	my $sth = $self->{mdl_dbh}->prepare_cached($stmt, undef, 3); # 3: see DBI docs
+	my $result = $sth->execute(@bind_vals);
+	$sth->finish;
+	
+	return defined $result;
+}
+
+sub prefix_table {
+	my ($self, $base) = @_;
+	if (defined $self->{r}->ce->{authen}{moodle_options}{table_prefix}) {
+		return $self->{r}->ce->{authen}{moodle_options}{table_prefix} . $base;
+	} else {
+		return $base;
+	}
+}
+
+sub unserialize_session {
+	my $serialData = shift;
+	# first, url decode:
+	$serialData =~ s/\%([A-Fa-f0-9]{2})/pack('C', hex($1))/seg;
+	# then, split it up by |, it's some ADODB sillyness
+	my @serialArray = split(/(\w+)\|/, $serialData);
+	my %variables;
+	# finally, actually deserialize it:
+	for( my $i = 1; $i < $#serialArray; $i += 2 ) {
+		$variables{$serialArray[$i]} = unserialize($serialArray[$i+1]);
+	}
+	return \%variables;
+}
+
+1;
diff --git a/lib/WeBWorK/Authen/Proctor.pm b/lib/WeBWorK/Authen/Proctor.pm
new file mode 100644
index 0000000000..607c7775b0
--- /dev/null
+++ b/lib/WeBWorK/Authen/Proctor.pm
@@ -0,0 +1,185 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/Authen/Proctor.pm,v 1.5 2007/04/04 15:05:27 glarose 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::Authen::Proctor;
+use base qw/WeBWorK::Authen/;
+
+=head1 NAME
+
+WeBWorK::Authen::Proctor - Authenticate gateway test proctors.
+
+=cut
+
+use strict;
+use warnings;
+use WeBWorK::Debug;
+use WeBWorK::DB::Utils qw(grok_vsetID);
+
+use constant GENERIC_ERROR_MESSAGE => "Invalid user ID or password.";
+
+## this is only overridden for debug logging
+#sub verify {
+#	debug("BEGIN PROCTOR VERIFY");
+#	my $result = $_[0]->SUPER::verify(@_[1..$#_]);
+#	debug("END PROCTOR VERIFY");
+#	return $result;
+#}
+
+# this is similar to the method in the base class, with these differences:
+#  1. no guest logins
+#  2. no cookie
+#  3. user_id/session_key/password come from params proctor_user/proctor_key/proctor_passwd
+sub get_credentials {
+	my ($self) = @_;
+	my $r = $self->{r};
+	my $ce = $r->ce;
+	my $db = $r->db;
+
+	my $urlpath = $r->urlpath;
+	my ($set_id, $version_id) = grok_vsetID( $urlpath->arg('setID') );
+	
+	# at least the user ID is available in request parameters
+	if (defined $r->param("proctor_user")) {
+		my $student_user_id = $r->param("effectiveUser");
+		$self->{user_id} = $r->param("proctor_user");
+		if ( $self->{user_id} eq $set_id ) {
+			$self->{user_id} = "set_id:$set_id";
+		}
+		$self->{session_key} = $r->param("proctor_key");
+		$self->{password} = $r->param("proctor_passwd");
+		$self->{login_type} = $r->param("submitAnswers") 
+			? "proctor_grading:$student_user_id" 
+			: "proctor_login:$student_user_id";
+		$self->{credential_source} = "params";
+		return 1;
+	}
+}
+
+# duplicates method in superclass, adding additional check for permission 
+#    to proctor quizzes
+sub check_user {
+	my $self = shift;
+	my $r = $self->{r};
+	my $ce = $r->ce;
+	my $db = $r->db;
+	my $authz = $r->authz;
+
+	my $submitAnswers = $r->param("submitAnswers");
+	my $user_id = $self->{user_id};
+	my $past_proctor_id = $r->param("past_proctor_user") || $user_id;
+
+	# for set-level authentication we prepended "set_id:"
+	my $show_user_id = $user_id;
+	$show_user_id =~ s/^set_id://;
+
+	if (defined $user_id and ($user_id eq "" || $show_user_id eq "")) {
+		$self->{log_error} = "no user id specified";
+		$self->{error} = "You must specify a user ID.";
+		return 0;
+	}
+	
+	my $User = $db->getUser($user_id);
+	
+	unless ($User) {
+		$self->{log_error} = "user unknown";
+		$self->{error} = GENERIC_ERROR_MESSAGE;
+		return 0;
+	}
+	
+	# proctors may be tas, instructors, or proctors; if the last, they
+	#    do not have the behavior course_access, so we don't bother to 
+	#    check that here.  they must, however, be able to login, which 
+	#    it seems to me is an overlap between course permissions and 
+	#    course status behaviors.
+
+	unless ($authz->hasPermissions($user_id, "login")) {
+		$self->{log_error} = "user not permitted to login";
+		$self->{error} = GENERIC_ERROR_MESSAGE;
+		return 0;
+	}
+
+	if ( $submitAnswers ) {
+		unless ($authz->hasPermissions($user_id,"proctor_quiz_grade")) {
+			# only set the error if this proctor is different 
+			#    than the past proctor, implying that we have
+			#    tried to grade with a new proctor id
+			if ( $past_proctor_id ne $user_id ) {
+				$self->{log_error} = "user not permitted " .
+				    "to proctor quiz grading.";
+				$self->{error} = "User $show_user_id is not " .
+				    "authorized to proctor test grade " .
+				    "submissions in this course.";
+			}
+				
+			return 0;
+		}
+	} else {
+		unless ($authz->hasPermissions($user_id,"proctor_quiz_login")) {
+			$self->{log_error} =  "user not permitted to proctor " .
+				"quiz logins.";
+			$self->{error} = "User $show_user_id is not " .
+				"authorized to proctor test logins in this " .
+				"course.";
+			return 0;
+		}
+	} 
+}
+
+# this is similar to the method in the base class, excpet that the parameters
+# proctor_user, proctor_key, and proctor_passwd are used
+sub set_params {
+	my $self = shift;
+	my $r = $self->{r};
+	
+	$r->param("proctor_user", $self->{user_id});
+	$r->param("proctor_key", $self->{session_key});
+	$r->param("proctor_passwd", "");
+}
+
+# rewrite the userID to include both the proctor's and the student's user ID
+# and then call the default create_session method.
+sub create_session {
+	my ($self, $userID, $newKey) = @_;
+	
+	return $self->SUPER::create_session($self->proctor_key_id($userID), $newKey);
+}
+
+# rewrite the userID to include bith the proctor's and the student's user ID
+# and then call the default check_session method.
+sub check_session {
+	my ($self, $userID, $possibleKey, $updateTimestamp) = @_;
+	
+	return $self->SUPER::check_session($self->proctor_key_id($userID), $possibleKey, $updateTimestamp);
+}
+
+# proctor key ID rewriting helper
+sub proctor_key_id {
+	my ($self, $userID, $newKey) = @_;
+	my $r = $self->{r};
+	
+	my $proctor_key_id = $r->param("effectiveUser") . "," . $userID;
+	$proctor_key_id .= ",g" if $self->{login_type} =~ /^proctor_grading/;
+	
+	return $proctor_key_id;
+}
+
+# disable cookie functionality for proctors
+sub maybe_send_cookie {}
+sub fetchCookie {}
+sub sendCookie {}
+sub killCookie {}
+
+1;
diff --git a/lib/WeBWorK/Authen/Shibboleth.pm b/lib/WeBWorK/Authen/Shibboleth.pm
new file mode 100644
index 0000000000..39eba60348
--- /dev/null
+++ b/lib/WeBWorK/Authen/Shibboleth.pm
@@ -0,0 +1,203 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# 
+# 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::Authen::Shibboleth;
+use base qw/WeBWorK::Authen/;
+
+=head1 NAME
+
+WeBWorK::Authen::Shibboleth - Authentication plug in for Shibboleth. 
+This is basd on Cosign.pm
+
+For Shibboleth installation and configuration, please refer to:
+http://webwork.maa.org/wiki/External_(Shibboleth)_Authentication
+
+to use: include in global.conf or course.conf
+  $authen{user_module} = "WeBWorK::Authen::Shibboleth";
+and add /webwork2/courseName as a Shibboleth Protected
+Location
+
+if $r->ce->{shiboff} is set for a course, authentication reverts
+to standard WeBWorK authentication.
+
+add the following to global.conf to setup the Shibboleth
+  
+$shibboleth{logout_script} = "/Shibboleth.sso/Logout"?return=".$server_root_url.$webwork_url; # return URL after logout
+$shibboleth{session_header} = "Shib-Session-ID"; # the header to identify if there is an existing shibboleth session
+$shibboleth{manage_session_timeout} = 1; # allow shib to manage session time instead of webwork
+$shibboleth{hash_user_id_method} = "MD5"; # possible values none, MD5. Use it when you want to hide real user_ids from showing in url. 
+$shibboleth{hash_user_id_salt} = ""; # salt for hash function
+#define mapping between shib and webwork
+$shibboleth{mapping}{user_id} = "username";
+
+=cut
+
+use strict;
+use warnings;
+use WeBWorK::Debug;
+use Data::Dumper;
+
+# this is similar to the method in the base class, except that Shibboleth
+# ensures that we don't get to the address without a login.  this means
+# that we can't allow guest logins, but don't have to do any password
+# checking or cookie management.
+
+sub get_credentials {
+	my ($self) = @_;
+	my $r = $self->{r};
+	my $ce = $r->ce;
+	my $db = $r->db;
+	
+	if ( $ce->{shiboff} || $r->param('bypassShib')) {
+		return $self->SUPER::get_credentials( @_ );
+	} else {
+		debug("Shib is on!");
+
+		# set external auth parameter so that Login.pm knows
+		#    not to rely on internal logins if there's a check_user
+		#    failure.
+		$self->{external_auth} = 1;
+
+		if ( $r->param("user") && ! $r->param("force_passwd_authen") ) {
+			return $self->SUPER::get_credentials( @_ );
+		}
+		
+		if ( defined ($ENV{$ce->{shibboleth}{session_header}}) && defined( $ENV{$ce->{shibboleth}{mapping}{user_id}} ) ) {
+			debug('Got shib header and user_id');
+			my $user_id = $ENV{$ce->{shibboleth}{mapping}{user_id}};
+			if ( defined ($ce->{shibboleth}{hash_user_id_method}) && 
+			     $ce->{shibboleth}{hash_user_id_method} ne "none" && 
+			     $ce->{shibboleth}{hash_user_id_method} ne "" ) {
+				use Digest;
+				my $digest  = Digest->new($ce->{shibboleth}{hash_user_id_method});
+				$digest->add(uc($user_id). ( defined $ce->{shibboleth}{hash_user_id_salt} ? $ce->{shibboleth}{hash_user_id_salt} : ""));
+				$user_id = $digest->hexdigest;
+			}
+			$self->{'user_id'} = $user_id;
+			$self->{r}->param("user", $user_id);
+
+			# set external auth parameter so that login.pm
+			#    knows not to rely on internal logins if
+			#    there's a check_user failure.
+			$self->{session_key}   = undef;
+			$self->{password}      = "youwouldneverpickthispassword";
+			$self->{login_type}    = "normal";
+			$self->{credential_source} = "params";
+		} else {
+			debug("Couldn't shib header or user_id");
+			return 0;
+		}
+
+		# the session key isn't used (Shibboleth is managing this 
+		#    for us), and we want to force checking against the 
+		#    site_checkPassword
+		$self->{'session_key'} = undef;
+		$self->{'password'} = 1;
+		$self->{'credential_source'} = "params";
+
+		return 1;
+	}
+}
+
+sub site_checkPassword { 
+	my ( $self, $userID, $clearTextPassword ) = @_;
+
+	if ( $self->{r}->ce->{shiboff} ) {
+		return $self->SUPER::checkPassword( @_ );
+	} else {
+		# this is easy; if we're here at all, we've authenticated
+		# through shib
+		return 1;
+	}
+}
+
+# disable cookie functionality
+sub maybe_send_cookie {
+	my ($self, @args) = @_;
+	if ( $self->{r}->ce->{shiboff} ) {
+		return $self->SUPER::maybe_send_cookie( @_ );
+	} else {
+		# nothing to do here
+	}
+}
+sub fetchCookie {
+	my ($self, @args) = @_;
+	if ( $self->{r}->ce->{shiboff} ) {
+		return $self->SUPER::fetchCookie( @_ );
+	} else {
+		# nothing to do here
+	}
+}
+sub sendCookie {
+	my ($self, @args) = @_;
+	if ( $self->{r}->ce->{shiboff} ) {
+		return $self->SUPER::sendCookie( @_ );
+	} else {
+		# nothing to do here
+	}
+}
+sub killCookie {
+	my ($self, @args) = @_;
+	if ( $self->{r}->ce->{shiboff} ) {
+		return $self->SUPER::killCookie( @_ );
+	} else {
+		# nothing to do here
+	}
+}
+
+# this is a bit of a cheat, because it does the redirect away from the
+#   logout script or what have you, but I don't see a way around that.
+sub forget_verification { 
+	my ($self, @args) = @_;
+	my $r = $self->{r};
+
+	if ( $r->ce->{shiboff} ) {
+		return $self->SUPER::forget_verification( @_ );
+	} else {
+		$self->{was_verified} = 0;
+		$self->{redirect} = $r->ce->{shibboleth}{logout_script};
+	}
+}
+
+# returns ($sessionExists, $keyMatches, $timestampValid)
+# if $updateTimestamp is true, the timestamp on a valid session is updated
+# override function: allow shib to handle the session time out
+sub check_session {
+	my ($self, $userID, $possibleKey, $updateTimestamp) = @_;
+	my $ce = $self->{r}->ce;
+	my $db = $self->{r}->db;
+	
+	if ( $ce->{shiboff} ) {
+		return $self->SUPER::check_session( @_ );
+	} else {
+		my $Key = $db->getKey($userID); # checked
+			return 0 unless defined $Key;
+
+		my $keyMatches = (defined $possibleKey and $possibleKey eq $Key->key);
+		my $timestampValid = (time <= $Key->timestamp()+$ce->{sessionKeyTimeout});
+		if ($ce->{shibboleth}{manage_session_timeout}) {
+			# always valid to allow shib to take control of timeout
+			$timestampValid = 1;
+		}
+
+		if ($keyMatches and $timestampValid and $updateTimestamp) {
+			$Key->timestamp(time);
+			$db->putKey($Key);
+		}
+		return (1, $keyMatches, $timestampValid);
+	}
+}
+
+1;
diff --git a/lib/WeBWorK/Authz.pm b/lib/WeBWorK/Authz.pm
index 25e29f7b6a..6755fc1d1c 100644
--- a/lib/WeBWorK/Authz.pm
+++ b/lib/WeBWorK/Authz.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/Authz.pm,v 1.36 2007/08/13 22:59:54 sh002i 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
@@ -20,38 +20,449 @@ package WeBWorK::Authz;
 
 WeBWorK::Authz - check user permissions.
 
+=head1 SYNOPSIS
+
+ # create new authorizer -- $r is a WeBWorK::Request object.
+ my $authz = new WeBWorK::Authz($r);
+ 
+ # tell authorizer to cache permission level of user spammy.
+ $authz->setCachedUser("spammy");
+ 
+ # this call will use the cached data.
+ if ($authz->hasPermissions("spammy", "eat_breakfast")) {
+ 	eat_breakfast();
+ }
+ 
+ # this call will not use the cached data, and will cause a database lookup.
+ if ($authz->hasPermissions("hammy", "go_to_bed")) {
+ 	go_to_bed();
+ }
+
+=head1 DESCRIPTION
+
+WeBWorK::Authen determines if a user is authorized to perform a specific
+activity, based on the user's PermissionLevel record in the WeBWorK database and
+the contents of the %permissionLevels hash in the course environment.
+
+=head2 Format of the %permissionLevels hash
+
+%permissionLevels maps text strings describing activities to numeric permission
+levels. The definitive list of activities is contained in the default version of
+%permissionLevels, in the file F<conf/global.conf.dist>.
+
+A user is able to engage in an activity if their permission level is greater
+than or equal to the level associated with the activity. If the level associated
+with an activity is undefiend, then no user is permitted to perform the
+activity, regardless of their permission level.
+
 =cut
 
 use strict;
 use warnings;
+use Carp qw/croak/;
+# FIXME SET: set-level auth add
+use WeBWorK::Utils qw(before after between);
+use WeBWorK::Authen::Proctor;
+use Net::IP;
+
+################################################################################
+
+=head1 CONSTRUCTOR
+
+=over
+
+=item WeBWorK::Authz->new($r)
+
+Creates a new authorizer instance. $r is a WeBWorK::Request object. It must
+already have its C<ce> and C<db> fields set.
+
+=cut
 
-# WeBWorK::Authz->new($r, $ce, $db)
-sub new($$$$) {
-	my $invocant = shift;
+sub new {
+	my ($invocant, $r) = @_;
 	my $class = ref($invocant) || $invocant;
-	my $self = {};
-	($self->{r}, $self->{ce}, $self->{db}) = @_;
+	my $self = {
+		r => $r,
+	};
+	
 	bless $self, $class;
 	return $self;
 }
 
+=back
+
+=cut
+
+################################################################################
+
+=head1 METHODS
+
+=over
+
+=item setCachedUser($userID)
+
+Caches the PermissionLevel of the user $userID in an existing authorizer. If a
+user's PermissionLevel is cached, it will be used whenever hasPermissions() is
+called on the same user. Only one user can be cached at a time. This is used by
+WeBWorK to cache the "real" user.
+
+=cut
+
+sub setCachedUser {
+	my ($self, $userID) = @_;
+	my $r = $self->{r};
+	my $db = $r->db;
+	
+	delete $self->{userID};
+	delete $self->{PermissionLevel};
+	
+	if (defined $userID) {
+		$self->{userID} = $userID;
+		my $PermissionLevel = $db->getPermissionLevel($userID); # checked
+		if (defined $PermissionLevel) {
+			# store permission level record in database to avoid later database calls
+			$self->{PermissionLevel} = $PermissionLevel;
+		}
+	} else {
+		warn "setCachedUser() called with userID undefined.";
+	}
+}
+
+=item hasPermissions($userID, $activity)
+
+Checks the %permissionLevels hash in the course environment to determine if the
+user $userID has permission to engage in the activity $activity. If the user's
+permission level is greater than or equal to the level associated with $activty,
+a true value is returned. Otherwise, a false value is returned.
+
+If $userID has been cached using the setCachedUser() call, the cached data is
+used. Otherwise, the user's PermissionLevel is looked up in the WeBWorK
+database.
+
+If the user does not have a PermissionLevel record, the permission level record
+is empty, or the activity does not appear in %permissionLevels, hasPermissions()
+assumes that the user does not have permission.
+
+=cut
+
 # This currently only uses two of it's arguments, but it accepts any number, in
 # case in the future calculating certain permissions requires more information.
 sub hasPermissions {
-	my ($self, $user, $activity) = @_;
+	if (@_ != 3) {
+		shift @_; # get rid of self
+		my $nargs = @_;
+		croak "hasPermissions called with $nargs arguments instead of the expected 2: '@_'"
+	}
+	
+	my ($self, $userID, $activity) = @_;
+	my $r = $self->{r};
+	my $ce = $r->ce;
+	my $db = $r->db;
+	
+	# this may need to be changed if we get other permission level data sources
+	return 0 unless defined $db;
+	
+	# this may need to be changed if we want to control what unauthenticated users
+	# can do with the permissions system
+	return 0 unless defined $userID and $userID ne "";
+	
+	my $PermissionLevel;
+	
+	my $cachedUserID = $self->{userID};
+	if (defined $cachedUserID and $cachedUserID ne "" and $cachedUserID eq $userID) {
+		# this is the same user -- we can skip the database call
+		$PermissionLevel = $self->{PermissionLevel};
+	} else {
+		# a different user, or no user was defined before
+		#my $prettyCachedUserID = defined $cachedUserID ? "'$cachedUserID'" : "undefined";
+		#warn "hasPermissions called with user '$userID', but cached user is $prettyCachedUserID. Accessing database.\n";
+		$PermissionLevel = $db->getPermissionLevel($userID); # checked
+	}
+	
+	my $permission_level;
+	
+	if (defined $PermissionLevel) {
+		$permission_level = $PermissionLevel->permission;
+	} else {
+		# uh, oh. this user has no permission level record!
+		warn "User '$userID' has no PermissionLevel record -- assuming no permission.";
+		return 0;
+	}
+	
+	unless (defined $permission_level and $permission_level ne "") {
+		warn "User '$userID' has empty permission level -- assuming no permission.";
+		return 0;
+	}
+	
+	my $userRoles = $ce->{userRoles};
+	my $permissionLevels = $ce->{permissionLevels};
+	
+	if (exists $permissionLevels->{$activity}) {
+		my $activity_role = $permissionLevels->{$activity};
+		if (defined $activity_role) {
+			if (exists $userRoles->{$activity_role}) {
+				my $role_permlevel = $userRoles->{$activity_role};
+				if (defined $role_permlevel) {
+					return $permission_level >= $role_permlevel;
+				} else {
+					warn "Role '$activity_role' has undefined permisison level -- assuming no permission.";
+					return 0;
+				}
+			} else {
+				warn "Role '$activity_role' for activity '$activity' not found in \%userRoles -- assuming no permission.";
+				return 0;
+			}
+		} else {
+			return 0; # undefiend $activity_role, no one has permission to perform $activity
+		}
+	} else {
+		warn "Activity '$activity' not found in \%permissionLevels -- assuming no permission.";
+		return 0;
+	}
+}
+
+#### set-level authorization routines
+
+sub checkSet { 
+	my $self = shift;
 	my $r = $self->{r};
-	my $courseEnvironment = $self->{ce};
-	my $permissionLevels = $courseEnvironment->{permissionLevels};
-	
-	my $Permission = $self->{db}->getPermissionLevel($user); # checked
-	return 0 unless defined $Permission;
-	my $permissionLevel = $Permission->permission();
-	if (defined $permissionLevels->{$activity}
-	    and $permissionLevel >= $permissionLevels->{$activity}) {
-		return 1;
+	my $ce = $r->ce;
+	my $db = $r->db;
+	my $urlPath = $r->urlpath;
+
+	my $node_name = $urlPath->type;
+
+	# first check to see if we have to worried about set-level access
+	#    restrictions
+	return 0 unless (grep {/^$node_name$/} 
+			 (qw(problem_list problem_detail gateway_quiz
+			     proctored_gateway_quiz)));
+
+	# to check set restrictions we need a set and a user
+	my $setName = $urlPath->arg("setID");
+	my $userName = $r->param("user");
+	my $effectiveUserName = $r->param("effectiveUser");
+
+	# if there is no input userName, then the content generator will 
+	#    be forcing a login, so just bail 
+	return 0 if ( ! $userName || ! $effectiveUserName );
+
+	# do we have a cached set that we can use?
+	my $set = $self->{merged_set};
+
+	if ( $setName =~ /,v(\d+)$/ ) {
+		my $verNum = $1;
+		$setName =~ s/,v\d+$//;
+
+		if ( $set && $set->set_id eq $setName && 
+		     $set->user_id eq $effectiveUserName &&
+		     $set->version_id eq $verNum ) {
+			# then we can just use this set and skip the rest
+
+		} elsif ( $setName eq 'Undefined_Set' and 
+			  $self->hasPermissions($userName, "access_instructor_tools") ) {
+				# this is the case of previewing a problem
+				#    from a 'try it' link
+			return 0;
+		} else {
+			if ($db->existsSetVersion($effectiveUserName,$setName,$verNum)) {
+				$set = $db->getMergedSetVersion($effectiveUserName,$setName,$verNum);
+			} else {
+				return "Requested version ($verNum) of set " .
+					"'$setName' is not assigned to user " .
+					"$effectiveUserName.";
+			}
+		}
+		if ( ! $set ) {
+			return "Requested set '$setName' could not be found " .
+				"in the database for user $effectiveUserName.";
+		}
+	} else {
+
+		if ( $set && $set->set_id eq $setName &&
+		     $set->user_id eq $effectiveUserName ) {
+			# then we can just use this set, and skip the rest
+
+		} else {
+			if ( $db->existsUserSet($effectiveUserName,$setName) ) {
+				$set = $db->getMergedSet($effectiveUserName,$setName);
+			} elsif ( $setName eq 'Undefined_Set' and 
+				$self->hasPermissions($userName, "access_instructor_tools") ) {
+				# this is the weird case of the library
+				#   browser, when we don't actually have
+				#   a set to look at, but this only happens among
+				#   instructor tool users.
+				return 0;
+			} else {
+				return "Requested set '$setName' is not " .
+					"assigned to user $effectiveUserName.";
+			}
+		}
+		if ( ! $set ) {
+			return "Requested set '$setName' could not be found " .
+				"in the database for user $effectiveUserName.";
+		}
+	}
+	# cache the set for future use as needed.  this should probably 
+	#    be more sophisticated than this
+	$self->{merged_set} = $set;
+
+	# now we know that the set is assigned to the appropriate user; 
+	#    check to see if we're trying to access a set that's not open
+	if ( before($set->open_date) && 
+	     ! $self->hasPermissions($userName, "view_unopened_sets") ) {
+		return "Requested set '$setName' is not yet open.";
+	} 
+
+	# also check to make sure that the set is visible, or that we're
+	#    allowed to view hidden sets
+	# (do we need to worry about visible not being set at this point?)
+	my $visible = ( $set && $set->visible ne '0' && 
+			  $set->visible ne '1' ) ? 1 : $set->visible;
+	if ( ! $visible && 
+	     ! $self->hasPermissions($userName, "view_hidden_sets") ) { 
+		return "Requested set '$setName' is not available yet.";
+	}
+
+	# check to be sure that gateways are being sent to the correct
+	#    content generator
+	if (defined($set->assignment_type) && 
+	    $set->assignment_type =~ /gateway/ && 
+	    ($node_name eq 'problem_list' || $node_name eq 'problem_detail')) {
+		return "Requested set '$setName' is a test/quiz assignment " . 
+			"but the regular homework assignment content " .
+			"generator $node_name was called.  Try re-entering " .
+			"the set from the problem sets listing page.";
+	} elsif ( (! defined($set->assignment_type) ||
+		   $set->assignment_type eq 'homework') &&
+		  $node_name =~ /gateway/ ) {
+		return "Requested set '$setName' is a homework assignment " . 
+			"but the gateway/quiz content " .
+			"generator $node_name was called.  Try re-entering " .
+			"the set from the problem sets listing page.";
+	}
+		
+	# and check that if we're entering a proctored assignment that we 
+	#    have a valid proctor login; this is necessary to make sure that
+	#    someone doesn't use the unproctored url path to obtain access
+	#    to a proctored assignment.
+	if (defined($set->assignment_type) && 
+	    $set->assignment_type =~ /proctored/ &&
+	    ! WeBWorK::Authen::Proctor->new($r,$ce,$db)->verify() ) {
+		return "Requested set '$setName' is a proctored test/quiz " .
+			"assignment, but no valid proctor authorization " .
+			"has been obtained.";
+	}
+
+	# and whether there are ip restrictions that we need to check
+	my $badIP = $self->invalidIPAddress($set);
+	return $badIP if $badIP;
+
+	return 0;
+}
+
+sub invalidIPAddress { 
+# this exists as a separate routine because we need to check multiple
+#    sets in Hardcopy; having this routine to check the set allows us to do
+#    that for all sets individually there.
+
+	my $self = shift;
+	my $set = shift;
+
+	my $r = $self->{r};
+	my $db = $r->db;
+	my $urlPath = $r->urlpath;
+#	my $setName = $urlPath->arg("setID");  # not always defined
+	my $setName = $set->set_id;
+	my $userName = $r->param("user");
+	my $effectiveUserName = $r->param("effectiveUser");
+
+	return 0 if ($set->restrict_ip eq '' || $set->restrict_ip eq 'No' ||
+		     $self->hasPermissions($userName,'view_ip_restricted_sets'));
+
+	my $clientIP = new Net::IP($r->connection->remote_ip);
+	# make sure that we're using the non-versioned set name
+	$setName =~ s/,v\d+$//;
+
+	my $restrictType = $set->restrict_ip;
+	my @restrictLocations = $db->getAllMergedSetLocations($effectiveUserName,$setName);
+	my @locationIDs = ( map {$_->location_id} @restrictLocations );
+	my @restrictAddresses = ( map {$db->listLocationAddresses($_)} @locationIDs );
+
+	# if there are no addresses in the locations, return an error that
+	#    says this
+	return "Client ip address " . $clientIP->ip() . " is not allowed to " .
+	    "work this assignment, because the assignment has ip address " .
+	    "restrictions and there are no allowed locations associated " .
+	    "with the restriction.  Contact your professor to have this " .
+	    "problem resolved." if ( ! @restrictAddresses );
+
+	# build a set of IP objects to match against
+	my @restrictIPs = ( map {new Net::IP($_)} @restrictAddresses );
+
+	# and check the clientAddress against these: is $clientIP
+	#    in @restrictIPs?
+	my $inRestrict = 0;
+	foreach my $rIP ( @restrictIPs ) {
+		if ($rIP->overlaps($clientIP) == $IP_B_IN_A_OVERLAP ||
+		    $rIP->overlaps($clientIP) == $IP_IDENTICAL) {
+			$inRestrict = $rIP->ip();
+			last;
+		}
+	}
+
+	# this is slightly complicated by having to check relax_restrict_ip
+	my $badIP = '';
+	if ( $restrictType eq 'RestrictTo' && ! $inRestrict ) {
+		$badIP = "Client ip address " . $clientIP->ip() . 
+			" is not in the list of addresses from " .
+			"which this assignment may be worked.";
+	} elsif ( $restrictType eq 'DenyFrom' && $inRestrict ) {
+		$badIP = "Client ip address " . $clientIP->ip() . 
+			" is in the list of addresses from " .
+			"which this assignment may not be worked.";		
 	} else {
 		return 0;
 	}
+
+	# if we're here, we failed the IP check, and so need to consider
+	#    if ip restrictions were relaxed.  the set we were passed in 
+	#    is either the merged userset or the merged versioned userset,
+	#    depending on whether the set is versioned or not
+
+	my $relaxRestrict = $set->relax_restrict_ip;
+	return $badIP if ( $relaxRestrict eq 'No' );
+
+	if ( $set->assignment_type =~ /gateway/ ) {
+		if ( $relaxRestrict eq 'AfterAnswerDate' ) {
+			# in this case we need to go and get the userset,
+			#    not the versioned set (which we already have)
+			#    drat!
+			my $userset = $db->getMergedSet($set->user_id,$setName);
+			return( ! $userset || before($userset->answer_date) 
+				? $badIP : 0 );
+		} else {
+			# this is easier; just look at the current answer date
+			return( before($set->answer_date) ? $badIP : 0 );
+		}
+	} else {
+		# the set isn't versioned, so assume that $relaxRestrict
+		#    is 'AfterAnswerDate', regardless of what it actually
+		#    is; 'AfterVersionAnswerDate' doesn't make sense in 
+		#    this case
+		return( before($set->answer_date) ? $badIP : 0 );
+	}
 }
 
+=back
+
+=cut
+
+=head1 AUTHOR
+
+Written by Dennis Lambe, malsyned at math.rochester.edu. Modified by Sam
+Hathaway, sh002i at math.rochester.edu.
+
+=cut
+
 1;
diff --git a/bin/gif2png b/lib/WeBWorK/CGI.pm
old mode 100755
new mode 100644
similarity index 57%
rename from bin/gif2png
rename to lib/WeBWorK/CGI.pm
index 1c57e4cb53..1dfa80cc40
--- a/bin/gif2png
+++ b/lib/WeBWorK/CGI.pm
@@ -1,8 +1,7 @@
-#!/bin/sh
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/CGI.pm,v 1.27 2006/09/15 22:02:37 sh002i 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
@@ -15,19 +14,24 @@
 # Artistic License for more details.
 ################################################################################
 
-# This script wraps system-dependant calls to several netpbm utilities.
-# In order to use this script, set the NETPBM variable below to the
-# directory which contains giftopnm, ppmtopgm, and pnmtops.
+package WeBWorK::CGI;
 
-NETPBM=/usr/local/bin
+use strict;
+use warnings;
 
-# If you wish to set the paths to each utility separately, i.e. if they
-# are in different locations, do so below:
+# from http://search.cpan.org/src/LDS/CGI.pm-3.20/cgi_docs.html#subclassing
+use vars qw/@ISA $VERSION/;
+require CGI;
+@ISA = 'CGI';
+$VERSION = "0.1";
 
-GIFTOPNM=$NETPBM/giftopnm;
-PNMTOPNG=$NETPBM/pnmtopng;
+$CGI::DefaultClass = __PACKAGE__;
+$WeBWorK::CGI::AutoloadClass = 'CGI';
 
-# There should be no need for customization beyond this point.
+sub new {
+	my $self = shift->SUPER::new(@_);
+	$self->delete_all;
+	return $self;
+}
 
-umask 022
-cat $1 | $GIFTOPNM | $PNMTOPNG > $2
+1;
diff --git a/lib/WeBWorK/Constants.pm b/lib/WeBWorK/Constants.pm
index d5da847ddd..032180b94d 100644
--- a/lib/WeBWorK/Constants.pm
+++ b/lib/WeBWorK/Constants.pm
@@ -1,13 +1,13 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
-# 
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/Constants.pm,v 1.62 2010/02/01 01:57:56 apizer 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
 # Free Software Foundation; either version 2, or (at your option) any later
 # version, or (b) the "Artistic License" which comes with this package.
-# 
+#
 # This program is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 # FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
@@ -15,7 +15,6 @@
 ################################################################################
 
 package WeBWorK::Constants;
-use base qw(Exporter);
 
 =head1 NAME
 
@@ -26,7 +25,325 @@ WeBWorK::Constants - provide constant values for other WeBWorK modules.
 use strict;
 use warnings;
 
-our @EXPORT    = qw();
-our @EXPORT_OK = qw(SECRET);
+################################################################################
+# WeBWorK::Debug
+################################################################################
+
+# If true, WeBWorK::Debug will print debugging output.
+#
+$WeBWorK::Debug::Enabled = 0;
+
+# If non-empty, debugging output will be sent to the file named rather than STDERR.
+#
+$WeBWorK::Debug::Logfile = "";
+
+# If defined, prevent subroutines matching the following regular expression from
+# logging.
+#
+# For example, this pattern prevents the dispatch() function from logging:
+#     $WeBWorK::Debug::DenySubroutineOutput = qr/^WeBWorK::dispatch$/;
+#
+$WeBWorK::Debug::DenySubroutineOutput = undef;
+
+# If defined, allow only subroutines matching the following regular expression
+# to log.
+#
+# For example, this pattern allow only some function being worked on to log:
+#     $WeBWorK::Debug::AllowSubroutineOutput = qr/^WeBWorK::SomePkg::myFunc$/;
+#
+$WeBWorK::Debug::AllowSubroutineOutput = undef;
+
+################################################################################
+# WeBWorK::ContentGenerator::Hardcopy
+################################################################################
+
+# If true, don't delete temporary files
+#
+$WeBWorK::ContentGenerator::Hardcopy::PreserveTempFiles = 0;
+
+################################################################################
+# WeBWorK::PG::Local
+################################################################################
+# The maximum amount of time (in seconds) to work on a single problem.
+# At the end of this time a timeout message is sent to the browser.
+
+$WeBWorK::PG::Local::TIMEOUT = 60;
+
+################################################################################
+# WeBWorK::PG::ImageGenerator
+################################################################################
+
+# Arguments to pass to dvipng. This is dependant on the version of dvipng.
+#
+# For dvipng versions 0.x
+#     $WeBWorK::PG::ImageGenerator::DvipngArgs = "-x4000.5 -bgTransparent -Q6 -mode toshiba -D180";
+# For dvipng versions 1.0 to 1.5
+#     $WeBWorK::PG::ImageGenerator::DvipngArgs = "-bgTransparent -D120 -q -depth";
+#
+# For dvipng versions 1.6 (and probably above)
+#     $WeBWorK::PG::ImageGenerator::DvipngArgs = "-bgtransparent -D120 -q -depth";
+# Note: In 1.6 and later, bgTransparent gives alpha-channel transparency while
+# bgtransparent gives single-bit transparency. If you use alpha-channel transparency,
+# the images will not be viewable with MSIE.  bgtransparent works for version 1.5,
+# but does not give transparent backgrounds. It does not work for version 1.2. It has not
+# been tested with other versions.
+#
+$WeBWorK::PG::ImageGenerator::DvipngArgs = "-bgTransparent -D120 -q -depth";
+
+# If true, don't delete temporary files
+#
+$WeBWorK::PG::ImageGenerator::PreserveTempFiles = 0;
+
+# TeX to prepend to equations to be processed.
+#
+$WeBWorK::PG::ImageGenerator::TexPreamble = <<'EOF';
+\documentclass[12pt]{article}
+\nonstopmode
+\usepackage{amsmath,amsfonts,amssymb}
+\def\gt{>}
+\def\lt{<}
+\usepackage[active,textmath,displaymath]{preview}
+\begin{document}
+EOF
+
+# TeX to append to equations to be processed.
+#
+$WeBWorK::PG::ImageGenerator::TexPostamble = <<'EOF';
+\end{document}
+EOF
+
+################################################################################
+# WeBWorK::ContentGenerator::Instructor::Config
+################################################################################
+
+# Configuation data
+# It is organized by section.  The allowable types are
+#  'text' for a text string (no quote marks allowed),
+#  'number' for a number,
+#  'list' for a list of text strings,
+#  'permission' for a permission value,
+#  'boolean' for variables which really hold 0/1 values as flags.
+#  'checkboxlist' for variables which really hold a list of values which
+#      can be independently picked yes/no as checkboxes
+
+$WeBWorK::ContentGenerator::Instructor::Config::ConfigValues = [
+    ['General',
+		{ var => 'courseFiles{course_info}',
+		  doc => 'Name of course information file',
+		  doc2 => 'The name of course information file (located in the templates directory). Its contents are displayed in the right panel next to the list of homework sets.',
+		  type => 'text'},
+		{ var => 'defaultTheme',
+		  doc => 'Theme (refresh page after saving changes to reveal new theme.)',
+		  doc2 => 'There are currently five themes (or skins) to choose from: ur, math, math2, and dgage.  The theme
+specifies a unified look and feel for the WeBWorK course web pages.',
+		  values => [qw(math math2 math3 ur dgage  union)],
+		  type => 'popuplist'},
+		  { var => 'language',
+		  doc => 'Language (refresh page after saving changes to reveal new language.)',
+		  doc2 => 'WeBWorK currently has translations for four languages: "English en", "Turkish tr", "Spanish es", and "French fr" ',
+		  values => [qw(en tr es fr zh_hk heb)],
+		  type => 'popuplist'},
+		{ var => 'sessionKeyTimeout',
+		  doc => 'Inactivity time before a user is required to login again',
+		  doc2 => 'Length of time, in seconds, a user has to be inactive before he is required to login again.<p> This value should be entered as a number, so as 3600 instead of 60*60 for one hour',
+		  type => 'number'},
+		{ var => 'siteDefaults{timezone}',
+		  doc => 'Timezone for the course',
+		  doc2 => 'Some servers handle courses taking place in different timezones.  If this course is not showing the correct timezone, enter the correct value here.  The format consists of unix times, such as "America/New_York","America/Chicago", "America/Denver", "America/Phoenix" or "America/Los_Angeles". Complete list: <a href="http://en.wikipedia.org/wiki/List_of_zoneinfo_time_zones">TimeZoneFiles</a>',
+		  type => 'text'},],
+	['Permissions',
+		{ var => 'permissionLevels{login}',
+		  doc => 'Allowed to login to the course',
+		  type => 'permission'},
+		{ var => 'permissionLevels{change_password}',
+		  doc => 'Allowed to change their password',
+		  doc2 => 'Users at this level and higher are allowed to change their password. Normally guest users are not allowed to change their password.',
+		  type => 'permission'},
+		{ var => 'permissionLevels{become_student}',
+		  doc => 'Allowed to <em>act as</em> another user',
+		  type => 'permission'},
+		{ var => 'permissionLevels{submit_feedback}',
+		  doc => 'Can e-mail instructor',
+		  doc2 => 'Only this permission level and higher get buttons for sending e-mail to the instructor.',
+		  type => 'permission'},
+		{ var => 'permissionLevels{record_answers_when_acting_as_student}',
+		  doc => 'Can submit answers for a student',
+		  doc2 => 'When acting as a student, this permission level and higher can submit answers for that student.',
+		  type => 'permission'},
+		{ var => 'permissionLevels{report_bugs}',
+		  doc => 'Can report bugs',
+		  doc2 => 'Users with at least this permission level get a link in the left panel for reporting bugs to the bug tracking system in Rochester',
+		  type => 'permission'},
+		{ var => 'permissionLevels{change_email_address}',
+		  doc => 'Allowed to change their e-mail address',
+		  doc2 => 'Users at this level and higher are allowed to change their e-mail address. Normally guest users are not allowed to change the e-mail address since it does not make sense to send e-mail to anonymous accounts.',
+		  type => 'permission'},
+		{ var => 'permissionLevels{view_answers}',
+		  doc => 'Allowed to view past answers',
+		  doc2 => 'These users and higher get the "Show Past Answers" button on the problem page.',
+		  type => 'permission'},
+		{ var => 'permissionLevels{view_unopened_sets}',
+		  doc => 'Allowed to view problems in sets which are not open yet',
+		  type => 'permission'},
+		{ var => 'permissionLevels{show_correct_answers_before_answer_date}',
+		  doc => 'Allowed to see the correct answers before the answer date',
+		  type => 'permission'},
+		{ var => 'permissionLevels{show_solutions_before_answer_date}',
+		  doc => 'Allowed to see solutions before the answer date',
+		  type => 'permission'},
+		{ var => 'permissionLevels{can_show_old_answers_by_default}',
+		  doc => 'Can show old answers by default',
+		  doc2 => 'When viewing a problem, WeBWorK usually puts the previously submitted answer in the answer blank if it is before the due date.  Below this level, old answers are never initially shown.  Typically, that is the desired behaviour for guest accounts.',
+		  type => 'permission'},
+		{ var => 'permissionLevels{can_always_use_show_old_answers_default}',
+		  doc => 'Can always show old answers by default',
+		  doc2 => 'When viewing a problem, WeBWorK usually puts the previously submitted answer in the answer blank if it is before the due date.  At this level and higher, old answers are always shown (independent of the answer date).',
+		  type => 'permission'},
+	],
+	['PG - Problem Display/Answer Checking',
+		{ var => 'pg{displayModes}',
+		  doc => 'List of display modes made available to students',
+		  doc2 => 'When viewing a problem, users may choose different methods of rendering
+ formulas via an options box in the left panel.  Here, you can adjust what display modes are
+ listed.<p>
+ Some display modes require other software to be installed on the server.  Be sure to check
+ that all display modes selected here work from your server.<p>
+ The display modes are <ul>
+<li> plainText: shows the raw LaTeX strings for formulas.
+<li> formattedText: formulas are passed through the external program <code>tth</code>,
+ which produces an HTML version of them.  Some browsers do not display all of the fonts
+ properly.
+<li> images: produces images using the external programs LaTeX and dvipng.
+<li> jsMath: uses javascript to place symbols, which may come from fonts or images
+ (the choice is configurable by the end user).
+<li> MathJax: a successor to jsMath, uses javascript to place render mathematics.
+<li> asciimath: renders formulas client side using ASCIIMathML
+<li> LaTeXMathML: renders formulas client side using LaTeXMathML
+</ul>
+<p>
+You must use at least one display mode.  If you select only one, then the options box will
+ not give a choice of modes (since there will only be one active).',
+		  min  => 1,
+		  values => ["MathJax", "images", "plainText", "formattedText",  "jsMath",  "asciimath", "LaTeXMathML"],
+		  type => 'checkboxlist'},
+
+		{ var => 'pg{options}{displayMode} ',
+		  doc => 'The default display mode',
+		  doc2 => 'Enter one of the allowed display mode types above.  See \'display modes entry\' for descriptions.',
+		  min  => 1,
+		  type => 'text'},
+		  
+		{ var => 'pg{options}{showEvaluatedAnswers}',
+		  doc => 'Display the evaluated student answer',
+		  doc2 => 'Set to true to display the "Entered" column which automatically shows the evaluated student answer, e.g. 1 
+		  if student input is sin(pi/2). If this is set to false, e.g. to save space in the response area, the student can 
+		  still see their evaluated answer by hovering the mouse pointer over the typeset version of their answer.',
+		  type => 'boolean'},		  
+
+		{ var => 'pg{options}{showEvaluatedAnswers}',
+		  doc => 'Display the evaluated student answer',
+		  doc2 => 'Set to true to display the "Entered" column which automatically shows the evaluated student answer, e.g. 1 
+		  if student input is sin(pi/2). If this is set to false, e.g. to save space in the response area, the student can 
+		  still see their evaluated answer by hovering the mouse pointer over the typeset version of their answer.',
+		  type => 'boolean'},		  
+
+		{ var => 'pg{ansEvalDefaults}{useBaseTenLog}',
+		  doc => 'Use log base 10 instead of base <i>e</i>',
+		  doc2 => 'Set to true for log to mean base 10 log and false for log to mean natural logarithm',
+		  type => 'boolean'},
+
+		{ var => 'pg{ansEvalDefaults}{useOldAnswerMacros}',
+		  doc => 'Use older answer checkers',
+		  doc2 => 'During summer 2005, a newer version of the answer checkers was implemented for answers which are functions and numbers.  The newer checkers allow more functions in student answers, and behave better in certain cases.  Some problems are specifically coded to use new (or old) answer checkers.  However, for the bulk of the problems, you can choose what the default will be here.  <p>Choosing <i>false</i> here means that the newer answer checkers will be used by default, and choosing <i>true</i> means that the old answer checkers will be used by default.',
+		  type => 'boolean'},
+
+		{ var => 'pg{ansEvalDefaults}{defaultDisplayMatrixStyle}',
+		  doc => 'Control string for displaying matricies',
+		  doc2 => 'String of three characters for defining the defaults for displaying matricies.  The first and last characters give the left and right delimiters of the matrix, so usually one of ([| for a left delimiter, and one of )]| for the right delimiter.  It is also legal to specify "." for no delimiter. <p> The middle character indicates how to display vertical lines in a matrix (e.g., for an augmented matrix).  This can be s for solid lines and d for dashed lines.  While you can specify the defaults, individual problems may override these values.',
+		  type => 'text'},
+
+		{ var => 'pg{ansEvalDefaults}{numRelPercentTolDefault}',
+		  doc => 'Allowed error, as a percentage, for numerical comparisons',
+		  doc2 => "When numerical answers are checked, most test if the student's answer
+ is close enough to the programmed answer be computing the error as a percentage of
+ the correct answer.  This value controls the default for how close the student answer
+ has to be in order to be marked correct.
+<p>
+A value such as 0.1 means 0.1 percent error is allowed.",
+		  type => 'number'},
+		{ var => 'pg{ansEvalDefaults}{reducedScoringPeriod}',
+		  doc => 'Length of Reduced Credit Period in minutes',
+		  doc2 => 'The Reduced Credit Period (formally called the Reduced Scoring Period) is a period before the due date during which
+ all additional work done by the student counts at a reduced rate. Here is where 
+ you set the length of this period in minutes. If this value is greater than 0, a
+ message like "This assignment has a Reduced Credit Period that begins 11/08/2009 
+ at 06:17pm EST and ends on the due date, 11/10/2009 at 06:17pm EST. During this 
+ period all additional work done counts 50% of the original." will be displayed.<p>
+ To use this, you also have to enable Reduced Credit for individual assignments by
+ editing the set data using the Hmwk Sets Editor.<p>
+ This works with the avg_problem_grader (which is the the default grader) and the 
+ std_problem_grader (the all or nothing grader).  It will work with custom graders
+ if they are written appropriately.' ,
+		  type => 'number'},
+		{ var => 'pg{ansEvalDefaults}{reducedScoringValue}',
+		  doc => 'Value of work done in Reduced Credit Period' ,
+		  doc2 => 'The Reduced Credit Period (formally called the Reduced Scoring Period) is a period before the due date during which
+ all additional work done by the student counts at a reduced rate. Here is where 
+ you set the reduced rate which must be a number in the interval [0,1]. 1 means no 
+ reduction. For example if this value is .5 and a student views a problem during the
+ Reduced Credit Period, they will see the message "You are in the Reduced Credit 
+ Period: All additional work done counts 50% of the original." <p>
+ To use this, you also have to enable Reduced Credit for individual assignments by
+ editing the set data using the Hmwk Sets Editor.<p>
+ This works with the avg_problem_grader (which is the the default grader) and the 
+ std_problem_grader (the all or nothing grader).  It will work with custom graders
+ if they are written appropriately.' ,
+		  type => 'number'},
+	],
+	['E-Mail',
+		{ var => 'mail{feedbackSubjectFormat}',
+		  doc => 'Format for the subject line in feedback e-mails',
+		  doc2 => 'When students click the <em>Email Instructor</em> button
+ to send feedback, WeBWorK fills in the subject line.  Here you can set the
+ subject line.  In it, you can have various bits of information filled in
+ with the following escape sequences.
+<p>
+<ul>
+<li> %c = course ID
+<li> %u = user ID
+<li> %s = set ID
+<li> %p = problem ID
+<li> %x = section
+<li> %r = recitation
+<li> %% = literal percent sign
+</ul>',
+		  width => 45,
+		  type => 'text'},
+		{ var => 'mail{feedbackVerbosity}',
+		  doc => 'E-mail verbosity level',
+		  doc2 => 'The e-mail verbosity level controls how much information is
+ automatically added to feedback e-mails.  Levels are
+<ol>
+<li value="0"> send only the feedback comment and context link
+<li value="1"> as in 0, plus user, set, problem, and PG data
+<li value="2"> as in 1, plus the problem environment (debugging data)
+</ol>',
+		  type => 'number'
+		},
+		{ var => 'mail{allowedRecipients}',
+		  doc => 'E-mail addresses which can receive e-mail from a pg problem',
+		  doc2 => 'List of e-mail addresses to which e-mail can be sent by a problem. Professors need to be added to this list if questionaires are used, or other WeBWorK problems which send e-mail as part of their answer mechanism.',
+		  type => 'list'},
+		{ var => 'permissionLevels{receive_feedback}',
+		  doc => 'E-mail feedback from students automatically sent to this permission level and higher:',
+		  doc2 => 'Users with this permssion level or greater will automatically be sent feedback from students (generated when they use the "Contact instructor" button on any problem page).  In addition the feedback message will be sent to addresses listed below.  To send ONLY to addresses listed below set permission level to "nobody".',
+		  type => 'permission'},
+
+		{ var => 'mail{feedbackRecipients}',
+		  doc => 'Additional addresses for receiving feedback e-mail.',
+		  doc2 => 'By default, feeback is sent to all users above who have permission to receive feedback. Feedback is also sent to any addresses specified in this blank. Separate email address entries by commas.',
+		  type => 'list'},
+	]
+];
 
-use constant SECRET => 'fkjOPIiSUfeT6dm5pevSrM1xgFmsex7.Z/.6Wjcxqb9Pi4Zm9JUGygwv^FdG8^yth^*KbDFWMXiLtNDggWNA370llFj68JxNKMCyCeSJxCHRfU2P6br10HtPS!NvcaJ7';
+1;
diff --git a/lib/WeBWorK/ContentGenerator.pm b/lib/WeBWorK/ContentGenerator.pm
index 3db263a975..13ccbb135d 100644
--- a/lib/WeBWorK/ContentGenerator.pm
+++ b/lib/WeBWorK/ContentGenerator.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator.pm,v 1.196 2009/06/04 01:33:15 gage 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
@@ -20,665 +20,2062 @@ package WeBWorK::ContentGenerator;
 
 WeBWorK::ContentGenerator - base class for modules that generate page content.
 
+=head1 SYNOPSIS
+
+ # start with a WeBWorK::Request object: $r
+ 
+ use WeBWorK::ContentGenerator::SomeSubclass;
+ 
+ my $cg = WeBWorK::ContentGenerator::SomeSubclass->new($r);
+ my $result = $cg->go();
+
+=head1 DESCRIPTION
+
+WeBWorK::ContentGenerator provides the framework for generating page content.
+"Content generators" are subclasses of this class which provide content for
+particular parts of the system.
+
+Default versions of methods used by the templating system are provided. Several
+useful methods are provided for rendering common output idioms and some
+miscellaneous utilities are provided.
+
 =cut
 
 use strict;
 use warnings;
-use Apache::Constants qw(:common);
-use CGI qw();
+use Carp;
+#use CGI qw(-nosticky *ul *li escapeHTML);
+use WeBWorK::CGI;
+use WeBWorK::File::Scoring qw/parse_scoring_file/;
+use Date::Format;
 use URI::Escape;
-use WeBWorK::Authz;
-use WeBWorK::DB;
-use WeBWorK::Utils qw(readFile);
+use WeBWorK::Debug;
+use WeBWorK::PG;
+use MIME::Base64;
+use WeBWorK::Template qw(template);
+use WeBWorK::Localize;
+use mod_perl;
+use constant MP2 => ( exists $ENV{MOD_PERL_API_VERSION} and $ENV{MOD_PERL_API_VERSION} >= 2 );
 
-################################################################################
-# This is a very unruly file, so I'm going to use very large comments to divide
-# it into logical sections.
-################################################################################
 
-# new(Apache::Request, WeBWorK::CourseEnvironment, WeBWorK::DB) - create a new    
-# instance of a content generator. Usually only called by the dispatcher, although
-# one might be able to use it for things like "sub-requests". Uh... uh... I have  
-# to think about that one. The dispatcher uses this idiom:                        
-# 
-# 	WeBWorK::ContentGenerator::WHATEVER->new($r, $ce, $db)->go(@whatever);
-# 
-# and throws away the result ;)
-#
+
+
+BEGIN {
+	if (MP2) {
+		require Apache2::Const;
+		Apache2::Const->import(-compile => qw/OK NOT_FOUND FORBIDDEN SERVER_ERROR REDIRECT/);
+	} else {
+		require Apache::Constants;
+		Apache::Constants->import(qw/OK NOT_FOUND FORBIDDEN SERVER_ERROR REDIRECT/);
+	}
+}
+
+###############################################################################
+
+=head1 CONSTRUCTOR
+
+=over
+
+=item new($r)
+
+Creates a new instance of a content generator. Supply a WeBWorK::Request object
+$r.
+
+=cut
+
 sub new {
-	my ($invocant, $r, $ce, $db) = @_;
+	my ($invocant, $r) = @_;
 	my $class = ref($invocant) || $invocant;
 	my $self = {
-		r  => $r,
-		ce => $ce,
-		db => $db,
-		authz => WeBWorK::Authz->new($r, $ce, $db),
-		noContent => undef,
+		r => $r, # this is now a WeBWorK::Request
+		ce => $r->ce(),       # these three are here for
+		db => $r->db(),       # backward-compatability
+		authz => $r->authz(), # with unconverted CGs
+		noContent => undef, # FIXME this should get clobbered at some point
 	};
 	bless $self, $class;
 	return $self;
 }
 
-################################################################################
-# Invocation and template processing
+=back
+
+=cut
+
 ################################################################################
 
-# go(@otherArguments) - render a page, using methods from the particular
-# subclass of ContentGenerator. @otherArguments is passed to each method, so
-# that the dispatcher can pass CG-specific data. The order of calls looks like
-# this:
-# 
-# 	* &pre_header_initialize - give subclasses a chance to do initialization
-# 	  necessary for generating the HTTP header.
-# 	* &header - this class provides a standard HTTP header with Content-Type
-# 	  text/html. Subclasses are welcome to overload this for things like
-# 	  an image-creation content generator or a PDF generator.
-#	  In addition, if &header returns a value, that will be the value
-#         returned by the entire PerlHandler.
-# 	* &initialize - let subclasses do post-header initialization.
-# 	* any "template escapes" defined in the system template and supported by
-# 	  the subclass.
-#         (if &content exists on a content generator, it is called
-#         and no template processing occurs.)
-#
-# If &pre_header_initialize or &header sets $self->{noContent} to a true value,
-# &initialize will not be run and the content or template processing code
-# will not be executed.  This is probably only desirable if a redirect has been
-# issued.
+=head1 INVOCATION
+
+=over
+
+=item go()
+
+Generates a page, using methods from the particular subclass of ContentGenerator
+that is instantiated. Generatoion is broken up into several steps, to give
+subclasses ample control over the process.
+
+=over
+
+=item 1
+
+go() will attempt to call the method pre_header_initialize(). This method may be
+implemented in subclasses which must do processing before the HTTP header is
+emitted.
+
+=item 2
+
+go() will attempt to call the method header(). This method emits the HTTP
+header. It is defined in this class (see below), but may be overridden in
+subclasses which need to send different header information. For some reason, the
+return value of header() will be used as the result of this function, if it is
+defined.
+
+FIXME: figure out what the deal is with the return value of header(). If we sent
+a header, it's too late to set the status by returning. If we didn't, header()
+didn't perform its function!
+
+=item 3
+
+At this point, go() will terminate if the request is a HEAD request or if the
+field $self->{noContent} contains a true value.
+
+FIXME: I don't think we'll need noContent after reply_with_redirect() is
+adopted by all modules.
+
+=item 4
+
+go() then attempts to call the method initialize(). This method may be
+implemented in subclasses which must do processing after the HTTP header is sent
+but before any content is sent.
+
+=item 6
+
+The method content() is called to send the page content to client.
+
+=back
+
+=cut
+
 sub go {
-	my $self = shift;
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+
+	# check to verify if there are set-level problems with running
+	#    this content generator (individual content generators must
+	#    check $self->{invalidSet} and react correctly)
+	my $authz = $r->authz;
+	$self->{invalidSet} = $authz->checkSet();
 	
-	my $r = $self->{r};
-	my $ce = $self->{ce};
-	my $returnValue = OK;
+	my $returnValue = MP2 ? Apache2::Const::OK : Apache::Constants::OK;
 	
+	# We only write to the activity log if it has been defined and if
+	# we are in a specific course.  The latter check is to prevent attempts
+	# to write to a course log file when viewing the top-level list of
+	# courses page.
+	WeBWorK::Utils::writeCourseLog($ce, 'activity_log',
+		$self->prepare_activity_entry) if ( $r->urlpath->arg("courseID") and
+			$r->ce->{courseFiles}->{logs}->{activity_log});
+
 	$self->pre_header_initialize(@_) if $self->can("pre_header_initialize");
+	
+	# send a file instead of a normal reply (reply_with_file() sets this field)
+	defined $self->{reply_with_file} and do {
+		return $self->do_reply_with_file($self->{reply_with_file});
+	};
+	
+	# send a Location: header instead of a normal reply (reply_with_redirect() sets this field)
+	defined $self->{reply_with_redirect} and do {
+		return $self->do_reply_with_redirect($self->{reply_with_redirect});
+	};
+	
 	my $headerReturn = $self->header(@_);
 	$returnValue = $headerReturn if defined $headerReturn;
+	# FIXME: we won't need noContent after reply_with_redirect() is adopted
 	return $returnValue if $r->header_only or $self->{noContent};
 	
-	# if the sendFile flag is set, send the file and exit;
-	if ($self->{sendFile}) {
-		return $self->sendFile;
-	}
-	
-	$self->initialize(@_) if $self->can("initialize");
+	$self->initialize() if $self->can("initialize");
 	
-	# A content generator will have a "content" method if it does not
-	# wish to be passed through template processing, but wishes to be
-	# completely responsible for it's own output.
-	if ($self->can("content")) {
-		$self->content(@_);
-	} else {
-		# if the content generator specifies a custom template name, use that
-		# field in the $ce->{templates} hash instead of "system" if it exists.
-		my $templateName;
-		if ($self->can("templateName")) {
-			$templateName = $self->templateName;
-		} else {
-			$templateName = "system";
-		}
-		$templateName = "system" unless exists $ce->{templates}->{$templateName};
-		$self->template($ce->{templates}->{$templateName}, @_);
-	}
+	$self->content();
 	
 	return $returnValue;
 }
 
-sub sendFile {
+=item r()
+
+Returns a reference to the WeBWorK::Request object associated with this
+instance.
+
+=cut
+
+sub r {
 	my ($self) = @_;
 	
-	my $file = $self->{sendFile}->{source};
-	
-	return NOT_FOUND unless -e $file;
-	return FORBIDDEN unless -r $file;
-	
-	open my $fh, "<", $file
-		or return SERVER_ERROR;
-	while (<$fh>) {
-		print $_;
-	}
-	close $fh;
-	
-	return OK;
+	return $self->{r};
 }
 
-# template(STRING, @otherArguments) - parse a template, looking for escapes of
-# the form <!--#NAME ARG1="FOO" ARG2="BAR"--> and calling a member function NAME
-# (if available) for each NAME. The escapes are called like:
-# 
-# 	$self->NAME(@otherArguments, \%escapeArguments)
-# 
-# where @otherArguments originates in the dispatcher and %escapeArguments is
-# parsed out of the escape itself (i.e. ARG1 => FOO, ARG2 => BAR)
-# 
-sub template {
-	my ($self, $templateFile) = (shift, shift);
-	my $r = $self->{r};
-	my $courseEnvironment = $self->{ce};
-	my @ifstack = (1); # Start off in printing mode
-		# say $ifstack[-1] to get the result of the last <#!--if-->
-	
-	# so even though the variable $/ APPEARS to contain a newline,
-	# <TEMPLATE> is slurping the whole file into the first element of
-	# @template ONLY AFTER THE TRANSLATOR RUNS. WTF!!!
-	#
-	#open(TEMPLATE, $templateFile) or die "Couldn't open template $templateFile";
-	#my @template = <TEMPLATE>;
-	#close TEMPLATE;
-	#
-	# Let's try something else instead:
-	my @template = split /\n/, readFile($templateFile);
-	
-	foreach my $line (@template) {
-		# This is incremental regex processing.
-		# the /c is so that pos($line) doesn't die when the regex fails.
-		while ($line =~ m/\G(.*?)<!--#(\w*)((?:\s+.*?)?)-->/gc) {
-			my ($before, $function, $raw_args) = ($1, $2, $3);
-			my @args = ($raw_args =~ /\S/) ? cook_args($raw_args) : ();
-			
-			if ($ifstack[-1]) {
-				print $before;
-			}
-			
-			if ($function eq "if") {
-				# a predicate can only be true if everything else on the ifstack is already true, for ANDing
-				push @ifstack, ($self->$function(@_, [@args]) && $ifstack[-1]);
-			} elsif ($function eq "else" and @ifstack > 1) {
-				$ifstack[-1] = not $ifstack[-1];
-			} elsif ($function eq "endif" and @ifstack > 1) {
-				pop @ifstack;
-			} elsif ($ifstack[-1]) {
-				if ($self->can($function)) {
-					my @result = $self->$function(@_, {@args});
-					if (@result) {
-						print @result;
-					} else {
-						warn "Template escape $function returned an empty list.";
-					}
-				}
-			}
-		}
-		
-		if ($ifstack[-1]) {
-			print substr($line, (defined pos $line) ? pos $line : 0), "\n";
-		}
-	}
-}
+=item do_reply_with_file($fileHash)
 
-# cook_args(STRING) - parses a string of the form ARG1="FOO" ARG2="BAR". Returns
-# a list which pairs into key/values and fits nicely in {}s.
-# 
-sub cook_args($) { # ... also used by bin/wwdb, so watch out
-	my ($raw_args) = @_;
-	my @args = ();
-	
-	# Boy I love m//g in scalar context!  Go read the camel book, heathen.
-	# First, get the whole token with the quotes on both ends...
-	while ($raw_args =~ m/\G\s*(\w*)="((?:[^"\\]|\\.)*)"/g) {
-		my ($key, $value) = ($1, $2);
-		# ... then, rip out all the protecty backspaces
-		$value =~ s/\\(.)/$1/g;
-		push @args, $key => $value;
-	}
-	
-	return @args;
-}
+Handler for reply_with_file(), used by go(). DO NOT CALL THIS METHOD DIRECTLY.
 
-# This is different.  It probably shouldn't print anything (except in debugging cases)
-# and it should return a boolean, not a string.  &if is called in a nonstandard way
-# by &template, with $args as an arrayref instead of a hashref.  this is a hack!  yay!
+=cut
 
-# OK, this is a pluggin architecture.  it iterates through attributes of the "if" tag,
-# and for each predicate $p, it calls &if_$p in an object-oriented way, continuing the
-# grand templating theme of an object-oriented pluggable architecture using ->can($).
-sub if {
-	my ($self, $args) = @_[0,-1];
-	# A single if "or"s it's components.  Nesting produces "and".
+sub do_reply_with_file {
+	my ($self, $fileHash) = @_;
+	my $r = $self->r;
 	
-	my @args = @$args; # Hahahahaha, get it?!
+	my $type = $fileHash->{type};
+	my $source = $fileHash->{source};
+	my $name = $fileHash->{name};
+	my $delete_after = $fileHash->{delete_after};
 	
-	if (@args % 2 != 0) {
-		# flip out and kill people, but do not commit seppuku
-		print '<!--&if recieved an uneven number of arguments.  This shouldn\'t happen, but I\'ll let it slide.-->\n';
-	}
+	# if there was a problem, we return here and let go() worry about sending the reply
+	return MP2 ? Apache2::Const::NOT_FOUND : Apache::Constants::NOT_FOUND unless -e $source;
+	return MP2 ? Apache2::Const::FORBIDDEN : Apache::Constants::FORBIDDEN unless -r $source;
 	
-	while (@args > 1) {
-		my ($key, $value) = (shift @args, shift @args);
-		
-		# a non-existent &if_$key is the same as a false result, but we're ORing, so it's OK
-		my $sub = "if_$key"; # perl doesn't like it when you try to construct a string right in a method invocation
-		if ($self->can("if_$key") and $self->$sub("$value")) {
-			return 1;
-		}
+	my $fh;
+	if (!MP2) {
+		# open the file now, so we can send the proper error status is we fail
+		open $fh, "<", $source or return Apache::Constants::SERVER_ERROR;
 	}
 	
-	return 0;
-}
-
-################################################################################
-# Macros used by content generators to render common idioms
-################################################################################
-
-# pathMacro(HASHREF, LIST) - helper macro for <!--#path--> escape: the hash
-# reference contains the "style", "image", and "text" arguments to the escape.
-# The LIST consists of ordered key-value pairs of the form:
-# 
-# 	"Page Name" => URL
-# 
-# If the page should not have a link associated with it, the URL should be left
-# empty. Authentication data is added to the URL so you don't have to. A fully-
-# formed path line is returned, suitable for returning by a function
-# implementing the #path escape.
-# 
-sub pathMacro {
-	my $self = shift;
-	my %args = %{ shift() };
-	my @path = @_;
-	my $sep;
-	if ($args{style} eq "image") {
-		$sep = CGI::img({-src=>$args{image}, -alt=>$args{text}});
+	# send our custom HTTP header
+	$r->content_type($type);
+	$r->headers_out->{"Content-Disposition"} = "attachment; filename=\"$name\"";
+	$r->send_http_header unless MP2;
+	
+	# send the file
+	if (MP2) {
+		$r->sendfile($source);
 	} else {
-		$sep = $args{text};
-	}
-	my $auth = $self->url_authen_args;
-	my @result;
-	while (@path) {
-		my $name = shift @path;
-		my $url = shift @path;
-		push @result, $url
-			? CGI::a({-href=>"$url?$auth"}, $name)
-			: $name;
-	}
-	return join($sep, @result) . "\n";
-}
-
-sub siblingsMacro {
-	my $self = shift;
-	my @siblings = @_;
-	my $sep = CGI::br();
-	my $auth = $self->url_authen_args;
-	my @result;
-	while (@siblings) {
-		my $name = shift @siblings;
-		my $url = shift @siblings;
-		push @result, $url
-			? CGI::a({-href=>"$url?$auth"}, $name)
-			: $name;
-	}
-	return join($sep, @result), "\n";
-}
-
-sub navMacro {
-	my $self = shift;
-	my %args = %{ shift() };
-	my $tail = shift;
-	my @links = @_;
-	my $auth = $self->url_authen_args;
-	my $ce = $self->{ce};
-	my $prefix = $ce->{webworkURLs}->{htdocs}."/images";
-	my @result;
-	while (@links) {
-		my $name = shift @links;
-		my $url = shift @links;
-		my $img = shift @links;
-		my $html = 
-			($img && $args{style} eq "images") 
-			? CGI::img(
-				{src=>($prefix."/".$img.$args{imagesuffix}), 
-				border=>"",
-				alt=>"$name"})
-			: $name;
-		unless($img && !$url) {
-			push @result, $url
-				? CGI::a({-href=>"$url?$auth$tail"}, $html)
-				: $html;
-		}
+		$r->send_fd($fh);
 	}
-	return join($args{separator}, @result) . "\n";
-}
-
-# hidden_fields(LIST) - return hidden <INPUT> tags for each field mentioned in
-# LIST (or all fields if list is empty), taking data from the current request.
-# 
-sub hidden_fields($;@) {
-	my $self = shift;
-	my $r = $self->{r};
-	my @fields = @_;
-	@fields or @fields = $r->param;
-	my $courseEnvironment = $self->{ce};
-	my $html = "";
 	
-	foreach my $param (@fields) {
-		my $value = $r->param($param);
-		$html .= CGI::input({-type=>"hidden",-name=>"$param",-value=>"$value"});
+	if (!MP2) {
+		# close the file and go home
+		close $fh;
 	}
-	return $html;
-}
-
-# hidden_authen_fields() - use hidden_fields to return hidden <INPUT> tags for
-# request fields used in authentication.
-# 
-sub hidden_authen_fields($) {
-	my $self = shift;
-	return $self->hidden_fields("user","effectiveUser","key");
-}
-
-# url_args(LIST) - return a URL query string (without the leading `?')
-# containing values for each field mentioned in LIST, or all fields if list is
-# empty. Data is taken from the current request.
-# 
-sub url_args($;@) {
-	my $self = shift;
-	my $r = $self->{r};
-	my @fields = @_;
-	@fields or @fields = $r->param; # If no fields are passed in, do them all.
-	my $courseEnvironment = $self->{ce};
 	
-	my @pairs;
-	foreach my $param (@fields) {
-		my @values = $r->param($param);
-		foreach my $value (@values) {
-			push @pairs, uri_escape($param) . "=" . uri_escape($value);
-		}
+	if ($delete_after) {
+		unlink $source or warn "failed to unlink $source after sending: $!";
 	}
 	
-	return join("&", @pairs);
+	return; # (see comment on return statement in do_reply_with_redirect, below.)
 }
 
-# url_authen_args() - use url_args to return a URL query string for request
-# fields used in authentication.
-# 
-sub url_authen_args($) {
-	my $self = shift;
-	my $r = $self->{r};
-	return $self->url_args("user","effectiveUser","key");
-}
+=item do_reply_with_redirect($url)
 
-# print_form_data(BEGIN, MIDDLE, END, OMIT) - return a string containing request
-# fields not matched by OMIT, placing BEGIN before each field name, MIDDLE
-# between each field and its value, and END after each value. Values are taken
-# from the current request. OMIT is a quoted reguar expression.
-# 
-sub print_form_data {
-	my ($self, $begin, $middle, $end, $qr_omit) = @_;
-	my $return_string = "";
-	my $r=$self->{r};
-	my @form_data = $r->param;
-	foreach my $name (@form_data) {
-		next if ($qr_omit and $name =~ /$qr_omit/);
-		my @values = $r->param($name);
-		foreach my $variable (qw(begin name middle value end)) {
-			no strict 'refs';
-			${$variable} = "" unless defined ${$variable};
-		}
-		foreach my $value (@values) {
-			$return_string .= "$begin$name$middle$value$end";
-		}
-	}
-	return $return_string;
-}
+Handler for reply_with_redirect(), used by go(). DO NOT CALL THIS METHOD DIRECTLY.
 
-sub errorOutput($$$) {
-	my ($self, $error, $details) = @_;
-	return
-		CGI::h3("Software Error"),
-		CGI::p(<<EOF),
-WeBWorK has encountered a software error while attempting to process this
-problem. It is likely that there is an error in the problem itself. If you are
-a student, contact your professor to have the error corrected. If you are a
-professor, please consut the error output below for more informaiton.
-EOF
-		CGI::h3("Error messages"), CGI::p(CGI::tt($error)),
-		CGI::h3("Error context"), CGI::p(CGI::tt($details));
-}
+=cut
 
-sub warningOutput($$) {
-	my ($self, $warnings) = @_;
+sub do_reply_with_redirect {
+	my ($self, $url) = @_;
+	my $r = $self->r;
 	
-	my @warnings = split m/\n+/, $warnings;
+	$r->status(MP2 ? Apache2::Const::REDIRECT : Apache::Constants::REDIRECT);
+	$r->headers_out->{"Location"} = $url;
+	$r->send_http_header unless MP2;
 	
-	return
-		CGI::h3("Software Warnings"),
-		CGI::p(<<EOF),
-WeBWorK has encountered warnings while attempting to process this problem. It
-is likely that this indicates an error or ambiguity in the problem itself. If
-you are a student, contact your professor to have the problem corrected. If you
-are a professor, please consut the warning output below for more informaiton.
-EOF
-		CGI::h3("Warning messages"),
-		CGI::ul(CGI::li(\@warnings)),
-	;
+	return; # we need to explicitly return noting here, otherwise we return $url under Apache2.
+	        # the return value from the mod_perl handler is used to set the HTTP status code,
+	        # but we're setting it explicitly above. i think we should dispense with setting it
+	        # with the return value altogether, and always do it with $r->status. the other way
+	        # is too oblique and error-prone. this is probably a FIXME.
+	        # 
+	        # Apache::WeBWorK::handler always returns the value it got from WeBWorK::dispatch
+	        # WeBWorK::dispatch always returns the value it got from WW::ContentGenerator::go
+	        # WW::ContentGenerator::go works like this:
+	        #		- if reply_with_file, return the return value from do_reply_with_file
+	        #		  (do_reply_with_file actually uses this to return NOT_FOUND/FORBIDDEN)
+	        #		- if reply_with_redirect, return the return value from do_reply_with_redirect
+	        #		  (do_reply_with_redirect does NOT use this -- it sets $r->status instead!)
+	        #		- if header returns a defined value, return that
+	        #		  (CG::header always returns OK!)
+	        #		- otherwise, return OK (this never happens!)
+	        # there are no longer any legitimate header() methods other than the one in CG.pm
 }
 
-################################################################################
-# Generic versions of template escapes
+=back
+
+=cut
+
 ################################################################################
 
-# Reminder: here are the template functions currently defined:
-# FIXME: this list is out of date!!!!!!!!
-# 
-# head
-# path
-# 	style = text|image
-# 	image = URL of image
-# 	text  = text separator
-# loginstatus
-# links
-# siblings
-# nav
-# 	style       = text|image
-# 	imageprefix = prefix to image URL
-# 	imagesuffix = suffix to image URL
-# 	separator   = HTML to place in between links
-# title
-# body
+=head1 DATA MODIFIERS
 
-sub header {
-	my $self = shift;
-	my $r = $self->{r};
-	
-	if ($self->{sendFile}) {
-		my $contentType = $self->{sendFile}->{type};
-		my $fileName = $self->{sendFile}->{name};
-		$r->content_type($contentType);
-		$r->header_out("Content-Disposition" => "attachment; filename=\"$fileName\"");
-	} else {
-		$r->content_type("text/html");
-		
-	}
-	
-	$r->send_http_header();
-	return OK;
-}
+Modifiers allow the caller to register a piece of data for later retrieval in a
+standard way.
 
-sub loginstatus {
-	my $self = shift;
-	my $r = $self->{r};
-	my $user = $r->param("user");
-	my $eUser = $r->param("effectiveUser");
-	my $key = $r->param("key");
-	return "" unless $key;
-	my $exitURL = $r->uri() . "?user=$user&key=$key";
-	print CGI::small("User:", "$user");
-	if ($user ne $eUser) {
-		print CGI::br(), CGI::font({-color=>'red'},
-				CGI::small("Acting as:", "$eUser")
-			),
-			CGI::br(), CGI::a({-href=>$exitURL},
-				CGI::small("Stop Acting")
-			);
-	}
-	return "";
-}
+=over
 
-# FIXME: drunk code. rewrite.
-# also, this should be structured s.t. subclasses can add items to the links
-# area, i.e. "stacking"
-sub links {
-	my $self = shift;
-	my @components = @_;
-	my $ce = $self->{ce};
-	my $db = $self->{db};
-	my $userName = $self->{r}->param("user");
-	my $courseName = $ce->{courseName};
-	my $root = $ce->{webworkURLs}->{root};
-	
-	#my $Key = $db->getKey($userName); # checked
-	#my $key = (defiend $key
-	#	? $Key->key()
-	#	: "");
-	#
-	#return "" unless defined $key;
-	# This has been replaced by using "#if loggedin" in ur.template.
-	
-	# URLs to parts of the system
-	my $probSets   = "$root/$courseName/?"            . $self->url_authen_args();
-	my $prefs      = "$root/$courseName/options/?"    . $self->url_authen_args();
-	my $help       = "$ce->{webworkURLs}->{docs}?"    . $self->url_authen_args();
-	my $logout     = "$root/$courseName/logout/?"     . $self->url_authen_args();
-	
-	my $PermissionLevel = $db->getPermissionLevel($userName); # checked
-	my $permLevel = (defined $PermissionLevel
-		? $PermissionLevel->permission()
-		: 0);
-	
-	return join("",
-		CGI::a({-href=>$probSets}, "Problem&nbsp;Sets"), CGI::br(),
-		CGI::a({-href=>$prefs}, "User&nbsp;Prefs"), CGI::br(),
-		CGI::a({-href=>$help}, "Help"), CGI::br(),
-		CGI::a({-href=>$logout}, "Log Out"), CGI::br(),
-		($permLevel > 0
-			? $self->instructor_links(@components) : ""
-		),
-	);
-}
-sub instructor_links {
-	my $self       = shift;
-	my @components = @_; 
-	my $args       = pop(@components);  # get hash of option arguments
-	my $courseName = $self->{ce}->{courseName};
-	my $root       = $self->{ce}->{webworkURLs}->{root};
-	my $userName = $self->{r}->param("effectiveUser");
-	$userName    = $self->{r}->param("user") unless defined $userName;
-	my ($set, $prob) = @components;
-	my $instructor = "$root/$courseName/instructor/?" . $self->url_authen_args();
-	my $sets       = "$root/$courseName/instructor/sets/?" . $self->url_authen_args();
-	my $users      = "$root/$courseName/instructor/users/?" . $self->url_authen_args();
-	my $email      = "$root/$courseName/instructor/send_mail/?" . $self->url_authen_args();
-	my $scoring    = "$root/$courseName/instructor/scoring/?" . $self->url_authen_args();
-	my $statsRoot  = "$root/$courseName/instructor/stats";     
-	my $stats      = $statsRoot. '/?'.$self->url_authen_args();
-	my $fileXfer   = "$root/$courseName/instructor/files/?" . $self->url_authen_args();
-
-	
-	#  Add direct links to sets e.g.  3:4 for set3 problem 4
-	my $setURL = (defined $set)
-		? "$root/$courseName/instructor/sets/$set/?" . $self->url_authen_args()
-		: '';
-	my $probURL = (defined $set && defined $prob)
-		? "$root/$courseName/instructor/pgProblemEditor/$set/$prob?" . $self->url_authen_args()
-		: '';
-	
-	my ($setLink, $problemLink) = ("", "");
-	if ($setURL) {
-		$setLink = "&nbsp;&nbsp;&nbsp;&nbsp;"
-			. CGI::a({-href=>$setURL}, "Set&nbsp;$set")
-			. CGI::br();
-		if ($probURL) {
-			$problemLink = "&nbsp;&nbsp;&nbsp;&nbsp;"
-				. CGI::a({-href=>$probURL}, "Problem&nbsp;$prob")
-				. CGI::br();
-		}
-	}
+=item reply_with_file($type, $source, $name, $delete_after)
+
+Enables file sending mode, causing go() to send the file specified by $source to
+the client after calling pre_header_initialize(). The content type sent is
+$type, and the suggested client-side file name is $name. If $delete_after is
+true, $source is deleted after it is sent.
+
+Must be called before the HTTP header is sent. Usually called from
+pre_header_initialize().
+
+=cut
+
+sub reply_with_file {
+	my ($self, $type, $source, $name, $delete_after) = @_;
+	$delete_after ||= "";
 	
-	#my $setProb = ($setURL)
-	#	? CGI::a({-href=>$setURL}, $set)
-	#	: '';
-	#$setProb .= ':' . CGI::a({-href=>$probURL},$prob) if $setProb && $probURL;
-	
-	return join("",
-		 CGI::hr(),
-		 CGI::a({-href=>$instructor}, "Instructor&nbsp;Tools") , CGI::br(),
-		 '&nbsp;&nbsp;',CGI::a({-href=>$sets}, "Set&nbsp;List"), CGI::br(),
-		 $setLink,
-		 $problemLink,
-		 '&nbsp;&nbsp;',CGI::a({-href=>$users}, "User&nbsp;List"), CGI::br(),
-		 '&nbsp;&nbsp;',CGI::a({-href=>$email}, "Send&nbsp;Email"), CGI::br(),
-		 '&nbsp;&nbsp;',CGI::a({-href=>$scoring}, "Score&nbsp;Sets"), CGI::br(),
-		 '&nbsp;&nbsp;',CGI::a({-href=>$stats}, 'Statistics'), CGI::br(),
-		 (defined($set))
-		 	? '&nbsp;&nbsp;&nbsp;&nbsp;'.CGI::a({-href=>"$statsRoot/set/$set/?".$self->url_authen_args}, "$set").CGI::br() 
-			: '',
-		 (defined($userName))
-		 	? '&nbsp;&nbsp;&nbsp;&nbsp;'.CGI::a({-href=>"$statsRoot/student/$userName/?".$self->url_authen_args}, "$userName").CGI::br()
-			: '',
-		 '&nbsp;&nbsp;',CGI::a({-href=>$fileXfer}, "File&nbsp;Transfer"), CGI::br(),
-	);
-}
-
-# &if_can will return 1 if the current object->can("do $_[1]")
-sub if_can ($$) {
-	my ($self, $arg) = (@_);
-	
-	if ($self->can("$arg")) {
-		return 1;
-	} else {
-		return 0;
-	}
+	$self->{reply_with_file} = {
+		type => $type,
+		source => $source,
+		name => $name,
+		delete_after => $delete_after,
+	};
 }
 
-# Every content generator is logged in unless it says otherwise.
-sub if_loggedin($$) {
-	my ($self, $arg) = (@_);
+=item reply_with_redirect($url)
+
+Enables redirect mode, causing go() to redirect to the given URL after calling
+pre_header_initialize().
+
+Must be called before the HTTP header is sent. Usually called from
+pre_header_initialize().
+
+=cut
+
+sub reply_with_redirect {
+	my ($self, $url) = @_;
 	
-	return $arg;
+	$self->{reply_with_redirect} = $url;
 }
 
-# Handling of errors in submissions
+=item addmessage($message)
 
-sub if_submiterror($$) {
-	my ($self, $arg) = @_;
-	if (exists $self->{submitError}) {
-		return $arg;
-	} else {
-		return !$arg;
-	}
-}
+Adds a message to the list of messages to be printed by the message() template
+escape handler.
 
-sub submiterror {
-	my ($self) = @_;
-	if (exists $self->{submitError}) {
-		return $self->{submitError};
-	} else {
-		return "";
-	}
-}
+Must be called before the message() template escape is invoked.
 
-# General warning handling
+=cut
 
-sub if_warnings($$) {
-	my ($self, $arg) = @_;
-	return $self->{r}->notes("warnings") ? $arg : !$arg;
-}
 
-sub warnings {
-	my ($self) = @_;
-	my $r = $self->{r};
-	if ($r->notes("warnings")) {
-		return $self->warningOutput($r->notes("warnings"));
-	} else {
-		return "";
-	}
+
+sub addmessage {
+	my ($self, $message) = @_;
+	$self->{status_message} .= $message;
 }
 
-1;
+=item addgoodmessage($message)
 
-__END__
+Adds a success message to the list of messages to be printed by the
+message() template escape handler.
 
-=head1 AUTHOR
+=cut
 
-Written by Dennis Lambe Jr., malsyned (at) math.rochester.edu
-and Sam Hathaway, sh002i (at) math.rochester.edu.
 
-=cut
+sub addgoodmessage {
+	my ($self, $message) = @_;
+	$self->addmessage(CGI::div({class=>"ResultsWithoutError"}, $message));
+}
+
+=item addbadmessage($message)
+
+Adds a failure message to the list of messages to be printed by the
+message() template escape handler.
+
+=cut
+
+
+sub addbadmessage {
+	my ($self, $message) = @_;
+	$self->addmessage(CGI::div({class=>"ResultsWithError"}, $message));
+}
+
+=item prepare_activity_entry()
+                                                                                
+Prepare a string to be sent to the activity log, if it is turned on.
+This can be overriden by different modules.
+                                                                                
+=cut                                                                            
+
+
+sub prepare_activity_entry {
+    my $self = shift;
+	my $r = $self->r;
+	my $string = $r->urlpath->path . "  --->  ".
+		join("\t", (map { $_ eq 'key' || $_ eq 'passwd' ? '' : $_ ." => " . $r->param($_) } $r->param()));
+	$string =~ s/\t+/\t/g;
+	return($string);
+}
+
+=back
+
+=cut
+
+################################################################################
+
+=head1 STANDARD METHODS
+
+The following are the standard content generator methods. Some are defined here,
+but may be overridden in a subclass. Others are not defined unless they are
+defined in a subclass.
+
+=over
+
+=item pre_header_initialize()
+
+Not defined in this package.
+
+May be defined by a subclass to perform any processing that must occur before
+the HTTP header is sent.
+
+=cut
+
+#sub pre_header_initialize {  }
+
+=item header()
+
+Defined in this package.
+
+Generates and sends a default HTTP header, specifying the "text/html" content
+type.
+
+=cut
+
+sub header {
+	my $self = shift;
+	my $r = $self->r;
+	
+	$r->content_type("text/html; charset=utf-8");
+	$r->send_http_header unless MP2;
+	return MP2 ? Apache2::Const::OK : Apache::Constants::OK;
+}
+
+=item initialize()
+
+Not defined in this package.
+
+May be defined by a subclass to perform any processing that must occur after the
+HTTP header is sent but before any content is sent.
+
+=cut
+
+#sub initialize {  }
+
+=item content()
+
+Defined in this package.
+
+Print the content of the generated page.
+
+The implementation in this package uses WeBWorK::Template to define the content
+of the page. See WeBWorK::Template for details.
+
+If a method named templateName() exists, it it called to determine the name of
+the template to use. If not, the default template, "system", is used. The
+location of the template is looked up in the course environment.
+
+=cut
+
+sub content {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	
+	my $themesDir = $ce->{webworkDirs}{templates};
+	my $theme = $r->param("theme") || $ce->{defaultTheme};
+	$theme = $ce->{defaultTheme} if $theme =~ m!(?:^|/)\.\.(?:/|$)!;
+	#$ce->{webworkURLs}->{stylesheet} = ($ce->{webworkURLs}->{htdocs})."/css/$theme.css";   # reset the style sheet
+	# the line above is clever -- but I think it is better to link directly to the style sheet from the system.template
+	# then the link between template and css is made in .template file instead of hard coded as above
+	# this means that the {stylesheet} option in global.conf is never used
+	my $template = $self->can("templateName") ? $self->templateName : $ce->{defaultThemeTemplate};
+	my $templateFile = "$themesDir/$theme/$template.template";
+	
+	template($templateFile, $self);
+}
+
+=back
+
+=cut
+
+# ------------------------------------------------------------------------------
+
+=head2 Template escape handlers
+
+Template escape handlers are invoked when the template processor encounters a
+matching escape sequence in the template. The escapse sequence's arguments are
+passed to the methods as a reference to a hash.
+
+For more information, refer to WeBWorK::Template.
+
+The following template escapes handlers are defined here or may be defined in
+subclasses. For methods that are not defined in this package, the documentation
+defines the interface and behavior that any subclass implementation must follow.
+
+=over
+
+=item head()
+
+Not defined in this package.
+
+Any tags that should appear in the HEAD of the document.
+
+=cut
+
+#sub head {  }
+
+=item info()
+
+Not defined in this package.
+
+Auxiliary information related to the content displayed in the C<body>.
+
+=cut
+
+#sub info {  }
+
+=item links()
+
+Defined in this package.
+
+Links that should appear on every page.
+
+=cut
+
+sub links {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my $db = $r->db;
+	my $authen = $r->authen;
+	my $authz = $r->authz;
+	my $urlpath = $r->urlpath;
+	
+	# we don't currently have any links to display if the user's not logged in. this may change, though.
+	#return "" unless $authen->was_verified;
+	
+	# grab some interesting data from the request
+	my $courseID = $urlpath->arg("courseID");
+	my $userID = $r->param('user');
+	my $eUserID   = $r->param("effectiveUser");
+	my $setID     = $urlpath->arg("setID");
+	my $problemID = $urlpath->arg("problemID");
+	
+	my $prettySetID = $setID;
+	$prettySetID =~ s/_/ /g if defined $prettySetID;
+	
+	# it's possible that the setID and the problemID are invalid, since they're just taken from the URL path info
+	if ($authen->was_verified) {
+		# DBFIXME testing for existence by keyfields -- don't need fetch record
+		if (defined $setID and $db->getUserSet($eUserID, $setID)) {
+			if (defined $problemID and $db->getUserProblem($eUserID, $setID, $problemID)) {
+				# both set and poblem exist -- do nothing
+			} else {
+				$problemID = undef;
+			}
+		} else {
+			$setID = undef;
+			$problemID = undef;
+		}
+	}
+	
+	# experimental subroutine for generating links, to clean up the rest of the
+	# code. ignore for now. (this is a closure over $self.)
+	my $makelink = sub {
+		my ($module, %options) = @_;
+		
+		my $urlpath_args = $options{urlpath_args} || {};
+		my $systemlink_args = $options{systemlink_args} || {};
+		my $text = $options{text};
+		my $active = $options{active};
+		my %target = ($options{target} ? (target => $options{target}) : ());
+		
+		my $new_urlpath = $self->r->urlpath->newFromModule($module, $r, %$urlpath_args);
+		my $new_systemlink = $self->systemLink($new_urlpath, %$systemlink_args);
+		
+		defined $text or $text = $new_urlpath->name;  #too clever
+		
+		my $id = $text;
+		$id =~ s/\W/\_/g; 
+		#$text = sp2nbsp($text); # ugly hack to prevent text from wrapping
+		
+		# try to set $active automatically by comparing 
+		if (not defined $active) {
+			if ($urlpath->module eq $new_urlpath->module) {
+				my @args = sort keys %{{$urlpath->args}};
+				my @new_args = sort keys %{{$new_urlpath->args}};
+				if (@args == @new_args) {
+					foreach my $i (0 .. $#args) {
+						$active = 0;
+						last if $args[$i] ne $new_args[$i];
+						$active = 1;
+					}
+				} else {
+					$active = 0;
+				}
+			} else {
+				$active = 0;
+			}
+		}
+		
+		my $new_anchor;
+		if ($active) {
+			# add <strong> for old browsers
+			$new_anchor = CGI::strong(CGI::a({href=>$new_systemlink, id=>$id, class=>"active", %target}, $text));
+		} else {
+			$new_anchor = CGI::a({href=>$new_systemlink, id=>$id, %target}, "$text");
+		}
+		
+		return $new_anchor;
+	};
+	
+	# to make things more concise
+	my $pfx = "WeBWorK::ContentGenerator::";
+	my %args = ( courseID => $courseID );
+	
+	# we'd like to preserve displayMode and showOldAnswers between pages, and we
+	# don't have a general way of preserving non-authen params between requests,
+	# so here is the hack:
+	my %params;
+	$params{displayMode} = $r->param("displayMode") if defined $r->param("displayMode");
+	$params{showOldAnswers} = $r->param("showOldAnswers") if defined $r->param("showOldAnswers");
+	# in the past, we were checking $self->{displayMode} and $self->{will}->{showOldAnswers}
+	# to set these args, but I don't wanna do that anymore, since it relies on
+	# fields specific to Problem.pm (pretty sure). The only differences in this
+	# approach are:
+	# (a) displayMode will not be set if it wasn't set in the current request,
+	# but this is ok since the resulting page will just use the default value
+	# (b) showOldAnswers will get set to the value specified in the current
+	# request, regardless of whether it is allowed, but this is OK since we
+	# always this value before using it.
+	my %systemlink_args;
+	$systemlink_args{params} = \%params if %params;
+	
+	print CGI::h2($r->maketext("Main Menu"));
+	print CGI::start_ul();
+	print CGI::start_li(); # Courses
+	print &$makelink("${pfx}Home", text=>$r->maketext("Courses"), systemlink_args=>{authen=>0});
+	
+	if (defined $courseID) {
+		#print CGI::start_ul();
+		#print CGI::start_li(); # $courseID
+		#print CGI::strong(CGI::span({class=>"active"}, $courseID));
+		
+		if ($authen->was_verified) {
+			print CGI::start_ul();
+			print CGI::start_li(); # Homework Sets
+			print &$makelink("${pfx}ProblemSets", text=>$r->maketext("Homework Sets"), urlpath_args=>{%args}, systemlink_args=>\%systemlink_args);
+			
+			if (defined $setID) {
+				print CGI::start_ul();
+				print CGI::start_li(); # $setID
+				# show a link if we're displaying a homework set, or a version
+				#    of a gateway assignment; to know if it's a gateway
+				#    assignment, we have to get the set record.
+				my ($globalSetID) = ( $setID =~ /(.+?)(,v\d+)?$/ );
+				my $setRecord = $db->getGlobalSet( $globalSetID );
+				if ( $setRecord->assignment_type !~ /gateway/ ) {
+					print &$makelink("${pfx}ProblemSet", text=>"$prettySetID", urlpath_args=>{%args,setID=>$setID}, systemlink_args=>\%systemlink_args);
+				} elsif ($setID =~ /,v(\d)+$/) {
+					print &$makelink("${pfx}GatewayQuiz", text=>"$prettySetID", urlpath_args=>{%args,setID=>$setID}, systemlink_args=>\%systemlink_args);
+				}
+
+				if (defined $problemID) {
+					print CGI::start_ul();
+					print CGI::start_li(); # $problemID
+					print &$makelink("${pfx}Problem", text=>$r->maketext("Problem [_1]", $problemID), urlpath_args=>{%args,setID=>$setID,problemID=>$problemID}, systemlink_args=>\%systemlink_args);
+					
+					print CGI::end_li(); # end $problemID
+					print CGI::end_ul();
+				}
+				print CGI::end_li(); # end $setID
+				print CGI::end_ul();
+			}
+			print CGI::end_li(); # end Homework Sets
+			
+			if ($authz->hasPermissions($userID, "change_password") or $authz->hasPermissions($userID, "change_email_address")) {
+				print CGI::li(&$makelink("${pfx}Options", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args));
+			}
+			
+			print CGI::li(&$makelink("${pfx}Grades", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args));
+			
+			if ($authz->hasPermissions($userID, "access_instructor_tools")) {
+				$pfx .= "Instructor::";
+				
+				print CGI::start_li(); # Instructor Tools
+				print &$makelink("${pfx}Index", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args);
+				print CGI::start_ul();
+				
+				print CGI::li(&$makelink("${pfx}UserList", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args));
+				
+				print CGI::start_li(); # Homework Set Editor
+				print &$makelink("${pfx}ProblemSetList", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args);
+				## only show editor link for non-versioned sets
+				if (defined $setID && $setID !~ /,v\d+$/ ) {
+					print CGI::start_ul();
+					print CGI::start_li(); # $setID
+					print &$makelink("${pfx}ProblemSetDetail", text=>"$prettySetID", urlpath_args=>{%args,setID=>$setID}, systemlink_args=>\%systemlink_args);
+					
+					if (defined $problemID) {
+						print CGI::start_ul();
+						print CGI::li(&$makelink("${pfx}PGProblemEditor", text=>"$problemID", urlpath_args=>{%args,setID=>$setID,problemID=>$problemID}, systemlink_args=>\%systemlink_args, target=>"WW_Editor"));
+						print CGI::end_ul();
+					}
+					
+					print CGI::end_li(); # end $setID
+					print CGI::end_ul();
+				}
+				print CGI::end_li(); # end Homework Set Editor
+				
+				print CGI::li(&$makelink("${pfx}SetMaker", text=>$r->maketext("Library Browser"), urlpath_args=>{%args}, systemlink_args=>\%systemlink_args));
+				print CGI::li(&$makelink("${pfx}SetMaker2", text=>$r->maketext("Library Browser 2"), urlpath_args=>{%args}, systemlink_args=>\%systemlink_args));
+				print CGI::start_li(); # Stats
+				print &$makelink("${pfx}Stats", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args);
+				if ($userID ne $eUserID or defined $setID) {
+					print CGI::start_ul();
+					if ($userID ne $eUserID) {
+						print CGI::li(&$makelink("${pfx}Stats", text=>"$eUserID", urlpath_args=>{%args,statType=>"student",userID=>$eUserID}, systemlink_args=>\%systemlink_args));
+					}
+					if (defined $setID) {
+						# make sure we don't try to send a versioned
+						#    set id in to the stats link
+						my ( $nvSetID ) = ( $setID =~ /(.+?)(,v\d+)?$/ );
+						my ( $nvPretty ) = ( $prettySetID =~ /(.+?)(,v\d+)?$/ );
+						print CGI::li(&$makelink("${pfx}Stats", text=>"$nvPretty", urlpath_args=>{%args,statType=>"set",setID=>$nvSetID}, systemlink_args=>\%systemlink_args));
+					}
+					print CGI::end_ul();
+				}
+				print CGI::end_li(); # end Stats
+				
+				print CGI::start_li(); # Student Progress
+				print &$makelink("${pfx}StudentProgress", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args);
+				if ($userID ne $eUserID or defined $setID) {
+					print CGI::start_ul();
+					if ($userID ne $eUserID) {
+						print CGI::li(&$makelink("${pfx}StudentProgress", text=>"$eUserID", urlpath_args=>{%args,statType=>"student",userID=>$eUserID}, systemlink_args=>\%systemlink_args));
+					}
+					if (defined $setID) {
+						# make sure we don't try to send a versioned
+						#    set id in to the stats link
+						my ( $nvSetID ) = ( $setID =~ /(.+?)(,v\d+)?$/ );
+						my ( $nvPretty ) = ( $prettySetID =~ /(.+?)(,v\d+)?$/ );
+						print CGI::li(&$makelink("${pfx}StudentProgress", text=>"$nvPretty", urlpath_args=>{%args,statType=>"set",setID=>$nvSetID}, systemlink_args=>\%systemlink_args));
+					}
+					print CGI::end_ul();
+				}
+				print CGI::end_li(); # end Student Progress
+				
+				if ($authz->hasPermissions($userID, "score_sets")) {
+					print CGI::li(&$makelink("${pfx}Scoring", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args));
+				}
+				
+				if ($authz->hasPermissions($userID, "send_mail")) {
+					print CGI::li(&$makelink("${pfx}SendMail", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args));
+				}
+				
+				if ($authz->hasPermissions($userID, "manage_course_files")) {
+					print CGI::li(&$makelink("${pfx}FileManager", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args));
+				}
+				
+				if ($authz->hasPermissions($userID, "manage_course_files")) {
+					print CGI::li(&$makelink("${pfx}Config", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args));
+				}
+				print CGI::li({}, $self->helpMacro('instructor_links','Help'),$self->help() );
+				if ($authz->hasPermissions($userID, "manage_course_files") # show this only on the FileManager page
+				     && $r->urlpath->module eq "WeBWorK::ContentGenerator::Instructor::FileManager") {
+				    my %augmentedSystemLinks = %systemlink_args;
+				    $augmentedSystemLinks{params}->{archiveCourse}=1;
+					print CGI::li(&$makelink("${pfx}FileManager", text=>"Archive this Course",urlpath_args=>{%args}, systemlink_args=>\%augmentedSystemLinks));
+				}
+				print CGI::end_ul();
+				print CGI::end_li(); # end Instructor Tools
+			} # /* access_instructor_tools */
+			
+			print CGI::end_ul();
+			
+			print CGI::start_ul();
+			if (exists $ce->{webworkURLs}{bugReporter} and $ce->{webworkURLs}{bugReporter} ne ""
+				and $authz->hasPermissions($userID, "report_bugs")) {
+				print CGI::li(CGI::a({style=>'font-size:larger', href=>$ce->{webworkURLs}{bugReporter}}, $r->maketext("Report bugs")));
+			}
+	
+	print CGI::end_ul();
+
+		} # /* authentication was_verified */
+		
+		#print CGI::end_li(); # end $courseID
+		#print CGI::end_ul();
+	} # /* defined $courseID */
+	
+	print CGI::end_li(); # end Courses
+	print CGI::end_ul();
+	
+	
+
+	
+	return "";
+}
+
+=item loginstatus()
+
+Defined in this package.
+
+Print a notification message announcing the current real user and effective
+user, a link to stop acting as the effective user, and a link to logout.
+
+=cut
+
+sub loginstatus {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $authen = $r->authen;
+	my $urlpath = $r->urlpath;
+	
+	if ($authen and $authen->was_verified) {
+		my $courseID = $urlpath->arg("courseID");
+		my $userID = $r->param("user");
+		my $eUserID = $r->param("effectiveUser");
+		
+		my $stopActingURL = $self->systemLink($urlpath, # current path
+			params => { effectiveUser => $userID },
+		);
+		my $logoutURL = $self->systemLink($urlpath->newFromModule(__PACKAGE__ . "::Logout", $r, courseID => $courseID));
+		
+		if ($eUserID eq $userID) {
+			print $r->maketext("Logged in as [_1]. ", $userID) . CGI::br() . CGI::a({href=>$logoutURL}, $r->maketext("Log Out"));
+		} else {
+			print $r->maketext("Logged in as [_1]. ", $userID) . CGI::a({href=>$logoutURL}, $r->maketext("Log Out")) . CGI::br();
+			print $r->maketext("Acting as [_1]. ", $eUserID) . CGI::a({href=>$stopActingURL}, $r->maketext("Stop Acting"));
+		}
+	} else {
+		print $r->maketext("Not logged in.");
+	}
+	
+	return "";
+}
+
+=item nav($args)
+
+Not defined in this package.
+
+Links to the previous, next, and parent objects.
+
+$args is a reference to a hash containing the following fields:
+
+ style       => text|image
+ imageprefix => prefix to prepend to base image URL
+ imagesuffix => suffix to append to base image URL
+ separator   => HTML to place in between links
+
+If C<style> is "image", image URLs are constructed by prepending C<imageprefix>
+and postpending C<imagesuffix> to the image base names defined by the
+implementor. (Examples of base names include "Prev", "Next", "ProbSet", and
+"Up"). Each concatenated string should form an absolute URL to an image file.
+For example:
+
+ <!--#nav style="images" imageprefix="/webwork2_files/images/nav"
+          imagesuffix=".gif" separator="  "-->
+
+=cut
+
+#sub nav {  }
+
+=item options()
+
+Not defined in this package.
+
+View options related to the content displayed in the body or info areas. See also
+optionsMacro().
+
+=cut
+
+#sub options {  }
+
+=item path($args)
+
+Defined in this package.
+
+Print "breadcrubs" from the root of the virtual hierarchy to the current page.
+$args is a reference to a hash containing the following fields:
+
+ style    => type of separator: text|image
+ image    => if style=image, URL of image to use as path separator
+ text     => if style=text, text to use as path separator
+             if style=image, the ALT text of each separator image
+ textonly => suppress all HTML, return only plain text
+
+The implementation in this package takes information from the WeBWorK::URLPath
+associated with the current request.
+
+=cut
+
+sub path {
+	my ($self, $args) = @_;
+	my $r = $self->r;
+	
+	my @path;
+	
+	my $urlpath = $r->urlpath;
+	do {
+		unshift @path, $urlpath->name, $r->location . $urlpath->path;
+	} while ($urlpath = $urlpath->parent);
+	
+	$path[$#path] = ""; # we don't want the last path element to be a link
+	
+	#print "\n<!-- BEGIN " . __PACKAGE__ . "::path -->\n";
+	print $self->pathMacro($args, @path);
+	#print "<!-- END " . __PACKAGE__ . "::path -->\n";
+	
+	return "";
+}
+
+=item siblings()
+
+Not defined in this package.
+
+Print links to siblings of the current object.
+
+=cut
+
+#sub siblings {  }
+
+=item footer()
+
+	-by ghe3
+	
+	combines timestamp() and other elements of the footer, including the copyright, into one output subroutine,
+=cut
+
+sub footer(){
+	my $self = shift;
+	my $r = $self->r;
+	
+	print CGI::p({-id=>"last-modified"}, $r->maketext("Page generated at [_1]", timestamp($self)));
+	print CGI::div({-id=>"copyright"}, "WeBWorK &#169; 1996-2011", CGI::a({-href=>"http://webwork.maa.org/"}, $r->maketext("The WeBWorK Project")));
+	
+	return "";
+}
+
+ 
+=item timestamp()
+
+Defined in this package.
+
+Display the current time and date using default format "3:37pm on Jan 7, 2004".
+The display format can be adjusted by giving a style in the template.
+For example,
+
+  <!--#timestamp style="%m/%d/%y at %I:%M%P"-->
+
+will give standard WeBWorK time format.  Wording and other formatting
+can be done in the template itself.
+=cut
+
+# sub timestamp {
+# 	my ($self, $args) = @_;
+# 	my $formatstring = "%l:%M%P on %b %e, %Y";
+# 	$formatstring = $args->{style} if(defined($args->{style}));
+# 	return(Date::Format::time2str($formatstring, time()));
+# }
+sub timestamp {
+	my ($self, $args) = @_;
+# 	my $r = $self->r;
+# 	my $ce = $r->ce;
+# 	my $tz = $ce->{siteDefaults}{timezone};
+# 	warn "testing", $r, $ce, $tz;
+    # need to use the formatDateTime in this file (some subclasses access Util's version.
+	return( $self->formatDateTime( time() ) );
+}
+=item message()
+
+Defined in this package.
+
+Print any messages (error or non-error) resulting from the last form submission.
+This could be used to give Sucess and Failure messages after an action is performed by a module.
+
+The implementation in this package prints the value of the field
+$self->{status_message}, if it is present.
+
+=cut
+
+sub message {
+	my ($self) = @_;
+	
+	print "\n<!-- BEGIN " . __PACKAGE__ . "::message -->\n";
+	print $self->{status_message} if exists $self->{status_message};
+	
+	print "<!-- END " . __PACKAGE__ . "::message -->\n";
+	
+	return "";
+}
+
+=item title()
+
+Defined in this package.
+
+Print the title of the current page.
+
+The implementation in this package takes information from the WeBWorK::URLPath
+associated with the current request.
+
+=cut
+
+sub title {
+	my ($self, $args) = @_;
+	my $r = $self->r;
+	
+	#print "\n<!-- BEGIN " . __PACKAGE__ . "::title -->\n";
+	#print underscore2nbsp($r->urlpath->name);
+	my $name = $r->urlpath->name;
+	# $name =~ s/_/ /g;
+	print $name;
+	#print "<!-- END " . __PACKAGE__ . "::title -->\n";
+	
+	return "";
+}
+
+=item warnings()
+
+Defined in this package.
+
+Print accumulated warnings.
+
+The implementation in this package checks for a note in the request named
+"warnings". If present, its contents are formatted and returned.
+
+=cut
+
+sub warnings {
+	my ($self) = @_;
+	my $r = $self->r;
+	
+	print "\n<!-- BEGIN " . __PACKAGE__ . "::warnings -->\n";
+	my $warnings = MP2 ? $r->notes->get("warnings") : $r->notes("warnings");
+	print $self->warningOutput($warnings) if $warnings;
+	print "<!-- END " . __PACKAGE__ . "::warnings -->\n";
+	
+	return "";
+}
+
+=item help()
+
+Display a link to context-sensitive help. If the argument C<name> is defined,
+the link will be to the help document for that name. Otherwise the module of the
+WeBWorK::URLPath node for the current system location will be used.
+
+=cut
+
+sub help {
+	my $self = shift;
+	my $args = shift;
+	my $name = $args->{name};
+
+	# old naming scheme
+	#$name = lc($self->r->urlpath->name) unless defined($name);
+	#$name =~ s/\s/_/g;
+
+	$name = $self->r->urlpath->module unless defined($name);
+	$name =~ s/WeBWorK::ContentGenerator:://;
+	$name =~ s/://g;
+
+	$self->helpMacro($name);
+}
+
+=item url($args)
+
+Defined in this package.
+
+Returns the specified URL from either %webworkURLs or %courseURLs in the course
+environment. $args is a reference to a hash containing the following fields:
+
+ type => type of URL: webwork|course
+ name => name of URL (key in URL hash)
+
+=cut
+
+sub url {
+	my ($self, $args) = @_;
+	my $ce = $self->r->ce;
+	my $type = $args->{type};
+	my $name = $args->{name};
+	
+	if ($type eq "webwork") {
+		return $ce->{webworkURLs}->{$name};
+	} elsif ($type eq "course") {
+		return $ce->{courseURLs}->{$name};
+	} else {
+		warn __PACKAGE__."::url: unrecognized type '$type'.\n";
+	}
+}
+
+=back
+
+=cut
+
+# ------------------------------------------------------------------------------
+
+=head2 Conditional predicates
+
+Conditional predicate methods are invoked when the C<#if> escape sequence is
+encountered in the template. If a method named C<if_predicate> is defined in
+here or in the instantiated subclass, it is invoked.
+
+The following predicates are currently defined:
+
+=over
+
+=item if_can($function)
+
+If a function named $function is present in the current content generator (or
+any superclass), a true value is returned. Otherwise, a false value is returned.
+
+The implementation in this package uses the method UNIVERSAL->can(function) to
+arrive at the result.
+
+A subclass could redefine this method to, for example, "hide" a method from the
+template:
+
+ sub if_can {
+ 	my ($self, $arg) = @_;
+ 	
+ 	if ($arg eq "floobar") {
+ 		return 0;
+ 	} else {
+ 		return $self->SUPER::if_can($arg);
+ 	}
+ }
+
+=cut
+
+sub if_can {
+	my ($self, $arg) = @_;
+	
+	return $self->can($arg) ? 1 : 0;
+}
+
+=item if_loggedin($arg)
+
+If the user is currently logged in, $arg is returned. Otherwise, the inverse of
+$arg is returned.
+
+#The implementation in this package always returns $arg, since most content
+#generators are only reachable when the user is authenticated. It is up to
+#classes that can be reached without logging in to override this method and
+#provide the correct behavior.
+#
+#This is suboptimal, and may change in the future.
+
+The implementation in this package uses WeBWorK::Authen::was_verified() to
+retrieve the result of the last call to WeBWorK::Authen::verify().
+
+=cut
+
+sub if_loggedin {
+	my ($self, $arg) = @_;
+	
+	#return $arg;
+	return 0 unless $self->r->authen;
+	return $self->r->authen->was_verified() ? $arg : !$arg;
+}
+
+=item if_message($arg)
+
+If the last form submission generated a message, $arg is returned. Otherwise, the
+inverse of $arg is returned.
+
+The implementation in this package checks for the field $self->{status_message} to
+determine if a message is present.
+
+If a subclass uses some other method to classify submission results, this method could be
+redefined to handle that variance:
+
+ sub if_message {
+ 	my ($self, $arg) = @_;
+ 	
+ 	my $status = $self->{processReturnValue};
+ 	if ($status != 0) {
+ 		return $arg;
+ 	} else {
+ 		return !$arg;
+ 	}
+ }
+
+=cut
+
+sub if_message {
+	my ($self, $arg) = @_;
+	
+	if (exists $self->{status_message}) {
+		return $arg;
+	} else {
+		return !$arg;
+	}
+}
+
+=item if_warnings
+
+If warnings have been emitted while handling this request, $arg is returned.
+Otherwise, the inverse of $arg is returned.
+
+The implementation in this package checks for a note in the request named
+"warnings". This is set by the WARN handler in Apache::WeBWorK when a warning is
+handled.
+
+=cut
+
+sub if_warnings {
+	my ($self, $arg) = @_;
+	my $r = $self->r;
+	
+	if (MP2 ? $r->notes->get("warnings") : $r->notes("warnings")) {
+		return $arg;
+	} else {
+		!$arg;
+	}
+}
+
+=back
+
+=cut
+
+################################################################################
+
+=head1 HTML MACROS
+
+Various routines are defined in this package for rendering common WeBWorK
+idioms.
+
+FIXME: some of these should be moved to WeBWorK::HTML:: modules!
+
+# ------------------------------------------------------------------------------
+
+=head2 Template escape handler macros
+
+These methods are used by implementations of the escape sequence handlers to
+maintain a consistent style.
+
+=over
+
+=item pathMacro($args, @path)
+
+Helper macro for the C<#path> escape sequence: $args is a hash reference
+containing the "style", "image", "text", and "textonly" arguments to the escape.
+@path consists of ordered key-value pairs of the form:
+
+ "Page Name" => URL
+
+If the page should not have a link associated with it, the URL should be left
+empty. Authentication data is added to each URL so you don't have to. A fully-
+formed path line is returned, suitable for returning by a function implementing
+the C<#path> escape.
+
+FIXME: authentication data probably shouldn't be added here any more, now that
+we have systemLink().
+
+=cut
+
+sub pathMacro {
+	my ($self, $args, @path) = @_;
+	my $r = $self->r;
+	my %args = %$args;
+	$args{style} = "text" if $args{textonly};
+	
+	my $auth = $self->url_authen_args;
+	my $sep;
+	if ($args{style} eq "image") {
+		$sep = CGI::img({-src=>$args{image}, -alt=>$args{text}});
+	} else {
+		$sep = $args{text};
+	}
+	
+	my @result;
+	while (@path) {
+		my $name = shift @path;
+		my $url = shift @path;
+		if ($url and not $args{textonly}) {
+			push @result, CGI::a({-href=>"$url?$auth"}, $r->maketext(lc($name)));
+		} else {
+			push @result, $r->maketext($name);
+		}
+	}
+	
+	return join($sep, @result), "\n";
+}
+
+=item siblingsMacro(@siblings)
+
+Helper macro for the C<#siblings> escape sequence. @siblings consists of ordered
+key-value pairs of the form:
+
+ "Sibling Name" => URL
+
+If the sibling should not have a link associated with it, the URL should be left
+empty. Authentication data is added to each URL so you don't have to. A fully-
+formed siblings block is returned, suitable for returning by a function
+implementing the C<#siblings> escape.
+
+FIXME: authentication data probably shouldn't be added here any more, now that
+we have systemLink().
+
+=cut
+
+sub siblingsMacro {
+	my ($self, @siblings) = @_;
+	
+	my $auth = $self->url_authen_args;
+	my $sep = CGI::br();
+	
+	my @result;
+	while (@siblings) {
+		my $name = shift @siblings;
+		my $url = shift @siblings;
+		my $id = $name;
+		$id =~ s/\W/\_/g;
+		push @result, $url
+			? CGI::span( {id=>$id}, CGI::a({-href=>"$url?$auth"}, $name) )
+			: CGI::span( {id=>$id},$name );
+	}
+	
+	return join($sep, @result) . "\n";
+}
+
+
+
+=item navMacro($args, $tail, @links)
+
+Helper macro for the C<#nav> escape sequence: $args is a hash reference
+containing the "style", "imageprefix", "imagesuffix", and "separator" arguments
+to the escape. @siblings consists of ordered tuples of the form:
+
+ "Link Name", URL, ImageBaseName
+
+If the sibling should not have a link associated with it, the URL should be left
+empty. ImageBaseName is placed between the C<imageprefix> and C<imagesuffix>.
+Authentication data is added to each URL so you don't have to. $tail is appended
+to each URL, after the authentication information. A fully-formed nav line is
+returned, suitable for returning by a function implementing the C<#nav> escape.
+
+=cut
+
+sub navMacro {
+	my ($self, $args, $tail, @links) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my %args = %$args;
+
+	my $auth = $self->url_authen_args;
+	my $prefix = $ce->{webworkURLs}->{htdocs}."/images";
+
+	my @result;
+	while (@links) {
+		my $name = shift @links;
+		my $url = shift @links;
+		my $direction = shift @links;
+		my $html = ($direction && $args{style} eq "buttons") ? $direction : $name;
+			# ($img && $args{style} eq "images")
+			# ? CGI::img(
+				# {src=>($prefix."/".$img.$args{imagesuffix}),
+				# border=>"",
+				# alt=>"$name"})
+			# : $name."lol";
+#		unless($img && !$url) {  ## these are now "disabled" versions in grey -- DPVC
+			push @result, $url
+				? CGI::a({-href=>"$url?$auth$tail", -class=>"nav_button"}, $html)
+				: CGI::span({-class=>"gray_button"}, $html);
+#		}
+	}
+
+	return join($args{separator}, @result) . "\n";
+}
+
+=item helpMacro($name)
+
+This escape is represented by a question mark which links to an html page in the
+helpFiles  directory.  Currently the link is made to the file $name.html
+
+=cut
+
+sub helpMacro {
+    my $self = shift;
+	my $name = shift;
+	my $label  = shift; #optional
+	my $ce   = $self->r->ce;
+	my $basePath = $ce->{webworkDirs}->{local_help};
+	$name        = 'no_help' unless -e "$basePath/$name.html";
+	my $path     = "$basePath/$name.html";
+	my $url = $ce->{webworkURLs}->{local_help}."/$name.html";
+	my $imageURL = $ce->{webworkURLs}->{htdocs}."/images/question_mark.png";
+	$label    = CGI::img({src=>$imageURL, alt=>" ? "}) unless defined $label;
+	return CGI::a({href      => $url,
+	               target    => 'ww_help',
+	               onclick   => "window.open(this.href,this.target,'width=550,height=350,scrollbars=yes,resizable=yes')"},
+	               $label);
+}
+
+=item optionsMacro(options_to_show => \@options_to_show, extra_params => \@extra_params)
+
+Helper macro for displaying the View Options panel.
+
+@options_to_show lists the options to show, from among this list "displayMode",
+"showOldAnswers", "showHints", "showSolutions". If no options are given,
+"displayMode" is assumed.
+
+@extraParams is dereferenced and passed to the hidden_fields() method. Use this
+to preserve state from the content generator calling optionsMacro().
+
+This macro is intended to be called from an implementation of the options()
+method. The simplest way to to this is:
+
+ sub options { shift->optionsMacro }
+
+=cut
+
+sub optionsMacro {
+	my ($self, %options) = @_;
+	my $r = $self->r;
+	
+	my @options_to_show = @{$options{options_to_show}} if exists $options{options_to_show};
+	@options_to_show = "displayMode" unless @options_to_show;  #FIXME -- I don't understant this -- type seems wrong
+	my %options_to_show; @options_to_show{@options_to_show} = (); # make hash for easy lookups
+	my @extra_params = @{$options{extra_params}} if exists $options{extra_params};
+	
+	print CGI::h2($r->maketext("Display Options"));
+	
+	my $result = CGI::start_form("POST", $self->r->uri);
+	$result .= $self->hidden_authen_fields;
+	$result .= $self->hidden_fields(@extra_params) if @extra_params;
+	$result .= CGI::start_div({class=>"viewOptions"});
+	
+	if (exists $options_to_show{displayMode}) {
+		my $curr_displayMode = $self->r->param("displayMode") || $self->r->ce->{pg}->{options}->{displayMode};
+		my %display_modes = %{WeBWorK::PG::DISPLAY_MODES()};
+		my @active_modes = grep { exists $display_modes{$_} } @{$self->r->ce->{pg}->{displayModes}};
+		if (@active_modes > 1) {
+			$result .= "View&nbsp;equations&nbsp;as:&nbsp;&nbsp;&nbsp;&nbsp;";
+			$result .= CGI::br();
+			$result .= CGI::radio_group(
+				-name => "displayMode",
+				-values => \@active_modes,
+				-default => $curr_displayMode,
+				-linebreak=>'true',
+			);
+			$result .= CGI::br();
+		}
+	}
+	
+	if (exists $options_to_show{showOldAnswers}) {
+		# Note, 0 is a legal value, so we can't use || in setting this
+		my $curr_showOldAnswers = defined($self->r->param("showOldAnswers")) ?
+			$self->r->param("showOldAnswers") : $self->r->ce->{pg}->{options}->{showOldAnswers};
+		$result .= "Show&nbsp;saved&nbsp;answers?";
+		$result .= CGI::br();
+		$result .= CGI::radio_group(
+			-name => "showOldAnswers",
+			-values => [1,0],
+			-default => $curr_showOldAnswers,
+			-labels => { 0=>'No', 1=>'Yes' },
+		);
+		$result .= CGI::br();
+	}
+	
+	$result .= CGI::submit(-name=>"redisplay", -label=>$r->maketext("Apply Options"));
+	$result .= CGI::end_div();
+	$result .= CGI::end_form();
+	
+	return $result;
+}
+
+=item feedbackMacro(%params)
+
+Helper macro for displaying the feedback form. Returns a button named "Email
+Instructor". %params contains the request parameters accepted by the Feedback
+module and their values.
+
+=cut
+
+sub feedbackMacro {
+	my ($self, %params) = @_;
+	my $r = $self->r;
+	my $authz = $r->authz;
+	my $userID = $r->param("user");
+	
+	# don't do anything unless the user has permission to
+	return "" unless $authz->hasPermissions($userID, "submit_feedback");
+	
+	my $feedbackURL = $r->ce->{courseURLs}{feedbackURL};
+	my $feedbackFormURL = $r->ce->{courseURLs}{feedbackFormURL};
+	if (defined $feedbackURL and $feedbackURL ne "") {
+		return $self->feedbackMacro_url($feedbackURL);
+	} elsif (defined $feedbackFormURL and $feedbackFormURL ne "") {
+		return $self->feedbackMacro_form($feedbackFormURL,%params);
+	} else {
+		return $self->feedbackMacro_email(%params);
+	}
+}
+
+sub feedbackMacro_email {
+	my ($self, %params) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my $urlpath = $r->urlpath;
+	my $courseID = $urlpath->arg("courseID");
+	
+	# feedback form url
+	my $feedbackPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Feedback",  $r, courseID => $courseID);
+	my $feedbackURL = $self->systemLink($feedbackPage, authen => 0); # no authen info for form action
+	my $feedbackName = $r->maketext($ce->{feedback_button_name}) || $r->maketext("Email instructor");
+	
+	my $result = CGI::start_form(-method=>"POST", -action=>$feedbackURL) . "\n";
+	$result .= $self->hidden_authen_fields . "\n";
+	
+	while (my ($key, $value) = each %params) {
+	    next if $key eq 'pg_object';    # not used in internal feedback mechanism
+		$result .= CGI::hidden($key, $value) . "\n";
+	}
+	$result .= CGI::p({-align=>"left"}, CGI::submit(-name=>"feedbackForm", -value=>$feedbackName));
+	$result .= CGI::endform() . "\n";
+	
+	return $result;
+}
+
+sub feedbackMacro_form {
+	my ($self, $feedbackFormURL, %params) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my $urlpath = $r->urlpath;
+	my $courseID = $urlpath->arg("courseID");
+	
+	# feedback form url
+	my $feedbackName = $r->maketext($ce->{feedback_button_name}) || $r->maketext("Email instructor");
+	
+	my $result = CGI::start_form(-method=>"POST", -action=>$feedbackFormURL,-target=>"WW_info") . "\n";
+	$result .= $self->hidden_authen_fields . "\n";
+	
+	while (my ($key, $value) = each %params) {
+	    if ($key eq 'pg_object') {
+	        my $tmp = $value->{body_text}; 
+	        $tmp .= CGI::p(CGI::b("Note: "). CGI::i($value->{result}->{msg})) if $value->{result}->{msg} ;
+	        $result .= CGI::hidden($key, encode_base64($tmp, "") );
+	    } else {
+			$result .= CGI::hidden($key, $value) . "\n";
+		}
+	}
+	$result .= CGI::p({-align=>"left"}, CGI::submit(-name=>"feedbackForm", -value=>$feedbackName));
+	$result .= CGI::endform() . "\n";
+	
+	return $result;
+}
+
+sub feedbackMacro_url {
+	my ($self, $url) = @_;
+	my $r = $self->r;
+	my $feedbackName = $r->maketext($r->ce->{feedback_button_name}) || $r->maketext("Email instructor");
+	return CGI::a({-href=>$url}, $feedbackName);
+}
+
+=back
+
+=cut
+
+# ------------------------------------------------------------------------------
+
+=head2 Parameter management
+
+Methods for formatting request parameters as hidden form fields or query string
+fragments.
+
+=over
+
+=item hidden_fields(@fields)
+
+Return hidden <INPUT> tags for each field mentioned in @fields (or all fields if
+list is empty), taking data from the current request.
+
+=cut
+
+sub hidden_fields {
+	my ($self, @fields) = @_;
+	my $r = $self->r;
+	
+	@fields = $r->param unless @fields;
+	
+	my $html = "";
+	foreach my $param (@fields) {
+# 		my @values = $r->param($param);
+# 		$html .= CGI::hidden($param, @values);  #MEG
+# 		 warn "$param ", join(" ", @values) if @values >1; #this should never happen!!!
+		my $value  = $r->param($param);
+		$html .= CGI::hidden($param, $value); # (can't name these items when using real CGI) 
+	}
+	return $html;
+}
+
+=item hidden_authen_fields()
+
+Use hidden_fields to return hidden <INPUT> tags for request fields used in
+authentication.
+
+=cut
+
+sub hidden_authen_fields {
+	my ($self) = @_;
+	
+	return $self->hidden_fields("user", "effectiveUser", "key", "theme");
+}
+
+=item hidden_proctor_authen_fields()
+
+Use hidden_fields to return hidden <INPUT> tags for request fields used in
+proctor authentication.
+
+=cut
+
+sub hidden_proctor_authen_fields {
+	my $self = shift;
+	if ( $self->r->param('proctor_user') ) {
+		return $self->hidden_fields("proctor_user", "proctor_key");
+	} else {
+		return '';
+	}
+}
+
+=item hidden_state_fields()
+
+Use hidden_fields to return hidden <INPUT> tags for request fields used to
+maintain state. Currently includes authentication fields and display option
+fields.
+
+=cut
+
+sub hidden_state_fields {
+	my ($self) = @_;
+	
+	return $self->hidden_authen_fields();
+	
+	# other things that may be state data:
+	#$self->hidden_fields("displayMode", "showOldAnswers", "showCorrectAnswers", "showHints", "showSolutions");
+}
+
+=item url_args(@fields)
+
+Return a URL query string (without the leading `?') containing values for each
+field mentioned in @fields, or all fields if list is empty. Data is taken from
+the current request.
+
+=cut
+
+sub url_args {
+	my ($self, @fields) = @_;
+	my $r = $self->r;
+	
+	@fields = $r->param unless @fields;
+	
+	my @pairs;
+	foreach my $param (@fields) {
+		my @values = $r->param($param);
+		foreach my $value (@values) {
+			push @pairs, uri_escape($param) . "=" . uri_escape($value);
+		}
+	}
+	
+	return join("&", @pairs);
+}
+
+=item url_authen_args()
+
+Use url_args to return a URL query string for request fields used in
+authentication.
+
+=cut
+
+sub url_authen_args {
+	my ($self) = @_;
+	
+	return $self->url_args("user", "effectiveUser", "key", "theme");
+}
+
+=item url_state_args()
+
+Use url_args to return a URL query string for request fields used to maintain
+state. Currently includes authentication fields and display option fields.
+
+=cut
+
+sub url_state_args {
+	my ($self) = @_;
+	
+	return $self->url_authen_args;
+	
+	# other things that may be state data:
+	#$self->url_args("displayMode", "showOldAnswers", "showCorrectAnswers", "showHints", "showSolutions");
+}
+
+# This method is not used anywhere! --sam(1-Aug-05)
+#
+#=item url_display_args()
+#
+#Use url_args to return a URL query string for request fields used in
+#authentication.
+#
+#=cut
+#
+#sub url_display_args {
+#	my ($self) = @_;
+#	
+#	return $self->url_args("displayMode", "showOldAnswer");
+#}
+
+# This method is not used anywhere! --sam(1-Aug-05)
+#
+#=item print_form_data($begin, $middle, $end, $omit)
+#
+#Return a string containing every request field not matched by the quoted reguar
+#expression $omit, placing $begin before each field name, $middle between each
+#field name and its value, and $end after each value. Values are taken from the
+#current request.
+#
+#=cut
+#
+#sub print_form_data {
+#	my ($self, $begin, $middle, $end, $qr_omit) = @_;
+#	my $r=$self->r;
+#	my @form_data = $r->param;
+#	
+#	my $return_string = "";
+#	foreach my $name (@form_data) {
+#		next if ($qr_omit and $name =~ /$qr_omit/);
+#		my @values = $r->param($name);
+#		foreach my $variable (qw(begin name middle value end)) {
+#			# FIXME: can this loop be moved out of the enclosing loop?
+#			no strict 'refs';
+#			${$variable} = "" unless defined ${$variable};
+#		}
+#		foreach my $value (@values) {
+#			$return_string .= "$begin$name$middle$value$end";
+#		}
+#	}
+#	
+#	return $return_string;
+#}
+
+=back
+
+=cut
+
+# ------------------------------------------------------------------------------
+
+=head2 Utilities
+
+=over
+
+=item systemLink($urlpath, %options)
+
+Generate a link to another part of the system. $urlpath is WeBWorK::URLPath
+object from which the base path will be taken. %options can consist of:
+
+=over
+
+=item params
+
+Can be either a reference to an array or a reference to a hash.
+
+If it is a reference to a hash, it maps parmaeter names to values. These
+parameters will be included in the generated link. If a value is an arrayref,
+the values of the array referenced will be used. If a value is undefined, the
+value from the current request will be used.
+
+If C<params> is an arrayref, it is interpreted as a list of parameter names.
+These parameters will be included in the generated link, using the values from
+the current request.
+
+Unless C<authen> is false (see below), the authentication parameters (C<user>,
+C<effectiveUser>, and C<key>) are included with their default values.
+
+=item authen
+
+If set to a false value, the authentication parameters (C<user>,
+C<effectiveUser>, and C<key>) are included in the the generated link unless
+explicitly listed in C<params>.
+
+=item use_abs_url
+
+If set to a true value, the scheme, host, and port are prepended to the URL.
+This is useful for links which must be usable on their own, such as those sent
+via email.
+
+=back
+
+=cut
+
+# FIXME: there should probably be an option for prepending "http://hostname:port"
+sub systemLink {
+	my ($self, $urlpath, %options) = @_;
+	my $r = $self->r;
+	
+	my %params = ();
+	if (exists $options{params}) {
+		if (ref $options{params} eq "HASH") {
+			%params = %{ $options{params} };
+		} elsif (ref $options{params} eq "ARRAY") {
+			my @names = @{ $options{params} };
+			@params{@names} = ();
+		} else {
+			croak "option 'params' is not a hashref or an arrayref";
+		}
+	}
+	
+	my $authen = exists $options{authen} ? $options{authen} : 1;
+	if ($authen) {
+		$params{user}          = undef unless exists $params{user};
+		$params{effectiveUser} = undef unless exists $params{effectiveUser};
+		$params{key}           = undef unless exists $params{key};
+		$params{theme}         = undef unless exists $params{theme};
+	}
+	
+	my $url;
+	
+	$url = $r->ce->{apache_root_url} if $options{use_abs_url};
+	$url .= $r->location . $urlpath->path;
+	my $first = 1;
+	
+	foreach my $name (keys %params) {
+		my $value = $params{$name};
+		
+		my @values;
+		if (defined $value) {
+			if (ref $value eq "ARRAY") {
+				@values = @$value;
+			} else {
+				@values = $value;
+			}
+		} elsif (defined $r->param($name)) {
+			@values = $r->param($name);
+		}
+		#FIXME  -- evntually we'd like to catch where this happens
+		if ($name eq 'user' and @values >1 )    {
+			warn "internal error --  user has been multiply defined! You may need to logout and log back in to correct this.";
+			my $user = $r->param("user");
+			$r->param(user => $user);
+		    @values = ($user);
+		    warn "requesting page is ", $r->headers_in->{'Referer'};
+		    warn "Parameters are ", join("|",$r->param());
+
+		}
+		 
+		if (@values) {
+			if ($first) {
+				$url .= "?";
+				$first = 0;
+			} else {
+				$url .= "&";
+			}
+			$url .= join "&", map { "$name=$_" } @values;
+		}
+	}
+	
+	return $url;
+}
+
+=item nbsp($string)
+
+If string consists of only whitespace, the HTML entity C<&nbsp;> is returned.
+Otherwise $string is returned.
+
+=cut
+
+sub nbsp {
+	my ($self, $str) = @_;
+	return (defined $str && $str =~/\S/) ? $str : "&nbsp;";
+}
+
+=item sp2nbsp($string)
+
+A copy of $string is returned with each space character replaced by the
+C<&nbsp;> entity.
+
+=cut
+
+sub sp2nbsp {
+	my ($str) = @_;
+	return unless defined $str;
+	$str =~ s/\s/&nbsp;/g;
+	return $str;
+}
+
+=item underscore2nbsp($string)
+
+A copy of $string is returned with each underscore character replaced by the
+C<&nbsp;> entity.
+
+=cut
+
+sub underscore2nbsp {
+	my ($str) = @_;
+	return unless defined $str;
+	$str =~ s/_/&nbsp;/g;
+	return $str;
+}
+
+=item errorOutput($error, $details)
+
+Used by Problem, ProblemSet, and Hardcopy to report errors encountered during
+problem rendering.
+
+=cut
+
+sub errorOutput($$$) {
+	my ($self, $error, $details) = @_;
+	my $r = $self->{r};
+	
+	my $time = time2str("%a %b %d %H:%M:%S %Y", time);
+	my $method = $r->method;
+	my $uri = $r->uri;
+	my $headers = do {
+		my %headers = %{$r->headers_in};
+		join("", map { CGI::Tr({},CGI::td(CGI::small($_)), CGI::td(CGI::small($headers{$_}))) } keys %headers);
+	};
+
+	# if it is a long report pass details by reference rather than by value
+	# for consistency we automatically convert all forms of $details into
+	# a reference to an array.
+
+	if (ref($details) =~ /SCALAR/i) {
+		$details = [$$details];
+	} elsif (ref($details) =~/ARRAY/i) {
+		# no change needed	
+	} else {
+	   $details = [$details];
+	}
+	return
+		CGI::h2("WeBWorK Error"),
+		CGI::p($r->maketext("_REQUEST_ERROR")),
+
+		CGI::h3("Error messages"),
+
+		CGI::p(CGI::code($error)),
+		CGI::h3("Error details"),
+		
+		CGI::start_code(), CGI::start_p(),
+		@{ $details },
+		#CGI::code(CGI::p(@expandedDetails)), 
+		# not using inclusive CGI calls here saves about 30Meg of memory!
+		CGI::end_p(),CGI::end_code(),
+		
+		CGI::h3("Request information"),
+		CGI::table({border=>"1"},
+			CGI::Tr({},CGI::td("Time"), CGI::td($time)),
+			CGI::Tr({},CGI::td("Method"), CGI::td($method)),
+			CGI::Tr({},CGI::td("URI"), CGI::td($uri)),
+			CGI::Tr({},CGI::td("HTTP Headers"), CGI::td(
+				CGI::table($headers),
+			)),
+		),
+	;  
+	
+}
+
+=item warningOutput($warnings)
+
+Used by warnings() in this class to report warnings caught during dispatching
+and content generation.
+
+=cut
+
+sub warningOutput($$) {
+	my ($self, $warnings) = @_;
+	my $r = $self->{r};
+	
+	my @warnings = split m/\n+/, $warnings;
+	foreach my $warning (@warnings) {
+		#$warning = escapeHTML($warning);  # this would prevent using tables in output from answer evaluators
+		$warning = CGI::li(CGI::code($warning));
+	}
+	$warnings = join("", @warnings);
+	
+	my $time = time2str("%a %b %d %H:%M:%S %Y", time);
+	my $method = $r->method;
+	my $uri = $r->uri;
+	#my $headers = do {
+	#	my %headers = $r->headers_in;
+	#	join("", map { CGI::Tr(CGI::td(CGI::small($_)), CGI::td(CGI::small($headers{$_}))) } keys %headers);
+	#};
+	
+	return
+		CGI::h2("WeBWorK Warnings"),
+		CGI::p(<<EOF),
+WeBWorK has encountered warnings while processing your request. If this occured
+when viewing a problem, it was likely caused by an error or ambiguity in that
+problem. Otherwise, it may indicate a problem with the WeBWorK system itself. If
+you are a student, report these warnings to your professor to have them
+corrected. If you are a professor, please consult the warning output below for
+more information.
+EOF
+		CGI::h3("Warning messages"),
+		CGI::ul($warnings),
+		CGI::h3("Request information"),
+		CGI::table({border=>"1"},
+			CGI::Tr({},CGI::td("Time"), CGI::td($time)),
+			CGI::Tr({},CGI::td("Method"), CGI::td($method)),
+			CGI::Tr({},CGI::td("URI"), CGI::td($uri)),
+			#CGI::Tr(CGI::td("HTTP Headers"), CGI::td(
+			#	CGI::table($headers),
+			#)),
+		);
+}
+
+=item $dateTime = parseDateTime($string, $display_tz)
+
+Parses $string as a datetime. If $display_tz is given, $string is assumed to be
+in that timezone. Otherwise, the timezone defined in the course environment
+variable $siteDefaults{timezone} is used. The result, $dateTime, is an integer
+UNIX datetime (epoch) in the server's timezone.
+
+=cut
+
+sub parseDateTime {
+	my ($self, $string, $display_tz) = @_;
+	my $ce = $self->r->ce;
+	$display_tz ||= $ce->{siteDefaults}{timezone};
+	return WeBWorK::Utils::parseDateTime($string, $display_tz);
+};
+
+=item $string = formatDateTime($dateTime, $display_tz)
+
+Formats the UNIX datetime $dateTime in the standard WeBWorK datetime format.
+$dateTime is assumed to be in the server's time zone. If $display_tz is given,
+the datetime is converted from the server's timezone to the timezone specified.
+Otherwise, the timezone defined in the course environment variable
+$siteDefaults{timezone} is used.
+
+=cut
+
+sub formatDateTime {
+	my ($self, $dateTime, $display_tz) = @_;
+	my $ce = $self->r->ce;
+	$display_tz ||= $ce->{siteDefaults}{timezone};
+	return WeBWorK::Utils::formatDateTime($dateTime, $display_tz);
+}
+
+=item read_scoring_file($fileName)
+
+Wrapper for WeBWorK::File::Scoring that no-ops if $fileName is "None" and
+prepends the path to the scoring directory.
+
+=cut
+
+sub read_scoring_file {
+	my ($self, $fileName) = @_;
+	return {} if $fileName eq "None"; # callers expect a hashref in all cases
+	return parse_scoring_file($self->r->ce->{courseDirs}{scoring}."/$fileName");
+}
+
+=back
+
+=head1 AUTHOR
+
+Written by Dennis Lambe Jr., malsyned (at) math.rochester.edu and Sam Hathaway,
+sh002i (at) math.rochester.edu.
+
+=cut
+
+1;
diff --git a/lib/WeBWorK/ContentGenerator/CourseAdmin.pm b/lib/WeBWorK/ContentGenerator/CourseAdmin.pm
new file mode 100644
index 0000000000..0946238b57
--- /dev/null
+++ b/lib/WeBWorK/ContentGenerator/CourseAdmin.pm
@@ -0,0 +1,2919 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm,v 1.91 2010/06/13 02:25:51 gage 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::ContentGenerator::CourseAdmin;
+use base qw(WeBWorK::ContentGenerator);
+
+=head1 NAME
+
+WeBWorK::ContentGenerator::CourseAdmin - Add, rename, and delete courses.
+
+=cut
+
+use strict;
+use warnings;
+#use CGI qw(-nosticky );
+use WeBWorK::CGI;
+use Data::Dumper;
+use File::Temp qw/tempfile/;
+use WeBWorK::CourseEnvironment;
+use IO::File;
+use URI::Escape;
+use WeBWorK::Debug;
+use WeBWorK::Utils qw(cryptPassword writeLog listFilesRecursive trim_spaces);
+use WeBWorK::Utils::CourseManagement qw(addCourse renameCourse deleteCourse listCourses archiveCourse 
+                                        listArchivedCourses unarchiveCourse initNonNativeTables);
+use WeBWorK::Utils::CourseIntegrityCheck;
+#use WeBWorK::Utils::DBImportExport qw(dbExport dbImport);
+# needed for location management
+use Net::IP;
+
+use constant IMPORT_EXPORT_WARNING => "The ability to import and export
+databases is still under development. It seems to work but it is <b>VERY</b>
+slow on large courses.  You may prefer to use webwork2/bin/wwdb  or the mysql
+dump facility for archiving large courses. Please send bug reports if you find
+errors.";
+
+sub pre_header_initialize {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my $db = $r->db;
+	my $authz = $r->authz;
+	my $urlpath = $r->urlpath;
+	my $user        = $r->param('user');
+	
+	# check permissions
+	unless ($authz->hasPermissions($user, "create_and_delete_courses")) {
+		$self->addmessage( CGI::div({class=>'ResultsWithError'},"$user is not authorized to create or delete courses") );
+		return;
+	}
+	
+	# get result and send to message
+	my $status_message = $r->param("status_message");
+	$self->addmessage(CGI::p("$status_message")) if $status_message;
+    
+    
+    # Check that the non-native tables are present in the database
+    # These are the tables which are not course specific
+    
+    my $table_update_result = initNonNativeTables($ce, $ce->{dbLayoutName});
+    
+    $self->addgoodmessage(CGI::p("$table_update_result")) if $table_update_result;
+    
+    
+	## if the user is asking for the downloaded database...
+	#if (defined $r->param("download_exported_database")) {
+	#	my $courseID = $r->param("export_courseID");
+	#	my $random_chars = $r->param("download_exported_database");
+	#	
+	#	die "courseID not specified" unless defined $courseID;
+	#	die "invalid file specification" unless $random_chars =~ m/^\w+$/;
+	#	
+	#	my $tempdir = $ce->{webworkDirs}->{tmp};
+	#	my $export_file = "$tempdir/db_export_$random_chars";
+	#	
+	#	$self->reply_with_file("application/xml", $export_file, "${courseID}_database.xml", 0);
+	#	
+	#	return "";
+	#}
+	#
+	## otherwise...
+	
+	my @errors;
+	my $method_to_call;
+	
+	my $subDisplay = $r->param("subDisplay");
+	if (defined $subDisplay) {
+	
+		if ($subDisplay eq "add_course") {
+			if (defined $r->param("add_course")) {
+				@errors = $self->add_course_validate;
+				if (@errors) {
+					$method_to_call = "add_course_form";
+				} else {
+					$method_to_call = "do_add_course";
+				}
+			} else {
+				$method_to_call = "add_course_form";
+			}
+		}
+		
+		elsif ($subDisplay eq "rename_course") {
+			if (defined $r->param("rename_course")) {
+				@errors = $self->rename_course_validate;
+				if (@errors) {
+					$method_to_call = "rename_course_form";
+				} else {
+					$method_to_call = "rename_course_confirm";
+				}
+			} elsif (defined $r->param("confirm_rename_course")) {
+				# validate and delete
+				@errors = $self->rename_course_validate;
+				if (@errors) {
+					$method_to_call = "rename_course_form";
+				} else {
+					$method_to_call = "do_rename_course";
+				}
+			} elsif (defined $r->param("upgrade_course_tables") ){
+			    # upgrade and revalidate
+			    @errors = $self->rename_course_validate;
+				if (@errors) {
+					$method_to_call = "rename_course_form";
+				} else {
+					$method_to_call = "rename_course_confirm";
+				}
+
+			} else {
+				$method_to_call = "rename_course_form";
+			}
+		}
+		
+		elsif ($subDisplay eq "delete_course") {
+			if (defined $r->param("delete_course")) {
+				# validate or confirm
+				@errors = $self->delete_course_validate;
+				if (@errors) {
+					$method_to_call = "delete_course_form";
+				} else {
+					$method_to_call = "delete_course_confirm";
+				}
+			} elsif (defined $r->param("confirm_delete_course")) {
+				# validate and delete
+				@errors = $self->delete_course_validate;
+				if (@errors) {
+					$method_to_call = "delete_course_form";
+				} else {
+					$method_to_call = "do_delete_course";
+				}
+			} else {
+				# form only
+				$method_to_call = "delete_course_form";
+			}
+		}
+		
+		elsif ($subDisplay eq "export_database") {
+			if (defined $r->param("export_database")) {
+				@errors = $self->export_database_validate;
+				if (@errors) {
+					$method_to_call = "export_database_form";
+				} else {
+					# we have to do something special here, since we're sending
+					# the database as we export it. $method_to_call still gets
+					# set here, but it gets caught by header() and content()
+					# below instead of by body().
+					$method_to_call = "do_export_database";
+				}
+			} else {
+				$method_to_call = "export_database_form";
+			}
+		}
+		
+		elsif ($subDisplay eq "import_database") {
+			if (defined $r->param("import_database")) {
+				@errors = $self->import_database_validate;
+				if (@errors) {
+					$method_to_call = "import_database_form";
+				} else {
+					$method_to_call = "do_import_database";
+				}
+			} else {
+				$method_to_call = "import_database_form";
+			}
+		}
+		
+		elsif ($subDisplay eq "archive_course") {
+			if (defined $r->param("archive_course")) {
+				# validate -- if invalid, start over.
+				# if form is valid a page indicating the status of 
+				# database tables and directories is presented.
+				# If they are ok, then you can push archive button, otherwise
+				# you can quit or choose to upgrade the tables
+				@errors = $self->archive_course_validate;
+				if (@errors) {
+					$method_to_call = "archive_course_form";
+				} else {
+					$method_to_call = "archive_course_confirm"; #check tables & directories
+				}
+			} elsif (defined $r->param("confirm_archive_course")) {
+				# validate and archive
+				# the "archive it" button has been pushed and the 
+				# course will be archived
+				# a report on success or failure will be generated
+				@errors = $self->archive_course_validate;
+				if (@errors) {
+					$method_to_call = "archive_course_form";
+				} else {
+					$method_to_call = "do_archive_course";
+				}
+			} elsif (defined $r->param("upgrade_course_tables") ){
+			    # upgrade and revalidate
+			    # the "upgrade course" button has been pushed
+			    # after the course has been upgraded you are returned
+			    # to the confirm page.
+			    @errors = $self->archive_course_validate;
+				if (@errors) {
+					$method_to_call = "archive_course_form";
+				} else {
+					$method_to_call = "archive_course_confirm"; # upgrade and recheck tables & directories.
+				}
+			} else {
+				# form only
+				$method_to_call = "archive_course_form";
+			}
+		}
+		elsif ($subDisplay eq "unarchive_course") {
+			if (defined $r->param("unarchive_course")) {
+				# validate or confirm
+				@errors = $self->unarchive_course_validate;
+				if (@errors) {
+					$method_to_call = "unarchive_course_form";
+				} else {
+					$method_to_call = "unarchive_course_confirm";
+				}
+			} elsif (defined $r->param("confirm_unarchive_course")) {
+				# validate and archive
+				@errors = $self->unarchive_course_validate;
+				if (@errors) {
+					$method_to_call = "unarchive_course_form";
+				} else {
+					$method_to_call = "do_unarchive_course";
+				}
+			} else {
+				# form only
+				# start at the beginning -- get drop down list of courses to unarchive
+				$method_to_call = "unarchive_course_form";
+			}
+		}
+		elsif ($subDisplay eq "upgrade_course") {
+			if (defined $r->param("upgrade_course")) {
+				# validate or confirm
+				# if form is valid present details of analysis of the course structure
+				@errors = $self->upgrade_course_validate;
+				if (@errors) {
+					$method_to_call = "upgrade_course_form";
+				} else {
+					$method_to_call = "upgrade_course_confirm";
+				}
+			} elsif (defined $r->param("confirm_upgrade_course")) {
+				# validate and upgrade
+				# if form is valid upgrade the courses and present results
+				@errors = $self->upgrade_course_validate;
+				if (@errors) {
+					$method_to_call = "upgrade_course_form";
+				} else {
+					$method_to_call = "do_upgrade_course";
+				}
+			} else {
+				# form only
+				# start at the beginning -- get list of courses and their status
+				$method_to_call = "upgrade_course_form";
+			}
+		}
+		elsif ($subDisplay eq "manage_locations") {
+			if (defined ($r->param("manage_location_action"))) {
+				$method_to_call = 
+				    $r->param("manage_location_action");
+			}
+			else{
+				$method_to_call = "manage_location_form";
+			}
+		}
+		elsif ($subDisplay eq "registration") {
+			if (defined ($r->param("register_site"))) {
+				$method_to_call =  "do_registration";
+			}
+			else{
+				$method_to_call = "registration_form";
+			}
+		}
+		else {
+			@errors = "Unrecognized sub-display @{[ CGI::b($subDisplay) ]}.";
+		}
+	}
+	
+	$self->{errors} = \@errors;
+	$self->{method_to_call} = $method_to_call;
+}
+
+sub header {
+	my ($self) = @_;
+	my $method_to_call = $self->{method_to_call};
+# 	if (defined $method_to_call and $method_to_call eq "do_export_database") {
+# 		my $r = $self->r;
+# 		my $courseID = $r->param("export_courseID");
+# 		$r->content_type("application/octet-stream");
+# 		$r->header_out("Content-Disposition" => "attachment; filename=\"${courseID}_database.xml\"");
+# 		$r->send_http_header;
+# 	} else {
+		$self->SUPER::header;
+#	}
+}
+
+# sends:
+# 
+# HTTP/1.1 200 OK
+# Date: Fri, 09 Jul 2004 19:05:55 GMT
+# Server: Apache/1.3.27 (Unix) mod_perl/1.27
+# Content-Disposition: attachment; filename="mth143_database.xml"
+# Connection: close
+# Content-Type: application/octet-stream
+
+sub content {
+	my ($self) = @_;
+	my $method_to_call = $self->{method_to_call};
+	if (defined $method_to_call and $method_to_call eq "do_export_database") {
+		#$self->do_export_database;
+		$self->SUPER::content;
+	} else {
+		$self->SUPER::content;
+	}
+}
+
+sub body {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my $db = $r->db;
+	my $authz = $r->authz;
+	my $urlpath = $r->urlpath;
+	
+	my $user = $r->param('user');
+	
+	# check permissions
+	unless ($authz->hasPermissions($user, "create_and_delete_courses")) {
+		return "";
+	}
+	my $method_to_call = $self->{method_to_call};
+	my $methodMessage ="";
+	
+	(defined($method_to_call) and $method_to_call eq "do_export_database") && do {
+	    my @export_courseID = $r->param("export_courseID");
+	    my $course_ids = join(", ", @export_courseID);
+		$methodMessage  = CGI::p("Exporting database for course(s) $course_ids").
+		CGI::p(".... please wait.... 
+		If your browser times out you will
+		still be able to download the exported database using the 
+		file manager.").CGI::hr();
+	};
+	
+	
+	print CGI::p({style=>"text-align: center"},
+		CGI::a({href=>$self->systemLink($urlpath, params=>{subDisplay=>"add_course",add_admin_users=>1,
+		           add_dbLayout=>'sql_single', 
+		           add_templates_course => $ce->{siteDefaults}->{default_templates_course} ||""}
+		           )}, 
+		           "Add Course"
+		),
+		" | ",
+		CGI::a({href=>$self->systemLink($urlpath, params=>{subDisplay=>"rename_course"})}, "Rename Course"),
+		" | ",
+		CGI::a({href=>$self->systemLink($urlpath, params=>{subDisplay=>"delete_course"})}, "Delete Course"),
+		" | ",
+		# CGI::a({href=>$self->systemLink($urlpath, params=>{subDisplay=>"export_database"})}, "Export Database"),
+		# " | ",
+		# CGI::a({href=>$self->systemLink($urlpath, params=>{subDisplay=>"import_database"})}, "Import Database"),
+		# " | ",
+		CGI::a({href=>$self->systemLink($urlpath, params=>{subDisplay=>"archive_course"})}, "Archive Course"),
+		 "|",
+		CGI::a({href=>$self->systemLink($urlpath, params=>{subDisplay=>"unarchive_course"})}, "Unarchive Course"),
+		 "|",
+		CGI::a({href=>$self->systemLink($urlpath, params=>{subDisplay=>"upgrade_course"})}, "Upgrade courses"),
+		 "|",
+		CGI::a({href=>$self->systemLink($urlpath, params=>{subDisplay=>"manage_locations"})}, "Manage Locations"),
+		CGI::hr(),
+		$methodMessage,
+		
+	);
+	
+	print( CGI::p({style=>"text-align: center"}, $self->display_registration_form() ) ) if $self->display_registration_form();
+	
+	
+	my @errors = @{$self->{errors}};
+	
+	
+	if (@errors) {
+		print CGI::div({class=>"ResultsWithError"},
+			CGI::p("Please correct the following errors and try again:"),
+			CGI::ul(CGI::li(\@errors)),
+		);
+	}
+	
+	if (defined $method_to_call and $method_to_call ne "") {
+		$self->$method_to_call;
+	} else {
+		    my $msg = "";
+	    	$msg .= CGI::li("unable to write to directory $ce->{webworkDirs}{logs}")  unless -w $ce->{webworkDirs}{logs}; 
+	    	$msg .=  CGI::li("unable to write to directory $ce->{webworkDirs}{tmp}" )  unless -w $ce->{webworkDirs}{tmp}; 
+	    	$msg .=  CGI::li("unable to write to directory $ce->{webworkDirs}{DATA}")  unless -w $ce->{webworkDirs}{DATA}; 
+	    	if ($msg) {
+				print CGI::h2("Directory permission errors ").CGI::ul($msg).
+				CGI::p(" The webwork server must be able to write to these directories. Please correct the permssion errors.") ;
+			}
+	
+		print CGI::h2("Courses");
+	
+		print CGI::start_ol();
+		
+		my @courseIDs = listCourses($ce);
+		foreach my $courseID (sort {lc($a) cmp lc($b) } @courseIDs) {
+			next if $courseID eq "admin"; # done already above
+			next if $courseID eq "modelCourse"; # modelCourse isn't a real course so don't create missing directories, etc
+ 			my $urlpath = $r->urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSets", $r, courseID => $courseID);
+			print CGI::li(CGI::a({href=>$self->systemLink($urlpath, authen => 0)}, $courseID));
+		}
+		
+		print CGI::end_ol();
+		
+		print CGI::h2("Archived Courses");
+		print CGI::start_ol();
+		
+		@courseIDs = listArchivedCourses($ce);
+		foreach my $courseID (sort {lc($a) cmp lc($b) } @courseIDs) {
+			print CGI::li($courseID),	 
+		}
+		
+		print CGI::end_ol();
+	}
+	return "";
+}
+
+################################################################################
+
+sub add_course_form {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	#my $db = $r->db;
+	#my $authz = $r->authz;
+	#my $urlpath = $r->urlpath;
+	
+	my $add_courseID                     = trim_spaces( $r->param("add_courseID") ) || "";
+	my $add_courseTitle                  = trim_spaces( $r->param("add_courseTitle") ) || "";
+	my $add_courseInstitution            = trim_spaces( $r->param("add_courseInstitution") ) || "";
+	
+	my $add_admin_users                  = trim_spaces( $r->param("add_admin_users") ) || "";
+	
+	my $add_initial_userID               = trim_spaces( $r->param("add_initial_userID") ) || "";
+	my $add_initial_password             = trim_spaces( $r->param("add_initial_password") ) || "";
+	my $add_initial_confirmPassword      = trim_spaces( $r->param("add_initial_confirmPassword") ) || "";
+	my $add_initial_firstName            = trim_spaces( $r->param("add_initial_firstName") ) || "";
+	my $add_initial_lastName             = trim_spaces( $r->param("add_initial_lastName") ) || "";
+	my $add_initial_email                = trim_spaces( $r->param("add_initial_email") ) || "";
+	
+	my $add_templates_course             = trim_spaces( $r->param("add_templates_course") ) || "";
+	
+	my $add_dbLayout                     = trim_spaces( $r->param("add_dbLayout") ) || "";
+	
+
+
+
+	my @dbLayouts = do {
+		my @ordered_layouts;
+		foreach my $layout (@{$ce->{dbLayout_order}}) {
+			if (exists $ce->{dbLayouts}->{$layout}) {
+				push @ordered_layouts, $layout;
+			}
+		}
+		
+		my %ordered_layouts; @ordered_layouts{@ordered_layouts} = ();
+		my @other_layouts;
+		foreach my $layout (keys %{ $ce->{dbLayouts} }) {
+			unless (exists $ordered_layouts{$layout}) {
+				push @other_layouts, $layout;
+			}
+		}
+		
+		(@ordered_layouts, @other_layouts);
+	};
+	
+	# unused...
+	#my $ce2 = new WeBWorK::CourseEnvironment({
+	#	%WeBWorK::SeedCE,
+	#	courseName => "COURSENAME",
+	#});
+	
+	my @existingCourses = listCourses($ce);
+	@existingCourses = sort { lc($a) cmp lc ($b) } @existingCourses; #make sort case insensitive 
+	
+	print CGI::h2("Add Course");
+	
+	print CGI::start_form(-method=>"POST", -action=>$r->uri);
+	print $self->hidden_authen_fields;
+	print $self->hidden_fields("subDisplay");
+	
+	print CGI::p("Specify an ID, title, and institution for the new course. The course ID may contain only letters, numbers, hyphens, and underscores.");
+	
+	print CGI::table({class=>"FormLayout"},
+		CGI::Tr({},
+			CGI::th({class=>"LeftHeader"}, "Course ID:"),
+			CGI::td(CGI::textfield(-name=>"add_courseID", -value=>$add_courseID, -size=>25)),
+		),
+		CGI::Tr({},
+			CGI::th({class=>"LeftHeader"}, "Course Title:"),
+			CGI::td(CGI::textfield(-name=>"add_courseTitle", -value=>$add_courseTitle, -size=>25)),
+		),
+		CGI::Tr({},
+			CGI::th({class=>"LeftHeader"}, "Institution:"),
+			CGI::td(CGI::textfield(-name=>"add_courseInstitution", -value=>$add_courseInstitution, -size=>25)),
+		),
+	);
+	
+	print CGI::p("To add the WeBWorK administrators to the new course (as instructors) check the box below.");
+	my @checked = ($add_admin_users) ?(checked=>1): ();  # workaround because CGI::checkbox seems to have a bug -- it won't default to checked.
+	print CGI::p({},CGI::input({-type=>'checkbox', -name=>"add_admin_users", @checked }, "Add WeBWorK administrators to new course"));
+	
+	print CGI::p("To add an additional instructor to the new course, specify user information below. The user ID may contain only 
+	numbers, letters, hyphens, periods (dots), commas,and underscores.\n");
+	
+	print CGI::table({class=>"FormLayout"}, CGI::Tr({},
+		CGI::td({},
+			CGI::table({class=>"FormLayout"},
+				CGI::Tr({},
+					CGI::th({class=>"LeftHeader"}, "User ID:"),
+					CGI::td(CGI::textfield(-name=>"add_initial_userID", -value=>$add_initial_userID, -size=>25)),
+				),
+				CGI::Tr({},
+					CGI::th({class=>"LeftHeader"}, "Password:"),
+					CGI::td(CGI::password_field(-name=>"add_initial_password", -value=>$add_initial_password, -size=>25)),
+				),
+				CGI::Tr({},
+					CGI::th({class=>"LeftHeader"}, "Confirm Password:"),
+					CGI::td(CGI::password_field(-name=>"add_initial_confirmPassword", -value=>$add_initial_confirmPassword, -size=>25)),
+				),
+			),
+		),
+		CGI::td({},
+			CGI::table({class=>"FormLayout"},
+				CGI::Tr({},
+					CGI::th({class=>"LeftHeader"}, "First Name:"),
+					CGI::td(CGI::textfield(-name=>"add_initial_firstName", -value=>$add_initial_firstName, -size=>25)),
+				),
+				CGI::Tr({},
+					CGI::th({class=>"LeftHeader"}, "Last Name:"),
+					CGI::td(CGI::textfield(-name=>"add_initial_lastName", -value=>$add_initial_lastName, -size=>25)),
+				),
+				CGI::Tr({},
+					CGI::th({class=>"LeftHeader"}, "Email Address:"),
+					CGI::td(CGI::textfield(-name=>"add_initial_email", -value=>$add_initial_email, -size=>25)),
+				),
+			),
+			
+		),
+	));
+	
+	print CGI::p("To copy problem templates from an existing course, select the course below.");
+	
+	print CGI::table({class=>"FormLayout"},
+		CGI::Tr({},
+			CGI::th({class=>"LeftHeader"}, "Copy templates from:"),
+			CGI::td(
+				CGI::popup_menu(
+					-name => "add_templates_course",
+					-values => [ "", @existingCourses ],
+					-default => $add_templates_course,
+					#-size => 10,
+					#-multiple => 0,
+					#-labels => \%courseLabels,
+				),
+
+			),
+		),
+	);
+	
+	
+	
+	print CGI::p("Select a database layout below.");
+	print CGI::start_table({class=>"FormLayout"});
+	
+	my %dbLayout_buttons;
+	my $selected_dbLayout = defined $add_dbLayout ? $add_dbLayout : $ce->{dbLayout_order}[0];
+	@dbLayout_buttons{@dbLayouts} = CGI::radio_group(-name=>"add_dbLayout",-values=>\@dbLayouts,-default=>$selected_dbLayout);
+	foreach my $dbLayout (@dbLayouts) {
+		my $dbLayoutLabel = (defined $ce->{dbLayout_descr}{$dbLayout})
+			? "$dbLayout - " . $ce->{dbLayout_descr}{$dbLayout}
+			: "$dbLayout - no description provided in global.conf";
+		print CGI::Tr({},
+			CGI::td({width=>'20%'}, $dbLayout_buttons{$dbLayout}),
+			CGI::td($dbLayoutLabel),
+		);
+	}
+	print CGI::end_table();
+	print CGI::p({style=>"text-align: left"}, CGI::submit(-name=>"add_course", -label=>"Add Course"));
+	
+	print CGI::end_form();
+}
+
+sub add_course_validate {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	#my $db = $r->db;
+	#my $authz = $r->authz;
+	#my $urlpath = $r->urlpath;
+	
+
+	my $add_courseID                     = trim_spaces( $r->param("add_courseID") ) || "";
+	my $add_courseTitle                  = trim_spaces( $r->param("add_courseTitle") ) || "";
+	my $add_courseInstitution            = trim_spaces( $r->param("add_courseInstitution") ) || "";
+	
+	my $add_admin_users                  = trim_spaces( $r->param("add_admin_users") ) || "";
+	
+	my $add_initial_userID               = trim_spaces( $r->param("add_initial_userID") ) || "";
+	my $add_initial_password             = trim_spaces( $r->param("add_initial_password") ) || "";
+	my $add_initial_confirmPassword      = trim_spaces( $r->param("add_initial_confirmPassword") ) || "";
+	my $add_initial_firstName            = trim_spaces( $r->param("add_initial_firstName") ) || "";
+	my $add_initial_lastName             = trim_spaces( $r->param("add_initial_lastName") ) || "";
+	my $add_initial_email                = trim_spaces( $r->param("add_initial_email") ) || "";
+	my $add_templates_course             = trim_spaces( $r->param("add_templates_course") ) || "";
+	my $add_dbLayout                     = trim_spaces( $r->param("add_dbLayout") ) || "";
+	
+	
+
+	
+	######################
+	
+	my @errors;
+	
+	if ($add_courseID eq "") {
+		push @errors, "You must specify a course ID.";
+	}
+	unless ($add_courseID =~ /^[\w-]*$/) { # regex copied from CourseAdministration.pm
+		push @errors, "Course ID may only contain letters, numbers, hyphens, and underscores.";
+	}
+	if (grep { $add_courseID eq $_ } listCourses($ce)) {
+		push @errors, "A course with ID $add_courseID already exists.";
+	}
+	#if ($add_courseTitle eq "") {
+	#	push @errors, "You must specify a course title.";
+	#}
+	#if ($add_courseInstitution eq "") {
+	#	push @errors, "You must specify an institution for this course.";
+	#}
+	
+	if ($add_initial_userID ne "") {
+		if ($add_initial_password eq "") {
+			push @errors, "You must specify a password for the initial instructor.";
+		}
+		if ($add_initial_confirmPassword eq "") {
+			push @errors, "You must confirm the password for the initial instructor.";
+		}
+		if ($add_initial_password ne $add_initial_confirmPassword) {
+			push @errors, "The password and password confirmation for the instructor must match.";
+		}
+		if ($add_initial_firstName eq "") {
+			push @errors, "You must specify a first name for the initial instructor.";
+		}
+		if ($add_initial_lastName eq "") {
+			push @errors, "You must specify a last name for the initial instructor.";
+		}
+		if ($add_initial_email eq "") {
+			push @errors, "You must specify an email address for the initial instructor.";
+		}
+	}
+	
+	if ($add_dbLayout eq "") {
+		push @errors, "You must select a database layout.";
+	} else {
+		if (exists $ce->{dbLayouts}->{$add_dbLayout}) {
+			# we used to check for layout-specific fields here, but there aren't any layouts that require them
+			# anymore. (in the future, we'll probably deal with this in layout-specific modules.)
+		} else {
+			push @errors, "The database layout $add_dbLayout doesn't exist.";
+		}
+	}
+	
+	return @errors;
+}
+
+sub do_add_course {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my $db = $r->db;
+	my $authz = $r->authz;
+	my $urlpath = $r->urlpath;
+	
+	my $add_courseID                     = trim_spaces( $r->param("add_courseID") ) || "";
+	my $add_courseTitle                  = trim_spaces( $r->param("add_courseTitle") ) || "";
+	my $add_courseInstitution            = trim_spaces( $r->param("add_courseInstitution") ) || "";
+	
+	my $add_admin_users                  = trim_spaces( $r->param("add_admin_users") ) || "";
+	
+	my $add_initial_userID               = trim_spaces( $r->param("add_initial_userID") ) || "";
+	my $add_initial_password             = trim_spaces( $r->param("add_initial_password") ) || "";
+	my $add_initial_confirmPassword      = trim_spaces( $r->param("add_initial_confirmPassword") ) || "";
+	my $add_initial_firstName            = trim_spaces( $r->param("add_initial_firstName") ) || "";
+	my $add_initial_lastName             = trim_spaces( $r->param("add_initial_lastName") ) || "";
+	my $add_initial_email                = trim_spaces( $r->param("add_initial_email") ) || "";
+	
+	my $add_templates_course             = trim_spaces( $r->param("add_templates_course") ) || "";
+	
+	my $add_dbLayout                     = trim_spaces( $r->param("add_dbLayout") ) || "";
+	
+	my $ce2 = new WeBWorK::CourseEnvironment({
+		%WeBWorK::SeedCE,
+		courseName => $add_courseID,
+	});
+	
+	my %courseOptions = ( dbLayoutName => $add_dbLayout );
+	
+	if ($add_initial_email ne "") {
+		$courseOptions{allowedRecipients} = [ $add_initial_email ];
+		# don't set feedbackRecipients -- this just gets in the way of the more
+		# intelligent "receive_recipients" method.
+		#$courseOptions{feedbackRecipients} = [ $add_initial_email ];
+	}
+	
+	# this is kinda left over from when we had 'gdbm' and 'sql' database layouts
+	# below this line, we would grab values from getopt and put them in this hash
+	# but for now the hash can remain empty
+	my %dbOptions;
+	
+	my @users;
+	
+	# copy users from current (admin) course if desired
+	if ($add_admin_users ne "") {
+		foreach my $userID ($db->listUsers) {
+			if ($userID eq $add_initial_userID) {
+				$self->addbadmessage( "User '$userID' will not be copied from admin course as it is the initial instructor.");
+				next;
+			}
+			my $User            = $db->getUser($userID);
+			my $Password        = $db->getPassword($userID);
+			my $PermissionLevel = $db->getPermissionLevel($userID);
+			push @users, [ $User, $Password, $PermissionLevel ] 
+			       if $authz->hasPermissions($userID,"create_and_delete_courses");  
+			       #only transfer the "instructors" in the admin course classlist.
+		}
+	}
+	
+	# add initial instructor if desired
+	if ($add_initial_userID ne "") {
+		my $User = $db->newUser(
+			user_id       => $add_initial_userID,
+			first_name    => $add_initial_firstName,
+			last_name     => $add_initial_lastName,
+			student_id    => $add_initial_userID,
+			email_address => $add_initial_email,
+			status        => "C",
+		);
+		my $Password = $db->newPassword(
+			user_id  => $add_initial_userID,
+			password => cryptPassword($add_initial_password),
+		);
+		my $PermissionLevel = $db->newPermissionLevel(
+			user_id    => $add_initial_userID,
+			permission => "10",
+		);
+		push @users, [ $User, $Password, $PermissionLevel ];
+	}
+	
+	push @{$courseOptions{PRINT_FILE_NAMES_FOR}}, map { $_->[0]->user_id } @users;
+	
+	my %optional_arguments;
+	if ($add_templates_course ne "") {
+		$optional_arguments{templatesFrom} = $add_templates_course;
+	}
+	
+	eval {
+		addCourse(
+			courseID      => $add_courseID,
+			ce            => $ce2,
+			courseOptions => \%courseOptions,
+			dbOptions     => \%dbOptions,
+			users         => \@users,
+			%optional_arguments,
+		);
+	};
+	if ($@) {
+		my $error = $@;
+		print CGI::div({class=>"ResultsWithError"},
+			CGI::p("An error occured while creating the course $add_courseID:"),
+			CGI::tt(CGI::escapeHTML($error)),
+		);
+		# get rid of any partially built courses
+		# FIXME  -- this is too fragile
+		unless ($error =~ /course exists/) {
+			eval {
+				deleteCourse(
+					courseID   => $add_courseID,
+					ce         => $ce2,
+					dbOptions  => \%dbOptions,
+				);
+			}
+		}
+	} else {
+	    #log the action
+	    writeLog($ce, "hosted_courses", join("\t",
+	    	"\tAdded",
+	    	( defined $add_courseInstitution ? $add_courseInstitution : "(no institution specified)" ),
+	    	( defined $add_courseTitle ? $add_courseTitle : "(no title specified)" ),
+	    	$add_courseID,
+	    	$add_initial_firstName,
+	    	$add_initial_lastName,
+	  		$add_initial_email,
+	    ));
+	    # add contact to admin course as student?
+	    # FIXME -- should we do this?
+	    if ($add_initial_userID ne "") {
+	        my $composite_id = "${add_initial_userID}_${add_courseID}"; # student id includes school name and contact
+			my $User = $db->newUser(
+			user_id       => $composite_id,          # student id includes school name and contact
+			first_name    => $add_initial_firstName,
+			last_name     => $add_initial_lastName,
+			student_id    => $add_initial_userID,
+			email_address => $add_initial_email,
+			status        => "C",
+			);
+			my $Password = $db->newPassword(
+				user_id  => $composite_id,
+				password => cryptPassword($add_initial_password),
+			);
+			my $PermissionLevel = $db->newPermissionLevel(
+				user_id    => $composite_id,
+				permission => "0",
+			);
+			# add contact to admin course as student
+			# or if this contact and course already exist in a dropped status
+			# change the student's status to enrolled
+			if (my $oldUser = $db->getUser($composite_id) ) {
+				warn "Replacing old data for $composite_id  status: ". $oldUser->status;
+				$db->deleteUser($composite_id);
+			}
+			eval { $db->addUser($User)                       }; warn $@ if $@;
+			eval { $db->addPassword($Password)               }; warn $@ if $@;
+			eval { $db->addPermissionLevel($PermissionLevel) }; warn $@ if $@;
+		}
+		print CGI::div({class=>"ResultsWithoutError"},
+			CGI::p("Successfully created the course $add_courseID"),
+		);
+		my $newCoursePath = $urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSets", $r,
+			courseID => $add_courseID);
+		my $newCourseURL = $self->systemLink($newCoursePath, authen => 0);
+		print CGI::div({style=>"text-align: center"},
+			CGI::a({href=>$newCourseURL}, "Log into $add_courseID"),
+		);
+	}
+
+	
+}
+
+################################################################################
+
+sub rename_course_form {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	#my $db = $r->db;
+	#my $authz = $r->authz;
+	#my $urlpath = $r->urlpath;
+	
+	my $rename_oldCourseID     = $r->param("rename_oldCourseID")     || "";
+	my $rename_newCourseID     = $r->param("rename_newCourseID")     || "";
+	
+	my @courseIDs = listCourses($ce);
+	@courseIDs    = sort {lc($a) cmp lc ($b) } @courseIDs;
+	
+	my %courseLabels; # records... heh.
+	foreach my $courseID (@courseIDs) {
+		my $tempCE = new WeBWorK::CourseEnvironment({
+			%WeBWorK::SeedCE,
+			courseName => $courseID,
+		});
+		$courseLabels{$courseID} = "$courseID (" . $tempCE->{dbLayoutName} . ")";
+	}
+	
+	print CGI::h2("Rename Course");
+	
+	print CGI::start_form(-method=>"POST", -action=>$r->uri);
+	print $self->hidden_authen_fields;
+	print $self->hidden_fields("subDisplay");
+	
+	print CGI::p("Select a course to rename.");
+	
+	print CGI::table({class=>"FormLayout"},
+		CGI::Tr({},
+			CGI::th({class=>"LeftHeader"}, "Course Name:"),
+			CGI::td(
+				CGI::scrolling_list(
+					-name => "rename_oldCourseID",
+					-values => \@courseIDs,
+					-default => $rename_oldCourseID,
+					-size => 10,
+					-multiple => 0,
+					-labels => \%courseLabels,
+				),
+			),
+		),
+		CGI::Tr({},
+			CGI::th({class=>"LeftHeader"}, "New Name:"),
+			CGI::td(CGI::textfield(-name=>"rename_newCourseID", -value=>$rename_newCourseID, -size=>25)),
+		),
+	);
+	
+	print CGI::end_table();
+	
+	print CGI::p({style=>"text-align: center"}, CGI::submit(-name=>"rename_course", -label=>"Rename Course"));
+	
+	print CGI::end_form();
+}
+sub rename_course_confirm {
+
+    my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	#my $db = $r->db;
+	#my $authz = $r->authz;
+	#my $urlpath = $r->urlpath;
+
+    my $rename_oldCourseID     = $r->param("rename_oldCourseID")     || "";
+	my $rename_newCourseID     = $r->param("rename_newCourseID")     || "";
+
+	my $ce2 = new WeBWorK::CourseEnvironment({
+		%WeBWorK::SeedCE,
+		courseName => $rename_oldCourseID,
+	});
+#############################################################################
+# Check database
+#############################################################################
+	
+	my ($tables_ok,$dbStatus);
+	if ($ce2->{dbLayoutName} ) {
+	     my $CIchecker = new WeBWorK::Utils::CourseIntegrityCheck(ce=>$ce2);
+	    ($tables_ok,$dbStatus) = $CIchecker->checkCourseTables($rename_oldCourseID);
+		if ($r->param("upgrade_course_tables")) {
+			my @schema_table_names = keys %$dbStatus;  # update tables missing from database;
+			my @tables_to_create = grep {$dbStatus->{$_}->[0] == WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_A} @schema_table_names;
+			my @tables_to_alter  = grep {$dbStatus->{$_}->[0] == WeBWorK::Utils::CourseIntegrityCheck::DIFFER_IN_A_AND_B} @schema_table_names;
+			my $msg = $CIchecker->updateCourseTables($rename_oldCourseID, [@tables_to_create]);
+			foreach my $table_name (@tables_to_alter) {
+				$msg .= $CIchecker->updateTableFields($rename_oldCourseID, $table_name);
+			}
+			print CGI::p({-style=>'color:green; font-weight:bold'}, $msg);
+			
+		}
+ 		($tables_ok,$dbStatus) = $CIchecker->checkCourseTables($rename_oldCourseID);
+ 
+
+		# print db status
+
+		my %msg =(    WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_A         => CGI::span({style=>"color:red"}," Table defined in schema but missing in database"),
+		              WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_B         => CGI::span({style=>"color:red"}," Table defined in database but missing in schema"),
+		              WeBWorK::Utils::CourseIntegrityCheck::SAME_IN_A_AND_B   => CGI::span({style=>"color:green"}," Table is ok "),
+		              WeBWorK::Utils::CourseIntegrityCheck::DIFFER_IN_A_AND_B => CGI::span({style=>"color:red"}," Schema and database table definitions do not agree "),
+		);
+		my %msg2 =(    WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_A        => CGI::span({style=>"color:red"}," missing in database"),
+		              WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_B         => CGI::span({style=>"color:red"}," missing in schema"),
+		              WeBWorK::Utils::CourseIntegrityCheck::SAME_IN_A_AND_B   => CGI::span({style=>"color:green"}," is ok "),
+		              WeBWorK::Utils::CourseIntegrityCheck::DIFFER_IN_A_AND_B => CGI::span({style=>"color:red"}," Schema and database field definitions do not agree "),
+		);
+		my $all_tables_ok=1;
+		my $extra_database_tables=0;
+		my $extra_database_fields=0;
+		my $str=CGI::h4("Report on database structure for course $rename_oldCourseID:").CGI::br();
+		foreach my $table (sort keys %$dbStatus) {
+		    my $table_status = $dbStatus->{$table}->[0];
+			$str .= CGI::b($table) .  $msg{ $table_status } . CGI::br();
+			
+			CASE: {
+				$table_status == WeBWorK::Utils::CourseIntegrityCheck::SAME_IN_A_AND_B 
+					&& do{ last CASE;
+					};
+				$table_status == WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_A
+					&& do{
+						   $all_tables_ok = 0; last CASE;
+					};
+				$table_status == WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_B
+					&& do{
+						   $extra_database_tables = 1; last CASE;
+					};
+				$table_status == WeBWorK::Utils::CourseIntegrityCheck::DIFFER_IN_A_AND_B
+					&& do{ 
+					    my %fieldInfo = %{ $dbStatus->{$table}->[1] };
+						foreach my $key (keys %fieldInfo) {
+						    my $field_status = $fieldInfo{$key}->[0];
+						    CASE2: {
+						    	$field_status == WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_B 
+						    		&& do{ 
+						    		   $extra_database_fields = 1; last CASE2;
+						    		};
+						    	$field_status == WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_A 
+						    		&& do{ 
+						    		   $all_tables_ok=0; last CASE2;
+						    		};						    
+						    }
+							$str .= CGI::br()."\n&nbsp;&nbsp;Field $key => ". $msg2{$field_status };
+						}							
+					};
+			}
+			$str.=CGI::br();
+			
+		}
+#############################################################################
+# Report on databases
+#############################################################################
+
+		print CGI::p($str);
+		if ($extra_database_tables) {
+				print CGI::p({-style=>'color:red; font-weight:bold'},"There are extra database tables which are not defined in the schema.  
+				                                                     They can only be removed manually from the database. They will not be renamed.");
+		} 
+		if ($extra_database_fields) {
+				print CGI::p({-style=>'color:red; font-weight:bold'},"There are extra database fields  which are not defined in the schema for at least one table.  
+				                                                     They can only be removed manually from the database.");
+		} 		
+		if ($all_tables_ok) {
+			print CGI::p({-style=>'color:green; font-weight:bold'},"Course $rename_oldCourseID database is in order");
+		} else {
+			print CGI::p({-style=>'color:red; font-weight:bold'}, "Course $rename_oldCourseID databases must be updated before renaming this course.");
+		}	
+		
+#############################################################################
+# Check directories
+#############################################################################
+
+
+      my ($directories_ok, $str2) = $CIchecker->checkCourseDirectories($ce2);
+      my $style = ($directories_ok)?"color:green" : "color:red";
+      print CGI::h2("Directory structure"), CGI::p($str2),
+      ($directories_ok)? CGI::p({style=>$style},"Directory structure is ok") :
+              CGI::p({style=>$style},"Directory structure is missing directories 
+                          or the webserver lacks sufficient privileges.");
+    
+#############################################################################
+# Print form for choosing next action.
+#############################################################################
+
+
+
+		print CGI::start_form(-method=>"POST", -action=>$r->uri);
+		print $self->hidden_authen_fields;
+		print $self->hidden_fields("subDisplay");
+		print $self->hidden_fields(qw/rename_oldCourseID rename_newCourseID/);
+			# grab some values we'll need
+        # fail if the source course does not exist
+
+		
+		
+		if ($all_tables_ok && $directories_ok ) { # no missing tables or missing fields or directories
+			print CGI::p({style=>"text-align: center"},
+				CGI::submit(-name=>"decline_rename_course", -value=>"Don't rename"),
+				"&nbsp;",
+				CGI::submit(-name=>"confirm_rename_course", -value=>"Rename") ,
+			);
+		} elsif(  $directories_ok  ) {
+			print CGI::p({style=>"text-align: center"},
+				CGI::submit(-name => "decline_rename_course", -value => "Don't rename"),
+				"&nbsp;",
+				CGI::submit(-name=>"upgrade_course_tables", -value=>"upgrade course tables"),
+			);
+		} else  {
+			print CGI::p({style=>"text-align: center"},
+				CGI::submit(-name => "decline_rename_course", -value => "Don't rename"),
+				CGI::br(),"Directory structure needs to be repaired manually before renaming."
+			);
+		} 
+	}
+}
+sub rename_course_validate {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	#my $db = $r->db;
+	#my $authz = $r->authz;
+	#my $urlpath = $r->urlpath;
+	
+	my $rename_oldCourseID     = $r->param("rename_oldCourseID")     || "";
+	my $rename_newCourseID     = $r->param("rename_newCourseID")     || "";
+	
+	my @errors;
+	
+	if ($rename_oldCourseID eq "") {
+		push @errors, "You must select a course to rename.";
+	}
+	if ($rename_newCourseID eq "") {
+		push @errors, "You must specify a new name for the course.";
+	}
+	if ($rename_oldCourseID eq $rename_newCourseID) {
+		push @errors, "Can't rename to the same name.";
+	}
+	unless ($rename_newCourseID =~ /^[\w-]*$/) { # regex copied from CourseAdministration.pm
+		push @errors, "Course ID may only contain letters, numbers, hyphens, and underscores.";
+	}
+	if (grep { $rename_newCourseID eq $_ } listCourses($ce)) {
+		push @errors, "A course with ID $rename_newCourseID already exists.";
+	}
+	
+	my $ce2 = new WeBWorK::CourseEnvironment({
+		%WeBWorK::SeedCE,
+		courseName => $rename_oldCourseID,
+	});
+	
+	return @errors;
+}
+
+sub do_rename_course {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my $db = $r->db;
+	#my $authz = $r->authz;
+	my $urlpath = $r->urlpath;
+	
+	my $rename_oldCourseID     = $r->param("rename_oldCourseID")     || "";
+	my $rename_newCourseID     = $r->param("rename_newCourseID")     || "";
+	
+	my $ce2 = new WeBWorK::CourseEnvironment({
+		%WeBWorK::SeedCE,
+		courseName => $rename_oldCourseID,
+	});
+	
+	my $dbLayoutName = $ce->{dbLayoutName};
+	
+	# this is kinda left over from when we had 'gdbm' and 'sql' database layouts
+	# below this line, we would grab values from getopt and put them in this hash
+	# but for now the hash can remain empty
+	my %dbOptions;
+	
+	eval {
+		renameCourse(
+			courseID      => $rename_oldCourseID,
+			ce            => $ce2,
+			dbOptions     => \%dbOptions,
+			newCourseID   => $rename_newCourseID,
+		);
+	};
+	if ($@) {
+		my $error = $@;
+		print CGI::div({class=>"ResultsWithError"},
+			CGI::p("An error occured while renaming the course $rename_oldCourseID to $rename_newCourseID:"),
+			CGI::tt(CGI::escapeHTML($error)),
+		);
+	} else {
+		print CGI::div({class=>"ResultsWithoutError"},
+			CGI::p("Successfully renamed the course $rename_oldCourseID to $rename_newCourseID"),
+		);
+		my $newCoursePath = $urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSets", $r,
+			courseID => $rename_newCourseID);
+		my $newCourseURL = $self->systemLink($newCoursePath, authen => 0);
+		print CGI::div({style=>"text-align: center"},
+			CGI::a({href=>$newCourseURL}, "Log into $rename_newCourseID"),
+		);
+	}
+}
+
+################################################################################
+
+sub delete_course_form {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	#my $db = $r->db;
+	#my $authz = $r->authz;
+	#my $urlpath = $r->urlpath;
+	
+	my $delete_courseID     = $r->param("delete_courseID")     || "";
+	
+	my @courseIDs = listCourses($ce);
+	@courseIDs    = sort {lc($a) cmp lc ($b) } @courseIDs; #make sort case insensitive 
+	
+	my %courseLabels; # records... heh.
+	foreach my $courseID (@courseIDs) {
+		my $tempCE = new WeBWorK::CourseEnvironment({
+			%WeBWorK::SeedCE,
+			courseName => $courseID,
+		});
+		$courseLabels{$courseID} = "$courseID (" . $tempCE->{dbLayoutName} . ")";
+	}
+	
+	print CGI::h2("Delete Course");
+	
+	print CGI::start_form(-method=>"POST", -action=>$r->uri);
+	print $self->hidden_authen_fields;
+	print $self->hidden_fields("subDisplay");
+	
+	print CGI::p("Select a course to delete.");
+	
+	print CGI::table({class=>"FormLayout"},
+		CGI::Tr({},
+			CGI::th({class=>"LeftHeader"}, "Course Name:"),
+			CGI::td(
+				CGI::scrolling_list(
+					-name => "delete_courseID",
+					-values => \@courseIDs,
+					-default => $delete_courseID,
+					-size => 10,
+					-multiple => 0,
+					-labels => \%courseLabels,
+				),
+			),
+		),
+	);
+	
+	print CGI::p({style=>"text-align: center"}, CGI::submit(-name=>"delete_course", -value=>"Delete Course"));
+	
+	print CGI::end_form();
+}
+
+sub delete_course_validate {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	#my $db = $r->db;
+	#my $authz = $r->authz;
+	my $urlpath = $r->urlpath;
+	
+	my $delete_courseID     = $r->param("delete_courseID")     || "";
+	
+	my @errors;
+	
+	if ($delete_courseID eq "") {
+		push @errors, "You must specify a course name.";
+	} elsif ($delete_courseID eq $urlpath->arg("courseID")) {
+		push @errors, "You cannot delete the course you are currently using.";
+	}
+	
+	my $ce2 = new WeBWorK::CourseEnvironment({
+		%WeBWorK::SeedCE,
+		courseName => $delete_courseID,
+	});
+	
+	return @errors;
+}
+
+sub delete_course_confirm {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	#my $db = $r->db;
+	#my $authz = $r->authz;
+	#my $urlpath = $r->urlpath;
+	
+	print CGI::h2("Delete Course");
+	
+	my $delete_courseID     = $r->param("delete_courseID")     || "";
+	
+	my $ce2 = new WeBWorK::CourseEnvironment({
+		%WeBWorK::SeedCE,
+		courseName => $delete_courseID,
+	});
+	
+	print CGI::p("Are you sure you want to delete the course " . CGI::b($delete_courseID)
+		. "? All course files and data will be destroyed. There is no undo available.");
+	
+	print CGI::start_form(-method=>"POST", -action=>$r->uri);
+	print $self->hidden_authen_fields;
+	print $self->hidden_fields("subDisplay");
+	print $self->hidden_fields(qw/delete_courseID/);
+	
+	print CGI::p({style=>"text-align: center"},
+		CGI::submit(-name=>"decline_delete_course", -label=>"Don't delete"),
+		"&nbsp;",
+		CGI::submit(-name=>"confirm_delete_course", -label=>"Delete"),
+	);
+	
+	print CGI::end_form();
+}
+
+sub do_delete_course {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my $db = $r->db;
+	#my $authz = $r->authz;
+	#my $urlpath = $r->urlpath;
+	
+	my $delete_courseID     = $r->param("delete_courseID")     || "";
+	
+	my $ce2 = new WeBWorK::CourseEnvironment({
+		%WeBWorK::SeedCE,
+		courseName => $delete_courseID,
+	});
+	
+	# this is kinda left over from when we had 'gdbm' and 'sql' database layouts
+	# below this line, we would grab values from getopt and put them in this hash
+	# but for now the hash can remain empty
+	my %dbOptions;
+	
+	eval {
+		deleteCourse(
+			courseID => $delete_courseID,
+			ce => $ce2,
+			dbOptions => \%dbOptions,
+		);
+	};
+	
+	if ($@) {
+		my $error = $@;
+		print CGI::div({class=>"ResultsWithError"},
+			CGI::p("An error occured while deleting the course $delete_courseID:"),
+			CGI::tt(CGI::escapeHTML($error)),
+		);
+	} else {
+	    # mark the contact person in the admin course as dropped.
+	    # find the contact person for the course by searching the admin classlist.
+	    my @contacts = grep /_$delete_courseID$/,  $db->listUsers;
+	    if (@contacts) {
+			die "Incorrect number of contacts for the course $delete_courseID". join(" ", @contacts) if @contacts !=1;
+			#warn "contacts", join(" ", @contacts);
+			#my $composite_id = "${add_initial_userID}_${add_courseID}";
+			my $composite_id  = $contacts[0];
+			
+			# mark the contact person as dropped.
+			my $User = $db->getUser($composite_id);
+			my $status_name = 'Drop';
+			my $status_value = ($ce->status_name_to_abbrevs($status_name))[0];
+			$User->status($status_value);
+			$db->putUser($User);
+		}
+        
+		print CGI::div({class=>"ResultsWithoutError"},
+			CGI::p("Successfully deleted the course $delete_courseID."),
+		);
+		 writeLog($ce, "hosted_courses", join("\t",
+	    	"\tDeleted",
+	    	"",
+	    	"",
+	    	$delete_courseID,
+	    ));
+		print CGI::start_form(-method=>"POST", -action=>$r->uri);
+		print $self->hidden_authen_fields;
+		print $self->hidden_fields("subDisplay");
+		
+		print CGI::p({style=>"text-align: center"}, CGI::submit(-name=>"decline_delete_course", -value=>"OK"),);
+		
+		print CGI::end_form();
+	}
+}
+
+sub archive_course_form {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	#my $db = $r->db;
+	#my $authz = $r->authz;
+	#my $urlpath = $r->urlpath;
+	
+	my $archive_courseID     = $r->param("archive_courseID")     || "";
+	
+	my @courseIDs = listCourses($ce);
+	@courseIDs    = sort {lc($a) cmp lc ($b) } @courseIDs; #make sort case insensitive 
+	
+	my %courseLabels; # records... heh.
+	foreach my $courseID (@courseIDs) {
+		my $tempCE = new WeBWorK::CourseEnvironment({
+			%WeBWorK::SeedCE,
+			courseName => $courseID,
+		});
+		$courseLabels{$courseID} = "$courseID (" . $tempCE->{dbLayoutName} . ")";
+	}
+	
+	print CGI::h2("archive Course");
+	
+	print CGI::p(
+		"Creates a gzipped tar archive (.tar.gz) of a course in the WeBWorK
+		courses directory. Before archiving, the course database is dumped into
+		a subdirectory of the course's DATA directory. Currently the archive
+		facility is only available for mysql databases. It depends on the
+		mysqldump application."
+	);
+	
+	print CGI::start_form(-method=>"POST", -action=>$r->uri);
+	print $self->hidden_authen_fields;
+	print $self->hidden_fields("subDisplay");
+	
+	print CGI::p("Select a course to archive.");
+	
+	print CGI::table({class=>"FormLayout"},
+		CGI::Tr({},
+			CGI::th({class=>"LeftHeader"}, "Course Name:"),
+			CGI::td(
+				CGI::scrolling_list(
+					-name => "archive_courseIDs",
+					-values => \@courseIDs,
+					-default => $archive_courseID,
+					-size => 10,
+					-multiple => 1,
+					-labels => \%courseLabels,
+				),
+			),
+			
+		),
+		CGI::Tr({},
+			CGI::th({class=>"LeftHeader"}, "Delete course:"),
+			CGI::td({-style=>'color:red'}, CGI::checkbox({ 
+			                    -name=>'delete_course', 
+			                    -checked=>0,
+			                    -value => 1,
+			                    -label =>'Delete course after archiving. Caution there is no undo!',
+			                   },
+			       ),
+			),
+		)
+	);
+	
+	print CGI::p({style=>"text-align: center"}, CGI::submit(-name=>"archive_course", -value=>"archive Course"));
+	
+	print CGI::end_form();
+}
+
+sub archive_course_validate {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	#my $db = $r->db;
+	#my $authz = $r->authz;
+	my $urlpath = $r->urlpath;
+	
+	my @archive_courseIDs     = $r->param("archive_courseIDs");
+	@archive_courseIDs        = () unless @archive_courseIDs;
+	my @errors;
+	foreach my $archive_courseID (@archive_courseIDs) {
+		if ($archive_courseID eq "") {
+			push @errors, "You must specify a course name.";
+		} elsif ($archive_courseID eq $urlpath->arg("courseID")) {
+			push @errors, "You cannot archive the course you are currently using.";
+		}
+	}
+	
+	#my $ce2 = new WeBWorK::CourseEnvironment({
+	#	%WeBWorK::SeedCE,
+	#	courseName => $archive_courseID,
+	#});
+	
+	return @errors;
+}
+
+sub archive_course_confirm {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	#my $db = $r->db;
+	#my $authz = $r->authz;
+	#my $urlpath = $r->urlpath;
+	
+	print CGI::h2("archive Course");
+	
+	my $delete_course_flag   = $r->param("delete_course")        || "";
+	
+	my @archive_courseIDs     = $r->param("archive_courseIDs");
+	@archive_courseIDs        = () unless @archive_courseIDs;
+    my $archive_courseID  = $r->param("archive_courseID"); 
+    $archive_courseID  = $archive_courseIDs[0] unless $archive_courseID;
+    
+    
+	my $ce2 = new WeBWorK::CourseEnvironment({
+		%WeBWorK::SeedCE,
+		courseName => $archive_courseID,
+	});
+
+	
+	my ($tables_ok,$dbStatus);
+#############################################################################
+# Check database
+#############################################################################
+	my %missing_fields;
+	if ($ce2->{dbLayoutName} ) {
+	    my $CIchecker = new WeBWorK::Utils::CourseIntegrityCheck(ce=>$ce2);
+	    ($tables_ok,$dbStatus) = $CIchecker->checkCourseTables($archive_courseID);
+		if ($r->param("upgrade_course_tables")) {
+			my @schema_table_names = keys %$dbStatus;  # update tables missing from database;
+			my @tables_to_create = grep {$dbStatus->{$_}->[0] == WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_A} @schema_table_names;
+			my @tables_to_alter  = grep {$dbStatus->{$_}->[0] == WeBWorK::Utils::CourseIntegrityCheck::DIFFER_IN_A_AND_B} @schema_table_names;
+			my $msg = $CIchecker->updateCourseTables($archive_courseID, [@tables_to_create]);
+			foreach my $table_name (@tables_to_alter) {
+				$msg .= $CIchecker->updateTableFields($archive_courseID, $table_name);
+			}
+			print CGI::p({-style=>'color:green; font-weight:bold'}, $msg);
+		}
+		if ($r->param("upgrade_course_tables") ) {
+			
+			$CIchecker -> updateCourseDirectories();   # needs more error messages
+		
+		
+		
+		}
+ 		($tables_ok,$dbStatus) = $CIchecker->checkCourseTables($archive_courseID);
+ 
+
+		# print db status
+
+		my %msg =(    WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_A         => CGI::span({style=>"color:red"}," Table defined in schema but missing in database"),
+		              WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_B         => CGI::span({style=>"color:red"}," Table defined in database but missing in schema"),
+		              WeBWorK::Utils::CourseIntegrityCheck::SAME_IN_A_AND_B   => CGI::span({style=>"color:green"}," Table is ok "),
+		              WeBWorK::Utils::CourseIntegrityCheck::DIFFER_IN_A_AND_B => CGI::span({style=>"color:red"}," Schema and database table definitions do not agree "),
+		);
+		my %msg2 =(    WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_A        => CGI::span({style=>"color:red"}," missing in database"),
+		              WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_B         => CGI::span({style=>"color:red"}," missing in schema"),
+		              WeBWorK::Utils::CourseIntegrityCheck::SAME_IN_A_AND_B   => CGI::span({style=>"color:green"}," is ok "),
+		              WeBWorK::Utils::CourseIntegrityCheck::DIFFER_IN_A_AND_B => CGI::span({style=>"color:red"}," Schema and database field definitions do not agree "),
+		);
+		my $all_tables_ok=1;
+		my $extra_database_tables=0;
+		my $extra_database_fields=0;
+		my $str=CGI::h4("Report on database structure for course $archive_courseID:").CGI::br();
+		foreach my $table (sort keys %$dbStatus) {
+		    my $table_status = $dbStatus->{$table}->[0];
+			$str .= CGI::b($table) .  $msg{ $table_status } . CGI::br();
+			
+			CASE: {
+				$table_status == WeBWorK::Utils::CourseIntegrityCheck::SAME_IN_A_AND_B 
+					&& do{ last CASE;
+					};
+				$table_status == WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_A
+					&& do{
+						   $all_tables_ok = 0; last CASE;
+					};
+				$table_status == WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_B
+					&& do{
+						   $extra_database_tables = 1; last CASE;
+					};
+				$table_status == WeBWorK::Utils::CourseIntegrityCheck::DIFFER_IN_A_AND_B
+					&& do{ 
+					    my %fieldInfo = %{ $dbStatus->{$table}->[1] };
+						foreach my $key (keys %fieldInfo) {
+						    my $field_status = $fieldInfo{$key}->[0];
+						    CASE2: {
+						    	$field_status == WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_B 
+						    		&& do{ 
+						    		   $extra_database_fields = 1; last CASE2;
+						    		};
+						    	$field_status == WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_A 
+						    		&& do{ 
+						    		   $all_tables_ok=0; last CASE2;
+						    		};						    
+						    }
+							$str .= CGI::br()."\n&nbsp;&nbsp;Field $key => ". $msg2{$field_status };
+						}							
+					};
+			}
+			$str.=CGI::br();
+			
+		}
+#############################################################################
+# Report on databases
+#############################################################################
+
+		print CGI::p($str);
+		if ($extra_database_tables) {
+				print CGI::p({-style=>'color:red; font-weight:bold'},"There are extra database tables which are not defined in the schema.  
+				                                                     They can only be removed manually from the database.");
+		} 
+		if ($extra_database_fields) {
+				print CGI::p({-style=>'color:red; font-weight:bold'},"There are extra database fields  which are not defined in the schema for at least one table.  
+				                                                     They can only be removed manually from the database.");
+		} 
+		if ($all_tables_ok) {
+			print CGI::p({-style=>'color:green; font-weight:bold'},"Course $archive_courseID database is in order");
+			print(CGI::p({-style=>'color:red; font-weight:bold'}, "Are you sure that you want to delete the course ".
+			      CGI::b($archive_courseID). " after archiving?  This cannot be undone!")) if $delete_course_flag;
+		} else {
+			print CGI::p({-style=>'color:red; font-weight:bold'}, "There are tables or fields missing from the
+			        database.  The database  
+			        must be upgraded before archiving this course."
+			);
+		}
+#############################################################################
+# Check directories and report
+#############################################################################
+
+
+      my ($directories_ok, $str2) = $CIchecker->checkCourseDirectories();
+      my $style = ($directories_ok)?"color:green" : "color:red";
+      print CGI::h2("Directory structure"), CGI::p($str2),
+      ($directories_ok)? CGI::p({style=>$style},"Directory structure is ok") :
+              CGI::p({style=>$style},"Directory structure is missing directories 
+                          or the webserver lacks sufficient privileges.");
+    
+
+
+
+#############################################################################
+# Print form for choosing next action.
+#############################################################################
+
+		print CGI::start_form(-method=>"POST", -action=>$r->uri);
+		print $self->hidden_authen_fields;
+		print $self->hidden_fields("subDisplay");
+		print $self->hidden_fields(qw/delete_course/);
+		print CGI::hidden('archive_courseID', $archive_courseID);
+		print CGI::hidden('archive_courseIDs',@archive_courseIDs);
+			# grab some values we'll need
+		my $course_dir   = $ce2->{courseDirs}{root};
+		my $archive_path = $ce2->{webworkDirs}{courses} . "/$archive_courseID.tar.gz";
+        # fail if the source course does not exist
+		unless (-e $course_dir) {
+			print CGI::p( "$archive_courseID: The directory for the course not found.");
+		}
+		
+		if ($all_tables_ok && $directories_ok ) { # no missing fields
+			# Warn about overwriting an existing archive
+			if (-e $archive_path and -w $archive_path) {
+				print CGI::p({-style=>'color:red; font-weight:bold'},"The course '$archive_courseID' has already been archived at '$archive_path'.
+				  This earlier archive will be erased.  This cannot be undone.");
+			}
+			# archive execute button
+			print CGI::p({style=>"text-align: center"},
+				CGI::submit(-name=>"decline_archive_course", -value=>"Stop archiving"),
+				"&nbsp;",
+				(@archive_courseIDs)? CGI::submit(-name=>"archive_course", -value=>"Skip archiving this course")."&nbsp;":'',
+				CGI::submit(-name=>"confirm_archive_course", -value=>"archive") ,
+			);
+		} elsif( $directories_ok)  {
+			print CGI::p({style=>"text-align: center"},
+			CGI::submit(-name => "decline_archive_course", -value => "Don't archive"),
+				"&nbsp;",
+				CGI::submit(-name=>"upgrade_course_tables", -value=>"upgrade course tables"),
+			);
+		} else {
+			print CGI::p({style=>"text-align: center"},
+			CGI::br(),
+			"Directory structure needs to be repaired manually before archiving.",CGI::br(),
+			CGI::submit(-name => "decline_archive_course", -value => "Don't archive"),
+			CGI::submit(-name => "upgrade_course_tables", -value => "Attempt to upgrade directories"),
+			);
+		
+		}
+		print CGI::end_form();
+	} else {
+		print CGI::p({-style=>'color:red; font-weight:bold'},"Unable to find database layout for $archive_courseID");
+	}
+}
+
+sub do_archive_course {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my $db = $r->db;
+	#my $authz = $r->authz;
+	#my $urlpath = $r->urlpath;
+	
+    
+	my $archive_courseID     = $r->param("archive_courseID")     || "";
+	my $delete_course_flag   = $r->param("delete_course")        || "";
+	my @archive_courseIDs     = $r->param("archive_courseIDs");
+	@archive_courseIDs        = () unless @archive_courseIDs;
+
+	my $ce2 = new WeBWorK::CourseEnvironment({
+		%WeBWorK::SeedCE,
+		courseName => $archive_courseID,
+	});
+	
+	# this is kinda left over from when we had 'gdbm' and 'sql' database layouts
+	# below this line, we would grab values from getopt and put them in this hash
+	# but for now the hash can remain empty
+	my %dbOptions;
+	
+	eval {
+		archiveCourse(
+			courseID => $archive_courseID,
+			ce => $ce2,
+			dbOptions => \%dbOptions,
+		);
+	};
+	
+	if ($@) {
+		my $error = $@;
+		print CGI::div({class=>"ResultsWithError"},
+			CGI::p("An error occured while archiving the course $archive_courseID:"),
+			CGI::tt(CGI::escapeHTML($error)),
+		);
+	} else {
+		print CGI::div({class=>"ResultsWithoutError"},
+			CGI::p("Successfully archived the course $archive_courseID"),
+		);
+		 writeLog($ce, "hosted_courses", join("\t",
+	    	"\tarchived",
+	    	"",
+	    	"",
+	    	$archive_courseID,
+	    ));
+	    
+		if ($delete_course_flag) {
+			eval {
+				deleteCourse(
+					courseID => $archive_courseID,
+					ce => $ce2,
+					dbOptions => \%dbOptions,
+				);
+			};
+			
+			if ($@) {
+				my $error = $@;
+				print CGI::div({class=>"ResultsWithError"},
+					CGI::p("An error occured while deleting the course $archive_courseID:"),
+					CGI::tt(CGI::escapeHTML($error)),
+				);
+			} else {
+				# mark the contact person in the admin course as dropped.
+				# find the contact person for the course by searching the admin classlist.
+				my @contacts = grep /_$archive_courseID$/,  $db->listUsers;
+				if (@contacts) {
+					die "Incorrect number of contacts for the course $archive_courseID". join(" ", @contacts) if @contacts !=1;
+					#warn "contacts", join(" ", @contacts);
+					#my $composite_id = "${add_initial_userID}_${add_courseID}";
+					my $composite_id  = $contacts[0];
+					
+					# mark the contact person as dropped.
+					my $User = $db->getUser($composite_id);
+					my $status_name = 'Drop';
+					my $status_value = ($ce->status_name_to_abbrevs($status_name))[0];
+					$User->status($status_value);
+					$db->putUser($User);
+				}
+				
+				print CGI::div({class=>"ResultsWithoutError"},
+					CGI::p("Successfully deleted the course $archive_courseID."),
+				);
+			}
+		
+		
+		}
+		shift @archive_courseIDs;  # remove the course which has just been archived.
+		if (@archive_courseIDs) {	    
+			print CGI::start_form(-method=>"POST", -action=>$r->uri);
+			print $self->hidden_authen_fields;
+			print $self->hidden_fields("subDisplay");
+			print $self->hidden_fields(qw/delete_course/);
+
+			print CGI::hidden('archive_courseIDs',@archive_courseIDs);		
+			print CGI::p({style=>"text-align: center"}, CGI::submit("decline_archive_course", "Stop archiving courses"),
+				CGI::submit("archive_course", "archive next course")
+			);
+ 			print CGI::end_form();
+ 		} else {
+			print CGI::start_form(-method=>"POST", -action=>$r->uri);
+			print $self->hidden_authen_fields;
+			print $self->hidden_fields("subDisplay");
+			print CGI::hidden("archive_courseID",$archive_courseID);
+			print CGI::p( CGI::submit("decline_archive_course", "OK")  );
+			print CGI::end_form();
+		}
+	}
+}
+
+##########################################################################
+
+sub unarchive_course_form {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	#my $db = $r->db;
+	#my $authz = $r->authz;
+	#my $urlpath = $r->urlpath;
+	
+	my $unarchive_courseID     = $r->param("unarchive_courseID")     || "";
+	
+	# First find courses which have been archived.
+	my @courseIDs = listArchivedCourses($ce);
+	@courseIDs    = sort {lc($a) cmp lc ($b) } @courseIDs; #make sort case insensitive 
+	
+	my %courseLabels; # records... heh.
+	foreach my $courseID (@courseIDs) {
+        $courseLabels{$courseID} = $courseID;
+	}
+	
+	print CGI::h2("Unarchive Course");
+	
+	print CGI::p(
+		"Restores a course from a gzipped tar archive (.tar.gz). After
+		unarchiving, the course database is restored from a subdirectory of the
+		course's DATA directory. Currently the archive facility is only
+		available for mysql databases. It depends on the mysqldump application."
+	);
+	
+	print CGI::start_form(-method=>"POST", -action=>$r->uri);
+	print $self->hidden_authen_fields;
+	print $self->hidden_fields("subDisplay");
+	
+	print CGI::p("Select a course to unarchive.");
+	
+	print CGI::table({class=>"FormLayout"},
+		CGI::Tr({},
+			CGI::th({class=>"LeftHeader"}, "Course Name:"),
+			CGI::td(
+				CGI::scrolling_list(
+					-name => "unarchive_courseID",
+					-values => \@courseIDs,
+					-default => $unarchive_courseID,
+					-size => 10,
+					-multiple => 0,
+					-labels => \%courseLabels,
+				),
+			),
+		),
+	
+		CGI::Tr({},
+				CGI::th({class=>"LeftHeader"}, CGI::checkbox(-name => "create_newCourseID",-default=>'',-value=>1, -label=>'New Name:')),
+				CGI::td(CGI::textfield(-name=>"new_courseID", -value=>'', -size=>25)),
+			),
+	);
+	
+	print CGI::p({style=>"text-align: center"}, CGI::submit(-name=>"unarchive_course", -value=>"Unarchive Course"));
+	
+	print CGI::end_form();
+}
+
+sub unarchive_course_validate {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	#my $db = $r->db;
+	#my $authz = $r->authz;
+	my $urlpath = $r->urlpath;
+	
+	my $unarchive_courseID                   = $r->param("unarchive_courseID")             || "";
+	my $create_newCourseID                   = $r->param("create_newCourseID")      || "";
+	my $new_courseID                         = $r->param("new_courseID")    || "";
+	my @errors;
+	#by default we use the archive name for the course
+	my $courseID = $unarchive_courseID; 
+	$courseID =~ s/\.tar\.gz$//;
+	
+	if ( $create_newCourseID) {
+		$courseID = $new_courseID;
+	}
+	debug(" unarchive_courseID $unarchive_courseID new_courseID $new_courseID ");
+
+	if ($courseID eq "") {
+		push @errors, "You must specify a course name.";
+	} elsif ( -d $ce->{webworkDirs}->{courses}."/$courseID" ) {
+	    #Check that a directory for this course doesn't already exist
+		push @errors, "A directory already exists with the name $courseID. 
+		 You must first delete this existing course before you can unarchive.";
+	}
+
+	
+	return @errors;
+}
+
+sub unarchive_course_confirm {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	#my $db = $r->db;
+	#my $authz = $r->authz;
+	#my $urlpath = $r->urlpath;
+	
+	print CGI::h2("Unarchive Course");
+	
+	my $unarchive_courseID                    = $r->param("unarchive_courseID")     || "";
+	my $create_newCourseID                    = $r->param("create_newCourseID")     || "";
+	my $new_courseID                          = $r->param("new_courseID")           || "";
+
+	my $courseID = $unarchive_courseID; $courseID =~ s/\.tar\.gz$//;
+	
+	if ( $create_newCourseID) {
+		$courseID = $new_courseID;
+	}	
+
+    debug(" unarchive_courseID $unarchive_courseID new_courseID $new_courseID ");
+
+	print CGI::start_form(-method=>"POST", -action=>$r->uri);
+		print CGI::p($unarchive_courseID," to course ", 
+	             CGI::input({-name=>'new_courseID', -value=>$courseID})
+	);
+
+	print $self->hidden_authen_fields;
+	print $self->hidden_fields("subDisplay");
+	print $self->hidden_fields(qw/unarchive_courseID create_newCourseID/);
+	
+	print CGI::p({style=>"text-align: center"},
+		CGI::submit(-name=>"decline_unarchive_course", -value=>"Don't unarchive"),
+		"&nbsp;",
+		CGI::submit(-name=>"confirm_unarchive_course", -value=>"unarchive"),
+	);
+	
+	print CGI::end_form();
+}
+
+sub do_unarchive_course {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	#my $db = $r->db;
+	#my $authz = $r->authz;
+	my $urlpath = $r->urlpath;
+	my $new_courseID           = $r->param("new_courseID")           || "";
+	my $unarchive_courseID     = $r->param("unarchive_courseID")     || "";
+	
+	my $old_courseID   = $unarchive_courseID; 
+	$old_courseID =~ s/.tar.gz//;
+
+	#eval {
+		unarchiveCourse(
+			newCourseID => $new_courseID,
+			oldCourseID => $old_courseID,
+			archivePath =>$ce->{webworkDirs}->{courses}."/$unarchive_courseID",
+			ce => $ce,
+		);
+	#};
+	
+	if ($@) {
+		my $error = $@;
+		print CGI::div({class=>"ResultsWithError"},
+			CGI::p("An error occured while archiving the course $unarchive_courseID:"),
+			CGI::tt(CGI::escapeHTML($error)),
+		);
+	} else {
+		print CGI::div({class=>"ResultsWithoutError"},
+			CGI::p("Successfully unarchived  $unarchive_courseID to the course $new_courseID"),
+		);
+		 writeLog($ce, "hosted_courses", join("\t",
+	    	"\tunarchived",
+	    	"",
+	    	"",
+	    	"$unarchive_courseID to $new_courseID",
+	    ));
+
+		my $newCoursePath = $urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSets", $r,
+			courseID => $new_courseID);
+		my $newCourseURL = $self->systemLink($newCoursePath, authen => 0);
+		print CGI::div({style=>"text-align: center"},
+			CGI::a({href=>$newCourseURL}, "Log into $new_courseID"),
+		);
+		
+		print CGI::start_form(-method=>"POST", -action=>$r->uri);
+		print $self->hidden_authen_fields;
+		print $self->hidden_fields("subDisplay");
+		print CGI::hidden("unarchive_courseID",$unarchive_courseID);
+		print CGI::p( CGI::submit("decline_unarchive_course", "unarchive next course")  );
+ 		print CGI::end_form();
+ 
+	}
+}
+
+##########################################################################
+
+sub upgrade_course_form {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	#my $db = $r->db;
+	#my $authz = $r->authz;
+	#my $urlpath = $r->urlpath;
+	
+	
+	my $selectAll =CGI::input({-type=>'button', -name=>'check_all', -value=>'Select all eligible courses',
+	       onClick => "for (i in document.courselist.elements)  { 
+	                       if (document.courselist.elements[i].name =='upgrade_courseIDs') { 
+	                           document.courselist.elements[i].checked = true
+	                       }
+	                    }" });
+   	my $selectNone =CGI::input({-type=>'button', -name=>'check_none', -value=>'Unselect all courses',
+	       onClick => "for (i in document.courselist.elements)  { 
+	                       if (document.courselist.elements[i].name =='upgrade_courseIDs') { 
+	                          document.courselist.elements[i].checked = false
+	                       }
+	                    }" });
+
+	my @courseIDs = listCourses($ce);
+	@courseIDs    = sort {lc($a) cmp lc ($b) } @courseIDs; #make sort case insensitive 
+	
+	print CGI::h2("Upgrade Courses");
+	
+	print CGI::p(
+		"Update the checked directories?"
+	);
+	
+	print CGI::start_form(-method=>"POST", -action=>$r->uri, -id=>"courselist", -name=>"courselist"),
+	      CGI::p($selectAll, $selectNone);
+	print $self->hidden_authen_fields;
+	print $self->hidden_fields("subDisplay");
+	
+		foreach my $courseID ( @courseIDs) {
+			next if $courseID eq "admin"; # done already above
+			next if $courseID eq "modelCourse"; # modelCourse isn't a real course so don't create missing directories, etc
+			next unless $courseID =~/\S/;  # skip empty courseIDs (there shouldn't be any
+			my $urlpath = $r->urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSets", $r, courseID => $courseID);
+			my $tempCE;
+			eval{ $tempCE = new WeBWorK::CourseEnvironment({
+				%WeBWorK::SeedCE,
+				courseName => $courseID,
+			})};
+		    print "Can't create course environment for $courseID because $@" if $@;
+			my $CIchecker = new WeBWorK::Utils::CourseIntegrityCheck(ce=>$tempCE);
+			$CIchecker->updateCourseDirectories();  #creates missing html_temp, mailmerge tmpEditFileDir directories;
+			my ($tables_ok,$dbStatus)   = $CIchecker->checkCourseTables($courseID);
+			my ($directories_ok, $str2) = $CIchecker->checkCourseDirectories();
+			my $checked = ($tables_ok && $directories_ok)?0:1;   # don't check if everything is ok
+			my $checkbox_spot = "";
+			if ($checked) {  # only show checkbox if the course is not up-to-date
+	        	$checkbox_spot = CGI::checkbox({name=>"upgrade_courseIDs", label=>'upgrade', selected=>$checked,value=>$courseID});
+	        }
+			print CGI::li(
+			    $checkbox_spot,"&nbsp;",
+			    CGI::a({href=>$self->systemLink($urlpath, authen => 0)}, $courseID),
+				CGI::code(
+					$tempCE->{dbLayoutName},
+				),
+				$directories_ok ? "" : CGI::span({style=>"color:red"},"Directory structure or permissions need to be repaired. "),
+				$tables_ok ? CGI::span({style=>"color:green"},"Database tables ok") : CGI::span({style=>"color:red"},"Database tables need updating."),
+			
+			);
+			 
+		}
+		
+
+	
+	print CGI::p({style=>"text-align: center"}, CGI::submit(-name=>"upgrade_course", -value=>"Upgrade Courses"));
+	
+	print CGI::end_form();
+}
+
+sub upgrade_course_validate {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	#my $db = $r->db;
+	#my $authz = $r->authz;
+	my $urlpath = $r->urlpath;
+	
+	my @upgrade_courseIDs     = $r->param("upgrade_courseIDs") ; 
+	@upgrade_courseIDs        = () unless  @upgrade_courseIDs;
+	#warn "validate: upgrade ids ", join("|",@upgrade_courseIDs);
+	my @errors;
+	foreach my $upgrade_courseID (@upgrade_courseIDs) {
+		if ($upgrade_courseID eq "") {
+			push @errors, "You must specify a course name.";
+		} 
+	}
+	
+	
+	return @errors;
+}
+
+sub upgrade_course_confirm {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my $db = $r->db;
+	
+    
+	my @upgrade_courseIDs     = $r->param("upgrade_courseIDs");
+	@upgrade_courseIDs        = () unless @upgrade_courseIDs;
+    #my $upgrade_courseID      = $upgrade_courseIDs[0];
+    my %update_error_msg 	  = ();
+    print CGI::start_form(-method=>"POST", -action=>$r->uri);
+    foreach my $upgrade_courseID (@upgrade_courseIDs) {
+        next unless $upgrade_courseID =~/\S/;   # skip empty values
+    	##########################
+		# analyze one course
+		##########################
+		my $ce2 = new WeBWorK::CourseEnvironment({
+			%WeBWorK::SeedCE,
+			courseName => $upgrade_courseID,
+		});
+		#warn "upgrade_course_confirm: updating |$upgrade_courseID| from course list: " , join("|",@upgrade_courseIDs); 
+	
+		#############################################################################
+		# Create integrity checker
+		#############################################################################
+	
+		my $CIchecker = new WeBWorK::Utils::CourseIntegrityCheck(ce=>$ce2);
+	
+		#############################################################################
+		# Report on database status
+		#############################################################################
+	
+		my ($tables_ok,$dbStatus) = $CIchecker->checkCourseTables($upgrade_courseID);
+ 		my ($all_tables_ok, $extra_database_tables, $extra_database_fields, $str) = formatReportOnDatabaseTables($tables_ok, $dbStatus);
+ 		# prepend course name
+		$str = CGI::checkbox({name=>"upgrade_courseIDs", label=>'upgrade', selected=>1,value=>$upgrade_courseID}).
+		         "Report for course $upgrade_courseID:".CGI::br()."Database:".CGI::br(). $str;
+		 
+		#############################################################################
+		# Report on databases
+		#############################################################################
+	
+		print CGI::p($str);
+		if ($extra_database_tables) {
+				print CGI::p({-style=>'color:red; font-weight:bold'},"There are extra database tables which are not defined in the schema.  
+																	 They can only be removed manually from the database.");
+		} 
+		if ($extra_database_fields) {
+				print CGI::p({-style=>'color:red; font-weight:bold'},"There are extra database fields  which are not defined in the schema for at least one table.  
+																	 They can only be removed manually from the database.");
+		} 
+	
+	   
+		#############################################################################
+		# Report on directory status
+		#############################################################################
+		my ($directories_ok, $str2) = $CIchecker->checkCourseDirectories();
+		my $style = ($directories_ok)?"color:green" : "color:red";
+		print "Directory structure".CGI::br(), CGI::p($str2),
+		($directories_ok)? CGI::p({style=>$style},"Directory structure is ok") :
+			  CGI::p({style=>$style},"Directory structure is missing directories 
+						  or the webserver lacks sufficient privileges.");
+	}
+	#warn "upgrade_course_confirm:  now print form";
+	#############################################################################
+	# Print form for choosing next action.
+	#############################################################################
+    print CGI::h3("No course id defined") unless @upgrade_courseIDs;
+
+
+	print $self->hidden_authen_fields;
+	print $self->hidden_fields("subDisplay");
+	#print CGI::hidden('upgrade_courseIDs',@upgrade_courseIDs);
+
+	####################################################################
+	# Submit buttons
+	# After presenting a detailed summary of status of selected courses the choice is made to
+	# upgrade the selected courses (confirm_upgrade_course is set
+	# or return to the beginning (decline_upgrade_course   is set           
+	
+	####################################################################
+	print CGI::p({style=>"text-align: center"},
+	    CGI::submit(-name =>"decline_upgrade_course", -value => "Don't upgrade"),
+		CGI::submit(-name=>"confirm_upgrade_course", -value=>"Upgrade") );
+		
+	print	CGI::h3("upgrade_course_confirm subroutine");
+
+	print CGI::end_form();
+
+}
+
+sub do_upgrade_course {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my $db = $r->db;
+	
+    
+	my @upgrade_courseIDs     = $r->param("upgrade_courseIDs");
+	@upgrade_courseIDs        = () unless @upgrade_courseIDs;
+    my %update_error_msg 				  = ();
+    #warn "do_upgrade_course:  upgrade_courseIDs = ", join(" ", @upgrade_courseIDs);
+    foreach my $upgrade_courseID (@upgrade_courseIDs) {
+    	next unless $upgrade_courseID =~ /\S/; # omit blank course IDs
+ 
+		##########################
+		# update one course
+		##########################
+		my $ce2 = new WeBWorK::CourseEnvironment({
+			%WeBWorK::SeedCE,
+			courseName => $upgrade_courseID,
+		});
+		#warn "do_upgrade_course: updating |$upgrade_courseID| from" , join("|",@upgrade_courseIDs); 
+		#############################################################################
+		# Create integrity checker
+		#############################################################################
+	
+		my $CIchecker = new WeBWorK::Utils::CourseIntegrityCheck(ce=>$ce2);
+		
+		#############################################################################
+		# Add missing tables and missing fields to existing tables
+		#############################################################################
+	
+		my ($tables_ok,$dbStatus) = $CIchecker->checkCourseTables($upgrade_courseID);
+		my @schema_table_names = keys %$dbStatus;  # update tables missing from database;
+		my @tables_to_create = grep {$dbStatus->{$_}->[0] == WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_A} @schema_table_names;	
+		my @tables_to_alter  = grep {$dbStatus->{$_}->[0] == WeBWorK::Utils::CourseIntegrityCheck::DIFFER_IN_A_AND_B} @schema_table_names;
+		$update_error_msg{$upgrade_courseID} = $CIchecker->updateCourseTables($upgrade_courseID, [@tables_to_create]);
+		foreach my $table_name (@tables_to_alter) {	#warn "do_upgrade_course: adding new fields to table $table_name in course $upgrade_courseID";
+			$update_error_msg{$upgrade_courseID} .= $CIchecker->updateTableFields($upgrade_courseID, $table_name);
+		}
+		### $update_error_msg{$upgrade_courseID} is printed below
+		#############################################################################
+		# Add missing directories when it can be done safely
+		#############################################################################	#warn "do_upgrade_course: updating course directories for $upgrade_courseID";
+		$CIchecker -> updateCourseDirectories();   # needs more error messages
+	
+		
+		#############################################################################
+		# Analyze database status and prepare status report
+		#############################################################################
+	
+		($tables_ok,$dbStatus) = $CIchecker->checkCourseTables($upgrade_courseID);
+		  
+		my ($all_tables_ok, $extra_database_tables, $extra_database_fields, $str) 
+		      = formatReportOnDatabaseTables($tables_ok, $dbStatus);
+ 		# prepend course name
+		$str = CGI::br()."Database:".CGI::br(). $str;
+
+		#############################################################################
+		# Report on databases and report summary
+		#############################################################################
+	
+			
+			if ($extra_database_tables) {
+					$str .= CGI::p({-style=>'color:red; font-weight:bold'},"There are extra database tables which are not defined in the schema.  
+																		 They can only be removed manually from the database.");
+			} 
+			if ($extra_database_fields) {
+					$str .= CGI::p({-style=>'color:red; font-weight:bold'},"There are extra database fields  which are not defined in the schema for at least one table.  
+																		 They can only be removed manually from the database.");
+			} 
+	   
+		#############################################################################
+		# Prepare report on directory status
+		#############################################################################
+		  my ($directories_ok, $str2) = $CIchecker->checkCourseDirectories();
+		  my $style = ($directories_ok)?"color:green" : "color:red";
+		  my $dir_msg  = join ('', 
+		  	"Directory structure",CGI::br(), 
+		  	CGI::p($str2),
+		  	($directories_ok)? CGI::p({style=>$style},"Directory structure is ok") :
+				  CGI::p({style=>$style},"Directory structure is missing directories 
+							  or the webserver lacks sufficient privileges.")
+		  );
+	
+		#############################################################################
+		# Print status
+		#############################################################################
+		print " Report for course $upgrade_courseID:".CGI::br();
+		print CGI::p({-style=>'color:green; font-weight:bold'}, $update_error_msg{$upgrade_courseID});
+
+		print CGI::p($str);     # print message about tables
+		print CGI::p($dir_msg); # message about directories
+
+	}
+	#############################################################################
+	# Submit buttons -- return to beginning
+	#############################################################################
+	print CGI::h3("do_upgrade_course subroutine");
+	print CGI::start_form(-method=>"POST", -action=>$r->uri);  #send back to this script
+	print $self->hidden_authen_fields;
+	print $self->hidden_fields("subDisplay");
+	print CGI::p({style=>"text-align: center"}, CGI::submit(-name=>"decline_upgrade_course", -value=>"Continue") );
+	print CGI::end_form();
+}
+	
+	
+
+################################################################################
+## location management routines; added by DG [Danny Ginn] 20070215
+## revised by glarose
+
+sub manage_location_form {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my $db = $r->db;
+	#my $authz = $r->authz;
+	my $urlpath = $r->urlpath;
+
+	# get a list of all existing locations
+	my @locations = sort {lc($a->location_id) cmp lc($b->location_id)}
+		$db->getAllLocations();
+	my %locAddr = map {$_->location_id => [ $db->listLocationAddresses($_->location_id) ]} @locations;
+
+	my @locationIDs = map { $_->location_id } @locations;
+	
+	print CGI::h2("Manage Locations");
+
+	print CGI::p({},CGI::strong("Currently defined locations are listed below."));
+
+	print CGI::start_form(-method=>"POST", -action=>$r->uri);
+	print $self->hidden_authen_fields;
+	print $self->hidden_fields("subDisplay");
+
+	# get a list of radio buttons to select an action
+	my @actionRadios = 
+		CGI::radio_group(-name => "manage_location_action",
+				 -values => ["edit_location_form",
+					     "add_location_handler",
+					     "delete_location_handler"],
+				 -labels => { edit_location_form => "",
+					      add_location_handler => "",
+					      delete_location_handler => "", },
+				 -default => $r->param("manage_location_action") ? $r->param("manage_location_action") : 'none');
+
+	print CGI::start_table({});
+	print CGI::Tr({}, CGI::th({-colspan=>4,-align=>"left"}, 
+				  "Select an action to perform:"));
+
+	# edit action
+	print CGI::Tr({}, 
+		CGI::td({},[ $actionRadios[0], "Edit Location:" ]),
+		CGI::td({-colspan=>2, -align=>"left"}, 
+			CGI::div({-style=>"width:25%;"},
+				  CGI::popup_menu(-name=>"edit_location",
+					-values=>[@locationIDs]))) );
+	# create action
+	print CGI::Tr({},
+		CGI::td({-align=>"left"},[ $actionRadios[1], 
+			"Create Location:" ]),
+		CGI::td({-colspan=>2},
+			"Location name: " .
+			CGI::textfield(-name=>"new_location_name",
+				       -size=>"10",
+				       -default=>$r->param("new_location_name")?$r->param("new_location_name"):'')));
+	print CGI::Tr({valign=>'top'},
+		CGI::td({}, ["&nbsp;", "Location description:"]),
+		CGI::td({-colspan=>2}, 
+			CGI::textfield(-name=>"new_location_description",
+				       -size=>"50",
+				       -default=>$r->param("new_location_description")?$r->param("new_location_description"):'')) );
+	print CGI::Tr({}, CGI::td({},"&nbsp;"),
+		CGI::td({-colspan=>3}, "Addresses for new location " .
+			"(enter one per line, as single IP addresses " .
+			"(e.g., 192.168.1.101), address masks (e.g., " .
+			"192.168.1.0/24), or IP ranges (e.g., " .
+			"192.168.1.101-192.168.1.150)):"));
+	print CGI::Tr({}, CGI::td({}, "&nbsp;"),
+		CGI::td({-colspan=>3},
+			CGI::textarea({-name=>"new_location_addresses",
+				       -rows=>5, -columns=>28,
+				       -default=>$r->param("new_location_addresses")?$r->param("new_location_addresses"):''})));
+
+	# delete action
+	print CGI::Tr({}, 
+		CGI::td({-colspan=>4}, 
+			CGI::div({-class=>"ResultsWithError"},
+				 CGI::em({}, "Deletion deletes all location " .
+					 "data and related addresses, and is" .
+
+ 					 " not undoable!"))));
+	print CGI::Tr({}, 
+		CGI::td({}, 
+			[ $actionRadios[2],
+			  CGI::div({-class=>"ResultsWithError"},
+				   "Delete location:") ]),
+		CGI::td({-colspan=>2}, 
+			CGI::popup_menu(-name=>"delete_location",
+					-values=>["",
+						  "selected_locations",
+						  @locationIDs],
+					-labels=>{selected_locations => "locations selected below",
+						  "" => "no location"}) .
+			CGI::span({-style=>"color:#C33;"}, "  Confirm: ") . 
+			CGI::checkbox({-name=>"delete_confirm",
+				       -value=>"true",
+				       -label=>""}) ) );
+	print CGI::end_table();
+
+	print CGI::p({}, CGI::submit(-name=>"manage_locations", -value=>"Take Action!"));
+
+	# existing location table
+	# FIXME: the styles for this table should be off in a stylesheet 
+	#    somewhere
+	print CGI::start_div({align=>"center"}),
+		CGI::start_table({border=>1, cellpadding=>2});
+	print CGI::Tr({style=>"background-color:#e0e0e0;font-size:92%", align=>"left"}, 
+		      CGI::th({}, ["Select", "Location", "Description", 
+				   "Addresses"]));
+	foreach my $loc ( @locations ) {
+		my $editAddr = $self->systemLink($urlpath, params=>{subDisplay=>"manage_locations", manage_location_action=>"edit_location_form", edit_location=>$loc->location_id});
+		print CGI::Tr({valign=>'top',style=>"background-color:#eeeeee;"}, 
+			      CGI::td({style=>'font-size:85%;'},
+				      [ CGI::checkbox(-name=>"delete_selected",
+						      -value=>$loc->location_id,
+						      -label=>''),
+					CGI::a({href=>$editAddr}, $loc->location_id),
+					$loc->description,
+					join(', ', @{$locAddr{$loc->location_id}}) ]));
+	}
+	print CGI::end_table(), CGI::end_div();
+	print CGI::end_form();
+
+
+}
+
+sub add_location_handler {
+	my $self = shift();
+	my $r = $self->r;
+	my $db = $r->db;
+
+	# the location data we're to add
+	my $locationID = $r->param("new_location_name");
+	my $locationDescr = $r->param("new_location_description");
+	my $locationAddr = $r->param("new_location_addresses");
+	# break the addresses up
+	$locationAddr =~ s/\s*-\s*/-/g;
+	$locationAddr =~ s/\s*\/\s*/\//g;
+	my @addresses = split(/\s+/, $locationAddr);
+
+	# sanity checks
+	my $badAddr = '';
+	foreach my $addr ( @addresses ) {
+		unless ( new Net::IP($addr) ) {
+			$badAddr .= "$addr, ";
+			$locationAddr =~ s/$addr\n//s;
+		}
+	}
+	$badAddr =~ s/, $//;
+
+	# a check to be sure that the location addresses don't already
+	#    exist
+	my $badLocAddr;
+	if ( ! $badAddr && $locationID ) {
+		if ( $db->countLocationAddresses( $locationID ) ) {
+			my @allLocAddr = $db->listLocationAddresses($locationID);
+			foreach my $addr ( @addresses ) {
+				$badLocAddr .= "$addr, " 
+					if ( grep {/^$addr$/} @allLocAddr );
+			}
+			$badLocAddr =~ s/, $//;
+		}
+	}
+
+	if ( ! @addresses || ! $locationID || ! $locationDescr ) {
+		print CGI::div({-class=>"ResultsWithError"}, 
+			       "Missing required input data. Please check " .
+			       "that you have filled in all of the create " .
+			       "location fields and resubmit.");
+	} elsif ( $badAddr ) {
+		$r->param("new_location_addresses", $locationAddr);
+		print CGI::div({-class=>"ResultsWithError"}, 
+			       "Address(es) $badAddr is(are) not in a " .
+			       "recognized form.  Please check your " .
+			       "data entry and resubmit.");
+	} elsif ( $db->existsLocation( $locationID ) ) {
+		print CGI::div({-class=>"ResultsWithError"}, 
+			       "A location with the name $locationID " .
+			       "already exists in the database.  Did " .
+			       "you mean to edit that location instead?");
+	} elsif ( $badLocAddr ) {
+		print CGI::div({-class=>"ResultsWithError"}, 
+			       "Address(es) $badLocAddr already exist " .
+			       "in the database.  THIS SHOULD NOT HAPPEN!  " .
+			       "Please double check the integrity of " .
+			       "the WeBWorK database before continuing.");
+	} else {
+		# add the location
+		my $locationObj = $db->newLocation;
+		$locationObj->location_id( $locationID );
+		$locationObj->description( $locationDescr );
+		$db->addLocation( $locationObj );
+
+		# and add the addresses
+		foreach my $addr ( @addresses ) {
+			my $locationAddress = $db->newLocationAddress;
+			$locationAddress->location_id($locationID);
+			$locationAddress->ip_mask($addr);
+
+			$db->addLocationAddress( $locationAddress );
+		}
+		
+		# we've added the location, so clear those param 
+		#    entries
+		$r->param('manage_location_action','none');
+		$r->param('new_location_name','');
+		$r->param('new_location_description','');
+		$r->param('new_location_addresses','');
+
+		print CGI::div({-class=>"ResultsWithoutError"}, 
+			       "Location $locationID has been created, " .
+			       "with addresses " . join(', ', @addresses) .
+			       ".");
+	}
+
+	$self->manage_location_form;
+}
+
+sub delete_location_handler {
+	my $self = shift;
+	my $r = $self->r;
+	my $db = $r->db;
+
+	# what location are we deleting?
+	my $locationID = $r->param("delete_location");
+	# check for selected deletions if appropriate
+	my @delLocations = ( $locationID );
+	if ( $locationID eq 'selected_locations' ) {
+		@delLocations = $r->param("delete_selected");
+		$locationID = @delLocations;
+	}
+	# are we sure?
+	my $confirm = $r->param("delete_confirm");
+
+	my $badID;
+	if ( ! $locationID ) {
+		print CGI::div({-class=>"ResultsWithError"}, 
+			       "Please provide a location name " . 
+			       "to delete.");
+
+	} elsif ( $badID = $self->existsLocations_helper( @delLocations ) ) {
+		print CGI::div({-class=>"ResultsWithError"}, 
+			       "No location with name $badID " . 
+			       "exists in the database.");
+
+	} elsif ( ! $confirm || $confirm ne 'true' ) {
+		print CGI::div({-class=>"ResultsWithError"}, 
+			       "Location deletion requires confirmation.");
+	} else {
+		foreach ( @delLocations ) {
+			$db->deleteLocation( $_ );
+		}
+		print CGI::div({-class=>"ResultsWithoutError"},
+			       "Location" . (@delLocations > 1 ? 's ' : ' ') .
+			       join(', ', @delLocations) . 
+			       (@delLocations > 1 ? ' have ' : ' has ' ) . 
+			       'been deleted.');
+		$r->param('manage_location_action','none');
+		$r->param('delete_location','');
+	}
+	$self->manage_location_form;
+}
+sub existsLocations_helper {
+	my ($self, @locations) = @_;
+	my $db = $self->r->db;
+	foreach ( @locations ) {
+		return $_ if ( ! $db->existsLocation($_) );
+	}
+	return 0;
+}
+
+sub edit_location_form {
+	my $self = shift;
+	my $r = $self->r;
+	my $db = $r->db;
+
+	my $locationID = $r->param("edit_location");
+	if ( $db->existsLocation( $locationID ) ) {
+		my $location = $db->getLocation($locationID);
+		# this doesn't give that nice a sort for IP addresses,
+		#    b/c there's the problem with 192.168.1.168 sorting 
+		#    ahead of 192.168.1.2.  we could do better if we 
+		#    either invoked Net::IP in the sort routine, or if
+		#    we insisted on dealing only with IPv4.  rather than
+		#    deal with either of those, we'll leave this for now
+		my @locAddresses = sort { $a cmp $b }
+			$db->listLocationAddresses($locationID);
+
+		print CGI::h2("Editing location ", $locationID);
+
+		print CGI::p({},"Edit the current value of the location ",
+			     "description, if desired, then add and select ",
+			     "addresses to delete, and then click the ", 
+			     "\"Take Action\" button to make all of your ",
+			     "changes.  Or, click \"Manage Locations\" ",
+			     "above to make no changes and return to the ",
+			     "Manage Locations page.");
+
+		print CGI::start_form(-method=>"POST",
+				      -action=>$r->uri);
+		print $self->hidden_authen_fields;
+		print $self->hidden_fields("subDisplay");
+		print CGI::hidden(-name=>'edit_location',
+				  -default=>$locationID);
+		print CGI::hidden(-name=>'manage_location_action',
+				  -default=>'edit_location_handler');
+
+		print CGI::start_table();
+		print CGI::Tr({-valign=>'top'},
+			CGI::td({-colspan=>3},
+				"Location description: ", CGI::br(),
+				CGI::textfield(-name=>"location_description",
+					       -size=>"50",
+					       -default=>$location->description)));
+		print CGI::Tr({-valign=>'top'},
+			CGI::td({-width=>"50%"},
+				"Addresses to add to the location " .
+				"(enter one per line, as single IP addresses " .
+				"(e.g., 192.168.1.101), address masks " .
+				"(e.g., 192.168.1.0/24), or IP ranges " .
+				"(e.g., 192.168.1.101-192.168.1.150)):" . 
+				CGI::br() .
+				CGI::textarea({-name=>"new_location_addresses",
+					       -rows=>5, -columns=>28})),
+			CGI::td({}, "&nbsp;"),
+			CGI::td({-width=>"50%"},
+				"Existing addresses for the location are " .
+				"given in the scrolling list below.  Select " .
+				"addresses from the list to delete them:" . 
+				CGI::br() .
+				CGI::scrolling_list(-name=>'delete_location_addresses',
+						    -values=>[@locAddresses],
+						    -size=>8,
+						    -multiple=>'multiple') .
+				CGI::br() . "or: " .
+				CGI::checkbox(-name=>'delete_all_addresses',
+					      -value=>'true',
+					      -label=>'Delete all existing addresses')
+				 ));
+
+		print CGI::end_table();
+
+		print CGI::p({},CGI::submit(-value=>'Take Action!'));
+
+	} else {
+		print CGI::div({-class=>"ResultsWithError"},
+			       "Location $locationID does not exist " .
+			       "in the WeBWorK database.  Please check " .
+			       "your input (perhaps you need to reload " .
+			       "the location management page?).");
+
+		$self->manage_location_form;
+	}
+}
+
+sub edit_location_handler { 
+	my $self = shift;
+	my $r = $self->r;
+	my $db = $r->db;
+
+	my $locationID = $r->param("edit_location");
+	my $locationDesc = $r->param("location_description");
+	my $addAddresses = $r->param("new_location_addresses");
+	my @delAddresses = $r->param("delete_location_addresses");
+	my $deleteAll = $r->param("delete_all_addresses");
+
+	# gut check
+	if ( ! $locationID ) {
+		print CGI::div({-class=>"ResultsWithError"},
+			       "No location specified to edit?! " .
+			       "Please check your input data.");
+		$self->manage_location_form;
+
+	} elsif ( ! $db->existsLocation( $locationID ) ) {
+		print CGI::div({-class=>"ResultsWithError"},
+			       "Location $locationID does not exist " .
+			       "in the WeBWorK database.  Please check " .
+			       "your input (perhaps you need to reload " .
+			       "the location management page?).");
+		$self->manage_location_form;
+	} else {
+		my $location = $db->getLocation($locationID);
+
+		# get the current location addresses.  if we're deleting
+		#   all of the existing addresses, we don't use this list 
+		#   to determine which addresses to add, however.
+		my @currentAddr = $db->listLocationAddresses($locationID);
+		my @compareAddr = ( ! $deleteAll || $deleteAll ne 'true' )
+			? @currentAddr : ();
+
+		my $doneMsg = '';
+
+		if ($locationDesc && $location->description ne $locationDesc) {
+			$location->description($locationDesc);
+			$db->putLocation($location);
+			$doneMsg .= CGI::p({},"Updated location description.");
+		}
+		# get the actual addresses to add out of the text field
+		$addAddresses =~ s/\s*-\s*/-/g;
+		$addAddresses =~ s/\s*\/\s*/\//g;
+		my @addAddresses = split(/\s+/, $addAddresses);
+
+		# make sure that we're adding and deleting only those 
+		#    addresses that are not yet/currently in the location
+		#    addresses
+		my @toAdd = ();  my @noAdd = ();
+		my @toDel = ();  my @noDel = ();
+		foreach my $addr ( @addAddresses ) {
+			if (grep {/^$addr$/} @compareAddr) {push(@noAdd,$addr);}
+			else { push(@toAdd, $addr); }
+		}
+		if ( $deleteAll && $deleteAll eq 'true' ) {
+			@toDel = @currentAddr;
+		} else {
+			foreach my $addr ( @delAddresses ) { 
+				if (grep {/^$addr$/} @currentAddr) {
+					push(@toDel,$addr);
+				} else { push(@noDel, $addr); }
+			}
+		}
+
+		# and make sure that all of the addresses we're adding are 
+		#    a sensible form
+		my $badAddr = '';
+		foreach my $addr ( @toAdd ) {
+			unless ( new Net::IP($addr) ) {
+				$badAddr .= "$addr, ";
+			}
+		}
+		$badAddr =~ s/, $//;
+
+		# delete addresses first, because we allow deletion of 
+		#    all existing addresses, then addition of addresses.
+		#    note that we don't allow deletion and then addition 
+		#    of the same address normally, however; in that case
+		#    we'll end up just deleting the address.
+		foreach ( @toDel ) {
+			$db->deleteLocationAddress($locationID, $_);
+		}
+		foreach ( @toAdd ) {
+			my $locAddr = $db->newLocationAddress;
+			$locAddr->location_id($locationID);
+			$locAddr->ip_mask($_);
+
+			$db->addLocationAddress($locAddr);
+		}
+
+		my $addrMsg = '';
+		$addrMsg .= "Deleted addresses " . join(', ', @toDel) .
+			" from location." . CGI::br() if ( @toDel );
+		$addrMsg .= "Added addresses " . join(', ', @toAdd) . 
+			" to location $locationID.  " if ( @toAdd );
+
+		my $badMsg = '';
+		$badMsg .= 'Address(es) ' . join(', ', @noAdd) .
+			" in the add list is(are) already in the " .
+			"location $locationID, and so were " .
+			"skipped." . CGI::br() if ( @noAdd );
+		$badMsg .= "Address(es) $badAddr is(are) not in a " .
+			"recognized form.  Please check your data " .
+			"entry and try again." . CGI::br() if ( $badAddr );
+		$badMsg .= 'Address(es) ' . join(', ', @noDel) . 
+			" in the delete list is(are) not in the " .
+			"location $locationID, and so were " .
+			"skipped." if ( @noDel );
+
+		print CGI::div({-class=>"ResultsWithError"}, $badMsg)
+			if ( $badMsg );
+		if ( $doneMsg || $addrMsg ) {
+			print CGI::div({-class=>"ResultsWithoutError"},
+				       CGI::p({}, $doneMsg, $addrMsg));
+		} else {
+			print CGI::div({-class=>"ResultsWithError"},
+				       "No valid changes submitted for ",
+				       "location $locationID.");
+		}
+
+		$self->edit_location_form;
+	}
+}
+
+################################################################################
+#   registration forms added by Mike Gage 5-5-2008
+################################################################################
+
+our $registered_file_name = "registered_$main::VERSION";
+
+sub display_registration_form {
+	my $self = shift;
+	my $ce   = $self->r->ce;
+	my $registeredQ = (-e ($ce->{courseDirs}->{root})."/$registered_file_name")?1:0;
+	#my $registration_subDisplay = ( $self->{method_to_call} eq "registration_form") ?  1: 0;
+	return 0  if $registeredQ or $self->r->param("register_site");     #otherwise return registration form
+	return  q! 
+	<center>
+	<table class="messagebox" style="background-color:#FFFFCC;width:60%">
+	<tr><td>
+	!,
+	CGI::p("If you are using your WeBWorK server for courses please help us out by registering your server."),
+	CGI::p("We are often asked how many institutions are using WeBWorK and how many students are using
+	WeBWorK  Since WeBWorK is open source and can be freely downloaded from ".
+	CGI::a({href=>'http://webwork.maa.org'},'http://webwork.maa.org' ). " and ".
+	CGI::a({href=> 'http://www.openwebwork.org'},'http://www.openwebwork.org'). ", it is frequently difficult for us to give a reasonable answer to this 
+	question."),
+	CGI::p("You can help by registering your current version of WeBWorK -- click the button, answer a few
+	questions (the ones you can answer easily) and send the email.  It takes less than two minutes.  Thank you!. -- The WeBWorK Team"),
+	q!
+	</td>
+	</tr>
+	<tr><td align="center">
+	!,
+	CGI::a({href=>$self->systemLink($self->r->urlpath, params=>{subDisplay=>"registration"})}, "Register"),
+	q!
+	</td></tr>
+	</table>
+	</center>
+	!;
+	
+
+
+}
+
+sub registration_form {
+	my $self = shift;
+	my $ce = $self->r->ce;
+	
+	print "<center>";
+	print  "\n",CGI::p({style=>"text-align: left; width:60%"},
+	"\nPlease ",
+	CGI::a({href=>'mailto:gage@math.rochester.edu?'
+	.'subject=WeBWorK%20Server%20Registration'
+	.'&body='
+	.uri_escape("Thanks for registering your WeBWorK server.  We'd appreciate if you would answer
+	as many of these questions as you can conveniently.  We need this data so we can better 
+	answer questions such as 'How many institutions have webwork servers?' and 'How many students
+	use WeBWorK?'.  Your email and contact information  will be kept private.  We will 
+	list your institution as one that uses WeBWorK unless you tell us to keep that private as well.
+	\n\nThank you. \n\n--Mike Gage \n\n
+	")
+	.uri_escape("Server URL: ".$ce->{apache_root_url}." \n\n")
+	.uri_escape("WeBWorK version: $main::VERSION \n\n")
+	.uri_escape("Institution name (e.g. University of Rochester): \n\n")
+	.uri_escape("Contact person name: \n\n")
+	.uri_escape("Contact email: \n\n")
+	.uri_escape("Approximate number of courses run each term: \n\n")
+	.uri_escape("Approximate number of students using this server each term: \n\n")
+	.uri_escape("Other institutions who use WeBWorK courses hosted on this server: \n\n")
+	.uri_escape("Other comments: \n\n")
+	},
+	'click here'),
+	q! to open your email application.  There are a few questions, some of which have already
+	been filled in for your installation.  Fill in the other questions which you can answer easily and send
+	the email to gage@math.rochester.edu
+	!
+	);
+	
+	
+	
+	print  "\n",CGI::p({style=>"text-align: left; width:60%"},q!Once you have emailed your registration information you can hide the "registration" banner 
+	for successive visits by clicking
+	the button below. It writes an empty file (!.CGI::code('registered_versionNumber').q!) to the directory !.CGI::code('..../courses/admin')
+	);
+	
+	print "</center>";
+	print CGI::start_form(-method=>"POST", -action=>$self->r->uri);
+	print $self->hidden_authen_fields;
+	print $self->hidden_fields("subDisplay");
+	print CGI::p({style=>"text-align: center"}, CGI::submit(-name=>"register_site", -label=>"Site has been registered"));
+	print CGI::end_form();
+}
+
+
+
+sub do_registration {
+	my $self = shift;
+	my $ce   = $self->r->ce;
+	my $registered_file_path = $ce->{courseDirs}->{root}."/$registered_file_name";
+	# warn qq!`echo "info" >$registered_file_path`!;
+	`echo "info" >$registered_file_path`;
+	
+	print  "\n<center>",CGI::p({style=>"text-align: left; width:60%"},q{Registration action completed.  Thank you very much for registering WeBWorK!"});
+	
+	print CGI::start_form(-method=>"POST", -action=>$self->r->uri);
+	print $self->hidden_authen_fields;
+	print CGI::p({style=>"text-align: center"}, CGI::submit(-name=>"registration_completed", -label=>"Continue"));
+	print CGI::end_form();
+	print "</center>";
+
+}
+################################################################################
+# Utilities
+################################################################################
+sub formatReportOnDatabaseTables {
+	my ($tables_ok,$dbStatus) =  @_;
+	
+	# print db status
+	
+		my %msg =(    WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_A         => CGI::span({style=>"color:red"}," Table defined in schema but missing in database"),
+					  WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_B         => CGI::span({style=>"color:red"}," Table defined in database but missing in schema"),
+					  WeBWorK::Utils::CourseIntegrityCheck::SAME_IN_A_AND_B   => CGI::span({style=>"color:green"}," Table is ok "),
+					  WeBWorK::Utils::CourseIntegrityCheck::DIFFER_IN_A_AND_B => CGI::span({style=>"color:red"}," Schema and database table definitions do not agree "),
+		);
+		my %msg2 =(    WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_A        => CGI::span({style=>"color:red"}," missing in database"),
+					  WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_B         => CGI::span({style=>"color:red"}," missing in schema"),
+					  WeBWorK::Utils::CourseIntegrityCheck::SAME_IN_A_AND_B   => CGI::span({style=>"color:green"}," is ok "),
+					  WeBWorK::Utils::CourseIntegrityCheck::DIFFER_IN_A_AND_B => CGI::span({style=>"color:red"}," Schema and database field definitions do not agree "),
+		);
+		my $all_tables_ok=1;
+		my $extra_database_tables=0;
+		my $extra_database_fields=0;
+		my $str ='';
+		$str .= CGI::start_ul();
+		foreach my $table (sort keys %$dbStatus) {
+			my $table_status = $dbStatus->{$table}->[0];
+			$str .= CGI::li( CGI::b($table) .  $msg{ $table_status } );
+			
+			CASE: {
+				$table_status == WeBWorK::Utils::CourseIntegrityCheck::SAME_IN_A_AND_B 
+					&& do{ last CASE;
+					};
+				$table_status == WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_A
+					&& do{
+						   $all_tables_ok = 0; last CASE;
+					};
+				$table_status == WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_B
+					&& do{
+						   $extra_database_tables = 1; last CASE;
+					};
+				$table_status == WeBWorK::Utils::CourseIntegrityCheck::DIFFER_IN_A_AND_B
+					&& do{ 
+						my %fieldInfo = %{ $dbStatus->{$table}->[1] };
+						$str .=CGI::start_ul();
+						foreach my $key (keys %fieldInfo) {
+							my $field_status = $fieldInfo{$key}->[0];
+							CASE2: {
+								$field_status == WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_B 
+									&& do{ 
+									   $extra_database_fields = 1; last CASE2;
+									};
+								$field_status == WeBWorK::Utils::CourseIntegrityCheck::ONLY_IN_A 
+									&& do{ 
+									   $all_tables_ok=0; last CASE2;
+									};						    
+							}
+							$str .= CGI::li("Field $key => ". $msg2{$field_status });
+						}
+						$str .= CGI::end_ul();
+					};
+			}
+			
+			
+		}
+		$str.=CGI::end_ul();
+		$str .= ($all_tables_ok)?CGI::p("Database tables are ok") : "";
+		return ($all_tables_ok, $extra_database_tables, $extra_database_fields, $str);
+}
+1;
diff --git a/lib/WeBWorK/ContentGenerator/EquationDisplay.pm b/lib/WeBWorK/ContentGenerator/EquationDisplay.pm
new file mode 100644
index 0000000000..bd3f8ad8ee
--- /dev/null
+++ b/lib/WeBWorK/ContentGenerator/EquationDisplay.pm
@@ -0,0 +1,133 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/EquationDisplay.pm,v 1.6 2006/07/12 01:23:54 gage 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::ContentGenerator::EquationDisplay;
+use base qw(WeBWorK::ContentGenerator);
+
+=head1 NAME
+
+
+WeBWorK::ContentGenerator::EquationDisplay -- create .png version of TeX equations.
+
+=cut
+
+use strict;
+use warnings;
+#use CGI qw(-nosticky );
+use WeBWorK::CGI;
+use WeBWorK::PG::ImageGenerator;
+
+sub display_equation {
+	my ($self, $str) = @_;
+	
+	my $imageTag = $self->{image_gen}->add($str, 'inline');
+	$self->{image_gen}->render();
+	return $imageTag;
+}
+
+################################################################################
+# template escape handlers
+################################################################################
+
+sub initialize {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	
+	$self->{image_gen} = WeBWorK::PG::ImageGenerator->new(
+		tempDir  => $ce->{webworkDirs}->{tmp}, # global temp dir
+		latex	 => $ce->{externalPrograms}->{latex},
+		dvipng   => $ce->{externalPrograms}->{dvipng},
+		useCache => 1,
+		cacheDir => $ce->{webworkDirs}->{equationCache},
+		cacheURL => $ce->{webworkURLs}->{equationCache},
+		cacheDB  => $ce->{webworkFiles}->{equationCacheDB},
+	);
+	
+	my $equationStr = $r->param('eq');
+	$self->{equationStr} = $equationStr if defined $equationStr;
+	$self->{typesetStr}  = $self->display_equation($equationStr) if $equationStr;
+}
+
+#sub path {
+#	my ($self, $args) = @_;
+#	
+#	my $ce = $self->{ce};
+#	my $root = $ce->{webworkURLs}->{root};
+#	my $courseName = $ce->{courseName};
+#	return $self->pathMacro($args,
+#		"Home" => "$root",
+#		$courseName => "$root/$courseName",
+#		"Feedback" => "",
+#	);
+#}
+#
+#sub title {
+#	return "Equation";
+#}
+
+sub body {
+	my ($self) = @_;
+	my $r = $self->r;
+	
+	#######################################
+	# Initial data for the textarea field where the equation is entered
+	#######################################
+	my $initial_str = "Enter equation here";
+	$initial_str = $r->param('eq') if $self->{equationStr};
+	
+	#######################################
+	# Prepare to display the typeset image and
+	# the HTML code that links to the source image.
+	# The HTML code is linked also to the image address
+	# This requires digging out the link from the string returned
+	# by display_equation and ImageGenerator.
+	# The server name and port are included in the new url.
+	#######################################
+	my $typesetStr = (defined $self->{typesetStr})?$self->{typesetStr}:'';
+	
+	#### add the host name to the string
+	my $hostName = $r->hostname;
+	my $port     = $r->get_server_port;
+	$hostName    .= ":$port";
+	$typesetStr =~ s|src="|src="http://$hostName|;
+	
+	my $typeset2Str = $typesetStr;
+	$typeset2Str =~ s/</&lt;/g;
+	$typeset2Str =~ s/>/&gt;/g;
+	
+	my $sourceHref = $typesetStr;
+	$sourceHref =~ /"([^"]*)"/;
+	$sourceHref = $1;
+	
+	#######################################
+	# Print the page
+	#######################################
+	return join( "",
+		"Copy the location of this image (or drag and drop) into your editing area:",
+		CGI::br(),
+		$typeset2Str,
+		CGI::br(),
+		$typesetStr,
+		CGI::start_form(-method=>'POST', -action=>$r->uri),
+		$self->hidden_authen_fields,
+		CGI::textarea( "eq", $initial_str, 5, 40),
+		CGI::submit('typeset', 'typeset'),
+		CGI::end_form(),
+	);
+}
+
+1;
diff --git a/lib/WeBWorK/ContentGenerator/Feedback.pm b/lib/WeBWorK/ContentGenerator/Feedback.pm
index c4a03dce9e..4c8de75014 100644
--- a/lib/WeBWorK/ContentGenerator/Feedback.pm
+++ b/lib/WeBWorK/ContentGenerator/Feedback.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm,v 1.45 2008/03/13 22:22:23 sh002i 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
@@ -29,9 +29,15 @@ WeBWorK::ContentGenerator::Feedback - Send mail to professors.
 use strict;
 use warnings;
 use Data::Dumper;
-use CGI qw();
+#use CGI qw(-nosticky );
+use WeBWorK::CGI;
 use Mail::Sender;
+use Socket qw/unpack_sockaddr_in inet_ntoa/; # for remote host/port info
 use Text::Wrap qw(wrap);
+use WeBWorK::Utils qw/ decodeAnswers/;
+
+use mod_perl;
+use constant MP2 => ( exists $ENV{MOD_PERL_API_VERSION} and $ENV{MOD_PERL_API_VERSION} >= 2 );
 
 # request paramaters used
 # 
@@ -56,28 +62,12 @@ use Text::Wrap qw(wrap);
 # problem object for current problem (if from Problem)
 # display options (if from Problem)
 
-sub path {
-	my ($self, $args) = @_;
-	
-	my $ce = $self->{ce};
-	my $root = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
-	return $self->pathMacro($args,
-		"Home" => "$root",
-		$courseName => "$root/$courseName",
-		"Feedback" => "",
-	);
-}
-
-sub title {
-	return "Feedback";
-}
-
 sub body {
-	my $self = shift;
-	my $r = $self->{r};
-	my $ce = $self->{ce};
-	my $db = $self->{db};
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my $db = $r->db;
+	my $authz = $r->authz;
 	
 	# get form fields 
 	my $key                = $r->param("key");
@@ -92,6 +82,7 @@ sub body {
 	my $showSolutions      = $r->param("showSolutions");
 	my $from               = $r->param("from");
 	my $feedback           = $r->param("feedback");
+	my $courseID           = $r->urlpath->arg("courseID");
 	
 	my ($user, $set, $problem);
 	$user = $db->getUser($userName) # checked
@@ -108,63 +99,80 @@ sub body {
 			if defined $set and defined $problemNumber && $problemNumber ne "";
 	}
 	
-	# get some network settings
-	my $hostname = $r->hostname();
-	my $port     = $r->get_server_port();
-	my $remoteIdent = $r->get_remote_logname() || "UNKNOWN";
-	my $remoteHost = $r->get_remote_host();
-	
-	# generate context URL
-	my $URL;
+	# generate context URLs
 	my $emailableURL;
 	my $returnURL;
 	if ($user) {
-		$URL = "http://$hostname:$port"
-			. $ce->{webworkURLs}->{root}
-			. "/" . $ce->{courseName}
-			. ($set 
-				? "/".$set->set_id . ($problem ? "/".$problem->problem_id : "")
-				: "")
-			. "/?" 
-			. ($problem 
-				? "&displayMode=$displayMode" 
-				. "&showOldAnswers=$showOldAnswers"
-				. "&showCorrectAnswers=$showCorrectAnswers"
-				. "&showHints=$showHints"
-				. "&showSolutions=$showSolutions" 
-				: "" );
-		$emailableURL = $URL . "&effectiveUser=$userName";
-		$returnURL = $URL . '&'. $self->url_authen_args;
+		my $modulePath;
+		my @args;
+		if ($set) {
+			if ($problem) {
+				$modulePath = $r->urlpath->newFromModule("WeBWorK::ContentGenerator::Problem", $r,
+					courseID => $r->urlpath->arg("courseID"),
+					setID => $set->set_id,
+					problemID => $problem->problem_id,
+				);
+				@args = qw/displayMode showOldAnswers showCorrectAnswers showHints showSolutions/;
+			} else {
+				$modulePath = $r->urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSet", $r,
+					courseID => $r->urlpath->arg("courseID"),
+					setID => $set->set_id,
+				);
+				@args = ();
+			}
+		} else {
+			$modulePath = $r->urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSets", $r,
+				courseID => $r->urlpath->arg("courseID"),
+			);
+			@args = ();
+		}
+		$emailableURL = $self->systemLink($modulePath,
+			authen => 0,
+			params => [ "effectiveUser", @args ],
+			use_abs_url => 1,
+		);
+		$returnURL = $self->systemLink($modulePath,
+			authen => 1,
+			params => [ @args ],
+		);
 	} else {
-		$URL = $emailableURL = "(not available)";
+		$emailableURL = "(not available)";
 		$returnURL = "";
 	}
+	my $homeModulePath = $r->urlpath->newFromModule("WeBWorK::ContentGenerator::Home", $r);
+	my $systemURL = $self->systemLink($homeModulePath, authen=>0, use_abs_url=>1);
+	
+	unless ($authz->hasPermissions($userName, "submit_feedback")) {
+		$self->feedbackNotAllowed($returnURL);
+		return "";
+	}
+	
+	# determine the recipients of the email
+	my @recipients = $self->getFeedbackRecipients($user);
+	
+	unless (@recipients) {
+		$self->noRecipientsAvailable($returnURL);
+		return "";
+	}
 	
 	if (defined $r->param("sendFeedback")) {
 		# get verbosity level
 		my $verbosity = $ce->{mail}->{feedbackVerbosity};
 		
 		# determine the sender of the email
-		my $sender = ($user && $user->email_address
-			? $user->email_address
-			: $from);
-		
-		# determine the recipients of the email
-		my @recipients;
-		if (defined $ce->{mail}->{feedbackRecipients}) {
-			@recipients = @{$ce->{mail}->{feedbackRecipients}};
-		} else {
-			# send to all professors and TAs
-			foreach my $rcptName ($db->listUsers()) {
-				my $rcptPerm = $db->getPermissionLevel($rcptName); # checked
-				next unless $rcptPerm;
-				if ($rcptPerm->permission() == 5 or $rcptPerm->permission() == 10) {
-					my $rcpt = $db->getUser($rcptName); # checked
-					if ($rcpt and $rcpt->email_address) {
-						push @recipients, $rcpt->email_address;
-					}
+		my $sender;
+		if ($user) {
+			if ($user->email_address) {
+				$sender = $user->rfc822_mailbox;
+			} else {
+				if ($user->full_name) {
+					$sender = $user->full_name . " <$from>"
+				} else {
+					$sender = $from;
 				}
 			}
+		} else {
+			$sender = $from;
 		}
 		
 		# sanity checks
@@ -173,56 +181,57 @@ sub body {
 				"No Sender specified.");
 			return "";
 		}
-		unless (@recipients) {
-			$self->feedbackForm($user, $returnURL,
-				"No recipients specified.");
-			return "";
-		}
 		unless ($feedback) {
 			$self->feedbackForm($user, $returnURL,
 				"Message was blank.");
 			return "";
 		}
 		
-		# get some network settings
-		my $hostname = $r->hostname();
-		my $port     = $r->get_server_port();
-		my $remoteIdent = $r->get_remote_logname() || "UNKNOWN";
-		my $remoteHost = $r->get_remote_host();
+		my %subject_map = (
+			'c' => $courseID,
+			'u' => $user    ? $user->user_id       : undef,
+			's' => $set     ? $set->set_id         : undef,
+			'p' => $problem ? $problem->problem_id : undef,
+			'x' => $user    ? $user->section       : undef,
+			'r' => $user    ? $user->recitation    : undef,
+			'%' => '%',
+		);
+		my $chars = join("", keys %subject_map);
+		my $subject = $ce->{mail}{feedbackSubjectFormat}
+			|| "WeBWorK question from %c: %u set %s/prob %p"; # default if not entered
+		$subject =~ s/%([$chars])/defined $subject_map{$1} ? $subject_map{$1} : ""/eg;
 		
-		# generate context URL
-		my $URL;
-		if ($user) {
-			$URL = "http://$hostname:$port"
-				. $ce->{webworkURLs}->{root}
-				. "/" . $ce->{courseName}
-				. ($set 
-					? "/".$set->set_id . ($problem ? "/".$problem->problem_id : "")
-					: "")
-				. "/" . "?effectiveUser=$userName"
-				. ($problem 
-					? "&displayMode=$displayMode" 
-					. "&showOldAnswers=$showOldAnswers"
-					. "&showCorrectAnswers=$showCorrectAnswers"
-					. "&showHints=$showHints"
-					. "&showSolutions=$showSolutions" 
-					: "" );
+		# get info about remote user (stolen from &WeBWorK::Authen::write_log_entry)
+		my ($remote_host, $remote_port);
+		if (MP2) {
+			$remote_host = $r->connection->remote_addr->ip_get || "UNKNOWN";
+			$remote_port = $r->connection->remote_addr->port || "UNKNOWN";
 		} else {
-			$URL = "(not available)";
+			($remote_port, $remote_host) = unpack_sockaddr_in($r->connection->remote_addr);
+			$remote_host = defined $remote_host ? inet_ntoa($remote_host) : "UNKNOWN";
+			$remote_port = "UNKNOWN" unless defined $remote_port;
 		}
+		#my $user_agent = $r->headers_in("User-Agent");
+		
+		my $headers = "X-Remote-Host: $remote_host\n";
+		$headers .= "X-WeBWorK-Module: $module\n" if defined $module;
+		$headers .= "X-WeBWorK-Course: $courseID\n" if defined $courseID;
+		if ($user) {
+			$headers .= "X-WeBWorK-User: ".$user->user_id."\n";
+			$headers .= "X-WeBWorK-Section: ".$user->section."\n";
+			$headers .= "X-WeBWorK-Recitation: ".$user->recitation."\n";
+		}
+		$headers .= "X-WeBWorK-Set: ".$set->set_id."\n" if $set;
+		$headers .= "X-WeBWorK-Problem: ".$problem->problem_id."\n" if $problem;
 		
 		# bring up a mailer
 		my $mailer = Mail::Sender->new({
-			from => $sender,
+			from => $ce->{mail}{smtpSender},
+			fake_from => $sender,
 			to => join(",", @recipients),
-			# *** we might want to have a CE setting for
-			# "additional recipients"
 			smtp    => $ce->{mail}->{smtpServer},
-			subject => "WeBWorK feedback: ".$user->first_name." ".$user->last_name. 
-			                (   ( defined($setName) && defined($problemNumber) ) ?
-			                				 " set$setName/prob$problemNumber" : ""
-			                ),
-			headers => "X-Remote-Host: ".$r->get_remote_host(),
+			subject => $subject,
+			headers => $headers,
 		});
 		unless (ref $mailer) {
 			$self->feedbackForm($user, $returnURL,
@@ -238,11 +247,12 @@ sub body {
 		
 		# print message
 		print $MAIL
-			wrap("", "", "This feedback message was automatically",
-			     "generated by the WeBWorK system at",
-			     "$hostname:$port, in response to a request from",
-			     "$remoteIdent\@$remoteHost."), "\n\n";
-		print $MAIL "Context: $emailableURL\n\n";
+			wrap("", "", "This  message was automatically generated by the WeBWorK",
+				"system at $systemURL, in response to a request from $remote_host:$remote_port."
+			), "\n\n";
+		
+		print $MAIL "Click this link to see the page from which the user sent feedback:\n",
+			"$emailableURL\n\n";
 		
 		if ($feedback) {
 			print $MAIL
@@ -254,58 +264,82 @@ sub body {
 				"***** Data about the problem processor: *****\n\n",
 
 				"Display Mode:         $displayMode\n",
-				"Show Old Answers?     $showOldAnswers\n",
-				"Show Correct Answers? $showCorrectAnswers\n",
-				"Show Hints?           $showHints\n",
-				"Show Solutions?       $showSolutions\n\n",
+				"Show Old Answers:     " . ($showOldAnswers ? "yes" : "no") . "\n",
+				"Show Correct Answers: " . ($showCorrectAnswers ? "yes" : "no") . "\n",
+				"Show Hints:           " . ($showHints ? "yes" : "no") . "\n",
+				"Show Solutions:       " . ($showSolutions ? "yes" : "no") . "\n\n",
 		}
 		if ($user and $verbosity >= 1) {
 			print $MAIL
 				"***** Data about the user: *****\n\n",
-				$user->toString(), "\n\n";
-		
+				#$user->toString(), "\n\n";
+				$self->format_user($user), "\n";
 		}
 		if ($problem and $verbosity >= 1) {
 			print $MAIL
 				"***** Data about the problem: *****\n\n",
-				$problem->toString(), "\n\n";
-		
+				#$problem->toString(), "\n\n";
+				$self->format_userproblem($problem), "\n";
 		}
 		if ($set and $verbosity >= 1) {
 			print $MAIL
-				"***** Data about the problem set: *****\n\n",
-				$set->toString(), "\n\n";
-		
+				"***** Data about the homework set: *****\n\n",
+				#$set->toString(), "\n\n";
+				$self->format_userset($set), "\n";
 		}
 		if ($ce and $verbosity >= 2) {
 			print $MAIL
 				"***** Data about the environment: *****\n\n",
 				Dumper($ce), "\n\n";
-		
 		}
 		
-		# end the message
-		close $MAIL;
+		# Close returns the mailer object on success, a negative value on failure,
+		# zero if mailer was not opened.
+		my $result = $mailer->Close;
 		
-		# print confirmation
-		print CGI::p("Your message was sent successfully.");
-		print CGI::p(CGI::a({-href => $returnURL}, "Return to your work"));
-		print CGI::p( wrap("", "", $feedback) );
+		if (ref $result) {
+			# print confirmation
+			print CGI::p("Your message was sent successfully.");
+			print CGI::p(CGI::a({-href => $returnURL}, "Return to your work"));
+			print CGI::pre(wrap("", "", $feedback));
+		} else {
+			$self->feedbackForm($user, $returnURL,
+				"Failed to send message ($result): $Mail::Sender::Error");
+		}
 	} else {
 		# just print the feedback form, with no message
-		$self->feedbackForm(  $user, $returnURL,"",);
+		$self->feedbackForm($user, $returnURL, "");
 	}
 	
 	return "";
 }
 
-sub feedbackForm($;$$$) {
-	my ($self, $user,$returnURL,  $message, ) = @_;
-	my $r = $self->{r};
+sub feedbackNotAllowed {
+	my ($self, $returnURL) = @_;
+	
+	print CGI::p("You are not allowed to send e-mail.");
+	print CGI::p(CGI::a({-href=>$returnURL}, "Cancel E-Mail")) if $returnURL;
+}
+
+sub noRecipientsAvailable {
+	my ($self, $returnURL) = @_;
+	
+	print CGI::p("No e-mail recipients are listed for this course.");
+	print CGI::p(CGI::a({-href=>$returnURL}, "Cancel E-Mail")) if $returnURL;
+}
+sub title {
+	return "E-mail Instructor";
+}
+sub feedbackForm {
+	my ($self, $user, $returnURL, $message) = @_;
+	my $r = $self->r;
 	
 	print CGI::start_form(-method=>"POST", -action=>$r->uri);
 	print $self->hidden_authen_fields;
-	print $self->hidden_state_fields($r);
+	print $self->hidden_fields(qw(
+		module set problem displayMode showOldAnswers showCorrectAnswers
+		showHints showSolutions
+	));
 	print CGI::p(CGI::b("From:"), " ",
 		($user && $user->email_address
 			? CGI::tt($user->email_address)
@@ -318,22 +352,118 @@ sub feedbackForm($;$$$) {
 		included.");
 	print CGI::p(CGI::i($message)) if $message;
 	print CGI::p(
-		CGI::b("Feedback:"), CGI::br(),
+		CGI::b("E-mail:"), CGI::br(),
 		CGI::textarea("feedback", "", 20, 80),
 	);
-	print CGI::submit("sendFeedback", "Send Feedback");
+	print CGI::submit("sendFeedback", "Send E-mail");
 	print CGI::end_form();
-	print CGI::p(CGI::a({-href=>$returnURL}, "Cancel feedback"));
+	print CGI::p(CGI::a({-href=>$returnURL}, "Cancel E-mail")) if $returnURL;
+}
+
+sub getFeedbackRecipients {
+	my ($self, $user) = @_;
+	my $ce = $self->r->ce;
+	my $db = $self->r->db;
+	my $authz = $self->r->authz;
+	
+	my @recipients;
 	
+	# send to all users with permission to receive_feedback and an email address
+	# DBFIXME iterator?
+	foreach my $rcptName ($db->listUsers()) {
+		if ($authz->hasPermissions($rcptName, "receive_feedback")) {
+			my $rcpt = $db->getUser($rcptName); # checked
+			next if $ce->{feedback_by_section} and defined $user
+				and defined $rcpt->section and defined $user->section
+				and $rcpt->section ne $user->section;
+			if ($rcpt and $rcpt->email_address) {
+				push @recipients, $rcpt->rfc822_mailbox;
+			}
+		}
+	}
+	
+	if (defined $ce->{mail}->{feedbackRecipients}) {
+		push @recipients, @{$ce->{mail}->{feedbackRecipients}};
+	}
+	
+	return @recipients;
 }
 
-sub hidden_state_fields($) {
-	my $self = shift;
-	my $r = $self->{r};
+sub format_user {
+	my ($self, $User) = @_;
+	my $ce = $self->r->ce;
+	
+	my $result = "User ID:    " . $User->user_id . "\n";
+	$result .= "Name:       " . $User->full_name . "\n";
+	$result .= "Email:      " . $User->email_address . "\n";
+	$result .= "Student ID: " . $User->student_id . "\n";
+	
+	my $status_name = $ce->status_abbrev_to_name($User->status);
+	my $status_string = defined $status_name
+		? "$status_name ('" . $User->status . "')"
+		: $User->status . " (unknown status abbreviation)";
+	$result .= "Status:     $status_string\n";
+	
+	$result .= "Section:    " . $User->section . "\n";
+	$result .= "Recitation: " . $User->recitation . "\n";
+	$result .= "Comment:    " . $User->comment . "\n";
+	
+	return $result;
+}
+
+sub format_userset {
+	my ($self, $Set) = @_;
+	my $ce = $self->r->ce;
+	
+	my $result = "Set ID:                    " . $Set->set_id . "\n";
+	$result .= "Set header file:           " . $Set->set_header . "\n";
+	$result .= "Hardcopy header file:      " . $Set->hardcopy_header . "\n";
+	
+	my $tz = $ce->{siteDefaults}{timezone};
+	$result .= "Open date:                 " . $self->formatDateTime($Set->open_date, $tz). "\n";
+	$result .= "Due date:                  " . $self->formatDateTime($Set->due_date, $tz). "\n";
+	$result .= "Answer date:               " . $self->formatDateTime($Set->answer_date, $tz) . "\n";
+	$result .= "Visible:                   " . ($Set->visible ? "yes" : "no") . "\n";
+	$result .= "Assignment type:           " . $Set->assignment_type . "\n";
+	if ($Set->assignment_type =~ /gateway/) {
+		$result .= "Attempts per version:      " . $Set->assignment_type . "\n";
+		$result .= "Time interval:             " . $Set->time_interval . "\n";
+		$result .= "Versions per interval:     " . $Set->versions_per_interval . "\n";
+		$result .= "Version time limit:        " . $Set->version_time_limit . "\n";
+		$result .= "Version creation time:     " . $self->formatDateTime($Set->version_creation_time, $tz) . "\n";
+		$result .= "Problem randorder:         " . $Set->problem_randorder . "\n";
+		$result .= "Version last attempt time: " . $Set->version_last_attempt_time . "\n";
+	}
+	
+	return $result;
+}
+
+sub format_userproblem {
+	my ($self, $Problem) = @_;
+	my $ce = $self->r->ce;
+	
+	my $result = "Problem ID:                   " . $Problem->problem_id . "\n";
+	$result .= "Source file:                  " . $Problem->source_file . "\n";
+	$result .= "Value:                        " . $Problem->value . "\n";
+	$result .= "Max attempts                  " . ($Problem->max_attempts == -1 ? "unlimited" : $Problem->max_attempts) . "\n";
+	$result .= "Random seed:                  " . $Problem->problem_seed . "\n";
+	$result .= "Status:                       " . $Problem->status . "\n";
+	$result .= "Attempted:                    " . ($Problem->attempted ? "yes" : "no") . "\n";
+	
+	my %last_answer = decodeAnswers($Problem->last_answer);
+	if (%last_answer) {
+		$result .= "Last answer:\n";
+		foreach my $key (sort keys %last_answer) {
+			$result .= "\t$key: $last_answer{$key}\n";
+		}
+	} else {
+		$result .= "Last answer:                  none\n";
+	}
+	
+	$result .= "Number of correct attempts:   " . $Problem->num_correct . "\n";
+	$result .= "Number of incorrect attempts: " . $Problem->num_incorrect . "\n";
 	
-	print CGI::hidden("$_", $r->param("$_"))
-		foreach (qw(module set problem displayMode showOldAnswers
-		            showCorrectAnswers showHints showSolutions));
+	return $result;
 }
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm b/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm
index f0fdc6e1f0..67b6ec50f1 100644
--- a/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm
+++ b/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader: webwork-modperl/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm,v 1.5 2003/12/09 01:12:31 sh002i Exp $
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm,v 1.54 2008/07/01 13:12:56 glarose 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
@@ -16,505 +16,429 @@
 
 package WeBWorK::ContentGenerator::GatewayQuiz;
 use base qw(WeBWorK::ContentGenerator);
-use File::Path qw(rmtree);
-use WeBWorK::Form;
-use WeBWorK::PG;
-use WeBWorK::PG::IO;
-use WeBWorK::Utils qw(writeLog encodeAnswers decodeAnswers ref2string makeTempDirectory);
-use WeBWorK::DB::Utils qw(global2user user2global findDefaults);
 
 =head1 NAME
 
-WeBWorK::ContentGenerator::GatewayQuiz - display an index of the problems in a 
-problem set. (modifying this from ProblemSet.pm)
+WeBWorK::ContentGenerator::GatewayQuiz - display a quiz of problems on one page,
+deal with versioning sets
 
 =cut
 
 use strict;
 use warnings;
-use CGI qw();
+#use CGI qw(-nosticky );
+use WeBWorK::CGI;
+use File::Path qw(rmtree);
+use WeBWorK::Form;
+use WeBWorK::PG;
+use WeBWorK::PG::ImageGenerator;
+use WeBWorK::PG::IO;
+use WeBWorK::Utils qw(writeLog writeCourseLog encodeAnswers decodeAnswers
+	ref2string makeTempDirectory path_is_subdir sortByName before after
+	between);  # use the ContentGenerator formatDateTime, not the version in Utils
+use WeBWorK::DB::Utils qw(global2user user2global);
+use WeBWorK::Utils::Tasks qw(fake_set fake_set_version fake_problem);
+use WeBWorK::Debug;
+use WeBWorK::ContentGenerator::Instructor qw(assignSetVersionToUser);
+use PGrandom;
 
-sub pre_header_initialize {
-	my ($self, $setName)     = @_;
-	my $r                    = $self->{r};
-	my $courseEnv            = $self->{ce};
-	my $db                   = $self->{db};
-	my $userName             = $r->param('user');
-	my $effectiveUserName    = $r->param('effectiveUser');
-	my $key					 = $r->param('key');
-	my $user                 = $db->getUser($userName); # checked
-	my $effectiveUser        = $db->getUser($effectiveUserName); # checked
-	
-	die "user ", $r->param("user"), " (real user) not found."
-		unless $user;
-	die " effective user ", $r->param("user"), "  not found. One 'acts as' the effective user. "
-		unless $effectiveUser;
-	
-	# obtain the effective user set, or if that is not yet defined obtain global set
-	my $set                  = $db->getMergedSet($effectiveUserName, $setName);  # checked
-	unless (defined $set) {
-		my $userSetClass     = $courseEnv->{dbLayout}->{set_user}->{record};
-		$set                 = global2user($userSetClass, $db->getGlobalSet($setName)); # checked
-		die "set  $setName  not found."  unless $set ;
-		$set->psvn('000');
-	}
-	
-	# FIXME obtain first problem for recording number of attempts FIXME
-	my $problem = $db->getMergedProblem($effectiveUser->user_id, $setName, 1); # checked
-	die "problem 1 for set $setName and user ".$effectiveUser->user_id." not found." unless $problem;
-	
-	my	$psvn                = $set->psvn();
-	
-	$self->{set}             = $set;
-	$self->{problem}         = $problem;
-	
-		##### get and save permission levels #####
-		
-	my $permissionLevel = $db->getPermissionLevel($userName)->permission(); # checked
-	die "permission level for $userName not found." unless $permissionLevel;
-	
-	$self->{userName}        = $userName;
-	$self->{user}            = $user;
-	$self->{effectiveUser}   = $effectiveUser;
-	$self->{permissionLevel} = $permissionLevel;
-	
-		##### form processing #####
-	
-	# set options from form fields (see comment at top of file for names)
-	my $displayMode        = $r->param("displayMode") || $courseEnv->{pg}->{options}->{displayMode};
-	my $redisplay          = $r->param("redisplay");
-	my $submitAnswers      = $r->param("submitAnswers");
-	my $checkAnswers       = $r->param("checkAnswers");
-	my $previewAnswers     = $r->param("previewAnswers");
-	
+# template method
+sub templateName {
+	return "gateway";
+}
 
-	# coerce form fields into CGI::Vars format
-	my $formFields = { WeBWorK::Form->new_from_paramable($r)->Vars };
-	
-	$self->{displayMode}    = $displayMode;
-	$self->{redisplay}      = $redisplay;
-	$self->{submitAnswers}  = $submitAnswers;
-	$self->{checkAnswers}   = $checkAnswers;
-	$self->{previewAnswers} = $previewAnswers;
-	$self->{formFields}     = $formFields;
 
-	##### permissions #####
-	
-	# are we allowed to view this quiz?
-	$self->{isOpen} = time >= $set->open_date || $permissionLevel > 0;
-	return unless $self->{isOpen};
-	
-	# what does the user want to do?
-	my %want = (
-		showOldAnswers     => $r->param("showOldAnswers")     || $courseEnv->{pg}->{options}->{showOldAnswers},
-		showCorrectAnswers => $r->param("showCorrectAnswers") || $courseEnv->{pg}->{options}->{showCorrectAnswers},
-		showHints          => $r->param("showHints")          || $courseEnv->{pg}->{options}->{showHints},
-		showSolutions      => $r->param("showSolutions")      || $courseEnv->{pg}->{options}->{showSolutions},
-		recordAnswers      => defined($submitAnswers),
-	);
-	
-	# are certain options enforced?
-	my %must = (
-		showOldAnswers     => 0,
-		showCorrectAnswers => 0,
-		showHints          => 0,
-		showSolutions      => 0,
-		recordAnswers      => mustRecordAnswers($permissionLevel),
-		checkAnswers       => 1,
-	);
-	
-	# does the user have permission to use certain options?
-	# QUIZ MAX ATTEMPTS should be set quiz wide FIXME
-	my $QUIZ_MAX_ATTEMPTS=100;
-	my %can = (
-		showOldAnswers     => 1,
-		showCorrectAnswers => canShowCorrectAnswers($permissionLevel, $set->answer_date),
-		showHints          => 1,
-		showSolutions      => canShowSolutions($permissionLevel, $set->answer_date),
-		recordAnswers      => canRecordAnswers($permissionLevel, $set->open_date, $set->due_date,
-			$QUIZ_MAX_ATTEMPTS, $problem->num_correct + $problem->num_incorrect + 1),
-			# attempts=num_correct+num_incorrect+1, as this happens before updating $problem
-		checkAnswers       => canCheckAnswers($permissionLevel, $set->answer_date),
-	);
-	
-	# final values for options
-	my %will;
-	foreach (keys %must) {
-		$will{$_} = $must{$_} || ($can{$_} && $want{$_}) ;
-	}
-# 	warn "\n want";
-# 	WeBWorK::Utils::pretty_print_rh(\%want);
-# 	warn "can";
-# 	WeBWorK::Utils::pretty_print_rh(\%can);
-# 	warn "must";
-# 	WeBWorK::Utils::pretty_print_rh(\%must);
-# 	warn "will";
-# 	WeBWorK::Utils::pretty_print_rh(\%will);
-	
-		##### store fields #####
-	
-	$self->{want} = \%want;
-	$self->{must} = \%must;
-	$self->{can}  = \%can;
-	$self->{will} = \%will;
-	
+################################################################################
+# "can" methods
+################################################################################
 
-# 	
-# 	#### sticky answers #####   FIXME
-# 	
-# 	if (not $submitAnswers and $will{showOldAnswers}) {
-# 		do this only if new answers are NOT being submitted
-# 		my %oldAnswers = decodeAnswers($problem->last_answer);
-# 		$formFields->{$_} = $oldAnswers{$_} foreach keys %oldAnswers;
-# 	}
-
-	 ######### translate problems ############
-	my @problemNumbers = $db->listUserProblems($effectiveUserName, $setName);
-    
-    my @pg_results = ();
-	foreach my $problemNumber (sort {$a<=> $b } @problemNumbers) {
-		my $problem = $db->getMergedProblem($effectiveUserName, $setName, $problemNumber);
-		my $pg = $self->getProblemHTML($self->{effectiveUser}, $setName, $problemNumber);
-		push(@pg_results, $pg);
-	}
-	$self->{ra_pg_results}=\@pg_results;
+# Subroutines to determine if a user "can" perform an action. Each subroutine is
+# called with the following arguments:
+# 
+#     ($self, $User, $PermissionLevel, $EffectiveUser, $Set, $Problem)
 
+# *** The "can" routines are taken from Problem.pm, with small modifications
+# *** to look at number of attempts per version, not per set, and to allow
+# *** showing of correct answers after all attempts at a version are used
 
-}
-sub initialize {
-	my ($self, $setName) = @_;
-	my $courseEnvironment = $self->{ce};
-	my $r = $self->{r};
-	my $db = $self->{db};
-	my $userName = $r->param("user");
-	my $effectiveUserName = $r->param("effectiveUser"); 
-	
-	my $user            = $db->getUser($userName); # checked
-	die "user $user (real user) not found."  unless $user; 
-	my $effectiveUser   = $db->getUser($effectiveUserName); # checked
-	die "effective user $effectiveUser  not found. One 'acts as' the effective user."  unless $effectiveUser;
-	my $set             = $db->getMergedSet($effectiveUserName, $setName); # checked
-	die "set $setName for effectiveUser $effectiveUserName not found." unless $set;
-	
-	my $permissionLevel = $db->getPermissionLevel($userName)->permission(); # checked
-	die "permission level undefined for $userName. " unless $permissionLevel;
-	
-	$self->{userName}        = $userName;
-	$self->{user}            = $user;
-	$self->{effectiveUser}   = $effectiveUser;
-	$self->{set}             = $set;
-	$self->{permissionLevel} = $permissionLevel;
-	
-	##### permissions #####
-	
-	$self->{isOpen} = time >= $set->open_date || $permissionLevel > 0;
+sub can_showOldAnswers {
+	my ($self, $User, $PermissionLevel, $EffectiveUser, $Set, $Problem, $tmplSet ) = @_;
+	my $authz = $self->r->authz;
+# we'd like to use "! $Set->hide_work()", but that hides students' work 
+# as they're working on the set, which isn't quite right.  so use instead:
+	return( before( $Set->due_date() ) || 
+		
+		$authz->hasPermissions($User->user_id,"view_hidden_work") ||
+		( $Set->hide_work() eq 'N' || 
+		  ( $Set->hide_work() eq 'BeforeAnswerDate' && time > $tmplSet->answer_date ) ) );
 }
 
-sub path {
-	my ($self, $setName, $args) = @_;
+# gateway change here: add $submitAnswers as an optional additional argument
+#   to be included if it's defined
+sub can_showCorrectAnswers {
+	my ($self, $User, $PermissionLevel, $EffectiveUser, $Set, $Problem, 
+	    $tmplSet, $submitAnswers) = @_;
+	my $authz = $self->r->authz;
 	
-	my $ce = $self->{ce};
-	my $root = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
-	return $self->pathMacro($args,
-		"Home" => "$root",
-		$courseName => "$root/$courseName",
-		$setName => "",
-	);
+# gateway change here to allow correct answers to be viewed after all attempts
+#   at a version are exhausted as well as if it's after the answer date
+# $addOne allows us to count the current submission
+	my $addOne = defined( $submitAnswers ) ? $submitAnswers : 0;
+	my $maxAttempts = $Set->attempts_per_version() || 0;
+	my $attemptsUsed = $Problem->num_correct + $Problem->num_incorrect + 
+	    $addOne || 0;
+
+# this is complicated by trying to address hiding scores by problem---that
+#    is, if $set->hide_score_by_problem and $set->hide_score are both set, 
+#    then we should allow scores to be shown, but not show the score on 
+#    any individual problem.  to deal with this, we make 
+#    can_showCorrectAnswers give the least restrictive view of hiding, and 
+#    then filter scores for the problems themselves later
+	my $canShowScores = ( $Set->hide_score eq 'N' ||
+			      $Set->hide_score_by_problem eq 'Y' ||
+			      ( $Set->hide_score eq 'BeforeAnswerDate' &&
+				after($tmplSet->answer_date) ) );
+
+	return ( ( ( after( $Set->answer_date ) || 
+		     ( $attemptsUsed >= $maxAttempts && 
+		       $Set->due_date() == $Set->answer_date() ) ) ||
+		   $authz->hasPermissions($User->user_id, 
+				"show_correct_answers_before_answer_date") ) &&
+		 ( $authz->hasPermissions($User->user_id, "view_hidden_work") ||
+		   $canShowScores ) );
 }
 
-sub nav {
-	my ($self, $setName, $args) = @_;
-	
-	my $ce = $self->{ce};
-	my $root = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
-	my @links = ("Problem Sets" , "$root/$courseName", "navUp");
-	my $tail = "";
+sub can_showHints {
+	#my ($self, $User, $PermissionLevel, $EffectiveUser, $Set, $Problem) = @_;
 	
-	return $self->navMacro($args, $tail, @links);
+	return 1;
 }
-	
 
-sub siblings {
-	my ($self, $setName) = @_;
-	return "";
-}
+# gateway change here: add $submitAnswers as an optional additional argument
+#   to be included if it's defined
+sub can_showSolutions {
+	my ($self, $User, $PermissionLevel, $EffectiveUser, $Set, $Problem, 
+	    $tmplSet, $submitAnswers) = @_;
+	my $authz = $self->r->authz;
 
-sub title {
-	my ($self, $setName) = @_;
-	
-	return $setName;
+# this is the same as can_showCorrectAnswers	
+# gateway change here to allow correct answers to be viewed after all attempts
+#   at a version are exhausted as well as if it's after the answer date
+# $addOne allows us to count the current submission
+	my $addOne = defined( $submitAnswers ) ? $submitAnswers : 0;
+	my $attempts_per_version = $Set->attempts_per_version() || 0;
+	my $attemptsUsed = $Problem->num_correct+$Problem->num_incorrect+$addOne || 0;
+
+# this is complicated by trying to address hiding scores by problem---that
+#    is, if $set->hide_score_by_problem and $set->hide_score are both set, 
+#    then we should allow scores to be shown, but not show the score on 
+#    any individual problem.  to deal with this, we make can_showSolutions 
+#    give the least restrictive view of hiding, and then filter scores for 
+#    the problems themselves later
+	my $canShowScores = ( $Set->hide_score eq 'N' ||
+			      $Set->hide_score_by_problem eq 'Y' ||
+			      ( $Set->hide_score eq 'BeforeAnswerDate' &&
+				after($tmplSet->answer_date) ) );
+
+	return ( ( ( after( $Set->answer_date ) || 
+		     ( $attemptsUsed >= $attempts_per_version && 
+		       $Set->due_date() == $Set->answer_date() ) ) ||
+		   $authz->hasPermissions($User->user_id, 
+				"show_correct_answers_before_answer_date") ) &&
+		 ( $authz->hasPermissions($User->user_id, "view_hidden_work") ||
+		   $canShowScores ) );
 }
 
+# gateway change here: add $submitAnswers as an optional additional argument
+#   to be included if it's defined
+# we also allow for a version_last_attempt_time which is the time the set was
+#   submitted; if that's present we use that instead of the current time to 
+#   decide if we can record the answers.  this deals with the time between the 
+#   submission time and the proctor authorization.
+sub can_recordAnswers {
+	my ($self, $User, $PermissionLevel, $EffectiveUser, $Set, $Problem, 
+	    $tmplSet, $submitAnswers) = @_;
+	my $authz = $self->r->authz;
 
+# easy first case: never record answers for undefined sets
+	return 0 if ( $Set->set_id eq "Undefined_Set" );
 
-sub body {
-	my $self			= shift;
-	
-		return CGI::p(CGI::font({-color=>"red"}, "This problem is not available because the problem set that contains it is not yet open."))
-		unless $self->{isOpen};
-	
-	# unpack some useful variables
-	
-	my $r               = $self->{r};
-	my $db              = $self->{db};
-	my $set             = $self->{set};
-	my $problem         = $self->{problem};
-	my $permissionLevel = $self->{permissionLevel};
-	my $submitAnswers   = $self->{submitAnswers};
-	my $checkAnswers    = $self->{checkAnswers};
-	my $previewAnswers  = $self->{previewAnswers};
-	my %want            = %{ $self->{want} };
-	my %can             = %{ $self->{can} };
-	my %must            = %{ $self->{must} };
-	my %will            = %{ $self->{will} };
-
-	# coerce form fields into CGI::Vars format
-	
-	return CGI::p(CGI::font({-color=>"red"}, "This problem set is not available because it is not yet open."))
-		unless ($self->{isOpen});
+	my $timeNow = ( defined($self->{timeNow}) ) ? $self->{timeNow} : time();
+   # get the sag time after the due date in which we'll still grade the test
+	my $grace = $self->{ce}->{gatewayGracePeriod};
 
-	print CGI::h3("This is an experimental gateway quiz format");
-	
-	print "Number of attempts is ". ($problem->num_correct + $problem->num_incorrect + 1);
+	my $submitTime = ( defined($Set->version_last_attempt_time()) &&
+			   $Set->version_last_attempt_time() ) ? 
+			   $Set->version_last_attempt_time() : $timeNow;
 
-	print
-		CGI::startform("POST", $r->uri),
-		$self->hidden_authen_fields;
-	
-	#my $set = $db->getMergedSet($effectiveUserName, $setName);
-	#my @problemNumbers = $db->listUserProblems($effectiveUserName, $setName);
-    my @pg_results = @{ $self->{ra_pg_results} };
-    my $problemNumber = 0;
-	foreach my $pg (@pg_results) {
-		$problemNumber++;
-		print CGI::p("Problem $problemNumber");
-		# FIXME determine when to see correct answers etc.
-		print $self->attemptResults($pg, 1,1,1, 1, 1 ) if $submitAnswers or $checkAnswers;
-		print CGI::p( $pg->{body_text});
-		print "\n\n", CGI::hr(),CGI::hr(),"\n\n";
-	
-		
-	
+	if ($User->user_id ne $EffectiveUser->user_id) {
+		my $recordAsOther = $authz->hasPermissions($User->user_id, "record_answers_when_acting_as_student");
+		my $recordVersionsAsOther = $authz->hasPermissions($User->user_id, "record_set_version_answers_when_acting_as_student");
+
+		if ( $recordAsOther ) {
+			return $recordAsOther;
+		} elsif ( ! $recordVersionsAsOther ) {
+			return $recordVersionsAsOther;
+		}
+		## if we're not allowed to record answers as another user,
+		##    return that permission.  if we're allowed to record
+		##    only set version answers, then we allow that between
+		##    the open and close dates, and so drop out of this
+		##    conditional to the usual one.
+		## it isn't clear if this is the correct behavior, but I
+		##    think it's probably reasonable.
+	}
+
+	if (before($Set->open_date, $submitTime)) {
+		#    warn("case 0\n");
+		return $authz->hasPermissions($User->user_id, "record_answers_before_open_date");
+	} elsif (between($Set->open_date, ($Set->due_date + $grace), $submitTime)) {
+
+# gateway change here; we look at maximum attempts per version, not for the set,
+#   to determine the number of attempts allowed
+# $addOne allows us to count the current submission
+	    my $addOne = ( defined( $submitAnswers ) && $submitAnswers ) ? 
+		1 : 0;
+	    my $attempts_per_version = $Set->attempts_per_version() || 0;
+	    my $attempts_used = $Problem->num_correct+$Problem->num_incorrect+$addOne;
+		if ($attempts_per_version == -1 or $attempts_used < $attempts_per_version) {
+			return $authz->hasPermissions($User->user_id, "record_answers_after_open_date_with_attempts");
+		} else {
+			return $authz->hasPermissions($User->user_id, "record_answers_after_open_date_without_attempts");
+		}
+	} elsif (between(($Set->due_date + $grace), $Set->answer_date, $submitTime)) {
+		return $authz->hasPermissions($User->user_id, "record_answers_after_due_date");
+	} elsif (after($Set->answer_date, $submitTime)) {
+		return $authz->hasPermissions($User->user_id, "record_answers_after_answer_date");
 	}
-	print CGI::p( #FIXME
-			($will{recordAnswers})
-				? CGI::submit(-name=>"submitAnswers",
-					-label=>"Submit Quiz")
-				: "",
-			(not $will{recordAnswers})
-				? CGI::submit(-name=>"checkAnswers",
-					-label=>"Check Answers")
-				: "",
-			CGI::submit(-name=>"previewAnswers",
-				-label=>"Preview Answers"),
-		);	
-#	print CGI::end_table();
-	
-	# feedback form
-	my $ce = $self->{ce};
-	my $root = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
-	my $feedbackURL = "$root/$courseName/feedback/";
-	print
-		CGI::startform("POST", $feedbackURL),
-		$self->hidden_authen_fields,
-		CGI::hidden("module", __PACKAGE__),
-		CGI::hidden("set",    $self->{set}->set_id),
-		CGI::p({-align=>"right"},
-			CGI::submit(-name=>"feedbackForm", -label=>"Send Feedback")
-		),
-		CGI::endform();
-	
-	return "";
 }
 
-sub viewOptions($) {
-	my $self = shift;
-	my $displayMode = $self->{displayMode};
-	my %must = %{ $self->{must} };
-	my %can  = %{ $self->{can}  };
-	my %will = %{ $self->{will} };
-	
-	my $optionLine;
-	$can{showOldAnswers} and $optionLine .= join "",
-		"Show: &nbsp;".CGI::br(),
-		CGI::checkbox(
-			-name    => "showOldAnswers",
-			-checked => $will{showOldAnswers},
-			-label   => "Saved answers",
-		), "&nbsp;&nbsp;".CGI::br();
-	$can{showCorrectAnswers} and $optionLine .= join "",
-		CGI::checkbox(
-			-name    => "showCorrectAnswers",
-			-checked => $will{showCorrectAnswers},
-			-label   => "Correct answers",
-		), "&nbsp;&nbsp;".CGI::br();
-	$can{showHints} and $optionLine .= join "",
-		CGI::checkbox(
-			-name    => "showHints",
-			-checked => $will{showHints},
-			-label   => "Hints",
-		), "&nbsp;&nbsp;".CGI::br();
-	$can{showSolutions} and $optionLine .= join "",
-		CGI::checkbox(
-			-name    => "showSolutions",
-			-checked => $will{showSolutions},
-			-label   => "Solutions",
-		), "&nbsp;&nbsp;".CGI::br();
-	$optionLine and $optionLine .= join "", CGI::br();
+# gateway change here: add $submitAnswers as an optional additional argument
+#   to be included if it's defined
+# we also allow for a version_last_attempt_time which is the time the set was
+#   submitted; if that's present we use that instead of the current time to 
+#   decide if we can check the answers.  this deals with the time between the 
+#   submission time and the proctor authorization.
+sub can_checkAnswers {
+	my ($self, $User, $PermissionLevel, $EffectiveUser, $Set, $Problem,
+	    $tmplSet, $submitAnswers) = @_;
+	my $authz = $self->r->authz;
+
+	my $timeNow = ( defined($self->{timeNow}) ) ? $self->{timeNow} : time();
+   # get the sag time after the due date in which we'll still grade the test
+	my $grace = $self->{ce}->{gatewayGracePeriod};
 	
-	return CGI::div({-style=>"border: thin groove; padding: 1ex; margin: 2ex align: left"},
-			"View&nbsp;equations&nbsp;as:&nbsp;&nbsp;&nbsp;&nbsp;".CGI::br(),
-		CGI::radio_group(
-			-name    => "displayMode",
-			-values  => ['plainText', 'formattedText', 'images'],
-			-default => $displayMode,
-			-linebreak=>'true',
-			-labels  => {
-				plainText     => "plain",
-				formattedText => "formatted",
-				images        => "images",
-			}
-		), CGI::br(),CGI::hr(),
-		$optionLine,
-		CGI::submit(-name=>"redisplay", -label=>"Save Options"),
-	);
-}
-sub options {
-	my $self = shift;
-	return join("",
-		CGI::start_form("POST", $self->{r}->uri),
-		$self->hidden_authen_fields,
-		CGI::hr(), 
-		CGI::start_div({class=>"viewOptions"}),
-		$self->viewOptions(),
-		CGI::end_div(),
-		CGI::end_form()
-	);
+	my $submitTime = ( defined($Set->version_last_attempt_time()) &&
+			   $Set->version_last_attempt_time() ) ? 
+			   $Set->version_last_attempt_time() : $timeNow;
+
+	# this is further complicated by trying to address hiding scores by 
+	#    problem---that is, if $set->hide_score_by_problem and 
+	#    $set->hide_score are both set, then we should allow scores to 
+	#    be shown, but not show the score on any individual problem.  
+	#    to deal with this, we use the least restrictive view of hiding 
+	#    here, and then filter for the problems themselves later
+	my $canShowScores = ( $Set->hide_score eq 'N' ||
+			      $Set->hide_score_by_problem eq 'Y' ||
+			      ( $Set->hide_score eq 'BeforeAnswerDate' &&
+				after($tmplSet->answer_date) ) );
+
+	if (before($Set->open_date, $submitTime)) {
+		return $authz->hasPermissions($User->user_id, "check_answers_before_open_date");
+	} elsif (between($Set->open_date, ($Set->due_date + $grace), $submitTime)) {
+
+# gateway change here; we look at maximum attempts per version, not for the set,
+#   to determine the number of attempts allowed
+# $addOne allows us to count the current submission
+	    my $addOne = (defined( $submitAnswers ) && $submitAnswers) ? 
+		1 : 0;
+	    my $attempts_per_version = $Set->attempts_per_version()||0;
+	    my $attempts_used = $Problem->num_correct+$Problem->num_incorrect+$addOne;
+
+		if ($attempts_per_version == -1 or $attempts_used < $attempts_per_version) {
+			return ( $authz->hasPermissions($User->user_id, "check_answers_after_open_date_with_attempts") &&
+				 ( $authz->hasPermissions($User->user_id, "view_hidden_work") ||
+				   $canShowScores ) );
+		} else {
+			return ( $authz->hasPermissions($User->user_id, "check_answers_after_open_date_without_attempts") && 
+				 ( $authz->hasPermissions($User->user_id, "view_hidden_work") ||
+				   $canShowScores ) );
+		}
+	} elsif (between(($Set->due_date + $grace), $Set->answer_date, $submitTime)) {
+		return ( $authz->hasPermissions($User->user_id, "check_answers_after_due_date")  &&
+			 ( $authz->hasPermissions($User->user_id, "view_hidden_work") ||
+			   $canShowScores ) );
+	} elsif (after($Set->answer_date, $submitTime)) {
+		return ( $authz->hasPermissions($User->user_id, "check_answers_after_answer_date") &&
+			 ( $authz->hasPermissions($User->user_id, "view_hidden_work") ||
+			   $canShowScores ) );
+	}
 }
 
+sub can_showScore {
+	my ($self, $User, $PermissionLevel, $EffectiveUser, $Set, $Problem,
+	    $tmplSet, $submitAnswers) = @_;
+	my $authz = $self->r->authz;
 
+	my $timeNow = ( defined($self->{timeNow}) ) ? $self->{timeNow} : time();
 
-###########################################################################
-# Evaluation utilties
-############################################################################
-sub getProblemHTML {
-	my ($self, $effectiveUser, $setName, $problemNumber, $pgFile) = @_;
+	# address hiding scores by problem
+	my $canShowScores = ( $Set->hide_score eq 'N' ||
+			      $Set->hide_score_by_problem eq 'Y' ||
+			      ( $Set->hide_score eq 'BeforeAnswerDate' &&
+				after($tmplSet->answer_date) ) );
+
+	return( $authz->hasPermissions($User->user_id,"view_hidden_work") ||
+		$canShowScores );
+}
+
+################################################################################
+# output utilities
+################################################################################
+
+# subroutine is modified from that in Problem.pm to produce a different 
+#    table format
+sub attemptResults {
+	my $self = shift;
+	my $pg = shift;
+	my $showAttemptAnswers = shift;
+	my $showCorrectAnswers = shift;
+	my $showAttemptResults = $showAttemptAnswers && shift;
+	my $showSummary = shift;
+	my $showAttemptPreview = shift || 0;
+	
 	my $r = $self->{r};
+	my $setName = $r->urlpath->arg("setID");
 	my $ce = $self->{ce};
-	my $db = $self->{db};
-	my $key =  $r->param('key');
-	# Should we provide a default user ? I think not FIXME
-	# $effectiveUser = $self->{effectiveUser} unless defined($effectiveUser);
+	my $root = $ce->{webworkURLs}->{root};
+	my $courseName = $ce->{courseName};
+	my @links = ("Homework Sets" , "$root/$courseName", "navUp");
+	my $tail = "";
 	
-	my $formFields = { WeBWorK::Form->new_from_paramable($r)->Vars };
+	my $problemResult = $pg->{result}; # the overall result of the problem
+	my @answerNames = @{ $pg->{flags}->{ANSWER_ENTRY_ORDER} };
+	
+	my $showMessages = $showAttemptAnswers && grep { $pg->{answers}->{$_}->{ans_message} } @answerNames;
 
-	my $permissionLevel = $self->{permissionLevel};
-	my $set  = $db->getMergedSet($effectiveUser->user_id, $setName); #checked
-	die "set $setName for effectiveUser ".$effectiveUser->user_id." not found." unless $set;
+  # present in ver 1.10; why is this checked here?
+	#	return CGI::p(CGI::font({-color=>"red"}, "This problem is not available because the homework set that contains it is not yet open."))
+	#	unless $self->{isOpen};
 
-	my $psvn = $set->psvn();
+	my $basename = "equation-" . $self->{set}->psvn. "." . $self->{problem}->problem_id . "-preview";
+
+	# to make grabbing these options easier, we'll pull them out now...
+	my %imagesModeOptions = %{$ce->{pg}->{displayModeOptions}->{images}};
 	
-	# decide what to do about problem number
-	my $problem;
-	if ($problemNumber) {
-		$problem = $db->getMergedProblem($effectiveUser->user_id, $setName, $problemNumber); #checked
-		die "Unable to find  problem $problemNumber in set $setName for user ".$effectiveUser->user_id."." unless $problem;
+	my $imgGen = WeBWorK::PG::ImageGenerator->new(
+		tempDir         => $ce->{webworkDirs}->{tmp},
+		latex	        => $ce->{externalPrograms}->{latex},
+		dvipng          => $ce->{externalPrograms}->{dvipng},
+		useCache        => 1,
+		cacheDir        => $ce->{webworkDirs}->{equationCache},
+		cacheURL        => $ce->{webworkURLs}->{equationCache},
+		cacheDB         => $ce->{webworkFiles}->{equationCacheDB},
+		dvipng_align    => $imagesModeOptions{dvipng_align},
+		dvipng_depth_db => $imagesModeOptions{dvipng_depth_db},
+	);
 
-	} elsif ($pgFile) {
-		$problem = WeBWorK::DB::Record::UserProblem->new(
-			set_id => $set->set_id,
-			problem_id => 0,
-			login_id => $effectiveUser->user_id,
-			source_file => $pgFile,
-			# the rest of Problem's fields are not needed, i think
-		);
-	}
-	# figure out if we're allowed to get solutions and call PG->new accordingly.
-	my $showCorrectAnswers = $self->{will}->{showCorrectAnswers};
-	my $showHints          = $self->{will}->{showHints};
-	my $showSolutions      = $self->{will}->{showSolutions};
-	my $processAnswers     = $self->{will}->{checkAnswers};
+	my %resultsData = ();
+	$resultsData{'Entered'}  = CGI::td({-class=>"label"}, "Your answer parses as:");
+	$resultsData{'Preview'}  = CGI::td({-class=>"label"}, "Your answer previews as:");
+	$resultsData{'Correct'}  = CGI::td({-class=>"label"}, "The correct answer is:");
+	$resultsData{'Results'}  = CGI::td({-class=>"label"}, "Result:");
+	$resultsData{'Messages'} = CGI::td({-class=>"label"}, "Messages:");
 
-	unless ($permissionLevel > 0 or time > $set->answer_date) {
-		$showCorrectAnswers = 0;
-		$showSolutions      = 0;
-	}
-
-	# FIXME WeBWorK::Utils::pretty_print_rh($formFields);
-	my $pg = WeBWorK::PG->new(
-		$ce,
-		$effectiveUser,
-		$key,
-		$set,
-		$problem,
-		$psvn,
-		$formFields, 
-		{ # translation options
-			displayMode     => "images",
-			showHints       => $showHints,
-			showSolutions   => $showSolutions,
-			refreshMath2img => $showHints || $showSolutions,
-			processAnswers  => 1,
-			QUIZ_PREFIX     => 'Q'.sprintf("%04d",$problemNumber).'_',
-		},
-	);
-	
-	if ($pg->{warnings} ne "") {
-		push @{$self->{warnings}}, {
-			set     => $setName,
-			problem => $problemNumber,
-			message => $pg->{warnings},
-		};
+	my %resultsRows = ();
+	foreach ( qw( Entered Preview Correct Results Messages ) ) {
+	    $resultsRows{$_} = "";
 	}
-	
-	if ($pg->{flags}->{error_flag}) {
-		push @{$self->{errors}}, {
-			set     => $setName,
-			problem => $problemNumber,
-			message => $pg->{errors},
-			context => $pg->{body_text},
-		};
-		# if there was an error, body_text contains
-		# the error context, not TeX code
-		$pg->{body_text} = undef;
+
+	my $numCorrect = 0;
+	my $numAns = 0;
+	foreach my $name (@answerNames) {
+		my $answerResult  = $pg->{answers}->{$name};
+		my $studentAnswer = $answerResult->{student_ans}; # original_student_ans
+		my $preview       = ($showAttemptPreview
+		                    	? $self->previewAnswer($answerResult, $imgGen)
+		                    	: "");
+		my $correctAnswer = $answerResult->{correct_ans};
+		my $answerScore   = $answerResult->{score};
+		my $answerMessage = $showMessages ? $answerResult->{ans_message} : "";
+		#FIXME  --Can we be sure that $answerScore is an integer-- could the problem give partial credit?
+		$numCorrect += $answerScore > 0;
+		my $resultString = $answerScore == 1 ? "correct" : "incorrect";
+		
+		# get rid of the goofy prefix on the answer names (supposedly, the format
+		# of the answer names is changeable. this only fixes it for "AnSwEr"
+		#$name =~ s/^AnSwEr//;
+		
+		my $pre = $numAns ? CGI::td("&nbsp;") : "";
+
+		$resultsRows{'Entered'} .= $showAttemptAnswers ? 
+		    CGI::Tr( $pre . $resultsData{'Entered'} . 
+			     CGI::td({-class=>"output"}, $self->nbsp($studentAnswer))) : "";
+		$resultsData{'Entered'} = '';
+		$resultsRows{'Preview'} .= $showAttemptPreview ? 
+		    CGI::Tr( $pre . $resultsData{'Preview'} . 
+			     CGI::td({-class=>"output"}, $self->nbsp($preview)) ) : "";
+		$resultsData{'Preview'} = '';
+		$resultsRows{'Correct'} .= $showCorrectAnswers ? 
+		    CGI::Tr( $pre . $resultsData{'Correct'} . 
+			     CGI::td({-class=>"output"}, $self->nbsp($correctAnswer)) ) : "";
+		$resultsData{'Correct'} = '';
+		$resultsRows{'Results'} .= $showAttemptResults ? 
+		    CGI::Tr( $pre . $resultsData{'Results'} . 
+			     CGI::td({-class=>"output"}, $self->nbsp($resultString)) )  : "";
+		$resultsData{'Results'} = '';
+		$resultsRows{'Messages'} .= $showMessages ? 
+		    CGI::Tr( $pre . $resultsData{'Messages'} . 
+			     CGI::td({-class=>"output"}, $self->nbsp($answerMessage)) ) : "";
+
+		$numAns++;
 	}
 	
-	#return '<br>hi FIXME'."effective User $effectiveUser, setName $setName, probNum $problemNumber, file: $pgFile".
-	return    $pg;
-}
-##### output utilities #####
-sub problemListRow($$$) {
-	my $self = shift;
-	my $set = shift;
-	my $problem = shift;
+	# render equation images
+	$imgGen->render(refresh => 1);
 	
-	my $name = $problem->problem_id;
-	my $interactiveURL = "$name/?" . $self->url_authen_args;
-	my $interactive = CGI::a({-href=>$interactiveURL}, "Problem $name");
-	my $attempts = $problem->num_correct + $problem->num_incorrect;
-	my $remaining = $problem->max_attempts < 0
-		? "unlimited"
-		: $problem->max_attempts - $attempts;
-	my $status = sprintf("%.0f%%", $problem->status * 100); # round to whole number
+#	my $numIncorrectNoun = scalar @answerNames == 1 ? "question" : "questions";
+	my $scorePercent = sprintf("%.0f%%", $problemResult->{score} * 100);
+#   FIXME  -- I left the old code in in case we have to back out.
+#	my $summary = "On this attempt, you answered $numCorrect out of "
+#		. scalar @answerNames . " $numIncorrectNoun correct, for a score of $scorePercent.";
+
+	my $summary = ""; 
+	if (scalar @answerNames == 1) {
+			if ($numCorrect == scalar @answerNames) {
+				$summary .= CGI::div({class=>"gwCorrect"},"This answer is correct.");
+			 } else {
+			 	 $summary .= CGI::div({class=>"gwIncorrect"},"This answer is NOT correct.");
+			 }
+	} else {
+			if ($numCorrect == scalar @answerNames) {
+				$summary .= CGI::div({class=>"gwCorrect"},"All of these answers are correct.");
+			 } else {
+			 	 $summary .= CGI::div({class=>"gwIncorrect"},"At least one of these answers is NOT correct.");
+			 }
+	}
 	
-	return CGI::Tr(CGI::td({-nowrap=>1}, [
-		$interactive,
-		$attempts,
-		$remaining,
-		$status,
-	]));
+	return
+#	    CGI::table({-class=>"attemptResults"}, $resultsRows{'Entered'}, 
+	    CGI::table({-class=>"gwAttemptResults"}, $resultsRows{'Entered'}, 
+		       $resultsRows{'Preview'}, $resultsRows{'Correct'}, 
+		       $resultsRows{'Results'}, $resultsRows{'Messages'}) .
+	    ($showSummary ? CGI::p({class=>'attemptResultsSummary'},$summary) : "");
+#		CGI::table({-class=>"attemptResults"}, CGI::Tr(\@tableRows))
+#		. ($showSummary ? CGI::p({class=>'emphasis'},$summary) : "");
 }
-sub nbsp {
-	my $str = shift;
-	($str) ? $str : '&nbsp;';  # returns non-breaking space for empty strings
-}
-sub previewAnswer($$) {
+
+# *BeginPPM* ###################################################################
+# this code taken from Problem.pm; excerpted section ends at *EndPPM*
+# modifications are flagged with comments *GW*
+
+sub previewAnswer {
 	my ($self, $answerResult, $imgGen) = @_;
-	my $ce            = $self->{ce};
-	my $effectiveUser = $self->{effectiveUser};
+	my $ce            = $self->r->ce;
+	my $EffectiveUser = $self->{effectiveUser};
 	my $set           = $self->{set};
 	my $problem       = $self->{problem};
 	my $displayMode   = $self->{displayMode};
@@ -540,151 +464,1898 @@ sub previewAnswer($$) {
 		my $result = `$tthCommand`;
 		if ($?) {
 			return "<b>[tth failed: $? $@]</b>";
+		} else {
+			return $result;
 		}
-		return $result;
 	} elsif ($displayMode eq "images") {
-		## how are we going to name this?
-		#my $targetPathCommon = "/m2i/"
-		#	. $effectiveUser->user_id . "."
-		#	. $set->set_id . "."
-		#	. $problem->problem_id . "."
-		#	. $answerResult->{ans_name} . ".png";
-		#
-		## figure out where to put things
-		#my $wd = makeTempDirectory($ce->{courseDirs}->{html_temp}, "webwork-dvipng");
-		#my $latex = $ce->{externalPrograms}->{latex};
-		#my $dvipng = $ce->{externalPrograms}->{dvipng};
-		#my $targetPath = $ce->{courseDirs}->{html_temp} . $targetPathCommon;
-		#		# should use surePathToTmpFile, but we have to
-		#		# isolate it from the problem enivronment first
-		#my $targetURL = $ce->{courseURLs}->{html_temp} . $targetPathCommon;
-		#
-		## call dvipng to generate a preview
-		#dvipng($wd, $latex, $dvipng, $tex, $targetPath);
-		#rmtree($wd, 0, 0);
-		#if (-e $targetPath) {
-		#	return "<img src=\"$targetURL\" alt=\"$tex\" />";
-		#} else {
-		#	return "<b>[math2img failed]</b>";
-		#}
-		$imgGen->add($answerResult->{preview_latex_string});
-		
+		$imgGen->add($tex);
+	} elsif ($displayMode eq "MathJax") {
+		return '<span class="MathJax_Preview">[math]</span><script type="math/tex; mode=display">'.$tex.'</script>';
+	} elsif ($displayMode eq "jsMath") {
+		$tex =~ s/&/&amp;/g; $tex =~ s/</&lt;/g; $tex =~ s/>/&gt;/g;
+		return '<SPAN CLASS="math">\\displaystyle{'.$tex.'}</SPAN>';
 	}
 }
 
+# *EndPPM ######################################################################
 
-sub attemptResults($$$$$$) {
-	my $self = shift;
-	my $pg = shift;
-	my $showAttemptAnswers = shift;
-	my $showCorrectAnswers = shift;
-	my $showAttemptResults = $showAttemptAnswers && shift;
-	my $showSummary = shift;
-	my $showAttemptPreview = shift || 0;
-	my $ce = $self->{ce};
-	my $problemResult = $pg->{result}; # the overall result of the problem
-	my @answerNames = @{ $pg->{flags}->{ANSWER_ENTRY_ORDER} };
-	
-	my $showMessages = $showAttemptAnswers && grep { $pg->{answers}->{$_}->{ans_message} } @answerNames;
-	
-	my $basename = "equation-" . $self->{set}->psvn. "." . $self->{problem}->problem_id . "-preview";
-	my $imgGen = WeBWorK::PG::ImageGenerator->new(
-		tempDir  => $ce->{webworkDirs}->{tmp},
-		latex	 => $ce->{externalPrograms}->{latex},
-		dvipng   => $ce->{externalPrograms}->{dvipng},
-		useCache => 1,
-		cacheDir => $ce->{webworkDirs}->{equationCache},
-		cacheURL => $ce->{webworkURLs}->{equationCache},
-		cacheDB  => $ce->{webworkFiles}->{equationCacheDB},
-	);
-	
-	my $header;
-	$header .= $showAttemptAnswers ? CGI::th("Entered")  : "";
-	$header .= $showAttemptPreview ? CGI::th("Answer Preview")  : "";
-	$header .= $showCorrectAnswers ? CGI::th("Correct")  : "";
-	$header .= $showAttemptResults ? CGI::th("Result")   : "";
-	$header .= $showMessages       ? CGI::th("messages") : "";
-	my @tableRows = ( $header );
-	my $numCorrect;
-	foreach my $name (@answerNames) {
-		my $answerResult  = $pg->{answers}->{$name};
-		
-		my $studentAnswer = $answerResult->{student_ans}; # original_student_ans
-		
-		my $preview       = ($showAttemptPreview
-		                    	? $self->previewAnswer($answerResult,$imgGen)
-					: "");
-		my $correctAnswer = $answerResult->{correct_ans};
-		my $answerScore   = $answerResult->{score};
-		my $answerMessage = $showMessages ? $answerResult->{ans_message} : "";
-		
-		$numCorrect += $answerScore > 0;
-		my $resultString = $answerScore ? "correct" : "incorrect";
-		
-	
-		my $row = ''; 
-		$row .= $showAttemptAnswers ? CGI::td(nbsp($studentAnswer)) : "";
-		$row .= $showAttemptPreview ? CGI::td(nbsp($preview))       : "";
-		$row .= $showCorrectAnswers ? CGI::td(nbsp($correctAnswer)) : "";
-		$row .= $showAttemptResults ? CGI::td(nbsp($resultString))  : "";
-		$row .= $answerMessage      ? CGI::td(nbsp($answerMessage)) : "";
-		push @tableRows, $row;
-	}
-	
-	# render equation images
-	$imgGen->render(refresh => 1);
+################################################################################
+# Template escape implementations
+################################################################################
 
-	my $numIncorrectNoun = scalar @answerNames == 1 ? "question" : "questions";
-	my $scorePercent = sprintf("%.0f%%", $problemResult->{score} * 100);
-	my $summary = "On this attempt, you answered $numCorrect out of "
-		. scalar @answerNames . " $numIncorrectNoun correct, for a score of $scorePercent.";
-	return CGI::table({-class=>"attemptResults"}, CGI::Tr(\@tableRows)) . ($showSummary ? CGI::p($summary) : "");
-}
+# FIXME need to make $Set and $set be used consistently
 
-##### logging subroutine ####
+sub pre_header_initialize {
+	my ($self)     = @_;
+
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my $db = $r->db;
+	my $authz = $r->authz;
+	my $urlpath = $r->urlpath;
+
+	my $setName = $urlpath->arg("setID");
+	my $userName = $r->param('user');
+	my $effectiveUserName = $r->param('effectiveUser');
+	my $key = $r->param('key');
+
+	# should we allow a new version to be created when
+	#    acting as a user?
+	my $verCreateOK = ( defined( $r->param('createnew_ok') ) ) ?
+		$r->param('createnew_ok') : 0;
+
+	# user checks
+	my $User = $db->getUser($userName);
+	die "record for user $userName (real user) does not exist." 
+		unless defined $User;
+	my $EffectiveUser = $db->getUser($effectiveUserName);
+	die "record for user $effectiveUserName (effective user) does " .
+		"not exist." unless defined $EffectiveUser;
+
+	my $PermissionLevel = $db->getPermissionLevel($userName);
+	die "permission level record for $userName does not exist (but the " .
+		"user does? odd...)" unless defined($PermissionLevel);
+	my $permissionLevel = $PermissionLevel->permission;
+
+# we could be coming in with $setName = the versioned or nonversioned set
+# deal with that first
+	my $requestedVersion = ( $setName =~ /,v(\d+)$/ ) ? $1 : 0;
+	$setName =~ s/,v\d+$//;
+# note that if we're already working with a version we want to be sure to stick
+# with that version.  we do this after we've validated that the user is
+# assigned the set, below
+
+###################################
+# gateway set and problem collection
+###################################
+
+# we need the template (user) set, the merged set-version, and a 
+#    problem from the set to be able to test whether we're creating a 
+#    new set version.  assemble these
+	my ( $tmplSet, $set, $Problem ) = ( 0, 0, 0 );
+
+# if the set comes in as "Undefined_Set", then we're trying/editing a 
+#    single problem in a set, and so create a fake set with which to work
+#    if the user has the authorization to do that.
+	if ( $setName eq "Undefined_Set" ) {
+
+		# make sure these are defined
+		$requestedVersion = 1;
+		$self->{assignment_type} = 'gateway';
+
+		if ( ! $authz->hasPermissions($userName,
+					      "modify_problem_sets") ) {
+			$self->{invalidSet} = "You do not have the " .
+				"authorization level required to view/" .
+				"edit undefined sets.";
+
+			# define these so that we can drop through
+			#    to report the error in body()
+			$tmplSet = fake_set( $db );
+			$set     = fake_set_version( $db );
+			$Problem = fake_problem( $db );
+		} else {
+	# in this case we're creating a fake set from the input, so
+	#    the input must include a source file.
+			if ( ! $r->param("sourceFilePath") ) {
+				$self->{invalidSet} = "An Undefined_Set " .
+					"was requested, but no source " .
+					"file for the contained problem " .
+					"was provided.";
+
+				# define these so that we can drop through
+				#    to report the error in body()
+				$tmplSet = fake_set( $db );
+				$set     = fake_set_version( $db );
+				$Problem = fake_problem( $db );
+
+			} else {
+				my $sourceFPath = $r->param("sourceFilePath");
+				die("sourceFilePath is unsafe!") unless
+					path_is_subdir($sourceFPath,
+						$ce->{courseDirs}->{templates},
+						1);
+
+				$tmplSet = fake_set( $db );
+				$set     = fake_set_version( $db );
+				$Problem = fake_problem( $db );
+
+				$tmplSet->assignment_type( "gateway" );
+				$tmplSet->attempts_per_version( 0 );
+				$tmplSet->time_interval( 0 );
+				$tmplSet->versions_per_interval(1);
+				$tmplSet->version_time_limit( 0 );
+				$tmplSet->version_creation_time( time() );
+				$tmplSet->problem_randorder( 0 );
+				$tmplSet->problems_per_page( 1 );
+				$tmplSet->hide_score('N');
+				$tmplSet->hide_score_by_problem('N');
+				$tmplSet->hide_work('N');
+				$tmplSet->time_limit_cap('0');
+				$tmplSet->restrict_ip('No');
+
+				$set->assignment_type( "gateway" );
+				$set->time_interval( 0 );
+				$set->versions_per_interval(1);
+				$set->version_time_limit( 0 );
+				$set->version_creation_time( time() );
+				$set->time_limit_cap('0');
+
+				$Problem->problem_id(1);
+				$Problem->source_file($sourceFPath);
+				$Problem->user_id($effectiveUserName);
+				$Problem->value(1);
+				$Problem->problem_seed( $r->param("problemSeed") ) if ( $r->param("problemSeed") );
+			}
+		}
+	} else {
+
+# get template set: the non-versioned set that's assigned to the user
+#    if this fails/failed in authz->checkSet, then $self->{invalidSet} is
+#    set
+		$tmplSet = $db->getMergedSet( $effectiveUserName, $setName );
+
+	# now we know that we're in a gateway test, save the assignment test 
+	#    for the processing of proctor keys for graded proctored tests; 
+	#    if we failed to get the set from the database, we store a fake 
+	#    value here to be able to continue
+		$self->{'assignment_type'} = $tmplSet->assignment_type() ||
+			'gateway';
+
+	# next, get the latest (current) version of the set if we don't have a 
+	#     requested version number
+		my @allVersionIds = $db->listSetVersions($effectiveUserName,
+							 $setName);
+		my $latestVersion = (@allVersionIds ? $allVersionIds[-1] : 0);
+
+	# double check that any requested version makes sense
+		$requestedVersion = $latestVersion 
+		  if ( $requestedVersion !~ /^\d+$/ ||
+		       $requestedVersion > $latestVersion ||
+		       $requestedVersion < 0 );
+
+		die("No requested version when returning to problem?!") 
+			if ( ( $r->param("previewAnswers") ||
+			       $r->param("checkAnswers") ||
+			       $r->param("submitAnswers") ||
+			       $r->param("newPage") ) && ! $requestedVersion );
+
+	# to test for a proctored test, we need the set version, not the 
+	#    template, to allow a finished proctored test to be checked as an 
+	#    unproctored test.  so we get the versioned set here
+		if ( $requestedVersion ) {
+	# if a specific set version was requested, it was stored in the $authz
+	#    object when we did the set check
+			$set = $db->getMergedSetVersion($effectiveUserName,
+							$setName,
+							$requestedVersion);
+		} elsif ( $latestVersion ) {
+	# otherwise, if there's a current version, which we take to be the 
+	#    latest version taken, we use that
+			$set = $db->getMergedSetVersion($effectiveUserName,
+							$setName,
+							$latestVersion);
+		} else {
+	# and if neither of those work, get a dummy set so that we have 
+	#    something to work with
+			my $userSetClass = $ce->{dbLayout}->{set_version}->{record};
+# FIXME RETURN TO: should this be global2version?
+			$set = global2user($userSetClass, 
+					   $db->getGlobalSet($setName));
+			die "set  $setName  not found."  unless $set;
+			$set->user_id($effectiveUserName);
+			$set->psvn('000');
+			$set->set_id("$setName");  # redundant?
+			$set->version_id(0);
+		}
+	}
+	my $setVersionNumber = ($set) ? $set->version_id() : 0;
+
+	#################################
+	# assemble gateway parameters
+	#################################
+
+	# we get the open/close dates for the gateway from the template set.
+	#    note $isOpen/Closed give the open/close dates for the gateway
+	#    as a whole (that is, the merged user|global set).  because the
+	#    set could be bad (if $self->{invalidSet}), we check ->open_date
+	#    before actually testing the date
+	my $isOpen = $tmplSet && $tmplSet->open_date && 
+		( after($tmplSet->open_date()) || 
+		  $authz->hasPermissions($userName, "view_unopened_sets") );
+
+	# FIXME for $isClosed, "record_answers_after_due_date" isn't quite
+	#    the right description, but it seems reasonable
+	my $isClosed = $tmplSet && $tmplSet->due_date &&
+		( after($tmplSet->due_date()) &&
+		  ! $authz->hasPermissions($userName, "record_answers_after_due_date") );
+
+	# to determine if we need a new version, we need to know whether this 
+	#    version exceeds the number of attempts per version.  (among other
+	#    things,) the number of attempts is a property of the problem, so 
+	#    get a problem to check that.  note that for a gateway/quiz all 
+	#    problems will have the same number of attempts.  This means that 
+	#    if the set doesn't have any problems we're up a creek, so check 
+	#    for that here and bail if it's the case
+	my @setPNum = $setName eq "Undefined_Set" ? ( 1 ) :
+		$db->listUserProblems($EffectiveUser->user_id, $setName);
+	die("Set $setName contains no problems.") if ( ! @setPNum );
+
+	# if we assigned a fake problem above, $Problem is already defined.
+	#    otherwise, we get the Problem, or define it to be undefined if
+	#    the set hasn't been versioned to the user yet--this gets fixed
+	#    when we assign the setVersion
+	if ( ! $Problem ) {
+		$Problem = $setVersionNumber ?
+			$db->getMergedProblemVersion($EffectiveUser->user_id,
+				$setName, $setVersionNumber, $setPNum[0]) :
+				undef;
+	}
+
+	# note that having $maxAttemptsPerVersion set to an infinite/0 value is
+	#    nonsensical; if we did that, why have versions? (might want to do it for one individual?)
+	my $maxAttemptsPerVersion = $tmplSet->attempts_per_version() || 0;
+	my $timeInterval          = $tmplSet->time_interval() || 0;
+	my $versionsPerInterval   = $tmplSet->versions_per_interval() || 0;
+	my $timeLimit             = $tmplSet->version_time_limit() || 0;
+
+	# what happens if someone didn't set one of these?  I think this can
+	# happen if we're handed a malformed set, where the values in the
+	# database are null.
+	$timeInterval = 0 if (! defined($timeInterval) || $timeInterval eq '');
+	$versionsPerInterval = 0 if (! defined($versionsPerInterval) ||
+				     $versionsPerInterval eq '');
+
+	# every problem in the set must have the same submission characteristics
+	my $currentNumAttempts    = ( defined($Problem) && 
+				      $Problem->num_correct() ne '' ) ? 
+				      $Problem->num_correct() +
+				      $Problem->num_incorrect() : 0;
+
+	# $maxAttempts turns into the maximum number of versions we can create;
+	#    if $Problem isn't defined, we can't have made any attempts, so it
+	#    doesn't matter
+	my $maxAttempts           = ( defined($Problem) && 
+				      defined($Problem->max_attempts()) &&
+				      $Problem->max_attempts() ) ? 
+				      $Problem->max_attempts() : -1;
+
+	# finding the number of versions per time interval is a little harder.
+	#    we interpret the time interval as a rolling interval: that is,
+	#    if we allow two sets per day, that's two sets in any 24 hour
+	#    period.  this is probably not what we really want, but it's
+	#    more extensible to a limitation like "one version per hour",
+	#    and we can set it to two sets per 12 hours for most "2ce daily"
+	#    type applications
+	my $timeNow = time();
+	my $grace = $ce->{gatewayGracePeriod};
+
+	my $currentNumVersions = 0;  # this is the number of versions in the
+	                             #    time interval
+	my $totalNumVersions = 0;
+
+	# we don't need to check this if $self->{invalidSet} is already set,
+	#    or if we're working with an Undefined_Set
+	if ( $setVersionNumber && ! $self->{invalidSet} &&
+	     $setName ne "Undefined_Set" ) {
+		my @setVersionIDs = $db->listSetVersions($effectiveUserName, $setName);
+		my @setVersions = $db->getSetVersions(map {[$effectiveUserName, $setName,, $_]} @setVersionIDs);
+		foreach ( @setVersions ) {
+			$totalNumVersions++;
+			$currentNumVersions++
+			    if ( ! $timeInterval ||
+				 $_->version_creation_time() > ($timeNow - $timeInterval) );
+		}
+	}
 
+	####################################
+	# new version creation conditional
+	####################################
+
+	my $versionIsOpen = 0;  # can we do anything to this version?
+
+	# recall $isOpen = timeNow > openDate [for the merged userset] and 
+	#    $isClosed = timeNow > dueDate [for the merged userset]
+	#    again, if $self->{invalidSet} is already set, we don't need to 
+	#    to check this
+	if ( $isOpen && ! $isClosed && ! $self->{invalidSet} ) {
+
+	# if no specific version is requested, we can create a new one if 
+	#    need be
+		if ( ! $requestedVersion ) {
+			if ( ( $maxAttempts == -1 ||
+			       $totalNumVersions < $maxAttempts )
+			     &&
+			     ( $setVersionNumber == 0 ||
+			       (
+				 ( $currentNumAttempts>=$maxAttemptsPerVersion
+				   ||
+				   $timeNow >= $set->due_date + $grace )
+				 &&
+				 ( ! $versionsPerInterval 
+				   ||
+				   $currentNumVersions < $versionsPerInterval )
+				 )
+			     )
+			     &&
+			     ( $effectiveUserName eq $userName ||
+			        ( $authz->hasPermissions($userName, "record_answers_when_acting_as_student") ||
+				  ( $authz->hasPermissions($userName, "create_new_set_version_when_acting_as_student") && $verCreateOK ) ) )
+
+			   ) {
+				# assign set, get the right name, version 
+				#    number, etc., and redefine the $set 
+				#    and $Problem we're working with
+				my $setTmpl = $db->getUserSet($effectiveUserName,$setName);
+				WeBWorK::ContentGenerator::Instructor::assignSetVersionToUser($self, $effectiveUserName, $setTmpl);
+				$setVersionNumber++;
+
+				# get a clean version of the set to save,
+				#    and the merged version to use in the 
+				#    rest of the routine
+				my $cleanSet = $db->getSetVersion(
+					$effectiveUserName, $setName,
+					$setVersionNumber);
+				$set = $db->getMergedSetVersion(
+					$effectiveUserName, $setName,
+					$setVersionNumber );
+
+				$Problem = $db->getMergedProblemVersion(
+					$effectiveUserName, $setName, 
+					$setVersionNumber, 1);
+
+				# because we're creating this on the fly, 
+				#    it should be visible
+				$set->visible(1);
+				# set up creation time, open and due dates
+				my $ansOffset = $set->answer_date() - 
+					$set->due_date();
+				$set->version_creation_time( $timeNow );
+				$set->open_date( $timeNow );
+				# figure out the due date, taking into account
+				#    any time limit cap
+				my $dueTime = 
+				    ( $set->time_limit_cap &&
+				      $timeNow+$timeLimit > $set->due_date ) ?
+				      $set->due_date : $timeNow+$timeLimit;
+				$set->due_date( $dueTime );
+				$set->answer_date($set->due_date + $ansOffset);
+				$set->version_last_attempt_time( 0 );
+
+				# put this new info into the database.  we 
+				#    put back that data which we need for the
+				#    version, and leave blank any information
+				#    that we'd like to inherit from the user
+				#    set or global set.  we set the data which
+				#    determines if a set is open, because we
+				#    don't want the set version to reopen after
+				#    it's complete
+				$cleanSet->version_creation_time( $set->version_creation_time );
+				$cleanSet->open_date( $set->open_date );
+				$cleanSet->due_date( $set->due_date );
+				$cleanSet->answer_date( $set->answer_date );
+				$cleanSet->version_last_attempt_time( $set->version_last_attempt_time );
+				$cleanSet->version_time_limit( $set->version_time_limit );
+				$cleanSet->attempts_per_version( $set->attempts_per_version );
+				$cleanSet->assignment_type( $set->assignment_type );
+				$db->putSetVersion( $cleanSet );
+
+				# we have a new set version, so it's open
+				$versionIsOpen = 1;
+
+				# also reset the number of attempts for this 
+				#    set to zero
+				$currentNumAttempts = 0;
+
+			} elsif ( $maxAttempts != -1 && 
+				  $totalNumVersions > $maxAttempts ) {
+				$self->{invalidSet} = "No new versions of " .
+					"this assignment are available,\n" .
+					"because you have already taken the " .
+					"maximum number\nallowed.";
+
+			} elsif ( $effectiveUserName ne $userName &&
+				  $authz->hasPermissions($userName, "create_new_set_version_when_acting_as_student") ) {
+				$self->{invalidSet} = "User " .
+					"$effectiveUserName is being acted " .
+					"as.  If you continue, you will " .
+					"create a new version of this set " .
+					"for that user, which will count " .
+					"against their allowed maximum " .
+					"number of versions for the current " .
+					"time interval.  IN GENERAL, THIS " .
+					"IS NOT WHAT YOU WANT TO DO.  " .
+					"Please be sure that you want to " .
+					"do this before clicking the \"" .
+					"Create new set version\" link " .
+					"below.  Alternately, PRESS THE " .
+					"\"BACK\" BUTTON and continue.";
+				$self->{invalidVersionCreation} = 1;
+
+			} elsif ( $effectiveUserName ne $userName ) {
+				$self->{invalidSet} = "User " .
+					"$effectiveUserName is being acted " .
+					"as.  When acting as another user, " .
+					"new versions of the set cannot be " .
+					"created.";
+				$self->{invalidVersionCreation} = 2;
+
+			} elsif ($currentNumAttempts < $maxAttemptsPerVersion &&
+				 $timeNow < $set->due_date() + $grace ) {
+				if ( between($set->open_date(), 
+					     $set->due_date() + $grace, 
+					     $timeNow) ) {
+					$versionIsOpen = 1;
+				} else {
+					$versionIsOpen = 0;  # redundant
+					$self->{invalidSet} = "No new " .
+						" versions of this assignment" .
+						" are available,\nbecause the" .
+						" set is not open or its time" .
+						" limit has expired.\n";
+				}
+
+			} elsif ($versionsPerInterval && 
+				 ($currentNumVersions >= $versionsPerInterval)){
+				$self->{invalidSet} = "You have already taken" .
+					" all available versions of this\n" .
+					"test in the current time interval.  " .
+					"You may take the\ntest again after " .
+					"the time interval has expired.";
+
+			}
+
+		} else {
+		# (we're still in the $isOpen && ! $isClosed conditional here)
+		#    if a specific version is requested, then we only check to 
+		#    see if it's open
+			if ( 
+			     ( $currentNumAttempts < $maxAttemptsPerVersion )
+			     && 
+			     ( $effectiveUserName eq $userName ||
+			       $authz->hasPermissions($userName,
+						      "record_set_version_answers_when_acting_as_student") )
+			   ) {
+				if ( between($set->open_date(), 
+					     $set->due_date() + $grace,
+					     $timeNow) ) {
+					$versionIsOpen = 1;
+				} else {
+					$versionIsOpen = 0;  # redundant
+				}
+			}
+		}
+
+	# closed set, with attempt at a new one
+	} elsif ( ! $self->{invalidSet} && ! $requestedVersion ) {
+		$self->{invalidSet} = "This set is closed.  No new set " .
+			"versions may be taken.";
+	}
+
+
+	####################################
+	# save problem and user data
+	####################################
+
+	my $psvn = $set->psvn();
+	$self->{tmplSet} = $tmplSet;
+	$self->{set} = $set;
+	$self->{problem} = $Problem;
+	$self->{requestedVersion} = $requestedVersion;
+
+	$self->{userName} = $userName;
+	$self->{effectiveUserName} = $effectiveUserName;
+	$self->{user} = $User;
+	$self->{effectiveUser}   = $EffectiveUser;
+	$self->{permissionLevel} = $permissionLevel;
+
+	$self->{isOpen} = $isOpen;
+	$self->{isClosed} = $isClosed;
+	$self->{versionIsOpen} = $versionIsOpen;
+
+	$self->{timeNow} = $timeNow;
+
+	####################################
+	# form processing
+	####################################
+
+	# this is the same as the following, but doesn't appear in Problem.pm
+	my $newPage = $r->param("newPage");
+	$self->{newPage} = $newPage;
+
+	# also get the current page, if it's given
+	my $currentPage = $r->param("currentPage") || 1;
+
+	# this is a hack manage previewing a page.  we set previewAnswers to 
+	# yes if either of the following are true:
+	#  1. the "previewAnswers" input is set (the "preview" button was
+	#     clicked), or 
+	#  2. the "previewHack" input is set (a preview link was used)
+	my $prevOr = $r->param('previewAnswers') || $r->param('previewHack');
+	$r->param('previewAnswers', $prevOr) if ( defined( $prevOr ) );
+
+        # [This section lifted from Problem.pm] ##############################
+
+	# set options from form fields (see comment at top of file for names)
+	my $displayMode      = $r->param("displayMode") || 
+		$ce->{pg}->{options}->{displayMode};
+	my $redisplay        = $r->param("redisplay");
+	my $submitAnswers    = $r->param("submitAnswers");
+	my $checkAnswers     = $r->param("checkAnswers");
+	my $previewAnswers   = $r->param("previewAnswers");
+
+	my $formFields = { WeBWorK::Form->new_from_paramable($r)->Vars };
+
+	$self->{displayMode}    = $displayMode;
+	$self->{redisplay}      = $redisplay;
+	$self->{submitAnswers}  = $submitAnswers;
+	$self->{checkAnswers}   = $checkAnswers;
+	$self->{previewAnswers} = $previewAnswers;
+	$self->{formFields}     = $formFields;
 
+	# now that we've set all the necessary variables quit out if the set or 
+	#    problem is invalid
 
-##### permission queries #####
+	return if $self->{invalidSet} || $self->{invalidProblem};
 
-# this stuff should be abstracted out into the permissions system
-# however, the permission system only knows about things in the
-# course environment and the username. hmmm...
+	# [End lifted section] ###############################################
 
-# also, i should fix these so that they have a consistent calling
-# format -- perhaps:
-# 	canPERM($courseEnv, $user, $set, $problem, $permissionLevel)
+	####################################
+	# permissions
+	####################################
 
-sub canShowCorrectAnswers($$) {
-	my ($permissionLevel, $answerDate) = @_;
-	return $permissionLevel > 0 || time > $answerDate;
+	# bail without doing anything if the set isn't yet open for this user
+	if ( ! ( $self->{isOpen} ||
+		 $authz->hasPermissions($userName,"view_unopened_sets") ) ) {
+		$self->{invalidSet} = "This set is not yet open.";
+		return;
+	}
+
+	# what does the user want to do?
+	my %want = 
+	    (showOldAnswers     => $r->param("showOldAnswers") || 
+				   $ce->{pg}->{options}->{showOldAnswers},
+	     showCorrectAnswers => ($r->param("showCorrectAnswers") || 
+ 	                       	   $ce->{pg}->{options}->{showCorrectAnswers}) &&
+                                   ($submitAnswers || $checkAnswers),
+	     showHints          => $r->param("showHints") || 
+		                   $ce->{pg}->{options}->{showHints},
+	     showSolutions      => ($r->param("showSolutions") || 
+		                   $ce->{pg}->{options}->{showSolutions}) &&
+                                   ($submitAnswers || $checkAnswers),
+	     recordAnswers      => $submitAnswers,
+	# we also want to check answers if we were checking answers and are
+	#    switching between pages
+	     checkAnswers       => $checkAnswers,
+	     );
+
+	# are certain options enforced?
+	my %must = 
+	    (showOldAnswers     => 0,
+	     showCorrectAnswers => 0,
+	     showHints          => 0,
+	     showSolutions      => 0,
+	     recordAnswers      => ! $authz->hasPermissions($userName, 
+							    "avoid_recording_answers"),
+	     checkAnswers       => 0,
+	     );
+
+	# does the user have permission to use certain options?
+	my @args = ($User, $PermissionLevel, $EffectiveUser, $set, $Problem, 
+		    $tmplSet);
+	my $sAns = ( $submitAnswers ? 1 : 0 );
+	my %can = 
+	    (showOldAnswers     => $self->can_showOldAnswers(@args), 
+	     showCorrectAnswers => $self->can_showCorrectAnswers(@args, $sAns),
+	     showHints          => $self->can_showHints(@args),
+	     showSolutions      => $self->can_showSolutions(@args, $sAns),
+	     recordAnswers      => $self->can_recordAnswers(@args),
+	     checkAnswers       => $self->can_checkAnswers(@args),
+	     recordAnswersNextTime => $self->can_recordAnswers(@args, $sAns),
+	     checkAnswersNextTime  => $self->can_checkAnswers(@args, $sAns),
+	     showScore          => $self->can_showScore(@args),
+	     );
+
+	# final values for options
+	my %will;
+	foreach (keys %must) {
+		$will{$_} = $can{$_} && ($must{$_} || $want{$_}) ;
+	}
+
+	##### store fields #####
+
+## FIXME: the following is present in Problem.pm, but missing here.  how do we 
+##   deal with it in the context of multiple problems with possible hints?
+## ##### fix hint/solution options #####
+## $can{showHints}     &&= $pg->{flags}->{hintExists}  
+##                     &&= $pg->{flags}->{showHintLimit}<=$pg->{state}->{num_of_incorrect_ans};
+##    $can{showSolutions} &&= $pg->{flags}->{solutionExists};
+	
+	$self->{want} = \%want;
+	$self->{must} = \%must;
+	$self->{can}  = \%can;
+	$self->{will} = \%will;
+
+
+	####################################
+	# set up problem numbering and multipage variables
+	####################################
+
+	my @problemNumbers;
+	if ( $setName eq "Undefined_Set" ) {
+		@problemNumbers = ( 1 );
+	} else {
+		@problemNumbers = $db->listProblemVersions($effectiveUserName,
+							   $setName,
+							   $setVersionNumber);
+	}
+
+	# to speed up processing of long (multi-page) tests, we want to only 
+	#    translate those problems that are being submitted or are currently 
+	#    being displayed.  so work out here which problems are on the 
+	#    current page.
+	my ( $numPages, $pageNumber, $numProbPerPage ) = ( 1, 0, 0 );
+	my ( $startProb, $endProb ) = ( 0, $#problemNumbers );
+
+	# update startProb and endProb for multipage tests
+	if ( defined($set->problems_per_page) && $set->problems_per_page ) {
+		$numProbPerPage = $set->problems_per_page;
+		$pageNumber = ($newPage) ? $newPage : $currentPage;
+
+		$numPages = scalar(@problemNumbers)/$numProbPerPage;
+		$numPages = int($numPages) + 1 if (int($numPages) != $numPages);
+
+		$startProb = ($pageNumber - 1)*$numProbPerPage;
+		$startProb = 0 if ( $startProb < 0 || 
+				    $startProb > $#problemNumbers );
+		$endProb = ($startProb + $numProbPerPage > $#problemNumbers) ? 
+		    $#problemNumbers : $startProb + $numProbPerPage - 1;
+	}
+
+
+	# set up problem list for randomly ordered tests
+	my @probOrder = (0..$#problemNumbers);
+
+	# there's a routine to do this somewhere, I think...
+	if ( $set->problem_randorder ) {
+		my @newOrder = ();
+	# we need to keep the random order the same each time the set is loaded!
+	#    this requires either saving the order in the set definition, or 
+	#    being sure that the random seed that we use is the same each time 
+	#    the same set is called.  we'll do the latter by setting the seed 
+	#    to the psvn of the problem set.  we use a local PGrandom object 
+	#    to avoid mucking with the system seed.
+		my $pgrand = PGrandom->new();
+		$pgrand->srand( $set->psvn );
+		while ( @probOrder ) { 
+			my $i = int($pgrand->rand(scalar(@probOrder)));
+			push( @newOrder, $probOrder[$i] );
+			splice(@probOrder, $i, 1);
+		}
+		@probOrder = @newOrder;
+	}
+	# now $probOrder[i] = the problem number, numbered from zero, that's 
+	#    displayed in the ith position on the test
+
+	# make a list of those problems we're displaying
+	my @probsToDisplay = ();
+	for ( my $i=0; $i<@probOrder; $i++ ) {
+		push(@probsToDisplay, $probOrder[$i]) 
+		    if ( $i >= $startProb && $i <= $endProb );
+	}
+
+	####################################
+	# process problems
+	####################################
+
+	my @problems = ();
+	my @pg_results = ();
+	# pg errors are stored here; initialize it to empty to start
+	$self->{errors} = [ ];
+
+	# process the problems as needed
+	my @mergedProblems;
+	if ( $setName eq "Undefined_Set" ) {
+		@mergedProblems = ( $Problem );
+	} else {
+		@mergedProblems = $db->getAllMergedProblemVersions($effectiveUserName, $setName, $setVersionNumber);
+	}
+
+	foreach my $problemNumber (sort {$a<=>$b } @problemNumbers) {
+
+		# pIndex numbers from zero
+		my $pIndex = $problemNumber - 1;
+		if ( ! defined( $mergedProblems[$pIndex] ) ) {
+			$self->{invalidSet} = "One or more of the problems " .
+				"in this set have not been assigned to you.";
+			return;
+		}
+		my $ProblemN = $mergedProblems[$pIndex];
+
+		# sticky answers are set up here
+		if ( not ( $submitAnswers or $previewAnswers or $checkAnswers or
+			   $newPage ) and $will{showOldAnswers} ) {
+
+			my %oldAnswers = decodeAnswers( $ProblemN->last_answer);
+			$formFields->{$_} = $oldAnswers{$_} foreach ( keys %oldAnswers );
+		}
+		push( @problems, $ProblemN );
+
+		# if we don't have to translate this problem, just save the 
+		#    problem number
+		my $pg = $problemNumber;
+		# this is the actual translation of each problem.  errors are 
+		#    stored in @{$self->{errors}} in each case
+		if ( (grep /^$pIndex$/, @probsToDisplay) || $submitAnswers ) {
+			$pg = $self->getProblemHTML($self->{effectiveUser},
+						    $set, $formFields,
+						    $ProblemN);
+		}
+		push(@pg_results, $pg);
+	}
+	$self->{ra_problems} = \@problems;
+	$self->{ra_pg_results}=\@pg_results;
+
+	$self->{startProb} = $startProb;
+	$self->{endProb} = $endProb;
+	$self->{numPages} = $numPages;
+	$self->{pageNumber} = $pageNumber;
+	$self->{ra_probOrder} = \@probOrder;
 }
 
-sub canShowSolutions($$) {
-	my ($permissionLevel, $answerDate) = @_;
-	return canShowCorrectAnswers($permissionLevel, $answerDate);
+sub path {
+	my ( $self, $args ) = @_;
+
+	my $r = $self->{r};
+	my $setName = $r->urlpath->arg("setID");
+	my $ce = $self->{ce};
+	my $root = $ce->{webworkURLs}->{root};
+	my $courseName = $ce->{courseName};
+ 
+	return $self->pathMacro( $args, "Home" => "$root", 
+				 $courseName => "$root/$courseName",
+				 $setName => "" );
 }
 
-sub canRecordAnswers($$$$$) {
-	my ($permissionLevel, $openDate, $dueDate, $maxAttempts, $attempts) = @_;
-	my $permHigh = $permissionLevel > 0;
-	my $timeOK = time >= $openDate && time <= $dueDate;
-	my $attemptsOK = $maxAttempts == -1 || $attempts <= $maxAttempts;
-	my $recordAnswers = $permHigh || ($timeOK && $attemptsOK);
-	return $recordAnswers;
+sub nav {
+	my ($self, $args) = @_;
+	
+	my $r = $self->{r};
+	my $setName = $r->urlpath->arg("setID");
+	my $ce = $self->{ce};
+	my $root = $ce->{webworkURLs}->{root};
+	my $courseName = $ce->{courseName};
+	my @links = ("Problem Sets" , "$root/$courseName", "navUp");
+	my $tail = "";
+	
+	return $self->navMacro($args, $tail, @links);
 }
 
-sub canCheckAnswers($$) {
-	my ($permissionLevel, $answerDate) = @_;
-	my $permHigh = $permissionLevel > 0;
-	my $timeOK = time >= $answerDate;
-	my $recordAnswers = $permHigh || $timeOK;
-	return $recordAnswers;
+sub options {
+	my ($self) = @_;
+	#warn "doing options in GatewayQuiz";
+	
+	# don't show options if we don't have anything to show
+	return if $self->{invalidSet} or $self->{invalidProblem};
+	return unless $self->{isOpen};
+	
+	my $displayMode = $self->{displayMode};
+	my %can = %{ $self->{can} };
+	
+	my @options_to_show = "displayMode";
+	push @options_to_show, "showOldAnswers" if $can{showOldAnswers};
+	push @options_to_show, "showHints" if $can{showHints};
+	push @options_to_show, "showSolutions" if $can{showSolutions};
+	
+	return $self->optionsMacro(
+		options_to_show => \@options_to_show,
+	);
 }
 
-sub mustRecordAnswers($) {
-	my ($permissionLevel) = @_;
-	return $permissionLevel == 0;
+sub body {
+	my $self = shift();
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my $db = $r->db;
+	my $authz = $r->authz;
+	my $urlpath = $r->urlpath;
+	my $user = $r->param('user');
+	my $effectiveUser = $r->param('effectiveUser');
+
+	# report everything with the same time that we started with
+	my $timeNow = $self->{timeNow};
+	my $grace = $ce->{gatewayGracePeriod};
+
+	#########################################
+	# preliminary error checking and output
+	#########################################
+
+	# if $self->{invalidSet} is set, then we have an error and should
+	#    just bail with the appropriate error message
+
+	if ($self->{invalidSet} || $self->{invalidProblem}) {
+	    # delete any proctor keys that are floating around
+		if ( $self->{'assignment_type'} eq 'proctored_gateway' ) {
+			my $proctorID = $r->param('proctor_user');
+			if ( $proctorID ) {
+				eval{ $db->deleteKey("$effectiveUser,$proctorID"); };
+				eval{ $db->deleteKey("$effectiveUser,$proctorID,g"); };
+			}
+		}
+
+		my $newlink = '';
+		my $usernote = '';
+		if ( defined( $self->{invalidVersionCreation} ) &&
+		     $self->{invalidVersionCreation} == 1 ) {
+			my $gwpage = $urlpath->newFromModule($urlpath->module,$r,
+				courseID=>$urlpath->arg("courseID"),
+				setID=>$urlpath->arg("setID"));
+			my $link = $self->systemLink( $gwpage,
+				params=>{effectiveUser => $effectiveUser,
+					 user => $user,
+					 createnew_ok => 1} );
+			$newlink = CGI::p(CGI::a({href=>$link},
+				"Create new set version."));
+			$usernote = " (acted as by $user)";
+		} elsif ( defined( $self->{invalidVersionCreation} ) &&
+			  $self->{invalidVersionCreation} == 2 ) {
+			$usernote = " (acted as by $user)";
+		}
+
+		return CGI::div({class=>"ResultsWithError"},
+				CGI::p("The selected problem set (" . 
+				       $urlpath->arg("setID") . ") is not " .
+				       "a valid set for $effectiveUser" .
+				       "$usernote:"),
+				CGI::p($self->{invalidSet}),
+				$newlink);
+	}
+
+	my $tmplSet = $self->{tmplSet};
+	my $set = $self->{set};
+	my $Problem = $self->{problem};
+	my $permissionLevel = $self->{permissionLevel};
+	my $submitAnswers = $self->{submitAnswers};
+	my $checkAnswers = $self->{checkAnswers};
+	my $previewAnswers = $self->{previewAnswers};
+	my $newPage = $self->{newPage};
+	my %want = %{ $self->{want} };
+	my %can = %{ $self->{can} };
+	my %must = %{ $self->{must} };
+	my %will = %{ $self->{will} };
+
+	my @problems = @{ $self->{ra_problems} };
+	my @pg_results = @{ $self->{ra_pg_results} };
+	my @pg_errors = @{ $self->{errors} };
+	my $requestedVersion = $self->{requestedVersion};
+
+	my $startProb = $self->{startProb};
+	my $endProb = $self->{endProb};
+	my $numPages = $self->{numPages};
+	my $pageNumber = $self->{pageNumber};
+	my @probOrder = @{$self->{ra_probOrder}};
+
+	my $setName  = $set->set_id;
+	my $versionNumber = $set->version_id;
+	my $setVName = "$setName,v$versionNumber";
+	my $numProbPerPage = $set->problems_per_page;
+
+	# translation errors -- we use the same output routine as Problem.pm, 
+	#    but play around to allow for errors on multiple translations 
+	#    because we have an array of problems to deal with.
+	if ( @pg_errors ) {
+		my $errorNum = 1;
+		my ( $message, $context ) = ( '', '' );
+		foreach ( @pg_errors ) {
+
+			$message .= "$errorNum. " if ( @pg_errors > 1 );
+			$message .= $_->{message} . CGI::br() . "\n";
+
+			$context .= CGI::p((@pg_errors > 1? "$errorNum.": '') . 
+					   $_->{context} ) . "\n\n" . 
+					   CGI::hr() . "\n\n";
+		}
+		return $self->errorOutput( $message, $context );
+	}
+
+	####################################
+	# answer processing
+	####################################
+
+	debug("begin answer processing"); 
+
+	my @scoreRecordedMessage = ('') x scalar(@problems);
+
+	####################################
+	# save results to database as appropriate
+	####################################
+
+	if ( $submitAnswers || ( ($previewAnswers || $newPage) &&
+				 $can{recordAnswers} ) ) {
+		# if we're submitting answers, we have to save the problems
+		#    to the database.
+		# if we're previewing or switching pages and can still
+		#    record answers, we save the last answer for future 
+		#    reference
+
+		# first, if we're submitting answers for a proctored exam, 
+		#    we want to delete the proctor keys that authorized 
+		#    that grading, so that it isn't possible to just log 
+		#    in and take another proctored test without getting 
+		#    reauthorized
+		if ( $submitAnswers && 
+		     $self->{'assignment_type'} eq 'proctored_gateway' ) {
+			my $proctorID = $r->param('proctor_user');
+
+			# if we don't have attempts left, delete all
+			#    proctor keys for this user
+			if ( $set->attempts_per_version - 1 -
+			     $Problem->num_correct - $Problem->num_incorrect 
+			     <= 0 ) {	
+				eval{ $db->deleteAllProctorKeys( $effectiveUser ); };
+			} else {
+				# otherwise, delete only the grading key
+				eval{ $db->deleteKey("$effectiveUser,$proctorID,g"); };
+				# in this case we may have a past, login, 
+				#    proctor key that we can keep so that 
+				#    we don't have to get another login to
+				#    continue working the test
+				if ( $r->param("past_proctor_user") &&
+				     $r->param("past_proctor_key") ) {
+					$r->param("proctor_user", $r->param("past_proctor_user"));
+					$r->param("proctor_key", $r->param("past_proctor_key"));
+				}
+			}
+			# this is unsubtle, but we'd rather not have bogus 
+			#    keys sitting around
+			if ( $@ ) {
+				die("ERROR RESETTING PROCTOR GRADING KEY(S): $@\n");
+			}
+
+		}
+
+		my @pureProblems = $db->getAllProblemVersions($effectiveUser,
+							      $setName,
+							      $versionNumber);
+		foreach my $i ( 0 .. $#problems ) {  # process each problem
+			# this code is essentially that from Problem.pm
+			my $pureProblem = $pureProblems[$i];
+
+			# store answers in problem for sticky answers later
+			my %answersToStore;
+
+			# we have to be a little careful about getting the
+			#    answers that we're saving, because we don't have
+			#    a pg_results object for all problems if we're not 
+			#    submitting
+			my %answerHash = ();
+			my @answer_order = ();
+			if ( ref( $pg_results[$i] ) ) {
+				%answerHash = %{$pg_results[$i]->{answers}};
+				$answersToStore{$_} = $self->{formFields}->{$_} 
+					foreach (keys %answerHash);
+				# check for extra answers that slipped 
+				#    by---e.g. for matrices, and get them 
+				#    from the original input form
+				my @extra_answer_names = 
+				    @{ $pg_results[$i]->{flags}->{KEPT_EXTRA_ANSWERS} };
+				$answersToStore{$_} = 
+				    $self->{formFields}->{$_} foreach (@extra_answer_names);
+				@answer_order = 
+				    ( @{$pg_results[$i]->{flags}->{ANSWER_ENTRY_ORDER}}, 
+				      @extra_answer_names );
+			} else {
+				my $prefix = sprintf('Q%04d_',$i+1);
+				my @fields = sort grep {/^$prefix/} (keys %{$self->{formFields}});
+				%answersToStore = map {$_ => $self->{formFields}->{$_}} @fields;
+				@answer_order = @fields;
+			}
+			my $answerString = encodeAnswers( %answersToStore, 
+							  @answer_order );
+			# and get the last answer 
+			$problems[$i]->last_answer( $answerString );
+			$pureProblem->last_answer( $answerString );
+
+			# next, store the state in the database if that makes 
+			#    sense
+			if ( $submitAnswers && $will{recordAnswers} ) {
+  $problems[$i]->status($pg_results[$i]->{state}->{recorded_score});
+  $problems[$i]->attempted(1);
+  $problems[$i]->num_correct($pg_results[$i]->{state}->{num_of_correct_ans});
+  $problems[$i]->num_incorrect($pg_results[$i]->{state}->{num_of_incorrect_ans});
+  $pureProblem->status($pg_results[$i]->{state}->{recorded_score});
+  $pureProblem->attempted(1);
+  $pureProblem->num_correct($pg_results[$i]->{state}->{num_of_correct_ans});
+  $pureProblem->num_incorrect($pg_results[$i]->{state}->{num_of_incorrect_ans});
+
+				if ( $db->putProblemVersion( $pureProblem ) ) {
+					$scoreRecordedMessage[$i] = "Your " .
+						"score on this problem was " .
+						"recorded.";
+				} else {
+					$scoreRecordedMessage[$i] = "Your " .
+						"score was not recorded " .
+						"because there was a failure " .
+						"in storing the problem " .
+						"record to the database.";
+				}
+				# write the transaction log
+				writeLog( $self->{ce}, "transaction",
+					  $problems[$i]->problem_id . "\t" .
+					  $problems[$i]->set_id . "\t" .
+					  $problems[$i]->user_id . "\t" .
+					  $problems[$i]->source_file . "\t" .
+					  $problems[$i]->value . "\t" .
+					  $problems[$i]->max_attempts . "\t" .
+					  $problems[$i]->problem_seed . "\t" .
+					  $problems[$i]->status . "\t" .
+					  $problems[$i]->attempted . "\t" .
+					  $problems[$i]->last_answer . "\t" .
+					  $problems[$i]->num_correct . "\t" .
+					  $problems[$i]->num_incorrect
+					  );
+			} elsif ( $submitAnswers ) {
+				# this is the case where we submitted answers
+				#    but can't save them; report an error 
+				#    message
+
+				if ($self->{isClosed}) {
+					$scoreRecordedMessage[$i] = "Your " .
+						"score was not recorded " .
+						"because this problem set " .
+						"version is not open.";
+				} elsif ( $problems[$i]->num_correct + 
+					  $problems[$i]->num_incorrect >= 
+					  $set->attempts_per_version ) {
+					$scoreRecordedMessage[$i] = "Your " .
+						"score was not recorded " .
+						"because you have no " .
+						"attempts remaining on this " .
+						"set version.";
+				} elsif ( ! $self->{versionIsOpen} ) {
+					my $endTime = ( $set->version_last_attempt_time ) ? $set->version_last_attempt_time : $timeNow;
+					if ($endTime > $set->due_date && 
+					    $endTime < $set->due_date + $grace){
+						$endTime = $set->due_date;
+					}
+					my $elapsed = 
+					    int(($endTime - $set->open_date)/0.6 + 0.5)/100;
+					# we assume that allowed is an even 
+					#    number of minutes
+					my $allowed = ($set->due_date - $set->open_date)/60;
+					$scoreRecordedMessage[$i] = "Your " .
+						"score was not recorded " .
+						"because you have exceeded " .
+						"the time limit for this " .
+						"test. (Time taken: $elapsed " .
+						"min; allowed: $allowed min.)";
+				} else {
+					$scoreRecordedMessage[$i] = "Your " .
+						"score was not recorded.";
+				}
+			} else {
+				# finally, we must be previewing or switching
+				#    pages.  save only the last answer for the
+				#    problems
+				$db->putProblemVersion( $pureProblem );
+			}
+		} # end loop through problems
+
+		## finally, log student answers if we're submitting, 
+		##    previewing, or changing pages, provided that we can 
+		##    record answers.  note that this will log an overtime 
+		##    submission (or any case where someone submits the 
+		##    test, or spoofs a request to submit a test)
+
+		my $answer_log = 
+			$self->{ce}->{courseFiles}->{logs}->{'answer_log'};
+
+		# this is carried over from Problem.pm
+		if ( defined( $answer_log ) ) {
+			foreach my $i ( 0 .. $#problems ) {
+				my $answerString = '';
+				my $scores = '';
+				# note that we store these answers in the 
+				#    order that they are presented, not the 
+				#    actual problem order
+				if ( ref( $pg_results[$probOrder[$i]] ) ) {
+					my %answerHash = %{ $pg_results[$probOrder[$i]]->{answers} };
+					foreach ( sortByName(undef, keys %answerHash) ) {
+						my $sAns = defined($answerHash{$_}->{original_student_ans}) ? $answerHash{$_}->{original_student_ans} : '';
+						$answerString .= $sAns . "\t";
+						$scores .= $answerHash{$_}->{score}>=1 ? "1" : "0" if ( $submitAnswers );
+					}
+				} else {
+					my $prefix = sprintf('Q%04d_', ($probOrder[$i]+1));
+					my @fields = sort grep {/^$prefix/} (keys %{$self->{formFields}});
+					foreach ( @fields ) {
+						$answerString .= $self->{formFields}->{$_} . "\t";
+						$scores .= $self->{formFields}->{"probstatus" . ($probOrder[$i]+1)} >= 1 ? "1" : "0" if ( $submitAnswers );
+					}
+				}
+				$answerString =~ s/\t+$/\t/;
+
+				my $answerPrefix;
+				if ( $submitAnswers ) { 
+					$answerPrefix = "[submit] ";  
+				} elsif ( $previewAnswers ) { 
+					$answerPrefix = "[preview] "; 
+				} else { 
+					$answerPrefix = "[newPage] "; 
+				}
+
+				if ( ! $answerString || 
+				     $answerString =~ /^\t$/ ) {
+					$answerString = "$answerPrefix" . 
+						"No answer entered\t";
+				} else {
+					$answerString = "$answerPrefix" .
+						"$answerString";
+				}
+
+				writeCourseLog( $self->{ce}, "answer_log",
+						join("", '|', 
+						     $problems[$i]->user_id,
+						     '|', $setVName,
+						     '|', ($i+1), '|', $scores, 
+						     "\t$timeNow\t",
+						     "$answerString"), 
+						);
+			}
+		}
+	}
+	debug("end answer processing");
+
+	# additional set-level database manipulation: we want to save the time 
+	#    that a set was submitted, and for proctored tests we want to reset 
+	#    the assignment type after a set is submitted for the last time so 
+	#    that it's possible to look at it later without getting proctor 
+	#    authorization
+	if ( ( $submitAnswers && 
+	       ( $will{recordAnswers} || 
+		 ( ! $set->version_last_attempt_time() &&
+		   $timeNow > $set->due_date + $grace ) ) ) ||
+	     ( ! $can{recordAnswersNextTime} && 
+	       $set->assignment_type() eq 'proctored_gateway' ) ) {
+
+		my $setName = $set->set_id();
+
+	# save the submission time if we're recording the answer, or if the 
+	#     first submission occurs after the due_date
+		if ( $submitAnswers && 
+		     ( $will{recordAnswers} || 
+		       ( ! $set->version_last_attempt_time() &&
+			 $timeNow > $set->due_date + $grace ) ) ) {
+			$set->version_last_attempt_time( $timeNow );
+		}
+		if ( ! $can{recordAnswersNextTime} && 
+		     $set->assignment_type() eq 'proctored_gateway' ) {
+			$set->assignment_type( 'gateway' );
+		}
+	# again, we save only parameters that are determine access to the
+	#    set version
+		my $cleanSet = $db->getSetVersion($effectiveUser,
+						$setName,
+						$versionNumber);
+		$cleanSet->assignment_type( $set->assignment_type );
+		$cleanSet->version_last_attempt_time( $set->version_last_attempt_time );
+		$db->putSetVersion( $cleanSet );
+	}
+
+
+	####################################
+	# output
+	####################################
+
+	# some convenient output variables
+	my $canShowProblemScores = $can{showScore} && 
+	    ($set->hide_score eq 'N' || $set->hide_score_by_problem eq 'N' ||
+	     $authz->hasPermissions($user, "view_hidden_work"));
+	my $canShowWork = $authz->hasPermissions($user, "view_hidden_work") || ($set->hide_work eq 'N' || ($set->hide_work eq 'BeforeAnswerDate' && $timeNow>$tmplSet->answer_date));
+
+	# for nicer answer checking on multi-page tests, we want to keep 
+	#    track of any changes that someone made to a different page, 
+	#    and what their score was.  we use @probStatus to do this.  we 
+	#    initialize this to any known scores, and then update this when 
+	#    calculating the score for checked or submitted tests
+	my @probStatus = ();
+	# we also figure out recorded score for the set, if any, and score 
+	#    on this attempt
+	my $recordedScore = 0;
+	my $totPossible = 0;
+	foreach ( @problems ) {
+		my $pv = ( $_->value() ) ? $_->value() : 1;
+		$totPossible += $pv;
+		$recordedScore += $_->status*$pv if (defined($_->status));
+		push( @probStatus, ($r->param("probstatus" . $_->problem_id) ||
+				    $_->status || 0) );
+	}
+
+	# to get the attempt score, we have to figure out what the score on 
+	#    each part of each problem is, and multiply the total for the 
+	#    problem by the weight (value) of the problem.  to make things 
+	#    even more interesting, we are avoiding translating all of the 
+	#    problems when checking answers
+	my $attemptScore = 0;
+
+	if ( $submitAnswers || $checkAnswers ) {
+		my $i=0;
+		foreach my $pg ( @pg_results ) {
+			my $pValue = $problems[$i]->value() ? $problems[$i]->value() : 1;
+			my $pScore = 0;
+			my $numParts = 0;
+			if ( ref( $pg ) ) {  # then we have a pg object
+				foreach (@{$pg->{flags}->{ANSWER_ENTRY_ORDER}}){
+					$pScore += $pg->{answers}->{$_}->{score};
+					$numParts++;
+				}
+				$probStatus[$i] = $pScore/($numParts>0 ? $numParts : 1);
+
+			} else {
+				# if we don't have a pg object, use any known 
+				#    problem status (this defaults to zero)
+				$pScore = $probStatus[$i];
+			}
+			$attemptScore += $pScore*$pValue/($numParts > 0 ? $numParts : 1);
+			$i++;
+		}
+	}
+
+	# we want to print elapsed and allowed times; allowed is easy
+	my $allowed = sprintf( "%.0f", 10*($set->due_date - $set->open_date)/6 )/100;
+	# elapsed is a little harder; we're counting to the last submission 
+	#    time, or to the current time if the test hasn't been submitted, 
+	#    and if the submission fell in the grace period round it to the 
+	#    due_date
+	my $exceededAllowedTime = 0;
+	my $endTime = ( $set->version_last_attempt_time ) ? 
+	    $set->version_last_attempt_time : $timeNow;
+	if ( $endTime > $set->due_date && $endTime < $set->due_date + $grace ) {
+		$endTime = $set->due_date;
+	} elsif ( $endTime > $set->due_date ) {
+		$exceededAllowedTime = 1;
+	}
+	my $elapsedTime = int(($endTime - $set->open_date)/0.6 + 0.5)/100;
+
+	# also get number of remaining attempts (important for sets with 
+	#    multiple attempts per version)
+	my $numLeft = ($set->attempts_per_version ||0 )- $Problem->num_correct - 
+		$Problem->num_incorrect - 
+		($submitAnswers && $will{recordAnswers} ? 1 : 0);
+	my $attemptNumber = $Problem->num_correct + $Problem->num_incorrect;
+
+	# a handy noun for when referring to a test
+	my $testNoun = (( $set->attempts_per_version || 0 ) > 1) ? "submission" : "test";
+	my $testNounNum = ( ( $set->attempts_per_version ||0 ) > 1 ) ? 
+		"submission (test " : "test (";
+
+	##### start output of test headers: 
+	##### display information about recorded and checked scores
+	if ( $submitAnswers ) {
+		# the distinction between $can{recordAnswers} and ! $can{} has 
+		#    been dealt with above and recorded in @scoreRecordedMessage
+		my $divClass = 'ResultsWithoutError';
+		my $recdMsg = '';
+		foreach ( @scoreRecordedMessage ) {
+			if ($_ ne 'Your score on this problem was recorded.') {
+				$recdMsg = $_;
+				$divClass = 'ResultsWithError';
+				last;
+			}
+		}
+		print CGI::start_div({class=>$divClass});
+
+		if ( $recdMsg ) {
+			# then there was an error when saving the results
+			print CGI::strong("Your score on this $testNounNum ",
+					  "$versionNumber) was NOT recorded.  ",
+					  $recdMsg), CGI::br();
+		} else {
+			# no error; print recorded message
+			print CGI::strong("Your score on this $testNounNum ",
+					  "$versionNumber) WAS recorded."), 
+			CGI::br();
+
+			# and show the score if we're allowed to do that
+			if ( $can{showScore} ) {
+				print CGI::strong("Your score on this " .
+						  "$testNoun is ", 
+						  "$attemptScore/$totPossible.");
+			} else {
+				my $when = 
+					($set->hide_score eq 'BeforeAnswerDate')
+					? ' until ' . ($self->formatDateTime($set->answer_date) )
+					: '';
+				print CGI::br() . 
+					"(Your score on this $testNoun " .
+					"is not available$when.)";
+			}
+		}
+
+		# finally, if there is another, recorded message, print that 
+		#    too so that we know what's going on
+		print CGI::end_div();
+		if ( $set->attempts_per_version > 1 && $attemptNumber > 1 &&
+		     $recordedScore != $attemptScore && $can{showScore} ) {
+			print CGI::start_div({class=>'gwMessage'});
+			print "The recorded score for this test is ",
+				"$recordedScore/$totPossible.";
+			print CGI::end_div();
+		}
+
+	} elsif ( $checkAnswers ) {
+		if ( $can{showScore} ) {
+			print CGI::start_div({class=>'gwMessage'});
+			print CGI::strong("Your score on this (checked, not ",
+					  "recorded) submission is ",
+					  "$attemptScore/$totPossible."), 
+				CGI::br();
+			print "The recorded score for this test is " .
+				"$recordedScore/$totPossible.  ";
+			print CGI::end_div();
+		}
+	}
+
+	##### remaining output of test headers:
+	##### display timer or information about elapsed time, "printme" link,
+	##### and information about any recorded score if not submitAnswers or 
+	##### checkAnswers
+	if ( $can{recordAnswersNextTime} ) {
+
+		# print timer
+		# FIXME: in the long run, we want to allow a test to not be
+		#    timed.  This does not allow for that possibility
+		my $timeLeft = $set->due_date() - $timeNow;  # this is in secs
+		print CGI::div({-id=>"gwTimer"},"\n");
+		print CGI::startform({-name=>"gwTimeData", -method=>"POST",
+				      -action=>$r->uri});
+		print CGI::hidden({-name=>"serverTime", -value=>$timeNow}), 
+			"\n";
+		print CGI::hidden({-name=>"serverDueTime", 
+				   -value=>$set->due_date()}), "\n";
+		print CGI::endform();
+
+		if ( $timeLeft < 1 && $timeLeft > 0 &&
+		     ! $authz->hasPermissions($user, "record_answers_when_acting_as_student")) {
+			print CGI::span({-class=>"resultsWithError"}, 
+					CGI::b("You have less than 1 minute ",
+					       "to complete this test.\n"));
+		} elsif ( $timeLeft <= 0 &&
+			  ! $authz->hasPermissions($user, "record_answers_when_acting_as_student") ) {
+			print CGI::span({-class=>"resultsWithError"}, 
+					CGI::b("You are out of time.  ",
+					       "Press grade now!\n"));
+		}
+		# if there are multiple attempts per version, indicate the 
+		#    number remaining, and if we've submitted a multiple 
+		#    attempt multi-page test, show the score on the previous
+		#    submission
+		if ( $set->attempts_per_version > 1 ) {
+			print CGI::em("You have $numLeft attempt(s) remaining ",
+				      "on this test.");
+			if ( $numLeft < $set->attempts_per_version &&
+			     $numPages > 1 &&
+			     $can{showScore} ) {
+				print CGI::start_div({-id=>"gwScoreSummary"}),
+					CGI::strong({},"Score summary for " .
+						    "last submit:");
+				print CGI::start_table({"border"=>0,
+							"cellpadding"=>0,
+							"cellspacing"=>0});
+				print CGI::Tr({},CGI::th({-align=>"left"},
+							 ["Prob","","Status","",
+							  "Result"]));
+				for ( my $i=0; $i<@probStatus; $i++ ) {
+					print CGI::Tr({},
+						CGI::td({},[($i+1),"",int(100*$probStatus[$probOrder[$i]]+0.5) . "%","", $probStatus[$probOrder[$i]] == 1 ? "Correct" : "Incorrect"]));
+				}
+				print CGI::end_table(), CGI::end_div();
+			}
+		}
+	} else {
+		print CGI::start_div({class=>'gwMessage'});
+
+		if ( ! $checkAnswers && ! $submitAnswers ) {
+
+			if ( $can{showScore} ) {
+				my $scMsg = "Your recorded score on this " .
+					"(test number $versionNumber) is " .
+					"$recordedScore/$totPossible";
+				if ( $exceededAllowedTime && 
+				     $recordedScore == 0 ) {
+					$scMsg .= ", because you exceeded " .
+						"the allowed time.";
+				} else {
+					$scMsg .= ".  ";
+				}
+				print CGI::strong($scMsg), CGI::br();
+			}
+		}
+
+		if ( $set->version_last_attempt_time ) {
+			print "Time taken on test: $elapsedTime min " .
+				"($allowed min allowed).";
+		} elsif ( $exceededAllowedTime && $recordedScore != 0 ) {
+			print "(This test is overtime because it was not " .
+				"submitted in the allowed time.)";
+		}
+		print CGI::end_div();
+
+		if ( $canShowWork && $set->set_id ne "Undefined_Set" ) {
+			print "The test (which is number $versionNumber) may " .
+				"no longer be submitted for a grade";
+			print "" . (($can{showScore}) ? ", but you may still " .
+				    "check your answers." : ".") ;
+
+			# print a "printme" link if we're allowed to see our 
+			#    work
+			my $link = $ce->{webworkURLs}->{root} . '/' . 
+				$ce->{courseName} . '/hardcopy/' . 
+				$set->set_id . ',v' . $set->version_id . '/?' . 
+				$self->url_authen_args;
+			my $printmsg = CGI::div({-class=>'gwPrintMe'}, 
+						CGI::a({-href=>$link}, 
+						       "Print Test"));
+			print $printmsg;
+		}
+	}
+
+	# this is a hack to get a URL that won't require a proctor login if 
+	#    we've submitted a proctored test for the last time.  above we've 
+	#    reset the assignment_type in this case, so we'll use that to 
+	#    decide if we should give a path to an unproctored test.
+	my $action = $r->uri();
+	$action =~ s/proctored_quiz_mode/quiz_mode/ 
+		if ( $set->assignment_type() eq 'gateway' );
+	# we also want to be sure that if we're in a set, the 'action' in the 
+	#    form points us to the same set.  
+	my $setname = $set->set_id;
+	my $setvnum = $set->version_id;
+	$action =~ s/(quiz_mode\/$setname)\/?$/$1,v$setvnum\//;  #"
+
+	# now, we print out the rest of the page if we're not hiding submitted
+	#    answers
+	if ( ! $can{recordAnswersNextTime} && ! $canShowWork ) {
+		my $when = ( $set->hide_work eq 'BeforeAnswerDate' ) 
+			? ' until ' . ($self->formatDateTime($set->answer_date))
+			: '';
+		print CGI::start_div({class=>"gwProblem"});
+		print CGI::strong("Completed results for this assignment are " .
+				  "not available$when.");
+		print CGI::end_div();
+
+	# else: we're not hiding answers
+	} else {
+
+		print CGI::startform({-name=>"gwquiz", -method=>"POST", 
+				      -action=>$action}), 
+			$self->hidden_authen_fields, 
+			$self->hidden_proctor_authen_fields;
+
+	# hacks to use a javascript link to trigger previews and jump to 
+	#    subsequent pages of a multipage test
+		print CGI::hidden({-name=>'previewHack', -value=>''}), 
+			CGI::br();
+		if ( $numProbPerPage && $numPages > 1 ) { 
+			print CGI::hidden({-name=>'newPage', -value=>''});
+			print CGI::hidden({-name=>'currentPage',
+					   -value=>$pageNumber});
+		}
+
+	# the link for a preview; for a multipage test, this also needs to 
+	#    keep track of what page we're on
+		my $jsprevlink = 'javascript:document.gwquiz.previewHack.value="1";';
+		$jsprevlink .= "document.gwquiz.newPage.value=\"$pageNumber\";"
+			if ( $numProbPerPage && $numPages > 1 );
+		$jsprevlink .= 'document.gwquiz.submit();';
+
+	# set up links between problems and, for multi-page tests, pages
+		my $jumpLinks = '';
+		my $probRow = [ CGI::b("Problem") ];
+		for my $i ( 0 .. $#pg_results ) {
+	    
+			my $pn = $i + 1;
+			if ( $i >= $startProb && $i <= $endProb ) {
+				push(@$probRow, CGI::b(" [ ")) if ($i == $startProb);
+				push( @$probRow, " &nbsp;" . 
+				      CGI::a({-href=>".", 
+					      -onclick=>"jumpTo($pn);return false;"},
+					     "$pn") . "&nbsp; " );
+				push(@$probRow, CGI::b(" ] ")) if ($i == $endProb);
+			} elsif ( ! ($i % $numProbPerPage) ) {
+				push(@$probRow, " &nbsp;&nbsp; ", 
+				     " &nbsp;&nbsp; ", " &nbsp;&nbsp; ");
+			}
+		}
+		if ( $numProbPerPage && $numPages > 1 ) {
+			my $pageRow = [ CGI::td([ CGI::b('Jump to: '), 
+						  CGI::b('Page '),
+						  CGI::b(' [ ' ) ]) ];
+			for my $i ( 1 .. $numPages ) {
+				my $pn = ( $i == $pageNumber ) ? $i : 
+				    CGI::a({-href=>'javascript:' .
+						"document.gwquiz.newPage.value=\"$i\";" .
+						'document.gwquiz.submit();'}, 
+					   "&nbsp;$i&nbsp;");
+
+				my $colspan =  0;
+				if ( $i == $pageNumber ) {
+					$colspan = 
+					    ($#pg_results - ($i-1)*$numProbPerPage > $numProbPerPage) ?
+					    $numProbPerPage : 
+					    $#pg_results - ($i-1)*$numProbPerPage + 1;
+				} else {
+					$colspan = 1;
+				}
+				push( @$pageRow, CGI::td({-colspan=>$colspan, 
+							  -align=>'center'}, 
+							 $pn) );
+				push( @$pageRow, CGI::td( [CGI::b(' ] '), 
+							   CGI::b(' [ ')] ) )
+					if ( $i != $numPages );
+			}
+			push( @$pageRow, CGI::td(CGI::b(' ] ')) );
+			unshift( @$probRow, ' &nbsp; ' );
+			$jumpLinks = CGI::table( CGI::Tr(@$pageRow), 
+						 CGI::Tr( CGI::td($probRow) ) );
+		} else {
+			unshift( @$probRow, CGI::b('Jump to: ') );
+			$jumpLinks = CGI::table( CGI::Tr( CGI::td($probRow) ) );
+		}
+	
+		print $jumpLinks,"\n";
+
+	# print out problems and attempt results, as appropriate
+	# note: args to attemptResults are (self,) $pg, $showAttemptAnswers,
+	#    $showCorrectAnswers, $showAttemptResults (and-ed with 
+	#    $showAttemptAnswers), $showSummary, $showAttemptPreview (or-ed 
+	#    with zero)
+		my $problemNumber = 0;
+
+		foreach my $i ( 0 .. $#pg_results ) {
+			my $pg = $pg_results[$probOrder[$i]];
+			$problemNumber++;
+
+			if ( $i >= $startProb && $i <= $endProb ) { 
+				
+				my $recordMessage = '';
+				my $resultsTable = '';
+
+				if ($pg->{flags}->{showPartialCorrectAnswers}>=0 && $submitAnswers){
+					if ( $scoreRecordedMessage[$probOrder[$i]] ne 
+					     "Your score on this problem was recorded." ) {
+						$recordMessage = CGI::span({class=>"resultsWithError"},
+									   "ANSWERS NOT RECORDED --", 
+									   $scoreRecordedMessage[$probOrder[$i]]);
+
+					}
+					$resultsTable = 
+					    $self->attemptResults($pg, 1, $will{showCorrectAnswers},
+								  $pg->{flags}->{showPartialCorrectAnswers} && $canShowProblemScores,
+								  $canShowProblemScores, 1);
+					
+				} elsif ( $checkAnswers ) {
+					$recordMessage = CGI::span({class=>"resultsWithError"},
+								   "ANSWERS ONLY CHECKED -- ", 
+								   "ANSWERS NOT RECORDED");
+					
+					$resultsTable = 
+					    $self->attemptResults($pg, 1, $will{showCorrectAnswers},
+								  $pg->{flags}->{showPartialCorrectAnswers} && $canShowProblemScores,
+								  $canShowProblemScores, 1);
+
+				} elsif ( $previewAnswers ) {
+					$recordMessage = 
+					    CGI::span({class=>"resultsWithError"},
+						      "PREVIEW ONLY -- ANSWERS NOT RECORDED");
+					$resultsTable = $self->attemptResults($pg, 1, 0, 0, 0, 1);
+ 
+				}	    
+				
+				print CGI::start_div({class=>"gwProblem"});
+				my $i1 = $i+1;
+				my $pv = $problems[$probOrder[$i]]->value() ? $problems[$probOrder[$i]]->value() : 1;
+				my $points = ($pv > 1) ? 
+					" (" . $pv . " points)" : 
+					" (1 point)";
+				print CGI::a({-name=>"#$i1"},"");
+				print CGI::strong("Problem $problemNumber."), 
+					"$points\n", $recordMessage;
+				print CGI::p($pg->{body_text}),
+				CGI::p($pg->{result}->{msg} ? 
+				       CGI::b("Note: ") : "", 
+				       CGI::i($pg->{result}->{msg}));
+				print CGI::p({class=>"gwPreview"}, 
+					     CGI::a({-href=>"$jsprevlink"}, 
+						    "preview problems"));
+
+				print $resultsTable if $resultsTable; 
+
+				print CGI::end_div();
+				# finally, store the problem status for 
+				#    continued attempts recording
+				my $pNum = $probOrder[$i] + 1;
+				print CGI::hidden({-name=>"probstatus$pNum",
+						   -value=>$probStatus[$probOrder[$i]]});
+
+				print "\n", CGI::hr(), "\n";
+			} else {
+				my $i1 = $i+1;
+				# keep the jump to anchors so that jumping to 
+				#    problem number 6 still works, even if 
+				#    we're viewing only problems 5-7, etc.
+				print CGI::a({-name=>"#$i1"},""), "\n";
+				# and print out hidden fields with the current 
+				#    last answers
+				my $curr_prefix = 'Q' . sprintf("%04d", $probOrder[$i]+1) . '_';
+				my @curr_fields = grep /^$curr_prefix/, keys %{$self->{formFields}};
+				foreach my $curr_field ( @curr_fields ) {
+					print CGI::hidden({-name=>$curr_field, 
+							   -value=>$self->{formFields}->{$curr_field}});
+				}
+				# finally, store the problem status for 
+				#    continued attempts recording
+				my $pNum = $probOrder[$i] + 1;
+				print CGI::hidden({-name=>"probstatus$pNum",
+						   -value=>$probStatus[$probOrder[$i]]});
+# 	    my $probid = 'Q' . sprintf("%04d", $probOrder[$i]+1) . "_AnSwEr1";
+# 	    my $probval = $self->{formFields}->{$probid};
+# 	    print CGI::hidden({-name=>$probid, -value=>$probval}), "\n";
+			}
+		}
+		print CGI::p($jumpLinks, "\n");
+		print "\n",CGI::hr(), "\n";
+
+		if ($can{showCorrectAnswers}) {
+			print CGI::checkbox(-name   =>"showCorrectAnswers",
+#				-checked => $will{showCorrectAnswers},
+					    -checked=>$want{showCorrectAnswers},
+					    -label  =>"Show correct answers",
+					    );
+		}
+#     if ($can{showHints}) {
+# 	print CGI::div({style=>"color:red"},
+# 		       CGI::checkbox(-name    => "showHints",
+# 				     -checked => $will{showHints},
+# 				     -label   => "Show Hints",
+# 				     )
+# 		       );
+#     }
+		if ($can{showSolutions}) {
+			print CGI::checkbox(-name    => "showSolutions",
+					    -checked => $will{showSolutions},
+					    -label   => "Show Solutions",
+					    );
+		}
+
+		if ($can{showCorrectAnswers} or $can{showHints} or 
+		    $can{showSolutions}) {
+			print CGI::br();
+		}
+
+		print CGI::p( CGI::submit( -name=>"previewAnswers", 
+					   -label=>"Preview Test" ),
+			      ($can{recordAnswersNextTime} ? 
+			       CGI::submit( -name=>"submitAnswers",
+					    -label=>"Grade Test" ) : " "),
+			      ($can{checkAnswersNextTime} && ! $can{recordAnswersNextTime} ?
+			       CGI::submit( -name=>"checkAnswers",
+					    -label=>"Check Test" ) : " "),
+			      ($numProbPerPage && $numPages > 1 && 
+			       $can{recordAnswersNextTime} ? CGI::br() . 
+			       CGI::em("Note: grading the test grades " . 
+				       CGI::b("all") . " problems, not just those " . 
+				       "on this page.") : " ") );
+
+		## save the source file, etc., if we're trying an undefined
+		##    set
+		# print( CGI::hidden(
+		# 		   -name   => 'sourceFilePath',
+		# 		   -value  =>  $self->{problem}->{source_file}
+		# 		  ))  if defined($self->{problem}->{source_file});
+		print( CGI::hidden(
+				   -name   => 'sourceFilePath',
+				   -value  =>  $r->param("sourceFilePath")
+				  ))  if defined($r->param("sourceFilePath"));
+		print( CGI::hidden(
+				   -name   => 'problemSeed',
+				   -value  =>  $r->param("problemSeed")
+				  ))  if defined($r->param("problemSeed"));
+
+		print CGI::endform();
+	}
+
+	# finally, put in a show answers option if appropriate
+	# print answer inspection button
+	if ($authz->hasPermissions($user, "view_answers")) {
+		my $pastAnswersPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::ShowAnswers", $r, courseID => $ce->{courseName});
+		my $showPastAnswersURL = $self->systemLink($pastAnswersPage, authen => 0); # no authen info for form action
+		print "\n", CGI::start_form(-method=>"POST",-action=>$showPastAnswersURL,-target=>"WW_Info"),"\n",
+			$self->hidden_authen_fields,"\n",
+			CGI::hidden(-name => 'courseID',  -value=>$ce->{courseName}), "\n",
+			CGI::hidden(-name => 'problemID', -value=>($startProb+1)), "\n",
+			CGI::hidden(-name => 'setID',  -value=>$setVName), "\n",
+			CGI::hidden(-name => 'studentUser',    -value=>$effectiveUser), "\n",
+			CGI::p( {-align=>"left"},
+				CGI::submit(-name => 'action',  -value=>'Show Past Answers')
+				), "\n",
+			CGI::endform();
+	}
+
+# debugging verbiage
+#     if ( $can{checkAnswersNextTime} ) {
+# 	print "Can check answers next time\n";
+#     } else {
+# 	print "Can NOT check answers next time\n";
+#     }
+#     if ( $can{recordAnswersNextTime} ) {
+# 	print "Can record answers next time\n";
+#     } else {
+# 	print "Can NOT record answers next time\n";
+#     }
+
+  # we exclude the feedback form from gateway tests.  they can use the feedback
+  #   button on the preceding or following pages
+#     my $ce = $r->ce;
+#     my $root = $ce->{webworkURLs}->{root};
+#     my $courseName = $ce->{courseName};
+#     my $feedbackURL = "$root/$courseName/feedback/";
+#     print CGI::startform("POST", $feedbackURL),
+#           $self->hidden_authen_fields,
+#           CGI::hidden("module", __PACKAGE__),
+#           CGI::hidden("set",    $self->{set}->set_id),
+#           CGI::p({-align=>"right"},
+# 		 CGI::submit(-name=>"feedbackForm", -label=>"Send Feedback")
+# 		 ),
+# 	  CGI::endform();
+	
+	return "";
+
+}
+
+
+###########################################################################
+# Evaluation utilities
+############################################################################
+
+sub getProblemHTML {
+	my ( $self, $EffectiveUser, $set, $formFields,
+	     $mergedProblem, $pgFile ) = @_;
+# in:  $EffectiveUser is the effective user we're working as, $set is the
+#      merged set version, %$formFields the form fields from the input form
+#      that we need to worry about putting into the HTML we're generating,
+#      and $mergedProblem and $pgFile are what we'd expect.
+#      $pgFile is optional
+# out: the translated problem is returned
+
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my $db = $r->db;
+	my $key =  $r->param('key');
+	my $setName = $set->set_id;
+	my $setVersionNumber = $set->version_id;
+	my $permissionLevel = $self->{permissionLevel};
+	my $psvn = $set->psvn();
+
+	if ( defined($mergedProblem) && $mergedProblem->problem_id ) {
+# nothing needs to be done
+
+	} elsif ($pgFile) {
+		$mergedProblem = 
+		    WeBWorK::DB::Record::ProblemVersion->new(
+					set_id => $setName,
+					version_id => $setVersionNumber,
+					problem_id => 0,
+					login_id => $EffectiveUser->user_id,
+					source_file => $pgFile,
+			# the rest of Problem's fields are not needed, i think
+							     );
+	}
+# figure out if we're allowed to get solutions and call PG->new accordingly.
+	my $showCorrectAnswers = $self->{will}->{showCorrectAnswers};
+	my $showHints          = $self->{will}->{showHints};
+	my $showSolutions      = $self->{will}->{showSolutions};
+	my $processAnswers     = $self->{will}->{checkAnswers};
+
+# FIXME  I'm not sure that problem_id is what we want here  FIXME
+	my $problemNumber = $mergedProblem->problem_id;
+
+	my $pg = 
+	    WeBWorK::PG->new(
+			 $ce,
+			 $EffectiveUser,
+			 $key,
+			 $set,
+			 $mergedProblem,
+			 $psvn,
+			 $formFields, 
+			 { # translation options
+			     displayMode     => $self->{displayMode},
+			     showHints       => $showHints,
+			     showSolutions   => $showSolutions,
+			     refreshMath2img => $showHints || $showSolutions,
+			     processAnswers  => 1,
+			     QUIZ_PREFIX     => 'Q' . 
+				 sprintf("%04d",$problemNumber) . '_',
+			     },
+			     );
+	
+# FIXME  is problem_id the correct thing in the following two stanzas?
+# FIXME  the original version had "problem number", which is what we want.
+# FIXME  I think problem_id will work, too
+	if ($pg->{warnings} ne "") {
+		push @{$self->{warnings}}, {
+			set     => "$setName,v$setVersionNumber",
+			problem => $mergedProblem->problem_id,
+			message => $pg->{warnings},
+		};
+	}
+
+	if ($pg->{flags}->{error_flag}) {
+		push @{$self->{errors}}, {
+			set     => "$setName,v$setVersionNumber",
+			problem => $mergedProblem->problem_id,
+			message => $pg->{errors},
+			context => $pg->{body_text},
+		};
+	# if there was an error, body_text contains
+	# the error context, not TeX code
+		$pg->{body_text} = undef;
+	}
+
+	return    $pg;
 }
 
+##### output utilities #####
+sub problemListRow($$$) {
+	my $self = shift;
+	my $set = shift;
+	my $Problem = shift;
+	
+	my $name = $Problem->problem_id;
+	my $interactiveURL = "$name/?" . $self->url_authen_args;
+	my $interactive = CGI::a({-href=>$interactiveURL}, "Problem $name");
+	my $attempts = $Problem->num_correct + $Problem->num_incorrect;
+	my $remaining = $Problem->max_attempts < 0
+		? "unlimited"
+		: $Problem->max_attempts - $attempts;
+	my $status = sprintf("%.0f%%", $Problem->status * 100); # round to whole number
+	
+	return CGI::Tr(CGI::td({-nowrap=>1}, [
+		$interactive,
+		$attempts,
+		$remaining,
+		$status,
+	]));
+}
+# sub nbsp {
+# 	my $str = shift;
+# 	($str) ? $str : '&nbsp;';  # returns non-breaking space for empty strings
+# }
+
+##### logging subroutine ####
+
+
+
+
 1;
diff --git a/lib/WeBWorK/ContentGenerator/Grades.pm b/lib/WeBWorK/ContentGenerator/Grades.pm
new file mode 100644
index 0000000000..4d0abeeadd
--- /dev/null
+++ b/lib/WeBWorK/ContentGenerator/Grades.pm
@@ -0,0 +1,593 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Grades.pm,v 1.35 2007/07/10 14:41:54 glarose 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::ContentGenerator::Grades;
+use base qw(WeBWorK::ContentGenerator);
+
+=head1 NAME
+
+WeBWorK::ContentGenerator::Instructor::Stats - Display statistics by user or
+problem set.
+
+=cut
+
+use strict;
+use warnings;
+#use CGI qw(-nosticky );
+use WeBWorK::CGI;
+use WeBWorK::Debug;
+use WeBWorK::Utils qw(readDirectory list2hash max);
+use WeBWorK::Localize;
+sub initialize {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $db = $r->db;
+	my $ce = $r->ce;
+	my $authz = $r->authz;
+	
+ 	my $userName = $r->param('user');
+ 	my $effectiveUserName = defined($r->param("effectiveUser") ) ? $r->param("effectiveUser") : $userName;
+    $self->{userName} = $userName;
+	$self->{studentName} = $effectiveUserName;
+}
+
+sub body {
+	my ($self) = @_;
+	
+	$self->displayStudentStats($self->{studentName});
+	
+	print $self->scoring_info();
+	
+	return '';
+
+}
+
+############################################
+# Borrowed from SendMail.pm and Instructor.pm
+############################################
+
+sub getRecord {
+	my $self    = shift;
+	my $line    = shift;
+	my $delimiter   = shift;
+	$delimiter       = ',' unless defined($delimiter);
+
+        #       Takes a delimited line as a parameter and returns an
+        #       array.  Note that all white space is removed.  If the
+        #       last field is empty, the last element of the returned
+        #       array is also empty (unlike what the perl split command
+        #       would return).  E.G. @lineArray=&getRecord(\$delimitedLine).
+
+        my(@lineArray);
+        $line.=$delimiter;                              # add 'A' to end of line so that
+                                                        # last field is never empty
+        @lineArray = split(/\s*${delimiter}\s*/,$line);
+        $lineArray[0] =~s/^\s*// if defined($lineArray[0]);                       # remove white space from first element
+        @lineArray;
+}
+
+sub scoring_info {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $db = $r->db;
+	my $ce = $r->ce;
+	
+	my $userName          = $r->param('effectiveUser') || $r->param('user');
+	my $userID              = $r->param('user');
+    my $ur                = $db->getUser($userName);
+	my $emailDirectory    = $ce->{courseDirs}->{email};
+	my $filePath          = "$emailDirectory/report_grades.msg";
+	my $merge_file         = "report_grades_data.csv";
+	my $delimiter            = ',';
+	my $scoringDirectory    = $ce->{courseDirs}->{scoring};
+	return "There is no additional grade information. The spreadsheet file $filePath cannot be found." unless -e "$scoringDirectory/$merge_file";
+	my $rh_merge_data   = $self->read_scoring_file("$merge_file", "$delimiter");
+	my $text;
+	my $header = '';
+	local(*FILE);
+	if (-e "$filePath" and -r "$filePath") {
+		open FILE, "$filePath" || return("Can't open $filePath"); 
+		while ($header !~ s/Message:\s*$//m and not eof(FILE)) { 
+			$header .= <FILE>; 
+		}
+	} else {
+		return("There is no additional grade information. <br> The message file $filePath cannot be found.")
+	}
+	$text = join( '', <FILE>);
+	close(FILE);
+	
+	my $status_name = $ce->status_abbrev_to_name($ur->status);
+	$status_name = $ur->status unless defined $status_name;
+	
+	my $SID           = $ur->student_id;
+	my $FN            = $ur->first_name;
+	my $LN            = $ur->last_name;
+	my $SECTION       = $ur->section;
+	my $RECITATION    = $ur->recitation;
+	my $STATUS        = $status_name;
+	my $EMAIL         = $ur->email_address;
+	my $LOGIN         = $ur->user_id;
+	my @COL           = defined($rh_merge_data->{$SID}) ? @{$rh_merge_data->{$SID} } : ();
+	unshift(@COL,"");			## this makes COL[1] the first column
+
+	my $endCol        = @COL;
+	# for safety, only evaluate special variables
+	# FIXME /e is not required for simple variable interpolation
+	my $msg = $text; 
+	$msg =~ s/(\$PAR)/<p>/ge;
+	$msg =~ s/(\$BR)/<br>/ge;
+   
+ 	$msg =~ s/\$SID/$SID/ge;
+ 	$msg =~ s/\$LN/$LN/ge;
+ 	$msg =~ s/\$FN/$FN/ge;
+ 	$msg =~ s/\$STATUS/$STATUS/ge;
+ 	$msg =~ s/\$SECTION/$SECTION/ge;
+ 	$msg =~ s/\$RECITATION/$RECITATION/ge;
+ 	$msg =~ s/\$EMAIL/$EMAIL/ge;
+ 	$msg =~ s/\$LOGIN/$LOGIN/ge;
+	if (defined($COL[1])) {		# prevents extraneous error messages.  
+		$msg =~ s/\$COL\[(\-?\d+)\]/$COL[$1] if defined($COL[$1])/ge
+	}
+	else {						# prevents extraneous $COL's in email message 
+		$msg =~ s/\$COL\[(\-?\d+)\]//g
+	}
+	
+# 	old version 
+#  	$msg =~ s/(\$SID)/eval($1)/ge;
+#  	$msg =~ s/(\$LN)/eval($1)/ge;
+#  	$msg =~ s/(\$FN)/eval($1)/ge;
+#  	$msg =~ s/(\$STATUS)/eval($1)/ge;
+#  	$msg =~ s/(\$SECTION)/eval($1)/ge;
+#  	$msg =~ s/(\$RECITATION)/eval($1)/ge;
+#  	$msg =~ s/(\$EMAIL)/eval($1)/ge;
+#  	$msg =~ s/(\$LOGIN)/eval($1)/ge;
+#  	$msg =~ s/\$COL\[ *-/\$COL\[$endCol-/g;
+#  	$msg =~ s/(\$COL\[.*?\])/eval($1)/ge;
+ 	
+ 	$msg =~ s/\r//g;
+ 	$msg = "<pre>$msg</pre>";
+ 	$msg = qq!More scoring information goes here in [TMPL]/email/report_grades.msg. It
+		is merged with the file [Scoring]/report_grades_data.csv. <br>These files can be edited 
+		using the "Email" link and the "Scoring Tools" link in the left margin.<p>!.$msg if ($r->authz->hasPermissions($userID, "access_instructor_tools"));
+	return CGI::div(
+		{style =>"background-color:#DDDDDD"}, $msg
+	);
+}
+
+sub displayStudentStats {
+	my ($self, $studentName) = @_;
+	my $r = $self->r;
+	my $db = $r->db;
+	my $ce = $r->ce;
+	my $authz = $r->authz;
+	
+	my $courseName = $ce->{courseName};
+	my $studentRecord = $db->getUser($studentName); # checked
+	die "record for user $studentName not found" unless $studentRecord;
+	my $root = $ce->{webworkURLs}->{root};
+
+######################################################################
+# Get all sets (including versions of gateway quizzes) assigned to this user
+######################################################################
+
+	# first get all non-versioned-sets; listUserSets will return all 
+	#    homework assignments, plus the template gateway sets.
+	# DBFIXME use iterator instead of setIDs
+	my @setIDs    = sort( $db->listUserSets($studentName) );
+	# to figure out which of these are gateways (that is, versioned),
+	#    we need to also have the actual (merged) set objects
+	my @sets = $db->getMergedSets( map {[$studentName, $_]} @setIDs );
+	# to be able to find the set objects later, make a handy hash
+	my %setsByID = ( map {$_->set_id => $_} @sets );
+
+######################################################
+# before going through the table generating loop, find all the 
+#    set versions for the sets in our list
+#
+# info for refactoring:
+# input:  list of regular sets (from $db->getMergedSets(studentID, setID )
+# input:  $db
+# input: \%setsByID
+# output: \%setVersionsByID  ---  a pointer to a list of version names.
+# update: \%setsByID ---  indexed by full set name, value is the set record
+# output: \@allSetIDs   -- full names of sets (the gateway template and the versioned tests)
+#############################################
+	my %setVersionsByID = ();
+	my @allSetIDs = ();
+	foreach my $set ( @sets ) {
+		my $setName = $set->set_id();
+		#
+		# FIXME: Here, as in many other locations, we assume that
+		#    there is a one-to-one matching between versioned sets
+		#    and gateways.  we really should have two flags, 
+		#    $set->assignment_type and $set->versioned.  I'm not 
+		#    adding that yet, however, so this will continue to 
+		#    use assignment_type...
+		#
+		if ( defined($set->assignment_type) && 
+		     $set->assignment_type =~ /gateway/ ) { 
+			my @vList = $db->listSetVersions($studentName,$setName);
+			# we have to have the merged set versions to 
+			#    know what each of their assignment types 
+			#    are (because proctoring can change)
+			my @setVersions = $db->getMergedSetVersions( map {[$studentName, $setName, $_]} @vList );
+
+			# add the set versions to our list of sets
+			foreach ( @setVersions ) { 
+				$setsByID{$_->set_id . ",v" . $_->version_id} = $_; 
+			}
+			# flag the existence of set versions for this set
+			$setVersionsByID{$setName} = [ @vList ];
+			# and save the set names for display
+			push( @allSetIDs, $setName );
+			push( @allSetIDs, map { "$setName,v$_" } @vList );
+
+		} else {
+			push( @allSetIDs, $setName );
+			$setVersionsByID{$setName} = "None";
+		}
+	}
+	
+
+#########################################################################################
+	my $fullName = join("", $studentRecord->first_name," ", $studentRecord->last_name);
+	my $effectiveUser = $studentRecord->user_id();
+	my $act_as_student_url = "$root/$courseName/?user=".$r->param("user").
+			"&effectiveUser=$effectiveUser&key=".$r->param("key");
+
+	
+	# FIXME: why is the following not "print CGI::h3($fullName);"?  Hmm.
+	print CGI::h3($fullName ), 
+
+	###############################################################
+	#  Print table
+	###############################################################
+
+	# FIXME I'm assuming the problems are all the same
+	# FIXME what does this mean?
+	
+	my @rows;
+	my $max_problems=0;
+	
+	foreach my $setName (@allSetIDs)   {
+		my $act_as_student_set_url = "$root/$courseName/$setName/?user=".$r->param("user").
+			"&effectiveUser=$effectiveUser&key=".$r->param("key");
+		my $set = $setsByID{ $setName };
+		my $setID = $set->set_id();  #FIXME   setName and setID should be the same
+
+		# now, if the set is a template gateway set and there 
+		#    are no versions, we acknowledge that the set exists
+		#    and the student hasn't attempted it; otherwise, we 
+		#    skip it and let the versions speak for themselves
+		if ( defined( $set->assignment_type() ) &&
+		     $set->assignment_type() =~ /gateway/ &&
+		     ref( $setVersionsByID{ $setName } ) ) {
+			if ( @{$setVersionsByID{$setName}} ) {
+				next;
+			} else {
+				push( @rows, CGI::Tr({}, CGI::td(WeBWorK::ContentGenerator::underscore2nbsp($setID)), 
+						     CGI::td({colspan=>4}, CGI::em("No versions of this assignment have been taken."))) );
+				next;
+			}
+		}
+		# if the set has hide_score set, then we need to skip printing
+		#    the score as well
+		if ( defined( $set->hide_score ) &&
+		     ( ! $authz->hasPermissions($r->param("user"), "view_hidden_work") &&
+		       ( $set->hide_score eq 'Y' || 
+			 ($set->hide_score eq 'BeforeAnswerDate' && time < $set->answer_date) ) ) ) {
+			push( @rows, CGI::Tr({}, CGI::td(WeBWorK::ContentGenerator::underscore2nbsp("${setID}_(test_" . $set->version_id . ")")), 
+					     CGI::td({colspan=>4}, CGI::em("Display of scores for this set is not allowed."))) );
+			next;
+		}
+
+		# otherwise, if it's a gateway, adjust the act-as url
+		my $setIsVersioned = 0;
+		if ( defined( $set->assignment_type() ) && 
+		     $set->assignment_type() =~ /gateway/ ) {
+			$setIsVersioned = 1;
+			if ( $set->assignment_type() eq 'proctored_gateway' ) {
+				$act_as_student_set_url =~ s/($courseName)\//$1\/proctored_quiz_mode\//;
+			} else {
+				$act_as_student_set_url =~ s/($courseName)\//$1\/quiz_mode\//;
+			}
+		}
+	   ##############################################
+	   # this segment requires @problemRecords, $db, $set
+	   # and $studentName, $setName, 
+	   ##############################################
+       my ($status, 
+           $longStatus, 
+           $string,
+           $twoString, 
+           $totalRight,
+           $total, 
+           $num_of_attempts, 
+           $num_of_problems);
+           
+          ($status, 
+           $longStatus, 
+           $string,
+           $twoString, 
+           $totalRight,
+           $total, 
+           $num_of_attempts, 
+           $num_of_problems
+           )   = grade_set( $db, $set, $setName, $studentName, $setIsVersioned);
+
+# 		warn "status $status  longStatus $longStatus string $string twoString 
+# 		      $twoString totalRight $totalRight, total $total num_of_attempts $num_of_attempts 
+# 		      num_of_problems $num_of_problems setName $setName";
+
+		my $avg_num_attempts = ($num_of_problems) ? $num_of_attempts/$num_of_problems : 0;
+		my $successIndicator = ($avg_num_attempts && $total) ? ($totalRight/$total)**2/$avg_num_attempts : 0 ;
+		
+		$max_problems = ($max_problems<$num_of_problems)? $num_of_problems:$max_problems;
+		
+		# prettify versioned set display
+		$setName =~ s/(.+),v(\d+)$/${1}_(test_$2)/;
+	
+		push @rows, CGI::Tr({},
+			CGI::td(CGI::a({-href=>$act_as_student_set_url}, WeBWorK::ContentGenerator::underscore2nbsp($setName))),
+			CGI::td(sprintf("%0.2f",$totalRight)), # score
+			CGI::td($total), # out of 
+			#CGI::td(sprintf("%0.0f",100*$successIndicator)),   # indicator -- leave this out
+			CGI::td("<pre>$string\n$twoString</pre>"), # problems
+			#CGI::td($studentRecord->section),
+			#CGI::td($studentRecord->recitation),
+			#CGI::td($studentRecord->user_id),			
+			
+		);
+	
+	}
+
+	my $problem_header = "";
+	foreach (1 .. $max_problems) {
+		$problem_header .= &threeSpaceFill($_);
+	}
+	
+	my $table_header = join("\n",
+		CGI::start_table({-border=>5,style=>'font-size:smaller',-id=>"grades_table"}),
+		CGI::Tr({},
+			CGI::th({ -align=>'center',},'Set'),
+			CGI::th({ -align=>'center', },'Score'),
+			CGI::th({ -align=>'center', },'Out'.CGI::br().'Of'),
+			#CGI::th({ -align=>'center', },'Ind'),  #  -- leave out indicator column
+			CGI::th({ -align=>'center', },'Problems'.CGI::br().CGI::pre($problem_header)),
+			#CGI::th({ -align=>'center', },'Section'),
+			#CGI::th({ -align=>'center', },'Recitation'),
+			#CGI::th({ -align=>'center', },'login_name'),
+			#CGI::th({ -align=>'center', },'ID'),
+		)
+	);
+	
+
+	
+	print $table_header;
+	print @rows;
+	print CGI::end_table();
+			
+	return "";
+}
+################
+# TASKS
+###################
+
+#  grading utility
+# provides a formatted line for presenting grades (
+###############################################################
+# 17-2-motion-velocity 	0.00 	7 	0 	.  .  .  .  .  .  .  
+#                                        0  0  0  0  0  0  0  
+###############################################################
+# requires = grade_set( $db, $set, $setName, $studentName, $setIsVersioned);
+# returns   my ($status, 
+#            $longStatus, 
+#            $string,
+#            $twoString, 
+#            $totalRight,
+#            $total, 
+#            $num_of_attempts, 
+#            $num_of_problems) = grade_set(...);
+#########################
+# 			########################################
+# 			# Notes for factoring the calculation in this loop.
+# 			#
+# 			# Inputs include:
+# 			#   @problemRecords  
+# 			# returns
+# 			#   $num_of_attempts
+# 			#   $status
+# 			# updates
+# 			#   $number_of_students_attempting_problem{$probID}++;
+# 			#   @{ $attempts_list_for_problem{$probID} }   
+# 			#   $number_of_attempts_for_problem{$probID}
+# 			#   $total_num_of_attempts_for_set
+# 			#   $correct_answers_for_problem{$probID}   
+# 			#    
+# 			#   $string (formatting output)
+# 			#   $twoString (more formatted output)
+# 			#   $longtwo (a combination of $string and $twostring)
+# 			#   $total
+# 			#   $totalRight
+# 			###################################
+sub grade_set {
+        
+        my ($db, $set, $setName, $studentName, $setIsVersioned) = @_;
+
+        my $setID = $set->set_id();  #FIXME   setName and setID should be the same
+
+		my $status = 0;
+		my $longStatus = '';
+		my $string     = '';
+		my $twoString  = '';
+		my $totalRight = 0;
+		my $total      = 0;
+		my $num_of_attempts = 0;
+	
+		debug("Begin collecting problems for set $setName");
+		# DBFIXME: to collect the problem records, we have to know 
+		#    which merge routines to call.  Should this really be an 
+		#    issue here?  That is, shouldn't the database deal with 
+		#    it invisibly by detecting what the problem types are?  
+		#    oh well.
+		
+		my @problemRecords = $db->getAllMergedUserProblems( $studentName, $setID );
+		my $num_of_problems  = @problemRecords || 0;
+		my $max_problems     = defined($num_of_problems) ? $num_of_problems : 0; 
+
+		if ( $setIsVersioned ) {
+			@problemRecords = $db->getAllMergedProblemVersions( $studentName, $setID, $set->version_id );
+		}   # use versioned problems instead (assume that each version has the same number of problems.
+		
+		debug("End collecting problems for set $setName");
+
+	####################
+	# Resort records
+	#####################
+		@problemRecords = sort {$a->problem_id <=> $b->problem_id }  @problemRecords;
+		
+		# for gateway/quiz assignments we have to be careful about 
+		#    the order in which the problems are displayed, because
+		#    they may be in a random order
+		if ( $set->problem_randorder ) {
+			my @newOrder = ();
+			my @probOrder = (0..$#problemRecords);
+			# we reorder using a pgrand based on the set psvn
+			my $pgrand = PGrandom->new();
+			$pgrand->srand( $set->psvn );
+			while ( @probOrder ) { 
+				my $i = int($pgrand->rand(scalar(@probOrder)));
+				push( @newOrder, $probOrder[$i] );
+				splice(@probOrder, $i, 1);
+			}
+			# now $newOrder[i] = pNum-1, where pNum is the problem
+			#    number to display in the ith position on the test
+			#    for sorting, invert this mapping:
+			my %pSort = map {($newOrder[$_]+1)=>$_} (0..$#newOrder);
+
+			@problemRecords = sort {$pSort{$a->problem_id} <=> $pSort{$b->problem_id}} @problemRecords;
+		}
+		
+		
+    #######################################################
+	# construct header
+	
+		foreach my $problemRecord (@problemRecords) {
+			my $prob = $problemRecord->problem_id;
+			
+			unless (defined($problemRecord) ){
+				# warn "Can't find record for problem $prob in set $setName for $student";
+				# FIXME check the legitimate reasons why a student record might not be defined
+				next;
+			}
+			
+		    $status           = $problemRecord->status || 0;
+		    my  $attempted    = $problemRecord->attempted;
+			my $num_correct   = $problemRecord->num_correct || 0;
+			my $num_incorrect = $problemRecord->num_incorrect   || 0;
+			$num_of_attempts  += $num_correct + $num_incorrect;
+
+#######################################################
+			# This is a fail safe mechanism that makes sure that
+			# the problem is marked as attempted if the status has
+			# been set or if the problem has been attempted
+			# DBFIXME this should happen in the database layer, not here!
+			if (!$attempted && ($status || $num_of_attempts)) {
+				$attempted = 1;
+				$problemRecord->attempted('1');
+				# DBFIXME: this is another case where it 
+				#    seems we shouldn't have to check for 
+				#    which routine to use here...
+				if ( $setIsVersioned ) {
+					$db->putProblemVersion($problemRecord);
+				} else {
+					$db->putUserProblem($problemRecord );
+				}
+			}
+######################################################			
+
+			# sanity check that the status (score) is 
+			# between 0 and 1
+			my $valid_status = ($status>=0 && $status<=1)?1:0;
+
+			###########################################
+			# Determine the string $longStatus which 
+			# will display the student's current score
+			###########################################			
+
+			if (!$attempted){
+				$longStatus     = '.';
+			} elsif   ($valid_status) {
+				$longStatus     = int(100*$status+.5);
+				$longStatus='C' if ($longStatus==100);
+			} else	{
+				$longStatus 	= 'X';
+			}
+
+			$string          .= threeSpaceFill($longStatus);
+			$twoString       .= threeSpaceFill($num_incorrect);
+			my $probValue     = $problemRecord->value;
+			$probValue        = 1 unless defined($probValue) and $probValue ne "";  # FIXME?? set defaults here?
+			$total           += $probValue;
+			$totalRight      += round_score($status*$probValue) if $valid_status;
+			
+# 				
+# 			# initialize the number of correct answers 
+# 			# for this problem if the value has not been 
+# 			# defined.
+# 			$correct_answers_for_problem{$probID} = 0 
+# 				unless defined($correct_answers_for_problem{$probID});
+			
+# 				
+# 		# add on the scores for this problem
+# 			if (defined($attempted) and $attempted) {
+# 				$number_of_students_attempting_problem{$probID}++;
+# 				push( @{ $attempts_list_for_problem{$probID} } ,     $num_of_attempts);
+# 				$number_of_attempts_for_problem{$probID}             += $num_of_attempts;
+# 				$h_problemData{$probID}                               = $num_incorrect;
+# 				$total_num_of_attempts_for_set                       += $num_of_attempts;
+# 				$correct_answers_for_problem{$probID}                += $status;
+# 			}
+
+		}  # end of problem record loop
+
+
+
+		return($status,  
+			   $longStatus, 
+			   $string,
+			   $twoString, 
+			   $totalRight,
+			   $total, 
+			   $num_of_attempts, 
+			   $num_of_problems			
+		);
+}
+#################################
+# Utility function NOT a method
+#################################
+sub threeSpaceFill {
+	my $num = shift @_ || 0;
+
+	if (length($num)<=1) {return "$num".'&nbsp;&nbsp;';}
+	elsif (length($num)==2) {return "$num".'&nbsp;';}
+	else {return "## ";}
+}
+sub round_score{
+	return shift;
+}
+
+1;
diff --git a/lib/WeBWorK/ContentGenerator/Hardcopy.pm b/lib/WeBWorK/ContentGenerator/Hardcopy.pm
index d3ace5ae83..6d55167526 100644
--- a/lib/WeBWorK/ContentGenerator/Hardcopy.pm
+++ b/lib/WeBWorK/ContentGenerator/Hardcopy.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm,v 1.102 2009/09/25 00:39:49 gage 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
@@ -17,744 +17,1199 @@
 package WeBWorK::ContentGenerator::Hardcopy;
 use base qw(WeBWorK::ContentGenerator);
 
-
 =head1 NAME
 
-WeBWorK::ContentGenerator::Hardcopy - generate a PDF version of one or more
+WeBWorK::ContentGenerator::Hardcopy - generate printable versions of one or more
 problem sets.
 
 =cut
 
 use strict;
 use warnings;
-use CGI qw();
-use File::Path qw(rmtree);
+
+#use Apache::Constants qw/:common REDIRECT/;
+#use CGI qw(-nosticky );
+use WeBWorK::CGI;
+
+use File::Path;
+use File::Temp qw/tempdir/;
+use String::ShellQuote;
+use WeBWorK::DB::Utils qw/user2global/;
+use WeBWorK::Debug;
 use WeBWorK::Form;
+use WeBWorK::HTML::ScrollingRecordList qw/scrollingRecordList/;
 use WeBWorK::PG;
-use WeBWorK::Utils qw(readFile makeTempDirectory);
-use Apache::Constants qw(:common REDIRECT);
+use WeBWorK::Utils qw/readFile decodeAnswers/;
+use PGrandom;
+
+=head1 CONFIGURATION VARIABLES
+
+=over
+
+=item $PreserveTempFiles
+
+If true, don't delete temporary files.
+
+=cut
+
+our $PreserveTempFiles = 0 unless defined $PreserveTempFiles;
+
+=back
+
+=cut
+
+our $HC_DEFAULT_FORMAT = "pdf"; # problems if this is not an allowed format for the user...
+our %HC_FORMATS = (
+	tex => { name => "TeX Source", subr => "generate_hardcopy_tex" },
+	pdf => { name => "Adobe PDF",  subr => "generate_hardcopy_pdf" },
+);
+
+# custom fields used in $self hash
+# FOR HEAVEN'S SAKE, PLEASE KEEP THIS UP-TO-DATE!
+# 
+# final_file_url
+#   contains the URL of the final hardcopy file generated
+#   set by generate_hardcopy(), used by pre_header_initialize() and body()
+# 
+# temp_file_map
+#   reference to a hash mapping temporary file names to URL
+#   set by pre_header_initialize(), used by body()
+# 
+# hardcopy_errors
+#   reference to array containing HTML strings describing generation errors (and warnings)
+#   used by add_errors(), get_errors(), get_errors_ref()
+# 
+# at_least_one_problem_rendered_without_error
+#   set to a true value by write_problem_tex if it is able to sucessfully render
+#   a problem. checked by generate_hardcopy to determine whether to continue
+#   with the generation process.
+#
+# versioned
+#   set to a true value in write_set_tex if the set_id indicates that 
+#   the set being rendered is a versioned set; this is used in 
+#   write_problem_tex to determine which problem merging routine from 
+#   DB.pm to use, and to indicate what problem number in a versioned 
+#   test we're on
+#
+# mergedSets
+#   a reference to a hash { userID!setID => setObject }, where setID is 
+#   either the set id or the fake versioned set id "setName,vN" depending 
+#   on whether the set is a versioned set or not.  this may include the 
+#   sets for which the hardcopy is being generated (or may not), depending
+#   on whether they were needed to determine the required permissions for 
+#   generating a hardcopy
+#
+# canShowScore
+#   a reference to a hash { userID!setID => boolean }, where setID is either 
+#   the set id or the fake versioned set id "setName,vN" depending on whether 
+#   the set is a versioned set or not, and the value of the boolean is 
+#   determined by the corresponding userSet's value of hide_score and the 
+#   current time
+
+################################################################################
+# UI subroutines
+################################################################################
 
 sub pre_header_initialize {
-	my ($self, $singleSet) = @_;
-	
-	my $r               = $self->{r};
-	my $ce              = $self->{ce};
-	my $db              = $self->{db};
-	my @sets            = $r->param("hcSet");
-	my @users           = $r->param("hcUser");
-	my $hardcopy_format = $r->param('hardcopy_format') ? $r->param('hardcopy_format') : '';
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my $db = $r->db;
+	my $authz = $r->authz;
+	
+	my $userID = $r->param("user");
+	my $eUserID = $r->param("effectiveUser");
+	my @setIDs = $r->param("selected_sets");
+	my @userIDs = $r->param("selected_users");
+	my $hardcopy_format = $r->param("hardcopy_format");
+	my $generate_hardcopy = $r->param("generate_hardcopy");
+	my $send_existing_hardcopy = $r->param("send_existing_hardcopy");
+	my $final_file_url = $r->param("final_file_url");
+	
+	# if there's an existing hardcopy file that can be sent, get set up to do that
+	if ($send_existing_hardcopy) {
+		$self->reply_with_redirect($final_file_url);
+		$self->{final_file_url} = $final_file_url;
+		$self->{send_hardcopy} = 1;
+		return;
+	}
+
+	# this should never happen, but apparently it did once (see bug #714), so we check for it
+	die "Parameter 'user' not defined -- this should never happen" unless defined $userID;
 	
+	if ($generate_hardcopy) {
+		my $validation_failed = 0;
+		
+		# set default format
+		$hardcopy_format = $HC_DEFAULT_FORMAT unless defined $hardcopy_format;
+		
+		# make sure format is valid
+		unless (grep { $_ eq $hardcopy_format } keys %HC_FORMATS) {
+			$self->addbadmessage("'$hardcopy_format' is not a valid hardcopy format.");
+			$validation_failed = 1;
+		}
+		
+		# make sure we are allowed to generate hardcopy in this format
+		unless ($authz->hasPermissions($userID, "download_hardcopy_format_$hardcopy_format")) {
+			$self->addbadmessage("You do not have permission to generate hardcopy in $hardcopy_format format.");
+			$validation_failed = 1;
+		}
+		
+		# is there at least one user and set selected?
+		unless (@userIDs) {
+			$self->addbadmessage("Please select at least one user and try again.");
+			$validation_failed = 1;
+		}	
 
-	# add singleSet to the list of sets
-	if (length $singleSet > 0) {
-		$singleSet =~ s/^set//;
-		unshift @sets, $singleSet unless grep { $_ eq $singleSet } @sets;
+# when students don't select any sets the size of @setIDs is 1 with a null character in $setIDs[0].
+# when professors don't select any sets the size of @setIDs is 0. 
+# the following test "unless ((@setIDs) and ($setIDs[0] =~ /\S+/))" catches both cases and prevents
+# warning messages in the case of a professor's empty array.
+		unless ((@setIDs) and ($setIDs[0] =~ /\S+/)) {
+			$self->addbadmessage("Please select at least one set and try again.");
+			$validation_failed = 1;			
+		}
+		
+		# is the user allowed to request multiple sets/users at a time?
+		my $perm_multiset = $authz->hasPermissions($userID, "download_hardcopy_multiset");
+		my $perm_multiuser = $authz->hasPermissions($userID, "download_hardcopy_multiuser");
+		
+		my $perm_viewhidden = $authz->hasPermissions($userID, "view_hidden_work");
+		my $perm_viewfromip = $authz->hasPermissions($userID, "view_ip_restricted_sets");
+		
+		if (@setIDs > 1 and not $perm_multiset) {
+			$self->addbadmessage("You are not permitted to generate hardcopy for multiple sets. Please select a single set and try again.");
+			$validation_failed = 1;
+		}
+		if (@userIDs > 1 and not $perm_multiuser) {
+			$self->addbadmessage("You are not permitted to generate hardcopy for multiple users. Please select a single user and try again.");
+			$validation_failed = 1;
+		}
+		if (@userIDs and $userIDs[0] ne $eUserID and not $perm_multiuser) {
+			$self->addbadmessage("You are not permitted to generate hardcopy for other users.");
+			$validation_failed = 1;
+			# FIXME -- download_hardcopy_multiuser controls both whether a user can generate hardcopy
+			# that contains sets for multiple users AND whether she can generate hardcopy that contains
+			# sets for users other than herself. should these be separate permission levels?
+		}
+
+		# to check if the set has a "hide_work" flag, or if we aren't
+		#    allowed to view the set from the user's IP address, we 
+		#    need the userset objects; if we've not failed validation 
+		#    yet, get those to check on this
+		my %canShowScore = ();
+		my %mergedSets = ();
+		unless ($validation_failed ) {
+			foreach my $sid ( @setIDs ) {
+				my($s,undef,$v) = ($sid =~ /([^,]+)(,v(\d+))?$/);
+				foreach my $uid ( @userIDs ) {
+					if ( $perm_viewhidden && $perm_viewfromip ) { 
+						$canShowScore{"$uid!$sid"} = 1;
+					} else {
+						my $userSet;
+						if ( defined($v) ) {
+							$userSet = $db->getMergedSetVersion($uid,$s,$v);
+						} else {
+							$userSet = $db->getMergedSet($uid,$s);
+						}
+						$mergedSets{"$uid!$sid"} = $userSet;
+						if ( ! $perm_viewhidden &&
+						     defined( $userSet->hide_work ) &&
+						     ( $userSet->hide_work eq 'Y' ||
+						       ( $userSet->hide_work eq 'BeforeAnswerDate' &&
+							 time < $userSet->answer_date ) ) ) {
+							$validation_failed = 1;
+							$self->addbadmessage("You are not permitted to generate a hardcopy for a set with hidden work.");
+							last;
+						}
+
+						if ( $authz->invalidIPAddress($userSet) ) {
+							$validation_failed = 1;
+							$self->addbadmessage("You are not allowed to generate a " .
+									     "hardcopy for " . $userSet->set_id . 
+									     " from your IP address, " .
+									     $r->connection->remote_ip . ".");
+							last;
+						}
+
+						$canShowScore{"$uid!$sid"} = 
+						    ( ! defined( $userSet->hide_score ) ||
+						      $userSet->hide_score eq '' ) ||
+							( $userSet ->hide_score eq 'N' ||
+							  ( $userSet->hide_score eq 'BeforeAnswerDate' &&
+							    time >= $userSet->answer_date ) );
+# 	die("hide_score = ", $userSet->hide_score, "; canshow{$uid!$sid} = ", (($canShowScore{"$uid!$sid"})?"True":"False"), "\n");
+
+					}
+					last if $validation_failed;
+				}
+			}
+		}
+		
+		unless ($validation_failed) {
+			$self->{canShowScore} = \%canShowScore;
+			$self->{mergedSets} = \%mergedSets;
+			my ($final_file_url, %temp_file_map) = $self->generate_hardcopy($hardcopy_format, \@userIDs, \@setIDs);
+			if ($self->get_errors) {
+				# store the URLs in self hash so that body() can make a link to it
+				$self->{final_file_url} = $final_file_url;
+				$self->{temp_file_map} = \%temp_file_map;
+			} else {
+				# send the file only
+				$self->reply_with_redirect($final_file_url);
+			}
+		}
 	}
-	
-	# default user is the effectiveUser
-	unless (@users) {
-		unshift @users, $r->param("effectiveUser");
+}
+
+sub body {
+	my ($self) = @_;
+	my $userID = $self->r->param("user");
+	my $perm_view_errors = $self->r->authz->hasPermissions($userID, "download_hardcopy_view_errors");
+	$perm_view_errors = (defined($perm_view_errors) ) ? $perm_view_errors : 0;
+	if (my $num = $self->get_errors) {
+		my $final_file_url = $self->{final_file_url};
+		my %temp_file_map = %{$self->{temp_file_map}};
+		if($perm_view_errors) {
+			my $errors_str = $num > 1 ? "errors" : "error";
+			print CGI::p("$num $errors_str occured while generating hardcopy:");
+			
+			print CGI::ul(CGI::li($self->get_errors_ref));
+		}
+		
+		if ($final_file_url) {
+			print CGI::p(
+				"A hardcopy file was generated, but it may not be complete or correct.", 
+				"Please check that no problems are missing and that they are all legible." , 
+				"If not, please inform your instructor.<br />",
+				CGI::a({href=>$final_file_url}, "Download Hardcopy"),
+			);
+		} else {
+			print CGI::p(
+				"WeBWorK was unable to generate a paper copy of this homework set.  Please inform your instructor. "
+			); 
+		
+		}
+		if($perm_view_errors) {
+			if (%temp_file_map) {
+				print CGI::start_p();
+				print "You can also examine the following temporary files: ";
+				my $first = 1;
+				while (my ($temp_file_name, $temp_file_url) = each %temp_file_map) {
+					if ($first) {
+						$first = 0;
+					} else {
+						print ", ";
+					}
+					print CGI::a({href=>$temp_file_url}, " $temp_file_name");
+				}
+				print CGI::end_p();
+			}
+		}
+		
+		print CGI::hr();
+	}
+
+	# don't display the retry form if there are errors and the user doesn't have permission to view the errors.
+	unless ($self->get_errors and not $perm_view_errors) {
+		$self->display_form();
+	}
+	''; # return a blank
+}
+
+sub display_form {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $db = $r->db;
+	my $authz = $r->authz;
+	my $userID = $r->param("user");
+	my $eUserID = $r->param("effectiveUser");
+	
+	# first time we show up here, fill in some values
+	unless ($r->param("in_hc_form")) {
+		# if a set was passed in via the path_info, add that to the list of sets.
+		my $singleSet = $r->urlpath->arg("setID");
+		if (defined $singleSet and $singleSet ne "") {
+			my @selected_sets = $r->param("selected_sets");
+			$r->param("selected_sets" => [ @selected_sets, $singleSet]) unless grep { $_ eq $singleSet } @selected_sets;
+		}
+		
+		# if no users are selected, select the effective user
+		my @selected_users = $r->param("selected_users");
+		unless (@selected_users) {
+			$r->param("selected_users" => $eUserID);
+		}
 	}
 	
-	$self->{user}            = $db->getUser($r->param("user")); # checked
-	die "user ", $r->param("user"), " (real user) not found."
-		unless $self->{user};
-	
-	$self->{effectiveUser}   = $db->getUser($r->param("effectiveUser")); # checked
-	die "user ", $r->param("effectiveUser"), " (effective user) not found."
-		unless $self->{effectiveUser};
+	my $perm_multiset = $authz->hasPermissions($userID, "download_hardcopy_multiset");
+	my $perm_multiuser = $authz->hasPermissions($userID, "download_hardcopy_multiuser");
+	my $perm_texformat = $authz->hasPermissions($userID, "download_hardcopy_format_tex");
+	my $perm_unopened = $authz->hasPermissions($userID, "view_unopened_sets");
+	my $perm_view_hidden = $authz->hasPermissions($userID, "view_hidden_sets");
 	
-	my $PermissionLevel = $db->getPermissionLevel($r->param("user")); # checked
-	if ($PermissionLevel) {
-		$self->{permissionLevel} = $PermissionLevel->permission();
-	} else {
-		die "permission level for user ", $r->param("user"), " (real user) not found.";
+	# get formats
+	my @formats;
+	foreach my $format (keys %HC_FORMATS) {
+		push @formats, $format if $authz->hasPermissions($userID, "download_hardcopy_format_$format");
 	}
 	
-	$self->{sets}            = \@sets;
-	$self->{users}           = \@users;
-	$self->{hardcopy_format} = $hardcopy_format;
-	$self->{errors}          = [];
-	$self->{warnings}        = [];
+	# get format names hash for radio buttons
+	my %format_labels = map { $_ => $HC_FORMATS{$_}{name} || $_ } @formats;
 	
+	# get users for selection
+	my @Users;
+	if ($perm_multiuser) {
+		# if we're allowed to select multiple users, get all the users
+		# DBFIXME shouldn't need to pass list of users, should use iterator for results?
+		@Users = $db->getUsers($db->listUsers);
+	} else {
+		# otherwise, we get our own record only
+		@Users = $db->getUser($eUserID);
+	}
 	
-	# security checks
-	my $multiSet    = $self->{permissionLevel} > 0;
-	my $multiUser   = $self->{permissionLevel} > 0;
-	
-	if (@sets > 1 and not $multiSet) {
-		$self->{generationError} = ["SIMPLE", "You are not permitted to generate hardcopy for multiple sets. Please select a single set and try again."];
+	# get sets for selection
+	# DBFIXME should use WHERE clause to filter on open_date and visible, rather then getting all
+	my @globalSetIDs;
+	my @GlobalSets;
+	if ($perm_multiuser) {
+		# if we're allowed to select sets for multiple users, get all sets.
+		@globalSetIDs = $db->listGlobalSets;
+		@GlobalSets = $db->getGlobalSets(@globalSetIDs);
+	} else {
+		# otherwise, only get the sets assigned to the effective user.
+		# note that we are getting GlobalSets, but using the list of UserSets assigned to the
+		# effective user. this is because if we pass UserSets  to ScrollingRecordList it will
+		# give us composite IDs back, which is a pain in the ass to deal with.
+		@globalSetIDs = $db->listUserSets($eUserID);
+		@GlobalSets = $db->getGlobalSets(@globalSetIDs);
 	}
-	if (@users > 1 and not $multiUser) {
-		$self->{generationError} = ["SIMPLE", "You are not permitted to generate hardcopy for multiple users. Please select a single user and try again."];
+	# we also want to get the versioned sets for this user
+	# FIXME: this is another place where we assume that there is a 
+	#    one-to-one correspondence between assignment_type =~ gateway
+	#    and versioned sets.  I think we really should have a 
+	#    "is_versioned" flag on set objects instead.
+	my @versionedSets = grep {$_->assignment_type =~ /gateway/} @GlobalSets;
+	my @SetVersions = ();
+	foreach my $v (@versionedSets) {
+		my @usv = map { [$eUserID, $v->set_id, $_] } ( $db->listSetVersions( $eUserID, $v->set_id ) );
+		push( @SetVersions, $db->getSetVersions( @usv ) );
 	}
-	if ($users[0] ne $self->{effectiveUser}->user_id and not $multiUser) {
-		$self->{generationError} = ["SIMPLE", "You are not permitted to generate hardcopy for other users."];
+	# FIXME: this is a hideous, horrible hack.  the identifying key for 
+	#    a global set is the set_id.  those for a set version are the 
+	#    set_id and version_id.  but this means that we have trouble 
+	#    displaying them both together in HTML::scrollingRecordList.  
+	#    so we brutally play tricks with the set_id here, which probably
+	#    is not very robust, and certainly is aesthetically displeasing.
+	#    yuck.
+	foreach ( @SetVersions ) { 
+		$_->set_id($_->set_id . ",v" . $_->version_id); 
 	}
 	
-	unless ($self->{generationError}) {
-		if ($r->param("generateHardcopy")) {
-#			my ($tempDir, $fileName) = eval { $self->generateHardcopy() };
-			my ($pdfFileURL) = eval { $self->generateHardcopy() };
-			
-			$self->{generationError} = $@ if $@;
-# 			warn "pdfFileURL is $pdfFileURL";
-# 			warn "generation error is ".$self->{generationError};
-# 			warn "hardcopy_format is ".$self->{hardcopy_format};
-			if ( $self->{generationError}  ) {
-				
-				# In this case no correct pdf file was generated.
-				# throw the error up higher.
-				# The error is reported in body.
-				# the tempDir was removed in generateHardcopy
-			} elsif ( $self->{hardcopy_format} eq 'tex')   {
-				# Only tex output was asked for, proceed to have the tex output handled by the subroutine
-				# "body".
-				
-			} else {
-			    # information for redirect
-			    	$self->{pdfFileURL} = $pdfFileURL;
-			}
+	# filter out unwanted sets
+	my @WantedGlobalSets;
+	foreach my $i (0 .. $#GlobalSets) {
+		my $Set = $GlobalSets[$i];
+		unless (defined $Set) {
+			warn "\$GlobalSets[$i] (ID $globalSetIDs[$i]) not defined -- skipping";
+			next;
 		}
+		next unless $Set->open_date <= time or $perm_unopened;
+		next unless $Set->visible or $perm_view_hidden;
+		# also skip gateway sets, for which we have to have a 
+		#    version to print something
+		next if $Set->assignment_type =~ /gateway/;
+		push @WantedGlobalSets, $Set;
 	}
-}
-
-sub header {
-	my ($self) = @_;
-	my $r = $self->{r};
 	
-	if (exists $self->{pdfFileURL}) {
- 		$r->header_out(Location => $self->{pdfFileURL} );
-		$self->{noContent} = 1;
- 		return REDIRECT;
-	}
-	$r->content_type("text/html");
-	$r->send_http_header();
-}
+	my $scrolling_user_list = scrollingRecordList({
+		name => "selected_users",
+		request => $r,
+		default_sort => "lnfn",
+		default_format => "lnfn_uid",
+		default_filters => ["all"],
+		size => 20,
+		multiple => $perm_multiuser,
+	}, @Users);
+	
+	my $scrolling_set_list = scrollingRecordList({
+		name => "selected_sets",
+		request => $r,
+		default_sort => "set_id",
+		default_format => "sid",
+		default_filters => ["all"],
+		size => 20,
+		multiple => $perm_multiset,
+	}, @WantedGlobalSets, @SetVersions );
+	
+	# we change the text a little bit depending on whether the user has multiuser privileges
+	my $ss = $perm_multiuser ? "s" : "";
+	my $aa = $perm_multiuser ? " " : " a ";
+	my $phrase_for_privileged_users = $perm_multiuser ? "to privileged users or" : "";
+	my $button_label = $perm_multiuser ? "Generate hardcopy for selected sets and selected users" :"Generate hardcopy";
+	
+# 	print CGI::start_p();
+# 	print "Select the homework set$ss for which to generate${aa}hardcopy version$ss.";
+# 	if ($authz->hasPermissions($userID, "download_hardcopy_multiuser")) {
+# 		print "You may also select multiple users from the users list. You will receive hardcopy for each (set, user) pair.";
+# 	}
+# 	print CGI::end_p();
+	
+	print CGI::start_form(-method=>"POST", -action=>$r->uri);
+	print $self->hidden_authen_fields();
+	print CGI::hidden("in_hc_form", 1);
+	
+	if ($perm_multiuser and $perm_multiset) {
+		print CGI::p("Select the homework sets for which to generate hardcopy versions. You may"
+		      ." also select multiple users from the users list. You will receive hardcopy" 
+		      ." for each (set, user) pair.");
+		
+		print CGI::table({class=>"FormLayout"},
+			CGI::Tr({},
+				CGI::th("Users"),
+				CGI::th("Sets"),
+			),
+			CGI::Tr({},
+				CGI::td($scrolling_user_list),
+				CGI::td($scrolling_set_list),
+			),
+		);
+	} else { # single user mode
+		#FIXME -- do a better job of getting the set and the user when in the single set mode
+		my $selected_set_id = $r->param("selected_sets");
+		$selected_set_id = '' unless defined $selected_set_id;
 
-# -----
+		my $selected_user_id = $Users[0]->user_id;
+		print CGI::hidden("selected_sets",   $selected_set_id ),
+		      CGI::hidden( "selected_users", $selected_user_id);
 
-sub path {
-	my ($self, undef, $args) = @_;
+	        # make display for versioned sets a bit nicer
+		$selected_set_id =~ s/,v(\d+)$/ (test $1)/;
+		
+		print CGI::p("Download hardcopy of set ", $selected_set_id, " for ", $Users[0]->first_name, " ",$Users[0]->last_name,"?");
 	
-	my $ce = $self->{ce};
-	my $root = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
-	return $self->pathMacro($args,
-		"Home" => "$root",
-		$courseName => "$root/$courseName",
-		"Hardcopy Generator" => "",
+	}
+	print CGI::table({class=>"FormLayout"},
+		CGI::Tr({},
+			CGI::td({colspan=>2, class=>"ButtonRow"},
+				CGI::small("You may choose to show any of the following data. Correct answers and solutions are only 
+				            available $phrase_for_privileged_users after the answer date of the homework set."),
+				CGI::br(),
+				CGI::b("Show:"), " ",
+				CGI::checkbox(
+					-name    => "printStudentAnswers",
+					-checked => defined($r->param("printStudentAnswers"))? $r->param("printStudentAnswers") : 1, # checked by default
+					-label   => "Student answers",
+				),
+				CGI::checkbox(
+					-name    => "showCorrectAnswers",
+					-checked => scalar($r->param("showCorrectAnswers")) || 0,
+					-label   => "Correct answers",
+				),
+				CGI::checkbox(
+					-name    => "showHints",
+					-checked => scalar($r->param("showHints")) || 0,
+					-label   => "Hints",
+				),
+				CGI::checkbox(
+					-name    => "showSolutions",
+					-checked => scalar($r->param("showSolutions")) || 0,
+					-label   => "Solutions",
+				),
+			),
+		),
+		CGI::Tr({},
+			CGI::td({colspan=>2, class=>"ButtonRow"},
+				CGI::b("Hardcopy Format:"), " ",
+				CGI::radio_group(
+					-name    => "hardcopy_format",
+					-values  => \@formats,
+					-default => scalar($r->param("hardcopy_format")) || $HC_DEFAULT_FORMAT,
+					-labels  => \%format_labels,
+				),
+			),
+		),
+		CGI::Tr({},
+			CGI::td({colspan=>2, class=>"ButtonRow"},
+				CGI::submit(
+					-name => "generate_hardcopy",
+					-value => $button_label,
+					#-style => "width: 45ex",
+				),
+			),
+		),
 	);
+	
+	print CGI::end_form();
+	
+	return "";
 }
 
-sub title {
-	return "Hardcopy Generator";
-}
+################################################################################
+# harddcopy generating subroutines
+################################################################################
 
-sub body {
-	my $self = shift;
-	
-	if ($self->{generationError}) {
-		if (ref $self->{generationError} eq "ARRAY") {
-			my ($disposition, @rest) = @{$self->{generationError}};
-			if ($disposition eq "PGFAIL") {
-				$self->multiErrorOutput(@{$self->{errors}});
-				return "";
-			} elsif ($disposition eq "FAIL") {
-				print $self->errorOutput(@rest);
-				return "";
-			} elsif ($disposition eq "RETRY") {
-				print $self->errorOutput(@rest);
-			} else { # a "simple" error
-				print CGI::p(CGI::font({-color=>"red"}, @rest));
-			}
-		} else {
-			# not something we were expecting...
-			die $self->{generationError};
-		}
-	}
-	if (@{$self->{warnings}}) {
-		# FIXME: this code will only be reached if there was also a
-		# generation error, because otherwise the module will send
-		# the PDF instead. DAMN!
-		$self->multiWarningOutput(@{$self->{warnings}});
+sub generate_hardcopy {
+	my ($self, $format, $userIDsRef, $setIDsRef) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my $db = $r->db;
+	my $authz = $r->authz;
+	
+	my $courseID = $r->urlpath->arg("courseID");
+	my $userID = $r->param("user");
+	my $eUserID = $r->param("effectiveUser");
+	
+	# we want to make the temp directory web-accessible, for error reporting
+	# use mkpath to ensure it exists (mkpath is pretty much ``mkdir -p'')
+	my $temp_dir_parent_path = $ce->{courseDirs}{html_temp} . "/hardcopy";
+	eval { mkpath($temp_dir_parent_path) };
+	if ($@) {
+		die "Couldn't create hardcopy directory $temp_dir_parent_path: $@";
 	}
-	if ($self->{hardcopy_format} eq 'tex') {
-	
-		my $r_tex_content = $self->{r_tex_content};
-		return $$r_tex_content;
-	
 	
+	# create a randomly-named working directory in the hardcopy directory
+	my $temp_dir_path = eval { tempdir("work.XXXXXXXX", DIR => $temp_dir_parent_path) };
+	if ($@) {
+		$self->add_errors("Couldn't create temporary working directory: ".CGI::code(CGI::escapeHTML($@)));
+		return;
 	}
-	$self->displayForm();
-}
+	# make sure the directory can be read by other daemons e.g. lighttpd
+	chmod 0755, $temp_dir_path;
 
-sub multiErrorOutput($@) {
-	my ($self, @errors) = @_;
 	
-	print CGI::h2("Compile Errors");
-	print CGI::p(<<EOF);
-WeBWorK has encountered one or more  errors while attempting to process
-these problem sets. It is likely that there are errors in the problems
-themselves. If you are a student, contact your professor to have the errors
-corrected. If you are a professor, please consult the error output below for
-more information.
-EOF
-	foreach my $error (@errors) {
-	    my $user = $error->{user};
-	    my $userName = $user->user_id . ' ('.$user->first_name.' '.$user->last_name. ')';
-		print CGI::h3("Set: ", $error->{set}, ", Problem: ", $error->{problem}, "for $userName");
-		print CGI::h4("Error messages"), CGI::blockquote(CGI::pre($error->{message}));
-		print CGI::h4("Error context"), CGI::blockquote(CGI::pre($error->{context}));
-	}
-}
-
-sub multiWarningOutput($@) {
-	my ($self, @warnings) = @_;
-	
-	print CGI::h2("Software Warnings");
-	print CGI::p(<<EOF);
-WeBWorK has encountered one or more warnings while attempting to process these
-problem sets. It is likely that this indicates errors or ambiguitiees in the
-problems themselves. If you are a student, contact your professor to have the
-problems corrected. If you are a professor, please consut the warning output
-below for more informaiton.
-EOF
-	foreach my $warning (@warnings) {
-		print CGI::h3("Set: ", $warning->{set}, ", Problem: ", $warning->{problem});
-		print CGI::h4("Error messages"), CGI::blockquote(CGI::pre($warning->{message}));
+	# do some error checking
+	unless (-e $temp_dir_path) {
+		$self->add_errors("Temporary directory '".CGI::code(CGI::escapeHTML($temp_dir_path))
+			."' does not exist, but creation didn't fail. This shouldn't happen.");
+		return;
 	}
-}
-
-# -----
-
-sub displayForm($) {
-	my $self = shift;
-	my $r = $self->{r};
-	my $db = $self->{db};
-	
-	print CGI::start_p(), "Select the problem sets for which to generate hardcopy versions.";
-	if ($self->{permissionLevel} > 0) {
-		print "You may also select multiple users from the users list. You will receive hardcopy for each (set, user) pair.";
+	unless (-w $temp_dir_path) {
+		$self->add_errors("Temporary directory '".CGI::code(CGI::escapeHTML($temp_dir_path))
+			."' is not writeable.");
+		$self->delete_temp_dir($temp_dir_path);
+		return;
 	}
-	print CGI::end_p();
 	
-	my $download_texQ = $self->{permissionLevel} > 0;
+	my $tex_file_name = "hardcopy.tex";
+	my $tex_file_path = "$temp_dir_path/$tex_file_name";
 	
-	#  ##########construct action URL #################
-	my $ce         = $self->{ce};
-	my $root       = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
-	my $actionURL  = "$root/$courseName/hardcopy/";
-	#  ################################################
+	#######################################
+	# create TeX file  (callback  write_multiuser_tex,  or ??)
+	#######################################
 	
-	print CGI::start_form(-method=>"POST", -action=>$actionURL);
-	print $self->hidden_authen_fields();
-	print CGI::h3("Options");
-	print CGI::p("You may choose to show any of the following data. Correct answers and solutions are only available to privileged users or after the answer date of the problem set.");
-	print CGI::p(
-		CGI::checkbox(
-			-name    => "showCorrectAnswers",
-			-checked => $r->param("showCorrectAnswers") || 0,
-			-label   => "Correct answers",
-		), CGI::br(),
-		CGI::checkbox(
-			-name    => "showHints",
-			-checked => $r->param("showHints") || 0,
-			-label   => "Hints",
-		), CGI::br(),
-		CGI::checkbox(
-			-name    => "showSolutions",
-			-checked => $r->param("showSolutions") || 0,
-			-label   => "Solutions",
-		),
-	);
-	print CGI::start_table({-width=>"100%"}), CGI::start_Tr({-valign=>"top"});
-	
-	my $multiSet          = $self->{permissionLevel} > 0;
-	my $multiUser         = $self->{permissionLevel} > 0;
-	my $preOpenSets       = $self->{permissionLevel} > 0;
-	my $effectiveUserName = $self->{effectiveUser}->user_id;	
-	my @setNames     = $db->listUserSets($effectiveUserName);
-	my @sets         = $db->getMergedSets( map { [$effectiveUserName, $_] }  @setNames ); # checked
-	@sets = grep { defined $_ } @sets;
-	@sets            = sort { $a->set_id cmp $b->set_id } @sets;
-	@setNames        = map( {$_->set_id } @sets );  # get sorted version of setNames
-	my %setLabels    = map( {($_->set_id, "set ".$_->set_id )} @sets );
-	my (@users, @userNames,%userLabels);
-	
-	if ($multiUser) {
-		@userNames    = $self->{db}->listUsers();
-		@users        = $self->{db}->getUsers(@userNames); # checked
-		@users = grep { defined $_ } @users;
-		@users        = sort { $a->last_name cmp $b->last_name } @users;
-		@userNames    = map( {$_->user_id} @users );  # get sorted version of user names
-		%userLabels   = map( {($_->user_id , $_->last_name .", ". $_->first_name ." --- ". $_->user_id   ) } @users ); 
-	}
-	# set selection menu
-	{
-		print CGI::start_td();
-		my $number_of_sets   = @{$self->{sets}};
-		print CGI::h3("Sets: $number_of_sets pre-selected");
-		print CGI::scrolling_list(-name=>'hcSet',
-							   -values=>\@setNames,
-							   -labels=>\%setLabels,
-							   -size  => 10,
-							   -multiple => $multiSet,
-							   -defaults => $self->{sets},					 
-		);	 
-		print CGI::end_td();
-	}
-	
-	# user selection menu
-	if ($multiUser) {
-		print CGI::start_td();
-		my $number_of_users       =   @{$self->{users}};
-		print CGI::h3("Users: $number_of_users pre-selected");
-		
-		print CGI::scrolling_list(-name=>'hcUser',
-							   -values=>\@userNames,
-							   -labels=>\%userLabels,
-							   -size  => 10,
-							   -multiple => 'true',
-							   -defaults => $self->{users},
-		);
-		print CGI::end_td();
+	my $open_result = open my $FH, ">", $tex_file_path;
+	unless ($open_result) {
+		$self->add_errors("Failed to open file '".CGI::code(CGI::escapeHTML($tex_file_path))
+			."' for writing: ".CGI::code(CGI::escapeHTML($!)));
+		$self->delete_temp_dir($temp_dir_path);
+		return;
+	}
+	$self->write_multiuser_tex($FH, $userIDsRef, $setIDsRef);
+	close $FH;
+	
+	# if no problems got rendered successfully, we can't continue
+	unless ($self->{at_least_one_problem_rendered_without_error}) {
+		$self->add_errors("No problems rendered. Can't continue.");
+		$self->delete_temp_dir($temp_dir_path);
+		return;
 	}
 	
-	print CGI::end_Tr(), CGI::end_table();
-	if ($download_texQ) {  # provide choice of pdf or tex output 
-		print CGI::p( {-align => "center"},
-				CGI::radio_group(
-							-name=>"hardcopy_format",
-							-values=>['pdf', 'tex'],
-							-default=>'pdf',
-							-labels=>{'tex'=>'TeX','pdf'=>'PDF'}
-				),
-		);
-	} else {   # only pdf output available
-		print CGI::hidden(-name=>'hardcopy_format',-value=>'pdf');
+	# if no hardcopy.tex file was generated, fail now
+	unless (-e "$temp_dir_path/hardcopy.tex") {
+		$self->add_errors("'".CGI::code("hardcopy.tex")."' not written to temporary directory '"
+			.CGI::code(CGI::escapeHTML($temp_dir_path))."'. Can't continue.");
+		$self->delete_temp_dir($temp_dir_path);
+		return;
 	}
-	print CGI::p({-align=>"center"},
-		CGI::submit(-name=>"generateHardcopy", -label=>"Generate Hardcopy"));
-	print CGI::end_form();
 	
-	return "";
-}
-
-sub generateHardcopy($) {
-	my $self = shift;
-	my $ce = $self->{ce};
-	my @sets = @{$self->{sets}};
-	my @users = @{$self->{users}};
-	my $multiSet = $self->{permissionLevel} > 0;
-	my $multiUser = $self->{permissionLevel} > 0;
-	# sanity checks
-	unless (@sets) {
-		die ["RETRY", "No sets were specified."];
-	}
-	unless (@users) {
-		die ["RETRY", "No users were specified."];
-	}
-	
-	# determine where hardcopy is going to go
-	my $tempDir = makeTempDirectory($ce->{webworkDirs}->{tmp}, "webwork-hardcopy");
-	
-	# determine name of PDF file  #FIXME it might be best to have the effective user in here somewhere
-	my $courseName = $self->{ce}->{courseName};
-	my $fileNameSet = (@sets > 1 ? "multiset" : $sets[0]);
-	my $fileNameUser = (@users > 1 ? "multiuser" : $users[0]);
-	my $fileName = "$courseName.$fileNameUser.$fileNameSet.pdf";
-	
-	# for each user ... generate TeX for each set
-	my $tex;
-	#
-	# the document tex preamble
-	$tex .= $self->texInclude($self->{ce}->{webworkFiles}->{hardcopySnippets}->{preamble});
-	# separate users by page break, or something
-	foreach my $user (@users) {
-		$tex .=  $self->getMultiSetTeX($user, @sets);
-	    if (@users) {
-			# separate users, but not after the last set
-			$tex .= $self->texInclude($self->{ce}->{webworkFiles}->{hardcopySnippets}->{userDivider});
-		}
-		
+	##############################################
+	# end creation of TeX file
+	##############################################
+	
+	# determine base name of final file
+	my $final_file_user = @$userIDsRef > 1 ? "multiuser" : $userIDsRef->[0];
+	my $final_file_set = @$setIDsRef > 1 ? "multiset" : $setIDsRef->[0];
+	my $final_file_basename = "$courseID.$final_file_user.$final_file_set";
+	
+	###############################################
+	# call format subroutine  (call back)
+	###############################################
+	# $final_file_name is the name of final hardcopy file
+	# @temp_files is a list of temporary files of interest used by the subroutine
+	# (all are relative to $temp_dir_path)
+	my $format_subr = $HC_FORMATS{$format}{subr};
+	my ($final_file_name, @temp_files) = $self->$format_subr($temp_dir_path, $final_file_basename);
+	my $final_file_path = "$temp_dir_path/$final_file_name";
+	
+	#warn "final_file_name=$final_file_name\n";
+	#warn "temp_files=@temp_files\n";
+	
+	################################################
+	# calculate URLs for each temp file of interest
+	#################################################
+	# makeTempDirectory's interface forces us to reverse-engineer the name of the temp dir from the path
+	my $temp_dir_parent_url = $ce->{courseURLs}{html_temp} . "/hardcopy";
+	(my $temp_dir_url = $temp_dir_path) =~ s/^$temp_dir_parent_path/$temp_dir_parent_url/; 
+	my %temp_file_map;
+	foreach my $temp_file_name (@temp_files) {
+		$temp_file_map{$temp_file_name} = "$temp_dir_url/$temp_file_name";
 	}
-	# the document postamble
-	$tex .= $self->texInclude($self->{ce}->{webworkFiles}->{hardcopySnippets}->{postamble});
 	
-	# deal with PG errors
-	if (@{$self->{errors}}) {
-		die ["PGFAIL"];
-	}
-	
-	# FIXME: add something like:
-	#if (@{$self->{warnings}}) {
-	#	$self->{generationWarnings} = 1;
-	#}
-	# ???????
-	
-	# "try" to generate pdf or return TeX file
-	my $pdfFileURL = undef;
-	if ($self->{hardcopy_format} eq 'pdf' ) {
-		my $errors = '';
-		$pdfFileURL = eval { $self->latex2pdf($tex, $tempDir, $fileName) };
-		if ($@) {
-			$errors = $@;
-			#$errors =~ s/\n/<br>/g;  # make this readable on HTML FIXME make this a Utils. filter (Error2HTML)
-			# clean up temp directory
-			# FIXME this clean up done in latex2pdf?  rmtree($tempDir);
-			die ["FAIL", "Failed to generate PDF from tex", $errors]; #throw error to subroutine body	
-		} else {
-		    # pass the relative temp file path back up to go subroutine 
-		    # to have an appropriate redirect generated.
-		
-		
-		}
-	} elsif ($self->{hardcopy_format} eq 'tex')    {
-	    $tex = protect_HTML($tex);
-	    #$tex =~ s/\n/\<br\>\n/g;
-	    $tex = join('', ("<pre>\n",$tex,"\n</pre>\n"));
-		$self->{r_tex_content} = \$tex;
-		
+	my $final_file_url;
+	
+	##################################################
+	# make sure final file exists
+	##################################################
+    # returns undefined unless $final_file_path points to a file
+	unless (-e $final_file_path) {
+		$self->add_errors("Final hardcopy file '".CGI::code(CGI::escapeHTML($final_file_path))
+			."' not found after calling '".CGI::code(CGI::escapeHTML($format_subr))."': "
+			.CGI::code(CGI::escapeHTML($!)));
+		return $final_file_url, %temp_file_map;
+	}
 	
+	##################################################	
+	# try to move the hardcopy file out of the temp directory
+	##################################################
+
+	# set $final_file_url accordingly
+	my $final_file_final_path = "$temp_dir_parent_path/$final_file_name";
+	my $mv_cmd = "2>&1 " . $ce->{externalPrograms}{mv} . " " . shell_quote($final_file_path, $final_file_final_path);
+	my $mv_out = readpipe $mv_cmd;
+	if ($?) {
+		$self->add_errors("Failed to move hardcopy file '".CGI::code(CGI::escapeHTML($final_file_name))
+			."' from '".CGI::code(CGI::escapeHTML($temp_dir_path))."' to '"
+			.CGI::code(CGI::escapeHTML($temp_dir_parent_path))."':".CGI::br()
+			.CGI::pre(CGI::escapeHTML($mv_out)));
+		$final_file_url = "$temp_dir_url/$final_file_name";
 	} else {
+		$final_file_url = "$temp_dir_parent_url/$final_file_name";
+	}
 	
+	##################################################	
+	# remove the temp directory if there are no errors
+	##################################################
+
+	unless ($self->get_errors or $PreserveTempFiles) {
+		$self->delete_temp_dir($temp_dir_path);
+	}
 	
-		die["FAIL", "Hard copy format |".$self->{hardcopy_format}. "| not recognized."];
+	warn "Preserved temporary files in directory '$temp_dir_path'.\n" if $PreserveTempFiles;
 	
+	return $final_file_url, %temp_file_map;
+}
+
+# helper function to remove temp dirs
+sub delete_temp_dir {
+	my ($self, $temp_dir_path) = @_;
+	
+	my $rm_cmd = "2>&1 " . $self->r->ce->{externalPrograms}{rm} . " -rf " . shell_quote($temp_dir_path);
+	my $rm_out = readpipe $rm_cmd;
+	if ($?) {
+		$self->add_errors("Failed to remove temporary directory '".CGI::code(CGI::escapeHTML($temp_dir_path))."':"
+			.CGI::br().CGI::pre($rm_out));
+		return 0;
+	} else {
+		return 1;
+	}
+}
+
+# format subroutines
+# 
+# assume that TeX source is located at $temp_dir_path/hardcopy.tex
+# the generated file will being with $final_file_basename
+# first element of return value is the name of the generated file (relative to $temp_dir_path)
+# rest of return value elements are names of temporary files that may be of interest in the
+#   case of an error, relative to $temp_dir_path. these are returned whether or not an error
+#   actually occured.
+
+sub generate_hardcopy_tex {
+	my ($self, $temp_dir_path, $final_file_basename) = @_;
+	
+	my $final_file_name;
+	
+	# try to rename tex file
+	my $src_name = "hardcopy.tex";
+	my $dest_name = "$final_file_basename.tex";
+	my $mv_cmd = "2>&1 " . $self->r->ce->{externalPrograms}{mv} . " " . shell_quote("$temp_dir_path/$src_name", "$temp_dir_path/$dest_name");
+	my $mv_out = readpipe $mv_cmd;
+	if ($?) {
+		$self->add_errors("Failed to rename '".CGI::code(CGI::escapeHTML($src_name))."' to '"
+			.CGI::code(CGI::escapeHTML($dest_name))."' in directory '"
+			.CGI::code(CGI::escapeHTML($temp_dir_path))."':".CGI::br()
+			.CGI::pre(CGI::escapeHTML($mv_out)));
+		$final_file_name = $src_name;
+	} else {
+		$final_file_name = $dest_name;
 	}
-	#return $tempDir, $fileName;
-	# return $pdfFilePath;
-	return $pdfFileURL;
+	
+	return $final_file_name;
 }
 
-# -----
-
-sub latex2pdf {
-	# this is a little ad-hoc function which I will replace with a LaTeX
-	# module at some point (or put it in Utils).
-	my ($self, $tex, $tempDir, $fileName) = @_;
-	my $finalFile = "$tempDir/$fileName";
-	my $ce = $self->{ce};
-	
-	# Location for hardcopy file to be downloaded
-	# FIXME  this should use surePathToTmpFile
-	my $hardcopyTempDirectory = $ce->{courseDirs}->{html_temp}."/hardcopy";
-	mkdir ($hardcopyTempDirectory)  or die "Unable to make $hardcopyTempDirectory" unless -e $hardcopyTempDirectory;
-	my $hardcopyFilePath        =  "$hardcopyTempDirectory/$fileName";
-	my $hardcopyFileURL         =  $ce->{courseURLs}->{html_temp}."/hardcopy/$fileName";
-	$self->{hardcopyFilePath}   =  $hardcopyFilePath;
-	$self->{hardcopyFileURL}    =  $hardcopyFileURL;
-	
-	## create a temporary directory for tex to shit in
-	# - we're using the existing temp dir. now
-	
-	my $wd = $tempDir;
-	my $texFile = "$wd/hardcopy.tex";
-	my $pdfFile = "$wd/hardcopy.pdf";
-	my $logFile = "$wd/hardcopy.log";
-	
-	# write the tex file
-	local *TEX;
-	open TEX, ">", $texFile or die "Failed to open $texFile: $!\n".CGI::br();
-	print TEX $tex;
-	close TEX;
+sub generate_hardcopy_pdf {
+	my ($self, $temp_dir_path, $final_file_basename) = @_;
 	
 	# call pdflatex - we don't want to chdir in the mod_perl process, as
 	# that might step on the feet of other things (esp. in Apache 2.0)
-	my $pdflatex = $ce->{externalPrograms}->{pdflatex};
-	my $pdflatexResult = system "cd $wd && $pdflatex $texFile";	
-	
-	# Even with errors there may be a valid pdfFile.  Move it to where we can get it.
-	if (-e $pdfFile) {
-
-       # moving to course tmp/hardcopy directory
-	    system "/bin/mv", $pdfFile, $hardcopyFilePath  
-			and die "Failed to mv: $pdfFile to  $hardcopyFilePath<br> Quite likely this means that there ".
-			        "is not sufficient write permission for some directory.<br>$!\n".CGI::br(); 
-	}
-	# Alert the world that the tex file did not process perfectly.
-	if ($pdflatexResult) {
-		# something bad happened
-		my $textErrorMessage = "Call to $pdflatex failed: $!\n".CGI::br();
+	my $pdflatex_cmd = "cd " . shell_quote($temp_dir_path) . " && "
+		. $self->r->ce->{externalPrograms}{pdflatex}
+		. " >pdflatex.stdout 2>pdflatex.stderr hardcopy";
+	if (my $rawexit = system $pdflatex_cmd) {
+		my $exit = $rawexit >> 8;
+		my $signal = $rawexit & 127;
+		my $core = $rawexit & 128;
+		$self->add_errors("Failed to convert TeX to PDF with command '"
+			.CGI::code(CGI::escapeHTML($pdflatex_cmd))."' (exit=$exit signal=$signal core=$core).");
 		
-		if (-e $hardcopyFilePath ) {
-			 # FIXME  Misuse of html tags!!!
-			$textErrorMessage.= "<h4>Some pdf output was produced and is available ". CGI::a({-href=>$hardcopyFileURL},"here.</h4>").CGI::hr();
-		}
-		# report logfile
-		if (-e $logFile) {
-			$textErrorMessage .= "pdflatex ran, but did not succeed. This suggests an error in the TeX\n".CGI::br();
-			$textErrorMessage .= "version of one of the problems, or a problem with the pdflatex system.\n".CGI::br();
-			my $logFileContents = eval { readTexErrorLog($logFile) };
-			$logFileContents    .=  CGI::hr().CGI::hr();
-			$logFileContents    .= eval { formatTexFile($texFile)     };
-			if ($@) {
-				$textErrorMessage .= "Additionally, the pdflatex log file could not be read, though it exists.\n".CGI::br();
+		# read hardcopy.log and report first error
+		my $hardcopy_log = "$temp_dir_path/hardcopy.log";
+		if (-e $hardcopy_log) {
+			if (open my $LOG, "<", $hardcopy_log) {
+				my $line;
+				while ($line = <$LOG>) {
+					last if $line =~ /^!\s+/;
+				}
+				my $first_error = $line;
+				while ($line = <$LOG>) {
+					last if $line =~ /^!\s+/;
+					$first_error .= $line;
+				}
+				close $LOG;
+				if (defined $first_error) {
+					$self->add_errors("First error in TeX log is:".CGI::br().
+						CGI::pre(CGI::escapeHTML($first_error)));
+				} else {
+					$self->add_errors("No errors encoundered in TeX log.");
+				}
 			} else {
-				$textErrorMessage .= "The essential contents of the TeX log are as follows:\n".CGI::hr().CGI::br();
-				$textErrorMessage .= "$logFileContents\n".CGI::br().CGI::br();
+				$self->add_errors("Could not read TeX log: ".CGI::code(CGI::escapeHTML($!)));
 			}
 		} else {
-			$textErrorMessage .= "No log file was created, suggesting that pdflatex never ran. Check the WeBWorK\n".CGI::br();
-			$textErrorMessage .= "configuration to ensure that the path to pdflatex is correct.\n".CGI::br();
+			$self->add_errors("No TeX log was found.");
 		}
-		die $textErrorMessage;
 	}
 	
-
-	
-	## remove temporary directory
-	rmtree($wd, 0, 0);
-
+	my $final_file_name;
+	
+	# try rename the pdf file
+	my $src_name = "hardcopy.pdf";
+	my $dest_name = "$final_file_basename.pdf";
+	my $mv_cmd = "2>&1 " . $self->r->ce->{externalPrograms}{mv} . " " . shell_quote("$temp_dir_path/$src_name", "$temp_dir_path/$dest_name");
+	my $mv_out = readpipe $mv_cmd;
+	if ($?) {
+		$self->add_errors("Failed to rename '".CGI::code(CGI::escapeHTML($src_name))."' to '"
+			.CGI::code(CGI::escapeHTML($dest_name))."' in directory '"
+			.CGI::code(CGI::escapeHTML($temp_dir_path))."':".CGI::br()
+			.CGI::pre(CGI::escapeHTML($mv_out)));
+		$final_file_name = $src_name;
+	} else {
+		$final_file_name = $dest_name;
+	}
 	
-	-e $hardcopyFilePath or die "Failed to create $finalFile for no apparent reason.\n";
-	# return hardcopyFilePath;
-	return $hardcopyFileURL;
+	return $final_file_name, qw/hardcopy.tex hardcopy.log hardcopy.aux pdflatex.stdout pdflatex.stderr/;
 }
 
-# -----
-# FIXME move to Utils? probably not
-
-sub readTexErrorLog {
-	my $filePath = shift;
-	my $print_error_switch = 0;
-	my $line='';
-	my @message=();
-	#local($/ ) = "\n";
-    open(LOGFILE,"<$filePath") or die "Can't read $filePath";
-    while (<LOGFILE>) {
-	    $line = $_;
-	    $print_error_switch = 1  if $line =~ /^!/;  # after a fatal error start printing messages
-		push(@message, protect_HTML($line)) if $print_error_switch;
-    }
-    close(LOGFILE);
-    join("<br>\n",@message);
-}
+################################################################################
+# TeX aggregating subroutines
+################################################################################
 
-sub formatTexFile {
-	my $texFilePath   = shift;
-    open (TEXFILE, "$texFilePath")
-	               or die "Can't open tex source file: path= $texFilePath: $!";
-	
-	my @message       = ();
-    push @message, '<BR>\n<h3>TeX Source File:</h3><BR>\n',     ;
- 
-    my $lineNumber    = 1;
-    while (<TEXFILE>) {
-		push @message, protect_HTML("$lineNumber $_")."\n";
-        $lineNumber++;
-    }
-    close(TEXFILE);
-    #push @message, '</pre>';
-    join("<br>\n",@message);
-}
-sub protect_HTML {
-	my $line = shift;
-	chomp($line);
-	$line =~s/\&/&amp;/g;
-	$line =~s/</&lt;/g;
-	$line =~s/>/&gt;/g;
-	$line;
+sub write_multiuser_tex {
+	my ($self, $FH, $userIDsRef, $setIDsRef) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	
+	my @userIDs = @$userIDsRef;
+	my @setIDs = @$setIDsRef;
+	
+	# get snippets
+	my $preamble = $ce->{webworkFiles}->{hardcopySnippets}->{preamble};
+	my $postamble = $ce->{webworkFiles}->{hardcopySnippets}->{postamble};
+	my $divider = $ce->{webworkFiles}->{hardcopySnippets}->{userDivider};
+	
+	# write preamble
+	$self->write_tex_file($FH, $preamble);
+	
+	# write section for each user
+	while (defined (my $userID = shift @userIDs)) {
+		$self->write_multiset_tex($FH, $userID, @setIDs);
+		$self->write_tex_file($FH, $divider) if @userIDs; # divide users, but not after the last user
+	}
+	
+	# write postamble
+	$self->write_tex_file($FH, $postamble);
 }
-sub texBlockComment(@) { return "\n".("%"x80)."\n%% ".join("", @_)."\n".("%"x80)."\n\n"; }
 
-sub getMultiSetTeX {
-	my ($self, $effectiveUserName,@sets) = @_;
-	my $ce = $self->{ce};
-	my $tex = "";
-	
+sub write_multiset_tex {
+	my ($self, $FH, $targetUserID, @setIDs) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my $db = $r->db;
+	
+	# get user record
+	my $TargetUser = $db->getUser($targetUserID); # checked
+	unless ($TargetUser) {
+		$self->add_errors("Can't generate hardcopy for user '".CGI::code(CGI::escapeHTML($targetUserID))."' -- no such user exists.\n");
+		return;
+	}
 	
+	# get set divider
+	my $divider = $ce->{webworkFiles}->{hardcopySnippets}->{setDivider};
 	
-	while (defined (my $setName = shift @sets)) {
-		$tex .= $self->getSetTeX($effectiveUserName, $setName);
-		if (@sets) {
-			# divide sets, but not after the last set
-			$tex .= $self->texInclude($ce->{webworkFiles}->{hardcopySnippets}->{setDivider});
+	# write each set
+	while (defined (my $setID = shift @setIDs)) {
+		$self->write_set_tex($FH, $TargetUser, $setID);
+		$self->write_tex_file($FH, $divider) if @setIDs; # divide sets, but not after the last set
+	}
+}
+
+sub write_set_tex {
+	my ($self, $FH, $TargetUser, $setID) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my $db = $r->db;
+	my $authz  = $r->authz;
+	my $userID = $r->param("user");
+
+	# we may already have the MergedSet from checking hide_work and 
+	#    hide_score in pre_header_initialize; check to see if that's true,
+	#    and otherwise, get the set.
+	my %mergedSets = %{$self->{mergedSets}};
+	my $uid = $TargetUser->user_id;
+	my $MergedSet;
+	my $versioned = 0;
+	if ( defined( $mergedSets{"$uid!$setID"} ) ) {
+		$MergedSet = $mergedSets{"$uid!$setID"};
+		$versioned = ($setID =~ /,v(\d+)$/) ? $1 : 0;
+	} else {
+		if ( $setID =~ /(.+),v(\d+)$/ ) {
+			$setID = $1;
+			$versioned = $2;
+		}
+		if ( $versioned ) {
+			$MergedSet = $db->getMergedSetVersion($TargetUser->user_id, $setID, $versioned);
+		} else {
+			$MergedSet = $db->getMergedSet($TargetUser->user_id, $setID); # checked
 		}
 	}
-	
+	# save versioned info for use in write_problem_tex
+	$self->{versioned} = $versioned;
 
+	unless ($MergedSet) {
+		$self->add_errors("Can't generate hardcopy for set ''".CGI::code(CGI::escapeHTML($setID))
+			."' for user '".CGI::code(CGI::escapeHTML($TargetUser->user_id))
+			."' -- set is not assigned to that user.");
+		return;
+	}
 	
-	return $tex;
-}
+	# see if the *real* user is allowed to access this problem set
+	if ($MergedSet->open_date > time and not $authz->hasPermissions($userID, "view_unopened_sets")) {
+		$self->add_errors("Can't generate hardcopy for set '".CGI::code(CGI::escapeHTML($setID))
+			."' for user '".CGI::code(CGI::escapeHTML($TargetUser->user_id))
+			."' -- set is not yet open.");
+		return;
+	}
+	if (not $MergedSet->visible and not $authz->hasPermissions($userID, "view_hidden_sets")) {
+		$self->addbadmessage("Can't generate hardcopy for set '".CGI::code(CGI::escapeHTML($setID))
+			."' for user '".CGI::code(CGI::escapeHTML($TargetUser->user_id))
+			."' -- set is not visible to students.");
+		return;
+	}
+	
+	# get snippets
+	my $header = $MergedSet->hardcopy_header
+		? $MergedSet->hardcopy_header
+		: $ce->{webworkFiles}->{hardcopySnippets}->{setHeader};
+  if ($header eq 'defaultHeader') {$header = $ce->{webworkFiles}->{hardcopySnippets}->{setHeader};}
+	my $footer = $ce->{webworkFiles}->{hardcopySnippets}->{setFooter};
+	my $divider = $ce->{webworkFiles}->{hardcopySnippets}->{problemDivider};
+	
+	# get list of problem IDs
+	# DBFIXME use ORDER BY in database
+	my @problemIDs = sort { $a <=> $b } $db->listUserProblems($MergedSet->user_id, $MergedSet->set_id);
 
-sub getSetTeX {
-	my ($self, $effectiveUserName, $setName) = @_;
-	my $ce = $self->{ce};
-	my $db = $self->{db};
-	
-	# FIXME (debug code line next)
-	# print STDERR "Creating set $setName for $effectiveUserName \n";
-	
-	# FIXME We could define a default for the effective user if no correct name is passed in.
-	# I'm not sure that it is wise.
-	my $effectiveUser = $db->getUser($effectiveUserName); # checked
-	die "effective user ($effectiveUserName) does not exist."
-		unless defined $effectiveUser;
-	
-	my @problemNumbers = sort { $a <=> $b }
-		$db->listUserProblems($effectiveUserName, $setName);
-	
-	# get header and footer
-	my $set       = $db->getMergedSet($effectiveUserName, $setName); # checked
-	my $setHeader = (ref($set) && $set->set_header) ? $set->set_header : $ce->{webworkFiles}->{hardcopySnippets}->{setHeader};
-	# database doesn't support the following yet :(
-	#my $setFooter = $wwdb->getMergedSet($effectiveUserName, $setName)->set_footer
-	#	|| $ce->{webworkFiles}->{hardcopySnippets}->{setFooter};
-	# so we don't allow per-set customization, which is probably okay :)
-	my $setFooter = $ce->{webworkFiles}->{hardcopySnippets}->{setFooter};
-	
-	my $tex = "";
-	
-	# render header
-	$tex .= texBlockComment("BEGIN $setName : $setHeader");
-	$tex .= $self->getProblemTeX($effectiveUser,$setName, 0, $setHeader);
-	
-	# render each problem
-	while (my $problemNumber = shift @problemNumbers) {
-		$tex .= texBlockComment("BEGIN $setName : $problemNumber");
-		$tex .= $self->getProblemTeX($effectiveUser,$setName, $problemNumber);
-		if (@problemNumbers) {
-			# divide problems, but not after the last problem
-			$tex .= $self->texInclude($ce->{webworkFiles}->{hardcopySnippets}->{problemDivider});
+	# for versioned sets (gateways), we might have problems in a random
+	# order; reset the order of the problemIDs if this is the case
+	if ( defined( $MergedSet->problem_randorder ) && 
+	     $MergedSet->problem_randorder ) {
+		my @newOrder = ();
+
+	# to set the same order each time we set the random seed to the psvn,
+ 	# and to avoid messing with the system random number generator we use
+	# our own PGrandom object
+		my $pgrand = PGrandom->new();
+		$pgrand->srand( $MergedSet->psvn );
+		while ( @problemIDs ) {
+			my $i = int($pgrand->rand(scalar(@problemIDs)));
+			push( @newOrder, $problemIDs[$i] );
+			splice(@problemIDs, $i, 1);
 		}
+		@problemIDs = @newOrder;
+	}
+		    
+	
+	# write set header
+	$self->write_problem_tex($FH, $TargetUser, $MergedSet, 0, $header); # 0 => pg file specified directly
+	
+	# write each problem
+	# for versioned problem sets (gateway tests) we like to include 
+	#   problem numbers
+	my $i = 1;
+	while (my $problemID = shift @problemIDs) {
+		$self->write_tex_file($FH, $divider);
+		$self->{versioned} = $i if $versioned;
+		$self->write_problem_tex($FH, $TargetUser, $MergedSet, $problemID);
+		$i++;
 	}
 	
-	# render footer
-	$tex .= texBlockComment("BEGIN $setName : $setFooter");
-	$tex .= $self->getProblemTeX($effectiveUser,$setName, 0, $setFooter);
-	
-	return $tex;
+	# write footer
+	$self->write_problem_tex($FH, $TargetUser, $MergedSet, 0, $footer); # 0 => pg file specified directly
 }
 
-sub getProblemTeX {
-    $WeBWorK::timer1 ->continue("hardcopy: begin processing problem") if defined($WeBWorK::timer1);
-	my ($self, $effectiveUser, $setName, $problemNumber, $pgFile) = @_;
-	my $r = $self->{r};
-	my $ce = $self->{ce};
-	my $db = $self->{db};
-	
-	# Should we provide a default user ? I think not FIXME
-	
-	# $effectiveUser = $self->{effectiveUser} unless defined($effectiveUser);
-	my $permissionLevel = $self->{permissionLevel};
-	my $set  = $db->getMergedSet($effectiveUser->user_id, $setName); # checked
-	unless (ref($set) )  {  # return error if no set is defined
-		push(@{$self->{warnings}}, 
-			   setName => $setName, 
-			   problem => 0,
-			   message => "No set $setName exists for ".$effectiveUser->first_name.' '.
-	                      $effectiveUser->last_name.' ('.$effectiveUser->user_id.' )'
-	    );
-	    return "No set $setName for ".$effectiveUser->user_id;
-	}
-
-	my $psvn = $set->psvn();
-	
-	# decide what to do about problem number
-	my $problem;
-	if ($problemNumber) {  # problem number defined and not zero
-		$problem = $db->getMergedProblem($effectiveUser->user_id, $setName, $problemNumber); # checked
+sub write_problem_tex {
+	my ($self, $FH, $TargetUser, $MergedSet, $problemID, $pgFile) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my $db = $r->db;
+	my $authz  = $r->authz;
+	my $userID = $r->param("user");
+	my $versioned = $self->{versioned};
+	my %canShowScore = %{$self->{canShowScore}};
+
+	my @errors;
+	
+	# get problem record
+	my $MergedProblem;
+	if ($problemID) {
+		# a non-zero problem ID was given -- load that problem
+	        # we use $versioned to determine which merging routine to use
+		if ( $versioned ) {
+			$MergedProblem = $db->getMergedProblemVersion($MergedSet->user_id, $MergedSet->set_id, $MergedSet->version_id, $problemID);
+
+		} else {
+			$MergedProblem = $db->getMergedProblem($MergedSet->user_id, $MergedSet->set_id, $problemID); # checked
+		}
+		
+		# handle nonexistent problem
+		unless ($MergedProblem) {
+			$self->add_errors("Can't generate hardcopy for problem '"
+				.CGI::code(CGI::escapeHTML($problemID))."' in set '"
+				.CGI::code(CGI::escapeHTML($MergedSet->set_id))
+				."' for user '".CGI::code(CGI::escapeHTML($MergedSet->user_id))
+				."' -- problem does not exist in that set or is not assigned to that user.");
+			return;
+		}
 	} elsif ($pgFile) {
-		$problem = WeBWorK::DB::Record::UserProblem->new(
-			set_id => $set->set_id,
+		# otherwise, we try an explicit PG file
+		$MergedProblem = $db->newUserProblem(
+			user_id => $MergedSet->user_id,
+			set_id => $MergedSet->set_id,
 			problem_id => 0,
-			login_id => $effectiveUser->user_id,
 			source_file => $pgFile,
-			# the rest of Problem's fields are not needed, i think
+			num_correct   => 0,
+			num_incorrect => 0,
 		);
+		die "newUserProblem failed -- WTF?" unless $MergedProblem; # this should never happen
+	} else {
+		# this shouldn't happen -- error out for real
+		die "write_problem_tex needs either a non-zero \$problemID or a \$pgFile";
 	}
-	unless (ref($problem) )  {  # return error if no problem is defined
-	    $problemNumber = 'undefined problem number' unless defined($problemNumber);
-	    $setName       = 'undefined set Name' unless defined($setName);
-	    my $msg        = "Problem $setName/problem $problemNumber not assigned to ".
-			              $effectiveUser->first_name.' '.
-	                      $effectiveUser->last_name.' ('.$effectiveUser->user_id.' )';
-		push(@{$self->{warnings}}, 
-			   setName => $setName, 
-			   problem => $problemNumber,
-			   message => $msg,
-	    );
-	    $msg =~ s/_/\\_/;  # escape underbars to protect them from TeX FIXME--this could be more general??
-	    return $msg;
-	}
-	# figure out if we're allowed to get solutions and call PG->new accordingly.
-	my $showCorrectAnswers = $r->param("showCorrectAnswers") || 0;
-	my $showHints          = $r->param("showHints") || 0;
-	my $showSolutions      = $r->param("showSolutions") || 0;
-	unless ($permissionLevel > 0 or time > $set->answer_date) {
+	
+	# figure out if we're allowed to get correct answers, hints, and solutions
+	# (eventually, we'd like to be able to use the same code as Problem)
+	my $versionName = $MergedSet->set_id . 
+		(( $versioned ) ?  ",v" . $MergedSet->version_id : '');
+
+	my $showCorrectAnswers  = $r->param("showCorrectAnswers") || 0;
+	my $printStudentAnswers = $r->param("printStudentAnswers") || 0;
+	my $showHints           = $r->param("showHints")          || 0;
+	my $showSolutions       = $r->param("showSolutions")      || 0;
+
+	unless( ( $authz->hasPermissions($userID, "show_correct_answers_before_answer_date") or
+		  ( time > $MergedSet->answer_date or 
+		    ( $versioned && 
+		      $MergedProblem->num_correct + 
+		      $MergedProblem->num_incorrect >= 
+		      $MergedSet->attempts_per_version &&
+		      $MergedSet->due_date == $MergedSet->answer_date ) ) ) &&
+		( $canShowScore{$MergedSet->user_id . "!$versionName"} ) ) {
 		$showCorrectAnswers = 0;
 		$showSolutions      = 0;
 	}
 	
-	my $pg = WeBWorK::PG->new(
-		$ce,
-		$effectiveUser,
-		$r->param('key'),
-		$set,
-		$problem,
-		$psvn,
-		{}, # no form fields!
+	# FIXME -- there can be a problem if the $siteDefaults{timezone} is not defined?  Why is this?
+	# why does it only occur with hardcopy?
+
+	# we need an additional translation option for versioned sets; also,
+	#   for versioned sets include old answers in the set if we're also 
+	#   asking for the answers
+	my $transOpts = 
 		{ # translation options
 			displayMode     => "tex",
-			showHints       => $showHints,
-			showSolutions   => $showSolutions,
-			processAnswers  => $showCorrectAnswers,
-		},
+			showHints       => $showHints          ? 1 : 0, # insure that this value is numeric
+			showSolutions   => $showSolutions      ? 1 : 0, # (or what? -sam)
+			processAnswers  => ($showCorrectAnswers || $printStudentAnswers) ? 1 : 0,
+			permissionLevel => $db->getPermissionLevel($userID)->permission,
+		};
+
+	if ( $versioned && $MergedProblem->problem_id != 0 ) {
+
+		$transOpts->{QUIZ_PREFIX} = 'Q' . sprintf("%04d",$MergedProblem->problem_id()) . '_';
+
+	}
+	my $formFields = { };
+	if ( $showCorrectAnswers ||$printStudentAnswers ) { 
+			my %oldAnswers = decodeAnswers($MergedProblem->last_answer);
+			$formFields->{$_} = $oldAnswers{$_} foreach (keys %oldAnswers);
+			print $FH "%% decoded old answers, saved. (keys = " . join(',', keys(%oldAnswers)) . "\n";
+		}
+
+#	warn("problem ", $MergedProblem->problem_id, ": source = ", $MergedProblem->source_file, "\n");
+
+	my $pg = WeBWorK::PG->new(
+		$ce,
+		$TargetUser,
+		scalar($r->param('key')), # avoid multiple-values problem
+		$MergedSet,
+		$MergedProblem,
+		$MergedSet->psvn,
+		$formFields, # no form fields!
+		$transOpts,
 	);
 	
+	# only bother to generate this info if there were warnings or errors
+	my $edit_url;
+	my $problem_name;
+	my $problem_desc;
+	if ($pg->{warnings} ne "" or $pg->{flags}->{error_flag}) {
+		my $edit_urlpath = $r->urlpath->newFromModule(
+			"WeBWorK::ContentGenerator::Instructor::PGProblemEditor", $r,
+			courseID  => $r->urlpath->arg("courseID"),
+			setID     => $MergedProblem->set_id,
+			problemID => $MergedProblem->problem_id,
+		);
+		
+		if ($MergedProblem->problem_id == 0) {
+			# link for an fake problem (like a header file)
+			$edit_url = $self->systemLink($edit_urlpath,
+				params => {
+					sourceFilePath => $MergedProblem->source_file,
+					problemSeed    => $MergedProblem->problem_seed,
+				},
+			);
+		} else {
+			# link for a real problem
+			$edit_url = $self->systemLink($edit_urlpath);
+		}
+		
+		if ($MergedProblem->problem_id == 0) {
+			$problem_name = "snippet";
+			$problem_desc = $problem_name." '".$MergedProblem->source_file
+				."' for set '".$MergedProblem->set_id."' and user '"
+				.$MergedProblem->user_id."'";
+		} else {
+			$problem_name = "problem";
+			$problem_desc = $problem_name." '".$MergedProblem->problem_id
+				."' in set '".$MergedProblem->set_id."' for user '"
+				.$MergedProblem->user_id."'";
+		}
+	}
+		
+	# deal with PG warnings
 	if ($pg->{warnings} ne "") {
-		push @{$self->{warnings}}, {
-			set     => $setName,
-			problem => $problemNumber,
-			message => $pg->{warnings},
-		};
+		$self->add_errors(CGI::a({href=>$edit_url, target=>"WW_Editor"}, "[edit]")
+			." Warnings encountered while processing $problem_desc. "
+			."Error text:".CGI::br().CGI::pre(CGI::escapeHTML($pg->{warnings}))
+		);
 	}
 	
+	# deal with PG errors
 	if ($pg->{flags}->{error_flag}) {
-		push @{$self->{errors}}, {
-			set     => $setName,
-			problem => $problemNumber,
-			user    => $effectiveUser,
-			message => $pg->{errors},
-			context => $pg->{body_text},
-		};
-		# if there was an error, body_text contains
-		# the error context, not TeX code FIXME (should this error context be used?)
-		$pg->{body_text} = ''; #   FIXME using undef causes error unless it is caught undef;
-	} else {
-		# append list of correct answers to body text
-		if ($showCorrectAnswers && $problemNumber != 0) {
-			my $correctTeX = "Correct Answers:\\par\\begin{itemize}\n";
-			foreach my $ansName (@{$pg->{flags}->{ANSWER_ENTRY_ORDER}}) {
-				my $correctAnswer = $pg->{answers}->{$ansName}->{correct_ans};
-				$correctAnswer =~ s/\^/\\\^\{\}/g;
-				$correctAnswer =~ s/\_/\\\_/g;
-				$correctTeX .= "\\item $correctAnswer\n";
+		$self->add_errors(CGI::a({href=>$edit_url, target=>"WW_Editor"}, "[edit]")
+			." Errors encountered while processing $problem_desc. "
+			."This $problem_name has been omitted from the hardcopy. "
+			."Error text:".CGI::br().CGI::pre(CGI::escapeHTML($pg->{errors}))
+		);
+		return;
+	}
+	
+	# if we got here, there were no errors (because errors cause a return above)
+	$self->{at_least_one_problem_rendered_without_error} = 1;
+
+	print $FH "{\\bf Problem $versioned.}\n" 
+		if ( $versioned && $MergedProblem->problem_id != 0 );
+	print $FH $pg->{body_text};
+
+	my @ans_entry_order = defined($pg->{flags}->{ANSWER_ENTRY_ORDER}) ? @{$pg->{flags}->{ANSWER_ENTRY_ORDER}} : ( );
+
+	# print the list of student answers if it is requested
+	if (  $printStudentAnswers && 
+	     $MergedProblem->problem_id != 0 && @ans_entry_order ) {
+			my $recScore = $pg->{state}->{recorded_score};
+			my $corrMsg = '';
+			if ( $recScore == 1 ) {
+				$corrMsg = ' (correct)';
+			} elsif ( $recScore == 0 ) {
+				$corrMsg = ' (incorrect)';
+			} else {
+				$corrMsg = " (score $recScore)";
 			}
-			$correctTeX .= "\\end{itemize} \\par\n";
-			$pg->{body_text} .= $correctTeX;
+		my $stuAnswers = "\\par{\\small{\\it Answer(s) submitted:}\n" .
+			"\\vspace{-\\parskip}\\begin{itemize}\n";
+		for my $ansName ( @ans_entry_order ) {
+			my $stuAns = $pg->{answers}->{$ansName}->{original_student_ans};
+			$stuAnswers .= "\\item\\begin{verbatim}$stuAns\\end{verbatim}\n";
+		}
+		$stuAnswers .= "\\end{itemize}}$corrMsg\\par\n";
+		print $FH $stuAnswers;
+	}
+	
+	# write the list of correct answers is appropriate; ANSWER_ENTRY_ORDER
+	#   isn't defined for versioned sets?  this seems odd FIXME  GWCHANGE
+	if ($showCorrectAnswers && $MergedProblem->problem_id != 0 && @ans_entry_order) {
+		my $correctTeX = "\\par{\\small{\\it Correct Answers:}\n"
+			. "\\vspace{-\\parskip}\\begin{itemize}\n";
+		
+		foreach my $ansName (@ans_entry_order) {
+			my $correctAnswer = $pg->{answers}->{$ansName}->{correct_ans};
+			$correctTeX .= "\\item\\begin{verbatim}$correctAnswer\\end{verbatim}\n";
+			# FIXME: What about vectors (where TeX will complain about < and > outside of math mode)?
 		}
+		
+		$correctTeX .= "\\end{itemize}}\\par\n";
+		
+		print $FH $correctTeX;
 	}
-	$WeBWorK::timer1 ->continue("hardcopy: end processing problem") if defined($WeBWorK::timer1);
-	return $pg->{body_text};
 }
 
-sub texInclude {
-	my ($self, $texFile) = @_;
-	my $tex = "";
+sub write_tex_file {
+	my ($self, $FH, $file) = @_;
 	
-	$tex .= texBlockComment("BEGIN: $texFile");
-	eval {
-		$tex .= readFile($texFile)
-	};
+	my $tex = eval { readFile($file) };
 	if ($@) {
-		$tex .= texBlockComment($@);
+		$self->add_errors("Failed to include TeX file '".CGI::code(CGI::escapeHTML($file))."': "
+			.CGI::escapeHTML($@));
+	} else {
+		print $FH $tex;
 	}
-	
-	return $tex;
+}
+
+################################################################################
+# utilities
+################################################################################
+
+sub add_errors {
+	my ($self, @errors) = @_;
+	push @{$self->{hardcopy_errors}}, @errors;
+}
+
+sub get_errors {
+	my ($self) = @_;
+	return $self->{hardcopy_errors} ? @{$self->{hardcopy_errors}} : ();
+}
+
+sub get_errors_ref {
+	my ($self) = @_;
+	return $self->{hardcopy_errors};
 }
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/Home.pm b/lib/WeBWorK/ContentGenerator/Home.pm
new file mode 100644
index 0000000000..af6ad0580d
--- /dev/null
+++ b/lib/WeBWorK/ContentGenerator/Home.pm
@@ -0,0 +1,110 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Home.pm,v 1.19 2006/07/12 01:23:54 gage 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::ContentGenerator::Home;
+use base qw(WeBWorK::ContentGenerator);
+
+=head1 NAME
+
+WeBWorK::ContentGenerator::Home - display a list of courses.
+
+=cut
+
+use strict;
+use warnings;
+#use CGI qw(-nosticky );
+use WeBWorK::CGI;
+use WeBWorK::Utils qw(readFile readDirectory);
+use WeBWorK::Utils::CourseManagement qw/listCourses/;
+use WeBWorK::Localize;
+sub info {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+
+	my $result;
+	
+	# This section should be kept in sync with the Login.pm version
+	my $site_info = $ce->{webworkFiles}->{site_info};
+	if (defined $site_info and $site_info) {
+		# deal with previewing a temporary file
+		# FIXME: DANGER: this code allows viewing of any file
+		# FIXME: this code is disabled because PGProblemEditor no longer uses editFileSuffix
+		#if (defined $r->param("editMode") and $r->param("editMode") eq "temporaryFile"
+		#		and defined $r->param("editFileSuffix")) {
+		#	$site_info .= $r->param("editFileSuffix");
+		#}
+		
+		if (-f $site_info) {
+			my $text = eval { readFile($site_info) };
+			if ($@) {
+				$result = CGI::div({class=>"ResultsWithError"}, $@);
+			} elsif ($text =~ /\S/) {
+				$result = $text;
+			}
+		}
+	}
+	
+	if (defined $result and $result ne "") {
+		return CGI::div({-class=>"info-wrapper"},CGI::div({class=>"info-box", id=>"InfoPanel"},
+			CGI::h2("Site Information"), $result));
+	} else {
+		return "";
+	}
+}
+
+sub body {
+	my ($self) = @_;
+	my $r = $self->r;
+	
+	my $coursesDir = $r->ce->{webworkDirs}->{courses};
+	my $coursesURL = $r->ce->{webworkURLs}->{root};
+	
+	my @courseIDs = listCourses($r->ce);
+	#filter underscores here!
+	
+	my $haveAdminCourse = 0;
+	foreach my $courseID (@courseIDs) {
+		if ($courseID eq "admin") {
+			$haveAdminCourse = 1;
+			last;
+		}
+	}
+	
+	print CGI::p($r->maketext("Welcome to WeBWorK!"));
+	
+	if ($haveAdminCourse and !(-f "$coursesDir/admin/hide_directory")) {
+		my $urlpath = $r->urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSets", $r, courseID => "admin");
+		print CGI::p(CGI::a({href=>$self->systemLink($urlpath, authen => 0)}, "Course Administration"));
+	}
+	
+	print CGI::h2($r->maketext("Courses"));
+	
+	print CGI::start_ul();
+	
+	foreach my $courseID (sort {lc($a) cmp lc($b) } @courseIDs) {
+		next if $courseID eq "admin"; # done already above
+		next if -f "$coursesDir/$courseID/hide_directory";
+		my $urlpath = $r->urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSets", $r, courseID => $courseID);
+		print CGI::li(CGI::a({href=>$self->systemLink($urlpath, authen => 0)}, $courseID));
+	}###place to use underscore sub
+	
+	print CGI::end_ul();
+	
+	return "";
+}
+
+1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor.pm b/lib/WeBWorK/ContentGenerator/Instructor.pm
index c27a63716b..0cf6d992cf 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm,v 1.64 2007/08/13 22:59:55 sh002i 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
@@ -19,151 +19,599 @@ use base qw(WeBWorK::ContentGenerator);
 
 =head1 NAME
 
-WeBWorK::ContentGenerator::Instructor - Abstract superclass for the Instructor pages
+WeBWorK::ContentGenerator::Instructor - Abstract superclass for the Instructor
+tools, providing useful utility functions.
 
 =cut
 
 use strict;
 use warnings;
-use CGI qw();
-use WeBWorK::DB::Utils qw(global2user initializeUserProblem);
+#use CGI qw(-nosticky );
+use WeBWorK::CGI;
+use File::Find;
+use WeBWorK::DB::Utils qw(initializeUserProblem);
+use WeBWorK::Debug;
+use WeBWorK::Utils;
 
-sub hiddenEditForUserFields {
-	my ($self, @editForUser) = @_;
-	my $return = "";
-	foreach my $editUser (@editForUser) {
-		$return .= CGI::input({type=>"hidden", name=>"editForUser", value=>$editUser});
+=head1 METHODS
+
+=cut
+
+################################################################################
+# Primary assignment methods
+################################################################################
+
+=head2 Primary assignment methods
+
+=over
+
+=item assignSetToUser($userID, $GlobalSet)
+
+Assigns the given set and all problems contained therein to the given user. If
+the set (or any problems in the set) are already assigned to the user, a list of
+failure messages is returned.
+
+=cut
+
+sub assignSetToUser {
+	my ($self, $userID, $GlobalSet) = @_;
+	my $setID = $GlobalSet->set_id;
+	my $db = $self->{db};
+	
+	my $UserSet = $db->newUserSet;
+	$UserSet->user_id($userID);
+	$UserSet->set_id($setID);
+	
+	my @results;
+	my $set_assigned = 0;
+	
+	eval { $db->addUserSet($UserSet) };
+	if ($@) {
+		if ($@ =~ m/user set exists/) {
+			push @results, "set $setID is already assigned to user $userID.";
+			$set_assigned = 1;
+		} else {
+			die $@;
+		}
 	}
 	
-	return $return;
+	my @GlobalProblems = grep { defined $_ } $db->getAllGlobalProblems($setID);
+	foreach my $GlobalProblem (@GlobalProblems) {
+		my @result = $self->assignProblemToUser($userID, $GlobalProblem);
+		push @results, @result if @result and not $set_assigned;
+	}
+	
+	return @results;
 }
 
-sub userCountMessage {
-	my ($self, $count, $numUsers) = @_;
-	
-	my $message;
-	if ($count == 0) {
-		$message = CGI::em("no users");
-	} elsif ($count == $numUsers) {
-		$message = "all users";
-	} elsif ($count == 1) {
-		$message = "1 user";
-	} elsif ($count > $numUsers || $count < 0) {
-		$message = CGI::em("an impossible number of users: $count out of $numUsers");
+sub assignSetVersionToUser {
+    my ( $self, $userID, $GlobalSet ) = @_;
+# in:  ($self,) $userID = the userID of the user to which to assign the set,
+#      $GlobalSet = the global set object.
+# out: a new set version is assigned to the user.
+# note: we assume that the global set and user are well defined.  I think this
+#    is a safe assumption.  it would be nice to just call assignSetToUser,
+#    but we run into trouble doing that because of the distinction between
+#    the setID and the setVersionID
+
+    my $setID = $GlobalSet->set_id;
+    my $db = $self->{db};
+
+# figure out what version we're on, reset setID, get a new user set
+# FIXME: old version; new call follows
+#    my $setVersionNum = $db->getUserSetVersionNumber( $userID, $setID );
+    my @allVersionIDs = $db->listSetVersions( $userID, $setID );
+    my $setVersionNum = ( @allVersionIDs ) ? $allVersionIDs[-1] : 0;
+    $setVersionNum++;
+    my $userSet = $db->newSetVersion;
+    $userSet->user_id( $userID );
+    $userSet->set_id( $setID );
+    $userSet->version_id( $setVersionNum );
+
+    my @results = ();
+    my $set_assigned = 0;
+
+# add the set to the database
+    eval { $db->addSetVersion( $userSet ) };
+    if ( $@ ) {
+	if ( $@ =~ m/user set exists/ ) {
+	    push( @results, "set $setID,v$setVersionNum is already assigned" .
+		  "to user $userID" );
+	    $set_assigned = 1;
 	} else {
-		$message = "$count users";
+	    die $@;
 	}
+    }
+
+# populate set with problems
+    my @GlobalProblems = grep { defined $_ } $db->getAllGlobalProblems($setID);
+
+# keep track of problems assigned from groups so that we can have multiple
+#    problems from a given group, without duplicates
+    my %groupProblems = ();
+
+    foreach my $GlobalProblem ( @GlobalProblems ) {
+	$GlobalProblem->set_id( $setID );
+# this is getting called from within ContentGenerator, so that $self
+#    isn't an Instructor object---therefore, calling $self->assign... 
+#    doesn't work.  the following is an ugly workaround that works b/c
+#    both Instructor and ContentGenerator objects have $self->{db}
+# FIXME  it would be nice to have a better solution to this
+	my @result = 
+	    assignProblemToUserSetVersion( $self, $userID, $userSet,
+	    			           $GlobalProblem, \%groupProblems );
+	push( @results, @result ) if ( @result && not $set_assigned );
+    }
+
+    return @results;
+}
+
+
+=item unassignSetFromUser($userID, $setID, $problemID)
+
+Unassigns the given set and all problems therein from the given user.
+
+=cut
+
+sub unassignSetFromUser {
+	my ($self, $userID, $setID) = @_;
+	my $db = $self->{db};
 	
-	return $message;
+	$db->deleteUserSet($userID, $setID);
 }
 
-### Utility functions for assigning sets to users.
-# These silently fail if the problem or set exists for the user.
+=item assignProblemToUser($userID, $GlobalProblem, $seed)
+
+Assigns the given problem to the given user. If the problem is already assigned
+to the user, an error string is returned. If $seed is defined, the UserProblem
+will be given that seed.
+
+=cut
 
 sub assignProblemToUser {
-	my ($self, $user, $globalProblem) = @_;
+	my ($self, $userID, $GlobalProblem, $seed) = @_;
 	my $db = $self->{db};
-	my $userProblem = $db->{problem_user}->{record}->new;
-
-	# Set up the key
-	$userProblem->user_id($user);
-	$userProblem->set_id($globalProblem->set_id);
-	$userProblem->problem_id($globalProblem->problem_id);
 	
-	initializeUserProblem($userProblem);
-	eval {$db->addUserProblem($userProblem)};
-	warn $@ if $@ and not $@ =~ m/user problem exists/;
+	my $UserProblem = $db->newUserProblem;
+	$UserProblem->user_id($userID);
+	$UserProblem->set_id($GlobalProblem->set_id);
+	$UserProblem->problem_id($GlobalProblem->problem_id);
+	initializeUserProblem($UserProblem, $seed);
+	
+	eval { $db->addUserProblem($UserProblem) };
+	if ($@) {
+		if ($@ =~ m/user problem exists/) {
+			return "problem " . $GlobalProblem->problem_id
+				. " in set " . $GlobalProblem->set_id
+				. " is already assigned to user $userID.";
+		} else {
+			die $@;
+		}
+	}
+	
+	return ();
 }
 
-sub assignSetToUser {
-	my ($self, $userID, $globalSet) = @_;
+# $seed is optional -- if set, the UserProblem will be given that seed
+sub assignProblemToUserSetVersion {
+	my ($self, $userID, $userSet, $GlobalProblem, $groupProbRef, $seed) = @_;
 	my $db = $self->{db};
-	my $userSet = $db->{set_user}->{record}->new;
-	my $setID = $globalSet->set_id;
-
-	$userSet->user_id($userID);
-	$userSet->set_id($setID);
-	eval {$db->addUserSet($userSet)};
-	warn $@ if $@ and not $@ =~ m/user set exists/;
-	
-	foreach my $problemID ($db->listGlobalProblems($setID)) {
-		my $problemRecord = $db->getGlobalProblem($setID, $problemID); # checked
-		if (not defined $problemRecord) {
-			warn "no record found for problem $problemID -- skipping.";
-			next;
+	
+# conditional to allow selection of problems from a group of problems, 
+# defined in a set.  
+
+    # problem groups are indicated by source files "group:problemGroupName"
+	if ( $GlobalProblem->source_file() =~ /^group:(.+)$/ ) {
+	    my $problemGroupName = $1;  
+
+    # get list of problems in group
+	    my @problemList = $db->listGlobalProblems($problemGroupName);
+        # sanity check: if the group set hasn't been defined or doesn't
+        # actually contain problems (oops), then we can't very well assign 
+        # this problem to the user.  we could go on and assign all other 
+        # problems, but that results in a partial set.  so we die here if 
+        # this happens.  philosophically we're requiring that the instructor
+        # set up the sets correctly or have to deal with the carnage after-
+        # wards.  I'm not sure that this is the best long-term solution.
+        # FIXME: this means that we may have created a set version that
+        # doesn't have any problems.  this is bad.  but it's hard to see 
+        # where else to deal with it---fixing the problem requires checking
+        # at the set version-creation level that all the problems in the 
+        # set are well defined.  FIXME
+	    die("Error in set version creation: no problems are available " .
+		"in problem group $problemGroupName.  Set " . 
+		$userSet->set_id . " has been created for $userID, but " .
+		"does not contain the right problems.\n") if (! @problemList);
+
+	    my $nProb = @problemList;
+	    my $whichProblem = int(rand($nProb));
+
+    # we allow selection of multiple problems from a group, but want them to
+    #   be different.  there's probably a better way to do this
+	    if ( defined( $groupProbRef->{$problemGroupName} ) &&
+		 $groupProbRef->{$problemGroupName} =~ /\b$whichProblem\b/ ) {
+		my $nAvail = $nProb - 
+		    ( $groupProbRef->{$problemGroupName} =~ tr/,// ) - 1;
+
+		die("Too many problems selected from group.") if ( ! $nAvail );
+
+		$whichProblem = int(rand($nProb));
+		while ( $groupProbRef->{$problemGroupName} =~ /\b$whichProblem\b/ ) {
+		    $whichProblem = ( $whichProblem + 1 )%$nProb;
+		}
+	    }
+	    if ( defined( $groupProbRef->{$problemGroupName} ) ) {
+		$groupProbRef->{$problemGroupName} .= ",$whichProblem";
+	    } else {
+		$groupProbRef->{$problemGroupName} = "$whichProblem";
+	    }
+
+	    my $prob = $db->getGlobalProblem($problemGroupName,
+					     $problemList[$whichProblem]);
+	    $GlobalProblem->source_file($prob->source_file());
+	}
+	
+# all set; do problem assignment
+	my $UserProblem = $db->newProblemVersion;
+	$UserProblem->user_id($userID);
+	$UserProblem->set_id($userSet->set_id);
+	$UserProblem->version_id($userSet->version_id);
+	$UserProblem->problem_id($GlobalProblem->problem_id);
+	$UserProblem->source_file($GlobalProblem->source_file);
+	initializeUserProblem($UserProblem, $seed);
+	
+	eval { $db->addProblemVersion($UserProblem) };
+	if ($@) {
+		if ($@ =~ m/user problem exists/) {
+			return "problem " . $GlobalProblem->problem_id
+				. " in set " . $GlobalProblem->set_id
+				. " is already assigned to user $userID.";
+		} else {
+			die $@;
 		}
-		$self->assignProblemToUser($userID, $problemRecord);
 	}
+
+	return();
 }
 
-# When a new problem is added to a set, all students to whom the set 
-# it belongs to is assigned should have it assigned to them.
-# Note that this does NOT assign to all users of a course, just all users
-# of a set.
-sub assignProblemToAllSetUsers {
-	my ($self, $globalProblem) = @_;
+=item unassignProblemFromUser($userID, $setID, $problemID)
+
+Unassigns the given problem from the given user.
+
+=cut
+
+sub unassignProblemFromUser {
+	my ($self, $userID, $setID, $problemID) = @_;
 	my $db = $self->{db};
-	my $setID = $globalProblem->set_id;
-	my @users = $db->listSetUsers($setID);
 	
-	foreach my $user (@users) {
-		$self->assignProblemToUser($user, $globalProblem);
-	}
+	$db->deleteUserProblem($userID, $setID, $problemID);
 }
 
-# READ THIS: Unlike the above function, "All" here refers to all of the
-# users of a course.
-# This function caches database data as a speed optimization.
+=back
+
+=cut
+
+################################################################################
+# Secondary set assignment methods
+################################################################################
+
+=head2 Secondary assignment methods
+
+=over
+
+=item assignSetToAllUsers($setID)
+
+Assigns the set specified and all problems contained therein to all users in
+the course. This is more efficient than repeatedly calling assignSetToUser().
+If any assignments fail, a list of failure messages is returned.
+
+=cut
+
 sub assignSetToAllUsers {
 	my ($self, $setID) = @_;
 	my $db = $self->{db};
-	my @users = $db->listUsers;
-	my @problemRecords = map { $db->getGlobalProblem($setID, $_) } # checked
-		$db->listGlobalProblems($setID);
-	@problemRecords = grep { defined $_ } @problemRecords;
-	
-	foreach my $user (@users) {
-		# FIXME: Create a UserSet record for the user!!!!
-		my $userSet = $db->{set_user}->{record}->new;
-		$userSet->user_id($user);
-		$userSet->set_id($setID);
-		eval {$db->addUserSet($userSet)};
-		foreach my $problemRecord (@problemRecords) {
-			$self->assignProblemToUser($user, $problemRecord);
+	my @userIDs = $db->listUsers;
+
+	debug("$setID: getting user list");
+	# DBFIXME pre-filter with WHERE clause for status abbrevs. that allow assignment (tricky...)
+	my @userRecords = $db->getUsers(@userIDs);
+	debug("$setID: (done with that)");
+	
+	debug("$setID: getting problem list");
+	my @GlobalProblems = grep { defined $_ } $db->getAllGlobalProblems($setID);
+	debug("$setID: (done with that)");
+	
+	my @results;
+	
+	foreach my $User (@userRecords) {
+		next unless $self->r->ce->status_abbrev_has_behavior($User->status, "include_in_assignment");
+		my $UserSet = $db->newUserSet;
+		my $userID = $User->user_id;
+		$UserSet->user_id($userID);
+		$UserSet->set_id($setID);
+		debug("$setID: adding UserSet for $userID");
+		eval { $db->addUserSet($UserSet) };
+		if ($@) {
+			next if $@ =~ m/user set exists/;
+			die $@;
+		}
+		debug("$setID: (done with that)");
+		
+		debug("$setID: adding UserProblems for $userID");
+		foreach my $GlobalProblem (@GlobalProblems) {
+			my @result = $self->assignProblemToUser($userID, $GlobalProblem);
+			push @results, @result if @result;
 		}
+		debug("$setID: (done with that)");
+	}
+	
+	return @results;
+}
+
+=item unassignSetFromAllUsers($setID)
+
+Unassigns the specified sets and all problems contained therein from all users.
+
+=cut
+
+sub unassignSetFromAllUsers {
+	my ($self, $setID) = @_;
+	my $db = $self->{db};
+	
+	my @userIDs = $db->listSetUsers($setID);
+	
+	foreach my $userID (@userIDs) {
+		$self->unassignSetFromUser($userID, $setID);
 	}
 }
 
+=item assignAllSetsToUser($userID)
+
+Assigns all sets in the course and all problems contained therein to the
+specified user. This is more efficient than repeatedly calling
+assignSetToUser(). If any assignments fail, a list of failure messages is
+returned.
+
+=cut
+
 sub assignAllSetsToUser {
 	my ($self, $userID) = @_;
 	my $db = $self->{db};
 	
 	# assign only sets that are not already assigned
-	my %userSetIDs = map { $_ => 1 } $db->listUserSets($userID);
-	my @globalSetIDs = grep { not exists $userSetIDs{$_} } $db->listGlobalSets;
-	
+	#my %userSetIDs = map { $_ => 1 } $db->listUserSets($userID);
+	#my @globalSetIDs = grep { not exists $userSetIDs{$_} } $db->listGlobalSets;
+	#my @GlobalSets = $db->getGlobalSets(@globalSetIDs);
+	# FIXME: i don't think we need to do the above, since asignSetToUser fails
+	# silently if a UserSet already exists. instead we do this:
+	# DBFIXME shouldn't need to get list of set IDs
+	my @globalSetIDs = $db->listGlobalSets;
 	my @GlobalSets = $db->getGlobalSets(@globalSetIDs);
 	
+	my @results;
+	
 	my $i = 0;
 	foreach my $GlobalSet (@GlobalSets) {
 		if (not defined $GlobalSet) {
 			warn "record not found for global set $globalSetIDs[$i]";
 		} else {
-			$self->assignSetToUser($userID, $GlobalSet);
+			my @result = $self->assignSetToUser($userID, $GlobalSet);
+			push @results, @result if @result;
 		}
 		$i++;
 	}
+	
+	return @results;
 }
 
+=item unassignAllSetsFromUser($userID)
+
+Unassigns all sets and all problems contained therein from the specified user.
+
+=cut
+
 sub unassignAllSetsFromUser {
 	my ($self, $userID) = @_;
 	my $db = $self->{db};
 	
-	my @userSetIDs = $db->listUserSets($userID);
+	my @setIDs = $db->listUserSets($userID);
+	
+	foreach my $setID (@setIDs) {
+		$self->unassignSetFromUser($userID, $setID);
+	}
+}
+
+=back
+
+=cut
+
+################################################################################
+# Utility assignment methods
+################################################################################
+
+=head2 Utility assignment methods
+
+=over
+
+=item assignSetsToUsers($setIDsRef, $userIDsRef)
+
+Assign each of the given sets to each of the given users. If any assignments
+fail, a list of failure messages is returned.
+
+=cut
+
+sub assignSetsToUsers {
+	my ($self, $setIDsRef, $userIDsRef) = @_;
+	my $db = $self->{db};
+	
+	my @setIDs = @$setIDsRef;
+	my @userIDs = @$userIDsRef;
+	my @GlobalSets = $db->getGlobalSets(@setIDs);
+	
+	my @results;
+	
+	foreach my $GlobalSet (@GlobalSets) {
+		foreach my $userID (@userIDs) {
+			my @result = $self->assignSetToUser($userID, $GlobalSet);
+			push @results, @result if @result;
+		}
+	}
+	
+	return @results;
+}
+
+=item unassignSetsFromUsers($setIDsRef, $userIDsRef)
+
+Unassign each of the given sets from each of the given users.
+
+=cut
+
+sub unassignSetsFromUsers {
+	my ($self, $setIDsRef, $userIDsRef) = @_;
+	my @setIDs = @$setIDsRef;
+	my @userIDs = @$userIDsRef;
+	
+	foreach my $setID (@setIDs) {
+		foreach my $userID (@userIDs) {
+			$self->unassignSetFromUser($userID, $setID);
+		}
+	}
+}
+
+=item assignProblemToAllSetUsers($GlobalProblem)
+
+Assigns the problem specified to all users to whom the problem's set is
+assigned. If any assignments fail, a list of failure messages is returned.
+
+=cut
+
+sub assignProblemToAllSetUsers {
+	my ($self, $GlobalProblem) = @_;
+	my $db = $self->{db};
+	my $setID = $GlobalProblem->set_id;
+	my @userIDs = $db->listSetUsers($setID);
+	
+	my @results;
+	
+	foreach my $userID (@userIDs) {
+		my @result = $self->assignProblemToUser($userID, $GlobalProblem);
+		push @results, @result if @result;
+	}
+	
+	return @results;
+}
+
+=back
+
+=cut
+
+################################################################################
+# Utility method for adding problems to a set
+################################################################################
+
+=head2 Utility method for adding problems to a set
+
+=over
+
+=cut
+
+sub addProblemToSet {
+	my ($self, %args) = @_;
+	my $db = $self->r->db;
+	my $value_default = $self->{ce}->{problemDefaults}->{value};
+	my $max_attempts_default = $self->{ce}->{problemDefaults}->{max_attempts};	
+	
+
+	die "addProblemToSet called without specifying the set name." if $args{setName} eq "";
+	my $setName = $args{setName};
+
+	my $sourceFile = $args{sourceFile} or 
+		die "addProblemToSet called without specifying the sourceFile.";
+
+	# The rest of the arguments are optional
 	
-	foreach my $userSetID (@userSetIDs) {
-		$db->deleteUserSet($userID, $userSetID);
+#	my $value = $args{value} || $value_default;
+	my $value = $value_default;
+	if (defined($args{value})){$value = $args{value};}  # 0 is a valid value for $args{value}  
+
+	my $maxAttempts = $args{maxAttempts} || $max_attempts_default;
+	my $problemID = $args{problemID};
+
+	unless ($problemID) {
+		$problemID = WeBWorK::Utils::max($db->listGlobalProblems($setName)) + 1;
 	}
+
+	my $problemRecord = $db->newGlobalProblem;
+	$problemRecord->problem_id($problemID);
+	$problemRecord->set_id($setName);
+	$problemRecord->source_file($sourceFile);
+	$problemRecord->value($value);
+	$problemRecord->max_attempts($maxAttempts);
+	$db->addGlobalProblem($problemRecord);
+
+	return $problemRecord;
+}
+
+=back
+
+=cut
+
+################################################################################
+# Utility methods
+################################################################################
+
+=head2 Utility methods
+
+=over
+
+=cut
+
+sub hiddenEditForUserFields {
+	my ($self, @editForUser) = @_;
+	my $return = "";
+	foreach my $editUser (@editForUser) {
+		$return .= CGI::input({type=>"hidden", name=>"editForUser", value=>$editUser});
+	}
+	
+	return $return;
+}
+
+sub userCountMessage {
+	my ($self, $count, $numUsers) = @_;
+	
+	my $message;
+	if ($count == 0) {
+		$message = CGI::em("no students");
+	} elsif ($count == $numUsers) {
+		$message = "all students";
+	} elsif ($count == 1) {
+		$message = "1 student";
+	} elsif ($count > $numUsers || $count < 0) {
+		$message = CGI::em("an impossible number of users: $count out of $numUsers");
+	} else {
+		$message = "$count students out of $numUsers";
+	}
+	
+	return $message;
+}
+
+sub setCountMessage {
+	my ($self, $count, $numSets) = @_;
+	
+	my $message;
+	if ($count == 0) {
+		$message = CGI::em("no sets");
+	} elsif ($count == $numSets) {
+		$message = "all sets";
+	} elsif ($count == 1) {
+		$message = "1 set";
+	} elsif ($count > $numSets || $count < 0) {
+		$message = CGI::em("an impossible number of sets: $count out of $numSets");
+	} else {
+		$message = "$count sets";
+	}
+	
+	return $message;
 }
 
 sub read_dir {  # read a directory
@@ -174,42 +622,20 @@ sub read_dir {  # read a directory
 	return sort @files;
 }
 
-sub read_scoring_file    { # used in SendMail and ....?
-	my $self            = shift;
-	my $fileName        = shift;
-	my $delimiter       = shift;
-	$delimiter          = ',' unless defined($delimiter);
-	my $scoringDirectory= $self->{ce}->{courseDirs}->{scoring};
-	my $filePath        = "$scoringDirectory/$fileName";  
-        #       Takes a delimited file as a parameter and returns an
-        #       associative array with the first field as the key.
-        #       Blank lines are skipped. White space is removed
-    my(@dbArray,$key,$dbString);
-    my %assocArray = ();
-    local(*FILE);
-    if ($fileName eq 'None') {
-    	# do nothing
-    } elsif ( open(FILE, "$filePath")  )   {
-		my $index=0;
-		while (<FILE>){
-			unless ($_ =~ /\S/)  {next;}               ## skip blank lines
-			chomp;
-			@{$dbArray[$index]} =$self->getRecord($_,$delimiter);
-			$key    =$dbArray[$index][0];
-			$assocArray{$key}=$dbArray[$index];
-			$index++;
-		}
-		close(FILE);
-     } else {
-     	warn "Couldn't read file $filePath";
-     }
-     return \%assocArray;
-}
+=back
+
+=cut
 
 ################################################################################
-# routines for listing various types of files
+# Methods for listing various types of files
 ################################################################################
 
+=head2 Methods for listing various types of files
+
+=over
+
+=cut
+
 # list classlist files
 sub getCSVList {
 	my ($self) = @_;
@@ -225,13 +651,44 @@ sub getDefList {
 	return $self->read_dir($dir, qr/.*\.def/);
 }
 
-################################################################################
-# template escapes
-################################################################################
+sub getScoringFileList {
+	my ($self) = @_;
+	my $ce = $self->{ce};
+	my $dir = $ce->{courseDirs}->{scoring};
+	return $self->read_dir($dir, qr/.*\.csv/);
+}
 
-sub links {
- 	my $self = shift;
-	return $self->SUPER::links();
+sub getTemplateFileList {  # find all .pg files under the template tree (time consuming)
+	my ($self) = shift;
+	my $subDir = shift;
+	my $ce = $self->{ce};
+	$subDir = '' unless defined $subDir;
+	my $dir = $ce->{courseDirs}->{templates}."/$subDir";
+	# FIXME  currently allows one to see most files in the templates directory.  
+	# a better facility for handling auxiliary files would be nice.
+	return $self->read_dir($dir, qr/\.pg$|.*\.html|\.png|\.gif|\.txt|\.pl/);
 }
+sub getTemplateDirList {  # find all .pg files under the template tree (time consuming)
+	my ($self) = @_;
+	my $ce = $self->{ce};
+	my $dir = $ce->{courseDirs}->{templates};
+	my @list = ();
+	my $wanted = sub { if (-d $_ ) { 
+	                        my $current = $_;
+	                        return if $current =~/CVS/;
+	                        return if -l $current;   # don't list links
+	                        my $name = $File::Find::name;
+	                        $name = " Top" if $current =/^\./; #  top directory
+							$name =~ s/^$dir\///;
+							push @list, $name
+					   }
+	};
+	File::Find::find($wanted, $dir);
+	return sort @list;
+}
+
+=back
+
+=cut
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm b/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm
index cdaa821047..9f037df4a1 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader: webwork-modperl/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm,v 1.2 2003/12/09 01:12:31 sh002i Exp $
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm,v 1.24 2007/08/13 22:59:55 sh002i 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
@@ -26,170 +26,190 @@ WeBWorK::ContentGenerator::Instructor::AddUsers - Menu interface for adding user
 
 use strict;
 use warnings;
-use CGI qw();
+#use CGI qw(-nosticky );
+use WeBWorK::CGI;
+use WeBWorK::Utils qw/cryptPassword trim_spaces/;
 
 sub initialize {
 	my ($self) = @_;
-	my $r = $self->{r};
-	my $db = $self->{db};
-	my $ce = $self->{ce};
-	my $authz = $self->{authz};
+	my $r = $self->r;
+	my $db = $r->db;
+	my $ce = $r->ce;
+	my $authz = $r->authz;
+	
 	my $user = $r->param('user');
-
-	unless ($authz->hasPermissions($user, "modify_student_data")) {
-		$self->{submitError} = "You are not authorized to modify student data";
-		return;
-	}
-
-	if (defined($r->param('addStudent'))) {
-		my $newUser = $db->newUser;
-		my $newPermissionLevel = $db->newPermissionLevel;
-		my $newPassword = $db->newPassword;
-		$newUser->user_id($r->param('new_user_id'));
-		$newPermissionLevel->user_id($r->param('new_user_id'));
-		$newPassword->user_id($r->param('new_user_id'));
-		$newUser->last_name($r->param('last_name'));
-		$newUser->first_name($r->param('first_name'));
-		$newUser->student_id($r->param('student_id'));
-		$newUser->email_address($r->param('email_address'));
-		$newUser->section($r->param('section'));
-		$newUser->recitation($r->param('recitation'));
-		$newUser->comment($r->param('comment'));
-		$newUser->status('C');
-		$newPermissionLevel->permission(0);
-		#FIXME  handle errors if user exists already
-		$db->addUser($newUser);
-		$db->addPermissionLevel($newPermissionLevel);
-		$db->addPassword($newPassword);
-	 	$self->{studentEntryReport} = join("",
-	 		"Entered student", CGI::br(), 
-	        "Name: ", $newUser->last_name, ", ",$newUser->first_name,CGI::br(),
-	        " login/studentID: ", $newUser->user_id, "/",$newUser->student_id,CGI::br(),
-	        " email: ", $newUser->email_address,CGI::br(),
-	        " section: ", $newUser->section,CGI::br(),
-	       
-	    );
-	}
-}
-
-sub path {
-	my $self = shift;
-	my $args = $_[-1];
-	my $ce = $self->{ce};
-	my $root = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
 	
-	return $self->pathMacro($args,
-		"Home"             => "$root",
-		$courseName        => "$root/$courseName",
-		'Instructor Tools' => '',
-	);
-}
-
-sub title {
-	my $self = shift;
-	return "Instructor Tools";
+	# Check permissions
+	return unless ($authz->hasPermissions($user, "access_instructor_tools"));
+	return unless ($authz->hasPermissions($user, "modify_student_data"));
+	
+	if (defined($r->param('addStudents'))) {
+		my @userIDs;
+		my $numberOfStudents    = $r->param('number_of_students');
+		warn "Internal error -- the number of students to be added has not been included" unless defined $numberOfStudents;
+		foreach my $i (1..$numberOfStudents) {
+		    my $new_user_id  = trim_spaces($r->param("new_user_id_$i"));
+		    my $new_password = cryptPassword($r->param("student_id_$i"));
+		    next unless defined($new_user_id) and $new_user_id;
+			push @userIDs, $new_user_id;
+		    
+			my $newUser            = $db->newUser;
+			my $newPermissionLevel = $db->newPermissionLevel;
+			my $newPassword        = $db->newPassword;
+			$newUser->user_id($new_user_id);
+			$newPermissionLevel->user_id($new_user_id);
+			$newPassword->user_id($new_user_id);
+			$newPassword->password($new_password);
+			$newUser->last_name(trim_spaces($r->param("last_name_$i")));
+			$newUser->first_name(trim_spaces($r->param("first_name_$i")));
+			$newUser->student_id(trim_spaces($r->param("student_id_$i")));
+			$newUser->email_address(trim_spaces($r->param("email_address_$i")));
+			$newUser->section(trim_spaces($r->param("section_$i")));
+			$newUser->recitation(trim_spaces($r->param("recitation_$i")));
+			$newUser->comment(trim_spaces($r->param("comment_$i")));
+			$newUser->status($ce->status_name_to_abbrevs($ce->{default_status}));
+			$newPermissionLevel->permission(0);
+			#FIXME  handle errors if user exists already
+			eval { $db->addUser($newUser) };
+			if ($@) {
+				my $addError = $@;
+				$self->{studentEntryReport} .= join("",
+					CGI::b("Failed to enter student: "), $newUser->last_name, ", ",$newUser->first_name,
+					CGI::b(", login/studentID: "), $newUser->user_id, "/",$newUser->student_id,
+					CGI::b(", email: "), $newUser->email_address,
+					CGI::b(", section: "), $newUser->section,
+					CGI::br(), CGI::b("Error message: "), $addError,
+					CGI::hr(),CGI::br(),
+				);
+			} else {
+				$db->addPermissionLevel($newPermissionLevel);
+				$db->addPassword($newPassword);
+				$self->{studentEntryReport} .= join("",
+					CGI::b("Entered student: "), $newUser->last_name, ", ",$newUser->first_name,
+					CGI::b(", login/studentID: "), $newUser->user_id, "/",$newUser->student_id,
+					CGI::b(", email: "), $newUser->email_address,
+					CGI::b(", section: "), $newUser->section,CGI::hr(),CGI::br(),
+
+				);
+			}
+		}
+		if (defined $r->param("assignSets")) {
+			my @setIDs = $r->param("assignSets");
+			if (@setIDs) {
+				$self->assignSetsToUsers(\@setIDs, \@userIDs);
+			}
+		}
+	}
 }
 
 sub body {
-	my $self = shift;
-	my $r = $self->{r};
-	my $ce = $self->{ce};
-	my $db = $self->{db};
-	my $authz = $self->{authz};
-	my $courseName = $ce->{courseName};
+	my ($self) = @_;
+	my $r      = $self->r;
+	my $ce     = $r->ce;
+	my $db     = $r->db;
+	my $authz  = $r->authz;
+	
+	my $courseName = $r->urlpath->arg("courseID");
 	my $authen_args = $self->url_authen_args();
 	my $user = $r->param('user');
-	my $prof_url = $ce->{webworkURLs}->{oldProf};
-	my $full_url = "$prof_url?course=$courseName&$authen_args";
-	my $userEditorURL = "users/?" . $self->url_args;
-	my $problemSetEditorURL = "sets/?" . $self->url_args;
-	my $statsURL       = "stats/?" . $self->url_args;
-	my $emailURL       = "send_mail/?" . $self->url_args;
 	
-	################### debug code
-	#my $permissonLevel =  $self->{db}->getPermissionLevel($user)->permission(); #checked
-	#my $courseEnvironmentLevels = $self->{ce}->{permissionLevels};
-	#return CGI::em(" user $permissonLevel permlevels ".join("<>",%$courseEnvironmentLevels));
-    ################### debug code
-    
-	return CGI::em('You are not authorized to access the Instructor tools.')
-		unless $authz->hasPermissions($user, 'access_instructor_tools');
+	# Check permissions
+	return CGI::div({class=>"ResultsWithError"}, "You are not authorized to access the Instructor tools.")
+		unless $authz->hasPermissions($user, "access_instructor_tools");
+	
+	return CGI::div({class=>"ResultsWithError"}, "You are not authorized to modify student data.")
+		unless $authz->hasPermissions($user, "modify_student_data");
 
+	
 	return join("", 
-		CGI::start_table({-border=>2,-cellpadding=>20}),
-		CGI::Tr({-align=>'center'},
-			CGI::td(
-				CGI::a({href=>$userEditorURL}, "Edit $courseName class list")  ,
-			),
-			CGI::td(
-				CGI::a({href=>$problemSetEditorURL}, "Edit $courseName problem sets"),
-					
-			),
-			"\n",
-		),
-		CGI::Tr({ -align=>'center'},
-			CGI::td([
-				CGI::a({-href=>$emailURL}, "Send e-mail to $courseName"),
-				CGI::a({-href=>$statsURL}, "Statistics for $courseName"),
-			]),
-			"\n",
-		),
-		CGI::Tr({ -align=>'center'},
-			CGI::td([
-				'WeBWorK 1.9 Instructor '.CGI::a({-href=>$full_url}, 'Tools'),
-				'Open WeBWorK 1.9 Instructor '.CGI::a({-href=>$full_url, -target=>'_new'}, 'Tools').' in new window',
-			]),
-			"\n",
-		),
-		
-		CGI::end_table(),
+	
 		CGI::hr(),
 		CGI::p(
 			defined($self->{studentEntryReport})
 				? $self->{studentEntryReport}
 				: ''
 		),
+		CGI::p("Enter information below for students you wish to add. Each student's password will initially be set to their student ID."),
 		$self->addStudentForm,
 	);
 }
 
 sub addStudentForm {
-	my $self = shift;
-	my $r = $self->{r};
+	my $self                  = shift;
+	my $r                     = $self->r;
+	my $db                    = $r->db;
+	my $ce                    = $r->ce;
+	my $numberOfStudents      = $r->param("number_of_students") || 5;
+	
+
 	
 	# Add a student form
-	return join("",
-		CGI::p("Add new students"),	
+	
+	my @entryLines = ();
+	foreach my $i (1..$numberOfStudents) {
+		push( @entryLines, 		
+			CGI::Tr({},
+				CGI::td({},
+					[ CGI::input({name=>"last_name_$i"}),
+					  CGI::input({name=>"first_name_$i"}),
+					  CGI::input({name=>"student_id_$i",size=>"16"}),
+					  CGI::input({name=>"new_user_id_$i",size=>"10"}),
+					  CGI::input({name=>"email_address_$i"}),
+					  CGI::input({name=>"section_$i",size=>"10"}),
+					  CGI::input({name=>"recitation_$i",size=>"10"}),
+					  CGI::input({name=>"comment_$i"}),
+					]
+				)
+			),"\n",
+		);
+	}
+
+	return join("",		
+		CGI::start_form({method=>"post", action=>$r->uri(),name=>"add_users"}),
+		$self->hidden_authen_fields(),"\n",
+		CGI::submit(-name=>"Create", -value=>"Create"),"&nbsp;&nbsp;","\n",
+		CGI::input({type=>'text', name=>'number_of_students', value=>$numberOfStudents,size => 3}), " entry rows. ","\n",
+		CGI::end_form(),"\n",
+		CGI::hr(),
+		
 		CGI::start_form({method=>"post", action=>$r->uri()}),
 		$self->hidden_authen_fields(),
+		CGI::input({type=>'hidden', name => "number_of_students", value => $numberOfStudents}),
 		CGI::start_table({border=>'1', cellpadding=>'2'}),
 		CGI::Tr({},
 			CGI::th({},
 				['Last Name', 'First Name', 'Student ID', 'Login Name', 'Email Address', 'Section','Recitation', 'Comment']
 			)
 		),
-		CGI::Tr({},
-			CGI::td({},
-				[ CGI::input({name=>'last_name'}),
-				  CGI::input({name=>'first_name'}),
-				  CGI::input({name=>'student_id',size=>'16'}),
-				  CGI::input({name=>'new_user_id',size=>'10'}),
-				  CGI::input({name=>'email_address'}),
-				  CGI::input({name=>'section',size=>'10'}),
-				  CGI::input({name=>'recitation',size=>'10'}),
-				  CGI::input({name=>'comment'}),
-				
-				
-				]
-			)
+		@entryLines,
+		CGI::end_table(),    
+		
+
+		
+		CGI::p("Select sets below to assign them to the newly-created users."),
+		CGI::popup_menu(
+			-name     => "assignSets",
+			-values   => [ $db->listGlobalSets ],
+			-size     => 10,
+			-multiple => "multiple",
 		),
-		CGI::end_table(),
-		CGI::submit({name=>"addStudent", value=>"Add Student"}),
-		CGI::end_form(),
+		CGI::p(
+			CGI::submit({name=>"addStudents", value=>"Add Students"}),
+		),
+		CGI::end_form(),		
+
+		#qq{ <div style="color:red"> After entering new students you will still 
+		#need to assign sets to them.  This is done from the "set list" page. <br> 
+		#Click on the entry "xx users" in 
+		#the "assigned to" column at the far right. <br> Then click either "assign to all"  
+		#or check individual users and click "save" at the bottom.  </div>
+		#Soon ( real soon -- honest!!! :-)  ) you will also be able to assign sets to the students as they are entered from this page. }
 	);
 }
 
+
+
+
 1;
 
 __END__
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm b/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm
index 4fd694b3fb..714e4f6237 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader: webwork-modperl/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm,v 1.7 2003/12/09 01:12:31 sh002i Exp $
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Instructor/Assigner.pm,v 1.37 2006/09/25 22:14:53 sh002i 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
@@ -19,140 +19,183 @@ use base qw(WeBWorK::ContentGenerator::Instructor);
 
 =head1 NAME
 
-WeBWorK::ContentGenerator::Instructor::Assigner - Assign problem sets to users
+WeBWorK::ContentGenerator::Instructor::Assigner - Assign homework sets to users.
 
 =cut
 
 use strict;
 use warnings;
-use CGI qw();
+#use CGI qw(-nosticky );
+use WeBWorK::CGI;
+use WeBWorK::HTML::ScrollingRecordList qw/scrollingRecordList/;
 
-sub initialize {
-	my ($self, $setID) = @_;
-	my $r = $self->{r};
-	my $authz = $self->{authz};
-	my $db = $self->{db};
+sub pre_header_initialize {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $db = $r->db;
+	my $authz = $r->authz;
+	my $ce = $r->ce;
 	my $user = $r->param('user');
 	
-	unless ($authz->hasPermissions($user, "assign_problem_sets")) {
-		$self->{submitError} = "You are not authorized to assign problem sets";
-		return;
-	}
+	# Permissions dealt with in the body
+	return "" unless $authz->hasPermissions($user, "access_instructor_tools");
+	return "" unless $authz->hasPermissions($user, "assign_problem_sets");
+
+	my @selected_users = $r->param("selected_users");
+	my @selected_sets = $r->param("selected_sets");
 	
-	my @users = $db->listUsers;
-	my %selectedUsers = map {$_ => 1} $r->param('selected');
-	
-	if (defined $r->param('assignToAll')) {
-		$self->assignSetToAllUsers($setID);
-	} elsif (defined $r->param('assignToSelected')) {
-		my $setRecord = $db->getGlobalSet($setID); #checked
-		die "Unable to get global set record for $setID " unless $setRecord;
-		foreach my $selectedUser (@users) {
-			if (exists $selectedUsers{$selectedUser}) {
-				$self->assignSetToUser($selectedUser, $setRecord)
-			} else {
-				$db->deleteUserSet($selectedUser, $setID);
+	if (defined $r->param("assign") || defined $r->param("unassign")) {
+		if  (@selected_users && @selected_sets) {
+			my @results;  # This is not used?
+			if(defined $r->param("assign")) {
+				$self->assignSetsToUsers(\@selected_sets, \@selected_users);
+				$self->addgoodmessage('All assignments were made successfully.');
+			}
+			if (defined $r->param("unassign")) {
+				if(defined $r->param('unassignFromAllSafety') and $r->param('unassignFromAllSafety')==1) {
+					$self->unassignSetsFromUsers(\@selected_sets, \@selected_users) if(defined $r->param("unassign"));
+					$self->addgoodmessage('All unassignments were made successfully.');
+				} else { # asked for unassign, but no safety radio toggle
+					$self->addbadmessage('Unassignments were not done.  You need to both click to "Allow unassign" and click on the Unassign button.');
+				}
 			}
+			
+			if (@results) { # Can't get here?
+				$self->addbadmessage(
+					"The following error(s) occured while assigning:".
+					CGI::ul(CGI::li(\@results))
+				);
+			}
+		} else {
+			$self->addbadmessage("You must select one or more users below.")
+				unless @selected_users;
+			$self->addbadmessage("You must select one or more sets below.")
+				unless @selected_sets;
 		}
 	}
 }
 
-sub getSetName {
-	my ($self, $pathSetName) = @_;
-	if (ref $pathSetName eq "HASH") {
-		$pathSetName = undef;
-	}
-	return $pathSetName;
-}
-
-sub path {
-	my $self          = shift;
-    my @components    = @_;
-	my $args          = $_[-1];
-	
-	my $ce = $self->{ce};
-	my $root = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
-	my $set_id    = $self->getSetName($components[0]);
-	return $self->pathMacro($args,
-		"Home"          => "$root",
-		$courseName     => "$root/$courseName",
-		'instructor'    => "$root/$courseName/instructor",
-		'sets'          => "$root/$courseName/instructor/sets/",
-		"$set_id"   => "$root/$courseName/instructor/sets/$set_id",
-		"assign"      => ''
-	);
-}
-
-sub title {
-	my ($self, @components) = @_;
-	return "Assign problems to students - ".$self->{ce}->{courseName}." : ".$self->getSetName(@components);
-}
-
 sub body {
-	my ($self, $setID) = @_;
-	my $r = $self->{r};
-	my $authz = $self->{authz};
-	my $db = $self->{db};
-	my $ce = $self->{ce};
-	my $webworkRoot = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
+	my ($self) = @_;
+	my $r = $self->r;
+	my $db = $r->db;
+	my $authz = $r->authz;
+	my $ce = $r->ce;
+	
 	my $user = $r->param('user');
 	
-        return CGI::em("You are not authorized to access the Instructor tools.") unless $authz->hasPermissions($user, "access_instructor_tools");
+	# Check permissions
+	return CGI::div({class=>"ResultsWithError"}, "You are not authorized to access the Instructor tools.")
+		unless $authz->hasPermissions($user, "access_instructor_tools");
+	
+	return CGI::div({class=>"ResultsWithError"}, "You are not authorized to assign homework sets.")
+		unless $authz->hasPermissions($user, "assign_problem_sets");
 
-	my @users = $db->listUsers;
-	print CGI::start_form({method=>"post", action=>$r->uri});
-	print CGI::start_table({});
-	# get user records
-	my @userRecords  = ();
-	foreach my $currentUser ( @users) {
-		my $userObj = $db->getUser($currentUser); #checked
-		die "Unable to find user object for $currentUser. " unless $userObj;
-		push (@userRecords, $userObj );
+	
+	print CGI::p("Select one or more sets and one or more users below to assign/unassign"
+		. " each selected set to/from all selected users.");
+	
+	# DBFIXME shouldn't have to get the user id list
+	# DBFIXME mark's filtering should happen in a WHERE clause
+	my @userIDs = $db->listUsers;
+	my @Users = $db->getUsers(@userIDs);
+## Mark's Edits for filtering
+	my @myUsers;
+
+	
+	my (@viewable_sections, @viewable_recitations);
+	
+	if (defined @{$ce->{viewable_sections}->{$user}})
+		{@viewable_sections = @{$ce->{viewable_sections}->{$user}};}
+	if (defined @{$ce->{viewable_recitations}->{$user}})
+		{@viewable_recitations = @{$ce->{viewable_recitations}->{$user}};}
+	if (@viewable_sections or @viewable_recitations){
+		foreach my $student (@Users){
+			my $keep = 0;
+			foreach my $sec (@viewable_sections){
+				if ($student->section() eq $sec){$keep = 1;}
+			}
+			foreach my $rec (@viewable_recitations){
+				if ($student->section() eq $rec){$keep = 1;}
+			}
+			if ($keep) {push @myUsers, $student;}
+		}
+		@Users = @myUsers;
 	}
-	@userRecords = sort { ( lc($a->section) cmp lc($b->section) ) || 
-	                     ( lc($a->last_name) cmp lc($b->last_name )) } @userRecords;
+## End Mark's Edits
 
-	foreach my $userRecord (@userRecords) {
-		my $user = $userRecord->user_id;
-		my $userSetRecord = $db->getUserSet($user, $setID); #checked
-		die "Unable to find record for user $user and set $setID " unless $userSetRecord;
-		my $prettyName = $userRecord->last_name
-			. ", "
-			. $userRecord->first_name;
-		print CGI::Tr({}, 
-			CGI::td({}, [
-				CGI::checkbox({
-					type=>"checkbox",
-					name=>"selected",
-					checked=>(
-						defined $userSetRecord
-						? "on"
-						: ""
+	
+	# DBFIXME shouldn't have to get the set ID list
+	my @globalSetIDs = $db->listGlobalSets;
+	my @GlobalSets = $db->getGlobalSets(@globalSetIDs);
+	
+	my $scrolling_user_list = scrollingRecordList({
+		name => "selected_users",
+		request => $r,
+		default_sort => "lnfn",
+		default_format => "lnfn_uid",
+		default_filters => ["all"],
+		size => 20,
+		multiple => 1,
+	}, @Users);
+	
+	my $scrolling_set_list = scrollingRecordList({
+		name => "selected_sets",
+		request => $r,
+		default_sort => "set_id",
+		default_format => "set_id",
+		default_filters => ["all"],
+		size => 20,
+		multiple => 1,
+	}, @GlobalSets);
+	
+	print CGI::start_form({method=>"post", action=>$r->uri()});
+	print $self->hidden_authen_fields();
+	
+	print CGI::table({class=>"FormLayout"},
+		CGI::Tr(
+			CGI::th("Users"),
+			CGI::th("Sets"),
+		),
+		CGI::Tr(
+			CGI::td($scrolling_user_list),
+			CGI::td($scrolling_set_list),
+		),
+		CGI::Tr(
+			CGI::td({colspan=>2, class=>"ButtonRow"},
+				CGI::submit(
+					-name => "assign",
+					-value => "Assign selected sets to selected users",
+					-style => "width: 45ex",
+				),
+			),
+		),
+		CGI::Tr(
+			CGI::td({colspan=>2},
+				CGI::div({class=>'ResultsWithError', style=>'color:red'},
+					"Do not unassign students unless you know what you are doing.",
+					CGI::br(),
+					"There is NO undo for unassigning students. ",
+					CGI::br(),
+					CGI::submit(
+						-name => "unassign",
+						-value => "Unassign selected sets from selected users",
+						-style => "width: 45ex",
 					),
-					value=>$user,
-					label=>"",
-				}),
-				$user,
-				"($prettyName)", " ", $userRecord->section, " ",
-				(
-					defined $userSetRecord
-					? CGI::a(
-						{href=>$ce->{webworkURLs}->{root}."/$courseName/instructor/sets/$setID/?editForUser=$user&".$self->url_authen_args()},
-						"Edit user-specific set data for $user"
-					)
-					: ()
+					CGI::radio_group(-name=>"unassignFromAllSafety", -values=>[0,1], -default=>0, -labels=>{0=>'Assignments only', 1=>'Allow unassign'}),
 				),
-			])
-		);
-	}
-	print CGI::end_table();
-	print $self->hidden_authen_fields;
-	print CGI::submit({name=>"assignToSelected", value=>"Save"});
-	print CGI::br();
-	print CGI::br();
-	print CGI::submit({name=>"assignToAll", value=>"Assign to All Users"});
+			),
+		),
+	);
+
+	
+
+	print CGI::p("When you unassign a student's name, you destroy all
+			of the data for that homework set for that student. You will then need to
+			reassign the set(s) to these students and they will receive new versions of the problems.
+			Make sure this is what you want to do before unassigning students."
+	);
+	
 	print CGI::end_form();
 	
 	return "";
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/Compare.pm b/lib/WeBWorK/ContentGenerator/Instructor/Compare.pm
new file mode 100644
index 0000000000..58d6f3bbbd
--- /dev/null
+++ b/lib/WeBWorK/ContentGenerator/Instructor/Compare.pm
@@ -0,0 +1,140 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $ $
+# 
+# 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.	 See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+# TODO
+
+# background on rendered parts
+# search for files by regex name
+# get "similar" files by chardiff
+
+package WeBWorK::ContentGenerator::Instructor::Compare;
+use base qw(WeBWorK::ContentGenerator::Instructor);
+
+=head1 NAME
+
+WeBWorK::ContentGenerator::Instructor::Compare - Compare problems
+
+=cut
+
+use strict;
+use warnings;
+
+#use CGI qw(-nosticky );
+use WeBWorK::CGI;
+use WeBWorK::Form;
+use WeBWorK::Utils qw(readDirectory max);
+use WeBWorK::Utils::Tasks qw(renderProblems);
+
+require WeBWorK::Utils::ListingDB;
+
+
+
+#sub pre_header_initialize {
+#	 my ($self) = @_;
+#	 my $r = $self->r;
+#}
+
+sub body {
+	my ($self) = @_;
+
+	my $r = $self->r;
+	my $ce = $r->ce;							# course environment
+	my $db = $r->db;							# database
+	my $j;												# garden variety counter
+
+	my $userName = $r->param('user');
+
+	my $user = $db->getUser($userName); # checked
+	die "record for user $userName (real user) does not exist."
+		unless defined $user;
+
+	### Check that this is a professor
+	my $authz = $r->authz;
+	unless ($authz->hasPermissions($userName, "modify_problem_sets")) {
+		print "User $userName returned " .
+			$authz->hasPermissions($user, "modify_problem_sets") .
+			" for permission";
+		return(CGI::div({class=>'ResultsWithError'},
+		  CGI::em("You are not authorized to access the Instructor tools.")));
+	}
+
+	my $path1 = $r->param('path1') || '';
+	my $path2 = $r->param('path2') || '';
+	if ($r->param('clear')) {
+		$path1 = '';
+		$path2 = '';
+	}
+	my @pathlist = ();
+	push @pathlist, $path1 if $path1;
+	push @pathlist, $path2 if $path2;
+	my @rendered = renderProblems(r=> $r,
+																user => $user,
+																problem_list => \@pathlist,
+																displayMode => 'images');
+
+	##########	Extract information computed in pre_header_initialize
+	print CGI::startform({-method=>"POST", -action=>$r->uri, -name=>'mainform'}),
+		$self->hidden_authen_fields;
+	print CGI::p('File 1: ', CGI::textfield(-name=>"path1",
+																					-default=>"$path1",
+																					-override=>1, -size=>90));
+	print CGI::p('File 2: ', CGI::textfield(-name=>"path2",
+																					-default=>"$path2",
+																					-override=>1, -size=>90));
+	print CGI::p(CGI::submit(-name=>"show_me",
+													 -value=>"Show Files"));
+	print CGI::p(CGI::submit(-name=>"clear",
+													 -value=>"Clear"));
+	print CGI::endform(), "\n";
+
+	for $j (@rendered) {
+		print '<hr size="5" color="blue" />';
+		if ($j->{flags}->{error_flag}) {
+			print CGI::p('Error');
+		} else {
+			print $j->{body_text}
+		}
+	}
+	print '<hr size="5" color="blue" />';
+	if (scalar(@pathlist)>1) {
+		print CGI::h2('Diff output');
+		my $use_hdiff = 0;
+		if($use_hdiff) {
+			# If you have hdiff installed, you can get colorized diffs
+			my $diffout = `hdiff -t " " -c "File 1" -C "File 2" -N $ce->{courseDirs}->{templates}/$pathlist[0] $ce->{courseDirs}->{templates}/$pathlist[1]`;
+			print $diffout;
+		} else { 
+			# Here we call diff.  Basic version first
+			my $diffout = `diff -u $ce->{courseDirs}->{templates}/$pathlist[0] $ce->{courseDirs}->{templates}/$pathlist[1]`;
+			print "\n<pre>\n";
+			print $diffout;
+			print "</pre>\n";
+		}
+	}
+
+	return "";	
+}
+
+
+=head1 AUTHOR
+
+Written by John Jones, jj (at) asu.edu.
+
+=cut
+
+
+
+1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/Config.pm b/lib/WeBWorK/ContentGenerator/Instructor/Config.pm
new file mode 100644
index 0000000000..b56a5a50b2
--- /dev/null
+++ b/lib/WeBWorK/ContentGenerator/Instructor/Config.pm
@@ -0,0 +1,635 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm,v 1.10 2007/07/26 18:53:06 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.	 See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+# TODO
+#  convert more html to CGI:: calls
+#  put some formatting in css and in ur.css
+#  add type to deal with boxes around problem text
+#  maybe add a type to deal with files like ur.css and templates (where
+#    a copy of the old file gets created for the course and then the
+#    user can modify it).
+
+# The main package starts lower down.  First we define different
+# types of config objects.
+
+# Each config object might want to override the methods display_value,
+# entry_widget, and save_string
+
+########################### config object defaults
+package configobject;
+
+use strict;
+use warnings;
+
+sub new {
+	my $class = shift;
+	my $self = shift;
+	$self->{Module} = shift;
+	bless $self, $class;
+	return $self;
+}
+
+# Only input is a value to display, and should produce an html string
+sub display_value {
+	my ($self, $val) = @_;
+	return $val;
+}
+
+# Stringified version for comparison (with html param return value)
+sub comparison_value {
+	my ($self, $val) = @_;
+	return $self->display_value($val);
+}
+
+sub convert_newval_source {
+	my ($self, $newvalsource) = @_;
+    my $inlinevarname = WeBWorK::ContentGenerator::Instructor::Config::inline_var($self->{var});
+    my $newval;
+    if($newvalsource =~ /widget/) {
+        $newval = $self->{Module}->{r}->param($newvalsource);
+    } else {
+        $newval = $self->comparison_value(eval('$self->{Module}->{r}->ce->'.
+			$inlinevarname));
+    }
+	return($newval);
+}
+
+# Bit of text to put in the configuration file.  The result should
+# be an assignment which is executable by perl.  oldval will be the
+# value of the perl variable, and newval will be whatever an entry
+# widget produces
+sub save_string {
+	my ($self, $oldval, $newvalsource) = @_;
+	my $varname = $self->{var};
+	my $newval = $self->convert_newval_source($newvalsource);
+	my $displayoldval = $self->display_value($oldval);
+	return '' if($displayoldval eq $newval);
+	return('$'. $varname . " = '$newval';\n");
+}
+
+# A widget to interact with the user
+sub entry_widget {
+	my ($self, $name, $default) = @_;
+	my $width = $self->{width} || 15;
+	return CGI::textfield(
+		-name => $name,
+		-value => $default,
+		-size => $width,
+	);
+}
+
+# This produces the documentation string and image link to more
+# documentation.  It is the same for all config types.
+sub what_string {
+	my $self = shift;
+	my $r = $self->{Module}->r;
+	return(CGI::td(
+		CGI::a({href=>$self->{Module}->systemLink(
+			$r->urlpath->new(type=>'instructor_config',
+				args=>{courseID => $r->urlpath->arg("courseID")}),
+				params=>{show_long_doc=>1,
+					var_name=>"$self->{var}"}),
+			target=>"_blank"},
+			CGI::img({src=>$r->{ce}->{webworkURLs}->{htdocs}.
+				"/images/question_mark.png",
+				border=>"0", alt=>"$self->{var}", 
+				style=>"float: right; padding-left: 0.1em;"})
+		) .
+		$self->{doc} 
+	));
+}
+
+########################### configtext
+package configtext;
+@configtext::ISA = qw(configobject);
+
+sub save_string {
+	my ($self, $oldval, $newvalsource) = @_;
+	my $varname = $self->{var};
+	my $newval = $self->convert_newval_source($newvalsource);
+	my $displayoldval = $self->comparison_value($oldval);
+	return '' if($displayoldval eq $newval);
+	# Remove quotes from the string, we will have a new type for text with quotes
+	$newval =~ s/['"`]//g; #`"'geditsucks
+	return('$'. $varname . " = '$newval';\n");
+}
+
+########################### confignumber
+package confignumber;
+@confignumber::ISA = qw(configobject);
+
+sub save_string {
+	my ($self, $oldval, $newvalsource) = @_;
+	my $varname = $self->{var};
+	my $newval = $self->convert_newval_source($newvalsource);
+	my $displayoldval = $self->comparison_value($oldval);
+	# Remove quotes from the string, we will have a new type for text with quotes
+	$newval =~ s/['"`]//g; #`"'geditsucks
+	my $newval2 = eval($newval);
+	if($@) {
+		$self->{Module}->addbadmessage("Syntax error in numeric value '$newval' for variable \$$self->{var}.  Reverting to the system default value.");
+		return '';
+	}
+	return '' if($displayoldval == $newval2);
+	return('$'. $varname . " = $newval;\n");
+}
+
+########################### configboolean
+package configboolean;
+@configboolean::ISA = qw(configobject);
+
+sub display_value {
+	my ($self, $val) = @_;
+	return 'True' if $val;
+	return 'False';
+}
+
+sub save_string {
+	my ($self, $oldval, $newvalsource) = @_;
+	my $varname = $self->{var};
+	my $newval = $self->convert_newval_source($newvalsource);
+	my $displayoldval = $self->comparison_value($oldval);
+	return '' if($displayoldval eq $newval);
+	return('$'. $varname . " = " . ($newval eq 'True' ? 1 : 0) .";\n");
+}
+
+sub entry_widget {
+	my ($self, $name, $default) = @_;
+	
+	return CGI::popup_menu(
+		-name => $name,
+		-default => ($default ? 'True' : 'False'),
+		-values => ['True', 'False'],
+	);
+}
+
+
+########################### configpermission
+package configpermission;
+@configpermission::ISA = qw(configobject);
+
+# This tries to produce a string from a permission number.  If you feed it
+# a string, that's what you get back.
+sub display_value {
+	my ($self, $val) = @_;
+	return 'nobody' if not defined($val);
+	my %userRoles = %{$self->{Module}->{r}->{ce}->{userRoles}};
+	my %reverseUserRoles = reverse %userRoles;
+	return $reverseUserRoles{$val} if defined($reverseUserRoles{$val});
+	return $val;
+}
+
+sub save_string {
+	my ($self, $oldval, $newvalsource) = @_;
+	my $varname = $self->{var};
+	my $newval = $self->convert_newval_source($newvalsource);
+	my $displayoldval = $self->comparison_value($oldval);
+	return '' if($displayoldval eq $newval);
+	my $str = '$'. $varname . " = '$newval';\n";
+	$str = '$'. $varname . " = undef;\n" if $newval eq 'nobody';
+	return($str);
+}
+
+sub entry_widget {
+	my ($self, $name, $default) = @_;
+	my $ce = $self->{Module}->{r}->{ce};
+	my $permHash = {};
+	my %userRoles = %{$ce->{userRoles}};
+	$userRoles{nobody} = 99999999; # insure that nobody comes at the end
+	my %reverseUserRoles = reverse %userRoles;
+
+	# the value of a permission can be undefined (for nobody),
+	# a standard permission number, or some other number
+	if(not defined($default)) {
+		$default = 'nobody';
+	}
+
+	my @values = sort { $userRoles{$a} <=> $userRoles{$b} } keys %userRoles;
+	return CGI::popup_menu(-name=>$name, -values => \@values,
+		-default=>$default);
+}
+
+########################### configlist
+package configlist;
+@configlist::ISA = qw(configobject);
+
+sub display_value {
+	my ($self, $val) = @_;
+	return '&nbsp;' if not defined($val);
+	my $str = join(','.CGI::br(), @{$val});
+	$str = '&nbsp;' if $str !~  /\S/;
+	return $str;
+}
+
+sub comparison_value {
+	my ($self, $val) = @_;
+	$val = [] if not defined($val);
+	my $str = join(',', @{$val});
+	return($str);
+}
+
+sub save_string {
+	my ($self, $oldval, $newvalsource) = @_;
+	my $newval = $self->convert_newval_source($newvalsource);
+	my $varname = $self->{var};
+	$oldval = $self->comparison_value($oldval);
+	return '' if($oldval eq $newval);
+	my $str = '';
+
+	$oldval =~ s/^\s*(.*)\s*$/$1/;
+	$newval =~ s/^\s*(.*)\s*$/$1/;
+	$oldval =~ s/[\s,]+/,/sg;
+	$newval =~ s/[\s,]+/,/sg;
+	return '' if($newval eq $oldval);
+	# ok we really have a new value, now turn it back into a string
+	my @parts = split ',', $newval;
+	map { $_ =~ s/['"`]//g } @parts; #`"'geditsucks
+	@parts = map { "'". $_ ."'" } @parts;
+	$str = join(',', @parts);
+	$str = '$'. $varname . " = [$str];\n";
+	return($str);
+}
+
+sub entry_widget {
+	my ($self, $name, $default) = @_;
+
+	$default = [] if not defined($default);
+	my $str = join(', ', @{$default});
+	$str = '' if $str !~ /\S/;
+	return CGI::textarea(
+		-name => $name,
+		-rows => 4,
+		-value => $str,
+		-columns => 25,
+	);
+}
+
+########################### configcheckboxlist
+package configcheckboxlist;
+@configcheckboxlist::ISA = qw(configobject);
+
+sub display_value {
+	my ($self, $val) = @_;
+	$val = [] if not defined($val);
+	my @vals = @$val;
+	return join(CGI::br(), @vals);
+}
+
+# here r->param() returns an array, so we need a custom
+# version of convert_newval_source
+
+sub convert_newval_source {
+	my ($self, $newvalsource) = @_;
+    my $inlinevarname = WeBWorK::ContentGenerator::Instructor::Config::inline_var($self->{var});
+    my @newvals;
+    if($newvalsource =~ /widget/) {
+        @newvals = $self->{Module}->{r}->param($newvalsource);
+    } else {
+        my $newval = eval('$self->{Module}->{r}->{ce}->'. $inlinevarname);
+		@newvals = @$newval;
+    }
+	return(@newvals);
+}
+
+# Bit of text to put in the configuration file.  The result should
+sub save_string {
+	my ($self, $oldval, $newvalsource) = @_;
+	my $varname = $self->{var};
+	my @newvals = $self->convert_newval_source($newvalsource);
+	if($self->{min} and (scalar(@newvals) < $self->{min})) {
+		$self->{Module}->addbadmessage("You need to select at least $self->{min} display mode.");
+		if($newvalsource =~ /widget/) {
+			return $self->save_string($oldval, 'current'); # try to return the old saved value
+		} else {
+			return '' ; # the previous saved value was empty, reset to system default
+		}
+	}
+	$oldval = $self->comparison_value($oldval);
+	my $newval =  $self->comparison_value(\@newvals);
+	return '' if($oldval eq $newval);
+	@newvals = map { "'".$_."'" } @newvals;
+	my $str = join(',', @newvals);
+	$str = '$'. $varname . " = [$str];\n";
+	return($str);
+}
+
+sub comparison_value {
+	my ($self, $val) = @_;
+	$val = [] if not defined($val);
+	my $str = join(',', @{$val});
+	return($str);
+}
+
+sub entry_widget {
+	my ($self, $name, $default) = @_;
+	return CGI::checkbox_group(
+		-name => $name,
+		-value => $self->{values},
+		-default => $default,
+		-columns=>1
+	);
+}
+
+########################### configpopuplist
+package configpopuplist;
+@configpopuplist::ISA = qw(configobject);
+
+sub display_value {
+	my ($self, $val) = @_;
+	$val = 'ur' if not defined($val);
+	return join(CGI::br(), $val);
+}
+
+# here r->param() returns an array, so we need a custom
+# version of convert_newval_source
+
+# sub convert_newval_source {
+# 	my ($self, $newvalsource) = @_;
+#     my $inlinevarname = WeBWorK::ContentGenerator::Instructor::Config::inline_var($self->{var});
+#     my @newvals;
+#     if($newvalsource =~ /widget/) {
+#         @newvals = $self->{Module}->{r}->param($newvalsource);
+#     } else {
+#         my $newval = eval('$self->{Module}->{r}->{ce}->'. $inlinevarname);
+# 		@newvals = @$newval;
+#     }
+# 	return(@newvals);
+# }
+
+sub save_string {
+	my ($self, $oldval, $newvalsource) = @_;
+	my $varname = $self->{var};
+	my $newval = $self->convert_newval_source($newvalsource);
+	my $displayoldval = $self->comparison_value($oldval);
+	return '' if($displayoldval eq $newval);
+	return('$'. $varname . " = " . "'$newval';\n");
+}
+
+# sub comparison_value {
+# 	my ($self, $val) = @_;
+# 	$val = 'ur' if not defined($val);
+# 	my $str = join(',', @{$val});
+# 	return($str);
+# }
+
+sub entry_widget {
+	my ($self, $name, $default) = @_;
+	return CGI::popup_menu(
+		-name => $name,
+		-values => $self->{values},
+		-default => $default,
+
+	);
+}
+
+########### Main Config Package starts here
+
+package WeBWorK::ContentGenerator::Instructor::Config;
+use base qw(WeBWorK::ContentGenerator::Instructor);
+
+=head1 NAME
+
+WeBWorK::ContentGenerator::Instructor::Config - Config
+
+=cut
+
+use strict;
+use warnings;
+
+use CGI qw(-nosticky );
+use WeBWorK::CourseEnvironment;
+
+# Load the configuration parts defined in Constants.pm 
+
+our $ConfigValues = [] unless defined $ConfigValues;
+
+# Configuation data
+# It is organized by section.  The allowable types are 
+#  'text' for a text string,
+#  'list' for a list of text strings,
+#  'permission' for a permission value, 
+#  'boolean' for variables which really hold 0/1 values as flags.
+
+# write contents to outputFilePath and return error messages if any
+sub writeFile {
+	my $outputFilePath = shift;
+	my $contents = shift;
+	my $writeFileErrors;
+	eval {                                                          
+		local *OUTPUTFILE;
+		if( open OUTPUTFILE, ">", $outputFilePath) {
+			print OUTPUTFILE $contents;
+			close OUTPUTFILE;
+		} else {
+			$writeFileErrors = "I could not open $outputFilePath".
+				CGI::br() . CGI::br().
+				"We will not be able to make configuration changes unless the permissions are set so that the web server can write to this file.";
+		}
+	};  # any errors are caught in the next block
+
+	$writeFileErrors = $@ if $@;
+	return($writeFileErrors);
+}
+
+# Make a new config object from data
+
+sub objectify {
+	my ($self, $data) = @_;
+	return "config$data->{type}"->new($data,$self);
+}
+
+
+# Take var string from ConfigValues and prepare it for $ce->...
+sub inline_var {
+	my $varstring = shift;
+	return '{'.$varstring.'}' if $varstring =~ /^\w+$/;
+	$varstring =~ s/^(\w+)/{$1}->/;
+	return($varstring);
+}
+
+sub print_navigation_tabs {
+	my ($self, $current_tab, @tab_names) = @_;
+	my $r = $self->r;
+	my $str = '';
+	for my $tab (0..(scalar(@tab_names)-1)) {
+		if($current_tab eq "tab$tab") {
+			$tab_names[$tab] = $tab_names[$tab];
+		} else {
+			$tab_names[$tab] = CGI::a({href=>$self->systemLink($r->urlpath, params=>{section_tab=>"tab$tab"})}, $tab_names[$tab]);
+		}
+	}
+	print CGI::p() .
+		'<div align="center">' . join('&nbsp;|&nbsp;', @tab_names) .'</div>'.
+		CGI::p();
+}
+
+sub pre_header_initialize {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+
+	# Get a course environment without course.conf
+	$self->{default_ce} = WeBWorK::CourseEnvironment->new({
+		%WeBWorK::SeedCE,
+	});
+
+	$self->{ce_file_dir} = $ce->{courseDirs}->{root};
+
+	# Get a copy of the course environment which does not have simple.conf loaded
+	my $ce3 = eval {
+		new WeBWorK::CourseEnvironment({
+			%WeBWorK::SeedCE,
+			courseName => $ce->{courseName},
+			web_config_filename => 'noSuchFilePlease',
+		})
+	};
+	if($r->param("make_changes")) {
+		my $widget_count = 0;
+		my $fileoutput = "#!perl
+# This file is automatically generated by WeBWorK's web-based
+# configuration module.  Do not make changes directly to this
+# file.  It will be overwritten the next time configuration
+# changes are saved.\n\n";
+
+		# Get the number of the current tab
+		my $tab = $r->param('section_tab') || 'tab0';
+		$tab =~ s/tab//;
+		# We completely rewrite the simple configuration file
+		# so we need to go through all sections
+		for my $configSection (@{$ConfigValues}) {
+			my @configSectionArray = @{$configSection};
+			shift @configSectionArray;
+			for my $con (@configSectionArray) {
+				my $conobject = $self->objectify($con);
+				if($tab) { # This tab is not being shown
+					my $oldval = eval('$ce3->'.inline_var($con->{var}));
+					$fileoutput .= $conobject->save_string($oldval, 'current');
+				} else { # We reached the tab with entry objects
+					$fileoutput .= $conobject->save_string(eval('$ce3->'.inline_var($con->{var})), "widget$widget_count");
+					$widget_count++;
+				}
+			}
+			$tab--;
+		}
+		my $write_result = writeFile($self->{ce_file_dir}."/simple.conf", $fileoutput);
+		if ($write_result) {
+			$self->addbadmessage($write_result);
+		} else {
+			$self->addgoodmessage("Changes saved.");
+		}
+	}
+}
+
+sub body {
+	my ($self) = @_;
+
+	my $r = $self->r;
+	my $ce = $r->ce;		# course environment
+	my $db = $r->db;		# database
+
+	my $userName = $r->param('user');
+
+	my $user = $db->getUser($userName); # checked
+	die "record for user $userName (real user) does not exist."
+		unless defined $user;
+
+	### Check that this is a professor
+	my $authz = $r->authz;
+	unless ($authz->hasPermissions($userName, "modify_problem_sets")) {
+		print "User $userName returned " .
+			$authz->hasPermissions($user, "modify_problem_sets") .
+			" for permission";
+		return(CGI::div({class=>'ResultsWithError'},
+		  CGI::em("You are not authorized to access the Instructor tools.")));
+	}
+
+	if ($r->param('show_long_doc')) {
+		my $docstring;
+		for my $consec (@$ConfigValues) {
+			my @configSectionArray = @$consec;
+			shift @configSectionArray;
+			for my $con (@configSectionArray) {
+				$docstring = $con->{doc2} || $con->{doc}
+					if($con->{var} eq $r->param('var_name'));
+			}
+		}
+		print CGI::h2("Variable Documentation: ". CGI::code('$'.$r->param('var_name'))),
+			CGI::p(),
+			CGI::blockquote( $docstring );
+		return "";
+	}
+
+	my $default_ce = $self->{default_ce};
+	# Get the current course environment again in case we just saved changes
+	my $ce4 = eval {
+		new WeBWorK::CourseEnvironment({
+			%WeBWorK::SeedCE,
+			courseName => $ce->{courseName},
+		})
+	};
+
+	my $widget_count = 0;
+	if(scalar(@$ConfigValues) == 0) {
+		print CGI::p("The configuration module did not find the data
+it needs to function.  Have your site administrator check that Constants.pm
+is up to date.");
+		return "";
+	}
+
+	# Start tabs at the top
+	my $current_tab = $r->param('section_tab') || 'tab0';
+	my @tab_names = map { $_->[0] } @{$ConfigValues};
+	$self->print_navigation_tabs($current_tab, @tab_names);
+
+	print CGI::startform({method=>"post", action=>$r->uri, name=>"configform"});
+	print $self->hidden_authen_fields();
+	print CGI::hidden(-name=> 'section_tab', -value=> $current_tab);
+
+	my $tabnumber = $current_tab;
+	$tabnumber =~ s/tab//;
+	my @configSectionArray = @{$ConfigValues->[$tabnumber]};
+	my $configTitle = shift @configSectionArray;
+	print CGI::p(CGI::div({-align=>'center'}, CGI::b($configTitle)));
+
+	print CGI::start_table({-border=>"1"});
+	print '<tr>'.CGI::th('What'). CGI::th('Default') .CGI::th('Current');
+	for my $con (@configSectionArray) {
+		my $conobject = $self->objectify($con);
+		print "\n<tr>";
+		print $conobject->what_string;
+		print CGI::td({-align=>"center"}, $conobject->display_value(eval('$default_ce->'.inline_var($con->{var}))));
+		print CGI::td($conobject->entry_widget("widget$widget_count", eval('$ce4->'.inline_var($con->{var}))));
+		print '</tr>';
+		$widget_count++;
+	}
+	print CGI::end_table();
+	print CGI::p(CGI::submit(-name=>'make_changes', -value=>'Save Changes'));
+	print CGI::end_form();
+
+
+	return "";	
+}
+
+
+=head1 AUTHOR
+
+Written by John Jones, jj (at) asu.edu.
+
+=cut
+
+
+
+1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm b/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm
new file mode 100644
index 0000000000..5a7bf6651e
--- /dev/null
+++ b/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm
@@ -0,0 +1,1257 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm,v 1.30 2007/09/08 21:15:16 dpvc 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::ContentGenerator::Instructor::FileManager;
+use base qw(WeBWorK::ContentGenerator::Instructor);
+
+use WeBWorK::Utils qw(readDirectory readFile sortByName listFilesRecursive);
+use WeBWorK::Upload;
+use File::Path;
+use File::Copy;
+use File::Spec;
+use String::ShellQuote;
+
+=head1 NAME
+
+WeBWorK::ContentGenerator::Instructor::FileManager.pm -- simple directory manager for WW files
+
+=cut
+
+use strict;
+use warnings;
+#use CGI;
+use WeBWorK::CGI;
+
+use WeBWorK::Utils::CourseManagement qw(archiveCourse);
+
+use constant HOME => 'templates';
+
+#
+#  The list of file extensions and the directories they usually go in.
+#
+my %uploadDir = (
+  csv  => 'scoring',
+  lst  => 'templates',
+  pg   => 'templates/.*',
+  pl   => 'templates/macros',
+  def  => 'templates',
+  html => 'html/.*',
+);
+
+##################################################
+#
+# Check that the user is authorized, and then
+# see if there is a download to perform.
+#
+sub pre_header_initialize {
+	my $self = shift;
+	my $r = $self->r;
+	my $authz = $r->authz;
+	my $user = $r->param('user');
+	
+	# we don't need to return an error here, because body() will print an error for us :)
+	return unless $authz->hasPermissions($user, "manage_course_files");
+	
+	my $action = $r->param('action');
+	$self->Download if ($action && $action eq 'Download');
+	my $file = $r->param('download');
+	$self->downloadFile($file) if (defined $file);
+	my $ce = $r->ce;
+	my $urlpath = $r->urlpath;
+	my $courseID = $r->urlpath->arg("courseID");
+	# removed archived_course_ prefix -- it is important that path matches the $courseID for consitency with the database dump
+	my $archive_path = $ce->{webworkDirs}{courses} . "/$courseID/templates/$courseID.tar.gz";
+	my %options = (courseID => $courseID, archive_path => $archive_path, ce=>$ce );
+	$self->{archive_options}= \%options;
+
+}
+
+##################################################
+#
+# Download a given file
+#
+sub downloadFile {
+	my $self = shift;
+	my $file = checkName(shift);
+	my $pwd = $self->checkPWD(shift || $self->r->param('pwd') || HOME);
+	return unless $pwd;
+	$pwd = $self->{ce}{courseDirs}{root} . '/' . $pwd;
+	unless (-e "$pwd/$file") {
+		$self->addbadmessage("The file you are trying to download doesn't exist");
+		return;
+	}
+	unless (-f "$pwd/$file") {
+		$self->addbadmessage("You can only download regular files.");
+		return;
+	}
+	my $type = "application/octet-stream";
+	$type = "text/plain" if $file =~ m/\.(pg|pl|pm|txt|def|csv|lst)/;
+	$type = "image/gif"  if $file =~ m/\.gif/;
+	$type = "image/jpeg" if $file =~ m/\.(jpg|jpeg)/;
+	$type = "image/png"  if $file =~ m/\.png/;
+	$self->reply_with_file($type, "$pwd/$file", $file, 0);
+}
+
+##################################################
+#
+# The main body of the page
+#
+sub body {
+	my $self       = shift;
+	my $r          = $self->r;
+	my $urlpath    = $r->urlpath;
+	my $db         = $r->db;
+	my $ce         = $r->ce;
+	my $authz      = $r->authz;
+	my $courseRoot = $ce->{courseDirs}{root};
+	my $courseName = $urlpath->arg('courseID');
+	my $user       = $r->param('user');
+	my $key        = $r->param('key');
+	
+	return CGI::em("You are not authorized to manage course files")
+		unless $authz->hasPermissions($user, "manage_course_files");
+
+	$self->{pwd} = $self->checkPWD($r->param('pwd') || HOME);
+	return CGI::em("You have specified an illegal working directory!") unless defined $self->{pwd};
+
+	my $fileManagerPage = $urlpath->newFromModule($urlpath->module, $r, courseID => $courseName);
+	my $fileManagerURL  = $self->systemLink($fileManagerPage, authen => 0);
+
+	print CGI::start_form(
+		-method=>"POST",
+		-action=>$fileManagerURL,
+		-id=>"FileManager",
+		-enctype=> 'multipart/form-data',
+		-name=>"FileManager",
+         -style=>"margin:0",
+	);
+	print $self->hidden_authen_fields;
+
+	$self->{courseRoot} = $courseRoot;
+	$self->{courseName} = $courseName;
+
+	my $action = $r->param('action') || $r->param('formAction') || $r->param("confirmed") || 'Init';
+
+	for ($action) {
+		/^Refresh/i    and do {$self->Refresh; last};
+		/^Cancel/i     and do {$self->Refresh; last};
+		/^\^/i         and do {$self->ParentDir; last};
+		/^Directory/i  and do {$self->Go; last};
+		/^Go/i         and do {$self->Go; last};
+		/^View/i       and do {$self->View; last};
+		/^Edit/i       and do {$self->Edit; last};
+		/^Download/i   and do {$self->Refresh; last};
+		/^Copy/i       and do {$self->Copy; last};
+		/^Rename/i     and do {$self->Rename; last};
+		/^Delete/i     and do {$self->Delete; last};
+		/^Make/i       and do {$self->MakeArchive; last};
+		/^Unpack/i     and do {$self->UnpackArchive; last};
+		/^New Folder/i and do {$self->NewFolder; last};
+		/^New File/i   and do {$self->NewFile; last};
+		/^Upload/i     and do {$self->Upload; last};
+		/^Revert/i     and do {$self->Edit; last};
+		/^Save As/i    and do {$self->SaveAs; last};
+		/^Save/i       and do {$self->Save; last};
+		/^Init/i       and do {$self->Init; last};
+		$self->addbadmessage("Unknown action.");
+		$self->Refresh;
+	}
+    if ($r->param('archiveCourse') ) {
+         my %options = %{$self->{archive_options}};
+        my $courseID = $options{courseID};
+        $self->addgoodmessage("Archiving course as $courseID.tar.gz. Reload FileManager to see it.");
+    	WeBWorK::Utils::CourseManagement::archiveCourse(%options);
+    	$self->addgoodmessage("Course archived.");
+    	
+    }
+	print CGI::hidden({name=>'pwd',value=>$self->{pwd}});
+	print CGI::hidden({name=>'formAction',value=>""});
+	print CGI::end_form();
+
+	return "";
+}
+
+
+##################################################
+#
+#  First time through
+#
+sub Init {
+	my $self = shift;
+	$self->r->param('unpack',1);
+	$self->r->param('autodelete',1);
+	$self->r->param('format','Automatic');
+	$self->Refresh;
+}
+
+sub HiddenFlags {
+	my $self = shift;
+	print CGI::hidden({name=>"dates",     value=>$self->getFlag('dates')});
+	print CGI::hidden({name=>"overwrite", value=>$self->getFlag('overwrite')});
+	print CGI::hidden({name=>"unpack",    value=>$self->getFlag('unpack')});
+	print CGI::hidden({name=>"autodelete",value=>$self->getFlag('autodelete')});
+	print CGI::hidden({name=>"format",    value=>$self->getFlag('format','Automatic')});
+}
+
+##################################################
+#
+# Display the directory listing and associated buttons
+#
+sub Refresh {
+ 	my $self = shift;
+	my $pwd = shift || $self->{pwd};
+	my $isTop = $pwd eq '.' || $pwd eq '';
+
+	my ($dirs,$dirlabels) = directoryMenu($self->{courseName},$pwd);
+	my ($files,$filelabels) = directoryListing($self->{courseRoot},$pwd,$self->getFlag('dates'));
+
+	unless ($files) {
+		$self->addbadmessage("The directory you specified doesn't exist");
+		$files = []; $filelabels = {};
+	}
+
+	#
+	# Some JavaScript to make things easier for the user
+	#
+	print CGI::script(<<EOF);
+		function doForm(action) {
+			var form = window.document.getElementById('FileManager');
+			form.formAction.value = action;
+			form.submit();
+		}
+		function disableButton(id,state) {
+			var element = window.document.getElementById(id);
+			element.disabled = state;
+		}
+		function checkFiles() {
+			var files = window.document.getElementById('files');
+			var state = files.selectedIndex < 0;
+			disableButton('View',state);
+			disableButton('Edit',state);
+			disableButton('Download',state);
+			disableButton('Rename',state);
+			disableButton('Copy',state);
+			disableButton('Delete',state);
+			disableButton('MakeArchive',state);
+			checkArchive(files,state);
+		}
+		function checkFile() {
+			var file = window.document.getElementById('file');
+			if (navigator.vendor && navigator.vendorSub && navigator.vendor == "Netscape") {
+			  if (navigator.vendorSub.match(/(\\d+)\.(\\d+)/)) {
+			    if (RegExp.\$1 < 7 || (RegExp.\$1 == 7 && RegExp.\$2 < 2)) return;
+			  }
+			}
+			var state = (file.value == "");
+			disableButton('Upload',state);
+		}
+		function checkArchive(files,disabled) {
+			var button = document.getElementById('MakeArchive');
+			button.value = 'Make Archive';
+			if (disabled) return;
+			if (!files.childNodes[files.selectedIndex].value.match(/\\.(tar|tar\\.gz|tgz)\$/)) return;
+			for (var i = files.selectedIndex+1; i < files.length; i++)
+			  {if (files.childNodes[i].selected) return}
+			button.value = 'Unpack Archive';
+		}
+EOF
+
+	#
+	# Start the table
+	#
+	print CGI::start_table({border=>0,cellpadding=>0,cellspacing=>3, style=>"margin:1em 0 0 3em"});
+
+	#
+	# Directory menu and date/size checkbox
+	#
+	print CGI::Tr({},
+		CGI::td({colspan=>2},
+			CGI::input({type=>"submit", name=>"action", value => "^", ($isTop? (disabled=>1): ())}),
+			CGI::popup_menu(
+				-name => "directory",
+				-values => $dirs,
+				-labels => $dirlabels,
+				-style => "width:25em",
+				-onChange => "doForm('Go')"
+			),
+			CGI::noscript(CGI::input({type=>"submit",name=>"action",value=>"Go"}))
+		),
+		CGI::td(CGI::small(CGI::checkbox(
+			-name => 'dates',
+			-checked => $self->getFlag('dates'),
+			-value => 1,
+			-label => 'Show Date & Size',
+			-onClick => 'doForm("Refresh")',
+		))),
+	);
+
+	#
+	# Directory Listing and column of buttons
+	#
+	my %button = (type=>"submit",name=>"action",style=>"width:10em");
+	my $width = ($self->getFlag('dates') && scalar(@{$files}) > 0) ? "": " width:30em";
+	print CGI::Tr({valign=>"middle"},
+		fixSpaces(CGI::td(CGI::scrolling_list(
+			-name => "files", id => "files",
+			-style => "font-family:monospace; $width",
+			-size => 17,
+			-multiple => 1,
+			-values => $files,
+			-labels => $filelabels,
+			-onDblClick => "doForm('View')",
+			-onChange => "checkFiles()"
+		))),
+		CGI::td({width=>15}),
+		CGI::td({},
+			CGI::start_table({border=>0,cellpadding=>0,cellspacing=>3}),
+			CGI::Tr([
+				CGI::td(CGI::input({%button,value=>"View",id=>"View"})),
+				CGI::td(CGI::input({%button,value=>"Edit",id=>"Edit"})),
+				CGI::td(CGI::input({%button,value=>"Download",id=>"Download"})),
+				CGI::td(CGI::input({%button,value=>"Rename",id=>"Rename"})),
+				CGI::td(CGI::input({%button,value=>"Copy",id=>"Copy"})),
+				CGI::td(CGI::input({%button,value=>"Delete",id=>"Delete"})),
+				CGI::td(CGI::input({%button,value=>"Make Archive",id=>"MakeArchive"})),
+				CGI::td({height=>10}),
+				CGI::td(CGI::input({%button,value=>"New File"})),
+				CGI::td(CGI::input({%button,value=>"New Folder"})),
+				CGI::td(CGI::input({%button,value=>"Refresh"})),
+			]),
+			CGI::end_table(),
+		),
+	);
+
+	#
+	# Upload button and checkboxes
+	#
+	print CGI::Tr([
+		CGI::td(),
+		CGI::td({colspan=>3},
+		  CGI::input({type=>"submit",name=>"action",style=>"width:7em",value=>"Upload:",id=>"Upload"}),
+		  CGI::input({type=>"file",name=>"file",id=>"file",size=>40,onChange=>"checkFile()"}),
+		  CGI::br(),
+		  CGI::small(join(' &nbsp; ',"Format:",
+		    CGI::radio_group(-name=>'format', -value=>['Text','Binary','Automatic'],
+				     -default=>$self->getFlag('format','Automatic')))),
+		),
+	]);
+	print CGI::Tr([
+		CGI::td(),
+		CGI::td({colspan=>3},
+		  CGI::small(CGI::checkbox(-name=>'overwrite',-checked=>$self->getFlag('overwrite'),-value=>1,
+					   -label=>'Overwrite existing files silently')),
+		  CGI::br(),
+		  CGI::small(CGI::checkbox(-name=>'unpack',-checked=>$self->getFlag('unpack'),-value=>1,
+					   -label=>'Unpack archives automatically')),
+		  CGI::small(CGI::checkbox(-name=>'autodelete',-checked=>$self->getFlag('autodelete'),-value=>1,
+					   -label=>'then delete them')),
+		),
+	]);
+
+	#
+	# End the table
+	# 
+	print CGI::end_table();
+	print CGI::script("checkFiles(); checkFile();");
+}
+
+##################################################
+#
+# Move to the parent directory
+#
+sub ParentDir {
+	my $self = shift;
+	$self->{pwd} = '.' unless ($self->{pwd} =~ s!/[^/]*$!!);
+	$self->Refresh;
+}
+
+##################################################
+#
+# Move to the parent directory
+#
+sub Go {
+	my $self = shift;
+	$self->{pwd} = $self->r->param('directory');
+	$self->Refresh;
+}
+
+##################################################
+#
+# Open a directory or view a file
+#
+sub View {
+	my $self = shift; my $pwd = $self->{pwd};
+	my $r = $self->r;
+	my $filename = $self->getFile("view"); return unless $filename;
+	my $name = "$pwd/$filename"; $name =~ s!^\./?!!;
+	my $file = "$self->{courseRoot}/$pwd/$filename";
+
+	#
+	# Don't follow symbolic links
+	#
+	if ($self->isSymLink($file)) {
+	  $self->addbadmessage("That symbolic link takes you outside your course directory");
+	  $self->Refresh; return;
+	}
+
+	#
+	# Handle directories by making them the working directory
+	#
+	if (-d $file) {
+		$self->{pwd} .= '/'.$filename;
+		$self->Refresh; return;
+	}
+
+	unless (-f $file) {
+		$self->addbadmessage("You can't view files of that type");
+		$self->Refresh; return;
+	}
+
+	#
+	# Include a download link
+	#
+	my $urlpath = $self->r->urlpath;
+	my $fileManagerPage = $urlpath->newFromModule($urlpath->module, $r, courseID => $self->{courseName});
+	my $fileManagerURL  = $self->systemLink($fileManagerPage, params => {download => $filename, pwd => $pwd});
+	print CGI::div({style=>"float:right"},
+		 CGI::a({href=>$fileManagerURL},"Download"));
+	print CGI::p(),CGI::b($name),CGI::p();
+	print CGI::hr();
+
+	#
+	# For files, display the file, if possible.
+	# If the file is an image, display it as an image.
+	#
+	my $data = readFile($file);
+	if (isText($data)) {
+		print CGI::pre(showHTML($data));
+	} elsif ($file =~ m/\.(gif|jpg|png)/i) {
+		print CGI::img({src=>$fileManagerURL, border=>0});
+	} else {
+		print CGI::div({class=>"ResultsWithError"},
+			"The file does not appear to be a text file.");
+	}
+}
+
+##################################################
+#
+# Edit a file
+#
+sub Edit {
+	my $self = shift;
+	my $filename = $self->getFile('edit'); return unless $filename;
+	my $file = "$self->{courseRoot}/$self->{pwd}/$filename";
+
+	if (-d $file) {
+		$self->addbadmessage("You can't edit a directory");
+		$self->Refresh; return;
+	}
+	unless (-f $file) {
+		$self->addbadmessage("You can only edit text files");
+		$self->Refresh; return;
+	}
+	my $data = readFile($file);
+	if (!isText($data)) {
+		$self->addbadmessage("The file does not appear to be a text file");
+		$self->Refresh; return;
+	}
+
+	$self->RefreshEdit($data,$filename);
+}
+
+##################################################
+#
+# Save the edited file
+#
+sub Save {
+	my $self = shift; my $filename = shift;
+	my $pwd = $self->{pwd};
+	if ($filename) {
+		$pwd = substr($filename,length($self->{courseRoot})+1);
+		$pwd =~ s!(/|^)([^/]*)$!!; $filename = $2;
+                $pwd = '.' if $pwd eq '';
+	} else {
+		$filename = $self->getFile("save"); return unless $filename;
+	}
+	my $file = "$self->{courseRoot}/$pwd/$filename";
+	my $data = $self->r->param("data");
+
+	if (defined($data)) {
+		$data =~ s/\r\n?/\n/g;  # convert DOS and Mac line ends to unix
+		local (*OUTFILE);
+		if (open(OUTFILE,">$file")) {
+			eval {print OUTFILE $data; close(OUTFILE)};
+			if ($@) {$self->addbadmessage("Failed to save: $@")}
+			   else {$self->addgoodmessage("File saved")}
+		} else {$self->addbadmessage("Can't write to file: $!")}
+	} else {$data = ""; $self->addbadmessage("Error: no file data was submitted!")}
+
+	$self->{pwd} = $pwd;
+	$self->RefreshEdit($data,$filename);
+}
+
+##################################################
+#
+# Save the edited file under a new name
+#
+sub SaveAs {
+	my $self = shift;
+
+	my $newfile = $self->r->param('name');
+	my $original = $self->r->param('files');
+	$newfile = $self->verifyPath($newfile,$original);
+	if ($newfile) {$self->Save($newfile); return}
+	$self->RefreshEdit($self->r->param('data'),$original);
+}
+
+##################################################
+#
+# Display the Edit page
+#
+sub RefreshEdit {
+	my $self = shift; my $data = shift; my $file = shift;
+	my $pwd = shift || $self->{pwd};
+	my $name = "$pwd/$file"; $name =~ s!^\./?!!;
+
+	my %button = (type=>"submit",name=>"action",style=>"width:6em");
+	print CGI::p();
+	print CGI::start_table({border=>0,cellspacing=>0,cellpadding=>2, width=>"95%", align=>"center"});
+	print CGI::Tr([
+		CGI::td({align=>"center",style=>"background-color:#CCCCCC"},CGI::b($name)),
+		CGI::td(CGI::textarea(-name=>"data",-default=>$data,-override=>1,-rows=>30,-columns=>80,
+				-style=>"width:100%")), ## can't seem to get variable height to work
+		CGI::td({align=>"center", nowrap=>1},
+			CGI::input({%button,value=>"Cancel"}),"&nbsp;",
+			CGI::input({%button,value=>"Revert"}),"&nbsp;",
+			CGI::input({%button,value=>"Save"}),,"&nbsp;",
+			CGI::input({%button,value=>"Save As:"}),
+			CGI::input({type=>"text",name=>"name",size=>20,style=>"width:50%"}),
+		),
+	]);
+	print CGI::end_table();
+	print CGI::hidden({name=>"files", value=>$file});
+	$self->HiddenFlags;
+}
+
+##################################################
+#
+# Copy a file
+#
+sub Copy {
+	my $self = shift;
+        my $dir = "$self->{courseRoot}/$self->{pwd}";
+	my $original = $self->getFile('copy'); return unless $original;
+	my $oldfile = "$dir/$original";
+
+	if (-d $oldfile) {
+		# FIXME: need to do recursive directory copy
+		$self->addbadmessage("Directory copies are not yet implemented");
+		$self->Refresh;
+		return;
+	}
+
+	if ($self->r->param('confirmed')) {
+		my $newfile = $self->r->param('name');
+		if ($newfile = $self->verifyPath($newfile,$original)) {
+			if (copy($oldfile, $newfile)) {
+				$self->addgoodmessage("File successfully copied");
+				$self->Refresh; return;
+			} else {$self->addbadmessage("Can't copy file: $!")}
+		}
+	}
+
+	$self->Confirm("Copy file as:",$original,"Copy");
+	print CGI::hidden({name=>"files",value=>$original});
+}
+
+##################################################
+#
+# Rename a file
+#
+sub Rename {
+	my $self = shift;
+        my $dir = "$self->{courseRoot}/$self->{pwd}";
+	my $original = $self->getFile('rename'); return unless $original;
+	my $oldfile = "$dir/$original";
+
+	if ($self->r->param('confirmed')) {
+		my $newfile = $self->r->param('name');
+		if ($newfile = $self->verifyPath($newfile,$original)) {
+			if (rename $oldfile, $newfile) {
+				$self->addgoodmessage("File successfully renamed");
+				$self->Refresh; return;
+			} else {$self->addbadmessage("Can't rename file: $!")}
+		}
+	}
+
+	$self->Confirm("Rename file as:",uniqueName($dir,$original),"Rename");
+	print CGI::hidden({name=>"files",value=>$original});
+}
+
+##################################################
+#
+# Delete a file
+#
+sub Delete {
+	my $self = shift;
+	my @files = $self->r->param('files');
+	if (scalar(@files) == 0) {
+		$self->addbadmessage("You must select at least one file to delete");
+		$self->Refresh; return;
+	}
+
+	my $pwd = $self->{pwd};
+	my $dir = $self->{courseRoot}.'/'.$pwd;
+	if ($self->r->param('confirmed')) {
+
+		#
+		# If confirmed, go ahead and delete the files
+		#
+		foreach my $file (@files) {
+			if (defined $self->checkPWD("$pwd/$file",1)) {
+				if (-d "$dir/$file" && !-l "$dir/$file") {
+					my $removed = eval {rmtree("$dir/$file",0,1)};
+					if ($removed) {$self->addgoodmessage("Directory '$file' removed (items deleted: $removed)")}
+					else {$self->addbadmessage("Directory '$file' not removed: $!")}
+				} else {
+					if (unlink("$dir/$file")) {$self->addgoodmessage("File '$file' successfully removed")}
+					else {$self->addbadmessage("File '$file' not removed: $!")}
+				}
+			} else {$self->addbadmessage("Illegal file '$file' specified"); last}
+		}
+		$self->Refresh;
+
+	} else {
+
+		#
+		#  Look up the files to be deleted, and for directories, add / and the contents of the directory
+		#
+		my @filelist = ();
+		foreach my $file (@files) {
+			if (defined $self->checkPWD("$pwd/$file",1)) {
+				if (-l "$dir/$file") {
+					push(@filelist,"$file@");
+				} elsif (-d "$dir/$file") {
+					my @contents = (); my $dcount = 0;
+					foreach my $item (readDirectory("$dir/$file")) {
+						next if $item eq "." || $item eq "..";
+						if (-l "$dir/$file/$item") {
+							push(@contents, "$item@");
+						} elsif (-d "$dir/$file/$item") {
+							my $count = scalar(listFilesRecursive("$dir/$file/$item",".*"));
+							my $s = ($count == 1 ? "" : "s"); $dcount += $count;
+							push (@contents, "$item/".CGI::small({style=>"float:right;margin-right:3em"},CGI::i("($count item$s)")));
+						} else {
+							push(@contents, $item);
+						}
+						$dcount += 1;
+					}
+					my $s = ($dcount == 1 ? "": "s");
+					@contents = (@contents[0..10],"&nbsp; .","&nbsp; .","&nbsp; .") if scalar(@contents) > 15;
+					push (@filelist,$file."/".
+								CGI::small({style=>"float:right;margin-right:4em"},CGI::i("($dcount item$s total)")).
+								CGI::div({style=>"margin-left:1ex"},join(CGI::br(),@contents)));
+				} else {
+					push(@filelist,$file);
+				}
+			}
+		}
+
+		#
+		# Put up the confirmation dialog box
+		#
+		print CGI::start_table({border=>1,cellspacing=>2,cellpadding=>20, style=>"margin: 1em 0 0 5em"});
+		print CGI::Tr(
+			CGI::td(
+			  CGI::b("Warning:")," You have requested that the following items be deleted\n",
+			  CGI::ul(CGI::li(\@filelist)),
+			    ((grep { -d "$dir/$_" } @files)?
+					 CGI::p({style=>"width:500"},"Some of these files are directories. ",
+									"Only delete directories if you really know what you are doing. ",
+									"You can seriously damage your course if you delete the wrong thing."): ""),
+			  CGI::p({style=>"color:red"},"There is no undo for deleting files or directories!"),
+			  CGI::p("Really delete the items listed above?"),
+			  CGI::div({style=>"float:left; padding-left:3ex"},
+			    CGI::input({type=>"submit",name=>"action",value=>"Cancel"})),
+			  CGI::div({style=>"float:right; padding-right:3ex"},
+			    CGI::input({type=>"submit",name=>"action",value=>"Delete"})),
+			),
+		);
+		print CGI::end_table();
+
+		print CGI::hidden({name=>"confirmed",value=>"Delete"});
+		foreach my $file (@files) {print CGI::hidden({name=>"files",value=>$file})}
+		$self->HiddenFlags;
+	}
+}
+
+##################################################
+#
+# Make a gzipped tar archive
+#
+sub MakeArchive {
+	my $self = shift;
+	my @files = $self->r->param('files');
+	if (scalar(@files) == 0) {
+		$self->addbadmessage("You must select at least one file for the archive");
+		$self->Refresh; return;
+	}
+
+	my $dir = $self->{courseRoot}.'/'.$self->{pwd};
+	my $archive = uniqueName($dir,(scalar(@files) == 1)?
+				 $files[0].".tgz": $self->{courseName}.".tgz");
+	my $tar = "cd ".shell_quote($dir)." && $self->{ce}{externalPrograms}{tar} -cvzf ".shell_quote($archive,@files);
+	@files = readpipe $tar." 2>&1";
+	if ($? == 0) {
+		my $n = scalar(@files); my $s = ($n == 1? "": "s");
+		$self->addgoodmessage("Archive '$archive' created successfully ($n file$s)");
+	} else {
+		$self->addbadmessage("Can't create archive '$archive': command returned ".systemError($?));
+	}
+	$self->Refresh;
+}
+
+##################################################
+#
+# Unpack a gzipped tar archive
+#
+sub UnpackArchive {
+	my $self = shift;
+	my $archive = $self->getFile("unpack"); return unless $archive;
+	if ($archive !~ m/\.(tar|tar\.gz|tgz)$/) {
+		$self->addbadmessage("You can only unpack files ending in '.tgz', '.tar' or '.tar.gz'");
+	} else {
+		$self->unpack($archive);
+	}
+	$self->Refresh;
+}
+
+sub unpack {
+	my $self = shift;
+	my $archive = shift; my $z = 'z'; $z = '' if $archive =~ m/\.tar$/;
+	my $dir = $self->{courseRoot}.'/'.$self->{pwd};
+	my $tar = "cd ".shell_quote($dir)." && $self->{ce}{externalPrograms}{tar} -vx${z}f ".shell_quote($archive);
+	my @files = readpipe $tar." 2>&1";
+	if ($? == 0) {
+		my $n = scalar(@files); my $s = ($n == 1? "": "s");
+		$self->addgoodmessage("$n file$s unpacked successfully");
+		return 1;
+	} else {
+		$self->addbadmessage("Can't unpack '$archive': command returned ".systemError($?));
+		return 0;
+	}
+}
+
+##################################################
+#
+# Make a new file and edit it
+#
+sub NewFile {
+	my $self = shift;
+
+	if ($self->r->param('confirmed')) {
+		my $name = $self->r->param('name');
+		if (my $file = $self->verifyName($name,"file")) {
+			local (*NEWFILE);
+			if (open(NEWFILE,">$file")) {
+				close(NEWFILE);
+				$self->RefreshEdit("",$name);
+				return;
+			} else {$self->addbadmessage("Can't create file: $!")}
+		}
+	}
+
+	$self->Confirm("New file name:","","New File");
+}
+
+##################################################
+#
+# Make a new directory
+#
+sub NewFolder {
+	my $self = shift;
+
+	if ($self->r->param('confirmed')) {
+		my $name = $self->r->param('name');
+		if (my $dir = $self->verifyName($name,"directory")) {
+			if (mkdir $dir, 0750) {
+				$self->{pwd} .= '/'.$name;
+				$self->Refresh; return;
+			} else {$self->addbadmessage("Can't create directory: $!")}
+		}
+	}
+
+	$self->Confirm("New folder name:","","New Folder");
+}
+
+##################################################
+#
+# Download a file
+#
+sub Download {
+	my $self = shift;
+	my $pwd = $self->checkPWD($self->r->param('pwd') || HOME);
+	return unless $pwd;
+	my $filename = $self->getFile("download"); return unless $filename;
+	my $file = $self->{ce}{courseDirs}{root}.'/'.$pwd.'/'.$filename;
+
+	if (-d $file) {$self->addbadmessage("You can't download directories"); return}
+	unless (-f $file) {$self->addbadmessage("You can't download files of that type"); return}
+
+	$self->r->param('download',$filename);
+}
+
+##################################################
+#
+# Upload a file to the server
+#
+sub Upload {
+	my $self = shift;
+	my $dir = "$self->{courseRoot}/$self->{pwd}";
+	my $fileIDhash = $self->r->param('file');
+	unless ($fileIDhash) {
+		$self->addbadmessage("You have not chosen a file to upload.");
+		$self->Refresh;
+		return;
+	}
+
+	my ($id,$hash) = split(/\s+/,$fileIDhash);
+	my $upload = WeBWorK::Upload->retrieve($id,$hash,dir=>$self->{ce}{webworkDirs}{uploadCache});
+
+	my $name = checkName($upload->filename);
+	my $action = $self->r->param("formAction") || "Cancel";
+	if ($self->r->param("confirmed")) {
+		if ($action eq "Cancel") {
+			$upload->dispose;
+			$self->Refresh;
+			return;
+		}
+		$name = checkName($self->r->param('name')) if ($action eq "Rename");
+	}
+
+	if (-e "$dir/$name") {
+		unless ($self->r->param('overwrite') || $action eq "Overwrite") {
+			$self->Confirm("File ".CGI::b($name)." already exists. Overwrite it, or rename it as:".
+				       CGI::p(),uniqueName($dir,$name),"Rename","Overwrite");
+			print CGI::hidden({name=>"action",value=>"Upload"});
+			print CGI::hidden({name=>"file",value=>$fileIDhash});
+			return;
+		}
+	}
+	$self->checkFileLocation($name,$self->{pwd});
+
+	my $file = "$dir/$name";
+	my $type = $self->getFlag('format','Automatic');
+	my $data;
+	
+	#
+	#  Check if we need to convert linebreaks
+	#
+	if ($type ne 'Binary') {
+		my $fh = $upload->fileHandle;
+		my @lines = <$fh>; $data = join('',@lines);
+		if ($type eq 'Automatic') {$type = isText($data) ? 'Text' : 'Binary'}
+	}
+	if ($type eq 'Text') {
+		$upload->dispose;
+		$data =~ s/\r\n?/\n/g;
+		if (open(UPLOAD,">$file")) {print UPLOAD $data; close(UPLOAD)}
+		  else {$self->addbadmessage("Can't create file '$name': $!")}
+	} else {
+		$upload->disposeTo($file);
+	}
+
+	if (-e $file) {
+	  $self->addgoodmessage("$type file '$name' uploaded successfully");
+	  if ($name =~ m/\.(tar|tar\.gz|tgz)$/ && $self->getFlag('unpack')) {
+	    if ($self->unpack($name) && $self->getFlag('autodelete')) {
+	      if (unlink($file)) {$self->addgoodmessage("Archive '$name' deleted")}
+	        else {$self->addbadmessage("Can't delete archive '$name': $!")}
+	    }
+	  }
+	}
+
+	$self->Refresh;
+}
+
+##################################################
+##################################################
+#
+# Print a confirmation dialog box
+#
+sub Confirm {
+	my $self = shift;
+	my $message = shift; my $value = shift;
+	my $button = shift; my $button2 = shift;
+
+	print CGI::p();
+	print CGI::start_table({border=>1,cellspacing=>2,cellpadding=>20, style=>"margin: 1em 0 0 3em"});
+	print CGI::Tr(
+		CGI::td({align=>"CENTER"},
+		  $message,
+		  CGI::input({type=>"text",name=>"name",size=>50,value=>$value}),
+		  CGI::p(), CGI::center(
+		    CGI::div({style=>"float:right; padding-right:3ex"},
+		      CGI::input({type=>"submit",name=>"formAction",value=>$button})), # this will be the default
+		    CGI::div({style=>"float:left; padding-left:3ex"},
+		    CGI::input({type=>"submit",name=>"formAction",value=>"Cancel"})),
+		    ($button2 ? CGI::input({type=>"submit",name=>"formAction",value=>$button2}): ()),
+		  ),
+		),
+	      );
+	print CGI::end_table();
+	print CGI::hidden({name=>"confirmed", value=>$button});
+	$self->HiddenFlags;
+	print CGI::script("window.document.FileManager.name.focus()");
+}
+
+##################################################
+##################################################
+#
+# Check that there is exactly one valid file
+#
+sub getFile {
+	my $self = shift; my $action = shift;
+	my @files = $self->r->param("files");
+	if (scalar(@files) > 1) {
+		$self->addbadmessage("You can only $action one file at a time.");
+		$self->Refresh unless $action eq 'download';
+		return;
+	}
+	if (scalar(@files) == 0 || $files[0] eq "") {
+		$self->addbadmessage("You need to select a file to $action.");
+		$self->Refresh unless $action eq 'download';
+		return;
+	}
+	my $pwd = $self->checkPWD($self->{pwd} || $self->r->param('pwd') || HOME) || '.';
+	if ($self->isSymLink($pwd.'/'.$files[0])) {
+		$self->addbadmessage("That symbolic link takes you outside your course directory");
+		$self->Refresh unless $action eq 'download';
+		return;
+	}
+	unless ($self->checkPWD($pwd.'/'.$files[0],1)) {
+		$self->addbadmessage("You have specified an illegal file");
+		$self->Refresh unless $action eq 'download';
+		return;
+	}
+	return $files[0];
+}
+
+##################################################
+#
+# Get the entries for the directory menu
+#
+sub directoryMenu {
+	my $course = shift;
+	my $dir  = shift; $dir =~ s!^\.(/|$)!!;
+	my @dirs = split('/',$dir);
+	my $menu = ""; my $pwd;
+	
+	my (@values,%labels);
+	while (scalar(@dirs)) {
+		$pwd = join('/',(@dirs)[0..$#dirs]);
+		$dir = pop(@dirs);
+		push(@values,$pwd); $labels{$pwd} = $dir;
+	}
+	push(@values,'.'); $labels{'.'} = $course;
+	return (\@values,\%labels);
+}
+
+##################################################
+#
+# Get the directory listing
+#
+sub directoryListing {
+	my $root = shift; my $pwd = shift; my $showdates = shift;
+	my $dir = $root.'/'.$pwd;
+	my (@values,%labels,$size,$data);
+
+	return unless -d $dir;
+        my $len = 24;
+	my @names = sortByName(undef,grep(/^[^.]/,readDirectory($dir)));
+	foreach my $name (@names) {
+		unless ($name eq 'DATA') {   #FIXME don't view the DATA directory
+			my $file = "$dir/$name";
+			push(@values,$name); $labels{$name} = $name;
+			$labels{$name} .= '@' if (-l $file);
+			$labels{$name} .= '/' if (-d $file && !-l $file);
+			$len = length($labels{$name}) if length($labels{$name}) > $len;
+		}
+	}
+	if ($showdates) {
+		$len += 3;
+		foreach my $name (@values) {
+			my $file = "$dir/$name";
+			my ($size,$date) = (lstat($file))[7,9];
+			$labels{$name} = sprintf("%-${len}s%-16s%10s",$labels{$name},
+						 ((-d $file)? ("",""):
+						  (getDate($date),getSize($size))));
+		}
+	}
+	return (\@values,\%labels);
+}
+
+sub getDate {
+  my ($sec,$min,$hour,$day,$month,$year) = localtime(shift);
+  sprintf("%02d-%02d-%04d %02d:%02d",$month+1,$day,$year+1900,$hour,$min);
+}
+
+sub getSize {
+  my $size = shift;
+  return $size." B "                        if $size < 1024;
+  return sprintf("%.1f KB",$size/1024)      if $size < 1024*100;
+  return sprintf("%d KB",int($size/1024))   if $size < 1024*1024;
+  return sprintf("%.1f MB",$size/1024/1024) if $size < 1024*1024*100;
+  return sprintf("%d MB",$size/1024/1024);
+}
+
+##################################################
+#
+#  Check if a file is a symbolic link that we
+#  are not allowed to follow.
+#
+sub isSymLink {
+	my $self = shift; my $file = shift;
+	return 0 unless -l $file;
+
+	my $courseRoot = $self->{ce}{courseDirs}{root};
+	$courseRoot = readlink($courseRoot) if -l $courseRoot;
+	my $pwd = $self->{pwd} || $self->r->param('pwd') || HOME;
+	my $link = File::Spec->rel2abs(readlink($file),"$courseRoot/$pwd");
+	#
+	# Remove /./ and dir/../ constructs
+	#
+	$link =~ s!(^|/)(\.(/|$))+!$1!g;
+	while ($link =~ s!((\.[^./]+|\.\.[^/]+|[^./][^/]*)/\.\.(/|$))!!) {};
+
+	#
+	# Link is OK if it is in the course directory
+	#
+	return 0 if substr($link,0,length($courseRoot)) eq $courseRoot;
+
+	#
+	# Look through the list of valid paths to see if this link is OK
+	#
+	my $valid = $self->{ce}{webworkDirs}{valid_symlinks};
+	if (defined $valid && $valid) {
+		foreach my $path (@{$valid}) {
+			return 0 if substr($link,0,length($path)) eq $path;
+		}
+	}
+
+	return 1;
+}
+
+##################################################
+#
+# Normalize the working directory and check if it is OK.
+#
+sub checkPWD {
+	my $self = shift;
+	my $pwd = shift;
+	my $renameError = shift;
+
+	$pwd =~ s!//+!/!g;               # remove duplicate slashes
+	$pwd =~ s!(^|/)~!$1_!g;          # remove ~user references
+	$pwd =~ s!(^|/)(\.(/|$))+!$1!g;  # remove dot directories
+	
+	# remove dir/.. constructions
+	while ($pwd =~ s!((\.[^./]+|\.\.[^/]+|[^./][^/]*)/\.\.(/|$))!!) {};
+	
+	$pwd =~ s!/$!!;                        # remove trailing /
+	return if ($pwd =~ m!(^|/)\.\.(/|$)!); # Error if outside the root
+
+	# check for bad symbolic links
+	my @dirs = split('/',$pwd);
+	pop(@dirs) if $renameError;      # don't check file iteself in this case
+	my @path = ($self->{ce}{courseDirs}{root});
+	foreach my $dir (@dirs) {
+		push @path,$dir;
+		return if ($self->isSymLink(join('/',@path)));
+	}
+
+	my $original = $pwd;
+	$pwd =~ s!(^|/)\.!$1_!g;         # don't enter hidden directories
+	$pwd =~ s!^/!!;                  # remove leading /
+	$pwd =~ s![^-_./A-Z0-9~, ]!_!gi; # no illegal characters
+	return if $renameError && $original ne $pwd;
+
+	$pwd = '.' if $pwd eq '';
+	return $pwd;
+}
+
+##################################################
+#
+# Check that a file is uploaded to the correct directory
+#
+sub checkFileLocation {
+  	my $self = shift;
+	my $extension = shift; $extension =~ s/.*\.//;
+	my $dir = shift; my $location = $uploadDir{$extension};
+	return unless defined($location);
+	return if $dir =~ m/^$location$/;
+	$location =~ s!/\.\*!!;
+	return if $dir =~ m/^$location$/;
+	$self->addbadmessage("Files with extension '.$extension' usually belong in '$location'");
+}
+
+##################################################
+#
+# Check a name for bad characters, etc.
+#
+sub checkName {
+	my $file = shift;
+	$file =~ s!.*[/\\]!!;               # remove directory
+	$file =~ s/[^-_.a-zA-Z0-9 ]/_/g;    # no illegal characters
+	$file =~ s/^\./_/;                  # no initial dot
+	$file = "newfile.txt" unless $file; # no blank names
+	return $file;
+}
+
+##################################################
+#
+# Get a unique name (in case it already exists)
+#
+sub uniqueName {
+	my $dir = shift; my $name = shift;
+	return $name unless (-e "$dir/$name");
+	my $type = ""; my $n = 1;
+	$type = $1 if ($name =~ s/(\.[^.]*)$//);
+	$n = $1 if ($name =~ s/_(\d+)$/_/);
+	while (-e "$dir/${name}_$n$type") {$n++}
+	return "${name}_$n$type";
+}
+
+##################################################
+#
+# Verify that a name can be added to the current
+# directory.
+#
+sub verifyName {
+	my $self = shift; my $name = shift; my $object = shift;
+	if ($name) {
+		unless ($name =~ m!/!) {
+			unless ($name =~ m!^\.!) {
+				unless ($name =~ m![^-_.a-zA-Z0-9 ]!) {
+					my $file = "$self->{courseRoot}/$self->{pwd}/$name";
+					return $file unless (-e $file);
+					$self->addbadmessage("A file with that name already exists");
+				} else {$self->addbadmessage("Your $object name contains illegal characters")}
+			} else {$self->addbadmessage("Your $object name may not begin with a dot")}
+		} else {$self->addbadmessage("Your $object name may not contain a path component")}
+	} else {$self->addbadmessage("You must specify a $object name")}
+	return
+}
+
+##################################################
+#
+# Verify that a file path is valid
+#
+sub verifyPath {
+	my $self = shift; my $path = shift; my $name = shift;
+
+	if ($path) {
+		unless ($path =~ m![^-_.a-zA-Z0-9 /]!) {
+			unless ($path =~ m!^/!) {
+				$path = $self->checkPWD($self->{pwd}.'/'.$path,1);
+				if ($path) {
+					$path = $self->{courseRoot}.'/'.$path;
+					$path .= '/'.$name if -d $path && $name;
+					return $path unless (-e $path);
+					$self->addbadmessage("A file with that name already exists");
+				} else {$self->addbadmessage("You have specified an illegal path")}
+			} else {$self->addbadmessage("You can not specify an absolute path")}
+		} else {$self->addbadmessage("Your file name contains illegal characters")}
+	} else {$self->addbadmessage("You must specify a file name")}
+	return
+}
+
+##################################################
+#
+# Get the value of a parameter flag
+#
+sub getFlag {
+  my $self = shift; my $flag = shift;
+  my $default = shift; $default = 0 unless defined $default;
+  my $value = $self->r->param($flag);
+  $value = $default unless defined $value;
+  return $value;
+}
+
+##################################################
+#
+# Make HTML symbols printable
+#
+sub showHTML {
+	my $string = shift;
+	return '' unless defined $string;
+	$string =~ s/&/\&amp;/g;
+	$string =~ s/</\&lt;/g;
+	$string =~ s/>/\&gt;/g;
+	$string;
+}
+
+##################################################
+#
+# Check if a string is plain text
+# (i.e., doesn't contain four non-regular
+# characters in a row.)
+#
+sub isText {
+	my $string = shift;
+	return $string !~ m/[^\s\x20-\x7E]{4}/;
+}
+
+##################################################
+#
+#  Convert spaces to &nbsp;, but only REAL spaces
+#
+sub sp2nbsp {
+	my $s = shift;
+	$s =~ s/ /\&nbsp;/g;
+	return $s;
+}
+
+##################################################
+#
+#  Hack to convert multiple spaces in the file
+#  selection box into &nbsp; so that the columns
+#  will allign properly in fixed-width fonts.
+#  We have to do it agter the fact, since CGI::
+#  is being "helpful" by turning & in the labels
+#  into &amp; for us.  So we have to convert
+#  after the <SELECT> is created (ugh).
+#
+sub fixSpaces {
+	my $s = shift;
+	$s =~ s!(<option[^>]*>)(.*?)(</option>)!$1.sp2nbsp($2).$3!gei;
+	return $s;
+}
+
+##################################################
+#
+#  Interpret command return errors
+#
+sub systemError {
+  my $status = shift;
+  return "error: $!" if $status == 0xFF00;
+  return "exit status ".($status >> 8) if ($status & 0xFF) == 0;
+  return "signal ".($status &= ~0x80);
+}
+
+##################################################
+
+1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/FileXfer.pm b/lib/WeBWorK/ContentGenerator/Instructor/FileXfer.pm
deleted file mode 100644
index 8fe7181997..0000000000
--- a/lib/WeBWorK/ContentGenerator/Instructor/FileXfer.pm
+++ /dev/null
@@ -1,326 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
-# 
-# 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
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-# 
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-package WeBWorK::ContentGenerator::Instructor::FileXfer;
-use base qw(WeBWorK::ContentGenerator::Instructor);
-
-=head1 NAME
-
-WeBWorK::ContentGenerator::Instructor::FileXfer - transfer course files from/to
-client
-
-=cut
-
-use strict;
-use warnings;
-use Apache::Constants qw(:common REDIRECT DONE);
-use CGI qw();
-
-=for comment
-
-Use this to check for permissions:
-
-unless ($authz->hasPermissions($user, "PERMISSION")) {
-	$self->{submitError} = "You are not authorized to PERMISSION";
-	return;
-}
-
-=cut
-
-sub pre_header_initialize {
-	my ($self) = @_;
-	my $r = $self->{r};
-	my $ce = $self->{ce};
-	my $authz = $self->{authz};
-	my $userID = $r->param("user");
-	
-	my ($type, $action) = ("", "");
-	if (defined $r->param("deleteDef"))         { $type = "def";       $action = "delete";   }
-	if (defined $r->param("downloadDef"))       { $type = "def";       $action = "download"; }
-	if (defined $r->param("uploadDef"))         { $type = "def";       $action = "upload";   }
-	if (defined $r->param("deleteClasslist"))   { $type = "classlist"; $action = "delete";   }
-	if (defined $r->param("downloadClasslist")) { $type = "classlist"; $action = "download"; }
-	if (defined $r->param("uploadClasslist"))   { $type = "classlist"; $action = "upload";   }
-	
-	# make sure we have permission to do what we want to do
-	if ($type eq "def") {
-		unless ($authz->hasPermissions($userID, "modify_set_def_files")) {
-			$self->{submitError} = "You are not authorized to modify the list of set definition files.";
-			return;
-		}
-	} elsif ($type eq "classlist") {
-		unless ($authz->hasPermissions($userID, "modify_classlist_files")) {
-			$self->{submitError} = "You are not authorized to modify the list of classlist files.";
-			return;
-		}
-	}
-	
-	# call handler for the action we want to perform
-	if ($action eq "delete") {
-		$self->handleDelete($type);
-	} elsif ($action eq "download") {
-		$self->handleDownload($type);
-	} elsif ($action eq "upload") {
-		$self->handleUpload($type);
-	}
-}
-
-sub handleDelete {
-	my ($self, $type) = @_;
-	my $r = $self->{r};
-	my $ce = $self->{ce};
-	
-	my (@fileList, $selectParam, $dir);
-	if ($type eq "classlist") {
-		@fileList = $self->getCSVList;
-		$selectParam = "classlist";
-		$dir = $ce->{courseDirs}->{templates};
-	} elsif ($type eq "def") {
-		@fileList = $self->getDefList;
-		$selectParam = "def";
-		$dir = $ce->{courseDirs}->{templates};
-	}
-	
-	# get file name
-	my $fileToDelete = $r->param($selectParam);
-	unless ($fileToDelete) {
-		$self->{submitError} = "No file selected for deletion.";
-		return;
-	}
-	
-	# make sure it's in the file list
-	unless (grep { $_ eq $fileToDelete } @fileList) {
-		$self->{submitError} = "File \"$fileToDelete\" not found in file list.";
-		return;
-	}
-	
-	# delete it
-	unlink "$dir/$fileToDelete";
-}
-
-sub handleDownload {
-	my ($self, $type) = @_;
-	my $r = $self->{r};
-	my $ce = $self->{ce};
-	
-	my (@fileList, $selectParam, $dir);
-	if ($type eq "classlist") {
-		@fileList = $self->getCSVList;
-		$selectParam = "classlist";
-		$dir = $ce->{courseDirs}->{templates};
-	} elsif ($type eq "def") {
-		@fileList = $self->getDefList;
-		$selectParam = "def";
-		$dir = $ce->{courseDirs}->{templates};
-	}
-	
-	# get file name
-	my $fileToDownload = $r->param($selectParam);
-	unless ($fileToDownload) {
-		$self->{submitError} = "No file selected for download.";
-		return;
-	}
-	
-	# make sure it's in the file list
-	unless (grep { $_ eq $fileToDownload } @fileList) {
-		$self->{submitError} = "File \"$fileToDownload\" not found in file list.";
-		return;
-	}
-	
-	# set the file to sent:
-	$self->{sendFile} = {
-		source => "$dir/$fileToDownload",
-		type => "text/plain",
-		name => $fileToDownload,
-	};
-}
-
-sub handleUpload {
-	my ($self, $type) = @_;
-	my $r = $self->{r};
-	my $ce = $self->{ce};
-	
-	my (@fileList, $uploadParam, $uploadNameParam, $ext, $destDir);
-	if ($type eq "classlist") {
-		@fileList = $self->getCSVList;
-		$uploadParam = "newClasslist";
-		$uploadNameParam = "newClasslistName";
-		$ext = ".lst";
-		$destDir = $ce->{courseDirs}->{templates};
-	} elsif ($type eq "def") {
-		@fileList = $self->getDefList;
-		$uploadParam = "newDef";
-		$uploadNameParam = "newDefName";
-		$ext = ".def";
-		$destDir = $ce->{courseDirs}->{templates};
-	}
-	
-	# get upload ID and hash
-	my $uploadIDHash = $r->param($uploadParam);
-	unless ($uploadIDHash) {
-		$self->{submitError} = "No file selected for upload.";
-		return;
-	}
-	my ($id, $hash) = split /\s+/, $uploadIDHash;
-	
-	#warn "upload param contains $uploadIDHash\n";
-	#warn "upload ID is $id\n";
-	#warn "upload hash is $hash\n";
-	
-	# retrieve upload from upload cache
-	my $upload = WeBWorK::Upload->retrieve($id, $hash,
-		dir => $ce->{webworkDirs}->{uploadCache}
-	);
-	
-	# determine what to call the resulting file
-	my $fileName = $r->param($uploadNameParam) || $upload->filename;
-	
-	# tack on the file extension if it's not already there
-	$fileName .= $ext unless $fileName =~ m/$ext$/;
-	
-	# does the file name have the path separator in it?
-	die "illegal character in upload name: \"/\". (no hacking!)" if $fileName =~ m|/|;
-	
-	# does a file already exist with that name?
-	if (grep { $_ eq $fileName } @fileList) {
-		$self->{submitError} = "A file named \"$fileName\" exists. Either remove it, or chose a different name for your upload.";
-		return;
-	}
-	
-	$upload->disposeTo("$destDir/$fileName");
-}
-
-# override contentGenerator header routine for now
-# FIXME
-#sub header {
-#	my $self = shift;
-#	
-#	
-#	
-#	return OK;
-#}
-
-sub initialize {
-	my ($self) = @_;
-}
-
-sub path {
-	my $self = shift;
-	my $args = $_[-1];
-	
-	my $ce = $self->{ce};
-	my $root = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
-	return $self->pathMacro($args,
-		"Home"             => "$root/",
-		$courseName        => "$root/$courseName/",
-		"Instructor Tools" => "$root/$courseName/instructor/",
-		"File Transfer"    => "",
-	);
-}
-
-sub title {
-	my $self = shift;
-	
-	return "File Transfer";
-}
-
-sub body {
-	my $self = shift;
-	my $r = $self->{r};
-	my $authz = $self->{authz};
-	
-	my $userID = $r->param("user");
-	
-	return CGI::em("You are not authorized to access the Instructor tools.")
-		unless $authz->hasPermissions($userID, "access_instructor_tools");
-	
-	# if we needed to get either of these lists earlier, use the cached copy
-	# otherwise, get them from the filesystem
-	#my $classlistsRef = $self->{classlists} || [ $self->getCSVList ];
-	#my $setDefsRef    = $self->{setDefs}    || [ $self->getDefList ];
-	my $classlistsRef = [ $self->getCSVList ];
-	my $setDefsRef    = [ $self->getDefList ];
-	
-	print CGI::p(<<EOT);
-Use the tools below to modify course files. Set definition files and classlist
-files are only used for importing and exporting set and user data.
-EOT
-	
-	print CGI::table({-border=>1},
-		CGI::Tr({-valign=>"top"},
-			CGI::td({},
-				CGI::p("Set Definition Files"),
-				CGI::startform("POST", $r->uri, "multipart/form-data"),
-				$self->hidden_authen_fields,
-				CGI::scrolling_list(
-					-name => "def",
-					-values => $setDefsRef,
-					-size => 8,
-					-multiple => 0,
-				), CGI::br(),
-				CGI::submit("deleteDef", "Delete"),
-				CGI::font({-color=>"red"}, CGI::em("Delete is not undoable!")),
-				CGI::br(),
-				CGI::submit("downloadDef", "Download"),
-				CGI::br(),
-				CGI::p("Upload New Set Definition File:"),
-				CGI::filefield(
-					-name => "newDef",
-					-size => 30,
-				), CGI::br(),
-				"Use name:", CGI::textfield("newDefName", "", 30), CGI::br(),
-				CGI::submit("uploadDef", "Upload Set Definition File"),
-				CGI::endform(),
-			),
-			CGI::td({},
-				CGI::p("Classlist Files"),
-				CGI::startform("POST", $r->uri, "multipart/form-data"),
-				$self->hidden_authen_fields,
-				CGI::scrolling_list(
-					-name => "classlist",
-					-values => $classlistsRef,
-					-size => 8,
-					-multiple => 0,
-				), CGI::br(),
-				CGI::submit("deleteClasslist", "Delete"),
-				CGI::font({-color=>"red"}, CGI::em("Delete is not undoable!")),
-				CGI::br(),
-				CGI::submit("downloadClasslist", "Download"), CGI::br(),
-				CGI::p("Upload New Classlist File:"),
-				CGI::filefield(
-					-name => "newClasslist",
-					-size => 30,
-				), CGI::br(),
-				"Use name:", CGI::textfield("newClasslistName", "", 30), CGI::br(),
-				CGI::submit("uploadClasslist", "Upload Classlist File"),
-				CGI::endform(),
-			),
-		)
-	);
-	
-	return "";
-}
-
-1;
-
-__END__
-
-=head1 AUTHOR
-
-Written by Sam Hathaway, sh002i (at) math.rochester.edu
-
-=cut
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/GetLibrarySetProblems.pm b/lib/WeBWorK/ContentGenerator/Instructor/GetLibrarySetProblems.pm
new file mode 100644
index 0000000000..1423dc07bd
--- /dev/null
+++ b/lib/WeBWorK/ContentGenerator/Instructor/GetLibrarySetProblems.pm
@@ -0,0 +1,989 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm,v 1.85 2008/07/01 13:18:52 glarose 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.	 See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+
+package WeBWorK::ContentGenerator::Instructor::GetLibrarySetProblems;
+use base qw(WeBWorK::ContentGenerator::Instructor);
+
+=head1 NAME
+
+WeBWorK::ContentGenerator::Instructor::GetLibrarySetProblems - Make homework sets.
+
+=cut
+
+use strict;
+use warnings;
+
+
+#use CGI qw(-nosticky);
+use WeBWorK::CGI;
+use WeBWorK::Debug;
+use WeBWorK::Form;
+use WeBWorK::Utils qw(readDirectory max sortByName);
+use WeBWorK::Utils::Tasks qw(renderProblems);
+use File::Find;
+
+require WeBWorK::Utils::ListingDB;
+
+use constant SHOW_HINTS_DEFAULT => 0;
+use constant SHOW_SOLUTIONS_DEFAULT => 0;
+use constant MAX_SHOW_DEFAULT => 20;
+use constant NO_LOCAL_SET_STRING => 'No sets in this course yet';
+use constant SELECT_SET_STRING => 'Select a Set from this Course';
+use constant SELECT_LOCAL_STRING => 'Select a Problem Collection';
+use constant MY_PROBLEMS => '  My Problems  ';
+use constant MAIN_PROBLEMS => '  Unclassified Problems  ';
+use constant CREATE_SET_BUTTON => 'Create New Set';
+use constant ALL_CHAPTERS => 'All Chapters';
+use constant ALL_SUBJECTS => 'All Subjects';
+use constant ALL_SECTIONS => 'All Sections';
+use constant ALL_TEXTBOOKS => 'All Textbooks';
+
+use constant LIB2_DATA => {
+  'dbchapter' => {name => 'library_chapters', all => 'All Chapters'},
+  'dbsection' =>  {name => 'library_sections', all =>'All Sections' },
+  'dbsubject' =>  {name => 'library_subjects', all => 'All Subjects' },
+  'textbook' =>  {name => 'library_textbook', all =>  'All Textbooks'},
+  'textchapter' => {name => 'library_textchapter', all => 'All Chapters'},
+  'textsection' => {name => 'library_textsection', all => 'All Sections'},
+  'keywords' =>  {name => 'library_keywords', all => '' },
+  };
+
+## Flags for operations on files
+
+use constant ADDED => 1;
+use constant HIDDEN => (1 << 1);
+use constant SUCCESS => (1 << 2);
+use constant DELETED => (1 << 3);
+use constant MOVED => (1 << 4);
+
+##	for additional problib buttons
+my %problib;	## filled in in global.conf
+my %ignoredir = (
+	'.' => 1, '..' => 1, 'Library' => 1, 'CVS' => 1, 'tmpEdit' => 1,
+	'headers' => 1, 'macros' => 1, 'email' => 1, '.svn' => 1,
+);
+
+sub prepare_activity_entry {
+	my $self=shift;
+	my $r = $self->r;
+	my $user = $self->r->param('user') || 'NO_USER';
+	return("In SetMaker2 as user $user");
+}
+
+## This is for searching the disk for directories containing pg files.
+## to make the recursion work, this returns an array where the first 
+## item is the number of pg files in the directory.  The second is a
+## list of directories which contain pg files.
+##
+## If a directory contains only one pg file and the directory name
+## is the same as the file name, then the directory is considered
+## to be part of the parent directory (it is probably in a separate
+## directory only because it has auxiliary files that want to be
+## kept together with the pg file).
+##
+## If a directory has a file named "=library-ignore", it is never
+## included in the directory menu.  If a directory contains a file
+## called "=library-combine-up", then its pg are included with those
+## in the parent directory (and the directory does not appear in the
+## menu).  If it has a file called "=library-no-combine" then it is
+## always listed as a separate directory even if it contains only one
+## pg file.
+
+sub get_library_sets {
+	my $top = shift; my $dir = shift;
+	# ignore directories that give us an error
+	my @lis = eval { readDirectory($dir) };
+	if ($@) {
+		warn $@;
+		return (0);
+	}
+	return (0) if grep /^=library-ignore$/, @lis;
+
+	my @pgfiles = grep { m/\.pg$/ and (not m/(Header|-text)\.pg$/) and -f "$dir/$_"} @lis;
+	my $pgcount = scalar(@pgfiles);
+	my $pgname = $dir; $pgname =~ s!.*/!!; $pgname .= '.pg';
+	my $combineUp = ($pgcount == 1 && $pgname eq $pgfiles[0] && !(grep /^=library-no-combine$/, @lis));
+
+	my @pgdirs;
+	my @dirs = grep {!$ignoredir{$_} and -d "$dir/$_"} @lis;
+	if ($top == 1) {@dirs = grep {!$problib{$_}} @dirs}
+	foreach my $subdir (@dirs) {
+		my @results = get_library_sets(0, "$dir/$subdir");
+		$pgcount += shift @results; push(@pgdirs,@results);
+	}
+
+	return ($pgcount, @pgdirs) if $top || $combineUp || grep /^=library-combine-up$/, @lis;
+	return (0,@pgdirs,$dir);
+}
+
+sub get_library_pgs {
+	my $top = shift; my $base = shift; my $dir = shift;
+	my @lis = readDirectory("$base/$dir");
+	return () if grep /^=library-ignore$/, @lis;
+	return () if !$top && grep /^=library-no-combine$/, @lis;
+
+	my @pgs = grep { m/\.pg$/ and (not m/(Header|-text)\.pg$/) and -f "$base/$dir/$_"} @lis;
+	my $others = scalar(grep { (!m/\.pg$/ || m/(Header|-text)\.pg$/) &&
+	                            !m/(\.(tmp|bak)|~)$/ && -f "$base/$dir/$_" } @lis);
+
+	my @dirs = grep {!$ignoredir{$_} and -d "$base/$dir/$_"} @lis;
+	if ($top == 1) {@dirs = grep {!$problib{$_}} @dirs}
+	foreach my $subdir (@dirs) {push(@pgs, get_library_pgs(0,"$base/$dir",$subdir))}
+
+	return () unless $top || (scalar(@pgs) == 1 && $others) || grep /^=library-combine-up$/, @lis;
+	return (map {"$dir/$_"} @pgs);
+}
+
+sub list_pg_files {
+	my ($templates,$dir) = @_;
+	my $top = ($dir eq '.')? 1 : 2;
+	my @pgs = get_library_pgs($top,$templates,$dir);
+	return sortByName(undef,@pgs);
+}
+
+## Search for set definition files
+
+sub get_set_defs {
+	my $topdir = shift;
+	my @found_set_defs;
+	# get_set_defs_wanted is a closure over @found_set_defs
+	my $get_set_defs_wanted = sub {
+		#my $fn = $_;
+		#my $fdir = $File::Find::dir;
+		#return() if($fn !~ /^set.*\.def$/);
+		##return() if(not -T $fn);
+		#push @found_set_defs, "$fdir/$fn";
+		push @found_set_defs, $_ if m|/set[^/]*\.def$|;
+	};
+	find({ wanted => $get_set_defs_wanted, follow_fast=>1, no_chdir=>1}, $topdir);
+	map { $_ =~ s|^$topdir/?|| } @found_set_defs;
+	return @found_set_defs;
+}
+
+## Try to make reading of set defs more flexible.  Additional strategies
+## for fixing a path can be added here.
+
+sub munge_pg_file_path {
+	my $self = shift;
+	my $pg_path = shift;
+	my $path_to_set_def = shift;
+	my $end_path = $pg_path;
+	# if the path is ok, don't fix it
+	return($pg_path) if(-e $self->r->ce->{courseDirs}{templates}."/$pg_path");
+	# if we have followed a link into a self contained course to get
+	# to the set.def file, we need to insert the start of the path to
+	# the set.def file
+	$end_path = "$path_to_set_def/$pg_path";
+	return($end_path) if(-e $self->r->ce->{courseDirs}{templates}."/$end_path");
+	# if we got this far, this path is bad, but we let it produce
+	# an error so the user knows there is a troublesome path in the
+	# set.def file.
+	return($pg_path);
+}
+
+## Read a set definition file.  This could be abstracted since it happens
+## elsewhere.  Here we don't have to process so much of the file.
+
+sub read_set_def {
+	my $self = shift;
+	my $r = $self->r;
+	my $filePathOrig = shift;
+	my $filePath = $r->ce->{courseDirs}{templates}."/$filePathOrig";
+	$filePathOrig =~ s/set.*\.def$//;
+	$filePathOrig =~ s|/$||;
+	$filePathOrig = "." if ($filePathOrig !~ /\S/);
+	my @pg_files = ();
+	my ($line, $got_to_pgs, $name, @rest) = ("", 0, "");
+	if ( open (SETFILENAME, "$filePath") )    {
+		while($line = <SETFILENAME>) {
+			chomp($line);
+			$line =~ s|(#.*)||; # don't read past comments
+			if($got_to_pgs) {
+				unless ($line =~ /\S/) {next;} # skip blank lines
+				($name,@rest) = split (/\s*,\s*/,$line);
+				$name =~ s/\s*//g;
+				push @pg_files, $name;
+			} else {
+				$got_to_pgs = 1 if ($line =~ /problemList\s*=/);
+			}
+		}
+	} else {
+		$self->addbadmessage("Cannot open $filePath");
+	}
+	# This is where we would potentially munge the pg file paths
+	# One possibility
+	@pg_files = map { $self->munge_pg_file_path($_, $filePathOrig) } @pg_files;
+	return(@pg_files);
+}
+
+## go through past page getting a list of identifiers for the problems
+## and whether or not they are selected, and whether or not they should
+## be hidden
+
+sub get_past_problem_files {
+	my $r = shift;
+	my @found=();
+	my $count =1;
+	while (defined($r->param("filetrial$count"))) {
+		my $val = 0;
+		$val |= ADDED if($r->param("trial$count"));
+		$val |= HIDDEN if($r->param("hideme$count"));
+		$val |= MOVED if($r->param("moved$count"));
+		push @found, [$r->param("filetrial$count"), $val];			
+		$count++;
+	}
+	$count = 1;
+	while (defined($r->param("mysetfiletrial$count"))) {
+	  my $val = 0;
+	  $val |= DELETED if($r->param("deleted$count"));
+	  push @found, [$r->param("mysetfiletrial$count"), $val];
+	  $count++;
+	}
+	return(\@found);
+}
+
+
+sub make_data_row {
+	my $self = shift;
+	my $sourceFileName = shift;
+	my $pg = shift;
+	my $cnt = shift;
+	my $mark = shift || 0;
+
+	$sourceFileName =~ s|^./||; # clean up top ugliness
+
+	my $urlpath = $self->r->urlpath;
+	my $db = $self->r->db;
+
+	## to set up edit and try links elegantly we want to know if
+	##    any target set is a gateway assignment or not
+	my $localSet = $self->r->param('local_sets');
+	my $setRecord;
+	if ( defined($localSet) && $localSet ne SELECT_SET_STRING &&
+	     $localSet ne NO_LOCAL_SET_STRING ) {
+		$setRecord = $db->getGlobalSet( $localSet );
+	}
+	my $isGatewaySet = ( defined($setRecord) && 
+			     $setRecord->assignment_type =~ /gateway/ );
+
+	my $problem_output = $pg->{flags}->{error_flag} ?
+		CGI::div({class=>"ResultsWithError"}, CGI::em("This problem produced an error"))
+		: CGI::div({class=>"RenderSolo"}, $pg->{body_text});
+	$problem_output .= $pg->{flags}->{comment} if($pg->{flags}->{comment});
+
+
+	#if($self->{r}->param('browse_which') ne 'browse_npl_library') {
+	my $problem_seed = $self->{'problem_seed'} || 1234;
+	my $edit_link = CGI::a({href=>$self->systemLink(
+		 $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor",
+			  courseID =>$urlpath->arg("courseID"),
+			  setID=>"Undefined_Set",
+			  problemID=>"1"),
+			params=>{sourceFilePath => "$sourceFileName", problemSeed=> $problem_seed}
+		  ), target=>"WW_Editor"}, "Edit it" );
+	
+	my $displayMode = $self->r->param("mydisplayMode");
+	$displayMode = $self->r->ce->{pg}->{options}->{displayMode}
+		if not defined $displayMode or $displayMode eq "None";
+	my $module = ( $isGatewaySet ) ? "GatewayQuiz" : "Problem";
+	my %pathArgs = ( courseID =>$urlpath->arg("courseID"),
+			setID=>"Undefined_Set" );
+	$pathArgs{problemID} = "1" if ( ! $isGatewaySet );
+
+	my $try_link = CGI::a({href=>$self->systemLink(
+		$urlpath->newFromModule("WeBWorK::ContentGenerator::$module",
+			%pathArgs ),
+			params =>{
+				effectiveUser => scalar($self->r->param('user')),
+				editMode => "SetMaker",
+				problemSeed=> $problem_seed,
+				sourceFilePath => "$sourceFileName",
+				displayMode => $displayMode,
+			}
+		), target=>"WW_View"}, "Try it");
+
+	my %add_box_data = ( -id=>"trial$cnt", -class=>"add_problem_checkbox" ,-name=>"trial$cnt",-value=>1,-label=>"Add this problem to the target set on the next update");
+	#allow for a move command from one problem set to anoter
+	my $move_box_data;
+	if($self->r->param('edit_mysets_set')){
+	  $move_box_data = CGI::checkbox( -id=>"moved$cnt" ,-name=>"moved$cnt",-value=>1,,-override=>1,-label=>"Move this problem from this set to the target set on the next update");
+	}
+	else{
+	  $move_box_data = "";
+	}
+	if($mark & SUCCESS) {
+		$add_box_data{ -label } .= " (just added this problem)";
+	} elsif($mark & ADDED) {
+		$add_box_data{ -checked } = 1;
+	}
+
+	if(!($self->{isInSet}{$sourceFileName})){
+
+  	print CGI::div({-class=>"problem libraryProblem", -align=>"left", -draggable=>"true", -href=>"#", -id=>"$cnt"},
+  		CGI::p({},"File name: $sourceFileName "), 
+  		CGI::p({}, $edit_link, " ", $try_link),
+  		CGI::p(CGI::checkbox(-id=>"hideme$cnt", -name=>"hideme$cnt",-value=>1,-label=>"Don't show this problem on the next update",-override=>1)),
+  		CGI::p(CGI::checkbox((%add_box_data),-override=>1)),
+  		CGI::p($move_box_data),
+  		CGI::hidden(-id=>"filetrial$cnt", -name=>"filetrial$cnt", -default=>$sourceFileName,-override=>1).
+  		CGI::p($problem_output)
+	  );
+	}
+	else{
+	  print CGI::div({-class=>"problem libraryProblem used", -align=>"left", -draggable=>"true", -href=>"#", -id=>"$cnt"},
+  		CGI::p({},"File name: $sourceFileName "), 
+  		CGI::p({}, $edit_link, " ", $try_link),
+  		CGI::p(CGI::checkbox(-id=>"hideme$cnt", -name=>"hideme$cnt",-value=>1,-label=>"Don't show this problem on the next update",-override=>1)),
+  		CGI::p(CGI::checkbox((%add_box_data),-override=>1)),
+  		CGI::p($move_box_data),
+  		CGI::hidden(-id=>"filetrial$cnt", -name=>"filetrial$cnt", -default=>$sourceFileName,-override=>1).
+  		CGI::p($problem_output),
+  		CGI::b("(This problem is in the target set)")
+	  );
+	}
+}
+
+
+sub clear_default {
+	my $r = shift;
+	my $param = shift;
+	my $default = shift;
+	my $newvalue = $r->param($param) || '';
+	$newvalue = '' if($newvalue eq $default);
+	$r->param($param, $newvalue);
+}
+
+sub pre_header_initialize {
+	my ($self) = @_;
+	my $r = $self->r;
+	## For all cases, lets set some things
+	$self->{error}=0;
+	my $ce = $r->ce;
+	my $db = $r->db;
+	my $maxShown = $r->param('max_shown') || MAX_SHOW_DEFAULT;
+	$maxShown = 10000000 if($maxShown eq 'All'); # let's hope there aren't more
+	my $library_basic = $r->param('library_is_basic') || 1;
+	$self->{problem_seed} = $r->param('problem_seed') || 1234;
+	## Fix some parameters
+	for my $key (keys(%{ LIB2_DATA() })) {
+		clear_default($r, LIB2_DATA->{$key}->{name}, LIB2_DATA->{$key}->{all} );
+	}
+    ##  Grab library sets to display from parameters list.  We will modify this
+    ##  as we go through the if/else tree
+    $self->{current_library_set} =  $r->param('library_sets');
+    $self->{current_myset_set} = $r->param('myset_sets');
+    if (not defined($self->{current_myset_set}) 
+		or $self->{current_myset_set} eq "Select a Homework Set"
+		or $self->{current_myset_set} eq NO_LOCAL_SET_STRING) {
+      my @all_db_sets = $db->listGlobalSets;
+	    @all_db_sets = sortByName(undef, @all_db_sets);
+	    $self->{current_myset_set} = shift(@all_db_sets);
+	  }
+    
+	##	These directories will have individual buttons
+	%problib = %{$ce->{courseFiles}{problibs}} if $ce->{courseFiles}{problibs};
+
+	my $userName = $r->param('user');
+	my $user = $db->getUser($userName); # checked 
+	die "record for user $userName (real user) does not exist." 
+		unless defined $user;
+	my $authz = $r->authz;
+	unless ($authz->hasPermissions($userName, "modify_problem_sets")) {
+		return(""); # Error message already produced in the body
+	}
+
+	## Now one action we have to deal with here
+	if ($r->param('edit_local')) {
+		my $urlpath = $r->urlpath;
+		my $db = $r->db;
+		my $checkset = $db->getGlobalSet($r->param('local_sets'));
+		if (not defined($checkset)) {
+			$self->{error} = 1;
+			$self->addbadmessage('You need to select a "Target Set" before you can edit it.');
+		} else {
+			my $page = $urlpath->newFromModule('WeBWorK::ContentGenerator::Instructor::ProblemSetDetail', setID=>$r->param('local_sets'), courseID=>$urlpath->arg("courseID"));
+			my $url = $self->systemLink($page);
+			$self->reply_with_redirect($url);
+		}
+	}
+
+	## Next, lots of set up so that errors can be reported with message()
+
+	############# List of problems we have already printed
+
+	$self->{past_problems} = get_past_problem_files($r);
+	# if we don't end up reusing problems, this will be wiped out
+	# if we do redisplay the same problems, we must adjust this accordingly
+	my @past_marks = map {$_->[1]} @{$self->{past_problems}};
+	my $none_shown = scalar(@{$self->{past_problems}})==0;
+	my @pg_files=();
+	my @myset_files=();
+	my $use_previous_problems = 1;
+	my $first_shown = $r->param('first_shown') || 0;
+	my $last_shown = $r->param('last_shown'); 
+	if (not defined($last_shown)) {
+		$last_shown = -1; 
+	}
+	my @all_past_list = (); # these are include requested, but not shown
+	my $j = 0;
+	while (defined($r->param("all_past_list$j"))) {
+		push @all_past_list, $r->param("all_past_list$j");
+		$j++;
+	}
+
+	############# Default of which problem selector to display
+
+	my $browse_which = $r->param('browse_which') || 'browse_npl_library';
+	my $gridded = $r->param('gridify') || 'false';
+
+	
+
+	## check for problem lib buttons
+	my $browse_lib = '';
+	foreach my $lib (keys %problib) {
+		if ($r->param("browse_$lib")) {
+			$browse_lib = "browse_$lib";
+			last;
+		}
+	}
+
+
+	########### Start the logic through if elsif elsif ...
+    debug("browse_lib", $r->param("$browse_lib"));
+    debug("browse_npl_library", $r->param("browse_npl_library"));
+    debug("edit_mysets", $r->param("edit_mysets"));
+    debug("browse_setdefs", $r->param("browse_setdefs"));
+	##### Asked to browse certain problems
+	if ($browse_lib ne '') {
+		$browse_which = $browse_lib;
+		$self->{current_library_set} = "";
+		$use_previous_problems = 0; @pg_files = (); ## clear old problems
+	} elsif ($r->param('browse_npl_library')) {
+		$browse_which = 'browse_npl_library';
+		$self->{current_library_set} = "";
+		$use_previous_problems = 0; @pg_files = (); ## clear old problems
+	} elsif ($r->param('browse_local')) {
+		$browse_which = 'browse_local';
+		#$self->{current_library_set} = "";
+		$use_previous_problems = 0; @pg_files = (); ## clear old problems
+	} elsif ($r->param('edit_mysets')) {
+		$browse_which = 'edit_mysets';
+		$self->{current_library_set} = "";
+		$use_previous_problems = 0; @pg_files = (); ## clear old problems
+	} elsif ($r->param('browse_setdefs')) {
+		$browse_which = 'browse_setdefs';
+		$self->{current_library_set} = "";
+		$use_previous_problems = 0; @pg_files = (); ## clear old problems
+
+		##### Change the seed value
+
+	} elsif ($r->param('rerandomize')) {
+		$self->{problem_seed}= 1+$self->{problem_seed};
+		#$r->param('problem_seed', $problem_seed);
+		$self->addbadmessage('Changing the problem seed for display, but there are no problems showing.') if $none_shown;
+
+		##### Clear the display
+
+	} elsif ($r->param('cleardisplay')) {
+		@pg_files = ();
+		$use_previous_problems=0;
+		$self->addbadmessage('The display was already cleared.') if $none_shown;
+
+		##### View problems selected from the local list
+
+	} elsif ($r->param('view_local_set')) {
+
+		my $set_to_display = $self->{current_library_set};
+		if (not defined($set_to_display) or $set_to_display eq SELECT_LOCAL_STRING or $set_to_display eq "Found no directories containing problems") {
+			$self->addbadmessage('You need to select a set to view.');
+		} else {
+			$set_to_display = '.' if $set_to_display eq MY_PROBLEMS;
+			$set_to_display = substr($browse_which,7) if $set_to_display eq MAIN_PROBLEMS;
+			@pg_files = list_pg_files($ce->{courseDirs}->{templates},
+				"$set_to_display");
+			$use_previous_problems=0;
+		}
+
+		##### View problems selected from the a set in this course
+  } elsif ($r->param('edit_mysets_set')){
+  
+    my $set_to_display = $self->{current_library_set};
+		  debug("set_to_display is $set_to_display");
+		  if (not defined($set_to_display) 
+		  		or $set_to_display eq "Select a Homework Set"
+		  		or $set_to_display eq NO_LOCAL_SET_STRING) {
+		  	$self->addbadmessage("You need to select a set from this course to view.");
+		  } else {
+		  	# DBFIXME don't use ID list, use an iterator
+		  	my @problemList = $db->listGlobalProblems($set_to_display);
+		  	my $problem;
+		  	@pg_files=();
+		  	for $problem (@problemList) {
+		  		my $problemRecord = $db->getGlobalProblem($set_to_display, $problem); # checked
+		  		die "global $problem for set $set_to_display not found." unless
+		  			$problemRecord;
+		  		push @pg_files, $problemRecord->source_file;
+  
+		  	}
+		  	@pg_files = sortByName(undef,@pg_files);
+		  	$use_previous_problems=0;
+		  }
+
+		##### View from the library database
+ 
+	} elsif ($r->param('lib_view')) {
+		@pg_files=();
+		my @dbsearch = WeBWorK::Utils::ListingDB::getSectionListings($r);
+		my ($result, $tolibpath);
+		for $result (@dbsearch) {
+			$tolibpath = "Library/$result->{path}/$result->{filename}";
+			
+			## Too clunky!!!!
+			push @pg_files, $tolibpath;
+		}
+		$use_previous_problems=0; 
+
+		##### View a set from a set*.def
+
+	} elsif ($r->param('view_setdef_set')) {
+
+		my $set_to_display = $self->{current_library_set};
+		debug("set_to_display is $set_to_display");
+		if (not defined($set_to_display) 
+				or $set_to_display eq "Select a Set Definition File"
+				or $set_to_display eq NO_LOCAL_SET_STRING) {
+			$self->addbadmessage("You need to select a set definition file to view.");
+		} else {
+			@pg_files= $self->read_set_def($set_to_display);
+		}
+		$use_previous_problems=0; 
+
+		##### Edit the current local homework set
+
+	} elsif ($r->param('edit_local')) { ## Jump to set edit page
+
+		; # already handled
+
+
+		##### Make a new local homework set
+
+	} elsif ($r->param('new_local_set')) {
+		if ($r->param('new_set_name') !~ /^[\w .-]*$/) {
+			$self->addbadmessage("The name ".$r->param('new_set_name')." is not a valid set name.  Use only letters, digits, -, _, and .");
+		} else {
+			my $newSetName = $r->param('new_set_name');
+			# if we want to munge the input set name, do it here
+			$newSetName =~ s/\s/_/g;
+			debug("local_sets was ", $r->param('local_sets'));
+			$r->param('local_sets',$newSetName);  ## use of two parameter param
+			debug("new value of local_sets is ", $r->param('local_sets'));
+			my $newSetRecord	 = $db->getGlobalSet($newSetName);
+			if (defined($newSetRecord)) {
+	            $self->addbadmessage("The set name $newSetName is already in use.  
+	            Pick a different name if you would like to start a new set.");
+			} else {			# Do it!
+				# DBFIXME use $db->newGlobalSet
+				$newSetRecord = $db->{set}->{record}->new();
+				$newSetRecord->set_id($newSetName);
+				$newSetRecord->set_header("defaultHeader");
+				$newSetRecord->hardcopy_header("defaultHeader");
+				$newSetRecord->open_date(time()+60*60*24*7); # in one week
+				$newSetRecord->due_date(time()+60*60*24*7*2); # in two weeks
+				$newSetRecord->answer_date(time()+60*60*24*7*3); # in three weeks
+				eval {$db->addGlobalSet($newSetRecord)};
+				if ($@) {
+					$self->addbadmessage("Problem creating set $newSetName<br> $@");
+				} else {
+					$self->addgoodmessage("Set $newSetName has been created.");
+					my $selfassign = $r->param('selfassign') || "";
+					$selfassign = "" if($selfassign =~ /false/i); # deal with javascript false
+					if($selfassign) {
+						$self->assignSetToUser($userName, $newSetRecord);
+						$self->addgoodmessage("Set $newSetName was assigned to $userName.");
+					}
+				}
+			}
+		}
+
+		##### Add selected problems to the current local set
+
+	} elsif ($r->param('update')) {
+	  $self->addgoodmessage("the update param exists");
+		## first handle problems to be added before we hide them
+		my($localSet, @selected);
+
+		my @add_pg_files = grep {(($_->[1] & ADDED)) != 0 } @{$self->{past_problems}}; 
+		my @add_selected = map {$_->[0]} @add_pg_files;
+		
+		my @delete_pg_files = grep {(($_->[1] & DELETED)) != 0} @{$self->{past_problems}};
+		my @delete_selected = map {$_->[0]} @delete_pg_files;
+		
+		my @move_pg_files = grep {(($_->[1] & MOVED)) != 0} @{$self->{past_problems}};
+		my @move_selected = map {$_->[0]} @move_pg_files;
+
+		my @action_files = grep {$_->[1] > 0 } @{$self->{past_problems}};
+		# There are now good reasons to do an update without selecting anything.
+		#if(scalar(@action_files) == 0) {
+		#	 $self->addbadmessage('Update requested, but no problems were marked.');
+		#}
+
+		if (scalar(@add_selected)>0) {	# if some are to be added, they need a place to go
+			$localSet = $r->param('myset_sets');
+			if (not defined($localSet) or 
+					$localSet eq SELECT_SET_STRING or 
+		            $localSet eq NO_LOCAL_SET_STRING) {
+				$self->addbadmessage('You are trying to add problems to something, 
+				but you did not select a "Target Set" name as a target.');
+			} else {
+				my $newSetRecord  = $db->getGlobalSet($localSet);
+				if (not defined($newSetRecord)) {
+					$self->addbadmessage("You are trying to add problems to $localSet, 
+					but that set does not seem to exist!  I bet you used your \"Back\" button.");
+				} else {
+					my $addcount = add_selected($self, $db, $localSet);
+					if($addcount > 0) {
+						$self->addgoodmessage("Added $addcount problem".(($addcount>1)?'s':'').
+							" to $localSet.");
+					}
+				}
+			}
+		}
+		if (scalar(@delete_selected)>0) {	# if some are to be added, they need a place to go
+			$localSet = $r->param('myset_sets');
+			if (not defined($localSet) or 
+					$localSet eq SELECT_SET_STRING or 
+		            $localSet eq NO_LOCAL_SET_STRING) {
+				$self->addbadmessage('You are trying to add problems to something, 
+				but you did not select a "Target Set" name as a target.');
+			} else {
+				my $newSetRecord  = $db->getGlobalSet($localSet);
+				if (not defined($newSetRecord)) {
+					$self->addbadmessage("You are trying to delete problems to $localSet, 
+					but that set does not seem to exist!  I bet you used your \"Back\" button.");
+				} else {
+					my $deletecount = delete_selected($self, $db, $localSet);
+					if($deletecount > 0) {
+						$self->addgoodmessage("Deleted $deletecount problem".(($deletecount>1)?'s':'').
+							" to $localSet.");
+					}
+				}
+			}
+		}
+		if (scalar(@move_selected)>0) {	# if some are to be added, they need a place to go
+			$localSet = $r->param('myset_sets');
+			my $otherSet = $self->{current_library_set};
+			if (not defined($localSet) or not defined($otherSet) or
+					$localSet eq SELECT_SET_STRING or 
+		            $localSet eq NO_LOCAL_SET_STRING) {
+				$self->addbadmessage('You are trying to add problems to something, 
+				but you did not select a "Target Set" name as a target.');
+			} else {
+				my $newSetRecord  = $db->getGlobalSet($localSet);
+				my $otherNewSetRecord = $db->getGlobalSet($otherSet);
+				if (not defined($newSetRecord) or not defined($otherNewSetRecord)) {
+					$self->addbadmessage("You are trying to move problems from $otherSet to $localSet, 
+					but that set does not seem to exist!  I bet you used your \"Back\" button.");
+				} else {
+					my $addcount = add_selected($self, $db, $localSet);
+					my $deletecount = delete_selected($self, $db, $otherSet);
+					if($addcount > 0 && $deletecount > 0) {
+						$self->addgoodmessage("Moved $addcount problem".(($addcount>1)?'s':'').
+							" from $otherSet to $localSet.");
+					}
+				}
+			}
+		}
+		## now handle problems to be hidden
+
+		## only keep the ones which are not hidden
+		@pg_files = grep {($_->[1] & HIDDEN) ==0 } @{$self->{past_problems}};
+		@pg_files = grep {(($_->[1] & DELETED)) != 0 } @pg_files;
+		@past_marks = map {$_->[1]} @pg_files;
+		@pg_files = map {$_->[0]} @pg_files;
+		@all_past_list = (@all_past_list[0..($first_shown-1)],
+					@pg_files,
+					@all_past_list[($last_shown+1)..(scalar(@all_past_list)-1)]);
+		$last_shown = $first_shown+$maxShown -1; debug("last_shown 3: ", $last_shown);
+		$last_shown = (scalar(@all_past_list)-1) if($last_shown>=scalar(@all_past_list)); debug("last_shown 4: ", $last_shown);
+		
+		#want to reorder in addition to anything else
+    if ($r->param('isReordered')){
+    #this might work, i'm not sure if this is the right ID
+      reorderProblems($self, $db, $r->param('myset_sets'), $r);
+    }
+
+	} elsif ($r->param('next_page')) {
+		$first_shown = $last_shown+1;
+		$last_shown = $first_shown+$maxShown-1; debug("last_shown 5: ", $last_shown);
+		$last_shown = (scalar(@all_past_list)-1) if($last_shown>=scalar(@all_past_list)); debug("last_shown 6: ", $last_shown);
+		$self->addgoodmessage("It sees the next_page parameter, last shown is: $last_shown and first shown is: $first_shown");
+		@past_marks = ();
+	} elsif ($r->param('prev_page')) {
+		$last_shown = $first_shown-1; 
+		$first_shown = $last_shown - $maxShown+1;
+
+		$first_shown = 0 if($first_shown<0);
+		@past_marks = ();
+
+	} elsif ($r->param('select_all')) {
+		@past_marks = map {1} @past_marks;
+	} elsif ($r->param('library_basic')) {
+		$library_basic = 1;
+		for my $jj (qw(textchapter textsection textbook)) {
+			$r->param('library_'.$jj,'');
+		}
+	} elsif ($r->param('library_advanced')) {
+		$library_basic = 2;
+	} elsif ($r->param('library_reset')) {
+		for my $jj (qw(chapters sections subjects textbook keywords)) {
+			$r->param('library_'.$jj,'');
+		}
+	} elsif ($r->param('select_none')) {
+		@past_marks = ();
+	} else {
+		#nothing
+	}				##### end of the if elsif ...
+
+  #I'm worried this will break something
+  my $default_set = $self->{current_myset_set};
+	  #debug("set_to_display is $default_set");
+	  if (not defined($default_set) 
+  		or $default_set eq "Select a Homework Set"
+  		or $default_set eq NO_LOCAL_SET_STRING) {
+  		$self->addbadmessage("You need to select a set from this course to view.");
+  	} else {
+  		# DBFIXME don't use ID list, use an iterator
+  		my @problemList = $db->listGlobalProblems($default_set);
+  		my $problem;
+  		@myset_files=();
+  		for $problem (@problemList) {
+  			my $problemRecord = $db->getGlobalProblem($default_set, $problem); # checked
+  			die "global $problem for set $default_set not found." unless
+  				$problemRecord;
+  			push @myset_files, $problemRecord->source_file;
+  
+  		}
+  	  #@myset_files = sortByName(undef,@myset_files);
+  	}
+ 
+	############# List of local sets
+
+	# DBFIXME sorting in database, please!
+	my @all_db_sets = $db->listGlobalSets;
+	@all_db_sets = sortByName(undef, @all_db_sets);
+
+	if ($use_previous_problems) {
+		@pg_files = @all_past_list;
+	} else {
+		$first_shown = 0;
+		$last_shown = scalar(@pg_files)<$maxShown ? scalar(@pg_files) : $maxShown; 
+		$last_shown--;		# to make it an array index
+		@past_marks = ();
+	}
+	############# Now store data in self for retreival by body
+	$self->{first_shown} = $first_shown;
+	$self->{last_shown} = $last_shown;
+	$self->{browse_which} = $browse_which;
+	$self->{gridded} = $gridded;
+	#$self->{problem_seed} = $problem_seed;
+	$self->{pg_files} = \@pg_files;
+	$self->{myset_files} = \@myset_files;
+	$self->{past_marks} = \@past_marks;
+	$self->{all_db_sets} = \@all_db_sets;
+	$self->{library_basic} = $library_basic;
+	debug("past_marks is ", join(" ", @{$self->{past_marks}}));
+}
+
+
+sub title {
+	return "Library Browser v2";
+}
+
+# hide view options panel since it distracts from SetMaker's built-in view options
+sub options {
+	return "";
+}
+
+sub head {
+  return "";
+}
+
+sub body {
+	my ($self) = @_;
+
+	my $r = $self->r;
+	my $ce = $r->ce;		# course environment
+	my $db = $r->db;		# database
+	my $j;			# garden variety counter
+
+	my $userName = $r->param('user');
+
+	my $user = $db->getUser($userName); # checked
+	die "record for user $userName (real user) does not exist."
+		unless defined $user;
+
+	### Check that this is a professor
+	my $authz = $r->authz;
+	unless ($authz->hasPermissions($userName, "modify_problem_sets")) {
+		print "User $userName returned " . 
+			$authz->hasPermissions($user, "modify_problem_sets") . 
+	" for permission";
+		return(CGI::div({class=>'ResultsWithError'},
+		CGI::em("You are not authorized to access the Instructor tools.")));
+	}
+
+	my $showHints = $r->param('showHints');
+	my $showSolutions = $r->param('showSolutions');
+	
+	##########	Extract information computed in pre_header_initialize
+
+	my $first_shown = $self->{first_shown};
+	my $last_shown = $self->{last_shown}; 
+	my $browse_which = $self->{browse_which};
+	my $gridded = $self->{gridded};
+	my $problem_seed = $self->{problem_seed}||1234;
+	my @pg_files = @{$self->{pg_files}};
+	my @myset_files =@{$self->{myset_files}};
+	my @all_db_sets = @{$self->{all_db_sets}};
+
+  my $displayModePlaceholder;
+	if (not defined($r->param('mydisplayMode'))){
+	  $displayModePlaceholder = "images";
+	}
+	else{
+	  $displayModePlaceholder = $r->param('mydisplayMode');
+	}
+
+	my @pg_html;
+	if ($last_shown >= $first_shown) {
+		@pg_html = renderProblems(
+			r=> $r,
+			user => $user,
+			problem_list => [@pg_files[$first_shown..$last_shown]],
+			displayMode => $displayModePlaceholder,
+			showHints => $showHints,
+			showSolutions => $showSolutions,
+		);
+	}
+	my @myset_html;
+
+  @myset_html = renderProblems(
+	  r=> $r,
+	  user => $user,
+		problem_list => [@myset_files],
+		displayMode => $displayModePlaceholder,
+		showHints => $showHints,
+		showSolutions => $showSolutions,
+  );
+
+	my %isInSet;
+	my $setName = $r->param("myset_sets");
+	if ($setName) {
+		# DBFIXME where clause, iterator
+		# DBFIXME maybe instead of hashing here, query when checking source files?
+		# DBFIXME definitely don't need to be making full record objects
+		# DBFIXME SELECT source_file FROM whatever_problem WHERE set_id=? GROUP BY source_file ORDER BY NULL;
+		# DBFIXME (and stick result directly into hash)
+		foreach my $problem ($db->listGlobalProblems($setName)) {
+			my $problemRecord = $db->getGlobalProblem($setName, $problem);
+			$isInSet{$problemRecord->source_file} = 1;
+		}
+	}
+	$self->{isInSet} = \%isInSet;
+  my $jj;
+ 
+	  	  
+	    	#some work for the moved controls
+				my $list_of_local_sets = $self->{all_db_sets};
+				my $have_local_sets = scalar(@$list_of_local_sets);
+				my $library_selected = $self->{current_library_set};
+				my $set_selected = $r->param('local_sets');
+			
+				if($have_local_sets ==0) {
+					$list_of_local_sets = [NO_LOCAL_SET_STRING];
+				} elsif (not defined($set_selected) or $set_selected eq ""
+					or $set_selected eq SELECT_SET_STRING) {
+					unshift @{$list_of_local_sets}, SELECT_SET_STRING;
+					$set_selected = SELECT_SET_STRING;
+				}
+			
+				# Tidy this list up since it is used in two different places
+				if ($list_of_local_sets->[0] eq SELECT_SET_STRING) {
+					shift @{$list_of_local_sets};
+				}
+
+	      print '<div id="setmaker_library_box" class="setmaker_library">';
+				  print '<h1>Library</h1>';
+				  print '<div class="setSelector">';
+				  print '</div>';
+				  print '<div id="setmaker_library_data">';
+					#hidden inputs for memeory
+					#remember gridify
+					print CGI::hidden(-id=>'pastGridded', -name=>'gridify', -value=>$gridded, -override=>1);
+					print CGI::hidden(-id=>'isReordered', -name=>'isReordered', -vale=>0 ,-override=>0);
+	        print CGI::hidden(-name=>'browse_which', -value=>$browse_which,-override=>1),
+		      CGI::hidden(-name=>'problem_seed', -value=>$problem_seed, -override=>1);
+	        for ($j = 0 ; $j < scalar(@pg_files) ; $j++) {
+		        print CGI::hidden(-name=>"all_past_list$j", -value=>$pg_files[$j],-override=>1);
+	        }
+	        print CGI::hidden(-name=>'first_shown', -value=>$first_shown,-override=>1);
+	        print CGI::hidden(-name=>'last_shown', -value=>$last_shown, -override=>1);
+          print '<div id="setmaker_library_problems" class="problemList">';
+	        ########## Now print problems
+	          for ($jj=0; $jj<scalar(@pg_html); $jj++) { 
+		          $pg_files[$jj] =~ s|^$ce->{courseDirs}->{templates}/?||;
+		          $self->make_data_row($pg_files[$jj+$first_shown], $pg_html[$jj], $jj+1,         $self->{past_marks}->[$jj]); 
+	          }
+          print '</div>';
+          print '<p><button type="button" onclick="increaseLibAcross();">+</button><span id="libAcross">4</span><button type="button" onclick="decreaseLibAcross();">-</button><span> problems across</span></p>';
+	        ########## Finish things off
+	        my ($next_button, $prev_button) = ("", "");
+	        if ($first_shown > 0) {
+		        #$prev_button = CGI::submit(-name=>"prev_page", -style=>"width:15ex", -value=>"Previous page");
+		        my $urlpath = $r->urlpath;
+            my $getProblemPath = $self->systemLink($urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::GetLibrarySetProblems", courseID =>$urlpath->arg("courseID")));
+	          $prev_button = "<span><button type='button' onclick='viewProblems(\"prev_page\" ,\"mainform\", \"".$getProblemPath."\", \"prev_spinner\");'>Previous page</button><img id='prev_spinner' style='display:none;' src='/webwork2_files/images/ajax-loader-small.gif'></img></span>";
+	        }
+	        if ((1+$last_shown)<scalar(@pg_files)) {
+		        #$next_button = CGI::submit(-name=>"next_page", -style=>"width:15ex", -value=>"Next page");
+		        my $urlpath = $r->urlpath;
+            my $getProblemPath = $self->systemLink($urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::GetLibrarySetProblems", courseID =>$urlpath->arg("courseID")));
+	          $next_button = "<span><button type='button' onclick='viewProblems(\"next_page\" ,\"mainform\", \"".$getProblemPath."\", \"next_spinner\");'>Next page</button><img id='next_spinner' style='display:none;' src='/webwork2_files/images/ajax-loader-small.gif'></img></span>";
+	        }
+	        if (scalar(@pg_files)>0) {
+	          my $urlpath = $r->urlpath;
+            my $getProblemPath = $self->systemLink($urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::SetMaker2", courseID =>$urlpath->arg("courseID")));
+		        print CGI::p(($first_shown+1)."-".($last_shown+1)." of ".scalar(@pg_files)." shown.", $prev_button, " ", $next_button,
+			      '<span><button type="button" style="float:right;" onclick="saveChanges(\'mainform\', \''.$getProblemPath.'\', \'save_changes_spinner2\');">save changes</button><img id="save_changes_spinner2" style="display:none;float:right;" src="/webwork2_files/images/ajax-loader-small.gif"></img></span>');
+	        }
+	        #close setmaker_library_data
+	        print '</div>';
+	        #close setmaker_library
+	      print '</div>';
+	
+
+	return "";	
+}
+
+=head1 AUTHOR
+
+Written by John Jones, jj (at) asu.edu.
+Edited by David Gage
+
+=cut
+
+1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/GetTargetSetProblems.pm b/lib/WeBWorK/ContentGenerator/Instructor/GetTargetSetProblems.pm
new file mode 100644
index 0000000000..3d2c08dd54
--- /dev/null
+++ b/lib/WeBWorK/ContentGenerator/Instructor/GetTargetSetProblems.pm
@@ -0,0 +1,296 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm,v 1.85 2008/07/01 13:18:52 glarose 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.	 See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+
+package WeBWorK::ContentGenerator::Instructor::GetTargetSetProblems;
+use base qw(WeBWorK::ContentGenerator::Instructor);
+
+=head1 NAME
+
+WeBWorK::ContentGenerator::Instructor::GetTargetSetProblems - Get homework sets.
+
+=cut
+
+use strict;
+use warnings;
+
+
+#use CGI qw(-nosticky);
+use WeBWorK::CGI;
+use WeBWorK::Debug;
+use WeBWorK::Form;
+use WeBWorK::Utils qw(readDirectory max sortByName);
+use WeBWorK::Utils::Tasks qw(renderProblems);
+use File::Find;
+
+require WeBWorK::Utils::ListingDB;
+
+use constant SHOW_HINTS_DEFAULT => 0;
+use constant SHOW_SOLUTIONS_DEFAULT => 0;
+use constant MAX_SHOW_DEFAULT => 20;
+use constant NO_LOCAL_SET_STRING => 'No sets in this course yet';
+use constant SELECT_SET_STRING => 'Select a Set from this Course';
+use constant SELECT_LOCAL_STRING => 'Select a Problem Collection';
+use constant MY_PROBLEMS => '  My Problems  ';
+use constant MAIN_PROBLEMS => '  Unclassified Problems  ';
+use constant CREATE_SET_BUTTON => 'Create New Set';
+use constant ALL_CHAPTERS => 'All Chapters';
+use constant ALL_SUBJECTS => 'All Subjects';
+use constant ALL_SECTIONS => 'All Sections';
+use constant ALL_TEXTBOOKS => 'All Textbooks';
+
+use constant LIB2_DATA => {
+  'dbchapter' => {name => 'library_chapters', all => 'All Chapters'},
+  'dbsection' =>  {name => 'library_sections', all =>'All Sections' },
+  'dbsubject' =>  {name => 'library_subjects', all => 'All Subjects' },
+  'textbook' =>  {name => 'library_textbook', all =>  'All Textbooks'},
+  'textchapter' => {name => 'library_textchapter', all => 'All Chapters'},
+  'textsection' => {name => 'library_textsection', all => 'All Sections'},
+  'keywords' =>  {name => 'library_keywords', all => '' },
+  };
+
+##	for additional problib buttons
+my %problib;	## filled in in global.conf
+my %ignoredir = (
+	'.' => 1, '..' => 1, 'Library' => 1, 'CVS' => 1, 'tmpEdit' => 1,
+	'headers' => 1, 'macros' => 1, 'email' => 1, '.svn' => 1,
+);
+
+sub prepare_activity_entry {
+	my $self=shift;
+	my $r = $self->r;
+	my $user = $self->r->param('user') || 'NO_USER';
+	return("In SetMaker2 as user $user");
+}
+
+sub make_myset_data_row {
+	my $self = shift;
+	my $sourceFileName = shift;
+	my $pg = shift;
+	my $cnt = shift;
+
+	$sourceFileName =~ s|^./||; # clean up top ugliness
+
+	my $urlpath = $self->r->urlpath;
+	my $db = $self->r->db;
+
+	## to set up edit and try links elegantly we want to know if
+	##    any target set is a gateway assignment or not
+	my $localSet = $self->r->param('local_sets');
+	my $setRecord;
+	if ( defined($localSet) && $localSet ne SELECT_SET_STRING &&
+	     $localSet ne NO_LOCAL_SET_STRING ) {
+		$setRecord = $db->getGlobalSet( $localSet );
+	}
+	my $isGatewaySet = ( defined($setRecord) && 
+			     $setRecord->assignment_type =~ /gateway/ );
+
+	my $problem_output = $pg->{flags}->{error_flag} ?
+		CGI::div({class=>"ResultsWithError"}, CGI::em("This problem produced an error"))
+		: CGI::div({class=>"RenderSolo"}, $pg->{body_text});
+	$problem_output .= $pg->{flags}->{comment} if($pg->{flags}->{comment});
+
+
+	#if($self->{r}->param('browse_which') ne 'browse_npl_library') {
+	my $problem_seed = $self->{'problem_seed'} || 1234;
+	my $edit_link = CGI::a({href=>$self->systemLink(
+		 $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor",
+			  courseID =>$urlpath->arg("courseID"),
+			  setID=>"Undefined_Set",
+			  problemID=>"1"),
+			params=>{sourceFilePath => "$sourceFileName", problemSeed=> $problem_seed}
+		  ), target=>"WW_Editor"}, "Edit it" );
+	
+	my %delete_box_data = ( -id=>"deleted$cnt".'myset' ,-name=>"deleted$cnt",-value=>1,-label=>"Delete this problem from the target set on the next update");
+	
+	my $displayMode = $self->r->param("mydisplayMode");
+	$displayMode = $self->r->ce->{pg}->{options}->{displayMode}
+		if not defined $displayMode or $displayMode eq "None";
+	my $module = ( $isGatewaySet ) ? "GatewayQuiz" : "Problem";
+	my %pathArgs = ( courseID =>$urlpath->arg("courseID"),
+			setID=>"Undefined_Set" );
+	$pathArgs{problemID} = "1" if ( ! $isGatewaySet );
+
+	my $try_link = CGI::a({href=>$self->systemLink(
+		$urlpath->newFromModule("WeBWorK::ContentGenerator::$module",
+			%pathArgs ),
+			params =>{
+				effectiveUser => scalar($self->r->param('user')),
+				editMode => "SetMaker",
+				problemSeed=> $problem_seed,
+				sourceFilePath => "$sourceFileName",
+				displayMode => $displayMode,
+			}
+		), target=>"WW_View"}, "Try it");
+
+	print CGI::div({-class=>"problem myProblem", -draggable=>"true", -href=>"#", -id=>("$cnt".'myset')},
+		CGI::p({},"File name: $sourceFileName "), 
+  	CGI::p({}, $edit_link, " ", $try_link),
+		CGI::p(CGI::checkbox((%delete_box_data),-override=>1)),
+		CGI::hidden(-id=>"filetrial$cnt".'myset', -name=>"mysetfiletrial$cnt", -default=>$sourceFileName,-override=>1),
+		CGI::p($problem_output),
+	);
+}
+
+sub clear_default {
+	my $r = shift;
+	my $param = shift;
+	my $default = shift;
+	my $newvalue = $r->param($param) || '';
+	$newvalue = '' if($newvalue eq $default);
+	$r->param($param, $newvalue);
+}
+
+sub pre_header_initialize {
+	my ($self) = @_;
+	my $r = $self->r;
+	## For all cases, lets set some things
+	$self->{error}=0;
+	my $ce = $r->ce;
+	my $db = $r->db;
+	
+    $self->{current_myset_set} = $r->param('myset_sets');
+    if (not defined($self->{current_myset_set}) 
+		or $self->{current_myset_set} eq "Select a Homework Set"
+		or $self->{current_myset_set} eq NO_LOCAL_SET_STRING) {
+      my @all_db_sets = $db->listGlobalSets;
+	    @all_db_sets = sortByName(undef, @all_db_sets);
+	    $self->{current_myset_set} = shift(@all_db_sets);
+	  }
+	
+	my $userName = $r->param('user');
+	my $user = $db->getUser($userName); # checked 
+	die "record for user $userName (real user) does not exist." 
+		unless defined $user;
+	my $authz = $r->authz;
+	unless ($authz->hasPermissions($userName, "modify_problem_sets")) {
+		return(""); # Error message already produced in the body
+	}
+
+	my @myset_files=();
+
+  #I'm worried this will break something
+  my $default_set = $self->{current_myset_set};
+	  #debug("set_to_display is $default_set");
+	  if (not defined($default_set) 
+  		or $default_set eq "Select a Homework Set"
+  		or $default_set eq NO_LOCAL_SET_STRING) {
+  		$self->addbadmessage("You need to select a set from this course to view.");
+  	} else {
+  		# DBFIXME don't use ID list, use an iterator
+  		my @problemList = $db->listGlobalProblems($default_set);
+  		my $problem;
+  		@myset_files=();
+  		for $problem (@problemList) {
+  			my $problemRecord = $db->getGlobalProblem($default_set, $problem); # checked
+  			die "global $problem for set $default_set not found." unless
+  				$problemRecord;
+  			push @myset_files, $problemRecord->source_file;
+  
+  		}
+  	  #@myset_files = sortByName(undef,@myset_files);
+  	}
+	############# Now store data in self for retreival by body
+
+	$self->{myset_files} = \@myset_files;
+}
+
+
+sub title {
+	return "Library Browser v2";
+}
+
+# hide view options panel since it distracts from SetMaker's built-in view options
+sub options {
+	return "";
+}
+
+sub head {
+
+  return "";
+}
+
+sub body {
+	my ($self) = @_;
+
+	my $r = $self->r;
+	my $ce = $r->ce;		# course environment
+	my $db = $r->db;		# database
+	my $j;			# garden variety counter
+
+	my $userName = $r->param('user');
+
+	my $user = $db->getUser($userName); # checked
+	die "record for user $userName (real user) does not exist."
+		unless defined $user;
+
+	### Check that this is a professor
+	my $authz = $r->authz;
+	unless ($authz->hasPermissions($userName, "modify_problem_sets")) {
+		print "User $userName returned " . 
+			$authz->hasPermissions($user, "modify_problem_sets") . 
+	" for permission";
+		return(CGI::div({class=>'ResultsWithError'},
+		CGI::em("You are not authorized to access the Instructor tools.")));
+	}
+
+	my $showHints = $r->param('showHints');
+	my $showSolutions = $r->param('showSolutions');
+	
+	##########	Extract information computed in pre_header_initialize
+
+
+	my @myset_files =@{$self->{myset_files}};
+
+  my $displayModePlaceholder;
+	if (not defined($r->param('mydisplayMode'))){
+	  $displayModePlaceholder = "images";
+	}
+	else{
+	  $displayModePlaceholder = $r->param('mydisplayMode');
+	}
+
+	my @myset_html;
+
+  @myset_html = renderProblems(
+	  r=> $r,
+	  user => $user,
+		problem_list => [@myset_files],
+		displayMode => $displayModePlaceholder,
+		showHints => $showHints,
+		showSolutions => $showSolutions,
+  );
+  
+  my $jj;
+	print '<div id="mysets_problems" class="problemList">';
+	  for ($jj=0; $jj<scalar(@myset_html); $jj++) { 
+	    $myset_files[$jj] =~ s|^$ce->{courseDirs}->{templates}/?||;
+	    $self->make_myset_data_row($myset_files[$jj], $myset_html[$jj], $jj+1); 
+	  }
+	print '</div>';
+	
+
+	return "";	
+}
+
+=head1 AUTHOR
+
+Written by John Jones, jj (at) asu.edu.
+Edited by David Gage
+
+=cut
+
+1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/Index.pm b/lib/WeBWorK/ContentGenerator/Instructor/Index.pm
index fca4cdbbdf..1a73b173ce 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/Index.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/Index.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader: webwork-modperl/lib/WeBWorK/ContentGenerator/Instructor/Index.pm,v 1.21 2003/12/09 01:12:31 sh002i Exp $
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm,v 1.59 2007/08/13 22:59:55 sh002i 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
@@ -10,7 +10,7 @@
 # 
 # This program is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# FOR A PARTICULAR PURPOSE.	 See either the GNU General Public License or the
 # Artistic License for more details.
 ################################################################################
 
@@ -19,532 +19,419 @@ use base qw(WeBWorK::ContentGenerator::Instructor);
 
 =head1 NAME
 
-WeBWorK::ContentGenerator::Instructor::Index - Menu interface to the Instructor pages
+WeBWorK::ContentGenerator::Instructor::Index - Menu interface to the Instructor
+pages
 
 =cut
 
 use strict;
 use warnings;
-use Apache::Constants qw(:common REDIRECT DONE);
-use CGI qw();
-sub pre_header_initialize {
-	my ($self, $setName, $problemNumber) = @_;
-	my $r                    = $self->{r};
-	my $ce                   = $self->{ce};
-	my $db                   = $self->{db};
-	my $authz                = $self->{authz};
-	my $userName             = $r->param('user');
-	my $effectiveUserName    = $r->param('effectiveUser');
-	my $key                  = $r->param('key');
-	my $user                 = $db->getUser($userName); #checked 
-	my $effectiveUser        = $db->getUser($effectiveUserName); #checked
-	my $permissionLevel      = $db->getPermissionLevel($userName)->permission(); #checked
-	die "user $user (real user) not found."  unless $user;
-	die "effective user $effectiveUser  not found. One 'acts as' the effective user."  unless $effectiveUser;
-	die "permisson level for user $userName  not found."  unless $permissionLevel;
-	
-	
-	
-	
-	unless ($authz->hasPermissions($userName, "modify_student_data")) {
-		$self->{submitError} = "You are not authorized to modify student data";
-		return;
-	}
-	my @submit_actions = qw(student-dates act-as-student edit-set-dates reset-password assign-passwords 
-	                        set-stats drop-students edit-students-sets edit-sets student-stats edit-class-data
-	                        add-students send-email score-sets);
-	foreach my $act (@submit_actions) {
-		$self->{current_action } .=  "The action &lt;$act&gt; &quot;". $r->param($act) . "&quot; was requested" 
-		if defined($r->param($act));
-	}
-	$self->{selected_sets}   = "Set(s) chosen: "      . join(" ", $r->param("setList"));
-	$self->{selected_users}  = "Student(s) chosen: "  .join(" ", $r->param("classList")) ;
-#   Redirect actions
-    defined($r->param('student-dates')) && do {
-    #FIXME  will only do one student and one set at a time
-    # it would be good to be able to do many sets for many student
-    # this would require a separate module
-     	my $root            = $ce->{webworkURLs}->{root};
-		my $courseName      = $ce->{courseName};
-		my @userList        = $r->param("classList");
-		# can only become the first user listed.
-		my $student     = shift @userList;
-		my @setList        = $r->param("setList");
-		# can only become the first user listed.
-		my $setName         = shift @setList;
-		my $uri="$root/$courseName/instructor/sets/$setName/?editForUser=$student&".$self->url_authen_args;
-		$r->header_out(Location => $uri);
-		$self->{noContent} =  1;  # forces redirect
-		return;
-    };
-	defined($r->param('act-as-student')) && do {
-		# fix url and redirect
-		my @userList        = $r->param("classList");
-		# can only become the first user listed.
-		my $effectiveUser   = shift @userList;
-		my @setList         = $r->param("setList");
-		my $setName         =  shift @setList;
-		my $root            = $ce->{webworkURLs}->{root};
-		my $courseName      = $ce->{courseName};
+#use CGI qw(-nosticky );
+use WeBWorK::CGI;
+use WeBWorK::HTML::ScrollingRecordList qw/scrollingRecordList/;
+#use WeBWorK::Utils::FilterRecords qw/getFiltersForClass/;
+
+use constant E_NO_USERS     => "Please do not select any users.";
+use constant E_NO_SETS      => "Please do not select any sets.";
+use constant E_MAX_ONE_USER => "Please select at most one user.";
+use constant E_MAX_ONE_SET  => "Please select at most one set.";
+use constant E_ONE_USER     => "Please select exactly one user.";
+use constant E_ONE_SET      => "Please select exactly one set.";
+use constant E_MIN_ONE_USER => "Please select at least one user.";
+use constant E_MIN_ONE_SET  => "Please select at least one set.";
+use constant E_SET_NAME     => "Please specify a homework set name.";
+use constant E_BAD_NAME     => "Please use only letter, digits, -, _ and . in your set name.";
 
-		my $uri="$root/$courseName/$setName/?effectiveUser=$effectiveUser&".$self->url_authen_args;
-		#FIXME  does the display mode need to be defined?
-		#FIXME  url_authen_args also includes an effective user, so the new one must come first.
-		# even that might not work with every browser since there are two effective User assignments.
-		$r->header_out(Location => $uri);
-		$self->{noContent} =  1;  # forces redirect
-		return;
+sub pre_header_initialize {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my $db = $r->db;
+	my $authz = $r->authz;
+	my $urlpath = $r->urlpath;
+
+	my $courseID = $urlpath->arg("courseID");
+	my $userID = $r->param("user");
+	my $eUserID = $r->param("effectiveUser");
+	$self->{courseName} = $courseID;
+	# Check permissions
+	return unless ($authz->hasPermissions($userID, "access_instructor_tools"));
+	
+	my @selectedUserIDs = $r->param("selected_users");
+	my @selectedSetIDs = $r->param("selected_sets");
+	
+	my $nusers = @selectedUserIDs;
+	my $nsets = @selectedSetIDs;
+	
+	my $firstUserID = $nusers ? $selectedUserIDs[0] : "";
+	my $firstSetID = $nsets ? $selectedSetIDs[0] : "";
+	
+	# these will be used to construct a new URL
+	my $module;
+	my %args = ( courseID => $courseID );
+	my %params;
+	
+	my $pfx = "WeBWorK::ContentGenerator";
+	my $ipfx = "WeBWorK::ContentGenerator::Instructor";
+	
+	my @error;
+	
+	# depending on which button was pushed, fill values in for URL construction
+	
+	defined param $r "sets_assigned_to_user" and do {
+		if ($nusers == 1) {
+			$module = "${ipfx}::UserDetail";
+			$args{userID} = $firstUserID;
+			$params{fromTools} = 1;
+		} else {
+			push @error, E_ONE_USER;
+		}
 	};
-	defined($r->param('edit-set-dates')) && do {
-	#FIXME  this should be replaced by redirecting to a module where you can edit
-	# dates for several sets at once
-     	my $root            = $ce->{webworkURLs}->{root};
-		my $courseName      = $ce->{courseName};
-		my @setList        = $r->param("setList");
-		# can only become the first user listed.
-		my $setName         = shift @setList;
-		my $uri="$root/$courseName/instructor/sets/$setName/?".$self->url_authen_args;
-		$r->header_out(Location => $uri);
-		$self->{noContent} =  1;  # forces redirect
-		return;
-    };
-    defined($r->param('reset-password')) && do {
-    # FIXME this should allow me to assign studentID to a number of students
-    # requires a new module
-		my @userList        = $r->param("classList");
-		# can only become the first user listed.
-		my $effectiveUser   = shift @userList;
-		my @setList         = $r->param("setList");
-		my $setName         =  shift @setList;
-		my $root            = $ce->{webworkURLs}->{root};
-		my $courseName      = $ce->{courseName};
-
-		my $uri="$root/$courseName/options/?effectiveUser=$effectiveUser&".$self->url_authen_args;
-		#FIXME  does the display mode need to be defined?
-		#FIXME  url_authen_args also includes an effective user, so the new one must come first.
-		# even that might not work with every browser since there are two effective User assignments.
-		$r->header_out(Location => $uri);
-		$self->{noContent} =  1;  # forces redirect
-		return;
-    };
-    defined($r->param('assign-passwords')) && do {
-  		my @userList        = $r->param("classList");
-		# can only become the first user listed.
-		my $effectiveUser   = shift @userList;
-		my @setList         = $r->param("setList");
-		my $setName         =  shift @setList;
-		my $root            = $ce->{webworkURLs}->{root};
-		my $courseName      = $ce->{courseName};
-
-		my $uri="$root/$courseName/options/?effectiveUser=$effectiveUser&".$self->url_authen_args;
-		#FIXME  does the display mode need to be defined?
-		#FIXME  url_authen_args also includes an effective user, so the new one must come first.
-		# even that might not work with every browser since there are two effective User assignments.
-		$r->header_out(Location => $uri);
-		$self->{noContent} =  1;  # forces redirect
-		return;
-    };
-    defined($r->param('set-stats')) && do {
-     	my $root            = $ce->{webworkURLs}->{root};
-		my $courseName      = $ce->{courseName};
-		my @setList        = $r->param("setList");
-		# can only become the first user listed.
-		my $setName         = shift @setList;
-		my $uri="$root/$courseName/instructor/stats/set/$setName?".$self->url_authen_args;
-		$r->header_out(Location => $uri);
-		$self->{noContent} =  1;  # forces redirect
-		return;
-    };
-    defined($r->param('drop-students')) && do {
-    #FIXME  this operation should be made faster
-    	my $root            = $ce->{webworkURLs}->{root};
-		my $courseName      = $ce->{courseName};
-		my @setList        = $r->param("setList");
-		# can only become the first user listed.
-		my $setName         = shift @setList;
-		my $uri="$root/$courseName/instructor/users/?".$self->url_authen_args;
-		$r->header_out(Location => $uri);
-		$self->{noContent} =  1;  # forces redirect
-		return;
-    };
-    defined($r->param('edit-students-sets')) && do {
-      	my $root            = $ce->{webworkURLs}->{root};
-		my $courseName      = $ce->{courseName};
-		my @userList        = $r->param("classList");
-		# can only become the first user listed.
-		my $student     = shift @userList;
-		my @setList        = $r->param("setList");
-		# can only become the first user listed.
-		my $setName         = shift @setList;
-		my $uri="$root/$courseName/instructor/sets/$setName/?editForUser=$student&".$self->url_authen_args;
-		$r->header_out(Location => $uri);
-		$self->{noContent} =  1;  # forces redirect
-		return;
-    };
-    defined($r->param('edit-sets')) && do {
-    	my $root            = $ce->{webworkURLs}->{root};
-		my $courseName      = $ce->{courseName};
-		my @setList        = $r->param("setList");
-		# can only become the first user listed.
-		my $setName         = shift @setList;
-		my $uri="$root/$courseName/instructor/sets/$setName/?".$self->url_authen_args;
-		$r->header_out(Location => $uri);
-		$self->{noContent} =  1;  # forces redirect
-		return;
-    };
-    defined($r->param('student-stats')) && do {
-    	my $root            = $ce->{webworkURLs}->{root};
-		my $courseName      = $ce->{courseName};
-		my @userList        = $r->param("classList");
-		# can only become the first user listed.
-		my $studentName     = shift @userList;
-		my $uri="$root/$courseName/instructor/stats/student/$studentName?".$self->url_authen_args;
-		$r->header_out(Location => $uri);
-		$self->{noContent} =  1;  # forces redirect
-		return;
-    };
-    defined($r->param('edit-class-data')) && do {
-    	my $root            = $ce->{webworkURLs}->{root};
-		my $courseName      = $ce->{courseName};
-		#my @setList        = $r->param("setList");
-		## can only become the first user listed.
-		#my $setName         = shift @setList;
-		# ...not sure what those are about
-		# get list of users selected
-		my @userIDs = $r->param("classList");
-		my $uri="$root/$courseName/instructor/users/?";
-		$uri .= join("&", map { "visible_users=$_" } @userIDs);
-		$uri .= "&editMode=1",
-		$uri .= "&" . $self->url_authen_args;
-		$r->header_out(Location => $uri);
-		$self->{noContent} =  1;  # forces redirect
-		return;
-    };
-    defined($r->param('add-students')) && do {
-		my $root            = $ce->{webworkURLs}->{root};
-		my $courseName      = $ce->{courseName};
-
-		my $uri="$root/$courseName/instructor/add_users/?".$self->url_authen_args;
-		$r->header_out(Location => $uri);
-		$self->{noContent} =  1;  # forces redirect
-		return;
+	
+	defined param $r "users_assigned_to_set" and do {
+		if ($nsets == 1) {
+			$module = "${ipfx}::UsersAssignedToSet";
+			$args{setID} = $firstSetID;
+			$params{fromTools} = 1;
+		} else {
+			push @error, E_ONE_SET;
+		}
 	};
-	defined($r->param('send-email')) && do {
-		my $root            = $ce->{webworkURLs}->{root};
-		my $courseName      = $ce->{courseName};
-
-		my $uri="$root/$courseName/instructor/send_mail/?".$self->url_authen_args;
-		$r->header_out(Location => $uri);
-		$self->{noContent} =  1;  # forces redirect
-		return;
+	
+	defined param $r "edit_users" and do {
+		if ($nusers >= 1) {
+			$module = "${ipfx}::UserList";
+			$params{visible_users} = \@selectedUserIDs;
+			$params{editMode} = 1;
+		} else {
+			push @error, E_MIN_ONE_USER;
+		}
+	};
+	
+	defined param $r "edit_sets" and do {
+		if ($nsets == 1) {
+			$module = "${ipfx}::ProblemSetDetail";
+			$args{setID} = $firstSetID;
+		} else {
+			push @error, E_ONE_SET;
+			
+		}
+	};
+	
+	defined param $r "prob_lib" and do {
+		if ($nsets == 1) {
+					$module = "${ipfx}::SetMaker";
+			$params{local_sets} = $firstSetID;
+		} elsif ($nsets == 0) {
+				$module = "${ipfx}::SetMaker";
+		} else {
+			push @error, E_ONE_SET;
+			
+		}
+	};
+	
+	defined param $r "user_stats" and do {
+		if ($nusers == 1) {
+			$module = "${ipfx}::Stats";
+			$args{statType} = "student"; # FIXME: fix URLPath -- i shouldn't have to type this!
+			$args{userID} = $firstUserID;
+		} else {
+			push @error, E_ONE_USER;
+		}
+	};
+	
+	defined param $r "set_stats" and do {
+		if ($nsets == 1) {
+			$module = "${ipfx}::Stats";
+			$args{statType} = "set"; # FIXME: fix URLPath -- i shouldn't have to type this!
+			$args{setID} = $firstSetID;
+		} else {
+			push @error, E_ONE_SET;
+		}
+	};
+	
+	defined param $r "user_progress" and do {
+		if ($nusers == 1) {
+			$module = "${ipfx}::StudentProgress";
+			$args{statType} = "student"; # FIXME: fix URLPath -- i shouldn't have to type this!
+			$args{userID} = $firstUserID;
+		} else {
+			push @error, E_ONE_USER;
+		}
+	};
+	
+	defined param $r "set_progress" and do {
+		if ($nsets == 1) {
+			$module = "${ipfx}::StudentProgress";
+			$args{statType} = "set"; # FIXME: fix URLPath -- i shouldn't have to type this!
+			$args{setID} = $firstSetID;
+		} else {
+			push @error, E_ONE_SET;
+		}
+	};
+	
+	defined param $r "user_options" and do {
+		if ($nusers == 1) {
+			$module = "${pfx}::Options";
+			$params{effectiveUser} = $firstUserID;
+		} else {
+			push @error, E_ONE_USER;
+		}
+	};
+	
+	defined param $r "score_sets" and do {
+		if ($nsets >= 1) {
+			$module = "${ipfx}::Scoring";
+			$params{selectedSet} = \@selectedSetIDs;
+			$params{scoreSelected} = 1;
+		} else {
+			push @error, E_MIN_ONE_SET;
+		}
+	};
+	
+	defined param $r "assign_users" and do {
+		if ($nusers >= 1 and $nsets >= 1) {
+			$module = "${ipfx}::Assigner";
+			$params{selected_users} = \@selectedUserIDs;
+			$params{selected_sets} = \@selectedSetIDs;
+			$params{assign} = "Assign selected sets to selected users";
+		} else {
+			push @error, E_MIN_ONE_USER unless $nusers >= 1;
+			push @error, E_MIN_ONE_SET unless $nsets >= 1;
+		}
+	};
+	
+	defined param $r "act_as_user" and do {
+		if ($nusers == 1 and $nsets <= 1) {
+			if ($nsets) {
+				# unfortunately, we need to know what
+				#    type of set it is to figure out
+				#    the correct module
+				my $set = $db->getGlobalSet( $firstSetID );
+				if ( defined( $set ) &&
+				     $set->assignment_type =~ /gateway/ ) {
+					$module = "${pfx}::GatewayQuiz";
+				} else {
+					$module = "${pfx}::ProblemSet";
+				}
+				$args{setID} = $firstSetID;
+			} else {
+				$module = "${pfx}::ProblemSets";
+			}
+			$params{effectiveUser} = $firstUserID;
+		} else {
+			push @error, E_ONE_USER unless $nusers == 1;
+			push @error, E_MAX_ONE_SET unless $nsets <= 1;
+		}
+	};
+	
+	defined param $r "edit_set_for_users" and do {
+		if ($nusers >= 1 and $nsets == 1) {
+			$module = "${ipfx}::ProblemSetDetail";
+			$args{setID} = $firstSetID;
+			$params{editForUser} = \@selectedUserIDs;
+		} else {
+			push @error, E_MIN_ONE_USER unless $nusers >= 1;
+			push @error, E_ONE_SET unless $nsets == 1;
+			
+		}
+	};
+	
+	defined param $r "create_set" and do {
+	  my $setname = $r->param("new_set_name");
+	  if ($setname && $setname ne 'Name for new set here') {
+		if ($setname =~ /^[\w.-]*$/) {
+		$module = "${ipfx}::SetMaker";
+		$params{new_local_set} = "Create a New Set in this Course";
+		$params{new_set_name} = $setname;
+		$params{selfassign} = 1;
+		  } else {
+		push @error, E_BAD_NAME;
+		  }
+	  } else {
+		push @error, E_SET_NAME;
+	  }
 	};
-	defined($r->param('score-sets')) && do {
-		my $root            = $ce->{webworkURLs}->{root};
-		my $courseName      = $ce->{courseName};
-
-		my $uri="$root/$courseName/instructor/scoring/?scoreSelected=Score%20Selected&".$self->url_authen_args;
-		my @selectedSets    = $r->param('setList');
-		$uri .= "&selectedSet=$_" foreach (@selectedSets);
-		$r->header_out(Location => $uri);
-		$self->{noContent} =  1;  # forces redirect
-		return;
-	};	
-
-}
-# override contentGenerator header routine for now
-# FIXME
-sub header {
-	my $self = shift;
-	return REDIRECT if $self->{noContent};
-	my $r = $self->{r};
-	$r->content_type('text/html');
-	$r->send_http_header();
-	return OK;
-}
-sub initialize {
-	my ($self) = @_;
-	my $r = $self->{r};
-	my $db = $self->{db};
-	my $ce = $self->{ce};
-	my $authz = $self->{authz};
-	my $user = $r->param('user');
 
-	unless ($authz->hasPermissions($user, "modify_student_data")) {
-		$self->{submitError} = "You are not authorized to modify student data";
-		return;
-	}
+	defined param $r "add_users" and do {
+		$module = "${ipfx}::AddUsers";
+	};
 
-#############################################################################################
-#	gather database data
-#############################################################################################	
-	# FIXME  this might be better done in body? We don't always need all of this data. or do we?
-# Obtaining the list of users
-    $WeBWorK::timer->continue("Begin listing users") if defined $WeBWorK::timer;
-	my @userNames =  $db->listUsers; # checked
-	$WeBWorK::timer->continue("End listing users") if defined $WeBWorK::timer;
-	$WeBWorK::timer->continue("Begin obtaining users") if defined $WeBWorK::timer;
-	my @user_records = $db->getUsers(@userNames); # checked
-	$WeBWorK::timer->continue("End obtaining users: ".@user_records) if defined $WeBWorK::timer;
+	defined param $r "email_users" and do {
+		$module = "${ipfx}::SendMail";
+	};
 
-	# store data
-	$self->{ra_users}              =   \@userNames;
-	$self->{ra_user_records}       =   \@user_records;
+	defined param $r "transfer_files" and do {
+		$module = "${ipfx}::FileManager";
+	};
 
-# Obtaining list of sets:
-	$WeBWorK::timer->continue("Begin listing sets") if defined $WeBWorK::timer;
-	my @setNames =  $db->listGlobalSets();
-	$WeBWorK::timer->continue("End listing sets") if defined $WeBWorK::timer;
-	my @set_records = ();
-	$WeBWorK::timer->continue("Begin obtaining sets") if defined $WeBWorK::timer;
-	@set_records = $db->getGlobalSets( @setNames);
-	$WeBWorK::timer->continue("End obtaining sets: ".@set_records) if defined $WeBWorK::timer;
-# 	foreach my $name (@setNames) {
-# 	    my $set_record;
-# 		$set_record = $db->getMergedSet($user,$name,) ;
-# 		
-# 			#warn "Adding set $name", ref($set_record);
-# 			push @set_records, $set_record;
-# 	}
+	push @error, "You are not allowed to act as a student." 
+		if (defined param $r "act_as_user" and not $authz->hasPermissions($userID, "become_student"));
+	push @error, "You are not allowed to modify homework sets." 
+		if ((defined param $r "edit_sets" or defined param $r "edit_set_for_users") and not $authz->hasPermissions($userID, "modify_problem_sets"));
+	push @error, "You are not allowed to assign homework sets."
+		if ((defined param $r "sets_assigned_to_user" or defined param $r "users_assigned_to_set") and not $authz->hasPermissions($userID, "assign_problem_sets"));
+	push @error, "You are not allowed to modify student data."
+		if ((defined param $r "edit_users" or defined param $r "user_options" or defined param $r "user_options") and not $authz->hasPermissions($userID, "modify_student_data"));
+	push @error, "You are not allowed to score sets."
+		if (defined param $r "score_sets" and not $authz->hasPermissions($userID, "score_sets"));
 	
-
-	# store data
-	$self->{ra_sets}              =   \@setNames;
-	$self->{ra_set_records}       =   \@set_records;
-
-}
-sub path {
-	my $self          = shift;
-	my $args          = $_[-1];
-	
-	my $ce = $self->{ce};
-	my $root = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
-	return $self->pathMacro($args,
-		"Home"          => "$root",
-		$courseName     => "$root/$courseName",
-		'instructor'    => '',
-	);
-}
-
-sub title {
-	my $self = shift;
-	return "Instructor tools for ".$self->{ce}->{courseName};
+	# handle errors, redirect to target page
+	if (@error) {
+		$self->addbadmessage(CGI::p(join(CGI::br(),@error)));
+
+	} elsif ($module) {
+		my $page = $urlpath->newFromModule($module, $r, %args);
+		my $url = $self->systemLink($page, params => \%params);
+		$self->reply_with_redirect($url);
+	}
 }
 
 sub body {
-	my $self = shift;
-	my $r = $self->{r};
-	my $ce = $self->{ce};
-	my $db = $self->{db};
-	my $authz = $self->{authz};
-	my $courseName = $ce->{courseName};
-	my $authen_args = $self->url_authen_args();
-	my $user = $r->param('user');
-	my $prof_url = $ce->{webworkURLs}->{oldProf};
-	my $full_url = "$prof_url?course=$courseName&$authen_args";
-	my $userEditorURL = "users/?" . $self->url_args;
-	my $problemSetEditorURL = "sets/?" . $self->url_args;
-	my $statsURL       = "stats/?" . $self->url_args;
-	my $emailURL       = "send_mail/?" . $self->url_args;
-	################### debug code
-#     my $permissonLevel =  $self->{db}->getPermissionLevel($user)->permission();
-#     
-#     my $courseEnvironmentLevels = $self->{ce}->{permissionLevels};
-#     return CGI::em(" user $permissonLevel permlevels ".join("<>",%$courseEnvironmentLevels));
-    ################### debug code
-	return CGI::em('You are not authorized to access the Instructor tools.') unless $authz->hasPermissions($user, 'access_instructor_tools');
-	my $actionURL= $r->uri;
-	return join("", 
-		#defined($self->{current_action}) ? CGI::h4($self->{current_action}) :'' ,
-		#defined($self->{selected_users}) ? CGI::p($self->{selected_users}) : '',
-		#defined($self->{selected_sets}) ? CGI::p($self->{selected_sets}) : '',
-		CGI::a({href=>$full_url},"Link to WeBWorK 1.9 Instructor tools"),
-		CGI::start_form(-method=>"POST", -action=>$actionURL),"\n",
-		$self->hidden_authen_fields,"\n",
-		CGI::start_table({-border=>2,-cellpadding=>5}),	
-		CGI::Tr({ -align=>'center'},
-			CGI::td({colspan=>2},[
-					CGI::input({type=>'submit',value=>'Add students...',name=>'add-students'}),
-					CGI::input({type=>'submit',value=>'Send email...',name=>'send-email'}),
-				]
-			),
-
-		
-		),
-		CGI::Tr({ -align=>'center'},
-			CGI::td({colspan=>1},[
-					
-					CGI::input({type=>'submit',value=>'Reset password',name=>'reset-password'}),
-					CGI::input({type=>'submit',value=>'Assign passwords...',name=>'assign-passwords'}), 
-					CGI::input({type=>'submit',value=>'View set statistics...',name=>'set-stats'}),
-					CGI::input({type=>'submit',value=>'Edit set(s) dates...',name=>'edit-set-dates'})
-				]
-			)
-		
-		),
-		CGI::Tr({ -align=>'center'},
-			CGI::td({colspan=>1},[
-					CGI::input({type=>'submit',value=>'View student statistics...',name=>'student-stats'}),
-					CGI::input({type=>'submit',value=>'Edit class data for students...',name=>'edit-class-data'}),
-					CGI::input({type=>'submit',value=>'Edit set(s) data...',name=>'edit-sets'}),
-					CGI::input({type=>'submit',value=>'Score selected set(s)...',name=>'score-sets'}),
-				]
-			),
-		),
-
-		
-		CGI::Tr({ -align=>'center'},
-			CGI::td({colspan=>2},[
-					$self->popup_user_form,
-					$self->popup_set_form,
-				]
-			)
-		
-		),
-		CGI::Tr({ -align=>'center'},
-			CGI::td({colspan=>1},[
-					
-					CGI::input({type=>'submit',value=>'Edit student(s)/set(s) dates',name=>'student-dates'}),
-					CGI::input({type=>'submit',value=>'Act as student in set...',name=>'act-as-student'}),
-				]
-			),
-			CGI::td({colspan=>2}, 
-				CGI::input({type=>'submit',value=>'Edit student(s) data for selected set(s)...',name=>'edit-students-sets'}),
-				
-				
-			)
-		
-		),
+	my ($self) = @_;
+	my $r = $self->r;
+	my $db = $r->db;
+	my $ce = $r->ce;
+	my $authz = $r->authz;
+	my $courseName = $self->{courseName};
+	my $user = $r->param("user");
+	
+	return CGI::div({class=>"ResultsWithError"}, "You are not authorized to access the Instructor tools.")
+		unless $authz->hasPermissions($user, "access_instructor_tools");
+	
+	print CGI::p({},"Use the interface below to quickly access commonly-used
+	instructor tools, or select a tool from the list to the left.", CGI::br(),
+	"Select user(s) and/or set(s) below and click the action button
+	of your choice.");
+	
+	# DBFIXME shouldn't need to use list of IDs, use iterator for results, marks edits in WHERE clause
+	# the grep here prevents set-level proctors from being displayed here
+	my @userIDs = grep {$_ !~ /^set_id:/} $db->listUsers;
+	my @Users = $db->getUsers(@userIDs);
 
-		CGI::Tr({ -align=>'center'},
-			CGI::td({colspan=>2},[
-					CGI::input({type=>'submit',value=>'Drop student(s)',name=>'drop-students'}),
-					'&nbsp;'
-					]
-			),
-			
-		
-		),
+## Mark's Edits for filtering
+	my @myUsers;
+	
+	my (@viewable_sections,@viewable_recitations);
+	
+	if (defined @{$ce->{viewable_sections}->{$user}})
+		{@viewable_sections = @{$ce->{viewable_sections}->{$user}};}
+	if (defined @{$ce->{viewable_recitations}->{$user}})
+		{@viewable_recitations = @{$ce->{viewable_recitations}->{$user}};}
+
+	if (@viewable_sections or @viewable_recitations){
+		foreach my $student (@Users){
+			my $keep = 0;
+			foreach my $sec (@viewable_sections){
+				if ($student->section() eq $sec){$keep = 1;}
+			}
+			foreach my $rec (@viewable_recitations){
+				if ($student->recitation() eq $rec){$keep = 1;}
+			}
+			if ($keep) {push @myUsers, $student;}
+		}
+		@Users = @myUsers;
+	}
+## End Mark's Edits
 
-		CGI::end_table(),
-		CGI::end_form(),
-# 		CGI::hr(),
-# 		CGI::p( defined($self->{studentEntryReport}) ? $self->{studentEntryReport}:''
-# 		),
-# 		
-# 		$self->addStudentForm,
-	);
-}
-sub addStudentForm {
-	my $self = shift;
-	my $r = $self->{r};
-	
-	# Add a student form
-	join( "",
-		CGI::p("Add new students"),	
-		CGI::start_form({method=>"post", action=>$r->uri()}),
-		$self->hidden_authen_fields(),
-		CGI::start_table({border=>'1', cellpadding=>'2'}),
+	# DBFIXME shouldn't need to use list of IDs, use iterator for results
+	my @globalSetIDs = $db->listGlobalSets;
+	my @GlobalSets = $db->getGlobalSets(@globalSetIDs);
+	
+	my @selected_users = $r->param("selected_users");
+	my @selected_sets = $r->param("selected_sets");
+	
+	my $scrolling_user_list = scrollingRecordList({
+			name => "selected_users",
+			request => $r,
+			default_sort => "lnfn",
+			default_format => "lnfn_uid",
+			default_filters => ["all"],
+			size => 10,
+			multiple => 1,
+		}, @Users);
+	
+	my $scrolling_set_list = scrollingRecordList({
+		name => "selected_sets",
+		request => $r,
+		default_sort => "set_id",
+		default_format => "sid",
+		default_filters => ["all"],
+		size => 10,
+		multiple => 1,
+	}, @GlobalSets);
+	
+	print CGI::start_form({method=>"get", action=>$r->uri()});
+	print $self->hidden_authen_fields();
+	
+	print CGI::table({class=>"FormLayout"},
 		CGI::Tr({},
-			CGI::th({},
-				['Last Name', 'First Name', 'Student ID', 'Login Name', 'Email Address', 'Section','Recitation', 'Comment']
-			)
+			CGI::th("Users"),
+			CGI::th("Sets"),
 		),
 		CGI::Tr({},
-			CGI::td({},
-				[ CGI::input({name=>'last_name'}),
-				  CGI::input({name=>'first_name'}),
-				  CGI::input({name=>'student_id',size=>'16'}),
-				  CGI::input({name=>'new_user_id',size=>'10'}),
-				  CGI::input({name=>'email_address'}),
-				  CGI::input({name=>'section',size=>'10'}),
-				  CGI::input({name=>'recitation',size=>'10'}),
-				  CGI::input({name=>'comment'}),
-				
-				
-				]
+			CGI::td({style=>"width:50%"}, $scrolling_user_list),
+			CGI::td({style=>"width:50%"}, $scrolling_set_list),
+		),
+		CGI::Tr({class=>"ButtonRow"}, [
+			CGI::td([
+				CGI::submit(-name=>"sets_assigned_to_user", -label=>"View/edit")." all sets for one <b>user</b>(set dates, scores)",
+				CGI::submit(-name=>"users_assigned_to_set", -label=>"View/edit")." all users for one <b>set</b>",
+			]),
+			CGI::td([
+				CGI::submit(-name=>"edit_users", -label=>"Edit"). " class list data for selected <b>users</b>",
+				CGI::submit(-name=>"edit_sets", -label=>"Edit"). " one <b>set</b>" . "&nbsp; &nbsp; ".
+				"or &nbsp; ".CGI::submit(-name=>"prob_lib",-label=>"add problems")." to one <b>set</b>",
+			]),
+			CGI::td([
+				CGI::submit(-name=>"user_stats", -label=>"Statistics")." or ".
+				CGI::submit(-name=>"user_progress", -label=>"progress")." for one <b>user</b>",
+				CGI::submit(-name=>"set_stats", -label=>"Statistics")." or ".
+				CGI::submit(-name=>"set_progress", -label=>"progress")." for one <b>set</b>",
+			]),
+			CGI::td([
+				CGI::submit(-name=>"user_options", -label=>"Change password")." for one <b>user</b>",
+				CGI::submit(-name=>"score_sets", -label=>"Score"). " selected <b>sets</b>",
+			]),
+			CGI::td([
+				CGI::submit(-name=>"add_users", -label=>"Add")." new users",
+				CGI::submit(-name=>"create_set", -label=>"Create"). " new set: ".
+				   CGI::textfield(-name=>"new_set_name", 
+					   -default=>"Name for new set here",
+					   -override=>1, -size=>20),
+				]),
+		]),
+		CGI::Tr({class=>"ButtonRowCenter"},
+			CGI::td({-colspan=>2, align=>"center"},
+				CGI::table({-border=>0, align=>"center"},
+					CGI::Tr({-align=>"left"}, [
+						CGI::td({-height=>2}),
+						CGI::td(CGI::submit(-name=>"assign_users", -label=>"Assign")." selected <b>users</b> to selected <b>sets</b>"),
+						CGI::td(CGI::submit(-name=>"act_as_user", -label=>"Act as")." one <b>user</b> (on one <b>set</b>)"),
+						CGI::td(CGI::submit(-name=>"edit_set_for_users", -label=>"Edit"). " one <b>set</b> for  <b>users</b>"),
+						CGI::td({-height=>4}),
+						CGI::td(CGI::submit(-name=>"email_users", -label=>"Email"). " your students"),
+						($authz->hasPermissions($user, "manage_course_files")
+							? CGI::td(CGI::submit(-name=>"transfer_files", -label=>"Transfer"). " course files")
+							: ()
+						),
+					])
+				)
 			)
 		),
-		CGI::end_table(),
-		CGI::submit({name=>"addStudent", value=>"Add Student"}),
-		CGI::end_form(),
 	);
-
-
-
-
-
-
-}
-sub popup_user_form {
-	my $self  = shift;
-	my $r     = $self->{r};
-	my $authz = $self->{authz};
-	my $user = $r->param('user');
-	my $db = $self->{db};
-	my $ce = $self->{ce};
-	my $root = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
-
- #     return CGI::em("You are not authorized to access the Instructor tools.") unless $authz->hasPermissions($user, "access_instructor_tools");
-	
-	# This code will require changing if the permission and user tables ever have different keys.
-    my @users                 = ();
-	my $ra_user_records       = $self->{ra_user_records};
-	my %classlistLabels       = ();#  %$hr_classlistLabels;
-	my @user_records   = sort { ( lc($a->section) cmp lc($b->section) ) || 
-	                     ( lc($a->last_name) cmp lc($b->last_name ))  } @{$ra_user_records};
-	foreach my $ur (@{user_records}) {
-		$classlistLabels{$ur->user_id} = $ur->last_name. ', '. $ur->first_name.'   -   '.$ur->section.' '.$ur->user_id;
-		push(@users, $ur->user_id);
-	}
-	return 			CGI::popup_menu(-name=>'classList',
-							   -values=>\@users,
-							   -labels=>\%classlistLabels,
-							   -size  => 10,
-							   -multiple => 1,
-							   #-default=>$user
-					),
-
-
+	
+	print CGI::end_form();
+	
+	return "";
 }
-sub popup_set_form {
-	my $self  = shift;
-	my $r     = $self->{r};
-	my $authz = $self->{authz};
-	my $user = $r->param('user');
-	my $db = $self->{db};
-	my $ce = $self->{ce};
-	my $root = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
-
- #     return CGI::em("You are not authorized to access the Instructor tools.") unless $authz->hasPermissions($user, "access_instructor_tools");
-
-	# This code will require changing if the permission and user tables ever have different keys.
-    my @setNames              = ();
-	my $ra_set_records        = $self->{ra_set_records};
-	my %setLabels             = ();#  %$hr_classlistLabels;
-	my @set_records           =  sort {$a->set_id cmp $b->set_id } @{$ra_set_records};
-	foreach my $sr (@set_records) {
- 		$setLabels{$sr->set_id} = $sr->set_id;
- 		push(@setNames, $sr->set_id);  # reorder sets
-	}
- 	return 			CGI::popup_menu(-name=>'setList',
- 							   -values=>\@setNames,
- 							   -labels=>\%setLabels,
- 							   -size  => 10,
- 							   -multiple => 1,
- 							   #-default=>$user
- 					),
-
 
-}
 1;
 
 __END__
 
 =head1 AUTHOR
 
-Written by Dennis Lambe Jr., malsyned (at) math.rochester.edu
+Written by Dennis Lambe Jr., malsyned (at) math.rochester.edu.
 
 =cut
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/Index2.pm b/lib/WeBWorK/ContentGenerator/Instructor/Index2.pm
deleted file mode 100644
index 5f003fffc3..0000000000
--- a/lib/WeBWorK/ContentGenerator/Instructor/Index2.pm
+++ /dev/null
@@ -1,536 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
-# 
-# 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
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-# 
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-package WeBWorK::ContentGenerator::Instructor::Index2;
-use base qw(WeBWorK::ContentGenerator::Instructor);
-
-=head1 NAME
-
-WeBWorK::ContentGenerator::Instructor::Index - Menu interface to the Instructor pages
-
-=cut
-
-use strict;
-use warnings;
-use Apache::Constants qw(:common REDIRECT DONE);
-use CGI qw();
-sub pre_header_initialize {
-	my ($self, $setName, $problemNumber) = @_;
-	my $r                    = $self->{r};
-	my $ce                   = $self->{ce};
-	my $db                   = $self->{db};
-	my $authz                = $self->{authz};
-	my $userName             = $r->param('user');
-	my $effectiveUserName    = $r->param('effectiveUser');
-	my $key                  = $r->param('key');
-	my $user                 = $db->getUser($userName);
-	my $effectiveUser        = $db->getUser($effectiveUserName);
-	my $permissionLevel      = $db->getPermissionLevel($userName)->permission();
-	unless ($authz->hasPermissions($userName, "modify_student_data")) {
-		$self->{submitError} = "You are not authorized to modify student data";
-		return;
-	}
-	my @submit_actions = qw(student-dates act-as-student edit-set-dates reset-password assign-passwords 
-	                        set-stats drop-students edit-students-sets edit-sets student-stats edit-class-data
-	                        add-students send-email);
-	foreach my $act (@submit_actions) {
-		$self->{current_action } .=  "The action &lt;$act&gt; &quot;". $r->param($act) . "&quot; was requested" 
-		if defined($r->param($act));
-	}
-	$self->{selected_sets}   = "Set(s) chosen: "      . join(" ", $r->param("setList"));
-	$self->{selected_users}  = "Student(s) chosen: "  .join(" ", $r->param("classList")) ;
-#   Redirect actions
-    defined($r->param('student-dates')) && do {
-    #FIXME  will only do one student and one set at a time
-    # it would be good to be able to do many sets for many student
-    # this would require a separate module
-     	my $root            = $ce->{webworkURLs}->{root};
-		my $courseName      = $ce->{courseName};
-		my @userList        = $r->param("classList");
-		# can only become the first user listed.
-		my $student     = shift @userList;
-		my @setList        = $r->param("setList");
-		# can only become the first user listed.
-		my $setName         = shift @setList;
-		my $uri="$root/$courseName/instructor/sets/$setName/?editForUser=$student&".$self->url_authen_args;
-		warn "redirect to $uri";
-		$r->header_out(Location => $uri);
-		$self->{noContent} =  1;  # forces redirect
-		return;
-    };
-	defined($r->param('act-as-student')) && do {
-		# fix url and redirect
-		my @userList        = $r->param("classList");
-		# can only become the first user listed.
-		my $effectiveUser   = shift @userList;
-		my @setList         = $r->param("setList");
-		my $setName         =  shift @setList;
-		my $root            = $ce->{webworkURLs}->{root};
-		my $courseName      = $ce->{courseName};
-
-		my $uri="$root/$courseName/$setName/?effectiveUser=$effectiveUser&".$self->url_authen_args;
-		#FIXME  does the display mode need to be defined?
-		#FIXME  url_authen_args also includes an effective user, so the new one must come first.
-		# even that might not work with every browser since there are two effective User assignments.
-		$r->header_out(Location => $uri);
-		$self->{noContent} =  1;  # forces redirect
-		return;
-	};
-	defined($r->param('edit-set-dates')) && do {
-	#FIXME  this should be replaced by redirecting to a module where you can edit
-	# dates for several sets at once
-     	my $root            = $ce->{webworkURLs}->{root};
-		my $courseName      = $ce->{courseName};
-		my @setList        = $r->param("setList");
-		# can only become the first user listed.
-		my $setName         = shift @setList;
-		my $uri="$root/$courseName/instructor/sets/$setName/?".$self->url_authen_args;
-		warn "redirect to $uri";
-		$r->header_out(Location => $uri);
-		$self->{noContent} =  1;  # forces redirect
-		return;
-    };
-    defined($r->param('reset-password')) && do {
-    # FIXME this should allow me to assign studentID to a number of students
-    # requires a new module
-		my @userList        = $r->param("classList");
-		# can only become the first user listed.
-		my $effectiveUser   = shift @userList;
-		my @setList         = $r->param("setList");
-		my $setName         =  shift @setList;
-		my $root            = $ce->{webworkURLs}->{root};
-		my $courseName      = $ce->{courseName};
-
-		my $uri="$root/$courseName/options/?effectiveUser=$effectiveUser&".$self->url_authen_args;
-		#FIXME  does the display mode need to be defined?
-		#FIXME  url_authen_args also includes an effective user, so the new one must come first.
-		# even that might not work with every browser since there are two effective User assignments.
-		$r->header_out(Location => $uri);
-		$self->{noContent} =  1;  # forces redirect
-		return;
-    };
-    defined($r->param('assign-passwords')) && do {
-  		my @userList        = $r->param("classList");
-		# can only become the first user listed.
-		my $effectiveUser   = shift @userList;
-		my @setList         = $r->param("setList");
-		my $setName         =  shift @setList;
-		my $root            = $ce->{webworkURLs}->{root};
-		my $courseName      = $ce->{courseName};
-
-		my $uri="$root/$courseName/options/?effectiveUser=$effectiveUser&".$self->url_authen_args;
-		#FIXME  does the display mode need to be defined?
-		#FIXME  url_authen_args also includes an effective user, so the new one must come first.
-		# even that might not work with every browser since there are two effective User assignments.
-		$r->header_out(Location => $uri);
-		$self->{noContent} =  1;  # forces redirect
-		return;
-    };
-    defined($r->param('set-stats')) && do {
-     	my $root            = $ce->{webworkURLs}->{root};
-		my $courseName      = $ce->{courseName};
-		my @setList        = $r->param("setList");
-		# can only become the first user listed.
-		my $setName         = shift @setList;
-		my $uri="$root/$courseName/instructor/stats/set/$setName?".$self->url_authen_args;
-		warn "redirect to $uri";
-		$r->header_out(Location => $uri);
-		$self->{noContent} =  1;  # forces redirect
-		return;
-    };
-    defined($r->param('drop-students')) && do {
-    #FIXME  this operation should be made faster
-    	my $root            = $ce->{webworkURLs}->{root};
-		my $courseName      = $ce->{courseName};
-		my @setList        = $r->param("setList");
-		# can only become the first user listed.
-		my $setName         = shift @setList;
-		my $uri="$root/$courseName/instructor/users/?".$self->url_authen_args;
-		warn "redirect to $uri";
-		$r->header_out(Location => $uri);
-		$self->{noContent} =  1;  # forces redirect
-		return;
-    };
-    defined($r->param('edit-students-sets')) && do {
-      	my $root            = $ce->{webworkURLs}->{root};
-		my $courseName      = $ce->{courseName};
-		my @userList        = $r->param("classList");
-		# can only become the first user listed.
-		my $student     = shift @userList;
-		my @setList        = $r->param("setList");
-		# can only become the first user listed.
-		my $setName         = shift @setList;
-		my $uri="$root/$courseName/instructor/sets/$setName/?editForUser=$student&".$self->url_authen_args;
-		warn "redirect to $uri";
-		$r->header_out(Location => $uri);
-		$self->{noContent} =  1;  # forces redirect
-		return;
-    };
-    defined($r->param('edit-sets')) && do {
-    	my $root            = $ce->{webworkURLs}->{root};
-		my $courseName      = $ce->{courseName};
-		my @setList        = $r->param("setList");
-		# can only become the first user listed.
-		my $setName         = shift @setList;
-		my $uri="$root/$courseName/instructor/sets/$setName/?".$self->url_authen_args;
-		warn "redirect to $uri";
-		$r->header_out(Location => $uri);
-		$self->{noContent} =  1;  # forces redirect
-		return;
-    };
-    defined($r->param('student-stats')) && do {
-    	my $root            = $ce->{webworkURLs}->{root};
-		my $courseName      = $ce->{courseName};
-		my @userList        = $r->param("classList");
-		# can only become the first user listed.
-		my $studentName     = shift @userList;
-		my $uri="$root/$courseName/instructor/stats/student/$studentName?".$self->url_authen_args;
-		warn "redirect to $uri";
-		$r->header_out(Location => $uri);
-		$self->{noContent} =  1;  # forces redirect
-		return;
-    };
-    defined($r->param('edit-class-data')) && do {
-    	my $root            = $ce->{webworkURLs}->{root};
-		my $courseName      = $ce->{courseName};
-		my @setList        = $r->param("setList");
-		# can only become the first user listed.
-		my $setName         = shift @setList;
-		my $uri="$root/$courseName/instructor/users/?".$self->url_authen_args;
-		warn "redirect to $uri";
-		$r->header_out(Location => $uri);
-		$self->{noContent} =  1;  # forces redirect
-		return;
-    };
-    defined($r->param('add-students')) && do {
-		my $root            = $ce->{webworkURLs}->{root};
-		my $courseName      = $ce->{courseName};
-
-		my $uri="$root/$courseName/instructor/?".$self->url_authen_args;
-		$r->header_out(Location => $uri);
-		$self->{noContent} =  1;  # forces redirect
-		return;
-	};
-	defined($r->param('send-email')) && do {
-		my $root            = $ce->{webworkURLs}->{root};
-		my $courseName      = $ce->{courseName};
-
-		my $uri="$root/$courseName/instructor/send_mail/?".$self->url_authen_args;
-		$r->header_out(Location => $uri);
-		$self->{noContent} =  1;  # forces redirect
-		return;
-	};
-	
-	
-		
-# 		unless (substr($current_uri,-1) eq '/') {
-# 		$r->header_out(Location => "$current_uri/" . ($args ? "?$args" : ""));
-# 		return REDIRECT;
-# 		# *** any post data gets lost here -- fix that.
-# 		# (actually, it's not a problem, since all URLs generated
-# 		# from within the system have trailing slashes, and we don't  
-# 		# need POST data from outside the system anyway!)
-# 	}
-
-}
-# override contentGenerator header routine for now
-# FIXME
-sub header {
-	my $self = shift;
-	return REDIRECT if $self->{noContent};
-	my $r = $self->{r};
-	$r->content_type('text/html');
-	$r->send_http_header();
-	return OK;
-}
-sub initialize {
-	my ($self) = @_;
-	my $r = $self->{r};
-	my $db = $self->{db};
-	my $ce = $self->{ce};
-	my $authz = $self->{authz};
-	my $user = $r->param('user');
-
-	unless ($authz->hasPermissions($user, "modify_student_data")) {
-		$self->{submitError} = "You are not authorized to modify student data";
-		return;
-	}
-
-#############################################################################################
-#	gather database data
-#############################################################################################	
-	# FIXME  this might be better done in body? We don't always need all of this data. or do we?
-# Obtaining the list of users
-	my @userNames =  $db->listUsers;
-	my @user_records = $db->getUsers(@userNames);
-
-	# store data
-	$self->{ra_users}              =   \@userNames;
-	$self->{ra_user_records}       =   \@user_records;
-
-# Obtaining list of sets:
-	my @setNames =  $db->listGlobalSets();
-	my @set_records = ();
-	@set_records = $db->getMergedSets(map {[$user,$_]} @setNames);
-# 	foreach my $name (@setNames) {
-# 	    my $set_record;
-# 		$set_record = $db->getMergedSet($user,$name,) ;
-# 		
-# 			#warn "Adding set $name", ref($set_record);
-# 			push @set_records, $set_record;
-# 	}
-	
-
-	# store data
-	$self->{ra_sets}              =   \@setNames;
-	$self->{ra_set_records}       =   \@set_records;
-
-}
-sub path {
-	my $self          = shift;
-	my $args          = $_[-1];
-	
-	my $ce = $self->{ce};
-	my $root = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
-	return $self->pathMacro($args,
-		"Home"          => "$root",
-		$courseName     => "$root/$courseName",
-		'instructor'    => '',
-	);
-}
-
-sub title {
-	my $self = shift;
-	return "Instructor tools for ".$self->{ce}->{courseName};
-}
-
-sub body {
-	my $self = shift;
-	my $r = $self->{r};
-	my $ce = $self->{ce};
-	my $db = $self->{db};
-	my $authz = $self->{authz};
-	my $courseName = $ce->{courseName};
-	my $authen_args = $self->url_authen_args();
-	my $user = $r->param('user');
-	my $prof_url = $ce->{webworkURLs}->{oldProf};
-	my $full_url = "$prof_url?course=$courseName&$authen_args";
-	my $userEditorURL = "users/?" . $self->url_args;
-	my $problemSetEditorURL = "sets/?" . $self->url_args;
-	my $statsURL       = "stats/?" . $self->url_args;
-	my $emailURL       = "send_mail/?" . $self->url_args;
-	################### debug code
-#     my $permissonLevel =  $self->{db}->getPermissionLevel($user)->permission();
-#     
-#     my $courseEnvironmentLevels = $self->{ce}->{permissionLevels};
-#     return CGI::em(" user $permissonLevel permlevels ".join("<>",%$courseEnvironmentLevels));
-    ################### debug code
-	return CGI::em('You are not authorized to access the Instructor tools.') unless $authz->hasPermissions($user, 'access_instructor_tools');
-	my $actionURL= $r->uri;
-	return join("", 
-		#defined($self->{current_action}) ? CGI::h4($self->{current_action}) :'' ,
-		#defined($self->{selected_users}) ? CGI::p($self->{selected_users}) : '',
-		#defined($self->{selected_sets}) ? CGI::p($self->{selected_sets}) : '',
-		CGI::a({href=>$prof_url},"Link to WeBWorK 1.9 Instructor tools")
-		CGI::start_form(-method=>"POST", -action=>$actionURL),"\n",
-		$self->hidden_authen_fields,"\n",
-		CGI::start_table({-border=>2,-cellpadding=>5}),	
-		CGI::Tr({ -align=>'center'},
-			CGI::td({colspan=>2},[
-					CGI::input({type=>'submit',value=>'Add students...',name=>'add-students'}),
-					CGI::input({type=>'submit',value=>'Send email...',name=>'send-email'}),
-				]
-			),
-
-		
-		),
-		CGI::Tr({ -align=>'center'},
-			CGI::td({colspan=>1},[
-					
-					CGI::input({type=>'submit',value=>'Reset password',name=>'reset-password'}),
-					CGI::input({type=>'submit',value=>'Assign passwords...',name=>'assign-passwords'}), 
-					CGI::input({type=>'submit',value=>'View set statistics...',name=>'set-stats'}),
-					CGI::input({type=>'submit',value=>'Edit set(s) dates...',name=>'edit-set-dates'})
-				]
-			)
-		
-		),
-		CGI::Tr({ -align=>'center'},
-			CGI::td({colspan=>1},[
-					CGI::input({type=>'submit',value=>'View student statistics...',name=>'student-stats'}),
-					CGI::input({type=>'submit',value=>'Edit class data for students...',name=>'edit-class-data'}),
-					CGI::input({type=>'submit',value=>'Edit set(s) data...',name=>'edit-sets'}),
-					'&nbsp;'
-				]
-			),
-		),
-
-		
-		CGI::Tr({ -align=>'center'},
-			CGI::td({colspan=>2},[
-					$self->popup_user_form,
-					$self->popup_set_form,
-				]
-			)
-		
-		),
-		CGI::Tr({ -align=>'center'},
-			CGI::td({colspan=>1},[
-					
-					CGI::input({type=>'submit',value=>'Edit student(s)/set(s) dates',name=>'student-dates'}),
-					CGI::input({type=>'submit',value=>'Act as student in set...',name=>'act-as-student'}),
-				]
-			),
-			CGI::td({colspan=>2}, 
-				CGI::input({type=>'submit',value=>'Edit student(s) data for set(s)...',name=>'edit-students-sets'}),
-				
-			)
-		
-		),
-
-		CGI::Tr({ -align=>'center'},
-			CGI::td({colspan=>2},[
-					CGI::input({type=>'submit',value=>'Drop student(s)',name=>'drop-students'}),
-					'&nbsp;'
-					]
-			),
-			
-		
-		),
-
-		CGI::end_table(),
-		CGI::end_form(),
-# 		CGI::hr(),
-# 		CGI::p( defined($self->{studentEntryReport}) ? $self->{studentEntryReport}:''
-# 		),
-# 		
-# 		$self->addStudentForm,
-	);
-}
-sub addStudentForm {
-	my $self = shift;
-	my $r = $self->{r};
-	
-	# Add a student form
-	join( "",
-		CGI::p("Add new students"),	
-		CGI::start_form({method=>"post", action=>$r->uri()}),
-		$self->hidden_authen_fields(),
-		CGI::start_table({border=>'1', cellpadding=>'2'}),
-		CGI::Tr({},
-			CGI::th({},
-				['Last Name', 'First Name', 'Student ID', 'Login Name', 'Email Address', 'Section','Recitation', 'Comment']
-			)
-		),
-		CGI::Tr({},
-			CGI::td({},
-				[ CGI::input({name=>'last_name'}),
-				  CGI::input({name=>'first_name'}),
-				  CGI::input({name=>'student_id',size=>'16'}),
-				  CGI::input({name=>'new_user_id',size=>'10'}),
-				  CGI::input({name=>'email_address'}),
-				  CGI::input({name=>'section',size=>'10'}),
-				  CGI::input({name=>'recitation',size=>'10'}),
-				  CGI::input({name=>'comment'}),
-				
-				
-				]
-			)
-		),
-		CGI::end_table(),
-		CGI::submit({name=>"addStudent", value=>"Add Student"}),
-		CGI::end_form(),
-	);
-
-
-
-
-
-
-}
-sub popup_user_form {
-	my $self  = shift;
-	my $r     = $self->{r};
-	my $authz = $self->{authz};
-	my $user = $r->param('user');
-	my $db = $self->{db};
-	my $ce = $self->{ce};
-	my $root = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
-
- #     return CGI::em("You are not authorized to access the Instructor tools.") unless $authz->hasPermissions($user, "access_instructor_tools");
-	
-	# This code will require changing if the permission and user tables ever have different keys.
-    my @users                 = ();
-	my $ra_user_records       = $self->{ra_user_records};
-	my %classlistLabels       = ();#  %$hr_classlistLabels;
-	my @user_records   = sort { ( lc($a->section) cmp lc($b->section) ) || 
-	                     ( lc($a->last_name) cmp lc($b->last_name ))  } @{$ra_user_records};
-	foreach my $ur (@{user_records}) {
-		$classlistLabels{$ur->user_id} = $ur->last_name. ', '. $ur->first_name.'   -   '.$ur->section.' '.$ur->user_id;
-		push(@users, $ur->user_id);
-	}
-	return 			CGI::popup_menu(-name=>'classList',
-							   -values=>\@users,
-							   -labels=>\%classlistLabels,
-							   -size  => 10,
-							   -multiple => 1,
-							   -default=>$user
-					),
-
-
-}
-sub popup_set_form {
-	my $self  = shift;
-	my $r     = $self->{r};
-	my $authz = $self->{authz};
-	my $user = $r->param('user');
-	my $db = $self->{db};
-	my $ce = $self->{ce};
-	my $root = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
-
- #     return CGI::em("You are not authorized to access the Instructor tools.") unless $authz->hasPermissions($user, "access_instructor_tools");
-
-	# This code will require changing if the permission and user tables ever have different keys.
-    my @setNames              = ();
-	my $ra_set_records        = $self->{ra_set_records};
-	my %setLabels             = ();#  %$hr_classlistLabels;
-	my @set_records           =  sort {$a->set_id cmp $b->set_id } @{$ra_set_records};
-	foreach my $sr (@set_records) {
- 		$setLabels{$sr->set_id} = $sr->set_id;
- 		push(@setNames, $sr->set_id);  # reorder sets
-	}
- 	return 			CGI::popup_menu(-name=>'setList',
- 							   -values=>\@setNames,
- 							   -labels=>\%setLabels,
- 							   -size  => 10,
- 							   -multiple => 1,
- 							   #-default=>$user
- 					),
-
-
-}
-1;
-
-__END__
-
-=head1 AUTHOR
-
-Written by Dennis Lambe Jr., malsyned (at) math.rochester.edu
-
-=cut
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm b/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm
index dca4353b96..1350de64ef 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader: webwork-modperl/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm,v 1.21 2003/12/09 01:12:31 sh002i Exp $
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm,v 1.99 2010/05/18 18:39:40 apizer 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
@@ -15,346 +15,1943 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator::Instructor::PGProblemEditor;
+use base qw(WeBWorK);
 use base qw(WeBWorK::ContentGenerator::Instructor);
+use base qw(WeBWorK::ContentGenerator::renderViaXMLRPC);
 
+use constant DEFAULT_SEED => 123456;  
 
 =head1 NAME
 
-WeBWorK::ContentGenerator::Instructor::ProblemSetEditor - Edit a set definition list
+WeBWorK::ContentGenerator::Instructor::PGProblemEditor - Edit a pg file
 
 =cut
 
 use strict;
 use warnings;
-use CGI qw();
-use WeBWorK::Utils qw(readFile);
-use Apache::Constants qw(:common REDIRECT);
+#use CGI qw(-nosticky );
+use WeBWorK::CGI;
+use WeBWorK::Utils qw(readFile surePathToFile path_is_subdir);
+use HTML::Entities;
+use URI::Escape;
+use WeBWorK::Utils qw(has_aux_files not_blank);
+use File::Copy;
+use WeBWorK::Utils::Tasks qw(fake_user fake_set renderProblems);
+use Data::Dumper;
+use Fcntl;
 
 
-our $libraryName;
-our $rowheight;
 
-sub title {
-	my $self = shift;
-	#FIXME  don't need the entire path  ??
-	return "Instructor Tools - PG Problem Editor ";
-}
-sub go {
-	my $self 			= shift;
-	my ($setName, $problemNumber) = @_;
-	my $r 				= 	$self->{r};
-	my $ce				=	$self->{ce};
-	my $submit_button 	= $r->param('submit');  # obtain submit command from form
-
-	# various actions depending on state.
-	if (     defined($submit_button) and ($submit_button eq 'Save' or $submit_button eq 'Refresh')    ) {
-	
-		$self->initialize($setName,$problemNumber);  # write the necessary files
-													 # return file path for viewing problem
-													 # in $self->{currentSourceFilePath}
-		#redirect to view the problem
+###########################################################
+# This editor will edit problem files or set header files or files, such as course_info
+# whose name is defined in the global.conf database
+#
+# Only files under the template directory ( or linked to this location) can be edited.
+#
+# The course information and problems are located in the course templates directory.
+# Course information has the name  defined by courseFiles->{course_info}
+# 
+# Only files under the template directory ( or linked to this location) can be edited.
+#
+# editMode = temporaryFile    (view the temp file defined by course_info.txt.user_name.tmp
+#                              instead of the file course_info.txt)
+#            this flag is read by Problem.pm and ProblemSet.pm, perhaps others
+# The TEMPFILESUFFIX is "user_name.tmp" by default.  It's definition should be moved to Instructor.pm #FIXME                              
+###########################################################
+
+###########################################################
+# The behavior of this module is essentially defined 
+# by the values of $file_type and the submit button which is placed in $action
+#############################################################
+#  File types which can be edited
+#
+#  file_type  eq 'problem'
+#                 this is the most common type -- this editor can be called by an instructor when viewing any problem.
+#                 the information for retrieving the source file is found using the problemID in order to look
+#                 look up the source file path.
+#
+#  file_type  eq 'source_path_for_problem_file'
+#                 This is the same as the 'problem' file type except that the source for the problem is found in
+#                 the parameter $r->param('sourceFilePath').  This path is relative to the templates directory
+#
+#  file_type  eq 'set_header'
+#                 This is a special case of editing the problem.  The set header is often listed as problem 0 in the set's list of problems.
+#
+#  file_type  eq 'hardcopy_header'
+#                  This is a special case of editing the problem.  The hardcopy_header is often listed as problem 0 in the set's list of problems.
+#                  But it is used instead of set_header when producing a hardcopy of the problem set in the TeX format, instead of producing HTML
+#                  formatted version for use on the computer screen.
+#
+#  file_type eq 'course_info'
+#                 This allows editing of the course_info.txt file which gives general information about the course.  It is called from the
+#                 ProblemSets.pm module.
+#
+#  file_type eq 'options_info'
+#                 This allows editing of the options_info.txt file which gives general information about the course.  It is called from the
+#                 Options.pm module.
+#
+#  file_type  eq 'blank_problem'
+#                 This is a special call which allows one to create and edit a new PG problem.  The "stationery" source for this problem is
+#                 stored in the conf/snippets directory and defined in global.conf by $webworkFiles{screenSnippets}{blankProblem}
+#############################################################
+# Requested actions  -- these and the file_type determine the state of the module
+#      Save                       ---- action = save
+#      Save as                    ---- action = save_as
+#      View Problem               ---- action = view
+#      Add this problem to:       ---- action = add_problem 
+#      Make this set header for:  ---- action = add_problem
+#      Revert                     ---- action = revert
+#      no submit button defined   ---- action = fresh_edit
+###################################################
+# 
+# Determining which is the correct path to the file is a mess!!! FIXME
+# The path to the file to be edited is eventually put in tempFilePath
+#
+#  (tempFilePath)(editFilePath)(forcedSourceFile)
+#input parameter is:  sourceFilePath
+#################################################################
+# params read
+# user
+# effectiveUser
+# submit
+# file_type
+# problemSeed
+# displayMode
+# edit_level
+# make_local_copy
+# sourceFilePath
+# problemContents
+# save_to_new_file
+# 
+
+use constant ACTION_FORMS => [qw(view add_problem save save_as  revert)]; 
+#[qw(view save save_as revert add_problem add_header make_local_copy)];
+
+# permissions needed to perform a given action
+use constant FORM_PERMS => {
+		view => "modify_student_data",
+		add_problem => "modify_student_data",
+		make_local_copy => "modify_student_data",
+		save => "modify_student_data",
+		save_as => "modify_student_data",
+#		rename  => "modify_student_data",
+		revert => "modify_student_data",
+};
+
+our $BLANKPROBLEM = 'blankProblem.pg';
+# use constant BLANKPROBLEM => 'blankProblem.pg';  # doesn't work because this constant needs to be used inside a match.
+sub pre_header_initialize {
+	my ($self)         = @_;
+	my $r              = $self->r;
+	my $ce             = $r->ce;
+	my $urlpath        = $r->urlpath;
+	my $authz          = $r->authz;
+	my $user           = $r->param('user');
+	$self->{courseID}   = $urlpath->arg("courseID");
+	$self->{setID}      = $r->urlpath->arg("setID") ;  # using $r->urlpath->arg("setID")  ||'' causes trouble with set 0!!!
+	$self->{problemID}  = $r->urlpath->arg("problemID");
+
+	# parse setID, which may come in with version data
+	
+	my $fullSetID = $self->{setID};
+	if (defined($fullSetID) ) {
 		
-		my $hostname 		= 	$r->hostname();
-		my $port     		= 	$r->get_server_port();
-		my $uri		 		= 	$r->uri;
-		my $courseName		=	$self->{ce}->{courseName};
-		my $problemSeed		= 	($r->param('problemSeed')) ? $r->param('problemSeed') : '';
-		my $displayMode		=	($r->param('displayMode')) ? $r->param('displayMode') : '';
-        my $viewURL         =   '';
-        if ($self->{file_type} eq 'problem') {
-        	# redirect to have problem read by Problem.pm
-			$viewURL  		= 	"http://$hostname:$port";
-			$viewURL		   .= 	$ce->{webworkURLs}->{root}."/$courseName/$setName/$problemNumber/?";
-			$viewURL		   .=	$self->url_authen_args;
-			$viewURL		   .=   "&displayMode=$displayMode&problemSeed=$problemSeed";   # optional displayMode and problemSeed overrides
-			if ($submit_button eq 'Save') {
-				$viewURL		   .=	"&editMode=savedFile";
-			} else {		
-				$viewURL		   .=	"&editMode=temporaryFile";
-			}
-			$viewURL		   .=	'&sourceFilePath='. $self->{currentSourceFilePath}; # path to pg text for viewing
-			                                                                            # allows Problem.pg to recognize state
-	                                                                                    # of problem being viewed.
-	    } elsif ($self->{file_type} eq 'set_header') {
-	    	# redirect set headers to ProblemList page
-	    	$viewURL  		= 	"http://$hostname:$port";
-			$viewURL		   .= 	$ce->{webworkURLs}->{root}."/$courseName/$setName/?";
-			$viewURL		   .=	$self->url_authen_args;
-			$viewURL		   .=   "&displayMode=$displayMode&problemSeed=$problemSeed";   # optional displayMode and problemSeed overrides
-			if ($submit_button eq 'Save') {
-				$viewURL		   .=	"&editMode=savedFile";
-			}
+		if ( $fullSetID =~ /,v(\d+)$/ ) {
+			$self->{versionID} = $1;
+			$self->{setID} =~ s/,v\d+$//;
 		}
-		$r->header_out(Location => $viewURL );
-		return REDIRECT;
-	} else {
-		# initialize and 
-		# display the editing window
-		
-		$self->SUPER::go(@_);
+		$self->{fullSetID} = $fullSetID;
 	}
+	my $submit_button   = $r->param('submit');  # obtain submit command from form
+	my $actionID        = $r->param('action');
+	my $file_type       = $r->param("file_type") || '';
+	my $setName         = $self->{setID};
+	my $versionedSetName = $self->{fullSetID};
+	my $problemNumber   = $self->{problemID};
 
-}
+	# Check permissions
+	return unless ($authz->hasPermissions($user, "access_instructor_tools"));
+	return unless ($authz->hasPermissions($user, "modify_problem_sets"));
 
-sub initialize {
-	
-	my ($self, $setName, $problemNumber) = @_;
-	my $ce 						= 	$self->{ce};
-	my $r						=	$self->{r};
-	my $path_info 				= 	$r->path_info || "";
-	my $db						=	$self->{db};
-	my $user					=	$r->param('user');
-	my $effectiveUserName		=	$r->param('effectiveUser');
-	my $courseName				=	$ce->{courseName};
-
-	
-	# Find URL for viewing problem
-	
-	# find path to pg file for the problem
-	
-	my $templateDirectory		=	$ce->{courseDirs}->{templates};
-	my $problemPath             =   $templateDirectory;
-	my $problem_record          =   undef;
-		# FIXME  there is a discrepancy in the way that the problems are found.
-		# FIXME  more error checking is needed in case the problem doesn't exist.
-	if (defined($problemNumber) and $problemNumber) {
-		$problem_record		=	$db->getMergedProblem($effectiveUserName, $setName, $problemNumber); # checked
-		# If there is no global_user defined problem, (i.e. the sets haven't been assigned yet), 
-		# look for a global version of the problem.
-		$problem_record			=	$db->getGlobalProblem($setName, $problemNumber) unless defined($problem_record); # checked
-		# bail if no problem is found
-		die "Cannot find a problem record for set $setName / problem $problemNumber" 
-			unless defined($problem_record);
-		$problemPath           .=   '/'.$problem_record->source_file;
-		$self->{file_type}      =   'problem';
-	} elsif (defined($problemNumber) and $problemNumber==0) { # we are editing a header file
-		my $set_record          =   $db->getMergedSet($effectiveUserName, $setName); # checked
-		die "Cannot find a set record for set $setName" unless defined($set_record);	
-		$problemPath           .=   '/'.$set_record->set_header;
-		$self->{file_type}      =   'set_header';
+ 	##############################################################################
+	# displayMode   and problemSeed
+	#
+	# Determine the display mode
+	# If $self->{problemSeed} was obtained within saveFileChanges from the problem_record
+	# then it can be overridden by the value obtained from the form.
+	# Insure that $self->{problemSeed} has some non-empty value
+	# displayMode and problemSeed 
+	# will be needed for viewing the problem via redirect.
+	# They are also two of the parameters which can be set by the editor
+	##############################################################################
+	
+	if (defined $r->param('displayMode')) {
+		$self->{displayMode} = $r->param('displayMode');
+	} else {
+		$self->{displayMode} = $ce->{pg}->{options}->{displayMode};
 	}
 	
-	my $editFileSuffix			=	$user.'.tmp';
-	my $submit_button			= 	$r->param('submit');
+	# form version of problemSeed overrides version obtained from the the problem_record
+	# inside saveFileChanges
+	$self->{problemSeed} = $r->param('problemSeed') if (defined $r->param('problemSeed'));	
+	# Make sure that the problem seed has some value
+	$self->{problemSeed} = DEFAULT_SEED() unless not_blank($self->{problemSeed});
+	
+	##############################################################################
+    #############################################################################
+	# Save file to permanent or temporary file, then redirect for viewing
+	#############################################################################
+	#
+	#  Any file "saved as" should be assigned to "Undefined_Set" and redirectoed to be viewed again in the editor
+	#
+	#  Problems "saved" or 'refreshed' are to be redirected to the Problem.pm module
+	#  Set headers which are "saved" are to be redirected to the ProblemSet.pm page
+	#  Hardcopy headers which are "saved" are also to be redirected to the ProblemSet.pm page
+	#  Course_info files are redirected to the ProblemSets.pm page
+	#  Options_info files are redirected to the Options.pm page
+	##############################################################################
+	
 
-	my $displayMode	  			= 	( defined($r->param('displayMode')) 	) ? $r->param('displayMode') : $ce->{pg}->{options}->{displayMode};
-	# try to get problem seed from the input parameter, or from the problem record
-	my $problemSeed;
-	if ( defined($r->param('problemSeed'))	) {
-		$problemSeed            =   $r->param('problemSeed');	
-	} elsif (defined($problem_record) and  $problem_record->can('problem_seed')) {
-		$problemSeed            =   $problem_record->problem_seed;
+
+	######################################
+    # Insure that file_type is defined
+	######################################
+	# We have already read in the file_type parameter from the form
+	#
+	# If this has not been defined we are  dealing with a set header
+	# or regular problem
+	if ( not_blank($file_type) ) { #file_type is defined and is not blank
+		# file type is already defined -- do nothing
+		#warn "file type already defined as $file_type"  #FIXME debug
+	} else {
+	    # if "sourceFilePath" is defined in the form, then we are getting the path directly.
+		# if the problem number is defined and is 0
+		# then we are dealing with some kind of 
+		# header file.  The default is 'set_header' which prints properly
+		# to the screen.
+		# If the problem number is not zero, we are dealing with a real problem
+		######################################
+		if ( not_blank($r->param('sourceFilePath') )  ) {
+			$file_type ='source_path_for_problem_file';
+			$file_type = 'set_header' if $r->param('sourceFilePath') =~ m!/headers/|Header\.pg$!; #FIXME this need to be cleaned up
+		} elsif ( defined($problemNumber) ) {
+			 if ( $problemNumber =~/^\d+$/ and $problemNumber == 0 ) {  # if problem number is numeric and zero
+                $file_type = 'set_header' unless  $file_type eq 'set_header' 
+                                               or $file_type eq 'hardcopy_header';                                    
+             } else {
+             	$file_type = 'problem';    
+             	#warn "setting file type to 'problem'\n";  #FIXME debug
+             }
+			           
+		}
 	}
-	# make absolutely sure that the problem seed is defined, if it hasn't been.
-	$problemSeed				=	'123456' unless defined($problemSeed) and $problemSeed =~/\S/;
+	die "The file_type variable |$file_type| has not been defined or is blank." unless not_blank($file_type);
+	# clean up sourceFilePath, just in case
+	# double check that sourceFilePath is relative to the templates file
+	if ($file_type eq 'source_path_for_problem_file' ) {	
+		my $templatesDirectory = $ce->{courseDirs}->{templates};
+		my $sourceFilePath = $r->param('sourceFilePath');
+		$sourceFilePath =~ s/$templatesDirectory//;
+		$sourceFilePath =~ s|^/||;  # remove intial /
+		$self->{sourceFilePath} = $sourceFilePath;	
+	}
+	$self->{file_type} = $file_type;
+	# $self->addgoodmessage("file type is $file_type");  #FIXME debug
+	# warn "file type is $file_type\n parameter is ".$self->r->param("file_type");
+	##########################################
+	# File type is one of:     blank_problem course_info options_info problem set_header hardcopy_header source_path_for_problem_file  
+    ##########################################
+    #
+    # Determine the path to the file
+    #
+    ###########################################
+    	$self->getFilePaths($versionedSetName, $problemNumber, $file_type);
+    	#defines $self->{editFilePath}   # path to the permanent file to be edited
+    	#        $self->{tempFilePath}   # path to the permanent file to be edited  has .tmp suffix
+    	#        $self->{inputFilePath}  # path to the file for input, (might be a .tmp file)
+    	
+    	
+    	
+    ##########################################
+    # Default problem contents
+    ##########################################
+    $self->{r_problemContents}= undef;
+    
+    ##########################################
+    #
+    # Determine action
+    #
+    ###########################################
+
+ 	if ($actionID) {
+ 		unless (grep { $_ eq $actionID } @{ ACTION_FORMS() } ) {
+ 			die "Action $actionID not found";
+ 		}
+ 		# Check permissions
+ 		if (not FORM_PERMS()->{$actionID} or $authz->hasPermissions($user, FORM_PERMS()->{$actionID})) {
+ 			my $actionHandler = "${actionID}_handler";
+ 			my %genericParams =();
+# 			foreach my $param (qw(selected_users)) {
+# 				$genericParams{$param} = [ $r->param($param) ];
+#			}
+ 			my %actionParams = $self->getActionParams($actionID);
+ 			my %tableParams = (); # $self->getTableParams();
+ 			$self->{action}= $actionID;
+ 			$self->$actionHandler(\%genericParams, \%actionParams, \%tableParams);
+ 		} else {
+ 			$self->addbadmessage( "You are not authorized to perform this action.");
+ 		}
+ 	} else {
+ 		$self->{action}='fresh_edit';
+ 		my $actionHandler = "fresh_edit_handler";
+ 		my %genericParams;
+ 		my %actionParams = (); #$self->getActionParams($actionID);
+ 		my %tableParams = (); # $self->getTableParams();
+		my $problemContents = '';
+		$self->{r_problemContents}=\$problemContents;
+ 		$self->$actionHandler(\%genericParams, \%actionParams, \%tableParams);
+ 	}
+ 
 	
-	my $problemContents	= '';
-	my $currentSourceFilePath	=	'';
-	my $editErrors = '';	
+	##############################################################################
+	# displayMode   and problemSeed
+	#
+	# Determine the display mode
+	# If $self->{problemSeed} was obtained within saveFileChanges from the problem_record
+	# then it can be overridden by the value obtained from the form.
+	# Insure that $self->{problemSeed} has some non-empty value
+	# displayMode and problemSeed 
+	# will be needed for viewing the problem via redirect.
+	# They are also two of the parameters which can be set by the editor
+	##############################################################################
 	
-	# update the .pg and .pg.tmp files in the directory
-	# if a .tmp file already exists use that, unless the revert button has been pressed.
-	# These .tmp files are
-	# removed when the file is finally saved.
-	my $inputFilePath           =  (-r "$problemPath.$editFileSuffix")?"$problemPath.$editFileSuffix" : $problemPath;
-	$inputFilePath              =   $problemPath  if defined($submit_button) and $submit_button eq 'Revert';
-	
-	if (not defined($submit_button) or $submit_button eq 'Revert' ) {
-		# this is a fresh editing job
-		# copy the pg file to a new file with the same name with .tmp added
-		# store this name in the $self->currentSourceFilePath for use in body 
-		eval { $problemContents			=	WeBWorK::Utils::readFile($inputFilePath)    };  
-		# try to read file
-		$problemContents = $@ if $@;
-		$editErrors .= $problemContents;
-		$currentSourceFilePath			=	"$problemPath.$editFileSuffix"; 
-		$self->{currentSourceFilePath}	=	$currentSourceFilePath; 
-	} elsif ($submit_button	eq 'Refresh' ) {
-		# grab the problemContents from the form in order to save it to the tmp file
-		# store tmp file name in the $self->currentSourceFilePath for use in body 
-		
-		$problemContents				=	$r->param('problemContents');
-		$currentSourceFilePath			=	"$problemPath.$editFileSuffix";	
-		$self->{currentSourceFilePath}	=	$currentSourceFilePath;
-	} elsif ($submit_button eq 'Save') {
-		# grab the problemContents from the form in order to save it to the permanent file
-		# later we will unlink (delete) the temporary file
-	 	# store permanent file name in the $self->currentSourceFilePath for use in body 
-		
-		$problemContents				=	$r->param('problemContents');
-		$currentSourceFilePath			=	"$problemPath"; 		
-		$self->{currentSourceFilePath}	=	$currentSourceFilePath;	
+	if (defined $r->param('displayMode')) {
+		$self->{displayMode} = $r->param('displayMode');
 	} else {
-		# give a warning
-		die "Unrecognized submit command $submit_button";
+		$self->{displayMode} = $ce->{pg}->{options}->{displayMode};
 	}
 	
-	# Handle the problem of line endings.  Make sure that all of the line endings.  Convert \r\n to \n
-	$problemContents    =~    s/\r\n/\n/g;
-	$problemContents    =~    s/\r/\n/g;
-	
-	# print changed pg files
-	# FIXME  make sure that the permissions are set correctly!!!
-	# Make sure that the warning is being transmitted properly.
+	# form version of problemSeed overrides version obtained from the the problem_record
+	# inside saveFileChanges
+	$self->{problemSeed} = $r->param('problemSeed') if (defined $r->param('problemSeed'));	
+	# Make sure that the problem seed has some value
+	$self->{problemSeed} = DEFAULT_SEED() unless not_blank( $self->{problemSeed});
 	
-	eval {
-		local *OUTPUTFILE;
-		open OUTPUTFILE, ">", $currentSourceFilePath
-				or die "Failed to write to $currentSourceFilePath.  
-				It is likely that the permissions in the template directory have not been set correctly.".
-				"The web server must be able to create and write to files in the directory containing the problem. 
-				$!";
-		print OUTPUTFILE $problemContents;
-		close OUTPUTFILE;
-	};
-	# record an error string for later use if there was a difficulty in writing to the file
-	# FIXME is this string every inspected?
-	
-	my $openTempFileErrors = $@ if $@;
-	
-	if (  $openTempFileErrors)   {
-	    
-		$self->{openTempFileErrors}	= "Unable to write to $currentSourceFilePath: $openTempFileErrors";
-		#diagnose errors:
-		warn "Editing errors: $openTempFileErrors\n";
-		warn "The file $currentSourceFilePath exists. \n " if -e $currentSourceFilePath; #FIXME 
-		warn "The file $currentSourceFilePath cannot be found. \n " unless -e $currentSourceFilePath;
-		warn "The file $currentSourceFilePath does not have write permissions. \n"
-		                 if -e $currentSourceFilePath and not -w $currentSourceFilePath;
-		
-		
-		
-	} else {	
-		# unlink the temporary file if there are no errors and the save button has been pushed
-	    
-		$self->{openTempFileErrors}	=	'';
-		unlink("$problemPath.$editFileSuffix") if defined($submit_button) and $submit_button eq 'Save';		
-	};
+	##############################################################################
+	# Return 
+	#   If  file saving fails or 
+	#   if no redirects are required. No further processing takes place in this subroutine.
+	#   Redirects are required only for the following submit values
+	#        'Save'
+	#        'Save as'
+	#        'Refresh'
+	#        add problem to set
+	#        add set header to set
+	# 
+    #########################################
+    
+    return if $self->{failure};
+    # FIXME: even with an error we still open a new page because of the target specified in the form
 	
-		
-	# return values for use in the body subroutine
-	$self->{problemPath}              =   $problemPath;
-	$self->{inputFilePath}            =   $inputFilePath;
-	$self->{displayMode}              =   $displayMode;
-	$self->{problemSeed}              =   $problemSeed;
-	$self->{r_problemContents}        =   \$problemContents;
-	# FIXME  there is no way to edit in a temporary file -- all editing takes place on disk!!!
 
+	# Some cases do not need a redirect: save, refresh, save_as, add_problem_to_set, add_header_to_set,make_local_copy
+	my $action = $self->{action};
+    return ;
+
+}
+
+
+sub initialize  {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $authz = $r->authz;
+	my $user = $r->param('user');
 	
+	# Check permissions
+	return unless ($authz->hasPermissions($user, "access_instructor_tools"));
+	return unless ($authz->hasPermissions($user, "modify_problem_sets"));
+	
+	my $file_type       = $r->param('file_type') || "";
+	my $tempFilePath    = $self->{tempFilePath}; # path to the file currently being worked with (might be a .tmp file)
+	my $inputFilePath   = $self->{inputFilePath};   # path to the file for input, (might be a .tmp file)
+	
+	$self->addmessage($r->param('status_message') ||'');  # record status messages carried over if this is a redirect
+	$self->addbadmessage("Changes in this file have not yet been permanently saved.") if -r $tempFilePath;
+	if ( not( -e $inputFilePath) ) {
+		$self->addbadmessage("The file '".$self->shortPath($inputFilePath)."' cannot be found.");
+	} elsif ((not -w $inputFilePath) && $file_type ne 'blank_problem' ) {
+
+		$self->addbadmessage("The file '".$self->shortPath($inputFilePath)."' is protected! ".CGI::br().
+		"To edit this text you must first make a copy of this file using the 'Save as' action below.");
+
+	}
+    if ($inputFilePath =~/$BLANKPROBLEM$/ && $file_type ne 'blank_problem') {
+#    	$self->addbadmessage("This file '$inputFilePath' is a blank problem! ".CGI::br()."To edit this text you must  
+    	$self->addbadmessage("The file '".$self->shortPath($inputFilePath)."' is a blank problem! ".CGI::br()."To edit this text you must  
+                           use the 'Save AS' action below to save it to another file.");
+    }
 	
 }
 
 sub path {
-	my $self          = shift;
-	my $set_id        = shift;
-	my $problem_id    = shift;
-	my $args          = $_[-1];
-	
-	my $ce = $self->{ce};
-	my $root = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
-	return $self->pathMacro($args,
-		"Home"          => "$root",
-		$courseName     => "$root/$courseName",
-		'instructor'    => "$root/$courseName/instructor",
-		'sets'          => "$root/$courseName/instructor/sets/",
-		"$set_id"       => "$root/$courseName/instructor/sets/$set_id/",
-		"problems"      => "$root/$courseName/instructor/sets/$set_id/problems",
-		"$problem_id"   => ''
+	my ($self, $args) = @_;
+	my $r = $self->r;
+	my $urlpath = $r->urlpath;
+	my $courseName  = $urlpath->arg("courseID");
+	my $setName = $r->urlpath->arg("setID") || '';
+	my $problemNumber = $r->urlpath->arg("problemID") || '';
+
+	# we need to build a path to the problem being edited by hand, since it is not the same as the urlpath
+	# For this page the bread crum path leads back to the problem being edited, not to the Instructor tool.
+	my @path = ( 'WeBWork', $r->location,
+	          "$courseName", $r->location."/$courseName",
+	          "$setName",    $r->location."/$courseName/$setName",
+	          "$problemNumber", $r->location."/$courseName/$setName/$problemNumber",
+	          "Editor", ""
 	);
+	
+	#print "\n<!-- BEGIN " . __PACKAGE__ . "::path -->\n";
+	print $self->pathMacro($args, @path);
+	#print "<!-- END " . __PACKAGE__ . "::path -->\n";
+	
+	return "";
 }
-sub body {
+sub title {
 	my $self = shift;
+	my $r = $self->r;
+	my $courseName    = $r->urlpath->arg("courseID");
+	my $setID         = $r->urlpath->arg("setID");
+	my $problemNumber = $r->urlpath->arg("problemID");
+	my $file_type = $self->{'file_type'} || '';
+
+	return "Set Header for  set $setID" if ($file_type eq 'set_header');
+	return "Hardcopy Header for set $setID" if ($file_type eq 'hardcopy_header');
+	return "Course Information for course $courseName" if ($file_type eq 'course_info');
+	return "Options Information" if ($file_type eq 'options_info');
+
+	return 'Problem ' . $r->{urlpath}->name;
+}
+
+sub body {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $db = $r->db;
+	my $ce = $r->ce;
+	my $authz = $r->authz;
+	my $user = $r->param('user');
+	my $make_local_copy = $r->param('make_local_copy');
+ 
+	# Check permissions
+	return CGI::div({class=>"ResultsWithError"}, "You are not authorized to access the Instructor tools.")
+		unless $authz->hasPermissions($user, "access_instructor_tools");
 	
-	# test area
-	my $r       =   $self->{r};
-	my $db      =   $self->{db};
-	my $ce      =   $self->{ce};
-	my $user    =   $r->param('user');
+	return CGI::div({class=>"ResultsWithError"}, "You are not authorized to modify problems.")
+		unless $authz->hasPermissions($user, "modify_student_data");
+
 	
 	
 	
-	################
 	# Gathering info
-	# What is needed
-	#     $problemPath  -- 
-	#     $formURL -- given by $r->uri
-	#     $tmpProblemPath 
-	my $problemPath 	         =   $self->{problemPath};
-	my $inputFilePath            =   $self->{inputFilePath};
-	
-	
+	my $editFilePath    = $self->{editFilePath}; # path to the permanent file to be edited
+	my $tempFilePath    = $self->{tempFilePath}; # path to the file currently being worked with (might be a .tmp file)
+	my $inputFilePath   = $self->{inputFilePath};   # path to the file for input, (might be a .tmp file)
+	my $setName         = $self->{setID} ;
+	my $problemNumber   = $self->{problemID} ;
+    $setName            = defined($setName) ? $setName : '';  # we need this instead of using the || construction 
+                                                              # to keep set 0 from being set to the 
+                                                              # empty string.
+	my $fullSetName = defined( $self->{fullSetID} ) ? $self->{fullSetID} : $setName;
+	$problemNumber      = defined($problemNumber) ? $problemNumber : '';
+    
+    
+    
+	#########################################################################    
+    # Construct url for reporting bugs:
+	#########################################################################
 
+	my $libraryName = '';
+	if ($editFilePath =~ m|([^/]*)Library|)   {  #find the path to the file
+		# find the library, if any exists in the path name (first library is picked)
+		my $tempLibraryName = $1;
+		$libraryName = ( not_blank($tempLibraryName) ) ? 
+		                $tempLibraryName : "Library"; 
+		# things that start /Library/setFoo/probBar  are labeled as component "Library"
+		# which refers to the SQL based problem library. (is nationalLibrary a better name?)
+	} else {
+		$libraryName = 'Library';  # make sure there is some default component defined.
+	}
+
+    my $BUGZILLA = "$ce->{webworkURLs}{bugReporter}?product=Problem%20libraries".
+                   "&component=$libraryName&bug_file_loc=${editFilePath}_with_problemSeed=".$self->{problemSeed};
+	#FIXME  # The construction of this URL is somewhat fragile.  A separate module could be devoted to 
+	# intelligent bug reporting.
 	
+	#########################################################################    
+    # Construct reference row for PGproblemEditor.
+	#########################################################################
 	
-
-	my $header = CGI::i("Editing problem:  $inputFilePath");
-
+       my @PG_Editor_Reference_Links = (
+   		{label 		=>	'Problem Techniques'	,
+   		 url 		=>  'http://webwork.maa.org/wiki/Category:Problem_Techniques' 	,
+   		 target     =>	'techniques_window'	,
+   		 tooltip 	=>	'Snippets of PG code illustrating specific techniques'	,
+   		},
+   		{label 		=>	'Math Objects'	,
+   		 url 		=>   'http://webwork.maa.org/wiki/Category:MathObjects'  	,
+   		 target		=>	'math_objects'	,
+   		 tooltip 	=>	'Wiki summary page for MathObjects'	,
+   		},   		
+   		{label 		=>	'POD'	,
+   		 url 		=>  'http://webwork.maa.org/pod/pg_TRUNK/'  	,
+   		 target		=>	'pod_docs'	,
+   		 tooltip 	=>	'Documentation from source code for PG modules and macro files. Often the most up-to-date information.'	,
+   		},
+   		{label 		=>	'PGLab'	,
+   		 url 		=>  'http://hosted2.webwork.rochester.edu/webwork2/wikiExamples/MathObjectsLabs2/2/?login_practice_user=true'  	,
+   		 target		=>	'PGLab'	,
+   		 tooltip 	=>	'Test snippets of PG code in interactive lab.  Good way to learn PG language.'	,
+   		},
+   		{label 		=>	'PGML'	,
+   		 url 		=>  'https://courses.webwork.maa.org/webwork2/cervone_course/PGML/1/?login_practice_user=true',
+   		 target		=>	'PGML'	,
+   		 tooltip 	=>	'PG mark down syntax used to format WeBWorK questions. This interactive lab can help you to learn the techniques.'	,
+   		},
+   		{label 		=>	'Author Info'	,
+   		 url 		=>  'http://webwork.maa.org/wiki/Category:Authors'  	,
+   		 target		=>	'author_info'	,
+   		 tooltip 	=>	'Top level of author information on the wiki.'	,
+   		},
+   		{label 		=>	'report bugs in this problem'	,
+   		 url 		=>  $BUGZILLA  	,
+   		 target		=>	'bug_report'	,
+   		 tooltip 	=>	'Report bugs in a WeBWorK question/problem using this link. <br/> The very first time you do this you will need to register with an email address so that information on the bug fix can be reported back to you.'	,
+   		},
+   
+   
+   
+   );
+   my $PG_Editor_Reference_String = '';
+   foreach my $link (@PG_Editor_Reference_Links) {
+   		$PG_Editor_Reference_String .= ' | '. 
+   	       CGI::a({-href=>$link->{url} ,-target=> $link->{target},
+   	       -onmouseover=>q!Tip('! .  $link->{tooltip} . 
+   	       				    q!',SHADOW, true, 
+		                    DELAY, 100, FADEIN, 300, FADEOUT, 300, STICKY, 0, OFFSETX, -20,  CLICKCLOSE, true, 
+		                    BGCOLOR, '#F4FF91', TITLE, 'Reference:',TITLEBGCOLOR, '#F4FF91', TITLEFONTCOLOR, '#000000')!
+		        },
+		'&nbsp;'.$link->{label}.'&nbsp;');   
+   }
+   $PG_Editor_Reference_String .=' | ';
 	#########################################################################
 	# Find the text for the problem, either in the tmp file, if it exists
 	# or in the original file in the template directory
+	# or in the problem contents gathered in the initialization phase.
 	#########################################################################
+	
 	my $problemContents = ${$self->{r_problemContents}};
 
-#	eval { $problemContents	=	WeBWorK::Utils::readFile($problemPath)  };  # try to read file
-#	$problemContents = $@ if $@;
+	unless ( $problemContents =~/\S/)   { # non-empty contents
+		if (-r $tempFilePath and not -d $tempFilePath) {
+			die "tempFilePath is unsafe!" unless path_is_subdir($tempFilePath, $ce->{courseDirs}->{templates}, 1); # 1==path can be relative to dir
+			eval { $problemContents = WeBWorK::Utils::readFile($tempFilePath) };
+			$problemContents = $@ if $@;
+			$inputFilePath = $tempFilePath;
+		} elsif  (-r $editFilePath and not -d $editFilePath) {
+			die "editFilePath is unsafe!" unless path_is_subdir($editFilePath, $ce->{courseDirs}->{templates}, 1)  # 1==path can be relative to dir
+				|| $editFilePath eq $ce->{webworkFiles}{screenSnippets}{setHeader}
+				|| $editFilePath eq $ce->{webworkFiles}{hardcopySnippets}{setHeader}
+				|| $editFilePath eq $ce->{webworkFiles}{screenSnippets}{blankProblem};
+			eval { $problemContents = WeBWorK::Utils::readFile($editFilePath) };
+			$problemContents = $@ if $@;
+			$inputFilePath = $editFilePath;
+		} else { # file not existing is not an error
+		    #warn "No file exists";
+			$problemContents = '';
+		}
+	} else {
+		#warn "obtaining input from r_problemContents";
+	}
+
+	my $protected_file = not -w $inputFilePath;
+
+	my $file_type = $self->{file_type};
+	my %titles = (
+		problem         => CGI::b("set $fullSetName/problem $problemNumber"),
+		blank_problem   => "blank problem",
+		set_header      => "header file",
+		hardcopy_header => "hardcopy header file",
+		course_info     => "course information",
+		options_info    => "options information",
+		''              => 'Unknown file type',
+		source_path_for_problem_file => " unassigned problem file:  ".CGI::b("set $setName/problem $problemNumber"),
+	);
+	my $header = CGI::i("Editing $titles{$file_type} in file '".$self->shortPath($inputFilePath)."'");
+	$header = ($self->isTempEditFilePath($inputFilePath)  ) ? CGI::div({class=>'temporaryFile'},$header) : $header;  # use colors if temporary file
 	
-			
-			
 	#########################################################################
 	# Format the page
 	#########################################################################
+	
 	# Define parameters for textarea
 	# FIXME 
 	# Should the seed be set from some particular user instance??
-	# The mode list should be obtained from global.conf ultimately
-	my $rows 		= 	20;
-	my $columns		= 	80;
-	my $mode_list 	= 	['plainText','formattedText','images'];
-	my $displayMode	= 	$self->{displayMode};
-	my $problemSeed	=	$self->{problemSeed};	
-	my $uri			=	$r->uri;
-	########################################################################
-	# Define a link to view the problem
-	#FIXME
+	my $rows            = 20;
+	my $columns         = 80;
+	my $mode_list       = $ce->{pg}->{displayModes};
+	my $displayMode     = $self->{displayMode};
+	my $problemSeed     = $self->{problemSeed};	
+	my $uri             = $r->uri;
+	my $edit_level      = $r->param('edit_level') || 0;
 	
-	#########################################################################
+	my $force_field = (not_blank( $self->{sourceFilePath}) ) ? # path is  a non-blank string
+		CGI::hidden(-name=>'sourceFilePath',
+		            -default=>$self->{sourceFilePath}) : '';
 
+	# FIXME this isn't used at all! --sam
+	my @allSetNames = sort $db->listGlobalSets;
+	for (my $j=0; $j<scalar(@allSetNames); $j++) {
+		$allSetNames[$j] =~ s|^set||;
+		$allSetNames[$j] =~ s|\.def||;
+	}
+	my $target = 'WW_View'; #"problem$edit_level"; # increasing edit_level gives you a new window with each edit.
+	my $site_url = $ce->{webworkURLs}->{htdocs};
+	print qq!<script type="text/javascript" src="$site_url/js/wz_tooltip.js"></script>!;
+	print CGI::script(<<EOF);
+ 		function setTarget(inWindow) {
+		  document.getElementById("newWindow").checked = inWindow;
+		  updateTarget();
+		}
+		function updateTarget() {
+		  var inWindow = document.getElementById("newWindow").checked;
+		  document.getElementById("editor").target = (inWindow? "WW_View": "");
+		}
+		function setRadio(i,nw) {
+		  document.getElementById('action'+i).checked = true;
+		  setTarget(nw);
+		}
+EOF
 	
-	warn "Errors in the problem ".CGI::br().$self->{editErrors} if $self->{editErrors};
 
-			   
-	return CGI::p($header),
-		#CGI::start_form("POST",$r->uri,-target=>'_problem'),  doesn't pass on the target parameter???
-		qq!<form method="POST" action="$uri" enctype="application/x-www-form-urlencoded", target="_problem">!,
+   
+	print CGI::p($header),
+
+		CGI::start_form({method=>"POST", id=>"editor", name=>"editor", action=>"$uri", enctype=>"application/x-www-form-urlencoded"}),
+
 		$self->hidden_authen_fields,
+		$force_field,
 		CGI::hidden(-name=>'file_type',-default=>$self->{file_type}),
-		CGI::div(
-		'Seed: ',
-		CGI::textfield(-name=>'problemSeed',-value=>$problemSeed),
-		'Mode: ',
-		CGI::popup_menu(-name=>'displayMode', -'values'=>$mode_list,
-													 -default=>$displayMode),
-		CGI::a(
-			{-href=>'http://webwork.math.rochester.edu/docs/docs/pglanguage/manpages/',-target=>"manpage_window"},
-			'Manpages',
-			)
-		),
+		CGI::div({},$PG_Editor_Reference_String),
+# 			CGI::a({-href=>'http://webwork.math.rochester.edu/docs/docs/pglanguage/manpages/',-target=>"manpage_window"},
+# 				'&nbsp;Manpages&nbsp;',
+# 			)," | ",
+# 			CGI::a({-href=>'http://devel.webwork.rochester.edu/twiki/bin/view/Webwork/PGmacrosByFile',-target=>"manpage_window"},
+# 				'&nbsp;macro list&nbsp;',
+# 			)," | ",
+# 			CGI::a({-href=>'http://webwork.maa.org/wiki/Category:Authors',-target=>"wiki_window"},
+# 				'&nbsp;authoring&nbsp;info&nbsp;&amp; help&nbsp;',
+# 			)," | ",
+# 			CGI::a({-href=>'http://hosted2.webwork.rochester.edu/webwork2/wikiExamples/MathObjectsLabs2/2/?login_practice_user=true',-target=>"lab_window",
+# 			     },
+# 				'&nbsp;testing&nbsp;lab&nbsp;'
+# 			)," | ",
+# 			CGI::a({-href=>'http://devel.webwork.rochester.edu/doc/cvs/pg_HEAD/',-target=>"doc_window"},
+# 				'&nbsp;pod docs&nbsp;',
+# 			)," | ",
+# 			CGI::a({-href=>$BUGZILLA,-target=>"bugs_window"},
+# 				'&nbsp;report problem bugs&nbsp;',
+# 			)," | ",
+# 		),
 		CGI::p(
-			CGI::textarea(-name => 'problemContents', -default => $problemContents,
-						  -rows => $rows, -columns => $columns, -override => 1,
+			CGI::textarea(
+				-name => 'problemContents', -default => $problemContents,
+				-rows => $rows, -cols => $columns, -override => 1,
 			),
-		),
-		CGI::p(
-			( ($self->{file_type} eq 'problem') ? CGI::submit(-value=>'Refresh',-name=>'submit') : ''   ),
-			CGI::submit(-value=>'Save',-name=>'submit'),
-			CGI::submit(-value=>'Revert',-name=>'submit'),
-		),	
-		CGI::end_form(),
+		);
 
 
+	
+######### print action forms
+		
+			print CGI::start_table({});
+			#print CGI::Tr({}, CGI::td({-colspan=>2}, "Select an action to perform:"));
+			
+			my @formsToShow = @{ ACTION_FORMS() };
+			my $default_choice = $formsToShow[0];
+			my $i = 0;
+			foreach my $actionID (@formsToShow) {
+				# Check permissions
+				#next if FORM_PERMS()->{$actionID} and not $authz->hasPermissions($user, FORM_PERMS()->{$actionID});
+				my $actionForm = "${actionID}_form";
+				my $newWindow = ($actionID =~ m/^(view|add_problem|save)$/)? 1: 0;
+				my $onChange = "setRadio($i,$newWindow)";
+				my %actionParams = $self->getActionParams($actionID);
+				my $line_contents = $self->$actionForm($onChange, %actionParams);
+				my $radio_params = {-type=>"radio", -name=>"action", -value=>$actionID};
+				$radio_params->{checked}=1 if ($actionID eq $default_choice) ;
+				$radio_params->{onclick} = "setTarget($newWindow)";
+				$radio_params->{id} = "action$i";
+				print CGI::Tr({-valign=>"top"},
+					CGI::td({}, CGI::input($radio_params)),
+					CGI::td({}, $line_contents)
+				) if $line_contents;
+				
+				$i++;
+			}
+			my $checkbox = CGI::input({-type=>"checkbox", -id=>"newWindow", -checked=>"checked",
+						   -onchange=>"updateTarget()"});
+			$checkbox =~ s/\n//; # remove unwanted linebreak
+			print CGI::Tr({}, CGI::td({-colspan=>2}, "Select above then:",
+			                  CGI::submit(-name=>'submit', -value=>"Take Action!"),
+						CGI::script("document.write('$checkbox in another window')")));
+			print CGI::end_table();	
+	
+	
+	print  CGI::end_form();
+
+	print CGI::script("updateTarget()");
+	return "";
+
+
+}
+
+#
+#  Convert long paths to [TMPL], etc.
+#
+sub shortPath {
+  my $self = shift; my $file = shift;
+  my $tmpl = $self->r->ce->{courseDirs}{templates};
+  my $root = $self->r->ce->{courseDirs}{root};
+  my $ww = $self->r->ce->{webworkDirs}{root};
+  $file =~ s|^$tmpl|[TMPL]|; $file =~ s|^$root|[COURSE]|; $file =~ s|^$ww|[WW]|;
+  return $file;
 }
 
+################################################################################
+# Utilities
+################################################################################
+
+sub getRelativeSourceFilePath {
+	my ($self, $sourceFilePath) = @_;
+	
+	my $templatesDir = $self->r->ce->{courseDirs}->{templates};
+	$sourceFilePath =~ s|^$templatesDir/*||; # remove templates path and any slashes that follow
+	
+	return $sourceFilePath;
+}
+
+# determineLocalFilePath   constructs a local file path parallel to a library file path
+
+# 
+sub determineLocalFilePath {
+	my $self= shift;				die "determineLocalFilePath is a method" unless ref($self);
+	my $path = shift;
+ 	my $default_screen_header_path   = $self->r->ce->{webworkFiles}->{hardcopySnippets}->{setHeader}; 
+ 	my $default_hardcopy_header_path = $self->r->ce->{webworkFiles}->{screenSnippets}->{setHeader};
+	my $setID = $self->{setID};
+	$setID = int(rand(1000)) unless $setID =~/\S/;  # setID can be 0
+	if ($path =~ /Library/) {
+		#$path =~ s|^.*?Library/||;  # truncate the url up to a segment such as ...rochesterLibrary/.......
+		$path  =~ s|^.*?Library/|local/|;  # truncate the url up to a segment such as ...rochesterLibrary/....... and prepend local
+ 	} elsif ($path eq $default_screen_header_path) {
+ 		$path = "set$setID/setHeader.pg";
+ 	} elsif ($path eq $default_hardcopy_header_path) {
+ 		$path = "set$setID/hardcopyHeader.tex";
+	} else { # if its not in a library we'll just save it locally
+		$path = "new_problem_".int(rand(1000)).".pg";	#l hope there aren't any collisions.
+	}
+    $path;
+
+}
+
+sub determineTempEditFilePath {  # this does not create the directories in the path to the file
+                                 # it  returns an absolute path to the file
+	my $self = shift;  die "determineTempEditFilePath is a method" unless ref($self);
+	my $path =shift;    # this should be an absolute path to the file
+	my $user = $self->r->param("user");
+	$user    = int(rand(1000)) unless defined $user;
+	my $setID = $self->{setID} || int(rand(1000));
+	my $courseDirectory = $self->r->ce->{courseDirs};
+	###############
+	# Calculate the location of the temporary file
+	###############
+	my $templatesDirectory           = $courseDirectory->{templates};
+	my $blank_file_path              = $self->r->ce->{webworkFiles}->{screenSnippets}->{blankProblem};
+	my $default_screen_header_path   = $self->r->ce->{webworkFiles}->{hardcopySnippets}->{setHeader}; 
+	my $default_hardcopy_header_path = $self->r->ce->{webworkFiles}->{screenSnippets}->{setHeader};
+	my $tmpEditFileDirectory = $self->getTempEditFileDirectory();
+	$self->addbadmessage("The path to the original file should be absolute") unless $path =~m|^/|;  # debug
+	if ($path =~/^$tmpEditFileDirectory/) {
+		$self->addbadmessage("Error: This path is already in the temporary edit directory -- no new temporary file is created. path = $path");
+	
+	} else {
+		if ($path =~ /^$templatesDirectory/ ) {
+			$path =~ s|^$templatesDirectory||;
+			$path =~ s|^/||;   # remove the initial slash if any
+			$path = "$tmpEditFileDirectory/$path.$user.tmp";
+		} elsif ($path eq $blank_file_path) {
+			$path = "$tmpEditFileDirectory/blank.$setID.$user.tmp";  # handle the case of the blank problem
+		} elsif ($path eq $default_screen_header_path) {
+			$path = "$tmpEditFileDirectory/screenHeader.$setID.$user.tmp";  # handle the case of the screen header in snippets 
+		} elsif ($path eq $default_hardcopy_header_path) {
+			$path = "$tmpEditFileDirectory/hardcopyHeader.$setID.$user.tmp";  # handle the case of the hardcopy header in snippets 
+		} else {
+			die "determineTempEditFilePath should only be used on paths within the templates directory, not on $path";
+		}
+	}
+	$path;
+}
+
+sub determineOriginalEditFilePath {  # determine the original path to a file corresponding to a temporary edit file
+                                     # returns path relative to the template directory
+	my $self = shift;
+	my $path = shift;
+	my $user = $self->r->param("user");
+	$self->addbadmessage("Can't determine user of temporary edit file $path.") unless defined($user);
+	my $templatesDirectory = $self->r->ce->{courseDirs} ->{templates};
+	my $tmpEditFileDirectory = $self->getTempEditFileDirectory();
+	# unless path is absolute assume that it is relative to the template directory
+	my $newpath = $path;
+	unless ($path =~ m|^/| ) {
+		$newpath = "$templatesDirectory/$path";
+	}
+	if ($self->isTempEditFilePath($newpath) ) {
+		$newpath =~ s|^$tmpEditFileDirectory/||; # delete temp edit directory 
+		if ($newpath =~m|blank\.[^/]*$|) {                     # handle the case of the blank problem 
+			$newpath = $self->r->ce->{webworkFiles}->{screenSnippets}->{blankProblem};
+		} elsif (($newpath =~m|hardcopyHeader\.[^/]*$|)) {     # handle the case of the hardcopy header in snippets 
+			$newpath = $self->r->ce->{webworkFiles}->{hardcopySnippets}->{setHeader};
+		} elsif (($newpath =~m|screenHeader\.[^/]*$|)) {       # handle the case of the screen header in snippets
+			$newpath = $self->r->ce->{webworkFiles}->{screenSnippets}->{setHeader};
+		} else {
+			$newpath =~ s|\.$user\.tmp$||;           # delete suffix
+			
+		}
+		#$self->addgoodmessage("Original file path is $newpath"); #FIXME debug
+	} else {
+		$self->addbadmessage("This path |$newpath| is not the path to a temporary edit file.");
+		# returns original path
+	}
+	$newpath;
+}
+	
+sub getTempEditFileDirectory {
+	my $self = shift;
+	my $courseDirectory       = $self->r->ce->{courseDirs};
+	my $templatesDirectory    = $courseDirectory->{templates};
+	my $tmpEditFileDirectory  = (defined ($courseDirectory->{tmpEditFileDir}) ) ? $courseDirectory->{tmpEditFileDir} : "$templatesDirectory/tmpEdit";
+	$tmpEditFileDirectory;
+}
+sub isTempEditFilePath  {
+	my $self = shift;
+	my $path = shift;
+	my $templatesDirectory = $self->r->ce->{courseDirs} ->{templates};
+	# unless path is absolute assume that it is relative to the template directory
+	unless ($path =~ m|^/| ) {
+		$path = "$templatesDirectory/$path";
+	}
+	my $tmpEditFileDirectory = $self->getTempEditFileDirectory();
+
+	($path =~/^$tmpEditFileDirectory/) ? 1: 0;
+}
+sub getFilePaths {
+	my ($self, $setName, $problemNumber, $file_type) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my $db = $r->db;
+	my $urlpath = $r->urlpath;
+	my $courseName = $urlpath->arg("courseID");
+	my $user = $r->param('user');
+	my $effectiveUserName = $r->param('effectiveUser');
+    
+	$setName = '' unless defined $setName;
+	$problemNumber = '' unless defined $problemNumber;
+
+	# parse possibly versioned set names
+	my $fullSetName = $setName;
+	my $editSetVersion = 0;
+	if ( $setName =~ /,v(\d)+$/ ) {
+		$editSetVersion = $1;
+		$setName =~ s/,v\d+$//;
+	}
+
+	die 'Internal error to PGProblemEditor -- file type is not defined'  unless defined $file_type;
+	#$self->addgoodmessage("file type is $file_type");  #FIXME remove
+	##########################################################
+	# Determine path to the input file to be edited. 
+	#   The permanent path of the input file  == $editFilePath 
+	#   A temporary path to the input file    == $tempFilePath
+	##########################################################
+	# Relevant parameters
+	#     $r->param("displayMode")
+	#     $r->param('problemSeed')
+	#     $r->param('submit')
+	#     $r->param('make_local_copy')
+	#     $r->param('sourceFilePath')
+	#     $r->param('problemContents')
+	#     $r->param('save_to_new_file')
+	##########################################################################
+	# Define the following  variables
+	#		path to regular file -- $editFilePath;
+	#	    path to file being read (temporary or permanent) 	
+	#       contents of the file being read  --- $problemContents  	
+	#       $self->{r_problemContents}        =   \$problemContents;
+    ###########################################################################
+
+	my $editFilePath = $ce->{courseDirs}->{templates};
+	
+    ##########################################################################
+    # Determine path to regular file, place it in $editFilePath
+    # problemSeed is defined for the file_type = 'problem' and 'source_path_to_problem'
+    ##########################################################################
+	CASE: 
+	{
+		($file_type eq 'course_info') and do {
+			# we are editing the course_info file
+			# value of courseFiles::course_info is relative to templates directory
+			$editFilePath           .= '/' . $ce->{courseFiles}->{course_info};
+			last CASE;
+		};
+		
+		($file_type eq 'options_info') and do {
+			# we are editing the options_info file
+			# value of courseFiles::options_info is relative to templates directory
+			$editFilePath           .= '/' . $ce->{courseFiles}->{options_info};
+			last CASE;
+		};
+		
+		($file_type eq 'blank_problem') and do {
+			$editFilePath = $ce->{webworkFiles}->{screenSnippets}->{blankProblem};
+			$self->addbadmessage("This is a blank problem template file and can not be edited directly. "
+			                     ."Use the 'Save as' action below to create a local copy of the file and add it to the current problem set."
+			);
+			last CASE;
+		};
+		
+		($file_type eq 'set_header' or $file_type eq 'hardcopy_header') and do {
+			# first try getting the merged set for the effective user
+			# FIXME merged set is overwritten immediately with global value... WTF? --sam
+			my $set_record = $db->getMergedSet($effectiveUserName, $setName); # checked
+			# if that doesn't work (the set is not yet assigned), get the global record
+			$set_record = $db->getGlobalSet($setName); # checked
+			# bail if no set is found
+			die "Cannot find a set record for set $setName" unless defined($set_record);
+ 				
+			my $header_file = "";
+			$header_file = $set_record->{$file_type};
+			if ($header_file && $header_file ne "" && $header_file ne "defaultHeader") {
+					if ( $header_file =~ m|^/| ) { # if absolute address
+						$editFilePath  = $header_file;
+					} else {
+						$editFilePath .= '/' . $header_file;
+					}
+			} else {
+					# if the set record doesn't specify the filename for a header
+					# then the set uses the default from snippets
+		
+						$editFilePath = $ce->{webworkFiles}->{screenSnippets}->{setHeader} if $file_type eq 'set_header';
+						$editFilePath = $ce->{webworkFiles}->{hardcopySnippets}->{setHeader} if $file_type eq 'hardcopy_header';
+
+#						$self->addbadmessage("'".$self->shortPath($editFilePath)."' is the default header file and cannot be edited directly.".CGI::br()."Any changes you make will have to be saved as another file.");
+					#}
+
+			}
+			last CASE;
+		}; #end 'set_header, hardcopy_header' case
+		
+		($file_type eq 'problem') and do {			
+		
+			# first try getting the merged problem for the effective user
+			my $problem_record;
+			if ( $editSetVersion ) {
+				$problem_record = $db->getMergedProblemVersion($effectiveUserName, $setName, $editSetVersion, $problemNumber); # checked
+			} else {
+				$problem_record = $db->getMergedProblem($effectiveUserName, $setName, $problemNumber); # checked
+			}
+			
+			# if that doesn't work (the problem is not yet assigned), get the global record
+			$problem_record = $db->getGlobalProblem($setName, $problemNumber) unless defined($problem_record); # checked
+			# bail if no source path for the problem is found ;
+		    die "Cannot find a problem record for set $setName / problem $problemNumber" unless defined($problem_record);
+			$editFilePath .= '/' . $problem_record->source_file;
+			# define the problem seed for later use
+			$self->{problemSeed}= $problem_record->problem_seed if  defined($problem_record) and  $problem_record->can('problem_seed') ;  
+			last CASE;
+		};  # end 'problem' case
+		
+		($file_type eq 'source_path_for_problem_file') and do {
+		  my $forcedSourceFile = $self->{sourceFilePath};
+		  # if the source file is in the temporary edit directory find the original source file
+		  # the source file is relative to the templates directory.
+		  if ($self->isTempEditFilePath($forcedSourceFile) ) {
+		      $forcedSourceFile   = $self->determineOriginalEditFilePath($forcedSourceFile);     # original file path
+		      $self->addgoodmessage("the original path to the file is $forcedSourceFile");  #FIXME debug
+		  }
+		  # bail if no source path for the problem is found ;
+		  die "Cannot find a file path to save to" unless( not_blank($forcedSourceFile)   );
+		  $self->{problemSeed} = DEFAULT_SEED();
+		  $editFilePath .= '/' . $forcedSourceFile;
+		  last CASE;
+		}; # end 'source_path_for_problem_file' case
+	}  # end CASE: statement
+
+	
+	# if a set record or problem record contains an empty blank for a header or problem source_file
+	# we could find ourselves trying to edit /blah/templates/.toenail.tmp or something similar
+	# which is almost undoubtedly NOT desirable
+
+	if (-d $editFilePath) {
+		my $msg = "The file '".$self->shortPath($editFilePath)."' is a directory!";
+		$self->{failure} = 1;
+		$self->addbadmessage($msg);
+	}
+	if (-e $editFilePath and not -r $editFilePath) {   #it's ok if the file doesn't exist, perhaps we're going to create it
+	                                                  # with save as
+		my $msg = "The file '".$self->shortPath($editFilePath)."' cannot be read!";
+		$self->{failure} = 1;
+		$self->addbadmessage($msg);	
+	}
+    #################################################
+	# The path to the permanent file is now verified and stored in $editFilePath
+	# Whew!!!
+	#################################################
+	
+	my $tempFilePath = $self->determineTempEditFilePath($editFilePath);  #"$editFilePath.$TEMPFILESUFFIX";
+	$self->{editFilePath}   = $editFilePath;
+	$self->{tempFilePath}   = $tempFilePath;
+	$self->{inputFilePath}  = (-r $tempFilePath) ? $tempFilePath : $editFilePath;
+	#warn "editfile path is $editFilePath and tempFile is $tempFilePath and inputFilePath is ". $self->{inputFilePath};
+}
+sub saveFileChanges {
+
+################################################################################
+# saveFileChanges does most of the work. it is a separate method so that it can
+# be called from either pre_header_initialize() or initilize(), depending on
+# whether a redirect is needed or not.
+# 
+# it actually does a lot more than save changes to the file being edited, and
+# sometimes less.
+################################################################################
+
+	my ($self, $outputFilePath, $problemContents ) = @_;
+ 	my $r             = $self->r;
+ 	my $ce            = $r->ce;
+
+	my $action          = $self->{action}||'no action';
+	# my $editFilePath  = $self->{editFilePath}; # not used??
+	my $sourceFilePath  = $self->{sourceFilePath};
+	my $tempFilePath    = $self->{tempFilePath}; 	
+	
+	if (defined($problemContents) and ref($problemContents) ) {
+		$problemContents = ${$problemContents};
+	} elsif( ! not_blank($problemContents)  ) {      # if the problemContents is undefined or empty
+		$problemContents = ${$self->{r_problemContents}};
+	}
+	##############################################################################
+	# read and update the targetFile and targetFile.tmp files in the directory
+	# if a .tmp file already exists use that, unless the revert button has been pressed.
+	# The .tmp files are removed when the file is or when the revert occurs.
+	##############################################################################
+	
+
+    unless (not_blank($outputFilePath) ) {
+    	$self->addbadmessage("You must specify an file name in order to save a new file.");
+    	return "";
+    }
+	my $do_not_save    = 0 ;       # flag to prevent saving of file
+	my $editErrors = '';	
+
+	##############################################################################
+	# write changes to the approriate files
+	# FIXME  make sure that the permissions are set correctly!!!
+	# Make sure that the warning is being transmitted properly.
+	##############################################################################
+   
+	my $writeFileErrors;
+	if ( not_blank($outputFilePath)  ) {   # save file
+	    # Handle the problem of line endings.  
+		# Make sure that all of the line endings are of unix type.  
+		# Convert \r\n to \n
+		#$problemContents =~ s/\r\n/\n/g;
+		#$problemContents =~ s/\r/\n/g;
+
+		# make sure any missing directories are created
+		WeBWorK::Utils::surePathToFile($ce->{courseDirs}->{templates},
+		                                                        $outputFilePath);
+		die "outputFilePath is unsafe!" unless path_is_subdir($outputFilePath, $ce->{courseDirs}->{templates}, 1); # 1==path can be relative to dir
+
+		eval {
+			local *OUTPUTFILE;
+			open OUTPUTFILE,  ">$outputFilePath"
+					or die "Failed to open $outputFilePath";
+			print OUTPUTFILE $problemContents;
+			close OUTPUTFILE;		
+		  # any errors are caught in the next block
+		};
+
+		$writeFileErrors = $@ if $@;
+	} 
+ 
+	###########################################################
+	# Catch errors in saving files,  clean up temp files
+	###########################################################
+	
+	$self->{saveError} = $do_not_save;    # don't do redirects if the file was not saved.
+	                                    # don't unlink files or send success messages
+
+	if ($writeFileErrors) {
+	    # get the current directory from the outputFilePath
+		$outputFilePath =~ m|^(/.*?/)[^/]+$|;
+		my $currentDirectory = $1;
+	
+		my $errorMessage;
+		# check why we failed to give better error messages
+		if ( not -w $ce->{courseDirs}->{templates} ) {
+			$errorMessage = "Write permissions have not been enabled in the templates directory.  No changes can be made.";
+		} elsif ( not -w $currentDirectory ) {
+			$errorMessage = "Write permissions have not been enabled in '".$self->shortPath($currentDirectory)."'.  Changes must be saved to a different directory for viewing.";
+		} elsif ( -e $outputFilePath and not -w $outputFilePath ) {
+			$errorMessage = "Write permissions have not been enabled for '".$self->shortPath($outputFilePath)."'.  Changes must be saved to another file for viewing.";
+		} else {
+			$errorMessage = "Unable to write to '".$self->shortPath($outputFilePath)."': $writeFileErrors";
+		}
+
+		$self->{failure} = 1;
+		$self->addbadmessage(CGI::p($errorMessage));
+		
+	} 
+	###########################################################
+	# FIXME if the file is accompanied by auxiliary files transfer them as well
+	# if the filepath ends in   foobar/foobar.pg  then we assume there are auxiliary files
+	# copy the contents of the original foobar directory to the new one
+	#
+	###########################################################
+    # If things have worked so far determine if the file might be accompanied by auxiliary files
+    # a path ending in    foo/foo.pg  is assumed to contain auxilliary files
+    #
+    my $auxiliaryFilesExist = has_aux_files($outputFilePath);
+
+    if ($auxiliaryFilesExist and not $do_not_save ) {
+        my $sourceDirectory = $sourceFilePath;
+    	my $outputDirectory = $outputFilePath;
+        $sourceDirectory =~ s|/[^/]+\.pg$||;
+        $outputDirectory =~ s|/[^/]+\.pg$||;
+##############
+# Transfer this to Utils::copyAuxiliaryFiles($sourceDirectory, $destinationDirectory)
+##############
+    	my @filesToCopy;
+        @filesToCopy = WeBWorK::Utils::readDirectory($sourceDirectory) if -d $sourceDirectory;
+        foreach my $file (@filesToCopy) {
+            next if $file =~ /\.pg$/;   # .pg file should already be transferred
+        	my $fromPath = "$sourceDirectory/$file";
+        	my $toPath   = "$outputDirectory/$file";
+        	if (-f $fromPath and -r $fromPath and not -e $toPath) { # don't copy directories, don't copy files that have already been copied
+				copy($fromPath, $toPath) or $writeFileErrors.= "<br> Error copying $fromPath to $toPath";
+				# need to use binary transfer for gif files.  File::Copy does this.
+				#warn "copied from $fromPath to $toPath";
+				#warn "files are different ",system("diff $fromPath $toPath");
+        	}
+        	$self->addbadmessage($writeFileErrors) if not_blank($writeFileErrors);
+        	
+
+        }
+        $self->addgoodmessage("Copied auxiliary files from $sourceDirectory to  new location at $outputDirectory");
+ 
+    }
+ ##############
+ ##############
+     
+	###########################################################
+	# clean up temp files on revert, save and save_as
+	###########################################################	
+	unless( $writeFileErrors or $do_not_save) {  # everything worked!  unlink and announce success!
+		# unlink the temporary file if there are no errors and the save button has been pushed
+		if (($action eq 'save' or $action eq 'save_as') and (-w $self->{tempFilePath})  ) {
+		             
+		             $self->addgoodmessage("Deleting temp file at " . $self->shortPath($self->{tempFilePath}));
+		             die "tempFilePath is unsafe!" unless path_is_subdir($self->{tempFilePath}, $ce->{courseDirs}->{templates}, 1); # 1==path can be relative to dir
+		             unlink($self->{tempFilePath}) ;
+		}
+
+		if ( defined($outputFilePath) and ! $self->{failure} and not $self->isTempEditFilePath($outputFilePath) ) {  
+		            # don't announce saving of temporary editing files
+			my $msg = "Saved to file '".$self->shortPath($outputFilePath)."'.";
+
+			$self->addgoodmessage($msg);
+			#$self->{inputFilePath} = $outputFilePath; ## DPVC -- avoid file-not-found message
+		}
+
+	}
+
+
+}  # end saveFileChanges
+
+
+
+
+
+sub getActionParams {
+	my ($self, $actionID) = @_;
+	my $r = $self->{r};
+	
+	my %actionParams=();
+	foreach my $param ($r->param) {
+		next unless $param =~ m/^action\.$actionID\./;
+		$actionParams{$param} = [ $r->param($param) ];
+	}
+	return %actionParams;
+}
+
+sub fixProblemContents {
+		#NOT a method
+		my $problemContents = shift;
+		# Handle the problem of line endings.  
+		# Make sure that all of the line endings are of unix type.  
+		# Convert \r\n to \n
+		$problemContents =~ s/\r\n/\n/g;
+		$problemContents =~ s/\r/\n/g;
+		$problemContents;
+}
+
+sub fresh_edit_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	#$self->addgoodmessage("fresh_edit_handler called");
+}
+sub view_form {
+	my ($self, $onChange, %actionParams) = @_;
+	my $file_type     = $self->{file_type};
+	return "" if    $file_type eq 'hardcopy_header';  # these can't yet be edited from temporary files #FIXME
+	my $output_string = "View";
+	unless ($file_type eq 'course_info' || $file_type eq 'options_info') {
+
+		$output_string .= join(" ",
+			" using seed ",
+			CGI::textfield(-name=>'action.view.seed',-value=>$self->{problemSeed},-onfocus=>$onChange),
+			"and display mode ",
+			CGI::popup_menu(-name=>'action.view.displayMode', -values=>$self->r->ce->{pg}->{displayModes}, 
+			  -default=>$self->{displayMode}, -onmousedown=>$onChange)
+		);
+	}
+
+	return $output_string;  #FIXME  add -labels to the pop up menu
+}
+
+sub view_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	my $r = $self->r;
+	my $courseName      =  $self->{courseID};
+	my $setName         =  $self->{setID};
+	my $fullSetName     =  $self->{fullSetID};
+	my $problemNumber   =  $self->{problemID};
+	my $problemSeed     = ($actionParams->{'action.view.seed'}) ? 
+	                                $actionParams->{'action.view.seed'}->[0] 
+	                                : DEFAULT_SEED();
+	my $displayMode     = ($actionParams->{'action.view.displayMode'}) ? 
+	                                $actionParams->{'action.view.displayMode'}->[0]  
+	                                : $self->r->ce->{pg}->{options}->{displayMode};
+	                                
+	my $editFilePath        = $self->{editFilePath};
+	my $tempFilePath        = $self->{tempFilePath};
+	########################################################                               
+	# grab the problemContents from the form in order to save it to the tmp file
+	######################################################## 
+	my $problemContents     = fixProblemContents($self->r->param('problemContents'));
+	$self->{r_problemContents}    = \$problemContents;
+	
+
+	my $do_not_save = 0;
+	my $file_type = $self->{file_type};                               
+	$self->saveFileChanges($tempFilePath,);
+
+	########################################################
+	# construct redirect URL and redirect
+	########################################################
+	my $edit_level = $self->r->param("edit_level") || 0;
+	$edit_level++;
+	my $viewURL;
+	
+	my $relativeTempFilePath = $self->getRelativeSourceFilePath($tempFilePath);
+	
+	if ($file_type eq 'problem' or $file_type eq 'source_path_for_problem_file') { # redirect to Problem.pm or GatewayQuiz.pm
+
+		# we need to know if the set is a gateway set to determine the redirect
+		my $globalSet = $self->r->db->getGlobalSet( $setName );
+
+		my $problemPage;
+		if ( defined($globalSet) && $globalSet->assignment_type =~ /gateway/ ) {
+			$problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::GatewayQuiz",$r,
+			courseID => $courseName, setID => "Undefined_Set");
+		}  else {
+			$problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Problem",$r,
+									courseID => $courseName, setID => $setName, problemID => $problemNumber
+			);
+		}
+
+		$viewURL = $self->systemLink($problemPage,
+			params => {
+				displayMode        => $displayMode,
+				problemSeed        => $problemSeed,
+				editMode           => "temporaryFile",
+				edit_level         => $edit_level,
+				sourceFilePath     => $relativeTempFilePath,
+				status_message     => uri_escape($self->{status_message})
+	
+			}
+		);
+	} elsif ($file_type eq 'set_header' ) { # redirect to ProblemSet
+		my $problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSet",$r,
+			courseID => $courseName, setID => $setName, 
+		);
+		
+		$viewURL = $self->systemLink($problemPage,
+			params => {
+				set_header         => $tempFilePath,
+				displayMode        => $displayMode,
+				problemSeed        => $problemSeed,
+				editMode           => "temporaryFile",
+				edit_level         => $edit_level,
+				sourceFilePath     => $relativeTempFilePath,
+				status_message     => uri_escape($self->{status_message})
+	
+			}
+		);	
+	} elsif ($file_type eq 'hardcopy_header') { # redirect to ProblemSet?? # it's difficult to view temporary changes for hardcopy headers
+		my $problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSet",$r,
+			courseID => $courseName, setID => $setName, 
+		);
+		
+		$viewURL = $self->systemLink($problemPage,
+			params => {
+				set_header         => $tempFilePath,
+				displayMode        => $displayMode,
+				problemSeed        => $problemSeed,
+				editMode           => "temporaryFile",
+				edit_level         => $edit_level,
+				sourceFilePath     => $relativeTempFilePath,
+				status_message     => uri_escape($self->{status_message})
+	
+			}
+		);	
+	
+	} elsif ($file_type eq 'course_info') {  # redirec to ProblemSets.pm
+		my $problemSetsPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSets",$r,
+			courseID => $courseName);
+		$viewURL = $self->systemLink($problemSetsPage,
+			params => {
+
+				course_info        => $tempFilePath,
+				editMode           => "temporaryFile",
+				edit_level         => $edit_level,
+				sourceFilePath     => $relativeTempFilePath,
+				status_message     => uri_escape($self->{status_message})
+			}
+		);
+	} elsif ($file_type eq 'options_info') {  # redirec to Options.pm
+		my $optionsPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Options",$r,
+			courseID => $courseName);
+		$viewURL = $self->systemLink($optionsPage,
+			params => {
+				options_info       => $tempFilePath,
+				editMode           => "temporaryFile",
+				edit_level         => $edit_level,
+				sourceFilePath     => $relativeTempFilePath,
+				status_message     => uri_escape($self->{status_message})
+			}
+		);
+	} else {
+		die "I don't know how to redirect this file type $file_type ";
+	}
+
+	$self->reply_with_redirect($viewURL);
+} 
+
+sub add_problem_form {
+   my $self            = shift;
+ 	my ($onChange, %actionParams) = @_;
+	my $r               = $self->r;
+	my $setName         = $self->{setID} ;
+	my $problemNumber   = $self->{problemID} ;
+    $setName            = defined($setName) ? $setName : '';  # we need this instead of using the || construction 
+                                                              # to keep set 0 from being set to the 
+                                                              # empty string.
+    my $filePath        = $self->{inputFilePath};
+ 	$setName   =~ s|^set||;
+	my @allSetNames = sort $r->db->listGlobalSets;
+	for (my $j=0; $j<scalar(@allSetNames); $j++) {
+		$allSetNames[$j] =~ s|^set||;
+		$allSetNames[$j] =~ s|\.def||;
+	}
+	my $labels = {
+		problem         => 'problem',
+		set_header      => 'set header',
+		hardcopy_header => 'hardcopy header',
+	};
+	return "" if $self->{file_type} eq 'course_info' || $self->{file_type} eq 'options_info';
+	return join(" ",
+		"Add to set " ,
+		CGI::popup_menu({name=>'action.add_problem.target_set', values=>\@allSetNames, default=>$setName, onmousedown=>$onChange}),
+		" as ",
+		CGI::popup_menu({name=>'action.add_problem.file_type', values=>['problem','set_header', 'hardcopy_header'], labels=>$labels, default=>$self->{file_type}, onmousedown=>$onChange}),
+		
+	);  #FIXME  add -lables to the pop up menu
+	return "";
+}
+
+sub add_problem_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	my $r=>$self->r;
+	#$self->addgoodmessage("add_problem_handler called");
+	my $courseName      =  $self->{courseID};
+	my $setName         =  $self->{setID};
+	my $problemNumber   =  $self->{problemID};
+	my $sourceFilePath  =  $self->{editFilePath};
+	my $displayMode     =  $self->{displayMode};
+	my $problemSeed     =  $self->{problemSeed};
+		    
+	my $targetSetName         =  $actionParams->{'action.add_problem.target_set'}->[0];
+	my $targetFileType        =  $actionParams->{'action.add_problem.file_type'}->[0];
+	my $templatesPath         =  $self->r->ce->{courseDirs}->{templates};
+	$sourceFilePath    =~ s|^$templatesPath/||;
+	
+	my $edit_level = $self->r->param("edit_level") || 0;
+	$edit_level++;
+
+	my $viewURL ='';
+	if ($targetFileType eq 'problem') {
+		my $targetProblemNumber   =  1+ WeBWorK::Utils::max( $self->r->db->listGlobalProblems($targetSetName));
+		
+		#################################################
+		# Update problem record
+		#################################################
+		my $problemRecord  = $self->addProblemToSet(
+							   setName        => $targetSetName,
+							   sourceFile     => $sourceFilePath, 
+							   problemID      => $targetProblemNumber, #added to end of set
+		);
+		$self->assignProblemToAllSetUsers($problemRecord);
+		$self->addgoodmessage("Added $sourceFilePath to ". $targetSetName. " as problem $targetProblemNumber") ;
+		$self->{file_type}   = 'problem'; # change file type to problem -- if it's not already that
+
+		#################################################
+		# Set up redirect Problem.pm
+		#################################################
+		my $problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Problem",$r,
+			courseID  => $courseName, 
+			setID     => $targetSetName, 
+			problemID => $targetProblemNumber, 
+		);
+		my $relativeSourceFilePath = $self->getRelativeSourceFilePath($sourceFilePath);
+		$viewURL = $self->systemLink($problemPage,
+				params => {
+					displayMode        => $displayMode,
+					problemSeed        => $problemSeed,
+					editMode           => "savedFile",
+					edit_level         => $edit_level,
+					sourceFilePath     => $relativeSourceFilePath,
+					status_message     => uri_escape($self->{status_message})
+	
+				}
+		);
+	} elsif ($targetFileType eq 'set_header')  {
+		#################################################
+		# Update set record
+		#################################################
+		my $setRecord  = $self->r->db->getGlobalSet($targetSetName);
+		$setRecord->set_header($sourceFilePath);
+		if(  $self->r->db->putGlobalSet($setRecord) ) {
+			$self->addgoodmessage("Added '".$self->shortPath($sourceFilePath)."' to ". $targetSetName. " as new set header ") ;
+		} else {
+			$self->addbadmessage("Unable to make '".$self->shortPath($sourceFilePath)."' the set header for $targetSetName");
+		}
+		$self->{file_type} = 'set_header'; # change file type to set_header if it not already so
+		#################################################
+		# Set up redirect
+		#################################################
+		my $problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSet",$r,
+			courseID => $courseName, setID => $targetSetName
+		);
+		$viewURL = $self->systemLink($problemPage,
+				params => {
+					displayMode        => $displayMode,
+					editMode           => "savedFile",
+					edit_level         => $edit_level,
+					status_message     => uri_escape($self->{status_message})
+				}
+		);
+	} else {
+		die "Don't know what to do with target file type $targetFileType";
+	}
+	
+	$self->reply_with_redirect($viewURL);
+}
+
+
+sub save_form {
+	my ($self, $onChange, %actionParams) = @_;
+	my $r => $self->r;
+	#return "" unless defined($self->{tempFilePath}) and -e $self->{tempFilePath};
+	if ($self->{editFilePath} =~ /$BLANKPROBLEM$/ ) {
+		return "";  #Can't save blank problems without changing names
+	} elsif (-w $self->{editFilePath}) {
+
+		return "Save ".CGI::b($self->shortPath($self->{editFilePath}))." and View";	
+
+	} else {
+		return ""; #"Can't save -- No write permission";
+	}
+
+}
+
+sub save_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	my $r= $self->r;
+	#$self->addgoodmessage("save_handler called");
+	my $courseName      =  $self->{courseID};
+	my $setName         =  $self->{setID};
+	my $fullSetName     =  $self->{fullSetID};
+	my $problemNumber   =  $self->{problemID};
+	my $displayMode     =  $self->{displayMode};
+	my $problemSeed     =  $self->{problemSeed};
+	
+	#################################################
+	# grab the problemContents from the form in order to save it to a new permanent file
+	# later we will unlink (delete) the current temporary file
+	#################################################
+	my $problemContents = fixProblemContents($self->r->param('problemContents'));
+	$self->{r_problemContents} = \$problemContents;
+	
+	#################################################
+	# Construct the output file path
+	#################################################
+	my $editFilePath        = $self->{editFilePath};
+	my $outputFilePath      = $editFilePath;
+
+	my $do_not_save = 0;
+	my $file_type = $self->{file_type};
+	$self->saveFileChanges($outputFilePath);	
+	#################################################
+	# Set up redirect to Problem.pm
+	#################################################
+	my $viewURL;
+	########################################################
+	# construct redirect URL and redirect
+	########################################################
+	if ($file_type eq 'problem' || $file_type eq 'source_path_for_problem_file') { # redirect to Problem.pm
+
+		# we need to know if the set is a gateway set to determine the redirect
+		my $globalSet = $self->r->db->getGlobalSet( $setName );
+		my $problemPage;
+		if ( defined( $globalSet) && $globalSet->assignment_type =~ /gateway/ ) {
+			$problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::GatewayQuiz",$r,
+			courseID => $courseName, setID => "Undefined_Set");
+			# courseID => $courseName, setID => $fullSetName);
+		} else {
+			$problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Problem",$r,
+									courseID => $courseName, setID => $setName, problemID => $problemNumber	);
+		}
+		
+		my $relativeEditFilePath = $self->getRelativeSourceFilePath($editFilePath);
+		
+		$viewURL = $self->systemLink($problemPage,
+			params => {
+				displayMode        => $displayMode,
+				problemSeed        => $problemSeed,
+				editMode           => "savedFile",
+				edit_level         => 0,
+				sourceFilePath     => $relativeEditFilePath,
+				status_message     => uri_escape($self->{status_message})
+	
+			}
+		);
+	} elsif ($file_type eq 'set_header' ) { # redirect to ProblemSet
+		my $problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSet",$r,
+			courseID => $courseName, setID => $setName, 
+		);
+		
+		$viewURL = $self->systemLink($problemPage,
+			params => {
+				displayMode        => $displayMode,
+				problemSeed        => $problemSeed,
+				editMode           => "savedFile",
+				edit_level         => 0,
+				status_message     => uri_escape($self->{status_message})
+	
+			}
+		);	
+	} elsif ( $file_type eq 'hardcopy_header') { # redirect to ProblemSet
+		my $problemPage = $self->r->urlpath->newFromModule('WeBWorK::ContentGenerator::Hardcopy',$r,
+			courseID => $courseName, setID => $setName, 
+		);
+		
+		$viewURL = $self->systemLink($problemPage,
+			params => {
+				displayMode        => $displayMode,
+				problemSeed        => $problemSeed,
+				editMode           => "savedFile",
+				edit_level         => 0,
+				status_message     => uri_escape($self->{status_message})
+	
+			}
+		);	
+	
+	} elsif ($file_type eq 'course_info') {  # redirect to ProblemSets.pm
+		my $problemSetsPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSets",$r,
+			courseID => $courseName);
+		$viewURL = $self->systemLink($problemSetsPage,
+			params => {
+				editMode           => ("savedFile"),
+				edit_level         => 0,
+				status_message     => uri_escape($self->{status_message})
+			}
+		);
+	} elsif ($file_type eq 'options_info') {  # redirect to Options.pm
+		my $optionsPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Options",$r,
+			courseID => $courseName);
+		$viewURL = $self->systemLink($optionsPage,
+			params => {
+				editMode           => ("savedFile"),
+				edit_level         => 0,
+				status_message     => uri_escape($self->{status_message})
+			}
+		);
+	} elsif ($file_type eq 'source_path_for_problem_file') {  # redirect to ProblemSets.pm
+		my $problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor",$r,
+		courseID => $courseName, setID => $setName, problemID => $problemNumber
+		);
+		my $viewURL = $self->systemLink($problemPage, 
+			 params=>{
+			    displayMode        => $displayMode,
+				problemSeed        => $problemSeed,
+				editMode           => "savedFile",
+				edit_level         => 0,
+				sourceFilePath     => $outputFilePath, #The path relative to the templates directory is required.
+				file_type          => 'source_path_for_problem_file',
+				status_message     => uri_escape($self->{status_message})
+
+			 }
+	);
+
+	} else {
+		die "I don't know how to redirect this file type $file_type ";
+	}
+	
+	$self->reply_with_redirect($viewURL);
+}
+
+
+
+# sub make_local_copy_form {
+# 	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+# 	my $editFilePath    = $self->{editFilePath}; # path to the permanent file to be edited
+# 	#warn "editFilePath $editFilePath inputFilePath",$self->{inputFilePath};
+# 	return "" unless -e $editFilePath;
+# 	return "" if -w $editFilePath;
+# 	return "" unless    $self->{file_type} eq 'problem'           # need problem structure to make local copy in most cases
+# 			 or $self->{file_type} eq 'blank_problem'   # $editFilePath eq  $self->r->cr->{webworkFiles}{screenSnippets}{blankProblem}
+# 	                 or $self->{file_type} eq 'set_header'      # $editFilePath eq  $self->r->ce->{webworkFiles}->{hardcopySnippets}->{setHeader}   # special case to make copy of screen header
+# 	                 or $self->{file_type} eq 'hardcopy_header';  #  $editFilePath eq  $self->r->ce->{webworkFiles}->{screenSnippets}->{setHeader}   ;  # special case to make copy of hardcopy header
+# 	                 #  or $self->{file_type} eq 'source_path_for_problem_file'; # need setID and problemID to make local copy -- can't be done in this case.
+# 	# make sure setID is well defined before allowing local copy
+# 	my $setID         = $self->{setID};
+# 	my $probNum       = ($self->{file_type} eq 'problem')? "/problem $self->{problemID}" : "";
+# 	return "" unless not_blank($setID) && $setID ne 'Undefined_Set';
+# 	
+# 	return join ("",
+# 		"Save local editable copy as: [TMPL]/".($self->determineLocalFilePath($editFilePath)).CGI::br()." and use in ".CGI::b("set $setID$probNum"),
+# 		CGI::hidden(-name=>'action.make_local_copy.target_file', -value=>$self->determineLocalFilePath($editFilePath) ),
+# 		CGI::hidden(-name=>'action.make_local_copy.source_file', -value=>$editFilePath ),
+# 		CGI::hidden(-name=>'action.make_local_copy.file_type',-value=>$self->{file_type}),
+# 		CGI::hidden(-name=>'action.make_local_copy.saveMode',-value=>'rename')
+# 	);
+# }
+# 
+# 
+# sub make_local_copy_handler {
+# 	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+# 	foreach my $key (qw(target_file file_type saveMode source_file)) {
+# 		$actionParams->{"action.save_as.$key"}->[0] = $actionParams->{"action.make_local_copy.$key"}->[0];
+# 		#warn "action.make_local_copy.$key", @{$actionParams->{"action.make_local_copy.$key"}}
+# 	}
+#   	save_as_handler($self, $genericParams, $actionParams, $tableParams);
+# 
+# 
+# }
+sub save_as_form {  # calls the save_as_handler 
+	my ($self, $onChange, %actionParams) = @_;
+	my $editFilePath  = $self->{editFilePath};
+#	return "" unless -w $editFilePath;  ##  DPVC -- we don't need to be able to write the original in order to make a copy
+	
+	
+	my $templatesDir  =  $self->r->ce->{courseDirs}->{templates};
+	my $setID         = $self->{setID};
+	my $fullSetID     = $self->{fullSetID};
+	
+	
+	my $shortFilePath =  $editFilePath;
+	$shortFilePath   =~ s|^$templatesDir/||;
+	$shortFilePath   =  'local/'.$shortFilePath unless( $shortFilePath =~m|^local/|);  # suggest that modifications be saved to the "local" subdirectory
+	$shortFilePath =~ s|^.*/|| if $shortFilePath =~ m|^/|;  # if it is still an absolute path don't suggest a file path to save to.
+   
+
+	my $probNum = ($self->{file_type} eq 'problem')? "/problem $self->{problemID}" : "";
+	my $andRelink = '';
+# 	$andRelink = CGI::br().' and '.CGI::checkbox(
+# 				-name => "action.save_as.saveMode",
+# 				-value => "rename",
+# 				-label => "",
+# 				-checked => 1,
+# 				-onclick=>$onChange
+# 				).
+# 		     " use in ".CGI::b("set $fullSetID$probNum")
+# 		         if not_blank($setID)  && $setID ne 'Undefined_Set' &&
+# 			    $self->{file_type} ne 'blank_problem';
+
+    my $can_add_problem_to_set = not_blank($setID)  && $setID ne 'Undefined_Set' && $self->{file_type} ne 'blank_problem';
+    # don't addor replace problems to sets if the set is the Undefined_Set or if the problem is the blank_problem.
+    
+    my $replace_problem_in_set  = ($can_add_problem_to_set)?
+			 CGI::input({
+    			 -type      => 'radio',
+    			 -name      => "action.save_as.saveMode",
+    			 -value     => "rename",
+    			 -label     => '',
+			 },"and replace ".CGI::b("set $fullSetID$probNum").',')  : ''
+    ;
+    my $add_problem_to_set      = ($can_add_problem_to_set)?
+             CGI::input({
+    			 -type      => 'radio',
+    			 -name      => "action.save_as.saveMode",
+    			 -value     => 'add_to_set_as_new_problem',
+    			 -label     => '',
+    			 -onfocus   => $onChange,
+    		 },"and append to end of set $fullSetID",) : ''
+    ;  
+    my $rh_new_problem_options = {
+    			 -type      => 'radio',
+    			 -name      => "action.save_as.saveMode",
+    			 -value     => "new_independent_problem",
+    			 -onfocus   => $onChange,
+    			 };
+    $rh_new_problem_options->{checked}=1 unless $can_add_problem_to_set;
+    my $create_new_problem       = CGI::input($rh_new_problem_options,"as a new independent problem");
+    
+    $andRelink = CGI::br(). $replace_problem_in_set . $add_problem_to_set . $create_new_problem;
+    			 
+	return 'Save AS [TMPL]/'.
+	        CGI::textfield(
+			       -name=>'action.save_as.target_file', -size=>60, -value=>"$shortFilePath",  
+			       -onfocus=>$onChange
+			      ).",".
+			CGI::hidden(-name=>'action.save_as.source_file', -value=>$editFilePath ).
+			CGI::hidden(-name=>'action.save_as.file_type',-value=>$self->{file_type}).
+			$andRelink;
+}
+# suggestions for improvement
+# save as ......
+# ¥replacing foobar (rename) ¥ and add to set (add_new_problem) ¥ as an independent file (new_independent_problem)
+ 
+sub save_as_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	my $r = $self->r;
+	#$self->addgoodmessage("save_as_handler called");
+	$self->{status_message} = ''; ## DPVC -- remove bogus old messages
+	my $courseName      =  $self->{courseID};
+	my $setName         =  $self->{setID};
+	my $fullSetName     =  $self->{fullSetID};
+	my $problemNumber   =  $self->{problemID};
+	my $displayMode     =  $self->{displayMode};
+	my $problemSeed     =  $self->{problemSeed};
+	my $effectiveUserName = $self->r->param('effectiveUser');
+	
+	my $do_not_save = 0;
+	my $saveMode       = $actionParams->{'action.save_as.saveMode'}->[0] || 'no_save_mode_selected';
+	my $new_file_name  = $actionParams->{'action.save_as.target_file'}->[0] || '';
+	my $sourceFilePath = $actionParams->{'action.save_as.source_file'}->[0] || '';
+	my $file_type      = $actionParams->{'action.save_as.file_type'}->[0] || '';
+	$self ->{sourceFilePath} = $sourceFilePath;  # store for use in saveFileChanges
+	$new_file_name =~ s/^\s*//;  #remove initial and final white space
+	$new_file_name =~ s/\s*$//;
+	if ( $new_file_name !~ /\S/) { # need a non-blank file name
+		# setting $self->{failure} stops saving and any redirects
+		$do_not_save = 1;
+		$self->addbadmessage(CGI::p("Please specify a file to save to."));
+	}
+	
+	#################################################
+	# grab the problemContents from the form in order to save it to a new permanent file
+	# later we will unlink (delete) the current temporary file
+	#################################################
+	my $problemContents = fixProblemContents($self->r->param('problemContents'));
+	$self->{r_problemContents} = \$problemContents;
+	warn "problem contents is empty" unless $problemContents;
+	#################################################
+	# Rescue the user in case they forgot to end the file name with .pg
+	#################################################
+	
+	if($file_type eq 'problem' 
+	  or $file_type eq 'blank_problem'
+	  or $file_type eq 'set_header') {
+			$new_file_name =~ s/\.pg$//; # remove it if it is there
+			$new_file_name .= '.pg'; # put it there
+			
+	}	
+	#################################################
+	# Construct the output file path
+	#################################################
+	my $outputFilePath = $self->r->ce->{courseDirs}->{templates} . '/' . 
+								 $new_file_name; 		
+	if (defined $outputFilePath and -e $outputFilePath) {
+		# setting $do_not_save stops saving and any redirects
+		$do_not_save = 1;
+		$self->addbadmessage(CGI::p("File '".$self->shortPath($outputFilePath)."' exists.  
+		File not saved. No changes have been made.
+		You can change the file path for this problem manually from the 'Hmwk Sets Editor' page"));
+		$self->addgoodmessage(CGI::p("The text box now contains the source of the original problem.".
+		" You can recover lost edits by using the Back button on your browser."));
+	} else {
+		$self->{editFilePath} = $outputFilePath;
+		$self->{tempFilePath} = ''; # nothing needs to be unlinked.
+		$self->{inputFilePath} = '';
+	}
+
+
+	unless ($do_not_save ) {
+		$self->saveFileChanges($outputFilePath);
+
+		if ($saveMode eq 'rename' and -r $outputFilePath) { 
+		#################################################
+		# Modify source file path in problem
+		#################################################
+			if ($file_type eq 'set_header' ) {
+				my $setRecord = $self->r->db->getGlobalSet($setName);
+				$setRecord->set_header($new_file_name);
+				if ($self->r->db->putGlobalSet($setRecord)) {
+				  $self->addgoodmessage("The set header for set $setName has been renamed to '".$self->shortPath($outputFilePath)."'.") ;
+				} else {
+				  $self->addbadmessage("Unable to change the set header for set $setName. Unknown error.");
+				}
+			} elsif ($file_type eq 'hardcopy_header' ) {
+				my $setRecord = $self->r->db->getGlobalSet($setName);
+				$setRecord->hardcopy_header($new_file_name);
+				if ($self->r->db->putGlobalSet($setRecord)) {
+				  $self->addgoodmessage("The hardcopy header for set $setName has been renamed to '".$self->shortPath($outputFilePath)."'.") ;
+				} else {
+				  $self->addbadmessage("Unable to change the hardcopy header for set $setName. Unknown error.");
+				}
+			} else {
+				my $problemRecord;
+				if ( $fullSetName =~ /,v(\d+)$/ ) {
+					$problemRecord = $self->r->db->getMergedProblemVersion($effectiveUserName, $setName, $1, $problemNumber);
+				} else {
+					$problemRecord = $self->r->db->getGlobalProblem($setName,$problemNumber);
+				}
+				$problemRecord->source_file($new_file_name);
+				my $result = ( $fullSetName =~ /,v(\d+)$/ ) ?
+					$self->r->db->putProblemVersion($problemRecord) :
+					$self->r->db->putGlobalProblem($problemRecord);
+				if  ( $result  ) {
+					$self->addgoodmessage("The source file for 'set $fullSetName / problem $problemNumber' has been changed from ".
+					$self->shortPath($sourceFilePath)." to '".$self->shortPath($outputFilePath)."'.") ;
+				} else {
+					$self->addbadmessage("Unable to change the source file path for set $fullSetName, problem $problemNumber. Unknown error.");
+				}
+			}
+		} elsif ($saveMode eq 'add_to_set_as_new_problem') {
+			my $targetProblemNumber   =  1+ WeBWorK::Utils::max( $self->r->db->listGlobalProblems($setName));
+			my $problemRecord  = $self->addProblemToSet(
+					   setName        => $setName,
+					   sourceFile     => $new_file_name, 
+					   problemID      => $targetProblemNumber, #added to end of set
+			);
+			$self->assignProblemToAllSetUsers($problemRecord);
+			$self->addgoodmessage("Added $new_file_name to ". $setName. " as problem $targetProblemNumber") ;
+		} elsif ($saveMode eq 'new_independent_problem') {
+		#################################################
+		# Don't modify source file path in problem -- just report 
+		#################################################
+
+			#$self->{status_message} = '';  ## DPVC remove old messages
+			$self->addgoodmessage("A new file has been created at '".$self->shortPath($outputFilePath). 
+			"' with the contents below. No changes have been made to set $setName.");
+		} else {
+			$self->addbadmessage("Don't recognize saveMode: |$saveMode|. Unknown error.");
+		}
+	  
+	}
+	my $edit_level = $self->r->param("edit_level") || 0;
+	$edit_level++;
+	
+	#################################################
+	# Set up redirect
+	# The redirect gives the server time to detect that the new file exists.
+	#################################################
+	my $problemPage;
+	my $new_file_type;
+
+	if ($saveMode eq 'new_independent_problem' ) {
+		$problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor",$r,
+			courseID => $courseName, setID => 'Undefined_Set', problemID => 'Undefined_Set'
+		);
+		$new_file_type = 'source_path_for_problem_file';
+	} elsif ($saveMode eq 'rename') {
+		$problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor",$r,
+			courseID => $courseName, setID => $setName, problemID => $problemNumber
+		);
+		$new_file_type = $file_type;
+	} elsif ($saveMode eq 'add_to_set_as_new_problem') {
+	    $problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor",$r,
+			courseID => $courseName, setID => $setName, problemID => $problemNumber
+		);
+		$new_file_type = $file_type;
+	} else {
+		$self->addbadmessage(" Please use radio buttons to choose the method for saving this file. Can't recognize saveMode: |$saveMode|.");
+		# can't continue since paths have not been properly defined.
+		return "";
+	}
+
+	#warn "save mode is $saveMode";
+
+	my $relativeOutputFilePath = $self->getRelativeSourceFilePath($outputFilePath);
+	
+	my $viewURL = $self->systemLink($problemPage, 
+								 params=>{
+									 sourceFilePath     => $relativeOutputFilePath, #The path relative to the templates directory is required.
+									 problemSeed        => $problemSeed,
+									 edit_level         => $edit_level,
+									 file_type          => $new_file_type,
+									 status_message     => uri_escape($self->{status_message})
+
+								 }
+	);
+	
+	$self->reply_with_redirect($viewURL);
+    return "";  # no redirect needed
+}
+sub revert_form {
+	my ($self, $onChange, %actionParams) = @_;
+	my $editFilePath    = $self->{editFilePath};
+	return "Error: The original file $editFilePath cannot be read." unless -r $editFilePath;
+	return "" unless defined($self->{tempFilePath}) and -e $self->{tempFilePath} ;
+	return "Revert to ".$self->shortPath($editFilePath) ;
+
+}
+sub revert_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	my $ce = $self->r->ce;
+	#$self->addgoodmessage("revert_handler called");	
+	my $editFilePath       = $self->{editFilePath};
+	$self->{inputFilePath} = $editFilePath;
+	# unlink the temp files;
+	die "tempFilePath is unsafe!" unless path_is_subdir($self->{tempFilePath}, $ce->{courseDirs}->{templates}, 1); # 1==path can be relative to dir
+	unlink($self->{tempFilePath});
+	$self->addgoodmessage("Deleting temp file at " . $self->shortPath($self->{tempFilePath}));
+	$self->{tempFilePath}  = '';
+	my $problemContents    ='';
+	$self->{r_problemContents} = \$problemContents;
+	$self->addgoodmessage("Reverting to original file '".$self->shortPath($editFilePath)."'");
+	# no redirect is needed
+}
+
+
 
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/Preflight.pm b/lib/WeBWorK/ContentGenerator/Instructor/Preflight.pm
new file mode 100644
index 0000000000..adf54963e0
--- /dev/null
+++ b/lib/WeBWorK/ContentGenerator/Instructor/Preflight.pm
@@ -0,0 +1,457 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Instructor/Preflight.pm,v 1.8 2006/09/25 22:14:53 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::ContentGenerator::Instructor::Preflight;
+use base qw(WeBWorK::ContentGenerator::Instructor);
+
+=head1 NAME
+
+WeBWorK::ContentGenerator::Instructor::Preflight.pm  -- display past answers of many students
+
+=cut
+
+use strict;
+use warnings;
+use CGI qw(-nosticky );
+use WeBWorK::HTML::OptionList qw/optionList/;
+use WeBWorK::HTML::ScrollingRecordList qw/scrollingRecordList/;
+
+sub initialize {
+	my $self       = shift;
+	my $r          = $self->r;
+	my $urlpath    = $r->urlpath;
+	my $db         = $r->db;
+	my $ce         = $r->ce;
+	my $authz      = $r->authz;
+	my $courseName = $urlpath->arg("courseID");
+	my $user       = $r->param('user');
+	
+	# Check permissions
+	return unless ($authz->hasPermissions($user, "access_instructor_tools"));
+}
+
+
+sub body {
+	my $self          = shift;
+	my $r             = $self->r;
+	my $urlpath       = $r->urlpath;
+	my $db            = $r->db;
+	my $ce            = $r->ce;
+	my $authz         = $r->authz;
+	my $root          = $ce->{webworkURLs}->{root};
+	my $courseName    = $urlpath->arg('courseID');  
+	my $setName       = $r->param('setID') || "";     # these are passed in the search args in this case
+	my $problemNumber = $r->param('problemID') || "";
+	if ($problemNumber =~ /\!(\d+)/) { $problemNumber = $1 };
+	my $user          = $r->param('user');
+	my $key           = $r->param('key');
+	my $studentUser   = $r->param('studentUser') || "";
+	
+	# Check permissions
+	return CGI::div({class=>"ResultsWithError"}, "You are not authorized to access the Instructor tools.")
+		unless $authz->hasPermissions($r->param("user"), "access_instructor_tools");
+
+	
+	my $showAnswersPage   = $urlpath->newFromModule($urlpath->module, $r, courseID => $courseName);
+	my $showAnswersURL    = $self->systemLink($showAnswersPage,authen => 0 );
+	
+	my ($safeUser, $safeCourse) = (showHTML($studentUser), showHTML($courseName));
+	my ($safeSet, $safeProb) = (showHTML($setName), showHTML($problemNumber));
+
+	my @defaultOrder = qw(user_id set_id problem_id date answers);
+
+	my %prettyFieldNames;
+	
+	@prettyFieldNames{qw(
+		user_id
+		set_id
+		problem_id
+		date
+		answers
+	)} = (
+		"User ID",
+		"Set Name",
+		"Problem Number",
+		"Date", 
+		"Answers",
+	);
+	$prettyFieldNames{nofield} = "";
+	
+	#####################################################################
+	# print form
+	#####################################################################
+	
+	# FIXME why are we filtering out users with non-word characters in their userIDs?
+	my @userIDs = grep /\w/, sort $db->listUsers();
+	# DBFIXME for these "get all" type queries, we shouldn't need the lists of setIDs
+	my @Users = $db->getUsers(@userIDs);
+	my %users = map { $_ => $db->getUser($_)->first_name } @userIDs;
+	my @setIDs = sort $db->listGlobalSets();
+	my @GlobalSets = $db->getGlobalSets(@setIDs);
+	my @GlobalProblems = $db->getAllGlobalProblems($setName);
+
+	my $scrolling_user_list = scrollingRecordList({
+		name => "studentUser",
+		request => $r,
+		default_sort => "lnfn",
+		default_format => "lnfn_uid",
+		default_filters => ["all"],
+		default => "Select one or more users: ",
+#		hide_sort => 1,
+#		hide_format => 1,
+#		hide_filter => 1,
+		size => 10,
+#		multiple => 0,
+	}, @Users);
+	
+	my $scrolling_set_list = scrollingRecordList({
+		name => "setID",
+		request => $r,
+		default_sort => "set_id",
+		default_format => "set_id",
+		default_filters => ["all"],
+		default => "Select one or more sets: ",
+#		hide_sort => 1,
+#		hide_format => 1,
+#		hide_filter => 1,		
+		size => 10,
+#		multiple => 0,
+	}, @GlobalSets);
+
+	my $scrolling_problem_list = scrollingRecordList({
+		name => "problemID",
+		request => $r,
+		default => "Select one or more problems: ",
+		default_filters => ["all"],		
+#		hide_sort => 1,
+#		hide_format => 1,
+#		hide_filter => 1,		
+		size => 10,
+#		multiple => 0,
+	}, @GlobalProblems);
+	
+	my @selected_fields = $r->param("selected_fields");
+	my @selected_answers = $r->param("selected_answers");
+
+	print join ("",
+		CGI::br(),
+		"\n\n",
+		CGI::hr(),
+		CGI::start_form(
+			-method => "post", 
+			-action => $showAnswersURL, 
+			-target => 'information',
+		),
+			CGI::start_table(
+				-border => "0", 
+				-cellpadding => "0", 
+				-cellspacing => "0",
+			),
+				CGI::Tr(
+					CGI::td({style=>"width:33%"}, $scrolling_user_list),
+					CGI::td({style=>"width:33%"}, $scrolling_set_list),
+					CGI::td({style=>"width:33%"}, $scrolling_problem_list),					
+				),
+				CGI::Tr({}, 
+					CGI::submit(
+						-name => 'action',
+						-value => 'Past Answers for',
+					), "\n",
+#					$self->hidden_authen_fields,
+#					" &nbsp; \n User: &nbsp;",
+#					CGI::textfield(
+#						-name => 'studentUser1',
+#						-value => $safeUser,
+#						-size => 10,
+#					),
+#					" &nbsp; \n Set: &nbsp;",
+#					CGI::textfield(
+#						-name => 'setID1',
+#						-value => $safeSet,
+#						-size => 10, 
+#					),
+#					" &nbsp; \n Problem:  &nbsp;",
+#					CGI::textfield(
+#						-name => 'problemID',
+#						-value => $safeProb,
+#						-size => 10,
+#					),
+#					" &nbsp; \n",
+#					CGI::br(),CGI::br(),
+				),
+#				CGI::Tr({},
+#					CGI::popup_menu(
+#						-name => 'studentUser',
+#						-size => 10,
+#						-values => \@userIDs,
+#						-multiple => 1,
+#					),
+#					CGI::popup_menu(
+#						-name => 'setID',
+#						-values => \@setIDs,
+#						-size => 10,
+#						-multiple => 1,
+#					),
+#				),
+				CGI::Tr({},
+					CGI::td({}, 
+						"Select which fields to show: " . CGI::br(),
+						CGI::scrolling_list(
+							-name => "selected_fields",
+							-values => \@defaultOrder,
+							-labels => \%prettyFieldNames,
+							-default => \@selected_fields,
+							-size => 5,
+							-multiple => 1,
+						),
+					),
+					CGI::td({},
+						"and which answers to show: " . CGI::br(),
+						CGI::scrolling_list(
+							-name => "selected_answers",
+							-values => [1..100],
+							-default => \@selected_answers,
+							-size => 5,
+							-multiple => 1,
+						)
+					),
+				),
+			CGI::end_table({}),
+		CGI::end_form({}),	
+	);
+	
+	#####################################################################
+	# create ordering system
+	#####################################################################
+
+	# FIXME: We need a way to choose the order as well as the fields!
+	my (@fieldOrder) = @selected_fields ? @selected_fields : @defaultOrder;
+
+	if (defined($setName) and defined($problemNumber) )  {
+		#####################################################################
+		# print result table of answers
+		#####################################################################
+		my $answer_log    = $self->{ce}->{courseFiles}->{logs}->{'answer_log'};
+	
+		$studentUser = $r->param('studentUser') if ( defined($r->param('studentUser')) );
+		my ($safeUser, $safeCourse) = (showHTML($studentUser), showHTML($courseName));
+		my ($safeSet, $safeProb) = (showHTML($setName), showHTML($problemNumber));
+	
+		
+		print CGI::h3( "Past Answers for " . ($safeUser ? "user $safeUser " : '' ) . ($safeSet ? "set $safeSet " : '' ) . ($safeSet and $safeProb ? ', ' : '') . ($safeProb ? "problem $safeProb" : ''));
+	
+		$studentUser = "[^|]*"    if (not defined $studentUser or $studentUser eq ""    or $studentUser eq "*");
+		$setName = "[^|]*"  if ($setName eq ""  or $setName eq "*");
+		$problemNumber = "[^|]*" if ($problemNumber eq "" or $problemNumber eq "*");
+
+		#my $pattern = "^[[^]]*]|[^|]*\\|$setName\\|$problemNumber\\|";
+		my $pattern = "\\|$studentUser\\|$setName\\|$problemNumber\\|";
+		
+		our ($lastdate, $lasttime, $lastID, $lastn);
+		
+		
+		if (open(LOG,"$answer_log")) {
+			my $line;
+			local ($lastdate, $lasttime, $lastID, $lastn) = ("",0,"",0);
+			$self->{lastdate}       = '';
+			$self->{lasttime}       = '';
+			$self->{lastID}         = '';
+			$self->{lastn}          = '';
+		  
+			# get data from file
+			
+			my @lines = grep(/$pattern/,<LOG>); close(LOG);
+			chomp(@lines);
+						
+			my $maxcount = 0;
+			foreach my $newline (@lines) {
+				my @words = split /\t/, $newline;
+				my $count = @words;
+				$maxcount = $count if $count > $maxcount;
+			}
+			@selected_answers = (1..$maxcount) unless @selected_answers;
+			
+#			print "<CENTER>\n";
+			print CGI::start_table({
+					-border => "1",
+#					-cellpadding => '3',
+#					-cellspacing => '0',
+					-onload => "",
+				}) . "\n";
+			
+			my @tableHeaders;
+			foreach (@fieldOrder) {
+				push @tableHeaders, $prettyFieldNames{$_} unless $_ eq "answers";
+			}
+			print CGI::Tr({}, CGI::th({}, \@tableHeaders) , CGI::th({-colspan => 200}, $prettyFieldNames{answers}));
+
+			my @Records;
+			#####################################################################
+			# create array of records
+			#####################################################################
+			foreach $line ( @lines ) {
+				my %fakeRecord = ();
+				#print CGI::br() . $line;
+				next if not $line =~ /\|(\w+)\|([\w\d_-]+)\|(\d+)\|\s*(\d+)(.*?)\t?$/;
+				$fakeRecord{user_id} = "$1";
+				$fakeRecord{set_id} = "$2";
+				$fakeRecord{problem_id} = "$3";
+				$fakeRecord{date} = $4; #$self->formatDateTime($4);
+				$fakeRecord{answers} = [ split "\t", "$5", -1 ] if $5; # the -1 stops split from dropping any trailing null fields
+				my @answers = map { $_ ? showHTML($_) : CGI::small(CGI::i("empty")) } @{ $fakeRecord{answers} }; 
+				shift @answers;	# first field is always empty
+				$fakeRecord{answers} = \@answers;
+				
+
+				my @tableCells;
+				foreach (@fieldOrder) {
+				
+					#push @tableCells, showHTML($fakeRecord{$_});
+				}
+
+				push @Records, \%fakeRecord;
+
+				#print join " ", map { "$_ = $fakeRecord{$_}" } keys %fakeRecord;
+				#print CGI::br();
+#				print CGI::Tr({}, CGI::td({}, \@tableCells));
+			
+				#print $self->tableRow(split("\t",$line."\tx"));
+			}
+
+			#####################################################################
+			# sort array of records
+			#####################################################################
+
+			@Records = sort byUSPD @Records;
+
+			#####################################################################
+			# print array of records
+			#####################################################################
+			
+			foreach my $record (@Records) {
+				my @tableCells;
+				foreach (@fieldOrder) {
+					if ($_ eq "answers") {
+						my $i = 0;
+						my %answers = map { ++$i => $_ } @{ $record->{$_} };
+						push @tableCells, @answers{@selected_answers};
+					} elsif ($_ eq "date") {
+						my ( $sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst) = localtime $record->{$_};
+						$wday = ("Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat")[$wday];
+						$mon = ("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec")[$mon];
+						$year += 1900;
+						my $ampm = ("am", "pm")[$hour > 12];
+						$hour = $hour % 12;
+						push @tableCells, showHTML("$wday $mday $mon $year $hour:$min $ampm");
+					} else {
+						push @tableCells, $record->{$_};
+					}
+				}
+				
+				print CGI::Tr({}, CGI::td({}, \@tableCells));
+			}
+				
+			# print a horizontal line 
+			#print CGI::Tr({}, CGI::td({colspan => $lastn}, CGI::hr({size => 3})));
+			print CGI::end_table({});
+#			print "\n</CENTER>\n\n";
+			print CGI::p(
+	        	      CGI::i("No entries for " . ($safeUser ? "user $safeUser " : '' ) . ($safeSet ? "set $safeSet " : '' ) . ($safeSet and $safeProb ? ', ' : '') . ($safeProb ? "problem $safeProb" : ''))
+			) unless @lines;
+			
+		} else {
+			print CGI::em("Can't open the access log $answer_log");
+		}
+	}
+
+		
+	return "";
+}
+
+sub tableRow {
+	my $self       = shift;
+	my $lastID     = $self->{lastID};
+	my $lastn      = $self->{lastn};
+	my $lasttime   = $self->{lasttime};
+	my $lastdate   = $self->{lastdate};
+	my ($out,$answer,$studentUser,$set,$prob) = "";
+	my ($ID,$rtime,@answers) = @_; pop(@answers);
+	my $date = scalar(localtime($rtime)); $date =~ s/\s+/ /g;
+	my ($day,$month,$mdate,$time,$year) = split(" ",$date);
+	$date = "$mdate $month $year";
+	my $n = 2*(scalar(@answers)+1);
+
+	if ($lastID ne $ID) {
+		if ($lastn) {
+			print qq{<TR><TD COLSPAN="$lastn"><HR SIZE="3"></TD></TR>\n<P>\n\n};
+			print '<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">',"\n";
+		}
+		($studentUser,$set,$prob) = (split('\|',$ID))[1,2,3];
+		$out .= qq{<TR ALIGN="CENTER"><TD COLSPAN="$n"><HR SIZE="3">
+			User: <B>$studentUser</B> &nbsp;
+			Set: <B>$set</B> &nbsp;
+			Problem: <B>$prob</B></TD></TR>\n};
+		$lastID = $ID; $lasttime = 0; $lastdate = "";
+	}
+
+	$out .= qq{<TR><TD COLSPAN="$n"><HR SIZE="1"></TD></TR>\n}
+	if ($rtime - $lasttime > 30*60);
+	$lasttime = $rtime; $lastn = $n;
+
+	if ($lastdate ne $date) {
+		$out .= qq{<TR><TD COLSPAN="$n"><SMALL><I>$date</I></SMALL></TD></TR>\n};
+		$lastdate = $date;
+	}
+
+	$out .= '<TR><TD WIDTH="10"></TD>'.
+		'<TD><FONT COLOR="#808080"><SMALL>'.$time.'</SMALL></FONT></TD>';
+	foreach $answer (@answers) {
+		$answer =~ s/(^\s+|\s+$)//g;
+		$answer = showHTML($answer);
+		$answer = "<SMALL><I>empty</I></SMALL>" if ($answer eq "");
+		$out .= qq{<TD WIDTH="20"></TD><TD NOWRAP>$answer</TD>};
+	}
+	$out .= "</TR>\n";
+	$out;
+}
+
+################################################################################
+# sorts
+################################################################################
+
+sub byUserID      { $a->{user_id}      cmp $b->{user_id}    }
+sub bySetID       { lc($a->{set_id})   cmp lc($b->{set_id})     }
+sub byProblemID   { $a->{problem_id}   <=> $b->{problem_id} }  
+sub byDate        { $a->{date}         cmp $b->{date}       }
+
+sub byUSPD	{ &byUserID || &bySetID || &byProblemID || &byDate }
+
+##################################################
+#
+#  Make HTML symbols printable
+#
+sub showHTML {
+	my $string = shift;
+	return '' unless defined $string;
+	$string =~ s/&/\&amp;/g;
+	$string =~ s/</\&lt;/g;
+	$string =~ s/>/\&gt;/g;
+	$string =~ s/\0/,/g;
+	$string =~ s/ /&nbsp;/g;
+	return $string;
+}
+
+1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/ProblemList.pm b/lib/WeBWorK/ContentGenerator/Instructor/ProblemList.pm
deleted file mode 100644
index f93ffe05ab..0000000000
--- a/lib/WeBWorK/ContentGenerator/Instructor/ProblemList.pm
+++ /dev/null
@@ -1,336 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader: webwork-modperl/lib/WeBWorK/ContentGenerator/Instructor/ProblemList.pm,v 1.14 2003/12/09 01:12:31 sh002i 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
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-# 
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-package WeBWorK::ContentGenerator::Instructor::ProblemList;
-use base qw(WeBWorK::ContentGenerator::Instructor);
-
-=head1 NAME
-
-WeBWorK::ContentGenerator::Instructor::ProblemList - List and edit problems in a set
-
-=cut
-
-use strict;
-use warnings;
-use CGI qw();
-use WeBWorK::Utils qw(readDirectory list2hash max);
-use WeBWorK::DB::Record::Set;
-
-use constant PROBLEM_FIELDS =>[qw(source_file value max_attempts)];
-use constant PROBLEM_USER_FIELDS => [qw(problem_seed status num_correct num_incorrect)];
-
-sub problemElementHTML {
-	my ($fieldName, $fieldValue, $size, $override, $overrideValue) = @_;
-	my $attributeHash = {type=>"text",name=>$fieldName,value=>$fieldValue};
-	$attributeHash->{size} = $size if defined $size;
-	my $html;
-#	my $html = CGI::input($attributeHash);
-	
-	unless (defined $override) {
-		$html = CGI::input($attributeHash);
-	} else {
-		$html = $fieldValue;
-		$attributeHash->{name} = "${fieldName}.override";
-		$attributeHash->{value} = ($override ? $overrideValue : "");
-		$html = "default:".CGI::br().$html.CGI::br()
-			. CGI::checkbox({
-				type => "checkbox",
-				name => "override",
-				label => "override:",
-				value => $fieldName,
-				checked => ($override ? 1 : 0)
-			})
-			. CGI::br()
-			. CGI::input($attributeHash);
-	}
-	
-	return $html;
-}
-
-# pay no attention to the argument list.  Here's what you pass:
-# directoryListHTML($level, $selected, $libraryRoot, @path)
-sub directoryListHTML {
-	my ($level, $selected, @path) = @_;
-	$selected = [$selected] unless ref $selected eq "ARRAY";
-	my $dirName = join "/", @path[0..$level];
-	my $pathInLibrary = join "/", @path[1..$level];
-	my @contents = sort grep {m/\.pg$/ or -d "$dirName/$_" and not m/^\.{1,2}$/} readDirectory($dirName);
-	my %contentsPretty = map {$pathInLibrary . "/" . $_ => (-d "$dirName/$_" ? "$_/" : $_)} @contents;
-	@contents = map {"$pathInLibrary/$_"} @contents; # Make the full path the actual values, so weird user behavior doesn't hurt.
-	@$selected = map {"$pathInLibrary/$_"} @$selected;
-	
-	my $html = ($level eq "0" ? "problem library" : $path[$level]) . CGI::br();
-	$html .= CGI::scrolling_list({
-		name=>"directory_level_$level",
-		values=>\@contents,
-		labels=>\%contentsPretty,
-		default=>$selected,
-		multiple=>'true',
-		size=>"20",
-	});
-	$html .= CGI::br()
-		. CGI::input({type=>"submit", name=>"open_add_$level", value=>"Open/Add"});	
-}
-
-sub initialize {
-	my ($self, $setName) = @_;
-	my $r = $self->{r};
-	my $db = $self->{db};
-	my $ce = $self->{ce};
-	my $authz = $self->{authz};
-	my $user = $r->param('user');
-	my $setRecord = $db->getGlobalSet($setName); # checked
-	die "global set $setName  not found." unless $setRecord;
-
-	$self->{set}  = $setRecord;
-	my @editForUser = $r->param('editForUser');
-	# some useful booleans
-	my $forUsers = scalar(@editForUser);
-	my $forOneUser = $forUsers == 1;
-
-	unless ($authz->hasPermissions($user, "modify_problem_sets")) {
-		$self->{submitError} = "You are not authorized to modify problem sets";
-		return;
-	}
-
-	# build a quick lookup table
-	my %overrides = list2hash $r->param('override');
-
-	# the Problem form was submitted
-	if (defined($r->param('submit_problem_changes'))) {
-		my @problemList = $db->listGlobalProblems($setName);
-		foreach my $problem (@problemList) {
-			my $problemRecord = $db->getGlobalProblem($setName, $problem); # checked
-			die "global $problem for set $setName not found." unless $problemRecord;
-			foreach my $field (@{PROBLEM_FIELDS()}) {
-				my $paramName = "problem.${problem}.${field}";
-				if (defined($r->param($paramName))) {
-					$problemRecord->$field($r->param($paramName));
-				}
-			}
-			$db->putGlobalProblem($problemRecord);
-
-			if ($forOneUser) {
-				my $userProblemRecord = $db->getUserProblem($editForUser[0], $setName, $problem); # checked
-				die " problem $problem for set $setName and effective user $editForUser[0] not found" unless $userProblemRecord;
-				foreach my $field (@{PROBLEM_USER_FIELDS()}) {
-					my $paramName = "problem.${problem}.${field}";
-					if (defined($r->param($paramName))) {
-						$userProblemRecord->$field($r->param($paramName));
-					}
-				}
-				foreach my $field (@{PROBLEM_FIELDS()}) {
-					my $paramName = "problem.${problem}.${field}";
-					if (defined($r->param("${paramName}.override"))) {
-						if (exists $overrides{$paramName}) {
-							$userProblemRecord->$field($r->param("${paramName}.override"));
-						} else {
-							$userProblemRecord->$field(undef);
-						}
-						
-					}
-				}
-				$db->putUserProblem($userProblemRecord);
-				
-			}
-		}
-		foreach my $problem ($r->param('deleteProblem')) {
-			$db->deleteGlobalProblem($setName, $problem);
-		}
-	# The file list field was submitted
-	} elsif (defined $r->param('fileBrowsing')) {
-		my $libraryRoot = $ce->{courseDirs}->{templates};
-		my $count = 0;
-		my $done = 0;
-		my @path = ();
-		my $freeProblemID = max($db->listGlobalProblems($setName)) + 1;
-		
-		while (defined $r->param("directory_level_$count") and not $done) {
-			if (defined $r->param("open_add_$count")) {
-				$done = 1;
-				my @selected = $r->param("directory_level_$count");
-				my $dirFound = 0;
-				foreach my $selected (@selected) {
-					if (-d "$libraryRoot/$selected") {
-						@path = split "/", $selected;
-						shift @path if $path[0] eq ""; # remove the null element from the begining
-						$dirFound = 1;
-						last;
-					}
-				}
-				# Otherwise, create a new global problem for each of the files selected
-				unless ($dirFound) {
-					foreach my $selected (@selected) {
-						my $file = $selected;
-						@path = split "/", $selected;
-						pop @path; # Remove the file name from the path
-						shift @path if $path[0] eq ""; # remove the null element from the begining
-						my $problemRecord = $db->newGlobalProblem();
-						$problemRecord->problem_id($freeProblemID++);
-						$problemRecord->set_id($setName);
-						$problemRecord->source_file($file);
-						$problemRecord->value("1");
-						$problemRecord->max_attempts("-1");
-						$db->addGlobalProblem($problemRecord);
-						$self->assignProblemToAllSetUsers($problemRecord);
-					}
-
-				}
-			}
-			$count++;
-		}
-		$self->{path} = [@path];
-	}
-
-}
-
-sub path {
-	my $self           = shift;
-	my $args           = $_[-1];
-	my $ce = $self->{ce};
-	my $root = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
-	my $set_id     = $self->{set}->set_id;
-	return $self->pathMacro($args,
-		"Home"          => "$root",
-		$courseName     => "$root/$courseName",
-		'instructor'    => "$root/$courseName/instructor",
-		'sets'          => "$root/$courseName/instructor/sets/",
-		"set $set_id"   => "$root/$courseName/instructor/sets/$set_id",
-		'problems'  => '',    
-	);
-}
-
-sub title {
-	my ($self, $setName) = @_;
-	return "Problems in ".$self->{ce}->{courseName}." : ".$setName;
-}
-
-sub body {
-	my ($self, $setName) = @_;
-	my $r = $self->{r};
-	my $db = $self->{db};
-	my $ce = $self->{ce};
-	my $authz = $self->{authz};
-	my $user = $r->param('user');
-	my $courseName = $ce->{courseName};
-	my $setRecord = $db->getGlobalSet($setName); # checked
-	die "Global set $setName not found." unless $setRecord;
-	my @editForUser = $r->param('editForUser');
-	# some useful booleans
-	my $forUsers = scalar(@editForUser);
-	my $forOneUser = $forUsers == 1;
-
-        return CGI::em("You are not authorized to access the Instructor tools.") unless $authz->hasPermissions($user, "access_instructor_tools");
-	
-	my $userCount = $db->listUsers();
-	my $setUserCount = $db->countSetUsers($setName);
-	my $userCountMessage = "This set is assigned to " . $self->userCountMessage($setUserCount, $userCount) . ".";
-
-	if (@editForUser) {
-		print CGI::p("$userCountMessage  Editing user-specific overrides for ". CGI::b(join ", ", @editForUser));
-	} else {
-		print CGI::p($userCountMessage);
-	}
-	
-	## Problems Form ##
-	my @problemList = $db->listGlobalProblems($setName);
-	print CGI::a({name=>"problems"});
-	print CGI::h2({}, "Problems");
-	if (scalar(@problemList)) {
-		print CGI::start_form({method=>"POST", action=>$r->uri.'#problems'});
-		print CGI::start_table({border=>1, cellpadding=>4});
-		print CGI::Tr({}, CGI::th({}, [
-			($forUsers ? () : ("Delete?")), 
-			"Problem",
-			($forUsers ? ("Status", "Problem Seed") : ()),
-			"Source File", "Max. Attempts", "Weight",
-			($forUsers ? ("Number Correct", "Number Incorrect") : ())
-		]));
-		foreach my $problem (sort {$a <=> $b} @problemList) {
-			my $problemRecord = $db->getGlobalProblem($setName, $problem); # checked
-			die "global problem $problem in set $setName not found." unless $problemRecord;
-			my $problemID = $problemRecord->problem_id;
-			my $userProblemRecord;
-			my %problemOverrideArgs;
-
-			if ($forOneUser) {
-				$userProblemRecord = $db->getUserProblem($editForUser[0], $setName, $problem); # checked
-				die "problem $problem for set $setName and user $editForUser[0] not found. " unless $userProblemRecord;
-				foreach my $field (@{PROBLEM_FIELDS()}) {
-					$problemOverrideArgs{$field} = [defined $userProblemRecord->$field, $userProblemRecord->$field];
-				}
-	#		} elsif ($forUsers) {
-	#			foreach my $field (@{PROBLEM_FIELDS()}) {
-	#				$problemOverrideArgs{$field} = ["", ""];
-	#			}
-			} else {
-				foreach my $field (@{PROBLEM_FIELDS()}) {
-					$problemOverrideArgs{$field} = [undef, undef];
-				}
-			}
-
-			print CGI::Tr({}, 
-				CGI::td({}, [
-					($forUsers ? () : (CGI::input({type=>"checkbox", name=>"deleteProblem", value=>$problemID}))),
-					CGI::a({href=>$ce->{webworkURLs}->{root}."/$courseName/instructor/pgProblemEditor/".$setName.'/'.$problemID.'?'.$self->url_authen_args}, $problemID),
-					($forUsers ? (
-						problemElementHTML("problem.${problemID}.status", $userProblemRecord->status, "7"),
-						problemElementHTML("problem.${problemID}.problem_seed", $userProblemRecord->problem_seed, "7"),
-					) : ()),
-					problemElementHTML("problem.${problemID}.source_file", $problemRecord->source_file, "40", @{$problemOverrideArgs{source_file}}),
-					problemElementHTML("problem.${problemID}.max_attempts",$problemRecord->max_attempts,"7", @{$problemOverrideArgs{max_attempts}}),
-					problemElementHTML("problem.${problemID}.value",$problemRecord->value,"7", @{$problemOverrideArgs{value}}),
-					($forUsers ? (
-						problemElementHTML("problem.${problemID}.num_correct", $userProblemRecord->num_correct, "7"),
-						problemElementHTML("problem.${problemID}.num_incorrect", $userProblemRecord->num_incorrect, "7")
-					) : ())
-				])
-
-			)
-		}
-		print CGI::end_table();
-		print $self->hiddenEditForUserFields(@editForUser);
-		print $self->hidden_authen_fields;
-		print CGI::input({type=>"submit", name=>"submit_problem_changes", value=>"Save Problem Changes"});
-		print CGI::end_form();
-	} else {
-		print CGI::p("This set doesn't contain any problems yet.");
-	}
-	
-	unless ($forUsers) {
-		my $libraryRoot = $ce->{courseDirs}->{templates};
-		my @path = defined $self->{path} ? @{$self->{path}} : ();
-		unshift @path, $libraryRoot;
-		print CGI::a({name=>"addProblem"});
-		print CGI::h3({}, "Add Problem(s)");
-		print CGI::start_form({method=>"post", action=>$r->uri.'#addProblem'});
-		print CGI::input({type=>"hidden", name=>"fileBrowsing", value=>"Yes"});
-		print CGI::start_table();
-		my $columns = "";
-		for (my $counter = 0; $counter < scalar(@path); $counter++) {
-			$columns .= CGI::td(directoryListHTML ($counter, (exists $path[$counter+1] ? $path[$counter+1] : []), @path));
-		}
-		print CGI::Tr($columns);
-		print CGI::end_table();
-		print $self->hidden_authen_fields;
-		print CGI::end_form();
-	}
-	
-	return "";
-}
-
-1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm b/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm
new file mode 100644
index 0000000000..1d48afa2d1
--- /dev/null
+++ b/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm
@@ -0,0 +1,2159 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# 
+# 
+# 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::ContentGenerator::Instructor::ProblemSetDetail;
+use base qw(WeBWorK::ContentGenerator::Instructor);
+
+=head1 NAME
+
+WeBWorK::ContentGenerator::Instructor::ProblemSetDetail - Edit general set and specific user/set information as well as problem information
+
+=cut
+
+use strict;
+use warnings;
+#use CGI qw(-nosticky );
+use WeBWorK::CGI;
+use WeBWorK::HTML::ComboBox qw/comboBox/;
+use WeBWorK::Utils qw(readDirectory list2hash sortByName listFilesRecursive max cryptPassword);
+use WeBWorK::Utils::Tasks qw(renderProblems);
+use WeBWorK::Debug;
+# IP RESTRICT
+use WeBWorK::HTML::ScrollingRecordList qw/scrollingRecordList/;
+
+# Important Note: the following two sets of constants may seem similar 
+# 	but they are functionally and semantically different
+
+# these constants determine which fields belong to what type of record
+use constant SET_FIELDS => [qw(set_header hardcopy_header open_date due_date answer_date visible enable_reduced_scoring restrict_ip relax_restrict_ip assignment_type attempts_per_version version_time_limit time_limit_cap versions_per_interval time_interval problem_randorder problems_per_page hide_score:hide_score_by_problem hide_work)];
+use constant PROBLEM_FIELDS =>[qw(source_file value max_attempts)];
+use constant USER_PROBLEM_FIELDS => [qw(problem_seed status num_correct num_incorrect)];
+
+# these constants determine what order those fields should be displayed in
+use constant HEADER_ORDER => [qw(set_header hardcopy_header)];
+use constant PROBLEM_FIELD_ORDER => [qw(problem_seed status value max_attempts attempted last_answer num_correct num_incorrect)];
+# for gateway sets, we don't want to allow users to change max_attempts on a per
+#    problem basis, as that's nothing but confusing.
+use constant GATEWAY_PROBLEM_FIELD_ORDER => [qw(problem_seed status value attempted last_answer num_correct num_incorrect)];
+
+# we exclude the gateway set fields from the set field order, because they
+#     are only displayed for sets that are gateways.  this results in a bit of
+#     convoluted logic below, but it saves burdening people who are only using
+#     homework assignments with all of the gateway parameters
+# FIXME: in the long run, we may want to let hide_score and hide_work be
+# FIXME: set for non-gateway assignments.  right now (11/30/06) they are
+# FIXME: only used for gateways
+use constant SET_FIELD_ORDER => [qw(open_date due_date answer_date visible enable_reduced_scoring restrict_ip relax_restrict_ip assignment_type)];
+# use constant GATEWAY_SET_FIELD_ORDER => [qw(attempts_per_version version_time_limit time_interval versions_per_interval problem_randorder problems_per_page hide_score hide_work)];
+use constant GATEWAY_SET_FIELD_ORDER => [qw(version_time_limit time_limit_cap attempts_per_version time_interval versions_per_interval problem_randorder problems_per_page hide_score:hide_score_by_problem hide_work)];
+
+# this constant is massive hash of information corresponding to each db field.
+# override indicates for how many students at a time a field can be overridden
+# this hash should make it possible to NEVER have explicitly: if (somefield) { blah() }
+#
+#	All but name are optional
+#	some_field => {
+#		name      => "Some Field",
+#		type      => "edit",		# edit, choose, hidden, view - defines how the data is displayed
+#		size      => "50",		# size of the edit box (if any)
+#		override  => "none",		# none, one, any, all - defines for whom this data can/must be overidden
+#		module    => "problem_list",	# WeBWorK module 
+#		default   => 0			# if a field cannot default to undefined/empty what should it default to
+#		labels    => {			# special values can be hashed to display labels
+#				1 => "Yes",
+#				0 => "No",
+#		},
+#               convertby => 60,                # divide incoming database field values by this, and multiply when saving
+
+use constant BLANKPROBLEM => 'blankProblem.pg';
+
+use constant  FIELD_PROPERTIES => {
+	# Set information
+	set_header => {
+		name      => "Set Header",
+		type      => "edit",
+		size      => "50",
+		override  => "all",
+		module    => "problem_list",
+		default   => "",
+	},
+	hardcopy_header => {
+		name      => "Hardcopy Header",
+		type      => "edit",
+		size      => "50",
+		override  => "all",
+		module    => "hardcopy_preselect_set",
+		default   => "",		
+	},
+	open_date => {
+		name      => "Opens",
+		type      => "edit",
+		size      => "26",
+		override  => "any",
+		labels    => {
+				#0 => "None Specified",
+				"" => "None Specified",
+		},
+	},
+	due_date => {
+		name      => "Answers Due",
+		type      => "edit",
+		size      => "26",
+		override  => "any",
+		labels    => {
+				#0 => "None Specified",
+				"" => "None Specified",
+		},
+	},
+	answer_date => {
+		name      => "Answers Available",
+		type      => "edit",
+		size      => "26",
+		override  => "any",
+		labels    => {
+				#0 => "None Specified",
+				"" => "None Specified",
+		},
+	},
+	visible => {
+		name      => "Visible to Students",
+		type      => "choose",
+		override  => "all",
+		choices   => [qw( 0 1 )],
+		labels    => {
+				1 => "Yes",
+				0 => "No",
+		},
+	},
+	enable_reduced_scoring => {
+		name      => "Reduced Credit Enabled",
+		type      => "choose",
+		override  => "all",
+		choices   => [qw( 0 1 )],
+		labels    => {
+				1 => "Yes",
+				0 => "No",
+		},
+	},
+	restrict_ip => {
+		name      => "Restrict Access by IP",
+		type      => "choose",
+		override  => "any",
+		choices   => [qw( No RestrictTo DenyFrom )],
+		labels    => {
+				No => "No",
+				RestrictTo => "Restrict To",
+				DenyFrom => "Deny From",
+		},
+		default   => 'No',
+	},
+	relax_restrict_ip => { 
+		name      => "Relax IP restrictions when?",
+		type      => "choose",
+		override  => "any",
+		choices   => [qw( No AfterAnswerDate AfterVersionAnswerDate )],
+		labels    => {
+				No => "Never",
+				AfterAnswerDate => "After set answer date",
+				AfterVersionAnswerDate => "(gw/quiz) After version answer date",
+		},
+		default   => 'No',
+	},
+	assignment_type => {
+		name      => "Assignment type",
+		type      => "choose",
+		override  => "all",
+		choices   => [qw( default gateway proctored_gateway )],
+		labels    => {	default => "homework",
+				gateway => "gateway/quiz",
+				proctored_gateway => "proctored gateway/quiz",
+		},
+	},
+	version_time_limit => {
+		name      => "Test Time Limit (min)",
+		type      => "edit",
+		size      => "4",
+		override  => "any",
+#		labels    => {	"" => 0 },  # I'm not sure this is quite right
+		convertby => 60,
+	},
+	time_limit_cap => {
+		name      => "Cap Test Time at Set Due Date?",
+		type      => "choose",
+		override  => "all",
+		choices   => [qw(0 1)],
+		labels    => { '0' => 'No', '1' => 'Yes' },
+	},
+	attempts_per_version => {
+		name      => "Number of Graded Submissions per Test",
+		type      => "edit",
+		size      => "3",
+		override  => "any",
+#		labels    => {	"" => 1 },
+	},
+	time_interval => {
+		name      => "Time Interval for New Test Versions (min; 0=infty)",
+		type      => "edit",
+                size      => "5",
+		override  => "any",
+#		labels    => {	"" => 0 },
+		convertby => 60,
+	},
+	versions_per_interval => {
+		name      => "Number of Tests per Time Interval (0=infty)",
+		type      => "edit",
+                size      => "3",
+		override  => "any",
+		default   => "0",
+		format    => '[0-9]+',      # an integer, possibly zero
+#		labels    => {	"" => 0 },
+#		labels    => {	"" => 1 },
+	},
+	problem_randorder => {
+		name      => "Order Problems Randomly",
+		type      => "choose",
+		choices   => [qw( 0 1 )],
+		override  => "any",
+		labels    => {	0 => "No", 1 => "Yes" },
+	},
+	problems_per_page => {
+	        name      => "Number of Problems per Page (0=all)",
+		type      => "edit",
+		size      => "3",
+		override  => "any",
+		default   => "0",
+#		labels    => { "" => 0 },
+	},
+	'hide_score:hide_score_by_problem' => {
+		name      => "Show Scores on Finished Assignments?",
+		type      => "choose",
+		choices   => [ qw( N: Y:N BeforeAnswerDate:N Y:Y BeforeAnswerDate:Y ) ],
+		override  => "any",
+		labels    => { 'N:' => 'Yes', 'Y:N' => 'No', 'BeforeAnswerDate:N' => 'Only after set answer date', 'Y:Y' => 'Totals only (not problem scores)', 'BeforeAnswerDate:Y' => 'Totals only, only after answer date' },
+	},
+	hide_work         => {
+		name      => "Show Student Work on Finished Tests",
+		type      => "choose",
+		choices   => [ qw(N Y BeforeAnswerDate) ],
+		override  => "any",
+		labels    => { 'N' => "Yes", 'Y' => "No", 'BeforeAnswerDate' => 'Only after set answer date' },
+	},
+	# in addition to the set fields above, there are a number of things
+	#    that are set but aren't in this table:
+	#    any set proctor information (which is in the user tables), and
+	#    any set location restriction information (which is in the 
+	#    location tables)
+	#
+	# Problem information
+	source_file => {
+		name      => "Source File",
+		type      => "edit",
+		size      => 50,
+		override  => "any",
+		default   => "",
+	},
+	value => {
+		name      => "Weight",
+		type      => "edit",
+		size      => 6,
+		override  => "any",
+	},
+	max_attempts => {
+		name      => "Max&nbsp;attempts",
+		type      => "edit",
+		size      => 6,
+		override  => "any",
+		labels    => {
+				"-1" => "unlimited",
+		},
+	},
+	problem_seed => {
+		name      => "Seed",
+		type      => "edit",
+		size      => 6,
+		override  => "one",
+		
+	},
+	status => {
+		name      => "Status",
+		type      => "edit",
+		size      => 6,
+		override  => "one",
+		default   => 0,
+	},
+	attempted => {
+		name      => "Attempted",
+		type      => "hidden",
+		override  => "none",
+		choices   => [qw( 0 1 )],
+		labels    => {
+				1 => "Yes",
+				0 => "No",
+		},
+		default   => 0,
+	},
+	last_answer => {
+		name      => "Last Answer",
+		type      => "hidden",
+		override  => "none",
+	},
+	num_correct => {
+		name      => "Correct",
+		type      => "hidden",
+		override  => "none",
+		default   => 0,
+	},
+	num_incorrect => {
+		name      => "Incorrect",
+		type      => "hidden",
+		override  => "none",
+		default   => 0,
+	},	
+};
+
+use constant FIELD_PROPERTIES_GWQUIZ => {
+	max_attempts => {
+		type	=> "hidden",
+		override=> "any",
+	}
+};
+
+# Create a table of fields for the given parameters, one row for each db field
+# if only the setID is included, it creates a table of set information
+# if the problemID is included, it creates a table of problem information
+sub FieldTable {
+	my ($self, $userID, $setID, $problemID, $globalRecord, $userRecord, $isGWset) = @_;
+
+	my $r = $self->r;	
+	my @editForUser = $r->param('editForUser');
+	my $forUsers    = scalar(@editForUser);
+	my $forOneUser  = $forUsers == 1;
+
+	my @fieldOrder;
+
+	# needed for gateway output
+	my $gwFields = '';
+	# $isGWset will come in undef if we don't need to worry about it
+	$isGWset = 0 if ( ! defined( $isGWset ) );
+	# are we editing a set version?
+	my $setVersion = (defined($userRecord) && $userRecord->can("version_id")) ? 1 : 0;
+
+	# needed for ip restrictions
+	my $ipFields = '';
+	my $ipDefaults;
+	my $numLocations = 0;
+	my $ipOverride;
+
+	# needed for set-level proctor
+	my $procFields = '';
+
+	if (defined $problemID) {
+		@fieldOrder = ($isGWset) ? @{ GATEWAY_PROBLEM_FIELD_ORDER() } :
+			@{ PROBLEM_FIELD_ORDER() };
+	} else {
+		@fieldOrder = @{ SET_FIELD_ORDER() };
+
+		($gwFields, $ipFields, $numLocations, $procFields) = $self->extraSetFields($userID, $setID, $globalRecord, $userRecord, $forUsers);
+	}
+
+	my $output = CGI::start_table({border => 0, cellpadding => 1});
+	if ($forUsers) {
+		$output .= CGI::Tr({},
+		    CGI::th({colspan=>"2"}, "&nbsp;"),
+			CGI::th({colspan=>"1"}, "User Values"),
+			CGI::th({}, "Class values"),
+		);
+	}
+	foreach my $field (@fieldOrder) {
+		my %properties; 
+		
+		
+		if($isGWset && defined( FIELD_PROPERTIES_GWQUIZ->{$field} )){
+			%properties = %{ FIELD_PROPERTIES_GWQUIZ->{$field} };
+		}
+		else{
+			%properties = %{ FIELD_PROPERTIES()->{$field} };
+		}
+		
+		# we don't show the ip restriction option if there are 
+		#    no defined locations, nor the relax_restrict_ip option
+		#    if we're not restricting ip access
+		next if ( $field eq 'restrict_ip' && ( ! $numLocations || $setVersion ) );
+		next if ($field eq 'relax_restrict_ip' &&
+			 (! $numLocations || $setVersion ||
+			  ($forUsers && $userRecord->restrict_ip eq 'No') ||
+			  (! $forUsers && 
+			   ( $globalRecord->restrict_ip eq '' ||
+			     $globalRecord->restrict_ip eq 'No' ) ) ) );
+		# skip the problem seed if we're editing a gateway set for users,
+		#    but aren't editing a set version
+		next if ( $field eq 'problem_seed'  &&
+			  ( $isGWset && $forUsers && ! $setVersion ) );
+
+		unless ($properties{type} eq "hidden") {
+			$output .= CGI::Tr({}, CGI::td({}, [$self->FieldHTML($userID, $setID, $problemID, $globalRecord, $userRecord, $field)])) . "\n";
+	}
+
+		# finally, put in extra fields that are exceptions to the 
+		#    usual display mechanism
+		if ( $field eq 'restrict_ip' && $ipFields ) {
+			$output .= $ipFields;
+		}
+					      
+		if ( $field eq 'assignment_type' ) {
+			$output .= "$procFields\n$gwFields\n";
+		}
+	} 
+
+	if (defined $problemID) {
+		#my $problemRecord = $r->{db}->getUserProblem($userID, $setID, $problemID);
+		my $problemRecord = $userRecord; # we get this from the caller, hopefully
+		$output .= CGI::Tr({}, CGI::td({}, ["","Attempts", ($problemRecord->num_correct || 0) + ($problemRecord->num_incorrect || 0)])) if $forOneUser;
+	}		
+	$output .= CGI::end_table();
+	
+	return $output;
+}
+
+# Returns a list of information and HTML widgets
+# for viewing and editing the specified db fields
+# if only the setID is included, it creates a list of set information
+# if the problemID is included, it creates a list of problem information
+sub FieldHTML {
+	my ($self, $userID, $setID, $problemID, $globalRecord, $userRecord, $field) = @_;
+	
+	my $r = $self->r;
+	my $db = $r->db;
+	my @editForUser = $r->param('editForUser');
+	my $forUsers    = scalar(@editForUser);
+	my $forOneUser  = $forUsers == 1;
+
+	#my ($globalRecord, $userRecord, $mergedRecord);
+	#if (defined $problemID) { 	
+	#	$globalRecord = $db->getGlobalProblem($setID, $problemID);
+	#	$userRecord = $db->getUserProblem($userID, $setID, $problemID);
+	#	#$mergedRecord = $db->getMergedProblem($userID, $setID, $problemID); # never used --sam
+	#} else {
+	#	$globalRecord = $db->getGlobalSet($setID);
+	#	$userRecord = $db->getUserSet($userID, $setID);
+	#	#$mergedRecord = $db->getMergedSet($userID, $setID); # never user --sam
+	#}
+	
+	return "No data exists for set $setID and problem $problemID" unless $globalRecord;
+	return "No user specific data exists for user $userID" if $forOneUser and $globalRecord and not $userRecord;
+	
+	my %properties = %{ FIELD_PROPERTIES()->{$field} };
+	my %labels = %{ $properties{labels} };
+	return "" if $properties{type} eq "hidden";
+	return "" if $properties{override} eq "one" && not $forOneUser;
+	return "" if $properties{override} eq "none" && not $forOneUser;
+	return "" if $properties{override} eq "all" && $forUsers;
+			
+	my $edit = ($properties{type} eq "edit") && ($properties{override} ne "none");
+	my $choose = ($properties{type} eq "choose") && ($properties{override} ne "none");
+	
+# FIXME: allow one selector to set multiple fields
+#	my $globalValue = $globalRecord->{$field};
+# 	my $userValue = $userRecord->{$field};
+	my ($globalValue, $userValue) = ('', '');
+	my $blankfield = '';
+	if ( $field =~ /:/ ) {
+		my @gVals = ();
+		my @uVals = ();
+		my @bVals = ();
+		foreach my $f ( split(/:/, $field) ) {
+			# hmm.  this directly references the data in the 
+			#    record rather than calling the access method, 
+			#    thereby avoiding errors if the userRecord is 
+			#    undefined.  that seems a bit suspect, but it's
+			#    used below so we'll leave it here.
+
+			push(@gVals, $globalRecord->{$f} );
+			push(@uVals, $userRecord->{$f} );    # (defined($userRecord->{$f})?$userRecord->{$f}:'') );
+			push(@bVals, '');
+		}
+		# I don't like this, but combining multiple values is a bit messy
+		$globalValue = (grep {defined($_)} @gVals) ? join(':', (map { defined($_) ? $_ : '' } @gVals )) : undef;
+		$userValue = (grep {defined($_)} @uVals) ? join(':', (map { defined($_) ? $_ : '' } @uVals )) : undef;
+		$blankfield = join(':', @bVals);
+	} else {
+		$globalValue = $globalRecord->{$field};
+		$userValue = $userRecord->{$field};
+	}
+
+	# use defined instead of value in order to allow 0 to printed, e.g. for the 'value' field
+	$globalValue = (defined($globalValue)) ? ($labels{$globalValue || ""} || $globalValue) : "";
+	$userValue = (defined($userValue)) ? ($labels{$userValue || ""} || $userValue) : $blankfield;
+
+	if ($field =~ /_date/) {
+		$globalValue = $self->formatDateTime($globalValue) if defined $globalValue && $globalValue ne $labels{""};
+		# this is still fragile, but the check for blank (as opposed to 0) $userValue seems to prevent errors when no user has been assigned.
+		$userValue = $self->formatDateTime($userValue) if defined $userValue && $userValue =~/\S/ && $userValue ne $labels{""};
+	}
+
+	if ( defined($properties{convertby}) && $properties{convertby} ) {
+		$globalValue = $globalValue/$properties{convertby} if $globalValue;
+		$userValue = $userValue/$properties{convertby} if $userValue;
+	}
+
+	# check to make sure that a given value can be overridden
+	my %canOverride = map { $_ => 1 } (@{ PROBLEM_FIELDS() }, @{ SET_FIELDS() });
+	my $check = $canOverride{$field};
+
+	# $recordType is a shorthand in the return statement for problem or set
+	# $recordID is a shorthand in the return statement for $problemID or $setID
+	my $recordType = "";
+	my $recordID = "";
+	if (defined $problemID) {
+		$recordType = "problem";
+		$recordID = $problemID;
+	} else {
+		$recordType = "set";
+		$recordID = $setID;
+	}
+	
+	# $inputType contains either an input box or a popup_menu for changing a given db field
+	my $inputType = "";
+	if ($edit) {
+		$inputType = CGI::input({
+				name => "$recordType.$recordID.$field",
+				value => $r->param("$recordType.$recordID.$field") || ($forUsers ? $userValue : $globalValue),
+				size => $properties{size} || 5,
+		});
+	} elsif ($choose) {
+		# Note that in popup menus, you're almost guaranteed to have the choices hashed to labels in %properties
+		# but $userValue and and $globalValue are the values in the hash not the keys
+		# so we have to use the actual db record field values to select our default here.
+
+		# FIXME: this allows us to set one selector from two (or more) fields
+		# if $field matches /:/, we have to get two fields to get the data we need here
+		my $value = $r->param("$recordType.$recordID.$field");
+		if ( ! $value && $field =~ /:/ ) { 
+			my @fields = split(/:/, $field);
+			$value = '';
+			foreach my $f ( @fields ) {
+				$value .= ($forUsers && $userRecord->$f ne '' ? $userRecord->$f : $globalRecord->$f) . ":";
+			}
+			$value =~ s/:$//;
+		} elsif ( ! $value ) {
+			$value = ($forUsers && $userRecord->$field ne '' ? $userRecord->$field : $globalRecord->$field);
+		}
+			
+		$inputType = CGI::popup_menu({
+				name => "$recordType.$recordID.$field",
+				values => $properties{choices},
+				labels => \%labels,
+				default => $value,
+		});
+	}
+	
+	my $gDisplVal = defined($properties{labels}) && defined($properties{labels}->{$globalValue}) ? $properties{labels}->{$globalValue} : $globalValue;
+
+	# FIXME: adding ":" in the checked => allows for multiple fields to be set by one selector
+#	return (($forUsers && $edit && $check) ? CGI::checkbox({
+	return (($forUsers && $check) ? CGI::checkbox({
+				type => "checkbox",
+				name => "$recordType.$recordID.$field.override",
+				label => "",
+				value => $field,
+				checked => $r->param("$recordType.$recordID.$field.override") || ($userValue ne ($labels{""} || $blankfield) ? 1 : 0),
+		}) : "",
+		$properties{name},
+		$inputType,
+		$forUsers ? " $gDisplVal" : "",
+	);
+}
+
+# return weird fields that are non-native or which are displayed
+#    for only some sets
+sub extraSetFields {
+	my ($self,$userID,$setID,$globalRecord,$userRecord,$forUsers) = @_;
+	my $db = $self->r->{db};
+
+	my ($gwFields, $ipFields, $ipDefaults, $numLocations, $ipOverride,
+	    $procFields) = ( '', '', '', 0, '', '' );
+
+	# if we're dealing with a gateway, set up a table of gateway fields
+	my $nF = 0;  # this is the number of columns in the set field table
+	if ( $globalRecord->assignment_type() =~ /gateway/ ) {
+		my $gwhdr = "\n<!-- begin gwoutput table -->\n";
+
+		foreach my $gwfield ( @{ GATEWAY_SET_FIELD_ORDER() } ) {
+
+			# don't show template gateway fields when editing
+			#    set versions
+			next if ( ( $gwfield eq "time_interval" ||
+				    $gwfield eq "versions_per_interval" ) &&
+				  ( $forUsers &&
+				    $userRecord->can('version_id') ) );
+
+			my @fieldData = 
+			    ($self->FieldHTML($userID, $setID, undef, 
+					      $globalRecord, $userRecord, 
+					      $gwfield));
+			if ( @fieldData && defined($fieldData[1]) and 
+			     $fieldData[1] ne '' ) {
+				$nF = @fieldData if ( @fieldData > $nF );
+				$gwFields .= CGI::Tr({}, 
+					CGI::td({}, [@fieldData]));
+		    	}
+		}
+		$gwhdr .= CGI::Tr({},CGI::td({colspan=>$nF}, 
+					     CGI::em("Gateway parameters")))
+		    if ( $nF );
+		$gwFields = "$gwhdr$gwFields\n" .
+			"<!-- end gwoutput table -->\n";
+	}
+
+	# if we have a proctored test, then also generate a proctored 
+	#    set password input 
+	if ( $globalRecord->assignment_type eq 'proctored_gateway' && ! $forUsers ) {
+		my $nfm1 = $nF - 1;
+		$procFields = CGI::Tr({},CGI::td({},''),
+			CGI::td({colspan=>$nfm1},
+				CGI::em("Proctored tests require proctor " .
+					"authorization to start and to " .
+					"grade.  Provide a password to have " .
+					"a single password for all students " .
+					"to start a proctored test.")));
+		# we use a routine other than FieldHTML because of getting
+		#    the default value here
+		my @fieldData = 
+			$self->proctoredFieldHTML($userID, $setID, 
+						  $globalRecord);
+		$procFields .= CGI::Tr({}, 
+			CGI::td({}, [@fieldData]));
+	}
+
+	# finally, figure out what ip selector fields we want to include
+	my @locations = sort {$a cmp $b} ($db->listLocations());
+	$numLocations = @locations;
+
+	# we don't show ip selector fields if we're editing a set version
+	if ( ! defined( $userRecord ) ||
+	     ( defined( $userRecord ) && ! $userRecord->can("version_id") ) ) {
+		if ( ( ! $forUsers && $globalRecord->restrict_ip &&
+		       $globalRecord->restrict_ip ne 'No' ) ||
+		     ( $forUsers && $userRecord->restrict_ip ne 'No' ) ) {
+
+			my @globalLocations = $db->listGlobalSetLocations($setID);
+			# what ip locations should be selected?
+			my @defaultLocations = ();
+			if ( $forUsers && 
+			     ! $db->countUserSetLocations($userID, $setID) ) { 
+				@defaultLocations = @globalLocations;
+				$ipOverride = 0;
+			} elsif ( $forUsers ) {
+				@defaultLocations = $db->listUserSetLocations($userID, $setID);
+				$ipOverride = 1;
+			} else {
+				@defaultLocations = @globalLocations;
+			}
+			my $ipDefaults = join(', ', @globalLocations);
+
+			my $ipSelector = CGI::scrolling_list({
+				-name => "set.$setID.selected_ip_locations",
+				-values => [ @locations ], 
+				-default => [ @defaultLocations ], 
+				-size => 5,
+				-multiple => 'true'});
+
+			my $override = ($forUsers) ? 
+				CGI::checkbox({ type => "checkbox",
+					name => "set.$setID.selected_ip_locations.override",
+					label => "",
+					checked => $ipOverride }) : '';
+			$ipFields .= CGI::Tr({-valign=>'top'},
+					     CGI::td({}, [ $override, 
+						   'Restrict Locations', 
+						   $ipSelector, 
+						   $forUsers ? 
+						   " $ipDefaults" : '', ]
+					),
+			);
+		}
+	}
+	return($gwFields, $ipFields, $numLocations, $procFields);
+}
+
+sub proctoredFieldHTML {
+	my ( $self, $userID, $setID, $globalRecord ) = @_;
+
+	my $r = $self->r;
+	my $db = $r->db;
+
+	# note that this routine assumes that the login proctor password
+	#    is something that can only be changed for the global set
+
+	# if the set doesn't require a login proctor, then we can assume
+	#    that one doesn't exist; otherwise, we need to check the 
+	#    database to find if there's an already defined password
+	my $value = '';
+	if ( $globalRecord->restricted_login_proctor eq 'Yes' &&
+	     $db->existsPassword("set_id:$setID") ) {
+		$value = '********';
+	}
+
+	return( ( '',
+		  'Password (Leave blank for regular proctoring)',
+		  CGI::input({ name=>"set.$setID.restricted_login_proctor_password",
+			       value=>$value,
+			       size=>10,
+		       }),
+		  '' ) );
+}
+
+# creates a popup menu of all possible problem numbers (for possible rearranging)
+sub problem_number_popup {
+	my $num = shift;
+	my $total = shift;
+	return (CGI::popup_menu(-name => "problem_num_$num",
+				-values => [1..$total],
+				-default => $num));
+}
+
+# handles rearrangement necessary after changes to problem ordering
+sub handle_problem_numbers {
+	my $newProblemNumbersref = shift;
+	my %newProblemNumbers = %$newProblemNumbersref;
+	my $maxNum = shift;
+	my $db = shift;
+	my $setID = shift;
+	my $force = shift || 0;
+	my @sortme=();
+	my ($j, $val);
+
+	# keys are current problem numbers, values are target problem numbers
+	foreach $j (keys %newProblemNumbers) {
+		# we don't want to act unless all problems have been assigned a new problem number, so if any have not, return
+		return "" if (not defined $newProblemNumbers{"$j"});
+		# if the problem has been given a new number, we reduce the "score" of the problem by the original number of the problem
+		# when multiple problems are assigned the same number, this results in the last one ending up first -- FIXME?
+		if ($newProblemNumbers{"$j"} != $j) {
+			# force always gets set if reordering is done, so don't expect to be able to delete a problem,
+			# reorder some other problems, and end up with a hole -- FIXME
+			$force = 1;
+			$val = 1000 * $newProblemNumbers{$j} - $j;
+		} else {
+			$val = 1000 * $newProblemNumbers{$j};
+		}
+		# store a mapping between current problem number and score (based on currnet and new problem number)
+		push @sortme, [$j, $val];
+		# replace new problem numbers in hash with the (global) problems themselves
+		$newProblemNumbers{$j} = $db->getGlobalProblem($setID, $j);
+		die "global $j for set $setID not found." unless $newProblemNumbers{$j};
+	}
+
+	# we don't have to do anything if we're not getting rid of holes
+	return "" unless $force;
+
+	# sort the curr. prob. num./score pairs by score
+	@sortme = sort {$a->[1] <=> $b->[1]} @sortme;
+	# now, for global and each user with this set, loop through problem list
+	#   get all of the problem records
+	# assign new problem numbers
+	# loop - if number is new, put the problem record
+	# print "Sorted to get ". join(', ', map {$_->[0] } @sortme) ."<p>\n";
+
+
+	# Now, three stages.  First global values
+
+	for ($j = 0; $j < scalar @sortme; $j++) {
+		if($sortme[$j][0] == $j + 1) {
+			# if the jth problem (according to the new ordering) is in the right place (problem IDs are numbered from 1, hence $j+1)
+			# do nothing
+		} elsif (not defined $newProblemNumbers{$j + 1}) {
+			# otherwise, if there's a hole for it, add it there
+			$newProblemNumbers{$sortme[$j][0]}->problem_id($j + 1);
+			$db->addGlobalProblem($newProblemNumbers{$sortme[$j][0]});
+		} else {
+			# otherwise, overwrite the data for the problem that's already there with the jth problem's data (with a changed problemID)
+			$newProblemNumbers{$sortme[$j][0]}->problem_id($j + 1);
+			$db->putGlobalProblem($newProblemNumbers{$sortme[$j][0]});
+		}
+	}
+
+	my @setUsers = $db->listSetUsers($setID);
+	my (@problist, $user);
+
+	foreach $user (@setUsers) {
+		# grab a copy of each UserProblem for this user. @problist can be sparse (if problems were deleted)
+		for $j (keys %newProblemNumbers) {
+			$problist[$j] = $db->getUserProblem($user, $setID, $j);
+		}
+		for($j = 0; $j < scalar @sortme; $j++) { 
+			if ($sortme[$j][0] == $j + 1) {
+				# same as above -- the jth problem is in the right place, so don't worry about it
+				# do nothing
+			} elsif ($problist[$sortme[$j][0]]) {
+				# we've made sure the user's problem actually exists HERE, since we want to be able to fail gracefullly if it doesn't
+				# the problem with the original conditional below is that %newProblemNumbers maps oldids => global problem record
+				# we need to check if the target USER PROBLEM exists, which is what @problist knows
+				#if (not defined $newProblemNumbers{$j + 1}) {
+				if (not defined $problist[$j+1]) {
+					# same as above -- there's a hole for that problem to go into, so add it in its new place
+					$problist[$sortme[$j][0]]->problem_id($j + 1); 
+					$db->addUserProblem($problist[$sortme[$j][0]]); 
+				} else { 
+					# same as above -- there's a problem already there, so overwrite its data with the data from the jth problem
+					$problist[$sortme[$j][0]]->problem_id($j + 1); 
+					$db->putUserProblem($problist[$sortme[$j][0]]); 
+				} 
+			} else {
+				warn "UserProblem missing for user=$user set=$setID problem=$sortme[$j][0]. This may indicate database corruption.\n";
+				# when a problem doesn't exist in the target slot, a new problem gets added there, but the original problem
+				# never gets overwritten (because there wan't a problem it would have to get exchanged with)
+				# i think this can get pretty complex. consider 1=>2, 2=>3, 3=>4, 4=>1 where problem 1 doesn't exist for some user:
+				# @sortme[$j][0] will contain: 4, 1, 2, 3
+				# - problem 1 will get **added** with the data from problem 4 (because problem 1 doesn't exist for this user)
+				# - problem 2 will get overwritten with the data from problem 1
+				# - problem 3 will get overwritten with the data from problem 2
+				# - nothing will happend to problem 4, since problem 1 doesn't exit
+				# so the solution is to delete problem 4 altogether!
+				# here's the fix:
+				
+				# the data from problem $j+1 was/will be moved to another problem slot,
+				# but there's no problem $sortme[$j][0] to replace it. thus, we delete it now.
+				$db->deleteUserProblem($user, $setID, $j+1);
+			}
+		} 
+	}
+
+	# any problems with IDs above $maxNum get deleted -- presumably their data has been copied into problems with lower IDs
+	foreach ($j = scalar @sortme; $j < $maxNum; $j++) {
+		if (defined $newProblemNumbers{$j + 1}) {
+			$db->deleteGlobalProblem($setID, $j+1);
+		}
+	}
+
+	# return a string form of the old problem IDs in the new order (not used by caller, incidentally)
+	return join(', ', map {$_->[0]} @sortme);
+}
+
+
+# primarily saves any changes into the correct set or problem records (global vs user)
+# also deals with deleting or rearranging problems
+sub initialize {
+	my ($self)    = @_;
+	my $r         = $self->r;
+	my $db        = $r->db;
+	my $ce        = $r->ce;
+	my $authz     = $r->authz;
+	my $user      = $r->param('user');
+	my $setID   = $r->urlpath->arg("setID");
+
+	## we're now allowing setID to come in as setID,v# to edit a set
+	##    version; catch this first
+	my $editingSetVersion = 0;
+	if ( $setID =~ /,v(\d+)$/ ) {
+	    $editingSetVersion = $1;
+	    $setID =~ s/,v(\d+)$//;
+	}
+
+	my $setRecord = $db->getGlobalSet($setID); # checked
+	die "global set $setID  not found." unless $setRecord;
+
+	$self->{set}  = $setRecord;
+	my @editForUser = $r->param('editForUser');
+	# some useful booleans
+	my $forUsers   = scalar(@editForUser);
+	my $forOneUser = $forUsers == 1;
+
+	# Check permissions
+	return unless ($authz->hasPermissions($user, "access_instructor_tools"));
+	return unless ($authz->hasPermissions($user, "modify_problem_sets"));
+
+	## if we're editing a versioned set, it only makes sense to be
+	##    editing it for one user
+	return if ( $editingSetVersion && ! $forOneUser );
+
+	my %properties = %{ FIELD_PROPERTIES() };
+
+	# takes a hash of hashes and inverts it
+	my %undoLabels;
+	foreach my $key (keys %properties) {
+		%{ $undoLabels{$key} } = map { $properties{$key}->{labels}->{$_} => $_ } keys %{ $properties{$key}->{labels} };
+	}
+
+	# Unfortunately not everyone uses Javascript enabled browsers so
+	# we must fudge the information coming from the ComboBoxes
+	# Since the textfield and menu both have the same name, we get an array of two elements
+	# We then reset the param to the first if its not-empty or the second (empty or not).
+	foreach ( @{ HEADER_ORDER() } ) {
+		my @values = $r->param("set.$setID.$_");
+		my $value = $values[0] || $values[1] || "";	
+		$r->param("set.$setID.$_", $value);
+	}
+
+	#####################################################################
+	# Check date information
+	#####################################################################
+
+	my ($open_date, $due_date, $answer_date);
+	my $error = 0;
+	if (defined $r->param('submit_changes')) {
+		my @names = ("open_date", "due_date", "answer_date");
+		
+		my %dates = map { $_ => $r->param("set.$setID.$_") } @names;
+		%dates = map { 
+			my $unlabel = $undoLabels{$_}->{$dates{$_}}; 
+			$_ => defined $unlabel ? $setRecord->$_ : $self->parseDateTime($dates{$_}) 
+		} @names;
+
+		($open_date, $due_date, $answer_date) = map { $dates{$_}||0 } @names;
+        
+        # make sure dates are numeric by using ||0
+        
+		if ($answer_date < $due_date || $answer_date < $open_date) {		
+			$self->addbadmessage("Answers cannot be made available until on or after the due date!");
+			$error = $r->param('submit_changes');
+		}
+		
+		if ($due_date < $open_date) {
+			$self->addbadmessage("Answers cannot be due until on or after the open date!");
+			$error = $r->param('submit_changes');
+		}
+		
+		# make sure the dates are not more than 10 years in the future
+		my $curr_time = time;
+		my $seconds_per_year = 31_556_926;
+		my $cutoff = $curr_time + $seconds_per_year*10;
+		if ($open_date > $cutoff) {
+			$self->addbadmessage("Error: open date cannot be more than 10 years from now in set $setID");
+			$error = $r->param('submit_changes');
+		}
+		if ($due_date > $cutoff) {
+			$self->addbadmessage("Error: due date cannot be more than 10 years from now in set $setID");
+			$error = $r->param('submit_changes');
+		}
+		if ($answer_date > $cutoff) {
+			$self->addbadmessage("Error: answer date cannot be more than 10 years from now in set $setID");
+			$error = $r->param('submit_changes');
+		}
+
+	}
+	if ($error) {
+		$self->addbadmessage("No changes were saved!");
+	}
+	
+	if (defined $r->param('submit_changes') && !$error) {
+
+		#my $setRecord = $db->getGlobalSet($setID); # already fetched above --sam
+
+		#####################################################################
+		# Save general set information (including headers)
+		#####################################################################
+
+		if ($forUsers) {
+			# note that we don't deal with the proctor user
+			#    fields here, with the assumption that it can't
+			#    be possible to change them for users.  this is
+			#    not the most robust treatment of the problem
+			#    (FIXME)
+
+			# DBFIXME use a WHERE clause, iterator
+			my @userRecords = $db->getUserSets(map { [$_, $setID] } @editForUser);
+			# if we're editing a set version, we want to edit
+			#    edit that instead of the userset, so get it
+			#    too.
+			my $userSet = $userRecords[0];
+			my $setVersion = 0;
+			if ( $editingSetVersion ) {
+				$setVersion =
+					$db->getSetVersion($editForUser[0],
+							   $setID,
+							   $editingSetVersion);
+				@userRecords = ( $setVersion );
+			}
+
+			foreach my $record (@userRecords) {
+				foreach my $field ( @{ SET_FIELDS() } ) {
+					next unless canChange($forUsers, $field);
+					my $override = $r->param("set.$setID.$field.override");
+
+					if (defined $override && $override eq $field) {
+
+						my $param = $r->param("set.$setID.$field");
+						$param = $properties{$field}->{default} || "" unless defined $param && $param ne "";
+						my $unlabel = $undoLabels{$field}->{$param};
+						$param = $unlabel if defined $unlabel;
+#						$param = $undoLabels{$field}->{$param} || $param;
+						if ($field =~ /_date/) {
+							$param = $self->parseDateTime($param) unless defined $unlabel;
+						}
+						if (defined($properties{$field}->{convertby}) && $properties{$field}->{convertby}) {
+							$param = $param*$properties{$field}->{convertby};
+						}
+						# special case; does field fill in multiple values?
+						if ( $field =~ /:/ ) {
+							my @values = split(/:/, $param);
+							my @fields = split(/:/, $field);
+							for ( my $i=0; $i<@values; $i++ ) { 
+								my $f=$fields[$i]; 
+								$record->$f($values[$i]); 
+							}
+						} else {
+							$record->$field($param);
+						}
+					} else {
+						####################
+						# FIXME: allow one selector to set multiple fields
+						# 
+						if ( $field =~ /:/ ) {
+							foreach my $f ( split(/:/, $field) ) {
+								$record->$f(undef);
+							}
+						} else {
+							$record->$field(undef);
+						}
+					}
+				
+				}
+				####################
+				# FIXME: this is replaced by our allowing multiple fields to be set by one selector
+				# a check for hiding scores: if we have 
+				#    $set->hide_score eq 'N', we also want 
+				#    $set->hide_score_by_problem eq 'N'
+				# if ( $record->hide_score eq 'N' ) {
+				# 	$record->hide_score_by_problem('N');
+				# }
+				####################
+				if ( $editingSetVersion ) {
+					$db->putSetVersion( $record );
+				} else {
+					$db->putUserSet($record);
+				}
+			}
+
+		#######################################################
+		# Save IP restriction Location information
+		#######################################################
+		# FIXME: it would be nice to have this in the field values
+		#    hash, so that we don't have to assume that we can 
+		#    override this information for users
+
+			## should we allow resetting set locations for set versions?  this
+			##    requires either putting in a new set of database routines
+			##    to deal with the versioned setID, or fudging it at this end
+			##    by manually putting in the versioned ID setID,v#.  neither
+			##    of these seems desirable, so for now it's not allowed
+			if ( ! $editingSetVersion ) {
+				if ( $r->param("set.$setID.selected_ip_locations.override") ) {
+					foreach my $record ( @userRecords ) {
+						my $userID = $record->user_id;
+						my @selectedLocations = $r->param("set.$setID.selected_ip_locations");
+						my @userSetLocations = $db->listUserSetLocations($userID,$setID);
+						my @addSetLocations = ();
+						my @delSetLocations = ();
+						foreach my $loc ( @selectedLocations ) {
+							push( @addSetLocations, $loc ) if ( ! grep( /^$loc$/, @userSetLocations ) );
+						}
+						foreach my $loc ( @userSetLocations ) {
+							push( @delSetLocations, $loc ) if ( ! grep( /^$loc$/, @selectedLocations ) );
+						}
+						# then update the user set_locations
+						foreach ( @addSetLocations ) {
+							my $Loc = $db->newUserSetLocation;
+							$Loc->set_id( $setID );
+							$Loc->user_id( $userID );
+							$Loc->location_id($_);
+							$db->addUserSetLocation($Loc);
+						}
+						foreach ( @delSetLocations ) {
+							$db->deleteUserSetLocation($userID,$setID,$_);
+						}
+					}
+				} else {
+					# if override isn't selected, then we want
+					#    to be sure that there are no
+					#    set_locations_user entries setting around
+					foreach my $record ( @userRecords ) {
+						my $userID = $record->user_id;
+						my @userLocations = $db->listUserSetLocations($userID,$setID);
+						foreach ( @userLocations ) {
+							$db->deleteUserSetLocation($userID,$setID,$_);
+						}
+					}
+				}
+			}
+		} else {
+			foreach my $field ( @{ SET_FIELDS() } ) {
+				next unless canChange($forUsers, $field);
+
+				my $param = $r->param("set.$setID.$field");
+				$param = $properties{$field}->{default} || "" unless defined $param && $param ne "";
+
+				my $unlabel = $undoLabels{$field}->{$param};
+				$param = $unlabel if defined $unlabel;
+				if ($field =~ /_date/) {
+					$param = $self->parseDateTime($param) unless defined $unlabel;
+				}
+				if (defined($properties{$field}->{convertby}) && $properties{$field}->{convertby} && $param) {
+					$param = $param*$properties{$field}->{convertby};
+				}
+				# special case; does field fill in multiple values?
+				if ( $field =~ /:/ ) {
+					my @values = split(/:/, $param);
+					my @fields = split(/:/, $field);
+					for ( my $i=0; $i<@fields; $i++ ) { 
+						my $f = $fields[$i];
+						$setRecord->$f($values[$i]); 
+					}
+				} else {
+					$setRecord->$field($param);
+				}
+			}
+####################
+# FIXME: this is replaced by our setting both hide_score and hide_score_by_problem
+#    with a single drop down
+# 
+# 			# a check for hiding scores: if we have 
+# 			#    $set->hide_score eq 'N', we also want 
+# 			#    $set->hide_score_by_problem eq 'N', and if it's
+# 			#    changed to 'Y' and hide_score_by_problem is Null,
+# 			#    give it a value 'N'
+# 			if ( $setRecord->hide_score eq 'N' ||
+# 			     ( ! defined($setRecord->hide_score_by_problem) ||
+# 			       $setRecord->hide_score_by_problem eq '' ) ) {
+# 				$setRecord->hide_score_by_problem('N');
+# 			}
+####################
+			$db->putGlobalSet($setRecord);
+
+		#######################################################
+		# Save IP restriction Location information
+		#######################################################
+
+			if ( defined($r->param("set.$setID.restrict_ip")) and $r->param("set.$setID.restrict_ip") ne 'No' ) {
+				my @selectedLocations = $r->param("set.$setID.selected_ip_locations");
+				my @globalSetLocations = $db->listGlobalSetLocations($setID);
+				my @addSetLocations = ();
+				my @delSetLocations = ();
+				foreach my $loc ( @selectedLocations ) {
+					push( @addSetLocations, $loc ) if ( ! grep( /^$loc$/, @globalSetLocations ) );
+				}
+				foreach my $loc ( @globalSetLocations ) {
+					push( @delSetLocations, $loc ) if ( ! grep( /^$loc$/, @selectedLocations ) );
+				}
+				# then update the global set_locations
+				foreach ( @addSetLocations ) {
+					my $Loc = $db->newGlobalSetLocation;
+					$Loc->set_id( $setID );
+					$Loc->location_id($_);
+					$db->addGlobalSetLocation($Loc);
+				}
+				foreach ( @delSetLocations ) {
+					$db->deleteGlobalSetLocation($setID,$_);
+				}
+			} else {
+				my @globalSetLocations = $db->listGlobalSetLocations($setID);
+				foreach ( @globalSetLocations ) {
+					$db->deleteGlobalSetLocation($setID,$_);
+				}
+			}
+
+		#######################################################
+		# Save proctored problem proctor user information
+		#######################################################
+			if ($r->param("set.$setID.restricted_login_proctor_password") &&
+			    $setRecord->assignment_type eq 'proctored_gateway') {
+				# in this case we're adding a set-level proctor
+				#    or updating the password
+
+				my $procID = "set_id:$setID";
+				my $pass = $r->param("set.$setID.restricted_login_proctor_password");
+				# should we carefully check in this case that
+				#    the user and password exist?  the code 
+				#    in the add stanza is pretty careful to 
+				#    be sure that there's a one-to-one 
+				#    correspondence between the existence of 
+				#    the user and the setting of the set
+				#    restricted_login_proctor field, so we 
+				#    assume that just checking the latter 
+				#    here is sufficient.
+				if ( $setRecord->restricted_login_proctor eq 'Yes' ) {
+					# in this case we already have a set
+					#    level proctor, and so should be 
+					#    resetting the password
+					if ( $pass ne '********' ) {
+						# then we submitted a new 
+						#    password, so save it
+						my $dbPass;
+						eval { $dbPass = $db->getPassword($procID) };
+						if ( $@ ) {
+							$self->addbadmessage("Error getting old set-proctor password from the database: $@.  No update to the password was done.");
+						} else {
+							$dbPass->password(cryptPassword($pass));
+							$db->putPassword($dbPass);
+						}
+					}
+
+				} else {
+					$setRecord->restricted_login_proctor('Yes');
+					my $procUser = $db->newUser();
+					$procUser->user_id($procID);
+					$procUser->last_name("Proctor");
+					$procUser->first_name("Login");
+					$procUser->student_id("loginproctor");
+					$procUser->status($ce->status_name_to_abbrevs('Proctor'));
+					my $procPerm = $db->newPermissionLevel;
+					$procPerm->user_id($procID);
+					$procPerm->permission($ce->{userRoles}->{login_proctor});
+					my $procPass = $db->newPassword;
+					$procPass->user_id($procID);
+					$procPass->password(cryptPassword($pass));
+					# put these into the database
+					eval { $db->addUser($procUser) };
+					if ( $@ ) { 
+						$self->addbadmessage("Error " .
+							"adding set-level " .
+							"proctor: $@");
+					} else {
+						$db->addPermissionLevel($procPerm);
+						$db->addPassword($procPass);
+					}
+
+					# and set the restricted_login_proctor
+					#    set field
+					$db->putGlobalSet( $setRecord );
+				}
+
+			} else {
+				# if the parameter isn't set, or if the assignment
+				#    type is not 'proctored_gateway', then we need to be 
+				#    sure that there's no set-level proctor defined
+				if ( $setRecord->restricted_login_proctor eq 'Yes' ) {
+
+					$setRecord->restricted_login_proctor('No');
+					$db->deleteUser( "set_id:$setID" );
+					$db->putGlobalSet( $setRecord );
+
+				}
+			}
+		}
+		
+		#####################################################################
+		# Save problem information
+		#####################################################################
+
+		# DBFIXME use a WHERE clause, iterator?
+		my @problemIDs = sort { $a <=> $b } $db->listGlobalProblems($setID);;
+		my @problemRecords = $db->getGlobalProblems(map { [$setID, $_] } @problemIDs);
+		foreach my $problemRecord (@problemRecords) {
+			my $problemID = $problemRecord->problem_id;
+			die "Global problem $problemID for set $setID not found." unless $problemRecord;
+			
+			if ($forUsers) {
+				# Since we're editing for specific users, we don't allow the GlobalProblem record to be altered on that same page
+				# So we only need to make changes to the UserProblem record and only then if we are overriding a value
+				# in the GlobalProblem record or for fields unique to the UserProblem record.
+								
+				my @userIDs = @editForUser;
+
+				my @userProblemRecords;
+				if ( ! $editingSetVersion ) {
+					my @userProblemIDs = map { [$_, $setID, $problemID] } @userIDs;
+					# DBFIXME where clause? iterator?
+					@userProblemRecords = $db->getUserProblems(@userProblemIDs);
+				} else {
+					## (we know that we're only editing for one user)
+					@userProblemRecords =
+						( $db->getMergedProblemVersion( $userIDs[0], $setID, $editingSetVersion, $problemID ) );
+				}
+
+				foreach my $record (@userProblemRecords) {
+
+					my $changed = 0; # keep track of any changes, if none are made, avoid unnecessary db accesses
+					foreach my $field ( @{ PROBLEM_FIELDS() } ) {
+						next unless canChange($forUsers, $field);
+
+						my $override = $r->param("problem.$problemID.$field.override");
+						if (defined $override && $override eq $field) {
+
+							my $param = $r->param("problem.$problemID.$field");
+							$param = $properties{$field}->{default} || "" unless defined $param && $param ne "";
+							my $unlabel = $undoLabels{$field}->{$param};
+							$param = $unlabel if defined $unlabel;
+												#protect exploits with source_file
+							if ($field eq 'source_file') {
+								# add message
+								if ( $param =~ /\.\./ || $param =~ /^\// ) {
+									$self->addbadmessage( "Source file paths cannot include .. or start with /: your source file path was modified." );
+								}
+								$param =~ s|\.\.||g;    # prevent access to files above template
+								$param =~ s|^/||;       # prevent access to files above template
+							}
+
+							$changed ||= changed($record->$field, $param);
+							$record->$field($param);
+						} else {
+							$changed ||= changed($record->$field, undef);
+							$record->$field(undef);
+						}
+						
+					}
+					
+					foreach my $field ( @{ USER_PROBLEM_FIELDS() } ) {
+						next unless canChange($forUsers, $field);
+
+						my $param = $r->param("problem.$problemID.$field");
+						$param = $properties{$field}->{default} || "" unless defined $param && $param ne "";
+						my $unlabel = $undoLabels{$field}->{$param};
+						$param = $unlabel if defined $unlabel;
+											#protect exploits with source_file
+						if ($field eq 'source_file') {
+							# add message
+							if ( $param =~ /\.\./ || $param =~ /^\// ) {
+								$self->addbadmessage( "Source file paths cannot include .. or start with /: your source file path was modified." );
+							}
+							$param =~ s|\.\.||g;    # prevent access to files above template
+							$param =~ s|^/||;       # prevent access to files above template
+						}
+
+						$changed ||= changed($record->$field, $param);
+						$record->$field($param);
+					}
+					if ( ! $editingSetVersion ) {
+						$db->putUserProblem($record) if $changed;
+					} else {
+						$db->putProblemVersion($record) if $changed;
+					}
+				}
+			} else { 
+				# Since we're editing for ALL set users, we will make changes to the GlobalProblem record.
+				# We may also have instances where a field is unique to the UserProblem record but we want
+				# all users to (at least initially) have the same value
+
+				# this only edits a globalProblem record
+				my $changed = 0; # keep track of any changes, if none are made, avoid unnecessary db accesses
+				foreach my $field ( @{ PROBLEM_FIELDS() } ) {
+					next unless canChange($forUsers, $field);
+
+					my $param = $r->param("problem.$problemID.$field");
+					$param = $properties{$field}->{default} || "" unless defined $param && $param ne "";
+					my $unlabel = $undoLabels{$field}->{$param};
+					$param = $unlabel if defined $unlabel;
+					
+					#protect exploits with source_file
+					if ($field eq 'source_file') {
+						# add message
+						if ( $param =~ /\.\./ || $param =~ /^\// ) {
+							$self->addbadmessage( "Source file paths cannot include .. or start with /: your source file path was modified." );
+						}
+						$param =~ s|\.\.||g;    # prevent access to files above template
+						$param =~ s|^/||;       # prevent access to files above template
+					}
+					$changed ||= changed($problemRecord->$field, $param);
+					$problemRecord->$field($param);
+				}
+				$db->putGlobalProblem($problemRecord) if $changed;
+
+
+				# sometimes (like for status) we might want to change an attribute in
+				# the userProblem record for every assigned user
+				# However, since this data is stored in the UserProblem records,
+				# it won't be displayed once its been changed and if you hit "Save Changes" again
+				# it gets erased
+				
+				# So we'll enforce that there be something worth putting in all the UserProblem records
+				# This also will make hitting "Save Changes" on the global page MUCH faster
+				my %useful;
+				foreach my $field ( @{ USER_PROBLEM_FIELDS() } ) {
+					my $param = $r->param("problem.$problemID.$field");
+					$useful{$field} = 1 if defined $param and $param ne "";
+				}
+
+				if (keys %useful) {
+					# DBFIXME where clause, iterator
+					my @userIDs = $db->listProblemUsers($setID, $problemID);
+					my @userProblemIDs = map { [$_, $setID, $problemID] } @userIDs;
+					my @userProblemRecords = $db->getUserProblems(@userProblemIDs);
+					foreach my $record (@userProblemRecords) {
+						my $changed = 0; # keep track of any changes, if none are made, avoid unnecessary db accesses
+						foreach my $field ( keys %useful ) {
+							next unless canChange($forUsers, $field);
+
+							my $param = $r->param("problem.$problemID.$field");
+							$param = $properties{$field}->{default} || "" unless defined $param && $param ne "";
+							my $unlabel = $undoLabels{$field}->{$param};
+							$param = $unlabel if defined $unlabel;
+							$changed ||= changed($record->$field, $param);
+							$record->$field($param);
+						}
+						$db->putUserProblem($record) if $changed;
+					}
+				}
+			}
+		}
+		
+		# Mark the specified problems as correct for all users (not applicable when editing a set
+		#    version, because this only shows up when editing for users or editing the
+		#    global set/problem, not for one user)
+		foreach my $problemID ($r->param('markCorrect')) {
+			# DBFIXME where clause, iterator
+			my @userProblemIDs = map { [$_, $setID, $problemID] } ($forUsers ? @editForUser : $db->listProblemUsers($setID, $problemID));
+			# if the set is not a gateway set, this requires going through the
+			#    user_problems and resetting their status; if it's a gateway set,
+			#    then we have to go through every *version* of every user_problem.
+			#    it may be that there is an argument for being able to get() all
+			#    problem versions for all users in one database call.  The current
+			#    code may be slow for large classes.
+			if ( $setRecord->assignment_type !~ /gateway/ ) {
+				my @userProblemRecords = $db->getUserProblems(@userProblemIDs);
+				foreach my $record (@userProblemRecords) {
+					if (defined $record && ($record->status eq "" || $record->status < 1)) {
+						$record->status(1);
+						$record->attempted(1);
+						$db->putUserProblem($record);
+					}
+				}
+			} else {
+				my @userIDs = ( $forUsers ) ? @editForUser : $db->listProblemUsers($setID, $problemID);
+				foreach my $uid ( @userIDs ) {
+					my @versions = $db->listSetVersions( $uid, $setID );
+					my @userProblemVersionIDs = 
+						map{ [ $uid, $setID, $_, $problemID ]} @versions;
+					my @userProblemVersionRecords = $db->getProblemVersions(@userProblemVersionIDs);
+					foreach my $record (@userProblemVersionRecords) { 
+						if (defined $record && ($record->status eq "" || $record->status < 1)) {
+							$record->status(1);
+							$record->attempted(1);
+							$db->putProblemVersion($record);
+						}
+					}
+				}
+			}
+		}
+		
+		# Delete all problems marked for deletion (not applicable when editing
+		#    for users)
+		foreach my $problemID ($r->param('deleteProblem')) {
+			$db->deleteGlobalProblem($setID, $problemID);
+		}
+		
+		#####################################################################
+		# Add blank problem if needed
+		#####################################################################
+		if (defined($r->param("add_blank_problem") ) and $r->param("add_blank_problem") == 1) {
+		   # get number of problems to add and clean the entry
+		    my $newBlankProblems = (defined($r->param("add_n_problems")) ) ? $r->param("add_n_problems") :1;
+		    $newBlankProblems = int($newBlankProblems);
+		    my $MAX_NEW_PROBLEMS = 20;
+		    if ($newBlankProblems >=1 and $newBlankProblems <= $MAX_NEW_PROBLEMS ) {
+				foreach my $newProb (1..$newBlankProblems) {
+						my $targetProblemNumber   =  1+ WeBWorK::Utils::max( $self->r->db->listGlobalProblems($setID));
+						##################################################
+						# make local copy of the blankProblem
+						##################################################
+						my $blank_file_path       =  $ce->{webworkFiles}->{screenSnippets}->{blankProblem};
+						my $problemContents       =  WeBWorK::Utils::readFile($blank_file_path);
+						my $new_file_path         =  "set$setID/".BLANKPROBLEM();
+						my $fullPath              =  WeBWorK::Utils::surePathToFile($ce->{courseDirs}->{templates},'/'.$new_file_path);
+						local(*TEMPFILE);
+						open(TEMPFILE, ">$fullPath") or warn "Can't write to file $fullPath";
+						print TEMPFILE $problemContents;
+						close(TEMPFILE);
+						
+						#################################################
+						# Update problem record
+						#################################################
+						my $problemRecord  = $self->addProblemToSet(
+								   setName        => $setID,
+								   sourceFile     => $new_file_path, 
+								   problemID      => $targetProblemNumber, #added to end of set
+						);
+						$self->assignProblemToAllSetUsers($problemRecord);
+						$self->addgoodmessage("Added $new_file_path to ". $setID. " as problem $targetProblemNumber") ;
+				}
+			} else {
+				$self->addbadmessage("Could not add $newBlankProblems problems to this set.  The number must be between 1 and $MAX_NEW_PROBLEMS");
+			}
+		}
+		
+		# Sets the specified header to "defaultHeader" so that the default file will get used.
+		foreach my $header ($r->param('defaultHeader')) {
+			$setRecord->$header("defaultHeader");
+		}
+	}	
+	
+
+
+
+	# This erases any sticky fields if the user saves changes, resets the form, or reorders problems
+	# It may not be obvious why this is necessary when saving changes or reordering problems
+	# 	but when the problems are reorder the param problem.1.source_file needs to be the source
+	#	file of the problem that is NOW #1 and not the problem that WAS #1.
+	unless (defined $r->param('refresh')) {
+		
+		# reset all the parameters dealing with set/problem/header information
+		# if the current naming scheme is changed/broken, this could reek havoc
+		# on all kinds of things
+		foreach my $param ($r->param) {
+			$r->param($param, "") if $param =~ /^(set|problem|header)\./  && $param !~ /displaymode/;
+		}
+	}
+}
+
+# helper method for debugging
+sub definedness ($) {
+	my ($variable) = @_;
+
+	return "undefined" unless defined $variable;
+	return "empty" unless $variable ne "";
+	return $variable;
+}
+
+# helper method for checking if two things are different
+# the return values will usually be thrown away, but they could be useful for debugging
+sub changed ($$) {
+	my ($first, $second) = @_;
+
+	return "def/undef" if defined $first and not defined $second;
+	return "undef/def" if not defined $first and defined $second;
+	return "" if not defined $first and not defined $second;
+	return "ne" if $first ne $second;
+	return "";	# if they're equal, there's no change
+}
+
+# helper method that determines for how many users at a time a field can be changed
+# 	none means it can't be changed for anyone
+# 	any means it can be changed for anyone
+# 	one means it can ONLY be changed for one at a time. (eg problem_seed)
+# 	all means it can ONLY be changed for all at a time. (eg set_header)
+sub canChange ($$) {
+	my ($forUsers, $field) = @_;
+	
+	my %properties = %{ FIELD_PROPERTIES() };
+	my $forOneUser = $forUsers == 1;
+	
+	my $howManyCan = $properties{$field}->{override};
+	return 0 if $howManyCan eq "none";
+	return 1 if $howManyCan eq "any";	
+	return 1 if $howManyCan eq "one" && $forOneUser;
+	return 1 if $howManyCan eq "all" && !$forUsers;
+	return 0;	# FIXME: maybe it should default to 1?
+}
+
+# helper method that determines if a file is valid and returns a pretty error message
+sub checkFile ($) {
+	my ($self, $filePath, $headerType) = @_;
+
+	my $r = $self->r;
+	my $ce = $r->ce;
+
+	return "No source filePath specified" unless $filePath;
+	return "Problem source is drawn from a grouping set" if $filePath =~ /^group/;
+	
+	if ( $filePath eq "defaultHeader" ) {
+		if ($headerType eq 'set_header') {
+		  $filePath = $ce->{webworkFiles}{screenSnippets}{setHeader};
+		} elsif  ($headerType eq 'hardcopy_header') {
+			$filePath = $ce->{webworkFiles}{hardcopySnippets}{setHeader};
+		}	else	{
+			return "Invalid headerType $headerType"	
+		}	
+	} else {
+	#	$filePath = $ce->{courseDirs}->{templates} . '/' . $filePath unless $filePath =~ m|^/|; # bug: 1725 allows access to all files e.g. /etc/passwd
+		$filePath = $ce->{courseDirs}->{templates} . '/' . $filePath ; # only filePaths in template directory can be accessed 
+	}
+    
+	my $text = "This source file ";
+	my $fileError;
+	return "" if -e $filePath && -f $filePath && -r $filePath;
+	return $text . "is not readable!" if -e $filePath && -f $filePath;
+	return $text . "is a directory!" if -d $filePath;
+	return $text . "does not exist!" unless -e $filePath;
+	return $text . "is not a plain file!";
+}
+
+# don't show view options -- we provide display mode controls for headers/problems separately
+sub options {
+	return "";
+}
+
+# Creates two separate tables, first of the headers, and the of the problems in a given set
+# If one or more users are specified in the "editForUser" param, only the data for those users
+# becomes editable, not all the data
+sub body {
+
+	my ($self)      = @_;
+	my $r           = $self->r;
+	my $db          = $r->db;
+	my $ce          = $r->ce;
+	my $authz       = $r->authz;
+	my $userID      = $r->param('user');
+	my $urlpath     = $r->urlpath;
+	my $courseID    = $urlpath->arg("courseID");
+	my $setID       = $urlpath->arg("setID");
+
+	## we're now allowing setID to come in as setID,v# to edit a set
+	##    version; catch this first
+	my $editingSetVersion = 0;
+	my $fullSetID = $setID;
+	if ( $setID =~ /,v(\d+)$/ ) {
+	    $editingSetVersion = $1;
+	    $setID =~ s/,v(\d+)$//;
+	}
+
+	my $setRecord   = $db->getGlobalSet($setID) or die "No record for global set $setID.";
+
+	my $userRecord = $db->getUser($userID) or die "No record for user $userID.";
+	# Check permissions
+	return CGI::div({class=>"ResultsWithError"}, "You are not authorized to access the Instructor tools.")
+		unless $authz->hasPermissions($userRecord->user_id, "access_instructor_tools");
+	
+	return CGI::div({class=>"ResultsWithError"}, "You are not authorized to modify problems.")
+		unless $authz->hasPermissions($userRecord->user_id, "modify_problem_sets");
+
+	my @editForUser = $r->param('editForUser');
+
+	return CGI::div({class=>"ResultsWithError"}, "Versions of a set can only be " .
+			"edited for one user at a time.") if ( $editingSetVersion && @editForUser != 1 );
+
+	# Check that every user that we're editing for has a valid UserSet
+	my @assignedUsers;
+	my @unassignedUsers;
+	if (scalar @editForUser) {
+		foreach my $ID (@editForUser) {
+			# DBFIXME iterator
+			if ($db->getUserSet($ID, $setID)) {
+				unshift @assignedUsers, $ID;
+			} else {
+				unshift @unassignedUsers, $ID;
+			}
+		}
+		@editForUser = sort @assignedUsers;
+		$r->param("editForUser", \@editForUser);
+		
+		if (scalar @editForUser && scalar @unassignedUsers) {
+			print CGI::div({class=>"ResultsWithError"}, "The following users are NOT assigned to this set and will be ignored: " . CGI::b(join(", ", @unassignedUsers)));
+		} elsif (scalar @editForUser == 0) {
+			print CGI::div({class=>"ResultsWithError"}, "None of the selected users are assigned to this set: " . CGI::b(join(", ", @unassignedUsers)));
+			print CGI::div({class=>"ResultsWithError"}, "Global set data will be shown instead of user specific data");
+		}		
+	}
+
+	# some useful booleans
+	my $forUsers    = scalar(@editForUser);
+	my $forOneUser  = $forUsers == 1;
+
+	# and check that if we're editing a set version for a user, that
+	#    it exists as well
+	if ( $editingSetVersion && ! $db->existsSetVersion( $editForUser[0], $setID, $editingSetVersion ) ) {
+		return CGI::div({class=>"ResultsWithError"}, "The set-version ($setID, version $editingSetVersion) is not assigned to user $editForUser[0].");
+	}
+
+	# If you're editing for users, initially their records will be different but
+	# if you make any changes to them they will be the same.
+	# if you're editing for one user, the problems shown should be his/hers
+	my $userToShow        = $forUsers ? $editForUser[0] : $userID;
+
+	# a useful gateway variable
+	my $isGatewaySet = ( $setRecord->assignment_type =~ /gateway/ ) ? 1 : 0;
+	
+	# DBFIXME no need to get ID lists -- counts would be fine
+	my $userCount        = $db->listUsers();
+	my $setCount         = $db->listGlobalSets(); # if $forOneUser;
+	my $setUserCount     = $db->countSetUsers($setID);
+# if $forOneUser;
+	my $userSetCount     = ($forOneUser && @editForUser) ? $db->countUserSets($editForUser[0]) : 0;
+
+	
+	my $editUsersAssignedToSetURL = $self->systemLink(
+	      $urlpath->newFromModule(
+                "WeBWorK::ContentGenerator::Instructor::UsersAssignedToSet", $r,
+                  courseID => $courseID, setID => $setID));
+	my $editSetsAssignedToUserURL = $self->systemLink(
+	      $urlpath->newFromModule(
+                "WeBWorK::ContentGenerator::Instructor::UserDetail",$r,
+                  courseID => $courseID, userID => $editForUser[0])) if $forOneUser;
+
+
+	my $setDetailPage  = $urlpath -> newFromModule($urlpath->module, $r, courseID => $courseID, setID => $setID);
+	my $fullsetDetailPage  = $urlpath -> newFromModule($urlpath->module, $r, courseID => $courseID, setID => $fullSetID);
+	my $setDetailURL   = $self->systemLink($fullsetDetailPage, authen=>0);
+
+	my $userCountMessage = CGI::a({href=>$editUsersAssignedToSetURL}, $self->userCountMessage($setUserCount, $userCount));
+	my $setCountMessage = CGI::a({href=>$editSetsAssignedToUserURL}, $self->setCountMessage($userSetCount, $setCount)) if $forOneUser;
+
+	$userCountMessage = "The set $setID is assigned to " . $userCountMessage . ".";
+	$setCountMessage  = "The user $editForUser[0] has been assigned " . $setCountMessage . "." if $forOneUser;
+
+	if ($forUsers) {
+	    ##############################################
+		# calculate links for the users being edited:
+		##############################################
+		my @userLinks = ();
+		foreach my $userID (@editForUser) {
+			my $u = $db->getUser($userID);
+			my $email_address = $u->email_address;
+			my $line = $u->last_name.", " . $u->first_name . "&nbsp;&nbsp;(" .
+				CGI::a({-href=>"mailto:$email_address"},"email "). $u->user_id .
+				"). ";
+			if ( ! $editingSetVersion ) {
+				$line .= "Assigned to ";
+				my $editSetsAssignedToUserURL = $self->systemLink(
+					$urlpath->newFromModule(
+						"WeBWorK::ContentGenerator::Instructor::UserDetail", $r,
+                  				courseID => $courseID, userID => $u->user_id));
+            			$line .= CGI::a({href=>$editSetsAssignedToUserURL}, 
+                     			$self->setCountMessage($db->countUserSets($u->user_id), 
+						$setCount));
+			} else {
+				my $editSetLink = $self->systemLink( $setDetailPage,
+					params=>{effectiveUser=>$u->user_id,
+						 editForUser  =>$u->user_id} );
+				$line .= "Edit set " . CGI::a({href=>$editSetLink},$setID) .
+					" for this user.";
+			}
+			unshift @userLinks,$line;
+		}
+		@userLinks = sort @userLinks;
+	
+		# handy messages when editing gateway sets
+		my $gwmsg = ( $isGatewaySet && ! $editingSetVersion ) ?
+			CGI::br() . CGI::em("To edit a specific student version of this set, " .
+			    "edit (all of) her/his assigned sets.") : "";
+		my $vermsg = ( $editingSetVersion ) ? ", test $editingSetVersion" : "";
+
+		print CGI::table({border=>2,cellpadding=>10}, 
+		    CGI::Tr({},
+				CGI::td([
+					 "Editing problem set ".CGI::strong($setID . $vermsg)." data for these individual students:".CGI::br(). 
+					                CGI::strong(join CGI::br(), @userLinks),
+					CGI::a({href=>$self->systemLink($setDetailPage) },"Edit set ".CGI::strong($setID)." data for ALL students assigned to this set.") . $gwmsg,
+				
+				])
+			)
+		);
+	} else {
+		print CGI::table({border=>2,cellpadding=>10}, 
+		    CGI::Tr({},
+				CGI::td([
+					"This set ".CGI::strong($setID)." is assigned to ".$self->userCountMessage($setUserCount, $userCount).'.' ,
+					'Edit '.CGI::a({href=>$editUsersAssignedToSetURL},'individual versions '). "of set $setID.",
+				
+				])
+			)
+		);
+	}
+	
+	# handle renumbering of problems if necessary
+ 	print CGI::a({name=>"problems"});
+
+	my %newProblemNumbers = ();
+	my $maxProblemNumber = -1;
+	for my $jj (sort { $a <=> $b } $db->listGlobalProblems($setID)) {
+		$newProblemNumbers{$jj} = $r->param('problem_num_' . $jj);
+		$maxProblemNumber = $jj if $jj > $maxProblemNumber;
+	}
+
+	my $forceRenumber = $r->param('force_renumber') || 0;
+	handle_problem_numbers(\%newProblemNumbers, $maxProblemNumber, $db, $setID, $forceRenumber) unless defined $r->param('undo_changes');
+
+	my %properties = %{ FIELD_PROPERTIES() };
+
+	my %display_modes = %{WeBWorK::PG::DISPLAY_MODES()};
+	my @active_modes = grep { exists $display_modes{$_} } @{$r->ce->{pg}->{displayModes}};
+	push @active_modes, 'None';
+	my $default_header_mode = $r->param('header.displaymode') || 'None';
+	my $default_problem_mode = $r->param('problem.displaymode') || 'None';
+
+	#####################################################################
+	# Browse available header/problem files
+	#####################################################################
+	
+	my $templates = $r->ce->{courseDirs}->{templates};
+	my $skip = join("|", keys %{ $r->ce->{courseFiles}->{problibs} });
+
+	my @headerFileList = listFilesRecursive(
+		$templates,
+		qr/header.*\.pg$/i, 		# match these files
+		qr/^(?:$skip|svn)$/, 	# prune these directories
+		0, 				# match against file name only
+		1, 				# prune against path relative to $templates
+	);
+  @headerFileList = sortByName(undef,@headerFileList);
+ 
+	# Display a useful warning message
+	if ($forUsers) {
+		print CGI::p(CGI::b("Any changes made below will be reflected in the set for ONLY the student" . 
+					($forOneUser ? "" : "s") . " listed above."));
+	} else {
+		print CGI::p(CGI::b("Any changes made below will be reflected in the set for ALL students."));
+	}
+
+	print CGI::start_form({method=>"POST", action=>$setDetailURL});
+	print $self->hiddenEditForUserFields(@editForUser);
+	print $self->hidden_authen_fields;
+	print CGI::input({type=>"submit", name=>"submit_changes", value=>"Save Changes"});
+	print CGI::input({type=>"submit", name=>"undo_changes", value => "Reset Form"});
+
+	# spacing
+	print CGI::p();
+	
+	#####################################################################
+	# Display general set information
+	#####################################################################
+
+	print CGI::start_table({border=>1, cellpadding=>4});
+	print CGI::Tr({}, CGI::th({}, [
+		"General Information",
+	]));
+	
+	# this is kind of a hack -- we need to get a user record here, so we can
+	# pass it to FieldTable, so FieldTable can pass it to FieldHTML, so
+	# FieldHTML doesn't have to fetch it itself.
+	my $userSetRecord = $db->getUserSet($userToShow, $setID);
+
+	my $templateUserSetRecord;
+	# send in the set version if we're editing for versions
+	if ( $editingSetVersion ) {
+		$templateUserSetRecord = $userSetRecord;
+		$userSetRecord = $db->getSetVersion( $userToShow, $setID, $editingSetVersion );
+	}
+	
+	print CGI::Tr({}, CGI::td({}, [
+		$self->FieldTable($userToShow, $setID, undef, $setRecord, $userSetRecord),
+	]));
+	print CGI::end_table();	
+
+	# spacing
+	print CGI::p();
+
+	
+	#####################################################################
+	# Display header information
+	#####################################################################
+	my @headers = @{ HEADER_ORDER() };
+	my %headerModules = (set_header => 'problem_list', hardcopy_header => 'hardcopy_preselect_set');
+	my %headerDefaults = (set_header => $ce->{webworkFiles}->{screenSnippets}->{setHeader}, hardcopy_header => $ce->{webworkFiles}->{hardcopySnippets}->{setHeader});
+	my @headerFiles = map { $setRecord->{$_} } @headers;
+	if (scalar @headers and not $forUsers) {
+
+		print CGI::start_table({border=>1, cellpadding=>4});
+		print CGI::Tr({}, CGI::th({}, [
+			"Headers",
+#			"Data",
+			"Display&nbsp;Mode:&nbsp;" . 
+			CGI::popup_menu(-name => "header.displaymode", -values => \@active_modes, -default => $default_header_mode) . '&nbsp;'. 
+			CGI::input({type => "submit", name => "refresh", value => "Refresh Display"}),
+		]));
+
+		my %header_html;
+		
+		my %error;
+		my $this_set = $db->getMergedSet($userToShow, $setID);
+		my $guaranteed_set = $this_set;
+		if ( ! $guaranteed_set ) { 
+			# in the header loop we need to have a set that 
+			#    we know exists, so if the getMergedSet failed
+			#    (that is, the set isn't assigned to the 
+			#    the current user), we get the global set instead
+			# $guaranteed_set = $db->getGlobalSet( $setID );
+			$guaranteed_set = $setRecord;
+		}
+
+		foreach my $headerType (@headers) {
+
+			my $headerFile = $r->param("set.$setID.$headerType") || $setRecord->{$headerType};
+
+			$headerFile = 'defaultHeader' unless $headerFile =~/\S/; # (some non-white space character required)
+
+			$error{$headerType} = $self->checkFile($headerFile,$headerType);
+
+			unless ($error{$headerType}) {	    
+				my @temp = renderProblems(
+					r=> $r, 
+					user => $db->getUser($userToShow),
+					displayMode=> $default_header_mode,
+					problem_number=> 0,
+					this_set => $this_set,
+					problem_list => [$headerFile],
+				);
+				$header_html{$headerType} = $temp[0];	
+			}
+		}
+		
+		foreach my $headerType (@headers) {
+	
+			my $editHeaderPage = $urlpath->new(type => 'instructor_problem_editor_withset_withproblem', args => { courseID => $courseID, setID => $setID, problemID => 0 });
+			my $editHeaderLink = $self->systemLink($editHeaderPage, params => { file_type => $headerType, make_local_copy => 1 });
+
+			my $viewHeaderPage = $urlpath->new(type => $headerModules{$headerType}, args => { courseID => $courseID, setID => $setID });	
+			my $viewHeaderLink = $self->systemLink($viewHeaderPage);
+			
+			# this is a bit of a hack; the set header isn't shown
+			#    for gateway tests, and we run into trouble trying to 
+			#    edit/view it in this context, so we don't show this 
+			#    field for gateway tests
+			if ( $headerType eq 'set_header' && 
+		     	     $guaranteed_set->assignment_type =~ /gateway/ ) {
+				print CGI::Tr({}, CGI::td({}, 
+					      [ "Set Header", 
+					     	"Set headers are not used in " .
+						"display of gateway tests."]));
+				next;
+			}
+
+			print CGI::Tr({}, CGI::td({}, [
+				CGI::start_table({border => 0, cellpadding => 0}) . 
+					CGI::Tr({}, CGI::td({}, $properties{$headerType}->{name})) . 
+					CGI::Tr({}, CGI::td({}, CGI::a({href => $editHeaderLink, target=>"WW_Editor"}, "Edit it"))) .
+					CGI::Tr({}, CGI::td({}, CGI::a({href => $viewHeaderLink, target=>"WW_View"}, "View it"))) .
+				CGI::end_table(),
+
+				comboBox({
+					name => "set.$setID.$headerType",
+					request => $r,
+					default => $r->param("set.$setID.$headerType") || $setRecord->{$headerType}  || "defaultHeader",
+					multiple => 0,
+					values => ["defaultHeader", @headerFileList],
+					labels => { "defaultHeader" => "Use Default Header File" },
+				}) .
+				($error{$headerType} ? 
+					CGI::div({class=>"ResultsWithError", style=>"font-weight: bold"}, $error{$headerType}) 
+					: CGI::div({class=> "RenderSolo"}, $header_html{$headerType}->{body_text})
+				),
+			]));
+		}
+		
+		print CGI::end_table();
+	} else {
+		print CGI::p(CGI::b("Screen and Hardcopy set header information can not be overridden for individual students."));
+	}
+
+	# spacing
+	print CGI::p();
+
+
+	#####################################################################
+	# Display problem information
+	#####################################################################
+
+	my @problemIDList = sort { $a <=> $b } $db->listGlobalProblems($setID);
+	
+	# DBFIXME use iterators instead of getting all at once
+	
+	# get global problem records for all problems in one go
+	my %GlobalProblems;
+	my @globalKeypartsRef = map { [$setID, $_] } @problemIDList;
+	# DBFIXME shouldn't need to get key list here
+	@GlobalProblems{@problemIDList} = $db->getGlobalProblems(@globalKeypartsRef);
+	
+	# if needed, get user problem records for all problems in one go
+	my (%UserProblems, %MergedProblems);
+	if ($forOneUser) {
+		my @userKeypartsRef = map { [$editForUser[0], $setID, $_] } @problemIDList;
+		# DBFIXME shouldn't need to get key list here
+		@UserProblems{@problemIDList} = $db->getUserProblems(@userKeypartsRef);
+		if ( ! $editingSetVersion ) {
+			@MergedProblems{@problemIDList} = $db->getMergedProblems(@userKeypartsRef);
+		} else {
+			my @userversionKeypartsRef = map { [$editForUser[0], $setID, $editingSetVersion, $_] } @problemIDList;
+			@MergedProblems{@problemIDList} = $db->getMergedProblemVersions(@userversionKeypartsRef);
+		}
+	}
+	
+	if (scalar @problemIDList) {
+
+		print CGI::start_table({border=>1, cellpadding=>4});
+		print CGI::Tr({}, CGI::th({}, [
+			"Problems",
+			"Data",
+			"Display&nbsp;Mode:&nbsp;" . 
+			CGI::popup_menu(-name => "problem.displaymode", -values => \@active_modes, -default => $default_problem_mode) . '&nbsp;'. 
+			CGI::input({type => "submit", name => "refresh", value => "Refresh Display"}),
+		]));
+		
+		my %shownYet;
+		my $repeatFile;
+
+		foreach my $problemID (@problemIDList) {
+		
+			my $problemRecord;
+			if ($forOneUser) {
+				#$problemRecord = $db->getMergedProblem($editForUser[0], $setID, $problemID);
+				$problemRecord = $MergedProblems{$problemID}; # already fetched above --sam
+			} else {
+				#$problemRecord = $db->getGlobalProblem($setID, $problemID);
+				$problemRecord = $GlobalProblems{$problemID}; # already fetched above --sam
+			}
+
+			#$self->addgoodmessage("");
+			#$self->addbadmessage($problemRecord->toString());
+
+			# when we're editing a set version, we want to be sure to
+			#    use the merged problem in the edit, because we could
+			#    be using problem groups (for which the problem is generated
+			#    and then stored in the problem version)
+			my $problemToShow = ( $editingSetVersion ) ?
+				$MergedProblems{$problemID} : $UserProblems{$problemID};
+
+			my ( $editProblemPage, $editProblemLink, $viewProblemPage,
+			     $viewProblemLink );
+			if ( $isGatewaySet ) {
+				$editProblemPage = $urlpath->new(type =>'instructor_problem_editor_withset_withproblem', args => { courseID => $courseID, setID => $fullSetID, problemID => $problemID });
+				$editProblemLink = $self->systemLink($editProblemPage, params => { make_local_copy => 0 });
+				$viewProblemPage =
+					$urlpath->new(type =>'gateway_quiz',
+						      args => { courseID => $courseID,
+								setID => "Undefined_Set",
+								problemID => "1" } );
+
+				my $seed = $problemToShow ? $problemToShow->problem_seed : "";
+				my $file = $problemToShow ? $problemToShow->source_file : 
+					$GlobalProblems{$problemID}->source_file;
+
+				$viewProblemLink =
+					$self->systemLink( $viewProblemPage,
+						params => { effectiveUser =>
+							    ($forOneUser ? $editForUser[0] : $userID),
+							    problemSeed => $seed,
+							    sourceFilePath => $file });
+			} else {
+				$editProblemPage = $urlpath->new(type => 'instructor_problem_editor_withset_withproblem', args => { courseID => $courseID, setID => $fullSetID, problemID => $problemID });
+				$editProblemLink = $self->systemLink($editProblemPage, params => { make_local_copy => 0 });
+			# FIXME: should we have an "act as" type link here when editing for multiple users?		
+				$viewProblemPage = $urlpath->new(type => 'problem_detail', args => { courseID => $courseID, setID => $setID, problemID => $problemID });
+				$viewProblemLink = $self->systemLink($viewProblemPage, params => { effectiveUser => ($forOneUser ? $editForUser[0] : $userID)});
+			}
+
+	
+			my $problemFile = $r->param("problem.$problemID.source_file") || $problemRecord->source_file;
+            $problemFile =~ s|^/||;
+            $problemFile =~ s|\.\.||g;
+			# warn of repeat problems
+			if (defined $shownYet{$problemFile}) {
+				$repeatFile = "This problem uses the same source file as number " . $shownYet{$problemFile} . ".";
+			} else {
+				$shownYet{$problemFile} = $problemID;
+				$repeatFile = "";
+			}
+			
+			my $error = $self->checkFile($problemFile, undef);
+			my $this_set = $db->getMergedSet($userToShow, $setID);
+			my @problem_html;
+			unless ($error) {
+				@problem_html = renderProblems(
+					r=> $r, 
+					user => $db->getUser($userToShow),
+					displayMode=> $default_problem_mode,
+					problem_number=> $problemID,
+					this_set => $this_set,
+					problem_seed => $forOneUser ? $problemRecord->problem_seed : 0,
+					problem_list => [$problemFile],     #  [$problemRecord->source_file],
+				);
+			}
+
+			# we want to show the "Try It" and "Edit It" links if there's a 
+			#    well defined problem to view; this is when we're editing a 
+			#    homework set, or if we're editing a gateway set version, or 
+			#    if we're editing a gateway set and the problem is not a 
+			#    group problem
+			my $showLinks = ( ! $isGatewaySet || 
+					  ( $editingSetVersion || $problemFile !~ /^group/ ));
+
+
+			print CGI::Tr({}, CGI::td({}, [
+				CGI::start_table({border => 0, cellpadding => 1}) .
+					CGI::Tr({}, CGI::td({}, problem_number_popup($problemID, $maxProblemNumber))) .
+					CGI::Tr({}, CGI::td({}, 
+							    $showLinks ? CGI::a({href => $editProblemLink, target=>"WW_Editor"}, "Edit it") : "" )) .
+					CGI::Tr({}, CGI::td({}, 
+							    $showLinks ? CGI::a({href => $viewProblemLink, target=>"WW_View"}, "Try it" . ($forOneUser ? " (as $editForUser[0])" : "")) : "" )) .
+					($forUsers ? "" : CGI::Tr({}, CGI::td({}, CGI::checkbox({name => "deleteProblem", value => $problemID, label => "Delete it?"})))) .
+#					CGI::Tr({}, CGI::td({}, "Delete&nbsp;it?" . CGI::input({type => "checkbox", name => "deleteProblem", value => $problemID}))) .
+					($forOneUser ? "" : CGI::Tr({}, CGI::td({}, CGI::checkbox({name => "markCorrect", value => $problemID, label => "Mark Correct?"})))) .
+				CGI::end_table(),
+				$self->FieldTable($userToShow, $setID, $problemID, $GlobalProblems{$problemID}, $problemToShow, $isGatewaySet),
+# A comprehensive list of problems is just TOO big to be handled well
+#				comboBox({
+#					name => "set.$setID.$problemID",
+#					request => $r,
+#					default => $problemRecord->{problem_id},
+#					multiple => 0,
+#					values => \@problemFileList,
+#				}) .
+				
+				join ("\n", $self->FieldHTML(
+					$userToShow,
+					$setID,
+					$problemID,
+					$GlobalProblems{$problemID}, # pass previously fetched global record to FieldHTML --sam
+					$problemToShow, # pass previously fetched user record to FieldHTML --sam
+					"source_file"
+				)) .
+			        	CGI::br() . 
+					($error ? 
+						CGI::div({class=>"ResultsWithError", style=>"font-weight: bold"}, $error) 
+						: CGI::div({class=> "RenderSolo"}, $problem_html[0]->{body_text})
+					) .
+					($repeatFile ? CGI::div({class=>"ResultsWithError", style=>"font-weight: bold"}, $repeatFile) : ''),
+			]));
+		}
+
+          
+# print final lines
+		print CGI::end_table();
+		print CGI::checkbox({
+				  label=> "Force problems to be numbered consecutively from one (always done when reordering problems)",
+				  name=>"force_renumber", value=>"1"});
+		print CGI::p(<<EOF);
+Any time problem numbers are intentionally changed, the problems will
+always be renumbered consecutively, starting from one.  When deleting
+problems, gaps will be left in the numbering unless the box above is
+checked.
+EOF
+        print CGI::p("It is before the open date.  You probably want to renumber the problems if you are deleting some from the middle.") if ($setRecord->open_date>time());
+		print CGI::p("When changing problem numbers, we will move the problem to be ". CGI::em("before"). " the chosen number.");
+
+	} else {
+		print CGI::p(CGI::b("This set doesn't contain any problems yet."));
+	}
+	# always allow one to add a new problem, unless we're editing a set version
+	if ( ! $editingSetVersion ) {
+		print 	CGI::checkbox({ label=> "Add",
+					name=>"add_blank_problem", value=>"1"}
+			),CGI::input({
+					name=>"add_n_problems",
+					size=>2,
+					value=>1 },
+					"blank problem template(s) to end of homework set"
+			);
+	}
+	print CGI::br(),CGI::br(),
+		CGI::input({type=>"submit", name=>"submit_changes", value=>"Save Changes"}),
+		CGI::input({type=>"submit", name=>"handle_numbers", value=>"Reorder problems only"}),
+			"(Any unsaved changes will be lost.)";
+
+	#my $editNewProblemPage = $urlpath->new(type => 'instructor_problem_editor_withset_withproblem', args => { courseID => $courseID, setID => $setID, problemID =>'new_problem'    });
+    #my $editNewProblemLink = $self->systemLink($editNewProblemPage, params => { make_local_copy => 1, file_type => 'blank_problem'  });
+    # This next feature isn't fully supported and is causing problems.  Remove for now.  #FIXME
+	#print CGI::p( CGI::a({href=>$editNewProblemLink},'Edit'). ' a new blank problem');
+
+	print CGI::end_form();
+	
+	return "";
+}
+
+1;
+
+=head1 AUTHOR
+
+Written by Robert Van Dam, toenail (at) cif.rochester.edu
+
+=cut
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetEditor.pm b/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetEditor.pm
deleted file mode 100644
index b52453c70d..0000000000
--- a/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetEditor.pm
+++ /dev/null
@@ -1,339 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader: webwork-modperl/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetEditor.pm,v 1.37 2003/12/09 01:12:31 sh002i 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
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-# 
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-package WeBWorK::ContentGenerator::Instructor::ProblemSetEditor;
-use base qw(WeBWorK::ContentGenerator::Instructor);
-
-=head1 NAME
-
-WeBWorK::ContentGenerator::Instructor::ProblemSetEditor - Edit a set definition list
-
-=cut
-
-use strict;
-use warnings;
-use CGI qw();
-use WeBWorK::DB::Record::Problem;
-use WeBWorK::Utils qw(readFile formatDateTime parseDateTime list2hash readDirectory max);
-
-our $rowheight = 20;  #controls the length of the popup menus.  
-our $libraryName;  #library directory name
-
-use constant SET_FIELDS => [qw(open_date due_date answer_date set_header problem_header)];
-use constant PROBLEM_FIELDS =>[qw(source_file value max_attempts)];
-use constant PROBLEM_USER_FIELDS => [qw(problem_seed status num_correct num_incorrect)];
-
-sub getSetName {
-	my ($self, $pathSetName) = @_;
-	if (ref $pathSetName eq "HASH") {
-		$pathSetName = undef;
-	}
-	return $pathSetName;
-}
-
-# One wrinkle here: if $override is undefined, do the global thing, otherwise, it's truth value determines the checkbox.
-sub setRowHTML {
-	my ($description, $fieldName, $fieldValue, $size, $override, $overrideValue) = @_;
-	
-	my $attributeHash = {type=>"text", name=>$fieldName, value=>$fieldValue};
-	$attributeHash->{size} = $size if defined $size;
-	
-	my $html = CGI::td({}, [$description, CGI::input($attributeHash)]);
-	
-	if (defined $override) {
-		$attributeHash->{name}="${fieldName}_override";
-		$attributeHash->{value}=($override ? $overrideValue : "" );
-	
-		$html .= CGI::td({}, [
-			CGI::checkbox({
-				type=>"checkbox", 
-				name=>"override", 
-				label=>"override with:",
-				value=>$fieldName,
-				checked=>($override ? 1 : 0)
-			}),
-			CGI::input($attributeHash)
-		]);
-	}
-	
-	return $html;
-			
-}
-
-
-
-# Initialize does all of the form processing.  It's extensive, and could probably be cleaned up and
-# consolidated with a little abstraction.
-sub initialize {
-	my ($self, @components) = @_;
-	my $r           = $self->{r};
-	my $db          = $self->{db};
-	my $ce          = $self->{ce};
-	my $authz       = $self->{authz};
-	my $user        = $r->param('user');
-	my $setName     = $self->getSetName(@components);
-	my $setRecord   = $db->getGlobalSet($setName); #checked
-	die "global set $setName not found." unless $setRecord;
-
-	$self->{set}    = $setRecord;
-	my @editForUser = $r->param('editForUser');
-	# some useful booleans
-	my $forUsers    = scalar(@editForUser);
-	my $forOneUser  = $forUsers == 1;
-
-	# build a quick lookup table
-	my %overrides = list2hash $r->param('override');
-	
-	unless ($authz->hasPermissions($user, "modify_problem_sets")) {
-		$self->{submitError} = "You are not authorized to modify problem sets";
-		return;
-	}
-
-	
-	###################################################
-	# The set form was submitted with the save button pressed
-	# Save changes to the set
-	###################################################
-	if (defined($r->param('submit_set_changes'))) {
-		foreach (@{SET_FIELDS()}) {
-			if (defined($r->param($_))) {
-				if (m/_date$/) {
-					$setRecord->$_(parseDateTime($r->param($_)));
-				} else {
-					$setRecord->$_($r->param($_));
-				}
-			}
-		}
-		$db->putGlobalSet($setRecord);
-		if ($forOneUser) {
-			
-			my $userSetRecord = $db->getUserSet($editForUser[0], $setName); #checked
-			die "set $setName not found for $editForUser[0]." unless $userSetRecord;
-			foreach my $field (@{SET_FIELDS()}) {
-				if (defined $r->param("${field}_override")) {
-					if (exists $overrides{$field}) {
-						if ($field =~ m/_date$/) {
-							$userSetRecord->$field(parseDateTime($r->param("${field}_override")));
-						} else {
-							$userSetRecord->$field($r->param("${field}_override"));
-						}
-					} else {
-						$userSetRecord->$field(undef);
-					}
-					
-					$db->putUserSet($userSetRecord);
-				}
-			}
-		}
-	} 
-	
-	###################################################
-	# The set form was submitted with the export button pressed
-	# Export the set structure to a set definition file
-	###################################################
-	
-	if (  defined($r->param('export_set'))  ) {
-		my $fileName = $r->param('export_file_name');
-		die "Please specify a file name for saving the set definition" unless $fileName;
-		$fileName    .= '.def' unless $fileName =~ /\.def$/;
-		my $filePath  = $ce->{courseDirs}->{templates}.'/'.$fileName;
-		# back up existing file
-		rename($filePath,"$filePath.bak") or 
-	    	       die "Can't rename $filePath to $filePath.bak ",
-	    	           "Check permissions for webserver on directories. $!";
-	    my $openDate     = formatDateTime($setRecord->open_date);
-	    my $dueDate      = formatDateTime($setRecord->due_date);
-	    my $answerDate   = formatDateTime($setRecord->answer_date);
-	    my $setHeader    = $setRecord->set_header;
-	    
-	    my @problemList = $db->listGlobalProblems($setName);
-	    my $problemList  = '';
-	    foreach my $prob (sort {$a <=> $b} @problemList) {
-	    	my $problemRecord = $db->getGlobalProblem($setName, $prob); # checked
-	    	die "global problem $prob for set $setName not found" unless defined($problemRecord);
-	    	my $source_file   = $problemRecord->source_file();
-			my $value         = $problemRecord->value();
-			my $max_attempts  = $problemRecord->max_attempts();
-	    	$problemList     .= "$source_file, $value, $max_attempts \n";	    
-	    }
-	    my $fileContents = <<EOF;
-
-openDate          = $openDate
-dueDate           = $dueDate
-answerDate        = $answerDate
-paperHeaderFile   = $setHeader
-screenHeaderFile  = $setHeader
-problemList       = 
-
-$problemList
-
-
-
-EOF
-
-
-	    $self->saveProblem($fileContents, $filePath);
-	    $self->{message} .= "Set definition saved to $filePath";
-
-	
-	
-	
-	
-	}
-}
-
-sub path {
-	my $self          = shift;
-	my $args          = $_[-1];
-	
-	my $ce            = $self->{ce};
-	my $root          = $ce->{webworkURLs}->{root};
-	my $courseName    = $ce->{courseName};
-	my $set_id        = $self->{set}->set_id;
-	return $self->pathMacro($args,
-		"Home"          => "$root",
-		$courseName     => "$root/$courseName",
-		'instructor'    => "$root/$courseName/instructor",
-		'sets'          => "$root/$courseName/instructor/sets/",
-		"$set_id"   => '',
-	);
-}
-
-sub title {
-	my ($self, @components) = @_;
-	return "Problem Set Editor - ".$self->{ce}->{courseName}." : ".$self->getSetName(@components);
-}
-
-sub body {
-	my ($self, @components) = @_;
-	my $r = $self->{r};
-	my $db = $self->{db};
-	my $ce = $self->{ce};
-	my $authz = $self->{authz};
-	my $user = $r->param('user');
-	my $courseName = $ce->{courseName};
-	my $setName = $self->getSetName(@components);
-	my $setRecord = $db->getGlobalSet($setName);  # checked
-	die "global set $setName not found." unless $setRecord;
-	my @editForUser = $r->param('editForUser');
-	# some useful booleans
-	my $forUsers = scalar(@editForUser);
-	my $forOneUser = $forUsers == 1;
-
-        return CGI::em("You are not authorized to access the Instructor tools.") unless $authz->hasPermissions($user, "access_instructor_tools");
-
-	## Set Form ##
-	my $userSetRecord;
-	my %overrideArgs;
-	if ($forOneUser) {
-		$userSetRecord = $db->getUserSet($editForUser[0], $setName); #checked
-		die "set $setName not found for user $editForUser[0]." unless $userSetRecord;
-		foreach my $field (@{SET_FIELDS()}) {
-			$overrideArgs{$field} = [defined $userSetRecord->$field, ($field =~ /_date$/ ? formatDateTime($userSetRecord->$field) : $userSetRecord->$field)];
-		}
-	} else {
-		foreach my $field (@{SET_FIELDS()}) {
-			$overrideArgs{$field} = [undef, undef];
-		}
-	}
-	
-	print CGI::h2({}, "Set Data"), "\n";
-	if (@editForUser) {
-		print CGI::p("Editing user-specific overrides for ". CGI::b(join ", ", @editForUser));
-	}
-	print CGI::start_form({method=>"post", action=>$r->uri}), "\n";
-	print CGI::table({},
-		CGI::Tr({}, [
-			setRowHTML( "Open Date:", 
-						"open_date", 
-						formatDateTime($setRecord->open_date),
-						undef,
-						@{$overrideArgs{open_date}})."\n",
-			setRowHTML( "Due Date:",
-						"due_date", 
-						formatDateTime($setRecord->due_date), 
-						undef, 
-						@{$overrideArgs{due_date}})."\n",
-			setRowHTML( "Answer Date:",
-						"answer_date", 
-						formatDateTime($setRecord->answer_date), 
-						undef, 
-						@{$overrideArgs{answer_date}})."\n",
-			setRowHTML( "Set Header:", "set_header", 
-						$setRecord->set_header, 
-						32, 
-						@{$overrideArgs{set_header}})."\n",
-# FIXME  we're not using this right at the moment as far as I know.  There may someday be a use for it, so don't take this out yet.
-# 			setRowHTML( "Problem Header:", 
-# 						"problem_header", 
-# 						$setRecord->problem_header, 
-# 						undef, 
-# 						@{$overrideArgs{problem_header}})."\n"
-		])
-	);
-	
-	print $self->hiddenEditForUserFields(@editForUser),
-	      $self->hidden_authen_fields,
-	      CGI::input({type=>"submit", name=>"submit_set_changes", value=>"Save Set"}),
-	      '&nbsp;';
-	
-		#### link to edit setHeader 
-	if (defined($setRecord) and $setRecord->set_header) {
-		print CGI::a({-href=>$ce->{webworkURLs}->{root}."/$courseName/instructor/pgProblemEditor/".$setRecord->set_id.'/0'.
-	             '?'.$self->url_authen_args},'Edit set header: '.$setRecord->set_header);
-	}
-	
-	print CGI::br(),
-	      CGI::submit({ name=>"export_set", label=>"Export Set"} ),
-	      ' as ',
-	      CGI::input({type=>'text',name=>'export_file_name',value=>"set$setName.def",size=>10});
-	      
-	print CGI::br(), $self->{message}  if defined $self->{message};
-
-	
-
-	print CGI::end_form();
-	
-	my $problemCount = $db->listGlobalProblems($setName);
-	print CGI::h2({}, "Problems"), "\n";
-	print CGI::p({}, "This set contains $problemCount problem" . ($problemCount == 1 ? "" : "s").".");
-	print CGI::a({href=>$r->uri."problems/?".$self->url_authen_args.(join "", map {"\&editForUser=$_"} @editForUser)}, "Edit the list of problems in this set");
-	
-	my $userCount = $db->listUsers;
-	my $usersOfSet = $db->countSetUsers($setName);
-	print CGI::h2({}, "Users"), "\n";
-	print CGI::p({}, "This set is assigned to ".$self->userCountMessage($usersOfSet, $userCount).".");
-	print CGI::a({href=>$r->uri."users/?".$self->url_authen_args}, "Determine who this set is assigned to");
-	
-	return "";
-}
-###########################################################################
-# utility
-###########################################################################
-sub saveProblem {     
-    my $self      = shift;
-	my ($body, $probFileName)= @_;
-	local(*PROBLEM);
-	open (PROBLEM, ">$probFileName") ||
-		$self->submission_error("Could not open $probFileName for writing.
-		Check that the  permissions for this problem are 660 (-rw-rw----)");
-	print PROBLEM $body;
-	close PROBLEM;
-	chmod 0660, "$probFileName" ||
-	             $self->submission_error("
-	                    CAN'T CHANGE PERMISSIONS ON FILE $probFileName");
-}
-1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm b/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm
index 0d3ef83d69..ed52a2d741 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader: webwork-modperl/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm,v 1.35 2003/12/09 01:12:31 sh002i Exp $
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: 
 # 
 # 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
@@ -15,376 +15,1909 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator::Instructor::ProblemSetList;
+use base qw(WeBWorK);
 use base qw(WeBWorK::ContentGenerator::Instructor);
 
 =head1 NAME
 
-WeBWorK::ContentGenerator::Instructor::ProblemSetList - Entry point for Problem and Set editing
+WeBWorK::ContentGenerator::Instructor::ProblemSetList - Entry point for Set-specific
+data editing/viewing
 
 =cut
 
+=for comment
+
+What do we want to be able to do here?
+
+filter sort edit publish import create delete
+
+Filter what sets are shown:
+	- none, all, selected
+	- matching set_id, visible to students, hidden from students
+
+Sort sets by:
+	- set name
+	- open date
+	- due date
+	- answer date
+	- header files
+	- visibility to students	
+	
+Switch from view mode to edit mode:
+	- showing visible sets
+	- showing selected sets
+Switch from edit mode to view and save changes
+Switch from edit mode to view and abandon changes
+
+Make sets visible to or hidden from students:
+	- all, selected
+
+Import sets:
+	- replace:
+		- any users
+		- visible users
+		- selected users
+		- no users
+	- add:
+		- any users
+		- no users
+
+Score sets:
+	- all
+	- visible
+	- selected
+
+Create a set with a given name
+
+Delete sets:
+	- visible
+	- selected
+
+=cut
+
+# FIXME: rather than having two types of boolean modes $editMode and $exportMode
+#	make one $mode variable that contains a string like "edit", "view", or "export"
+
 use strict;
 use warnings;
-use Apache::Constants qw(REDIRECT);
-use CGI qw();
-use WeBWorK::Utils qw(formatDateTime);
+#use CGI qw(-nosticky );
+use WeBWorK::CGI;
+use WeBWorK::Debug;
+use WeBWorK::Utils qw(timeToSec readFile listFilesRecursive cryptPassword sortByName);
+
+use constant HIDE_SETS_THRESHOLD => 500;
+use constant DEFAULT_VISIBILITY_STATE => 1;
+use constant DEFAULT_ENABLED_REDUCED_SCORING_STATE => 0;
+use constant ONE_WEEK => 60*60*24*7;  
+
+use constant EDIT_FORMS => [qw(cancelEdit saveEdit)];
+use constant VIEW_FORMS => [qw(filter sort edit publish import export score create delete)];
+use constant EXPORT_FORMS => [qw(cancelExport saveExport)];
+
+use constant VIEW_FIELD_ORDER => [ qw( select set_id problems users visible enable_reduced_scoring open_date due_date answer_date) ];
+use constant EDIT_FIELD_ORDER => [ qw( set_id visible enable_reduced_scoring open_date due_date answer_date) ];
+use constant EXPORT_FIELD_ORDER => [ qw( select set_id filename) ];
+
+# permissions needed to perform a given action
+use constant FORM_PERMS => {
+		saveEdit => "modify_problem_sets",
+		edit => "modify_problem_sets",
+		publish => "modify_problem_sets",
+		import => "create_and_delete_problem_sets",
+		export => "modify_set_def_files",
+		saveExport => "modify_set_def_files",
+		score => "score_sets",
+		create => "create_and_delete_problem_sets",
+		delete => "create_and_delete_problem_sets",
+};
+
+# permissions needed to view a given field
+use constant FIELD_PERMS => {
+		problems => "modify_problem_sets",
+		users	=> "assign_problem_sets",
+};
+
+use constant STATE_PARAMS => [qw(user effectiveUser key visible_sets no_visible_sets prev_visible_sets no_prev_visible_set editMode exportMode primarySortField secondarySortField)];
+
+use constant SORT_SUBS => {
+	set_id		=> \&bySetID,
+#	set_header	=> \&bySetHeader,  # can't figure out why these are useful
+#	hardcopy_header	=> \&byHardcopyHeader,  # can't figure out why these are useful
+	open_date	=> \&byOpenDate,
+	due_date	=> \&byDueDate,
+	answer_date	=> \&byAnswerDate,
+	visible	=> \&byVisible,
+
+};
+
+# note that field_properties for some fields, in particular, gateway 
+# parameters, are not currently shown in the edit or display tables
+use constant  FIELD_PROPERTIES => {
+	set_id => {
+		type => "text",
+		size => 8,
+		access => "readonly",
+	},
+	set_header => {
+		type => "filelist",
+		size => 10,
+		access => "readonly",
+	},
+	hardcopy_header => {
+		type => "filelist",
+		size => 10,
+		access => "readonly",
+	},
+	open_date => {
+		type => "text",
+		size => 26,
+		access => "readwrite",
+	},
+	due_date => {
+		type => "text",
+		size => 26,
+		access => "readwrite",
+	},
+	answer_date => {
+		type => "text",
+		size => 26,
+		access => "readwrite",
+	},
+	visible => {
+		type => "checked",
+		size => 4,
+		access => "readwrite",
+	},	
+	enable_reduced_scoring => {
+		type => "checked",
+		size => 4,
+		access => "readwrite",
+	},	
+	assignment_type => {
+		type => "text",
+		size => 20,
+		access => "readwrite",
+	},	
+	attempts_per_version => {
+		type => "text",
+		size => 4,
+		access => "readwrite",
+	},	
+	time_interval => {
+		type => "text",
+		size => 10,
+		access => "readwrite",
+	},	
+	versions_per_interval => {
+		type => "text",
+		size => 4,
+		access => "readwrite",
+	},	
+	version_time_limit => {
+		type => "text",
+		size => 10,
+		access => "readwrite",
+	},	
+	problem_randorder => {
+		type => "text",
+		size => 4,
+		access => "readwrite",
+	},
+	problems_per_page => {
+		type => "text",
+		size => 4,
+		access => "readwrite",
+	},
+	version_creation_time => {
+		type => "text",
+		size => 10,
+		access => "readonly",
+	},	
+	version_last_attempt_time => {
+		type => "text",
+		size => 10,
+		access => "readonly",
+	},
+	# hide_score and hide_work should be drop down selects with 
+	#    options 'N', 'Y' and 'BeforeAnswerDate'.  in that we don't
+	#    allow editing of these fields in this module, this is moot.
+	hide_score => {
+		type => "text",
+		size => 16,
+		access => "readwrite",
+	},	
+	hide_work => {
+		type => "text",
+		size => 16,
+		access => "readwrite",
+	},
+	time_limit_cap => {
+		type => "checked",
+		size => 4,
+		access => "readwrite",
+	},
+	# this should be 'No', 'RestrictTo' or 'DenyFrom'
+	restrict_ip => { 
+		type => "text",
+		size => 10,
+		access => "readwrite",
+	}
+};
+
+sub pre_header_initialize {
+	my ($self) = @_;
+	my $r      = $self->r;
+	my $db     = $r->db;
+	my $ce     = $r->ce;
+	my $authz  = $r->authz;
+	my $urlpath = $r->urlpath;
+	my $user   = $r->param('user');
+	my $courseName = $urlpath->arg("courseID");
+
+
+	# Check permissions
+	return unless $authz->hasPermissions($user, "access_instructor_tools");
+	
+	if (defined $r->param("action") and $r->param("action") eq "score" and $authz->hasPermissions($user, "score_sets")) {
+		my $scope = $r->param("action.score.scope");
+		my @setsToScore = ();
+	
+		if ($scope eq "none") { 
+			return "No sets selected for scoring.";
+		} elsif ($scope eq "all") {
+			@setsToScore = @{ $r->param("allSetIDs") };
+		} elsif ($scope eq "visible") {
+			@setsToScore = @{ $r->param("visibleSetIDs") };
+		} elsif ($scope eq "selected") {
+			@setsToScore = $r->param("selected_sets");
+		}
+
+		my $uri = $self->systemLink( $urlpath->newFromModule('WeBWorK::ContentGenerator::Instructor::Scoring', $r, courseID=>$courseName),
+						params=>{
+							scoreSelected=>"ScoreSelected",
+							selectedSet=>\@setsToScore,
+#							recordSingleSetScores=>''
+						}
+		);
+
+		$self->reply_with_redirect($uri);
+	}
+
+}
+
+sub initialize {
+
+	my ($self)       = @_;
+	my $r            = $self->r;
+	my $urlpath      = $r->urlpath;
+	my $db           = $r->db;
+	my $ce           = $r->ce;
+	my $authz        = $r->authz;	
+	my $courseName   = $urlpath->arg("courseID");
+	my $setID        = $urlpath->arg("setID");       
+	my $user         = $r->param('user');
+	
+
+	my $root = $ce->{webworkURLs}->{root};
+
+	# templates for getting field names
+	my $setTemplate = $self->{setTemplate} = $db->newGlobalSet;
+	
+	return CGI::div({class => "ResultsWithError"}, "You are not authorized to access the Instructor tools.")
+		unless $authz->hasPermissions($user, "access_instructor_tools");
+	
+	########## set initial values for state fields
+	
+	my @allSetIDs = $db->listGlobalSets;
+	# DBFIXME count would suffice here :P
+	my @users = $db->listUsers;
+	$self->{allSetIDs} = \@allSetIDs;
+	$self->{totalUsers} = scalar @users;
+	
+	if (defined $r->param("visible_sets")) {
+		$self->{visibleSetIDs} = [ $r->param("visible_sets") ];
+	} elsif (defined $r->param("no_visible_sets")) {
+		$self->{visibleSetIDs} = [];
+	} else {
+		if (@allSetIDs > HIDE_SETS_THRESHOLD) {
+			$self->{visibleSetIDs} = [];
+		} else {
+			$self->{visibleSetIDs} = [ @allSetIDs ];
+		}
+	}
+	
+	$self->{prevVisibleSetIDs} = $self->{visibleSetIDs};
+	
+	if (defined $r->param("selected_sets")) {
+		$self->{selectedSetIDs} = [ $r->param("selected_sets") ];
+	} else {
+		$self->{selectedSetIDs} = [];
+	}
+	
+	$self->{editMode} = $r->param("editMode") || 0;
+	
+	return CGI::div({class=>"ResultsWithError"}, CGI::p("You are not authorized to modify homework sets."))
+		if $self->{editMode} and not $authz->hasPermissions($user, "modify_problem_sets");
+	
+	$self->{exportMode} = $r->param("exportMode") || 0;
+
+	return CGI::div({class=>"ResultsWithError"}, CGI::p("You are not authorized to modify set definition files."))
+		if $self->{exportMode} and not $authz->hasPermissions($user, "modify_set_def_files");
+	
+	$self->{primarySortField} = $r->param("primarySortField") || "due_date";
+	$self->{secondarySortField} = $r->param("secondarySortField") || "open_date";
+	
+	
+	#########################################
+	# collect date information from sets
+	#########################################
+
+	my @allSets = $db->getGlobalSets(@allSetIDs);
+
+	my (%open_dates, %due_dates, %answer_dates);
+	foreach my $Set (@allSets) {
+		push @{$open_dates{defined $Set->open_date ? $Set->open_date : ""}}, $Set->set_id;
+		push @{$due_dates{defined $Set->due_date ? $Set->due_date : ""}}, $Set->set_id;
+		push @{$answer_dates{defined $Set->answer_date ? $Set->answer_date : ""}}, $Set->set_id;
+	}
+	$self->{open_dates} = \%open_dates;
+	$self->{due_dates} = \%due_dates;
+	$self->{answer_dates} = \%answer_dates;
+	
+	#########################################
+	#  call action handler  
+	#########################################
+	
+	my $actionID = $r->param("action");
+	$self->{actionID} = $actionID;
+	if ($actionID) {
+		unless (grep { $_ eq $actionID } @{ VIEW_FORMS() }, @{ EDIT_FORMS() }, @{ EXPORT_FORMS() }) {
+			die "Action $actionID not found";
+		}
+		# Check permissions
+		if (not FORM_PERMS()->{$actionID} or $authz->hasPermissions($user, FORM_PERMS()->{$actionID})) {
+			my $actionHandler = "${actionID}_handler";
+			my %genericParams;
+			foreach my $param (qw(selected_sets)) {
+				$genericParams{$param} = [ $r->param($param) ];
+			}
+			my %actionParams = $self->getActionParams($actionID);
+			my %tableParams = $self->getTableParams();
+			$self->addmessage( CGI::div({class=>"Message"}, "Results of last action performed: "));
+			$self->addmessage(
+			                     $self->$actionHandler(\%genericParams, \%actionParams, \%tableParams), 
+			                     CGI::hr()
+			);
+		} else {
+			return CGI::div({class=>"ResultsWithError"}, CGI::p("You are not authorized to perform this action."));
+		}
+		
+		
+
+	} else {
+	
+		$self->addgoodmessage("Please select action to be performed.");
+	}
+		
+
+}
+
+sub body {
+	my ($self)       = @_;
+	my $r            = $self->r;
+	my $urlpath      = $r->urlpath;
+	my $db           = $r->db;
+	my $ce           = $r->ce;
+	my $authz        = $r->authz;	
+	my $courseName   = $urlpath->arg("courseID");
+	my $setID        = $urlpath->arg("setID");       
+	my $user         = $r->param('user');
+	
+	my $root = $ce->{webworkURLs}->{root};
+
+	# templates for getting field names
+	my $setTemplate = $self->{setTemplate} = $db->newGlobalSet;
+	
+	return CGI::div({class => "ResultsWithError"}, "You are not authorized to access the Instructor tools.")
+		unless $authz->hasPermissions($user, "access_instructor_tools");
+	
+	# This table can be consulted when display-ready forms of field names are needed.
+	my %prettyFieldNames = map { $_ => $_ } 
+		$setTemplate->FIELDS();
+	
+	@prettyFieldNames{qw(
+		select
+		problems
+		users
+		filename
+		set_id
+		set_header
+		hardcopy_header
+		open_date
+		due_date
+		answer_date
+		visible
+		enable_reduced_scoring	
+	)} = (
+		"Select",
+		"Edit<br> Problems",
+		"Edit<br> Assigned Users",
+		"Set Definition Filename",
+		"Edit<br> Set Data", 
+		"Set Header", 
+		"Hardcopy Header", 
+		"Open Date", 
+		"Due Date", 
+		"Answer Date", 
+		"Visible",
+		"Reduced Credit<br> Enabled" 
+	);
+	
+
+
+	my $actionID = $self->{actionID};
+	
+	########## retrieve possibly changed values for member fields
+	
+	my @allSetIDs = @{ $self->{allSetIDs} }; # do we need this one? YES, deleting or importing a set will change this.
+	my @visibleSetIDs = @{ $self->{visibleSetIDs} };
+	my @prevVisibleSetIDs = @{ $self->{prevVisibleSetIDs} };
+	my @selectedSetIDs = @{ $self->{selectedSetIDs} };
+	my $editMode = $self->{editMode};
+	my $exportMode = $self->{exportMode};
+	my $primarySortField = $self->{primarySortField};
+	my $secondarySortField = $self->{secondarySortField};
+	
+	#warn "visibleSetIDs=@visibleSetIDs\n";
+	#warn "prevVisibleSetIDs=@prevVisibleSetIDs\n";
+	#warn "selectedSetIDs=@selectedSetIDs\n";
+	#warn "editMode=$editMode\n";
+	#warn "exportMode = $exportMode\n";
+	
+	########## get required users
+		
+	# DBFIXME use an iterator
+	my @Sets = grep { defined $_ } @visibleSetIDs ? $db->getGlobalSets(@visibleSetIDs) : ();
+	
+	# presort users
+	my %sortSubs = %{ SORT_SUBS() };
+	my $primarySortSub = $sortSubs{$primarySortField};
+	my $secondarySortSub = $sortSubs{$secondarySortField};	
+	
+	# don't forget to sort in opposite order of importance
+	if ($secondarySortField eq "set_id") {
+		@Sets = sortByName("set_id", @Sets);
+	} else {
+		@Sets = sort $secondarySortSub @Sets;
+	}
+
+	if ($primarySortField eq "set_id") {
+		@Sets = sortByName("set_id", @Sets);
+	} else {
+		@Sets = sort $primarySortSub @Sets;
+	}
+
+	########## print beginning of form
+	
+	print CGI::start_form({method=>"post", action=>$self->systemLink($urlpath,authen=>0), name=>"problemsetlist"});
+	print $self->hidden_authen_fields();
+	
+	########## print state data
+	
+	print "\n<!-- state data here -->\n";
+	
+	if (@visibleSetIDs) {
+		print CGI::hidden(-name=>"visible_sets", -value=>\@visibleSetIDs);
+	} else {
+		print CGI::hidden(-name=>"no_visible_sets", -value=>"1");
+	}
+	
+	if (@prevVisibleSetIDs) {
+		print CGI::hidden(-name=>"prev_visible_sets", -value=>\@prevVisibleSetIDs);
+	} else {
+		print CGI::hidden(-name=>"no_prev_visible_sets", -value=>"1");
+	}
+	
+	print CGI::hidden(-name=>"editMode", -value=>$editMode);
+	print CGI::hidden(-name=>"exportMode", -value=>$exportMode);
+	
+	print CGI::hidden(-name=>"primarySortField", -value=>$primarySortField);
+	print CGI::hidden(-name=>"secondarySortField", -value=>$secondarySortField);	
+	
+	print "\n<!-- state data here -->\n";
+	
+	########## print action forms
+	
+	print CGI::p(CGI::b("Any changes made below will be reflected in the set for ALL students.")) if $editMode;
+
+	print CGI::start_table({});
+	print CGI::Tr({}, CGI::td({-colspan=>2}, "Select an action to perform:"));
+
+	my @formsToShow;
+	if ($editMode) {
+		@formsToShow = @{ EDIT_FORMS() };
+	} else {
+		@formsToShow = @{ VIEW_FORMS() };
+	}
+	
+	if ($exportMode) {
+		@formsToShow = @{ EXPORT_FORMS() };
+	}
+	
+	my $i = 0;
+	foreach my $actionID (@formsToShow) {
+		# Check permissions
+		next if FORM_PERMS()->{$actionID} and not $authz->hasPermissions($user, FORM_PERMS()->{$actionID});
+		my $actionForm = "${actionID}_form";
+		my $onChange = "document.problemsetlist.action[$i].checked=true";
+		my %actionParams = $self->getActionParams($actionID);
+		
+		print CGI::Tr({-valign=>"top"},
+			CGI::td({}, CGI::input({-type=>"radio", -name=>"action", -value=>$actionID})),
+			CGI::td({}, $self->$actionForm($onChange, %actionParams))
+		);
+		
+		$i++;
+	}
+	
+	my $selectAll =CGI::input({-type=>'button', -name=>'check_all', -value=>'Select all sets',
+	       onClick => "for (i in document.problemsetlist.elements)  { 
+	                       if (document.problemsetlist.elements[i].name =='selected_sets') { 
+	                           document.problemsetlist.elements[i].checked = true
+	                       }
+	                    }" });
+   	my $selectNone =CGI::input({-type=>'button', -name=>'check_none', -value=>'Unselect all sets',
+	       onClick => "for (i in document.problemsetlist.elements)  { 
+	                       if (document.problemsetlist.elements[i].name =='selected_sets') { 
+	                          document.problemsetlist.elements[i].checked = false
+	                       }
+	                    }" });
+	unless ($editMode or $exportMode) {
+		print CGI::Tr({}, CGI::td({ colspan=>2, -align=>"center"},
+			$selectAll." ". $selectNone
+			)
+		);
+	}
+	print CGI::Tr({}, CGI::td({-colspan=>2, -align=>"center"},
+		CGI::submit(-value=>"Take Action!"))
+	);
+	print CGI::end_table();
+	
+	########## print table
+	
+	########## first adjust heading if in editMode
+	$prettyFieldNames{set_id} = "Edit All <br> Set Data" if $editMode;
+	$prettyFieldNames{enable_reduced_scoring} = 'Enable Reduced<br>Credit' if $editMode;
+	
+	
+	print CGI::p({},"Showing ", scalar @visibleSetIDs, " out of ", scalar @allSetIDs, " sets.");
+	
+	$self->printTableHTML(\@Sets, \%prettyFieldNames,
+		editMode => $editMode,
+		exportMode => $exportMode,
+		selectedSetIDs => \@selectedSetIDs,
+	);
+	
+	
+	########## print end of form
+	
+ 	print CGI::end_form();
+
+	return "";
+}
+
+################################################################################
+# extract particular params and put them in a hash (values are ARRAYREFs!)
+################################################################################
+
+sub getActionParams {
+	my ($self, $actionID) = @_;
+	my $r = $self->{r};
+	
+	my %actionParams;
+	foreach my $param ($r->param) {
+		next unless $param =~ m/^action\.$actionID\./;
+		$actionParams{$param} = [ $r->param($param) ];
+	}
+	return %actionParams;
+}
+
+sub getTableParams {
+	my ($self) = @_;
+	my $r = $self->{r};
+	
+	my %tableParams;
+	foreach my $param ($r->param) {
+		next unless $param =~ m/^(?:set)\./;
+		$tableParams{$param} = [ $r->param($param) ];
+	}
+	return %tableParams;
+}
+
+################################################################################
+# actions and action triggers
+################################################################################
+
+# filter, edit, cancelEdit, and saveEdit should stay with the display module and
+# not be real "actions". that way, all actions are shown in view mode and no
+# actions are shown in edit mode.
+
+sub filter_form {
+	my ($self, $onChange, %actionParams) = @_;
+	#return CGI::table({}, CGI::Tr({-valign=>"top"},
+	#	CGI::td({}, 
+	return join("", 
+			"Show ",
+			CGI::popup_menu(
+				-name => "action.filter.scope",
+				-values => [qw(all none selected match_ids visible unvisible)],
+				-default => $actionParams{"action.filter.scope"}->[0] || "match_ids",
+				-labels => {
+					all => "all sets",
+					none => "no sets",
+					selected => "sets checked below",
+					visible => "sets visible to students",
+					unvisible => "sets hidden from students", 
+					match_ids => "sets with matching set IDs:",
+				},
+				-onchange => $onChange,
+			),
+			" ",
+			CGI::textfield(
+				-name => "action.filter.set_ids",
+				-value => $actionParams{"action.filter.set_ids"}->[0] || "",,
+				-width => "50",
+				-onchange => $onChange,
+			),
+			" (separate multiple IDs with commas)",
+			CGI::br(),
+#			"Open dates: ",
+#			CGI::popup_menu(
+#				-name => "action.filter.open_date",
+#				-values => [ keys %{ $self->{open_dates} } ],
+#				-default => $actionParams{"action.filter.open_date"}->[0] || "",
+#				-labels => { $self->menuLabels($self->{open_dates}) },
+#				-onchange => $onChange,
+#			),
+#			" Due dates: ",
+#			CGI::popup_menu(
+#				-name => "action.filter.due_date",
+#				-values => [ keys %{ $self->{due_dates} } ],
+#				-default => $actionParams{"action.filter.due_date"}->[0] || "",
+#				-labels => { $self->menuLabels($self->{due_dates}) },
+#				-onchange => $onChange,
+#			),
+#			" Answer dates: ",
+#			CGI::popup_menu(
+#				-name => "action.filter.answer_date",
+#				-values => [ keys %{ $self->{answer_dates} } ],
+#				-default => $actionParams{"action.filter.answer_date"}->[0] || "",
+#				-labels => { $self->menuLabels($self->{answer_dates}) },
+#				-onchange => $onChange,
+#			),
+			
+	);
+}
+
+# this action handler modifies the "visibleUserIDs" field based on the contents
+# of the "action.filter.scope" parameter and the "selected_users" 
+sub filter_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	
+	my $r = $self->r ;
+	my $db = $r->db;
+	
+	my $result;
+	
+	my $scope = $actionParams->{"action.filter.scope"}->[0];
+	if ($scope eq "all") {
+		$result = "showing all sets";
+		$self->{visibleSetIDs} = $self->{allSetIDs};
+	} elsif ($scope eq "none") {
+		$result = "showing no sets";
+		$self->{visibleSetIDs} = [];
+	} elsif ($scope eq "selected") {
+		$result = "showing selected sets";
+		$self->{visibleSetIDs} = $genericParams->{selected_sets}; # an arrayref
+	} elsif ($scope eq "match_ids") {
+		my @setIDs = split /\s*,\s*/, $actionParams->{"action.filter.set_ids"}->[0];
+		$self->{visibleSetIDs} = \@setIDs;
+	} elsif ($scope eq "match_open_date") {
+		my $open_date = $actionParams->{"action.filter.open_date"}->[0];
+		$self->{visibleSetIDs} = $self->{open_dates}->{$open_date}; # an arrayref
+	} elsif ($scope eq "match_due_date") {
+		my $due_date = $actionParams->{"action.filter.due_date"}->[0];
+		$self->{visibleSetIDs} = $self->{due_date}->{$due_date}; # an arrayref
+	} elsif ($scope eq "match_answer_date") {
+		my $answer_date = $actionParams->{"action.filter.answer_date"}->[0];
+		$self->{visibleSetIDs} = $self->{answer_dates}->{$answer_date}; # an arrayref
+	} elsif ($scope eq "visible") {
+		# DBFIXME do filtering in the database, please!
+		my @setRecords = $db->getGlobalSets(@{$self->{allSetIDs}});
+		my @visibleSetIDs = map { $_->visible ? $_->set_id : ""} @setRecords;		
+		$self->{visibleSetIDs} = \@visibleSetIDs;
+	} elsif ($scope eq "unvisible") {
+		# DBFIXME do filtering in the database, please!
+		my @setRecords = $db->getGlobalSets(@{$self->{allSetIDs}});
+		my @unvisibleSetIDs = map { (not $_->visible) ? $_->set_id : ""} @setRecords;
+		$self->{visibleSetIDs} = \@unvisibleSetIDs;
+	}
+	
+	return $result;
+}
+
+sub sort_form {
+	my ($self, $onChange, %actionParams) = @_;
+	return join ("",
+		"Primary sort: ",
+		CGI::popup_menu(
+			-name => "action.sort.primary",
+			-values => [qw(set_id set_header hardcopy_header open_date due_date answer_date visible)],
+			-default => $actionParams{"action.sort.primary"}->[0] || "due_date",
+			-labels => {
+				set_id		=> "Set Name",
+				set_header 	=> "Set Header",
+				hardcopy_header	=> "Hardcopy Header",
+				open_date	=> "Open Date",
+				due_date	=> "Due Date",
+				answer_date	=> "Answer Date",
+				visible	=> "Visibility",
+			},
+			-onchange => $onChange,
+		),
+		" Secondary sort: ",
+		CGI::popup_menu(
+			-name => "action.sort.secondary",
+			-values => [qw(set_id set_header hardcopy_header open_date due_date answer_date visible)],
+			-default => $actionParams{"action.sort.secondary"}->[0] || "open_date",
+			-labels => {
+				set_id		=> "Set Name",
+				set_header 	=> "Set Header",
+				hardcopy_header	=> "Hardcopy Header",
+				open_date	=> "Open Date",
+				due_date	=> "Due Date",
+				answer_date	=> "Answer Date",
+				visible	=> "Visibility",
+			},
+			-onchange => $onChange,
+		),
+		".",
+	);
+}
+
+sub sort_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	
+	my $primary = $actionParams->{"action.sort.primary"}->[0];
+	my $secondary = $actionParams->{"action.sort.secondary"}->[0];
+	
+	$self->{primarySortField} = $primary;
+	$self->{secondarySortField} = $secondary;
+
+	my %names = (
+		set_id		=> "Set Name",
+		set_header	=> "Set Header",
+		hardcopy_header	=> "Hardcopy Header",
+		open_date	=> "Open Date",
+		due_date	=> "Due Date",
+		answer_date	=> "Answer Date",
+		visible	=> "Visibility",
+	);
+	
+	return "sort by $names{$primary} and then by $names{$secondary}.";
+}
+
+
+sub edit_form {
+	my ($self, $onChange, %actionParams) = @_;
+
+	return join("",
+		"Edit ",
+		CGI::popup_menu(
+			-name => "action.edit.scope",
+			-values => [qw(all visible selected)],
+			-default => $actionParams{"action.edit.scope"}->[0] || "selected",
+			-labels => {
+				all => "all sets",
+				visible => "visible sets",
+				selected => "selected sets",
+			},
+			-onchange => $onChange,
+		),
+	);
+}
+
+sub edit_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+
+	my $result;
+	
+	my $scope = $actionParams->{"action.edit.scope"}->[0];
+	if ($scope eq "all") {
+		$result = "editing all sets";
+		$self->{visibleSetIDs} = $self->{allSetIDs};
+	} elsif ($scope eq "visible") {
+		$result = "editing visible sets";
+		# leave visibleUserIDs alone
+	} elsif ($scope eq "selected") {
+		$result = "editing selected sets";
+		$self->{visibleSetIDs} = $genericParams->{selected_sets}; # an arrayref
+	}
+	$self->{editMode} = 1;
+	
+	return $result;
+}
+
+sub publish_form {
+	my ($self, $onChange, %actionParams) = @_;
+
+	return join ("",
+		"Make ",
+		CGI::popup_menu(
+			-name => "action.publish.scope",
+			-values => [ qw(none all selected) ],
+			-default => $actionParams{"action.publish.scope"}->[0] || "selected",
+			-labels => {
+				none => "",
+				all => "all sets",
+#				visible => "visible sets",
+				selected => "selected sets",
+			},
+			-onchange => $onChange,
+		),
+		CGI::popup_menu(
+			-name => "action.publish.value",
+			-values => [ 0, 1 ],
+			-default => $actionParams{"action.publish.value"}->[0] || "1",
+			-labels => {
+				0 => "hidden",
+				1 => "visible",
+			},
+			-onchange => $onChange,
+		),
+		" for students.",
+	);
+}
+
+sub publish_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+
+	my $r = $self->r;
+	my $db = $r->db;
+
+	my $result = "";
+	
+	my $scope = $actionParams->{"action.publish.scope"}->[0];
+	my $value = $actionParams->{"action.publish.value"}->[0];
+
+	my $verb = $value ? "made visible for" : "hidden from";
+	
+	my @setIDs;
+	
+	if ($scope eq "none") { # FIXME: double negative "Make no sets hidden" might make professor expect all sets to be made visible.
+		@setIDs = ();
+		$result = CGI::div({class=>"ResultsWithError"},"No change made to any set.");
+	} elsif ($scope eq "all") {
+		@setIDs = @{ $self->{allSetIDs} };
+		$result = CGI::div({class=>"ResultsWithoutError"},"All sets $verb all students.");
+	} elsif ($scope eq "visible") {
+		@setIDs = @{ $self->{visibleSetIDs} };
+		$result = CGI::div({class=>"ResultsWithoutError"},"All visible sets $verb all students.");
+	} elsif ($scope eq "selected") {
+		@setIDs = @{ $genericParams->{selected_sets} };
+		$result = CGI::div({class=>"ResultsWithoutError"},"All selected sets $verb all students.");
+	}
+	
+	# can we use UPDATE here, instead of fetch/change/store?
+	my @sets = $db->getGlobalSets(@setIDs);
+	
+	map { $_->visible("$value") if $_; $db->putGlobalSet($_); } @sets;
+	
+	return $result
+	
+}
+sub enable_reduced_scoring_form {
+	my ($self, $onChange, %actionParams) = @_;
+
+	return join ("",
+		"Make ",
+		CGI::popup_menu(
+			-name => "action.enable_reduced_scoring.scope",
+			-values => [ qw(none all selected) ],
+			-default => $actionParams{"action.enable_reduced_scoring.scope"}->[0] || "selected",
+			-labels => {
+				none => "",
+				all => "all sets",
+#				visible => "visible sets",
+				selected => "selected sets",
+			},
+			-onchange => $onChange,
+		),
+		CGI::popup_menu(
+			-name => "action.enable_reduced_scoring.value",
+			-values => [ 0, 1 ],
+			-default => $actionParams{"action.enable_reduced_scoring.value"}->[0] || "1",
+			-labels => {
+				0 => "disable",
+				1 => "enable",
+			},
+			-onchange => $onChange,
+		),
+		" reduced sccoring.",
+	);
+}
+
+sub enable_reduced_scoring_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+
+	my $r = $self->r;
+	my $db = $r->db;
+
+	my $result = "";
+	
+	my $scope = $actionParams->{"action.enable_reduced_scoring.scope"}->[0];
+	my $value = $actionParams->{"action.enable_reduced_scoring.value"}->[0];
+
+	my $verb = $value ? "enabled" : "disabled";
+	
+	my @setIDs;
+	
+	if ($scope eq "none") { # FIXME: double negative "Make no sets hidden" might make professor expect all sets to be made visible.
+		@setIDs = ();
+		$result =  CGI::div({class=>"ResultsWithError"}, "No change made to any set.");
+	} elsif ($scope eq "all") {
+		@setIDs = @{ $self->{allSetIDs} };
+		$result = CGI::div({class=>"ResultsWithoutError"},"Reduced Credit $verb for all sets.");
+	} elsif ($scope eq "visible") {
+		@setIDs = @{ $self->{visibleSetIDs} };
+		$result = CGI::div({class=>"ResultsWithoutError"},"Reduced Credit $verb for visable sets.");
+	} elsif ($scope eq "selected") {
+		@setIDs = @{ $genericParams->{selected_sets} };
+		$result = CGI::div({class=>"ResultsWithoutError"},"Reduced Credit $verb for selected sets.");
+	}
+	
+	# can we use UPDATE here, instead of fetch/change/store?
+	my @sets = $db->getGlobalSets(@setIDs);
+	
+	map { $_->enable_reduced_scoring("$value") if $_; $db->putGlobalSet($_); } @sets;
+	
+	return $result
+	
+}
+
+sub score_form {
+	my ($self, $onChange, %actionParams) = @_;
+
+	return join ("",
+		"Score ",
+		CGI::popup_menu(
+			-name => "action.score.scope",
+			-values => [qw(none all selected)],
+			-default => $actionParams{"action.score.scope"}->[0] || "none",
+			-labels => {
+				none => "no sets.",
+				all => "all sets.",
+				selected => "selected sets.",
+			},
+			-onchange => $onChange,
+		),
+	);
+	
+
+
+}
+
+sub score_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+
+	my $r      = $self->r;
+	my $urlpath = $r->urlpath;
+	my $courseName = $urlpath->arg("courseID");
+
+	my $scope = $actionParams->{"action.score.scope"}->[0];	
+	my @setsToScore;
+	
+	if ($scope eq "none") { 
+		@setsToScore = ();
+		return "No sets selected for scoring.";
+	} elsif ($scope eq "all") {
+		@setsToScore = @{ $self->{allSetIDs} };
+	} elsif ($scope eq "visible") {
+		@setsToScore = @{ $self->{visibleSetIDs} };
+	} elsif ($scope eq "selected") {
+		@setsToScore = @{ $genericParams->{selected_sets} };
+	}
+
+	my $uri = $self->systemLink( $urlpath->newFromModule('WeBWorK::ContentGenerator::Instructor::Scoring',$r, courseID=>$courseName),
+					params=>{
+						scoreSelected=>"Score Selected",
+						selectedSet=>\@setsToScore,
+#						recordSingleSetScores=>''
+					}
+	);
+	
+	
+	return $uri;
+}
+
+
+sub delete_form {
+	my ($self, $onChange, %actionParams) = @_;
+
+	return join("",
+		CGI::div({class=>"ResultsWithError"}, 
+			"Delete ",
+			CGI::popup_menu(
+				-name => "action.delete.scope",
+				-values => [qw(none selected)],
+				-default => "none", #  don't make it easy to delete # $actionParams{"action.delete.scope"}->[0] || "none",
+				-labels => {
+					none => "no sets.",
+					#visible => "visible sets.",
+					selected => "selected sets.",
+				},
+				-onchange => $onChange,
+			),
+			CGI::em(" Deletion destroys all set-related data and is not undoable!"),
+		)
+	);
+}
+
+sub delete_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+
+	my $r      = $self->r;
+	my $db     = $r->db;
+
+	my $scope = $actionParams->{"action.delete.scope"}->[0];
+
+	
+	my @setIDsToDelete = ();
+
+	if ($scope eq "selected") {
+		@setIDsToDelete = @{ $self->{selectedSetIDs} };
+	}
+	
+	my %allSetIDs = map { $_ => 1 } @{ $self->{allSetIDs} };
+	my %visibleSetIDs = map { $_ => 1 } @{ $self->{visibleSetIDs} };
+	my %selectedSetIDs = map { $_ => 1 } @{ $self->{selectedSetIDs} };
+
+	foreach my $setID (@setIDsToDelete) {
+		delete $allSetIDs{$setID};
+		delete $visibleSetIDs{$setID};
+		delete $selectedSetIDs{$setID};
+		$db->deleteGlobalSet($setID);
+	}
+	
+	$self->{allSetIDs} = [ keys %allSetIDs ];
+	$self->{visibleSetIDs} = [ keys %visibleSetIDs ];
+	$self->{selectedSetIDs} = [ keys %selectedSetIDs ];
+	
+	my $num = @setIDsToDelete;
+	 return CGI::div({class=>"ResultsWithoutError"},  "deleted $num set" .
+	                                           ($num == 1 ? "" : "s")
+	);
+}
+
+sub create_form {
+	my ($self, $onChange, %actionParams) = @_;
+
+	my $r      = $self->r;
+	
+	return "Create a new set named: ", 
+		CGI::textfield(
+			-name => "action.create.name",
+			-value => $actionParams{"action.create.name"}->[0] || "",
+			-width => "50",
+			-onchange => $onChange,
+		),
+		" as ",
+		CGI::popup_menu(
+			-name => "action.create.type",
+			-values => [qw(empty copy)],
+			-default => $actionParams{"action.create.type"}->[0] || "empty",
+			-labels => {
+				empty => "a new empty set.",
+				copy => "a duplicate of the first selected set.",
+			},
+			-onchange => $onChange,
+		);
+			
+}
+
+sub create_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+
+	my $r      = $self->r;
+	my $db     = $r->db;
+	
+	my $newSetID = $actionParams->{"action.create.name"}->[0];
+	return CGI::div({class => "ResultsWithError"}, "Failed to create new set: no set name specified!") unless $newSetID =~ /\S/;
+	return CGI::div({class => "ResultsWithError"}, "Set $newSetID exists.  No set created") if $db->existsGlobalSet($newSetID);
+	my $newSetRecord = $db->newGlobalSet;
+	my $oldSetID = $self->{selectedSetIDs}->[0];
+
+	my $type = $actionParams->{"action.create.type"}->[0];
+	# It's convenient to set the open date one week from now so that it is 
+	# not accidentally available to students.  We set the due and answer date
+	# to be two weeks from now.
+
+
+	if ($type eq "empty") {
+		$newSetRecord->set_id($newSetID);
+		$newSetRecord->set_header("defaultHeader");
+		$newSetRecord->hardcopy_header("defaultHeader");
+		$newSetRecord->open_date(time + ONE_WEEK());
+		$newSetRecord->due_date(time + 2*ONE_WEEK() );
+		$newSetRecord->answer_date(time + 2*ONE_WEEK() );
+		$newSetRecord->visible(DEFAULT_VISIBILITY_STATE());	# don't want students to see an empty set
+		$newSetRecord->enable_reduced_scoring(DEFAULT_ENABLED_REDUCED_SCORING_STATE());
+		$db->addGlobalSet($newSetRecord);
+	} elsif ($type eq "copy") {
+		return CGI::div({class => "ResultsWithError"}, "Failed to duplicate set: no set selected for duplication!") unless $oldSetID =~ /\S/;
+		$newSetRecord = $db->getGlobalSet($oldSetID);
+		$newSetRecord->set_id($newSetID);
+		$db->addGlobalSet($newSetRecord);
+
+		# take all the problems from the old set and make them part of the new set
+		foreach ($db->getAllGlobalProblems($oldSetID)) { 
+			$_->set_id($newSetID); 
+			$db->addGlobalProblem($_);
+		}
+
+		# also copy any set_location restrictions and set-level proctor
+		#    information
+		foreach ($db->getAllGlobalSetLocations($oldSetID)) {
+			$_->set_id($newSetID);
+			$db->addGlobalSetLocation($_);
+		}
+		if ( $newSetRecord->restricted_login_proctor eq 'Yes' ) {
+			my $procUser = $db->getUser("set_id:$oldSetID");
+			$procUser->user_id("set_id:$newSetID");
+			eval { $db->addUser( $procUser ) };
+			if ( ! $@ ) {
+				my $procPerm = $db->getPermissionLevel("set_id:$oldSetID");
+				$procPerm->user_id("set_id:$newSetID");
+				$db->addPermissionLevel($procPerm);
+				my $procPass = $db->getPassword("set_id:$oldSetID");
+				$procPass->user_id("set_id:$newSetID");
+				$db->addPassword($procPass);
+			}
+		}
+	}
+    #  Assign set to current active user
+     my $userName = $r->param('user'); # FIXME possible security risk
+     $self->assignSetToUser($userName, $newSetRecord); # cures weird date error when no-one assigned to set
+	 $self->addgoodmessage("Set $newSetID was assigned to $userName."); # not currently used
+
+	push @{ $self->{visibleSetIDs} }, $newSetID;
+	push @{ $self->{allSetIds} }, $newSetID;
+	
+	return CGI::div({class => "ResultsWithError"}, "Failed to create new set: $@") if $@;
+	
+	 return CGI::div({class=>"ResultsWithoutError"},"Successfully created new set $newSetID" );
+	
+}
+
+sub import_form {
+	my ($self, $onChange, %actionParams) = @_;
+	
+	my $r = $self->r;
+	my $authz = $r->authz;
+	my $user = $r->param('user');
+
+	# this will make the popup menu alternate between a single selection and a multiple selection menu
+	# Note: search by name is required since document.problemsetlist.action.import.number is not seen as
+	# a valid reference to the object named 'action.import.number'
+	my $importScript = join (" ",
+				"var number = document.getElementsByName('action.import.number')[0].value;",
+				"document.getElementsByName('action.import.source')[0].size = number;",
+				"document.getElementsByName('action.import.source')[0].multiple = (number > 1 ? true : false);",
+				"document.getElementsByName('action.import.name')[0].value = (number > 1 ? '(taken from filenames)' : '');",
+			);
+	
+	return join(" ",
+		"Import ",
+		CGI::popup_menu(
+			-name => "action.import.number",
+			-values => [ 1, 8 ],
+			-default => $actionParams{"action.import.number"}->[0] || "1",
+			-labels => {
+				1 => "a single set",
+				8 => "multiple sets",
+			},
+			-onchange => "$onChange;$importScript",
+		),
+		" from ", # set definition file(s) ",
+		CGI::popup_menu(
+			-name => "action.import.source",
+			-values => [ "", $self->getDefList() ],
+			-labels => { "" => "the following file(s)" },
+			-default => $actionParams{"action.import.source"}->[0] || "",
+			-size => $actionParams{"action.import.number"}->[0] || "1",
+			-onchange => $onChange,
+		),
+		" with set name(s): ",
+		CGI::textfield(
+			-name => "action.import.name",
+			-value => $actionParams{"action.import.name"}->[0] || "",
+			-width => "50",
+			-onchange => $onChange,
+		),
+		($authz->hasPermissions($user, "assign_problem_sets")) 
+			?
+			"assigning this set to " .
+			CGI::popup_menu(
+				-name => "action.import.assign",
+				-value => [qw(user all)],
+				-default => $actionParams{"action.import.assign"}->[0] || "user",
+				-labels => {
+					all => "all current users.",
+					user => "only $user.",
+				},
+				-onchange => $onChange,
+			)
+			:
+			""	#user does not have permissions to assign problem sets
+	);
+}
+
+sub import_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+
+	my @fileNames = @{ $actionParams->{"action.import.source"} };
+	my $newSetName = $actionParams->{"action.import.name"}->[0];
+	$newSetName = "" if $actionParams->{"action.import.number"}->[0] > 1; # cannot assign set names to multiple imports
+	my $assign = $actionParams->{"action.import.assign"}->[0];
+	
+	my ($added, $skipped) = $self->importSetsFromDef($newSetName, $assign, @fileNames);
+
+	# make new sets visible... do we really want to do this? probably.
+	push @{ $self->{visibleSetIDs} }, @$added;
+	push @{ $self->{allSetIDs} }, @$added;
+	
+	my $numAdded = @$added;
+	my $numSkipped = @$skipped;
+
+   return CGI::div(
+		{class=>"ResultsWithoutError"},	
+		$numAdded . " set" . ($numAdded == 1 ? "" : "s") . " added, "
+		. $numSkipped . " set" . ($numSkipped == 1 ? "" : "s") . " skipped"
+		. " (" . join (", ", @$skipped) . ") "
+	);
+}
+
+sub export_form {
+	my ($self, $onChange, %actionParams) = @_;
+
+	return join("",
+		"Export ",
+		CGI::popup_menu(
+			-name => "action.export.scope",
+			-values => [qw(all visible selected)],
+			-default => $actionParams{"action.export.scope"}->[0] || "visible",
+			-labels => {
+				all => "all sets",
+				visible => "visible sets",
+				selected => "selected sets",
+			},
+			-onchange => $onChange,
+		),
+	);
+}
+
+# this does not actually export any files, rather it sends us to a new page in order to export the files
+sub export_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+
+	my $result;
+	
+	my $scope = $actionParams->{"action.export.scope"}->[0];
+	if ($scope eq "all") {
+		$result = "exporting all sets";
+		$self->{selectedSetIDs} = $self->{visibleSetIDs} = $self->{allSetIDs};
+
+	} elsif ($scope eq "visible") {
+		$result = "exporting visible sets";
+		$self->{selectedSetIDs} = $self->{visibleSetIDs};
+	} elsif ($scope eq "selected") {
+		$result = "exporting selected sets";
+		$self->{selectedSetIDs} = $self->{visibleSetIDs} = $genericParams->{selected_sets}; # an arrayref
+	}
+	$self->{exportMode} = 1;
+	
+	return   CGI::div({class=>"ResultsWithoutError"},  $result);
+}
 
-use constant PROBLEM_FIELDS =>[qw(source_file value max_attempts continuation)];
+sub cancelExport_form {
+	my ($self, $onChange, %actionParams) = @_;
+	return "Abandon export";
+}
 
-sub header {
-	my $self = shift;
-	my $r = $self->{r};
-	my $ce = $self->{ce};
-	my $courseName = $ce->{courseName};
-	my $root = $ce->{webworkURLs}->{root};
+sub cancelExport_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	my $r      = $self->r;
 	
-	if (defined $r->param('scoreSelected')) {
-		$r->header_out(Location => "$root/$courseName/instructor/scoring?".$self->url_args);
-		$self->{noContent} = 1;
-		return REDIRECT;
+	#$self->{selectedSetIDs) = $self->{visibleSetIDs};
+		# only do the above if we arrived here via "edit selected users"
+	if (defined $r->param("prev_visible_sets")) {
+		$self->{visibleSetIDs} = [ $r->param("prev_visible_sets") ];
+	} elsif (defined $r->param("no_prev_visible_sets")) {
+		$self->{visibleSetIDs} = [];
+	} else {
+		# leave it alone
 	}
-	$r->content_type("text/html");
-	$r->send_http_header();
+	$self->{exportMode} = 0;
+	
+	return CGI::div({class=>"ResultsWithError"},  "export abandoned");
 }
 
-sub initialize {
-	my $self = shift;
-	my $r = $self->{r};
-	my $db = $self->{db};
-	my $ce = $self->{ce};
-	my $authz = $self->{authz};
-	my $courseName = $ce->{courseName};
-	my $user = $r->param('user');
+sub saveExport_form {
+	my ($self, $onChange, %actionParams) = @_;
+	return "Export selected sets.";
+}
+
+sub saveExport_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	my $r           = $self->r;
+	my $db          = $r->db;
 	
-	unless ($authz->hasPermissions($user, "create_and_delete_problem_sets")) {
-		$self->{submitError} = "You aren't authorized to create or delete problems";
-		return;
-	}
-	
-	if (defined($r->param('deleteSelected'))) {
-		foreach my $wannaDelete ($r->param('selectedSet')) {
-			$db->deleteGlobalSet($wannaDelete);
-		}
-	} elsif (defined $r->param('scoreSelected')) {
-		# FIXME: this doesn't do anything!
-	} elsif (defined $r->param('makeNewSet')) {
-		my $newSetRecord = $db->{set}->{record}->new();
-		my $newSetName = $r->param('newSetName');
-		$newSetRecord->set_id($newSetName);
-		$newSetRecord->set_header("");
-		$newSetRecord->problem_header("");
-		$newSetRecord->open_date("0");
-		$newSetRecord->due_date("0");
-		$newSetRecord->answer_date("0");
-		eval {$db->addGlobalSet($newSetRecord)};
-	} elsif (defined $r->param('importSet') or defined $r->param('importSets')) {
-		my @setDefFiles = ();
-		my $newSetName = "";
-		if (defined $r->param('importSet')) {
-			@setDefFiles = $r->param('set_definition_file');
-			$newSetName = $r->param('newSetName');
-		} elsif (defined $r->param('importSets')) {
-			@setDefFiles = $r->param('set_definition_files');
-		}
-		
-		foreach my $set_definition_file (@setDefFiles) {
-			# read data in set definition file
-			my ($setName, $paperHeaderFile, $screenHeaderFile,
-		    	$openDate, $dueDate, $answerDate, $ra_problemData,
-			) = $self->readSetDef($set_definition_file);
-			my @problemList = @{$ra_problemData};
-
-			# Use the original name if form doesn't specify a new one.
-			# The set acquires the new name specified by the form.  A blank
-			# entry on the form indicates that the imported set name will be used.
-			$setName = $newSetName if $newSetName;
-			
-			# add the data to the set record
-			#my $newSetRecord = $db->{set}->{record}->new();
-			my $newSetRecord = $db->newGlobalSet;
-			$newSetRecord->set_id($setName);
-			$newSetRecord->set_header($screenHeaderFile);
-			$newSetRecord->problem_header($paperHeaderFile);
-			$newSetRecord->open_date($openDate);
-			$newSetRecord->due_date($dueDate);
-			$newSetRecord->answer_date($answerDate);
-
-			#create the set
-			eval {$db->addGlobalSet($newSetRecord)};
-			die "addGlobalSet $setName in ProblemSetList:  $@" if $@;
-
-			# add problems
-			my $freeProblemID = WeBWorK::Utils::max($db->listGlobalProblems($setName)) + 1;
-			foreach my $rh_problem (@problemList) {
-				#my $problemRecord = new WeBWorK::DB::Record::Problem;
-				my $problemRecord = $db->newGlobalProblem;
-				$problemRecord->problem_id($freeProblemID++);
-				#warn "Adding problem $freeProblemID ", $rh_problem->source_file;
-				$problemRecord->set_id($setName);
-				$problemRecord->source_file($rh_problem->{source_file});
-				$problemRecord->value($rh_problem->{value});
-				$problemRecord->max_attempts($rh_problem->{max_attempts});
-				# continuation flags???
-				$db->addGlobalProblem($problemRecord);
-				#$self->assignProblemToAllSetUsers($problemRecord);  # handled by parent
-			}
-			
-			# assign the set to all users
-			$self->assignSetToAllUsers($setName);
-		}
-	} 
+	my @setIDsToExport = @{ $self->{selectedSetIDs} };
+
+	my %filenames = map { $_ => (@{ $tableParams->{"set.$_"} }[0] || $_) } @setIDsToExport;
+
+	my ($exported, $skipped, $reason) = $self->exportSetsToDef(%filenames);
+	
+	if (defined $r->param("prev_visible_sets")) {
+		$self->{visibleSetIDs} = [ $r->param("prev_visible_sets") ];
+	} elsif (defined $r->param("no_prev_visble_sets")) {
+		$self->{visibleSetIDs} = [];
+	} else {
+		# leave it alone
+	}
+	
+	$self->{exportMode} = 0;
+	
+	my $numExported = @$exported;
+	my $numSkipped = @$skipped;
+	my $resultFont = ($numSkipped)? "ResultsWithError" : "ResultsWithoutError";
+	
+	my @reasons = map { "set $_ - " . $reason->{$_} } keys %$reason;
+
+	return 	CGI::div( {class=>$resultFont},
+	    $numExported . " set" . ($numExported == 1 ? "" : "s") . " exported, "
+		. $numSkipped . " set" . ($numSkipped == 1 ? "" : "s") . " skipped."
+		. (($numSkipped) ? CGI::ul(CGI::li(\@reasons)) : "")
+		);
+
 }
 
-sub path {
-	my ($self, $args) = @_;
+sub cancelEdit_form {
+	my ($self, $onChange, %actionParams) = @_;
+	return "Abandon changes";
+}
+
+sub cancelEdit_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	my $r      = $self->r;
 	
-	my $ce = $self->{ce};
-	my $root = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
-	return $self->pathMacro($args,
-		"Home"          => "$root",
-		$courseName     => "$root/$courseName",
-		'instructor'    => "$root/$courseName/instructor",
-		'sets'      => ''
-	);
+	#$self->{selectedSetIDs) = $self->{visibleSetIDs};
+		# only do the above if we arrived here via "edit selected users"
+	if (defined $r->param("prev_visible_sets")) {
+		$self->{visibleSetIDs} = [ $r->param("prev_visible_sets") ];
+	} elsif (defined $r->param("no_prev_visible_sets")) {
+		$self->{visibleSetIDs} = [];
+	} else {
+		# leave it alone
+	}
+	$self->{editMode} = 0;
+	
+	return CGI::div({class=>"ResultsWithError"}, "changes abandoned");
 }
 
-sub title {
-	my $self = shift;
-	return "Instructor Tools - Problem Set List for ".$self->{ce}->{courseName};
+sub saveEdit_form {
+	my ($self, $onChange, %actionParams) = @_;
+	return "Save changes";
 }
 
-sub body {
-	my $self = shift;
-	my $r = $self->{r};
-	my $db = $self->{db};
-	my $ce = $self->{ce};
-	my $authz = $self->{authz};
-	my $root = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
-	my $user = $r->param('user');
-	my $key  = $r->param('key');
-	my $effectiveUserName = $r->param('effectiveUser');
-	my $URL = $r->uri;
-	my $instructorBaseURL = "$root/$courseName/instructor";
-	my $importURL = "$instructorBaseURL/problemSetImport/";
-	my $sort = $r->param('sort') ? $r->param('sort') : "due_date";
-	
-	my @set_definition_files    = $self->read_dir($ce->{courseDirs}->{templates},'\\.def');
-	return CGI::em("You are not authorized to access the instructor tools") unless $authz->hasPermissions($user, "access_instructor_tools");
-
-	# Slurp each set record for this course in @sets
-	# Gather data from the database
-	my @users = $db->listUsers;
-	my @set_IDs = $db->listGlobalSets;
-	my @sets  = $db->getGlobalSets(@set_IDs); #checked
-	my %counts;
-	my %problemCounts;
-	
-	$WeBWorK::timer->continue("Begin obtaining problem info on sets") if defined $WeBWorK::timer;
-	foreach my $set_id (@set_IDs) {
-		$problemCounts{$set_id} = scalar($db->listGlobalProblems($set_id));
-		#$counts{$set_id} = $db->listSetUsers($set_id);
-	}
-	$WeBWorK::timer->continue("End obtaining problem on sets") if defined $WeBWorK::timer;
-	
-	$WeBWorK::timer->continue("Begin obtaining assigned user info on sets") if defined $WeBWorK::timer;
-	foreach my $set_id (@set_IDs) {
-		#$problemCounts{$set_id} = scalar($db->listGlobalProblems($set_id));
-		#$counts{$set_id} = $db->listSetUsers($set_id);
-		$counts{$set_id} = $db->countSetUsers($set_id);
-	}	
-	$WeBWorK::timer->continue("End obtaining assigned user info on sets") if defined $WeBWorK::timer;
-
-	# Sort @sets based on the sort parameter
-	# Invalid sort types will just cause an unpredictable ordering, which is no big deal.
-	@sets = sort {
-		if ($sort eq "set_id") {
-			return $a->$sort cmp $b->$sort;
-		}elsif ($sort =~ /_date$/) {
-			return $a->$sort <=> $b->$sort;
-		} elsif ($sort eq "num_probs") {
-			return $problemCounts{$a->set_id} <=> $problemCounts{$b->set_id};
-		} elsif ($sort eq "num_students") {
-			return $counts{$a->set_id} <=> $counts{$b->set_id};
-		}
-	} @sets;
-	
-	my $table = CGI::Tr({}, 
-		CGI::th("Sel.")
-		. CGI::th(CGI::a({"href"=>$URL."?".$self->url_authen_args."&sort=set_id"},       "ID"))
-		. CGI::th(CGI::a({"href"=>$URL."?".$self->url_authen_args."&sort=open_date"},    "Open Date"))
-		. CGI::th(CGI::a({"href"=>$URL."?".$self->url_authen_args."&sort=due_date"},     "Due Date"))
-		. CGI::th(CGI::a({"href"=>$URL."?".$self->url_authen_args."&sort=answer_date"},  "Answer Date"))
-		. CGI::th(CGI::a({"href"=>$URL."?".$self->url_authen_args."&sort=num_probs"},    "Num. Problems"))
-		. CGI::th(CGI::a({"href"=>$URL."?".$self->url_authen_args."&sort=num_students"}, "Assigned to:"))
-	) . "\n";
-	
-	foreach my $set (@sets) {
-		my $count = $counts{$set->set_id};
+sub saveEdit_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	my $r           = $self->r;
+	my $db          = $r->db;
+	
+	my @visibleSetIDs = @{ $self->{visibleSetIDs} };
+	foreach my $setID (@visibleSetIDs) {
+		my $Set = $db->getGlobalSet($setID); # checked
+		# FIXME: we may not want to die on bad sets, they're not as bad as bad users
+		die "record for visible set $setID not found" unless $Set;
+
+		foreach my $field ($Set->NONKEYFIELDS()) {
+			my $param = "set.${setID}.${field}";
+			if (defined $tableParams->{$param}->[0]) {
+				if ($field =~ /_date/) {
+					$Set->$field($self->parseDateTime($tableParams->{$param}->[0]));
+				} else {
+					$Set->$field($tableParams->{$param}->[0]);
+				}
+			}
+		}
 		
-		my $userCountMessage = $self->userCountMessage($count, scalar(@users));
-	
-		$table .= CGI::Tr({}, 
-			CGI::td({}, 
-				CGI::checkbox({
-					"name"=>"selectedSet",
-					"value"=>$set->set_id,
-					"label"=>"",
-					"checked"=>"0"
-				})
-			)
-			. CGI::td({}, CGI::a({href=>$r->uri.$set->set_id."/?".$self->url_authen_args}, $set->set_id))
-			. CGI::td({}, formatDateTime($set->open_date))
-			. CGI::td({}, formatDateTime($set->due_date))
-			. CGI::td({}, formatDateTime($set->answer_date))
-			. CGI::td({}, CGI::a({href=>$r->uri.$set->set_id."/problems/?".$self->url_authen_args}, $problemCounts{$set->set_id}))
-			. CGI::td({}, CGI::a({href=>$r->uri.$set->set_id."/users/?".$self->url_authen_args}, $userCountMessage))
-		) . "\n"
-	}
-	$table = CGI::table({"border"=>"1"}, "\n".$table."\n");
-
-	my $form = join("",
-		CGI::start_form({"method"=>"POST", "action"=>$r->uri}),"\n", # This form is for deleting sets, and points to itself
-		$table,"\n",
-		CGI::br(),"\n",
-		$self->hidden_authen_fields,"\n",
-		CGI::submit({"name"=>"deleteSelected", "label"=>"Delete Selected"}),"\n",
-		CGI::submit({"name"=>"scoreSelected", "label"=>"Score Selected"}),"\n",
-		CGI::end_form(),"\n",
+		# make sure the dates are not more than 10 years in the future
+		my $curr_time = time;
+		my $seconds_per_year = 31_556_926;
+		my $cutoff = $curr_time + $seconds_per_year*10;
+		return CGI::div({class=>'ResultsWithError'}, "Error: open date cannot be more than 10 years from now in set $setID")
+			if $Set->open_date > $cutoff;
+		return CGI::div({class=>'ResultsWithError'}, "Error: due date cannot be more than 10 years from now in set $setID")
+			if $Set->due_date > $cutoff;
+		return CGI::div({class=>'ResultsWithError'}, "Error: answer date cannot be more than 10 years from now in set $setID")
+			if $Set->answer_date > $cutoff;
 		
-		CGI::start_form({"method"=>"POST", "action"=>$r->uri}),"\n",
-		$self->hidden_authen_fields,"\n",
-		"New Set Name: ",
-		CGI::input({type=>"text", name=>"newSetName", value=>""}),
-		CGI::submit({"name"=>"makeNewSet", "label"=>"Create"}),"\n",
-		CGI::end_form(),"\n",
+		# Check that the open, due and answer dates are in increasing order.
+		# Bail if this is not correct.
+		if ($Set->open_date > $Set->due_date)  {
+			return CGI::div({class=>'ResultsWithError'}, "Error: Due date must come after open date in set $setID");
+		}
+		if ($Set->due_date > $Set->answer_date) {
+			return CGI::div({class=>'ResultsWithError'}, "Error: Answer date must come after due date in set $setID");
+		}
 		
-		CGI::start_form({"method"=>"POST", "action"=>$r->uri}),"\n",
-		$self->hidden_authen_fields,"\n",
-		CGI::b("Import a Single Set"), CGI::br(), "\n",
-		"From file: ", CGI::popup_menu(
-			-name=>'set_definition_file', 
-			-values=>\@set_definition_files, 
-		), CGI::br(), "\n",
-		"Set name: ", CGI::input({type=>"text", name=>"newSetName", value=>""}),
-		CGI::br(), "\n",
-		CGI::submit({"name"=>"importSet", "label"=>"Import a Single Set"}),"\n",
-		CGI::br(), "\n",
-		CGI::b("Import Multiple Sets"), CGI::br(),
-		"Each set will be named based on the name of the set definition file, omitting",
-		" any leading ", CGI::i("set"), " and trailing ", CGI::i(".def"), ". Note that",
-		" the name of a set cannot be changed once it has been created.",
-		CGI::br(), "\n",
-		CGI::scrolling_list(
-			-name=>"set_definition_files",
-			-values=>\@set_definition_files,
-			-size=>10,
-			-multiple=>"true",
-		), CGI::br(),
-		CGI::submit({"name"=>"importSets", "label"=>"Import Multiple Sets"}),"\n",
-		CGI::end_form(),"\n"
+		$db->putGlobalSet($Set);
+	}
+	
+	if (defined $r->param("prev_visible_sets")) {
+		$self->{visibleSetIDs} = [ $r->param("prev_visible_sets") ];
+	} elsif (defined $r->param("no_prev_visble_sets")) {
+		$self->{visibleSetIDs} = [];
+	} else {
+		# leave it alone
+	}
+	
+	$self->{editMode} = 0;
+	
+	return CGI::div({class=>"ResultsWithError"}, "changes saved" );
+}
+
+sub duplicate_form {
+	my ($self, $onChange, %actionParams) = @_;
+
+	my $r = $self->r;
+	my @visible_sets = $r->param('visible_sets');
+
+	return "" unless @visible_sets == 1;
+	
+	return join ("", 
+		"Duplicate this set and name it: ", 
+		CGI::textfield(
+			-name => "action.duplicate.name",
+			-value => $actionParams{"action.duplicate.name"}->[0] || "",
+			-width => "50",
+			-onchange => $onChange,
+		),
 	);
-	print $form;
+}
+
+sub duplicate_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
 	
-	return "";
+	my $r = $self->r;
+	my $db = $r->db;
+	
+	my $oldSetID = $self->{selectedSetIDs}->[0];
+	return CGI::div({class => "ResultsWithError"}, "Failed to duplicate set: no set selected for duplication!") unless defined($oldSetID) and $oldSetID =~ /\S/;	
+	my $newSetID = $actionParams->{"action.duplicate.name"}->[0];
+	return CGI::div({class => "ResultsWithError"}, "Failed to duplicate set: no set name specified!") unless $newSetID =~ /\S/;		
+	# DBFIXME checking for existence -- don't need to fetch
+	return CGI::div({class => "ResultsWithError"}, "Failed to duplicate set: set $newSetID already exists!") if defined $db->getGlobalSet($newSetID);
+
+	my $newSet = $db->getGlobalSet($oldSetID);
+	$newSet->set_id($newSetID);
+	eval {$db->addGlobalSet($newSet)};
+	
+	# take all the problems from the old set and make them part of the new set
+	foreach ($db->getAllGlobalProblems($oldSetID)) { 
+		$_->set_id($newSetID); 
+		$db->addGlobalProblem($_);
+	}
+	
+	push @{ $self->{visibleSetIDs} }, $newSetID;
+
+	return CGI::div({class => "ResultsWithError"}, "Failed to duplicate set: $@") if $@;
+	
+	return "SUCCESS";
+}
+
+################################################################################
+# sorts
+################################################################################
+
+sub bySetID         { $a->set_id         cmp $b->set_id         }
+
+# I can't figure out why these are useful
+
+# sub bySetHeader     { $a->set_header     cmp $b->set_header     }
+# sub byHardcopyHeader { $a->hardcopy_header cmp $b->hardcopy_header }
+#FIXME  eventually we may be able to remove these checks, if we can trust 
+# that the dates are always defined
+# dates which are the empty string '' or undefined  are treated as 0
+sub byOpenDate      { my $result = eval{( $a->open_date || 0 )      <=> ( $b->open_date || 0 ) };
+                      return $result unless $@;
+                      warn "Open date not correctly defined.";
+                      return 0;
+}
+sub byDueDate       { my $result = eval{( $a->due_date || 0 )     <=> ( $b->due_date || 0 )   };      
+                      return $result unless $@;
+                      warn "Due date not correctly defined.";
+                      return 0;
 }
+sub byAnswerDate    { my $result = eval{( $a->answer_date || 0)    <=> ( $b->answer_date || 0 )  };    
+                      return $result unless $@;
+                      warn "Answer date not correctly defined.";
+                      return 0;
+}
+sub byVisible     { my $result = eval{$a->visible      cmp $b->visible   };      
+                      return $result unless $@;
+                      warn "Visibility status not correctly defined.";
+                      return 0;
+}
+
+sub byOpenDue       { &byOpenDate || &byDueDate }
+
+################################################################################
+# utilities
+################################################################################
+
+# generate labels for open_date/due_date/answer_date popup menus
+sub menuLabels {
+	my ($self, $hashRef) = @_;
+	my %hash = %$hashRef;
+	
+	my %result;
+	foreach my $key (keys %hash) {
+		my $count = @{ $hash{$key} };
+		my $displayKey = $self->formatDateTime($key) || "<none>";
+		$result{$key} = "$displayKey ($count sets)";
+	}
+	return %result;
+}
+
+sub importSetsFromDef {
+	my ($self, $newSetName, $assign, @setDefFiles) = @_;
+	my $r     = $self->r;
+	my $ce    = $r->ce;
+	my $db    = $r->db;
+	my $dir   = $ce->{courseDirs}->{templates};
+
+	# if the user includes "following files" in a multiple selection
+	# it shows up here as "" which causes the importing to die
+	# so, we select on filenames containing non-whitespace
+	@setDefFiles = grep(/\S/, @setDefFiles);
+
+	# FIXME: do we really want everything to fail on one bad file name?
+	foreach my $fileName (@setDefFiles) {
+		die "won't be able to read from file $dir/$fileName: does it exist? is it readable?"
+			unless -r "$dir/$fileName";
+	}
+
+	my @allSetIDs = $db->listGlobalSets();
+	# FIXME: getGlobalSets takes a lot of time just for checking to see if a set already exists
+	# 	this could be avoided by waiting until the call to addGlobalSet below
+	#	and checking to see if the error message says that the set already exists
+	#	but if the error message is ever changed the code here might be broken
+	#	then again, one call to getGlobalSets and skipping unnecessary calls to addGlobalSet
+	#	could be faster than no call to getGlobalSets and lots of unnecessary calls to addGlobalSet
+	# DBFIXME all we need here is set IDs, right? why fetch entire records?
+	my %allSets = map { $_->set_id => 1 if $_} $db->getGlobalSets(@allSetIDs); # checked
+
+	my (@added, @skipped);
 
-##############################################################################################
-#  Utility scripts -- may be moved to Utils.pm
-##############################################################################################
+	foreach my $set_definition_file (@setDefFiles) {
 
+		debug("$set_definition_file: reading set definition file");
+		# read data in set definition file
+		my ($setName, $paperHeaderFile, $screenHeaderFile, $openDate, $dueDate, $answerDate, $ra_problemData, $assignmentType, $attemptsPerVersion, $timeInterval, $versionsPerInterval, $versionTimeLimit, $problemRandOrder, $problemsPerPage, $hideScore, $hideWork,$timeCap,$restrictIP,$restrictLoc,$relaxRestrictIP) = $self->readSetDef($set_definition_file);
+		my @problemList = @{$ra_problemData};
+
+		# Use the original name if form doesn't specify a new one.
+		# The set acquires the new name specified by the form.  A blank
+		# entry on the form indicates that the imported set name will be used.
+		$setName = $newSetName if $newSetName;
+
+		if ($allSets{$setName}) {
+			# this set already exists!!
+			push @skipped, $setName;
+			next;
+		} else {
+			push @added, $setName;
+		}
+
+		debug("$set_definition_file: adding set");
+		# add the data to the set record
+		my $newSetRecord = $db->newGlobalSet;
+		$newSetRecord->set_id($setName);
+		$newSetRecord->set_header($screenHeaderFile);
+		$newSetRecord->hardcopy_header($paperHeaderFile);
+		$newSetRecord->open_date($openDate);
+		$newSetRecord->due_date($dueDate);
+		$newSetRecord->answer_date($answerDate);
+		$newSetRecord->visible(DEFAULT_VISIBILITY_STATE);
+		$newSetRecord->enable_reduced_scoring(DEFAULT_ENABLED_REDUCED_SCORING_STATE);
+
+	# gateway/version data.  these should are all initialized to ''
+        #   by readSetDef, so for non-gateway/versioned sets they'll just 
+        #   be stored as null
+		$newSetRecord->assignment_type($assignmentType);
+		$newSetRecord->attempts_per_version($attemptsPerVersion);
+		$newSetRecord->time_interval($timeInterval);
+		$newSetRecord->versions_per_interval($versionsPerInterval);
+		$newSetRecord->version_time_limit($versionTimeLimit);
+		$newSetRecord->problem_randorder($problemRandOrder);
+		$newSetRecord->problems_per_page($problemsPerPage);
+		$newSetRecord->hide_score($hideScore);
+		$newSetRecord->hide_work($hideWork);
+		$newSetRecord->time_limit_cap($timeCap);
+		$newSetRecord->restrict_ip($restrictIP);
+		$newSetRecord->relax_restrict_ip($relaxRestrictIP);
+
+		#create the set
+		eval {$db->addGlobalSet($newSetRecord)};
+		die "addGlobalSet $setName in ProblemSetList:  $@" if $@;
+
+		#do we need to add locations to the set_locations table?
+		if ( $restrictIP ne 'No' && $restrictLoc ) {
+			if ($db->existsLocation( $restrictLoc ) ) {
+				if ( ! $db->existsGlobalSetLocation($setName,$restrictLoc) ) {
+					my $newSetLocation = $db->newGlobalSetLocation;
+					$newSetLocation->set_id( $setName );
+					$newSetLocation->location_id( $restrictLoc );
+					eval {$db->addGlobalSetLocation($newSetLocation)};
+					warn("error adding set location $restrictLoc " .
+					     "for set $setName: $@") if $@;
+				} else {
+					# this should never happen.
+					warn("input set location $restrictLoc" .
+					     " already exists for set " . 
+					     "$setName.\n");
+				}
+			} else { 
+				warn("restriction location $restrictLoc " .
+				     "does not exist.  IP restrictions have " .
+				     "been ignored.\n");
+				$newSetRecord->restrict_ip('No');
+				$newSetRecord->relax_restrict_ip('No');
+				eval { $db->putGlobalSet($newSetRecord) };
+				# we ignore error messages here; if the set
+				#    added without error before, we assume 
+				#    (ha) that it will put without trouble
+			}
+		}
+
+		debug("$set_definition_file: adding problems to database");
+		# add problems
+		my $freeProblemID = WeBWorK::Utils::max($db->listGlobalProblems($setName)) + 1;
+		foreach my $rh_problem (@problemList) {
+			$self->addProblemToSet(
+			  setName => $setName,
+			  sourceFile => $rh_problem->{source_file},
+			  problemID => $freeProblemID++,
+			  value => $rh_problem->{value},
+			  maxAttempts => $rh_problem->{max_attempts});
+		}
+
+
+		if ($assign eq "all") {
+			$self->assignSetToAllUsers($setName);
+		}
+		else {
+			my $userName = $r->param('user');
+			$self->assignSetToUser($userName, $newSetRecord); ## always assign set to instructor
+		}
+	}
+
+	return \@added, \@skipped;
+}
 
 sub readSetDef {
-	my $self          = shift;
-	my $fileName      = shift;
+	my ($self, $fileName) = @_;
 	my $templateDir   = $self->{ce}->{courseDirs}->{templates};
 	my $filePath      = "$templateDir/$fileName";
-    my $setNumber = '';
-    if ($fileName =~ m|^set(\w+)\.def$|) {
-    	$setNumber = $1;
-    } else {
-        warn qq{The setDefinition file name must begin with   <CODE>set</CODE>},
-			 qq{and must end with   <CODE>.def</CODE>  . Every thing in between becomes the name of the set. },
-			 qq{For example <CODE>set1.def</CODE>, <CODE>setExam.def</CODE>, and <CODE>setsample7.def</CODE> },
-			 qq{define sets named <CODE>1</CODE>, <CODE>Exam</CODE>, and <CODE>sample7</CODE> respectively. },
-			 qq{The filename, $fileName, you entered is not legal\n };
-
-    }
-
-    my ($line,$name,$value,$attemptLimit,$continueFlag);
+	my $value_default = $self->{ce}->{problemDefaults}->{value};
+	my $max_attempts_default = $self->{ce}->{problemDefaults}->{max_attempts};
+
+	my $setName = '';
+
+	if ($fileName =~ m|^set([.\w-]+)\.def$|) {
+		$setName = $1;
+	} else {
+		$self->addbadmessage( 
+		    qq{The setDefinition file name must begin with   <CODE>set</CODE>},
+			qq{and must end with   <CODE>.def</CODE>  . Every thing in between becomes the name of the set. },
+			qq{For example <CODE>set1.def</CODE>, <CODE>setExam.def</CODE>, and <CODE>setsample7.def</CODE> },
+			qq{define sets named <CODE>1</CODE>, <CODE>Exam</CODE>, and <CODE>sample7</CODE> respectively. },
+			qq{The filename, $fileName, you entered is not legal\n } 
+		);
+
+	}
+
+	my ($line, $name, $value, $attemptLimit, $continueFlag);
 	my $paperHeaderFile = '';
 	my $screenHeaderFile = '';
-	my ($dueDate,$openDate,$answerDate);
+	my ($dueDate, $openDate, $answerDate);
 	my @problemData;	
-    if ( open (SETFILENAME, "$filePath") )    {
+
+# added fields for gateway test/versioned set definitions:
+	my ( $assignmentType, $attemptsPerVersion, $timeInterval, 
+	     $versionsPerInterval, $versionTimeLimit, $problemRandOrder,
+	     $problemsPerPage, $restrictLoc,
+	     ) = 
+		 ('')x8;  # initialize these to ''
+	my ( $timeCap, $restrictIP, $relaxRestrictIP ) = ( 0, 'No', 'No');
+# additional fields currently used only by gateways; later, the world?
+	my ( $hideScore, $hideWork, ) = ( 'N', 'N' );
+
+	my %setInfo;
+	if ( open (SETFILENAME, "$filePath") )    {
 	#####################################################################
 	# Read and check set data
 	#####################################################################
 		while (<SETFILENAME>) {
+		
 			chomp($line = $_);
 			$line =~ s|(#.*)||;                              ## don't read past comments
 			unless ($line =~ /\S/) {next;}                   ## skip blank lines
 			$line =~ s|\s*$||;                               ## trim trailing spaces
 			$line =~ m|^\s*(\w+)\s*=\s*(.*)|;
-			if ($1 eq 'setNumber') {
+			
+			######################
+			# sanity check entries
+			######################
+			my $item = $1;
+			$item    = '' unless defined $item;
+			my $value = $2;
+			$value    = '' unless defined $value;
+			
+			if ($item eq 'setNumber') {
 				next;
-			} elsif ($1 eq 'paperHeaderFile') {
-				$paperHeaderFile = $2;
-			} elsif ($1 eq 'screenHeaderFile') {
-				$screenHeaderFile = $2;
-			} elsif ($1 eq 'dueDate') {
-				$dueDate = $2;
-			} elsif ($1 eq 'openDate') {
-				$openDate = $2;
-			} elsif ($1 eq 'answerDate') {
-				$answerDate = $2;
-			} elsif ($1 eq 'problemList') {
+			} elsif ($item eq 'paperHeaderFile') {
+				$paperHeaderFile = $value;
+			} elsif ($item eq 'screenHeaderFile') {
+				$screenHeaderFile = $value;
+			} elsif ($item eq 'dueDate') {
+				$dueDate = $value;
+			} elsif ($item eq 'openDate') {
+				$openDate = $value;
+			} elsif ($item eq 'answerDate') {
+				$answerDate = $value;
+			} elsif ($item eq 'assignmentType') {
+				$assignmentType = $value;
+			} elsif ($item eq 'attemptsPerVersion') {
+				$attemptsPerVersion = $value;
+			} elsif ($item eq 'timeInterval') {
+				$timeInterval = $value;
+			} elsif ($item eq 'versionsPerInterval') {
+				$versionsPerInterval = $value;
+			} elsif ($item eq 'versionTimeLimit') {
+				$versionTimeLimit = $value;
+			} elsif ($item eq 'problemRandOrder') {
+				$problemRandOrder = $value;
+			} elsif ($item eq 'problemsPerPage') {
+				$problemsPerPage = $value;
+			} elsif ($item eq 'hideScore') {
+				$hideScore = ( $value ) ? $value : 'N';
+			} elsif ($item eq 'hideWork') {
+				$hideWork = ( $value ) ? $value : 'N';
+			} elsif ($item eq 'capTimeLimit') {
+				$timeCap = ( $value ) ? 1 : 0;
+			} elsif ($item eq 'restrictIP') {
+				$restrictIP = ( $value ) ? $value : 'No';
+			} elsif ($item eq 'restrictLocation' ) { 
+				$restrictLoc = ( $value ) ? $value : '';
+			} elsif ( $item eq 'relaxRestrictIP' ) {
+				$relaxRestrictIP = ( $value ) ? $value : 'No';
+			} elsif ($item eq 'problemList') {
 				last;
 			} else {
-				warn "readSetDef error, can't read the line: $line";
+				warn "readSetDef error, can't read the line: ||$line||";
 			}
 		}
-	#####################################################################
-	# Check and format dates
-	#####################################################################
-		my ($time1,$time2,$time3) = map { $_ =~ s/\s*at\s*/ /; WeBWorK::Utils::parseDateTime($_);  }    ($openDate, $dueDate, $answerDate);
+
+		#####################################################################
+		# Check and format dates
+		#####################################################################
+		my ($time1, $time2, $time3) = map {  $self->parseDateTime($_);  }    ($openDate, $dueDate, $answerDate);
 	
 		unless ($time1 <= $time2 and $time2 <= $time3) {
-			warn "The open date: $openDate, due date: $dueDate, and answer date: $answerDate must be defined and in chronologicasl order.";
+			warn "The open date: $openDate, due date: $dueDate, and answer date: $answerDate must be defined and in chronological order.";
 		}
-	# Check header file names
+
+		# Check header file names
 		$paperHeaderFile =~ s/(.*?)\s*$/$1/;   #remove trailing white space
 		$screenHeaderFile =~ s/(.*?)\s*$/$1/;   #remove trailing white space
 	
-	 #   warn "setNumber: $setNumber\ndueDate: $dueDate\nopenDate: $openDate\nanswerDate: $answerDate\n";
-	 #   warn "time1 $time1 time2 $time2 time3 $time3";
-	#####################################################################
-	# Read and check list of problems for the set
-	#####################################################################
+                #####################################################################
+                # Gateway/version variable cleanup: convert times into seconds
+		$timeInterval = WeBWorK::Utils::timeToSec( $timeInterval )
+		    if ( $timeInterval );
+		$versionTimeLimit = WeBWorK::Utils::timeToSec($versionTimeLimit)
+		    if ( $versionTimeLimit );
 
+		# check that the values for hideWork and hideScore are valid
+		if ( $hideScore ne 'N' && $hideScore ne 'Y' && 
+		     $hideScore ne 'BeforeAnswerDate' ) {
+			warn("The value $hideScore for the hideScore option " .
+			     "is not valid; it will be replaced with 'N'.\n");
+			$hideScore = 'N';
+		}
+		if ( $hideWork ne 'N' && $hideWork ne 'Y' && 
+		     $hideWork ne 'BeforeAnswerDate' ) {
+			warn("The value $hideWork for the hideWork option " .
+			     "is not valid; it will be replaced with 'N'.\n");
+			$hideWork = 'N';
+		}
+		if ( $timeCap ne '0' && $timeCap ne '1' ) {
+			warn("The value $timeCap for the capTimeLimit option " .
+			     "is not valid; it will be replaced with '0'.\n");
+			$timeCap = '0';
+		}
+		if ( $restrictIP ne 'No' && $restrictIP ne 'DenyFrom' &&
+		     $restrictIP ne 'RestrictTo' ) {
+			warn("The value $restrictIP for the restrictIP " .
+			     "option is not valid; it will be replaced " . 
+			     "with 'No'.\n");
+			$restrictIP = 'No';
+			$restrictLoc = '';
+			$relaxRestrictIP = 'No';
+		}
+		if ( $relaxRestrictIP ne 'No' && 
+		     $relaxRestrictIP ne 'AfterAnswerDate' &&
+		     $relaxRestrictIP ne 'AfterVersionAnswerDate' ) {
+			warn("The value $relaxRestrictIP for the " .
+			     "relaxRestrictIP option is not valid; it will " . 
+			     "be replaced with 'No'.\n");
+			$relaxRestrictIP = 'No';
+		}
+		# to verify that restrictLoc is valid requires a database
+		#    call, so we defer that until we return to add the set
+		
+		#####################################################################
+		# Read and check list of problems for the set
+		#####################################################################
 		while(<SETFILENAME>) {
 			chomp($line=$_);
 			$line =~ s/(#.*)//;                             ## don't read past comments
 			unless ($line =~ /\S/) {next;}                  ## skip blank lines
 	
-			($name, $value, $attemptLimit, $continueFlag) = split (/\s*,\s*/,$line);
+			# commas are valid in filenames, so we have to handle commas
+			# using backslash escaping, so \X will be replaced with X
+			my @line = ();
+			my $curr = '';
+			for (my $i = 0; $i < length $line; $i++) {
+				my $c = substr($line,$i,1);
+				if ($c eq '\\') {
+					$curr .= substr($line,++$i,1);
+			    } elsif ($c eq ',') {
+					push @line, $curr;
+					$curr = '';
+				} else {
+					$curr .= $c;
+				}
+			}
+			## anything left?
+			push(@line, $curr) if ( $curr );
+			
+			($name, $value, $attemptLimit, $continueFlag) = @line;
 			#####################
 			#  clean up problem values
 			###########################
 			$name =~ s/\s*//g;
-			#                                 push(@problemList, $name);
 			$value = "" unless defined($value);
 			$value =~ s/[^\d\.]*//g;
-			unless ($value =~ /\d+/) {$value = 1;}
-			#                                 push(@problemValueList, $value);
+			unless ($value =~ /\d+/) {$value = $value_default;}
 			$attemptLimit = "" unless defined($attemptLimit);
 			$attemptLimit =~ s/[^\d-]*//g;
-			unless ($attemptLimit =~ /\d+/) {$attemptLimit = -1;}
-			#                                 push(@problemAttemptLimitList, $attemptLimit);
+			unless ($attemptLimit =~ /\d+/) {$attemptLimit = $max_attempts_default;}
 			$continueFlag = "0" unless( defined($continueFlag) && @problemData );  
-				# can't put continuation flag ont the first problem
-			#                                 push(@problemContinuationFlagList, $continueFlag);
+			# can't put continuation flag onto the first problem
 			push(@problemData, {source_file    => $name,
 			                    value          =>  $value,
 			                    max_attempts   =>, $attemptLimit,
@@ -392,17 +1925,441 @@ sub readSetDef {
 			                    });
 		}
 		close(SETFILENAME);
-		($setNumber,
+		($setName,
 		 $paperHeaderFile,
 		 $screenHeaderFile,
 		 $time1,
 		 $time2,
 		 $time3,
 		 \@problemData,
+		 $assignmentType, $attemptsPerVersion, $timeInterval, 
+		 $versionsPerInterval, $versionTimeLimit, $problemRandOrder,
+		 $problemsPerPage, 
+		 $hideScore,
+		 $hideWork,
+		 $timeCap,
+		 $restrictIP,
+		 $restrictLoc,
+		 $relaxRestrictIP,
 		);
 	} else {
 		warn "Can't open file $filePath\n";
 	}
 }
 
+sub exportSetsToDef {
+    	my ($self, %filenames) = @_;
+
+	my $r        = $self->r;
+	my $ce       = $r->ce;
+	my $db       = $r->db;
+
+	my (@exported, @skipped, %reason);
+
+SET:	foreach my $set (keys %filenames) {
+
+		my $fileName = $filenames{$set};
+		$fileName .= ".def" unless $fileName =~ m/\.def$/;
+		$fileName  = "set" . $fileName unless $fileName =~ m/^set/;
+		# files can be exported to sub directories but not parent directories
+		if ($fileName =~ /\.\./) {
+			push @skipped, $set;
+			$reason{$set} = "Illegal filename contains '..'";
+			next SET;
+		}
+
+		my $setRecord = $db->getGlobalSet($set);
+		unless (defined $setRecord) {
+			push @skipped, $set;
+			$reason{$set} = "No record found.";
+			next SET;
+		}
+		my $filePath = $ce->{courseDirs}->{templates} . '/' . $fileName;
+
+		# back up existing file
+		if(-e $filePath) {
+			rename($filePath, "$filePath.bak") or 
+				$reason{$set} = "Existing file $filePath could not be backed up and was lost.";
+		}
+		
+		my $openDate     = $self->formatDateTime($setRecord->open_date);
+		my $dueDate      = $self->formatDateTime($setRecord->due_date);
+		my $answerDate   = $self->formatDateTime($setRecord->answer_date);
+		my $setHeader    = $setRecord->set_header;
+		my $paperHeader  = $setRecord->hardcopy_header;
+		my @problemList = $db->listGlobalProblems($set);
+
+		my $problemList  = '';
+		foreach my $prob (sort {$a <=> $b} @problemList) {
+			# DBFIXME use an iterator?
+			my $problemRecord = $db->getGlobalProblem($set, $prob); # checked
+			unless (defined $problemRecord) {
+				push @skipped, $set;
+				$reason{$set} = "No record found for problem $prob.";
+				next SET;
+			}
+			my $source_file   = $problemRecord->source_file();
+			my $value         = $problemRecord->value();
+			my $max_attempts  = $problemRecord->max_attempts();
+			
+			# backslash-escape commas in fields
+			$source_file =~ s/([,\\])/\\$1/g;
+			$value =~ s/([,\\])/\\$1/g;
+			$max_attempts =~ s/([,\\])/\\$1/g;
+			$problemList     .= "$source_file, $value, $max_attempts \n";
+		}
+
+		# gateway fields
+		my $assignmentType = $setRecord->assignment_type;
+		my $gwFields = '';
+		if ( $assignmentType =~ /gateway/ ) {
+		    my $attemptsPerV = $setRecord->attempts_per_version;
+		    my $timeInterval = $setRecord->time_interval;
+		    my $vPerInterval = $setRecord->versions_per_interval;
+		    my $vTimeLimit   = $setRecord->version_time_limit;
+		    my $probRandom   = $setRecord->problem_randorder;
+		    my $probPerPage  = $setRecord->problems_per_page;
+		    my $hideScore    = $setRecord->hide_score;
+		    my $hideWork     = $setRecord->hide_work;
+		    my $timeCap      = $setRecord->time_limit_cap;
+		    $gwFields =<<EOG;
+
+assignmentType      = $assignmentType
+attemptsPerVersion  = $attemptsPerV
+timeInterval        = $timeInterval
+versionsPerInterval = $vPerInterval
+versionTimeLimit    = $vTimeLimit
+problemRandOrder    = $probRandom
+problemsPerPage     = $probPerPage
+hideScore           = $hideScore
+hideWork            = $hideWork
+capTimeLimit        = $timeCap
+EOG
+		    chomp($gwFields);
+		}
+
+		# ip restriction fields
+		my $restrictIP = $setRecord->restrict_ip;
+		my $restrictFields = '';
+		if ( $restrictIP && $restrictIP ne 'No' ) {
+			# only store the first location
+			my $restrictLoc = ($db->listGlobalSetLocations($setRecord->set_id))[0];
+			my $relaxRestrict = $setRecord->relax_restrict_ip;
+			$restrictLoc || ($restrictLoc = '');
+			$restrictFields = "restrictIP          = $restrictIP" .
+			    "\nrestrictLocation    = $restrictLoc\n" . 
+			    "relaxRestrictIP     = $relaxRestrict\n";
+		}
+
+		my $fileContents = <<EOF;
+
+openDate          = $openDate
+dueDate           = $dueDate
+answerDate        = $answerDate
+paperHeaderFile   = $paperHeader
+screenHeaderFile  = $setHeader$gwFields
+${restrictFields}problemList       = 
+$problemList
+EOF
+
+		$filePath = WeBWorK::Utils::surePathToFile($ce->{courseDirs}->{templates}, $filePath);
+		eval {
+			local *SETDEF;
+			open SETDEF, ">$filePath" or die "Failed to open $filePath";
+			print SETDEF $fileContents;
+			close SETDEF;
+		};
+		
+		if ($@) {
+			push @skipped, $set;
+			$reason{$set} = $@;
+		} else {
+			push @exported, $set;
+		}
+
+	}
+	
+	return \@exported, \@skipped, \%reason;
+
+}
+
+################################################################################
+# "display" methods
+################################################################################
+
+sub fieldEditHTML {
+	my ($self, $fieldName, $value, $properties) = @_;
+	my $size = $properties->{size};
+	my $type = $properties->{type};
+	my $access = $properties->{access};
+	my $items = $properties->{items};
+	my $synonyms = $properties->{synonyms};
+	my $headerFiles = $self->{headerFiles};
+	
+	if ($access eq "readonly") {
+		return $value;
+	}
+	
+	if ($type eq "number" or $type eq "text") {
+		return CGI::input({type=>"text", name=>$fieldName, value=>$value, size=>$size});
+	}
+	
+	if ($type eq "filelist") {
+		return CGI::popup_menu({
+			name => $fieldName,
+			value => [ sort keys %$headerFiles ],
+			labels => $headerFiles,
+			default => $value || 0,
+		});
+	}
+
+	if ($type eq "enumerable") {
+		my $matched = undef; # Whether a synonym match has occurred
+
+		# Process synonyms for enumerable objects
+		foreach my $synonym (keys %$synonyms) {
+			if ($synonym ne "*" and $value =~ m/$synonym/) {
+				$value = $synonyms->{$synonym};
+				$matched = 1;
+			}
+		}
+		
+		if (!$matched and exists $synonyms->{"*"}) {
+			$value = $synonyms->{"*"};
+		}
+		
+		return CGI::popup_menu({
+			name => $fieldName, 
+			values => [keys %$items],
+			default => $value,
+			labels => $items,
+		});
+	}
+	
+	if ($type eq "checked") {
+		
+		# FIXME: kludge (R)
+		# if the checkbox is checked it returns a 1, if it is unchecked it returns nothing
+		# in which case the hidden field overrides the parameter with a 0
+		return CGI::checkbox(
+			-name => $fieldName,
+			-checked => $value,
+			-label => "",
+			-value => 1
+		) . CGI::hidden(
+			-name => $fieldName,
+			-value => 0
+		);
+	}
+}
+
+sub recordEditHTML {
+	my ($self, $Set, %options) = @_;
+	my $r           = $self->r;
+	my $urlpath     = $r->urlpath;
+	my $ce          = $r->ce;
+	my $db		= $r->db;
+	my $authz	= $r->authz;
+	my $user	= $r->param('user');
+	my $root        = $ce->{webworkURLs}->{root};
+	my $courseName  = $urlpath->arg("courseID");
+	
+	my $editMode = $options{editMode};
+	my $exportMode = $options{exportMode};
+	my $setSelected = $options{setSelected};
+
+	my $visibleClass = $Set->visible ? "visible" : "hidden";
+	my $enable_reduced_scoringClass = $Set->enable_reduced_scoring ? 'Reduced Credit Enabled' : 'Reduced Credit Disabled';
+
+	my $users = $db->countSetUsers($Set->set_id);
+	my $totalUsers = $self->{totalUsers};
+	# DBFIXME count would suffice
+	my $problems = $db->listGlobalProblems($Set->set_id);
+	
+        my $usersAssignedToSetURL  = $self->systemLink($urlpath->new(type=>'instructor_users_assigned_to_set', args=>{courseID => $courseName, setID => $Set->set_id} ));
+	my $problemListURL  = $self->systemLink($urlpath->new(type=>'instructor_set_detail', args=>{courseID => $courseName, setID => $Set->set_id} ));
+	my $problemSetListURL = $self->systemLink($urlpath->new(type=>'instructor_set_list', args=>{courseID => $courseName, setID => $Set->set_id})) . "&editMode=1&visible_sets=" . $Set->set_id;
+	my $imageURL = $ce->{webworkURLs}->{htdocs}."/images/edit.gif";
+        my $imageLink = CGI::a({href => $problemSetListURL}, CGI::img({src=>$imageURL, border=>0}));
+	
+	my @tableCells;
+	my %fakeRecord;
+	my $set_id = $Set->set_id;
+
+	$fakeRecord{select} = CGI::checkbox(-name => "selected_sets", -value => $set_id, -checked => $setSelected, -label => "", );
+#	$fakeRecord{set_id} = CGI::font({class=>$visibleClass}, $set_id) . ($editMode ? "" : $imageLink);
+	$fakeRecord{set_id} = $editMode 
+					? CGI::a({href=>$problemListURL}, "$set_id") 
+					: CGI::font({class=>$visibleClass}, $set_id) . $imageLink;
+	$fakeRecord{problems} = (FIELD_PERMS()->{problems} and not $authz->hasPermissions($user, FIELD_PERMS()->{problems}))
+					? "$problems"
+					: CGI::a({href=>$problemListURL}, "$problems");
+	$fakeRecord{users} = (FIELD_PERMS()->{users} and not $authz->hasPermissions($user, FIELD_PERMS()->{users}))
+					? "$users/$totalUsers"
+					: CGI::a({href=>$usersAssignedToSetURL}, "$users/$totalUsers");
+	$fakeRecord{filename} = CGI::input({-name => "set.$set_id", -value=>"set$set_id.def", -size=>60});
+					
+		
+	# Select
+	if ($editMode) {
+		# column not there
+	} else {
+		# selection checkbox
+		push @tableCells, CGI::checkbox(
+			-name => "selected_sets",
+			-value => $set_id,
+			-checked => $setSelected,
+			-label => "",
+		);
+	}
+	
+	# Set ID
+	if ($editMode) {
+		push @tableCells, CGI::a({href=>$problemListURL}, "$set_id");
+	} else {		
+	push @tableCells, CGI::font({class=>$visibleClass}, $set_id . $imageLink);
+	}
+
+	# Problems link
+	if ($editMode) {
+		# column not there
+	} else {
+		# "problem list" link
+		push @tableCells, CGI::a({href=>$problemListURL}, "$problems");
+	}
+	
+	# Users link
+	if ($editMode) {
+		# column not there
+	} else {
+		# "edit users assigned to set" link
+		push @tableCells, CGI::a({href=>$usersAssignedToSetURL}, "$users/$totalUsers");
+	}
+	
+	# determine which non-key fields to show
+	my @fieldsToShow;
+	if ($editMode) {
+		@fieldsToShow = @{ EDIT_FIELD_ORDER() };
+	} elsif ($exportMode) {
+		@fieldsToShow = @{ EXPORT_FIELD_ORDER() };
+	} else {
+		@fieldsToShow = @{ VIEW_FIELD_ORDER() };
+	}
+	
+	# make a hash out of this so we can test membership easily
+	my %nonkeyfields; @nonkeyfields{$Set->NONKEYFIELDS} = ();
+	
+	# Set Fields
+	foreach my $field (@fieldsToShow) {
+		next unless exists $nonkeyfields{$field};
+		my $fieldName = "set." . $set_id . "." . $field,		
+		my $fieldValue = $Set->$field;
+		my %properties = %{ FIELD_PROPERTIES()->{$field} };
+		$properties{access} = "readonly" unless $editMode;
+		$fieldValue = $self->formatDateTime($fieldValue) if $field =~ /_date/;
+		$fieldValue =~ s/ /&nbsp;/g unless $editMode;
+		$fieldValue = ($fieldValue) ? "Yes" : "No" if $field =~ /visible/ and not $editMode;
+		$fieldValue = ($fieldValue) ? "Yes" : "No" if $field =~ /enable_reduced_scoring/ and not $editMode;
+		push @tableCells, CGI::font({class=>$visibleClass}, $self->fieldEditHTML($fieldName, $fieldValue, \%properties));
+		#$fakeRecord{$field} = CGI::font({class=>$visibleClass}, $self->fieldEditHTML($fieldName, $fieldValue, \%properties));
+	}
+
+	#@tableCells = map { $fakeRecord{$_} } @fieldsToShow;
+
+	return CGI::Tr({}, CGI::td({}, \@tableCells));
+}
+
+sub printTableHTML {
+	my ($self, $SetsRef, $fieldNamesRef, %options) = @_;
+	my $r                       = $self->r;
+	my $authz                   = $r->authz;
+	my $user                    = $r->param('user');
+	my $setTemplate	            = $self->{setTemplate};
+	my @Sets                    = @$SetsRef;
+	my %fieldNames              = %$fieldNamesRef;
+	
+	my $editMode                = $options{editMode};
+	my $exportMode              = $options{exportMode};
+	my %selectedSetIDs          = map { $_ => 1 } @{ $options{selectedSetIDs} };
+	my $currentSort             = $options{currentSort};
+	
+	# names of headings:
+	my @realFieldNames = (
+			$setTemplate->KEYFIELDS,
+			$setTemplate->NONKEYFIELDS,
+	);
+
+	if ($editMode) {
+		@realFieldNames = @{ EDIT_FIELD_ORDER() };
+	} else {
+		@realFieldNames = @{ VIEW_FIELD_ORDER() };
+	}
+	
+	if ($exportMode) {
+		@realFieldNames = @{ EXPORT_FIELD_ORDER() };
+	}
+
+	
+	my %sortSubs = %{ SORT_SUBS() };
+
+	# FIXME: should this always presume to use the templates directory?
+	# (no, but that can wait until we have an abstract ProblemLibrary API -- sam)
+	my $templates_dir = $r->ce->{courseDirs}->{templates};
+	my $exempt_dirs = join "|", keys %{ $r->ce->{courseFiles}->{problibs} };
+	my @headers = listFilesRecursive(
+		$templates_dir,
+		qr/header.*\.pg$/i, # match these files
+		qr/^(?:$exempt_dirs|CVS)$/, # prune these directories
+		0, # match against file name only
+		1, # prune against path relative to $templates_dir
+	);
+	
+	@headers = sort @headers;
+	my %headers = map { $_ => $_ } @headers;
+	$headers{""} = "Use System Default";
+	$self->{headerFiles} = \%headers;	# store these header files so we don't have to look for them later.
+
+
+	my @tableHeadings = map { $fieldNames{$_} } @realFieldNames;
+	
+	# prepend selection checkbox? only if we're NOT editing!
+#	unshift @tableHeadings, "Select", "Set", "Problems" unless $editMode;
+
+	# print the table
+	if ($editMode or $exportMode) {
+		print CGI::start_table({});
+	} else {
+		print CGI::start_table({-border=>1});
+	}
+	
+	print CGI::Tr({}, CGI::th({}, \@tableHeadings));
+	
+
+	for (my $i = 0; $i < @Sets; $i++) {
+		my $Set = $Sets[$i];
+		
+		print $self->recordEditHTML($Set,
+			editMode => $editMode,
+			exportMode => $exportMode,
+			setSelected => exists $selectedSetIDs{$Set->set_id}
+		);
+	}
+	
+	print CGI::end_table();
+	#########################################
+	# if there are no users shown print message
+	# 
+	##########################################
+	
+	print CGI::p(
+                      CGI::i("No sets shown.  Choose one of the options above to list the sets in the course.")
+	) unless @Sets;
+}
+
 1;
+
+=head1 AUTHOR
+
+Written by Robert Van Dam, toenail (at) cif.rochester.edu
+
+=cut
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/SaveTargetSetProblems.pm b/lib/WeBWorK/ContentGenerator/Instructor/SaveTargetSetProblems.pm
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm b/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm
index 25c5a21fdd..3818391eaa 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader: webwork-modperl/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm,v 1.20 2003/12/09 01:12:31 sh002i Exp $
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm,v 1.62 2007/03/07 17:34:42 glarose 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
@@ -25,44 +25,76 @@ WeBWorK::ContentGenerator::Instructor::Scoring - Generate scoring data files
 
 use strict;
 use warnings;
-use CGI qw();
-use WeBWorK::Utils qw(readFile formatDateTime);
-use WeBWorK::DB::Utils qw(initializeUserProblem);
-use WeBWorK::Timing;
+#use CGI qw(-nosticky );
+use WeBWorK::CGI;
+use WeBWorK::Debug;
+use WeBWorK::Utils qw(readFile);
+
+our @userInfoColumnHeadings = ("STUDENT ID", "login ID", "LAST NAME", "FIRST NAME", "SECTION", "RECITATION");
+our @userInfoFields = ("student_id", "user_id","last_name", "first_name", "section", "recitation");
 
 sub initialize {
 	my ($self)     = @_;
-	my $r          = $self->{r};
-	my $ce         = $self->{ce};
-	my $db         = $self->{db};
-	my $authz      = $self->{authz};
+	my $r          = $self->r;
+	my $urlpath    = $r->urlpath;
+	my $ce         = $r->ce;
+	my $db         = $r->db;
+	my $authz      = $r->authz;
 	my $scoringDir = $ce->{courseDirs}->{scoring};
-	my $courseName = $ce->{courseName};
+	my $courseName = $urlpath->arg("courseID");
 	my $user       = $r->param('user');
-
-	unless ($authz->hasPermissions($user, "score_sets")) {
-		$self->{submitError} = "You aren't authorized to score problem sets";
-		return;
-	}
-
+    
+	# Check permission
+	return unless $authz->hasPermissions($user, "access_instructor_tools");
+	return unless $authz->hasPermissions($user, "score_sets");
 	
-
+	my @selected = $r->param('selectedSet');
+	my $scoreSelected = $r->param('scoreSelected');
+	my $scoringFileName = $r->param('scoringFileName') || "${courseName}_totals";
+	$scoringFileName =~ s/\.csv\s*$//; $scoringFileName .='.csv';  # must end in .csv
+	$self->{scoringFileName}=$scoringFileName;
 	
+	$self->{padFields}  = defined($r->param('padFields') ) ? 1 : 0; 
 	
-	if (defined $r->param('scoreSelected')) {
-		my @selected               = $r->param('selectedSet');
+	if (defined $scoreSelected && @selected) {
+
 		my @totals                 = ();
 		my $recordSingleSetScores  = $r->param('recordSingleSetScores');
 		
+		# pre-fetch users
+		debug("pre-fetching users");
+		# DBFIXME shouldn't need ID list
+		my @Users = $db->getUsers($db->listUsers);
+		my %Users;
+		foreach my $User (@Users) {
+			next unless $User;
+			next unless $ce->status_abbrev_has_behavior($User->status, "include_in_scoring");
+			$Users{$User->user_id} = $User;
+		}
+		# DBFIXME use an ORDER BY clause in the database
+		my @sortedUserIDs = sort { 
+			lc($Users{$a}->last_name) cmp lc($Users{$b}->last_name) 
+				||
+			lc($Users{$a}->first_name) cmp lc($Users{$b}->first_name)
+				||
+			lc($Users{$a}->user_id) cmp lc($Users{$b}->user_id)
+			}
+
+			keys %Users;
+		#my @userInfo = (\%Users, \@sortedUserIDs);
+		debug("done pre-fetching users");
+		
 		my $scoringType            = ($recordSingleSetScores) ?'everything':'totals';
 		my (@everything, @normal,@full,@info,@totalsColumn);
-		@info                      = $self->scoreSet($selected[0], "info");
-		@totals                    =@info;
-		my $showIndex              = defined($r->param('includeIndex')) ? defined($r->param('includeIndex')) : 0;  
+		@info             = $self->scoreSet($selected[0], "info", undef, \%Users, \@sortedUserIDs) if defined($selected[0]);
+		@totals           = @info;
+		my $showIndex     = defined($r->param('includeIndex')) ? defined($r->param('includeIndex')) : 0; 
+		
      
 		foreach my $setID (@selected) {
+		    next unless defined $setID;
 			if ($scoringType eq 'everything') {
-				@everything = $self->scoreSet($setID, "everything",$showIndex);
+				@everything = $self->scoreSet($setID, "everything", $showIndex, \%Users, \@sortedUserIDs);
 				@normal = $self->everything2normal(@everything);
 				@full = $self->everything2full(@everything);
 				@info = $self->everything2info(@everything);
@@ -71,92 +103,146 @@ sub initialize {
 				$self->writeCSV("$scoringDir/s${setID}scr.csv", @normal);
 				$self->writeCSV("$scoringDir/s${setID}ful.csv", @full);				
 			} else {
-				@totalsColumn  = $self->scoreSet($setID, "totals",$showIndex);
+				@totalsColumn  = $self->scoreSet($setID, "totals", $showIndex, \%Users, \@sortedUserIDs);
 				$self->appendColumns(\@totals, \@totalsColumn);
 			}	
 		}
-		$self->writeCSV("$scoringDir/${courseName}_totals.csv", @totals);
-	}   
+		my @sum_scores  = $self->sumScores(\@totals, $showIndex, \%Users, \@sortedUserIDs);
+		$self->appendColumns( \@totals,\@sum_scores);
+		$self->writeCSV("$scoringDir/$scoringFileName", @totals);
+
+	} elsif (defined $scoreSelected) {
+		$self->addbadmessage("You must select one or more sets for scoring");
+	} 
 	
 	# Obtaining list of sets:
-	$WeBWorK::timer->continue("Begin listing sets") if defined $WeBWorK::timer;
 	my @setNames =  $db->listGlobalSets();
-	$WeBWorK::timer->continue("End listing sets") if defined $WeBWorK::timer;
 	my @set_records = ();
-	$WeBWorK::timer->continue("Begin obtaining sets") if defined $WeBWorK::timer;
+	# DBFIXME shouldn't need ID list
 	@set_records = $db->getGlobalSets( @setNames); 
-	$WeBWorK::timer->continue("End obtaining sets: ".@set_records) if defined $WeBWorK::timer;
 	
 	
 	# store data
-	$self->{ra_sets}              =   \@setNames;
+	$self->{ra_sets}              =   \@setNames; # ra_sets IS NEVER USED AGAIN!!!!!
 	$self->{ra_set_records}       =   \@set_records;
-	
-	
-	
 }
 
-sub title {
-	"Scoring data for ".(shift)->{ce}->{courseName};
-}
 
 sub body {
-	my ($self) = @_;
-	my $r = $self->{r};
-	my $ce = $self->{ce};
-	my $authz = $self->{authz};
-	my $scoringDir = $ce->{courseDirs}->{scoring};
-	my $courseName = $ce->{courseName};
-	my $user = $r->param('user');
-	my $actionURL= $r->uri;
+	my ($self)      = @_;
+	my $r           = $self->r;
+	my $urlpath     = $r->urlpath;
+	my $ce          = $r->ce;
+	my $authz       = $r->authz;
+	my $scoringDir  = $ce->{courseDirs}->{scoring};
+	my $courseName  = $urlpath->arg("courseID");
+	my $user        = $r->param('user');
+	
+	my $scoringPage       = $urlpath->newFromModule($urlpath->module, $r, courseID => $courseName);
+	my $scoringURL        = $self->systemLink($scoringPage, authen=>0);
+	
+	my $scoringDownloadPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::ScoringDownload", $r,  
+	                                      courseID => $courseName
+	);
+	
+	my $scoringFileName = $self->{scoringFileName};
 	
+	# Check permissions
+	return CGI::div({class=>"ResultsWithError"}, "You are not authorized to access the Instructor tools.")
+		unless $authz->hasPermissions($user, "access_instructor_tools");
 	
+	return CGI::div({class=>"ResultsWithError"}, "You are not authorized to score sets.")
+		unless $authz->hasPermissions($user, "score_sets");
+
 	print join("",
-			CGI::start_form(-method=>"POST", -action=>$actionURL),"\n",
+			CGI::start_form(-method=>"POST", -action=>$scoringURL),"\n",
 			$self->hidden_authen_fields,"\n",
 			CGI::hidden({-name=>'scoreSelected', -value=>1}),
-			$self->popup_set_form,
-			CGI::br(),
-			CGI::checkbox({ -name=>'includeIndex',
-							-value=>1,
-							-label=>'IncludeIndex',
-							-checked=>1,
-						   },
-						   'Include Index'
-			),
-			CGI::br(),
-			CGI::checkbox({ -name=>'recordSingleSetScores',
-							-value=>1,
-							-label=>'Record Scores for Single Sets',
-							-checked=>0,
-						  },
-						 'Record Scores for Single Sets'
-			),
-			CGI::br(),
-			CGI::input({type=>'submit',value=>'Score selected set(s)...',name=>'score-sets'}),
+			CGI::start_table({border=>1,}),
+				CGI::Tr({},
+					CGI::td($self->popup_set_form),
+					CGI::td({},
+						CGI::checkbox({ -name=>'includeIndex',
+										-value=>1,
+										-label=>'Include Index',
+										-checked=>0,
+									   },
+						),
+						CGI::br(),
+						# These are not yet implemented
+						#CGI::checkbox({ -name=>'includeTotals',
+						#				-value=>1,
+						#				-label=>'Include Total score column',
+						#				-checked=>1,
+						#			   },
+						#),
+						#CGI::br(),
+						#CGI::checkbox({ -name=>'includePercent',
+						#				-value=>1,
+						#				-label=>'Include Percent correct column',
+						#				-checked=>1,
+						#			   },
+						#),
+						#CGI::br(),
+						CGI::checkbox({ -name=>'recordSingleSetScores',
+										-value=>1,
+										-label=>'Record Scores for Single Sets',
+										-checked=>0,
+									  },
+									 'Record Scores for Single Sets'
+						),
+						CGI::br(),
+						CGI::checkbox({ -name=>'padFields',
+										-value=>1,
+										-label=>'Pad Fields',
+										-checked=>1,
+									  },
+									 'Pad Fields'
+						),
+					),
+				),
+				CGI::Tr(CGI::td({colspan =>2,align=>'center'},
+					CGI::input({type=>'submit',value=>'Score selected set(s) and save to: ',name=>'score-sets'}),
+					CGI::input({type=>'text', name=>'scoringFileName', size=>'40',value=>"$scoringFileName"})
+				)),
 			
+		   CGI::end_table(),
+		   CGI::end_form(),
 	);
 
 	
 	if ($authz->hasPermissions($user, "score_sets")) {
 		my @selected = $r->param('selectedSet');
-		print CGI::p("All of these files will also be made available for mail merge");
+		if (@selected) {
+			print CGI::p("All of these files will also be made available for mail merge");
+		} 
 		foreach my $setID (@selected) {
-			print CGI::h2("$setID");
+	
+			my @validFiles;
 			foreach my $type ("scr", "ful") {
 				my $filename = "s$setID$type.csv";
 				my $path = "$scoringDir/$filename";
-				if (-f $path) {
-					print CGI::a({href=>"../scoringDownload/?getFile=${filename}&".$self->url_authen_args}, $filename);
+				push @validFiles, $filename if -f $path;
+			}
+			if (@validFiles) {
+				print CGI::h2("$setID");
+				foreach my $filename (@validFiles) {
+					#print CGI::a({href=>"../scoringDownload/?getFile=${filename}&".$self->url_authen_args}, $filename);
+					print CGI::a({href=>$self->systemLink($scoringDownloadPage,
+					               params=>{getFile => $filename } )}, $filename);
 					print CGI::br();
 				}
+				print CGI::hr();
 			}
+		}
+		if (-f "$scoringDir/$scoringFileName") {
+			print CGI::h2("Totals");
+			#print CGI::a({href=>"../scoringDownload/?getFile=${courseName}_totals.csv&".$self->url_authen_args}, "${courseName}_totals.csv");
+			print CGI::a({href=>$self->systemLink($scoringDownloadPage,
+					               params=>{getFile => "$scoringFileName" } )}, "$scoringFileName");
 			print CGI::hr();
+			print CGI::pre({style=>'font-size:smaller'},WeBWorK::Utils::readFile("$scoringDir/$scoringFileName"));
 		}
-		print CGI::h2("Totals");
-		print CGI::a({href=>"../scoringDownload/?getFile=${courseName}_totals.csv&".$self->url_authen_args}, "${courseName}_totals.csv");
-		print CGI::hr();
-		print CGI::pre(WeBWorK::Utils::readFile("$scoringDir/${courseName}_totals.csv"));
 	}
 	
 	return "";
@@ -171,8 +257,9 @@ sub body {
 #   info: student info columns only
 #   totals: total column only
 sub scoreSet {
-	my ($self, $setID, $format, $showIndex) = @_;
-	my $db = $self->{db};
+	my ($self, $setID, $format, $showIndex, $UsersRef, $sortedUserIDsRef) = @_;
+	my $r  = $self->r;
+	my $db = $r->db;
 	my @scoringData;
 	my $scoringItems   = {    info             => 0,
 		                      successIndex     => 0,
@@ -184,19 +271,24 @@ sub scoreSet {
 	$format = "normal" unless defined $format;
 	$format = "normal" unless $format eq "full" or $format eq "everything" or $format eq "totals" or $format eq "info";
 	my $columnsPerProblem = ($format eq "full" or $format eq "everything") ? 3 : 1;
+	
+	# DBFIXME these have already been fetched in ra_set_records
 	my $setRecord = $db->getGlobalSet($setID); #checked
 	die "global set $setID not found. " unless $setRecord;
-	my %users;
-	my %userStudentID=();
-	$WeBWorK::timer->continue("Begin getting users for set $setID") if defined($WeBWorK::timer);
-	foreach my $userID ($db->listUsers()) {
-		my $userRecord = $db->getUser($userID); # checked
-		die "user record for $userID not found" unless $userID;
-		# The key is what we'd like to sort by.
-		$users{$userRecord->student_id} = $userRecord;
-		$userStudentID{$userID} = $userRecord->student_id;
-	}
-	$WeBWorK::timer->continue("End getting users for set $setID") if defined($WeBWorK::timer);
+	#my %users;
+	#my %userStudentID=();
+	#foreach my $userID ($db->listUsers()) {
+	#	my $userRecord = $db->getUser($userID); # checked
+	#	die "user record for $userID not found" unless $userID;
+	#	# FIXME: if two users have the same student ID, the second one will
+	#	# clobber the first one. this is bad!
+	#	# The key is what we'd like to sort by.
+	#	$users{$userRecord->student_id} = $userRecord;
+	#	$userStudentID{$userID} = $userRecord->student_id;
+	#}
+	
+	my %Users = %$UsersRef; # user objects hashed on user ID
+	my @sortedUserIDs = @$sortedUserIDsRef; # user IDs sorted by student ID
 	
 	my @problemIDs = $db->listGlobalProblems($setID);
 
@@ -246,13 +338,11 @@ sub scoreSet {
 	}
 	
 	# Initialize a two-dimensional array of the proper size
-	for (my $i = 0; $i < keys(%users) + 7; $i++) { # 7 is how many descriptive fields there are in each column
+	for (my $i = 0; $i < @sortedUserIDs + 7; $i++) { # 7 is how many descriptive fields there are in each column
 		push @scoringData, [];
 	}
 	
-	my @userInfoColumnHeadings = ("STUDENT ID", "LAST NAME", "FIRST NAME", "SECTION", "RECITATION");
-	my @userInfoFields = ("student_id", "last_name", "first_name", "section", "recitation");
-	my @userKeys = sort keys %users;
+	#my @userKeys = sort keys %users; # list of "student IDs" NOT user IDs
 	
 	if ($scoringItems->{header}) {
 		$scoringData[0][0] = "NO OF FIELDS";
@@ -273,16 +363,73 @@ sub scoreSet {
 				}
 			}
 			$scoringData[6][$field] = $userInfoColumnHeadings[$field];
-			for (my $user = 0; $user < @userKeys; $user++) {
+			for (my $user = 0; $user < @sortedUserIDs; $user++) {
 				my $fieldName = $userInfoFields[$field];
-				$scoringData[7 + $user][$field] = $users{$userKeys[$user]}->$fieldName;
+				$scoringData[$user + 7][$field] = $Users{$sortedUserIDs[$user]}->$fieldName;
 			}
 		}
 	}
 	return @scoringData if $format eq "info";
 	
+	# pre-fetch global problems
+	debug("pre-fetching global problems for set $setID");
+	my %GlobalProblems = map { $_->problem_id => $_ }
+		$db->getAllGlobalProblems($setID);
+	debug("done pre-fetching global problems for set $setID");
+	
+	# pre-fetch user problems
+	debug("pre-fetching user problems for set $setID");
+	my %UserProblems; # $UserProblems{$userID}{$problemID}
+
+  # Gateway change here: for non-gateway (non-versioned) sets, we just 
+  # get each user's problems.  For gateway (versioned) sets, we get the 
+  # user's best version and return that
+	if ( ! defined( $setRecord->assignment_type() ) ||
+	     $setRecord->assignment_type() !~ /gateway/ ) {
+		foreach my $userID (@sortedUserIDs) {
+			my %CurrUserProblems = map { $_->problem_id => $_ }
+				$db->getAllMergedUserProblems($userID, $setID);
+			$UserProblems{$userID} = \%CurrUserProblems;
+		}
+	} else {  # versioned sets; get the problems for the best version 
+
+		foreach my $userID (@sortedUserIDs) {
+			my $CurrUserProblems = {};
+			my @versionNums = $db->listSetVersions($userID,$setID);
+
+			my $bestScore = -1;
+
+			if ( @versionNums ) {
+			    for my $i ( @versionNums ) {
+				my %versionUserProblems = map { $_->problem_id => $_ }
+					$db->getAllMergedProblemVersions( $userID, $setID, $i );
+				my $score = 0;
+				foreach ( values ( %versionUserProblems ) ) {
+					my $status = $_->status || 0;
+					my $value = $_->value || 1;
+				# some of these are coming in null; I'm not
+				# why, or if this should be necessary
+					$_->status($status);
+					$_->value($value);
+					$score += $status*$value;
+				}
+				if ( $score > $bestScore ) {
+					$CurrUserProblems = \%versionUserProblems;
+					$bestScore = $score;
+				}
+			    }
+			} else {
+			    my %cp = map { $_->problem_id => $_ }
+				$db->getAllMergedUserProblems($userID, $setID);
+			    $CurrUserProblems = \%cp;
+			}
+			$UserProblems{$userID} = { %{$CurrUserProblems} };
+		}
+	}
+	debug("done pre-fetching user problems for set $setID");
+	
 	# Write the problem data
-	my $dueDateString = formatDateTime($setRecord->due_date);
+	my $dueDateString = $self->formatDateTime($setRecord->due_date);
 	my ($dueDate, $dueTime) = $dueDateString =~ m/^([^\s]*)\s*([^\s]*)$/;
 	my $valueTotal = 0;
 	my %userStatusTotals = ();
@@ -290,8 +437,11 @@ sub scoreSet {
 	my %numberOfAttempts = ();
 	my $num_of_problems  = @problemIDs;
 	for (my $problem = 0; $problem < @problemIDs; $problem++) {
-		my $globalProblem = $db->getGlobalProblem($setID, $problemIDs[$problem]); #checked
+		
+		#my $globalProblem = $db->getGlobalProblem($setID, $problemIDs[$problem]); #checked
+		my $globalProblem = $GlobalProblems{$problemIDs[$problem]};
 		die "global problem $problemIDs[$problem] not found for set $setID" unless $globalProblem;
+		
 		my $column = 5 + $problem * $columnsPerProblem;
 		if ($scoringItems->{header}) {
 			$scoringData[0][$column] = "";
@@ -317,17 +467,11 @@ sub scoreSet {
 		}
 		$valueTotal += $globalProblem->value;
 		
- 		my @userLoginIDs = $db->listUsers();
- 		$WeBWorK::timer->continue("Begin getting user problems for set $setID, problem $problemIDs[$problem]") if defined($WeBWorK::timer);
- 		#my @userProblems = $db->getMergedProblems( map { [ $_, $setID, $problemIDs[$problem] ] } @userLoginIDs );
- 		my @userProblems = $db->getUserProblems( map { [ $_, $setID, $problemIDs[$problem] ] }    @userLoginIDs ); # checked
- 		my %userProblems;
- 		foreach my $item (@userProblems) {
- 			$userProblems{$item->user_id} = $item if ref $item;
- 		}
- 		$WeBWorK::timer->continue("End getting user problems for set $setID, problem $problemIDs[$problem]") if defined($WeBWorK::timer);
-		for (my $user = 0; $user < @userKeys; $user++) {
-			my $userProblem = $userProblems{    $users{$userKeys[$user]}->user_id   };
+		
+		for (my $user = 0; $user < @sortedUserIDs; $user++) {
+			#my $userProblem = $userProblems{    $users{$userKeys[$user]}->user_id   };
+			#my $userProblem = $UserProblems{$sers{$userKeys[$user]}->user_id}{$problemIDs[$problem]};
+			my $userProblem = $UserProblems{$sortedUserIDs[$user]}{$problemIDs[$problem]};
 			unless (defined $userProblem) { # assume an empty problem record if the problem isn't assigned to this user
 				$userProblem = $db->newUserProblem;
 				$userProblem->status(0);
@@ -336,8 +480,8 @@ sub scoreSet {
 				$userProblem->num_incorrect(0);
 			}
 			$userStatusTotals{$user} = 0 unless exists $userStatusTotals{$user};
-			#$userStatusTotals{$user} += $userProblem->status * $userProblem->value;
-			$userStatusTotals{$user} += $userProblem->status * $globalProblem->value;	
+			my $user_problem_status          = ($userProblem->status =~/^[\d\.]+$/) ? $userProblem->status : 0; # ensure it's numeric
+			$userStatusTotals{$user}        += $user_problem_status * $userProblem->value;	
 			if ($scoringItems->{successIndex})   {
 				$numberOfAttempts{$user}  = 0 unless defined($numberOfAttempts{$user});
 				my $num_correct     = $userProblem->num_correct;
@@ -356,9 +500,9 @@ sub scoreSet {
 		}
 	}
 	if ($scoringItems->{successIndex}) {
-		for (my $user = 0; $user < @userKeys; $user++) {
+		for (my $user = 0; $user < @sortedUserIDs; $user++) {
 			my $avg_num_attempts = ($num_of_problems) ? $numberOfAttempts{$user}/$num_of_problems : 0;
-			$userSuccessIndex{$user} = ($avg_num_attempts) ? ($userStatusTotals{$user}/$valueTotal)**2/$avg_num_attempts : 0;						
+			$userSuccessIndex{$user} = ($avg_num_attempts && $valueTotal) ? ($userStatusTotals{$user}/$valueTotal)**2/$avg_num_attempts : 0;						
 		}
 	}
 	# write the status totals
@@ -366,22 +510,76 @@ sub scoreSet {
 		my $totalsColumn = $format eq "totals" ? 0 : 5 + @problemIDs * $columnsPerProblem;
 		$scoringData[0][$totalsColumn]    = "";
 		$scoringData[1][$totalsColumn]    = $setRecord->set_id;
-		$scoringData[1][$totalsColumn+1]  = $setRecord->set_id if $scoringItems->{successIndex};
 		$scoringData[2][$totalsColumn]    = "";
 		$scoringData[3][$totalsColumn]    = "";
 		$scoringData[4][$totalsColumn]    = "";
 		$scoringData[5][$totalsColumn]    = $valueTotal;
 		$scoringData[6][$totalsColumn]    = "total";
-		$scoringData[6][$totalsColumn+1]  = "index" if $scoringItems->{successIndex};
-		for (my $user = 0; $user < @userKeys; $user++) {
-			$scoringData[7+$user][$totalsColumn] = $userStatusTotals{$user};
-			$scoringData[7+$user][$totalsColumn+1] = $userSuccessIndex{$user} if $scoringItems->{successIndex};
+		if ($scoringItems->{successIndex}) {
+			$scoringData[0][$totalsColumn+1]    = "";
+			$scoringData[1][$totalsColumn+1]    = $setRecord->set_id;
+			$scoringData[2][$totalsColumn+1]    = "";
+			$scoringData[3][$totalsColumn+1]    = "";
+			$scoringData[4][$totalsColumn+1]    = "";
+			$scoringData[5][$totalsColumn+1]    = '100';
+			$scoringData[6][$totalsColumn+1]  = "index" ;
 		}
+		for (my $user = 0; $user < @sortedUserIDs; $user++) {
+            $userStatusTotals{$user} =$userStatusTotals{$user} ||0;
+			$scoringData[7+$user][$totalsColumn] = sprintf("%.1f",$userStatusTotals{$user}) if $scoringItems->{setTotals};
+			$scoringData[7+$user][$totalsColumn+1] = sprintf("%.0f",100*$userSuccessIndex{$user}) if $scoringItems->{successIndex};
+
+		}
+	}
+	debug("End  set $setID");
+	return @scoringData;
+}
+
+sub sumScores {    # Create a totals column for each student
+	my $self        = shift;
+	my $r_totals    = shift;
+	my $showIndex   = shift;
+	my $r_users     = shift;
+	my $r_sorted_user_ids =shift;
+	my $r           = $self->r;
+	my $db          = $r->db;
+	my @scoringData = ();
+	my $index_increment  = ($showIndex) ? 2 : 1;
+	# This whole thing is a hack, but here goes.  We're going to sum the appropriate columns of the totals file:
+	# I believe we have $r_totals->[rows]->[cols]  -- the way it's printed out.
+	my $start_column  = 6;  #The problem column 
+	my $last_column   = $#{$r_totals->[1]};  # try to figure out the number of the last column in the array.
+	my $row_count     = $#{$r_totals};
+	
+	# Calculate total number of problems for the course.
+	my $totalPoints      = 0;
+	my $problemValueRow  = 5;
+	for( my $j = $start_column;$j<=$last_column;$j+= $index_increment) {
+		my $score = $r_totals->[$problemValueRow]->[$j];
+		$totalPoints += ($score =~/^\s*[\d\.]+\s*$/)? $score : 0;
 	}
-	$WeBWorK::timer->continue("End  set $setID") if defined($WeBWorK::timer);
+    foreach my $i (0..$row_count) {
+    	my $studentTotal = 0;
+		for( my $j = $start_column;$j<=$last_column;$j+= $index_increment) {
+			my $score = $r_totals->[$i]->[$j];
+			$studentTotal += ($score =~/^\s*[\d\.]+\s*$/)? $score : 0;
+			
+		}
+		$scoringData[$i][0] =sprintf("%.1f",$studentTotal);
+		$scoringData[$i][1] =($totalPoints) ?sprintf("%.1f",100*$studentTotal/$totalPoints) : 0;
+    }
+    $scoringData[0]      = ['',''];
+    $scoringData[1]      = ['summary', '%score'];
+	$scoringData[2]      = ['',''];
+	$scoringData[3]      = ['',''];
+	$scoringData[4]      = ['',''];
+	$scoringData[6]      = ['',''];
+
+
 	return @scoringData;
 }
 
+
 # Often it's more efficient to just get everything out of the database
 # and then pick out what you want later.  Hence, these "everything2*" functions
 sub everything2info {
@@ -461,6 +659,18 @@ sub writeCSV {
 		}
 	}
 	
+	# Before writing a new totals file, we back up an existing totals file keeping any previous backups.
+	# We do not backup any other type of scoring files (e.g. ful or scr).
+	
+	if (($filename =~ m|(.*)/(.*_totals)\.csv$|) and (-e $filename)) {
+		my $scoringDir = $1;
+		my $short_filename = $2;
+		my $i=1;
+		while(-e "${scoringDir}/${short_filename}_bak$i.csv") {$i++;}      #don't overwrite existing backups
+		my $bakFileName ="${scoringDir}/${short_filename}_bak$i.csv";
+		rename $filename, $bakFileName or warn "Unable to rename $filename to $bakFileName";
+	}
+
 	open my $fh, ">", $filename or warn "Unable to open $filename for writing";
 	foreach my $row (@csv) {
 		my @rowPadded = ();
@@ -556,8 +766,11 @@ sub quote {
 sub pad {
 	my ($self, $string, $padTo) = @_;
 	$string = '' unless defined $string;
+	return $string unless $self->{padFields}==1;
 	my $spaces = $padTo - length $string;
-	return $string . " "x$spaces;
+
+#	return " "x$spaces.$string;
+	return $string." "x$spaces;
 }
 
 sub maxLength {
@@ -571,11 +784,12 @@ sub maxLength {
 
 sub popup_set_form {
 	my $self  = shift;
-	my $r     = $self->{r};
-	my $authz = $self->{authz};
-	my $user = $r->param('user');
-	my $db = $self->{db};
-	my $ce = $self->{ce};
+	my $r     = $self->r;	
+	my $db    = $r->db;
+	my $ce    = $r->ce;
+	my $authz = $r->authz;
+	my $user  = $r->param('user');
+
 	my $root = $ce->{webworkURLs}->{root};
 	my $courseName = $ce->{courseName};
 
@@ -601,3 +815,41 @@ sub popup_set_form {
 
 }
 1;
+
+__END__
+
+Here's pretty much everything I can think of that we can get out of the database
+or calculate:
+
+for each set, we have a few rows of non-user-specific data above the student rows
+(we could just have additional columns for these values, but they'd have the same value in every row)
+	set_id
+	optional other set data (dates, etc)
+	per-problem data (usually not shown, but available if needed)
+		problem_id
+		problem value
+	for all problems in the set
+		total value
+for each student (one row) we need columns for:
+	user_id and/or student_id
+	optional other user data (first_name/last_name, section, recitation, etc)
+	per-set data
+		per-problem data (usually not shown, but available if needed)
+			status
+			score = value*status
+			number of attempts
+			number of correct attempts
+			number of incorrect attempts
+		for all problems in the set
+			total status
+			total score
+			total number of attempts
+			average number of attempts
+			total number of correct attempts
+			average number of correct attempts
+			total number of incorrect attempts
+			average number of incorrect attempts
+			index = ( total_status / total_value )**2 / average_number_of_attempts
+
+"value" is the weight of the problem, in the range [0,inf), usually 1.
+"status" is the correctness of a problem, in the range [0,1].
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm b/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm
index fc96dd07e6..4a0a804258 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Instructor/ScoringDownload.pm,v 1.7 2006/07/12 04:36:07 sh002i 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
@@ -25,14 +25,35 @@ WeBWorK::ContentGenerator::Instructor::ScoringDownload - Download scoring data f
 
 use strict;
 use warnings;
-use Apache::Constants qw(:common);
 
-sub header {
+sub pre_header_initialize {
 	my ($self) = @_;
-	my $r = $self->{r};
-	my $ce = $self->{ce};
+	my $r          = $self->r;
+	my $ce         = $r->ce;
+	my $authz      = $r->authz;
+	my $scoringDir = $ce->{courseDirs}->{scoring};
+	my $file       = $r->param('getFile');
+	my $user       = $r->param('user');
+	
+	if ($authz->hasPermissions($user, "score_sets")) {
+		$self->reply_with_file("text/comma-separated-values", "$scoringDir/$file", $file, 0); # 0==don't delete file after downloading
+	} else {
+		$self->addbadmessage("You do not have permission to access scoring data.");
+	}
+}
+
+1;
+
+__END__
+
+# FIXME replace all crap with a call to reply_with_file
+# FIXME and then maybe merge that functionality into Scoring.pm
+sub header {
+	my ($self)     = @_;
+	my $r          = $self->r;
+	my $ce         = $r->ce;
 	my $scoringDir = $ce->{courseDirs}->{scoring};
-	my $file = $r->param('getFile');
+	my $file       = $r->param('getFile');
 	if (-f "$scoringDir/$file") {
 		$r->content_type('text/comma-separated-values');
 		$r->header_out("Content-Disposition" => "attachment; filename=$file;");
@@ -45,12 +66,12 @@ sub header {
 }
 
 sub content {
-	my ($self) = @_;
-	my $r = $self->{r};
-	my $ce = $self->{ce};
-	my $authz = $self->{authz};
+	my ($self)     = @_;
+	my $r          = $self->r;
+	my $ce         = $r->ce;
+	my $authz      = $r->authz;
 	my $scoringDir = $ce->{courseDirs}->{scoring};
-	my $user = $r->param('user');
+	my $user       = $r->param('user');
 	
 	if (!$authz->hasPermissions($user, "score_sets")) {
 		print "You do not have permission to access scoring data";
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm b/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm
index fc701bfb2e..32b8cdcedf 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader: webwork-modperl/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm,v 1.12 2003/12/09 01:12:31 sh002i Exp $
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm,v 1.64 2007/08/13 22:59:55 sh002i 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
@@ -25,30 +25,47 @@ WeBWorK::ContentGenerator::Instructor::SendMail - Entry point for User-specific
 
 use strict;
 use warnings;
-use CGI qw();
-#use HTML::Entities;
+#use CGI qw(-nosticky );
+use WeBWorK::CGI;
+use Email::Address;
+use HTML::Entities;
 use Mail::Sender;
+use Socket qw/unpack_sockaddr_in inet_ntoa/; # for remote host/port info
+use Text::Wrap qw(wrap);
+use WeBWorK::HTML::ScrollingRecordList qw/scrollingRecordList/;
+use WeBWorK::Utils qw/readFile readDirectory/;
+use WeBWorK::Utils::FilterRecords qw/filterRecords/;
 
+use mod_perl;
+use constant MP2 => ( exists $ENV{MOD_PERL_API_VERSION} and $ENV{MOD_PERL_API_VERSION} >= 2 );
+
+#my $REFRESH_RESIZE_BUTTON = "Set preview to: ";  # handle submit value idiocy
+my $UPDATE_SETTINGS_BUTTON = "Update settings and refresh page"; # handle submit value idiocy
 sub initialize {
 	my ($self) = @_;
-	my $r = $self->{r};
-	my $db = $self->{db};
-	my $ce = $self->{ce};
-	my $authz = $self->{authz};
-	my $user = $r->param('user');
-
-	unless ($authz->hasPermissions($user, "send_mail")) {
-		$self->{submitError} = "You are not authorized to send mail to students.";
-		return;
-	}
-#############################################################################################
-#	gather directory data
-#############################################################################################	
+	my $r      = $self->r;
+	my $db     = $r->db;
+	my $ce     = $r->ce;
+	my $authz  = $r->authz;
+	my $user   = $r->param('user');
+
+	my @selected_filters;
+	if (defined ($r->param('classList!filter'))){ @selected_filters = $r->param('classList!filter');}
+	else {@selected_filters = ("all");}
+
+
+	# Check permissions
+	return unless $authz->hasPermissions($user, "access_instructor_tools");
+	return unless $authz->hasPermissions($user, "send_mail");
+
+	#############################################################################################
+	#	gather directory data
+	#############################################################################################	
 	my $emailDirectory    =    $ce->{courseDirs}->{email};
 	my $scoringDirectory  =    $ce->{courseDirs}->{scoring};
 	my $templateDirectory =    $ce->{courseDirs}->{templates};
 	
-	my $action            =    $r->param('action'); 
+	my $action            =    $r->param('action') ; 
 	my $openfilename      =	   $r->param('openfilename');
 	my $savefilename      =	   $r->param('savefilename');
 	
@@ -58,42 +75,88 @@ sub initialize {
 	my $old_default_msg_file   =    'old_default.msg';
 	
 
+	#  get user record
+	my $ur = $self->{db}->getUser($user);
+
 	# store data
-	$self->{defaultFrom}            =   'FIXME from';
-	$self->{defaultReply}           =   'FIXME reply';	
+	$self->{defaultFrom}            =   $ur->rfc822_mailbox;
+	$self->{defaultReply}           =   $ur->rfc822_mailbox;
+	$self->{defaultSubject}         =   $self->r->urlpath->arg("courseID") . " notice";
+
 	$self->{rows}                   =   (defined($r->param('rows'))) ? $r->param('rows') : $ce->{mail}->{editor_window_rows};
 	$self->{columns}                =   (defined($r->param('columns'))) ? $r->param('columns') : $ce->{mail}->{editor_window_columns};
 	$self->{default_msg_file}	    =   $default_msg_file;
 	$self->{old_default_msg_file}   =   $old_default_msg_file;
 	$self->{merge_file}             =   (defined($r->param('merge_file'  )))    ? $r->param('merge_file')   : 'None';
-	$self->{preview_user}           =   (defined($r->param('preview_user')))    ? $r->param('preview_user') : $user;
+	#$self->{preview_user}           =   (defined($r->param('preview_user')))    ? $r->param('preview_user') : $user;
+	# an expermiment -- share the scrolling list for preivew and sendTo actions.
+	my @classList                   =   (defined($r->param('classList')))    ? $r->param('classList') : ($user);
+	$self->{preview_user}           =   $classList[0] || $user;
 	
-	
-#############################################################################################
-#	gather database data
-#############################################################################################	
+	#############################################################################################
+	#	gather database data
+	#############################################################################################	
 	# FIXME  this might be better done in body? We don't always need all of this data. or do we?
-	my @users = sort $db->listUsers;
+	# DBFIXME shouldn't need ID list
+	# DBFIXME do filtering in database
+	my @users =  $db->listUsers;
+	my @Users = $db->getUsers(@users);
+	# filter out users who don't get included in email (fixes bug #938)
+	@Users = grep { $ce->status_abbrev_has_behavior($_->status, "include_in_email") } @Users;
 	my @user_records = ();
-	foreach my $userName (@users) {
-		my $userRecord = $db->getUser($userName); # checked
-		die "record for user $userName not found" unless $userRecord;
-		push(@user_records, $userRecord);
+
+	## Mark's code to prefilter userlist
+	# DBFIXME more filtering that we can do in the database
+
+	
+	my (@viewable_sections,@viewable_recitations);
+	
+	if (defined @{$ce->{viewable_sections}->{$user}})
+		{@viewable_sections = @{$ce->{viewable_sections}->{$user}};}
+	if (defined @{$ce->{viewable_recitations}->{$user}})
+		{@viewable_recitations = @{$ce->{viewable_recitations}->{$user}};}
+
+	if (@viewable_sections or @viewable_recitations){
+		foreach my $student (@Users){
+			my $keep = 0;
+			foreach my $sec (@viewable_sections){
+				if ($student->section() eq $sec){$keep = 1;}
+			}
+			foreach my $rec (@viewable_recitations){
+				if ($student->recitation() eq $rec){$keep = 1;}
+			}
+			if ($keep) {push @user_records, $student;}
+		}
 	}
+	else {@user_records = @Users;}
+
+	## End Mark's code
 	
+
+	# replace the user names by a sorted version.
+	@users                         =  map {$_->user_id} @user_records;
 	# store data
 	$self->{ra_users}              =   \@users;
 	$self->{ra_user_records}       =   \@user_records;
 
-#############################################################################################
-#	gather list of recipients
-#############################################################################################	
+	#############################################################################################
+	#	gather list of recipients
+	#############################################################################################	
 	my @send_to                    =   ();	
 	#FIXME  this (radio) is a lousy name
 	my $recipients                 = $r->param('radio');
 	if (defined($recipients) and $recipients eq 'all_students') {  #only active students #FIXME status check??
+		
+		## Add code so that only people who pass the current filters are added to our list of recipients.		
+		#	@user_records = filterRecords({filter=\@selected_filters},@user_records);
+		#  I wasn't able to make this work
+		#  I edited the selection button to make that clear.
+		#
+
 		foreach my $ur (@user_records) {
-			push(@send_to,$ur->user_id) if $ur->status eq 'C' and not($ur->user_id =~ /practice/);
+			push(@send_to,$ur->user_id)
+				if $ce->status_abbrev_has_behavior($ur->status, "include_in_email")
+					and not $ur->user_id =~ /practice/;
 		}
 	} elsif (defined($recipients) and $recipients eq 'studentID' ) {
 		@send_to                   = $r->param('classList');
@@ -101,9 +164,9 @@ sub initialize {
 		# no recipients have been defined -- probably the first time on the page
 	}	
 	$self->{ra_send_to}               = \@send_to;
-#################################################################
-# Check the validity of the input file name
-#################################################################
+	#################################################################
+	# Check the validity of the input file name
+	#################################################################
 	my $input_file = '';
 	#make sure an input message file was submitted and exists
 	#else use the default message		
@@ -112,70 +175,77 @@ sub initialize {
 			if ( -R "${emailDirectory}/$openfilename") {
 				$input_file = $openfilename;
 			} else {
-				warn join("",
+				$self->addbadmessage(CGI::p(join("",
 					"The file ${emailDirectory}/$openfilename is not readable by the webserver.",CGI::br(),
 					"Check that it's permissions are set correctly.",
-				);
+				)));
 			}
 		} else {
 			$input_file = $default_msg_file;
-			warn join("",
+			$self->addbadmessage(CGI::p(join("",
 				  "The file ${emailDirectory}/$openfilename cannot be found.",CGI::br(),
 				  "Check whether it exists and whether the directory $emailDirectory can be read by the webserver.",CGI::br(),
 				  "Using contents of the default message $default_msg_file instead.",
-			);
+			)));
 		}
 	} else {
 		$input_file     = $default_msg_file;
 	}
 	$self->{input_file} =$input_file;
 
-#################################################################
-# Determine the file name to save message into
-#################################################################
+	#################################################################
+	# Determine the file name to save message into
+	#################################################################
 	my $output_file      = 'FIXME no output file specified';	
 	if (defined($action) and $action eq 'Save as Default') {
 		$output_file  = $default_msg_file;
-	} elsif ( defined($action) and ($action =~/save/i) and defined($savefilename) ){
-		$output_file  = $savefilename;
+	} elsif ( defined($action) and ($action =~/save/i)) {
+		if (defined($savefilename) and $savefilename ) {
+			$output_file  = $savefilename;
+		} else {
+			$self->addbadmessage(CGI::p("No filename was specified for saving!  The message was not saved."));
+		}
 	} elsif ( defined($input_file) ) {
 		$output_file  = $input_file;
 	}
-#	warn "FIXME savefilename $savefilename  output file $output_file";
+
 	#################################################################
 	# Sanity check on save file name
 	#################################################################
 
 	if ($output_file =~ /^[~.]/ || $output_file =~ /\.\./) {
-		$self->submission_error("For security reasons, you cannot specify a merge file from a directory", 
-								"higher than the email directory (you can't use ../blah/blah). ", 
-								"Please specify a different file or move the needed file to the email directory",
-		);
-	}
+		$self->addbadmessage(CGI::p("For security reasons, you cannot specify a message file from a directory", 
+						"higher than the email directory (you can't use ../blah/blah for example). ", 
+						"Please specify a different file or move the needed file to the email directory",));
+	} 
 	unless ($output_file =~ m|\.msg$| ) {
-		$self->submission_error("Invalid file name.", 
+		$self->addbadmessage(CGI::p("Invalid file name.", 
 		                        "The file name \"$output_file\" does not have a \".msg\" extension",
 								"All email file names must end in the extension \".msg\"",
 								"choose a file name with a \".msg\" extension.",
-								"The message was not saved.",
-		);
+								"The message was not saved.",));
 	}
+
 	$self->{output_file} = $output_file;  # this is ok.  It will be put back in the text input box for re-editing.
-    # FIXME $output_file can be blank if there was no savefilename
-
-#############################################################################################
-# Determine input source
-#############################################################################################
-	my $input_source =  ( defined( $r->param('body') ) and $action ne 'Open' ) ? 'form' : 'file';
-#	warn "FIXME input source is $input_source from $input_file";
-#############################################################################################
-# Get inputs
-#############################################################################################
+
+
+	#############################################################################################
+	# Determine input source
+	#############################################################################################
+	#warn "Action = $action";
+	my $input_source;
+	if ($action){	
+		$input_source =  ( defined( $r->param('body') ) and $action ne 'Open' ) ? 'form' : 'file';}
+	else { $input_source = ( defined($r->param('body')) ) ? 'form' : 'file';}
+
+	#############################################################################################
+	# Get inputs
+	#############################################################################################
 	my($from, $replyTo, $r_text, $subject);
 	if ($input_source eq 'file') {
-#		warn "FIXME obtaining source from $emailDirectory/$input_file";
+
 		($from, $replyTo,$subject,$r_text) = $self->read_input_file("$emailDirectory/$input_file");
-#		warn "FIXME Done reading source";
+
 
 	} elsif ($input_source eq 'form') {
 		# read info from the form
@@ -184,53 +254,63 @@ sub initialize {
 		$from              =    $r->param('from');
 		$replyTo           =    $r->param('replyTo');
 		$subject           =    $r->param('subject');
-		my $body              =    $r->param('body');
+		my $body           =    $r->param('body');
 		# Sanity check: body must contain non-white space
-		$self->submission_error('You didn\'t enter any message.') unless ($r->param('body') =~ /\S/);
+		$self->addbadmessage(CGI::p('You didn\'t enter any message.')) unless ($r->param('body') =~ /\S/);
 		$r_text               =    \$body;
 
 	}
+	
+	my $remote_host;
+	if (MP2) {
+		$remote_host = $r->connection->remote_addr->ip_get || "UNKNOWN";
+	} else {
+		(undef, $remote_host) = unpack_sockaddr_in($r->connection->remote_addr);
+		$remote_host = defined $remote_host ? inet_ntoa($remote_host) : "UNKNOWN";
+	}
+
 	# store data
 	$self->{from}                   =    $from;
 	$self->{replyTo}                =    $replyTo;
 	$self->{subject}                =    $subject;
+	$self->{remote_host}            =    $remote_host;
 	$self->{r_text}                 =    $r_text;
 
 
 
-###################################################################################
-#Determine the appropriate script action from the buttons
-###################################################################################
-#     first time actions
-#          open new file
-#          open default file 
-#     choose merge file actions
-#          chose merge button
-#     option actions
-#       'reset rows'
-
-#     save actions
-#		"save" button
-#		"save as" button
-#		"save as default" button
-#     preview actions
-#		'preview' button
-#     email actions
-#		'entire class'
-#		'selected studentIDs'
-#     error actions (various)
-
-
-#############################################################################################
-# if no form is submitted, gather data needed to produce the mail form and return
-#############################################################################################
+	###################################################################################
+	#Determine the appropriate script action from the buttons
+	###################################################################################
+	#     first time actions
+	#          open new file
+	#          open default file 
+	#     choose merge file actions
+	#          chose merge button
+	#     option actions
+	#       'reset rows'
+	
+	#     save actions
+	#		"save" button
+	#		"save as" button
+	#		"save as default" button
+	#     preview actions
+	#		'preview' button
+	#     email actions
+	#		'entire class'
+	#		'selected studentIDs'
+	#     error actions (various)
+
+
+	#############################################################################################
+	# if no form is submitted, gather data needed to produce the mail form and return
+	#############################################################################################
 	my $to                =    $r->param('To');
 	my $script_action     = '';
 	
 	
-	if(not defined($action) or $action eq 'Open' or $action eq 'Resize message window'
-	   or $action eq 'Set merge file to:' ){  
-#		warn "FIXME action is |$action| no further initialization required";
+	if(not defined($action) or $action eq 'Open'  
+	   or $action eq $UPDATE_SETTINGS_BUTTON ){  
+
 		return '';
 	}
 
@@ -238,15 +318,15 @@ sub initialize {
 
 	
 
-#############################################################################################
-# If form is submitted deal with filled out forms 
-# and various actions resulting from different buttons
-#############################################################################################
+	#############################################################################################
+	# If form is submitted deal with filled out forms 
+	# and various actions resulting from different buttons
+	#############################################################################################
 
 
 	if ($action eq 'Save' or $action eq 'Save as:' or $action eq 'Save as Default') {
 	
-#		warn "FIXME Saving files  action = $action  outputFileName=$output_file";
+		#warn "FIXME Saving files  action = $action  outputFileName=$output_file";
 		
 		#################################################################
 		# construct message body
@@ -257,14 +337,14 @@ sub initialize {
 				   "From: $from \nReply-To: $replyTo\n" ,
 				   "Subject: $subject\n" ,
 				   "Message: \n    $temp_body");
-#		warn "FIXME from $from | subject $subject |reply $replyTo|msg $temp_body";
+		#warn "FIXME from $from | subject $subject |reply $replyTo|msg $temp_body";
 		#################################################################
 		# overwrite protection
 		#################################################################
 		if ($action eq 'Save as:' and -e "$emailDirectory/$output_file") {
-			$self->submission_error("The file $emailDirectory/$output_file already exists and cannot be overwritten",
-			                         "The message was not saved");
-			return;	
+			$self->addbadmessage(CGI::p("The file $emailDirectory/$output_file already exists and cannot be overwritten",
+			                         "The message was not saved"));
+			return;
 		}
  
 		#################################################################
@@ -274,64 +354,87 @@ sub initialize {
 	    	rename("$emailDirectory/$default_msg_file","$emailDirectory/$old_default_msg_file") or 
 	    	       die "Can't rename $emailDirectory/$default_msg_file to $emailDirectory/$old_default_msg_file ",
 	    	           "Check permissions for webserver on directory $emailDirectory. $!";
-	    	$self->{message} .= "Backup file <code>$emailDirectory/$old_default_msg_file</code> created.".CGI::br();
+	    	$self->addgoodmessage(CGI::p("Backup file <code>$emailDirectory/$old_default_msg_file</code> created." . CGI::br()));
 	    }
 	    #################################################################
 	    # Save the message
 		#################################################################
-		$self->saveProblem($temp_body, "${emailDirectory}/$output_file" );
-		$self->{message}         .= "Message saved to file <code>${emailDirectory}/$output_file</code>.";
-#		warn "FIXME saving to ${emailDirectory}/$output_file";
-	} elsif ($action eq 'Preview') {
+		$self->saveProblem($temp_body, "${emailDirectory}/$output_file" ) unless ($output_file =~ /^[~.]/ || $output_file =~ /\.\./ || not $output_file =~ m|\.msg$|);
+		unless ( $self->{submit_message} or not -w "${emailDirectory}/$output_file" )  {  # if there are no errors report success
+			$self->addgoodmessage(CGI::p("Message saved to file <code>${emailDirectory}/$output_file</code>."));
+		}    
+
+	} elsif ($action eq 'Preview message') {
 		$self->{response}         = 'preview';
 	
 	} elsif ($action eq 'Send Email') {
-		$self->{response}         = 'send_email';
-
+		# verify format of From address (one valid rfc2822 address)
+		my @parsed_from_addrs = Email::Address->parse($self->{from});
+		unless (@parsed_from_addrs == 1) {
+			$self->addbadmessage("From field must contain one valid email address.");
+			return;
+		}
+		
+		# verify format of Reply-to address (zero or more valid rfc2822 addresses)
+		if (defined $self->{replyTo} and $self->{replyTo} ne "") {
+			my @parsed_replyto_addrs = Email::Address->parse($self->{replyTo});
+			unless (@parsed_replyto_addrs > 0) {
+				$self->addbadmessage("Invalid Reply-to address.");
+				return;
+			}
+		}
+		
+	    # check that recipients have been selected.
 		my @recipients            = @{$self->{ra_send_to}};
-		warn "No recipients selected " unless @recipients;
+		unless (@recipients) {
+			$self->addbadmessage(CGI::p("No recipients selected. Please select one or more recipients from the list below."));
+			return;
+		}
+		
 		#  get merge file
 		my $merge_file      = ( defined($self->{merge_file}) ) ? $self->{merge_file} : 'None';
 		my $delimiter       = ',';
 		my $rh_merge_data   = $self->read_scoring_file("$merge_file", "$delimiter");
 		unless (ref($rh_merge_data) ) {
-			warn "no merge data file";
-			$self->submission_error("Can't read merge file $merge_file. No message sent");
+			$self->addbadmessage(CGI::p("No merge data file"));
+			$self->addbadmessage(CGI::p("Can't read merge file $merge_file. No message sent"));
 			return;
 		} ;
+		$self->{rh_merge_data} = $rh_merge_data;
 		
+		# we don't set the response until we're sure that email can be sent
+		$self->{response}         = 'send_email';
 		
-		foreach my $recipient (@recipients) {
-			#warn "FIXME sending email to $recipient";
-			my $ur      = $self->{db}->getUser($recipient); #checked
-			die "record for user $recipient not found" unless $ur;
-			my ($msg, $preview_header);
-			eval{ ($msg,$preview_header) = $self->process_message($ur,$rh_merge_data); };
-			warn "There were errors in processing user $ur, merge file $merge_file. $@" if $@;
-			my $mailer = Mail::Sender->new({
-				from    =>   $from,
-				to      =>   $ur->email_address,
-				smtp    =>   $ce->{mail}->{smtpServer},
-				subject =>   $subject,
-				headers =>   "X-Remote-Host: ".$r->get_remote_host(),
-			});
-			unless (ref $mailer) {
-				warn "Failed to create a mailer: $Mail::Sender::Error";
-				next;
+		# FIXME i'm not sure why we're pulling this out here -- mail_message_to_recipients does have
+		# access to the course environment and should just grab it directly
+		$self->{smtpServer}    = $ce->{mail}->{smtpServer};
+		
+		# do actual mailing in the cleanup phase, since it could take a long time
+		# FIXME we need to do a better job providing status notifications for long-running email jobs
+		my $post_connection_action = sub {
+			my $r = shift; 
+			# catch exceptions generated during the sending process
+			my $result_message = eval { $self->mail_message_to_recipients() };
+			if ($@) {
+				# add the die message to the result message
+				$result_message = "An error occurred while trying to send email.\n"
+					. "The error message is:\n\n$@\n\n";
+				# and also write it to the apache log
+				$self->r->log->error("An error occurred while trying to send email: $@");
 			}
-			unless (ref $mailer->Open()) {
-				warn "Failed to open the mailer: $Mail::Sender::Error";
-				next;
+			# this could fail too...
+			eval { $self->email_notification($result_message) };
+			if ($@) {
+				$self->r->log->error("An error occured while trying to send the email notification: $@");
 			}
-			my $MAIL = $mailer->GetHandle() or warn "Couldn't get handle";
-			print $MAIL  $msg || warn "Couldn't print to $MAIL";
-			close $MAIL || warn "Couldn't close $MAIL";
-		    #warn "FIXME mailed to ", $ur->email_address, "from $from subject $subject";
-			 
-		} 
-			
+		};
+		if (MP2) {
+			$r->connection->pool->cleanup_register($post_connection_action);
+		} else {
+			$r->post_connection($post_connection_action);
+		}
 	} else {
-		warn "Didn't recognize button $action";
+		$self->addbadmessage(CGI::p("Didn't recognize button $action"));
 	}
 
 
@@ -339,43 +442,49 @@ sub initialize {
 }  #end initialize
 
 
-sub title {
-	my $self = shift;
-	return 'Send mail to ' .$self->{ce}->{courseName};
-}
 
-sub path {
-	my $self          = shift;
-	my $args          = $_[-1];
-	
-	my $ce = $self->{ce};
-	my $root = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
-	return $self->pathMacro($args,
-		"Home"          => "$root",
-		$courseName     => "$root/$courseName",
-		'instructor'    => "$root/$courseName/instructor",
-		"Send Mail to: $courseName"      => '',
-	);
-}
+
 
 sub body {
-	my ($self, $setID)  = @_;
+	my ($self)          = @_;
+	my $r               = $self->r;
+	my $urlpath         = $r->urlpath;
+	my $authz           = $r->authz;
+	my $setID           = $urlpath->arg("setID");    
 	my $response        = (defined($self->{response}))? $self->{response} : '';
+	my $user            = $r->param('user');
+
+	# Check permissions
+	return CGI::div({class=>"ResultsWithError"}, CGI::p("You are not authorized to access instructor tools"))
+		unless $authz->hasPermissions($user, "access_instructor_tools");
+
+	return CGI::div({class=>"ResultsWithError"}, CGI::p("You are not authorized to send mail to students"))
+		unless $authz->hasPermissions($user, "send_mail");
+
 	if ($response eq 'preview') {
 		$self->print_preview($setID);
-	} elsif (($response eq 'send_email')){
-		$self->{message} .= CGI::h3("Email sent to "). join(" ", @{$self->{ra_send_to}});
+	} elsif ($response eq 'send_email' and $self->{ra_send_to} and @{$self->{ra_send_to}}){
+		my $message = CGI::i("Email is being sent to ".  scalar(@{$self->{ra_send_to}})." recipient(s). You will be notified"
+		             ." by email when the task is completed.  This may take several minutes if the class is large."
+		);
+		$self->addgoodmessage($message);
+		$self->{message} .= $message;
+		
 		$self->print_form($setID);
 	} else {
 		$self->print_form($setID);
 	}
 
 }
+
 sub print_preview {
-	my ($self, $setID)  = @_;
+	my ($self)          = @_;
+	my $r               = $self->r;
+	my $urlpath         = $r->urlpath;
+	my $setID           = $urlpath->arg("setID");    
+
 	#  get preview user
-	my $ur      = $self->{db}->getUser($self->{preview_user}); #checked
+	my $ur      = $r->db->getUser($self->{preview_user}); #checked
 	die "record for preview user ".$self->{preview_user}. " not found." unless $ur;
 	
 	#  get merge file
@@ -383,10 +492,15 @@ sub print_preview {
 	my $delimiter       = ',';
 	my $rh_merge_data   = $self->read_scoring_file("$merge_file", "$delimiter");
 
-	my ($msg, $preview_header) = $self->process_message($ur,$rh_merge_data);
+	my ($msg, $preview_header) = $self->process_message($ur,$rh_merge_data,1); # 1 == for preview
 	
 	my $recipients  = join(" ",@{$self->{ra_send_to} });
-	my $errorMessage =  defined($self->{submitError}) ?  CGI::h3($self->{submitError} ) : '' ; 
+	my $errorMessage =  defined($self->{submit_message}) ?  CGI::i($self->{submit_message} ) : '' ; 
+	
+	# Format message keeping the preview_header lined up
+	$errorMessage = wrap("","",$errorMessage);
+	$msg = wrap("","",$msg);
+	
 	$msg = join("",
 	   $errorMessage,
 	   $preview_header,
@@ -397,6 +511,7 @@ sub print_preview {
 	   $msg , "\n"
 	);
 
+#	return join("", '<pre>',wrap("","",$msg),"\n","\n",
 	return join("", '<pre>',$msg,"\n","\n",
 				   '</pre>', 
 				   CGI::p('Use browser back button to return from preview mode'),
@@ -407,14 +522,19 @@ sub print_preview {
 
 }
 sub print_form {
-	my ($self, $setID) = @_;
-	my $r = $self->{r};
-	my $authz = $self->{authz};
-	my $user = $r->param('user');
-	my $db = $self->{db};
-	my $ce = $self->{ce};
-	my $root = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
+	my ($self)          = @_;
+	my $r               = $self->r;
+	my $urlpath         = $r->urlpath;
+	my $authz           = $r->authz;	
+	my $db              = $r->db;
+	my $ce              = $r->ce;
+	my $courseName      = $urlpath->arg("courseID");
+	my $setID           = $urlpath->arg("setID");    
+	my $user            = $r->param('user');
+
+	my $root            = $ce->{webworkURLs}->{root};
+	my $sendMailPage    = $urlpath->newFromModule($urlpath->module, $r, courseID=>$courseName);
+	my $sendMailURL     = $self->systemLink($sendMailPage, authen => 0);
 
         return CGI::em("You are not authorized to access the Instructor tools.") unless $authz->hasPermissions($user, "access_instructor_tools");
 
@@ -422,15 +542,26 @@ sub print_form {
 	my $permissionLevelTemplate = $db->newPermissionLevel;
 	
 	# This code will require changing if the permission and user tables ever have different keys.
-	my @users                 = @{ $self->{ra_users} };
+	my @users                 = sort @{ $self->{ra_users} };
 	my $ra_user_records       = $self->{ra_user_records};
 	my %classlistLabels       = ();#  %$hr_classlistLabels;
 	foreach my $ur (@{ $ra_user_records }) {
-		$classlistLabels{$ur->user_id} = $ur->user_id.' '.$ur->last_name. ', '. $ur->first_name.' - '.$ur->section;
+		$classlistLabels{$ur->user_id} = $ur->user_id.': '.$ur->last_name. ', '. $ur->first_name.' -- '.$ur->section." / ".$ur->recitation;
 	}
 
-
-##############################################################################################################
+	## Mark edit define scrolling list
+	my $scrolling_user_list = scrollingRecordList({
+		name => "classList", 			## changed from classList to action
+		request => $r,
+		default_sort => "lnfn",
+		default_format => "lnfn_uid",
+		default_filters => ["all"],
+		size => 5,
+		multiple => 1,
+		refresh_button_name =>'Update settings and refresh page',
+	}, @{$ra_user_records});
+
+	##############################################################################################################
 	
 
 	my $from            = $self->{from};
@@ -452,72 +583,73 @@ sub print_form {
 	die "record for preview user ".$self->{preview_user}. " not found." unless $preview_record;
 
 
-#############################################################################################		
+	#############################################################################################		
 
-	print CGI::start_form({method=>"post", action=>$r->uri()});
+	print CGI::start_form({method=>"post", action=>$sendMailURL});
 	print $self->hidden_authen_fields();
-#############################################################################################
-#	begin upper table
-#############################################################################################	
+	#############################################################################################
+	#	begin upper table
+	#############################################################################################	
 
     print CGI::start_table({-border=>'2', -cellpadding=>'4'});
-	print CGI::Tr({-align=>'left',-valign=>'VCENTER'},
-#############################################################################################
-#	first column
-#############################################################################################	
+	print CGI::Tr({-align=>'left',-valign=>'top'},
+	#############################################################################################
+	#	first column
+	#############################################################################################	
 
-			 CGI::td("Message file: $input_file","\n",CGI::br(),
+			 CGI::td({},
+			     CGI::strong("Message file: "), $input_file,"\n",CGI::br(),
 				 CGI::submit(-name=>'action', -value=>'Open'), '&nbsp;&nbsp;&nbsp;&nbsp;',"\n",
 				 CGI::popup_menu(-name=>'openfilename', 
 				                 -values=>\@sorted_messages, 
 				                 -default=>$input_file
-				 ), "\n",CGI::br(),
-
-				 "Save file to: $output_file","\n",CGI::br(),
-				 "\n", 'From:','&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;',  CGI::textfield(-name=>"from", -size=>30, -value=>$from, -override=>1),    
-				 "\n", CGI::br(),'Reply-To: ', CGI::textfield(-name=>"replyTo", -size=>30, -value=>$replyTo, -override=>1), 
-				 "\n", CGI::br(),'Subject:  ', CGI::br(), CGI::textarea(-name=>'subject', -default=>$subject, -rows=>3,-columns=>30, -override=>1),  
-			),
-#############################################################################################
-#	second column
-#############################################################################################	
-			CGI::td({-align=>'left'},
-				CGI::radio_group(-name=>'radio', -values=>['all_students','studentID'],
-					-labels=>{all_students=>'All active students',studentID => 'Select recipients'},
-					-default=>'studentID',
-					-linebreak=>1),
-					CGI::br(),
-					CGI::popup_menu(-name=>'classList',
-							   -values=>\@users,
-							   -labels=>\%classlistLabels,
-							   -size  => 10,
-							   -multiple => 1,
-							   -default=>$user
-					),
-					
-				
-			),
-#############################################################################################
-#	third column
-#############################################################################################	
-			CGI::td({align=>'left'},
-			     "Merge file is: $merge_file", CGI::br(),
-				 CGI::submit(-name=>'action', -value=>'Set merge file to:'),CGI::br(),
+				 ), 
+				 "\n",CGI::br(),
+				 CGI::strong("Save file to: "), $output_file,
+				 "\n",CGI::br(),
+				 CGI::strong('Merge file: '), $merge_file, 
+				 CGI::br(),
 				 CGI::popup_menu(-name=>'merge_file', 
 				                 -values=>\@sorted_merge_files, 
 				                 -default=>$merge_file,
-				 ), "\n",CGI::hr(),CGI::br(),
-				CGI::submit(-name=>'action', -value=>'preview',-label=>'Preview')," email to ",
-				CGI::popup_menu(-name=>'preview_user',
-							   -values=>\@users,
-							   #-labels=>\%classlistLabels,
-							   -default=>$preview_user,
+				 ), "\n",
+				 "\n",
+				 #CGI::hr(),
+				 CGI::div({style=>"background-color: #CCCCCC"},
+					 "\n", 'From:','&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;',  CGI::textfield(-name=>"from", -size=>30, -value=>$from, -override=>1),    
+					 "\n", CGI::br(),'Reply-To: ', CGI::textfield(-name=>"replyTo", -size=>30, -value=>$replyTo, -override=>1), 
+					 "\n", CGI::br(),'Subject:  ', CGI::br(), CGI::textarea(-name=>'subject', -default=>$subject, -rows=>3,-cols=>30, -override=>1),  
 				),
-				CGI::hr(),
-				CGI::submit(-name=>'action', -value=>'resize', -label=>'Resize message window'),CGI::br(),
-				" Rows: ", CGI::textfield(-name=>'rows', -size=>3, -value=>$rows),
-				" Columns: ", CGI::textfield(-name=>'columns', -size=>3, -value=>$columns),
-				CGI::br(),CGI::br(),
+				#CGI::hr(),
+				"Editor rows: ", CGI::textfield(-name=>'rows', -size=>3, -value=>$rows),
+				" columns: ", CGI::textfield(-name=>'columns', -size=>3, -value=>$columns),
+				CGI::br(),
+				CGI::submit(-name=>'action', -value=>$UPDATE_SETTINGS_BUTTON),
+				 
+			),
+	#############################################################################################
+	#	second column
+	#############################################################################################	
+
+	## Edit by Mark to insert scrolling list
+					CGI::td({-style=>"width:33%"},
+					     CGI::strong("Send to:"),
+		                  CGI::radio_group(-name=>'radio', 
+		                                   -values=>['all_students','studentID'],
+		                                   -labels=>{all_students=>'All students in course',studentID => 'Selected students'},
+		                                   -default=>'studentID', -linebreak=>0), 
+							CGI::br(),$scrolling_user_list,
+							CGI::i("Preview set to: "), $preview_record->last_name,'(', $preview_record->user_id,')',
+							CGI::submit(-name=>'action', -value=>'preview',-label=>'Preview message'),'&nbsp;&nbsp;',
+					),
+	); # end Tr
+	
+	# second row, for reference popup menu
+	print CGI::Tr(
+			CGI::td({align=>'center',colspan=>2},
+
+				
+				#CGI::i('Press any action button to update display'),CGI::br(),
 			#show available macros
 				CGI::popup_menu(
 						-name=>'dummyName',
@@ -536,56 +668,44 @@ sub print_form {
 							}
 				), "\n",
 			),
-
-	); # end Tr
+	);
+	
 	print CGI::end_table();	
-#############################################################################################
-#	end upper table
-#############################################################################################	
+	#############################################################################################
+	#	end upper table
+	#############################################################################################	
  
-# show merge file
-#         print  "<pre>",(map {$_ =~s/\s/\./g;$_}     map {sprintf('%-8.8s',$_);}  0..8),"</pre>";
-# 		print  CGI::popup_menu(
-# 						-name=>'dummyName2',
-# 						-values=>\@merge_keys,
-# 						-labels=>$rh_merge_data,
-# 						-multiple=>1,
-# 						-size    =>2,
-# 						
-# 				), "\n",CGI::br();
-#       warn "merge keys ", join( " ",@merge_keys);
-#############################################################################################
-#	merge file fragment and message text area field
-#############################################################################################	
-		my @tmp2;
-        eval{  @tmp2= @{$rh_merge_data->{ $db->getUser($preview_user)->student_id  }  };}; # checked
-        if ($@) {
-#        	print CGI::p( "Couldn't get merge data for $preview_user", CGI::br(), $@) ;
-			print "No merge data for $preview_user in merge file: &lt;$merge_file&gt;",CGI::br();
-        } else {
-			print CGI::pre("",data_format(0..($#tmp2)),"\n", data_format(@tmp2));
-		}
-#create a textbox with the subject and a textarea with the message
-#print actual body of message
+	#############################################################################################
+	#	merge file fragment and message text area field
+	#############################################################################################	
+	my @tmp2;
+	eval{  @tmp2= @{$rh_merge_data->{ $db->getUser($preview_user)->student_id  }  };}; # checked
+	if ($@ and $merge_file ne 'None') {
+		print "No merge data for $preview_user in merge file: &lt;$merge_file&gt;",CGI::br();
+	} else {
+		print CGI::pre("",data_format(1..($#tmp2+1)),"<br>", data_format2(@tmp2));
+	}
+	#create a textbox with the subject and a textarea with the message
+	#print actual body of message
 
 	print  "\n", CGI::p( $self->{message}) if defined($self->{message});  
-    print  "\n", CGI::p( CGI::textarea(-name=>'body', -default=>$text, -rows=>$rows, -columns=>$columns, -override=>1));
+    print  "\n", CGI::p( CGI::textarea(-name=>'body', -default=>$text, -rows=>$rows, -cols=>$columns, -override=>1));
 
-#############################################################################################
-#	action button table
-#############################################################################################	
+	#############################################################################################
+	#	action button table
+	#############################################################################################	
 	print    CGI::table( { -border=>2,-cellpadding=>4},
-				 CGI::Tr( 
-					 CGI::td( CGI::submit(-name=>'action', -value=>'Send Email') ), "\n",
-					 CGI::td(CGI::submit(-name=>'action', -value=>'Save')," to $output_file"), " \n",
-					 CGI::td(CGI::submit(-name=>'action', -value=>'Save as:'),
+				 CGI::Tr( {},
+					 CGI::td({}, CGI::submit(-name=>'action', -value=>'Send Email') ), "\n",
+					 CGI::td({}, CGI::submit(-name=>'action', -value=>'Save')," to $output_file"), " \n",
+					 CGI::td({}, CGI::submit(-name=>'action', -value=>'Save as:'),
 					         CGI::textfield(-name=>'savefilename', -size => 20, -value=> "$output_file", -override=>1)
 					 ), "\n",
 					 CGI::td(CGI::submit(-name=>'action', -value=>'Save as Default')),
 				) 
 	);
 			   
-##############################################################################################################
+	##############################################################################################################
 
 	print CGI::end_form();	
 	return "";
@@ -594,29 +714,18 @@ sub print_form {
 ##############################################################################
 # Utility methods
 ##############################################################################
-sub submission_error {
-	my $self = shift;
-    my $msg = join( " ", @_);
-	$self->{submitError} .= CGI::br().$msg; #CGI::b(HTML::Entities::encode($msg));
-# 		qq{Please hit the &quot;<B>Back</B>&quot; button on your browser to 
-# 		try again, or notify your web master
-# 		if you believe this message is in error.
-# 		};
-    return;
-}
 
 sub saveProblem {     
     my $self      = shift;
 	my ($body, $probFileName)= @_;
 	local(*PROBLEM);
 	open (PROBLEM, ">$probFileName") ||
-		$self->submission_error("Could not open $probFileName for writing.
-		Check that the  permissions for this problem are 660 (-rw-rw----)");
-	print PROBLEM $body;
+		$self->addbadmessage(CGI::p("Could not open $probFileName for writing.
+						Check that the  permissions for this problem are 660 (-rw-rw----)"));
+	print PROBLEM $body if -w $probFileName;
 	close PROBLEM;
 	chmod 0660, "$probFileName" ||
-	             $self->submission_error("
-	                    CAN'T CHANGE PERMISSIONS ON FILE $probFileName");
+	             $self->addbadmessage(CGI::p("CAN'T CHANGE PERMISSIONS ON FILE $probFileName"));
 }
 
 sub read_input_file {
@@ -627,7 +736,7 @@ sub read_input_file {
 	my ($subject, $from, $replyTo);
 	local(*FILE);
 	if (-e "$filePath" and -r "$filePath") {
-		open FILE, "$filePath" || do { $self->submission_error("Can't open $filePath"); return};
+		open FILE, "$filePath" || do { $self->addbadmessage(CGI::p("Can't open $filePath")); return};
 		while ($header !~ s/Message:\s*$//m and not eof(FILE)) { 
 			$header .= <FILE>; 
 		}
@@ -646,7 +755,7 @@ sub read_input_file {
 		$from           = $self->{defaultFrom};
 		$replyTo        = $self->{defaultReply};
 		$text           =  (-e "$filePath") ? "FIXME file $filePath can't be read" :"FIXME file $filePath doesn't exist";
-		$subject        = "FIXME default subject";
+		$subject        = $self->{defaultSubject};
 	}
 	return ($from, $replyTo, $subject, \$text);
 }
@@ -658,10 +767,106 @@ sub get_message_file_names {
 }
 sub get_merge_file_names   {
 	my $self         = shift;
-	return 'None', $self->read_dir($self->{ce}->{courseDirs}->{scoring}, '\\.csv$');
+	return 'None', $self->read_dir($self->{ce}->{courseDirs}->{scoring}, '\\.csv$'); #FIXME ? check that only readable files are listed.
 }
 
+sub mail_message_to_recipients {
+	my $self                  = shift;
+	my $r                     = $self->r;
+	my $ce                    = $r->ce;
+	my $subject               = $self->{subject};
+	my $from                  = $self->{from};
+	my @recipients            = @{$self->{ra_send_to}};
+	my $rh_merge_data         = $self->{rh_merge_data};
+	my $merge_file            = $self->{merge_file};  
+	my $result_message        = '';
+	my $failed_messages        = 0;
+	
+	foreach my $recipient (@recipients) {
+			# warn "FIXME sending email to $recipient";
+			my $error_messages = '';
+			my $ur      = $self->{db}->getUser($recipient); #checked
+			unless ($ur) {
+				$error_messages .= "Record for user $recipient not found\n";
+				next;
+			}
+			unless ($ur->email_address) {
+				$error_messages .="User $recipient does not have an email address -- skipping\n";
+				next;
+			}
+			my $msg = eval { $self->process_message($ur,$rh_merge_data) };
+			$error_messages .= "There were errors in processing user $recipient, merge file $merge_file. \n$@\n" if $@;
+			my $mailer = Mail::Sender->new({
+				from      => $ce->{mail}{smtpSender},
+				fake_from => $from,
+				to        => $ur->email_address,
+				smtp      => $self->{smtpServer},
+				subject   => $subject,
+				headers   => "X-Remote-Host: ".$self->{remote_host},
+			});
+			unless (ref $mailer) {
+				$error_messages .= "Failed to create a mailer for user $recipient: $Mail::Sender::Error\n";
+				next;
+			}
+			unless (ref $mailer->Open()) {
+				$error_messages .= "Failed to open the mailer for user $recipient: $Mail::Sender::Error\n";
+				next;
+			}
+			my $MAIL         = $mailer->GetHandle() || ($error_messages .= "Couldn't get mailer handle \n");
+			print $MAIL        $msg                 || ($error_messages .= "Couldn't print to $MAIL");
+			close $MAIL                             || ($error_messages .= "Couldn't close $MAIL");
+		    #warn "FIXME mailed to $recipient: ", $ur->email_address, " from $from subject $subject Errors: $error_messages";
+		    $failed_messages++ if $error_messages;
+		    $result_message .= $error_messages;			 
+		} 
+		my $courseName = $self->r->urlpath->arg("courseID");
+		my $number_of_recipients = scalar(@recipients) - $failed_messages;
+		$result_message = <<EndText.$result_message;
+		
+			A message with the subject line 
+			             $subject 
+			has been sent to 
+			$number_of_recipients recipient(s) in the class $courseName. 
+			There were $failed_messages message(s) that could not be delivered. 
+		
+EndText
+
+}
+sub email_notification {
+	my $self = shift;
+	my $result_message = shift;
+	# find info on mailer and sender
+	# use the defaultFrom address.
+
+	# find info on instructor recipient and message
+	my $subject="WeBWorK email sent";
+	
+	my $mailing_errors = "";
+	# open MAIL handle
+	my $mailer = Mail::Sender->new({
+		from => $self->{defaultFrom},
+		to   => $self->{defaultFrom},
+		smtp    => $self->{smtpServer},
+		subject => $subject,
+		headers => "X-Remote-Host: ".$self->{remote_host},
+	});
+	unless (ref $mailer) {
+		$mailing_errors .= "Failed to create a mailer: $Mail::Sender::Error";
+		return "";
+	}
+	unless (ref $mailer->Open()) {
+		$mailing_errors .= "Failed to open the mailer: $Mail::Sender::Error";
+		return "";
+	}
+	my $MAIL = $mailer->GetHandle();
+	# print message
+	print $MAIL $result_message;
+	# clean up
+	close $MAIL;
+	
+    warn "instructor message sent to ", $self->{defaultFrom};
 
+}
 sub getRecord {
 	my $self    = shift;
 	my $line    = shift;
@@ -675,10 +880,10 @@ sub getRecord {
         #       would return).  E.G. @lineArray=&getRecord(\$delimitedLine).
 
         my(@lineArray);
-        $line.=$delimiter;                              # add 'A' to end of line so that
-                                                        # last field is never empty
-        @lineArray = split(/\s*${delimiter}\s*/,$line);
+        $line.="${delimiter}___";                       # add final field which must be non-empty
+        @lineArray = split(/\s*${delimiter}\s*/,$line); # split line into fields
         $lineArray[0] =~s/^\s*//;                       # remove white space from first element
+        pop @lineArray;                                 # remove the last artificial field
         @lineArray;
 }
 
@@ -686,45 +891,70 @@ sub process_message {
 	my $self          = shift;
 	my $ur            = shift;
 	my $rh_merge_data = shift;
+	my $for_preview   = shift;
 	my $text          = defined($self->{r_text}) ? ${ $self->{r_text} }:
-	                        'FIXME no text was produced by initialization!!';	  
+	                        'FIXME no text was produced by initialization!!';	
+	my $merge_file      = ( defined($self->{merge_file}) ) ? $self->{merge_file} : 'None';  
+	
+	my $status_name = $self->r->ce->status_abbrev_to_name($ur->status);
+	$status_name = $ur->status unless defined $status_name;
+	
 	#user macros that can be used in the email message
 	my $SID           = $ur->student_id;
 	my $FN            = $ur->first_name;
 	my $LN            = $ur->last_name;
 	my $SECTION       = $ur->section;
 	my $RECITATION    = $ur->recitation;
-	my $STATUS        = $ur->status;
+	my $STATUS        = $status_name;
 	my $EMAIL         = $ur->email_address;
 	my $LOGIN         = $ur->user_id;
+	
 	# get record from merge file
 	# FIXME this is inefficient.  The info should be cached
 	my @COL            = defined($rh_merge_data->{$SID}) ? @{$rh_merge_data->{$SID} } : ();
-	$self->submission_error( "No merge data for $SID $FN $LN $LOGIN") unless defined($rh_merge_data->{$SID});
-	
+	if ($merge_file ne 'None' and not defined($rh_merge_data->{$SID}) and $for_preview) {
+		$self->addbadmessage(CGI::p("No merge data for student id:$SID; name:$FN $LN; login:$LOGIN"));
+	}
+	unshift(@COL,"");			## this makes COL[1] the first column
 	my $endCol = @COL;
 	# for safety, only evaluate special variables
  	my $msg = $text;    
- 	$msg =~ s/(\$SID)/eval($1)/ge;
- 	$msg =~ s/(\$LN)/eval($1)/ge;
- 	$msg =~ s/(\$FN)/eval($1)/ge;
- 	$msg =~ s/(\$STATUS)/eval($1)/ge;
- 	$msg =~ s/(\$SECTION)/eval($1)/ge;
- 	$msg =~ s/(\$RECITATION)/eval($1)/ge;
- 	$msg =~ s/(\$EMAIL)/eval($1)/ge;
- 	$msg =~ s/(\$LOGIN)/eval($1)/ge;
- 	$msg =~ s/\$COL\[ *-/\$COL\[$endCol-/g;
- 	$msg =~ s/(\$COL\[.*?\])/eval($1)/ge;
- 	
+ 	$msg =~ s/\$SID/$SID/ge;
+ 	$msg =~ s/\$LN/$LN/ge;
+ 	$msg =~ s/\$FN/$FN/ge;
+ 	$msg =~ s/\$STATUS/$STATUS/ge;
+ 	$msg =~ s/\$SECTION/$SECTION/ge;
+ 	$msg =~ s/\$RECITATION/$RECITATION/ge;
+ 	$msg =~ s/\$EMAIL/$EMAIL/ge;
+ 	$msg =~ s/\$LOGIN/$LOGIN/ge;
+	if (defined($COL[1])) {		# prevents extraneous error messages.  
+		$msg =~ s/\$COL\[(\-?\d+)\]/$COL[$1]/ge
+	}
+	else {						# prevents extraneous $COL's in email message 
+		$msg =~ s/\$COL\[(\-?\d+)\]//g
+	}			
+			 
  	$msg =~ s/\r//g;
-
-	my $preview_header = 	CGI::pre("",data_format(0..($#COL)),"\n", data_format(@COL)).
-		                    CGI::h3( "This sample mail would be sent to $EMAIL");
+	
+	if ($for_preview) {
+		my @preview_COL = @COL;
+		shift @preview_COL; ## shift back for preview
+		my $preview_header = 	CGI::p('',data_format(1..($#COL)),"<br>", data_format2(@preview_COL)).
+			                    CGI::h3( "This sample mail would be sent to $EMAIL");
+		return $msg, $preview_header;
+	} else {
+		return $msg;
+	}
+}
 
 
-	return $msg, $preview_header;
-}
+# Ý sub data_format {
+# 
+# Ý Ý Ý Ý Ýmap {$_ =~s/\s/\./g;$_} Ý Ý map {sprintf('%-8.8s',$_);} Ý@_;
  sub data_format {
- 	map {$_ =~s/\s/\./g;$_}     map {sprintf('%-8.8s',$_);}  @_;
+ 	    map {"COL[$_]".'&nbsp;'x(3-length($_));}  @_;  # problems if $_ has length bigger than 4
+ }
+  sub data_format2 {
+    map {$_ =~s/\s/&nbsp;/g;$_}  map {sprintf('%-8.8s',$_);} @_;
  }
 1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm b/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm
new file mode 100644
index 0000000000..66d56653fb
--- /dev/null
+++ b/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm
@@ -0,0 +1,1426 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm,v 1.85 2008/07/01 13:18:52 glarose 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.	 See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+
+package WeBWorK::ContentGenerator::Instructor::SetMaker;
+use base qw(WeBWorK::ContentGenerator::Instructor);
+
+=head1 NAME
+
+WeBWorK::ContentGenerator::Instructor::SetMaker - Make homework sets.
+
+=cut
+
+use strict;
+use warnings;
+
+
+#use CGI qw(-nosticky);
+use WeBWorK::CGI;
+use WeBWorK::Debug;
+use WeBWorK::Form;
+use WeBWorK::Utils qw(readDirectory max sortByName);
+use WeBWorK::Utils::Tasks qw(renderProblems);
+use File::Find;
+
+require WeBWorK::Utils::ListingDB;
+
+use constant SHOW_HINTS_DEFAULT => 0;
+use constant SHOW_SOLUTIONS_DEFAULT => 0;
+use constant MAX_SHOW_DEFAULT => 20;
+use constant NO_LOCAL_SET_STRING => 'No sets in this course yet';
+use constant SELECT_SET_STRING => 'Select a Set from this Course';
+use constant SELECT_LOCAL_STRING => 'Select a Problem Collection';
+use constant MY_PROBLEMS => '  My Problems  ';
+use constant MAIN_PROBLEMS => '  Unclassified Problems  ';
+use constant CREATE_SET_BUTTON => 'Create New Set';
+use constant ALL_CHAPTERS => 'All Chapters';
+use constant ALL_SUBJECTS => 'All Subjects';
+use constant ALL_SECTIONS => 'All Sections';
+use constant ALL_TEXTBOOKS => 'All Textbooks';
+
+use constant LIB2_DATA => {
+  'dbchapter' => {name => 'library_chapters', all => 'All Chapters'},
+  'dbsection' =>  {name => 'library_sections', all =>'All Sections' },
+  'dbsubject' =>  {name => 'library_subjects', all => 'All Subjects' },
+  'textbook' =>  {name => 'library_textbook', all =>  'All Textbooks'},
+  'textchapter' => {name => 'library_textchapter', all => 'All Chapters'},
+  'textsection' => {name => 'library_textsection', all => 'All Sections'},
+  'keywords' =>  {name => 'library_keywords', all => '' },
+  };
+
+## Flags for operations on files
+
+use constant ADDED => 1;
+use constant HIDDEN => (1 << 1);
+use constant SUCCESS => (1 << 2);
+
+##	for additional problib buttons
+my %problib;	## filled in in global.conf
+my %ignoredir = (
+	'.' => 1, '..' => 1, 'Library' => 1, 'CVS' => 1, 'tmpEdit' => 1,
+	'headers' => 1, 'macros' => 1, 'email' => 1, '.svn' => 1,
+);
+
+sub prepare_activity_entry {
+	my $self=shift;
+	my $r = $self->r;
+	my $user = $self->r->param('user') || 'NO_USER';
+	return("In SetMaker as user $user");
+}
+
+## This is for searching the disk for directories containing pg files.
+## to make the recursion work, this returns an array where the first 
+## item is the number of pg files in the directory.  The second is a
+## list of directories which contain pg files.
+##
+## If a directory contains only one pg file and the directory name
+## is the same as the file name, then the directory is considered
+## to be part of the parent directory (it is probably in a separate
+## directory only because it has auxiliary files that want to be
+## kept together with the pg file).
+##
+## If a directory has a file named "=library-ignore", it is never
+## included in the directory menu.  If a directory contains a file
+## called "=library-combine-up", then its pg are included with those
+## in the parent directory (and the directory does not appear in the
+## menu).  If it has a file called "=library-no-combine" then it is
+## always listed as a separate directory even if it contains only one
+## pg file.
+
+sub get_library_sets {
+	my $top = shift; my $dir = shift;
+	# ignore directories that give us an error
+	my @lis = eval { readDirectory($dir) };
+	if ($@) {
+		warn $@;
+		return (0);
+	}
+	return (0) if grep /^=library-ignore$/, @lis;
+
+	my @pgfiles = grep { m/\.pg$/ and (not m/(Header|-text)\.pg$/) and -f "$dir/$_"} @lis;
+	my $pgcount = scalar(@pgfiles);
+	my $pgname = $dir; $pgname =~ s!.*/!!; $pgname .= '.pg';
+	my $combineUp = ($pgcount == 1 && $pgname eq $pgfiles[0] && !(grep /^=library-no-combine$/, @lis));
+
+	my @pgdirs;
+	my @dirs = grep {!$ignoredir{$_} and -d "$dir/$_"} @lis;
+	if ($top == 1) {@dirs = grep {!$problib{$_}} @dirs}
+	foreach my $subdir (@dirs) {
+		my @results = get_library_sets(0, "$dir/$subdir");
+		$pgcount += shift @results; push(@pgdirs,@results);
+	}
+
+	return ($pgcount, @pgdirs) if $top || $combineUp || grep /^=library-combine-up$/, @lis;
+	return (0,@pgdirs,$dir);
+}
+
+sub get_library_pgs {
+	my $top = shift; my $base = shift; my $dir = shift;
+	my @lis = readDirectory("$base/$dir");
+	return () if grep /^=library-ignore$/, @lis;
+	return () if !$top && grep /^=library-no-combine$/, @lis;
+
+	my @pgs = grep { m/\.pg$/ and (not m/(Header|-text)\.pg$/) and -f "$base/$dir/$_"} @lis;
+	my $others = scalar(grep { (!m/\.pg$/ || m/(Header|-text)\.pg$/) &&
+	                            !m/(\.(tmp|bak)|~)$/ && -f "$base/$dir/$_" } @lis);
+
+	my @dirs = grep {!$ignoredir{$_} and -d "$base/$dir/$_"} @lis;
+	if ($top == 1) {@dirs = grep {!$problib{$_}} @dirs}
+	foreach my $subdir (@dirs) {push(@pgs, get_library_pgs(0,"$base/$dir",$subdir))}
+
+	return () unless $top || (scalar(@pgs) == 1 && $others) || grep /^=library-combine-up$/, @lis;
+	return (map {"$dir/$_"} @pgs);
+}
+
+sub list_pg_files {
+	my ($templates,$dir) = @_;
+	my $top = ($dir eq '.')? 1 : 2;
+	my @pgs = get_library_pgs($top,$templates,$dir);
+	return sortByName(undef,@pgs);
+}
+
+## Search for set definition files
+
+sub get_set_defs {
+	my $topdir = shift;
+	my @found_set_defs;
+	# get_set_defs_wanted is a closure over @found_set_defs
+	my $get_set_defs_wanted = sub {
+		#my $fn = $_;
+		#my $fdir = $File::Find::dir;
+		#return() if($fn !~ /^set.*\.def$/);
+		##return() if(not -T $fn);
+		#push @found_set_defs, "$fdir/$fn";
+		push @found_set_defs, $_ if m|/set[^/]*\.def$|;
+	};
+	find({ wanted => $get_set_defs_wanted, follow_fast=>1, no_chdir=>1}, $topdir);
+	map { $_ =~ s|^$topdir/?|| } @found_set_defs;
+	return @found_set_defs;
+}
+
+## Try to make reading of set defs more flexible.  Additional strategies
+## for fixing a path can be added here.
+
+sub munge_pg_file_path {
+	my $self = shift;
+	my $pg_path = shift;
+	my $path_to_set_def = shift;
+	my $end_path = $pg_path;
+	# if the path is ok, don't fix it
+	return($pg_path) if(-e $self->r->ce->{courseDirs}{templates}."/$pg_path");
+	# if we have followed a link into a self contained course to get
+	# to the set.def file, we need to insert the start of the path to
+	# the set.def file
+	$end_path = "$path_to_set_def/$pg_path";
+	return($end_path) if(-e $self->r->ce->{courseDirs}{templates}."/$end_path");
+	# if we got this far, this path is bad, but we let it produce
+	# an error so the user knows there is a troublesome path in the
+	# set.def file.
+	return($pg_path);
+}
+
+## Read a set definition file.  This could be abstracted since it happens
+## elsewhere.  Here we don't have to process so much of the file.
+
+sub read_set_def {
+	my $self = shift;
+	my $r = $self->r;
+	my $filePathOrig = shift;
+	my $filePath = $r->ce->{courseDirs}{templates}."/$filePathOrig";
+	$filePathOrig =~ s/set.*\.def$//;
+	$filePathOrig =~ s|/$||;
+	$filePathOrig = "." if ($filePathOrig !~ /\S/);
+	my @pg_files = ();
+	my ($line, $got_to_pgs, $name, @rest) = ("", 0, "");
+	if ( open (SETFILENAME, "$filePath") )    {
+		while($line = <SETFILENAME>) {
+			chomp($line);
+			$line =~ s|(#.*)||; # don't read past comments
+			if($got_to_pgs) {
+				unless ($line =~ /\S/) {next;} # skip blank lines
+				($name,@rest) = split (/\s*,\s*/,$line);
+				$name =~ s/\s*//g;
+				push @pg_files, $name;
+			} else {
+				$got_to_pgs = 1 if ($line =~ /problemList\s*=/);
+			}
+		}
+	} else {
+		$self->addbadmessage("Cannot open $filePath");
+	}
+	# This is where we would potentially munge the pg file paths
+	# One possibility
+	@pg_files = map { $self->munge_pg_file_path($_, $filePathOrig) } @pg_files;
+	return(@pg_files);
+}
+
+## go through past page getting a list of identifiers for the problems
+## and whether or not they are selected, and whether or not they should
+## be hidden
+
+sub get_past_problem_files {
+	my $r = shift;
+	my @found=();
+	my $count =1;
+	while (defined($r->param("filetrial$count"))) {
+		my $val = 0;
+		$val |= ADDED if($r->param("trial$count"));
+		$val |= HIDDEN if($r->param("hideme$count"));
+		push @found, [$r->param("filetrial$count"), $val];			
+		$count++;
+	}
+	return(\@found);
+}
+
+#### For adding new problems
+
+sub add_selected {
+	my $self = shift;
+	my $db = shift;
+	my $setName = shift;
+	my @past_problems = @{$self->{past_problems}};
+	my @selected = @past_problems;
+	my (@path, $file, $selected, $freeProblemID);
+	# DBFIXME count would work just as well
+	$freeProblemID = max($db->listGlobalProblems($setName)) + 1;
+	my $addedcount=0;
+
+	for $selected (@selected) {
+		if($selected->[1] & ADDED) {
+			$file = $selected->[0];
+			my $problemRecord = $self->addProblemToSet(setName => $setName,
+				sourceFile => $file, problemID => $freeProblemID);
+			$freeProblemID++;
+			$self->assignProblemToAllSetUsers($problemRecord);
+			$selected->[1] |= SUCCESS;
+			$addedcount++;
+		}
+	}
+	return($addedcount);
+}
+
+
+############# List of sets of problems in templates directory
+
+sub get_problem_directories {
+	my $ce = shift;
+	my $lib = shift;
+	my $source = $ce->{courseDirs}{templates};
+	my $main = MY_PROBLEMS; my $isTop = 1;
+	if ($lib) {$source .= "/$lib"; $main = MAIN_PROBLEMS; $isTop = 2}
+	my @all_problem_directories = get_library_sets($isTop, $source);
+	my $includetop = shift @all_problem_directories;
+	my $j;
+	for ($j=0; $j<scalar(@all_problem_directories); $j++) {
+		$all_problem_directories[$j] =~ s|^$ce->{courseDirs}->{templates}/?||;
+	}
+	@all_problem_directories = sortByName(undef, @all_problem_directories);
+	unshift @all_problem_directories, $main if($includetop);
+	return (\@all_problem_directories);
+}
+
+############# Everyone has a view problems line.	Abstract it
+sub view_problems_line {
+	my $internal_name = shift;
+	my $label = shift;
+	my $r = shift; # so we can get parameter values
+	my $result = CGI::submit(-name=>"$internal_name", -value=>$label);
+
+	my %display_modes = %{WeBWorK::PG::DISPLAY_MODES()};
+	my @active_modes = grep { exists $display_modes{$_} }
+		@{$r->ce->{pg}->{displayModes}};
+	push @active_modes, 'None';
+	# We have our own displayMode since its value may be None, which is illegal
+	# in other modules.
+	my $mydisplayMode = $r->param('mydisplayMode') || $r->ce->{pg}->{options}->{displayMode};
+	$result .= '&nbsp;Display&nbsp;Mode:&nbsp;'.CGI::popup_menu(-name=> 'mydisplayMode',
+	                                                            -values=>\@active_modes,
+	                                                            -default=> $mydisplayMode);
+	# Now we give a choice of the number of problems to show
+	my $defaultMax = $r->param('max_shown') || MAX_SHOW_DEFAULT;
+	$result .= '&nbsp;Max. Shown:&nbsp'.
+		CGI::popup_menu(-name=> 'max_shown',
+		                -values=>[5,10,15,20,25,30,50,'All'],
+		                -default=> $defaultMax);
+	# Option of whether to show hints and solutions
+	my $defaultHints = $r->param('showHints') || SHOW_HINTS_DEFAULT;
+	$result .= "&nbsp;".CGI::checkbox(-name=>"showHints",-checked=>$defaultHints,-label=>"Hints");
+	my $defaultSolutions = $r->param('showSolutions') || SHOW_SOLUTIONS_DEFAULT;
+	$result .= "&nbsp;".CGI::checkbox(-name=>"showSolutions",-checked=>$defaultSolutions,-label=>"Solutions");
+	
+	return($result);
+}
+
+
+### The browsing panel has three versions
+#####	 Version 1 is local problems
+sub browse_local_panel {
+	my $self = shift;
+	my $library_selected = shift;
+	my $lib = shift || ''; $lib =~ s/^browse_//;
+	my $name = ($lib eq '')? 'Local' : $problib{$lib};
+    
+	my $list_of_prob_dirs= get_problem_directories($self->r->ce,$lib);
+	if(scalar(@$list_of_prob_dirs) == 0) {
+		$library_selected = "Found no directories containing problems";
+		unshift @{$list_of_prob_dirs}, $library_selected;
+	} else {
+		my $default_value = SELECT_LOCAL_STRING;
+		if (not $library_selected or $library_selected eq $default_value) {
+			unshift @{$list_of_prob_dirs},	$default_value;
+			$library_selected = $default_value;
+		}
+	}
+	debug("library is $lib and sets are $library_selected");
+	my $view_problem_line = view_problems_line('view_local_set', 'View Problems', $self->r);
+	my @popup_menu_args = (
+		-name => 'library_sets',
+		-values => $list_of_prob_dirs,
+		-default => $library_selected,
+	);
+	# make labels without the $lib prefix -- reduces the width of the popup menu
+	if (length($lib)) {
+		my %labels = map { my($l)=$_=~/^$lib\/(.*)$/;$_=>$l } @$list_of_prob_dirs;
+		push @popup_menu_args, -labels => \%labels;
+	}
+	print CGI::Tr({}, CGI::td({-class=>"InfoPanel", -align=>"left"}, "$name Problems: ",
+		              CGI::popup_menu(@popup_menu_args),
+		              CGI::br(), 
+		              $view_problem_line,
+	));
+}
+
+#####	 Version 2 is local homework sets
+sub browse_mysets_panel {
+	my $self = shift;
+	my $library_selected = shift;
+	my $list_of_local_sets = shift;
+	my $default_value = "Select a Homework Set";
+
+	if(scalar(@$list_of_local_sets) == 0) {
+		$list_of_local_sets = [NO_LOCAL_SET_STRING];
+	} elsif (not $library_selected or $library_selected eq $default_value) { 
+		unshift @{$list_of_local_sets},	 $default_value; 
+		$library_selected = $default_value; 
+	} 
+
+	my $view_problem_line = view_problems_line('view_mysets_set', 'View Problems', $self->r);
+	print CGI::Tr({},
+		CGI::td({-class=>"InfoPanel", -align=>"left"}, "Browse from: ",
+		CGI::popup_menu(-name=> 'library_sets', 
+		                -values=>$list_of_local_sets, 
+		                -default=> $library_selected),
+		CGI::br(), 
+		$view_problem_line
+	));
+}
+
+#####	 Version 3 is the problem library
+# 
+# This comes in 3 forms, problem library version 1, and for version 2 there
+# is the basic, and the advanced interfaces.  This function checks what we are
+# supposed to do, or aborts if the problem library has not been installed.
+
+sub browse_library_panel {
+	my $self=shift;
+	my $r = $self->r;
+	my $ce = $r->ce;
+
+	# See if the problem library is installed
+	my $libraryRoot = $r->{ce}->{problemLibrary}->{root};
+
+	unless($libraryRoot) {
+		print CGI::Tr(CGI::td(CGI::div({class=>'ResultsWithError', align=>"center"}, 
+			"The problem library has not been installed.")));
+		return;
+	}
+	# Test if the Library directory link exists.  If not, try to make it
+	unless(-d "$ce->{courseDirs}->{templates}/Library") {
+		unless(symlink($libraryRoot, "$ce->{courseDirs}->{templates}/Library")) {
+			my $msg =	 <<"HERE";
+You are missing the directory <code>templates/Library</code>, which is needed
+for the Problem Library to function.	It should be a link pointing to
+<code>$libraryRoot</code>, which you set in <code>conf/global.conf</code>.
+I tried to make the link for you, but that failed.	Check the permissions
+in your <code>templates</code> directory.
+HERE
+			$self->addbadmessage($msg);
+		}
+	}
+
+	# Now check what version we are supposed to use
+	my $libraryVersion = $r->{ce}->{problemLibrary}->{version} || 1;
+	if($libraryVersion == 1) {
+		return $self->browse_library_panel1;
+	} elsif($libraryVersion == 2) {
+		return $self->browse_library_panel2	if($self->{library_basic}==1);
+		return $self->browse_library_panel2adv;
+	} else {
+		print CGI::Tr(CGI::td(CGI::div({class=>'ResultsWithError', align=>"center"}, 
+			"The problem library version is set to an illegal value.")));
+		return;
+	}
+}
+
+sub browse_library_panel1 {
+	my $self = shift;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	
+	my @chaps = WeBWorK::Utils::ListingDB::getAllChapters($r->{ce});
+	unshift @chaps, LIB2_DATA->{dbchapter}{all};
+	my $chapter_selected = $r->param('library_chapters') || LIB2_DATA->{dbchapter}->{all};
+
+	my @sects=();
+	if ($chapter_selected ne LIB2_DATA->{dbchapter}{all}) {
+		@sects = WeBWorK::Utils::ListingDB::getAllSections($r->{ce}, $chapter_selected);
+	}
+
+	unshift @sects, ALL_SECTIONS;
+	my $section_selected =	$r->param('library_sections') || LIB2_DATA->{dbsection}{all};
+
+	my $view_problem_line = view_problems_line('lib_view', 'View Problems', $self->r);
+
+	print CGI::Tr(CGI::td({-class=>"InfoPanel", -align=>"left"}, 
+		CGI::start_table(),
+			CGI::Tr({},
+				CGI::td(["Chapter:",
+					CGI::popup_menu(-name=> 'library_chapters', 
+					                -values=>\@chaps,
+					                -default=> $chapter_selected,
+					                -onchange=>"submit();return true"
+					),
+					CGI::submit(-name=>"lib_select_chapter", -value=>"Update Section List")])),
+			CGI::Tr({},
+				CGI::td("Section:"),
+				CGI::td({-colspan=>2},
+					CGI::popup_menu(-name=> 'library_sections', 
+					                -values=>\@sects,
+					                -default=> $section_selected
+			))),
+
+			CGI::Tr(CGI::td({-colspan=>3}, $view_problem_line)),
+			CGI::end_table(),
+		));
+}
+
+sub browse_library_panel2 {
+	my $self = shift;
+	my $r = $self->r;
+	my $ce = $r->ce;
+
+	my @subjs = WeBWorK::Utils::ListingDB::getAllDBsubjects($r);
+	unshift @subjs, LIB2_DATA->{dbsubject}{all};
+
+	my @chaps = WeBWorK::Utils::ListingDB::getAllDBchapters($r);
+	unshift @chaps, LIB2_DATA->{dbchapter}{all};
+
+	my @sects=();
+	@sects = WeBWorK::Utils::ListingDB::getAllDBsections($r);
+	unshift @sects, LIB2_DATA->{dbsection}{all};
+
+	my $subject_selected = $r->param('library_subjects') || LIB2_DATA->{dbsubject}{all};
+	my $chapter_selected = $r->param('library_chapters') || LIB2_DATA->{dbchapter}{all};
+	my $section_selected =	$r->param('library_sections') || LIB2_DATA->{dbsection}{all};
+
+	my $view_problem_line = view_problems_line('lib_view', 'View Problems', $self->r);
+
+	my $count_line = WeBWorK::Utils::ListingDB::countDBListings($r);
+	if($count_line==0) {
+		$count_line = "There are no matching pg files";
+	} else {
+		$count_line = "There are $count_line matching WeBWorK problem files";
+	}
+
+	print CGI::Tr({},
+	    CGI::td({-class=>"InfoPanel", -align=>"left"}, 
+		CGI::hidden(-name=>"library_is_basic", -default=>1,-override=>1),
+		CGI::start_table({-width=>"100%"}),
+		CGI::Tr({},
+			CGI::td(["Subject:",
+				CGI::popup_menu(-name=> 'library_subjects', 
+					            -values=>\@subjs,
+					            -default=> $subject_selected,
+					             -onchange=>"submit();return true"
+				)]),
+			CGI::td({-colspan=>2, -align=>"right"},
+				CGI::submit(-name=>"lib_select_subject", -value=>"Update Chapter/Section Lists"))
+		),
+		CGI::Tr({},
+			CGI::td(["Chapter:",
+				CGI::popup_menu(-name=> 'library_chapters', 
+					            -values=>\@chaps,
+					            -default=> $chapter_selected,
+					             -onchange=>"submit();return true"
+		    )]),
+			CGI::td({-colspan=>2, -align=>"right"},
+					CGI::submit(-name=>"library_advanced", -value=>"Advanced Search"))
+		),
+		CGI::Tr({},
+			CGI::td(["Section:",
+			CGI::popup_menu(-name=> 'library_sections', 
+					        -values=>\@sects,
+					        -default=> $section_selected,
+							-onchange=>"submit();return true"
+		    )]),
+		 ),
+		 CGI::Tr(CGI::td({-colspan=>3}, $view_problem_line)),
+		 CGI::Tr(CGI::td({-colspan=>3, -align=>"center"}, $count_line)),
+		 CGI::end_table(),
+	 ));
+	
+}
+
+sub browse_library_panel2adv {
+	my $self = shift;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my $right_button_style = "width: 18ex";
+
+	my @subjs = WeBWorK::Utils::ListingDB::getAllDBsubjects($r);
+	if(! grep { $_ eq $r->param('library_subjects') } @subjs) {
+		$r->param('library_subjects', '');
+	}
+	unshift @subjs, LIB2_DATA->{dbsubject}{all};
+
+	my @chaps = WeBWorK::Utils::ListingDB::getAllDBchapters($r);
+	if(! grep { $_ eq $r->param('library_chapters') } @chaps) {
+		$r->param('library_chapters', '');
+	}
+	unshift @chaps, LIB2_DATA->{dbchapter}{all};
+
+	my @sects = WeBWorK::Utils::ListingDB::getAllDBsections($r);
+	if(! grep { $_ eq $r->param('library_sections') } @sects) {
+		$r->param('library_sections', '');
+	}
+	unshift @sects, LIB2_DATA->{dbsection}{all};
+
+	my $texts = WeBWorK::Utils::ListingDB::getDBTextbooks($r);
+	my @textarray = map { $_->[0] }  @{$texts};
+	my %textlabels = ();
+	for my $ta (@{$texts}) {
+		$textlabels{$ta->[0]} = $ta->[1]." by ".$ta->[2]." (edition ".$ta->[3].")";
+	}
+	if(! grep { $_ eq $r->param('library_textbook') } @textarray) {
+		$r->param('library_textbook', '');
+	}
+	unshift @textarray, LIB2_DATA->{textbook}{all};
+	my $atb = LIB2_DATA->{textbook}{all}; $textlabels{$atb} = LIB2_DATA->{textbook}{all};
+
+	my $textchap_ref = WeBWorK::Utils::ListingDB::getDBTextbooks($r, 'textchapter');
+	my @textchaps = map { $_->[0] } @{$textchap_ref};
+	if(! grep { $_ eq $r->param('library_textchapter') } @textchaps) {
+		$r->param('library_textchapter', '');
+	}
+	unshift @textchaps, LIB2_DATA->{textchapter}{all};
+
+	my $textsec_ref = WeBWorK::Utils::ListingDB::getDBTextbooks($r, 'textsection');
+	my @textsecs = map { $_->[0] } @{$textsec_ref};
+	if(! grep { $_ eq $r->param('library_textsection') } @textsecs) {
+		$r->param('library_textsection', '');
+	}
+	unshift @textsecs, LIB2_DATA->{textsection}{all};
+
+	my %selected = ();
+	for my $j (qw( dbsection dbchapter dbsubject textbook textchapter textsection )) {
+		$selected{$j} = $r->param(LIB2_DATA->{$j}{name}) || LIB2_DATA->{$j}{all};
+	}
+
+	my $text_popup = CGI::popup_menu(-name => 'library_textbook',
+									 -values =>\@textarray,
+									 -labels => \%textlabels,
+									 -default=>$selected{textbook},
+									 -onchange=>"submit();return true");
+
+	
+	my $library_keywords = $r->param('library_keywords') || '';
+
+	my $view_problem_line = view_problems_line('lib_view', 'View Problems', $self->r);
+
+	my $count_line = WeBWorK::Utils::ListingDB::countDBListings($r);
+	if($count_line==0) {
+		$count_line = "There are no matching pg files";
+	} else {
+		$count_line = "There are $count_line matching WeBWorK problem files";
+	}
+
+	print CGI::Tr({},
+	  CGI::td({-class=>"InfoPanel", -align=>"left"},
+		CGI::hidden(-name=>"library_is_basic", -default=>2,-override=>1),
+		CGI::start_table({-width=>"100%"}),
+		# Html done by hand since it is temporary
+		CGI::Tr(CGI::td({-colspan=>4, -align=>"center"}, 'All Selected Constraints Joined by "And"')),
+		CGI::Tr({},
+			CGI::td(["Subject:",
+				CGI::popup_menu(-name=> 'library_subjects', 
+					            -values=>\@subjs,
+					            -default=> $selected{dbsubject},
+					             -onchange=>"submit();return true"
+				)]),
+			CGI::td({-colspan=>2, -align=>"right"},
+				CGI::submit(-name=>"lib_select_subject", -value=>"Update Menus",
+					-style=> $right_button_style))),
+		CGI::Tr({},
+			CGI::td(["Chapter:",
+				CGI::popup_menu(-name=> 'library_chapters', 
+					            -values=>\@chaps,
+					            -default=> $selected{dbchapter},
+					             -onchange=>"submit();return true"
+		    )]),
+			CGI::td({-colspan=>2, -align=>"right"},
+					CGI::submit(-name=>"library_reset", -value=>"Reset",
+					-style=>$right_button_style))
+		),
+		CGI::Tr({},
+			CGI::td(["Section:",
+			CGI::popup_menu(-name=> 'library_sections', 
+					        -values=>\@sects,
+					        -default=> $selected{dbsection},
+							-onchange=>"submit();return true"
+		    )]),
+			CGI::td({-colspan=>2, -align=>"right"},
+					CGI::submit(-name=>"library_basic", -value=>"Basic Search",
+					-style=>$right_button_style))
+		 ),
+		 CGI::Tr({},
+			CGI::td(["Textbook:", $text_popup]),
+		 ),
+		 CGI::Tr({},
+			CGI::td(["Text chapter:",
+			CGI::popup_menu(-name=> 'library_textchapter', 
+					        -values=>\@textchaps,
+					        -default=> $selected{textchapter},
+							-onchange=>"submit();return true"
+		    )]),
+		 ),
+		 CGI::Tr({},
+			CGI::td(["Text section:",
+			CGI::popup_menu(-name=> 'library_textsection', 
+					        -values=>\@textsecs,
+					        -default=> $selected{textsection},
+							-onchange=>"submit();return true"
+		    )]),
+		 ),
+		 CGI::Tr({},
+		     CGI::td("Keywords:"),CGI::td({-colspan=>2},
+			 CGI::textfield(-name=>"library_keywords",
+							-default=>$library_keywords,
+							-override=>1,
+							-size=>40))),
+		 CGI::Tr(CGI::td({-colspan=>3}, $view_problem_line)),
+		 CGI::Tr(CGI::td({-colspan=>3, -align=>"center"}, $count_line)),
+		 CGI::end_table(),
+	 ));
+	
+}
+
+
+#####	 Version 4 is the set definition file panel
+
+sub browse_setdef_panel {
+	my $self = shift;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my $library_selected = shift;
+	my $default_value = "Select a Set Definition File";
+	# in the following line, the parens after sort are important. if they are
+	# omitted, sort will interpret get_set_defs as the name of the comparison
+	# function, and ($ce->{courseDirs}{templates}) as a single element list to
+	# be sorted. *barf*
+	my @list_of_set_defs = sort(get_set_defs($ce->{courseDirs}{templates}));
+	if(scalar(@list_of_set_defs) == 0) {
+		@list_of_set_defs = (NO_LOCAL_SET_STRING);
+	} elsif (not $library_selected or $library_selected eq $default_value) { 
+		unshift @list_of_set_defs, $default_value; 
+		$library_selected = $default_value; 
+	}
+	my $view_problem_line = view_problems_line('view_setdef_set', 'View Problems', $self->r);
+	my $popupetc = CGI::popup_menu(-name=> 'library_sets',
+                                -values=>\@list_of_set_defs,
+                                -default=> $library_selected).
+		CGI::br().  $view_problem_line;
+	if($list_of_set_defs[0] eq NO_LOCAL_SET_STRING) {
+		$popupetc = "there are no set definition files in this course to look at."
+	}
+	print CGI::Tr(CGI::td({-class=>"InfoPanel", -align=>"left"}, "Browse from: ",
+		$popupetc
+	));
+}
+
+sub make_top_row {
+	my $self = shift;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my %data = @_;
+
+	my $list_of_local_sets = $data{all_db_sets};
+	my $have_local_sets = scalar(@$list_of_local_sets);
+	my $browse_which = $data{browse_which};
+	my $library_selected = $self->{current_library_set};
+	my $set_selected = $r->param('local_sets');
+	my (@dis1, @dis2, @dis3, @dis4) = ();
+	@dis1 =	 (-disabled=>1) if($browse_which eq 'browse_npl_library');	 
+	@dis2 =	 (-disabled=>1) if($browse_which eq 'browse_local');
+	@dis3 =	 (-disabled=>1) if($browse_which eq 'browse_mysets');
+	@dis4 =	 (-disabled=>1) if($browse_which eq 'browse_setdefs');
+
+	##	Make buttons for additional problem libraries
+	my $libs = '';
+	foreach my $lib (sort(keys(%problib))) {
+		$libs .= ' '. CGI::submit(-name=>"browse_$lib", -value=>$problib{$lib},
+																 ($browse_which eq "browse_$lib")? (-disabled=>1): ())
+			if (-d "$ce->{courseDirs}{templates}/$lib");
+	}
+	$libs = CGI::br()."or Problems from".$libs if $libs ne '';
+
+	my $these_widths = "width: 24ex";
+
+	if($have_local_sets ==0) {
+		$list_of_local_sets = [NO_LOCAL_SET_STRING];
+	} elsif (not defined($set_selected) or $set_selected eq ""
+	  or $set_selected eq SELECT_SET_STRING) {
+		unshift @{$list_of_local_sets}, SELECT_SET_STRING;
+		$set_selected = SELECT_SET_STRING;
+	}
+	#my $myjs = 'document.mainform.selfassign.value=confirm("Should I assign the new set to you now?\nUse OK for yes and Cancel for no.");true;';
+
+	print CGI::Tr(CGI::td({-class=>"InfoPanel", -align=>"left"}, "Add problems to ",
+		CGI::b("Target Set: "),
+		CGI::popup_menu(-name=> 'local_sets', 
+						-values=>$list_of_local_sets, 
+						-default=> $set_selected,
+						-override=>1),
+		CGI::submit(-name=>"edit_local", -value=>"Edit Target Set"),
+		CGI::hidden(-name=>"selfassign", -default=>0,-override=>1).
+		CGI::br(), 
+		CGI::br(), 
+		CGI::submit(-name=>"new_local_set", -value=>"Create a New Set in This Course:",
+		-onclick=>"document.mainform.selfassign.value=1"      #       $myjs
+		),
+		"  ",
+		CGI::textfield(-name=>"new_set_name", 
+					   -default=>"Name for new set here",
+					   -override=>1, -size=>30),
+	));
+
+	print CGI::Tr(CGI::td({-bgcolor=>"black"}));
+
+	# Tidy this list up since it is used in two different places
+	if ($list_of_local_sets->[0] eq SELECT_SET_STRING) {
+		shift @{$list_of_local_sets};
+	}
+
+	print CGI::Tr(CGI::td({-class=>"InfoPanel", -align=>"center"},
+		"Browse ",
+		CGI::submit(-name=>"browse_npl_library", -value=>"National Problem Library", -style=>$these_widths, @dis1),
+		CGI::submit(-name=>"browse_local", -value=>"Local Problems", -style=>$these_widths, @dis2),
+		CGI::submit(-name=>"browse_mysets", -value=>"From This Course", -style=>$these_widths, @dis3),
+		CGI::submit(-name=>"browse_setdefs", -value=>"Set Definition Files", -style=>$these_widths, @dis4),
+		$libs,
+	));
+
+	#print CGI::Tr(CGI::td({-bgcolor=>"black"}));
+	print CGI::hr();
+
+	if ($browse_which eq 'browse_local') {
+		$self->browse_local_panel($library_selected);
+	} elsif ($browse_which eq 'browse_mysets') {
+		$self->browse_mysets_panel($library_selected, $list_of_local_sets);
+	} elsif ($browse_which eq 'browse_npl_library') {
+		$self->browse_library_panel();
+	} elsif ($browse_which eq 'browse_setdefs') {
+		$self->browse_setdef_panel($library_selected);
+	} else { ## handle other problem libraries
+		$self->browse_local_panel($library_selected,$browse_which);
+	}
+
+	print CGI::Tr(CGI::td({-bgcolor=>"black"}));
+
+    # For next/previous buttons
+	my ($next_button, $prev_button, $shown_msg) = ("", "", "");
+	my $first_shown = $self->{first_shown};
+	my $last_shown = $self->{last_shown}; 
+	my @pg_files = @{$self->{pg_files}};
+	if ($first_shown > 0) {
+		$prev_button = CGI::submit(-name=>"prev_page", -style=>"width:15ex",
+						 -value=>"Previous page");
+	}
+	if ((1+$last_shown)<scalar(@pg_files)) {
+		$next_button = CGI::submit(-name=>"next_page", -style=>"width:15ex",
+						 -value=>"Next page");
+	}
+
+	print CGI::Tr({},
+	        CGI::td({-class=>"InfoPanel", -align=>"center"},
+		      CGI::start_table({-border=>"0"}),
+		        CGI::Tr({}, CGI::td({ -align=>"center"},
+			       CGI::submit(-name=>"select_all", -style=>$these_widths,
+			            -value=>"Mark All For Adding"),
+			       CGI::submit(-name=>"select_none", -style=>$these_widths,
+			            -value=>"Clear All Marks"),
+		           CGI::submit(-name=>"cleardisplay", 
+		                -style=>$these_widths,
+		                -value=>"Clear Problem Display")
+		     )), 
+		CGI::Tr({}, 
+		 CGI::td({},
+			CGI::submit(-name=>"update", -style=>$these_widths. "; font-weight:bold",
+			            -value=>"Update Set"),
+
+			$prev_button, " ", $next_button,
+
+		    CGI::submit(-name=>"rerandomize", 
+		                -style=>$these_widths,
+		                -value=>"Rerandomize"),
+	)), 
+	CGI::end_table()));
+}
+
+sub make_data_row {
+	my $self = shift;
+	my $r = $self->r;
+	my $sourceFileName = shift;
+	my $pg = shift;
+	my $cnt = shift;
+	my $mark = shift || 0;
+
+	$sourceFileName =~ s|^./||; # clean up top ugliness
+
+	my $urlpath = $self->r->urlpath;
+	my $db = $self->r->db;
+
+	## to set up edit and try links elegantly we want to know if
+	##    any target set is a gateway assignment or not
+	my $localSet = $self->r->param('local_sets');
+	my $setRecord;
+	if ( defined($localSet) && $localSet ne SELECT_SET_STRING &&
+	     $localSet ne NO_LOCAL_SET_STRING ) {
+		$setRecord = $db->getGlobalSet( $localSet );
+	}
+	my $isGatewaySet = ( defined($setRecord) && 
+			     $setRecord->assignment_type =~ /gateway/ );
+
+	my $problem_output = $pg->{flags}->{error_flag} ?
+		CGI::div({class=>"ResultsWithError"}, CGI::em("This problem produced an error"))
+		: CGI::div({class=>"RenderSolo"}, $pg->{body_text});
+	$problem_output .= $pg->{flags}->{comment} if($pg->{flags}->{comment});
+
+
+	#if($self->{r}->param('browse_which') ne 'browse_npl_library') {
+	my $problem_seed = $self->{'problem_seed'} || 1234;
+	my $edit_link = CGI::a({href=>$self->systemLink(
+		 $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor", $r, 
+			  courseID =>$urlpath->arg("courseID"),
+			  setID=>"Undefined_Set",
+			  problemID=>"1"),
+			params=>{sourceFilePath => "$sourceFileName", problemSeed=> $problem_seed}
+		  ), target=>"WW_Editor"}, "Edit it" );
+	
+	my $displayMode = $self->r->param("mydisplayMode");
+	$displayMode = $self->r->ce->{pg}->{options}->{displayMode}
+		if not defined $displayMode or $displayMode eq "None";
+	my $module = ( $isGatewaySet ) ? "GatewayQuiz" : "Problem";
+	my %pathArgs = ( courseID =>$urlpath->arg("courseID"),
+			setID=>"Undefined_Set" );
+	$pathArgs{problemID} = "1" if ( ! $isGatewaySet );
+
+	my $try_link = CGI::a({href=>$self->systemLink(
+		$urlpath->newFromModule("WeBWorK::ContentGenerator::$module", $r, 
+			%pathArgs ),
+			params =>{
+				effectiveUser => scalar($self->r->param('user')),
+				editMode => "SetMaker",
+				problemSeed=> $problem_seed,
+				sourceFilePath => "$sourceFileName",
+				displayMode => $displayMode,
+			}
+		), target=>"WW_View"}, "Try it");
+
+	my %add_box_data = ( -name=>"trial$cnt",-value=>1,-label=>"Add this problem to the target set on the next update");
+	if($mark & SUCCESS) {
+		$add_box_data{ -label } .= " (just added this problem)";
+	} elsif($mark & ADDED) {
+		$add_box_data{ -checked } = 1;
+	}
+
+	my $inSet = ($self->{isInSet}{$sourceFileName})?
+	    CGI::span({-style=>"float:right; text-align: right"},
+	      CGI::i(CGI::b("(This problem is in the target set)"))) : "";
+
+	print CGI::Tr({-align=>"left"}, CGI::td(
+		CGI::div({-style=>"background-color: #DDDDDD; margin: 0px auto"},
+			CGI::span({-style=>"float:left ; text-align: left"},"File name: $sourceFileName "), 
+			CGI::span({-style=>"float:right ; text-align: right"}, $edit_link, " ", $try_link)
+		), CGI::br(),
+		CGI::checkbox(-name=>"hideme$cnt",-value=>1,-label=>"Don't show this problem on the next update",-override=>1),
+		CGI::br(),
+		$inSet,
+		CGI::checkbox((%add_box_data),-override=>1),
+		CGI::hidden(-name=>"filetrial$cnt", -default=>$sourceFileName,-override=>1).
+		CGI::p($problem_output),
+	));
+}
+
+sub clear_default {
+	my $r = shift;
+	my $param = shift;
+	my $default = shift;
+	my $newvalue = $r->param($param) || '';
+	$newvalue = '' if($newvalue eq $default);
+	$r->param($param, $newvalue);
+}
+
+sub pre_header_initialize {
+	my ($self) = @_;
+	my $r = $self->r;
+	## For all cases, lets set some things
+	$self->{error}=0;
+	my $ce = $r->ce;
+	my $db = $r->db;
+	my $maxShown = $r->param('max_shown') || MAX_SHOW_DEFAULT;
+	$maxShown = 10000000 if($maxShown eq 'All'); # let's hope there aren't more
+	my $library_basic = $r->param('library_is_basic') || 1;
+	$self->{problem_seed} = $r->param('problem_seed') || 1234;
+	## Fix some parameters
+	for my $key (keys(%{ LIB2_DATA() })) {
+		clear_default($r, LIB2_DATA->{$key}->{name}, LIB2_DATA->{$key}->{all} );
+	}
+    ##  Grab library sets to display from parameters list.  We will modify this
+    ##  as we go through the if/else tree
+    $self->{current_library_set} =  $r->param('library_sets');
+    
+	##	These directories will have individual buttons
+	%problib = %{$ce->{courseFiles}{problibs}} if $ce->{courseFiles}{problibs};
+
+	my $userName = $r->param('user');
+	my $user = $db->getUser($userName); # checked 
+	die "record for user $userName (real user) does not exist." 
+		unless defined $user;
+	my $authz = $r->authz;
+	unless ($authz->hasPermissions($userName, "modify_problem_sets")) {
+		return(""); # Error message already produced in the body
+	}
+
+	## Now one action we have to deal with here
+	if ($r->param('edit_local')) {
+		my $urlpath = $r->urlpath;
+		my $db = $r->db;
+		my $checkset = $db->getGlobalSet($r->param('local_sets'));
+		if (not defined($checkset)) {
+			$self->{error} = 1;
+			$self->addbadmessage('You need to select a "Target Set" before you can edit it.');
+		} else {
+			my $page = $urlpath->newFromModule('WeBWorK::ContentGenerator::Instructor::ProblemSetDetail',  $r, setID=>$r->param('local_sets'), courseID=>$urlpath->arg("courseID"));
+			my $url = $self->systemLink($page);
+			$self->reply_with_redirect($url);
+		}
+	}
+
+	## Next, lots of set up so that errors can be reported with message()
+
+	############# List of problems we have already printed
+
+	$self->{past_problems} = get_past_problem_files($r);
+	# if we don't end up reusing problems, this will be wiped out
+	# if we do redisplay the same problems, we must adjust this accordingly
+	my @past_marks = map {$_->[1]} @{$self->{past_problems}};
+	my $none_shown = scalar(@{$self->{past_problems}})==0;
+	my @pg_files=();
+	my $use_previous_problems = 1;
+	my $first_shown = $r->param('first_shown') || 0;
+	my $last_shown = $r->param('last_shown'); 
+	if (not defined($last_shown)) {
+		$last_shown = -1; 
+	}
+	my @all_past_list = (); # these are include requested, but not shown
+	my $j = 0;
+	while (defined($r->param("all_past_list$j"))) {
+		push @all_past_list, $r->param("all_past_list$j");
+		$j++;
+	}
+
+	############# Default of which problem selector to display
+
+	my $browse_which = $r->param('browse_which') || 'browse_npl_library';
+
+	
+
+	## check for problem lib buttons
+	my $browse_lib = '';
+	foreach my $lib (keys %problib) {
+		if ($r->param("browse_$lib")) {
+			$browse_lib = "browse_$lib";
+			last;
+		}
+	}
+
+	########### Start the logic through if elsif elsif ...
+    debug("browse_lib", $r->param("$browse_lib"));
+    debug("browse_npl_library", $r->param("browse_npl_library"));
+    debug("browse_mysets", $r->param("browse_mysets"));
+    debug("browse_setdefs", $r->param("browse_setdefs"));
+	##### Asked to browse certain problems
+	if ($browse_lib ne '') {
+		$browse_which = $browse_lib;
+		$self->{current_library_set} = "";
+		$use_previous_problems = 0; @pg_files = (); ## clear old problems
+	} elsif ($r->param('browse_npl_library')) {
+		$browse_which = 'browse_npl_library';
+		$self->{current_library_set} = "";
+		$use_previous_problems = 0; @pg_files = (); ## clear old problems
+	} elsif ($r->param('browse_local')) {
+		$browse_which = 'browse_local';
+		#$self->{current_library_set} = "";
+		$use_previous_problems = 0; @pg_files = (); ## clear old problems
+	} elsif ($r->param('browse_mysets')) {
+		$browse_which = 'browse_mysets';
+		$self->{current_library_set} = "";
+		$use_previous_problems = 0; @pg_files = (); ## clear old problems
+	} elsif ($r->param('browse_setdefs')) {
+		$browse_which = 'browse_setdefs';
+		$self->{current_library_set} = "";
+		$use_previous_problems = 0; @pg_files = (); ## clear old problems
+
+		##### Change the seed value
+
+	} elsif ($r->param('rerandomize')) {
+		$self->{problem_seed}= 1+$self->{problem_seed};
+		#$r->param('problem_seed', $problem_seed);
+		$self->addbadmessage('Changing the problem seed for display, but there are no problems showing.') if $none_shown;
+
+		##### Clear the display
+
+	} elsif ($r->param('cleardisplay')) {
+		@pg_files = ();
+		$use_previous_problems=0;
+		$self->addbadmessage('The display was already cleared.') if $none_shown;
+
+		##### View problems selected from the local list
+
+	} elsif ($r->param('view_local_set')) {
+
+		my $set_to_display = $self->{current_library_set};
+		if (not defined($set_to_display) or $set_to_display eq SELECT_LOCAL_STRING or $set_to_display eq "Found no directories containing problems") {
+			$self->addbadmessage('You need to select a set to view.');
+		} else {
+			$set_to_display = '.' if $set_to_display eq MY_PROBLEMS;
+			$set_to_display = substr($browse_which,7) if $set_to_display eq MAIN_PROBLEMS;
+			@pg_files = list_pg_files($ce->{courseDirs}->{templates},
+				"$set_to_display");
+			$use_previous_problems=0;
+		}
+
+		##### View problems selected from the a set in this course
+
+	} elsif ($r->param('view_mysets_set')) {
+
+		my $set_to_display = $self->{current_library_set};
+		debug("set_to_display is $set_to_display");
+		if (not defined($set_to_display) 
+				or $set_to_display eq "Select a Homework Set"
+				or $set_to_display eq NO_LOCAL_SET_STRING) {
+			$self->addbadmessage("You need to select a set from this course to view.");
+		} else {
+			# DBFIXME don't use ID list, use an iterator
+			my @problemList = $db->listGlobalProblems($set_to_display);
+			my $problem;
+			@pg_files=();
+			for $problem (@problemList) {
+				my $problemRecord = $db->getGlobalProblem($set_to_display, $problem); # checked
+				die "global $problem for set $set_to_display not found." unless
+					$problemRecord;
+				push @pg_files, $problemRecord->source_file;
+
+			}
+			@pg_files = sortByName(undef,@pg_files);
+			$use_previous_problems=0;
+		}
+
+		##### View from the library database
+ 
+	} elsif ($r->param('lib_view')) {
+ 
+		@pg_files=();
+		my @dbsearch = WeBWorK::Utils::ListingDB::getSectionListings($r);
+		my ($result, $tolibpath);
+		for $result (@dbsearch) {
+			$tolibpath = "Library/$result->{path}/$result->{filename}";
+			
+			## Too clunky!!!!
+			push @pg_files, $tolibpath;
+		}
+		$use_previous_problems=0; 
+
+		##### View a set from a set*.def
+
+	} elsif ($r->param('view_setdef_set')) {
+
+		my $set_to_display = $self->{current_library_set};
+		debug("set_to_display is $set_to_display");
+		if (not defined($set_to_display) 
+				or $set_to_display eq "Select a Set Definition File"
+				or $set_to_display eq NO_LOCAL_SET_STRING) {
+			$self->addbadmessage("You need to select a set definition file to view.");
+		} else {
+			@pg_files= $self->read_set_def($set_to_display);
+		}
+		$use_previous_problems=0; 
+
+		##### Edit the current local homework set
+
+	} elsif ($r->param('edit_local')) { ## Jump to set edit page
+
+		; # already handled
+
+
+		##### Make a new local homework set
+
+	} elsif ($r->param('new_local_set')) {
+		if ($r->param('new_set_name') !~ /^[\w .-]*$/) {
+			$self->addbadmessage("The name ".$r->param('new_set_name')." is not a valid set name.  Use only letters, digits, -, _, and .");
+		} else {
+			my $newSetName = $r->param('new_set_name');
+			# if we want to munge the input set name, do it here
+			$newSetName =~ s/\s/_/g;
+			debug("local_sets was ", $r->param('local_sets'));
+			$r->param('local_sets',$newSetName);  ## use of two parameter param
+			debug("new value of local_sets is ", $r->param('local_sets'));
+			my $newSetRecord	 = $db->getGlobalSet($newSetName);
+			if (defined($newSetRecord)) {
+	            $self->addbadmessage("The set name $newSetName is already in use.  
+	            Pick a different name if you would like to start a new set.");
+			} else {			# Do it!
+				# DBFIXME use $db->newGlobalSet
+				$newSetRecord = $db->{set}->{record}->new();
+				$newSetRecord->set_id($newSetName);
+				$newSetRecord->set_header("defaultHeader");
+				$newSetRecord->hardcopy_header("defaultHeader");
+				$newSetRecord->open_date(time()+60*60*24*7); # in one week
+				$newSetRecord->due_date(time()+60*60*24*7*2); # in two weeks
+				$newSetRecord->answer_date(time()+60*60*24*7*3); # in three weeks
+				eval {$db->addGlobalSet($newSetRecord)};
+				if ($@) {
+					$self->addbadmessage("Problem creating set $newSetName<br> $@");
+				} else {
+					$self->addgoodmessage("Set $newSetName has been created.");
+					my $selfassign = $r->param('selfassign') || "";
+					$selfassign = "" if($selfassign =~ /false/i); # deal with javascript false
+					if($selfassign) {
+						$self->assignSetToUser($userName, $newSetRecord);
+						$self->addgoodmessage("Set $newSetName was assigned to $userName.");
+					}
+				}
+			}
+		}
+
+		##### Add selected problems to the current local set
+
+	} elsif ($r->param('update')) {
+		## first handle problems to be added before we hide them
+		my($localSet, @selected);
+
+		@pg_files = grep {($_->[1] & ADDED) != 0 } @{$self->{past_problems}}; 
+		@selected = map {$_->[0]} @pg_files;
+
+		my @action_files = grep {$_->[1] > 0 } @{$self->{past_problems}};
+		# There are now good reasons to do an update without selecting anything.
+		#if(scalar(@action_files) == 0) {
+		#	 $self->addbadmessage('Update requested, but no problems were marked.');
+		#}
+
+		if (scalar(@selected)>0) {	# if some are to be added, they need a place to go
+			$localSet = $r->param('local_sets');
+			if (not defined($localSet) or 
+					$localSet eq SELECT_SET_STRING or 
+		            $localSet eq NO_LOCAL_SET_STRING) {
+				$self->addbadmessage('You are trying to add problems to something, 
+				but you did not select a "Target Set" name as a target.');
+			} else {
+				my $newSetRecord  = $db->getGlobalSet($localSet);
+				if (not defined($newSetRecord)) {
+					$self->addbadmessage("You are trying to add problems to $localSet, 
+					but that set does not seem to exist!  I bet you used your \"Back\" button.");
+				} else {
+					my $addcount = add_selected($self, $db, $localSet);
+					if($addcount > 0) {
+						$self->addgoodmessage("Added $addcount problem".(($addcount>1)?'s':'').
+							" to $localSet.");
+					}
+				}
+			}
+		}
+		## now handle problems to be hidden
+
+		## only keep the ones which are not hidden
+		@pg_files = grep {($_->[1] & HIDDEN) ==0 } @{$self->{past_problems}};
+		@past_marks = map {$_->[1]} @pg_files;
+		@pg_files = map {$_->[0]} @pg_files;
+		@all_past_list = (@all_past_list[0..($first_shown-1)],
+					@pg_files,
+					@all_past_list[($last_shown+1)..(scalar(@all_past_list)-1)]);
+		$last_shown = $first_shown+$maxShown -1; debug("last_shown 3: ", $last_shown);
+		$last_shown = (scalar(@all_past_list)-1) if($last_shown>=scalar(@all_past_list)); debug("last_shown 4: ", $last_shown);
+
+	} elsif ($r->param('next_page')) {
+		$first_shown = $last_shown+1;
+		$last_shown = $first_shown+$maxShown-1; debug("last_shown 5: ", $last_shown);
+		$last_shown = (scalar(@all_past_list)-1) if($last_shown>=scalar(@all_past_list)); debug("last_shown 6: ", $last_shown);
+		@past_marks = ();
+	} elsif ($r->param('prev_page')) {
+		$last_shown = $first_shown-1; 
+		$first_shown = $last_shown - $maxShown+1;
+
+		$first_shown = 0 if($first_shown<0);
+		@past_marks = ();
+
+	} elsif ($r->param('select_all')) {
+		@past_marks = map {1} @past_marks;
+	} elsif ($r->param('library_basic')) {
+		$library_basic = 1;
+		for my $jj (qw(textchapter textsection textbook)) {
+			$r->param('library_'.$jj,'');
+		}
+	} elsif ($r->param('library_advanced')) {
+		$library_basic = 2;
+	} elsif ($r->param('library_reset')) {
+		for my $jj (qw(chapters sections subjects textbook keywords)) {
+			$r->param('library_'.$jj,'');
+		}
+	} elsif ($r->param('select_none')) {
+		@past_marks = ();
+	} else {
+		##### No action requested, probably our first time here
+	}				##### end of the if elsif ...
+
+ 
+	############# List of local sets
+
+	# DBFIXME sorting in database, please!
+	my @all_db_sets = $db->listGlobalSets;
+	@all_db_sets = sortByName(undef, @all_db_sets);
+
+	if ($use_previous_problems) {
+		@pg_files = @all_past_list;
+	} else {
+		$first_shown = 0;
+		$last_shown = scalar(@pg_files)<$maxShown ? scalar(@pg_files) : $maxShown; 
+		$last_shown--;		# to make it an array index
+		@past_marks = ();
+	}
+	############# Now store data in self for retreival by body
+	$self->{first_shown} = $first_shown;
+	$self->{last_shown} = $last_shown;
+	$self->{browse_which} = $browse_which;
+	#$self->{problem_seed} = $problem_seed;
+	$self->{pg_files} = \@pg_files;
+	$self->{past_marks} = \@past_marks;
+	$self->{all_db_sets} = \@all_db_sets;
+	$self->{library_basic} = $library_basic;
+	debug("past_marks is ", join(" ", @{$self->{past_marks}}));
+}
+
+
+sub title {
+	return "Library Browser";
+}
+
+# hide view options panel since it distracts from SetMaker's built-in view options
+sub options {
+	return "";
+}
+
+sub body {
+	my ($self) = @_;
+
+	my $r = $self->r;
+	my $ce = $r->ce;		# course environment
+	my $db = $r->db;		# database
+	my $j;			# garden variety counter
+
+	my $userName = $r->param('user');
+
+	my $user = $db->getUser($userName); # checked
+	die "record for user $userName (real user) does not exist."
+		unless defined $user;
+
+	### Check that this is a professor
+	my $authz = $r->authz;
+	unless ($authz->hasPermissions($userName, "modify_problem_sets")) {
+		print "User $userName returned " . 
+			$authz->hasPermissions($user, "modify_problem_sets") . 
+	" for permission";
+		return(CGI::div({class=>'ResultsWithError'},
+		CGI::em("You are not authorized to access the Instructor tools.")));
+	}
+
+	my $showHints = $r->param('showHints');
+	my $showSolutions = $r->param('showSolutions');
+	
+	##########	Extract information computed in pre_header_initialize
+
+	my $first_shown = $self->{first_shown};
+	my $last_shown = $self->{last_shown}; 
+	my $browse_which = $self->{browse_which};
+	my $problem_seed = $self->{problem_seed}||1234;
+	my @pg_files = @{$self->{pg_files}};
+	my @all_db_sets = @{$self->{all_db_sets}};
+
+	my @pg_html;
+	if ($last_shown >= $first_shown) {
+		@pg_html = renderProblems(
+			r=> $r,
+			user => $user,
+			problem_list => [@pg_files[$first_shown..$last_shown]],
+			displayMode => $r->param('mydisplayMode'),
+			showHints => $showHints,
+			showSolutions => $showSolutions,
+		);
+	}
+
+	my %isInSet;
+	my $setName = $r->param("local_sets");
+	if ($setName) {
+		# DBFIXME where clause, iterator
+		# DBFIXME maybe instead of hashing here, query when checking source files?
+		# DBFIXME definitely don't need to be making full record objects
+		# DBFIXME SELECT source_file FROM whatever_problem WHERE set_id=? GROUP BY source_file ORDER BY NULL;
+		# DBFIXME (and stick result directly into hash)
+		foreach my $problem ($db->listGlobalProblems($setName)) {
+			my $problemRecord = $db->getGlobalProblem($setName, $problem);
+			$isInSet{$problemRecord->source_file} = 1;
+		}
+	}
+	$self->{isInSet} = \%isInSet;
+
+	##########	Top part
+	print CGI::start_form({-method=>"POST", -action=>$r->uri, -name=>'mainform'}),
+		$self->hidden_authen_fields,
+			'<div align="center">',
+	CGI::start_table({-border=>2});
+	$self->make_top_row('all_db_sets'=>\@all_db_sets, 
+				 'browse_which'=> $browse_which);
+	print CGI::hidden(-name=>'browse_which', -value=>$browse_which,-override=>1),
+		CGI::hidden(-name=>'problem_seed', -value=>$problem_seed, -override=>1);
+	for ($j = 0 ; $j < scalar(@pg_files) ; $j++) {
+		print CGI::hidden(-name=>"all_past_list$j", -value=>$pg_files[$j],-override=>1);
+	}
+
+	print CGI::hidden(-name=>'first_shown', -value=>$first_shown,-override=>1);
+	
+	print CGI::hidden(-name=>'last_shown', -value=>$last_shown, -override=>1);
+
+
+	########## Now print problems
+	my $jj;
+	for ($jj=0; $jj<scalar(@pg_html); $jj++) { 
+		$pg_files[$jj] =~ s|^$ce->{courseDirs}->{templates}/?||;
+		$self->make_data_row($pg_files[$jj+$first_shown], $pg_html[$jj], $jj+1, $self->{past_marks}->[$jj]); 
+		#$self->make_data_row($pg_files[$jj+$first_shown], $pg_html[$jj], $jj+1, $self->{past_marks}->[$jj+$first_shown]); #MEG
+	}
+
+	########## Finish things off
+	print CGI::end_table();
+	print '</div>';
+	#	 if($first_shown>0 or (1+$last_shown)<scalar(@pg_files)) {
+	my ($next_button, $prev_button) = ("", "");
+	if ($first_shown > 0) {
+		$prev_button = CGI::submit(-name=>"prev_page", -style=>"width:15ex",
+						 -value=>"Previous page");
+	}
+	if ((1+$last_shown)<scalar(@pg_files)) {
+		$next_button = CGI::submit(-name=>"next_page", -style=>"width:15ex",
+						 -value=>"Next page");
+	}
+	if (scalar(@pg_files)>0) {
+		print CGI::p(($first_shown+1)."-".($last_shown+1)." of ".scalar(@pg_files).
+			" shown.", $prev_button, " ", $next_button,
+			CGI::submit(-name=>"update", -style=>"width:15ex; font-weight:bold",
+					-value=>"Update Set"));
+	}
+	#	 }
+	print CGI::endform(), "\n";
+
+	return "";	
+}
+
+=head1 AUTHOR
+
+Written by John Jones, jj (at) asu.edu.
+
+=cut
+
+1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/SetMaker2.pm b/lib/WeBWorK/ContentGenerator/Instructor/SetMaker2.pm
new file mode 100755
index 0000000000..e3df3a41ee
--- /dev/null
+++ b/lib/WeBWorK/ContentGenerator/Instructor/SetMaker2.pm
@@ -0,0 +1,1928 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright � 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm,v 1.85 2008/07/01 13:18:52 glarose 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.	 See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+
+package WeBWorK::ContentGenerator::Instructor::SetMaker2;
+use base qw(WeBWorK::ContentGenerator::Instructor);
+
+=head1 NAME
+
+WeBWorK::ContentGenerator::Instructor::SetMaker2 - Make homework sets.
+
+=cut
+
+use strict;
+use warnings;
+
+
+#use CGI qw(-nosticky);
+use WeBWorK::CGI;
+use WeBWorK::Debug;
+use WeBWorK::Form;
+use WeBWorK::Utils qw(readDirectory max sortByName);
+use WeBWorK::Utils::Tasks qw(renderProblems);
+use File::Find;
+
+require WeBWorK::Utils::ListingDB;
+
+use constant SHOW_HINTS_DEFAULT => 0;
+use constant SHOW_SOLUTIONS_DEFAULT => 0;
+use constant MAX_SHOW_DEFAULT => 20;
+use constant NO_LOCAL_SET_STRING => 'No sets in this course yet';
+use constant SELECT_SET_STRING => 'Select a Set from this Course';
+use constant SELECT_LOCAL_STRING => 'Select a Problem Collection';
+use constant MY_PROBLEMS => '  My Problems  ';
+use constant MAIN_PROBLEMS => '  Unclassified Problems  ';
+use constant CREATE_SET_BUTTON => 'Create New Set';
+use constant ALL_CHAPTERS => 'All Chapters';
+use constant ALL_SUBJECTS => 'All Subjects';
+use constant ALL_SECTIONS => 'All Sections';
+use constant ALL_TEXTBOOKS => 'All Textbooks';
+
+use constant LIB2_DATA => {
+  'dbchapter' => {name => 'library_chapters', all => 'All Chapters'},
+  'dbsection' =>  {name => 'library_sections', all =>'All Sections' },
+  'dbsubject' =>  {name => 'library_subjects', all => 'All Subjects' },
+  'textbook' =>  {name => 'library_textbook', all =>  'All Textbooks'},
+  'textchapter' => {name => 'library_textchapter', all => 'All Chapters'},
+  'textsection' => {name => 'library_textsection', all => 'All Sections'},
+  'keywords' =>  {name => 'library_keywords', all => '' },
+  };
+
+## Flags for operations on files
+
+use constant ADDED => 1;
+use constant HIDDEN => (1 << 1);
+use constant SUCCESS => (1 << 2);
+use constant DELETED => (1 << 3);
+use constant MOVED => (1 << 4);
+
+##	for additional problib buttons
+my %problib;	## filled in in global.conf
+my %ignoredir = (
+	'.' => 1, '..' => 1, 'Library' => 1, 'CVS' => 1, 'tmpEdit' => 1,
+	'headers' => 1, 'macros' => 1, 'email' => 1, '.svn' => 1,
+);
+
+sub prepare_activity_entry {
+	my $self=shift;
+	my $r = $self->r;
+	my $user = $self->r->param('user') || 'NO_USER';
+	return("In SetMaker2 as user $user");
+}
+
+## This is for searching the disk for directories containing pg files.
+## to make the recursion work, this returns an array where the first 
+## item is the number of pg files in the directory.  The second is a
+## list of directories which contain pg files.
+##
+## If a directory contains only one pg file and the directory name
+## is the same as the file name, then the directory is considered
+## to be part of the parent directory (it is probably in a separate
+## directory only because it has auxiliary files that want to be
+## kept together with the pg file).
+##
+## If a directory has a file named "=library-ignore", it is never
+## included in the directory menu.  If a directory contains a file
+## called "=library-combine-up", then its pg are included with those
+## in the parent directory (and the directory does not appear in the
+## menu).  If it has a file called "=library-no-combine" then it is
+## always listed as a separate directory even if it contains only one
+## pg file.
+
+sub get_library_sets {
+	my $top = shift; my $dir = shift;
+	# ignore directories that give us an error
+	my @lis = eval { readDirectory($dir) };
+	if ($@) {
+		warn $@;
+		return (0);
+	}
+	return (0) if grep /^=library-ignore$/, @lis;
+
+	my @pgfiles = grep { m/\.pg$/ and (not m/(Header|-text)\.pg$/) and -f "$dir/$_"} @lis;
+	my $pgcount = scalar(@pgfiles);
+	my $pgname = $dir; $pgname =~ s!.*/!!; $pgname .= '.pg';
+	my $combineUp = ($pgcount == 1 && $pgname eq $pgfiles[0] && !(grep /^=library-no-combine$/, @lis));
+
+	my @pgdirs;
+	my @dirs = grep {!$ignoredir{$_} and -d "$dir/$_"} @lis;
+	if ($top == 1) {@dirs = grep {!$problib{$_}} @dirs}
+	foreach my $subdir (@dirs) {
+		my @results = get_library_sets(0, "$dir/$subdir");
+		$pgcount += shift @results; push(@pgdirs,@results);
+	}
+
+	return ($pgcount, @pgdirs) if $top || $combineUp || grep /^=library-combine-up$/, @lis;
+	return (0,@pgdirs,$dir);
+}
+
+sub get_library_pgs {
+	my $top = shift; my $base = shift; my $dir = shift;
+	my @lis = readDirectory("$base/$dir");
+	return () if grep /^=library-ignore$/, @lis;
+	return () if !$top && grep /^=library-no-combine$/, @lis;
+
+	my @pgs = grep { m/\.pg$/ and (not m/(Header|-text)\.pg$/) and -f "$base/$dir/$_"} @lis;
+	my $others = scalar(grep { (!m/\.pg$/ || m/(Header|-text)\.pg$/) &&
+	                            !m/(\.(tmp|bak)|~)$/ && -f "$base/$dir/$_" } @lis);
+
+	my @dirs = grep {!$ignoredir{$_} and -d "$base/$dir/$_"} @lis;
+	if ($top == 1) {@dirs = grep {!$problib{$_}} @dirs}
+	foreach my $subdir (@dirs) {push(@pgs, get_library_pgs(0,"$base/$dir",$subdir))}
+
+	return () unless $top || (scalar(@pgs) == 1 && $others) || grep /^=library-combine-up$/, @lis;
+	return (map {"$dir/$_"} @pgs);
+}
+
+sub list_pg_files {
+	my ($templates,$dir) = @_;
+	my $top = ($dir eq '.')? 1 : 2;
+	my @pgs = get_library_pgs($top,$templates,$dir);
+	return sortByName(undef,@pgs);
+}
+
+## Search for set definition files
+
+sub get_set_defs {
+	my $topdir = shift;
+	my @found_set_defs;
+	# get_set_defs_wanted is a closure over @found_set_defs
+	my $get_set_defs_wanted = sub {
+		#my $fn = $_;
+		#my $fdir = $File::Find::dir;
+		#return() if($fn !~ /^set.*\.def$/);
+		##return() if(not -T $fn);
+		#push @found_set_defs, "$fdir/$fn";
+		push @found_set_defs, $_ if m|/set[^/]*\.def$|;
+	};
+	find({ wanted => $get_set_defs_wanted, follow_fast=>1, no_chdir=>1}, $topdir);
+	map { $_ =~ s|^$topdir/?|| } @found_set_defs;
+	return @found_set_defs;
+}
+
+## Try to make reading of set defs more flexible.  Additional strategies
+## for fixing a path can be added here.
+
+sub munge_pg_file_path {
+	my $self = shift;
+	my $pg_path = shift;
+	my $path_to_set_def = shift;
+	my $end_path = $pg_path;
+	# if the path is ok, don't fix it
+	return($pg_path) if(-e $self->r->ce->{courseDirs}{templates}."/$pg_path");
+	# if we have followed a link into a self contained course to get
+	# to the set.def file, we need to insert the start of the path to
+	# the set.def file
+	$end_path = "$path_to_set_def/$pg_path";
+	return($end_path) if(-e $self->r->ce->{courseDirs}{templates}."/$end_path");
+	# if we got this far, this path is bad, but we let it produce
+	# an error so the user knows there is a troublesome path in the
+	# set.def file.
+	return($pg_path);
+}
+
+## Read a set definition file.  This could be abstracted since it happens
+## elsewhere.  Here we don't have to process so much of the file.
+
+sub read_set_def {
+	my $self = shift;
+	my $r = $self->r;
+	my $filePathOrig = shift;
+	my $filePath = $r->ce->{courseDirs}{templates}."/$filePathOrig";
+	$filePathOrig =~ s/set.*\.def$//;
+	$filePathOrig =~ s|/$||;
+	$filePathOrig = "." if ($filePathOrig !~ /\S/);
+	my @pg_files = ();
+	my ($line, $got_to_pgs, $name, @rest) = ("", 0, "");
+	if ( open (SETFILENAME, "$filePath") )    {
+		while($line = <SETFILENAME>) {
+			chomp($line);
+			$line =~ s|(#.*)||; # don't read past comments
+			if($got_to_pgs) {
+				unless ($line =~ /\S/) {next;} # skip blank lines
+				($name,@rest) = split (/\s*,\s*/,$line);
+				$name =~ s/\s*//g;
+				push @pg_files, $name;
+			} else {
+				$got_to_pgs = 1 if ($line =~ /problemList\s*=/);
+			}
+		}
+	} else {
+		$self->addbadmessage("Cannot open $filePath");
+	}
+	# This is where we would potentially munge the pg file paths
+	# One possibility
+	@pg_files = map { $self->munge_pg_file_path($_, $filePathOrig) } @pg_files;
+	return(@pg_files);
+}
+
+## go through past page getting a list of identifiers for the problems
+## and whether or not they are selected, and whether or not they should
+## be hidden
+
+sub get_past_problem_files {
+	my $r = shift;
+	my @found=();
+	my $count =1;
+	while (defined($r->param("filetrial$count"))) {
+		my $val = 0;
+		$val |= ADDED if($r->param("trial$count"));
+		$val |= HIDDEN if($r->param("hideme$count"));
+		$val |= MOVED if($r->param("moved$count"));
+		push @found, [$r->param("filetrial$count"), $val];			
+		$count++;
+	}
+	$count = 1;
+	while (defined($r->param("mysetfiletrial$count"))) {
+	  my $val = 0;
+	  $val |= DELETED if($r->param("deleted$count"));
+	  push @found, [$r->param("mysetfiletrial$count"), $val];
+	  $count++;
+	}
+	return(\@found);
+}
+
+#### For adding new problems
+
+sub add_selected {
+	my $self = shift;
+	my $db = shift;
+	my $setName = shift;
+	my @past_problems = @{$self->{past_problems}};
+	my @selected = @past_problems;
+	my (@path, $file, $selected, $freeProblemID);
+	# DBFIXME count would work just as well
+	$freeProblemID = max($db->listGlobalProblems($setName)) + 1;
+	my $addedcount=0;
+
+	for $selected (@selected) {
+		if($selected->[1] & ADDED || $selected->[1] & MOVED) {
+			$file = $selected->[0];
+			#print "$file";
+			my $problemRecord = $self->addProblemToSet(setName => $setName,
+				sourceFile => $file, problemID => $freeProblemID);
+			$freeProblemID++;
+			$self->assignProblemToAllSetUsers($problemRecord);
+			if(!($selected->[1] & MOVED)){
+			  $selected->[1] |= SUCCESS;
+			}
+			$addedcount++;
+		}
+	}
+	return($addedcount);
+}
+
+sub delete_selected {
+	my $self = shift;
+	my $db = shift;
+	my $setName = shift;
+	my @past_problems = @{$self->{past_problems}};
+	my @selected = @past_problems;
+	my (@path, $file, $selected);
+	# DBFIXME count would work just as well
+	my $deletedcount=0;
+
+	for $selected (@selected) {
+		if($selected->[1] & DELETED || $selected->[1] & MOVED) {
+		  foreach my $problem ($db->listGlobalProblems($setName)) {
+			  my $problemRecord = $db->getGlobalProblem($setName, $problem);
+			  if($problemRecord->source_file eq $selected->[0]){
+			    $db->deleteGlobalProblem($setName, $problemRecord->problem_id);
+			  }
+		  }
+		  if(!($selected->[1] & MOVED)){
+			  $selected->[1] |= SUCCESS;
+			}
+			$deletedcount++;
+		}
+	}
+	return($deletedcount);
+}
+
+##order the problems as they are after user reorder
+sub reorderProblems {
+  my $self = shift;
+	my $db = shift;
+	my $setID = shift;
+	my $r = shift;
+	#my (@problemIDList) = @_;
+	#my ($prob1, $prob2, $prob);
+	my $index = 1;
+	#get all the problems
+	my @problems = ();
+	while (defined($r->param("reorder$index"))) {
+	  #this will work if i can get problems by name
+		my $problemRecord; # checked
+		foreach my $problem ($db->listGlobalProblems($setID)) {
+			my $tempProblem = $db->getGlobalProblem($setID, $problem);
+		  if($tempProblem->source_file eq $r->param("reorder$index")){
+		    $problemRecord = $tempProblem;
+		  }
+		}
+		die "global " .$r->param("reorder$index") ." for set $setID not found." unless $problemRecord;
+		#print "found this problem to be reordered: ".$problemRecord."\n";
+		push @problems, $problemRecord;
+	  $index = $index + 1;
+	}
+	#then change their info
+	my @setUsers = $db->listSetUsers($setID);
+	my $user;
+	$index = 1;
+	foreach my $problem (@problems) {
+	  $problem->problem_id($index);
+	  die "global $problem not found." unless $problem;
+	  #print "problem to be reordered: ".$problem."\n";
+	  $db->putGlobalProblem($problem);
+	  
+	  #need to deal with users?
+	  foreach $user (@setUsers) {
+  		my $prob1 = $db->getUserProblem($user, $setID, $index); #checked
+		  die " problem $index for set $setID and effective user $user not found"	unless $prob1;
+      $prob1->problem_id($index);
+  		$db->putUserProblem($prob1);
+	  }
+	  $index = $index + 1;
+	}
+}
+
+############# List of sets of problems in templates directory
+
+sub get_problem_directories {
+	my $ce = shift;
+	my $lib = shift;
+	my $source = $ce->{courseDirs}{templates};
+	my $main = MY_PROBLEMS; my $isTop = 1;
+	if ($lib) {$source .= "/$lib"; $main = MAIN_PROBLEMS; $isTop = 2}
+	my @all_problem_directories = get_library_sets($isTop, $source);
+	my $includetop = shift @all_problem_directories;
+	my $j;
+	for ($j=0; $j<scalar(@all_problem_directories); $j++) {
+		$all_problem_directories[$j] =~ s|^$ce->{courseDirs}->{templates}/?||;
+	}
+	@all_problem_directories = sortByName(undef, @all_problem_directories);
+	unshift @all_problem_directories, $main if($includetop);
+	return (\@all_problem_directories);
+}
+
+############# Everyone has a view problems line.	Abstract it
+sub view_problems_line {
+	my $internal_name = shift;
+	my $label = shift;
+	my $r = shift; # so we can get parameter values
+	my $self = shift;
+	my $urlpath = $r->urlpath;
+  my $getProblemPath = $self->systemLink($urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::GetLibrarySetProblems", $r, courseID =>$urlpath->arg("courseID")));
+	my $result = "<span><button type='button' onclick='viewProblems(\"$internal_name\" ,\"mainform\", \"".$r->uri."\", \"view_problems_spinner\");'>$label</button><img id='view_problems_spinner' style='display:none;' src='/webwork2_files/images/ajax-loader-small.gif'></img></span>";
+	#$result .= CGI::hidden(-name=>"$internal_name");
+	my %display_modes = %{WeBWorK::PG::DISPLAY_MODES()};
+	my @active_modes = grep { exists $display_modes{$_} }
+		@{$r->ce->{pg}->{displayModes}};
+	push @active_modes, 'None';
+	# We have our own displayMode since its value may be None, which is illegal
+	# in other modules.
+	my $mydisplayMode = $r->param('mydisplayMode') || $r->ce->{pg}->{options}->{displayMode};
+	$result .= '&nbsp;Display&nbsp;Mode:&nbsp;'.CGI::popup_menu(-name=> 'mydisplayMode',
+	                                                            -values=>\@active_modes,
+	                                                            -default=> $mydisplayMode);
+	# Now we give a choice of the number of problems to show
+	my $defaultMax = $r->param('max_shown') || MAX_SHOW_DEFAULT;
+	$result .= '&nbsp;Max. Shown:&nbsp'.
+		CGI::popup_menu(-name=> 'max_shown',
+		                -values=>[5,10,15,20,25,30,50,'All'],
+		                -default=> $defaultMax);
+	# Option of whether to show hints and solutions
+	my $defaultHints = $r->param('showHints') || SHOW_HINTS_DEFAULT;
+	$result .= "&nbsp;".CGI::checkbox(-name=>"showHints",-checked=>$defaultHints,-label=>"Hints");
+	my $defaultSolutions = $r->param('showSolutions') || SHOW_SOLUTIONS_DEFAULT;
+	$result .= "&nbsp;".CGI::checkbox(-name=>"showSolutions",-checked=>$defaultSolutions,-label=>"Solutions");
+	
+	return($result);
+}
+
+
+### The browsing panel has three versions
+#####	 Version 1 is local problems
+sub browse_local_panel {
+	my $self = shift;
+	my $library_selected = shift;
+	my $lib = shift || ''; $lib =~ s/^browse_//;
+	my $name = ($lib eq '')? 'Local' : $problib{$lib};
+    
+	my $list_of_prob_dirs= get_problem_directories($self->r->ce,$lib);
+	if(scalar(@$list_of_prob_dirs) == 0) {
+		$library_selected = "Found no directories containing problems";
+		unshift @{$list_of_prob_dirs}, $library_selected;
+	} else {
+		my $default_value = SELECT_LOCAL_STRING;
+		if (not $library_selected or $library_selected eq $default_value) {
+			unshift @{$list_of_prob_dirs},	$default_value;
+			$library_selected = $default_value;
+		}
+	}
+	debug("library is $lib and sets are $library_selected");
+	my $view_problem_line = view_problems_line('view_local_set', 'View Problems', $self->r, $self);
+	my @popup_menu_args = (
+	  -size => 4,
+		-name => 'library_sets',
+		-values => $list_of_prob_dirs,
+		-default => $library_selected,
+	);
+	# make labels without the $lib prefix -- reduces the width of the popup menu
+	if (length($lib)) {
+		my %labels = map { my($l)=$_=~/^$lib\/(.*)$/;$_=>$l } @$list_of_prob_dirs;
+		push @popup_menu_args, -labels => \%labels;
+	}
+	print CGI::div({-class=>"InfoPanel", -align=>"left"}, "<p style='margin-bottom:0'>$name Problems: </p>",
+		              CGI::popup_menu(@popup_menu_args),
+		              CGI::br(), 
+		              $view_problem_line,
+	);
+}
+
+#####	 Version 2 is local homework sets
+sub browse_mysets_panel {
+	my $self = shift;
+	my $library_selected = shift;
+	my $list_of_local_sets = shift;
+	my $remember_local_set = shift;
+	my $default_value = "Select a Homework Set";
+
+	if(scalar(@$list_of_local_sets) == 0) {
+		$list_of_local_sets = [NO_LOCAL_SET_STRING];
+	} elsif (not $library_selected or $library_selected eq $default_value) { 
+		unshift @{$list_of_local_sets},	 $default_value; 
+		$library_selected = $default_value; 
+	} 
+  
+	my $view_problem_line = view_problems_line('view_mysets_set', 'View Problems', $self->r, $self);
+	
+	my $urlpath = $self->r->urlpath;
+  my $getProblemPath = $self->r->uri;#$self->systemLink($urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::GetTargetSetProblems", $r, courseID =>$urlpath->arg("courseID")));
+	print CGI::div({-class=>"InfoPanel", -align=>"left"},
+	  #CGI::submit(-name=>"update", -style=>"width: 25ex; font-weight:bold;", -value=>"Update Set"),
+	  '<span>',
+		CGI::popup_menu(-id=> 'myset_sets',
+		                -name=> 'myset_sets', 
+		                -size=>6,
+		                -onchange=>"viewSet(\'mainform\', \'$getProblemPath\', \'view_set_spinner\');",
+		                -values=>$list_of_local_sets, 
+		                -default=> $library_selected),
+		"<img id='view_set_spinner' style='display:none;' src='/webwork2_files/images/ajax-loader-small.gif'></img></span>",
+	  "<button type='button' onclick='document.getElementById(\"create_new_set\").style.display = \"block\";'>+</button>",
+		CGI::hidden(-name=> 'local_sets', -value=>$remember_local_set),
+		CGI::br(), 
+		"<span>",
+		#'<button type="button" onclick="viewSet(\'mainform\', \'/webwork2/myTestCourse/instructor/setmaker2/\');">View Set</button>',
+		#CGI::submit(-name=>"view_mysets_set", -value=>"View Set"),
+		"<span id='problem_counter' style='float:right;'>0</span>",
+		"</span>"
+	);
+}
+
+#####	 Version 2.1 is local homework sets
+sub edit_mysets_panel {
+	my $self = shift;
+	my $library_selected = shift;
+	my $list_of_local_sets = shift;
+	my $default_value = "Select a Homework Set";
+
+	if(scalar(@$list_of_local_sets) == 0) {
+		$list_of_local_sets = [NO_LOCAL_SET_STRING];
+	} elsif (not $library_selected or $library_selected eq $default_value) { 
+		unshift @{$list_of_local_sets},	 $default_value; 
+		$library_selected = $default_value; 
+	} 
+
+	my $view_problem_line = view_problems_line('edit_mysets_set', 'View Problems', $self->r, $self);
+	print CGI::Tr({},
+		CGI::td({-class=>"InfoPanel", -align=>"left"}, "<p style='margin-bottom:0;'>Browse from:</p>",
+		CGI::popup_menu(-name=> 'library_sets', 
+		                -size=> 4,
+		                -values=>$list_of_local_sets, 
+		                -default=> $library_selected),
+		CGI::br(), 
+		$view_problem_line
+	));
+}
+
+#####	 Version 3 is the problem library
+# 
+# This comes in 3 forms, problem library version 1, and for version 2 there
+# is the basic, and the advanced interfaces.  This function checks what we are
+# supposed to do, or aborts if the problem library has not been installed.
+
+sub browse_library_panel {
+	my $self=shift;
+	my $r = $self->r;
+	my $ce = $r->ce;
+
+	# See if the problem library is installed
+	my $libraryRoot = $r->{ce}->{problemLibrary}->{root};
+
+	unless($libraryRoot) {
+		print CGI::div({class=>'ResultsWithError', align=>"center"}, 
+			"The problem library has not been installed.");
+		return;
+	}
+	# Test if the Library directory link exists.  If not, try to make it
+	unless(-d "$ce->{courseDirs}->{templates}/Library") {
+		unless(symlink($libraryRoot, "$ce->{courseDirs}->{templates}/Library")) {
+			my $msg =	 <<"HERE";
+You are missing the directory <code>templates/Library</code>, which is needed
+for the Problem Library to function.	It should be a link pointing to
+<code>$libraryRoot</code>, which you set in <code>conf/global.conf</code>.
+I tried to make the link for you, but that failed.	Check the permissions
+in your <code>templates</code> directory.
+HERE
+			$self->addbadmessage($msg);
+		}
+	}
+
+	# Now check what version we are supposed to use
+	my $libraryVersion = $r->{ce}->{problemLibrary}->{version} || 1;
+	if($libraryVersion == 1) {
+		return $self->browse_library_panel1;
+	} elsif($libraryVersion == 2) {
+		return $self->browse_library_panel2	if($self->{library_basic}==1);
+		return $self->browse_library_panel2adv;
+	} else {
+		print CGI::div({class=>'ResultsWithError', align=>"center"}, 
+			"The problem library version is set to an illegal value.");
+		return;
+	}
+}
+
+sub browse_library_panel1 {
+	my $self = shift;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	
+	my @chaps = WeBWorK::Utils::ListingDB::getAllChapters($r->{ce});
+	unshift @chaps, LIB2_DATA->{dbchapter}{all};
+	my $chapter_selected = $r->param('library_chapters') || LIB2_DATA->{dbchapter}->{all};
+
+	my @sects=();
+	if ($chapter_selected ne LIB2_DATA->{dbchapter}{all}) {
+		@sects = WeBWorK::Utils::ListingDB::getAllSections($r->{ce}, $chapter_selected);
+	}
+
+	unshift @sects, ALL_SECTIONS;
+	my $section_selected =	$r->param('library_sections') || LIB2_DATA->{dbsection}{all};
+
+	my $view_problem_line = view_problems_line('lib_view', 'View Problems', $self->r, $self);
+
+	print CGI::div({-class=>"InfoPanel", -align=>"left"},
+				CGI::div(["Chapter:",
+					CGI::popup_menu(-name=> 'library_chapters', 
+					                -size=>4,
+					                -values=>\@chaps,
+					                -default=> $chapter_selected,
+					                -onchange=>"updateLibCategories(\'mainform\', \'".$r->uri."\', \'null\',\'view_problems_spinner\')"
+					),
+					CGI::submit(-name=>"lib_select_chapter", -value=>"Update Section List")]),
+				CGI::div("Section:", 
+					CGI::popup_menu(-name=> 'library_sections', 
+					                -values=>\@sects,
+					                -default=> $section_selected
+			)),
+			CGI::div($view_problem_line)
+		);
+}
+
+sub browse_library_panel2 {
+	my $self = shift;
+	my $r = $self->r;
+	my $ce = $r->ce;
+
+	my @subjs = WeBWorK::Utils::ListingDB::getAllDBsubjects($r);
+	unshift @subjs, LIB2_DATA->{dbsubject}{all};
+
+	my @chaps = WeBWorK::Utils::ListingDB::getAllDBchapters($r);
+	unshift @chaps, LIB2_DATA->{dbchapter}{all};
+
+	my @sects=();
+	@sects = WeBWorK::Utils::ListingDB::getAllDBsections($r);
+	unshift @sects, LIB2_DATA->{dbsection}{all};
+
+	my $subject_selected = $r->param('library_subjects') || LIB2_DATA->{dbsubject}{all};
+	my $chapter_selected = $r->param('library_chapters') || LIB2_DATA->{dbchapter}{all};
+	my $section_selected =	$r->param('library_sections') || LIB2_DATA->{dbsection}{all};
+
+	my $view_problem_line = view_problems_line('lib_view', 'View Problems', $self->r, $self);
+
+	my $count_line = WeBWorK::Utils::ListingDB::countDBListings($r);
+	if($count_line==0) {
+		$count_line = "There are no matching pg files";
+	} else {
+		$count_line = "There are $count_line matching WeBWorK problem files";
+	}
+
+	print CGI::div({-class=>"InfoPanel", -align=>"left"}, 
+		CGI::hidden(-name=>"library_is_basic", -default=>1,-override=>1),
+		CGI::div({-style=>"float:left;"},"<p style='margin-bottom:0'>Subject:</p>",
+				CGI::popup_menu(-name=> 'library_subjects', 
+				              -size=>4,
+					            -values=>\@subjs,
+					            -default=> $subject_selected,
+					             -onchange=>"updateLibCategories(\'mainform\', \'".$r->uri."\', \'null\',\'view_problems_spinner\')"
+		)),
+		CGI::div({-style=>"float:left;"},"<p style='margin-bottom:0'>Chapter:</p>",
+		  CGI::popup_menu(-name=> 'library_chapters', 
+		                  -size=>4,
+					            -values=>\@chaps,
+					            -default=> $chapter_selected,
+					             -onchange=>"updateLibCategories(\'mainform\', \'".$r->uri."\', \'null\',\'view_problems_spinner\')"
+		)),
+	  CGI::div({-style=>"float:left;"},"<p style='margin-bottom:0'>Section:</p>",
+			CGI::popup_menu(-name=> 'library_sections', 
+			            -size=>4,
+					        -values=>\@sects,
+					        -default=> $section_selected,
+							-onchange=>"updateLibCategories(\'mainform\', \'".$r->uri."\', \'null\',\'view_problems_spinner\')"
+		)),
+		'<div colspan=2 align="right">',
+		  '<button type="button" onclick="updateLibCategories(\'mainform\', \''.$r->uri.'\', \'library_advanced\', \'view_problems_spinner\')">Advanced Search</button>',
+		'</div>',
+		'<div colspan=2 align="right">',
+		  '<button type="button" onclick="updateLibCategories(\'mainform\', \''.$r->uri.'\', \'lib_select_subject\', \'view_problems_spinner\')">Update Chapter/Section Lists</button>',
+		'</div>',
+		#CGI::div({-colspan=>2, -align=>"right"},
+		#  CGI::submit(-name=>"library_advanced", -value=>"Advanced Search")),
+		#CGI::div({-colspan=>2, -align=>"right"},
+		#  CGI::submit(-name=>"lib_select_subject", -value=>"Update Chapter/Section Lists")),
+		'<div style="clear:both;"></div>',
+		CGI::div({-colspan=>3}, $view_problem_line),
+		CGI::div({-colspan=>3, -align=>"center"}, $count_line)
+	 );
+	
+}
+
+sub browse_library_panel2adv {
+	my $self = shift;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my $right_button_style = "width: 18ex";
+
+	my @subjs = WeBWorK::Utils::ListingDB::getAllDBsubjects($r);
+	if(! grep { $_ eq $r->param('library_subjects') } @subjs) {
+		$r->param('library_subjects', '');
+	}
+	unshift @subjs, LIB2_DATA->{dbsubject}{all};
+
+	my @chaps = WeBWorK::Utils::ListingDB::getAllDBchapters($r);
+	if(! grep { $_ eq $r->param('library_chapters') } @chaps) {
+		$r->param('library_chapters', '');
+	}
+	unshift @chaps, LIB2_DATA->{dbchapter}{all};
+
+	my @sects = WeBWorK::Utils::ListingDB::getAllDBsections($r);
+	if(! grep { $_ eq $r->param('library_sections') } @sects) {
+		$r->param('library_sections', '');
+	}
+	unshift @sects, LIB2_DATA->{dbsection}{all};
+
+	my $texts = WeBWorK::Utils::ListingDB::getDBTextbooks($r);
+	my @textarray = map { $_->[0] }  @{$texts};
+	my %textlabels = ();
+	for my $ta (@{$texts}) {
+		$textlabels{$ta->[0]} = $ta->[1]." by ".$ta->[2]." (edition ".$ta->[3].")";
+	}
+	if(! grep { $_ eq $r->param('library_textbook') } @textarray) {
+		$r->param('library_textbook', '');
+	}
+	unshift @textarray, LIB2_DATA->{textbook}{all};
+	my $atb = LIB2_DATA->{textbook}{all}; $textlabels{$atb} = LIB2_DATA->{textbook}{all};
+
+	my $textchap_ref = WeBWorK::Utils::ListingDB::getDBTextbooks($r, 'textchapter');
+	my @textchaps = map { $_->[0] } @{$textchap_ref};
+	if(! grep { $_ eq $r->param('library_textchapter') } @textchaps) {
+		$r->param('library_textchapter', '');
+	}
+	unshift @textchaps, LIB2_DATA->{textchapter}{all};
+
+	my $textsec_ref = WeBWorK::Utils::ListingDB::getDBTextbooks($r, 'textsection');
+	my @textsecs = map { $_->[0] } @{$textsec_ref};
+	if(! grep { $_ eq $r->param('library_textsection') } @textsecs) {
+		$r->param('library_textsection', '');
+	}
+	unshift @textsecs, LIB2_DATA->{textsection}{all};
+
+	my %selected = ();
+	for my $j (qw( dbsection dbchapter dbsubject textbook textchapter textsection )) {
+		$selected{$j} = $r->param(LIB2_DATA->{$j}{name}) || LIB2_DATA->{$j}{all};
+	}
+
+	my $text_popup = CGI::popup_menu(-name => 'library_textbook',
+	                 -size => 4,
+									 -values =>\@textarray,
+									 -labels => \%textlabels,
+									 -default=>$selected{textbook},
+									 -onchange=>"updateLibCategories(\'mainform\', \'".$r->uri."\', \'null\',\'view_problems_spinner\')");
+
+	
+	my $library_keywords = $r->param('library_keywords') || '';
+
+	my $view_problem_line = view_problems_line('lib_view', 'View Problems', $self->r, $self);
+
+	my $count_line = WeBWorK::Utils::ListingDB::countDBListings($r);
+	if($count_line==0) {
+		$count_line = "There are no matching pg files";
+	} else {
+		$count_line = "There are $count_line matching WeBWorK problem files";
+	}
+
+	print CGI::div({-class=>"InfoPanel", -align=>"left"},
+		CGI::hidden(-name=>"library_is_basic", -default=>2,-override=>1),
+		# Html done by hand since it is temporary
+		CGI::div({-colspan=>4, -align=>"center"}, 'All Selected Constraints Joined by "And"'),
+			CGI::div(["Subject:",
+				CGI::popup_menu(-name=> 'library_subjects', 
+				              -size => 4,
+					            -values=>\@subjs,
+					            -default=> $selected{dbsubject},
+					             -onchange=>"updateLibCategories(\'mainform\', \'".$r->uri."\',\'view_problems_spinner\')"
+				)]),
+			CGI::div({-colspan=>2, -align=>"right"},
+				'<button type="button" style="'.$right_button_style.'" onclick="updateLibCategories(\'mainform\', \''.$r->uri.'\', \'lib_select_subject\', \'null\',\'view_problems_spinner\')">Update Menus</button>'),
+			CGI::div(["Chapter:",
+				CGI::popup_menu(-name=> 'library_chapters', 
+				              -size => 4,
+					            -values=>\@chaps,
+					            -default=> $selected{dbchapter},
+					             -onchange=>"updateLibCategories(\'mainform\', \'".$r->uri."\',\'view_problems_spinner\')"
+		    )]),
+			CGI::div({-colspan=>2, -align=>"right"},
+					'<button type="button" style="'.$right_button_style.'" onclick="updateLibCategories(\'mainform\', \''.$r->uri.'\', \'library_reset\', \'null\',\'view_problems_spinner\')">Reset</button>'),
+			CGI::div(["Section:",
+			CGI::popup_menu(-name=> 'library_sections', 
+			            -size => 4,
+					        -values=>\@sects,
+					        -default=> $selected{dbsection},
+							-onchange=>"updateLibCategories(\'mainform\', \'".$r->uri."\',\'null\',\'view_problems_spinner\')"
+		    )]),
+			CGI::div({-colspan=>2, -align=>"right"},
+					'<button type="button" style="'.$right_button_style.'" onclick="updateLibCategories(\'mainform\', \''.$r->uri.'\', \'library_basic\', \'null\',\'view_problems_spinner\')">Basic Search</button>'),
+			CGI::div(["Textbook:", $text_popup]),
+			CGI::div(["Text chapter:",
+			CGI::popup_menu(-name=> 'library_textchapter', 
+			            -size => 4,
+					        -values=>\@textchaps,
+					        -default=> $selected{textchapter},
+							-onchange=>"updateLibCategories(\'mainform\', \'".$r->uri."\',\'null\',\'view_problems_spinner\')"
+		    )]),
+			CGI::div(["Text section:",
+			CGI::popup_menu(-name=> 'library_textsection', 
+			            -size => 4,
+					        -values=>\@textsecs,
+					        -default=> $selected{textsection},
+							-onchange=>"updateLibCategories(\'mainform\', \'".$r->uri."\',\'null\',\'view_problems_spinner\')"
+		    )]),
+		     CGI::div("Keywords:"),CGI::div({-colspan=>2},
+			 CGI::textfield(-name=>"library_keywords",
+							-default=>$library_keywords,
+							-override=>1,
+							-size=>40)),
+      CGI::div({-colspan=>3}, $view_problem_line),
+      CGI::div({-colspan=>3, -align=>"center"}, $count_line)
+	 );
+	
+}
+
+
+#####	 Version 4 is the set definition file panel
+
+sub browse_setdef_panel {
+	my $self = shift;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my $library_selected = shift;
+	my $default_value = "Select a Set Definition File";
+	# in the following line, the parens after sort are important. if they are
+	# omitted, sort will interpret get_set_defs as the name of the comparison
+	# function, and ($ce->{courseDirs}{templates}) as a single element list to
+	# be sorted. *barf*
+	my @list_of_set_defs = sort(get_set_defs($ce->{courseDirs}{templates}));
+	if(scalar(@list_of_set_defs) == 0) {
+		@list_of_set_defs = (NO_LOCAL_SET_STRING);
+	} elsif (not $library_selected or $library_selected eq $default_value) { 
+		unshift @list_of_set_defs, $default_value; 
+		$library_selected = $default_value; 
+	}
+	my $view_problem_line = view_problems_line('view_setdef_set', 'View Problems', $self->r, $self);
+	my $popupetc = CGI::popup_menu(-size=> 4,
+	                              -name=> 'library_sets',
+                                -values=>\@list_of_set_defs,
+                                -default=> $library_selected).
+		CGI::br().  $view_problem_line;
+	if($list_of_set_defs[0] eq NO_LOCAL_SET_STRING) {
+		$popupetc = "there are no set definition files in this course to look at."
+	}
+	print CGI::div({-class=>"InfoPanel", -align=>"left"}, "<p style='margin-bottom:0;'>Browse from:</p>",
+		$popupetc
+	);
+}
+
+sub make_mysets_row {
+  my $self = shift;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my %data = @_;
+
+	my $list_of_local_sets = $data{all_db_sets};
+	my $have_local_sets = scalar(@$list_of_local_sets);
+	my $browse_which = 'browse_mysets';
+	my $library_selected = $self->{current_myset_set};
+	my $set_selected = $r->param('myset_sets');
+	my $remember_local_set = $r->param('local_sets');
+
+	##	Make buttons for additional problem libraries
+	#my $libs = '';
+	#foreach my $lib (sort(keys(%problib))) {
+	#	$libs .= ' '. CGI::submit(-name=>"browse_$lib", -value=>$problib{$lib},
+	#															 ($browse_which eq "browse_$lib")? (-disabled=>1): ())
+	#		if (-d "$ce->{courseDirs}{templates}/$lib");
+	#}
+	#$libs = CGI::br()."or Problems from".$libs if $libs ne '';
+
+	my $these_widths = "width: 25ex";
+
+
+	#if($have_local_sets ==0) {
+	#	$list_of_local_sets = [NO_LOCAL_SET_STRING];
+	#} elsif (not defined($set_selected) or $set_selected eq ""
+	#  or $set_selected eq SELECT_SET_STRING) {
+	#	unshift @{$list_of_local_sets}, SELECT_SET_STRING;
+	#	$set_selected = SELECT_SET_STRING;
+	#}
+	my $myjs = 'document.getElementById(\"create_new_set\").style.display = \"none\";document.mainform.selfassign.value=confirm("Should I assign the new set to you now?\nUse OK for yes and Cancel for no.");true;';
+	## edited this, as a demo for the current set problem list
+	print CGI::div({-id=>"create_new_set", -class=>"InfoPanel shadowed"},
+	    CGI::hidden(-name=>"selfassign", -default=>0,-override=>1).
+		CGI::submit(-name=>"new_local_set", -value=>"Create a New Set in This Course:",
+		-onclick=>"document.mainform.selfassign.value=1"   #just assign it!!   # $myjs
+		),
+		"  ",
+		CGI::textfield(-name=>"new_set_name", 
+					   -default=>"Name for new set here",
+					   -override=>1, -size=>30),
+	  '<button type="button" onclick="document.getElementById(\'create_new_set\').style.display = \'none\';">Cancel</button>',
+	);
+	# Tidy this list up since it is used in two different places
+	#if ($list_of_local_sets->[0] eq SELECT_SET_STRING) {
+	#	shift @{$list_of_local_sets};
+	#}
+
+	#print CGI::div(CGI::div({-bgcolor=>"black"}));
+	#print CGI::hr();
+
+	#$self->browse_mysets_panel($library_selected, $list_of_local_sets, $remember_local_set);
+}
+
+sub make_top_row {
+	my $self = shift;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my %data = @_;
+
+	my $list_of_local_sets = $data{all_db_sets};
+	my $have_local_sets = scalar(@$list_of_local_sets);
+	my $browse_which = $data{browse_which};
+	my $library_selected = $self->{current_library_set};
+	my $set_selected = $r->param('local_sets');
+	my (@dis1, @dis2, @dis3, @dis4) = ();
+	@dis1 =	 (-disabled=>1) if($browse_which eq 'browse_npl_library');	 
+	@dis2 =	 (-disabled=>1) if($browse_which eq 'browse_local');
+	@dis3 =	 (-disabled=>1) if($browse_which eq 'edit_mysets');
+	@dis4 =	 (-disabled=>1) if($browse_which eq 'browse_setdefs');
+
+	##	Make buttons for additional problem libraries
+	#my $libs = '';
+	#foreach my $lib (sort(keys(%problib))) {
+	#	$libs .= ' '. CGI::submit(-name=>"browse_$lib", -value=>$problib{$lib},
+	#															 ($browse_which eq "browse_$lib")? (-disabled=>1): ())
+	#		if (-d "$ce->{courseDirs}{templates}/$lib");
+	#}
+	#$libs = CGI::br()."or Problems from".$libs if $libs ne '';
+
+	my $these_widths = "width: 25ex";
+
+	if($have_local_sets ==0) {
+		$list_of_local_sets = [NO_LOCAL_SET_STRING];
+	} elsif (not defined($set_selected) or $set_selected eq ""
+	  or $set_selected eq SELECT_SET_STRING) {
+		unshift @{$list_of_local_sets}, SELECT_SET_STRING;
+		$set_selected = SELECT_SET_STRING;
+	}
+
+	# Tidy this list up since it is used in two different places
+	if ($list_of_local_sets->[0] eq SELECT_SET_STRING) {
+		shift @{$list_of_local_sets};
+	}
+
+	#print CGI::div({-class=>"InfoPanel"},
+	#	"Browse ",
+	#	CGI::submit(-name=>"browse_npl_library", -value=>"National Problem Library", -style=>$these_widths, @dis1),
+	#	CGI::submit(-name=>"browse_local", -value=>"Local Problems", -style=>$these_widths, @dis2),
+	#	CGI::submit(-name=>"edit_mysets", -value=>"From This Course", -style=>$these_widths, @dis3),
+	#	CGI::submit(-name=>"browse_setdefs", -value=>"Set Definition Files", -style=>$these_widths, @dis4),
+	#	$libs,
+	#);
+  
+	#if ($browse_which eq 'browse_local') {
+	#	$self->browse_local_panel($library_selected);
+	#} elsif ($browse_which eq 'edit_mysets') {
+	#	$self->edit_mysets_panel($library_selected, $list_of_local_sets);
+	#} elsif ($browse_which eq 'browse_npl_library') {
+	#	$self->browse_library_panel();
+	#} elsif ($browse_which eq 'browse_setdefs') {
+	#	$self->browse_setdef_panel($library_selected);
+	#} else { ## handle other problem libraries
+	#	$self->browse_local_panel($library_selected,$browse_which);
+	#}
+	
+	#, 
+		#CGI::div({},
+		#    CGI::submit(-name=>"rerandomize", 
+		#                -style=>$these_widths,
+		#                -value=>"Rerandomize"),
+		#    CGI::submit(-name=>"cleardisplay", 
+		#            -style=>$these_widths,
+		#            -value=>"Clear Problem Display"),
+	  #);
+	  
+	print "<div class='inforPanel' style='float:left;'>
+	<p style='margin-bottom:0'>Browse:</p>
+	<select id='library_selector' size=4 onchange='changeLibrary(\"mainform\", \"".$r->uri."\", this, \"view_problems_spinner\")'>"
+	;
+	print "<option value=\'browse_npl_library\'>National Problem Library</option>
+			<option value=\'browse_local\'>Local Problems</option>
+			<option value=\'edit_mysets\'>From this Course</option>
+			<option value=\'browse_setdefs\'>Set Definition Files</option>"
+	;
+	foreach my $lib (sort(keys(%problib))) {
+	  print "<option value=\'browse_$lib\'>".$problib{$lib}."</option>"
+	}
+	
+	print "</select>
+	  </div>"
+	;
+	  
+}
+
+sub make_data_row {
+	my $self = shift;
+	my $r = $self->r;
+	my $sourceFileName = shift;
+	my $pg = shift;
+	my $cnt = shift;
+	my $mark = shift || 0;
+
+	$sourceFileName =~ s|^./||; # clean up top ugliness
+
+	my $urlpath = $self->r->urlpath;
+	my $db = $self->r->db;
+
+	## to set up edit and try links elegantly we want to know if
+	##    any target set is a gateway assignment or not
+	my $localSet = $self->r->param('local_sets');
+	my $setRecord;
+	if ( defined($localSet) && $localSet ne SELECT_SET_STRING &&
+	     $localSet ne NO_LOCAL_SET_STRING ) {
+		$setRecord = $db->getGlobalSet( $localSet );
+	}
+	my $isGatewaySet = ( defined($setRecord) && 
+			     $setRecord->assignment_type =~ /gateway/ );
+
+	my $problem_output = $pg->{flags}->{error_flag} ?
+		CGI::div({class=>"ResultsWithError"}, CGI::em("This problem produced an error"))
+		: CGI::div({class=>"RenderSolo"}, $pg->{body_text});
+	$problem_output .= $pg->{flags}->{comment} if($pg->{flags}->{comment});
+
+
+	#if($self->{r}->param('browse_which') ne 'browse_npl_library') {
+	my $problem_seed = $self->{'problem_seed'} || 1234;
+	my $edit_link = CGI::a({href=>$self->systemLink(
+		 $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor", $r,
+			  courseID =>$urlpath->arg("courseID"),
+			  setID=>"Undefined_Set",
+			  problemID=>"1"),
+			params=>{sourceFilePath => "$sourceFileName", problemSeed=> $problem_seed}
+		  ), target=>"WW_Editor"}, "Edit it" );
+	
+	my $displayMode = $self->r->param("mydisplayMode");
+	$displayMode = $self->r->ce->{pg}->{options}->{displayMode}
+		if not defined $displayMode or $displayMode eq "None";
+	my $module = ( $isGatewaySet ) ? "GatewayQuiz" : "Problem";
+	my %pathArgs = ( courseID =>$urlpath->arg("courseID"),
+			setID=>"Undefined_Set" );
+	$pathArgs{problemID} = "1" if ( ! $isGatewaySet );
+
+	my $try_link = CGI::a({href=>$self->systemLink(
+		$urlpath->newFromModule("WeBWorK::ContentGenerator::$module", $r,
+			%pathArgs ),
+			params =>{
+				effectiveUser => scalar($self->r->param('user')),
+				editMode => "SetMaker",
+				problemSeed=> $problem_seed,
+				sourceFilePath => "$sourceFileName",
+				displayMode => $displayMode,
+			}
+		), target=>"WW_View"}, "Try it");
+
+	my %add_box_data = ( -id=>"trial$cnt", -class=>"add_problem_checkbox" ,-name=>"trial$cnt",-value=>1,-label=>"Add this problem to the target set on the next update");
+	#allow for a move command from one problem set to anoter
+	my $move_box_data;
+	if($self->r->param('edit_mysets_set')){
+	  $move_box_data = CGI::checkbox( -id=>"moved$cnt" ,-name=>"moved$cnt",-value=>1,,-override=>1,-label=>"Move this problem from this set to the target set on the next update");
+	}
+	else{
+	  $move_box_data = "";
+	}
+	if($mark & SUCCESS) {
+		$add_box_data{ -label } .= " (just added this problem)";
+	} elsif($mark & ADDED) {
+		$add_box_data{ -checked } = 1;
+	}
+
+	if(!($self->{isInSet}{$sourceFileName})){
+
+  	print CGI::div({-class=>"problem libraryProblem", -align=>"left", -draggable=>"true", -href=>"#", -id=>"$cnt"},
+  		CGI::p(CGI::span({style=> 'float:left'},"File name: $sourceFileName "), 
+  		       CGI::span({style=>'float:right'}, $edit_link, "&nbsp;&nbsp;", $try_link,"&nbsp;")
+  		),CGI::br(),
+  		CGI::checkbox(-id=>"hideme$cnt", -name=>"hideme$cnt",-value=>1,-label=>"Don't show this problem on the next update",-override=>1),
+  		CGI::br(),CGI::checkbox((%add_box_data),-override=>1),
+  		CGI::p($move_box_data),
+  		CGI::hidden(-id=>"filetrial$cnt", -name=>"filetrial$cnt", -default=>$sourceFileName,-override=>1).
+  		CGI::p($problem_output)
+	  );
+	}
+	else{
+	  print CGI::div({-class=>"problem libraryProblem used", -align=>"left", -draggable=>"true", -href=>"#", -id=>"$cnt"},
+  		CGI::p({},"File name: $sourceFileName "), 
+  		CGI::p({}, $edit_link, " ", $try_link),
+  		CGI::p(CGI::checkbox(-id=>"hideme$cnt", -name=>"hideme$cnt",-value=>1,-label=>"Don't show this problem on the next update",-override=>1)),
+  		CGI::p(CGI::checkbox((%add_box_data),-override=>1)),
+  		CGI::p($move_box_data),
+  		CGI::hidden(-id=>"filetrial$cnt", -name=>"filetrial$cnt", -default=>$sourceFileName,-override=>1).
+  		CGI::p($problem_output),
+  		CGI::b("(This problem is in the target set)")
+	  );
+	}
+}
+
+sub make_myset_data_row {
+	my $self = shift;
+	my $r = $self->r;
+	my $sourceFileName = shift;
+	my $pg = shift;
+	my $cnt = shift;
+	my $mark = shift || 0;
+
+	$sourceFileName =~ s|^./||; # clean up top ugliness
+
+	my $urlpath = $self->r->urlpath;
+	my $db = $self->r->db;
+
+	## to set up edit and try links elegantly we want to know if
+	##    any target set is a gateway assignment or not
+	my $localSet = $self->r->param('local_sets');
+	my $setRecord;
+	if ( defined($localSet) && $localSet ne SELECT_SET_STRING &&
+	     $localSet ne NO_LOCAL_SET_STRING ) {
+		$setRecord = $db->getGlobalSet( $localSet );
+	}
+	my $isGatewaySet = ( defined($setRecord) && 
+			     $setRecord->assignment_type =~ /gateway/ );
+
+	my $problem_output = $pg->{flags}->{error_flag} ?
+		CGI::div({class=>"ResultsWithError"}, CGI::em("This problem produced an error"))
+		: CGI::div({class=>"RenderSolo"}, $pg->{body_text});
+	$problem_output .= $pg->{flags}->{comment} if($pg->{flags}->{comment});
+
+
+	#if($self->{r}->param('browse_which') ne 'browse_npl_library') {
+	my $problem_seed = $self->{'problem_seed'} || 1234;
+	my $edit_link = CGI::a({href=>$self->systemLink(
+		 $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor", $r,
+			  courseID =>$urlpath->arg("courseID"),
+			  setID=>"Undefined_Set",
+			  problemID=>"1"),
+			params=>{sourceFilePath => "$sourceFileName", problemSeed=> $problem_seed}
+		  ), target=>"WW_Editor"}, "Edit it" );
+	
+	my %delete_box_data = ( -id=>"deleted$cnt".'myset' ,-name=>"deleted$cnt",-value=>1,-label=>"Delete this problem from the target set on the next update");
+	
+	my $displayMode = $self->r->param("mydisplayMode");
+	$displayMode = $self->r->ce->{pg}->{options}->{displayMode}
+		if not defined $displayMode or $displayMode eq "None";
+	my $module = ( $isGatewaySet ) ? "GatewayQuiz" : "Problem";
+	my %pathArgs = ( courseID =>$urlpath->arg("courseID"),
+			setID=>"Undefined_Set" );
+	$pathArgs{problemID} = "1" if ( ! $isGatewaySet );
+
+	my $try_link = CGI::a({href=>$self->systemLink(
+		$urlpath->newFromModule("WeBWorK::ContentGenerator::$module", $r,
+			%pathArgs ),
+			params =>{
+				effectiveUser => scalar($self->r->param('user')),
+				editMode => "SetMaker",
+				problemSeed=> $problem_seed,
+				sourceFilePath => "$sourceFileName",
+				displayMode => $displayMode,
+			}
+		), target=>"WW_View"}, "Try it");
+
+	print CGI::div({-class=>"problem myProblem", -draggable=>"true", -href=>"#", -id=>("$cnt".'myset')},
+		CGI::p({},"File name: $sourceFileName "), 
+  	CGI::p({}, $edit_link, " ", $try_link),
+		CGI::p(CGI::checkbox((%delete_box_data),-override=>1)),
+		CGI::hidden(-id=>"filetrial$cnt".'myset', -name=>"mysetfiletrial$cnt", -default=>$sourceFileName,-override=>1),
+		CGI::p($problem_output),
+	);
+}
+
+sub clear_default {
+	my $r = shift;
+	my $param = shift;
+	my $default = shift;
+	my $newvalue = $r->param($param) || '';
+	$newvalue = '' if($newvalue eq $default);
+	$r->param($param, $newvalue);
+}
+
+sub pre_header_initialize {
+	my ($self) = @_;
+	my $r = $self->r;
+	## For all cases, lets set some things
+	$self->{error}=0;
+	my $ce = $r->ce;
+	my $db = $r->db;
+	my $maxShown = $r->param('max_shown') || MAX_SHOW_DEFAULT;
+	$maxShown = 10000000 if($maxShown eq 'All'); # let's hope there aren't more
+	my $library_basic = $r->param('library_is_basic') || 1;
+	$self->{problem_seed} = $r->param('problem_seed') || 1234;
+	## Fix some parameters
+	for my $key (keys(%{ LIB2_DATA() })) {
+		clear_default($r, LIB2_DATA->{$key}->{name}, LIB2_DATA->{$key}->{all} );
+	}
+    ##  Grab library sets to display from parameters list.  We will modify this
+    ##  as we go through the if/else tree
+    $self->{current_library_set} =  $r->param('library_sets');
+    $self->{current_myset_set} = $r->param('myset_sets');
+    if (not defined($self->{current_myset_set}) 
+		or $self->{current_myset_set} eq "Select a Homework Set"
+		or $self->{current_myset_set} eq NO_LOCAL_SET_STRING) {
+      my @all_db_sets = $db->listGlobalSets;
+	    @all_db_sets = sortByName(undef, @all_db_sets);
+	    $self->{current_myset_set} = shift(@all_db_sets);
+	  }
+    
+	##	These directories will have individual buttons
+	%problib = %{$ce->{courseFiles}{problibs}} if $ce->{courseFiles}{problibs};
+
+	my $userName = $r->param('user');
+	my $user = $db->getUser($userName); # checked 
+	die "record for user $userName (real user) does not exist." 
+		unless defined $user;
+	my $authz = $r->authz;
+	unless ($authz->hasPermissions($userName, "modify_problem_sets")) {
+		return(""); # Error message already produced in the body
+	}
+
+	## Now one action we have to deal with here
+	if ($r->param('edit_local')) {
+		my $urlpath = $r->urlpath;
+		my $db = $r->db;
+		my $checkset = $db->getGlobalSet($r->param('local_sets'));
+		if (not defined($checkset)) {
+			$self->{error} = 1;
+			$self->addbadmessage('You need to select a "Target Set" before you can edit it.');
+		} else {
+			my $page = $urlpath->newFromModule('WeBWorK::ContentGenerator::Instructor::ProblemSetDetail', $r, setID=>$r->param('local_sets'), courseID=>$urlpath->arg("courseID"));
+			my $url = $self->systemLink($page);
+			$self->reply_with_redirect($url);
+		}
+	}
+
+	## Next, lots of set up so that errors can be reported with message()
+
+	############# List of problems we have already printed
+
+	$self->{past_problems} = get_past_problem_files($r);
+	# if we don't end up reusing problems, this will be wiped out
+	# if we do redisplay the same problems, we must adjust this accordingly
+	my @past_marks = map {$_->[1]} @{$self->{past_problems}};
+	my $none_shown = scalar(@{$self->{past_problems}})==0;
+	my @pg_files=();
+	my @myset_files=();
+	my $use_previous_problems = 1;
+	my $first_shown = $r->param('first_shown') || 0;
+	my $last_shown = $r->param('last_shown'); 
+	if (not defined($last_shown)) {
+		$last_shown = -1; 
+	}
+	my @all_past_list = (); # these are include requested, but not shown
+	my $j = 0;
+	while (defined($r->param("all_past_list$j"))) {
+		push @all_past_list, $r->param("all_past_list$j");
+		$j++;
+	}
+
+	############# Default of which problem selector to display
+
+	my $browse_which = $r->param('browse_which') || 'browse_npl_library';
+	my $gridded = $r->param('gridify') || 'false';
+
+	
+
+	## check for problem lib buttons
+	my $browse_lib = '';
+	foreach my $lib (keys %problib) {
+		if ($r->param("browse_$lib")) {
+			$browse_lib = "browse_$lib";
+			last;
+		}
+	}
+
+
+	########### Start the logic through if elsif elsif ...
+    debug("browse_lib", $r->param("$browse_lib"));
+    debug("browse_npl_library", $r->param("browse_npl_library"));
+    debug("edit_mysets", $r->param("edit_mysets"));
+    debug("browse_setdefs", $r->param("browse_setdefs"));
+	##### Asked to browse certain problems
+	if ($browse_lib ne '') {
+		$browse_which = $browse_lib;
+		$self->{current_library_set} = "";
+		$use_previous_problems = 0; @pg_files = (); ## clear old problems
+	} elsif ($r->param('browse_npl_library')) {
+		$browse_which = 'browse_npl_library';
+		$self->{current_library_set} = "";
+		$use_previous_problems = 0; @pg_files = (); ## clear old problems
+	} elsif ($r->param('browse_local')) {
+		$browse_which = 'browse_local';
+		#$self->{current_library_set} = "";
+		$use_previous_problems = 0; @pg_files = (); ## clear old problems
+	} elsif ($r->param('edit_mysets')) {
+		$browse_which = 'edit_mysets';
+		$self->{current_library_set} = "";
+		$use_previous_problems = 0; @pg_files = (); ## clear old problems
+	} elsif ($r->param('browse_setdefs')) {
+		$browse_which = 'browse_setdefs';
+		$self->{current_library_set} = "";
+		$use_previous_problems = 0; @pg_files = (); ## clear old problems
+
+		##### Change the seed value
+
+	} elsif ($r->param('rerandomize')) {
+		$self->{problem_seed}= 1+$self->{problem_seed};
+		#$r->param('problem_seed', $problem_seed);
+		$self->addbadmessage('Changing the problem seed for display, but there are no problems showing.') if $none_shown;
+
+		##### Clear the display
+
+	} elsif ($r->param('cleardisplay')) {
+		@pg_files = ();
+		$use_previous_problems=0;
+		$self->addbadmessage('The display was already cleared.') if $none_shown;
+
+		##### View problems selected from the local list
+
+	} elsif ($r->param('view_local_set')) {
+
+		my $set_to_display = $self->{current_library_set};
+		if (not defined($set_to_display) or $set_to_display eq SELECT_LOCAL_STRING or $set_to_display eq "Found no directories containing problems") {
+			$self->addbadmessage('You need to select a set to view.');
+		} else {
+			$set_to_display = '.' if $set_to_display eq MY_PROBLEMS;
+			$set_to_display = substr($browse_which,7) if $set_to_display eq MAIN_PROBLEMS;
+			@pg_files = list_pg_files($ce->{courseDirs}->{templates},
+				"$set_to_display");
+			$use_previous_problems=0;
+		}
+
+		##### View problems selected from the a set in this course
+  } elsif ($r->param('edit_mysets_set')){
+  
+    my $set_to_display = $self->{current_library_set};
+		  debug("set_to_display is $set_to_display");
+		  if (not defined($set_to_display) 
+		  		or $set_to_display eq "Select a Homework Set"
+		  		or $set_to_display eq NO_LOCAL_SET_STRING) {
+		  	$self->addbadmessage("You need to select a set from this course to view.");
+		  } else {
+		  	# DBFIXME don't use ID list, use an iterator
+		  	my @problemList = $db->listGlobalProblems($set_to_display);
+		  	my $problem;
+		  	@pg_files=();
+		  	for $problem (@problemList) {
+		  		my $problemRecord = $db->getGlobalProblem($set_to_display, $problem); # checked
+		  		die "global $problem for set $set_to_display not found." unless
+		  			$problemRecord;
+		  		push @pg_files, $problemRecord->source_file;
+  
+		  	}
+		  	@pg_files = sortByName(undef,@pg_files);
+		  	$use_previous_problems=0;
+		  }
+
+		##### View from the library database
+ 
+	} elsif ($r->param('lib_view')) {
+		@pg_files=();
+		my @dbsearch = WeBWorK::Utils::ListingDB::getSectionListings($r);
+		my ($result, $tolibpath);
+		for $result (@dbsearch) {
+			$tolibpath = "Library/$result->{path}/$result->{filename}";
+			
+			## Too clunky!!!!
+			push @pg_files, $tolibpath;
+		}
+		$use_previous_problems=0; 
+
+		##### View a set from a set*.def
+
+	} elsif ($r->param('view_setdef_set')) {
+
+		my $set_to_display = $self->{current_library_set};
+		debug("set_to_display is $set_to_display");
+		if (not defined($set_to_display) 
+				or $set_to_display eq "Select a Set Definition File"
+				or $set_to_display eq NO_LOCAL_SET_STRING) {
+			$self->addbadmessage("You need to select a set definition file to view.");
+		} else {
+			@pg_files= $self->read_set_def($set_to_display);
+		}
+		$use_previous_problems=0; 
+
+		##### Edit the current local homework set
+
+	} elsif ($r->param('edit_local')) { ## Jump to set edit page
+
+		; # already handled
+
+
+		##### Make a new local homework set
+
+	} elsif ($r->param('new_local_set')) {
+		if ($r->param('new_set_name') !~ /^[\w .-]*$/) {
+			$self->addbadmessage("The name ".$r->param('new_set_name')." is not a valid set name.  Use only letters, digits, -, _, and .");
+		} else {
+			my $newSetName = $r->param('new_set_name');
+			# if we want to munge the input set name, do it here
+			$newSetName =~ s/\s/_/g;
+			debug("local_sets was ", $r->param('local_sets'));
+			$r->param('local_sets',$newSetName);  ## use of two parameter param
+			debug("new value of local_sets is ", $r->param('local_sets'));
+			my $newSetRecord	 = $db->getGlobalSet($newSetName);
+			if (defined($newSetRecord)) {
+	            $self->addbadmessage("The set name $newSetName is already in use.  
+	            Pick a different name if you would like to start a new set.");
+			} else {			# Do it!
+				# DBFIXME use $db->newGlobalSet
+				$newSetRecord = $db->{set}->{record}->new();
+				$newSetRecord->set_id($newSetName);
+				$newSetRecord->set_header("defaultHeader");
+				$newSetRecord->hardcopy_header("defaultHeader");
+				$newSetRecord->open_date(time()+60*60*24*7); # in one week
+				$newSetRecord->due_date(time()+60*60*24*7*2); # in two weeks
+				$newSetRecord->answer_date(time()+60*60*24*7*3); # in three weeks
+				eval {$db->addGlobalSet($newSetRecord)};
+				if ($@) {
+					$self->addbadmessage("Problem creating set $newSetName<br> $@");
+				} else {
+					$self->addgoodmessage("Set $newSetName has been created.");
+					my $selfassign = $r->param('selfassign') || "";
+					$selfassign = "" if($selfassign =~ /false/i); # deal with javascript false
+					if($selfassign) {
+						$self->assignSetToUser($userName, $newSetRecord);
+						$self->addgoodmessage("Set $newSetName was assigned to $userName.");
+					}
+				}
+			}
+		}
+
+		##### Add selected problems to the current local set
+
+	} elsif ($r->param('update')) {
+	  
+		## first handle problems to be added before we hide them
+		my($localSet, @selected);
+
+		my @add_pg_files = grep {(($_->[1] & ADDED)) != 0 } @{$self->{past_problems}}; 
+		my @add_selected = map {$_->[0]} @add_pg_files;
+		
+		my @delete_pg_files = grep {(($_->[1] & DELETED)) != 0} @{$self->{past_problems}};
+		my @delete_selected = map {$_->[0]} @delete_pg_files;
+		
+		my @move_pg_files = grep {(($_->[1] & MOVED)) != 0} @{$self->{past_problems}};
+		my @move_selected = map {$_->[0]} @move_pg_files;
+
+		my @action_files = grep {$_->[1] > 0 } @{$self->{past_problems}};
+		# There are now good reasons to do an update without selecting anything.
+		#if(scalar(@action_files) == 0) {
+		#	 $self->addbadmessage('Update requested, but no problems were marked.');
+		#}
+		if (scalar(@add_selected)>0) {	# if some are to be added, they need a place to go
+			$localSet = $r->param('myset_sets');
+			if (not defined($localSet) or 
+					$localSet eq SELECT_SET_STRING or 
+		            $localSet eq NO_LOCAL_SET_STRING) {
+				$self->addbadmessage('You are trying to add problems to something, 
+				but you did not select a "Target Set" name as a target.');
+			} else {
+				my $newSetRecord  = $db->getGlobalSet($localSet);
+				if (not defined($newSetRecord)) {
+					$self->addbadmessage("You are trying to add problems to $localSet, 
+					but that set does not seem to exist!  I bet you used your \"Back\" button.");
+				} else {
+					my $addcount = add_selected($self, $db, $localSet);
+					if($addcount > 0) {
+						$self->addgoodmessage("Added $addcount problem".(($addcount>1)?'s':'').
+							" to $localSet.");
+					}
+				}
+			}
+		}
+		if (scalar(@delete_selected)>0) {	# if some are to be added, they need a place to go
+			$localSet = $r->param('myset_sets');
+			if (not defined($localSet) or 
+					$localSet eq SELECT_SET_STRING or 
+		            $localSet eq NO_LOCAL_SET_STRING) {
+				$self->addbadmessage('You are trying to add problems to something, 
+				but you did not select a "Target Set" name as a target.');
+			} else {
+				my $newSetRecord  = $db->getGlobalSet($localSet);
+				if (not defined($newSetRecord)) {
+					$self->addbadmessage("You are trying to delete problems to $localSet, 
+					but that set does not seem to exist!  I bet you used your \"Back\" button.");
+				} else {
+					my $deletecount = delete_selected($self, $db, $localSet);
+					if($deletecount > 0) {
+						$self->addgoodmessage("Deleted $deletecount problem".(($deletecount>1)?'s':'').
+							" to $localSet.");
+					}
+				}
+			}
+		}
+		if (scalar(@move_selected)>0) {	# if some are to be added, they need a place to go
+			$localSet = $r->param('myset_sets');
+			my $otherSet = $self->{current_library_set};
+			if (not defined($localSet) or not defined($otherSet) or
+					$localSet eq SELECT_SET_STRING or 
+		            $localSet eq NO_LOCAL_SET_STRING) {
+				$self->addbadmessage('You are trying to add problems to something, 
+				but you did not select a "Target Set" name as a target.');
+			} else {
+				my $newSetRecord  = $db->getGlobalSet($localSet);
+				my $otherNewSetRecord = $db->getGlobalSet($otherSet);
+				if (not defined($newSetRecord) or not defined($otherNewSetRecord)) {
+					$self->addbadmessage("You are trying to move problems from $otherSet to $localSet, 
+					but that set does not seem to exist!  I bet you used your \"Back\" button.");
+				} else {
+					my $addcount = add_selected($self, $db, $localSet);
+					my $deletecount = delete_selected($self, $db, $otherSet);
+					if($addcount > 0 && $deletecount > 0) {
+						$self->addgoodmessage("Moved $addcount problem".(($addcount>1)?'s':'').
+							" from $otherSet to $localSet.");
+					}
+				}
+			}
+		}
+		## now handle problems to be hidden
+
+		## only keep the ones which are not hidden
+		@pg_files = grep {($_->[1] & HIDDEN) ==0 } @{$self->{past_problems}};
+		@pg_files = grep {(($_->[1] & DELETED)) != 0 } @pg_files;
+		@past_marks = map {$_->[1]} @pg_files;
+		@pg_files = map {$_->[0]} @pg_files;
+		@all_past_list = (@all_past_list[0..($first_shown-1)],
+					@pg_files,
+					@all_past_list[($last_shown+1)..(scalar(@all_past_list)-1)]);
+		$last_shown = $first_shown+$maxShown -1; debug("last_shown 3: ", $last_shown);
+		$last_shown = (scalar(@all_past_list)-1) if($last_shown>=scalar(@all_past_list)); debug("last_shown 4: ", $last_shown);
+		
+		#want to reorder in addition to anything else
+    if ($r->param('isReordered')){
+    #this might work, i'm not sure if this is the right ID
+      reorderProblems($self, $db, $r->param('myset_sets'), $r);
+    }
+
+	} elsif ($r->param('next_page')) {
+		$first_shown = $last_shown+1;
+		$last_shown = $first_shown+$maxShown-1; debug("last_shown 5: ", $last_shown);
+		$last_shown = (scalar(@all_past_list)-1) if($last_shown>=scalar(@all_past_list)); debug("last_shown 6: ", $last_shown);
+		$self->addgoodmessage("It sees the next_page parameter, last shown is: $last_shown and first shown is: $first_shown");
+		@past_marks = ();
+	} elsif ($r->param('prev_page')) {
+		$last_shown = $first_shown-1; 
+		$first_shown = $last_shown - $maxShown+1;
+
+		$first_shown = 0 if($first_shown<0);
+		@past_marks = ();
+
+	} elsif ($r->param('select_all')) {
+		@past_marks = map {1} @past_marks;
+	} elsif ($r->param('library_basic')) {
+		$library_basic = 1;
+		for my $jj (qw(textchapter textsection textbook)) {
+			$r->param('library_'.$jj,'');
+		}
+	} elsif ($r->param('library_advanced')) {
+		$library_basic = 2;
+	} elsif ($r->param('library_reset')) {
+		for my $jj (qw(chapters sections subjects textbook keywords)) {
+			$r->param('library_'.$jj,'');
+		}
+	} elsif ($r->param('select_none')) {
+		@past_marks = ();
+	} else {
+		#nothing
+	}				##### end of the if elsif ...
+
+  #I'm worried this will break something
+  my $default_set = $self->{current_myset_set};
+	  #debug("set_to_display is $default_set");
+	  if (not defined($default_set) 
+  		or $default_set eq "Select a Homework Set"
+  		or $default_set eq NO_LOCAL_SET_STRING) {
+  		$self->addbadmessage("You need to select a set from this course to view.");
+  	} else {
+  		# DBFIXME don't use ID list, use an iterator
+  		my @problemList = $db->listGlobalProblems($default_set);
+  		my $problem;
+  		@myset_files=();
+  		for $problem (@problemList) {
+  			my $problemRecord = $db->getGlobalProblem($default_set, $problem); # checked
+  			die "global $problem for set $default_set not found." unless
+  				$problemRecord;
+  			push @myset_files, $problemRecord->source_file;
+  
+  		}
+  	  #@myset_files = sortByName(undef,@myset_files);
+  	}
+ 
+	############# List of local sets
+
+	# DBFIXME sorting in database, please!
+	my @all_db_sets = $db->listGlobalSets;
+	@all_db_sets = sortByName(undef, @all_db_sets);
+
+	if ($use_previous_problems) {
+		@pg_files = @all_past_list;
+	} else {
+		$first_shown = 0;
+		$last_shown = scalar(@pg_files)<$maxShown ? scalar(@pg_files) : $maxShown; 
+		$last_shown--;		# to make it an array index
+		@past_marks = ();
+	}
+	############# Now store data in self for retreival by body
+	$self->{first_shown} = $first_shown;
+	$self->{last_shown} = $last_shown;
+	$self->{browse_which} = $browse_which;
+	$self->{gridded} = $gridded;
+	#$self->{problem_seed} = $problem_seed;
+	$self->{pg_files} = \@pg_files;
+	$self->{myset_files} = \@myset_files;
+	$self->{past_marks} = \@past_marks;
+	$self->{all_db_sets} = \@all_db_sets;
+	$self->{library_basic} = $library_basic;
+	debug("past_marks is ", join(" ", @{$self->{past_marks}}));
+}
+
+
+sub title {
+	return "Library Browser v2";
+}
+
+# hide view options panel since it distracts from SetMaker's built-in view options
+sub options {
+	return "";
+}
+
+sub head {
+  print '<script src="/webwork2_files/js/dnd.js"></script>';
+  print '<script src="/webwork2_files/js/problem_grid.js"></script>';
+  print '<script src="/webwork2_files/js/form_builder.js"></script>';
+  #my ($self) = @_;
+  #my $r = $self->r;
+  #start a timer to save people's stuff idk if people want this
+  #print "<script> setInterval('saveChanges(\"mainform\", \"".$r->uri."\")', 680000); </script>";
+  print '<link rel="stylesheet" type="text/css" href="/webwork2_files/css/setmaker2.css" />';
+  print '<script>window.addEventListener("load", setup, false);</script>';
+  return "";
+}
+
+sub body {
+  #big wrapper div that will hopefully fix theme issues
+  print '<div id="set_maker_two_box">';
+  
+	my ($self) = @_;
+
+	my $r = $self->r;
+	my $ce = $r->ce;		# course environment
+	my $db = $r->db;		# database
+	my $j;			# garden variety counter
+
+	my $userName = $r->param('user');
+
+	my $user = $db->getUser($userName); # checked
+	die "record for user $userName (real user) does not exist."
+		unless defined $user;
+
+	### Check that this is a professor
+	my $authz = $r->authz;
+	unless ($authz->hasPermissions($userName, "modify_problem_sets")) {
+		print "User $userName returned " . 
+			$authz->hasPermissions($user, "modify_problem_sets") . 
+	" for permission";
+		return(CGI::div({class=>'ResultsWithError'},
+		CGI::em("You are not authorized to access the Instructor tools.")));
+	}
+
+	my $showHints = $r->param('showHints');
+	my $showSolutions = $r->param('showSolutions');
+	
+	##########	Extract information computed in pre_header_initialize
+
+	my $first_shown = $self->{first_shown};
+	my $last_shown = $self->{last_shown}; 
+	my $browse_which = $self->{browse_which};
+	my $gridded = $self->{gridded};
+	my $problem_seed = $self->{problem_seed}||1234;
+	my @pg_files = @{$self->{pg_files}};
+	my @myset_files =@{$self->{myset_files}};
+	my @all_db_sets = @{$self->{all_db_sets}};
+
+  my $displayModePlaceholder;
+	if (not defined($r->param('mydisplayMode'))){
+	  $displayModePlaceholder = "images";
+	}
+	else{
+	  $displayModePlaceholder = $r->param('mydisplayMode');
+	}
+
+	my @pg_html;
+	if ($last_shown >= $first_shown) {
+		@pg_html = renderProblems(
+			r=> $r,
+			user => $user,
+			problem_list => [@pg_files[$first_shown..$last_shown]],
+			displayMode => $displayModePlaceholder,
+			showHints => $showHints,
+			showSolutions => $showSolutions,
+		);
+	}
+	my @myset_html;
+
+  @myset_html = renderProblems(
+	  r=> $r,
+	  user => $user,
+		problem_list => [@myset_files],
+		displayMode => $displayModePlaceholder,
+		showHints => $showHints,
+		showSolutions => $showSolutions,
+  );
+
+	my %isInSet;
+	my $setName = $r->param("myset_sets");
+	if ($setName) {
+		# DBFIXME where clause, iterator
+		# DBFIXME maybe instead of hashing here, query when checking source files?
+		# DBFIXME definitely don't need to be making full record objects
+		# DBFIXME SELECT source_file FROM whatever_problem WHERE set_id=? GROUP BY source_file ORDER BY NULL;
+		# DBFIXME (and stick result directly into hash)
+		foreach my $problem ($db->listGlobalProblems($setName)) {
+			my $problemRecord = $db->getGlobalProblem($setName, $problem);
+			$isInSet{$problemRecord->source_file} = 1;
+		}
+	}
+	$self->{isInSet} = \%isInSet;
+  my $jj;
+  ##########  Loading Screen
+  print '<div id="loading"></div>';
+  
+	##########	Top part
+	print '<span><button onclick="fullWindowMode();">Full Screen</button>';
+	print '<span><button id="gridifyButton" onclick="gridify();">Gridify!!</button>';
+	print '<span>Hover Magnification: <button type="button" onclick="increaseMagnification();">+</button><span id="magnification">1</span><button type="button" onclick="decreaseMagnification();">-</button></span></span>';
+	print '<button type="button" onclick="toggleHelp(this);" value="false">?</button>';
+	print '<div id="help" style="display:none;position:absolute;z-index:1500;background:white;" class="shadowed">',
+				  '<h1>What can you do?</h1>',
+					'<p>Drag a problem from the library to the target set to add.</p>',
+					'<p>Drag a problem set off the target set to remove.</p>',
+					'<p>If you have a local problem set in the library<br/>you can shift drag to move a problem from there to the target set.<br/>This will remove the problem from one set and add it to the other</p>',
+					'<h1>Legend</h1>',
+					'<p><div class="problem" style="width:16px;height:16px;border:solid 1px;"></div><span>Normal problem</span></p>',
+					'<p><div class="used" style="width:16px;height:16px;border:solid 1px;"></div><span>Problem already in set</span></p>',
+					'<p><div class="libProblem" style="width:16px;height:16px;border:solid 1px;"></div><span>Problem will be added to target on next update</span></p>',
+					'<p><div class="removedProblem" style="width:16px;height:16px;border:solid 1px;"></div><span>Problem will be deleted from target on next update</span></p>',
+					'<p><div class="ResultsWithError" style="width:16px;height:16px;border:solid 1px;"></div><span>Errors</span></p>',
+				'</div>';
+				#'<p>In the target set you can drag problems to reorder them.<br/>The problem will be placed in front of the one you drop it on,<br/>or at the end of the list if you drop it on an empty space in the table.</p>',
+	print '<span><button type="button" style="float:right;" onclick="saveChanges(\'mainform\', \''.$r->uri.'\', \'save_changes_spinner\');">save changes</button><img id="save_changes_spinner" style="display:none;float:right;" src="/webwork2_files/images/ajax-loader-small.gif"></img>
+	             <button type="button" style="float:right;" onclick="updateLibCategories(\'mainform\', \''.$r->uri.'\', \'lib_select_subject\', \'null\',\'view_problems_spinner\')">Update Menus</button>
+	             <button type="button" style="float:right;" onclick="updateLibCategories(\'mainform\', \''.$r->uri.'\', \'library_reset\', \'null\',\'view_problems_spinner\')">Reset</button>
+	             <button type="button" style="float:right;" onclick="updateLibCategories(\'mainform\', \''.$r->uri.'\', \'library_advanced\', \'view_problems_spinner\')">Advanced Search</button>
+	             <button type="button" style="float:right;" onclick="updateLibCategories(\'mainform\', \''.$r->uri.'\', \'library_basic\', \'null\',\'view_problems_spinner\')">Basic Search</button>
+	      </span>';
+	print '<div id="editor-form">';
+	  print CGI::start_form({-id=>"mainform", -method=>"POST", -action=>$r->uri, -name=>'mainform'}),
+	  	$self->hidden_authen_fields;
+			
+	  	#print '<div id="control_panel">';
+	  	  #print '<div id="myset_control" class="mysets control">';
+	  	  
+	    	#some work for the moved controls
+				my $list_of_local_sets = $self->{all_db_sets};
+				my $have_local_sets = scalar(@$list_of_local_sets);
+				my $library_selected = $self->{current_library_set};
+				my $set_selected = $r->param('local_sets');
+			
+				if($have_local_sets ==0) {
+					$list_of_local_sets = [NO_LOCAL_SET_STRING];
+				} elsif (not defined($set_selected) or $set_selected eq ""
+					or $set_selected eq SELECT_SET_STRING) {
+					unshift @{$list_of_local_sets}, SELECT_SET_STRING;
+					$set_selected = SELECT_SET_STRING;
+				}
+			
+				# Tidy this list up since it is used in two different places
+				if ($list_of_local_sets->[0] eq SELECT_SET_STRING) {
+					shift @{$list_of_local_sets};
+				}
+	    	#print '</div>';
+								
+	  	#print '</div>';
+	  	print '<div style="clear:both;padding:0px;margin:0px;"></div>';
+	    #########  Table of mysets problems
+	    print '<div id="problem_container">';
+			  print '<div id="mysets_problems_box" class="mysets">';
+				print '<h1>Target Set</h1>';
+				print '<div class="setSelector">';
+								#work for moved controlls
+								$list_of_local_sets = $self->{all_db_sets};
+								$have_local_sets = scalar(@$list_of_local_sets);
+								$library_selected = $self->{current_myset_set};
+								$set_selected = $r->param('myset_sets');
+								my $remember_local_set = $r->param('local_sets');
+				
+								my $these_widths = "width: 25ex";
+				
+								if($have_local_sets ==0) {
+									$list_of_local_sets = [NO_LOCAL_SET_STRING];
+								} elsif (not defined($set_selected) or $set_selected eq ""
+								or $set_selected eq SELECT_SET_STRING) {
+									unshift @{$list_of_local_sets}, SELECT_SET_STRING;
+									$set_selected = SELECT_SET_STRING;
+								}
+								# Tidy this list up since it is used in two different places
+								if ($list_of_local_sets->[0] eq SELECT_SET_STRING) {
+									shift @{$list_of_local_sets};
+								}
+				
+								$self->browse_mysets_panel($library_selected, $list_of_local_sets, $remember_local_set);
+								$self->make_mysets_row('all_db_sets'=>\@all_db_sets);
+			  print '</div>';
+				print '<div id="mysets_problems" class="problemList">';
+	        for ($jj=0; $jj<scalar(@myset_html); $jj++) { 
+	      	  $myset_files[$jj] =~ s|^$ce->{courseDirs}->{templates}/?||;
+	      	  $self->make_myset_data_row($myset_files[$jj], $myset_html[$jj], $jj+1, $self->{past_marks}->[$jj]); 
+	        }
+	      print '</div>';
+	      print '<p><button type="button" onclick="increasMysetsAcross();">+</button><span id="mysetsAcross">1</span><button type="button" onclick="decreaseMysetsAcross();">-</button><span> problems across</span></p>';
+				print '</div>';
+				print '<div id="horizontal_slider">=</div>';
+				print '<div id="size_slider"><p>||</p></div>';
+				
+				#some work for the moved controls
+				$list_of_local_sets = $self->{all_db_sets};
+				$have_local_sets = scalar(@$list_of_local_sets);
+				$library_selected = $self->{current_library_set};
+				$set_selected = $r->param('local_sets');
+			
+				if($have_local_sets ==0) {
+					$list_of_local_sets = [NO_LOCAL_SET_STRING];
+				} elsif (not defined($set_selected) or $set_selected eq ""
+					or $set_selected eq SELECT_SET_STRING) {
+					unshift @{$list_of_local_sets}, SELECT_SET_STRING;
+					$set_selected = SELECT_SET_STRING;
+				}
+			
+				# Tidy this list up since it is used in two different places
+				if ($list_of_local_sets->[0] eq SELECT_SET_STRING) {
+					shift @{$list_of_local_sets};
+				}
+	      print '<div id="setmaker_library_box" class="setmaker_library">';
+				  print '<h1>Library</h1>';
+			    print '<div class="setSelector">';
+			      ###########################################
+			      # Library repository controls
+		    	  ###########################################
+	    		  print '<div id="setmaker_library" class="control">';
+  						$self->make_top_row('all_db_sets'=>\@all_db_sets, 'browse_which'=> $browse_which);
+	  					print '<div id="library_categories">';
+	  					  #misplaced controlls
+	  					  if ($browse_which eq 'browse_local') {
+	  					  	$self->browse_local_panel($library_selected);
+	  					  }	elsif ($browse_which eq 'edit_mysets') {
+	  				  		$self->edit_mysets_panel($library_selected, $list_of_local_sets);
+	  				  	} elsif ($browse_which eq 'browse_npl_library') {
+	  				  		$self->browse_library_panel();
+	  				  	} elsif ($browse_which eq 'browse_setdefs') {
+	  				  		$self->browse_setdef_panel($library_selected);
+	  				  	} else { ## handle other problem libraries
+	  				  		$self->browse_local_panel($library_selected,$browse_which);
+	  				  	}
+	  					print '</div>';
+	  					print CGI::div({-class=>"InfoPanel"},
+                '<span class="js_action_span" onclick="selectAll();">all</span>
+                <span style="margin-left:10px;" class="js_action_span" onclick="selectNone();">none</span>'
+                #<span style="margin-left:10px;" class="js_action_span" onclick="rerandomize();">Rerandomize</span>
+               # <span style="margin-left:10px;" class="js_action_span" onclick="cleardisplay();">Clear Problem Display</span>'
+		          );
+	  		    print '</div>';
+	  		    ###########################################
+  			  print '</div>';
+			
+			    print '<div class="setSelectorLib">';#what is this?
+				  print '</div>';
+					#hidden inputs for memeory
+					#remember gridify
+					print '<div id="setmaker_library_data">';
+					print CGI::hidden(-id=>'pastGridded', -name=>'gridify', -value=>$gridded, -override=>1);
+					print CGI::hidden(-id=>'isReordered', -name=>'isReordered', -vale=>0 ,-override=>0);
+	        print CGI::hidden(-name=>'browse_which', -value=>$browse_which,-override=>1),
+		      CGI::hidden(-name=>'problem_seed', -value=>$problem_seed, -override=>1);
+	        for ($j = 0 ; $j < scalar(@pg_files) ; $j++) {
+		        print CGI::hidden(-name=>"all_past_list$j", -value=>$pg_files[$j],-override=>1);
+	        }
+	        print CGI::hidden(-name=>'first_shown', -value=>$first_shown,-override=>1);
+	        print CGI::hidden(-name=>'last_shown', -value=>$last_shown, -override=>1);
+          print '<div id="setmaker_library_problems" class="problemList">';
+	        ########## Now print problems
+	          for ($jj=0; $jj<scalar(@pg_html); $jj++) { 
+		          $pg_files[$jj] =~ s|^$ce->{courseDirs}->{templates}/?||;
+		          $self->make_data_row($pg_files[$jj+$first_shown], $pg_html[$jj], $jj+1,         $self->{past_marks}->[$jj]); 
+	          }
+          print '</div>';
+          print '<p><button type="button" onclick="increaseLibAcross();">+</button><span id="libAcross">4</span><button type="button" onclick="decreaseLibAcross();">-</button><span> problems across</span></p>';
+	        ########## Finish things off
+	        my ($next_button, $prev_button) = ("", "");
+	        if ($first_shown > 0) {
+		        #$prev_button = CGI::submit(-name=>"prev_page", -style=>"width:15ex", -value=>"Previous page");
+		        my $urlpath = $r->urlpath;
+            my $getProblemPath = $self->systemLink($urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::GetLibrarySetProblems", $r, courseID =>$urlpath->arg("courseID")));
+	          $prev_button = "<span><button type='button' onclick='viewProblems(\"prev_page\" ,\"mainform\", \"".$r->uri."\", \"prev_spinner\");'>Previous page</button><img id='prev_spinner' style='display:none;' src='/webwork2_files/images/ajax-loader-small.gif'></img></span>";
+	        }
+	        if ((1+$last_shown)<scalar(@pg_files)) {
+		        #$next_button = CGI::submit(-name=>"next_page", -style=>"width:15ex", -value=>"Next page");
+		        my $urlpath = $r->urlpath;
+            my $getProblemPath = $self->systemLink($urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::GetLibrarySetProblems", $r, courseID =>$urlpath->arg("courseID")));
+	          $next_button = "<span><button type='button' onclick='viewProblems(\"next_page\" ,\"mainform\", \"".$r->uri."\", \"next_spinner\");'>Next page</button><img id='next_spinner' style='display:none;' src='/webwork2_files/images/ajax-loader-small.gif'></img></span>";
+	        }
+	        if (scalar(@pg_files)>0) {
+		        print CGI::p(($first_shown+1)."-".($last_shown+1)." of ".scalar(@pg_files)." shown.", $prev_button, " ", $next_button,
+			      '<span><button type="button" style="float:right;" onclick="saveChanges(\'mainform\', \''.$r->uri.'\', \'save_changes_spinner2\');">save changes</button><img id="save_changes_spinner2" style="display:none;float:right;" src="/webwork2_files/images/ajax-loader-small.gif"></img></span>');
+	        }
+	        #close setmaker_library_data
+	        print '</div>';
+	        #close setmaker_library
+	      print '</div>';
+	    #close problem_container
+	    print '</div>';
+	  print CGI::endform(), "\n";
+	  #close form-editor
+	print '</div>';
+	print '<div style="clear:both;"></div>';
+	#	 if($first_shown>0 or (1+$last_shown)<scalar(@pg_files)) {
+	
+	#	 }
+	# end big wrapper div that will hopefully fix theme issues
+  print '</div>';
+	return "";	
+}
+
+=head1 AUTHOR
+
+Written by John Jones, jj (at) asu.edu.
+Edited by David Gage
+
+=cut
+
+1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm b/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm
index c27a088699..0c83fec4ce 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader: webwork-modperl/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm,v 1.3 2003/12/09 01:12:31 sh002i Exp $
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetsAssignedToUser.pm,v 1.26 2006/09/25 22:14:53 sh002i 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
@@ -26,52 +26,76 @@ sets are assigned to a given user.
 
 use strict;
 use warnings;
-use CGI qw();
-use WeBWorK::Utils qw(formatDateTime);
+#use CGI qw(-nosticky );
+use WeBWorK::CGI;
+use WeBWorK::Debug;
 
 sub initialize {
-	my ($self, $userID) = @_;
-	my $r = $self->{r};
-	my $db = $self->{db};
-	my $authz = $self->{authz};
-	my $user = $r->param("user");
+	my ($self)     = @_;
+	my $r          = $self->r;
+	my $urlpath    = $r->urlpath;	
+	my $db         = $r->db;
+	my $authz      = $r->authz;
+
+	my $userID     = $urlpath->arg("userID");
+	my $user       = $r->param("user");
 	
 	# check authorization
-	unless ($authz->hasPermissions($user, "assign_problem_sets")) {
-		$self->{submitError} = "You are not authorized to assign problem sets";
-		return;
-	}
+	return unless $authz->hasPermissions($user, "access_instructor_tools");
+	return unless $authz->hasPermissions($user, "assign_problem_sets");
+	
+	# get the global user, if there is one
+	my $globalUserID = "";
+	$globalUserID = $db->{set}->{params}->{globalUserID}
+		if ref $db->{set} eq "WeBWorK::DB::Schema::GlobalTableEmulator";
 	
 	if (defined $r->param("assignToAll")) {
 		$self->assignAllSetsToUser($userID);
-	} elsif (defined $r->param("unassignFromAll")) {
-		$self->unassignAllSetsFromUser($userID);
+		debug("assignAllSetsToUser($userID)");
+		$self->addmessage(CGI::div({class=>'ResultsWithoutError'}, "User has been assigned to all current sets."));
+		debug("done assignAllSetsToUsers($userID)");
+	} elsif (defined $r->param('unassignFromAll') and defined($r->param('unassignFromAllSafety')) and $r->param('unassignFromAllSafety')==1) {
+		if ($userID ne $globalUserID) {
+		  $self->addmessage(CGI::div({class=>'ResultsWithoutError'}, "User has been unassigned from all sets."));
+			$self->unassignAllSetsFromUser($userID);
+		}
 	} elsif (defined $r->param('assignToSelected')) {
 		# get list of all sets and a hash for checking selectedness
+		# DBFIXME shouldn't need to get set list, should use iterator
 		my @setIDs = $db->listGlobalSets;
+		my @setRecords = grep { defined $_ } $db->getGlobalSets(@setIDs);
 		my %selectedSets = map { $_ => 1 } $r->param("selected");
 		
 		# get current user
 		my $User = $db->getUser($userID); # checked
 		die "record not found for $userID.\n" unless $User;
 		
-		# go through each possible set
-		foreach my $setID (@setIDs) {
-			# does the user want it to be assigned to the selected user
-			if (exists $selectedSets{$setID}) {
-				# user asked to have the set assigned to the selected user
-				my $Set = $db->getGlobalSet($setID); #checked
-				if ($Set) {
-					$self->assignSetToUser($userID, $Set);
+		$self->addmessage(CGI::div({class=>'ResultsWithoutError'}, "User's sets have been reassigned."));
+		
+		unless ($User->user_id eq $globalUserID) {
+		
+			my %userSets = map { $_ => 1 } $db->listUserSets($userID);
+			
+			# go through each possible set
+			foreach my $setRecord (@setRecords) {
+				my $setID = $setRecord->set_id;
+				# does the user want it to be assigned to the selected user
+				if (exists $selectedSets{$setID}) {
+					unless ($userSets{$setID}) {	# skip users already in the set
+						debug("assignSetToUser($userID, $setID)");
+						$self->assignSetToUser($userID, $setRecord);
+						debug("done assignSetToUser($userID, $setID)");
+					}
 				} else {
-					warn "global set $setID appeared in listGlobalSets() but does not exist.\n"
+					# user asked to NOT have the set assigned to the selected user
+					next unless $userSets{$setID};	# skip users not in the set
+					$db->deleteUserSet($userID, $setID);
 				}
-			} else {
-				# user asked to NOT have the set assigned to the selected user
-				# this will unassign it if it is assigned
-				$db->deleteUserSet($userID, $setID);
 			}
 		}
+	} elsif (defined $r->param("unassignFromAll")) {
+	   # no action taken
+	   $self->addmessage(CGI::div({class=>'ResultsWithError'}, "No action taken"));
 	}
 }
 
@@ -85,103 +109,151 @@ sub getUserName {
 	return $pathUserName;
 }
 
-sub path {
-	my $self          = shift;
-    my @components    = @_;
-	my $args          = $_[-1];
-	
-	my $ce = $self->{ce};
-	my $root = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
-	my $userID = $self->getUserName($components[0]);
-	
-	return $self->pathMacro($args,
-		"Home"             => "$root",
-		$courseName        => "$root/$courseName",
-		"Instructor Tools" => "$root/$courseName/instructor",
-		"Users"            => "$root/$courseName/instructor/users/",
-		$userID            => "$root/$courseName/instructor/users/$userID",
-		"Assigned Sets"    => "", # "$root/$courseName/instructor/users/$userID/sets"
-	);
-}
 
-sub title {
-	my ($self, @components) = @_;
-	my $userID = $self->getUserName($components[0]);
-	
-	return "Assigned Sets";
-}
 
 sub body {
-	my ($self, $userID) = @_;
-	my $r = $self->{r};
-	my $authz = $self->{authz};
-	my $db = $self->{db};
-	my $ce = $self->{ce};
+	my ($self)      = @_;
+	my $r           = $self->r;
+	my $urlpath     = $r->urlpath;
+	my $db          = $r->db;
+	my $ce          = $r->ce;
+	my $authz       = $r->authz;
+	my $courseName  = $urlpath->arg("courseID");
 	my $webworkRoot = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
-	my $user = $r->param('user');
+	my $userID      = $urlpath->arg("userID");
 	
+	my $user        = $r->param('user');
+	my $setsAssignedToUserPage    = $urlpath->newFromModule($urlpath->module, $r, 
+	                                                        courseID =>  $courseName,
+	                                                        userID=>$userID
+	);
+	my $setsAssignedToUserURL     = $self->systemLink($setsAssignedToUserPage,authen=>0);
+
 	# check authorization
-	return CGI::em("You are not authorized to access the Instructor tools.")
+	return CGI::div({class=>"ResultsWithError"}, CGI::p("You are not authorized to access the Instructor tools."))
 		unless $authz->hasPermissions($user, "access_instructor_tools");
 	
+	return CGI::div({class=>"ResultsWithError"}, CGI::p("You are not authorized to assign homework sets."))
+		unless $authz->hasPermissions($user, "assign_problem_sets");
+	
 	# get list of sets
+	# DBFIXME this is a duplicate call! :P :P :P
 	my @setIDs = $db->listGlobalSets;
 	my @Sets = $db->getGlobalSets(@setIDs);
 	
-	# sort first by open date and then by name (this should be replaced with a
-	# call to a standard sorting routine!)
+#	# sort first by due date and then by name (this should be replaced with a
+#	# call to a standard sorting routine!)
+# 	@Sets = sort {
+# 		$a->due_date <=> $b->due_date
+# 		|| lc($a->set_id) cmp lc($b->set_id)
+# 	} @Sets;
+
+	# Sort by set name only  -- I find this most useful for the instructor pages
 	@Sets = sort {
-		$a->open_date <=> $b->open_date
-		|| lc($a->set_id) cmp lc($b->set_id)
+		lc($a->set_id) cmp lc($b->set_id)
 	} @Sets;
 	
-	print CGI::start_form({method=>"post", action=>$r->uri});
+	
+	print CGI::start_form({method=>"post", action=>$setsAssignedToUserURL});
 	print $self->hidden_authen_fields;
 	
-	print CGI::p(
-		CGI::submit({name=>"assignToAll", value=>"Assign all sets"}),
-		CGI::submit({name=>"unassignFromAll", value=>"Unassign all sets"}),
-	);
+	# get the global user, if there is one
+	my $globalUserID = "";
+	$globalUserID = $db->{set}->{params}->{globalUserID}
+		if ref $db->{set} eq "WeBWorK::DB::Schema::GlobalTableEmulator";
+	
+	if ($userID ne $globalUserID) {
+		print CGI::p(CGI::submit({name=>"assignToAll", value=>"Assign All Sets"}));
+	}
 	
+	print CGI::div({-style=>"color:red"},
+		       "Do not uncheck a set unless you know what you are doing.", CGI::br(),
+		       "There is NO undo for unassigning a set.");
+
+	print CGI::p("When you uncheck a homework set (and save the changes), you destroy all
+		      of the data for that set for this student.   If You then need to
+		      reassign the set and the student will receive new versions of the problems.
+		      Make sure this is what you want to do before unchecking sets."
+	);
+				        
 	print CGI::start_table({});
+        print CGI::Tr(CGI::th(["Assigned","&nbsp;&nbsp;","Set Name","&nbsp;&nbsp;","Due Date", "&nbsp;"]));
+        print CGI::Tr(CGI::td([CGI::hr(),"",CGI::hr(),"",CGI::hr()]));
 	
 	foreach my $Set (@Sets) {
 		my $setID = $Set->set_id;
-		my $prettyName = formatDateTime($Set->open_date);
 		
 		# this is true if $Set is assigned to the selected user
-		my $currentlyAssigned = defined $db->getUserSet($userID, $setID); # checked
+		# DBFIXME testing for existence -- don't need to fetch record
+		my $UserSet = $db->getUserSet($userID, $setID); # checked
+		my $currentlyAssigned = defined $UserSet;
 		
-		# URL to edit user-specific set data
-		my $url = $ce->{webworkURLs}->{root}
-			. "/$courseName/instructor/sets/$setID/?editForUser=$userID&"
-			. $self->url_authen_args();
+		my $prettyDate;
+		if ($currentlyAssigned and $UserSet->due_date) {
+			$prettyDate = $self->formatDateTime($UserSet->due_date);
+		} else {
+			$prettyDate = $self->formatDateTime($Set->due_date);
+		}
 		
+		# URL to edit user-specific set data
+# 		my $url = $ce->{webworkURLs}->{root}
+# 			. "/$courseName/instructor/sets/$setID/?editForUser=$userID&"
+# 			. $self->url_authen_args();
+        my $setListPage = $urlpath->new(type =>'instructor_set_detail',
+					args =>{
+						courseID => $courseName,
+						setID    => $setID
+	});
+		my $url = $self->systemLink($setListPage,params =>{editForUser => $userID});
 		print CGI::Tr({}, 
-			CGI::td({}, [
-				CGI::checkbox({
-					type=>"checkbox",
-					name=>"selected",
-					checked=>$currentlyAssigned,
-					value=>$setID,
-					label=>"",
-				}),
-				$setID,
-				"($prettyName)",
-				" ",
+			      CGI::td({-align=>"center"},
+				($userID eq $globalUserID
+					? "" # no checkboxes for global user!
+					: CGI::checkbox({
+						type=>"checkbox",
+						name=>"selected",
+						checked=>$currentlyAssigned,
+						value=>$setID,
+						label=>"",
+					})
+				)),
+			      CGI::td({}, [ "",
+				$setID, "",
+				"($prettyDate)", "",
 				$currentlyAssigned
 					? CGI::a({href=>$url}, "Edit user-specific set data")
 					: (),
 			])
 		);
 	}
+        print CGI::Tr(CGI::td([CGI::hr(),"",CGI::hr(),"",CGI::hr()]));
 	print CGI::end_table();
 	print CGI::submit({name=>"assignToSelected", value=>"Save"});
+
+	print CGI::p( CGI::hr(),
+		      CGI::div( {class=>'ResultsWithError'},
+				"There is NO undo for this function.  
+				 Do not use it unless you know what you are doing!  When you unassign
+				 sets using this button, or by unchecking their set names, you destroy all
+				 of the data for those sets for this student.",
+				CGI::br(),
+				CGI::submit({name=>"unassignFromAll", value=>"Unassign All Sets"}),
+				CGI::radio_group(-name=>"unassignFromAllSafety", -values=>[0,1], -default=>0, -labels=>{0=>'Read only', 1=>'Allow unassign'}),
+				  ),
+				  CGI::hr(),
+	);
+
 	print CGI::end_form();
 	
 	return "";
 }
 
+sub title {  
+        my ($self) = @_;  
+        my $r = $self->{r};  
+        my $userID = $r->urlpath->arg("userID");  
+  
+        return "Assigned Sets for user $userID";  
+}
+
 1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm b/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm
index 1aae72a5bd..62578ad1f0 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm,v 1.20 2006/10/10 10:58:54 dpvc 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
@@ -19,90 +19,71 @@ use base qw(WeBWorK::ContentGenerator::Instructor);
 
 =head1 NAME
 
-WeBWorK::ContentGenerator::Instructor::ProblemSetList - Entry point for Problem and Set editing
+WeBWorK::ContentGenerator::Instructor::ShowAnswers.pm  -- display past answers of students
 
 =cut
 
 use strict;
 use warnings;
-use CGI qw();
-use WeBWorK::Utils qw(formatDateTime);
+#use CGI;
+use WeBWorK::CGI;
+
 
 sub initialize {
-	my $self = shift;
-	my $r = $self->{r};
-	my $db = $self->{db};
-	my $ce = $self->{ce};
-	my $authz = $self->{authz};
-	my $courseName = $ce->{courseName};
-	my $user = $r->param('user');
+	my $self       = shift;
+	my $r          = $self->r;
+	my $urlpath    = $r->urlpath;
+	my $db         = $r->db;
+	my $ce         = $r->ce;
+	my $authz      = $r->authz;
+	my $courseName = $urlpath->arg("courseID");
+	my $user       = $r->param('user');
 	
-	unless ($authz->hasPermissions($user, "create_and_delete_problem_sets")) {
-		$self->{submitError} = "You aren't authorized to create or delete problems";
+	unless ($authz->hasPermissions($user, "view_answers")) {
+		$self->addbadmessage("You aren't authorized to view past answers");
 		return;
 	}
-	
-
-}
-
-sub path {
-	my ($self, $args) = @_;
-	
-	my $ce = $self->{ce};
-	my $root = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
-	return $self->pathMacro($args,
-		"Home"          => "$root",
-		$courseName     => "$root/$courseName",
-		'instructor'    => "$root/$courseName/instructor",
-		'showAnswers'   => ''
-	);
 }
 
-sub title {
-	my $self = shift;
-	return "Instructor Tools - Show answers submitted by students in".$self->{ce}->{courseName};
-}
 
 sub body {
-	my $self = shift;
-	my $r = $self->{r};
-	my $db = $self->{db};
-	my $ce = $self->{ce};
-	my $authz = $self->{authz};
-	my $root = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
-	my $user = $r->param('user');
-	my $key  = $r->param('key');
-	my $studentUser = $r->param('studentUser');
-	my $setName = $r->param('setName');
-	my $problemNumber = $r->param('problemNumber');
+	my $self          = shift;
+	my $r             = $self->r;
+	my $urlpath       = $r->urlpath;
+	my $db            = $r->db;
+	my $ce            = $r->ce;
+	my $authz         = $r->authz;
+	my $root          = $ce->{webworkURLs}->{root};
+	my $courseName    = $urlpath->arg('courseID');  
+	my $setName       = $r->param('setID');     # these are passed in the search args in this case
+	my $problemNumber = $r->param('problemID');
+	my $user          = $r->param('user');
+	my $key           = $r->param('key');
+	my $studentUser   = $r->param('studentUser') if ( defined($r->param('studentUser')) );
 	
 	return CGI::em("You are not authorized to access the instructor tools") unless $authz->hasPermissions($user, "access_instructor_tools");
+	return CGI::em("You are not authorized to view past answers") unless $authz->hasPermissions($user, "view_answers");
 	
-	$studentUser = $r->param('studentUser') if ( defined($r->param('studentUser')) );
-	my ($safeUser,$safeCourse) = (showHTML($studentUser),showHTML($courseName));
-	my ($safeSet,$safeProb) = (showHTML($setName),showHTML($problemNumber));
-	
+	my $showAnswersPage   = $urlpath->newFromModule($urlpath->module,  $r, courseID => $courseName);
+	my $showAnswersURL    = $self->systemLink($showAnswersPage,authen => 0 );
 	
 	#####################################################################
 	# print form
 	#####################################################################
-	
-	print "<p>\n\n<HR>\n";
-	print '<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0"><TR><TD>';
-	print CGI::start_form("POST", $self->{r}->uri,-target=>'information'),
-	  CGI::submit(-name => 'action',  -value=>'Past Answers for'), "\n",
-	  " &nbsp; \n",
-	  $self->hidden_authen_fields,
-	  qq{<INPUT TYPE="TEXT" NAME="studentUser" VALUE="$safeUser" SIZE="15">},
-	  " &nbsp; &nbsp;\n",
-	  qq{Set: <INPUT TYPE="TEXT" NAME="setName" VALUE="$safeSet" SIZE="10">},
-	  " &nbsp; &nbsp;\n",
-	  qq{Problem: <INPUT TYPE="TEXT" NAME="problemNumber" VALUE="$safeProb" SIZE="5">},
-	  CGI::end_form(),"\n\n";
-	print "</TABLE>";
-	
+
+	print CGI::p(),CGI::hr();
+
+	print CGI::start_form("POST", $showAnswersURL,-target=>'information'),
+	      $self->hidden_authen_fields;
+	print CGI::submit(-name => 'action', -value=>'Past Answers for')," &nbsp; ",
+	      CGI::textfield(-name => 'studentUser', -value => $studentUser, -size =>10 ),
+	      " &nbsp; Set: &nbsp;",
+	      CGI::textfield( -name => 'setID', -value => $setName, -size =>10  ), 
+              " &nbsp; Problem: &nbsp;",
+	      CGI::textfield(-name => 'problemID', -value => $problemNumber,-size =>10  ),  
+  	      " &nbsp; ";
+	print CGI::end_form();
+
 	if (defined($setName) and defined($problemNumber) )  {
 		#####################################################################
 		# print result table of answers
@@ -110,98 +91,103 @@ sub body {
 		my $answer_log    = $self->{ce}->{courseFiles}->{logs}->{'answer_log'};
 	
 		$studentUser = $r->param('studentUser') if ( defined($r->param('studentUser')) );
-		my ($safeUser,$safeCourse) = (showHTML($studentUser),showHTML($courseName));
-		my ($safeSet,$safeProb) = (showHTML($setName),showHTML($problemNumber));
-	
 		
-		print CGI::h3( "Past Answers for $safeUser, set $safeSet, problem$safeProb)" );
+		print CGI::h3("Past Answers for $studentUser, set $setName, problem $problemNumber" );
 	
-		$studentUser = "[^|]*"    if ($studentUser eq ""    or $studentUser eq "*");
-		$setName = "[^|]*"  if ($setName eq ""  or $setName eq "*");
+		$studentUser = "[^|]*"   if ($studentUser eq ""    or $studentUser eq "*");
+		$setName = "[^|]*"       if ($setName eq ""  or $setName eq "*");
 		$problemNumber = "[^|]*" if ($problemNumber eq "" or $problemNumber eq "*");
 		
-		# had to change the pattern a little to match
-		# the initial time stamp: [Fri Feb 28 22:05:11 2003].
-		my $pattern = "^[[^]]*]|$studentUser\\|$setName\\|$problemNumber\\|";
-		#my $pattern = "^\\|$studentUser\\|$setName\\|$problemNumber\\|";
-		
-		our ($lastdate,$lasttime,$lastID,$lastn);
+		my $pattern = "^[^|]*\\|$studentUser\\|$setName\\|$problemNumber\\|";
 		
-		
-		if (open(LOG,"$answer_log")) {
-		  my $line;
-		  local ($lastdate,$lasttime,$lastID,$lastn) = ("",0,"",0);
-		  $self->{lastdate}       = '';
-		  $self->{lasttime}       = '';
-		  $self->{lastID}         = '';
-		  $self->{lastn}          = '';
-		  
-		  # get data from file
-		  my @lines = grep(/$pattern/,<LOG>); close(LOG);
-		  chomp(@lines);
-		
-		  print "<CENTER>\n";
-		  print '<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">',"\n";
-		  print "No entries for $safeUser set $safeSet, problem $safeProb)" unless @lines;  # warn if there are no answers
-		  foreach $line (sort(@lines)) {
-			print $self->tableRow(split("\t",$line."\tx"));
-		  }
-		  print qq{<TR><TD COLSPAN="$lastn"><HR SIZE="3"></TD></TR>\n} if ($lastn);
-		  print "</TABLE>\n</CENTER>\n\n";
+		if (-e $answer_log) {
+			if (open my $log, $answer_log) {
+				my $line;
+				$self->{lastdate} = '';
+				$self->{lasttime} = 0;
+				$self->{lastID}   = '';
+				$self->{lastn}    = 0;
+				
+				my @lines = grep(/$pattern/,<$log>); close($log);
+				chomp(@lines);
+				foreach $line (@lines) {$line = substr($line,27)}; # remove datestamp
+				
+				print CGI::start_table({border=>0,cellpadding=>0,cellspacing=>3,align=>"center"});
+				print "No entries for $studentUser set $setName, problem $problemNumber" unless @lines;
+				foreach $line (sort byData @lines) {$self->tableRow(split("\t",$line,-1))}
+				print CGI::Tr(CGI::td({colspan=>$self->{lastn}},CGI::hr({size=>3}))) if ($self->{lastn});
+				print CGI::end_table();
+			} else {
+				$self->addbadmessage("Failed to open the answer log '$answer_log': $!");
+			}
 		} else {
-		  print "<B>Can't open the access log $answer_log</B>";
+			# no answer log exists yet -- this is probably not an error
+			print "No answers have been logged. (Answer log '$answer_log' does not exist.)";
 		}
 	}
-
 		
 	return "";
 }
 
+sub byData {
+  my ($A,$B) = ($a,$b);
+  $A =~ s/\|[01]*\t([^\t]+)\t.*/|$1/; # remove answers and correct/incorrect status
+  $B =~ s/\|[01]*\t([^\t]+)\t.*/|$1/;
+  return $A cmp $B;
+}
+
 sub tableRow {
-  my $self       = shift;
-  my $lastID     = $self->{lastID};
-  my $lastn      = $self->{lastn};
-  my $lasttime   = $self->{lasttime};
-  my $lastdate   = $self->{lastdate};
-  my ($out,$answer,$studentUser,$set,$prob) = "";
+  my $self = shift;
+  my ($answer,$score,$studentUser,$set,$prob);
   my ($ID,$rtime,@answers) = @_; pop(@answers);
+  my $scores = ''; $scores = $1 if ($ID =~ s/\|([01]+)$/|/);
+  my @scores = split(//, $scores);
   my $date = scalar(localtime($rtime)); $date =~ s/\s+/ /g;
   my ($day,$month,$mdate,$time,$year) = split(" ",$date);
   $date = "$mdate $month $year";
   my $n = 2*(scalar(@answers)+1);
 
-  if ($lastID ne $ID) {
-    if ($lastn) {
-      print qq{<TR><TD COLSPAN="$lastn"><HR SIZE="3"></TD></TR>\n<P>\n\n};
-      print '<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">',"\n";
+  if ($self->{lastID} ne $ID) {
+    if ($self->{lastn}) {
+      print CGI::Tr(CGI::td({colspan=>$self->{lastn}},CGI::hr({size=>3}))),
+            CGI::end_table(),CGI::p();
+      print CGI::start_table({border=>0,cellpadding=>0,cellspacing=>3,align=>"center"});
     }
     ($studentUser,$set,$prob) = (split('\|',$ID))[1,2,3];
-    $out .= qq{<TR ALIGN="CENTER"><TD COLSPAN="$n"><HR SIZE="3">
-               User: <B>$studentUser</B> &nbsp;
-               Set: <B>$set</B> &nbsp;
-               Problem: <B>$prob</B></TD></TR>\n};
-    $lastID = $ID; $lasttime = 0; $lastdate = "";
+    print CGI::Tr({align=>"center"},
+		  CGI::td({colspan=>$n},CGI::hr({size=>3}),
+			  "User: "   .CGI::b($studentUser)." &nbsp; ",
+			  "Set: "    .CGI::b($set)." &nbsp; ",
+			  "Problem: ".CGI::b($prob))),"\n";
+    $self->{lastID}   = $ID;
+    $self->{lasttime} = 0;
+    $self->{lastdate} = "";
   }
 
-  $out .= qq{<TR><TD COLSPAN="$n"><HR SIZE="1"></TD></TR>\n}
-    if ($rtime - $lasttime > 30*60);
-  $lasttime = $rtime; $lastn = $n;
+  print CGI::Tr(CGI::td({colspan=>$n},CGI::hr({size=>1})))
+    if ($rtime - $self->{lasttime} > 30*60);
+  $self->{lasttime} = $rtime;
+  $self->{lastn} = $n;
 
-  if ($lastdate ne $date) {
-    $out .= qq{<TR><TD COLSPAN="$n"><SMALL><I>$date</I></SMALL></TD></TR>\n};
-    $lastdate = $date;
+  if ($self->{lastdate} ne $date) {
+    print CGI::Tr(CGI::td({colspan=>$n},CGI::small(CGI::i($date))));
+    $self->{lastdate} = $date;
   }
 
-  $out .= '<TR><TD WIDTH="10"></TD>'.
-          '<TD><FONT COLOR="#808080"><SMALL>'.$time.'</SMALL></FONT></TD>';
+  ##
+  ##  These colors really should use CSS and the template
+  ##
+  my @row = (CGI::td({width=>10}),CGI::td({style=>"color:#808080"},CGI::small($time)));
+  my $td = {nowrap => 1};
   foreach $answer (@answers) {
     $answer =~ s/(^\s+|\s+$)//g;
     $answer = showHTML($answer);
-    $answer = "<SMALL><I>empty</I></SMALL>" if ($answer eq "");
-    $out .= qq{<TD WIDTH="20"></TD><TD NOWRAP>$answer</TD>};
+    $score = shift(@scores); $td->{style} = $score? "color:#006600": "color:#660000";
+    delete($td->{style}) unless $answer ne "" && defined($score);
+    $answer = CGI::small(CGI::i("empty")) if ($answer eq "");
+    push(@row,CGI::td({width=>20}),CGI::td($td,$answer));
   }
-  $out .= "</TR>\n";
-  $out;
+  print CGI::Tr(@row);
 }
 
 ##################################################
@@ -210,10 +196,11 @@ sub tableRow {
 #
 sub showHTML {
     my $string = shift;
-    return '' unless $string;
+    return '' unless defined $string;
     $string =~ s/&/\&amp;/g;
     $string =~ s/</\&lt;/g;
     $string =~ s/>/\&gt;/g;
+    $string =~ s/\000/,/g;  # anyone know why this is here?  (I didn't add it -- dpvc)
     $string;
 }
 
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm b/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm
index e049e79c6f..fe81befe72 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader: webwork-modperl/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm,v 1.12 2003/12/09 01:12:31 sh002i Exp $
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm,v 1.68 2007/08/13 22:59:56 sh002i 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
@@ -20,115 +20,193 @@ use base qw(WeBWorK::ContentGenerator::Instructor);
 =head1 NAME
 
 WeBWorK::ContentGenerator::Instructor::Stats - Display statistics by user or
-problem set.
+homework set.
 
 =cut
 
 use strict;
 use warnings;
-use CGI qw();
-use WeBWorK::Utils qw(readDirectory list2hash max);
-use WeBWorK::DB::Record::Set;
-
+#use CGI qw(-nosticky );
+use WeBWorK::CGI;
+use WeBWorK::Debug;
+use WeBWorK::ContentGenerator::Grades;
+use WeBWorK::Utils qw(readDirectory list2hash max sortByName);
 
+# The table format has been borrowed from the Grades.pm module
 sub initialize {
 	my $self     = shift; 
 	# FIXME  are there args here?
-	my $type       = shift || '';
 	my @components = @_;
-	my $r = $self->{r};
-	my $db = $self->{db};
-	my $ce = $self->{ce};
-	my $authz = $self->{authz};
- 	my $user = $r->param('user');
- 	my $setName = $_[0];
-#FIXME these don't appear to be used any where
-#  	$setName = 0 unless defined($setName);  #FIXME relay to index page for statistics
-#  	my $setRecord = $db->getGlobalSet($setName); # checked
-# # 	die "global set $setName  not found." unless $setRecord;
-# 
-#  	$self->{set}   = $setRecord;
-#####################################
+	my $r          = $self->{r};
+	my $urlpath    = $r->urlpath;
+	my $type       = $urlpath->arg("statType") || '';
+	my $db         = $self->{db};
+	my $ce         = $self->{ce};
+	my $authz      = $self->{authz};
+	my $courseName = $urlpath->arg('courseID');
+ 	my $user       = $r->param('user');
+ 	
+	# Check permissions
+	return unless $authz->hasPermissions($user, "access_instructor_tools");
+ 	
  	$self->{type}  = $type;
  	if ($type eq 'student') {
- 		$self->{studentName } = $components[0] || $user;
+ 		my $studentName = $r->urlpath->arg("userID") || $user;
+ 		$self->{studentName } = $studentName;
  		
  	} elsif ($type eq 'set') {
- 		$self->{setName}     = $components[0]  || 0 ;
+ 		my $setName = $r->urlpath->arg("setID") || 0;
+ 		$self->{setName}     = $setName;
+ 		my $setRecord  = $db->getGlobalSet($setName); # checked
+		die "global set $setName  not found." unless $setRecord;
+		$self->{set_due_date} = $setRecord->due_date;
+		$self->{setRecord}   = $setRecord;
  	}
  	
  	
 }
 
-sub path {
-	my $self       = shift;
-	my $args       = $_[-1];
-	my $ce         = $self->{ce};
-	my $root       = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
-	
-	return $self->pathMacro($args,
-		"Home"          => "$root",
-		$courseName     => "$root/$courseName",
-		'instructor'    => "$root/$courseName/instructor",
-		'stats'         => "$root/$courseName/instructor/stats/",
-		( $self->{type} eq 'set')     ? ("set/".$self->{setName}  => '')        : ''   ,
-		( $self->{type} eq 'student') ? ("student/".$self->{studentName} => '') : ''   ,
-	);
-}
 
 sub title { 
-	my ($self, @components) = @_;
+	my ($self) = @_;
+	my $r = $self->r;
+	my $authz = $r->authz;
+	my $user = $r->param('user');
+
+	return "" unless $authz->hasPermissions($user, "access_instructor_tools");
+	
 	my $type                = $self->{type};
 	my $string              = "Statistics for ".$self->{ce}->{courseName}." ";
+	
 	if ($type eq 'student') {
 		$string             .= "student ".$self->{studentName};
 	} elsif ($type eq 'set' ) {
 		$string             .= "set   ".$self->{setName};
+		$string             .= ".&nbsp;&nbsp;&nbsp; Due ". $self->formatDateTime($self->{set_due_date});
 	}
 	return $string;
 }
+sub siblings {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $db = $r->db;
+	my $authz = $r->authz;
+	my $user = $r->param('user');
+	my $urlpath = $r->urlpath;
+	
+	# Check permissions
+	return "" unless $authz->hasPermissions($user, "access_instructor_tools");
+	
+	my $courseID = $urlpath->arg("courseID");
+	my $eUserID  = $r->param("effectiveUser");
+	my @setIDs   = sort  $db->listGlobalSets;
+	
+	my $stats     = $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::Stats", $r,  
+	                                        courseID => $courseID);
+	
+	print CGI::start_div({class=>"info-box", id=>"fisheye"});
+	print CGI::h2("Statistics");
+	#print CGI::start_ul({class=>"LinksMenu"});
+	#print CGI::start_li();
+	#print CGI::span({style=>"font-size:larger"}, CGI::a({href=>$self->systemLink($stats)}, 'Statistics'));
+	print CGI::start_ul();
+	
+	foreach my $setID (@setIDs) {
+		my $problemPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::Stats", $r, 
+			courseID => $courseID, setID => $setID,statType => 'set',);
+		print CGI::li(CGI::a({href=>$self->systemLink($problemPage)}, WeBWorK::ContentGenerator::underscore2nbsp($setID)));
+	}
+	
+	print CGI::end_ul();
+	#print CGI::end_li();
+	#print CGI::end_ul();
+	print CGI::end_div();
+	
+	return "";
+}
 sub body {
 	my $self       = shift;
-	my $args       = pop(@_);
+	my $r          = $self->r;
+	my $urlpath    = $r->urlpath;
+	my $db         = $r->db;
+	my $ce         = $r->ce;
+	my $authz      = $r->authz;
+	my $courseName = $urlpath->arg("courseID");
+	my $user       = $r->param('user');
 	my $type       = $self->{type};
+
+	# Check permissions
+	return CGI::div({class=>"ResultsWithError"}, CGI::p("You are not authorized to access instructor tools"))
+		unless $authz->hasPermissions($user, "access_instructor_tools");
+	
 	if ($type eq 'student') {
-		$self->displayStudents($self->{studentName});
+		my $studentName = $self->{studentName};
+		my $studentRecord = $db->getUser($studentName) # checked
+			or die "record for user $studentName not found";
+		my $fullName = $studentRecord->full_name;
+        my $courseHomePage = $urlpath->new(type  => 'set_list',
+        	args => {courseID=>$courseName});
+		my $email = $studentRecord->email_address;
+		
+		print CGI::a({-href=>"mailto:$email"}, $email), CGI::br(),
+			"Section: ", $studentRecord->section, CGI::br(),
+			"Recitation: ", $studentRecord->recitation, CGI::br();
+		
+		if ($authz->hasPermissions($user, "become_student")) {
+			my $act_as_student_url = $self->systemLink($courseHomePage,
+				params => {effectiveUser=>$studentName});
+			
+			print 'Act as: ', CGI::a({-href=>$act_as_student_url},$studentRecord->user_id);
+		}
+		
+		print WeBWorK::ContentGenerator::Grades::displayStudentStats($self,$studentName);
 	} elsif( $type eq 'set') {
-		my $setName = $self->{setName};
 		$self->displaySets($self->{setName});
 	} elsif ($type eq '') {
 		$self->index;
 	} else {
 		warn "Don't recognize statistics display type: |$type|";
-
 	}
 	
-
 	return '';
-
 }
 sub index {
 	my $self          = shift;
-	my $ce            = $self->{ce};
-	my $r             = $self->{r};
-	my $courseName    = $ce->{courseName};
-	my $db            = $self->{db};
+	my $r             = $self->r;
+	my $urlpath       = $r->urlpath;
+	my $ce            = $r->ce;
+	my $db            = $r->db;
+	my $courseName    = $urlpath->arg("courseID");
+	
+	# DBFIXME sort in database
 	my @studentList   = sort $db->listUsers;
 	my @setList       = sort  $db->listGlobalSets;
-	my $uri           = $r->uri;
+	
+	
 	my @setLinks      = ();
 	my @studentLinks  = (); 
 	foreach my $set (@setList) {
-		push @setLinks, CGI::a({-href=>"${uri}set/$set/?".$self->url_authen_args },"set $set" );	
+	    my $setStatisticsPage   = $urlpath->newFromModule($urlpath->module, $r, 
+	                                                      courseID => $courseName,
+	                                                      statType => 'set',
+	                                                      setID    => $set
+	    );
+		push @setLinks, CGI::a({-href=>$self->systemLink($setStatisticsPage) }, WeBWorK::ContentGenerator::underscore2nbsp($set));
 	}
 	
 	foreach my $student (@studentList) {
-		push @studentLinks, CGI::a({-href=>"${uri}student/$student/?".$self->url_authen_args},"  $student" ),;	
+	    my $userStatisticsPage  = $urlpath->newFromModule($urlpath->module, $r, 
+	                                                      courseID => $courseName,
+	                                                      statType => 'student',
+	                                                      userID   => $student
+	    );
+		push @studentLinks, CGI::a({-href=>$self->systemLink($userStatisticsPage,
+		                                                     prams=>{effectiveUser => $student}
+		                                                     )},"  $student" ),;	
 	}
 	print join("",
 		CGI::start_table({-border=>2, -cellpadding=>20}),
-		CGI::Tr(
+		CGI::Tr({},
 			CGI::td({-valign=>'top'}, 
 				CGI::h3({-align=>'center'},'View statistics by set'),
 				CGI::ul(  CGI::li( [@setLinks] ) ), 
@@ -142,24 +220,65 @@ sub index {
 	);
 	
 }
+###################################################
+# Determines the percentage of students whose score is greater than a given value
+# The percentages are fixed at 75, 50, 25 and 5%
+sub determine_percentiles {
+	my $percent_brackets  = shift;
+	my @list_of_scores    = @_;
+	@list_of_scores       = sort {$a<=>$b} @list_of_scores;
+	my %percentiles          = ();
+	my $num_students      = $#list_of_scores;
+	foreach my $percentage (@{$percent_brackets}) {
+		$percentiles{$percentage} = @list_of_scores[int( (100-$percentage)*$num_students/100)];
+		$percentiles{$percentage} =0 unless defined($percentiles{$percentage});  #in case no students have tried this question
+	}
+	# for example
+	# $percentiles{75}  = @list_of_scores[int( 25*$num_students/100)]; 
+	# means that 75% of the students received this score ($percentiles{75}) or higher
+	%percentiles;
+}
+sub prevent_repeats {    # replace a string such as 0 0 0 86 86 100 100 100 by    0 - - 86 - 100 - -
+	my @inarray   = @_;
+	my @outarray = ();
+	my $saved_item = shift @inarray;
+	push @outarray, $saved_item;
+	while (@inarray )   {
+		my $current_item = shift @inarray;
+		if ( $current_item == $saved_item ) {
+			push @outarray, '&nbsp;-';
+		} else {
+			push @outarray, $current_item;
+			$saved_item = $current_item;
+		}
+	}
+	@outarray;
+}
+		
 sub displaySets {
-	my $self    = shift;
-	#FIXME
-	my $setName = shift;
+	my $self             = shift;	
+	my $r                = $self->r;
+	my $urlpath          = $r->urlpath;
+	my $db               = $r->db;
+	my $ce               = $r->ce;
+	my $authz            = $r->authz;
+	my $courseName       = $urlpath->arg("courseID");
+	my $setName          = $urlpath->arg("setID");
+	my $user             = $r->param('user');
+	my $setRecord        = $self->{setRecord};
+	my $root             = $ce->{webworkURLs}->{root};
 	
-	my $r          = $self->{r};
-	my $db         = $self->{db};
-	my $ce         = $self->{ce};
-	my $authz      = $self->{authz};
-	my $user       = $r->param('user');
-	my $courseName = $ce->{courseName};
-	my $setRecord  = $db->getGlobalSet($setName); # checked
-	die "global set $setName  not found." unless $setRecord;
-	my $root       = $ce->{webworkURLs}->{root};
-	my $url        = $r->uri; 
+	my $setStatsPage     = $urlpath->newFromModule($urlpath->module, $r, courseID=>$courseName,statType=>'sets',setID=>$setName);
 	my $sort_method_name = $r->param('sort');  
-	my @studentList   = $db->listUsers;
-
+	# DBFIXME duplicate call
+	my @studentList      = $db->listUsers;
+    
+   	my @index_list                           = ();  # list of all student index 
+	my @score_list                           = ();  # list of all student total percentage scores 
+    my %attempts_list_for_problem            = ();  # a list of the number of attempts for each problem
+    my %number_of_attempts_for_problem       = ();  # the total number of attempst for this problem (sum of above list)
+    my %number_of_students_attempting_problem = ();  # the number of students attempting this problem.
+    my %correct_answers_for_problem          = ();  # the number of students correctly answering this problem (partial correctness allowed)
 	my $sort_method = sub {
 		my ($a,$b) = @_;
 		return 0 unless defined($sort_method_name);
@@ -167,100 +286,172 @@ sub displaySets {
 		return $b->{index} <=> $a->{index} if $sort_method_name eq 'index';
 		return $a->{section} cmp $b->{section} if $sort_method_name eq 'section';
 		if ($sort_method_name =~/p(\d+)/) {
-			return $b->{problemData}->{$1} <=> $a->{problemData}->{$1};  # sort by number of attempts.
+		    my $left  =  $b->{problemData}->{$1} ||0;
+		    my $right =  $a->{problemData}->{$1} ||0;
+			return $left <=> $right;  # sort by number of attempts.
 		}
 
 	};
-	#FIXME  need to be able to sort by index and score as well.
+
 ###############################################################
-#  Print table
+#  Print tables
 ###############################################################
-	my @problems = sort {$a <=> $b } $db->listUserProblems($user, $setName);
-
-	# FIXME I'm assuming the problems are all the same
-
-	my $num_of_problems  = @problems;
+	
+	my $max_num_problems  = 0;
 	# get user records
-	$WeBWorK::timer->continue("Begin obtaining user records for set $setName") if defined($WeBWorK::timer);
+	debug("Begin obtaining problem records for  set $setName");
+	# DBFIXME use an iterator
 	my @userRecords  = $db->getUsers(@studentList);
-	$WeBWorK::timer->continue("End obtaining user records for set $setName") if defined($WeBWorK::timer);
-
+	debug("End obtaining user records for set $setName");
+    debug("begin main loop");
  	my @augmentedUserRecords    = ();
+ 	my $number_of_active_students;
+    
+    ########################################
+    # Notes for factoring this calculation
+    #
+    # Inputs include:
+    # $user
+    # $setName
+    # @userRecords
+    #               @problemRecords  these are fetched for each student in @userRecords
+    #
+    ###################################
+   
 	foreach my $studentRecord (@userRecords)   {
+		next unless ref($studentRecord);
 		my $student = $studentRecord->user_id;
 		next if $studentRecord->last_name =~/^practice/i;  # don't show practice users
-		next if $studentRecord->status !~/C/;              # don't show dropped students FIXME
-	    my $status = 0;
-	    my $attempted = 0;
-	    my $longStatus = '';
-	    my $string     = '';
-	    my $twoString  = '';
-	    my $totalRight = 0;
-	    my $total      = 0;
-		my $num_of_attempts = 0;
-		my %h_problemData  = ();
+		next unless $ce->status_abbrev_has_behavior($studentRecord->status, "include_in_stats");
+		$number_of_active_students++;
+	    my $string          = '';
+	    my $twoString       = '';
+	    my $totalRight      = 0;
+	    my $total           = 0;
+		my $total_num_of_attempts_for_set = 0;
+		my %h_problemData   = ();
 		my $probNum         = 0;
-		my @triplets = map {[$student, $setName, $_ ]} @problems;
-		$WeBWorK::timer->continue("Begin obtaining problem records for user $student set $setName") if defined($WeBWorK::timer);
-		my @problemRecords = $db->getUserProblems( @triplets );
-		$WeBWorK::timer->continue("End obtaining problem records for user $student set $setName") if defined($WeBWorK::timer);
+		
+		debug("Begin obtaining problem records for user $student set $setName");
+		
+		# DBFIXME use an iterator
+		my @problemRecords;
+		if ( $setRecord->assignment_type =~ /gateway/ ) {
+			my @setVersions = $db->listSetVersions($student, $setName);
+			foreach my $ver ( @setVersions ) {
+				push( @problemRecords,
+				      $db->getAllProblemVersions($student,
+								 $setName, $ver) );
+			}
+		} else {
+			@problemRecords = sort {$a->problem_id <=> $b->problem_id } $db->getAllUserProblems( $student, $setName );
+		}
+		debug("End obtaining problem records for user $student set $setName");
 
+		my $num_of_problems = @problemRecords;
+		$max_num_problems = ($max_num_problems>= $num_of_problems) ? $max_num_problems : $num_of_problems;
+	   ########################################
+		# Notes for factoring the calculation in this loop.
+		#
+		# Inputs include:
+		# 
+		#
+		# @problemRecords  
+		# returns
+		#       $num_of_attempts
+		#       $status
+		# updates
+		#     	$number_of_students_attempting_problem{$probID}++;
+		# 		@{ $attempts_list_for_problem{$probID} }   
+		# 		$number_of_attempts_for_problem{$probID}          
+		# 		$total_num_of_attempts_for_set                    
+		# 		$correct_answers_for_problem{$probID}   
+		#    
+		#       $string (formatting output)
+		#       $twoString (more formatted output)
+		#       $total
+		#       $totalRight
+		###################################
+   
 		foreach my $problemRecord (@problemRecords) {
-			my $prob = $problemRecord->problem_id;
-		#foreach my $prob (@problems) {
-			#my $problemRecord   = $db->getUserProblem($student, $setName, $prob);
-			$probNum++;
-			my $valid_status    = 0;
-			unless (defined($problemRecord) ){
+			next unless ref($problemRecord);
+
 				# warn "Can't find record for problem $prob in set $setName for $student";
 				# FIXME check the legitimate reasons why a student record might not be defined
-				next;
-			}
-	    	$status             = $problemRecord->status || 0;
-	        $attempted          = $problemRecord->attempted;
+			####################################################################
+			# Grab data from the database
+			####################################################################
+			# It's possible that $problemRecord->num_correct or $problemRecord->num_correct
+			# or $problemRecord->status is an empty 
+			# or blank string instead of 0.  The || clause fixes this and prevents 
+			# warning messages in the comparisons below.
+			
+			my $probID             = $problemRecord->problem_id;
+			my $attempted          = $problemRecord->attempted;
+			my $num_correct        = $problemRecord->num_correct     || 0;
+			my $num_incorrect      = $problemRecord->num_incorrect   || 0;
+			my $num_of_attempts    = $num_correct + $num_incorrect;
+			
+		    # initialize the number of correct answers for this problem 
+		    # if the value has not been defined.
+	        $correct_answers_for_problem{$probID}  = 0 unless defined($correct_answers_for_problem{$probID});
+		
+	        
+			my $probValue          = $problemRecord->value;
+			# set default problem value here
+			$probValue             = 1 unless defined($probValue) and $probValue ne "";  # FIXME?? set defaults here?
+			
+			my $status             = $problemRecord->status          || 0;
+			# sanity check that the status (score) is between 0 and 1
+	        my $valid_status       = ($status >= 0 and $status <=1 ) ? 1 : 0;
+	        
+	        ###################################################################
+	        # Determine the string $longStatus which will display the student's current score
+	        ###################################################################
+	        my $longStatus = '';
 			if (!$attempted){
-				$longStatus     = '.  ';
-			}
-			elsif   ($status >= 0 and $status <=1 ) {
-				$valid_status   = 1;
+				$longStatus     = '.';
+			} elsif   ($valid_status) {
 				$longStatus     = int(100*$status+.5);
-				if ($longStatus == 100) {
-					$longStatus = 'C  ';
-				}
-				else {
-					$longStatus = &threeSpaceFill($longStatus);
-				}
-			}
-			else	{
-				$longStatus 	= 'X  ';
+				$longStatus     = ($longStatus == 100) ? 'C' : $longStatus;
+			} else	{
+				$longStatus 	= 'X';
 			}
+			
+			$string          .=  threeSpaceFill($longStatus);
+			$twoString       .= threeSpaceFill($num_incorrect);
 
-			my $incorrect     = $problemRecord->num_incorrect || 0; 
-			# It's possible that $incorrect is an empty or blank string instead of 0  the || clause fixes this and prevents 
-			# warning messages in the comparison below.
-			$incorrect        = ($incorrect < 99) ? $incorrect: 99;  # take min
-			$string          .=  $longStatus;
-			$twoString       .= threeSpaceFill($incorrect);
-			my $probValue     = $problemRecord->value;
-			$probValue        = 1 unless defined($probValue);  # FIXME?? set defaults here?
 			$total           += $probValue;
 			$totalRight      += round_score($status*$probValue) if $valid_status;
-			my $num_correct   = $problemRecord->num_incorrect || 0;
-			my $num_incorrect = $problemRecord->num_correct   || 0;
-			$num_of_attempts += $num_correct + $num_incorrect;
-			$h_problemData{$probNum} = $incorrect;
+
+			
+			
+			
+			
+			
+			 # add on the scores for this problem
+			if (defined($attempted) and $attempted) {
+				$number_of_students_attempting_problem{$probID}++;
+				push( @{ $attempts_list_for_problem{$probID} } ,     $num_of_attempts);
+				$number_of_attempts_for_problem{$probID}             += $num_of_attempts;
+				$h_problemData{$probID}                               = $num_incorrect;
+				$total_num_of_attempts_for_set                       += $num_of_attempts;
+				$correct_answers_for_problem{$probID}                += $status;
+			}
+			
 		}
-		# FIXME   we can do this more effficiently  get the list first
 		
 		
-		my $act_as_student_url = "$root/$courseName/$setName?user=".$r->param("user").
-			"&effectiveUser=".$studentRecord->user_id()."&key=".$r->param("key");
-		my $email    = $studentRecord->email_address;
+		my $act_as_student_url = $self->systemLink($urlpath->new(type=>'set_list',args=>{courseID=>$courseName}),
+		                                           params=>{effectiveUser => $studentRecord->user_id}
+		);
+		my $email              = $studentRecord->email_address;
 		# FIXME  this needs formatting
 		
-		my $avg_num_attempts = ($num_of_problems) ? $num_of_attempts/$num_of_problems : 0;
+		my $avg_num_attempts = ($num_of_problems) ? $total_num_of_attempts_for_set/$num_of_problems : 0;
 		my $successIndicator = ($avg_num_attempts) ? ($totalRight/$total)**2/$avg_num_attempts : 0 ;
-		my $temp_hash         = {    user_id     => $studentRecord->user_id,
+		
+		my $temp_hash         = {         user_id        => $studentRecord->user_id,
 		                                  last_name      => $studentRecord->last_name,
 		                                  first_name     => $studentRecord->first_name,
 		                                  score          => $totalRight,
@@ -273,213 +464,150 @@ sub displaySets {
 		                                  email_address  => $studentRecord->email_address,
 		                                  problemData    => {%h_problemData},
 		}; 
+		# add this data to the list of total scores (out of 100)
+		# add this data to the list of success indices.
+		push( @index_list, $temp_hash->{index});
+		push( @score_list, ($temp_hash->{total}) ?$temp_hash->{score}/$temp_hash->{total} : 0 ) ;
 		push( @augmentedUserRecords, $temp_hash );
 		                                
 	}	
+	debug("end mainloop");
 	
 	@augmentedUserRecords = sort {           &$sort_method($a,$b)
 												||
 							lc($a->{last_name}) cmp lc($b->{last_name} ) } @augmentedUserRecords;
-							
-		# construct header
-	my $problem_header = '';
-	my $i=0;
-	foreach (@problems) {
-	    $i++;
-		$problem_header .= CGI::a({"href"=>$url."?".$self->url_authen_args."&sort=p$i"},threeSpaceFill($i) );
-	}
-	print
-	    defined($sort_method_name) ?"sort method is $sort_method_name":"",
-		CGI::start_table({-border=>5}),
-		CGI::Tr(CGI::th(  {-align=>'center'},
-			[CGI::a({"href"=>$url."?".$self->url_authen_args."&sort=name"},'Name'),
-			 CGI::a({"href"=>$url."?".$self->url_authen_args."&sort=score"},'Score'),
-			 'Out'.CGI::br().'Of',
-			 CGI::a({"href"=>$url."?".$self->url_authen_args."&sort=index"},'Ind'),
-			 '<pre>Problems'.CGI::br().$problem_header.'</pre>',
-			 CGI::a({"href"=>$url."?".$self->url_authen_args."&sort=section"},'Section'),
-			 'Recitation',
-			 'login_name',
-			 ])
+	
+	# sort the problem IDs
+	my @problemIDs         = sort {$a<=>$b} keys %correct_answers_for_problem;
+	# determine index quartiles
+    my @brackets1          = (90,80,70,60,50,40,30,20,10);  #% students having scores or indices above this cutoff value
+    my @brackets2          = (95, 75,50,25,5,1);       # % students having this many incorrect attempts or more  
+	my %index_percentiles = determine_percentiles(\@brackets1, @index_list);
+    my %score_percentiles = determine_percentiles(\@brackets1, @score_list);
+    my %attempts_percentiles_for_problem = ();
+    my %problemPage                      = (); # link to the problem page
+    foreach my $probID (@problemIDs) {
+    	$attempts_percentiles_for_problem{$probID} =   {
+    		determine_percentiles([@brackets2], @{$attempts_list_for_problem{$probID}})
 
-		);
-								
-	foreach my $rec (@augmentedUserRecords) {
-		my $fullName = join("", $rec->{first_name}," ", $rec->{last_name});
-		my $email    = $rec->{email_address}; 
-		my $twoString  = $rec->{twoString};                             
-		print CGI::Tr(
-			CGI::td(CGI::a({-href=>$rec->{act_as_student}},$fullName), CGI::br(), CGI::a({-href=>"mailto:$email"},$email)),
-			CGI::td( sprintf("%0.2f",$rec->{score}) ), # score
-			CGI::td($rec->{total}), # out of 
-			CGI::td(sprintf("%0.0f",100*($rec->{index}) )),   # indicator
-			CGI::td($rec->{problemString}), # problems
-			CGI::td($rec->{section}),
-			CGI::td($rec->{recitation}),
-			CGI::td($rec->{user_id}),			
-			
-		);
-	}
+    	}; 
+    	$problemPage{$probID} = $urlpath->newFromModule("WeBWorK::ContentGenerator::Problem", $r, 
+			courseID => $courseName, setID => $setName, problemID => $probID);
 
-	print CGI::end_table();
-			
-			
+    }
+ 
+#####################################################################################
+# Table showing the percentage of students with correct answers for each problems
+#####################################################################################
 
-			
-	return "";
-}
-sub displayStudents {
-	my $self     = shift;
-	my $studentName  = shift;
-	my $r = $self->{r};
-	my $db = $self->{db};
-	my $ce = $self->{ce};
-	my $courseName = $ce->{courseName};
-	my $studentRecord = $db->getUser($studentName); # checked
-	die "record for user $studentName not found" unless $studentRecord;
-	my $root = $ce->{webworkURLs}->{root};
-	
-	my @setIDs    = sort $db->listUserSets($studentName);
-	my $fullName = join("", $studentRecord->first_name," ", $studentRecord->last_name);
-	my $act_as_student_url = "$root/$courseName/?user=".$r->param("user").
-			"&effectiveUser=".$studentRecord->user_id()."&key=".$r->param("key");
-
-	my $email    = $studentRecord->email_address;
-	print CGI::h3($fullName ), 
-	CGI::a({-href=>"mailto:$email"},$email),CGI::br(),
-	"Section: ", $studentRecord->section, CGI::br(),
-	"Recitation: ", $studentRecord->recitation,CGI::br(),
-	CGI::a({-href=>$act_as_student_url},$studentRecord->user_id);	
-	
-	###############################################################
-	#  Print table
-	###############################################################
+print  
 
-	# FIXME I'm assuming the problems are all the same
-	# FIXME what does this mean?
-	
-	my @rows;
-	my $max_problems=0;
-	
-	foreach my $setName (@setIDs)   {
-	    my $status = 0;
-	    my $attempted = 0;
-	    my $longStatus = '';
-	    my $string     = '';
-	    my $twoString  = '';
-	    my $totalRight = 0;
-	    my $total      = 0;
-		my $num_of_attempts = 0;
-		my @problems = sort {$a <=> $b } $db->listUserProblems($studentName, $setName);
-		my $num_of_problems  = @problems;
-		$max_problems = $num_of_problems if $num_of_problems > $max_problems;
-		# construct header
-		$WeBWorK::timer->continue("Begin collecting problems for set $setName") if defined($WeBWorK::timer);
-		my @problemRecords = $db->getUserProblems( map {[$studentName, $setName,$_]}  @problems);
-		$WeBWorK::timer->continue("End collecting problems for set $setName") if defined($WeBWorK::timer);
-		foreach my $problemRecord (@problemRecords) {
-			my $prob = $problemRecord->problem_id;
-		#foreach my $prob (@problems) {
-			#my $problemRecord   = $db->getUserProblem($studentName, $setName, $prob);
-			
-			my $valid_status    = 0;
-			unless (defined($problemRecord) ){
-				# warn "Can't find record for problem $prob in set $setName for $student";
-				# FIXME check the legitimate reasons why a student record might not be defined
-				next;
-			}
-	    	$status             = $problemRecord->status || 0;
-	        $attempted          = $problemRecord->attempted;
-			if (!$attempted){
-				$longStatus     = '.  ';
-			}
-			elsif   ($status >= 0 and $status <=1 ) {
-				$valid_status   = 1;
-				$longStatus     = int(100*$status+.5);
-				if ($longStatus == 100) {
-					$longStatus = 'C  ';
-				}
-				else {
-					$longStatus = &threeSpaceFill($longStatus);
-				}
-			}
-			else	{
-				$longStatus 	= 'X  ';
-			}
+	   CGI::p('The percentage of active students with correct answers for each problem'),
+		CGI::start_table({-border=>1}),
+		CGI::Tr(CGI::td(
+			['Problem #', 
+			   map {CGI::a({ href=>$self->systemLink($problemPage{$_}) },$_)} @problemIDs
+			]
+		)),
+		CGI::Tr(CGI::td(
+			[ '% correct',map {($number_of_students_attempting_problem{$_})
+			                      ? sprintf("%0.0f",100*$correct_answers_for_problem{$_}/$number_of_students_attempting_problem{$_})
+			                      : '-'}			                   
+			                       @problemIDs 
+			]
+		)),
+		CGI::Tr(CGI::td(
+			[ 'avg attempts',map {($number_of_students_attempting_problem{$_})
+			                      ? sprintf("%0.1f",$number_of_attempts_for_problem{$_}/$number_of_students_attempting_problem{$_})
+			                      : '-'}			                   
+			                       @problemIDs 
+			]
+		)),
+		CGI::end_table();
 
-			my $incorrect     = $problemRecord->num_incorrect;
-			$incorrect        = ($incorrect < 99) ? $incorrect: 99;  # take min
-			$string          .=  $longStatus;
-			$twoString       .= threeSpaceFill($incorrect);
-			my $probValue     = $problemRecord->value;
-			$probValue        = 1 unless defined($probValue);  # FIXME?? set defaults here?
-			$total           += $probValue;
-			$totalRight      += round_score($status*$probValue) if $valid_status;
-			my $num_correct   = $problemRecord->num_incorrect || 0;
-			my $num_incorrect = $problemRecord->num_correct   || 0;
-			$num_of_attempts += $num_correct + $num_incorrect;
-		}
-		
-		# FIXME   we can do this more effficiently  get the list first
-		
+#####################################################################################
+# table showing percentile statistics for scores and success indices
+#####################################################################################
+	print  
 
-		# FIXME  this needs formatting
-		
-		my $avg_num_attempts = ($num_of_problems) ? $num_of_attempts/$num_of_problems : 0;
-		my $successIndicator = ($avg_num_attempts) ? ($totalRight/$total)**2/$avg_num_attempts : 0 ;
-	
-		push @rows, CGI::Tr(
-			CGI::td($setName),
-			CGI::td(sprintf("%0.2f",$totalRight)), # score
-			CGI::td($total), # out of 
-			CGI::td(sprintf("%0.0f",100*$successIndicator)),   # indicator
-			CGI::td("<pre>$string\n$twoString</pre>"), # problems
-			#CGI::td($studentRecord->section),
-			#CGI::td($studentRecord->recitation),
-			#CGI::td($studentRecord->user_id),			
-			
-		);
-	
-	}
+	    	CGI::p(CGI::i('The percentage of students receiving at least these scores.<br/>
+	    	       The median score is in the 50% column. ')),
+			CGI::start_table({-border=>1}),
+				CGI::Tr(
+					CGI::td( ['% students',
+					          (map {  "&nbsp;".$_   } @brackets1) ,
+					          'top score ', 
+					         
+					         ]
+					)
+				),
+				CGI::Tr(
+					CGI::td( [
+						'Score',
+						(prevent_repeats map { sprintf("%0.0f",100*$score_percentiles{$_})   } @brackets1),
+						sprintf("%0.0f",100),
+						]
+					)
+				),
+				CGI::Tr(
+					CGI::td( [
+						'Success Index',
+						(prevent_repeats  map { sprintf("%0.0f",100*$index_percentiles{$_})   } @brackets1),
+						sprintf("%0.0f",100),
+						]
+					)
+				)
+			;
+
+	print     CGI::end_table(),	
+
+		;
+
+#####################################################################################
+# table showing percentile statistics for scores and success indices
+#####################################################################################
+	print  
+
+	    	CGI::p(CGI::i('Percentile cutoffs for number of attempts. <br/> The 50% column shows the median number of attempts')),
+			CGI::start_table({-border=>1}),
+				CGI::Tr(
+					CGI::td( ['% students',
+					          (map {  "&nbsp;".($_)  } @brackets2) ,
+					        
+					         ]
+					)
+				);
+
+
+	foreach my $probID (@problemIDs) {
+		print	CGI::Tr(
+					CGI::td( [
+						CGI::a({ href=>$self->systemLink($problemPage{$probID}) },"Prob $probID"),
+						( prevent_repeats reverse map { sprintf("%0.0f",$attempts_percentiles_for_problem{$probID}->{$_})   } @brackets2),
+
+						]
+					)
+				);
 	
-	my $problem_header = "";
-	foreach (1 .. $max_problems) {
-		$problem_header .= &threeSpaceFill($_);
 	}
-	
-	my $table_header = join("\n",
-		CGI::start_table({-border=>5}),
-		CGI::Tr(
-			CGI::th({ -align=>'center',},'Set'),
-			CGI::th({ -align=>'center', },'Score'),
-			CGI::th({ -align=>'center', },'Out'.CGI::br().'Of'),
-			CGI::th({ -align=>'center', },'Ind'),
-			CGI::th({ -align=>'center', },'Problems'.CGI::br().CGI::pre($problem_header)),
-			#CGI::th({ -align=>'center', },'Section'),
-			#CGI::th({ -align=>'center', },'Recitation'),
-			#CGI::th({ -align=>'center', },'login_name'),
-			#CGI::th({ -align=>'center', },'ID'),
-		)
-	);
-	
-	print $table_header;
-	print @rows;
 	print CGI::end_table();
 			
 	return "";
 }
 
+
 #################################
 # Utility function NOT a method
 #################################
 sub threeSpaceFill {
-    my $num = shift @_ || 0;
-    
-    if ($num < 10) {return "$num".'  ';}
-    elsif ($num < 100) {return "$num".' ';}
-    else {return "$num";}
+	my $num = shift @_ || 0;
+
+	if (length($num)<=1) {return "$num".'&nbsp;&nbsp;';}
+	elsif (length($num)==2) {return "$num".'&nbsp;';}
+	else {return "## ";}
 }
 sub round_score{
 	return shift;
 }
+
 1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm b/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm
new file mode 100644
index 0000000000..3444ca5f69
--- /dev/null
+++ b/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm
@@ -0,0 +1,1190 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm,v 1.36 2008/06/19 19:34:31 glarose 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::ContentGenerator::Instructor::StudentProgress;
+use base qw(WeBWorK::ContentGenerator::Instructor);
+
+=head1 NAME
+
+WeBWorK::ContentGenerator::Instructor::StudentProgress - Display Student Progress.
+
+=cut
+
+use strict;
+use warnings;
+#use CGI qw(-nosticky );
+use WeBWorK::CGI;
+use WeBWorK::Debug;
+use WeBWorK::ContentGenerator::Grades;
+#use WeBWorK::Utils qw(readDirectory list2hash max sortByName);
+use WeBWorK::Utils::SortRecords qw/sortRecords/;
+use WeBWorK::Utils::Grades qw/list_set_versions/;
+use WeBWorK::DB::Record::UserSet;  #FIXME -- this is only used in one spot.
+
+# The table format has been borrowed from the Grades.pm module
+sub initialize {
+	my $self     = shift; 
+	# FIXME  are there args here?
+	my @components = @_;
+	my $r          = $self->{r};
+	my $urlpath    = $r->urlpath;
+	my $type       = $urlpath->arg("statType") || '';
+	my $db         = $self->{db};
+	my $ce         = $self->{ce};
+	my $authz      = $self->{authz};
+	my $courseName = $urlpath->arg('courseID');
+ 	my $user       = $r->param('user');
+ 	
+ 	# Check permissions
+	return unless $authz->hasPermissions($user, "access_instructor_tools");
+	
+ 	$self->{type}  = $type;
+ 	if ($type eq 'student') {
+ 		my $studentName = $r->urlpath->arg("userID") || $user;
+ 		$self->{studentName } = $studentName;
+ 		
+ 	} elsif ($type eq 'set') {
+ 		my $setName = $r->urlpath->arg("setID") || 0;
+ 		$self->{setName}     = $setName;
+ 		my $setRecord  = $db->getGlobalSet($setName); # checked
+		die "global set $setName  not found." unless $setRecord;
+		$self->{set_due_date} = $setRecord->due_date;
+		$self->{setRecord}   = $setRecord;
+ 	}
+}
+
+
+sub title { 
+	my ($self) = @_;
+	my $r = $self->r;
+	my $authz = $r->authz;
+	my $user = $r->param('user');
+	
+	# Check permissions
+	return "" unless $authz->hasPermissions($user, "access_instructor_tools");
+	
+	my $type                = $self->{type};
+	my $string              = "Student Progress for ".$self->{ce}->{courseName}." ";
+	if ($type eq 'student') {
+		$string             .= "student ".$self->{studentName};
+	} elsif ($type eq 'set' ) {
+		$string             .= "set   ".$self->{setName};
+		$string             .= ".&nbsp;&nbsp;&nbsp; Due ". $self->formatDateTime($self->{set_due_date});
+	}
+	return $string;
+}
+sub siblings {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $db = $r->db;
+	my $authz = $r->authz;
+	my $user = $r->param('user');
+	my $urlpath = $r->urlpath;
+	
+	# Check permissions
+	return "" unless $authz->hasPermissions($user, "access_instructor_tools");
+	
+	my $courseID = $urlpath->arg("courseID");
+	my $eUserID  = $r->param("effectiveUser");
+	my @setIDs   = sort  $db->listGlobalSets;
+	
+	my $progress     = $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::StudentProgress",  $r, 
+	                                        courseID => $courseID);
+	
+	print CGI::start_div({class=>"info-box", id=>"fisheye"});
+	print CGI::h2("Student Progress");
+	#print CGI::start_ul({class=>"LinksMenu"});
+	#print CGI::start_li();
+	#print CGI::span({style=>"font-size:larger"}, CGI::a({href=>$self->systemLink($stats)}, 'Statistics'));
+	print CGI::start_ul();
+	foreach my $setID (@setIDs) {
+		my $problemPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::StudentProgress", $r, 
+			courseID => $courseID, setID => $setID,statType => 'set',);
+		my $prettySetID = $setID;
+		$prettySetID =~ s/_/ /g;
+		print CGI::li({},CGI::a({href=>$self->systemLink($problemPage)}, $prettySetID));
+	}
+	
+	print CGI::end_ul();
+	#print CGI::end_li();
+	#print CGI::end_ul();
+	print CGI::end_div();
+	
+	return "";
+}
+sub body {
+	my $self       = shift;
+	my $r          = $self->r;
+	my $urlpath    = $r->urlpath;
+	my $db         = $r->db;
+	my $ce         = $r->ce;
+	my $authz      = $r->authz;
+	my $user       = $r->param('user');
+	my $courseName = $urlpath->arg("courseID");
+	my $type       = $self->{type};
+
+	# Check permissions	
+	return CGI::div({class=>"ResultsWithError"}. CGI::p("You are not authorized to access instructor tools"))
+		unless $authz->hasPermissions($user, "access_instructor_tools");
+		
+	if ($type eq 'student') {
+		my $studentName = $self->{studentName};
+		my $studentRecord = $db->getUser($studentName) # checked
+			or die "record for user $studentName not found";
+		my $fullName = $studentRecord->full_name;
+        my $courseHomePage = $urlpath->new(type  => 'set_list',
+        	args => {courseID=>$courseName});
+		my $email = $studentRecord->email_address;
+		
+		print CGI::a({-href=>"mailto:$email"}, $email), CGI::br(),
+			"Section: ", $studentRecord->section, CGI::br(),
+			"Recitation: ", $studentRecord->recitation, CGI::br();
+		
+		if ($authz->hasPermissions($user, "become_student")) {
+			my $act_as_student_url = $self->systemLink($courseHomePage,
+				params => {effectiveUser=>$studentName});
+			
+			print 'Act as: ', CGI::a({-href=>$act_as_student_url},$studentRecord->user_id);
+		}
+		
+		print WeBWorK::ContentGenerator::Grades::displayStudentStats($self,$studentName);
+	} elsif( $type eq 'set') {
+		$self->displaySets($self->{setName});
+	} elsif ($type eq '') {
+		
+		$self->index;
+	} else {
+		warn "Don't recognize statistics display type: |$type|";
+
+	}
+	
+
+	return '';
+
+}
+sub index {
+	my $self          = shift;
+	my $r             = $self->r;
+	my $urlpath       = $r->urlpath;
+	my $ce            = $r->ce;
+	my $db            = $r->db;
+	my $courseName    = $urlpath->arg("courseID");
+	my @studentList   = sort $db->listUsers;
+	my @setList       = sort  $db->listGlobalSets;
+
+## Edit to filter out students you aren't allowed to see
+#
+	# DBFIXME do filtering in database
+	my @myUsers;
+#	my @studentRecords = $db->getUsers;  #this is never used
+	my $user = $r->param("user");
+	
+	my (@viewable_sections, @viewable_recitations);
+	if (defined @{$ce->{viewable_sections}->{$user}})
+		{@viewable_sections = @{$ce->{viewable_sections}->{$user}};}
+	if (defined @{$ce->{viewable_recitations}->{$user}})
+		{@viewable_recitations = @{$ce->{viewable_recitations}->{$user}};}
+	if (@viewable_sections or @viewable_recitations){
+		foreach my $studentL (@studentList){
+			my $keep = 0;
+			my $student = $db->getUser($studentL);
+			foreach my $sec (@viewable_sections){
+				if ($student->section() eq $sec){$keep = 1; last;}
+			}
+			foreach my $rec (@viewable_recitations){
+				if ($student->recitation() eq $rec){$keep = 1; last;}
+			}
+			if ($keep) {push @myUsers, $studentL;}		
+		}
+#	@studentList = @myUsers;
+	}
+	else {@myUsers = @studentList;}
+	
+	# DBFIXME sort in database
+	my @studentRecords = $db->getUsers(@myUsers);
+	my @sortedStudentRecords = sortRecords({fields=>[qw/last_name first_name user_id/]}, @studentRecords);
+		
+	my @setLinks      = ();
+	my @studentLinks  = (); 
+	foreach my $set (@setList) {
+	    my $setStatisticsPage   = $urlpath->newFromModule($urlpath->module, $r, 
+	                                                      courseID => $courseName,
+	                                                      statType => 'set',
+	                                                      setID    => $set
+	    );
+	    my $prettySetID = $set;
+	    $prettySetID =~ s/_/ /g;
+		push @setLinks, CGI::a({-href=>$self->systemLink($setStatisticsPage) }, $prettySetID);
+	}
+	
+	foreach my $studentRecord (@sortedStudentRecords) {
+		my $first_name = $studentRecord->first_name;
+		my $last_name = $studentRecord->last_name;
+		my $user_id = $studentRecord->user_id;
+		my $userStatisticsPage  = $urlpath->newFromModule($urlpath->module, $r, 
+	                                                      courseID => $courseName,
+	                                                      statType => 'student',
+	                                                      userID   => $user_id
+	    );
+
+		push @studentLinks, CGI::a({-href=>$self->systemLink($userStatisticsPage,
+		                                                     prams=>{effectiveUser => $studentRecord->user_id}
+		                                                     )},"  $last_name, $first_name  ($user_id)" ),;	
+	}
+	print join("",
+		CGI::start_table({-border=>2, -cellpadding=>20}),
+		CGI::Tr({},
+			CGI::td({-valign=>'top'}, 
+				CGI::h3({-align=>'center'},'View student progress by set'),
+				CGI::ul(  CGI::li( [@setLinks] ) ), 
+			),
+			CGI::td({-valign=>'top'}, 
+				CGI::h3({-align=>'center'},'View student progress by student'),
+				CGI::ul(CGI::li( [ @studentLinks ] ) ),
+			),
+		),
+		CGI::end_table(),
+	);
+	
+}
+###################################################
+sub displaySets {
+	my $self             = shift;	
+	my $r                = $self->r;
+	my $urlpath          = $r->urlpath;
+	my $db               = $r->db;
+	my $ce               = $r->ce;
+	my $authz            = $r->authz;
+	my $courseName       = $urlpath->arg("courseID");
+	my $setName          = $urlpath->arg("setID");
+	my $user             = $r->param('user');
+	my $GlobalSet        = $self->{setRecord};
+	my $root             = $ce->{webworkURLs}->{root};
+	
+	my $setStatsPage     = $urlpath->newFromModule($urlpath->module, $r, courseID=>$courseName,statType=>'sets',setID=>$setName);
+	my $primary_sort_method_name = $r->param('primary_sort');
+	my $secondary_sort_method_name = $r->param('secondary_sort'); 
+	my $ternary_sort_method_name = $r->param('ternary_sort');  
+
+	# DBFIXME duplicate call!
+	my @studentList      = $db->listUsers;
+    
+# another versioning/gateway change.  in many cases we don't want or need
+# all of the columns that are put in here by default, so we add a set of
+# flags for which columns to show.  for versioned sets we may also want to
+# only see the best score, so we include that as an option also.
+# these are ignored for non-versioned sets
+	my %showColumns = ( 'name' => 1, 'score' => 1, 'outof' => 1, 
+			    'date' => 0, 'testtime' => 0, 'index' => 1, 
+			    'problems' => 1, 'section' => 1, 'recit' => 1, 
+			    'login' => 1 );
+	my $showBestOnly = 0;
+
+   	my @index_list                           = ();  # list of all student index 
+	my @score_list                           = ();  # list of all student total percentage scores 
+	my %attempts_list_for_problem            = ();  # a list of the number of attempts for each problem
+	my %number_of_attempts_for_problem       = ();  # the total number of attempst for this problem (sum of above list)
+	my %number_of_students_attempting_problem = ();  # the number of students attempting this problem.
+	my %correct_answers_for_problem          = ();  # the number of students correctly answering this problem (partial correctness allowed)
+	my $sort_method = sub {
+		my ($a,$b,$sort_method_name) = @_;
+		return 0 unless defined($sort_method_name);
+		return lc($a->{last_name}) cmp lc($b->{last_name}) if $sort_method_name eq 'last_name';
+		return lc($a->{first_name}) cmp lc($b->{first_name}) if $sort_method_name eq 'first_name';
+		return 	lc($a->{email_address}) cmp lc($b->{email_address}) if $sort_method_name eq 'email_address';
+		return $b->{score} <=> $a->{score} if $sort_method_name eq 'score';
+		return $b->{index} <=> $a->{index} if $sort_method_name eq 'index';
+		return lc($a->{section}) cmp lc($b->{section}) if $sort_method_name eq 'section';
+		return lc($a->{recitation}) cmp lc($b->{recitation}) if $sort_method_name eq 'recitation';
+		return lc($a->{user_id}) cmp lc($b->{user_id}) if $sort_method_name eq 'user_id';
+		if ($sort_method_name =~/p(\d+)/) {
+			my $left  =  $b->{problemData}->{$1} ||0;
+			my $right =  $a->{problemData}->{$1} ||0;
+			return $left <=> $right;  # sort by number of attempts.
+		}
+
+	};
+	my %display_sort_method_name = (
+		last_name => 'last name',
+		first_name => 'first name',
+		email_address => 'email address',
+		score => 'score',
+		index => 'success indicator',
+		section => 'section',
+		recitation => 'recitation',
+		user_id => 'login name',
+	);				
+
+# get versioning information
+	my $setIsVersioned = 
+	    ( defined($GlobalSet->assignment_type()) && 
+	      $GlobalSet->assignment_type() =~ /gateway/ ) ? 1 : 0;
+
+# reset column view options based on whether the set is versioned and, if so,
+# the input parameters
+	if ( $setIsVersioned ) {
+  # the returning parameter lets us set defaults for versioned sets
+		my $ret = defined($r->param('returning')) ? 
+			$r->param('returning') : 0;
+		$showColumns{'date'} = ($ret && defined($r->param('show_date'))) ? $r->param('show_date') : 1;
+		$showColumns{'testtime'} = ($ret && defined($r->param('show_testtime'))) ? $r->param('show_testtime'):1;
+		$showColumns{'index'} = ($ret && defined($r->param('show_index'))) ? $r->param('show_index') : 0;
+		$showColumns{'problems'} = ($ret && defined($r->param('show_problems'))) ? $r->param('show_problems'):0;
+		$showColumns{'section'} = ($ret && defined($r->param('show_section'))) ? $r->param('show_section') : 0;
+		$showColumns{'recit'} = ($ret && defined($r->param('show_recitation'))) ? $r->param('show_recitation') : 0;
+		$showColumns{'login'} = ($ret && defined($r->param('show_login'))) ? $r->param('show_login') : 0;
+		$showBestOnly = ($ret && defined($r->param('show_best_only'))) ? $r->param('show_best_only') : 0;
+	}
+
+###############################################################
+#  Print tables
+###############################################################
+	
+	my $max_num_problems  = 0;
+	# get user records
+	debug("Begin obtaining user records for set $setName");
+	my @userRecords  = $db->getUsers(@studentList);
+	debug("End obtaining user records for set $setName");
+    debug("begin main loop");
+ 	my @augmentedUserRecords    = ();
+ 	my $number_of_active_students;
+
+## Edit to filter out students
+#
+	my @myUsers;
+	my $ActiveUser = $r->param("user");
+	my (@viewable_sections, @viewable_recitations);
+	if (defined @{$ce->{viewable_sections}->{$user}})
+		{@viewable_sections = @{$ce->{viewable_sections}->{$user}};}
+	if (defined @{$ce->{viewable_recitations}->{$user}})
+		{@viewable_recitations = @{$ce->{viewable_recitations}->{$user}};}
+	if (@viewable_sections or @viewable_recitations){
+		foreach my $student (@userRecords){
+			my $keep = 0;
+			foreach my $sec (@viewable_sections){
+				if ($student->section() eq $sec){$keep = 1; last;}
+			}
+			foreach my $rec (@viewable_recitations){
+				if ($student->recitation() eq $rec){$keep = 1; last;}
+			}
+			if ($keep) {push @myUsers, $student;}		
+		}
+	}
+	else {@myUsers = @userRecords;}
+	foreach my $studentRecord (@myUsers)   {
+		next unless ref($studentRecord);
+		my $studentName = $studentRecord->user_id;
+		next if $studentRecord->last_name =~/^practice/i;  # don't show practice users
+		next unless $ce->status_abbrev_has_behavior($studentRecord->status, "include_in_stats");
+		$number_of_active_students++;
+
+# build list of versioned sets for this student user
+# 		my @allSetNames = ();
+# 		my $notAssignedSet = 0;
+# 		if ( $setIsVersioned ) {
+# 			my @setVersions = $db->listSetVersions($studentName, $setName);
+# 			@allSetNames = map { "$setName,v$_" } @setVersions;
+# 			# if there aren't any set versions, is it because
+# 			#    the user isn't assigned the set (e.g., is a 
+# 			#    proctor), or because the user hasn't completed
+# 			#    any versions?
+# 			if ( ! @setVersions ) {
+# 				$notAssignedSet = 1 if (! $db->existsUserSet($studentName,$setName));
+# 			}
+# 
+# 		} else {
+# 			@allSetNames = ( "$setName" );
+# 		}
+        my( $ra_allSetVersionNames, $notAssignedSet) = list_set_versions($db, $studentName, $setName, $setIsVersioned);
+        my @allSetVersionNames = @{$ra_allSetVersionNames};
+        
+		# for versioned sets, we might be keeping only the high score
+		my $maxScore = -1;
+		my $max_hash = {};
+
+		foreach my $setName ( @allSetVersionNames ) {
+
+			my $status          = 0;
+			my $longStatus      = '';
+			my $string          = '';
+			my $twoString       = '';
+			my $totalRight      = 0;
+			my $total           = 0;
+			my $total_num_of_attempts_for_set = 0;
+			my %h_problemData   = ();
+			my $num_of_attempts;
+			my $num_of_problems;
+			
+			my $set;
+			my $userSet;
+            if ( $setIsVersioned ) {
+				my ($setN,$vNum) = ($setName =~ /(.+),v(\d+)$/);
+				# we'll also need information from the set
+				#    as we set up the display below, so get
+				#    the merged userset as well
+				$set = $db->getMergedSetVersion($studentRecord->user_id, $setN, $vNum);
+				$userSet = $set;
+				$setName = $setN;
+			} else {
+			    $set = $db->getMergedSet( $studentName, $setName );
+			
+			}
+		     #FIXME -- this seems like over kill -- perhaps we only need to pass in the set_id.
+		     # that is the only aspect of $set that is used in grade set.
+		     # the problem_random order sequence is used in the corresponding routine in Grades.pm
+		     
+		    unless ( ref($set) ) {
+		    	$set = new WeBWorK::DB::Record::UserSet;
+		    	$set->set_id($setName);
+		    }
+		    
+           ( $status, 
+             $longStatus, 
+             $string,
+             $twoString, 
+             $totalRight,
+             $total, 
+             $num_of_attempts, 
+             $num_of_problems) = grade_set( $db, $set, $setName, $studentName, $setIsVersioned,
+									    \%number_of_students_attempting_problem,
+									    \%attempts_list_for_problem,
+										\%number_of_attempts_for_problem,
+										\%h_problemData,
+										\$total_num_of_attempts_for_set,
+										\%correct_answers_for_problem,
+						       );
+			my $probNum         = 0;
+			my $act_as_student_url = '';
+
+
+# 		
+# 			# add on the scores for this problem
+# 			if (defined($attempted) and $attempted) {
+# 				$number_of_students_attempting_problem{$probID}++;
+# 				push( @{ $attempts_list_for_problem{$probID} } ,     $num_of_attempts);
+# 				$number_of_attempts_for_problem{$probID}             += $num_of_attempts;
+# 				$h_problemData{$probID}                               = $num_incorrect;
+# 				$total_num_of_attempts_for_set                       += $num_of_attempts;
+# 				$correct_answers_for_problem{$probID}                += $status;
+# 			}
+
+# 
+# 			# DBFIXME: to collect the problem records, we have 
+# 			#    to know which merge routines to call.  Should 
+# 			#    this really be an issue here?  That is, 
+# 			#    shouldn't the database deal with it invisibly 
+# 			#    by detecting what the problem types are?
+# 			# DBFIXME sort in database
+# 			my $userSet;
+# 			my @problemRecords = ();
+# 			if ( $setIsVersioned ) {
+# 				my ($setN,$vNum) = ($sN =~ /(.+),v(\d+)$/);
+# 				@problemRecords = sort {$a->problem_id <=> $b->problem_id } $db->getAllMergedProblemVersions( $student, $setN, $vNum );
+# 				# we'll also need information from the set
+# 				#    as we set up the display below, so get
+# 				#    the merged userset as well
+# 				$userSet = $db->getMergedSetVersion($studentRecord->user_id, $setN, $vNum);
+# 
+# 			} else {
+# 				@problemRecords = sort {$a->problem_id <=> $b->problem_id} $db->getAllMergedUserProblems( $student, $sN );
+# 			}
+# 			debug("End obtaining problem records for user $student set $sN");
+# 			my $num_of_problems = @problemRecords;
+# 			$max_num_problems = ($max_num_problems>= $num_of_problems) ? $max_num_problems : $num_of_problems;
+# 			########################################
+# 			# Notes for factoring the calculation in this loop.
+# 			#
+# 			# Inputs include:
+# 			#   @problemRecords  
+# 			# returns
+# 			#   $num_of_attempts
+# 			#   $status
+# 			# updates
+# 			#   $number_of_students_attempting_problem{$probID}++;
+# 			#   @{ $attempts_list_for_problem{$probID} }   
+# 			#   $number_of_attempts_for_problem{$probID}
+# 			#   $total_num_of_attempts_for_set
+# 			#   $correct_answers_for_problem{$probID}   
+# 			#    
+# 			#   $string (formatting output)
+# 			#   $twoString (more formatted output)
+# 			#   $longtwo (a combination of $string and $twostring)
+# 			#   $total
+# 			#   $totalRight
+# 			###################################
+#    
+# 			foreach my $problemRecord (@problemRecords) {
+# 				next unless ref($problemRecord);
+# 				# warn "Can't find record for problem $prob in set $setName for $student";
+# 				# FIXME check the legitimate reasons why a student record might not be defined
+# 				###########################################
+# 				# Grab data from the database
+# 				###########################################
+# 				# It's possible that 
+# 				# $problemRecord->num_correct or 
+# 				# $problemRecord->num_correct
+# 				# or $problemRecord->status is an empty 
+# 				# or blank string instead of 0.  
+# 				# The || clause fixes this and prevents 
+# 				# warning messages in the comparisons below.
+# 			
+# 				my $probID          = $problemRecord->problem_id;
+# 				my $attempted       = $problemRecord->attempted;
+# 				my $num_correct     = $problemRecord->num_correct     || 0;
+# 				my $num_incorrect   = $problemRecord->num_incorrect   || 0;
+# 				my $num_of_attempts = $num_correct + $num_incorrect;
+# 				# initialize the number of correct answers 
+# 				# for this problem if the value has not been 
+# 				# defined.
+# 				$correct_answers_for_problem{$probID} = 0 
+# 					unless defined($correct_answers_for_problem{$probID});
+# 
+# 				## This doesn't work - Fix it
+# 				my $probValue = $problemRecord->value;
+# 				# set default problem value here
+# 				# FIXME?? set defaults here?
+# 				$probValue = 1 unless defined($probValue) and 
+# 					$probValue ne "";  
+# 			
+# 				my $status  = $problemRecord->status || 0;
+# 
+# 				# sanity check that the status (score) is 
+# 				# between 0 and 1
+# 				my $valid_status = ($status>=0 && $status<=1)?1:0;
+# 
+# 				###########################################
+# 				# Determine the string $longStatus which 
+# 				# will display the student's current score
+# 				###########################################
+# 				my $longStatus = '';
+# 				if (!$attempted){
+# 					$longStatus     = '.';
+# 				} elsif   ($valid_status) {
+# 					$longStatus     = int(100*$status+.5);
+# 					$longStatus='C' if ($longStatus==100);
+# 				} else	{
+# 					$longStatus 	= 'X';
+# 				}
+# 			
+# 				$string     .= threeSpaceFill($longStatus);
+# 				$twoString  .= threeSpaceFill($num_incorrect);
+# 
+# 				$total      += $probValue;
+# 				$totalRight += round_score($status*$probValue) 
+# 					if $valid_status;
+# 			
+# 				# add on the scores for this problem
+# 				if (defined($attempted) and $attempted) {
+# 					$number_of_students_attempting_problem{$probID}++;
+# 					push( @{ $attempts_list_for_problem{$probID} } ,     $num_of_attempts);
+# 					$number_of_attempts_for_problem{$probID}             += $num_of_attempts;
+# 					$h_problemData{$probID}                               = $num_incorrect;
+# 					$total_num_of_attempts_for_set                       += $num_of_attempts;
+# 					$correct_answers_for_problem{$probID}                += $status;
+# 				}
+# 			
+# 			}  # end of problem record loop
+            
+            
+			# for versioned tests we might be displaying the 
+			# test date and test time
+			my $dateOfTest = '';
+			my $testTime = '';
+			if ( $setIsVersioned ) {
+				# if this isn't defined, something's wrong
+				if ( defined($userSet) ) {  
+					$dateOfTest = localtime($userSet->version_creation_time());
+					if ( defined($userSet->version_last_attempt_time()) && $userSet->version_last_attempt_time() ) {
+						$testTime = ($userSet->version_last_attempt_time() - $userSet->open_date() ) / 60; 
+						my $timeLimit = $userSet->version_time_limit()/60;
+						$testTime = $timeLimit if ( $testTime > $timeLimit );
+						$testTime = sprintf("%3.1f min", $testTime);
+					} elsif ( time() - $userSet->open_date() < $userSet->version_time_limit() ) {
+						$testTime = 'still open';
+					} else {
+						$testTime = 'time limit ' .
+							'exceeded';
+					}
+				} else {
+					$dateOfTest = '???';
+					$testTime = '???';
+				}
+			}
+		
+		
+			$act_as_student_url = $self->systemLink($urlpath->new(type=>'set_list',args=>{courseID=>$courseName}), params=>{effectiveUser => $studentRecord->user_id});
+			my $email              = $studentRecord->email_address;
+			# FIXME  this needs formatting
+
+			# change to give better output for gateways with; 
+			# only one attempt per version: just reports the 
+			# result for each problem, not the number of attempts.
+			my $longtwo = ($setIsVersioned && 
+				       $userSet->attempts_per_version == 1) ? 
+				       $string : "$string\n$twoString";
+		
+			my $avg_num_attempts = ($num_of_problems) ? $total_num_of_attempts_for_set/$num_of_problems : 0;
+			my $successIndicator = ($avg_num_attempts && $total) ? ($totalRight/$total)**2/$avg_num_attempts : 0 ;
+		
+			my $temp_hash         = { user_id        => $studentRecord->user_id,
+		                                  last_name      => $studentRecord->last_name,
+		                                  first_name     => $studentRecord->first_name,
+		                                  score          => $totalRight,
+		                                  total          => $total,
+		                                  index          => $successIndicator,
+		                                  section        => $studentRecord->section,
+		                                  recitation     => $studentRecord->recitation,
+		                                  problemString  => "<pre>$longtwo</pre>",
+		                                  act_as_student => $act_as_student_url,
+		                                  email_address  => $studentRecord->email_address,
+		                                  problemData    => {%h_problemData},
+						  date           => $dateOfTest,
+						  testtime       => $testTime,
+					      }; 
+			
+			# keep track of best score
+			if ( $totalRight > $maxScore ) {
+				$maxScore = $totalRight;
+				$max_hash = { %$temp_hash };
+			}
+
+			# if we're showing all records, add it in to the list
+			if ( ! $showBestOnly ) {
+				# add this data to the list of total scores (out of 100)
+				# add this data to the list of success indices.
+				push( @index_list, $temp_hash->{index});
+				push( @score_list, ($temp_hash->{total}) ?$temp_hash->{score}/$temp_hash->{total} : 0 ) ;
+				push( @augmentedUserRecords, $temp_hash );
+			}
+
+		} # this closes the loop through all set versions
+
+		# if we're showing only the best score, add the best score now
+		if ( $showBestOnly ) {
+			# if there's no %$max_hash, then we had no results
+			#    this occurs for proctors, for example
+			if ( $notAssignedSet ) {
+				next;
+			} elsif ( ! %$max_hash ) {
+				$max_hash = { 
+					user_id => $studentRecord->user_id(),
+					last_name=>$studentRecord->last_name(),
+					first_name=>$studentRecord->first_name(),
+					score => 0,
+					total => 'n/a',
+					index => 0,
+					section => $studentRecord->section(),
+					recitation=>$studentRecord->recitation(),
+					problemString => 'no attempt recorded',
+					act_as_student => $self->systemLink($urlpath->new(type=>'set_list',args=>{courseID=>$courseName}), params=>{effectiveUser => $studentRecord->user_id}),
+					email_address => $studentRecord->email_address(),
+					problemData => {},
+					date => 'none',
+					testtime => 'none',
+				};
+			}
+
+			push( @index_list, $max_hash->{index} );
+			push( @score_list, 
+			      ($max_hash->{total} && $max_hash->{total} ne 'n/a') ? 
+			      $max_hash->{score}/$max_hash->{total} : 0 );
+			push( @augmentedUserRecords, $max_hash );
+		# if there were no set versions and the set was assigned
+		#    to the user, also keep the data
+		} elsif ( ! @allSetVersionNames && ! $notAssignedSet ) {
+			my $dataH = { user_id => $studentRecord->user_id(),
+				      last_name=>$studentRecord->last_name(),
+				      first_name=>$studentRecord->first_name(),
+				      score => 0,
+				      total => 'n/a',
+				      index => 0,
+				      section => $studentRecord->section(),
+				      recitation=>$studentRecord->recitation(),
+				      problemString => 'no attempt recorded',
+				      act_as_student => $self->systemLink($urlpath->new(type=>'set_list',args=>{courseID=>$courseName}), params=>{effectiveUser => $studentRecord->user_id}),
+				      email_address => $studentRecord->email_address(),
+				      problemData => {},
+				      date => 'none',
+				      testtime => 'none',
+				  };
+			push( @index_list, 0 );
+			push( @score_list, 0 );
+			push( @augmentedUserRecords, $dataH );
+
+		}
+
+        } # this closes the loop through all student records
+	
+	debug("end mainloop");
+	
+	@augmentedUserRecords = sort {
+		&$sort_method($a,$b,$primary_sort_method_name)
+			||
+		&$sort_method($a,$b,$secondary_sort_method_name)
+			||
+		&$sort_method($a,$b,$ternary_sort_method_name)
+			||			
+		lc($a->{last_name}) cmp lc($b->{last_name})
+			||
+		lc($a->{first_name}) cmp lc($b->{first_name})
+			||
+		lc($a->{user_id}) cmp lc($b->{user_id})	
+		} 
+		@augmentedUserRecords;
+	
+
+	# construct header
+	my $problem_header = '';
+	# DBFIXME sort in database
+	my @list_problems = sort {$a<=> $b } $db->listGlobalProblems($setName );
+	$problem_header = '<pre>'.join("", map {&threeSpaceFill($_)}  @list_problems  ).'</pre>';
+
+# changes for gateways/versioned sets here.  in this case we allow instructors
+# to modify the appearance of output, which we do with a form.  so paste in the
+# form header here, and make appropriate modifications
+        my $verSelectors = '';
+	if ( $setIsVersioned ) {
+		print CGI::start_form({'method' => 'post', 
+				       'action' => $self->systemLink($urlpath,authen=>0),'name' => 'StudentProgress'});
+		print $self->hidden_authen_fields();
+
+#	    $verSelectors = CGI::p({'style'=>'background-color:#eeeeee;color:black;'},
+		print CGI::p({'style'=>'background-color:#eeeeee;color:black;'},
+			     "Display options: Show ",
+			     CGI::hidden(-name=>'returning', -value=>'1'),
+			     CGI::checkbox(-name=>'show_best_only', -value=>'1', 
+					   -checked=>$showBestOnly, 
+					   -label=>' only best scores; '),
+#			     CGI::checkbox(-name=>'show_index', -value=>'1', 
+#					   -checked=>$showColumns{'index'},
+#					   -label=>' success indicator; '),
+			     CGI::checkbox(-name=>'show_date', -value=>'1', 
+					   -checked=>$showColumns{'date'},
+					   -label=>' test date; '),
+			     CGI::checkbox(-name=>'show_testtime', -value=>'1', 
+					   -checked=>$showColumns{'testtime'},
+					   -label=>' test time; '),
+			     CGI::checkbox(-name=>'show_problems', -value=>'1', 
+					   -checked=>$showColumns{'problems'},
+					   -label=>'problems;'), "\n", CGI::br(), "\n",
+			     CGI::checkbox(-name=>'show_section', -value=>'1', 
+					   -checked=>$showColumns{'section'}, 
+					   -label=>' section #; '),
+			     CGI::checkbox(-name=>'show_recitation', -value=>'1', 
+					   -checked=>$showColumns{'recit'},
+					   -label=>' recitation #; '),
+			     CGI::checkbox(-name=>'show_login', -value=>'1', 
+					   -checked=>$showColumns{'login'}, 
+					   -label=>'login'), "\n", CGI::br(), "\n",
+			     CGI::submit(-value=>'Update Display'),
+			     );
+		print CGI::end_form();
+	}
+
+#####################################################################################
+	print
+#		CGI::br(),
+		CGI::br(),
+		CGI::p({},'A period (.) indicates a problem has not been attempted, a &quot;C&quot; indicates 
+		a problem has been answered 100% correctly, and a number from 0 to 99 
+		indicates the percentage of partial credit earned. The number on the 
+		second line gives the number of incorrect attempts.  ',
+#		'The success indicator,' ,CGI::i('Ind'),', for each student is calculated as',
+#		CGI::br(),
+#		'100*(totalNumberOfCorrectProblems / totalNumberOfProblems)^2 / (AvgNumberOfAttemptsPerProblem)',CGI::br(),
+#		'or 0 if there are no attempts.'
+		),
+		CGI::br(),
+		"Click on student's name to see the student's version of the homework set. &nbsp; &nbsp;&nbsp;
+		Click heading to sort table. ",
+		CGI::br(),
+		CGI::br(),
+		defined($primary_sort_method_name) ?" Entries are sorted by $display_sort_method_name{$primary_sort_method_name}":'',
+		defined($secondary_sort_method_name) ?", then by $display_sort_method_name{$secondary_sort_method_name}":'',
+		defined($ternary_sort_method_name) ?", then by $display_sort_method_name{$ternary_sort_method_name}":'',
+		defined($primary_sort_method_name) ?'.':'',
+	;
+	# calculate secondary and ternary sort methods parameters if appropriate
+	my %past_sort_methods = ();		
+	%past_sort_methods = (secondary_sort => "$primary_sort_method_name",) if defined($primary_sort_method_name);
+	%past_sort_methods = (%past_sort_methods, ternary_sort => "$secondary_sort_method_name",) if defined($secondary_sort_method_name);
+
+	# continue with table output
+	if ( ! $setIsVersioned ) {
+	    print
+		CGI::start_table({-border=>5,style=>'font-size:smaller'}),
+		CGI::Tr(CGI::td(  {-align=>'left'},
+			['Name'.CGI::br().CGI::a({"href"=>$self->systemLink($setStatsPage,params=>{primary_sort=>'first_name', %past_sort_methods})},'First').
+			   '&nbsp;&nbsp;&nbsp;'.CGI::a({"href"=>$self->systemLink($setStatsPage,params=>{primary_sort=>'last_name', %past_sort_methods })},'Last').CGI::br().
+			   CGI::a({"href"=>$self->systemLink($setStatsPage,params=>{primary_sort=>'email_address', %past_sort_methods })},'Email'),
+			CGI::a({"href"=>$self->systemLink($setStatsPage,params=>{primary_sort=>'score', %past_sort_methods})},'Score'),
+			'Out'.CGI::br().'Of',
+#			CGI::a({"href"=>$self->systemLink($setStatsPage,params=>{primary_sort=>'index', %past_sort_methods})},'Ind'),
+			'Problems'.CGI::br().$problem_header,
+			CGI::a({"href"=>$self->systemLink($setStatsPage,params=>{primary_sort=>'section', %past_sort_methods})},'Section'),
+			CGI::a({"href"=>$self->systemLink($setStatsPage,params=>{primary_sort=>'recitation', %past_sort_methods})},'Recitation'),
+			CGI::a({"href"=>$self->systemLink($setStatsPage,params=>{primary_sort=>'user_id', %past_sort_methods})},'Login Name'),
+			])
+
+		),
+		;
+	} else {
+		# we need to preserve display options when the sort headers are clicked
+		my %display_options = (
+			returning       => 1,
+			show_best_only  => $showBestOnly,
+#			show_index      => $showColumns{index},
+			show_date       => $showColumns{date},
+			show_testtime   => $showColumns{testtime},
+			show_problems   => $showColumns{problems},
+			show_section    => $showColumns{section},
+			show_recitation => $showColumns{recit},
+			show_login      => $showColumns{login},
+		);
+		my %params = (%past_sort_methods, %display_options);
+	    my @columnHdrs = ();
+	    push( @columnHdrs, 'Name'.CGI::br().CGI::a({"href"=>$self->systemLink($setStatsPage,params=>{primary_sort=>'first_name', %params})},'First').
+		  '&nbsp;&nbsp;&nbsp;'.CGI::a({"href"=>$self->systemLink($setStatsPage,params=>{primary_sort=>'last_name', %params })},'Last') );
+	    push( @columnHdrs, CGI::a({"href"=>$self->systemLink($setStatsPage,params=>{primary_sort=>'score', %params})},'Score') );
+	    push( @columnHdrs, 'Out'.CGI::br().'Of' );
+	    push( @columnHdrs, 'Date' ) if ( $showColumns{ 'date' } );
+	    push( @columnHdrs, 'TestTime' ) if ( $showColumns{ 'testtime' } );
+#	    push( @columnHdrs, CGI::a({"href"=>$self->systemLink($setStatsPage,params=>{primary_sort=>'index', %params})},'Ind') )
+#		if ( $showColumns{ 'index' } );
+	    push( @columnHdrs, 'Problems'.CGI::br().$problem_header )
+		if ( $showColumns{ 'problems' } );
+	    push( @columnHdrs, CGI::a({"href"=>$self->systemLink($setStatsPage,params=>{primary_sort=>'section', %params})},'Section') )
+		if ( $showColumns{ 'section' } );
+	    push( @columnHdrs, CGI::a({"href"=>$self->systemLink($setStatsPage,params=>{primary_sort=>'recitation', %params})},'Recitation') )
+		if ( $showColumns{ 'recit' } );
+	    push( @columnHdrs, CGI::a({"href"=>$self->systemLink($setStatsPage,params=>{primary_sort=>'user_id', %params})},'Login Name') )
+		if ( $showColumns{ 'login' } );
+
+	    print CGI::start_table({-border=>5,style=>'font-size:smaller'}),
+	        CGI::Tr(CGI::td(  {-align=>'left'},
+		    [ @columnHdrs ] ) ),
+	    ;
+	}
+
+    # variables to keep track of versioned sets
+	my $prevFullName = '';
+	my $vNum = 1;
+    # and to make formatting nice for students who haven't taken any tests
+    #    (the total number of columns is two more than this; we want the 
+    #    number that missing record information should span)
+	my $numCol = 1 + $showColumns{'date'} + $showColumns{'testtime'} + 
+#		$showColumns{'index'} +
+		$showColumns{'problems'};
+
+	foreach my $rec (@augmentedUserRecords) {
+		my $fullName = join("", $rec->{first_name}," ", $rec->{last_name});
+		my $email    = $rec->{email_address}; 
+		my $twoString  = $rec->{twoString};
+		if ( ! $setIsVersioned ) {
+		    print CGI::Tr({},
+			CGI::td({},CGI::a({-href=>$rec->{act_as_student}},$fullName), CGI::br(), CGI::a({-href=>"mailto:$email"},$email)),
+			CGI::td( sprintf("%0.2f",$rec->{score}) ), # score
+			CGI::td($rec->{total}), # out of 
+#			CGI::td(sprintf("%0.0f",100*($rec->{index}) )),   # indicator
+			CGI::td($rec->{problemString}), # problems
+			CGI::td($self->nbsp($rec->{section})),
+			CGI::td($self->nbsp($rec->{recitation})),
+			CGI::td($rec->{user_id}),			
+		    );
+		} else {
+            # we separate versioned sets so that we can restrict what columns
+            # we show
+		    # if total is 'n/a', then it's a user who hasn't taken
+		    #    any tests, which we treat separately
+			if ( $rec->{total} ne 'n/a' ) {
+				my @cols = ();
+				# make make versioned sets' name format nicer
+				my $nameEntry = '';
+				if ( $fullName eq $prevFullName ) {
+					$vNum++;
+					$nameEntry = "(v$vNum)";
+				} else {
+					$nameEntry = CGI::a({-href=>$rec->{act_as_student}},$fullName) . 
+						($setIsVersioned && ! $showBestOnly ? ' (v1)':' ') .
+						CGI::br() . CGI::a({-href=>"mailto:$email"},$email);
+					$vNum = 1;
+					$prevFullName = $fullName;
+				}
+		    
+				# build columns to show
+				push(@cols, $nameEntry, 
+				     sprintf("%0.2f",$rec->{score}),
+				     $rec->{total});
+				push(@cols, $self->nbsp($rec->{date})) 
+				    if ($showColumns{'date'});
+				push(@cols, $self->nbsp($rec->{testtime})) 
+				    if ($showColumns{'testtime'});
+#				push(@cols, sprintf("%0.0f",$rec->{index})) 
+#				    if ($showColumns{'index'});
+				push(@cols, $self->nbsp($rec->{problemString}))
+				    if ($showColumns{'problems'});
+				push(@cols, $self->nbsp($rec->{section})) 
+				    if ($showColumns{'section'});
+				push(@cols, $self->nbsp($rec->{recitation})) 
+				    if ($showColumns{'recit'});
+				push(@cols, $rec->{user_id}) if ($showColumns{'login'});
+				print CGI::Tr( CGI::td( [ @cols ] ) );
+			} else {
+				my @cols = ( CGI::td( $fullName ),
+					     CGI::td( $rec->{score} ),
+					     CGI::td({colspan=>$numCol},
+						     CGI::em($self->nbsp("No tests taken."))) );
+				push(@cols, 
+				     CGI::td($self->nbsp($rec->{section})))
+					if ( $showColumns{'section'} );
+				push(@cols, 
+				     CGI::td($self->nbsp($rec->{recitation})))
+					if ( $showColumns{'recit'} );
+				push(@cols, 
+				     CGI::td($self->nbsp($rec->{user_id})))
+					if ( $showColumns{'login'} );
+				print CGI::Tr(@cols);
+			}
+		}
+	}
+
+	print CGI::end_table();
+
+	return "";
+}
+
+#############################################################
+# Grading utilities
+#############################################################
+
+
+# 			########################################
+# 			# Notes for factoring the calculation in this loop.
+# 			#
+# 			# Inputs include:
+# 			#   @problemRecords  
+# 			# returns
+# 			#   $num_of_attempts
+# 			#   $status
+# 			# updates
+# 			#   $number__studofents_attempting_problem{$probID}++;
+# 			#   @{ $attempts_list_for_problem{$probID} }   
+# 			#   $number_of_attempts_for_problem{$probID}
+# 			#   $total_num_of_attempts_for_set
+# 			#   $correct_answers_for_problem{$probID}   
+# 			#    
+# 			#   $string (formatting output)
+# 			#   $twoString (more formatted output)
+# 			#   $longtwo (a combination of $string and $twostring)
+# 			#   $total
+# 			#   $totalRight
+# 			###################################
+
+###############################################################
+# requires = grade_set( $db, $set, $setName, $studentName, $setIsVersioned);
+# returns   my ($status, 
+#            $longStatus, 
+#            $string,
+#            $twoString, 
+#            $totalRight,
+#            $total, 
+#            $num_of_attempts, 
+#            $num_of_problems) = grade_set(...);
+#########################
+
+sub grade_set {
+
+        my ($db, $set, $setName, $studentName, $setIsVersioned,
+        $rh_number_of_students_attempting_problem,
+        $rh_attempts_list_for_problem,
+        $rh_number_of_attempts_for_problem,
+        $rh_problemData,
+        $rh_total_num_of_attempts_for_set,
+        $rh_correct_answers_for_problem
+        ) = @_;
+
+        my $setID = $set->set_id();  #FIXME   setName and setID should be the same
+
+		my $status = 0;
+		my $longStatus = '';
+		my $string     = '';
+		my $twoString  = '';
+		my $totalRight = 0;
+		my $total      = 0;
+		my $num_of_attempts = 0;
+	
+		debug("Begin collecting problems for set $setName");
+		# DBFIXME: to collect the problem records, we have to know 
+		#    which merge routines to call.  Should this really be an 
+		#    issue here?  That is, shouldn't the database deal with 
+		#    it invisibly by detecting what the problem types are?  
+		#    oh well.
+		
+		my @problemRecords = $db->getAllMergedUserProblems( $studentName, $setID );
+		my $num_of_problems  = @problemRecords || 0;
+		if ( $setIsVersioned ) {
+			@problemRecords =  $db->getAllMergedProblemVersions( $studentName, $setID, $set->version_id );
+		}
+		
+		
+		
+		
+		
+		
+		debug("End collecting problems for set $setName");
+
+	####################
+	# Resort records
+	#####################
+		@problemRecords = sort {$a->problem_id <=> $b->problem_id } @problemRecords;
+
+#    		
+# 		# for gateway/quiz assignments we have to be careful about 
+# 		#    the order in which the problems are displayed, because
+# 		#    they may be in a random order
+# 		if ( $set->problem_randorder ) {
+# 			my @newOrder = ();
+# 			my @probOrder = (0..$#problemRecords);
+# 			# we reorder using a pgrand based on the set psvn
+# 			my $pgrand = PGrandom->new();
+# 			$pgrand->srand( $set->psvn );
+# 			while ( @probOrder ) { 
+# 				my $i = int($pgrand->rand(scalar(@probOrder)));
+# 				push( @newOrder, $probOrder[$i] );
+# 				splice(@probOrder, $i, 1);
+# 			}
+# 			# now $newOrder[i] = pNum-1, where pNum is the problem
+# 			#    number to display in the ith position on the test
+# 			#    for sorting, invert this mapping:
+# 			my %pSort = map {($newOrder[$_]+1)=>$_} (0..$#newOrder);
+# 
+# 			@problemRecords = sort {$pSort{$a->problem_id} <=> $pSort{$b->problem_id}} @problemRecords;
+# 		}
+    
+    #######################################################
+	# construct header
+    
+		foreach my $problemRecord (@problemRecords) {
+			my $prob = $problemRecord->problem_id;
+			
+			unless (defined($problemRecord) ){
+				# warn "Can't find record for problem $prob in set $setName for $student";
+			# FIXME check the legitimate reasons why a student record might not be defined
+				next;
+			}
+			
+		    $status           = $problemRecord->status || 0;
+			my $attempted     = $problemRecord->attempted;
+			my $num_correct   = $problemRecord->num_correct || 0;
+			my $num_incorrect = $problemRecord->num_incorrect   || 0;
+			$num_of_attempts  = $num_correct + $num_incorrect;
+			
+#######################################################
+			# This is a fail safe mechanism that makes sure that
+			# the problem is marked as attempted if the status has
+			# been set or if the problem has been attempted
+			# DBFIXME this should happen in the database layer, not here!
+			if (!$attempted && ($status || $num_of_attempts)) {
+				$attempted = 1;
+				$problemRecord->attempted('1');
+				# DBFIXME: this is another case where it 
+				#    seems we shouldn't have to check for 
+				#    which routine to use here...
+				if ( $setIsVersioned ) {
+					$db->putProblemVersion($problemRecord);
+				} else {
+					$db->putUserProblem($problemRecord );
+				}
+			}
+######################################################			
+
+			# sanity check that the status (score) is 
+			# between 0 and 1
+			my $valid_status = ($status>=0 && $status<=1)?1:0;
+
+			###########################################
+			# Determine the string $longStatus which 
+			# will display the student's current score
+			###########################################
+
+			if (!$attempted){
+				$longStatus     = '.';
+			} elsif   ($valid_status) {
+				$longStatus     =  int(100*$status+.5) ;
+				$longStatus='C' if ($longStatus==100);
+			} else	{
+				$longStatus 	= 'X';
+			}
+		
+			$string         .= threeSpaceFill($longStatus);
+			$twoString      .= threeSpaceFill($num_incorrect);
+			my $probValue   =  $problemRecord->value;
+			$probValue      =  1 unless defined($probValue) and $probValue ne "";  # FIXME?? set defaults here?
+			$total          += $probValue;
+			$totalRight     += round_score($status*$probValue) if $valid_status;
+				
+# 				
+# 			# initialize the number of correct answers 
+# 			# for this problem if the value has not been 
+# 			# defined.
+# 			$correct_answers_for_problem{$probID} = 0 
+# 				unless defined($correct_answers_for_problem{$probID});
+			
+				
+		# add on the scores for this problem
+			if (defined($rh_correct_answers_for_problem ) ) {  #skip this if we are not updating records
+			    my $probID          = $problemRecord->problem_id;
+				$rh_correct_answers_for_problem->{$probID} = 0  	unless defined($rh_correct_answers_for_problem->{$probID});
+				if (defined($attempted) and $attempted) {
+					$rh_number_of_students_attempting_problem->{$probID}++;
+					push( @{ $rh_attempts_list_for_problem->{$probID} } ,     $num_of_attempts);
+					$rh_number_of_attempts_for_problem->{$probID}          += $num_of_attempts;
+					$rh_problemData->{$probID}                              = $num_incorrect;
+					$$rh_total_num_of_attempts_for_set                     += $num_of_attempts;
+					$rh_correct_answers_for_problem->{$probID}             += $status;
+				}
+			}
+		
+		}  # end of problem record loop
+
+
+
+		return($status,  
+			   $longStatus, 
+			   $string,
+			   $twoString, 
+			   $totalRight,
+			   $total, 
+			   $num_of_attempts, 
+			   $num_of_problems			
+		);
+}
+#################################
+# Utility function NOT a method
+#################################
+sub threeSpaceFill {
+	my $num = shift @_ || 0;
+
+	if (length($num)<=1) {return "$num".'&nbsp;&nbsp;';}
+	elsif (length($num)==2) {return "$num".'&nbsp;';}
+	else {return "## ";}
+}
+
+sub round_score{
+	return shift;
+}
+
+1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm b/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm
new file mode 100644
index 0000000000..fe07c2a1bb
--- /dev/null
+++ b/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm
@@ -0,0 +1,599 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: 
+# 
+# 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::ContentGenerator::Instructor::UserDetail;
+use base qw(WeBWorK::ContentGenerator::Instructor);
+
+=head1 NAME
+
+WeBWorK::ContentGenerator::Instructor::UserDetail - Detailed User specific information
+
+=cut
+
+use strict;
+use warnings;
+#use CGI qw(-nosticky );
+use WeBWorK::CGI;
+use WeBWorK::Utils qw(sortByName);
+use WeBWorK::Debug;
+
+use constant DATE_FIELDS => {   open_date    => " Open: ",
+	                            due_date     => " Due&nbsp;: ",
+	                            answer_date  => " Ans&nbsp;: "
+};
+use constant DATE_FIELDS_ORDER =>[qw(open_date due_date answer_date )];
+sub initialize {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $urlpath = $r->urlpath;
+	my $db = $r->db;
+	my $authz = $r->authz;
+	my $userID = $r->param("user");
+	my $editForUserID = $urlpath->arg("userID");
+
+	return CGI::div({class => "ResultsWithError"}, "You are not authorized to edit user specific information.")
+		unless $authz->hasPermissions($userID, "access_instructor_tools");
+
+	# templates for getting field names
+	my $userTemplate = $self->{userTemplate} = $db->newUser;
+	my $permissionLevelTemplate = $self->{permissionLevelTemplate} = $db->newPermissionLevel;
+	
+	# first check to see if a save form has been submitted
+	return '' unless $r->param('save_button');
+	
+	# As it stands we need to check each set to see if it is still assigned 
+	# the forms are not currently set up to simply transmit changes
+	
+	#Get the list of sets and the global set records
+	# DBFIXME shouldn't need set IDs to get records
+	my @setIDs = $db->listGlobalSets;
+	my @setRecords = grep { defined $_ } $db->getGlobalSets(@setIDs);
+	
+	my @assignedSets = ();
+	foreach my $setID (@setIDs) {
+		push @assignedSets, $setID if defined($r->param("set.$setID.assignment"));
+	}
+
+	# note: assignedSets are those sets that are assigned in the submitted form
+	debug("assignedSets", join(" ", @assignedSets));
+
+	my %selectedSets = map { $_ => 1 } @assignedSets;
+
+	#debug ##########################
+		#print STDERR ("aSsigned sets", join(" ",@assignedSets));
+        #my @params = $r->param();
+        #print STDERR " parameters ", join(" ", @params);
+    ###############
+
+	#Get the user(s) whose records are to be modified
+	#  for now: $editForUserID
+	# check the user exists?  Is this necessary?
+	my $editUserRecord = $db->getUser($editForUserID);
+	die "record not found for $editForUserID.\n" unless $editUserRecord;
+
+	#Perform the desired assignments or deletions
+	my %userSets = map { $_ => 1 } $db->listUserSets($editForUserID);
+
+	# go through each possible set
+	debug(" parameters ", join(" ", $r->param()) );
+	foreach my $setRecord (@setRecords) {
+		my $setID = $setRecord->set_id;
+		# does the user want it to be assigned to the selected user
+		if (exists $selectedSets{$setID}) {
+		    # change by glarose, 2007/02/07: only assign set if the 
+		    # user doesn't already have the set assigned.
+			$self->assignSetToUser($editForUserID, $setRecord) if ( ! $userSets{$setID} );
+
+			#override dates
+			my $userSetRecord = $db->getUserSet($editForUserID, $setID);
+			# get the dates
+			#do checks to see if new dates meet criteria
+			my $rh_dates = $self->checkDates($setRecord,$setID);
+			unless  ( $rh_dates->{error} ) { #returns 1 if error
+				# if no error update database
+				foreach my $field (keys %{DATE_FIELDS()}) {
+					if (defined $r->param("set.$setID.$field.override")) {
+						$userSetRecord->$field($rh_dates->{$field});
+					} else {
+						$userSetRecord->$field(undef); #stop override
+					}
+				}
+				$db->putUserSet($userSetRecord);
+			}
+
+			# if the set is a gateway set, also check to see if we're
+			#    resetting the dates for any of the assigned set versions
+			if ( $setRecord->assignment_type =~ /gateway/ ) {
+				my @setVer = $db->listSetVersions( $editForUserID,
+								   $setID );
+				foreach my $ver ( @setVer ) {
+					my $setVersionRecord =
+						$db->getSetVersion( $editForUserID,
+								    $setID, $ver );
+					my $rh_dates = $self->checkDates($setVersionRecord,
+									 "$setID,v$ver");
+					unless ( $rh_dates->{error} ) {
+						foreach my $field ( keys %{DATE_FIELDS()} ) {
+							if ( defined( $r->param("set.$setID,v$ver.$field.override") ) ) {
+								$setVersionRecord->$field($rh_dates->{$field});
+							} else {
+								$setVersionRecord->$field(undef);
+							}
+						}
+						$db->putSetVersion( $setVersionRecord );
+					}
+				}
+			}
+
+		} else {
+			# user asked to NOT have the set assigned to the selected user
+			# debug("deleteUserSet($editForUserID, $setID)");
+		    # change by glarose, 2007/02/07: only do delete if user
+		    # had the set previously assigned
+			$db->deleteUserSet($editForUserID, $setID) if ( $userSets{$setID} );
+			# debug("done deleteUserSet($editForUserID, $setID)");
+		}
+	}
+	
+	return '';
+	
+	
+	
+}
+
+sub body {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $urlpath = $r->urlpath;
+	my $db = $r->db;
+	my $ce = $r->ce;
+	my $authz = $r->authz;
+	my $courseID = $urlpath->arg("courseID");
+	my $editForUserID = $urlpath->arg("userID");
+	my $userID = $r->param("user");
+	
+	my @editForSets = $r->param("editForSets");
+	
+	return CGI::div({class => "ResultsWithError"}, "You are not authorized to edit user specific information.")
+		unless $authz->hasPermissions($userID, "access_instructor_tools");
+	
+	my $UserRecord = $db->getUser($editForUserID);
+	my $PermissionRecord = $db->getPermissionLevel($editForUserID);
+	my @UserSetIDs = $db->listUserSets($editForUserID);
+	
+	my $userName = $UserRecord->first_name . " " . $UserRecord->last_name;
+
+	# templates for getting field names
+	my $userTemplate = $self->{userTemplate};
+	my $permissionLevelTemplate = $self->{permissionLevelTemplate};
+	
+	# This table can be consulted when display-ready forms of field names are needed.
+	my %prettyFieldNames = map { $_ => $_ } 
+		$userTemplate->FIELDS();
+	
+# 	@prettyFieldNames{qw(
+# 		#user_id
+# 		first_name
+# 		last_name
+# 		email_address
+# 		student_id
+# 		status
+# 		section
+# 		recitation
+# 		comment
+# 		permission
+# 	)} = (
+# 		#"Login Name",
+# 		"First Name",
+# 		"Last Name",
+# 		"Email",
+# 		"Student ID",
+# 		"Status",
+# 		"Section",
+# 		"Recitation",
+# 		"Comment",
+# 		"Permission Level",
+# 	);
+	
+	my @dateFields         = @{DATE_FIELDS_ORDER()};
+	my $rh_dateFieldLabels =  DATE_FIELDS();
+
+
+	# create a link to the SetsAssignedToUser page
+# 	my $editSetsPath = $urlpath->newFromModule(
+# 		"WeBWorK::ContentGenerator::Instructor::SetsAssignedToUser", $r, 
+# 		courseID => $courseID,
+# 		userID => $userID,
+# 	);
+# 	my $editSetsAssignedToUserURL = $self->systemLink($editSetsPath);
+	
+	# create a message about how many sets have been assigned to this user
+ 	my $setCount = $db->countUserSets($editForUserID);
+# 	my $userCountMessage =  CGI::a({href=>$editSetsAssignedToUserURL}, $setCount . " sets.");
+# 	$userCountMessage = "The user " . CGI::b($userName . " ($editForUserID)") . " has been assigned " . $userCountMessage;
+	my $basicInfoPage = $urlpath->new(type =>'instructor_user_list',
+					args =>{
+						courseID => $courseID,
+	                }
+	    );
+		my $basicInfoUrl = $self->systemLink($basicInfoPage,
+		                                     params =>{visible_users => $editForUserID,
+		                                               editMode      => 1,
+		                                              }
+		);
+
+	print CGI::h4({align=>'center'},"Edit ",CGI::a({href=>$basicInfoUrl},'class list data')," for  $userName ($editForUserID) who has been assigned $setCount sets.");
+	
+	#print CGI::h4("User Data");
+# 	print CGI::start_table({ align=>'center', border=>1,cellpadding=>5});
+# 	print CGI::Tr(
+# 		CGI::th(CGI::checkbox({ type => 'checkbox',
+# 								name => "edit.basic.info",
+# 								label => '',
+#                         		checked => 0
+#         }),"Edit class list data for $editForUserID"),
+#         CGI::th(CGI::checkbox({ type => 'checkbox',
+# 								name => "change.password",
+# 								label => '',
+#                         		checked => 0
+#         }),"Change Password for $editForUserID"));
+#         
+# 	print "<tr><td rowspan=\"2\">";
+# 	########################################
+# 	# Basic student data
+# 	########################################
+# 	print CGI::start_table();
+# 	foreach ($userTemplate->FIELDS()) {
+# 		next if $_ eq 'user_id';   # don't print login name
+# 		print CGI::Tr(
+# 			CGI::td([
+# 		        	$prettyFieldNames{$_}, 
+# 				CGI::input({ -value => $UserRecord->$_, -size => 25 })
+# 			])
+# 		);
+# 	}
+# 	foreach ($permissionLevelTemplate->FIELDS()) {
+# 		print CGI::Tr(
+# 			CGI::td([
+# 		        	$prettyFieldNames{$_}, 
+# 				CGI::input({ -value => $PermissionRecord->$_, -size => 25 })
+# 			])
+# 		);
+# 	}
+# 	print CGI::end_table();
+# 	
+# 	#print CGI::br();
+# 	print "</td><td valign=\"top\">";
+# 	########################################
+# 	# Change password section
+# 	########################################
+# 	my $profRecord = $db->getUser($userID);
+# 	my $profName = $profRecord->first_name . " " . $profRecord->last_name;
+# 	my $poss = "'s ";
+# 	my $pass = " password ";
+# 	
+# 	print CGI::start_table();
+# 	print CGI::Tr(CGI::td(["<b>$profName</b>$poss$pass", CGI::input({ -type => "password", -name => "$userID.password"})]));
+# 	print CGI::Tr(CGI::td(["<b>$userName</b>$poss new $pass", CGI::input({ -type => "password", -name => "$editForUserID.password.1"})]));
+# 	print CGI::Tr(CGI::td(["Confirm <b>$userName</b>$poss new $pass", CGI::input({ -type => "password", -name => "$editForUserID.password.2"})]));
+# 	print CGI::end_table();
+# 	print "</td></tr>";
+# 	print CGI::Tr(CGI::th(  #FIXME  enable this once it can be handled
+# # 		CGI::checkbox({ type => 'checkbox',
+# # 								name => "change.login",
+# # 								label => '',
+# #                         		checked => 0
+# #         }),
+#         "Change login name $editForUserID to ", CGI::input({-name=>'new_login', -value=>''  ,-size=>25})
+# 	));
+# 	print CGI::end_table();
+	
+	print CGI::br();
+
+	#print CGI::h4("Sets assigned to $userName");
+	# construct url for the form
+	my $userDetailPage = $urlpath->new(type =>'instructor_user_detail',
+					                       args =>{
+						                             courseID => $courseID,
+						                             userID   => $editForUserID, #FIXME eventually this should be a list??
+	                }
+	);
+	my $userDetailUrl = $self->systemLink($userDetailPage,authen=>0);
+
+	# DBFIXME all we need here is set IDs
+	# DBFIXME do sorting in DB
+	my %GlobalSetRecords = map { $_->set_id => $_ } $db->getGlobalSets($db->listGlobalSets());
+	my @UserSetRefs = map { [$editForUserID, $_] } sortByName(undef, @UserSetIDs);
+	my %UserSetRecords = map { $_->set_id => $_ } $db->getUserSets(@UserSetRefs);
+	my @MergedSetRefs = map { [$editForUserID, $_] } sortByName(undef, @UserSetIDs);
+	my %MergedSetRecords = map { $_->set_id => $_ } $db->getMergedSets(@MergedSetRefs);
+
+	# get set versions of versioned sets
+	my %UserSetVersionRecords;
+	my %UserSetMergedVersionRecords;
+	foreach my $setid ( keys( %UserSetRecords ) ) {
+		if ( $GlobalSetRecords{$setid}->assignment_type =~ /gateway/ ) {
+			my @setVersionRefs = map { [$editForUserID, $setid, $_] }
+				$db->listSetVersions( $editForUserID, $setid );
+			if ( @setVersionRefs ) {
+				$UserSetVersionRecords{$setid} = [ $db->getSetVersions(@setVersionRefs) ];
+				$UserSetMergedVersionRecords{$setid} = [ $db->getMergedSetVersions(@setVersionRefs) ];
+			}
+		}
+	}
+	
+	########################################
+	# Print warning
+	########################################
+	print CGI::div({-class=>'ResultsWithError'},
+		       "Do not uncheck a set unless you know what you are doing.", CGI::br(),
+		       "There is NO undo for unassigning a set.");
+
+	print CGI::p("To change status (scores or grades) for this student for one
+	              set, click on the individual set link.");
+
+	print CGI::div({-class=>'ResultsWithError'},"When you uncheck a homework set (and save the changes), you destroy all
+		      of the data for that set for this student.   If you
+		      reassign the set, the student will receive a new version of each problem.
+		      Make sure this is what you want to do before unchecking sets."
+	);
+	########################################
+	# Assigned sets form
+	########################################
+
+	print CGI::start_form( {method=>'post',action=>$userDetailUrl, name=>'UserDetail'}),"\n";
+	print $self->hidden_authen_fields();
+	print CGI::p(CGI::submit(-name=>'save_button',-label=>'Save changes',));
+	
+	print CGI::start_table({ border=> 1,cellpadding=>5}),"\n";
+	print CGI::Tr(
+		CGI::th({align=>'center',colspan=>3}, "Sets assigned to $userName ($editForUserID)")
+	),"\n";
+	print CGI::Tr(
+		CGI::th({ -align => "center"}, [
+			"Assigned",
+			"Edit set for $editForUserID",
+			"Dates",
+		])
+	),"\n";
+
+	# get a list of sets to show
+	# DBFIXME already have this data
+	my @setsToShow = sortByName( undef, $db->listGlobalSets() );
+	# insert any set versions that we have
+	my $i = $#setsToShow;
+	if ( defined( $UserSetVersionRecords{$setsToShow[$i]} ) ) {
+		push( @setsToShow, map{ $_->set_id . ",v" . $_->version_id }
+			@{$UserSetVersionRecords{$setsToShow[$i]}} );
+	}
+	$i--;
+	my $numit = 0;
+	while ( $i>=0 ) {
+		if ( defined( $UserSetVersionRecords{$setsToShow[$i]} ) ) {
+			splice( @setsToShow, $i+1, 0,
+				map{ $_->set_id . ",v" . $_->version_id }
+				@{$UserSetVersionRecords{$setsToShow[$i]}} );
+		}
+		$i--;
+		$numit++;
+		# just to be safe
+		last if $numit >= 150;
+	}
+	warn("Truncated display of sets at 150 in UserDetail.pm.  This is a " .
+	     "brake to avoid spiraling into the abyss.  If you really have " .
+	     "more than 150 sets in your course, reset the limit at about line " .
+	     "370 in webwork/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm.")
+		if ( $numit == 150 );
+
+
+	foreach my $setID ( @setsToShow ) {
+		# catch the versioned sets that we just added
+		my $setVersion = 0;
+		my $fullSetID = $setID;
+		if ( $setID =~ /,v(\d+)$/ ) {
+			$setVersion = $1;
+			$setID =~ s/,v\d+$//;
+		}
+
+		my $GlobalSetRecord = $GlobalSetRecords{$setID};
+		my $UserSetRecord = (! $setVersion) ? $UserSetRecords{$setID} :
+			$UserSetVersionRecords{$setID}->[$setVersion-1];
+		my $MergedSetRecord = (! $setVersion) ?  $MergedSetRecords{$setID} :
+			$UserSetMergedVersionRecords{$setID}->[$setVersion-1];
+		my $setListPage = $urlpath->new(type =>'instructor_set_detail',
+					args =>{
+						courseID => $courseID,
+						setID    => $fullSetID
+	                }
+		);
+		my $url = $self->systemLink($setListPage,
+		                      params =>{effectiveUser => $editForUserID,
+		                                editForUser   => $editForUserID,
+		});
+
+		my $setName = ( $setVersion ) ? "test $setVersion" : $setID;
+
+		print CGI::Tr(
+			CGI::td({ -align => "center" }, [
+				($setVersion) ? "" : CGI::checkbox({ type => 'checkbox',
+								name => "set.$fullSetID.assignment",
+								label => '',
+								value => 'assigned',
+								checked => (defined $MergedSetRecord)}),
+				defined($MergedSetRecord) ? CGI::b(CGI::a({href=>$url},$setName, ) ) : CGI::b($setID, ),
+				join "\n", $self->DBFieldTable($GlobalSetRecord, $UserSetRecord, $MergedSetRecord, "set", $setID, \@dateFields, $rh_dateFieldLabels),
+			])
+		),"\n";
+	}
+	print CGI::end_table(),"\n";
+	print CGI::p(CGI::submit(-name=>'save_button',-label=>'Save changes',));
+	print CGI::end_form(),"\n";
+	########################################
+	# Print warning
+	########################################
+
+	CGI::div( {class=>'ResultsWithError'},
+				"There is NO undo for this function.  
+				 Do not use it unless you know what you are doing!  When you unassign
+				 sets using this button, or by unchecking their set names, you destroy all
+				 of the data for those sets for this student."
+	);
+
+
+#	print CGI::start_table();
+#	print CGI::Tr(
+#		CGI::th({ -align => "center"},[
+#			"Assigned",
+#			"Set Name",
+#			"Opens",
+#			"Answers Due",
+#			"Answers Available",
+#		])
+#	);
+				
+#	foreach my $setID (sortByName(undef, @UserSetIDs)) {
+#		my $MergedSetRecord = $MergedSetRecords{$setID};
+#		print CGI::Tr(
+#			CGI::td({ -align => "center" }, [
+#				CGI::checkbox({checked => (defined $MergedSetRecord)}),
+#				$setID,
+#				CGI::checkbox() .
+#				CGI::input({ -value => $self->formatDateTime($MergedSetRecord->open_date), -size => 25}),
+#				CGI::checkbox() .
+#				CGI::input({ -value => $self->formatDateTime($MergedSetRecord->due_date), -size => 25}),
+#				CGI::checkbox() .
+#				CGI::input({ -value => $self->formatDateTime($MergedSetRecord->answer_date), -size => 25}),
+#			])
+#		);
+#	}
+	return '';
+}
+
+sub checkDates { 
+	my $self         = shift;
+	my $setRecord    = shift;
+	my $setID        = shift;
+	my $r            = $self->r;
+	my %dates = ();
+	my $error_undefined_override = 0;
+	my $numerical_date=0;
+	my $error        = 0;
+	foreach my $field (@{DATE_FIELDS_ORDER()}) {  # check that override dates can be parsed and are not blank
+		$dates{$field} = $setRecord->$field;
+		if (defined  $r->param("set.$setID.$field.override") ){
+			eval{ $numerical_date = $self->parseDateTime($r->param("set.$setID.$field"))};
+			unless( $@  ) {
+					$dates{$field}=$numerical_date;
+			} else {
+					$self->addbadmessage("&nbsp;&nbsp;* Badly defined time for set $setID $field. No date changes made:<br/>$@");
+					$error = 1;
+			}
+		}
+			
+
+	}
+	return {%dates,error=>1} if $error;    # no point in going on if the dates can't be parsed.
+	
+	my ($open_date, $due_date, $answer_date) = map { $dates{$_} } @{DATE_FIELDS_ORDER()};
+
+    unless ($answer_date && $due_date && $open_date) {
+    	$self->addbadmessage("set $setID has errors in its dates: answer_date |$answer_date|, 
+    	 due date |$due_date|, open_date |$open_date|");
+	}
+	if ($answer_date < $due_date || $answer_date < $open_date) {		
+		$self->addbadmessage("Answers cannot be made available until on or after the due date in set $setID!");
+		$error = 1;
+	}
+	
+	if ($due_date < $open_date) {
+		$self->addbadmessage("Answers cannot be due until on or after the open date in set $setID!");
+		$error = 1;
+	}
+	
+	# make sure the dates are not more than 10 years in the future
+	my $curr_time = time;
+	my $seconds_per_year = 31_556_926;
+	my $cutoff = $curr_time + $seconds_per_year*10;
+	if ($open_date > $cutoff) {
+		$self->addbadmessage("Error: open date cannot be more than 10 years from now in set $setID");
+		$error = 1;
+	}
+	if ($due_date > $cutoff) {
+		$self->addbadmessage("Error: due date cannot be more than 10 years from now in set $setID");
+		$error = 1;
+	}
+	if ($answer_date > $cutoff) {
+		$self->addbadmessage("Error: answer date cannot be more than 10 years from now in set $setID");
+		$error = 1;
+	}
+	
+	
+	if ($error) {
+		$self->addbadmessage("No date changes were saved!");
+	}
+	return {%dates,error=>$error};
+}
+
+sub DBFieldTable {
+	my ($self, $GlobalRecord, $UserRecord, $MergedRecord, $recordType,
+	    $recordID, $fieldsRef, $rh_fieldLabels) = @_;
+	
+	return CGI::div({class => "ResultsWithError"}, "No record exists for $recordType $recordID") unless defined $GlobalRecord;
+	
+	# modify record name if we're dealing with versioned sets
+	my $isVersioned = 0;
+	if ( $recordType eq "set" && defined($MergedRecord) &&
+	     $MergedRecord->assignment_type =~ /gateway/ &&
+	     $MergedRecord->can( "version_id" ) ) {
+		$recordID .= ",v" . $MergedRecord->version_id;
+		$isVersioned = 1;
+	}
+	my $r = $self->r;
+	my @fields = @$fieldsRef;
+	my @results;
+	foreach my $field (@fields) {
+		my $globalValue = $GlobalRecord->$field;
+		my $userValue = defined $UserRecord ? $UserRecord->$field : $globalValue;
+		my $mergedValue  = defined $MergedRecord ? $MergedRecord->$field : $globalValue;
+		push @results, 
+			[$rh_fieldLabels->{$field},
+			 defined $UserRecord ? 
+				CGI::checkbox({
+					type => "checkbox",
+					name => "$recordType.$recordID.$field.override",
+					label => "",
+					value => $field,
+					checked => ($r->param("$recordType.$recordID.$field.override") || $mergedValue ne $globalValue || $isVersioned) ? 1 : 0
+				}) : "",
+				defined $UserRecord ? 
+					(CGI::input({ -name=>"$recordType.$recordID.$field",
+					              -value => $userValue ? $self->formatDateTime($userValue) : "", 
+					              -size => 25})
+					) : "",
+				$self->formatDateTime($globalValue),				
+			]
+			
+	}
+
+	my @table;
+	foreach my $row (@results) {
+		push @table, CGI::Tr(CGI::td({-align => "center"}, $row));
+	}
+	
+	return (CGI::start_table({border => 0}), @table, CGI::end_table());
+}
+
+1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm b/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm
index b02b1496a9..2f0d440cf1 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader: webwork-modperl/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm,v 1.34 2003/12/09 01:12:31 sh002i Exp $
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm,v 1.96 2010/05/14 00:52:48 gage 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
@@ -36,6 +36,11 @@ Switch from view mode to edit mode:
 	- showing selected users
 Switch from edit mode to view and save changes
 Switch from edit mode to view and abandon changes
+Switch from view mode to password mode:
+	- showing visible users
+	- showing selected users
+Switch from password mode to view and save changes
+Switch from password mode to view and abandon changes
 Delete users:
 	- visible
 	- selected
@@ -61,13 +66,35 @@ Export users:
 
 use strict;
 use warnings;
-use CGI qw();
-use WeBWorK::Utils qw(readFile readDirectory);
-
-use constant HIDE_USERS_THRESHHOLD => 20;
+#use CGI qw(-nosticky );
+use WeBWorK::CGI;
+use WeBWorK::File::Classlist;
+use WeBWorK::DB qw(check_user_id);
+use WeBWorK::Utils qw(readFile readDirectory cryptPassword);
+use constant HIDE_USERS_THRESHHOLD => 200;
 use constant EDIT_FORMS => [qw(cancelEdit saveEdit)];
-use constant VIEW_FORMS => [qw(filter edit delete import export)];
-use constant STATE_PARAMS => [qw(user effectiveUser key visible_users no_visible_users prev_visible_users no_prev_visible_users editMode sortField)];
+use constant PASSWORD_FORMS => [qw(cancelPassword savePassword)];
+use constant VIEW_FORMS => [qw(filter sort edit password import export add delete)];
+
+# permissions needed to perform a given action
+use constant FORM_PERMS => {
+		saveEdit => "modify_student_data",
+		edit => "modify_student_data",
+		savePassword => "change_password",
+		password => "change_password",
+		import => "modify_student_data",
+		export => "modify_classlist_files",
+		add => "modify_student_data",
+		delete => "modify_student_data",
+};
+
+# permissions needed to view a given field
+use constant FIELD_PERMS => {
+		act_as => "become_student",
+		sets	=> "assign_problem_sets",
+};
+
+use constant STATE_PARAMS => [qw(user effectiveUser key visible_users no_visible_users prev_visible_users no_prev_visible_users editMode passwordMode primarySortField secondarySortField ternarySortField labelSortMethod)];
 
 use constant SORT_SUBS => {
 	user_id       => \&byUserID,
@@ -79,6 +106,7 @@ use constant SORT_SUBS => {
 	section       => \&bySection,
 	recitation    => \&byRecitation,
 	comment       => \&byComment,
+	permission    => \&byPermission,
 };
 
 use constant  FIELD_PROPERTIES => {
@@ -108,20 +136,21 @@ use constant  FIELD_PROPERTIES => {
 		access => "readwrite",
 	},
 	status => {
-		type => "enumerable",
+		#type => "enumerable",
+		type => "status",
 		size => 4,
 		access => "readwrite",
-		items => {
-			"C" => "Enrolled",
-			"D" => "Drop",
-			"A" => "Audit",
-		},
-		synonyms => {
-			qr/^[ce]/i => "C",
-			qr/^[dw]/i => "D",
-			qr/^a/i => "A",
-			"*" => "C",
-		}
+		#items => {
+		#	"C" => "Enrolled",
+		#	"D" => "Drop",
+		#	"A" => "Audit",
+		#},
+		#synonyms => {
+		#	qr/^[ce]/i => "C",
+		#	qr/^[dw]/i => "D",
+		#	qr/^a/i => "A",
+		#	"*" => "C",
+		#}
 	},
 	section => {
 		type => "text",
@@ -139,24 +168,60 @@ use constant  FIELD_PROPERTIES => {
 		access => "readwrite",
 	},
 	permission => {
-		type => "number",
-		size => 2,
+# this really should be read from $r->ce, but that's not available here
+		type => "permission",
 		access => "readwrite",
+#		type => "number",
+#		size => 2,
+#		access => "readwrite",
 	}
 };
+sub pre_header_initialize {
+	my $self          = shift;
+	my $r             = $self->r;
+	my $urlpath       = $r->urlpath;
+	my $authz         = $r->authz;
+	my $ce            = $r->ce;
+	my $courseName    = $urlpath->arg("courseID");
+	my $user          = $r->param('user');
+	# Handle redirects, if any.
+	##############################
+	# Redirect to the addUser page
+	##################################
+
+	# Check permissions
+	return unless $authz->hasPermissions($user, "access_instructor_tools");
+	
+	defined($r->param('action')) && $r->param('action') eq 'add' && do {
+		# fix url and redirect
+		my $root              = $ce->{webworkURLs}->{root};
+		
+		my $numberOfStudents  = $r->param('number_of_students');
+		warn "number of students not defined " unless defined $numberOfStudents;
+
+		my $uri=$self->systemLink( $urlpath->newFromModule('WeBWorK::ContentGenerator::Instructor::AddUsers', $r, courseID=>$courseName),
+		                           params=>{
+		                          			number_of_students=>$numberOfStudents,
+		                                   }
+		);
+		#FIXME  does the display mode need to be defined?
+		#FIXME  url_authen_args also includes an effective user, so the new one must come first.
+		# even that might not work with every browser since there are two effective User assignments.
+		$self->reply_with_redirect($uri);
+		return;
+	};
+}
 
 sub initialize {
 	my ($self) = @_;
-	my $r = $self->{r};
-	my $db = $self->{db};
-	my $ce = $self->{ce};
-	my $authz = $self->{authz};
-	my $user = $r->param('user');
+	my $r      = $self->r;
+	my $db     = $r->db;
+	my $ce     = $r->ce;
+	my $authz  = $r->authz;
+	my $user   = $r->param('user');
 
-	unless ($authz->hasPermissions($user, "modify_student_data")) {
-		$self->{submitError} = "You are not authorized to modify student data";
-		return;
-	}
+	# Check permissions
+	return unless $authz->hasPermissions($user, "access_instructor_tools");
 	
 	#if (defined($r->param('addStudent'))) {
 	#	my $newUser = $db->newUser;
@@ -173,41 +238,26 @@ sub initialize {
 	#}
 }
 
-sub title {
-	my $self = shift;
-	return "User List";
-}
 
-sub path {
-	my $self = shift;
-	my $args = $_[-1];
-	my $ce = $self->{ce};
-	my $root = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
-	
-	return $self->pathMacro($args,
-		"Home"              => "$root",
-		$courseName         => "$root/$courseName",
-		"Instructor Tools"  => "$root/$courseName/instructor",
-		"Users"             => "", # "$root/$courseName/instructor/users",
-	);
-}
 
 sub body {
-	my ($self, $setID) = @_;
-	my $r = $self->{r};
-	my $authz = $self->{authz};
-	my $user = $r->param('user');
-	my $db = $self->{db};
-	my $ce = $self->{ce};
-	my $root = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
+	my ($self)       = @_;
+	my $r            = $self->r;
+	my $urlpath      = $r->urlpath;
+	my $db           = $r->db;
+	my $ce           = $r->ce;
+	my $authz        = $r->authz;	
+	my $courseName   = $urlpath->arg("courseID");
+	my $setID        = $urlpath->arg("setID");       
+	my $user         = $r->param('user');
 	
+	my $root = $ce->{webworkURLs}->{root};
+
 	# templates for getting field names
 	my $userTemplate            = $self->{userTemplate}            = $db->newUser;
 	my $permissionLevelTemplate = $self->{permissionLevelTemplate} = $db->newPermissionLevel;
 	
-	return CGI::em("You are not authorized to access the Instructor tools.")
+	return CGI::div({class=>"ResultsWithError"}, CGI::p("You are not authorized to access the instructor tools."))
 		unless $authz->hasPermissions($user, "access_instructor_tools");
 	
 	# This table can be consulted when display-ready forms of field names are needed.
@@ -227,29 +277,37 @@ sub body {
 		comment 
 		permission
 	)} = (
-		"User ID", 
+		"Login Name", 
 		"First Name", 
 		"Last Name", 
-		"E-mail", 
+		"Email Address", 
 		"Student ID", 
 		"Status", 
 		"Section", 
 		"Recitation", 
 		"Comment", 
-		"Perm. Level"
+		"Permission Level"
 	);
 	
+	$self->{prettyFieldNames} = \%prettyFieldNames;
 	########## set initial values for state fields
 	
-	my @allUserIDs = $db->listUsers;
+	# exclude set-level proctors
+	my @allUserIDs = grep {$_ !~ /^set_id:/} $db->listUsers;
+	# DBFIXME count would work
+	$self->{totalSets} = $db->listGlobalSets; # save for use in "assigned sets" links
 	$self->{allUserIDs} = \@allUserIDs;
 	
-	if (defined $r->param("visible_users")) {
+	# DBFIXME filter in the database
+	if (defined $r->param("visable_user_string")) {
+		my @visableUserIDs = split /:/, $r->param("visable_user_string");
+		$self->{visibleUserIDs} = [ @visableUserIDs ];
+	} elsif (defined $r->param("visible_users")) {
 		$self->{visibleUserIDs} = [ $r->param("visible_users") ];
 	} elsif (defined $r->param("no_visible_users")) {
 		$self->{visibleUserIDs} = [];
 	} else {
-		if (@allUserIDs > HIDE_USERS_THRESHHOLD) {
+		if ((@allUserIDs > HIDE_USERS_THRESHHOLD) and (not defined $r->param("show_all_users") )) {
 			$self->{visibleUserIDs} = [];
 		} else {
 			$self->{visibleUserIDs} = [ @allUserIDs ];
@@ -265,14 +323,33 @@ sub body {
 	}
 	
 	$self->{editMode} = $r->param("editMode") || 0;
+
+	return CGI::div({class=>"ResultsWithError"}, CGI::p("You are not authorized to modify student data"))
+		if $self->{editMode} and not $authz->hasPermissions($user, "modify_student_data");
+
+
+	$self->{passwordMode} = $r->param("passwordMode") || 0;
+
+	return CGI::div({class=>"ResultsWithError"}, CGI::p("You are not authorized to modify student data"))
+		if $self->{passwordMode} and not $authz->hasPermissions($user, "modify_student_data");
+
+	if (defined $r->param("labelSortMethod")) {
+		$self->{primarySortField} = $r->param("labelSortMethod");
+		$self->{secondarySortField} = $r->param("primarySortField");
+		$self->{ternarySortField} = $r->param("secondarySortField");
+	}
+	else {			
+		$self->{primarySortField} = $r->param("primarySortField") || "last_name";
+		$self->{secondarySortField} = $r->param("secondarySortField") || "first_name";
+		$self->{ternarySortField} = $r->param("ternarySortField") || "student_id";
+	}
 	
-	$self->{sortField} = $r->param("sortField") || "last_name";
-	
+	# DBFIXME use an iterator
 	my @allUsers = $db->getUsers(@allUserIDs);
 	my (%sections, %recitations);
 	foreach my $User (@allUsers) {
-		push @{$sections{$User->section}}, $User->user_id;
-		push @{$recitations{$User->recitation}}, $User->user_id;
+		push @{$sections{defined $User->section ? $User->section : ""}}, $User->user_id;
+		push @{$recitations{defined $User->recitation ? $User->recitation : ""}}, $User->user_id;
 	}
 	$self->{sections} = \%sections;
 	$self->{recitations} = \%recitations;
@@ -281,52 +358,103 @@ sub body {
 	
 	my $actionID = $r->param("action");
 	if ($actionID) {
-		unless (grep { $_ eq $actionID } @{ VIEW_FORMS() }, @{ EDIT_FORMS() }) {
+		unless (grep { $_ eq $actionID } @{ VIEW_FORMS() }, @{ EDIT_FORMS() }, @{ PASSWORD_FORMS() } ) {
 			die "Action $actionID not found";
 		}
-		my $actionHandler = "${actionID}_handler";
-		my %genericParams;
-		foreach my $param (qw(selected_users)) {
-			$genericParams{$param} = [ $r->param($param) ];
+		# Check permissions
+		if (not FORM_PERMS()->{$actionID} or $authz->hasPermissions($user, FORM_PERMS()->{$actionID})) {
+			my $actionHandler = "${actionID}_handler";
+			my %genericParams;
+			foreach my $param (qw(selected_users)) {
+				$genericParams{$param} = [ $r->param($param) ];
+			}
+			my %actionParams = $self->getActionParams($actionID);
+			my %tableParams = $self->getTableParams();
+			print CGI::p(
+			    '<div style="color:green">',
+				"Result of last action performed: ",
+				CGI::i($self->$actionHandler(\%genericParams, \%actionParams, \%tableParams)),
+				'</div>',
+				CGI::hr()
+			);
+		} else {
+			return CGI::div({class=>"ResultsWithError"}, CGI::p("You are not authorized to perform this action."));
 		}
-		my %actionParams = $self->getActionParams($actionID);
-		my %tableParams = $self->getTableParams();
-		print CGI::p(
-			"Result of last action performed: ",
-			CGI::i($self->$actionHandler(\%genericParams, \%actionParams, \%tableParams))
-		);
 	}
 		
 	########## retrieve possibly changed values for member fields
 	
 	#@allUserIDs = @{ $self->{allUserIDs} }; # do we need this one?
+	# DBFIXME instead of re-listing, why not add added users to $self->{allUserIDs} ?
+	# exclude set-level proctors
+	@allUserIDs = grep {$_ !~ /^set_id:/} $db->listUsers; # recompute value in case some were added
 	my @visibleUserIDs = @{ $self->{visibleUserIDs} };
 	my @prevVisibleUserIDs = @{ $self->{prevVisibleUserIDs} };
 	my @selectedUserIDs = @{ $self->{selectedUserIDs} };
 	my $editMode = $self->{editMode};
-	my $sortField = $self->{sortField};
+	my $passwordMode = $self->{passwordMode};	
+	my $primarySortField = $self->{primarySortField};
+	my $secondarySortField = $self->{secondarySortField};
+	my $ternarySortField = $self->{ternarySortField};
 	
 	#warn "visibleUserIDs=@visibleUserIDs\n";
 	#warn "prevVisibleUserIDs=@prevVisibleUserIDs\n";
 	#warn "selectedUserIDs=@selectedUserIDs\n";
 	#warn "editMode=$editMode\n";
-	
+	#warn "passwordMode=$passwordMode\n";
+	#warn "primarySortField=$primarySortField\n";
+	#warn "secondarySortField=$secondarySortField\n";
+	#warn "ternarySortField=$ternarySortField\n";
+
 	########## get required users
 		
 	my @Users = grep { defined $_ } @visibleUserIDs ? $db->getUsers(@visibleUserIDs) : ();
-	
-	# presort users
+
 	my %sortSubs = %{ SORT_SUBS() };
-	my $sortSub = $sortSubs{$sortField};
-	#@Users = sort $sortSub @Users;
-	@Users = sort byLnFnUid @Users;
+	my $primarySortSub = $sortSubs{$primarySortField};
+	my $secondarySortSub = $sortSubs{$secondarySortField};
+	my $ternarySortSub = $sortSubs{$ternarySortField};
+	
+	# add permission level to user record hash so we can sort it if necessary
+	# DBFIXME this calls for a join... (i'd like the User record to contain permission level info)
+	if ($primarySortField eq 'permission' or $secondarySortField eq 'permission' or $ternarySortField eq 'permission') {
+		foreach my $User (@Users) {
+			next unless $User;
+			my $permissionLevel = $db->getPermissionLevel($User->user_id);
+        	                $User->{permission} = $permissionLevel->permission;
+		}
+	}
+		
+	
+#	# don't forget to sort in opposite order of importance
+#	@Users = sort $secondarySortSub @Users;
+#	@Users = sort $primarySortSub @Users;
+#	#@Users = sort byLnFnUid @Users;
+
+#   Always have a definite sort order even if first three sorts don't determine things
+	@Users = sort {
+		&$primarySortSub
+			||
+		&$secondarySortSub 
+			||
+		&$ternarySortSub
+			||
+		byLastName
+			||
+		byFirstName
+			||
+		byUserID
+		} 
+		@Users;
 		
 	my @PermissionLevels;
 	
 	for (my $i = 0; $i < @Users; $i++) {
 		my $User = $Users[$i];
+		# DBFIX we maybe already have the permission level from above (for use in sorting)
 		my $PermissionLevel = $db->getPermissionLevel($User->user_id); # checked
 		
+		# DBFIXME this should go in the DB layer
 		unless ($PermissionLevel) {
 			# uh oh! no permission level record found!
 			warn "added missing permission level for user ", $User->user_id, "\n";
@@ -345,7 +473,7 @@ sub body {
 	
 	########## print beginning of form
 	
-	print CGI::start_form({method=>"post", action=>$r->uri, name=>"userlist"});
+	print CGI::start_form({method=>"post", action=>$self->systemLink($urlpath,authen=>0), name=>"userlist"});
 	print $self->hidden_authen_fields();
 	
 	########## print state data
@@ -366,7 +494,11 @@ sub body {
 	
 	print CGI::hidden(-name=>"editMode", -value=>$editMode);
 	
-	print CGI::hidden(-name=>"sortField", -value=>$sortField);
+	print CGI::hidden(-name=>"passwordMode", -value=>$passwordMode);
+	
+	print CGI::hidden(-name=>"primarySortField", -value=>$primarySortField);
+	print CGI::hidden(-name=>"secondarySortField", -value=>$secondarySortField);
+	print CGI::hidden(-name=>"ternarySortField", -value=>$ternarySortField);
 	
 	print "\n<!-- state data here -->\n";
 	
@@ -378,12 +510,16 @@ sub body {
 	my @formsToShow;
 	if ($editMode) {
 		@formsToShow = @{ EDIT_FORMS() };
+	}elsif ($passwordMode) {
+		@formsToShow = @{ PASSWORD_FORMS() };	
 	} else {
 		@formsToShow = @{ VIEW_FORMS() };
 	}
 	
 	my $i = 0;
 	foreach my $actionID (@formsToShow) {
+		# Check permissions
+		next if FORM_PERMS()->{$actionID} and not $authz->hasPermissions($user, FORM_PERMS()->{$actionID});
 		my $actionForm = "${actionID}_form";
 		my $onChange = "document.userlist.action[$i].checked=true";
 		my %actionParams = $self->getActionParams($actionID);
@@ -395,19 +531,47 @@ sub body {
 		
 		$i++;
 	}
-	
-	print CGI::Tr({}, CGI::td({-colspan=>2, -align=>"center"},
-		CGI::submit(-value=>"Take Action!"))
+	my $selectAll =CGI::input({-type=>'button', -name=>'check_all', -value=>'Select all users',
+	       onClick => "for (i in document.userlist.elements)  { 
+	                       if (document.userlist.elements[i].name =='selected_users') { 
+	                           document.userlist.elements[i].checked = true
+	                       }
+	                    }" });
+   	my $selectNone =CGI::input({-type=>'button', -name=>'check_none', -value=>'Unselect all users',
+	       onClick => "for (i in document.userlist.elements)  { 
+	                       if (document.userlist.elements[i].name =='selected_users') { 
+	                          document.userlist.elements[i].checked = false
+	                       }
+	                    }" });
+	unless ($editMode or $passwordMode) {
+		print CGI::Tr({}, CGI::td({ colspan=>2, -align=>"center"},
+			$selectAll." ". $selectNone
+			)
+		);
+	}
+	print CGI::Tr({}, CGI::td({ colspan=>2, -align=>"center"},
+		CGI::submit(-value=>"Take Action!") 
+		)
 	);
 	print CGI::end_table();
 	
 	########## print table
 	
-	print CGI::p("Showing ", scalar @visibleUserIDs, " out of ", scalar @allUserIDs, " users.");
+	print CGI::p({},"Showing ", scalar @Users, " out of ", scalar @allUserIDs, " users.");
 	
+	print CGI::p("If a password field is left blank, the student's current password will be maintained.") if $passwordMode;
+	if ($editMode) {
+	   
+
+		print CGI::p('<b>Click</b> on the login name to <b>edit individual problem set data</b>, (e.g. due dates) for these students.');
+	}
 	$self->printTableHTML(\@Users, \@PermissionLevels, \%prettyFieldNames,
 		editMode => $editMode,
+		passwordMode => $passwordMode,
 		selectedUserIDs => \@selectedUserIDs,
+		primarySortField => $primarySortField,
+		secondarySortField => $secondarySortField,
+		visableUserIDs => \@visibleUserIDs,
 	);
 	
 	
@@ -458,19 +622,23 @@ sub filter_form {
 	my ($self, $onChange, %actionParams) = @_;
 	#return CGI::table({}, CGI::Tr({-valign=>"top"},
 	#	CGI::td({}, 
+	
+	my %prettyFieldNames = %{ $self->{prettyFieldNames} };
+	
 	return join("", 
 			"Show ",
 			CGI::popup_menu(
 				-name => "action.filter.scope",
-				-values => [qw(all none selected match_ids match_section match_recitation)],
-				-default => $actionParams{"action.filter.scope"}->[0] || "selected",
+				-values => [qw(all none selected match_regex)],
+				-default => $actionParams{"action.filter.scope"}->[0] || "match_regex",
 				-labels => {
 					all => "all users",
 					none => "no users",
-					selected => "users selected below",
-					match_ids => "users with matching user IDs:",
-					match_section => "users in selected section",
-					match_recitation => "users in selected recitation",
+					selected => "selected users",
+#					match_ids => "users with matching user IDs:",
+					match_regex => "users who match:", 
+#					match_section => "users in selected section",
+#					match_recitation => "users in selected recitation",
 				},
 				-onchange => $onChange,
 			),
@@ -481,22 +649,30 @@ sub filter_form {
 				-width => "50",
 				-onchange => $onChange,
 			),
-			" (separate multiple IDs with commas)",
-			CGI::br(),
-			"sections: ",
-			CGI::popup_menu(
-				-name => "action.filter.section",
-				-values => [ keys %{ $self->{sections} } ],
-				-default => $actionParams{"action.filter.section"}->[0] || "",
-				-labels => { $self->menuLabels($self->{sections}) },
-				-onchange => $onChange,
-			),
-			" recitations: ",
+#			" (separate multiple IDs with commas)",
+#			CGI::br(),
+#			"sections: ",
+#			CGI::popup_menu(
+#				-name => "action.filter.section",
+#				-values => [ keys %{ $self->{sections} } ],
+#				-default => $actionParams{"action.filter.section"}->[0] || "",
+#				-labels => { $self->menuLabels($self->{sections}) },
+#				-onchange => $onChange,
+#			),
+#			" recitations: ",
+#			CGI::popup_menu(
+#				-name => "action.filter.recitation",
+#				-values => [ keys %{ $self->{recitations} } ],
+#				-default => $actionParams{"action.filter.recitation"}->[0] || "",
+#				-labels => { $self->menuLabels($self->{recitations}) },
+#				-onchange => $onChange,
+#			),
+			" in their ",
 			CGI::popup_menu(
-				-name => "action.filter.recitation",
-				-values => [ keys %{ $self->{recitations} } ],
-				-default => $actionParams{"action.filter.recitation"}->[0] || "",
-				-labels => { $self->menuLabels($self->{recitations}) },
+				-name => "action.filter.field",
+				-value => [ keys %{ FIELD_PROPERTIES() } ],
+				-default => $actionParams{"action.filter.field"}->[0] || "user_id",
+				-labels => \%prettyFieldNames,
 				-onchange => $onChange,
 			),
 	);
@@ -506,9 +682,13 @@ sub filter_form {
 
 # this action handler modifies the "visibleUserIDs" field based on the contents
 # of the "action.filter.scope" parameter and the "selected_users" 
+# DBFIXME filtering should happen in the database!
 sub filter_handler {
 	my ($self, $genericParams, $actionParams, $tableParams) = @_;
 	
+	my $r = $self->r;
+	my $db = $r->db;
+	
 	my $result;
 	
 	my $scope = $actionParams->{"action.filter.scope"}->[0];
@@ -521,6 +701,23 @@ sub filter_handler {
 	} elsif ($scope eq "selected") {
 		$result = "showing selected users";
 		$self->{visibleUserIDs} = $genericParams->{selected_users}; # an arrayref
+	} elsif ($scope eq "match_regex") {
+		$result = "showing matching users";
+		my $regex = $actionParams->{"action.filter.user_ids"}->[0];
+		my $field = $actionParams->{"action.filter.field"}->[0];
+		my @userRecords = $db->getUsers(@{$self->{allUserIDs}});
+		my @userIDs;
+		foreach my $record (@userRecords) {
+			next unless $record;
+
+			# add permission level to user record hash so we can match it if necessary
+			if ($field eq "permission") {
+				my $permissionLevel = $db->getPermissionLevel($record->user_id);
+        	                $record->{permission} = $permissionLevel->permission;
+			}
+			push @userIDs, $record->user_id if $record->{$field} =~ /^$regex/i;
+		}
+		$self->{visibleUserIDs} = \@userIDs;
 	} elsif ($scope eq "match_ids") {
 		my @userIDs = split /\s*,\s*/, $actionParams->{"action.filter.user_ids"}->[0];
 		$self->{visibleUserIDs} = \@userIDs;
@@ -535,14 +732,107 @@ sub filter_handler {
 	return $result;
 }
 
+sub sort_form {
+	my ($self, $onChange, %actionParams) = @_;
+	return join ("",
+		"Sort by ",
+		CGI::popup_menu(
+			-name => "action.sort.primary",
+			-values => [qw(user_id first_name last_name email_address student_id status section recitation comment permission)],
+			-default => $actionParams{"action.sort.primary"}->[0] || "last_name",
+			-labels => {
+				user_id		=> "Login Name",
+				first_name	=> "First Name",
+				last_name	=> "Last Name",
+				email_address	=> "Email Address",
+				student_id	=> "Student ID",
+				status		=> "Enrollment Status",
+				section		=> "Section",
+				recitation	=> "Recitation",
+				comment		=> "Comment",
+				permission	=> "Permission Level"
+			},
+			-onchange => $onChange,
+		),
+		", then by ",
+		CGI::popup_menu(
+			-name => "action.sort.secondary",
+			-values => [qw(user_id first_name last_name email_address student_id status section recitation comment permission)],
+			-default => $actionParams{"action.sort.secondary"}->[0] || "first_name",
+			-labels => {
+				user_id		=> "Login Name",
+				first_name	=> "First Name",
+				last_name	=> "Last Name",
+				email_address	=> "Email Address",
+				student_id	=> "Student ID",
+				status		=> "Enrollment Status",
+				section		=> "Section",
+				recitation	=> "Recitation",
+				comment		=> "Comment",
+				permission	=> "Permission Level"
+			},
+			-onchange => $onChange,
+		),
+		", then by ",
+		CGI::popup_menu(
+			-name => "action.sort.ternary",
+			-values => [qw(user_id first_name last_name email_address student_id status section recitation comment permission)],
+			-default => $actionParams{"action.sort.ternary"}->[0] || "user_id",
+			-labels => {
+				user_id		=> "Login Name",
+				first_name	=> "First Name",
+				last_name	=> "Last Name",
+				email_address	=> "Email Address",
+				student_id	=> "Student ID",
+				status		=> "Enrollment Status",
+				section		=> "Section",
+				recitation	=> "Recitation",
+				comment		=> "Comment",
+				permission	=> "Permission Level"
+			},
+			-onchange => $onChange,
+		),
+
+		".",
+	);
+}
+
+sub sort_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	
+	my $primary = $actionParams->{"action.sort.primary"}->[0];
+	my $secondary = $actionParams->{"action.sort.secondary"}->[0];
+	my $ternary = $actionParams->{"action.sort.ternary"}->[0];
+	
+	$self->{primarySortField} = $primary;
+	$self->{secondarySortField} = $secondary;
+	$self->{ternarySortField} = $ternary;
+
+	my %names = (
+				user_id		=> "Login Name",
+				first_name	=> "First Name",
+				last_name	=> "Last Name",
+				email_address	=> "Email Address",
+				student_id	=> "Student ID",
+				status		=> "Enrollment Status",
+				section		=> "Section",
+				recitation	=> "Recitation",
+				comment		=> "Comment",
+				permission	=> "Permission Level"
+	);
+	
+	return "Users sorted by $names{$primary}, then by $names{$secondary}, then by $names{$ternary}.";
+}
+
 sub edit_form {
 	my ($self, $onChange, %actionParams) = @_;
+
 	return join("",
 		"Edit ",
 		CGI::popup_menu(
 			-name => "action.edit.scope",
 			-values => [qw(all visible selected)],
-			-default => $actionParams{"action.edit.scope"}->[0] || "visible",
+			-default => $actionParams{"action.edit.scope"}->[0] || "selected",
 			-labels => {
 				all => "all users",
 				visible => "visible users",
@@ -555,7 +845,7 @@ sub edit_form {
 
 sub edit_handler {
 	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	
+
 	my $result;
 	
 	my $scope = $actionParams->{"action.edit.scope"}->[0];
@@ -574,33 +864,81 @@ sub edit_handler {
 	return $result;
 }
 
+
+sub password_form {
+	my ($self, $onChange, %actionParams) = @_;
+
+	return join("",
+		"Give new password to ",
+		CGI::popup_menu(
+			-name => "action.password.scope",
+			-values => [qw(all visible selected)],
+			-default => $actionParams{"action.password.scope"}->[0] || "selected",
+			-labels => {
+				all => "all users",
+				visible => "visible users",
+				selected => "selected users"
+			},
+			-onchange => $onChange,
+		),
+	);
+}
+
+sub password_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+
+	my $result;
+	
+	my $scope = $actionParams->{"action.password.scope"}->[0];
+	if ($scope eq "all") {
+		$result = "giving new passwords to all users";
+		$self->{visibleUserIDs} = $self->{allUserIDs};
+	} elsif ($scope eq "visible") {
+		$result = "giving new passwords to visible users";
+		# leave visibleUserIDs alone
+	} elsif ($scope eq "selected") {
+		$result = "giving new passwords to selected users";
+		$self->{visibleUserIDs} = $genericParams->{selected_users}; # an arrayref
+	}
+	$self->{passwordMode} = 1;
+	
+	return $result;
+}
+
 sub delete_form {
 	my ($self, $onChange, %actionParams) = @_;
+
 	return join("",
+	    	CGI::div({class=>"ResultsWithError"},
 		"Delete ",
 		CGI::popup_menu(
 			-name => "action.delete.scope",
-			-values => [qw(visible selected)],
-			-default => $actionParams{"action.delete.scope"}->[0] || "selected",
+			-values => [qw(none selected)],
+			-default => $actionParams{"action.delete.scope"}->[0] || "none",
 			-labels => {
-				visible => "visible users",
-				selected => "selected users"
+			    none     => "no users.",
+				#visible  => "visible users.",
+				selected => "selected users."
 			},
 			-onchange => $onChange,
 		),
 		CGI::em(" Deletion destroys all user-related data and is not undoable!"),
+		),
 	);
 }
 
 sub delete_handler {
 	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	my $db = $self->{db};
+	my $r         = $self->r;
+	my $db        = $r->db;
+	my $user      = $r->param('user');
 	my $scope = $actionParams->{"action.delete.scope"}->[0];
 	
-	my @userIDsToDelete;
-	if ($scope eq "visible") {
-		@userIDsToDelete = @{ $self->{visibleUserIDs} };
-	} elsif ($scope eq "selected") {
+	my @userIDsToDelete = ();
+	#if ($scope eq "visible") {
+	#	@userIDsToDelete = @{ $self->{visibleUserIDs} };
+	#} elsif ($scope eq "selected") {
+	if ($scope eq "selected") {
 		@userIDsToDelete = @{ $self->{selectedUserIDs} };
 	}
 	
@@ -608,28 +946,44 @@ sub delete_handler {
 	my %visibleUserIDs = map { $_ => 1 } @{ $self->{visibleUserIDs} };
 	my %selectedUserIDs = map { $_ => 1 } @{ $self->{selectedUserIDs} };
 	
+	my $error = "";
+	my $num = 0;
 	foreach my $userID (@userIDsToDelete) {
+		if ($user eq $userID) { # don't delete yourself!!
+			$error = "You cannot delete yourself!";
+			next;
+		}
 		delete $allUserIDs{$userID};
 		delete $visibleUserIDs{$userID};
 		delete $selectedUserIDs{$userID};
 		$db->deleteUser($userID);
+		$num++;
 	}
 	
 	$self->{allUserIDs} = [ keys %allUserIDs ];
 	$self->{visibleUserIDs} = [ keys %visibleUserIDs ];
 	$self->{selectedUserIDs} = [ keys %selectedUserIDs ];
 	
-	my $num = @userIDsToDelete;
-	return "deleted $num user" . ($num == 1 ? "" : "s");
+	return "deleted $num user" . ($num == 1 ? "" : "s.  ") . $error;
+}
+sub add_form {
+	my ($self, $onChange, %actionParams) = @_;
+
+    return "Add ", CGI::input({name=>'number_of_students', value=>1,size => 3}), " student(s). ";
 }
 
+sub add_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	# This action is redirected to the addUser.pm module using ../instructor/add_user/...
+	return "Nothing done by add student handler";
+}
 sub import_form {
 	my ($self, $onChange, %actionParams) = @_;
 	return join(" ",
 		"Import users from file",
 		CGI::popup_menu(
 			-name => "action.import.source",
-			-values => [ "", $self->getCSVList() ],
+			-values => [ $self->getCSVList() ],
 			-default => $actionParams{"action.import.source"}->[0] || "",
 			-onchange => $onChange,
 		),
@@ -696,7 +1050,8 @@ sub import_handler {
 	
 	return $numReplaced . " user" . ($numReplaced == 1 ? "" : "s") . " replaced, "
 		. $numAdded . " user" . ($numAdded == 1 ? "" : "s") . " added, "
-		. $numSkipped . " user" . ($numSkipped == 1 ? "" : "s") . " skipped.";
+		. $numSkipped . " user" . ($numSkipped == 1 ? "" : "s") . " skipped"
+		. " (" . join (", ", @$skipped) . ") ";
 }
 
 sub export_form {
@@ -736,11 +1091,17 @@ sub export_form {
 
 sub export_handler {
 	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	my $r       = $self->r;
+	my $ce      = $r->ce;
+	my $dir     = $ce->{courseDirs}->{templates};
 	
 	my $scope = $actionParams->{"action.export.scope"}->[0];
 	my $target = $actionParams->{"action.export.target"}->[0];
 	my $new = $actionParams->{"action.export.new"}->[0];
 	
+	#get name of templates directory as it appears in file manager
+	$dir =~ s|.*/||;
+	
 	my $fileName;
 	if ($target eq "new") {
 		$fileName = $new;
@@ -761,7 +1122,7 @@ sub export_handler {
 	
 	$self->exportUsersToCSV($fileName, @userIDsToExport);
 	
-	return scalar @userIDsToExport . " users exported";
+	return scalar @userIDsToExport . " users exported to file &nbsp;&nbsp; $dir/$fileName";
 }
 
 sub cancelEdit_form {
@@ -771,7 +1132,7 @@ sub cancelEdit_form {
 
 sub cancelEdit_handler {
 	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	my $r = $self->{r};
+	my $r      = $self->r;
 	
 	#$self->{selectedUserIDs} = $self->{visibleUserIDs};
 		# only do the above if we arrived here via "edit selected users"
@@ -794,8 +1155,8 @@ sub saveEdit_form {
 
 sub saveEdit_handler {
 	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	my $r = $self->{r};
-	my $db = $self->{db};
+	my $r           = $self->r;
+	my $db          = $r->db;
 	
 	my @visibleUserIDs = @{ $self->{visibleUserIDs} };
 	foreach my $userID (@visibleUserIDs) {
@@ -834,21 +1195,83 @@ sub saveEdit_handler {
 	return "changes saved";
 }
 
+sub cancelPassword_form {
+	my ($self, $onChange, %actionParams) = @_;
+	return "Abandon changes";
+}
+
+sub cancelPassword_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	my $r      = $self->r;
+	
+	#$self->{selectedUserIDs} = $self->{visibleUserIDs};
+		# only do the above if we arrived here via "edit selected users"
+	if (defined $r->param("prev_visible_users")) {
+		$self->{visibleUserIDs} = [ $r->param("prev_visible_users") ];
+	} elsif (defined $r->param("no_prev_visible_users")) {
+		$self->{visibleUserIDs} = [];
+	} else {
+		# leave it alone
+	}
+	$self->{passwordMode} = 0;
+	
+	return "changes abandoned";
+}
+
+sub savePassword_form {
+	my ($self, $onChange, %actionParams) = @_;
+	return "Save changes";
+}
+
+sub savePassword_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	my $r           = $self->r;
+	my $db          = $r->db;
+	
+	my @visibleUserIDs = @{ $self->{visibleUserIDs} };
+	foreach my $userID (@visibleUserIDs) {
+		my $User = $db->getUser($userID); # checked
+		die "record for visible user $userID not found" unless $User;
+		my $param = "user.${userID}.new_password";
+			if ((defined $tableParams->{$param}->[0]) and ($tableParams->{$param}->[0])) {
+				my $newP = $tableParams->{$param}->[0];
+				my $Password = eval {$db->getPassword($User->user_id)}; # checked	 	
+				my 	$cryptPassword = cryptPassword($newP);											 
+				$Password->password(cryptPassword($newP));
+				eval { $db->putPassword($Password) };				
+			}
+	}
+	
+	if (defined $r->param("prev_visible_users")) {
+		$self->{visibleUserIDs} = [ $r->param("prev_visible_users") ];
+	} elsif (defined $r->param("no_prev_visible_users")) {
+		$self->{visibleUserIDs} = [];
+	} else {
+		# leave it alone
+	}
+	
+	$self->{passwordMode} = 0;
+	
+	return "new passwords saved";
+}
+
+
 ################################################################################
 # sorts
 ################################################################################
 
-sub byUserID       { $a->user_id       cmp $b->user_id       }
-sub byFirstName    { $a->first_name    cmp $b->first_name    }
-sub byLastName     { $a->last_name     cmp $b->last_name     }
-sub byEmailAddress { $a->email_address cmp $b->email_address }
-sub byStudentID    { $a->student_id    cmp $b->student_id    }
-sub byStatus       { $a->status        cmp $b->status        }
-sub bySection      { $a->section       cmp $b->section       }
-sub byRecitation   { $a->recitation    cmp $b->recitation    }
-sub byComment      { $a->comment       cmp $b->comment       }
+sub byUserID       { lc $a->user_id       cmp lc $b->user_id       }
+sub byFirstName    {  (defined $a->first_name && defined $b->first_name) ?  lc $a->first_name cmp lc $b->first_name  : 0;  }
+sub byLastName     {  (defined $a->last_name  && defined $b->last_name ) ?  lc $a->last_name  cmp lc $b->last_name   : 0;  }
+sub byEmailAddress { lc $a->email_address cmp lc $b->email_address }
+sub byStudentID    { lc $a->student_id    cmp lc $b->student_id    }
+sub byStatus       { lc $a->status        cmp lc $b->status        }
+sub bySection      { lc $a->section       cmp lc $b->section       }
+sub byRecitation   { lc $a->recitation    cmp lc $b->recitation    }
+sub byComment      { lc $a->comment       cmp lc $b->comment       }
+sub byPermission   { $a->{permission}    <=>  $b->{permission}     }  ## permission level is added to user record hash so we can sort it if necessary
 
-sub byLnFnUid { &byLastName || &byFirstName || &byUserID }
+# sub byLnFnUid { &byLastName || &byFirstName || &byUserID }
 
 ################################################################################
 # utilities
@@ -868,13 +1291,17 @@ sub menuLabels {
 	return %result;
 }
 
+# FIXME REFACTOR this belongs in a utility class so that addcourse can use it!
+# (we need a whole suite of higher-level import/export functions somewhere)
 sub importUsersFromCSV {
 	my ($self, $fileName, $createNew, $replaceExisting, @replaceList) = @_;
-	my $ce = $self->{ce};
-	my $db = $self->{db};
-	my $dir = $ce->{courseDirs}->{templates};
+	my $r     = $self->r;
+	my $ce    = $r->ce;
+	my $db    = $r->db;
+	my $dir   = $ce->{courseDirs}->{templates};
+	my $user  = $r->param('user');
 	
-	die "illegal character in input: \"/\"" if $fileName =~ m|/|;
+	die "illegal character in input: '/'" if $fileName =~ m|/|;
 	die "won't be able to read from file $dir/$fileName: does it exist? is it readable?"
 		unless -r "$dir/$fileName";
 	
@@ -888,16 +1315,28 @@ sub importUsersFromCSV {
 		%replaceOK = %allUserIDs;
 	}
 	
+	my $default_permission_level = $ce->{default_permission_level};
+	
 	my (@replaced, @added, @skipped);
 	
-	my @contents = split /\n/, readFile("$dir/$fileName");
-	foreach my $string (@contents) {
-		$string =~ s/^\s+//;
-		$string =~ s/\s+$//;
-		my (
-			$student_id, $last_name, $first_name, $status, $comment,
-			$section, $recitation, $email_address, $user_id
-		) = split /\s*,\s*/, $string;
+	# get list of hashrefs representing lines in classlist file
+	my @classlist = parse_classlist("$dir/$fileName");
+	
+	# Default status is enrolled -- fetch abbreviation for enrolled
+	my $default_status_abbrev = $ce->{statuses}->{Enrolled}->{abbrevs}->[0];
+	
+	foreach my $record (@classlist) {
+		my %record = %$record;
+		my $user_id = $record{user_id};
+		
+		unless (WeBWorK::DB::check_user_id($user_id) ) {  # try to catch lines with bad characters
+			push @skipped, $user_id;
+			next;
+		}
+		if ($user_id eq $user) { # don't replace yourself!!
+			push @skipped, $user_id;
+			next;
+		}
 		
 		if (exists $allUserIDs{$user_id} and not exists $replaceOK{$user_id}) {
 			push @skipped, $user_id;
@@ -909,25 +1348,30 @@ sub importUsersFromCSV {
 			next;
 		}
 		
-		my $User = $db->newUser;
-		$User->user_id($user_id);
-		$User->first_name($first_name);
-		$User->last_name($last_name);
-		$User->email_address($email_address);
-		$User->student_id($student_id);
-		$User->status($status);
-		$User->section($section);
-		$User->recitation($recitation);
-		$User->comment($comment);
+		# set default status is status field is "empty"
+		$record{status} = $default_status_abbrev
+			unless defined $record{status} and $record{status} ne "";
 		
-		my $PermissionLevel = $db->newPermissionLevel;
-		$PermissionLevel->user_id($user_id);
-		$PermissionLevel->permission(0);
+		# set password from student ID if password field is "empty"
+		if (not defined $record{password} or $record{password} eq "") {
+			if (defined $record{student_id} and $record{student_id} ne "") {
+				# crypt the student ID and use that
+				$record{password} = cryptPassword($record{student_id});
+			} else {
+				# an empty password field in the database disables password login
+				$record{password} = "";
+			}
+		}
 		
-		my $Password = $db->newPassword;
-		$Password->user_id($user_id);
-		$Password->password(cryptPassword($student_id));
+		# set default permission level if permission level is "empty"
+		$record{permission} = $default_permission_level
+			unless defined $record{permission} and $record{permission} ne "";
 		
+		my $User = $db->newUser(%record);
+		my $PermissionLevel = $db->newPermissionLevel(user_id => $user_id, permission => $record{permission});
+		my $Password = $db->newPassword(user_id => $user_id, password => $record{password});
+		
+		# DBFIXME use REPLACE
 		if (exists $allUserIDs{$user_id}) {
 			$db->putUser($User);
 			$db->putPermissionLevel($PermissionLevel);
@@ -946,34 +1390,33 @@ sub importUsersFromCSV {
 
 sub exportUsersToCSV {
 	my ($self, $fileName, @userIDsToExport) = @_;
-	my $ce = $self->{ce};
-	my $db = $self->{db};
-	my $dir = $ce->{courseDirs}->{templates};
+	my $r       = $self->r;
+	my $ce      = $r->ce;
+	my $db      = $r->db;
+	my $dir     = $ce->{courseDirs}->{templates};
 		
-	die "illegal character in input: \"/\"" if $fileName =~ m|/|;
+	die "illegal character in input: '/'" if $fileName =~ m|/|;
 	
-	open my $fh, ">", "$dir/$fileName"
-		or die "failed to open file $dir/$fileName for writing: $!\n";
+	my @records;
 	
-	foreach my $userID (@userIDsToExport) {
-		my $User = $db->getUser($userID); # checked
-		die "record for user $userID not found." unless $User;
-		my @fields = (
-			$User->student_id,
-			$User->last_name,
-			$User->first_name,
-			$User->status,
-			$User->comment,
-			$User->section,
-			$User->recitation,
-			$User->email_address,
-			$User->user_id,
+	# DBFIXME use an iterator here
+	my @Users = $db->getUsers(@userIDsToExport);
+	my @Passwords = $db->getPasswords(@userIDsToExport);
+	my @PermissionLevels = $db->getPermissionLevels(@userIDsToExport);
+	foreach my $i (0 .. $#userIDsToExport) {
+		my $User = $Users[$i];
+		my $Password = $Passwords[$i];
+		my $PermissionLevel = $PermissionLevels[$i];
+		next unless defined $User;
+		my %record = (
+			defined $PermissionLevel ? $PermissionLevel->toHash : (),
+			defined $Password ? $Password->toHash : (),
+			$User->toHash,
 		);
-		my $string = join ",", @fields;
-		print $fh "$string\n";
+		push @records, \%record;
 	}
 	
-	close $fh;
+	write_classlist("$dir/$fileName", @records);
 }
 
 ################################################################################
@@ -982,20 +1425,36 @@ sub exportUsersToCSV {
 
 sub fieldEditHTML {
 	my ($self, $fieldName, $value, $properties) = @_;
+	my $ce = $self->r->ce;
 	my $size = $properties->{size};
 	my $type = $properties->{type};
 	my $access = $properties->{access};
 	my $items = $properties->{items};
 	my $synonyms = $properties->{synonyms};
 	
+	if ($type eq "email") {
+		if ($value eq '&nbsp;') {
+			return $value;}
+		else {
+			return CGI::a({-href=>"mailto:$value"},$value);
+		}
+	}
+	
 	if ($access eq "readonly") {
+		# hack for status
+		if ($type eq "status") {
+			my $status_name = $ce->status_abbrev_to_name($value);
+			if (defined $status_name) {
+				$value = "$status_name ($value)";
+			}
+		}
 		return $value;
 	}
 	
 	if ($type eq "number" or $type eq "text") {
 		return CGI::input({type=>"text", name=>$fieldName, value=>$value, size=>$size});
 	}
-	
+		
 	if ($type eq "enumerable") {
 		my $matched = undef; # Whether a synonym match has occurred
 
@@ -1018,33 +1477,94 @@ sub fieldEditHTML {
 			labels => $items,
 		});
 	}
+	
+	if ($type eq "status") {
+		# we used to surreptitously map synonyms to a canonical value...
+		# so should we continue to do that?
+		my $status_name = $ce->status_abbrev_to_name($value);
+		if (defined $status_name) {
+			$value = ($ce->status_name_to_abbrevs($status_name))[0];
+		}
+		
+		my (@values, %labels);
+		while (my ($k, $v) = each %{$ce->{statuses}}) {
+			my @abbrevs = @{$v->{abbrevs}};
+			push @values, $abbrevs[0];
+			foreach my $abbrev (@abbrevs) {
+				$labels{$abbrev} = $k;
+			}
+		}
+		
+		return CGI::popup_menu({
+			name => $fieldName, 
+			values => \@values,
+			default => $value,
+			labels => \%labels,
+		});
+	}
+
+	if ($type eq "permission") {
+		my ($default, @values, %labels);
+		my %roles = %{$ce->{userRoles}};
+		foreach my $role (sort {$roles{$a}<=>$roles{$b}} keys(%roles) ) {
+			my $val = $roles{$role};
+
+			push(@values, $val);
+			$labels{$val} = $role;
+			$default = $val if ( $value eq $role );
+		}
+		return CGI::popup_menu({
+			-name => $fieldName,
+			-values => \@values,
+			 -default => [$default], # force default of 0 to be a selector value (instead of 
+			                        # being considered as a null -- now works with CGI 3.42
+			#-default => $default,   # works with CGI 3.49 (but the above does not, go figure
+			-labels => \%labels,
+			-override => 1,    # force default value to be selected. (corrects bug on newer CGI
+		});
+	}
 }
 
 sub recordEditHTML {
 	my ($self, $User, $PermissionLevel, %options) = @_;
-	my $r = $self->{r};
-	my $ce = $self->{ce};
-	my $root = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
+	my $r           = $self->r;
+	my $urlpath     = $r->urlpath;
+	my $db          = $r->db;
+	my $ce          = $r->ce;
+	my $authz	= $r->authz;
+	my $user	= $r->param('user');
+	my $root        = $ce->{webworkURLs}->{root};
+	my $courseName  = $urlpath->arg("courseID");
 	
 	my $editMode = $options{editMode};
+	my $passwordMode = $options{passwordMode};
 	my $userSelected = $options{userSelected};
+
+	my $statusClass = $ce->status_abbrev_to_name($User->status);
+
+	my $sets = $db->countUserSets($User->user_id);
+	my $totalSets = $self->{totalSets};
 	
-	my $changeEUserURL = "$root/$courseName?"
-		. "user="           . $r->param("user")
-		. "&effectiveUser=" . $User->user_id
-		. "&key="           . $r->param("key");
+	my $changeEUserURL = $self->systemLink($urlpath->new(type=>'set_list',args=>{courseID=>$courseName}),
+										   params => {effectiveUser => $User->user_id}
+	);
 	
-	my $setsAssignedToUserURL = "$root/$courseName/instructor/users/"
-		. $User->user_id . "/sets/?"
-		. "user="           . $r->param("user")
-		. "&effectiveUser=" . $r->param("effectiveUser")
-		. "&key="           . $r->param("key");
+	my $setsAssignedToUserURL = $self->systemLink($urlpath->new(type=>'instructor_user_detail',
+	                                                            args=>{courseID => $courseName, 
+	                                                                   userID   => $User->user_id
+	                                                                   }),
+										   params => {effectiveUser => $User->user_id}
+	);
+
+	my $userListURL = $self->systemLink($urlpath->new(type=>'instructor_user_list', args=>{courseID => $courseName} )) . "&editMode=1&visible_users=" . $User->user_id;
+
+	my $imageURL = $ce->{webworkURLs}->{htdocs}."/images/edit.gif";
+        my $imageLink = CGI::a({href => $userListURL}, CGI::img({src=>$imageURL, border=>0}));
 	
 	my @tableCells;
 	
 	# Select
-	if ($editMode) {
+	if ($editMode or $passwordMode) {
 		# column not there
 	} else {
 		# selection checkbox
@@ -1057,56 +1577,110 @@ sub recordEditHTML {
 	}
 	
 	# Act As
-	if ($editMode) {
+	if ($editMode or $passwordMode) {
 		# column not there
 	} else {
 		# selection checkbox
-		push @tableCells, CGI::a({href=>$changeEUserURL}, "Act&nbsp;As");
+		if ( FIELD_PERMS()->{act_as} and not $authz->hasPermissions($user, FIELD_PERMS()->{act_as}) ){
+			push @tableCells, $User->user_id . $imageLink;
+		} else {
+			push @tableCells, CGI::a({href=>$changeEUserURL}, $User->user_id) . $imageLink;
+		}
 	}
 	
-	# User ID
-	if ($editMode) {
+	# Login Status
+	if ($editMode or $passwordMode) {
+		# column not there
+	} else {
+		# check to see if a user is currently logged in
+		# DBFIXME use a WHERE clause
+		my $Key = $db->getKey($User->user_id);
+		my $is_active = ($Key and time <= $Key->timestamp()+$ce->{sessionKeyTimeout}); # cribbed from check_session
+		push @tableCells, $is_active ? CGI::b("active") : CGI::em("inactive");
+	}
+	
+	# change password (only in password mode)
+	if ($passwordMode) {
+		if ($User->user_id eq $user) {
+			push @tableCells, ''   # don't allow a professor to change their own password from this form
+		}
+		else {
+			my $fieldName = 'user.' . $User->user_id . '.' . 'new_password';
+			push @tableCells, CGI::input({type=>"text", name=>$fieldName, size=>14});;
+		}	
+	}	
+	# User ID (edit mode) or Assigned Sets (otherwise)
+	if ( $passwordMode) {
+		# straight user ID
+		push @tableCells, CGI::div({class=>$statusClass}, $User->user_id);
+	} elsif ($editMode) {
 		# straight user ID
-		push @tableCells, $User->user_id;
+		 my $userDetailPage = $urlpath->new(type =>'instructor_user_detail',
+					                       args =>{
+						                             courseID => $courseName,
+						                             userID   => $User->user_id, #FIXME eventually this should be a list??
+	                }
+	    );
+	    my $userDetailUrl = $self->systemLink($userDetailPage,params =>{});
+		push @tableCells, CGI::a({href=>$userDetailUrl}, $User->user_id);
+	
 	} else {
 		# "edit sets assigned to user" link
-		push @tableCells, CGI::a({href=>$setsAssignedToUserURL}, $User->user_id);
+		#push @tableCells, CGI::a({href=>$setsAssignedToUserURL}, "Edit sets");
+		if ( FIELD_PERMS()->{sets} and not $authz->hasPermissions($user, FIELD_PERMS()->{sets}) ) {
+			push @tableCells, "$sets/$totalSets";
+		} else {
+			push @tableCells, CGI::a({href=>$setsAssignedToUserURL}, "$sets/$totalSets");
+		}
 	}
-	
+
 	# User Fields
 	foreach my $field ($User->NONKEYFIELDS) {
-		my $fieldName = "user." . $User->user_id . "." . $field,
+		my $fieldName = 'user.' . $User->user_id . '.' . $field,
 		my $fieldValue = $User->$field;
 		my %properties = %{ FIELD_PROPERTIES()->{$field} };
-		$properties{access} = "readonly" unless $editMode;
-		push @tableCells, $self->fieldEditHTML($fieldName, $fieldValue, \%properties);
+		$properties{access} = 'readonly' unless $editMode;
+		$properties{type} = 'email' if ($field eq 'email_address' and !$editMode and !$passwordMode);
+		$fieldValue = $self->nbsp($fieldValue) unless $editMode;
+		push @tableCells, CGI::div({class=>$statusClass}, $self->fieldEditHTML($fieldName, $fieldValue, \%properties));
 	}
 	
 	# PermissionLevel Fields
 	foreach my $field ($PermissionLevel->NONKEYFIELDS) {
-		my $fieldName = "permission." . $PermissionLevel->user_id . "." . $field,
+		my $fieldName = 'permission.' . $PermissionLevel->user_id . '.' . $field,
 		my $fieldValue = $PermissionLevel->$field;
+		# get name out of permission level 
+		if ( $field eq 'permission' ) {
+			($fieldValue) = grep { $ce->{userRoles}->{$_} eq $fieldValue } ( keys ( %{$ce->{userRoles}} ) );
+		}
 		my %properties = %{ FIELD_PROPERTIES()->{$field} };
-		$properties{access} = "readonly" unless $editMode;
-		push @tableCells, $self->fieldEditHTML($fieldName, $fieldValue, \%properties);
+		$properties{access} = 'readonly' unless $editMode;
+		$fieldValue = $self->nbsp($fieldValue) unless $editMode;
+		push @tableCells, CGI::div({class=>$statusClass}, $self->fieldEditHTML($fieldName, $fieldValue, \%properties));
 	}
 	
-	return CGI::Tr({}, CGI::td({}, \@tableCells));
+	return CGI::Tr({}, CGI::td({nowrap=>1}, \@tableCells));
 }
 
 sub printTableHTML {
 	my ($self, $UsersRef, $PermissionLevelsRef, $fieldNamesRef, %options) = @_;
-	my $r = $self->{r};
-	my $userTemplate = $self->{userTemplate};
+	my $r                       = $self->r;
+	my $urlpath     = $r->urlpath;
+	my $courseName  = $urlpath->arg("courseID");
+	my $userTemplate            = $self->{userTemplate};
 	my $permissionLevelTemplate = $self->{permissionLevelTemplate};
-	my @Users = @$UsersRef;
-	my @PermissionLevels = @$PermissionLevelsRef;
-	my %fieldNames = %$fieldNamesRef;
-	
-	my $editMode = $options{editMode};
-	my %selectedUserIDs = map { $_ => 1 } @{ $options{selectedUserIDs} };
-	my $currentSort = $options{currentSort};
-	
+	my @Users                   = @$UsersRef;
+	my @PermissionLevels        = @$PermissionLevelsRef;
+	my %fieldNames              = %$fieldNamesRef;
+	
+	my $editMode                = $options{editMode};
+	my $passwordMode            = $options{passwordMode};
+	my %selectedUserIDs         = map { $_ => 1 } @{ $options{selectedUserIDs} };
+#	my $currentSort             = $options{currentSort};
+	my $primarySortField        = $options{primarySortField};
+	my $secondarySortField      = $options{secondarySortField};	
+	my @visableUserIDs          = @{ $options{visableUserIDs} };	
+		
 	# names of headings:
 	my @realFieldNames = (
 			$userTemplate->KEYFIELDS,
@@ -1114,267 +1688,99 @@ sub printTableHTML {
 			$permissionLevelTemplate->NONKEYFIELDS,
 	);
 	
-	my %sortSubs = %{ SORT_SUBS() };
+#	my %sortSubs = %{ SORT_SUBS() };
 	#my @stateParams = @{ STATE_PARAMS() };
 	#my $hrefPrefix = $r->uri . "?" . $self->url_args(@stateParams); # $self->url_authen_args
 	my @tableHeadings;
 	foreach my $field (@realFieldNames) {
-		my $result;
-		#if (exists $sortSubs{$field}) {
-		#	$result = CGI::a({-href=>"$hrefPrefix&sort=$field"}, $fieldNames{$field});
-		#} else {
-			$result = $fieldNames{$field};
-		#}
+		my $result = $fieldNames{$field};
 		push @tableHeadings, $result;
 	};
 	
 	# prepend selection checkbox? only if we're NOT editing!
-	unshift @tableHeadings, "Select", "Act As" unless $editMode;
-	
+	unless($editMode or $passwordMode) {
+
+		#warn "line 1582 visibleUserIDs=@visableUserIDs \n";
+		my %current_state =();
+		if (@visableUserIDs) {
+			# This is a hack to get around: Maximum URL Length Is 2,083 Characters in Internet Explorer.
+			# Without passing visable users the URL is about 250 characters. If the total URL is under the limit
+			# we will pass visable users. If it is over, we will not pass any and all users will be displayed.
+			# Maybe we should replace the GET method by POST (but this doesn't look good) --- AKP
+
+			my $visableUserIDsString = join ':', @visableUserIDs;
+			if (length($visableUserIDsString) < 1830) {
+				%current_state = (
+					primarySortField => "$primarySortField", 
+					secondarySortField => "$secondarySortField",
+					visable_user_string => "$visableUserIDsString"
+				);
+			} else {
+				%current_state = (
+				primarySortField => "$primarySortField", 
+				secondarySortField => "$secondarySortField",
+				show_all_users => "1"
+				);
+			}	
+		} else {
+			%current_state = (
+			primarySortField => "$primarySortField", 
+			secondarySortField => "$secondarySortField",
+			no_visible_users => "1"
+			);
+		}	
+		@tableHeadings = (
+			"Select",
+			CGI::a({href => $self->systemLink($urlpath->new(type=>'instructor_user_list', args=>{courseID => $courseName,} ), params=>{labelSortMethod=>'user_id', %current_state})}, 'Login Name'),
+			"Login Status", 
+			"Assigned Sets",
+			CGI::a({href => $self->systemLink($urlpath->new(type=>'instructor_user_list', args=>{courseID => $courseName,} ), params=>{labelSortMethod=>'first_name', %current_state})}, 'First Name'),
+			CGI::a({href => $self->systemLink($urlpath->new(type=>'instructor_user_list', args=>{courseID => $courseName,} ), params=>{labelSortMethod=>'last_name', %current_state})}, 'Last Name'),
+			CGI::a({href => $self->systemLink($urlpath->new(type=>'instructor_user_list', args=>{courseID => $courseName,} ), params=>{labelSortMethod=>'email_address', %current_state})}, 'Email Address'),
+			CGI::a({href => $self->systemLink($urlpath->new(type=>'instructor_user_list', args=>{courseID => $courseName,} ), params=>{labelSortMethod=>'student_id', %current_state})}, 'Student ID'),
+			CGI::a({href => $self->systemLink($urlpath->new(type=>'instructor_user_list', args=>{courseID => $courseName,} ), params=>{labelSortMethod=>'status', %current_state})}, 'Status'),
+			CGI::a({href => $self->systemLink($urlpath->new(type=>'instructor_user_list', args=>{courseID => $courseName,} ), params=>{labelSortMethod=>'section', %current_state})}, 'Section'),
+			CGI::a({href => $self->systemLink($urlpath->new(type=>'instructor_user_list', args=>{courseID => $courseName,} ), params=>{labelSortMethod=>'recitation', %current_state})}, 'Recitation'),
+			CGI::a({href => $self->systemLink($urlpath->new(type=>'instructor_user_list', args=>{courseID => $courseName,} ), params=>{labelSortMethod=>'comment', %current_state})}, 'Comment'),
+			CGI::a({href => $self->systemLink($urlpath->new(type=>'instructor_user_list', args=>{courseID => $courseName,} ), params=>{labelSortMethod=>'permission', %current_state})}, 'Permission Level'),
+		)	
+	}
+ 	if($passwordMode) {	
+		unshift @tableHeadings, "New Password";
+        }       
+        
 	# print the table
-	if ($editMode) {
+	if ($editMode or $passwordMode) {
 		print CGI::start_table({});
 	} else {
-		print CGI::start_table({-border=>1});
+		print CGI::start_table({-border=>1, -nowrap=>1});
 	}
 	
 	print CGI::Tr({}, CGI::th({}, \@tableHeadings));
 	
+
 	for (my $i = 0; $i < @Users; $i++) {
 		my $User = $Users[$i];
 		my $PermissionLevel = $PermissionLevels[$i];
 		
 		print $self->recordEditHTML($User, $PermissionLevel,
 			editMode => $editMode,
+			passwordMode => $passwordMode,
 			userSelected => exists $selectedUserIDs{$User->user_id}
 		);
 	}
 	
 	print CGI::end_table();
+    #########################################
+	# if there are no users shown print message
+	# 
+	##########################################
+	
+	print CGI::p(
+	              CGI::i("No students shown.  Choose one of the options above to 
+	              list the students in the course.")
+	) unless @Users;
 }
 
 1;
 
-__END__
-	
-	my $editMode = 0;
-	if (defined $r->param("edit_selected") or defined $r->param("edit_visible")) {
-		$editMode = 1;
-	}
-	
-	my @userIDs = $db->listUsers;
-	my @userRecords = $db->getUsers(@userIDs);
-	
-	my (%sections, %recitations);
-	foreach my $user (@userRecords) {
-		push @{$sections{$user->section}}, $user;
-		push @{$recitations{$user->recitation}}, $user;
-	}
-	
-	my $filter_type = $r->param("filter_type")
-		|| (@userIDs > HIDE_USERS_THRESHHOLD ? "none" : "all");
-	my $filter_user_id = $filter_type eq "filter_user_id"
-		? $r->param("filter_user_id") || ""
-		: "";
-	my $filter_section = $filter_type eq "filter_section"
-		? $r->param("filter_section") || ""
-		: "";
-	my $filter_recitation = $filter_type eq "filter_recitation"
-		? $r->param("filter_recitation") || ""
-		: "";
-	
-	# override filter selection if "Edit Selected Users" button is pressed
-	if (defined $r->param("edit_selected")) {
-		$filter_type = "filter_selected";
-	}
-	
-	if ($filter_type eq "none") {
-		@userRecords = ();
-	} elsif ($filter_type eq "filter_selected") {
-		@userRecords = ();
-		my @userIDs = $r->param("selectUser");
-		if (@userIDs) {
-			@userRecords = $db->getUsers(@userIDs);
-		}
-	} elsif ($filter_type eq "filter_user_id") {
-		@userRecords = ();
-		if ($filter_user_id ne "") {
-			my $userRecord = $db->getUser($filter_user_id);
-			@userRecords = ($userRecord) if $userRecord;
-		}
-	} elsif ($filter_type eq "filter_section") {
-		@userRecords = ();
-		@userRecords = @{$sections{$filter_section}}
-			if exists $sections{$filter_section};
-	} elsif ($filter_type eq "filter_recitation") {
-		@userRecords = ();
-		@userRecords = @{$recitations{$filter_recitation}}
-			if exists $recitations{$filter_recitation};
-	}
-	
-	@userRecords = sort {
-		(lc $a->section cmp lc $b->section)
-			|| (lc $a->last_name cmp lc $b->last_name)
-			|| (lc $a->first_name cmp lc $b->first_name)
-			|| (lc $a->user_id cmp lc $b->user_id)
-	} @userRecords;
-	
-	print CGI::start_form({method=>"post", action=>$r->uri()});
-	print $self->hidden_authen_fields();
-	
-	filter options
-	my %labels = (
-		none => "No users",
-		all => "All " . scalar @userIDs . " users",
-		filter_selected => "Users selected below",
-		filter_user_id => "User with ID " . CGI::input({
-			type=>"text",
-			name=>"filter_user_id",
-			value=>$filter_user_id,
-			size=>"20"
-		}),
-		filter_section => "Users in section " . CGI::popup_menu(
-			-name=>"filter_section",
-			-values=>[ keys %sections ],
-			-labels=>{ $self->menuLabels(\%sections) },
-			-default=>$filter_section,
-		),
-		filter_recitation => "Users in recitation " . CGI::popup_menu(
-			-name=>"filter_recitation",
-			-values=>[ sort keys %recitations ],
-			-labels=>{ $self->menuLabels(\%recitations) },
-			-default=>$filter_recitation,
-		),
-	);
-	
-	if ($editMode) {
-		print CGI::hidden(
-			-name=>"filter_type",
-			-value=>"filter_selected",
-		);
-	} else {
-		my $cgi = new CGI;
-		$cgi->autoEscape(0);
-		print "Show:", CGI::br();
-		print $cgi->radio_group(
-			-name=>"filter_type",
-			-values=>[ qw(none all filter_selected filter_user_id filter_section filter_recitation) ],
-			-default=>$filter_type,
-			-linebreak=>"true",
-			-labels=>\%labels,
-			-rows=>3,
-			-columns=>2,
-		);
-		print CGI::submit({name=>"filter", value=>"Filter"});
-	}
-	
-	print CGI::start_table({});
-	
-	# Table headings, prettied-up
-	my @tableHeadings = (
-		($editMode ? () : "Select"),
-		map {$prettyFieldNames{$_}} (
-			$userTemplate->KEYFIELDS(),
-			$userTemplate->NONKEYFIELDS(),
-			$permissionLevelTemplate->NONKEYFIELDS(),
-		),
-	);
-	
-	# now print them
-	print CGI::Tr({},
-		CGI::th({}, \@tableHeadings)
-	);
-	
-	my @userIDsForHiddenSelectField;
-	
-	# process user records
-	foreach my $userRecord (@userRecords) {
-		my $currentUser = $userRecord->user_id;
-		push @userIDsForHiddenSelectField, $currentUser;
-		my $permissionLevel = $db->getPermissionLevel($currentUser);
-		unless (defined $permissionLevel) {
-			warn "No permissionLevel record for user $currentUser -- added";
-			my $newPermissionLevel = $db->newPermissionLevel;
-			$newPermissionLevel->user_id($currentUser);
-			$newPermissionLevel->permission(0);
-			$db->addPermissionLevel($newPermissionLevel);
-			$permissionLevel = $newPermissionLevel;
- 			# permission set to minimum level
-		}
-		
-		# A concise way of printing a row containing a cell for each field, editable unless it's a key
-		print CGI::Tr({},
-			CGI::td({}, [
-				($editMode
-					? () # don't show selection checkbox if we're in edit mode -- hidden field below
-					#: CGI::input({type=>"checkbox", name=>"selectUser", value=>$currentUser})
-					: CGI::checkbox(
-						-name=>"selectUser",
-						-value=>$currentUser,
-						-checked=>($filter_type eq "filter_selected" and not defined $r->param("editingAllVisibleUsers")),
-						-label=>""
-					)
-				),
-				($editMode
-					? $currentUser
-					: (map {
-						my $changeEUserURL = "$root/$courseName?"
-							. "user=" . $r->param("user")
-							. "&effectiveUser=" . $userRecord->user_id
-							. "&key=" . $r->param("key");
-						CGI::a({href=>$changeEUserURL}, $userRecord->$_)
-					} $userRecord->KEYFIELDS)
-				),
-				(map {
-					$self->fieldEditHTML(
-						"user." . $userRecord->user_id . "." .$_,
-						$userRecord->$_, $fieldProperties{$_});
-				} $userRecord->NONKEYFIELDS()), 
-				(map {
-					$self->fieldEditHTML(
-						"permission." . $permissionLevel->user_id . "." . $_,
-						$permissionLevel->$_, $fieldProperties{$_});
-				} $permissionLevel->NONKEYFIELDS()),
-			])
-		);
-	}
-	
-	unless (@userRecords) {
-		print CGI::Tr({},
-			CGI::td({-colspan=>scalar(@tableHeadings), -align=>"center"},
-				"No users match the filter criteria above."
-			),
-		);
-	}
-	
-	print CGI::end_table();
-	
-	if ($editMode) {
-		print CGI::hidden(-name=>"selectUser", -value=>[ @userIDsForHiddenSelectField ]);
-		if (defined $r->param("edit_visible")) {
-			print CGI::hidden(-name=>"editingAllVisibleUsers", -value=>1);
-		}
-	}
-	
-	if ($editMode) {
-		print CGI::submit({name=>"discard_chagnes", value=>"Discard Changes to Users"});
-		print CGI::submit({name=>"save_classlist", value=>"Save Changes to Users"});
-	} else {
-		print CGI::submit({name=>"edit_visible", value=>"Edit Visible Users"});
-		print CGI::submit({name=>"edit_selected", value=>"Edit Selected Users"});
-		print CGI::submit({name=>"delete_selected", value=>"Delete Selected Users"});
-	}
-	
-	print CGI::end_form();
-	
-	# Add a student form
-	unless ($editMode) {
-		print CGI::start_form({method=>"post", action=>$r->uri()});
-		print $self->hidden_authen_fields();
-		print "User ID:";
-		print CGI::input({type=>"text", name=>"newUserID", value=>"", size=>"20"});
-		print CGI::submit({name=>"addStudent", value=>"Add User"});
-		print CGI::end_form();
-	}
-	
-	return "";
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm b/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm
new file mode 100644
index 0000000000..6d9e8e0ce3
--- /dev/null
+++ b/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm
@@ -0,0 +1,226 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm,v 1.23 2006/09/25 22:14:53 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::ContentGenerator::Instructor::UsersAssignedToSet;
+use base qw(WeBWorK::ContentGenerator::Instructor);
+
+=head1 NAME
+
+WeBWorK::ContentGenerator::Instructor::UsersAssignedToSet - List and edit the
+users to which sets are assigned.
+
+=cut
+
+use strict;
+use warnings;
+use CGI qw(-nosticky );
+use WeBWorK::Debug;
+
+sub initialize {
+	my ($self)     = @_;
+	my $r          = $self->r;
+	my $urlpath    = $r->urlpath;
+	my $authz      = $r->authz;
+	my $db         = $r->db;	
+	my $setID      = $urlpath->arg("setID");
+	my $user       = $r->param('user');
+	
+	# Check permissions
+	return unless $authz->hasPermissions($user, "access_instructor_tools");	
+	return unless $authz->hasPermissions($user, "assign_problem_sets");
+	
+	my @users = $db->listUsers;
+	my %selectedUsers = map {$_ => 1} $r->param('selected');
+	
+	my $doAssignToSelected = 0;
+	
+	# get the global user, if there is one
+	my $globalUserID = "";
+	$globalUserID = $db->{set}->{params}->{globalUserID}
+		if ref $db->{set} eq "WeBWorK::DB::Schema::GlobalTableEmulator";
+
+	if (defined $r->param('assignToAll')) {
+		debug("assignSetToAllUsers($setID)");
+		$self->addmessage(CGI::div({class=>'ResultsWithoutError'}, "Problems have been assigned to all current users."));
+		$self->assignSetToAllUsers($setID);
+		debug("done assignSetToAllUsers($setID)");
+	} elsif (defined $r->param('unassignFromAll') and defined($r->param('unassignFromAllSafety')) and $r->param('unassignFromAllSafety')==1) {
+		%selectedUsers = ( $globalUserID => 1 );
+		$self->addmessage(CGI::div({class=>'ResultsWithoutError'}, "Problems for all students have been unassigned."));
+		$doAssignToSelected = 1;
+	} elsif (defined $r->param('assignToSelected')) {
+	   	$self->addmessage(CGI::div({class=>'ResultsWithoutError'}, "Problems for selected students have been reassigned."));
+		$doAssignToSelected = 1;
+	} elsif (defined $r->param("unassignFromAll")) {
+	   # no action taken
+	   $self->addmessage(CGI::div({class=>'ResultsWithError'}, "No action taken"));
+	}
+	
+	if ($doAssignToSelected) {
+		my $setRecord = $db->getGlobalSet($setID); #checked
+		die "Unable to get global set record for $setID " unless $setRecord;
+		
+		my %setUsers = map { $_ => 1 } $db->listSetUsers($setID);
+		foreach my $selectedUser (@users) {
+			if (exists $selectedUsers{$selectedUser}) {
+				unless ($setUsers{$selectedUser}) {	# skip users already in the set
+					debug("assignSetToUser($selectedUser, ...)");
+					$self->assignSetToUser($selectedUser, $setRecord);
+					debug("done assignSetToUser($selectedUser, ...)");
+				}
+			} else {
+				next if $selectedUser eq $globalUserID;
+				next unless $setUsers{$selectedUser};	# skip users not in the set
+				$db->deleteUserSet($selectedUser, $setID);
+			}
+		}
+	}
+}
+
+sub getSetName {
+	my ($self, $pathSetName) = @_;
+	if (ref $pathSetName eq "HASH") {
+		$pathSetName = undef;
+	}
+	return $pathSetName;
+}
+
+sub body {
+	my ($self)         = @_;
+	my $r              = $self->r;
+	my $urlpath        = $r->urlpath;
+	my $db             = $r->db;
+	my $ce             = $r->ce;
+	my $authz          = $r->authz;
+	my $webworkRoot    = $ce->{webworkURLs}->{root};
+	my $courseName     = $urlpath->arg("courseID");
+	my $setID          = $urlpath->arg("setID");
+	my $user           = $r->param('user');
+
+	return CGI::div({class=>"ResultsWithError"}, CGI::p("You are not authorized to acces the Instructor tools."))
+		unless $authz->hasPermissions($user, "access_instructor_tools");
+		
+	return CGI::div({class=>"ResultsWithError"}, CGI::p("You are not authorized to assign homework sets."))
+		unless $authz->hasPermissions($user, "assign_problem_sets");	
+	
+	# DBFIXME duplicate call
+	my @users = $db->listUsers;
+	print CGI::start_form({method=>"post", action => $self->systemLink( $urlpath, authen=>0) });
+	 
+	print CGI::p(
+		    CGI::submit({name=>"assignToAll", value => "Assign to All Current Users"}), CGI::i("This action can take a long time if there are many students.")
+		  ),
+		  CGI::div({-style=>"color:red"}, "Do not uncheck students, unless you know what you are doing.",CGI::br(),
+	           "There is NO undo for unassigning students. "),
+	      CGI::p("When you unassign
+				        by unchecking a student's name, you destroy all
+				        of the data for homework set ".CGI::b($setID)." for this student. You will then need to
+				        reassign the set to these students and they will receive new versions of the problems.
+				        Make sure this is what you want to do before unchecking students."
+	);
+				        
+	print CGI::start_table({});
+	print CGI::Tr({-valign=>"top"}, CGI::th(["Assigned","Login Name","&nbsp;","Student Name","&nbsp;","Section","&nbsp;","Due Date"]));
+	print CGI::Tr(CGI::td([CGI::hr(),CGI::hr(),"",CGI::hr(),"",CGI::hr(),"",CGI::hr(),"&nbsp;"]));
+
+	# get user records
+	my @userRecords  = ();
+	foreach my $currentUser ( @users) {
+		my $userObj = $db->getUser($currentUser); #checked
+		die "Unable to find user object for $currentUser. " unless $userObj;
+		push (@userRecords, $userObj );
+	}
+	@userRecords = sort { ( lc($a->section) cmp lc($b->section) ) || 
+	                     ( lc($a->last_name) cmp lc($b->last_name )) } @userRecords;
+	
+	# get the global user, if there is one
+	my $globalUserID = "";
+	$globalUserID = $db->{set}->{params}->{globalUserID}
+		if ref $db->{set} eq "WeBWorK::DB::Schema::GlobalTableEmulator";
+
+	foreach my $userRecord (@userRecords) {
+
+		my $statusClass = $ce->status_abbrev_to_name($userRecord->status) || "";
+
+		my $user = $userRecord->user_id;
+		my $userSetRecord = $db->getUserSet($user, $setID); #checked
+		# don't need to check here, undefined values are handled below
+		#die "Unable to find record for user $user and set $setID " unless $userSetRecord;
+		my $prettyName = $userRecord->last_name
+			. ", "
+			. $userRecord->first_name;
+		my $dueDate    = $userSetRecord->due_date if ref($userSetRecord);
+		my $prettyDate = ($dueDate)?  '(' . $self->formatDateTime($dueDate) . ') ' : '';
+		print CGI::Tr({}, 
+			CGI::td({-align=>"center"},
+				($user eq $globalUserID
+					? "" # no checkbox for global user!
+					: CGI::checkbox({
+						type=>"checkbox",
+						name=>"selected",
+						checked=>(
+							defined($userSetRecord) # && $statusClass ne "Drop"
+							? "on"
+							: ""
+						),
+						value=>$user,
+						label=>"",
+					})
+				)
+			),CGI::td({},[
+				CGI::div({class=>$statusClass}, $user),
+				"",
+				"($prettyName)", " ", $userRecord->section, " ",
+				(
+					defined $userSetRecord
+###					? $prettyDate . CGI::a(
+					? ($prettyDate, "", CGI::a(
+						{href=>$self->systemLink($urlpath->new(type =>'instructor_set_detail',
+						                                       args =>{courseID => $courseName,
+						                                               setID    => $setID
+						                                       }),
+						                         params =>{editForUser=> $user}
+						)},
+						"",
+						"Edit data for $user"
+					))
+					: ()
+				),
+			])
+		);
+	}
+	print CGI::Tr(CGI::td([CGI::hr(),CGI::hr(),"",CGI::hr(),"",CGI::hr(),"",CGI::hr()]));
+	print CGI::end_table();
+	print $self->hidden_authen_fields;
+	print CGI::submit({name=>"assignToSelected", value=>"Save"});
+	print CGI::p( CGI::hr(),
+				  CGI::div( {class=>'ResultsWithError'},
+						"There is NO undo for this function.  
+				        Do not use it unless you know what you are doing!  When you unassign
+				        a student using this button, or by unchecking their name, you destroy all
+				        of the data for homework set $setID for this student.",
+						CGI::br(),
+						CGI::submit({name=>"unassignFromAll", value=>"Unassign from All Users"}),
+						CGI::radio_group(-name=>"unassignFromAllSafety", -values=>[0,1], -default=>0, -labels=>{0=>'Read only', 1=>'Allow unassign'}),
+				  ),
+				  CGI::hr(),
+	);
+	print CGI::end_form();
+	
+	return "";
+}
+
+1;
diff --git a/lib/WeBWorK/ContentGenerator/Login.pm b/lib/WeBWorK/ContentGenerator/Login.pm
index 851c9b58cd..27ad28f744 100644
--- a/lib/WeBWorK/ContentGenerator/Login.pm
+++ b/lib/WeBWorK/ContentGenerator/Login.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Login.pm,v 1.46 2007/08/13 22:59:55 sh002i 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
@@ -15,6 +15,7 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator::Login;
+use base qw(WeBWorK);
 use base qw(WeBWorK::ContentGenerator);
 
 =head1 NAME
@@ -25,82 +26,211 @@ WeBWorK::ContentGenerator::Login - display a login form.
 
 use strict;
 use warnings;
-use CGI qw();
+#use CGI qw(-nosticky );
+use WeBWorK::CGI;
+use WeBWorK::Utils qw(readFile dequote);
 
-sub title {
-	return "Login";
+use mod_perl;
+use constant MP2 => ( exists $ENV{MOD_PERL_API_VERSION} and $ENV{MOD_PERL_API_VERSION} >= 2 );
+
+# This content generator is NOT logged in.
+sub if_loggedin {
+	my ($self, $arg) = @_;
+	
+	return !$arg;
 }
 
-sub links {
-	return "";
+sub info {
+
+	######### NOTES ON TRANSLATION
+	# -translation of the content found in the info panel.  Since most of this content is in fact read from files, a simple use of maketext would be too limited to translate these types of content efficiently.
+
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	
+	my $result;
+	# This section should be kept in sync with the Home.pm version
+	# list the login info first.
+	
+	# FIXME this is basically the same code as below... TIME TO REFACTOR!
+	my $login_info = $ce->{courseFiles}->{login_info};
+
+	if (defined $login_info and $login_info) {
+		# login info is relative to the templates directory, apparently
+		$login_info = $ce->{courseDirs}->{templates} . "/$login_info";
+		
+		# deal with previewing a temporary file
+		# FIXME: DANGER: this code allows viewing of any file
+		# FIXME: this code is disabled because PGProblemEditor no longer uses editFileSuffix
+		#if (defined $r->param("editMode") and $r->param("editMode") eq "temporaryFile"
+		#		and defined $r->param("editFileSuffix")) {
+		#	$login_info .= $r->param("editFileSuffix");
+		#}
+		
+		if (-f $login_info) {
+			my $text = eval { readFile($login_info) };
+			if ($@) {
+				$result .= CGI::h2($r->maketext("Login Info"));
+				$result .= CGI::div({class=>"ResultsWithError"}, $@);
+			} elsif ($text =~ /\S/) {
+				$result .= CGI::h2($r->maketext("Login Info"));
+				$result .= $text;
+			}
+		}
+	}
+
+	my $site_info = $ce->{webworkFiles}->{site_info};
+	if (defined $site_info and $site_info) {
+		# deal with previewing a temporary file
+		# FIXME: DANGER: this code allows viewing of any file
+		# FIXME: this code is disabled because PGProblemEditor no longer uses editFileSuffix
+		#if (defined $r->param("editMode") and $r->param("editMode") eq "temporaryFile"
+		#		and defined $r->param("editFileSuffix")) {
+		#	$site_info .= $r->param("editFileSuffix");
+		#}
+		
+		if (-f $site_info) {
+			my $text = eval { readFile($site_info) };
+			if ($@) {
+				$result .= CGI::h2($r->maketext("Site Information"));
+				$result .= CGI::div({class=>"ResultsWithError"}, $@);
+			} elsif ($text =~ /\S/) {
+				$result .= CGI::h2($r->maketext("Site Information"));
+				$result .= $text;
+			}
+		}
+	}
+	
+
+	
+	if (defined $result and $result ne "") {
+		return CGI::div({-class=>"info-wrapper"},CGI::div({class=>"info-box", id=>"InfoPanel"}, $result));
+	} else {
+		return "";
+	}
 }
 
 sub body {
-	my $self = shift;
-	my $r = $self->{r};
-	my $course_env = $self->{ce};
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my $db = $r->db;
+	my $urlpath = $r->urlpath;
+
+	# get the authen object to make sure that we should print
+	#    a login form or not
+	my $auth = $r->authen;
+	my $externalAuth = (defined($auth->{external_auth}) && $auth->{external_auth} ) ? 1 : 0;
+	
 	# get some stuff together
 	my $user = $r->param("user") || "";
 	my $key = $r->param("key");
 	my $passwd = $r->param("passwd") || "";
-	my $course = $course_env->{"courseName"};
+	my $course = $urlpath->arg("courseID");
+	my $practiceUserPrefix = $ce->{practiceUserPrefix};
+	
+	# don't fill in the user ID for practice users
+	# (they should use the "Guest Login" button)
+	$user = "" if $user =~ m/^$practiceUserPrefix/;
 	
 	# WeBWorK::Authen::verify will set the note "authen_error" 
 	# if invalid authentication is found.  If this is done, it's a signal to
 	# us to yell at the user for doing that, since Authen isn't a content-
 	# generating module.
-	if ($r->notes("authen_error")) {
-		print CGI::font({-color => 'red'}, CGI::b($r->notes("authen_error"))),CGI::br();
+	my $authen_error = MP2 ? $r->notes->get("authen_error") : $r->notes("authen_error");
+	if ($authen_error) {
+		print CGI::div({class=>"ResultsWithError"},
+			CGI::p($authen_error)
+		);
 	}
-	
-	print CGI::p("Please enter your username and password for ",CGI::b($course)," below:");
-	print CGI::startform({-method=>"POST", -action=>$r->uri});
-
-	# write out the form data posted to the requested URI
-	print $self->print_form_data('<input type="hidden" name="','" value="',"\"/>\n",qr/^(user|passwd|key|force_passwd_authen)$/);
-	
-	print
-		CGI::table({-border => 0}, 
-		  CGI::Tr([
-		    CGI::td([
-		      "Username:",
-		      CGI::input({-type=>"textfield", -name=>"user", -value=>"$user"}),CGI::br(),
-		    ]),
-		    CGI::td([
-		      "Password:",
-		      CGI::input({-type=>"password", -name=>"passwd", -value=>"$passwd"}) . CGI::i("(Will not be echoed)"),
-		    ]),
-		 ])
-		)
-	;
-	
-	print CGI::input({-type=>"submit", -value=>"Continue"});
-	print CGI::p(), "Many courses allow guest logins.", CGI::p(),
-	  "Use practice1, practice2, practice3, etc.",CGI::br(),
-	  "No password is required";
-	print CGI::endform();
-	
-	return "";
-}
 
-sub info {
-	my $self = shift;
-	my $r = $self->{r};
-	my $courseEnvironment = $self->{ce};
+	if ( $externalAuth ) {
+	    print CGI::p({}, $r->maketext("_EXTERNAL_AUTH_MESSAGE", CGI::strong($r->maketext($course))));
 
-	if (defined $courseEnvironment->{courseFiles}->{login_info}
-		and $courseEnvironment->{courseFiles}->{login_info}) {
-		my $login_info = eval { WeBWorK::Utils::readFile($courseEnvironment->{courseFiles}->{login_info}) };
-		$@ or print $login_info;
+	} else {
+		print CGI::p($r->maketext("Please enter your username and password for [_1] below:", CGI::b($r->maketext($course))));
+		print CGI::p($r->maketext("_LOGIN_MESSAGE", CGI::b($r->maketext("Remember Me"))));
+	
+		print CGI::startform({-method=>"POST", -action=>$r->uri, -id=>"login_form"});
 
-	}
-	'';
-}
-# This content generator is NOT logged in.
-sub if_loggedin($$) {
-	my ($self, $arg) = (@_);
 	
-	return !$arg;
+		# preserve the form data posted to the requested URI
+		my @fields_to_print = grep { not m/^(user|passwd|key|force_passwd_authen)$/ } $r->param;
+	
+		#FIXME:  This next line can be removed in time.  MEG 1/27/2005
+		# warn "Error in filtering fields : |", join("|",@fields_to_print),"|" if grep {m/user/} @fields_to_print;
+		# the above test was an attempt to discover why "user" was 
+		# being multiply defined.  We caught that error, but this 
+		# warning causes trouble with UserList.pm which now has 
+		# fields visible_users and prev_visible_users
+	
+	
+		# Important note. If hidden_fields is passed an empty array 
+		# it prints ALL parameters as hidden fields.  That is not 
+		# what we want in this case, so we don't print at all if 
+		# @fields_to_print is empty.
+		print $self->hidden_fields(@fields_to_print) if @fields_to_print > 0;
+	
+	
+		# print CGI::table({class=>"FormLayout"}, 
+			# CGI::Tr([
+				# CGI::td([
+		  		# "Username:",
+		  		# CGI::input({-type=>"text", -name=>"user", -value=>"$user"}),
+				# ]),CGI::br(),
+				# CGI::td([
+		  		# "Password:",
+		  		# CGI::input({-type=>"password", -name=>"passwd", -value=>"$passwd"}),
+				# ]),CGI::br(),
+				# CGI::td([
+		  		# "",
+		  		# CGI::checkbox(
+				# -name=>"send_cookie",
+				# -label=>"Remember Me",
+		  		# ),
+				# ]),
+	  		# ])
+		# );
+		
+		print CGI::br(),CGI::br();
+		print WeBWorK::CGI_labeled_input(-type=>"text", -id=>"uname", -label_text=>$r->maketext("Username").": ", -input_attr=>{-name=>"user", -value=>"$user"}, -label_attr=>{-id=>"uname_label"});
+		print CGI::br();
+		print WeBWorK::CGI_labeled_input(-type=>"password", -id=>"pswd", -label_text=>$r->maketext("Password").": ", -input_attr=>{-name=>"passwd", -value=>"$passwd"}, -label_attr=>{-id=>"pswd_label"});
+		print CGI::br();
+		print WeBWorK::CGI_labeled_input(-type=>"checkbox", -id=>"rememberme", -label_text=>$r->maketext("Remember Me"), -input_attr=>{-name=>"send_cookie", -value=>"on"});
+		print CGI::br();
+		print WeBWorK::CGI_labeled_input(-type=>"submit", -input_attr=>{-value=>$r->maketext("Continue")});
+		print CGI::br();
+		print CGI::endform();
+	
+		# figure out if there are any valid practice users
+		# DBFIXME do this with a WHERE clause
+		my @guestUserIDs = grep m/^$practiceUserPrefix/, $db->listUsers;
+		my @GuestUsers = $db->getUsers(@guestUserIDs);
+		my @allowedGuestUsers;
+		foreach my $GuestUser (@GuestUsers) {
+			next unless defined $GuestUser->status;
+			next unless $GuestUser->status ne "";
+			push @allowedGuestUsers, $GuestUser
+				if $ce->status_abbrev_has_behavior($GuestUser->status, "allow_course_access");
+		}
+	
+		# form for guest login
+		if (@allowedGuestUsers) {
+			print CGI::startform({-method=>"POST", -action=>$r->uri});
+		
+			# preserve the form data posted to the requested URI
+			my @fields_to_print = grep { not m/^(user|passwd|key|force_passwd_authen)$/ } $r->param;
+			print $self->hidden_fields(@fields_to_print);
+		
+			print CGI::p($r->maketext("_GUEST_LOGIN_MESSAGE", CGI::b($r->maketext("Guest Login"))));
+			print CGI::input({-type=>"submit", -name=>"login_practice_user", -value=>$r->maketext("Guest Login")});
+	    
+	    		print CGI::endform();
+		}
+	}
+	return "";
 }
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/LoginProctor.pm b/lib/WeBWorK/ContentGenerator/LoginProctor.pm
new file mode 100644
index 0000000000..a6f82473b8
--- /dev/null
+++ b/lib/WeBWorK/ContentGenerator/LoginProctor.pm
@@ -0,0 +1,298 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm,v 1.10 2007/04/04 15:05:26 glarose 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::ContentGenerator::LoginProctor;
+use base qw(WeBWorK::ContentGenerator);
+
+=head1 NAME
+
+WeBWorK::ContentGenerator::LoginProctor - display a login form for 
+GatewayQuiz proctored tests.
+
+=cut
+
+use strict;
+use warnings;
+use CGI qw(-nosticky );
+use WeBWorK::Utils qw(readFile dequote);
+use WeBWorK::DB::Utils qw(grok_vsetID);
+use WeBWorK::ContentGenerator::GatewayQuiz qw(can_recordAnswers);
+
+use mod_perl;
+use constant MP2 => ( exists $ENV{MOD_PERL_API_VERSION} and $ENV{MOD_PERL_API_VERSION} >= 2 );
+
+# This content generator is NOT logged in.
+# FIXME  I'm not sure this is really what we want for the proctor login,
+# FIXME  but I also don't know what this actually does, so I'm ignoring it
+# FIXME  for now.
+sub if_loggedin {
+	my ($self, $arg) = @_;
+	
+	return !$arg;
+}
+
+sub info {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	
+	my $result;
+	
+	# This section should be kept in sync with the Home.pm version
+	my $site_info = $ce->{webworkFiles}->{site_info};
+	if (defined $site_info and $site_info) {
+		# deal with previewing a temporary file
+		# FIXME: DANGER: this code allows viewing of any file
+		# FIXME: this code is disabled because PGProblemEditor no longer uses editFileSuffix
+		#if (defined $r->param("editMode") and $r->param("editMode") eq "temporaryFile"
+		#		and defined $r->param("editFileSuffix")) {
+		#	$site_info .= $r->param("editFileSuffix");
+		#}
+		
+		if (-f $site_info) {
+			my $text = eval { readFile($site_info) };
+			if ($@) {
+				$result .= CGI::h2("Site Information");
+				$result .= CGI::div({class=>"ResultsWithError"}, $@);
+			} elsif ($text =~ /\S/) {
+				$result .= CGI::h2("Site Information");
+				$result .= $text;
+			}
+		}
+	}
+	
+	# FIXME this is basically the same code as above... TIME TO REFACTOR!
+	my $login_info = $ce->{courseFiles}->{login_info};
+	if (defined $login_info and $login_info) {
+		# login info is relative to the templates directory, apparently
+		$login_info = $ce->{courseDirs}->{templates} . "/$login_info";
+		
+		# deal with previewing a temporary file
+		# FIXME: DANGER: this code allows viewing of any file
+		# FIXME: this code is disabled because PGProblemEditor no longer uses editFileSuffix
+		#if (defined $r->param("editMode") and $r->param("editMode") eq "temporaryFile"
+		#		and defined $r->param("editFileSuffix")) {
+		#	$login_info .= $r->param("editFileSuffix");
+		#}
+		
+		if (-f $login_info) {
+			my $text = eval { readFile($login_info) };
+			if ($@) {
+				$result .= CGI::h2("Login Info");
+				$result .= CGI::div({class=>"ResultsWithError"}, $@);
+			} elsif ($text =~ /\S/) {
+				$result .= CGI::h2("Login Info");
+				$result .= $text;
+			}
+		}
+	}
+	
+	if (defined $result and $result ne "") {
+		return CGI::div({class=>"info-box", id=>"InfoPanel"}, $result);
+	} else {
+		return "";
+	}
+}
+
+sub body {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my $db = $r->db;
+	my $urlpath = $r->urlpath;
+	
+  # convenient data variables
+	my $effectiveUser = $r->param("effectiveUser") || "";
+	my $user = $r->param("user");
+	my $proctorUser = $r->param("proctor_user") || "";
+	my $key = $r->param("proctor_key");
+	my $passwd = $r->param("proctor_passwd") || "";
+	my $course = $urlpath->arg("courseID");
+	my $setID = $urlpath->arg("setID");
+	my $timeNow = time();
+
+  # these are to manage the transition to, and possibly back from,
+  #    the grading proctor
+	my $pastProctorUser = $r->param("past_proctor_user") || $proctorUser;
+	my $pastProctorKey = $r->param("past_proctor_key") || $key;
+
+  # data collection
+	my $submitAnswers = $r->param("submitAnswers");
+	my $EffectiveUser = $db->getUser($effectiveUser);
+	my $User = $db->getUser($user);
+
+	my $effectiveUserFullName = $EffectiveUser->first_name() . " " . 
+	    $EffectiveUser->last_name();
+
+	# we need the UserSet to check for a set-restricted login proctor,
+	#    and to show and possibly save the submission time.
+	#    and to get the UserSet, we need to know what set and version
+	#    we're working with.  if the setName and versionName come in 
+	#    with the setID, we're ok; otherwise, get the highest version
+	#    number available and go with that
+	my ($setName, $versionNum) = grok_vsetID($setID);
+	my $noSetVersions = 0;
+	if ( ! $versionNum ) {
+		# get a list of all available versions
+		my @setVersions = $db->listSetVersions($effectiveUser,
+						       $setName);
+		if ( @setVersions ) {
+			$versionNum = $setVersions[-1];
+		} else {
+			# if there are no versions yet, we must be starting
+			#    the first one
+			$versionNum = 1;
+			$noSetVersions = 1;
+		}
+	}
+	# get the merged set; if we're not grading a test, 
+	#    get the merged template set instead
+	my $UserSet;
+	if ( $noSetVersions || ! $submitAnswers ) {
+		$UserSet = $db->getMergedSet($effectiveUser, $setName);
+	} else {
+		$UserSet = $db->getMergedSetVersion($effectiveUser, $setName,
+						    $versionNum);
+	}
+
+	# let's just make sure that worked
+	die("Proctor authorization requested for a nonexistent " .
+	    "set?\n") if ( ! defined( $UserSet ) );
+  
+	# now, if we're submitting the set we need to save the 
+	#    submission time.
+	if ( $submitAnswers ) {
+		# this shouldn't ever happen
+		if ( $noSetVersions ) {
+			die("Request to grade a set version before " .
+			    "any tests have been taken.");
+		}
+		# we save the submission time if the attempt will be recorded,
+		#   so we have to do some research to determine if that's 
+		#   the case
+		my $PermissionLevel = $db->getPermissionLevel($user);
+		my $Problem = 
+		    $db->getMergedProblemVersion($effectiveUser, $setName,
+						 $versionNum, 1);
+		# set last_attempt_time if appropriate
+		if ( WeBWorK::ContentGenerator::GatewayQuiz::can_recordAnswers($self, $User, $PermissionLevel, 
+			$EffectiveUser, $UserSet, $Problem) ) {
+			$UserSet->version_last_attempt_time( $timeNow );
+			# FIXME: this saves all of the merged set data into 
+			#    the set_user table.  we live with this in other
+			#    places for versioned sets, but it's not ideal
+			$db->putSetVersion( $UserSet );
+		}
+	}
+
+	
+	print CGI::p(CGI::strong("Proctor authorization required."), "\n\n");
+    # WeBWorK::Authen::verifyProctor will set the note "authen_error" 
+    # if invalid authentication is found.  If this is done, it's a signal to
+    # us to yell at the user for doing that, since Authen isn't a content-
+    # generating module.
+	my $authen_error = MP2 ? $r->notes->get("authen_error") : $r->notes("authen_error");
+	if ($authen_error) {
+		print CGI::div({class=>"ResultsWithError"},
+			CGI::p($authen_error)
+		);
+	}
+	
+    # also print a message about submission times if we're submitting 
+    # an answer
+	if ( $submitAnswers ) {
+	    my $dueTime = $UserSet->due_date();
+	    my $timeLimit = $UserSet->version_time_limit();
+	    my ($color, $msg) = ("#ddddff", "");
+
+	    if ( $dueTime + $ce->{gatewayGracePeriod} < $timeNow ) {
+		$color = "#ffffaa";
+		$msg = CGI::br() . "\nThe time limit on this assignment " .
+		    "was exceeded.\nThe assignment may be checked, but " .
+		    "the result will not be counted.\n";
+	    }
+	    my $style = "background-color: $color; color: black; " .
+		"border: solid black 1px; padding: 2px;";
+	    print CGI::div({-style=>$style}, 
+			   CGI::strong("Grading assignment: ", CGI::br(), 
+				       "Submission time: ", 
+				       scalar(localtime($timeNow)), CGI::br(),
+				       "Due: ",
+				       scalar(localtime($dueTime)), $msg));
+	}
+
+	# start printing the form
+	print CGI::startform({-method=>"POST", -action=>$r->uri});
+	# write out the form data posted to the requested URI
+	my @fields_to_print = 
+	    grep { ! /^(user)|(effectiveUser)|(passwd)|(key)|(force_password_authen)|(proctor_user)|(proctor_key)|(proctor_password)$/ } $r->param();
+
+	print $self->hidden_fields(@fields_to_print) if ( @fields_to_print );
+	print $self->hidden_authen_fields,"\n";
+
+	print CGI::hidden(-name=>"past_proctor_user",
+			  -value=>$pastProctorUser);
+	print CGI::hidden(-name=>"past_proctor_key",
+			  -value=>$pastProctorKey);
+
+	# skip printing the user's name and all if we're doing a restricted
+	#    set login
+	my $userNameFields = '';
+	if ( $submitAnswers || 
+	     ( $UserSet->restricted_login_proctor eq '' ||
+	       $UserSet->restricted_login_proctor eq 'No' ) ) {
+		print CGI::div({style=>"background-color:#ddddff;"},
+			       CGI::p("User's username is: ", 
+				      CGI::strong("$effectiveUser"),"\n",
+				      CGI::br(),"User's name is: ", 
+				      CGI::strong("$effectiveUserFullName"),
+				      "\n")),"\n";
+		$userNameFields = CGI::td([
+					"Proctor username:",
+					CGI::input({-type=>"text", 
+						    -name=>"proctor_user", 
+						    -value=>""}),
+					]);
+	} else {
+		print CGI::start_div({style=>"background-color:#ddddff;"});
+		print CGI::em("This set has a set-level proctor ",
+			      "password to authorize logins. ",
+			      "Enter the password below.");
+		print CGI::end_div();
+		print CGI::hidden(-name=>'proctor_user',
+				  -value=>"set_id:$setName");
+	}
+
+	# then print out the table for the username, if needed, and 
+	#    password for the proctor
+	print CGI::start_table({class=>"FormLayout"});
+	print CGI::Tr( $userNameFields ) if ( $userNameFields );
+	print CGI::Tr( CGI::td([
+				"Proctor password:",
+				CGI::input({-type=>"password", 
+					    -name=>"proctor_passwd", 
+					    -value=>""}),
+				])
+		       );
+	print CGI::end_table();
+	
+	print CGI::input({-type=>"submit", -value=>"Continue"});
+	print CGI::endform();
+	
+	return "";
+}
+
+1;
diff --git a/lib/WeBWorK/ContentGenerator/Logout.pm b/lib/WeBWorK/ContentGenerator/Logout.pm
index 8b59965d82..cfe330d154 100644
--- a/lib/WeBWorK/ContentGenerator/Logout.pm
+++ b/lib/WeBWorK/ContentGenerator/Logout.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Logout.pm,v 1.16 2007/03/22 13:39:50 glarose 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
@@ -25,46 +25,106 @@ WeBWorK::ContentGenerator::Logout - invalidate key and display logout message.
 
 use strict;
 use warnings;
-use CGI qw();
+#use CGI qw(-nosticky );
+use WeBWorK::CGI;
+use WeBWorK::Cookie;
+use WeBWorK::Localize;
 
-sub title {
-	return "Logout";
-}
 
-sub links {
-	return "";
+sub pre_header_initialize {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my $db = $r->db;
+	my $authen = $r->authen;
+	
+	# get rid of stored authentication info (this is kind of a hack. i have a better way
+	# in mind but it requires pretty much rewriting Authen/Login/Logout. :-( FIXME)
+	$authen->forget_verification;
+	
+	my $cookie = WeBWorK::Cookie->new($r,
+		-name => "WeBWorKAuthentication",
+		-value => "",
+		-expires => "-1D",
+		-domain => $r->hostname,
+		-path => $ce->{webworkURLRoot},
+		-secure => 0,
+	);
+	$r->headers_out->set("Set-Cookie" => $cookie->as_string);
+
+	my $userID = $r->param("user");
+	my $keyError = '';
+	eval { $db->deleteKey($userID) };
+	if ($@) {
+		$keyError .= "Something went wrong while logging out of " .
+			"WeBWorK: $@";
+	}
+
+	# also check to see if there is a proctor key associated with this 
+	#    login.  if there is a proctor user, then we must have a 
+	#    proctored test, so we try and delete the key
+	my $proctorID = defined($r->param("proctor_user")) ? 
+	    $r->param("proctor_user") : '';
+	if ( $proctorID ) {
+		eval { $db->deleteKey( "$userID,$proctorID" ); };
+		if ( $@ ) {
+			$keyError .= CGI::p( 
+				"Error when clearing proctor key: $@");
+		}
+	# we may also have a proctor key from grading the test
+		eval { $db->deleteKey( "$userID,$proctorID,g" ); };
+		if ( $@ ) {
+			$keyError .= CGI::p( 
+				"Error when clearing proctor grading key: $@");
+		}
+	}
+	$self->{keyError} = $keyError;
+
+	# if we have an authen redirect, all of those errors may be 
+	#    moot, but I think that's unavoidable (-glarose)
+	if ( defined($authen->{redirect}) && $authen->{redirect} ) {
+		$self->reply_with_redirect( $authen->{redirect} );
+	}
 }
 
+## This content generator is NOT logged in.
+#sub if_loggedin {
+#	my ($self, $arg) = @_;
+#	
+#	return !$arg;
+#}
+#
+## suppress links
+#sub links {
+#	return "";
+#}
+
 sub body {
-	my $self = shift;
-	my $r = $self->{r};
-	my $ce = $self->{ce};
-	my $db = $self->{db};
-	
-	my $root = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
-	my $userName = $r->param("user");
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my $db = $r->db;
+	my $urlpath = $r->urlpath;
 	
-	eval { $db->deleteKey($userName) };
-	if ($@) {
-		print CGI::p("Something went wrong while logging out of WeBWorK: $@");
+	my $courseID = $urlpath->arg("courseID");
+	my $userID = $r->param("user");
+
+	if ( $self->{keyError} ) { 
+		print CGI::div({class=>"ResultsWithError"}, $self->{keyError});
 	}
 	
-	print CGI::p("You have been logged out of WeBWorK.");
-	print CGI::start_form(-method=>"POST", -action=>"$root/$courseName/");
-	print CGI::hidden("user", $userName);
+	my $problemSets = $urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSets",  $r, courseID => $courseID);
+	my $loginURL = $r->location . $problemSets->path;
+	
+	print CGI::p($r->maketext("You have been logged out of WeBWorK."));
+	
+	print CGI::start_form(-method=>"POST", -action=>$loginURL);
+	print CGI::hidden("user", $userID);
 	print CGI::hidden("force_passwd_authen", 1);
-	print CGI::p({-align=>"center"}, CGI::submit("submit", "Log In Again"));
+	print CGI::p({align=>"center"}, CGI::submit(-name=>"submit", -label=>$r->maketext("Log In Again")));
 	print CGI::end_form();
 	
 	return "";
 }
 
-# This content generator is NOT logged in.
-sub if_loggedin($$) {
-	my ($self, $arg) = (@_);
-	
-	return !$arg;
-}
-
 1;
diff --git a/lib/WeBWorK/ContentGenerator/Options.pm b/lib/WeBWorK/ContentGenerator/Options.pm
index c76e62b17e..9a795e6e7b 100644
--- a/lib/WeBWorK/ContentGenerator/Options.pm
+++ b/lib/WeBWorK/ContentGenerator/Options.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Options.pm,v 1.24 2006/07/24 23:28:41 gage 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
@@ -25,117 +25,162 @@ WeBWorK::ContentGenerator::Options - Change user options.
 
 use strict;
 use warnings;
-use CGI qw();
-use WeBWorK::Utils qw(cryptPassword);
+#use CGI qw(-nosticky );
+use WeBWorK::CGI;
+use WeBWorK::Utils qw(cryptPassword dequote);
+use WeBWorK::Localize;
 
-sub initialize {
-	my $self = shift;
-	my $r = $self->{r};
-	my $ce = $self->{ce};
-	my $db = $self->{db};
-	
-	$self->{effectiveUser} = $db->getUser($r->param('effectiveUser')); # checked
-	die "record not found for user ", $r->param('effectiveUser'), " (effective user)."
-		unless defined $self->{effectiveUser};
-}
 
-sub path {
-	my ($self, $args) = @_;
-	
-	my $ce = $self->{ce};
-	my $root = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
-	return $self->pathMacro($args,
-		"Home" => "$root",
-		$courseName => "$root/$courseName",
-		"User Options" => "",
-	);
-}
-
-sub title {
-	my $self = shift;
-	
-	return "User Options for " . $self->{effectiveUser}->first_name
-		. " " . $self->{effectiveUser}->last_name;
-}
 
 sub body {
-	my $self = shift;
-	my $r = $self->{r};
-	my $db = $self->{db};
-	my $effectiveUser = $self->{effectiveUser};
+	my ($self) = @_;
+	my $r = $self->r;
+	my $db = $r->db;
+	my $authz = $r->authz;
+	
+	my $userID = $r->param("user");
+	my $User = $db->getUser($userID);
+	die "record not found for user '$userID'." unless defined $User;
+	
+	my $eUserID = $r->param('effectiveUser');
+	my $EUser = $db->getUser($eUserID); # checked
+	die "record not found for effective user '$eUserID'." unless defined $EUser;
+	
+	my $user_name = $User->first_name . " " . $User->last_name;
+	my $e_user_name = $EUser->first_name . " " . $EUser->last_name;
 	
 	my $changeOptions = $r->param("changeOptions");
+	my $currP = $r->param("currPassword");
 	my $newP = $r->param("newPassword");
 	my $confirmP = $r->param("confirmPassword");
 	my $newA = $r->param("newAddress");
 		
 	print CGI::start_form(-method=>"POST", -action=>$r->uri);
 	print $self->hidden_authen_fields;
-	print CGI::h2("Change Password");
-	if ($changeOptions) {
-		if ($newP or $confirmP) {
-			if ($newP eq $confirmP) {
-				my $passwordRecord = eval {$db->getPassword($effectiveUser->user_id)}; # checked
-				warn "Can't get password for user |$effectiveUser| $@" if $@ or not defined($passwordRecord);
-				my $cryptedPassword = cryptPassword($newP);
-				$passwordRecord->password($cryptedPassword);
-				
-				# possibly do some format checking?
-				eval { $db->putPassword($passwordRecord) };
-				if ($@) {
-					print CGI::p("Couldn't change your
-					password: $@");
+	
+	print CGI::h2($r->maketext("Change Password"));
+	
+	if ($changeOptions and ($currP or $newP or $confirmP)) {
+		
+		if ($authz->hasPermissions($userID, "change_password")) {
+			
+			my $Password = eval {$db->getPassword($User->user_id)}; # checked
+			warn $r->maketext("Can't get password record for user '[_1]': [_2]",$userID,$@) if $@ or not defined $Password;
+			
+			my $EPassword = eval {$db->getPassword($EUser->user_id)}; # checked
+			warn $r->maketext("Can't get password record for effective user '[_1]': [_2]",$eUserID,$@) if $@ or not defined $EPassword;
+			
+			if (crypt($currP, $Password->password) eq $Password->password) {
+				if ($newP or $confirmP) {
+					if ($newP eq $confirmP) {
+						$EPassword->password(cryptPassword($newP));
+						eval { $db->putPassword($EPassword) };
+						if ($@) {
+							print CGI::div({class=>"ResultsWithError"},
+								CGI::p($r->maketext("Couldn't change [_1]'s password: [_2]",$e_user_name,$@)),
+							);
+						} else {
+							print CGI::div({class=>"ResultsWithoutError"},
+								CGI::p($r->maketext("[_1]'s password has been changed.",$e_user_name)),
+							);
+						}
+					} else {
+						print CGI::div({class=>"ResultsWithError"},
+							CGI::p(
+								$r->maketext("The passwords you entered in the 
+								[_1] and [_2]
+								fields don't match. Please retype your new password and try
+								again.",
+								CGI::b($r->maketext("[_1]'s New Password",$e_user_name)), 
+								CGI::b($r->maketext("Confirm [_1]'s New Password",$e_user_name))) 
+							),
+						);
+					}
 				} else {
-					print CGI::p("Your password has been
-					changed.");
+					print CGI::div({class=>"ResultsWithError"},
+						CGI::p($r->maketext("[_1]'s new password cannot be blank.",$e_user_name)),
+					);
 				}
 			} else {
-				print CGI::p("The passwords you entered in the
-				New Password and Confirm Password fields don't
-				match. Please retype your new password and try
-				again.");
+				print CGI::div({class=>"ResultsWithError"},
+					CGI::p($r->maketext("The password you entered in the [_1] 
+						field does not match your current
+						password. Please retype your current password and try
+						again.",
+						CGI::b($r->maketext("[_1]'s Current Password",$user_name)))
+					),
+				);
 			}
+			
+		} else {
+			print CGI::div({class=>"ResultsWithError"},
+				CGI::p($r->maketext("You do not have permission to change your password.")))
+					unless $changeOptions and ($currP or $newP or $confirmP); # avoid double message
 		}
+		
+	}
+	
+	if ($authz->hasPermissions($userID, "change_password")) {
+		print CGI::table({class=>"FormLayout"},
+			CGI::Tr({},
+				CGI::td($r->maketext("[_1]'s Current Password",$user_name)),
+				CGI::td(CGI::password_field(-name=>"currPassword")),
+			),
+			CGI::Tr({},
+				CGI::td($r->maketext("[_1]'s New Password",$e_user_name)),
+				CGI::td(CGI::password_field(-name=>"newPassword")),
+			),
+			CGI::Tr({},
+				CGI::td($r->maketext("Confirm [_1]'s New Password",$e_user_name)),
+				CGI::td(CGI::password_field(-name=>"confirmPassword")),
+			),
+		);
+	} else {
+		print CGI::p($r->maketext("You do not have permission to change your password."));
 	}
-	print CGI::table(
-		CGI::Tr(
-			CGI::td("New Password"),
-			CGI::td(CGI::password_field("newPassword")),
-		),
-		CGI::Tr(
-			CGI::td("Confirm Password"),
-			CGI::td(CGI::password_field("confirmPassword")),
-		),
-	);
-	print CGI::h2("Change Email Address");
-	if ($changeOptions) {
-		if ($newA) {
-			# possibly do some format checking?
-			my $oldA = $effectiveUser->email_address;
-			$effectiveUser->email_address($newA);
-			eval { $db->putUser($effectiveUser) };
+	
+	print CGI::h2($r->maketext("Change Email Address"));
+	
+	if ($changeOptions and $newA) {
+		if ($authz->hasPermissions($userID, "change_email_address")) {
+			
+			my $oldA = $EUser->email_address;
+			$EUser->email_address($newA);
+			eval { $db->putUser($EUser) };
 			if ($@) {
-				$effectiveUser->email_address($oldA);
-				print CGI::p("Couldn't change your
-				email address: $@");
+				$EUser->email_address($oldA);
+				print CGI::div({class=>"ResultsWithError"},
+					CGI::p($r->maketext("Couldn't change your email address: [_1]",$@)),
+				);
 			} else {
-				print CGI::p("Your email address has
-				been changed.");
-				$newA = "";
+				print CGI::div({class=>"ResultsWithoutError"},
+					CGI::p($r->maketext("Your email address has been changed.")),
+				);
 			}
+			
+		} else {
+			print CGI::div({class=>"ResultsWithError"},
+				CGI::p($r->maketext("You do not have permission to change email addresses.")),
+			);
 		}
 	}
-	print CGI::table(
-		CGI::Tr(
-			CGI::td("Current Address"),
-			CGI::td($effectiveUser->email_address),
-		),
-		CGI::Tr(
-			CGI::td("New Address"),
-			CGI::td(CGI::textfield("newAddress", $newA)),
-		),
-	);
+	
+	if ($authz->hasPermissions($userID, "change_email_address")) {
+		print CGI::table({class=>"FormLayout"},
+			CGI::Tr({},
+				CGI::td($r->maketext("[_1]'s Current Address",$e_user_name)),
+				CGI::td($EUser->email_address),
+			),
+			CGI::Tr({},
+				CGI::td($r->maketext("[_1]'s New Address",$e_user_name)),
+				CGI::td(CGI::textfield(-name=>"newAddress", -text=>$newA)),
+			),
+		);
+	} else {
+		print CGI::p($r->maketext("You do not have permission to change email addresses."))
+			unless $changeOptions and $newA; # avoid double message
+	}
+	
 	print CGI::br();
 	print CGI::submit("changeOptions", "Change User Options");
 	print CGI::end_form();
diff --git a/lib/WeBWorK/ContentGenerator/Problem.pm b/lib/WeBWorK/ContentGenerator/Problem.pm
index 4d8eb9266e..1f95404ee7 100644
--- a/lib/WeBWorK/ContentGenerator/Problem.pm
+++ b/lib/WeBWorK/ContentGenerator/Problem.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader: webwork-modperl/lib/WeBWorK/ContentGenerator/Problem.pm,v 1.109 2003/12/09 01:12:31 sh002i Exp $
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Problem.pm,v 1.225 2010/05/28 21:29:48 gage 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
@@ -15,7 +15,9 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator::Problem;
-use base qw(WeBWorK::ContentGenerator);
+use base qw(WeBWorK);
+#use base qw(WeBWorK::ContentGenerator);
+use base qw(WeBWorK::ContentGenerator::ProblemUtil::ProblemUtil);  # not needed?
 
 =head1 NAME
  
@@ -25,53 +27,464 @@ WeBWorK::ContentGenerator::Problem - Allow a student to interact with a problem.
 
 use strict;
 use warnings;
-use CGI qw();
+#use CGI qw(-nosticky );
+use WeBWorK::CGI;
 use File::Path qw(rmtree);
+use WeBWorK::Debug;
 use WeBWorK::Form;
 use WeBWorK::PG;
 use WeBWorK::PG::ImageGenerator;
 use WeBWorK::PG::IO;
-use WeBWorK::Utils qw(writeLog writeCourseLog encodeAnswers decodeAnswers ref2string makeTempDirectory);
-use WeBWorK::DB::Utils qw(global2user user2global findDefaults);
-use WeBWorK::Timing;
+use WeBWorK::Utils qw(readFile writeLog writeCourseLog encodeAnswers decodeAnswers
+	ref2string makeTempDirectory path_is_subdir sortByName before after between);
+use WeBWorK::DB::Utils qw(global2user user2global);
+use URI::Escape;
+use WeBWorK::Localize;
+use WeBWorK::Utils::Tasks qw(fake_set fake_problem);
 
+################################################################################
+# CGI param interface to this module (up-to-date as of v1.153)
+################################################################################
 
-############################################################
+# Standard params:
+# 
+#     user - user ID of real user
+#     key - session key
+#     effectiveUser - user ID of effective user
+# 
+# Integration with PGProblemEditor:
 # 
-# user
-# effectiveUser
-# key
+#     editMode - if set, indicates alternate problem source location.
+#                can be "temporaryFile" or "savedFile".
 # 
-# displayMode
-# showOldAnswers
-# showCorrectAnswers
-# showHints
-# showSolutions
+#     sourceFilePath - path to file to be edited
+#     problemSeed - force problem seed to value
+#     success - success message to display
+#     failure - failure message to display
 # 
-# AnSwEr# - answer blanks in problem
+# Rendering options:
 # 
-# redisplay - name of the "Redisplay Problem" button
-# submitAnswers - name of "Submit Answers" button
-# checkAnswers - name of the "Check Answers" button
-# previewAnswers - name of the "Preview Answers" button
+#     displayMode - name of display mode to use
+#     
+#     showOldAnswers - request that last entered answer be shown (if allowed)
+#     showCorrectAnswers - request that correct answers be shown (if allowed)
+#     showHints - request that hints be shown (if allowed)
+#     showSolutions - request that solutions be shown (if allowed)
+# 
+# Problem interaction:
+# 
+#     AnSwEr# - answer blanks in problem
+#     
+#     redisplay - name of the "Redisplay Problem" button
+#     submitAnswers - name of "Submit Answers" button
+#     checkAnswers - name of the "Check Answers" button
+#     previewAnswers - name of the "Preview Answers" button
+
+################################################################################
+# "can" methods
+################################################################################
+
+# Subroutines to determine if a user "can" perform an action. Each subroutine is
+# called with the following arguments:
 # 
-# FIXME: this table is heinously out of date
-#
-############################################################
+#     ($self, $User, $EffectiveUser, $Set, $Problem)
+
+# Note that significant parts of the "can" methods are lifted into the 
+# GatewayQuiz module.  It isn't direct, however, because of the necessity
+# of dealing with versioning there.
+
+sub can_showOldAnswers {
+	#my ($self, $User, $EffectiveUser, $Set, $Problem) = @_;
+	
+	return 1;
+}
+
+sub can_showCorrectAnswers {
+	my ($self, $User, $EffectiveUser, $Set, $Problem) = @_;
+	my $authz = $self->r->authz;
+	
+	return
+		after($Set->answer_date)
+			||
+		$authz->hasPermissions($User->user_id, "show_correct_answers_before_answer_date")
+		;
+}
+
+sub can_showHints {
+	#my ($self, $User, $EffectiveUser, $Set, $Problem) = @_;
+	
+	return 1;
+}
+
+sub can_showSolutions {
+	my ($self, $User, $EffectiveUser, $Set, $Problem) = @_;
+	my $authz = $self->r->authz;
+	
+	return
+		after($Set->answer_date)
+			||
+		$authz->hasPermissions($User->user_id, "show_solutions_before_answer_date")
+		;
+}
+
+sub can_recordAnswers {
+	my ($self, $User, $EffectiveUser, $Set, $Problem, $submitAnswers) = @_;
+	my $authz = $self->r->authz;
+	my $thisAttempt = $submitAnswers ? 1 : 0;
+	if ($User->user_id ne $EffectiveUser->user_id) {
+		return $authz->hasPermissions($User->user_id, "record_answers_when_acting_as_student");
+	}
+	if (before($Set->open_date)) {
+		return $authz->hasPermissions($User->user_id, "record_answers_before_open_date");
+	} elsif (between($Set->open_date, $Set->due_date)) {
+		my $max_attempts = $Problem->max_attempts;
+		my $attempts_used = $Problem->num_correct + $Problem->num_incorrect + $thisAttempt;
+		if ($max_attempts == -1 or $attempts_used < $max_attempts) {
+			return $authz->hasPermissions($User->user_id, "record_answers_after_open_date_with_attempts");
+		} else {
+			return $authz->hasPermissions($User->user_id, "record_answers_after_open_date_without_attempts");
+		}
+	} elsif (between($Set->due_date, $Set->answer_date)) {
+		return $authz->hasPermissions($User->user_id, "record_answers_after_due_date");
+	} elsif (after($Set->answer_date)) {
+		return $authz->hasPermissions($User->user_id, "record_answers_after_answer_date");
+	}
+}
+
+sub can_checkAnswers {
+	my ($self, $User, $EffectiveUser, $Set, $Problem, $submitAnswers) = @_;
+	my $authz = $self->r->authz;
+	my $thisAttempt = $submitAnswers ? 1 : 0;
+	
+	if (before($Set->open_date)) {
+		return $authz->hasPermissions($User->user_id, "check_answers_before_open_date");
+	} elsif (between($Set->open_date, $Set->due_date)) {
+		my $max_attempts = $Problem->max_attempts;
+		my $attempts_used = $Problem->num_correct + $Problem->num_incorrect + $thisAttempt;
+		if ($max_attempts == -1 or $attempts_used < $max_attempts) {
+			return $authz->hasPermissions($User->user_id, "check_answers_after_open_date_with_attempts");
+		} else {
+			return $authz->hasPermissions($User->user_id, "check_answers_after_open_date_without_attempts");
+		}
+	} elsif (between($Set->due_date, $Set->answer_date)) {
+		return $authz->hasPermissions($User->user_id, "check_answers_after_due_date");
+	} elsif (after($Set->answer_date)) {
+		return $authz->hasPermissions($User->user_id, "check_answers_after_answer_date");
+	}
+}
+
+# Reset the default in some cases
+sub set_showOldAnswers_default {
+	my ($self, $ce, $userName, $authz, $set) = @_;
+	# these people always use the system/course default, so don't
+	# override the value of ...->{showOldAnswers}
+	return if $authz->hasPermissions($userName, "can_always_use_show_old_answers_default");
+	# this person should always default to 0
+	$ce->{pg}->{options}->{showOldAnswers} = 0
+		unless ($authz->hasPermissions($userName, "can_show_old_answers_by_default"));
+	# we are after the due date, so default to not showing it
+	$ce->{pg}->{options}->{showOldAnswers} = 0 if $set->{due_date} && after($set->{due_date});
+}
+
+################################################################################
+# output utilities
+################################################################################
+
+# Note: the substance of attemptResults is lifted into GatewayQuiz.pm,
+# with some changes to the output format
+
+sub attemptResults {
+	my $self = shift;
+	my $r = $self->r;
+	my $pg = shift;
+	my $showAttemptAnswers = shift;
+	my $showCorrectAnswers = shift;
+	my $showAttemptResults = $showAttemptAnswers && shift;
+	my $showSummary = shift;
+	my $showAttemptPreview = shift || 0;
+	
+	my $ce = $self->r->ce;
+	
+	# for color coding the responses.
+	my @correct_ids = ();
+	my @incorrect_ids = ();
+
+
+	my $problemResult = $pg->{result}; # the overall result of the problem
+	my @answerNames = @{ $pg->{flags}->{ANSWER_ENTRY_ORDER} };
+	
+	my $showMessages = $showAttemptAnswers && grep { $pg->{answers}->{$_}->{ans_message} } @answerNames;
+	
+	my $basename = "equation-" . $self->{set}->psvn. "." . $self->{problem}->problem_id . "-preview";
+	
+	# to make grabbing these options easier, we'll pull them out now...
+	my %imagesModeOptions = %{$ce->{pg}->{displayModeOptions}->{images}};
+	
+	my $imgGen = WeBWorK::PG::ImageGenerator->new(
+		tempDir         => $ce->{webworkDirs}->{tmp},
+		latex	        => $ce->{externalPrograms}->{latex},
+		dvipng          => $ce->{externalPrograms}->{dvipng},
+		useCache        => 1,
+		cacheDir        => $ce->{webworkDirs}->{equationCache},
+		cacheURL        => $ce->{webworkURLs}->{equationCache},
+		cacheDB         => $ce->{webworkFiles}->{equationCacheDB},
+		dvipng_align    => $imagesModeOptions{dvipng_align},
+		dvipng_depth_db => $imagesModeOptions{dvipng_depth_db},
+	);
+	
+	my $showEvaluatedAnswers = $ce->{pg}->{options}->{showEvaluatedAnswers};
+
+	my $header;
+	#$header .= CGI::th("Part");
+	if ($showEvaluatedAnswers) {
+		$header .= $showAttemptAnswers ? CGI::th($r->maketext("Entered"))  : "";
+	}	
+	$header .= $showAttemptPreview ? CGI::th($r->maketext("Answer Preview"))  : "";
+	$header .= $showCorrectAnswers ? CGI::th($r->maketext("Correct"))  : "";
+	$header .= $showAttemptResults ? CGI::th($r->maketext("Result"))   : "";
+	$header .= $showMessages       ? CGI::th($r->maketext("Messages")) : "";
+	my $fully = '';
+	my @tableRows = ( $header );
+	my $numCorrect = 0;
+	my $numBlanks  =0;
+	my $tthPreambleCache;
+	foreach my $name (@answerNames) {
+		my $answerResult  = $pg->{answers}->{$name};
+		my $studentAnswer = $answerResult->{student_ans}; # original_student_ans
+		my $preview       = ($showAttemptPreview
+		                    	? $self->previewAnswer($answerResult, $imgGen, \$tthPreambleCache)
+		                    	: "");
+		my $correctAnswerPreview = $self->previewCorrectAnswer($answerResult, $imgGen, \$tthPreambleCache);
+		my $correctAnswer = $answerResult->{correct_ans};
+		my $answerScore   = $answerResult->{score};
+		my $answerMessage = $showMessages ? $answerResult->{ans_message} : "";
+		$answerMessage =~ s/\n/<BR>/g;
+		$numCorrect += $answerScore >= 1;
+		$numBlanks++ unless $studentAnswer =~/\S/ || $answerScore >= 1;   # unless student answer contains entry
+		my $resultString = $answerScore >= 1 ? CGI::span({class=>"ResultsWithoutError"}, $r->maketext("correct")) :
+		                   $answerScore > 0  ? $r->maketext("[_1]% correct", int($answerScore*100)) :
+                                                       CGI::span({class=>"ResultsWithError"}, $r->maketext("incorrect"));
+		$fully = $r->maketext("completely") if $answerScore >0 and $answerScore < 1;
+		
+		push @correct_ids,   $name if $answerScore == 1;
+		push @incorrect_ids, $name if $answerScore < 1;
+		
+		# need to capture auxiliary answers as well and identify their ids.
+		
+		
+		my $row;
+		#$row .= CGI::td($name);
+		if ($showEvaluatedAnswers) {
+		  $row .= $showAttemptAnswers ? CGI::td($self->nbsp($studentAnswer)) : "";
+		}
+		$row .= $showAttemptPreview ? CGI::td({onmouseover=>qq!Tip('$studentAnswer',SHADOW, true, 
+		                    DELAY, 1000, FADEIN, 300, FADEOUT, 300, STICKY, 1, OFFSETX, -20, CLOSEBTN, true, CLICKCLOSE, false, 
+		                    BGCOLOR, '#F4FF91', TITLE, 'Entered:',TITLEBGCOLOR, '#F4FF91', TITLEFONTCOLOR, '#000000')!},
+		                    $self->nbsp($preview))       : "";
+		$row .= $showCorrectAnswers ? CGI::td({onmouseover=> qq!Tip('$correctAnswer',SHADOW, true, 
+		                    DELAY, 1000, FADEIN, 300, FADEOUT, 300, STICKY, 1, OFFSETX, -20, CLOSEBTN, true, CLICKCLOSE, false, 
+		                    BGCOLOR, '#F4FF91', TITLE, 'Entered:',TITLEBGCOLOR, '#F4FF91', TITLEFONTCOLOR, '#000000')!},
+		                  $self->nbsp($correctAnswerPreview)) : "";
+		$row .= $showAttemptResults ? CGI::td($self->nbsp($resultString))  : "";
+		$row .= $showMessages       ? CGI::td({-class=>"Message"},$self->nbsp($answerMessage)) : "";
+		push @tableRows, $row;
+	}
+	
+	# render equation images
+	$imgGen->render(refresh => 1);
+	
+#	my $numIncorrectNoun = scalar @answerNames == 1 ? "question" : "questions";
+	my $scorePercent = sprintf("%.0f%%", $problemResult->{score} * 100);
+#   FIXME  -- I left the old code in in case we have to back out.
+#	my $summary = "On this attempt, you answered $numCorrect out of "
+#		. scalar @answerNames . " $numIncorrectNoun correct, for a score of $scorePercent.";
+	my $summary = ""; 
+	unless (defined($problemResult->{summary}) and $problemResult->{summary} =~ /\S/) {
+		if (scalar @answerNames == 1) {  #default messages
+				if ($numCorrect == scalar @answerNames) {
+					$summary .= CGI::div({class=>"ResultsWithoutError"},$r->maketext("The answer above is correct."));
+				 } else {
+					 $summary .= CGI::div({class=>"ResultsWithError"},$r->maketext("The answer above is NOT [_1]correct.", $fully));
+				 }
+		} else {
+				if ($numCorrect == scalar @answerNames) {
+					$summary .= CGI::div({class=>"ResultsWithoutError"},$r->maketext("All of the answers above are correct."));
+				 } 
+				 #unless ($numCorrect + $numBlanks == scalar( @answerNames)) { # this allowed you to figure out if you got one answer right.
+				 elsif ($numBlanks != scalar( @answerNames)) {
+					$summary .= CGI::div({class=>"ResultsWithError"},$r->maketext("At least one of the answers above is NOT [_1]correct.", $fully));
+				 }
+				 if ($numBlanks) {
+					my $s = ($numBlanks>1)?'':'s';
+					$summary .= CGI::div({class=>"ResultsAlert"},$r->maketext("[quant,_1,of the questions remains,of the questions remain] unanswered.", $numBlanks));
+				 }
+		}
+	} else {
+		$summary = $problemResult->{summary};   # summary has been defined by grader
+	}
+	
+	$self->{correct_ids}=[@correct_ids]       if @correct_ids;
+	$self->{incorrect_ids} = [@incorrect_ids] if @incorrect_ids;
+
+	return
+		CGI::table({-class=>"attemptResults"}, CGI::Tr(\@tableRows))
+		. ($showSummary ? CGI::p({class=>'attemptResultsSummary'},$summary) : "");
+}
+
 
-# FIXME: what is this?
-sub templateName {
-	"problem";
+# Note: previewAnswer is lifted into GatewayQuiz.pm
+
+sub previewAnswer {
+	my ($self, $answerResult, $imgGen, $tthPreambleCache) = @_;
+	my $ce            = $self->r->ce;
+	my $effectiveUser = $self->{effectiveUser};
+	my $set           = $self->{set};
+	my $problem       = $self->{problem};
+	my $displayMode   = $self->{displayMode};
+	
+	# note: right now, we have to do things completely differently when we are
+	# rendering math from INSIDE the translator and from OUTSIDE the translator.
+	# so we'll just deal with each case explicitly here. there's some code
+	# duplication that can be dealt with later by abstracting out tth/dvipng/etc.
+	
+	my $tex = $answerResult->{preview_latex_string};
+	
+	return "" unless defined $tex and $tex ne "";
+	
+	if ($displayMode eq "plainText") {
+		return $tex;
+	} elsif ($displayMode eq "formattedText") {
+		
+		# read the TTH preamble, or use the cached copy passed in from the caller
+		my $tthPreamble='';
+		if (defined $$tthPreambleCache) {
+			$tthPreamble = $$tthPreambleCache;
+		} else {
+			my $tthPreambleFile = $ce->{courseDirs}->{templates} . "/tthPreamble.tex";
+			if (-r $tthPreambleFile) {
+				$tthPreamble = readFile($tthPreambleFile);
+				# thanks to Jim Martino. each line in the definition file should end with
+				#a % to prevent adding supurious paragraphs to output:
+				$tthPreamble =~ s/(.)\n/$1%\n/g;
+				# solves the problem if the file doesn't end with a return:
+				$tthPreamble .="%\n";
+				# store preamble in cache:
+				$$tthPreambleCache = $tthPreamble;
+			} else {
+			}
+		}
+		
+		# construct TTH command line
+		my $tthCommand = $ce->{externalPrograms}->{tth}
+			. " -L -f5 -u -r  2> /dev/null <<END_OF_INPUT; echo > /dev/null\n"
+			. $tthPreamble . "\\[" . $tex . "\\]\n"
+			. "END_OF_INPUT\n";
+		
+		# call tth
+		my $result = `$tthCommand`;
+		if ($?) {
+			return "<b>[tth failed: $? $@]</b>";
+		} else {
+			#  avoid border problems in tables and remove unneeded initial <br>
+			$result =~ s/(<table [^>]*)>/$1 CLASS="ArrayLayout">/gi;
+			$result =~ s!\s*<br clear="all" />!!;
+			return $result;
+		}
+		
+	} elsif ($displayMode eq "images") {
+		$imgGen->add($tex);
+	} elsif ($displayMode eq "MathJax") {
+		return '<span class="MathJax_Preview">[math]</span><script type="math/tex; mode=display">'.$tex.'</script>';
+	} elsif ($displayMode eq "jsMath") {
+		$tex =~ s/&/&amp;/g; $tex =~ s/</&lt;/g; $tex =~ s/>/&gt;/g;
+		return '<SPAN CLASS="math">\\displaystyle{'.$tex.'}</SPAN>';
+	}
+}
+sub previewCorrectAnswer {
+	my ($self, $answerResult, $imgGen, $tthPreambleCache) = @_;
+	my $ce            = $self->r->ce;
+	my $effectiveUser = $self->{effectiveUser};
+	my $set           = $self->{set};
+	my $problem       = $self->{problem};
+	my $displayMode   = $self->{displayMode};
+	
+	# note: right now, we have to do things completely differently when we are
+	# rendering math from INSIDE the translator and from OUTSIDE the translator.
+	# so we'll just deal with each case explicitly here. there's some code
+	# duplication that can be dealt with later by abstracting out tth/dvipng/etc.
+	
+	my $tex = $answerResult->{correct_ans_latex_string};
+	return $answerResult->{correct_ans} unless defined $tex and $tex=~/\S/;   # some answers don't have latex strings defined
+	# return "" unless defined $tex and $tex ne "";
+	
+	if ($displayMode eq "plainText") {
+		return $tex;
+	} elsif ($displayMode eq "formattedText") {
+		
+		# read the TTH preamble, or use the cached copy passed in from the caller
+		my $tthPreamble='';
+		if (defined $$tthPreambleCache) {
+			$tthPreamble = $$tthPreambleCache;
+		} else {
+			my $tthPreambleFile = $ce->{courseDirs}->{templates} . "/tthPreamble.tex";
+			if (-r $tthPreambleFile) {
+				$tthPreamble = readFile($tthPreambleFile);
+				# thanks to Jim Martino. each line in the definition file should end with
+				#a % to prevent adding supurious paragraphs to output:
+				$tthPreamble =~ s/(.)\n/$1%\n/g;
+				# solves the problem if the file doesn't end with a return:
+				$tthPreamble .="%\n";
+				# store preamble in cache:
+				$$tthPreambleCache = $tthPreamble;
+			} else {
+			}
+		}
+		
+		# construct TTH command line
+		my $tthCommand = $ce->{externalPrograms}->{tth}
+			. " -L -f5 -u -r  2> /dev/null <<END_OF_INPUT; echo > /dev/null\n"
+			. $tthPreamble . "\\[" . $tex . "\\]\n"
+			. "END_OF_INPUT\n";
+		
+		# call tth
+		my $result = `$tthCommand`;
+		if ($?) {
+			return "<b>[tth failed: $? $@]</b>";
+		} else {
+			#  avoid border problems in tables and remove unneeded initial <br>
+			$result =~ s/(<table [^>]*)>/$1 CLASS="ArrayLayout">/gi;
+			$result =~ s!\s*<br clear="all" />!!;
+			return $result;
+		}
+		
+	} elsif ($displayMode eq "images") {
+		$imgGen->add($tex);
+	} elsif ($displayMode eq "MathJax") {
+		return '<span class="MathJax_Preview">[math]</span><script type="math/tex; mode=display">'.$tex.'</script>';
+	} elsif ($displayMode eq "jsMath") {
+		$tex =~ s/&/&amp;/g; $tex =~ s/</&lt;/g; $tex =~ s/>/&gt;/g;
+		return '<SPAN CLASS="math">\\displaystyle{'.$tex.'}</SPAN>';
+	}
 }
 
+################################################################################
+# Template escape implementations
+################################################################################
+
 sub pre_header_initialize {
-	my ($self, $setName, $problemNumber) = @_;
-	my $r                    = $self->{r};
-	my $courseEnv            = $self->{ce};
-	my $db                   = $self->{db};
-	my $userName             = $r->param('user');
-	my $effectiveUserName    = $r->param('effectiveUser');
-	my $key                  = $r->param('key');
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my $db = $r->db;
+	my $authz = $r->authz;
+	my $urlpath = $r->urlpath;
+	
+	my $setName = $urlpath->arg("setID");
+	my $problemNumber = $r->urlpath->arg("problemID");
+	my $userName = $r->param('user');
+	my $effectiveUserName = $r->param('effectiveUser');
+	my $key = $r->param('key');
+	my $editMode = $r->param("editMode");
 	
 	my $user = $db->getUser($userName); # checked
 	die "record for user $userName (real user) does not exist."
@@ -81,34 +494,59 @@ sub pre_header_initialize {
 	die "record for user $effectiveUserName (effective user) does not exist."
 		unless defined $effectiveUser;
 	
-	my $PermissionLevel = $db->getPermissionLevel($userName); # checked
-	die "permission level record for user $userName does not exist (but the user does? odd...)"
-		unless defined $PermissionLevel;
-	my $permissionLevel = $PermissionLevel->permission;
-	
 	# obtain the merged set for $effectiveUser
 	my $set = $db->getMergedSet($effectiveUserName, $setName); # checked
+
+	$self->set_showOldAnswers_default($ce, $userName, $authz, $set);
+
+	# Database fix (in case of undefined visiblity state values)
+	# this is only necessary because some people keep holding to ww1.9 which did not have a visible field
+	# make sure visible is set to 0 or 1
+	if ( $set and $set->visible ne "0" and $set->visible ne "1") {
+		my $globalSet = $db->getGlobalSet($set->set_id);
+		$globalSet->visible("1");	# defaults to visible
+		$db->putGlobalSet($globalSet);
+		$set = $db->getMergedSet($effectiveUserName, $setName);
+	} else {
+		# don't do anything just yet, maybe we're a professor and we're
+		# fabricating a set or haven't assigned it to ourselves just yet
+	}
+		# When a set is created enable_reduced_scoring is null, so we have to set it 
+	if ( $set and $set->enable_reduced_scoring ne "0" and $set->enable_reduced_scoring ne "1") {
+		my $globalSet = $db->getGlobalSet($set->set_id);
+		$globalSet->enable_reduced_scoring("0");	# defaults to disabled
+		$db->putGlobalSet($globalSet);
+		$set = $db->getMergedSet($effectiveUserName, $setName);
+	}
+	
 	
 	# obtain the merged problem for $effectiveUser
 	my $problem = $db->getMergedProblem($effectiveUserName, $setName, $problemNumber); # checked
 	
-	my $editMode = $r->param("editMode");
+	# A very hacky and temporary solution to the max_attempts problem
+	# if($problem->max_attempts == ""){
+		# $problem->max_attempts = -1;
+	# }
 	
-	if ($permissionLevel > 0 and defined $editMode) {
+	if ($authz->hasPermissions($userName, "modify_problem_sets")) {
 		# professors are allowed to fabricate sets and problems not
 		# assigned to them (or anyone). this allows them to use the
 		# editor to 
-		
-		# if that is not yet defined obtain the global set, convert
-		# it to a user set, and add fake user data
+
+		# if a User Set does not exist for this user and this set
+		# then we check the Global Set
+		# if that does not exist we create a fake set
+		# if it does, we add fake user data
 		unless (defined $set) {
 			my $userSetClass = $db->{set_user}->{record};
 			my $globalSet = $db->getGlobalSet($setName); # checked
-			# if the global set doesn't exist either, bail!
-			die "Set $setName does not exist"
-				unless defined $set;
-			$set = global2user($userSetClass, $globalSet);
-			$set->psvn(0);
+
+			if (not defined $globalSet) {
+				$set = fake_set($db);
+			} else {
+				$set = global2user($userSetClass, $globalSet);
+				$set->psvn(0);
+			}
 		}
 		
 		# if that is not yet defined obtain the global problem,
@@ -117,16 +555,26 @@ sub pre_header_initialize {
 			my $userProblemClass = $db->{problem_user}->{record};
 			my $globalProblem = $db->getGlobalProblem($setName, $problemNumber); # checked
 			# if the global problem doesn't exist either, bail!
-			die "Problem $problemNumber in set $setName does not exist"
-				unless defined $problem;
-			$problem = global2user($userProblemClass, $globalProblem);
-			$problem->user_id($effectiveUserName);
-			$problem->problem_seed(0);
-			$problem->status(0);
-			$problem->attempted(0);
-			$problem->last_answer("");
-			$problem->num_correct(0);
-			$problem->num_incorrect(0);
+			if(not defined $globalProblem) {
+				my $sourceFilePath = $r->param("sourceFilePath");
+				die "sourceFilePath is unsafe!" unless path_is_subdir($sourceFilePath, $ce->{courseDirs}->{templates}, 1); # 1==path can be relative to dir
+				# These are problems from setmaker.  If declared invalid, they won't come up
+				$self->{invalidProblem} = $self->{invalidSet} = 1 unless defined $sourceFilePath;
+#				die "Problem $problemNumber in set $setName does not exist" unless defined $sourceFilePath;
+				$problem = fake_problem($db);
+				$problem->problem_id(1);
+				$problem->source_file($sourceFilePath);
+				$problem->user_id($effectiveUserName);
+			} else {
+				$problem = global2user($userProblemClass, $globalProblem);
+				$problem->user_id($effectiveUserName);
+				$problem->problem_seed(0);
+				$problem->status(0);
+				$problem->attempted(0);
+				$problem->last_answer("");
+				$problem->num_correct(0);
+				$problem->num_incorrect(0);
+			}
 		}
 		
 		# now we're sure we have valid UserSet and UserProblem objects
@@ -137,28 +585,36 @@ sub pre_header_initialize {
 		# if the caller is asking to override the source file, and
 		# editMode calls for a temporary file, do so
 		my $sourceFilePath = $r->param("sourceFilePath");
-		if (defined $sourceFilePath and $editMode eq "temporaryFile") {
+		if (defined $editMode and $editMode eq "temporaryFile" and defined $sourceFilePath) {
+			die "sourceFilePath is unsafe!" unless path_is_subdir($sourceFilePath, $ce->{courseDirs}->{templates}, 1); # 1==path can be relative to dir
 			$problem->source_file($sourceFilePath);
 		}
 		
+		# if the problem does not have a source file or no source file has been passed in 
+		# then this is really an invalid problem (probably from a bad URL)
+		$self->{invalidProblem} = not (defined $sourceFilePath or $problem->source_file);
+		
 		# if the caller is asking to override the problem seed, do so
 		my $problemSeed = $r->param("problemSeed");
 		if (defined $problemSeed) {
 			$problem->problem_seed($problemSeed);
 		}
-	} else {
-		# students can't view problems not assigned to them
-		die "Set $setName is not assigned to $effectiveUserName"
-			unless defined $set;
-		die "Problem $problemNumber in set $setName is not assigned to $effectiveUserName"
-			unless defined $problem;
+
+		my $visiblityStateClass = ($set->visible) ? $r->maketext("visible") : $r->maketext("hidden");
+		my $visiblityStateText = ($set->visible) ? $r->maketext("visible to students")."." : $r->maketext("hidden from students").".";
+		$self->addmessage(CGI::span($r->maketext("This set is [_1]", CGI::font({class=>$visiblityStateClass}, $visiblityStateText))));
+
+  # test for additional problem validity if it's not already invalid
+        } else {
+		$self->{invalidProblem} = !(defined $problem and ($set->visible || $authz->hasPermissions($userName, "view_hidden_sets")));
+		
+		$self->addbadmessage(CGI::p($r->maketext("This problem will not count towards your grade."))) if $problem and not $problem->value and not $self->{invalidProblem};
 	}
-	
+
 	$self->{userName}          = $userName;
 	$self->{effectiveUserName} = $effectiveUserName;
 	$self->{user}              = $user;
 	$self->{effectiveUser}     = $effectiveUser;
-	$self->{permissionLevel}   = $permissionLevel;
 	$self->{set}               = $set;
 	$self->{problem}           = $problem;
 	$self->{editMode}          = $editMode;
@@ -166,34 +622,13 @@ sub pre_header_initialize {
 	##### form processing #####
 	
 	# set options from form fields (see comment at top of file for names)
-	my $displayMode        = $r->param("displayMode") || $courseEnv->{pg}->{options}->{displayMode};
+	my $displayMode        = $r->param("displayMode") || $ce->{pg}->{options}->{displayMode};
 	my $redisplay          = $r->param("redisplay");
 	my $submitAnswers      = $r->param("submitAnswers");
 	my $checkAnswers       = $r->param("checkAnswers");
 	my $previewAnswers     = $r->param("previewAnswers");
 	
-	# fields which may be defined when using Problem Editor
-	#my $override_seed = ($permissionLevel>=10) ? $r->param('problemSeed') : undef;
-	#my $override_problem_source = ($permissionLevel>=10) ? $r->param('sourceFilePath') : undef;
-	#my $editMode = undef;
-	#my $submit_button = $r->param('submit_button');
-	#if ( defined($submit_button ) ) {
-	#	$editMode = "temporaryFile" if $submit_button eq 'Refresh';
-	#	$editMode = 'savedFile'     if $submit_button eq 'Save';
-	#}
-	#
-	##override using the source file data from the form field
-	#$problem->source_file($override_problem_source) if defined($override_problem_source);
-	#$problem->problem_seed($override_seed)          if defined($override_seed);
-	#
-	## store path to source file for title.
-	#$self->{problem_source_name}    =  $problem->source_file;
-	#$self->{edit_mode}		=	$editMode;
-	#$self->{current_problem_source} 	=	(defined($override_problem_source) ) ?
-	
-	# coerce form fields into CGI::Vars format
 	my $formFields = { WeBWorK::Form->new_from_paramable($r)->Vars };
-
 	
 	$self->{displayMode}    = $displayMode;
 	$self->{redisplay}      = $redisplay;
@@ -201,21 +636,31 @@ sub pre_header_initialize {
 	$self->{checkAnswers}   = $checkAnswers;
 	$self->{previewAnswers} = $previewAnswers;
 	$self->{formFields}     = $formFields;
+
+	# get result and send to message
+	my $status_message = $r->param("status_message");
+	$self->addmessage(CGI::p("$status_message")) if $status_message;
+
+	# now that we've set all the necessary variables quit out if the set or problem is invalid
+	return if $self->{invalidSet} || $self->{invalidProblem};
 	
 	##### permissions #####
-	
-	# are we allowed to view this problem?
-	$self->{isOpen} = time >= $set->open_date || $permissionLevel > 0;
-	return unless $self->{isOpen};
-	
+
 	# what does the user want to do?
+	#FIXME  There is a problem with checkboxes -- if they are not checked they are invisible.  Hence if the default mode in $ce is 1
+	# there is no way to override this.  Probably this is ok for the last three options, but it was definitely not ok for showing
+	# saved answers which is normally on, but you want to be able to turn it off!  This section should be moved to ContentGenerator
+	# so that you can set these options anywhere.  We also need mechanisms for making them sticky.
+	# Note: ProblemSet and ProblemSets might set showOldAnswers to '', which
+	#       needs to be treated as if it is not set.
 	my %want = (
-		showOldAnswers     => $r->param("showOldAnswers")     || $courseEnv->{pg}->{options}->{showOldAnswers},
-		showCorrectAnswers => $r->param("showCorrectAnswers") || $courseEnv->{pg}->{options}->{showCorrectAnswers},
-		showHints          => $r->param("showHints")          || $courseEnv->{pg}->{options}->{showHints},
-		showSolutions      => $r->param("showSolutions")      || $courseEnv->{pg}->{options}->{showSolutions},
+		showOldAnswers     => (defined($r->param("showOldAnswers")) and $r->param("showOldAnswers") ne '') ? $r->param("showOldAnswers")  : $ce->{pg}->{options}->{showOldAnswers},
+		showCorrectAnswers => $r->param("showCorrectAnswers") || $ce->{pg}->{options}->{showCorrectAnswers},
+		showHints          => $r->param("showHints")          || $ce->{pg}->{options}->{showHints},
+		showSolutions      => $r->param("showSolutions")      || $ce->{pg}->{options}->{showSolutions},
 		recordAnswers      => $submitAnswers,
 		checkAnswers       => $checkAnswers,
+		getSubmitButton    => 1,
 	);
 	
 	# are certain options enforced?
@@ -224,47 +669,28 @@ sub pre_header_initialize {
 		showCorrectAnswers => 0,
 		showHints          => 0,
 		showSolutions      => 0,
-		recordAnswers      => mustRecordAnswers($permissionLevel),
+		recordAnswers      => ! $authz->hasPermissions($userName, "avoid_recording_answers"),
 		checkAnswers       => 0,
+		getSubmitButton    => 0,
 	);
-	
+	 
 	# does the user have permission to use certain options?
+	my @args = ($user, $effectiveUser, $set, $problem);
 	my %can = (
-		showOldAnswers     => 1,
-		showCorrectAnswers => canShowCorrectAnswers($permissionLevel, $set->answer_date),
-		showHints          => 1,
-		showSolutions      => canShowSolutions($permissionLevel, $set->answer_date),
-		recordAnswers      => canRecordAnswers($permissionLevel, $set->open_date, $set->due_date,
-			$problem->max_attempts, $problem->num_correct + $problem->num_incorrect + 1),
-			# attempts=num_correct+num_incorrect+1, as this happens before updating $problem
-		checkAnswers       => canCheckAnswers($permissionLevel, $set->answer_date),
+		showOldAnswers     => $self->can_showOldAnswers(@args),
+		showCorrectAnswers => $self->can_showCorrectAnswers(@args),
+		showHints          => $self->can_showHints(@args),
+		showSolutions      => $self->can_showSolutions(@args),
+		recordAnswers      => $self->can_recordAnswers(@args, 0),
+		checkAnswers       => $self->can_checkAnswers(@args, $submitAnswers),
+		getSubmitButton    => $self->can_recordAnswers(@args, $submitAnswers),
 	);
-	#########################################################
-	# more complicated logic for showing check answer button:
-	#########################################################
-	# checkAnswers button shows up after due date -- once a student can't record anymore
-	# checkAnswers button always shows up when an instructor or TA is acting
-	# as someone else (the $user and $effectiveUserName aren't the same).
-	$can{checkAnswers} =  ($can{checkAnswers}    &&   not $can{recordAnswers}           ) ||
-	                      ( defined($userName) and defined($effectiveUserName) and 
-	                        ($userName ne $effectiveUserName)
-	                       ); 
-	#########################################################
-	# more complicated logif for showing "submit answer" button
-	#########################################################                     
-	# We hide the submit answer button if someone is acting as a student
-	# This prevents errors where you accidently submit the answer for a student
-	# Not sure whether this a feature or a bug
-	
-	$can{recordAnswers} = ($can{recordAnswers} and not
-	                          (   defined($userName) and defined($effectiveUserName) and 
-	                              ($userName ne $effectiveUserName)
-	                          )
-	                      );
+	
 	# final values for options
 	my %will;
 	foreach (keys %must) {
 		$will{$_} = $can{$_} && ($want{$_} || $must{$_});
+		#warn "final values for options $_ is can $can{$_}, want $want{$_}, must $must{$_}, will $will{$_}";
 	}
 	
 	##### sticky answers #####
@@ -277,9 +703,9 @@ sub pre_header_initialize {
 	
 	##### translation #####
 
-	$WeBWorK::timer->continue("begin pg processing") if defined($WeBWorK::timer);
+	debug("begin pg processing");
 	my $pg = WeBWorK::PG->new(
-		$courseEnv,
+		$ce,
 		$effectiveUser,
 		$key,
 		$set,
@@ -292,10 +718,13 @@ sub pre_header_initialize {
 			showSolutions   => $will{showSolutions},
 			refreshMath2img => $will{showHints} || $will{showSolutions},
 			processAnswers  => 1,
+			permissionLevel => $db->getPermissionLevel($userName)->permission,
+			effectivePermissionLevel => $db->getPermissionLevel($effectiveUserName)->permission,
 		},
 	);
+
+	debug("end pg processing");
 	
-	$WeBWorK::timer->continue("end pg processing") if defined($WeBWorK::timer);
 	##### fix hint/solution options #####
 	
 	$can{showHints}     &&= $pg->{flags}->{hintExists}  
@@ -311,384 +740,492 @@ sub pre_header_initialize {
 	$self->{pg} = $pg;
 }
 
-#sub if_warnings($$) {
-#	my ($self, $arg) = @_;
-#	return 0 unless $self->{isOpen};
-#	return $self->{pg}->{warnings} ne "";
-#}
-
 sub if_errors($$) {
 	my ($self, $arg) = @_;
-	return 0 unless $self->{isOpen};
-	return $self->{pg}->{flags}->{error_flag};
+	
+	if ($self->{isOpen}) {
+		return $self->{pg}->{flags}->{error_flag} ? $arg : !$arg;
+	} else {
+		return !$arg;
+	}
 }
 
 sub head {
-	my $self = shift;
-	return "" unless $self->{isOpen};
+	my ($self) = @_;
+
+	return "" if ( $self->{invalidSet} );
 	return $self->{pg}->{head_text} if $self->{pg}->{head_text};
 }
 
-sub options {
-	my $self = shift;
-	return join("",
-		CGI::start_form("POST", $self->{r}->uri),
-		$self->hidden_authen_fields,
-		CGI::hr(), 
-		CGI::start_div({class=>"viewOptions"}),
-		$self->viewOptions(),
-		CGI::end_div(),
-		CGI::end_form()
-	);
+sub post_header_text {
+	my ($self) = @_;
+	return "" if ( $self->{invalidSet} );
+    return $self->{pg}->{post_header_text} if $self->{pg}->{post_header_text};
 }
 
-sub path {
-	my $self = shift;
-	my $args = $_[-1];
-	my $setName = $self->{set}->set_id;
-	my $problemNumber = $self->{problem}->problem_id;
-	
-	my $ce = $self->{ce};
-	my $root = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
-	return $self->pathMacro($args,
-		"Home" => "$root",
-		$courseName => "$root/$courseName",
-		$setName => "$root/$courseName/$setName",
-		"Problem $problemNumber" => "",
+sub options {
+	my ($self) = @_;
+	#warn "doing options in Problem";
+	
+	# don't show options if we don't have anything to show
+	return "" if $self->{invalidSet} or $self->{invalidProblem};
+	
+	my $displayMode = $self->{displayMode};
+	my %can = %{ $self->{can} };
+	
+	my @options_to_show = "displayMode";
+	push @options_to_show, "showOldAnswers" if $can{showOldAnswers};
+	push @options_to_show, "showHints" if $can{showHints};
+	push @options_to_show, "showSolutions" if $can{showSolutions};
+	
+	return $self->optionsMacro(
+		options_to_show => \@options_to_show,
+		extra_params => ["editMode", "sourceFilePath"],
 	);
 }
 
 sub siblings {
-	my $self = shift;
-	my $setName = $self->{set}->set_id;
-	my $problemNumber = $self->{problem}->problem_id;
-	
-	my $ce = $self->{ce};
-	my $db = $self->{db};
-	my $root = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
-	print CGI::strong("Problems"), CGI::br();
-	
-	my $effectiveUser = $self->{r}->param("effectiveUser");
-	my @problemIDs = $db->listUserProblems($effectiveUser, $setName);
-	foreach my $problem (sort { $a <=> $b } @problemIDs) {
-		print '&nbsp;&nbsp;'.CGI::a({-href=>"$root/$courseName/$setName/".$problem."/?"
-			. $self->url_authen_args . "&displayMode=" . $self->{displayMode}},
-			"Problem ".$problem), CGI::br();
+	my ($self) = @_;
+	my $r = $self->r;
+	my $db = $r->db;
+	my $urlpath = $r->urlpath;
+	
+	# can't show sibling problems if the set is invalid
+	return "" if $self->{invalidSet};
+	
+	my $courseID = $urlpath->arg("courseID");
+	my $setID = $self->{set}->set_id;
+	my $eUserID = $r->param("effectiveUser");
+	my @problemIDs = sort { $a <=> $b } $db->listUserProblems($eUserID, $setID);
+	
+	print CGI::start_div({class=>"info-box", id=>"fisheye"});
+	print CGI::h2($r->maketext("Problems"));
+	#print CGI::start_ul({class=>"LinksMenu"});
+	#print CGI::start_li();
+	#print CGI::span({style=>"font-size:larger"}, "Problems");
+	print CGI::start_ul();
+
+	foreach my $problemID (@problemIDs) {
+		my $problemPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Problem", $r, 
+			courseID => $courseID, setID => $setID, problemID => $problemID);
+		print CGI::li(CGI::a( {href=>$self->systemLink($problemPage, 
+													params=>{  displayMode => $self->{displayMode}, 
+															   showOldAnswers => $self->{will}->{showOldAnswers}
+															})},  $r->maketext("Problem [_1]",$problemID))
+	   );
 	}
 
+	print CGI::end_ul();
+	#print CGI::end_li();
+	#print CGI::end_ul();
+	print CGI::end_div();
+
 	return "";
 }
 
 sub nav {
-	$WeBWorK::timer->continue("begin nav subroutine") if defined($WeBWorK::timer);
-	my $self = shift;
-	my $args = $_[-1];
-	my $setName = $self->{set}->set_id;
-	my $problemNumber = $self->{problem}->problem_id;
-	
-	my $ce = $self->{ce};
-	my $db = $self->{db};
-	my $root = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
-	
-	my $wwdb          = $self->{wwdb};
-	my $effectiveUser = $self->{r}->param("effectiveUser");
-	my $tail = "&displayMode=".$self->{displayMode};
-	
-	my @links = ("Problem List" , "$root/$courseName/$setName", "navProbList");
-	
-	my @problemIDs = $db->listUserProblems($effectiveUser, $setName);
+	my ($self, $args) = @_;
+	my $r = $self->r;
+	my $db = $r->db;
+	my $urlpath = $r->urlpath;
+
+	return "" if ( $self->{invalidSet} );
+
+	my $courseID = $urlpath->arg("courseID");
+	my $setID = $self->{set}->set_id if !($self->{invalidSet});
+	my $problemID = $self->{problem}->problem_id if !($self->{invalidProblem});
+	my $eUserID = $r->param("effectiveUser");
+
 	my ($prevID, $nextID);
-	foreach my $id (@problemIDs) {
-		$prevID = $id if $id < $problemNumber
-			and (not defined $prevID or $id > $prevID);
-		$nextID = $id if $id > $problemNumber
-			and (not defined $nextID or $id < $nextID);
+
+	if (!$self->{invalidProblem}) {
+		my @problemIDs = $db->listUserProblems($eUserID, $setID);
+		foreach my $id (@problemIDs) {
+			$prevID = $id if $id < $problemID
+				and (not defined $prevID or $id > $prevID);
+			$nextID = $id if $id > $problemID
+				and (not defined $nextID or $id < $nextID);
+		}
+	}
+
+	my @links;
+
+	if ($prevID) {
+		my $prevPage = $urlpath->newFromModule(__PACKAGE__, $r, 
+			courseID => $courseID, setID => $setID, problemID => $prevID);
+		push @links, $r->maketext("Previous Problem"), $r->location . $prevPage->path, $r->maketext("navPrev");
+	} else {
+		push @links, $r->maketext("Previous Problem"), "", $r->maketext("navPrevGrey");
+	}
+
+	if (defined($setID) && $setID ne 'Undefined_Set') {
+		push @links, $r->maketext("Problem List"), $r->location . $urlpath->parent->path, $r->maketext("navProbList");
+	} else {
+		push @links, $r->maketext("Problem List"), "", $r->maketext("navProbListGrey");
 	}
-	unshift @links, "Previous Problem" , ($prevID
-		? "$root/$courseName/$setName/".$prevID
-		: "") , "navPrev";
-	push @links, "Next Problem" , ($nextID
-		? "$root/$courseName/$setName/".$nextID
-		: "") , "navNext";
-	
-	my $result = $self->navMacro($args, $tail, @links);
-	$WeBWorK::timer->continue("end nav subroutine") if defined($WeBWorK::timer);
-	return $result;
+
+	if ($nextID) {
+		my $nextPage = $urlpath->newFromModule(__PACKAGE__, $r, 
+			courseID => $courseID, setID => $setID, problemID => $nextID);
+		push @links, $r->maketext("Next Problem"), $r->location . $nextPage->path, $r->maketext("navNext");
+	} else {
+		push @links, $r->maketext("Next Problem"), "", $r->maketext("navNextGrey");
+	}
+
+	my $tail = "";
+
+	$tail .= "&displayMode=".$self->{displayMode} if defined $self->{displayMode};
+	$tail .= "&showOldAnswers=".$self->{will}->{showOldAnswers}
+		if defined $self->{will}->{showOldAnswers};
+	return $self->navMacro($args, $tail, @links);
 }
 
 sub title {
-	my $self = shift;
-	my $setName = $self->{set}->set_id;
-	my $problemNumber = $self->{problem}->problem_id;
-	
-	return "$setName : Problem $problemNumber";
+	my ($self) = @_;
+	my $r = $self->r;
+	# using the url arguments won't break if the set/problem are invalid
+	my $setID = WeBWorK::ContentGenerator::underscore2nbsp($self->r->urlpath->arg("setID"));
+	my $problemID = $self->r->urlpath->arg("problemID");
+
+	return $r->maketext("[_1]: Problem [_2]",$setID, $problemID);
 }
 
+
+# now altered to outsource most output operations to the template, main functions now are simply error checking and answer processing - ghe3
 sub body {
 	my $self = shift;
+	my $set = $self->{set};
+	my $problem = $self->{problem};
+	my $pg = $self->{pg};
+	
+	my $valid = WeBWorK::ContentGenerator::ProblemUtil::ProblemUtil::check_invalid($self);
+	unless($valid eq "valid"){
+		return $valid;
+	}
 	
-	return CGI::p(CGI::font({-color=>"red"}, "This problem is not available because the problem set that contains it is not yet open."))
-		unless $self->{isOpen};
 	
-	# unpack some useful variables
-	my $r               = $self->{r};
-	my $db              = $self->{db};
-	my $ce = $self->{ce};
-	my $root = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
+	
+	##### answer processing #####
+	debug("begin answer processing");
+	# if answers were submitted:
+	#my $scoreRecordedMessage = WeBWorK::ContentGenerator::ProblemUtil::ProblemUtil::process_and_log_answer($self);
+	debug("end answer processing");
+	# output for templates that only use body instead of calling the body parts individually
+	$self ->output_JS;
+	$self ->output_custom_edit_message;
+	$self ->output_summary;
+	$self ->output_hidden_info;
+	$self ->output_form_start();
+	$self ->output_problem_body;
+	$self ->output_message;
+	$self ->output_editorLink;
+	$self ->output_checkboxes;
+	$self ->output_submit_buttons;
+	$self ->output_score_summary;
+	$self ->output_misc;
+	print "</form>";
+	# debugging stuff
+	if (0) {
+		print
+			CGI::hr(),
+			CGI::h2("debugging information"),
+			CGI::h3("form fields"),
+			ref2string($self->{formFields}),
+			CGI::h3("user object"),
+			ref2string($self->{user}),
+			CGI::h3("set object"),
+			ref2string($set),
+			CGI::h3("problem object"),
+			ref2string($problem),
+			CGI::h3("PG object"),
+			ref2string($pg, {'WeBWorK::PG::Translator' => 1});
+	}
+	debug("leaving body of Problem.pm");
+	return "";
+}
+
+# output_form_start subroutine
+
+# prints out the beginning of the main form, and the necessary hidden authentication fields
+
+sub output_form_start{
+	my $self = shift;
+	my $r = $self->r;
+	print CGI::start_form(-method=>"POST", -action=> $r->uri,-name=>"problemMainForm", onsubmit=>"submitAction()");
+	print $self->hidden_authen_fields;
+	return "";
+}
+
+# output_problem_body subroutine
+
+# prints out the body of the current problem
+
+sub output_problem_body{
+	my $self = shift;
+	my $pg = $self->{pg};
+
+	print "\n";
+	print CGI::p($pg->{body_text});
+	return "";
+}
+
+# output_message subroutine
+
+# prints out a message about the problem
+
+sub output_message{
+	my $self = shift;
+	my $pg = $self->{pg};
+	my $r = $self->r;
+
+	print CGI::p(CGI::b($r->maketext("Note").": "). CGI::i($pg->{result}->{msg})) if $pg->{result}->{msg};
+	return "";
+}
+
+# output_editorLink subroutine
+
+# processes and prints out the correct link to the editor of the current problem
+
+sub output_editorLink{
+	
+	my $self = shift;
+
 	my $set             = $self->{set};
 	my $problem         = $self->{problem};
-	my $editMode        = $self->{editMode};
-	my $permissionLevel = $self->{permissionLevel};
-	my $submitAnswers   = $self->{submitAnswers};
-	my $checkAnswers    = $self->{checkAnswers};
-	my $previewAnswers  = $self->{previewAnswers};
-	my %want            = %{ $self->{want} };
-	my %can             = %{ $self->{can}  };
-	my %must            = %{ $self->{must} };
-	my %will            = %{ $self->{will} };
 	my $pg              = $self->{pg};
 	
-	
-	
-	#####create Editor link   #####
-	# print editor link if the user is an instructor AND the file is not in temporary editing mode
-	my $editorLinkMessage   =   '';
-	# and ( (not defined($self->{editMode}))  or $self->{editMode} eq 'savedFile')  # FIXME is this needed?
-	if ($self->{permissionLevel}>=10  ) {
-		$editorLinkMessage = CGI::a({-href=>$ce->{webworkURLs}->{root}."/$courseName/instructor/pgProblemEditor/".
-		$set->set_id.'/'.$problem->problem_id.'?'.$self->url_authen_args},'Edit this problem');
+	my $r = $self->r;
+	
+	my $authz = $r->authz;
+	my $urlpath = $r->urlpath;
+	my $user = $r->param('user');
+	
+	my $courseName = $urlpath->arg("courseID");
+	
+	# FIXME: move editor link to top, next to problem number.
+	# format as "[edit]" like we're doing with course info file, etc.
+	# add edit link for set as well.
+	my $editorLink = "";
+	# if we are here without a real homework set, carry that through
+	my $forced_field = [];
+	$forced_field = ['sourceFilePath' =>  $r->param("sourceFilePath")] if
+		($set->set_id eq 'Undefined_Set');
+	if ($authz->hasPermissions($user, "modify_problem_sets")) {
+		my $editorPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor", $r, 
+			courseID => $courseName, setID => $set->set_id, problemID => $problem->problem_id);
+		my $editorURL = $self->systemLink($editorPage, params=>$forced_field);
+		$editorLink = CGI::p(CGI::a({href=>$editorURL,target =>'WW_Editor'}, $r->maketext("Edit this problem")));
 	}
-	##### translation errors? #####
 	
+	##### translation errors? #####
+
 	if ($pg->{flags}->{error_flag}) {
-		return $self->errorOutput($pg->{errors}, $pg->{body_text}.CGI::p($editorLinkMessage));
+		if ($authz->hasPermissions($user, "view_problem_debugging_info")) {
+			print $self->errorOutput($pg->{errors}, $pg->{body_text});
+		} else {
+			print $self->errorOutput($pg->{errors}, $r->maketext("You do not have permission to view the details of this error."));
+		}
+		print "";
 	}
-	
-	##### answer processing #####
-	$WeBWorK::timer->continue("begin answer processing") if defined($WeBWorK::timer);
-	# if answers were submitted:
-	my $scoreRecordedMessage;
-	if ($submitAnswers) {
-		# get a "pure" (unmerged) UserProblem to modify
-		# this will be undefined if the problem has not been assigned to this user
-		my $pureProblem = $db->getUserProblem($problem->user_id, $problem->set_id, $problem->problem_id); # checked
-		if (defined $pureProblem) {
-			# store answers in DB for sticky answers
-			my %answersToStore;
-			my %answerHash = %{ $pg->{answers} };
-			$answersToStore{$_} = $self->{formFields}->{$_}  #$answerHash{$_}->{original_student_ans} -- this may have been modified for fields with multiple values.  Don't use it!!
-				foreach (keys %answerHash);
-			# There may be some more answers to store -- one which are auxiliary entries to a primary answer.  Evaluating
-			# matrices works in this way, only the first answer triggers an answer evaluator, the rest are just inputs
-			# however we need to store them.  Fortunately they are still in the input form.
-			my @extra_answer_names  = @{ $pg->{flags}->{KEPT_EXTRA_ANSWERS}};
-			
-			$answersToStore{$_} = $self->{formFields}->{$_} foreach  (@extra_answer_names);
-			
-			# Now let's encode these answers to store them -- append the extra answers to the end of answer entry order
-			my @answer_order = (@{$pg->{flags}->{ANSWER_ENTRY_ORDER}}, @extra_answer_names);
-			my $answerString = encodeAnswers(%answersToStore,
-				 @answer_order);
-			
-			# store last answer to database
-			$problem->last_answer($answerString);
-			$pureProblem->last_answer($answerString);
-			$db->putUserProblem($pureProblem);
-			
-			# store state in DB if it makes sense
-			if ($will{recordAnswers}) {
-				$problem->status($pg->{state}->{recorded_score});
-				$problem->attempted(1);
-				$problem->num_correct($pg->{state}->{num_of_correct_ans});
-				$problem->num_incorrect($pg->{state}->{num_of_incorrect_ans});
-				$pureProblem->status($pg->{state}->{recorded_score});
-				$pureProblem->attempted(1);
-				$pureProblem->num_correct($pg->{state}->{num_of_correct_ans});
-				$pureProblem->num_incorrect($pg->{state}->{num_of_incorrect_ans});
-				if ($db->putUserProblem($pureProblem)) {
-					$scoreRecordedMessage = "Your score was recorded.";
-				} else {
-					$scoreRecordedMessage = "Your score was not recorded because there was a failure in storing the problem record to the database.";
+	else{
+		print $editorLink;
+	}
+	return "";
+}
+
+# output_checkboxes subroutine
+
+# prints out the checkbox input elements that are available for the current problem
+
+sub output_checkboxes{
+	my $self = shift;
+	my $r = $self->r;
+	my %can = %{ $self->{can} };
+	my %will = %{ $self->{will} };
+
+	if ($can{showCorrectAnswers}) {
+		print WeBWorK::CGI_labeled_input(
+			-type	 => "checkbox",
+			-id		 => "showCorrectAnswers_id",
+			-label_text => $r->maketext("Show correct answers"),
+			-input_attr => $will{showCorrectAnswers} ?
+			{
+				-name    => "showCorrectAnswers",
+				-checked => "checked",
+				-value   => 1,
+			}
+			:
+			{
+				-name    => "showCorrectAnswers",
+				-value   => 1,
+			}
+		),"&nbsp;";
+	}
+	if ($can{showHints}) {
+		print CGI::span({style=>"color:red"},
+			WeBWorK::CGI_labeled_input(
+				-type	 => "checkbox",
+				-id		 => "showHints_id",
+				-label_text => $r->maketext("Show Hints"),
+				-input_attr => $will{showHints} ?
+				{
+					-name    => "showHints",
+					-checked => "checked",
+					-value   => 1,
 				}
-				# write to the transaction log, just to make sure
-				writeLog($self->{ce}, "transaction",
-					$problem->problem_id."\t".
-					$problem->set_id."\t".
-					$problem->user_id."\t".
-					$problem->source_file."\t".
-					$problem->value."\t".
-					$problem->max_attempts."\t".
-					$problem->problem_seed."\t".
-					$pureProblem->status."\t".
-					$pureProblem->attempted."\t".
-					$pureProblem->last_answer."\t".
-					$pureProblem->num_correct."\t".
-					$pureProblem->num_incorrect
-				);
-			} else {
-				if (time < $set->open_date or time > $set->due_date) {
-					$scoreRecordedMessage = "Your score was not recorded because this problem set is closed.";
-				} else {
-					$scoreRecordedMessage = "Your score was not recorded.";
+				:
+				{
+					-name    => "showHints",
+					-value   => 1,
 				}
+			)
+		),"&nbsp;";
+	}
+	if ($can{showSolutions}) {
+		print WeBWorK::CGI_labeled_input(
+			-type	 => "checkbox",
+			-id		 => "showSolutions_id",
+			-label_text => $r->maketext("Show Solutions"),
+			-input_attr => $will{showSolutions} ?
+			{
+				-name    => "showSolutions",
+				-checked => "checked",
+				-value   => 1,
 			}
-		} else {
-			$scoreRecordedMessage = "Your score was not recorded because this problem has not been built for you.";
-		}
+			:
+			{
+				-name    => "showSolutions",
+				-value   => 1,
+			}
+		),"&nbsp;";
 	}
 	
-	# logging student answers
-
-	my $answer_log    = $self->{ce}->{courseFiles}->{logs}->{'answer_log'};
-	if ( defined($answer_log )) {
-		if ($submitAnswers ) {
-			my $answerString = "";
-			my %answerHash = %{ $pg->{answers} };
-			$answerString = $answerString . $answerHash{$_}->{original_student_ans}."\t"
-				foreach (sort keys  %answerHash);
-			$answerString = '' unless defined($answerString); # insure string is defined. 
-			writeCourseLog($self->{ce}, "answer_log",
-			        join("",
-						'|', $problem->user_id,
-						'|', $problem->set_id,
-						'|', $problem->problem_id,
-						'|',"\t",
-						time(),"\t",
-						$answerString,
-					),
-			);
-			
-		}
+	if ($can{showCorrectAnswers} or $can{showHints} or $can{showSolutions}) {
+		print CGI::br();
 	}
 	
-	$WeBWorK::timer->continue("end answer processing") if defined($WeBWorK::timer);
-	
-	##### output #####
-	
-	print CGI::start_div({class=>"problemHeader"});
+	return "";
+}
+
+# output_submit_buttons
+
+# prints out the submit button input elements that are available for the current problem
+
+sub output_submit_buttons{
+	my $self = shift;
+	my $r = $self->r;
+	my %can = %{ $self->{can} };
 	
-	# custom message for editor
-	if ($permissionLevel >= 10 and defined $editMode) {
-		if ($editMode eq "temporaryFile") {
-			print CGI::p(CGI::i("Editing temporary file: ", $problem->source_file));
-		} elsif ($editMode eq "savedFile") {
-			print CGI::p(CGI::i("Problem saved to: ", $problem->source_file));
-		}
+	my $user = $r->param('user');
+	my $effectiveUser = $r->param('effectiveUser');
+
+	print WeBWorK::CGI_labeled_input(-type=>"submit", -id=>"previewAnswers_id", -input_attr=>{-name=>"previewAnswers", -value=>$r->maketext("Preview Answers")});
+	if ($can{checkAnswers}) {
+		print WeBWorK::CGI_labeled_input(-type=>"submit", -id=>"checkAnswers_id", -input_attr=>{-name=>"checkAnswers", -value=>$r->maketext("Check Answers")});
 	}
-	
-	# attempt summary
-	#FIXME -- the following is a kludge:  if showPartialCorrectAnswers is negative don't show anything.
-	# until after the due date
-	# do I need to check $wills{howCorrectAnswers} to make preflight work??
-	if (($pg->{flags}->{showPartialCorrectAnswers}>= 0 and $submitAnswers) ) {
-		# print this if user submitted answers OR requested correct answers
-		
-		print $self->attemptResults($pg, 1,
-			$will{showCorrectAnswers},
-			$pg->{flags}->{showPartialCorrectAnswers}, 1, 1);
-	} elsif ($checkAnswers) {
-		# print this if user previewed answers
-		print "ANSWERS ONLY CHECKED  -- ",CGI::br(),"ANSWERS NOT RECORDED", CGI::br();
-		print $self->attemptResults($pg, 1, $will{showCorrectAnswers}, 1, 1, 1);
-			# show attempt answers
-			# show correct answers if asked
-			# show attempt results (correctness)
-			# show attempt previews
-	} elsif ($previewAnswers) {
-		# print this if user previewed answers
-		print "PREVIEW ONLY -- NOT RECORDED",CGI::br(),$self->attemptResults($pg, 1, 0, 0, 0, 1);
-			# show attempt answers
-			# don't show correct answers
-			# don't show attempt results (correctness)
-			# show attempt previews
+	if ($can{getSubmitButton}) {
+		if ($user ne $effectiveUser) {
+			# if acting as a student, make it clear that answer submissions will
+			# apply to the student's records, not the professor's.
+			print WeBWorK::CGI_labeled_input(-type=>"submit", -id=>"submitAnswers_id", -input_attr=>{-name=>$r->maketext("submitAnswers"), -value=>$r->maketext("Submit Answers for [_1]", $effectiveUser)});
+		} else {
+			#print CGI::submit(-name=>"submitAnswers", -label=>"Submit Answers", -onclick=>"alert('submit button clicked')");
+			print WeBWorK::CGI_labeled_input(-type=>"submit", -id=>"submitAnswers_id", -input_attr=>{-name=>"submitAnswers", -value=>$r->maketext("Submit Answers"), -onclick=>""});
+			# FIXME  for unknown reasons the -onclick label seems to have to be there in order to allow the forms onsubmit to trigger
+			# WTF???
+		}
 	}
 	
-	print CGI::end_div();
-	
-	print CGI::start_div({class=>"problem"});
-	
-	# main form
-	print
-		CGI::startform("POST", $r->uri),
-		$self->hidden_authen_fields,
-		CGI::p($pg->{body_text}),
-		CGI::p($pg->{result}->{msg} ? CGI::b("Note: ") : "", CGI::i($pg->{result}->{msg})),
-		CGI::p(
-			($can{showCorrectAnswers} 
-				? CGI::checkbox(
-						-name    => "showCorrectAnswers",
-						-checked => $will{showCorrectAnswers},
-						-label   => "Show correct answers",
-					) ." "
-				: "" ), 
-			($can{showHints} 
-				? '<div style="color:red">'. CGI::checkbox(
-					-name    => "showHints",
-					-checked => $will{showHints},
-					-label   => "Show Hints",
-					) . "</div> "
-				: " " ),
-			($can{showSolutions} 
-				? CGI::checkbox(
-					-name    => "showSolutions",
-					-checked => $will{showSolutions},
-					-label   => "Show Solutions",
-					) . " "
-				: " " ),CGI::br(),
-			CGI::submit(-name=>"previewAnswers",
-				-label=>"Preview Answers"),
-			($can{recordAnswers}
-				? CGI::submit(-name=>"submitAnswers",
-					-label=>"Submit Answers")
-				: ""),
-			( $can{checkAnswers}
-				? CGI::submit(-name=>"checkAnswers",
-					-label=>"Check Answers")
-				: ""),
-		);
-	print CGI::end_div();
-	
-	print CGI::start_div({class=>"scoreSummary"});
+	return "";
+}
+
+# output_score_summary subroutine
+
+# prints out a summary of the student's current progress and status on the current problem
+
+sub output_score_summary{
+	my $self = shift;
+	my $r = $self->r;
+	my $problem = $self->{problem};
+	my $set = $self->{set};
+	my $pg = $self->{pg};
+	my $scoreRecordedMessage = WeBWorK::ContentGenerator::ProblemUtil::ProblemUtil::process_and_log_answer($self) || "";
+	my $submitAnswers = $self->{submitAnswers};
 	
 	# score summary
+	warn "num_correct =", $problem->num_correct,"num_incorrect=",$problem->num_incorrect 
+	        unless defined($problem->num_correct) and defined($problem->num_incorrect) ;
 	my $attempts = $problem->num_correct + $problem->num_incorrect;
-	my $attemptsNoun = $attempts != 1 ? "times" : "time";
-	my $lastScore = sprintf("%.0f%%", $problem->status * 100); # Round to whole number
-	my ($attemptsLeft, $attemptsLeftNoun);
-	if ($problem->max_attempts == -1) {
-		# unlimited attempts
-		$attemptsLeft = "unlimited";
-		$attemptsLeftNoun = "attempts";
-	} else {
-		$attemptsLeft = $problem->max_attempts - $attempts;
-		$attemptsLeftNoun = $attemptsLeft == 1 ? "attempt" : "attempts";
-	}
+	#my $attemptsNoun = $attempts != 1 ? $r->maketext("times") : $r->maketext("time");
+	my $problem_status    = $problem->status || 0;
+	my $lastScore = sprintf("%.0f%%", $problem_status * 100); # Round to whole number
+	my $attemptsLeft = $problem->max_attempts - $attempts;
+
 	
 	my $setClosed = 0;
 	my $setClosedMessage;
-	if (time < $set->open_date or time > $set->due_date) {
+	if (before($set->open_date) or after($set->due_date)) {
 		$setClosed = 1;
-		$setClosedMessage = "This problem set is closed.";
-		if ($permissionLevel > 0) {
-			$setClosedMessage .= " However, since you are a privileged user, additional attempts will be recorded.";
-		} else {
-			$setClosedMessage .= " Additional attempts will not be recorded.";
+		if (before($set->open_date)) {
+			$setClosedMessage = $r->maketext("This homework set is not yet open.");
+		} elsif (after($set->due_date)) {
+			$setClosedMessage = $r->maketext("This homework set is closed.");
 		}
 	}
-	print CGI::p(
-		$submitAnswers ? $scoreRecordedMessage . CGI::br() : "",
-		"You have attempted this problem $attempts $attemptsNoun.", CGI::br(),
-		$problem->attempted
-			? "Your recorded score is $lastScore." . CGI::br()
-			: "",
-		$setClosed ? $setClosedMessage : "You have $attemptsLeft $attemptsLeftNoun remaining."
-	);
-	print CGI::end_div();
-		
+	#if (before($set->open_date) or after($set->due_date)) {
+	#	$setClosed = 1;
+	#	$setClosedMessage = "This homework set is closed.";
+	#	if ($authz->hasPermissions($user, "view_answers")) {
+	#		$setClosedMessage .= " However, since you are a privileged user, additional attempts will be recorded.";
+	#	} else {
+	#		$setClosedMessage .= " Additional attempts will not be recorded.";
+	#	}
+	#}
+	unless (defined( $pg->{state}->{state_summary_msg}) and $pg->{state}->{state_summary_msg}=~/\S/) {
+		my $notCountedMessage = ($problem->value) ? "" : $r->maketext("(This problem will not count towards your grade.)");
+		print CGI::p(join("",
+			$submitAnswers ? $scoreRecordedMessage . CGI::br() : "",
+			$r->maketext("You have attempted this problem [quant,_1,time,times].",$attempts), CGI::br(),
+			$submitAnswers ? $r->maketext("You received a score of [_1] for this attempt.",sprintf("%.0f%%", $pg->{result}->{score} * 100)) . CGI::br():'',
+			$problem->attempted
+				? $r->maketext("Your overall recorded score is [_1].  [_2]",$lastScore,$notCountedMessage) . CGI::br()
+				: "",
+			$setClosed ? $setClosedMessage : $r->maketext("You have [negquant,_1,unlimited attempts,attempt,attempts] remaining.",$attemptsLeft) 
+		));
+	}else {
+		print CGI::p($pg->{state}->{state_summary_msg});
+	}
+	
+	return "";
+}
+
+# output_misc subroutine
+
+# prints out other necessary elements
+
+sub output_misc{
+
+	my $self = shift;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my $db = $r->db;
+	my $pg = $self->{pg};
+	my %will = %{ $self->{will} };
+	my $user = $r->param('user');
+
+	print CGI::start_div();
+	
+	my $pgdebug = join(CGI::br(), @{$pg->{pgcore}->{flags}->{DEBUG_messages}} );
+	my $pgwarning = join(CGI::br(), @{$pg->{pgcore}->{flags}->{WARNING_messages}} );
+	my $pginternalerrors = join(CGI::br(),  @{$pg->{pgcore}->get_internal_debug_messages}   );
+	my $pgerrordiv = $pgdebug||$pgwarning||$pginternalerrors;  # is 1 if any of these are non-empty
+	
+	print CGI::p({style=>"color:red;"}, $r->maketext("Checking additional error messages")) if $pgerrordiv  ;
+ 	print CGI::p("pg debug<br/> $pgdebug"                   ) if $pgdebug ;
+	print CGI::p("pg warning<br/>$pgwarning"                ) if $pgwarning ;	
+	print CGI::p("pg internal errors<br/> $pginternalerrors") if $pginternalerrors;
+	print CGI::end_div()                                      if $pgerrordiv ;
+	
 	# save state for viewOptions
 	print  CGI::hidden(
 			   -name  => "showOldAnswers",
@@ -704,336 +1241,244 @@ sub body {
 			   -value   => $self->{editMode},
 		   )
 	) if defined($self->{editMode}) and $self->{editMode} eq 'temporaryFile';
+	
+	# this is a security risk -- students can use this to find the source code for the problem
+
+	my $permissionLevel = $db->getPermissionLevel($user)->permission;
+	my $professorPermissionLevel = $ce->{userRoles}->{professor};
 	print( CGI::hidden(
 		   		-name   => 'sourceFilePath',
 		   		-value  =>  $self->{problem}->{source_file}
-	))  if defined($self->{problem}->{source_file});
-			
-	# end of main form
-	print CGI::endform();
+	))  if defined($self->{problem}->{source_file}) and $permissionLevel>= $professorPermissionLevel; # only allow this for professors
+
+	print( CGI::hidden(
+		   		-name   => 'problemSeed',
+		   		-value  =>  $r->param("problemSeed")
+	))  if defined($r->param("problemSeed")) and $permissionLevel>= $professorPermissionLevel; # only allow this for professors
 	
+	return "";
+}
+
+# output_summary subroutine
+
+# prints out the summary of the questions that the student has answered for the current problem, along with available information about correctness
+
+sub output_summary{
 	
-	print  CGI::start_div({class=>"problemFooter"});
+	my $self = shift;
 	
-	# arguments for answer inspection button
-	my $prof_url = $ce->{webworkURLs}->{oldProf};
-	my $webworkURL = $ce->{webworkURLs}->{root};
-	my $cgi_url = $prof_url;
-	$cgi_url=~ s|/[^/]*$||;  # clip profLogin.pl
-	my $authen_args = $self->url_authen_args();
-	my $showPastAnswersURL = "$webworkURL/$courseName/instructor/show_answers/";
+	my $editMode = $self->{editMode};
+	my $problem = $self->{problem};
+	my $pg = $self->{pg};
+	my $submitAnswers = $self->{submitAnswers};
+	my %will = %{ $self->{will} };
+	my $checkAnswers = $self->{checkAnswers};
+	my $previewAnswers = $self->{previewAnswers};
 	
-	# print answer inspection button
-	if ($self->{permissionLevel} > 0) {
-		print "\n",
-			CGI::start_form(-method=>"POST",-action=>$showPastAnswersURL,-target=>"information"),"\n",
-			$self->hidden_authen_fields,"\n",
-			CGI::hidden(-name => 'course',  -value=>$courseName), "\n",
-			CGI::hidden(-name => 'problemNumber', -value=>$problem->problem_id), "\n",
-			CGI::hidden(-name => 'setName',  -value=>$problem->set_id), "\n",
-			CGI::hidden(-name => 'studentUser',    -value=>$problem->user_id), "\n",
-			CGI::p( {-align=>"left"},
-				CGI::submit(-name => 'action',  -value=>'Show Past Answers')
-			), "\n",
-			CGI::endform();
-	}
+	my $r = $self->r;
 	
-	#print CGI::end_div();
-	#
-	#print CGI::start_div();
-	
-	# arguments for feedback form
-	my $feedbackURL = "$root/$courseName/feedback/";
-	
-	#print feedback form
-	print
-		CGI::start_form(-method=>"POST", -action=>$feedbackURL),"\n",
-		$self->hidden_authen_fields,"\n",
-		CGI::hidden("module",             __PACKAGE__),"\n",
-		CGI::hidden("set",                $set->set_id),"\n",
-		CGI::hidden("problem",            $problem->problem_id),"\n",
-		CGI::hidden("displayMode",        $self->{displayMode}),"\n",
-		CGI::hidden("showOldAnswers",     $will{showOldAnswers}),"\n",
-		CGI::hidden("showCorrectAnswers", $will{showCorrectAnswers}),"\n",
-		CGI::hidden("showHints",          $will{showHints}),"\n",
-		CGI::hidden("showSolutions",      $will{showSolutions}),"\n",
-		CGI::p({-align=>"left"},
-			CGI::submit(-name=>"feedbackForm", -label=>"Email instructor")
-		),
-		CGI::endform(),"\n";
-		
-	# FIXME print editor link
-	print $editorLinkMessage;   #empty unless it is appropriate to have an editor link.
+	my $authz = $r->authz;
+	my $user = $r->param('user');
 	
-	print CGI::end_div();
+	# attempt summary
+	#FIXME -- the following is a kludge:  if showPartialCorrectAnswers is negative don't show anything.
+	# until after the due date
+	# do I need to check $will{showCorrectAnswers} to make preflight work??
+	if (($pg->{flags}->{showPartialCorrectAnswers} >= 0 and $submitAnswers) ) {
+		# print this if user submitted answers OR requested correct answers
+		
+		print $self->attemptResults($pg, 1,
+			$will{showCorrectAnswers},
+			$pg->{flags}->{showPartialCorrectAnswers}, 1, 1);
+	} elsif ($checkAnswers) {
+		# print this if user previewed answers
+		print CGI::div({class=>'ResultsWithError'},$r->maketext("ANSWERS ONLY CHECKED -- ANSWERS NOT RECORDED")), CGI::br();
+		print $self->attemptResults($pg, 1, $will{showCorrectAnswers}, 1, 1, 1);
+			# show attempt answers
+			# show correct answers if asked
+			# show attempt results (correctness)
+			# show attempt previews
+	} elsif ($previewAnswers) {
+		# print this if user previewed answers
+		print CGI::div({class=>'ResultsWithError'},$r->maketext("PREVIEW ONLY -- ANSWERS NOT RECORDED")),CGI::br(),$self->attemptResults($pg, 1, 0, 0, 0, 1);
+			# show attempt answers
+			# don't show correct answers
+			# don't show attempt results (correctness)
+			# show attempt previews
+	}
 	
-	# warning output
-	#if ($pg->{warnings} ne "") {
-	#	print CGI::hr(), $self->warningOutput($pg->{warnings});
-	#}
+	return "";
+}
+
+# output_custom_edit_message
+
+# prints out a custom edit message
+
+sub output_custom_edit_message{
+	my $self = shift;
+	my $r = $self->r;
+	my $authz = $r->authz;
+	my $user = $r->param('user');
+	my $editMode = $self->{editMode};
+	my $problem = $self->{problem};
 	
-	# debugging stuff
-	if (0) {
-		print
-			CGI::hr(),
-			CGI::h2("debugging information"),
-			CGI::h3("form fields"),
-			ref2string($self->{formFields}),
-			CGI::h3("user object"),
-			ref2string($self->{user}),
-			CGI::h3("set object"),
-			ref2string($set),
-			CGI::h3("problem object"),
-			ref2string($problem),
-			CGI::h3("PG object"),
-			ref2string($pg, {'WeBWorK::PG::Translator' => 1});
+	# custom message for editor
+	if ($authz->hasPermissions($user, "modify_problem_sets") and defined $editMode) {
+		if ($editMode eq "temporaryFile") {
+			print CGI::p(CGI::div({class=>'temporaryFile'}, $r->maketext("Viewing temporary file: "), $problem->source_file));
+		} elsif ($editMode eq "savedFile") {
+			# taken care of in the initialization phase
+		}
 	}
 	
 	return "";
 }
 
-##### output utilities #####
 
-sub attemptResults($$$$$$) {
+
+
+# output_past_answer_button
+
+# prints out the "Show Past Answers" button
+
+sub output_past_answer_button{
 	my $self = shift;
-	my $pg = shift;
-	my $showAttemptAnswers = shift;
-	my $showCorrectAnswers = shift;
-	my $showAttemptResults = $showAttemptAnswers && shift;
-	my $showSummary = shift;
-	my $showAttemptPreview = shift || 0;
-	my $ce = $self->{ce};
-	my $problemResult = $pg->{result}; # the overall result of the problem
-	my @answerNames = @{ $pg->{flags}->{ANSWER_ENTRY_ORDER} };
-	
-	my $showMessages = $showAttemptAnswers && grep { $pg->{answers}->{$_}->{ans_message} } @answerNames;
+	my $r = $self->r;
+	my $problem = $self->{problem};
 	
-	my $basename = "equation-" . $self->{set}->psvn. "." . $self->{problem}->problem_id . "-preview";
-	my $imgGen = WeBWorK::PG::ImageGenerator->new(
-		tempDir  => $ce->{webworkDirs}->{tmp},
-		latex	 => $ce->{externalPrograms}->{latex},
-		dvipng   => $ce->{externalPrograms}->{dvipng},
-		useCache => 1,
-		cacheDir => $ce->{webworkDirs}->{equationCache},
-		cacheURL => $ce->{webworkURLs}->{equationCache},
-		cacheDB  => $ce->{webworkFiles}->{equationCacheDB},
-	);
+	my $authz = $r->authz;
+	my $urlpath = $r->urlpath;
+	my $user = $r->param('user');
 	
-	my $header;
-	#$header .= CGI::th("Part");
-	$header .= $showAttemptAnswers ? CGI::th("Entered")  : "";
-	$header .= $showAttemptPreview ? CGI::th("Answer Preview")  : "";
-	$header .= $showCorrectAnswers ? CGI::th("Correct")  : "";
-	$header .= $showAttemptResults ? CGI::th("Result")   : "";
-	$header .= $showMessages       ? CGI::th("messages") : "";
-	my @tableRows = ( $header );
-	my $numCorrect;
-	foreach my $name (@answerNames) {
-		my $answerResult  = $pg->{answers}->{$name};
-		my $studentAnswer = $answerResult->{student_ans}; # original_student_ans
-		my $preview       = ($showAttemptPreview
-		                    	? $self->previewAnswer($answerResult, $imgGen)
-		                    	: "");
-		my $correctAnswer = $answerResult->{correct_ans};
-		my $answerScore   = $answerResult->{score};
-		my $answerMessage = $showMessages ? $answerResult->{ans_message} : "";
-		#FIXME  --Can we be sure that $answerScore is an integer-- could the problem give partial credit?
-		$numCorrect += $answerScore > 0;
-		my $resultString = $answerScore ? "correct" : "incorrect";
-		
-		# get rid of the goofy prefix on the answer names (supposedly, the format
-		# of the answer names is changeable. this only fixes it for "AnSwEr"
-		#$name =~ s/^AnSwEr//;
+	my $courseName = $urlpath->arg("courseID");
+
+	my $pastAnswersPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::ShowAnswers", $r, 
+		courseID => $courseName);
+	my $showPastAnswersURL = $self->systemLink($pastAnswersPage, authen => 0); # no authen info for form action
 		
-		my $row;
-		#$row .= CGI::td($name);
-		$row .= $showAttemptAnswers ? CGI::td(nbsp($studentAnswer)) : "";
-		$row .= $showAttemptPreview ? CGI::td(nbsp($preview))       : "";
-		$row .= $showCorrectAnswers ? CGI::td(nbsp($correctAnswer)) : "";
-		$row .= $showAttemptResults ? CGI::td(nbsp($resultString))  : "";
-		$row .= $answerMessage      ? CGI::td(nbsp($answerMessage)) : "";
-		push @tableRows, $row;
+	# print answer inspection button
+	if ($authz->hasPermissions($user, "view_answers")) {
+		print "\n",
+			CGI::start_form(-method=>"POST",-action=>$showPastAnswersURL,-target=>"WW_Info"),"\n",
+			$self->hidden_authen_fields,"\n",
+			CGI::hidden(-name => 'courseID',  -value=>$courseName), "\n",
+			CGI::hidden(-name => 'problemID', -value=>$problem->problem_id), "\n",
+			CGI::hidden(-name => 'setID',  -value=>$problem->set_id), "\n",
+			CGI::hidden(-name => 'studentUser',    -value=>$problem->user_id), "\n",
+			CGI::p( {-align=>"left"},
+				CGI::submit(-name => 'action',  -value=>$r->maketext("Show Past Answers"))
+			), "\n",
+			CGI::endform();
 	}
 	
-	# render equation images
-	$imgGen->render(refresh => 1);
-	
-#	my $numIncorrectNoun = scalar @answerNames == 1 ? "question" : "questions";
-	my $scorePercent = sprintf("%.0f%%", $problemResult->{score} * 100);
-#   FIXME  -- I left the old code in in case we have to back out.
-#	my $summary = "On this attempt, you answered $numCorrect out of "
-#		. scalar @answerNames . " $numIncorrectNoun correct, for a score of $scorePercent.";
-	my $summary = ""; 
-	if (scalar @answerNames == 1) {
-			if ($numCorrect == scalar @answerNames) {
-				$summary .= "The above answer is correct.";
-			 } else {
-			 	 $summary .= "The above answer is NOT correct.";
-			 }
-	} else {
-			if ($numCorrect == scalar @answerNames) {
-				$summary .= "All of the above answers are correct.";
-			 } else {
-			 	 $summary .= "At least one of the above answers is NOT correct.";
-			 }
-	}
-	#FIXME  there must be a better way to force refresh.
-	#my $refresh_warning = 'Hold down shift and click "refresh" or "reload" to update answer preview images.';
-	#return CGI::table({-class=>"attemptResults"}, CGI::Tr(\@tableRows)) . 
-	#CGI::div({style=>'color:red; font-size:10pt'},$refresh_warning) . 
-	#($showSummary ? CGI::p({class=>'emphasis'},$summary) : "");
-	# ... this has been fixed by equation caching.
-	return
-		CGI::table({-class=>"attemptResults"}, CGI::Tr(\@tableRows))
-		. ($showSummary ? CGI::p({class=>'emphasis'},$summary) : "");
-}
-sub nbsp {
-	my $str = shift;
-	($str =~/\S/) ? $str : '&nbsp;'  ;  # returns non-breaking space for empty strings
-	                                    # tricky cases:   $str =0;
-	                                    #  $str is a complex number
+	return "";
 }
-sub viewOptions($) {
+
+# output_email_instructor subroutine
+
+# prints out the "Email Instructor" button
+
+sub output_email_instructor{
 	my $self = shift;
-	my $displayMode = $self->{displayMode};
-	my %must = %{ $self->{must} };
-	my %can  = %{ $self->{can}  };
+	my $problem = $self->{problem};
 	my %will = %{ $self->{will} };
-	
-	my $optionLine;
-	$can{showOldAnswers} and $optionLine .= join "",
-		"Show: &nbsp;".CGI::br(),
-		CGI::checkbox(
-			-name    => "showOldAnswers",
-			-checked => $will{showOldAnswers},
-			-label   => "Saved answers",
-		), "&nbsp;&nbsp;".CGI::br();
-
-	$optionLine and $optionLine .= join "", CGI::br();
-	
-	return CGI::div({-style=>"border: thin groove; padding: 1ex; margin: 2ex align: left"},
-			"View&nbsp;equations&nbsp;as:&nbsp;&nbsp;&nbsp;&nbsp;".CGI::br(),
-		CGI::radio_group(
-			-name    => "displayMode",
-			-values  => ['plainText', 'formattedText', 'images'],
-			-default => $displayMode,
-			-linebreak=>'true',
-			-labels  => {
-				plainText     => "plain",
-				formattedText => "formatted",
-				images        => "images",
-			}
-		), CGI::br(),CGI::hr(),
-		$optionLine,
-		CGI::submit(-name=>"redisplay", -label=>"Save Options"),
-	);
-}
+	my $pg = $self->{pg};
 
-sub previewAnswer($$) {
-	my ($self, $answerResult, $imgGen) = @_;
-	my $ce            = $self->{ce};
-	my $effectiveUser = $self->{effectiveUser};
-	my $set           = $self->{set};
-	my $problem       = $self->{problem};
-	my $displayMode   = $self->{displayMode};
-	
-	# note: right now, we have to do things completely differently when we are
-	# rendering math from INSIDE the translator and from OUTSIDE the translator.
-	# so we'll just deal with each case explicitly here. there's some code
-	# duplication that can be dealt with later by abstracting out tth/dvipng/etc.
-	
-	my $tex = $answerResult->{preview_latex_string};
-	
-	return "" unless defined $tex and $tex ne "";
+	print $self->feedbackMacro(
+		module             => __PACKAGE__,
+		set                => $self->{set}->set_id,
+		problem            => $problem->problem_id,
+		displayMode        => $self->{displayMode},
+		showOldAnswers     => $will{showOldAnswers},
+		showCorrectAnswers => $will{showCorrectAnswers},
+		showHints          => $will{showHints},
+		showSolutions      => $will{showSolutions},
+		pg_object          => $pg,
+	);
 	
-	if ($displayMode eq "plainText") {
-		return $tex;
-	} elsif ($displayMode eq "formattedText") {
-		my $tthCommand = $ce->{externalPrograms}->{tth}
-			. " -L -f5 -r 2> /dev/null <<END_OF_INPUT; echo > /dev/null\n"
-			. "\\(".$tex."\\)\n"
-			. "END_OF_INPUT\n";
-		
-		# call tth
-		my $result = `$tthCommand`;
-		if ($?) {
-			return "<b>[tth failed: $? $@]</b>";
-		}
-		return $result;
-	} elsif ($displayMode eq "images") {
-		## how are we going to name this?
-		#my $targetPathCommon = "/m2i/"
-		#	. $effectiveUser->user_id . "."
-		#	. $set->set_id . "."
-		#	. $problem->problem_id . "."
-		#	. $answerResult->{ans_name} . ".png";
-		#
-		## figure out where to put things
-		#my $wd = makeTempDirectory($ce->{courseDirs}->{html_temp}, "webwork-dvipng");
-		#my $latex = $ce->{externalPrograms}->{latex};
-		#my $dvipng = $ce->{externalPrograms}->{dvipng};
-		#my $targetPath = $ce->{courseDirs}->{html_temp} . $targetPathCommon;
-		#		# should use surePathToTmpFile, but we have to
-		#		# isolate it from the problem enivronment first
-		#my $targetURL = $ce->{courseURLs}->{html_temp} . $targetPathCommon;
-		#
-		## call dvipng to generate a preview
-		#dvipng($wd, $latex, $dvipng, $tex, $targetPath);
-		#rmtree($wd, 0, 0);
-		#if (-e $targetPath) {
-		#	return "<img src=\"$targetURL\" alt=\"$tex\" />";
-		#} else {
-		#	return "<b>[math2img failed]</b>";
-		#}
-		$imgGen->add($answerResult->{preview_latex_string});
-		
-	}
+	return "";
 }
 
-##### logging subroutine ####
+# output_hidden_info subroutine
 
+# outputs the hidden fields required for the form
 
+sub output_hidden_info{
+	my $self = shift;
+	my $previewAnswers = $self->{previewAnswers};
+	my $checkAnswers   = $self->{checkAnswers};
+	my $showPartialCorrectAnswers = $self->{pg}->{flags}->{showPartialCorrectAnswers};
+	if($previewAnswers){  # never color previewed answers 
+		return "";
+	}
+	elsif (   ($checkAnswers  ) 
+	         or $showPartialCorrectAnswers )    { # color answers when partialCorrectAnswers is set
+	                                              # or when checkAnswers is submitted 
+		if(defined $self->{correct_ids}){
+			my $correctRef = $self->{correct_ids};
+			my @correct = @$correctRef;
+			foreach(@correct){
+				print CGI::hidden(-name=>"correct_ids", -value=>$_."_val");
+			}
+		}
+		if(defined $self->{incorrect_ids}){
+			my $incorrectRef = $self->{incorrect_ids};
+			my @incorrect = @$incorrectRef;
+			foreach(@incorrect){
+				print CGI::hidden(-name=>"incorrect_ids", -value=>$_."_val");
+			}
+		}
+		return "";
+	} else {
+		return "";
+	}
+}
 
-##### permission queries #####
+# output_JS subroutine
 
-# this stuff should be abstracted out into the permissions system
-# however, the permission system only knows about things in the
-# course environment and the username. hmmm...
+# prints out the wz_tooltip.js script for the current site.
 
-# also, i should fix these so that they have a consistent calling
-# format -- perhaps:
-# 	canPERM($courseEnv, $user, $set, $problem, $permissionLevel)
+sub output_wztooltip_JS{
+	
+	my $self = shift;
+	my $r = $self->r;
+	my $ce = $r->ce;
 
-sub canShowCorrectAnswers($$) {
-	my ($permissionLevel, $answerDate) = @_;
-	return $permissionLevel > 0 || time > $answerDate;
+	my $site_url = $ce->{webworkURLs}->{htdocs};
+	
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/wz_tooltip.js"}), CGI::end_script();
+	return "";
 }
 
-sub canShowSolutions($$) {
-	my ($permissionLevel, $answerDate) = @_;
-	return canShowCorrectAnswers($permissionLevel, $answerDate);
-}
+# outputs all of the Javascript needed for this page. 
+# The main javascript needed here is color.js, which colors input fields based on whether or not 
+# they are correct when answers are submitted.  When a problem attempts results, it prints out hidden fields containing identification 
+# information for the fields that were correct and the fields that were incorrect.  color.js collects of the correct and incorrect fields into 
+# two arrays using the information gathered from the hidden fields, and then loops through and changes the styles so 
+# that the colors will show up correctly.
 
-sub canRecordAnswers($$$$$) {
-	my ($permissionLevel, $openDate, $dueDate, $maxAttempts, $attempts) = @_;
-	my $permHigh = $permissionLevel > 0;
-	my $timeOK = time >= $openDate && time <= $dueDate;
-	my $attemptsOK = $maxAttempts == -1 || $attempts <= $maxAttempts;
-	my $recordAnswers = $permHigh || ($timeOK && $attemptsOK);
-	return $recordAnswers;
-}
+sub output_JS{
+	my $self = shift;
+	my $r = $self->r;
+	my $ce = $r->ce;
 
-sub canCheckAnswers($$) {
-	my ($permissionLevel, $answerDate) = @_;
-	my $permHigh = $permissionLevel > 0;
-	my $timeOK = time >= $answerDate;
-	my $recordAnswers = $permHigh || $timeOK;
-	return $recordAnswers;
+	my $site_url = $ce->{webworkURLs}->{htdocs};
+	
+	# This file declares a function called addOnLoadEvent which allows multiple different scripts to add to a single onLoadEvent handler on a page.
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/addOnLoadEvent.js"}), CGI::end_script();
+	
+	# This is a file which initializes the proper JAVA applets should they be needed for the current problem.
+	print CGI::start_script({type=>"tesxt/javascript", src=>"$site_url/js/java_init.js"}), CGI::end_script();
+	
+	# The color.js file, which uses javascript to color the input fields based on whether they are correct or incorrect.
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/color.js"}), CGI::end_script();
+	return "";
 }
 
-sub mustRecordAnswers($) {
-	my ($permissionLevel) = @_;
-	return $permissionLevel == 0;
+# Simply here to indicate to the template that this page has body part methods which can be called
+
+sub can_body_parts{
+	return "";
 }
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/ProblemRenderer.pm b/lib/WeBWorK/ContentGenerator/ProblemRenderer.pm
new file mode 100644
index 0000000000..cd57a441f7
--- /dev/null
+++ b/lib/WeBWorK/ContentGenerator/ProblemRenderer.pm
@@ -0,0 +1,85 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/ProblemRenderer.pm,v 1.1 2008/04/29 19:27:34 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::ContentGenerator::ProblemRenderer;
+use base qw(WeBWorK::ContentGenerator);
+
+=head1 NAME
+
+WeBWorK::ContentGenerator::ProblemRenderer - render a problem with a minimal
+amount of UI garbage.
+
+=cut
+
+use strict;
+use warnings;
+use WeBWorK::CGI;
+use WeBWorK::Utils::Tasks qw(renderProblems);
+
+sub pre_header_initialize {
+	my ($self) = @_;
+	my $r = $self->r;
+	
+	my $pg = $r->param('pg');
+	my $file = $r->param('file');
+	my $seed = $r->param('seed');
+	my $mode = $r->param('mode');
+	my $hint = $r->param('hint');
+	my $sol = $r->param('sol');
+	
+	die "must specify either a PG problems (param 'pg') or a path to a PG file (param 'file') and not both"
+		unless defined $pg and length $pg xor defined $file and length $file;
+	
+	my $problem = $self->get_problem($pg, $file);
+	my @options = (r=>$r, problem_list=>[\$pg]);
+	
+	#push @options, (problem_seed=>$seed) if defined $seed;
+	#push @options, (displayMode=>$mode) if defined $mode;
+	#push @options, (showHints=>$hint) if defined $hint;
+	#push @options, (showSolutions=>$sol) if defined $sol;
+	
+	($self->{result}) = renderProblems(@options);
+}
+
+sub get_problem {
+	my ($self, $pg, $file) = @_;
+	
+	if (defined $pg) {
+		return \$pg;
+	} else {
+		return $file;
+	}
+}
+
+use Data::Dumper;
+sub content {
+	my ($self) = @_;
+	my $result = $self->{result};
+	my $dump = Dumper($result);
+	
+	print <<EOF;
+<html>
+<head>
+<title>Yuck!</title>
+</head>
+<body>
+<pre>$dump</pre>
+</body>
+</html>
+EOF
+}
+
+1;
diff --git a/lib/WeBWorK/ContentGenerator/ProblemSet.pm b/lib/WeBWorK/ContentGenerator/ProblemSet.pm
index d48254d453..c2e6e8dfdf 100644
--- a/lib/WeBWorK/ContentGenerator/ProblemSet.pm
+++ b/lib/WeBWorK/ContentGenerator/ProblemSet.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader: webwork-modperl/lib/WeBWorK/ContentGenerator/ProblemSet.pm,v 1.37 2003/12/09 01:12:31 sh002i Exp $
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm,v 1.94 2009/11/02 16:54:15 apizer 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
@@ -26,145 +26,212 @@ problem set.
 
 use strict;
 use warnings;
-use CGI qw();
+#use CGI qw(-nosticky *ul *li);
+use WeBWorK::CGI;
 use WeBWorK::PG;
+use URI::Escape;
+use WeBWorK::Debug;
+use WeBWorK::Utils qw(sortByName path_is_subdir);
+use WeBWorK::Localize;
 
 sub initialize {
-	my ($self, $setName) = @_;
-	my $courseEnvironment = $self->{ce};
-	my $r = $self->{r};
-	my $db = $self->{db};
+	my ($self) = @_;
+	my $r = $self->r;
+	my $db = $r->db;
+	my $urlpath = $r->urlpath;
+	my $authz = $r->authz;
+	
+	my $setName = $urlpath->arg("setID");
 	my $userName = $r->param("user");
 	my $effectiveUserName = $r->param("effectiveUser");
+	$self->{displayMode}  = $r->param('displayMode') || $r->ce->{pg}->{options}->{displayMode};
 	
+
 	my $user            = $db->getUser($userName); # checked
 	my $effectiveUser   = $db->getUser($effectiveUserName); # checked
 	my $set             = $db->getMergedSet($effectiveUserName, $setName); # checked
-	my $permissionLevel = $db->getPermissionLevel($userName)->permission(); # checked
 	
 	die "user $user (real user) not found."  unless $user;
 	die "effective user $effectiveUserName  not found. One 'acts as' the effective user."  unless $effectiveUser;
-	die "set $setName for effectiveUser $effectiveUserName not found." unless $set;
-	die "permisson level for user $userName  not found."  unless defined $permissionLevel;
+
+	# FIXME: some day it would be nice to take out this code and consolidate the two checks
+	
+	# get result and send to message
+	my $status_message = $r->param("status_message");
+	$self->addmessage(CGI::p("$status_message")) if $status_message;
+	
+	# $self->{invalidSet} is set by ContentGenerator.pm
+	return if $self->{invalidSet};
+	return unless defined($set);
+	
+	# Database fix (in case of undefined visible values)
+	# this is only necessary because some people keep holding to ww1.9 which did not have a visible field
+	# make sure visible is set to 0 or 1
+
+	if ($set->visible ne "0" and $set->visible ne "1") {
+		my $globalSet = $db->getGlobalSet($set->set_id);
+		$globalSet->visible("1");	# defaults to visible
+		$db->putGlobalSet($globalSet);
+		$set = $db->getMergedSet($effectiveUserName, $set->set_id);
+	}
+
+	# When a set is created enable_reduced_scoring is null, so we have to set it 
+	if ($set->enable_reduced_scoring ne "0" and $set->enable_reduced_scoring ne "1") {
+		my $globalSet = $db->getGlobalSet($set->set_id);
+		$globalSet->enable_reduced_scoring("0");	# defaults to disabled
+		$db->putGlobalSet($globalSet);
+		$set = $db->getMergedSet($effectiveUserName, $set->set_id);
+	}
+
+	my $visiblityStateText = ($set->visible) ? $r->maketext("visible to students")."." : $r->maketext("hidden from students").".";
+	my $visiblityStateClass = ($set->visible) ? "visible" : "hidden";
+	$self->addmessage(CGI::span($r->maketext("This set is [_1]", CGI::font({class=>$visiblityStateClass}, $visiblityStateText)))) if $authz->hasPermissions($userName, "view_hidden_sets");
+
 
 	$self->{userName}        = $userName;
 	$self->{user}            = $user;
 	$self->{effectiveUser}   = $effectiveUser;
 	$self->{set}             = $set;
-	$self->{permissionLevel} = $permissionLevel;
 	
 	##### permissions #####
 	
-	$self->{isOpen} = time >= $set->open_date || $permissionLevel > 0;
-}
-
-sub path {
-	my ($self, $setName, $args) = @_;
-	
-	my $ce = $self->{ce};
-	my $root = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
-	return $self->pathMacro($args,
-		"Home" => "$root",
-		$courseName => "$root/$courseName",
-		$setName => "",
-	);
+	$self->{isOpen} = time >= $set->open_date || $authz->hasPermissions($userName, "view_unopened_sets");
 }
 
 sub nav {
-	my ($self, $setName, $args) = @_;
-	
-	my $ce = $self->{ce};
-	my $root = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
-	my @links = ("Problem Sets" , "$root/$courseName", "navUp");
-	my $tail = "";
-	
+	my ($self, $args) = @_;
+	my $r = $self->r;
+	my $urlpath = $r->urlpath;
+
+	my $courseID = $urlpath->arg("courseID");
+	#my $problemSetsPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSets",  $r, courseID => $courseID);
+	my $problemSetsPage = $urlpath->parent;
+	
+	my @links = ($r->maketext("Homework Sets") , $r->location . $problemSetsPage->path, $r->maketext("navUp"));
+	# CRAP ALERT: this line relies on the hacky options() implementation in ContentGenerator.
+	# we need to find a better way to do this -- long range dependencies like this are dangerous!
+	#my $tail = "&displayMode=".$self->{displayMode}."&showOldAnswers=".$self->{will}->{showOldAnswers};
+	# here is a hack to get some functionality back, but I don't even think it's that important to
+	# have this, since there are SO MANY PLACES where we lose the displayMode, etc.
+	# (oh boy, do we need a session table in the database!)
+	my $displayMode = $r->param("displayMode") || "";
+	my $showOldAnswers = $r->param("showOldAnswers") || "";
+	my $tail = "&displayMode=$displayMode&showOldAnswers=$showOldAnswers";
 	return $self->navMacro($args, $tail, @links);
 }
-	
 
 sub siblings {
-	my ($self, $setName) = @_;
-#	$WeBWorK::timer0->continue('begin  siblings');
-	my $ce = $self->{ce};
-	my $db = $self->{db};
-	my $root = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
-	my $effectiveUser = $self->{r}->param("effectiveUser");
-	
-	print CGI::strong("Problem Sets"), CGI::br();
-	
-	my @sets;
-	
-	#  FIXME   The following access to the complete list of sets is very slow.
-	#  $WeBWorK::timer0->continue('collect siblings');
-	#  push @sets, $db->getMergedSet($effectiveUser, $_)
-	#  	  foreach ($db->listUserSets($effectiveUser));
-	
-	my @setNames = $db->listUserSets($effectiveUser);
-	@setNames   = sort @setNames;
-#	$WeBWorK::timer0->continue('done collecting siblings');
-	# FIXME only experience will tell us the best sorting procedure.
-	# due_date seems right for students, but alphabetically may be more
-	# useful for professors?
-	
-# 	my @sorted_sets;
-# 	
-# 	# sort by set name
-# 	#@sorted_sets = sort { $a->set_id cmp $b->set_id } @sets;
-# 	
-# 	# sort by set due date
-# 	$WeBWorK::timer0->continue('begin sorting siblings');
-# 	@sorted_sets = sort { $a->due_date <=> $b->due_date } @sets;
-# 	
-# 	# ...and put closed sets last;
-# 	my $now = time();
-# 	my @open_sets = grep { $_->due_date > $now } @sorted_sets;
-# 	my @closed_sets = grep { $_->due_date <= $now } @sorted_sets;
-# 	@sorted_sets = (@open_sets,@closed_sets);
-# 	$WeBWorK::timer0->continue('end sorting siblings');
-# 	foreach my $set (@sorted_sets) { 
-# 		if (time >= $set->open_date) {
-# 			print CGI::a({-href=>"$root/$courseName/".$set->set_id."/?"
-# 				. $self->url_authen_args}, $set->set_id), CGI::br();
-# 		} else {
-# 			print $set->set_id, CGI::br();
-# 		}
-# 	}
-# hack to put links up quickly FIXME when database is faster.
-	foreach my $setName (@setNames) {
-	
-		print '&nbsp;&nbsp;'.CGI::a({-href=>"$root/$courseName/".$setName."/?"
- 				. $self->url_authen_args}, $setName), CGI::br();
+	my ($self) = @_;
+	my $r = $self->r;
+	my $db = $r->db;
+	my $authz = $r->authz;
+	my $urlpath = $r->urlpath;
 	
 	
+	my $courseID = $urlpath->arg("courseID");
+	my $user = $r->param('user');
+	my $eUserID = $r->param("effectiveUser");
+
+# note that listUserSets does not list versioned sets
+	# DBFIXME do filtering in WHERE clause, use iterator for results :)
+	my @setIDs = sortByName(undef, $db->listUserSets($eUserID));
+
+	# do not show hidden siblings unless user is allowed to view hidden sets, and 
+        # exclude gateway tests in all cases
+	if ( $authz->hasPermissions($user, "view_hidden_sets") ) {
+		@setIDs    = grep {my $gs = $db->getGlobalSet( $_ ); 
+				   $gs->assignment_type() !~ /gateway/} @setIDs;
+
+	} else {
+		@setIDs    = grep {my $gs = $db->getGlobalSet( $_ ); 
+				            $gs->assignment_type() !~ /gateway/ && 
+				            ( defined($gs->visible()) ? $gs->visible() : 1 )
+				           }   @setIDs;
 	}
-}
 
-sub title {
-	my ($self, $setName) = @_;
+	print CGI::start_div({class=>"info-box", id=>"fisheye"});
+	print CGI::h2($r->maketext("Sets"));
+	print CGI::start_ul();
+
+		debug("Begin printing sets from listUserSets()");
+	foreach my $setID (@setIDs) {
+		my $setPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSet", $r, 
+			courseID => $courseID, setID => $setID);
+		my $pretty_set_id = $setID;
+		$pretty_set_id =~ s/_/ /g;
+		print CGI::li(
+			     CGI::a({  href=>$self->systemLink($setPage,
+			                params=>{
+								displayMode    => $self->{displayMode}, 
+								showOldAnswers => $self->{will}->{showOldAnswers},
+							},
+					    ),
+					    id=>$pretty_set_id,
+			          }, $pretty_set_id)
+	          ) ;
+	}
+	debug("End printing sets from listUserSets()");
+
+	# FIXME: when database calls are faster, this will get rid of hidden sibling links
+	#debug("Begin printing sets from getMergedSets()");	
+	#my @userSetIDs = map {[$eUserID, $_]} @setIDs;
+	#my @sets = $db->getMergedSets(@userSetIDs);
+	#foreach my $set (@sets) {
+	#	my $setPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSet",  $r, courseID => $courseID, setID => $set->set_id);
+	#	print CGI::li(CGI::a({href=>$self->systemLink($setPage)}, $set->set_id)) unless !(defined $set && ($set->published || $authz->hasPermissions($user, "view_unpublished_sets"));
+	#}
+	#debug("Begin printing sets from getMergedSets()");
+	
+	print CGI::end_ul();
+	#print CGI::end_li();
+	#print CGI::end_ul();
+	print CGI::end_div();
 	
-	return $setName;
+	return "";
 }
 
 sub info {
-	my ($self, $setName) = @_;
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my $db = $r->db;
+	my $authz = $r->authz;
+	my $urlpath = $r->urlpath;
+
+	return "" if ( $self->{invalidSet} );
 	
-	my $r = $self->{r};
-	my $ce = $self->{ce};
-	my $db = $self->{db};
+	my $courseID = $urlpath->arg("courseID");
+	my $setID = $r->urlpath->arg("setID");
+
+	my $userID = $r->param("user");
+	my $eUserID = $r->param("effectiveUser");
 	
-	return "" unless $self->{isOpen};
+	my $effectiveUser = $db->getUser($eUserID); # checked 
+	my $set  = $db->getMergedSet($eUserID, $setID); # checked
 	
-	my $effectiveUser = $db->getUser($r->param("effectiveUser")); # checked 
-	die "effective user ".$r->param("effectiveUser")." not found. One 'acts as' the effective user."  unless $effectiveUser;
-	my $set  = $db->getMergedSet($effectiveUser->user_id, $setName); # checked
-	die "set $setName for effectiveUser ".$effectiveUser->user_id." not found." unless $set;
-	my $psvn = $set->psvn();
+	die "effective user $eUserID not found. One 'acts as' the effective user." unless $effectiveUser;
+	# FIXME: this was already caught in initialize()
+	die "set $setID for effectiveUser $eUserID not found." unless $set;
 	
-	my $screenSetHeader = $set->set_header || $ce->{webworkFiles}->{screenSnippets}->{setHeader};
-	my $displayMode     = $ce->{pg}->{options}->{displayMode};
+	my $psvn = $set->psvn();
+	# hack to prevent errors from uninitialized set_headers.
+	$set->set_header("defaultHeader") unless $set->set_header =~/\S/; # (some non-white space character required)
+	my $screenSetHeader = ($set->set_header eq "defaultHeader") ?
+	      $ce->{webworkFiles}->{screenSnippets}->{setHeader} :
+	      $set->set_header;
+
+	my $displayMode     = $r->param("displayMode") || $ce->{pg}->{options}->{displayMode};
+	
+	if ($authz->hasPermissions($userID, "modify_problem_sets")) {
+		if (defined $r->param("editMode") and $r->param("editMode") eq "temporaryFile") {
+			$screenSetHeader = $r->param('sourceFilePath');
+			$screenSetHeader = $ce->{courseDirs}{templates}.'/'.$screenSetHeader unless $screenSetHeader =~ m!^/!;
+			die "sourceFilePath is unsafe!" unless path_is_subdir($screenSetHeader, $ce->{courseDirs}->{templates});
+			$self->addmessage(CGI::div({class=>'temporaryFile'}, $r->maketext("Viewing temporary file").": ",
+			            $screenSetHeader));
+			$displayMode = $r->param("displayMode") if $r->param("displayMode");
+		}
+	}
 	
 	return "" unless defined $screenSetHeader and $screenSetHeader;
 	
@@ -192,117 +259,190 @@ sub info {
 			processAnswers  => 0,
 		},
 	);
-	# Add link for editor
-	#### link to edit setHeader 
-	my $editor_link			= '';
-	if (defined($set) and $set->set_header and 
-	    $self->{permissionLevel} >= $ce->{permissionLevels}->{modify_problem_sets} ) {  
-	    #FIXME ?  can't edit the default set header this way
-		$editor_link = CGI::p(
-		                    CGI::a({-href=>$ce->{webworkURLs}->{root}.'/'.$ce->{courseName}.
-								'/instructor/pgProblemEditor/'.
-								$set->set_id.'/0'. '?'.$self->url_authen_args},
-								'Edit set header: '.$set->set_header
-		          			)
-		);
-	}	
-	# handle translation errors
+	
+	my $editorURL;
+	if (defined($set) and $authz->hasPermissions($userID, "modify_problem_sets")) {  
+		my $editorPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor", $r, 
+			courseID => $courseID, setID => $set->set_id, problemID => 0);
+		$editorURL = $self->systemLink($editorPage, params => { file_type => 'set_header'});
+	}
+	
+	print CGI::start_div({class=>"info-box", id=>"InfoPanel"});
+	
+	if ($editorURL) {
+		print CGI::h2({},$r->maketext("Set Info"), CGI::a({href=>$editorURL, target=>"WW_Editor"}, $r->maketext("~[edit~]")));
+	} else {
+		print CGI::h2($r->maketext("Set Info"));
+	}
+	
 	if ($pg->{flags}->{error_flag}) {
-		return $self->errorOutput($pg->{errors}, $pg->{body_text}.$editor_link);
+		print CGI::div({class=>"ResultsWithError"}, $self->errorOutput($pg->{errors}, $pg->{body_text}));
 	} else {
-		return $pg->{body_text}.$editor_link;
+		print $pg->{body_text};
 	}
+	
+	print CGI::end_div();
+	
+	return "";
 }
 
+sub options { shift->optionsMacro }
+
 sub body {
-	my ($self, $setName) = @_;
-	my $r = $self->{r};
-	my $courseEnvironment = $self->{ce};
-	my $db = $self->{db};
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my $db = $r->db;
+	my $urlpath = $r->urlpath;
+
+	my $courseID = $urlpath->arg("courseID");
+	my $setName = $urlpath->arg("setID");
 	my $effectiveUser = $r->param('effectiveUser');
+
+	my $set = $db->getMergedSet($effectiveUser, $setName);  # checked
+	# FIXME: this was already caught in initialize()
+	# die "set $setName for user $effectiveUser not found" unless $set;
+
+	if ( $self->{invalidSet} ) { 
+		return CGI::div({class=>"ResultsWithError"},
+				CGI::p($r->maketext("The selected problem set ([_1]) is not a valid set for [_2]",$setName,$effectiveUser).":"),
+				CGI::p($self->{invalidSet}));
+	}
 	
-	return CGI::p(CGI::font({-color=>"red"}, "This problem set is not available because it is not yet open."))
-		unless ($self->{isOpen});
-	
-	my $hardcopyURL =
-		$courseEnvironment->{webworkURLs}->{root} . "/"
-		. $courseEnvironment->{courseName} . "/"
-		. "hardcopy/$setName/?" . $self->url_authen_args;
-	print CGI::p(CGI::a({-href=>$hardcopyURL}, "Download a hardcopy"),
-		"of this problem set.");
-	
-	print CGI::start_table();
-	print CGI::Tr(
-		CGI::th("Name"),
-		CGI::th("Attempts"),
-		CGI::th("Remaining"),
-		CGI::th("Status"),
-	);
+	#my $hardcopyURL =
+	#	$ce->{webworkURLs}->{root} . "/"
+	#	. $ce->{courseName} . "/"
+	#	. "hardcopy/$setName/?" . $self->url_authen_args;
 	
-	my $set = $db->getMergedSet($effectiveUser, $setName);  # checked
-	die "set $setName for user $effectiveUser not found" unless $set;
-	my @problemNumbers = $db->listUserProblems($effectiveUser, $setName);
-	foreach my $problemNumber (sort { $a <=> $b } @problemNumbers) {
-		my $problem = $db->getMergedProblem($effectiveUser, $setName, $problemNumber); # checked
-		die "problem $problemNumber in set $setName for user $effectiveUser not found." unless $problem;
-		print $self->problemListRow($set, $problem);
+	my $hardcopyPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Hardcopy", $r, 
+		courseID => $courseID, setID => $setName);
+	my $hardcopyURL = $self->systemLink($hardcopyPage);
+	
+	print CGI::div({-class=>"problem_set_options"}, CGI::a({href=>$hardcopyURL}, $r->maketext("Download PDF or TeX Hardcopy for Current Set")));
+
+
+	my $enable_reduced_scoring = $set->enable_reduced_scoring;
+	my $reducedScoringPeriod = $ce->{pg}->{ansEvalDefaults}->{reducedScoringPeriod};
+	if ($reducedScoringPeriod > 0 and $enable_reduced_scoring) {
+		my $dueDate = $self->formatDateTime($set->due_date());
+		my $reducedScoringPeriodSec = $reducedScoringPeriod*60;   # $reducedScoringPeriod is in minutes
+		my $reducedScoringValue = $ce->{pg}->{ansEvalDefaults}->{reducedScoringValue};
+		my $reducedScoringPerCent = int(100*$reducedScoringValue+.5);
+		my $beginReducedScoringPeriod =  $self->formatDateTime($set->due_date() - $reducedScoringPeriodSec);
+		if (time < $set->due_date()) {
+			print CGI::div({class=>"ResultsAlert"},$r->maketext("_REDUCED_CREDIT_MESSAGE_1",$beginReducedScoringPeriod,$dueDate,$reducedScoringPerCent));
+		} else {
+			print CGI::div({class=>"ResultsAlert"},$r->maketext("_REDUCED_CREDIT_MESSAGE_2",$beginReducedScoringPeriod,$dueDate,$reducedScoringPerCent));
+		}
 	}
 	
-	print CGI::end_table();
-	
-	# feedback form
-	my $ce = $self->{ce};
-	my $root = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
-	my $feedbackURL = "$root/$courseName/feedback/";
-# 	print
-# 		CGI::startform("POST", $feedbackURL),
-# 		$self->hidden_authen_fields,
-# 		CGI::hidden("module", __PACKAGE__),
-# 		CGI::hidden("set",    $set->set_id),
-# 		CGI::p({-align=>"right"},
-# 			CGI::submit(-name=>"feedbackForm", -label=>"Send Feedback")
-# 		),
-# 		CGI::endform();
-	#print feedback form
-	print
-		CGI::start_form(-method=>"POST", -action=>$feedbackURL),"\n",
-		$self->hidden_authen_fields,"\n",
-		CGI::hidden("module",             __PACKAGE__),"\n",
-		CGI::hidden("set",                $self->{set}->set_id),"\n",
-		CGI::hidden("problem",            ""),"\n",
-		CGI::hidden("displayMode",        $self->{displayMode}),"\n",
-		CGI::hidden("showOldAnswers",     ''),"\n",
-		CGI::hidden("showCorrectAnswers", ''),"\n",
-		CGI::hidden("showHints",          ''),"\n",
-		CGI::hidden("showSolutions",      ''),"\n",
-		CGI::p({-align=>"left"},
-			CGI::submit(-name=>"feedbackForm", -label=>"Email instructor")
-		),
-		CGI::endform(),"\n";
+	# DBFIXME use iterator
+	my @problemNumbers = WeBWorK::remove_duplicates($db->listUserProblems($effectiveUser, $setName));
+	
+	if (@problemNumbers) {
+		# UPDATE - ghe3
+		# This table now contains a summary, a caption, and scope variables for the columns.
+		print CGI::start_table({-summary=>"This table shows the problems that are in this problem set.  The columns from left to right are: name of the problem, current number of attempts made, number of attempts remaining, the point worth, and the completion status.  Click on the link on the name of the problem to take you to the problem page.", -class=>"problem_set_table"});
+		print CGI::caption($r->maketext("Problems"));
+		print CGI::Tr({},
+
+			CGI::th($r->maketext("Name")),
+			CGI::th($r->maketext("Attempts")),
+			CGI::th($r->maketext("Remaining")),
+			CGI::th($r->maketext("Worth")),
+			CGI::th($r->maketext("Status")),
+
+		);
+		
+		foreach my $problemNumber (sort { $a <=> $b } @problemNumbers) {
+			my $problem = $db->getMergedProblem($effectiveUser, $setName, $problemNumber); # checked
+			die "problem $problemNumber in set $setName for user $effectiveUser not found." unless $problem;
+			print $self->problemListRow($set, $problem);
+		}
+		
+		print CGI::end_table();
+	} else {
+		print CGI::p($r->maketext("This homework set contains no problems."));
+	}
+	
+	## feedback form url
+	#my $feedbackPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Feedback", $r, 
+	#	courseID => $courseID);
+	#my $feedbackURL = $self->systemLink($feedbackPage, authen => 0); # no authen info for form action
+	#
+	##print feedback form
+	#print
+	#	CGI::start_form(-method=>"POST", -action=>$feedbackURL),"\n",
+	#	$self->hidden_authen_fields,"\n",
+	#	CGI::hidden("module",             __PACKAGE__),"\n",
+	#	CGI::hidden("set",                $self->{set}->set_id),"\n",
+	#	CGI::hidden("problem",            ''),"\n",
+	#	CGI::hidden("displayMode",        $self->{displayMode}),"\n",
+	#	CGI::hidden("showOldAnswers",     ''),"\n",
+	#	CGI::hidden("showCorrectAnswers", ''),"\n",
+	#	CGI::hidden("showHints",          ''),"\n",
+	#	CGI::hidden("showSolutions",      ''),"\n",
+	#	CGI::p({-align=>"left"},
+	#		CGI::submit(-name=>"feedbackForm", -label=>"Email instructor")
+	#	),
+	#	CGI::endform(),"\n";
+	
+	print CGI::start_div({-class=>"problem_set_options"});
+	print $self->feedbackMacro(
+		module => __PACKAGE__,
+		set => $self->{set}->set_id,
+		problem => "",
+		displayMode => $self->{displayMode},
+		showOldAnswers => "",
+		showCorrectAnswers => "",
+		showHints => "",
+		showSolutions => "",
+	);
+	print CGI::end_div();
+	
 	return "";
 }
 
 sub problemListRow($$$) {
-	my $self = shift;
-	my $set = shift;
-	my $problem = shift;
+	my ($self, $set, $problem) = @_;
+	my $r = $self->r;
+	my $urlpath = $r->urlpath;
+	
+	my $courseID = $urlpath->arg("courseID");
+	my $setID = $set->set_id;
+	my $problemID = $problem->problem_id;
+	
+	my $interactiveURL = $self->systemLink(
+		$urlpath->newFromModule("WeBWorK::ContentGenerator::Problem", $r, 
+			courseID => $courseID, setID => $setID, problemID => $problemID
+		),
+		params=>{  displayMode => $self->{displayMode}, 
+			       showOldAnswers => $self->{will}->{showOldAnswers}
+		}
+	);
 	
-	my $name = $problem->problem_id;
-	my $interactiveURL = "$name/?" . $self->url_authen_args;
-	my $interactive = CGI::a({-href=>$interactiveURL}, "Problem $name");
+	my $interactive = CGI::a({-href=>$interactiveURL}, $r->maketext("Problem [_1]",$problemID));
 	my $attempts = $problem->num_correct + $problem->num_incorrect;
-	my $remaining = $problem->max_attempts < 0
-		? "unlimited"
+	my $remaining = (($problem->max_attempts||-1) < 0) #a blank yields 'infinite' because it evaluates as false with out giving warnings about comparing non-numbers
+		? $r->maketext("unlimited")
 		: $problem->max_attempts - $attempts;
-	my $status = sprintf("%.0f%%", $problem->status * 100); # round to whole number
-	
-	return CGI::Tr(CGI::td({-nowrap=>1}, [
-		$interactive,
-		$attempts,
-		$remaining,
-		$status,
-	]));
+	my $rawStatus = $problem->status || 0;
+	my $status;
+	$status = eval{ sprintf("%.0f%%", $rawStatus * 100)}; # round to whole number
+	$status = 'unknown(FIXME)' if $@; # use a blank if problem status was not defined or not numeric.
+	                                  # FIXME  -- this may not cover all cases.
+	
+#	my $msg = ($problem->value) ? "" : "(This problem will not count towards your grade.)";
+	
+	return CGI::Tr({},
+		CGI::td({-nowrap=>1, -align=>"left"},$interactive),
+		CGI::td({-nowrap=>1, -align=>"center"},
+	 		[
+				$attempts,
+				$remaining,
+				$problem->value,
+				$status,
+			]));
 }
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/ProblemSets.pm b/lib/WeBWorK/ContentGenerator/ProblemSets.pm
index 237c7d2114..8cd23b473e 100644
--- a/lib/WeBWorK/ContentGenerator/ProblemSets.pm
+++ b/lib/WeBWorK/ContentGenerator/ProblemSets.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader: webwork-modperl/lib/WeBWorK/ContentGenerator/ProblemSets.pm,v 1.34 2003/12/09 01:12:31 sh002i Exp $
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm,v 1.94 2010/01/31 02:31:04 apizer 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
@@ -15,6 +15,7 @@
 ################################################################################
 
 package WeBWorK::ContentGenerator::ProblemSets;
+use base qw(WeBWorK);
 use base qw(WeBWorK::ContentGenerator);
 
 =head1 NAME
@@ -25,171 +26,553 @@ WeBWorK::ContentGenerator::ProblemSets - Display a list of built problem sets.
 
 use strict;
 use warnings;
-use CGI qw();
-use WeBWorK::Utils qw(readFile formatDateTime sortByName);
-
-sub path {
-	my ($self, $args) = @_;
-	
-	my $ce = $self->{ce};
-	my $root = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
-	return $self->pathMacro($args,
-		"Home" => "$root",
-		$courseName => "",
-	);
-}
+#use CGI qw(-nosticky );
+use WeBWorK::CGI;
+use WeBWorK::Debug;
+use WeBWorK::Utils qw(readFile sortByName path_is_subdir);
+use WeBWorK::Localize;
+# what do we consider a "recent" problem set?
+use constant RECENT => 2*7*24*60*60 ; # Two-Weeks in seconds
+
+sub info {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my $db = $r->db;
+	my $urlpath = $r->urlpath;
+	my $authz = $r->authz;
+	
+	my $courseID = $urlpath->arg("courseID");
+	my $user = $r->param("user");
+	
+	my $course_info = $ce->{courseFiles}->{course_info};
+	
+	if (defined $course_info and $course_info) {
+		my $course_info_path = $ce->{courseDirs}->{templates} . "/$course_info";
+		
+		print CGI::start_div({-class=>"info-wrapper"});
+		print CGI::start_div({class=>"info-box", id=>"InfoPanel"});
+		
+		# deal with instructor crap
+		my $editorURL;
+		if ($authz->hasPermissions($user, "access_instructor_tools")) {
+			if (defined $r->param("editMode") and $r->param("editMode") eq "temporaryFile") {
+				$course_info_path = $r->param("sourceFilePath");
+				$course_info_path = $ce->{courseDirs}{templates}.'/'.$course_info_path unless $course_info_path =~ m!^/!;
+				die "sourceFilePath is unsafe!" unless path_is_subdir($course_info_path, $ce->{courseDirs}->{templates});
+				$self->addmessage(CGI::div({class=>'temporaryFile'}, $r->maketext("Viewing temporary file: "), $course_info_path));
+			}
+			
+			my $editorPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor",  $r, courseID => $courseID);
+			$editorURL = $self->systemLink($editorPage, params => { file_type => "course_info" });
+		}
+		
+		if ($editorURL) {
+			print CGI::h2($r->maketext("Course Info"), CGI::a({href=>$editorURL, target=>"WW_Editor"}, $r->maketext("~[edit~]")));
+		} else {
+			print CGI::h2($r->maketext("Course Info"));
+		}
+		
+		if (-f $course_info_path) { #check that it's a plain  file
+			my $text = eval { readFile($course_info_path) };
+			if ($@) {
+				print CGI::div({class=>"ResultsWithError"},
+					CGI::p("$@"),
+				);
+			} else {
+				print $text;
+			}
+		}
 
-sub title {
+		print CGI::end_div();
+		print CGI::end_div();
+		
+		return "";
+	}
+}
+sub help {   # non-standard help, since the file path includes the course name
 	my $self = shift;
-	return $self->{ce}->{courseName};
+	my $args = shift;
+	my $name = $args->{name};
+	$name = lc('course home') unless defined($name);
+	$name =~ s/\s/_/g;
+	$self->helpMacro($name);
 }
+sub initialize {
+
+
+
+# get result and send to message
+	my ($self) = @_;
+	my $r = $self->r;
+	my $authz = $r->authz;
+	my $urlpath = $r->urlpath;
+	
+	my $user               = $r->param("user");
+	my $effectiveUser      = $r->param("effectiveUser");
+	if ($authz->hasPermissions($user, "access_instructor_tools")) {
+		# get result and send to message
+		my $status_message = $r->param("status_message");
+		$self->addmessage(CGI::p("$status_message")) if $status_message;
+	
 
-sub body {
-	my $self = shift;
-	my $r = $self->{r};
-	my $courseEnvironment = $self->{ce};
-	my $db = $self->{db};
-	my $user = $r->param("user");
-	my $effectiveUser = $r->param("effectiveUser");
-	my $sort = $r->param("sort") || "status";
-	my $permissionLevel = $db->getPermissionLevel($user)->permission(); # checked???
-	$permissionLevel =0 unless defined $permissionLevel;
-	
-	if (defined $courseEnvironment->{courseFiles}->{motd}
-		and $courseEnvironment->{courseFiles}->{motd}) {
-		my $motd = eval { readFile($courseEnvironment->{courseFiles}->{motd}) };
-		$@ or print $motd;
 	}
+}
+sub body {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my $db = $r->db;
+	my $authz = $r->authz;
+	my $urlpath = $r->urlpath;
 	
-	$sort = "status" unless $sort eq "status" or $sort eq "name";
-	my $baseURL = $r->uri . "?" . $self->url_authen_args();
-	my $nameHeader = ($sort eq "name") ? CGI::u("Name") : CGI::a({-href=>"$baseURL&sort=name"}, "Name");
-	my $statusHeader = ($sort eq "status") ? CGI::u("Status") : CGI::a({-href=>"$baseURL&sort=status"}, "Status");
-	
-	print CGI::startform(-method=>"POST", -action=>$r->uri."hardcopy/");
-	print $self->hidden_authen_fields;
-	print CGI::start_table();
-	print CGI::Tr(
-		CGI::th("Sel."),
-		CGI::th($nameHeader),
-		CGI::th($statusHeader),
-		#CGI::th("Hardcopy"),
-	);
+	my $user            = $r->param("user");
+	my $effectiveUser   = $r->param("effectiveUser");
+	my $sort            = $r->param("sort") || "status";
 	
-	my @setIDs = $db->listUserSets($effectiveUser);
+	my $courseName      = $urlpath->arg("courseID");
 	
+	my $hardcopyPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Hardcopy",  $r, courseID => $courseName);
+	my $actionURL = $self->systemLink($hardcopyPage, authen => 0); # no authen info for form action
+	
+# we have to get sets and versioned sets separately
+	# DBFIXME don't get ID lists, use WHERE clauses and iterators
+	my @setIDs = $db->listUserSets($effectiveUser);
 	my @userSetIDs = map {[$effectiveUser, $_]} @setIDs;
-	$WeBWorK::timer->continue("Begin collecting merged sets") if defined($WeBWorK::timer);
+
+	debug("Begin collecting merged sets");
 	my @sets = $db->getMergedSets( @userSetIDs );
-	$WeBWorK::timer->continue("Begin sorting merged sets") if defined($WeBWorK::timer);
+
+	debug("Begin fixing merged sets");
 	
-	@sets = sortByName("set_id", @sets) if $sort eq "name";
-	@sets = sort byduedate @sets if $sort eq "status";
-	$WeBWorK::timer->continue("End preparing merged sets") if defined($WeBWorK::timer);
+	# Database fix (in case of undefined visible values)
+	# this may take some extra time the first time but should NEVER need to be run twice
+	# this is only necessary because some people keep holding to ww1.9 which did not have a visible field
+	# DBFIXME this should be in the database layer (along with other "fixes" of its ilk)
+	foreach my $set (@sets) {
+		# make sure visible is set to 0 or 1
+		if ( $set and $set->visible ne "0" and $set->visible ne "1") {
+			my $globalSet = $db->getGlobalSet($set->set_id);
+			$globalSet->visible("1");	# defaults to visible
+			$db->putGlobalSet($globalSet);
+			$set = $db->getMergedSet($effectiveUser, $set->set_id);
+		} else {
+			die "set $set not defined" unless $set;
+		}
+	}
+
+	foreach my $set (@sets) {
+		# make sure enable_reduced_scoring is set to 0 or 1
+		if ( $set and $set->enable_reduced_scoring ne "0" and $set->enable_reduced_scoring ne "1") {
+			my $globalSet = $db->getGlobalSet($set->set_id);
+			$globalSet->enable_reduced_scoring("0");	# defaults to disabled
+			$db->putGlobalSet($globalSet);
+			$set = $db->getMergedSet($effectiveUser, $set->set_id);
+		} else {
+			die "set $set not defined" unless $set;
+		}
+	}
+
+# gateways/versioned sets require dealing with output data slightly 
+# differently, so check for those here	
+	debug("Begin set-type check");
+	my $existVersions = 0;
+	my @gwSets = ();
+	my @nonGWsets = ();
+	my %gwSetNames = ();  # this is necessary because we get a setname
+	                      #    for all versions of g/w tests
+	foreach ( @sets ) {
+	    if ( defined( $_->assignment_type() ) && 
+		 $_->assignment_type() =~ /gateway/ ) {
+		$existVersions = 1; 
+
+		push( @gwSets, $_ ) if ( ! defined($gwSetNames{$_->set_id}) );
+		$gwSetNames{$_->set_id} = 1;
+	    } else {
+		push( @nonGWsets, $_ );
+	    }
+	}
+# now get all user set versions that we need
+	my @vSets = ();
+# we need the template sets below, so also make an indexed list of those
+	my %gwSetsBySetID = ();
+	foreach my $set ( @gwSets ) {
+		$gwSetsBySetID{$set->set_id} = $set;
+
+		my @setVer = $db->listSetVersions( $effectiveUser, $set->set_id );
+		my @setVerIDs = map { [ $effectiveUser, $set->set_id, $_ ] } @setVer;
+		push( @vSets, $db->getMergedSetVersions( @setVerIDs ) );
+	}
+
+# set sort method
+	$sort = "status" unless $sort eq "status" or $sort eq "name";
+
+# now set the headers for the table
+	my $nameHeader = $sort eq "name"
+		? CGI::u($r->maketext("Name"))
+		: CGI::a({href=>$self->systemLink($urlpath, params=>{sort=>"name"})}, $r->maketext("Name"));
+	my $statusHeader = $sort eq "status"
+		? CGI::u($r->maketext("Status"))
+		: CGI::a({href=>$self->systemLink($urlpath, params=>{sort=>"status"})}, $r->maketext("Status"));
+# print the start of the form
+
+    print CGI::start_form(-method=>"POST",-action=>$actionURL),
+          $self->hidden_authen_fields;
+    
+# and send the start of the table
+# UPDATE - ghe3
+# This table now contains a summary and a caption, scope attributes for the column headers, and no longer prints a column for 'Sel.' (due to it having been merged with the second column for accessibility purposes).
+	print CGI::start_table({-summary=>"This table lists out the available homework sets for this class, along with its current status. Click on the link on the name of the homework sets to take you to the problems in that homework set.  Clicking on the links in the table headings will sort the table by the field it corresponds to.  You can also select sets for download to PDF or TeX format using the radio buttons or checkboxes next to the problem set names, and then clicking on the 'Download PDF or TeX Hardcopy for Selected Sets' button at the end of the table.  There is also a clear button and an Email instructor button at the end of the table.", -class=>"problem_set_table"});
+	print CGI::caption($r->maketext("Homework Sets"));
+	if ( ! $existVersions ) {
+	    print CGI::Tr({},
+		    CGI::th({-scope=>"col"},$nameHeader),
+		    CGI::th({-scope=>"col"},$statusHeader),
+	        );
+	} else {
+	    print CGI::Tr(
+		    CGI::th({-scope=>"col"},$nameHeader),
+		    CGI::th({-scope=>"col"},$r->maketext("Test Score")),
+		    CGI::th({-scope=>"col"},$r->maketext("Test Date")),
+		    CGI::th({-scope=>"col"},$statusHeader),
+	        );
+	}
+
+	debug("Begin sorting merged sets");
+
+# before building final set lists, exclude proctored gateway sets 
+#    for users without permission to view them
+	my $viewPr = $authz->hasPermissions( $user, "view_proctored_tests" );
+	@gwSets = grep {$_->assignment_type !~ /proctored/ || $viewPr} @gwSets;
 	
+	if ( $sort eq 'name' ) {
+	    @nonGWsets = sortByName("set_id", @nonGWsets);
+	    @gwSets = sortByName("set_id", @gwSets);
+	} elsif ( $sort eq 'status' ) {
+	    @nonGWsets = sort byUrgency  @nonGWsets;
+	    @gwSets = sort byUrgency @gwSets;
+	}
+# we sort set versions by name
+	@vSets = sortByName(["set_id", "version_id"], @vSets);
+
+# put together a complete list of sorted sets to consider
+	@sets = (@nonGWsets, @gwSets );
+	
+	debug("End preparing merged sets");
+
+# we do regular sets and the gateway set templates separately
+# from the actual set-versions, to avoid managing a tricky test
+# for a version number that may not exist
 	foreach my $set (@sets) {
 		die "set $set not defined" unless $set;
-		print $self->setListRow($set, ($permissionLevel > 0),
-			($permissionLevel > 0));
+		
+		if ($set->visible || $authz->hasPermissions($user, "view_hidden_sets")) {
+			print $self->setListRow($set, $authz->hasPermissions($user, "view_multiple_sets"), $authz->hasPermissions($user, "view_unopened_sets"),$existVersions,$db);
+		}
+	}
+	foreach my $set (@vSets) {
+		die "set $set not defined" unless $set;
+		
+		if ($set->visible || $authz->hasPermissions($user, "view_hidden_sets")) {
+			print $self->setListRow($set, $authz->hasPermissions($user, "view_multiple_sets"), $authz->hasPermissions($user, "view_unopened_sets"),$existVersions,$db,1, $gwSetsBySetID{$set->{set_id}}, "ethet" );  # 1 = gateway, versioned set
+		}
 	}
 	
 	print CGI::end_table();
-	my $pl = ($permissionLevel > 0 ? "s" : "");
-	print CGI::p(CGI::submit("hardcopy", "Download Hardcopy for Selected Set$pl"));
+	my $pl = ($authz->hasPermissions($user, "view_multiple_sets") ? "s" : "");
+# 	print CGI::p(CGI::submit(-name=>"hardcopy", -label=>$r->maketext("Download Hardcopy for Selected [plural,_1,Set,Sets]",$pl)));
+
+	# UPDATE - ghe3
+	# Added reset button to form.
+	print CGI::start_div({-class=>"problem_set_options"});
+	print CGI::p(WeBWorK::CGI_labeled_input(-type=>"reset", -input_attr=>{-value=>$r->maketext("Clear")}));
+	print CGI::p(WeBWorK::CGI_labeled_input(-type=>"submit", -input_attr=>{-name=>"hardcopy", -value=>$r->maketext("Download PDF or TeX Hardcopy for Selected Sets")}));
 	print CGI::endform();
 	
-	# feedback form
-	my $ce = $self->{ce};
-	my $root = $ce->{webworkURLs}->{root};
-	my $courseName = $ce->{courseName};
-	my $feedbackURL = "$root/$courseName/feedback/";
-	
-	
-	#print feedback form
-	print
-		CGI::start_form(-method=>"POST", -action=>$feedbackURL),"\n",
-		$self->hidden_authen_fields,"\n",
-		CGI::hidden("module",             __PACKAGE__),"\n",
-		CGI::hidden("set",                ''),"\n",
-		CGI::hidden("problem",            ''),"\n",
-		CGI::hidden("displayMode",        $self->{displayMode}),"\n",
-		CGI::hidden("showOldAnswers",     ''),"\n",
-		CGI::hidden("showCorrectAnswers", ''),"\n",
-		CGI::hidden("showHints",          ''),"\n",
-		CGI::hidden("showSolutions",      ''),"\n",
-		CGI::p({-align=>"left"},
-			CGI::submit(-name=>"feedbackForm", -label=>"Email instructor")
-		),
-		CGI::endform(),"\n";
+	## feedback form url
+	#my $feedbackPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Feedback",  $r, courseID => $courseName);
+	#my $feedbackURL = $self->systemLink($feedbackPage, authen => 0); # no authen info for form action
+	#
+	##print feedback form
+	#print
+	#	CGI::start_form(-method=>"POST", -action=>$feedbackURL),"\n",
+	#	$self->hidden_authen_fields,"\n",
+	#	CGI::hidden("module",             __PACKAGE__),"\n",
+	#	CGI::hidden("set",                ''),"\n",
+	#	CGI::hidden("problem",            ''),"\n",
+	#	CGI::hidden("displayMode",        ''),"\n",
+	#	CGI::hidden("showOldAnswers",     ''),"\n",
+	#	CGI::hidden("showCorrectAnswers", ''),"\n",
+	#	CGI::hidden("showHints",          ''),"\n",
+	#	CGI::hidden("showSolutions",      ''),"\n",
+	#	CGI::p({-align=>"left"},
+	#		CGI::submit(-name=>"feedbackForm", -label=>"Email instructor")
+	#	),
+	#	CGI::endform(),"\n";
+	
+	print $self->feedbackMacro(
+		module => __PACKAGE__,
+		set => "",
+		problem => "",
+		displayMode => "",
+		showOldAnswers => "",
+		showCorrectAnswers => "",
+		showHints => "",
+		showSolutions => "",
+	);
+	print CGI::end_div();
 	
 	return "";
 }
 
-sub setListRow($$$) {
-	my ($self, $set, $multiSet, $preOpenSets) = @_;
+# UPDATE - ghe3
+# this subroutine now combines the $control and $interactive elements, by using the $interactive element as the $control element's label.
+
+sub setListRow {
+	my ($self, $set, $multiSet, $preOpenSets, $existVersions, $db,
+	    $gwtype, $tmplSet) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my $authz = $r->authz;
+	my $user = $r->param("user");
+	my $urlpath = $r->urlpath;
+	$gwtype = 0 if ( ! defined( $gwtype ) );
+	$tmplSet = $set if ( ! defined( $tmplSet ) );
 	
 	my $name = $set->set_id;
+	my $urlname = ( $gwtype == 1 ) ? "$name,v" . $set->version_id : $name;
+
+	my $courseName      = $urlpath->arg("courseID");
 	
-	my $interactiveURL = "$name/?" . $self->url_authen_args;
-	#my $hardcopyURL = "hardcopy/$name/?" . $self->url_authen_args;
-	
-	my $openDate = formatDateTime($set->open_date);
-	my $dueDate = formatDateTime($set->due_date);
-	my $answerDate = formatDateTime($set->answer_date);
-	
-	#my $checkbox = CGI::checkbox(-name=>"hcSet", -value=>$set->set_id, -label=>"");
-	
-	my $control = "";
-	if ($multiSet) {
-		$control = CGI::checkbox(
-			-name=>"hcSet",
-			-value=>$name,
-			-label=>"",
-		);
+	my $problemSetPage;
+
+	if ( ! defined( $set->assignment_type() ) || 
+	     $set->assignment_type() !~ /gateway/ ) {
+	    $problemSetPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSet", $r, 
+				      courseID => $courseName, setID => $urlname);
+	} elsif( $set->assignment_type() !~ /proctored/ ) {
+
+	    $problemSetPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::GatewayQuiz", $r, 
+				      courseID => $courseName, setID => $urlname);
 	} else {
-		$control = CGI::radio_group(
-			-name=>"hcSet",
-			-values=>[$name],
-			-default=>"-",
-			-labels=>{$name => ""},
-		);
+
+	    $problemSetPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::GatewayQuiz", $r, 
+				      courseID => $courseName, setID => $urlname);
 	}
+
+	my $interactiveURL = $self->systemLink($problemSetPage,
+	                                       params=>{  displayMode => $self->{displayMode}, 
+													  showOldAnswers => $self->{will}->{showOldAnswers}
+										   }
+	);
+
+  # check to see if this is a template gateway assignment
+	$gwtype = 2 if ( defined( $set->assignment_type() ) && 
+			 $set->assignment_type() =~ /gateway/ && ! $gwtype );
+  # and get problemRecords if we're dealing with a versioned set, so that
+  #    we can test status and scores
+  # FIXME: should we really have to get the merged 
+  # problem_versions here?  it looks that way, because
+  # otherwise we don't inherit things like the problem
+  # value properly.
+	my @problemRecords = 
+		$db->getAllProblemVersions($set->user_id(), $set->set_id(),
+					   $set->version_id()) 
+		if ( $gwtype == 1 );
+
+  # the conditional here should be redundant.  ah well.
+	$interactiveURL =~ s|/quiz_mode/|/proctored_quiz_mode/| if 
+	    ( defined( $set->assignment_type() ) && 
+	      $set->assignment_type() eq 'proctored_gateway' );
 	
-	my $interactive = CGI::a({-href=>$interactiveURL}, "set $name");
+	$name =~ s/_/&nbsp;/g;
+# this is the link to the homework assignment
+	my $interactive = CGI::a({-href=>$interactiveURL}, "$name");
 	
-	my $status;
-	if (time < $set->open_date) {
-		$status = "opens at $openDate";
+	my $control = "";
+	
+	my $setIsOpen = 0;
+	my $status = '';
+	if ( $gwtype ) {
+		if ( $gwtype == 1 ) {
+		  unless (ref($problemRecords[0]) ) {warn "Error: problem not defined in set $name"; return()}
+			if ( $problemRecords[0]->num_correct() + 
+			     $problemRecords[0]->num_incorrect() >= 
+			     ( ( !($set->attempts_per_version()) ) ? 0 : $set->attempts_per_version() ) ) {
+				$status = $r->maketext("completed.");
+			} elsif ( time() > $set->due_date() + 
+				  $self->r->ce->{gatewayGracePeriod} ) {
+				$status = $r->maketext("over time: closed.");
+			} else {
+				$status = $r->maketext("open: complete by [_1]",  
+					$self->formatDateTime($set->due_date()));
+			}
+			# we let people go back to old tests
+			$setIsOpen = 1;
+
+			# reset the link to give the test number
+			my $vnum = $set->version_id;
+			$interactive = CGI::a({-href=>$interactiveURL},
+					      $r->maketext("[_1] (test [_2])", $name, $vnum));
+		} else {
+			my $t = time();
+			if ( $t < $set->open_date() ) {
+				$status = $r->maketext("will open on [_1]", $self->formatDateTime($set->open_date));
+				if ( $preOpenSets ) {
+					# reset the link
+					$interactive = CGI::a({-href=>$interactiveURL},
+							      $r->maketext("Take [_1] test", $name));
+				} else {
+					$control = "";
+					$interactive = $r->maketext("[_1] test", $name);
+				}
+			} elsif ( $t < $set->due_date() ) {
+				$status = $r->maketext("now open, due ") . $self->formatDateTime($set->due_date);
+				$setIsOpen = 1;
+				$interactive = CGI::a({-href=>$interactiveURL},
+						      $r->maketext("Take [_1] test", $name));
+			} else {
+				$status = $r->maketext("Closed");
+
+				if ( $authz->hasPermissions( $user, "record_answers_after_due_date" ) ) {
+					$interactive = CGI::a({-href=>$interactiveURL},
+							      $r->maketext("Take [_1] test", $name));
+				} else {
+					$interactive = $r->maketext("[_1] test", $name);
+				}
+			}
+		}
+
+# old conditional
+	} elsif (time < $set->open_date) {
+		$status = $r->maketext("will open on [_1]", $self->formatDateTime($set->open_date));
 		$control = "" unless $preOpenSets;
 		$interactive = $name unless $preOpenSets;
 	} elsif (time < $set->due_date) {
-		$status = "open, due $dueDate";
+			$status = $r->maketext("now open, due ") . $self->formatDateTime($set->due_date);
+			my $enable_reduced_scoring = $set->enable_reduced_scoring;
+			my $reducedScoringPeriod = $ce->{pg}->{ansEvalDefaults}->{reducedScoringPeriod};
+			if ($reducedScoringPeriod > 0 and $enable_reduced_scoring ) {
+				my $reducedScoringPeriodSec = $reducedScoringPeriod*60;   # $reducedScoringPeriod is in minutes
+				my $beginReducedScoringPeriod =  $self->formatDateTime($set->due_date() - $reducedScoringPeriodSec);
+#				$status .= '. <FONT COLOR="#cc6600">Reduced Credit starts ' . $beginReducedScoringPeriod . '</FONT>';
+				$status .= CGI::div({-class=>"ResultsAlert"}, $r->maketext("Reduced Credit Starts: [_1]", $beginReducedScoringPeriod));
+
+			}
+		$setIsOpen = 1;
 	} elsif (time < $set->answer_date) {
-		$status = "closed, answers at $answerDate";
+		$status = $r->maketext("closed, answers on [_1]", $self->formatDateTime($set->answer_date));
+	} elsif ($set->answer_date <= time and time < $set->answer_date +RECENT ) {
+		$status = $r->maketext("closed, answers recently available");
 	} else {
-		$status = "closed, answers available";
+		$status = $r->maketext("closed, answers available");
 	}
 	
-	return CGI::Tr(CGI::td([
-		$control,
-		$interactive,
-		$status,
-	]));
-}
-sub info {
-	my $self = shift;
-	my $r = $self->{r};
-	my $courseEnvironment = $self->{ce};
+	if ($multiSet) {
+		if ( $gwtype < 2 ) {
+			$control = WeBWorK::CGI_labeled_input(
+				-type=>"checkbox",
+				-id=>$name . ($gwtype ? ",v" . $set->version_id : ''),
+				-label_text=>$interactive,
+				-input_attr=>{
+					-name=>"selected_sets",
+					-value=>$name . ($gwtype ? ",v" . $set->version_id : '')
+					}
+			);
+		} else {
+			$control = $interactive;
+		}
+	} else {
+		if ( $gwtype < 2 ) {
+			my $n = $name  . ($gwtype ? ",v" . $set->version_id : '');
+			$control = WeBWorK::CGI_labeled_input(
+				-type=>"radio",
+				-id=>$n,
+				-label_text=>$interactive,
+				-input_attr=>{
+					-name=>"selected_sets",
+					-value=>$n
+					}
+			);
+		} else {
+			$control = $interactive;
+		}
+	}
+
+	my $visiblityStateClass = ($set->visible) ? "visible" : "hidden";
+
+	$status = CGI::font({class=>$visiblityStateClass}, $status) if $preOpenSets;
+	
+# check to see if we need to return a score and a date column
+	if ( ! $existVersions ) {
+	    return CGI::Tr(CGI::td([
+			     $control,
+		             $status,
+	    ]));
+	} else {
+		my ( $startTime, $score );
+
+		if ( defined( $set->assignment_type() ) && 
+		     $set->assignment_type() =~ /gateway/ && $gwtype == 1 ) {
+			$startTime = localtime($set->version_creation_time() || 0); #fixes error message for undefined creation_time
 
-	if (defined $courseEnvironment->{courseFiles}->{course_info}
-		and $courseEnvironment->{courseFiles}->{course_info}) {
-		my $course_info = eval { readFile($courseEnvironment->{courseFiles}->{course_info}) };
-		$@ or print $course_info;
+			if ( $authz->hasPermissions($user, "view_hidden_work") || 
+			     $set->hide_score_by_problem eq 'Y' ||
+			     $set->hide_score() eq 'N' || 
+			     ( $set->hide_score eq 'BeforeAnswerDate' && time > $tmplSet->answer_date() ) ) {
+				# find score
+
+			# DBFIXME we can do this math in the database, i think
+				my $possible = 0;
+				$score = 0;
+				foreach my $pRec ( @problemRecords ) {
+					my $pval = $pRec->value() ? $pRec->value() : 1;
+			    		if ( defined( $pRec ) && 
+					     $score ne 'undef' ) {
+						$score += $pRec->status()*$pval || 0;
+					} else {
+						$score = 'undef';
+					}
+					$possible += $pval;
+				}
+				$score = "$score/$possible";
+			} else {
+				$score = "n/a";
+			}
+		} else {
+			$startTime = '&nbsp;';
+			$score = $startTime;
+		}
+		return CGI::Tr(CGI::td([
+		                     $control,
+		                     $score,
+		                     $startTime,
+		                     $status,
+		]));
 	}
-	'';
 }
+
 sub byname { $a->set_id cmp $b->set_id; }
-sub byduedate { $a->due_date <=> $b->due_date; }
+
+sub byUrgency {
+	my $mytime = time;
+	my @a_parts = ($a->answer_date + RECENT <= $mytime) ?  (4, $a->open_date, $a->due_date, $a->set_id) 
+		: ($a->answer_date <= $mytime and $mytime < $a->answer_date + RECENT) ? (3, $a-> answer_date, $a-> due_date, $a->set_id)
+		: ($a->due_date <= $mytime and $mytime < $a->answer_date ) ? (2, $a->answer_date, $a->due_date, $a->set_id)
+		: ($mytime < $a->open_date) ? (1, $a->open_date, $a->due_date, $a->set_id) 
+		: (0, $a->due_date, $a->open_date, $a->set_id);
+	my @b_parts = ($b->answer_date + RECENT <= $mytime) ?  (4, $b->open_date, $b->due_date, $b->set_id) 
+		: ($b->answer_date <= $mytime and $mytime < $b->answer_date + RECENT) ? (3, $b-> answer_date, $b-> due_date, $b->set_id)
+		: ($b->due_date <= $mytime and $mytime < $b->answer_date ) ? (2, $b->answer_date, $b->due_date, $b->set_id)
+		: ($mytime < $b->open_date) ? (1, $b->open_date, $b->due_date, $b->set_id) 
+		: (0, $b->due_date, $b->open_date, $b->set_id);
+	my $returnIt=0;
+	while (scalar(@a_parts) > 1) {
+		if ($returnIt = ( (shift @a_parts) <=> (shift @b_parts) ) ) {
+			return($returnIt);
+		}
+	}
+	return (  $a_parts[0] cmp  $b_parts[0] );
+}
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm b/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm
new file mode 100644
index 0000000000..006c898827
--- /dev/null
+++ b/lib/WeBWorK/ContentGenerator/ProblemUtil/ProblemUtil.pm
@@ -0,0 +1,628 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Problem.pm,v 1.225 2010/05/28 21:29:48 gage 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+# Created to house most output subroutines for Problem.pm to make that module more lightweight
+# Now mostly defunct due to having moved most of the output declarations to the template
+# -ghe3
+
+package WeBWorK::ContentGenerator::ProblemUtil::ProblemUtil;
+use base qw(WeBWorK);
+use base qw(WeBWorK::ContentGenerator);
+
+=head1 NAME
+ 
+WeBWorK::ContentGenerator::ProblemUtil::ProblemUtil - contains a bunch of subroutines for generating output for the problem pages, especially those generated by Problem.pm
+
+=cut
+
+use strict;
+use warnings;
+#use CGI qw(-nosticky );
+use WeBWorK::CGI;
+use File::Path qw(rmtree);
+use WeBWorK::Debug;
+use WeBWorK::Form;
+use WeBWorK::PG;
+use WeBWorK::PG::ImageGenerator;
+use WeBWorK::PG::IO;
+use WeBWorK::Utils qw(readFile writeLog writeCourseLog encodeAnswers decodeAnswers
+	ref2string makeTempDirectory path_is_subdir sortByName before after between);
+use WeBWorK::DB::Utils qw(global2user user2global);
+use URI::Escape;
+
+use WeBWorK::Utils::Tasks qw(fake_set fake_problem);
+
+# process_and_log_answer subroutine.
+
+# performs functions of processing and recording the answer given in the page. Also returns the appropriate scoreRecordedMessage.
+
+sub process_and_log_answer{
+
+	my $self = shift;
+	
+	my $r = $self->r;
+	my $db = $r->db;
+	my $effectiveUser = $r->param('effectiveUser');
+	my $authz = $r->authz;
+	
+	
+	my %will = %{ $self->{will} };
+	my $submitAnswers = $self->{submitAnswers};
+	my $problem = $self->{problem};
+	my $pg = $self->{pg};
+	my $set = $self->{set};
+	
+	my $scoreRecordedMessage = "";
+	my $pureProblem;
+	if ($submitAnswers) {
+		# get a "pure" (unmerged) UserProblem to modify
+		# this will be undefined if the problem has not been assigned to this user
+		$pureProblem = $db->getUserProblem($problem->user_id, $problem->set_id, $problem->problem_id); # checked
+		if (defined $pureProblem) {
+			# store answers in DB for sticky answers
+			my %answersToStore;
+			my %answerHash = %{ $pg->{answers} };
+			$answersToStore{$_} = $self->{formFields}->{$_}  #$answerHash{$_}->{original_student_ans} -- this may have been modified for fields with multiple values.  Don't use it!!
+				foreach (keys %answerHash);
+			
+			# There may be some more answers to store -- one which are auxiliary entries to a primary answer.  Evaluating
+			# matrices works in this way, only the first answer triggers an answer evaluator, the rest are just inputs
+			# however we need to store them.  Fortunately they are still in the input form.
+			my @extra_answer_names  = @{ $pg->{flags}->{KEPT_EXTRA_ANSWERS}};
+			$answersToStore{$_} = $self->{formFields}->{$_} foreach  (@extra_answer_names);
+			
+			# Now let's encode these answers to store them -- append the extra answers to the end of answer entry order
+			my @answer_order = (@{$pg->{flags}->{ANSWER_ENTRY_ORDER}}, @extra_answer_names);
+			my $answerString = encodeAnswers(%answersToStore,
+				 @answer_order);
+			
+			# store last answer to database
+			$problem->last_answer($answerString);
+			$pureProblem->last_answer($answerString);
+			$db->putUserProblem($pureProblem);
+			
+			# store state in DB if it makes sense
+			if ($will{recordAnswers}) {
+				$problem->status($pg->{state}->{recorded_score});
+				$problem->sub_status($pg->{state}->{sub_recorded_score});
+				$problem->attempted(1);
+				$problem->num_correct($pg->{state}->{num_of_correct_ans});
+				$problem->num_incorrect($pg->{state}->{num_of_incorrect_ans});
+				$pureProblem->status($pg->{state}->{recorded_score});
+				$pureProblem->sub_status($pg->{state}->{sub_recorded_score});
+				$pureProblem->attempted(1);
+				$pureProblem->num_correct($pg->{state}->{num_of_correct_ans});
+				$pureProblem->num_incorrect($pg->{state}->{num_of_incorrect_ans});
+				if ($db->putUserProblem($pureProblem)) {
+					$scoreRecordedMessage = "Your score was recorded.";
+				} else {
+					$scoreRecordedMessage = "Your score was not recorded because there was a failure in storing the problem record to the database.";
+				}
+				# write to the transaction log, just to make sure
+				writeLog($self->{ce}, "transaction",
+					$problem->problem_id."\t".
+					$problem->set_id."\t".
+					$problem->user_id."\t".
+					$problem->source_file."\t".
+					$problem->value."\t".
+					$problem->max_attempts."\t".
+					$problem->problem_seed."\t".
+					$pureProblem->status."\t".
+					$pureProblem->attempted."\t".
+					$pureProblem->last_answer."\t".
+					$pureProblem->num_correct."\t".
+					$pureProblem->num_incorrect
+				);
+			} else {
+				if (before($set->open_date) or after($set->due_date)) {
+					$scoreRecordedMessage = "Your score was not recorded because this homework set is closed.";
+				} else {
+					$scoreRecordedMessage = "Your score was not recorded.";
+				}
+			}
+		} else {
+			$scoreRecordedMessage = "Your score was not recorded because this problem has not been assigned to you.";
+		}
+	}
+	
+	# logging student answers
+
+	my $answer_log    = $self->{ce}->{courseFiles}->{logs}->{'answer_log'};
+	if ( defined($answer_log ) and defined($pureProblem)) {
+		if ($submitAnswers && !$authz->hasPermissions($effectiveUser, "dont_log_past_answers")) {
+		        my $answerString = ""; my $scores = "";
+			my %answerHash = %{ $pg->{answers} };
+			# FIXME  this is the line 552 error.  make sure original student ans is defined.
+			# The fact that it is not defined is probably due to an error in some answer evaluator.
+			# But I think it is useful to suppress this error message in the log.
+			foreach (sortByName(undef, keys %answerHash)) {
+				my $orig_ans = $answerHash{$_}->{original_student_ans};
+				my $student_ans = defined $orig_ans ? $orig_ans : '';
+				$answerString  .= $student_ans."\t";
+				$scores .= $answerHash{$_}->{score} >= 1 ? "1" : "0";
+			}
+			$answerString = '' unless defined($answerString); # insure string is defined.
+			writeCourseLog($self->{ce}, "answer_log",
+			        join("",
+						'|', $problem->user_id,
+						'|', $problem->set_id,
+						'|', $problem->problem_id,
+						'|', $scores, "\t",
+						time(),"\t",
+						$answerString,
+					),
+			);
+			
+		}
+	}
+	
+	$self->{scoreRecordedMessage} = $scoreRecordedMessage;
+	return $scoreRecordedMessage;
+}
+
+# process_editorLink subroutine
+
+# Creates and returns the proper editor link for the current website.  Also checks for translation errors and prints an error message and returning a false value if one is detected.
+
+sub process_editorLink{
+	
+	my $self = shift;
+	
+	my $set = $self->{set};
+	my $problem = $self->{problem};
+	my $pg = $self->{pg};
+	
+	my $r = $self->r;
+	
+	my $authz = $r->authz;
+	my $urlpath = $r->urlpath;
+	my $user = $r->param('user');
+	
+	my $courseName = $urlpath->arg("courseID");
+	
+	# FIXME: move editor link to top, next to problem number.
+	# format as "[edit]" like we're doing with course info file, etc.
+	# add edit link for set as well.
+	my $editorLink = "";
+	# if we are here without a real homework set, carry that through
+	my $forced_field = [];
+	$forced_field = ['sourceFilePath' =>  $r->param("sourceFilePath")] if
+		($set->set_id eq 'Undefined_Set');
+	if ($authz->hasPermissions($user, "modify_problem_sets")) {
+		my $editorPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor",
+			courseID => $courseName, setID => $set->set_id, problemID => $problem->problem_id);
+		my $editorURL = $self->systemLink($editorPage, params=>$forced_field);
+		$editorLink = CGI::p(CGI::a({href=>$editorURL,target =>'WW_Editor'}, "Edit this problem"));
+	}
+	
+	##### translation errors? #####
+
+	if ($pg->{flags}->{error_flag}) {
+		if ($authz->hasPermissions($user, "view_problem_debugging_info")) {
+			print $self->errorOutput($pg->{errors}, $pg->{body_text});
+		} else {
+			print $self->errorOutput($pg->{errors}, "You do not have permission to view the details of this error.");
+		}
+		print $editorLink;
+		return "permission_error";
+	}
+	else{
+		return $editorLink;
+	}
+}
+
+# output_JS subroutine
+
+# prints out the wz_tooltip.js script for the current site.
+
+sub output_JS{
+	
+	my $self = shift;
+	my $r = $self->r;
+	my $ce = $r->ce;
+
+	my $site_url = $ce->{webworkURLs}->{htdocs};
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/wz_tooltip.js"}), CGI::end_script();
+}
+
+# output_summary subroutine
+
+# prints out summary information for the problem pages.
+
+sub output_summary{
+	
+	my $self = shift;
+	
+	my $editMode = $self->{editMode};
+	my $problem = $self->{problem};
+	my $pg = $self->{pg};
+	my $submitAnswers = $self->{submitAnswers};
+	my %will = %{ $self->{will} };
+	my $checkAnswers = $self->{checkAnswers};
+	my $previewAnswers = $self->{previewAnswers};
+	
+	my $r = $self->r;
+	
+	my $authz = $r->authz;
+	my $user = $r->param('user');
+	
+	# custom message for editor
+	if ($authz->hasPermissions($user, "modify_problem_sets") and defined $editMode) {
+		if ($editMode eq "temporaryFile") {
+			print CGI::p(CGI::div({class=>'temporaryFile'}, "Viewing temporary file: ", $problem->source_file));
+		} elsif ($editMode eq "savedFile") {
+			# taken care of in the initialization phase
+		}
+	}
+	print CGI::start_div({class=>"problemHeader"});
+	
+	
+	# attempt summary
+	#FIXME -- the following is a kludge:  if showPartialCorrectAnswers is negative don't show anything.
+	# until after the due date
+	# do I need to check $will{showCorrectAnswers} to make preflight work??
+	if (($pg->{flags}->{showPartialCorrectAnswers} >= 0 and $submitAnswers) ) {
+		# print this if user submitted answers OR requested correct answers
+		
+		print $self->attemptResults($pg, 1,
+			$will{showCorrectAnswers},
+			$pg->{flags}->{showPartialCorrectAnswers}, 1, 1);
+	} elsif ($checkAnswers) {
+		# print this if user previewed answers
+		print CGI::div({class=>'ResultsWithError'},"ANSWERS ONLY CHECKED -- ANSWERS NOT RECORDED"), CGI::br();
+		print $self->attemptResults($pg, 1, $will{showCorrectAnswers}, 1, 1, 1);
+			# show attempt answers
+			# show correct answers if asked
+			# show attempt results (correctness)
+			# show attempt previews
+	} elsif ($previewAnswers) {
+		# print this if user previewed answers
+		print CGI::div({class=>'ResultsWithError'},"PREVIEW ONLY -- ANSWERS NOT RECORDED"),CGI::br(),$self->attemptResults($pg, 1, 0, 0, 0, 1);
+			# show attempt answers
+			# don't show correct answers
+			# don't show attempt results (correctness)
+			# show attempt previews
+	}
+	
+	print CGI::end_div();
+}
+
+# output_CSS subroutine
+
+# prints the CSS scripts to page.  Does some PERL trickery to form the styles for the correct answers and the incorrect answers (which may be substituted with JS sometime in the future).
+
+sub output_CSS{
+
+	my $self = shift;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my $pg = $self->{pg};
+
+	# always show colors for checkAnswers
+	# show colors for submit answer if 
+	if (($self->{checkAnswers}) or ($self->{submitAnswers} and $pg->{flags}->{showPartialCorrectAnswers}) ) {
+		print CGI::start_style({type=>"text/css"});
+		print	'#'.join(', #', @{ $self->{correct_ids} }), $ce->{pg}{options}{correct_answer}   if ref( $self->{correct_ids}  )=~/ARRAY/;   #correct  green
+		print	'#'.join(', #', @{ $self->{incorrect_ids} }), $ce->{pg}{options}{incorrect_answer} if ref( $self->{incorrect_ids})=~/ARRAY/; #incorrect  reddish
+		print	CGI::end_style();
+	}
+}
+
+# output_main_form subroutine.
+
+# prints out the main form for the page.  This particular subroutine also takes in $editorLink and $scoreRecordedMessage as required parameters. Also uses CGI_labeled_input for its input elements for accessibility reasons.  Also prints out the score summary where applicable.
+
+sub output_main_form{
+	
+	my $self = shift;
+	my $editorLink = shift;
+	
+	my $r = $self->r;
+	my $pg = $self->{pg};
+	my $problem = $self->{problem};
+	my $set = $self->{set};
+	my $submitAnswers = $self->{submitAnswers};
+	
+	my $db = $r->db;
+	my $ce = $r->ce;
+	my $user = $r->param('user');
+	my $effectiveUser = $r->{'effectiveUser'};
+	
+	my %can = %{ $self->{can} };
+	my %will = %{ $self->{will} };
+	
+	print "\n";
+	print CGI::start_form(-method=>"POST", -action=> $r->uri,-name=>"problemMainForm", onsubmit=>"submitAction()");
+	print $self->hidden_authen_fields;
+	# print "\n";
+	# print CGI::start_div({class=>"problem"});
+	# print CGI::p($pg->{body_text});
+	# print CGI::p(CGI::b("Note: "). CGI::i($pg->{result}->{msg})) if $pg->{result}->{msg};
+	# print $editorLink; # this is empty unless it is appropriate to have an editor link.
+	# print CGI::end_div();
+	
+	# print CGI::start_p();
+	
+	# if ($can{showCorrectAnswers}) {
+		# print WeBWorK::CGI_labeled_input(
+			# -type	 => "checkbox",
+			# -id		 => "showCorrectAnswers_id",
+			# -label_text => "Show correct answers",
+			# -input_attr => $will{showCorrectAnswers} ?
+			# {
+				# -name    => "showCorrectAnswers",
+				# -checked => "checked",
+				# -value   => 1,
+			# }
+			# :
+			# {
+				# -name    => "showCorrectAnswers",
+				# -value   => 1,
+			# }
+		# );
+	# }
+	# if ($can{showHints}) {
+		# print CGI::div({style=>"color:red"},
+			# WeBWorK::CGI_labeled_input(
+				# -type	 => "checkbox",
+				# -id		 => "showHints_id",
+				# -label_text => "Show Hints",
+				# -input_attr => $will{showHints} ?
+				# {
+					# -name    => "showHints",
+					# -checked => "checked",
+					# -value   => 1,
+				# }
+				# :
+				# {
+					# -name    => "showCorrectAnswers",
+					# -value   => 1,
+				# }
+			# )
+		# );
+	# }
+	# if ($can{showSolutions}) {
+		# print WeBWorK::CGI_labeled_input(
+			# -type	 => "checkbox",
+			# -id		 => "showSolutions_id",
+			# -label_text => "Show Solutions",
+			# -input_attr => $will{showSolutions} ?
+			# {
+				# -name    => "showSolutions",
+				# -checked => "checked",
+				# -value   => 1,
+			# }
+			# :
+			# {
+				# -name    => "showCorrectAnswers",
+				# -value   => 1,
+			# }
+		# );
+	# }
+	
+	# if ($can{showCorrectAnswers} or $can{showHints} or $can{showSolutions}) {
+		# print CGI::br();
+	# }
+		
+	# print WeBWorK::CGI_labeled_input(-type=>"submit", -id=>"previewAnswers_id", -input_attr=>{-name=>"previewAnswers", -value=>"Preview Answers"});
+	# if ($can{checkAnswers}) {
+		# print WeBWorK::CGI_labeled_input(-type=>"submit", -id=>"checkAnswers_id", -input_attr=>{-name=>"checkAnswers", -value=>"Check Answers"});
+	# }
+	# if ($can{getSubmitButton}) {
+		# if ($user ne $effectiveUser) {
+			# # if acting as a student, make it clear that answer submissions will
+			# # apply to the student's records, not the professor's.
+			# print WeBWorK::CGI_labeled_input(-type=>"submit", -id=>"submitAnswers_id", -input_attr=>{-name=>"submitAnswers", -value=>"Submit Answers for $effectiveUser"});
+		# } else {
+			# #print CGI::submit(-name=>"submitAnswers", -label=>"Submit Answers", -onclick=>"alert('submit button clicked')");
+			# print WeBWorK::CGI_labeled_input(-type=>"submit", -id=>"submitAnswers_id", -input_attr=>{-name=>"submitAnswers", -label=>"Submit Answers", -onclick=>""});
+			# # FIXME  for unknown reasons the -onclick label seems to have to be there in order to allow the forms onsubmit to trigger
+			# # WFT???
+		# }
+	# }
+	
+	# print CGI::end_p();
+	
+	# print CGI::start_div({class=>"scoreSummary"});
+	
+	# # score summary
+	# my $attempts = $problem->num_correct + $problem->num_incorrect;
+	# my $attemptsNoun = $attempts != 1 ? "times" : "time";
+	# my $problem_status    = $problem->status || 0;
+	# my $lastScore = sprintf("%.0f%%", $problem_status * 100); # Round to whole number
+	# my ($attemptsLeft, $attemptsLeftNoun);
+	# if ($problem->max_attempts == -1) {
+		# # unlimited attempts
+		# $attemptsLeft = "unlimited";
+		# $attemptsLeftNoun = "attempts";
+	# } else {
+		# $attemptsLeft = $problem->max_attempts - $attempts;
+		# $attemptsLeftNoun = $attemptsLeft == 1 ? "attempt" : "attempts";
+	# }
+	
+	# my $setClosed = 0;
+	# my $setClosedMessage;
+	# if (before($set->open_date) or after($set->due_date)) {
+		# $setClosed = 1;
+		# if (before($set->open_date)) {
+			# $setClosedMessage = "This homework set is not yet open.";
+		# } elsif (after($set->due_date)) {
+			# $setClosedMessage = "This homework set is closed.";
+		# }
+	# }
+	# #if (before($set->open_date) or after($set->due_date)) {
+	# #	$setClosed = 1;
+	# #	$setClosedMessage = "This homework set is closed.";
+	# #	if ($authz->hasPermissions($user, "view_answers")) {
+	# #		$setClosedMessage .= " However, since you are a privileged user, additional attempts will be recorded.";
+	# #	} else {
+	# #		$setClosedMessage .= " Additional attempts will not be recorded.";
+	# #	}
+	# #}
+	# unless (defined( $pg->{state}->{state_summary_msg}) and $pg->{state}->{state_summary_msg}=~/\S/) {
+		# my $notCountedMessage = ($problem->value) ? "" : "(This problem will not count towards your grade.)";
+		# print CGI::p(join("",
+			# $submitAnswers ? $scoreRecordedMessage . CGI::br() : "",
+			# "You have attempted this problem $attempts $attemptsNoun.", CGI::br(),
+			# $submitAnswers ?"You received a score of ".sprintf("%.0f%%", $pg->{result}->{score} * 100)." for this attempt.".CGI::br():'',
+			# $problem->attempted
+				# ? "Your overall recorded score is $lastScore.  $notCountedMessage" . CGI::br()
+				# : "",
+			# $setClosed ? $setClosedMessage : "You have $attemptsLeft $attemptsLeftNoun remaining."
+		# ));
+	# }else {
+		# print CGI::p($pg->{state}->{state_summary_msg});
+	# }
+
+	# print CGI::end_div();
+	# print CGI::start_div();
+	
+	# my $pgdebug = join(CGI::br(), @{$pg->{pgcore}->{flags}->{DEBUG_messages}} );
+	# my $pgwarning = join(CGI::br(), @{$pg->{pgcore}->{flags}->{WARNING_messages}} );
+	# my $pginternalerrors = join(CGI::br(),  @{$pg->{pgcore}->get_internal_debug_messages}   );
+	# my $pgerrordiv = $pgdebug||$pgwarning||$pginternalerrors;  # is 1 if any of these are non-empty
+	
+	# print CGI::p({style=>"color:red;"}, "Checking additional error messages") if $pgerrordiv  ;
+ 	# print CGI::p("pg debug<br/> $pgdebug"                   ) if $pgdebug ;
+	# print CGI::p("pg warning<br/>$pgwarning"                ) if $pgwarning ;	
+	# print CGI::p("pg internal errors<br/> $pginternalerrors") if $pginternalerrors;
+	# print CGI::end_div()                                      if $pgerrordiv ;
+	
+	# # save state for viewOptions
+	# print  CGI::hidden(
+			   # -name  => "showOldAnswers",
+			   # -value => $will{showOldAnswers}
+		   # ),
+
+		   # CGI::hidden(
+			   # -name  => "displayMode",
+			   # -value => $self->{displayMode}
+		   # );
+	# print( CGI::hidden(
+			   # -name    => 'editMode',
+			   # -value   => $self->{editMode},
+		   # )
+	# ) if defined($self->{editMode}) and $self->{editMode} eq 'temporaryFile';
+	
+	# # this is a security risk -- students can use this to find the source code for the problem
+
+	# my $permissionLevel = $db->getPermissionLevel($user)->permission;
+	# my $professorPermissionLevel = $ce->{userRoles}->{professor};
+	# print( CGI::hidden(
+		   		# -name   => 'sourceFilePath',
+		   		# -value  =>  $self->{problem}->{source_file}
+	# ))  if defined($self->{problem}->{source_file}) and $permissionLevel>= $professorPermissionLevel; # only allow this for professors
+
+	# print( CGI::hidden(
+		   		# -name   => 'problemSeed',
+		   		# -value  =>  $r->param("problemSeed")
+	# ))  if defined($r->param("problemSeed")) and $permissionLevel>= $professorPermissionLevel; # only allow this for professors
+
+			
+	# end of main form
+	print CGI::endform();
+}
+
+# output_footer subroutine
+
+# prints out the footer elements to the page.
+
+sub output_footer{
+
+	my $self = shift;
+	my $r = $self->r;
+	my $problem = $self->{problem};
+	my $pg = $self->{pg};
+	my %will = %{ $self->{will} };
+	
+	my $authz = $r->authz;
+	my $urlpath = $r->urlpath;
+	my $user = $r->param('user');
+	
+	my $courseName = $urlpath->arg("courseID");
+	
+	print CGI::start_div({class=>"problemFooter"});
+	
+	
+	my $pastAnswersPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::ShowAnswers",
+		courseID => $courseName);
+	my $showPastAnswersURL = $self->systemLink($pastAnswersPage, authen => 0); # no authen info for form action
+		
+	# print answer inspection button
+	if ($authz->hasPermissions($user, "view_answers")) {
+		print "\n",
+			CGI::start_form(-method=>"POST",-action=>$showPastAnswersURL,-target=>"WW_Info"),"\n",
+			$self->hidden_authen_fields,"\n",
+			CGI::hidden(-name => 'courseID',  -value=>$courseName), "\n",
+			CGI::hidden(-name => 'problemID', -value=>$problem->problem_id), "\n",
+			CGI::hidden(-name => 'setID',  -value=>$problem->set_id), "\n",
+			CGI::hidden(-name => 'studentUser',    -value=>$problem->user_id), "\n",
+			CGI::p( {-align=>"left"},
+				CGI::submit(-name => 'action',  -value=>'Show Past Answers')
+			), "\n",
+			CGI::endform();
+	}
+	
+	
+	print $self->feedbackMacro(
+		module             => __PACKAGE__,
+		set                => $self->{set}->set_id,
+		problem            => $problem->problem_id,
+		displayMode        => $self->{displayMode},
+		showOldAnswers     => $will{showOldAnswers},
+		showCorrectAnswers => $will{showCorrectAnswers},
+		showHints          => $will{showHints},
+		showSolutions      => $will{showSolutions},
+		pg_object          => $pg,
+	);
+	
+	print CGI::end_div();
+}
+
+# check_invalid subroutine
+
+# checks to see if the current problem set is valid for the current user, returns "valid" if it is and an error message if it's not.
+
+sub check_invalid{
+	
+	my $self = shift;
+	my $r = $self->r;
+	my $urlpath = $r->urlpath;
+	my $effectiveUser = $r->param('effectiveUser');
+	
+	if ( $self->{invalidSet} ) { 
+		return CGI::div({class=>"ResultsWithError"},
+				CGI::p("The selected problem set (" .
+				       $urlpath->arg("setID") . ") is not " .
+				       "a valid set for $effectiveUser:"),
+				CGI::p($self->{invalidSet}));
+	}
+	
+	elsif ($self->{invalidProblem}) {
+		return CGI::div({class=>"ResultsWithError"},
+			CGI::p("The selected problem (" . $urlpath->arg("problemID") . ") is not a valid problem for set " . $self->{set}->set_id . "."));
+	}
+	else{
+		return "valid";
+	}
+	
+}
+
+sub test{
+	print "test";
+}
+
+1;
\ No newline at end of file
diff --git a/lib/WeBWorK/ContentGenerator/Skeleton.pm b/lib/WeBWorK/ContentGenerator/Skeleton.pm
new file mode 100644
index 0000000000..abfdb23ef1
--- /dev/null
+++ b/lib/WeBWorK/ContentGenerator/Skeleton.pm
@@ -0,0 +1,174 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Skeleton.pm,v 1.5 2006/07/08 14:07:34 gage 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+# SKEL: Welcome to the ContentGenerator skeleton!
+# 
+# This module is designed to help you in creating subclasses of
+# WeBWorK::ContentGenerator. Follow the instructions marked "SKEL" below to
+# create your very own module.
+# 
+# When you've finished, I recommend you do some cleanup. These modules are much
+# easier to maintain if they doesn't contain "vestigal" garbage code. Remove the
+# "SKEL" comments and anything else that that you're not using in your module.
+
+# SKEL: Declare the name and superclass of your module here:
+package WeBWorK::ContentGenerator::Skeleton;
+use base qw(WeBWorK::ContentGenerator);
+
+# SKEL: change the name of the module below and provide a short description. Add
+# additional POD documentation as you see fit.
+
+=head1 NAME
+
+WeBWorK::ContentGenerator::Skeleton - Template for creating subclasses of
+WeBWorK::ContentGenerator.
+
+=cut
+
+use strict;
+use warnings;
+
+# SKEL: Add "use" lines for libraries you will be using here. Note that you only
+# need to add a "use" line here if you will be instantiating now objects or
+# calling free functions. If you have an existing instance (like $self->r) you
+# can use it without a corresponding "use" line. Sample lines are given below:
+# 
+# You'll probably want to generate HTML code:
+#use CGI qw(-nosticky );
+# 
+# You might need some utility functions:
+#use WeBWorK::Utils qw(function1 function2);
+
+# SKEL: If you need to do any processing before the HTTP header is sent, do it
+# in this method:
+# 
+#sub pre_header_initialize {
+#	my ($self) = @_;
+#	
+#	# Do your processing here! Don't print or return anything -- store data in
+#	# the self hash for later retrieveal.
+#}
+
+# SKEL: To emit your own HTTP header, uncomment this:
+# 
+#sub header {
+#	my ($self) = @_;
+#	
+#	# Generate your HTTP header here.
+#	
+#	# If you return something, it will be used as the HTTP status code for this
+#	# request. The Apache::Constants module might be useful for gerating status
+#	# codes. If you don't return anything, the status code "OK" will be used.
+#	return "";
+#}
+
+# SKEL: If you need to do any processing after the HTTP header is sent, but before
+# any template processing occurs, or you need to calculate values that will be
+# used in multiple methods, do it in this method:
+# 
+#sub initialize {
+#	my ($self) = @_;
+#	
+#	# Do your processing here! Don't print or return anything -- store data in
+#	# the self hash for later retrieveal.
+#}
+
+# SKEL: If you need to add tags to the document <HEAD>, uncomment this method:
+# 
+#sub head {
+#	my ($self) = @_;
+#	
+#	# You can print head tags here, like <META>, <SCRIPT>, etc.
+#	
+#	return "";
+#}
+
+# SKEL: To fill in the "info" box (to the right of the main body), use this
+# method:
+# 
+#sub info {
+#	my ($self) = @_;
+#	
+#	# Print HTML here.
+#	
+#	return "";
+#}
+
+# SKEL: To provide navigation links, use this method:
+# 
+#sub nav {
+#	my ($self, $args) = @_;
+#	
+#	# See the documentation of path() and pathMacro() in
+#	# WeBWorK::ContentGenerator for more information.
+#	
+#	return "";
+#}
+
+# SKEL: For a little box for display options, etc., use this method:
+# 
+#sub options {
+#	my ($self) = @_;
+#	
+#	# Print HTML here.
+#	
+#	return "";
+#}
+
+# SKEL: For a list of sibling objects, use this method:
+# 
+#sub siblings {
+#	my ($self, $args) = @_;
+#	
+#	# See the documentation of siblings() and siblingsMacro() in
+#	# WeBWorK::ContentGenerator for more information.
+#	# 
+#	# Refer to implementations in ProblemSet and Problem.
+#	
+#	return "";
+#}
+
+# SKEL: Okay, here's the body. Most of your stuff will go here:
+# 
+sub body {
+	my ($self) = @_;
+	
+	# SKEL: Useful things from the superclass:
+	# 
+	# The WeBWorK::Request object. Good for accessing request params and so on.
+	#my $r = $self->r;
+	# 
+	# Do you need data from the course environment?
+	#my $ce = $r->ce;
+	# 
+	# Will you be accessing the database?
+	#my $db = $r->db;
+	# 
+	# Query authorization:
+	#my $authz = $r->authz;
+	# 
+	# The WeBWorK::URLPath object. Necessary for getting/generating URL data:
+	#my $urlpath = $r->urlpath;
+	
+	# FIXME: Add more examples of common idioms, mention WeBWorK::HTML::*
+	# classes, refer to superclass methods.
+	
+	# SKEL: Print your content here!
+	
+	return "";	
+}
+
+1;
diff --git a/lib/WeBWorK/ContentGenerator/Test.pm b/lib/WeBWorK/ContentGenerator/Test.pm
index af75140ee4..f64a08533e 100644
--- a/lib/WeBWorK/ContentGenerator/Test.pm
+++ b/lib/WeBWorK/ContentGenerator/Test.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Test.pm,v 1.16 2006/07/25 23:02:12 sh002i 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
@@ -19,49 +19,78 @@ use base qw(WeBWorK::ContentGenerator);
 
 =head1 NAME
 
-WeBWorK::ContentGenerator::Test - display debugging information.
+WeBWorK::ContentGenerator::Test - Test area for monkeying around with stuff.
 
 =cut
 
 use strict;
 use warnings;
-use CGI qw();
-use WeBWorK::Form;
-use WeBWorK::Utils qw(ref2string);
 
-sub initialize {
-	my $self = shift;
-}
-
-sub path {
-	my $self = shift;
-	my $args = $_[-1];
-	return $self->pathMacro($args, Home => "../", Test => "");
-}
-
-sub siblings {
-	my $self = shift;
-	return $self->siblingsMacro(Test2 => "blah/", "Test Three" => "spoo");
-}
-
-sub nav {
-	my $self = shift;
-	my $args = $_[-1];
-	return $self->navMacro($args, "", TestMinus1 => "-1/", TestPlusOne => "+1/");
-}
-
-sub title {
-	return "Welcome to Hell";
-}
+#use CGI;
+use WeBWorK::CGI;
+#use WeBWorK::CGIParamShim;
+use WeBWorK::Utils qw/undefstr/;
 
 sub body {
-	my $self = shift;
-	my $formFields = WeBWorK::Form->new_from_paramable($self->{r});
-	my $courseEnvironment = $self->{ce};
-	return
-		CGI::h2("URL Authentication Arguments"), CGI::p($self->url_authen_args()),
-		CGI::h2("Form Fields"), ref2string($formFields),
-		CGI::h2("Course Environment"), ref2string($courseEnvironment),
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+	my $db = $r->db;
+	my $authz = $r->authz;
+	my $urlpath = $r->urlpath;
+	
+	$self->{pwd} = $r->param("pwd") || "helloworld";
+	
+	print CGI::p(
+		"REQUEST_METHOD is $ENV{REQUEST_METHOD}", CGI::br(),
+		"CONTENT_TYPE is $ENV{CONTENT_TYPE}", CGI::br(),
+		"CONTENT_LENGTH is $ENV{CONTENT_LENGTH}",
+	);
+	
+	use Data::Dumper;
+	print CGI::pre(CGI::escapeHTML(Dumper($CGI::Q)));
+	
+	#print CGI::start_form(-method=>"POST", -action=>$r->uri);
+	my $start_form = CGI::start_form(
+		-method=>"POST",
+		-action=>$r->uri,
+		#-enctype=>'application/x-www-form-urlencoded',
+		-enctype=>'multipart/form-data',
+	);
+	print CGI::pre(CGI::escapeHTML($start_form));
+	print $start_form;
+	print $self->hidden_authen_fields;
+	
+	print CGI::p("before action:" . CGI::br()
+		. " \$r->param('pwd')=" . (defined $r->param('pwd') ? $r->param('pwd') : "UNDEF") . CGI::br()
+		. " CGI::param('pwd')=" . (defined CGI::param('pwd') ? CGI::param('pwd') : "UNDEF") . CGI::br()
+		. " \$CGI::Q->{pwd}=" . (defined $CGI::Q->{pwd} ? "@{$CGI::Q->{pwd}}" : "UNDEF") . CGI::br()
+		. " \$self->{pwd}=" . (defined $self->{pwd} ? $self->{pwd} : "UNDEF"));
+	
+	if (defined $r->param("submit") and $r->param("submit") eq "ChangePWD") {
+		$self->{pwd} = $r->param("new_pwd");
+		print CGI::p("pwd change requested, new pwd is ", $self->{pwd});
+	}
+	
+	print "new_pwd: ", CGI::textfield({name=>"new_pwd",value=>$self->{pwd}}), CGI::br();
+	
+	print CGI::p("after action:" . CGI::br()
+		. " \$r->param('pwd')=" . (defined $r->param('pwd') ? $r->param('pwd') : "UNDEF") . CGI::br()
+		. " CGI::param('pwd')=" . (defined CGI::param('pwd') ? CGI::param('pwd') : "UNDEF") . CGI::br()
+		. " \$CGI::Q->{pwd}=" . (defined $CGI::Q->{pwd} ? "@{$CGI::Q->{pwd}}" : "UNDEF") . CGI::br()
+		. " \$self->{pwd}=" . (defined $self->{pwd} ? $self->{pwd} : "UNDEF"));
+	
+	my $hidden_pwd = CGI::hidden({name=>"pwd",value=>$self->{pwd}});
+	print CGI::p("hidden field is being passed value=>".$self->{pwd}, CGI::br(),
+		"hidden field is ", CGI::pre(CGI::escapeHTML($hidden_pwd)));
+	print $hidden_pwd;
+	
+	print CGI::submit({name=>"submit",value=>"Refresh"});
+	print CGI::submit({name=>"submit",value=>"ChangePWD"});
+	
+	print CGI::end_form();
+	
+	return "";	
 }
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/renderViaXMLRPC.pm b/lib/WeBWorK/ContentGenerator/renderViaXMLRPC.pm
new file mode 100755
index 0000000000..7e95f72a8b
--- /dev/null
+++ b/lib/WeBWorK/ContentGenerator/renderViaXMLRPC.pm
@@ -0,0 +1,186 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/renderViaXMLRPC.pm,v 1.1 2010/05/11 15:27:08 gage 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+=head1 NAME
+
+WeBWorK::ContentGenerator::ProblemRenderer - renderViaXMLRPC is an HTML 
+front end for calls to the xmlrpc webservice
+
+=cut
+
+use strict;
+use warnings;
+
+package WeBWorK::ContentGenerator::renderViaXMLRPC;
+use base qw(WeBWorK::ContentGenerator);
+
+#use Crypt::SSLeay;
+#use XMLRPC::Lite;
+#use MIME::Base64 qw( encode_base64 decode_base64);
+
+
+use strict;
+use warnings;
+use WebworkClient;
+
+
+=head1 Description
+
+
+#################################################
+  renderViaXMLRPC -- a front end for the Webservice that accepts HTML forms
+
+  receives WeBWorK problems presented as HTML forms,
+  packages the form variables into an XML_RPC request
+ suitable for the Webservice/RenderProblem.pm
+ takes the answer returned by the webservice (which has HTML format) and 
+ returns it to the browser.
+#################################################
+
+=cut
+ 
+# To configure the target webwork server two URLs are required
+# 1. $XML_URL   http://test.webwork.maa.org/mod_xmlrpc
+#    points to the Webservice.pm and Webservice/RenderProblem modules
+#    Is used by the client to send the original XML request to the webservice
+#
+# 2. $FORM_ACTION_URL      http:http://test.webwork.maa.org/webwork2/html2xml
+#    points to the renderViaXMLRPC.pm module.
+#
+#     This url is placed as form action url when the rendered HTML from the original
+#     request is returned to the client from Webservice/RenderProblem. The client
+#     reorganizes the XML it receives into an HTML page (with a WeBWorK form) and 
+#     pipes it through a local browser.
+#
+#     The browser uses this url to resubmit the problem (with answers) via the standard
+#     HTML webform used by WeBWorK to the renderViaXMLRPC.pm handler.  
+#
+#     This renderViaXMLRPC.pm handler acts as an intermediary between the browser 
+#     and the webservice.  It interprets the HTML form sent by the browser, 
+#     rewrites the form data in XML format, submits it to the WebworkWebservice.pm 
+#     which processes it and sends the the resulting HTML back to renderViaXMLRPC.pm
+#     which in turn passes it back to the browser.
+# 3.  The second time a problem is submitted renderViaXMLRPC.pm receives the WeBWorK form 
+#     submitted directly by the browser.  
+#     The renderViaXMLRPC.pm translates the WeBWorK form, has it processes by the webservice
+#     and returns the result to the browser. 
+#     The The client renderProblem.pl script is no longer involved.
+# 4.  Summary: renderProblem.pl is only involved in the first round trip
+#     of the submitted problem.  After that the communication is  between the browser and
+#     renderViaXMLRPC using HTML forms and between renderViaXMLRPC and the WebworkWebservice.pm
+#     module using XML_RPC.
+
+
+# Determine the root directory for webwork on this machine (e.g. /opt/webwork/webwork2 )
+# this is set in webwork.apache2-config
+# it specifies the address of the webwork root directory
+
+#my $webwork_dir  = $ENV{WEBWORK_ROOT};
+my $webwork_dir  = $WeBWorK::Constants::WEBWORK_DIRECTORY;
+unless ($webwork_dir) {
+	die "renderViaXMLRPC.pm requires that the top WeBWorK directory be set in ".
+	"\$WeBWorK::Constants::WEBWORK_DIRECTORY by webwork.apache-config or webwork.apache2-config\n";
+}
+
+# read the webwork2/conf/global.conf file to determine other parameters
+#
+my $seed_ce = new WeBWorK::CourseEnvironment({ webwork_dir => $webwork_dir });
+my $server_root_url = $seed_ce->{server_root_url};
+unless ($server_root_url) {
+	die "unable to determine apache server url using course environment |$seed_ce|.".
+	    "check that the variable \$server_root_url has been properly set in conf/global.conf\n";
+}
+
+############################
+# These variables are set when the child process is started
+# and remain constant through all of the calls handled by the 
+# child
+############################
+
+our ($XML_URL,$FORM_ACTION_URL, $XML_PASSWORD, $XML_COURSE);
+
+	$XML_PASSWORD     	 =  'xmlwebwork';
+	$XML_COURSE          =  'daemon_course';
+
+
+
+	$XML_URL             =  "$server_root_url/mod_xmlrpc";
+	$FORM_ACTION_URL     =  "$server_root_url/webwork2/html2xml";
+
+use constant DISPLAYMODE   => 'images'; #  jsMath  is another possibilities.
+
+
+our @COMMANDS = qw( listLibraries    renderProblem  ); #listLib  readFile tex2pdf 
+
+
+##################################################
+# end configuration section
+##################################################
+
+
+sub pre_header_initialize {
+	my ($self) = @_;
+	my $r = $self->r;
+ 
+    #######################
+    #  setup xmlrpc client
+    #######################
+    my $xmlrpc_client = new WebworkClient;
+
+	$xmlrpc_client->{encodedSource} = $r->param('problemSource') ; # this source has already been encoded
+	$xmlrpc_client->url($XML_URL);
+	$xmlrpc_client->{form_action_url}= $FORM_ACTION_URL;
+	$xmlrpc_client->{displayMode}   = DISPLAYMODE();
+	$xmlrpc_client->{user}          = 'xmluser';
+	$xmlrpc_client->{password}      = $XML_PASSWORD;
+	$xmlrpc_client->{course}        = $XML_COURSE;
+	my %inputs_ref;
+	my @keys = $r->mutable_param;  # $r->param;
+	foreach my $key ( @keys ) {
+		$inputs_ref{$key} = $r->param("$key");
+	}
+	
+	$xmlrpc_client->{inputs_ref} = \%inputs_ref;
+	# print STDERR WebworkClient::pretty_print($r->{paramcache});
+	
+	##############################
+	# xmlrpc_client calls webservice to have problem rendered
+	#
+	# and stores the resulting HTML output in $self->{output}
+	# from which it will eventually be returned to the browser
+	#
+	##############################
+	if ( $xmlrpc_client->xmlrpcCall('renderProblem') )    {
+		$self->{output} = $xmlrpc_client->formatRenderedProblem;
+	} else {
+		$self->{output} = $xmlrpc_client->{output};  # error report
+	}
+	
+	################################
+ }
+
+sub content {
+   ###########################
+   # Return content of rendered problem to the browser that requested it
+   ###########################
+	my $self = shift;
+	print $self->{output};
+}
+
+
+
+
+1;
diff --git a/lib/WeBWorK/DB/Schema/Null.pm b/lib/WeBWorK/Cookie.pm
similarity index 50%
rename from lib/WeBWorK/DB/Schema/Null.pm
rename to lib/WeBWorK/Cookie.pm
index bb461180e2..e1a70f8301 100644
--- a/lib/WeBWorK/DB/Schema/Null.pm
+++ b/lib/WeBWorK/Cookie.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader: webwork-modperl/lib/WeBWorK/DB/Schema/Null.pm,v 1.7 2003/12/09 01:12:32 sh002i Exp $
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/Cookie.pm,v 1.1 2006/06/29 21:10:52 sh002i 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
@@ -14,32 +14,39 @@
 # Artistic License for more details.
 ################################################################################
 
-package WeBWorK::DB::Schema::Null;
-use base qw(WeBWorK::DB::Schema);
+package WeBWorK::Cookie;
 
 =head1 NAME
 
-WeBWorK::DB::Schema::Null - a dummy schema with no backend.
+WeBWorK::Cookie - inherit from either Apache::Cookie or Apache2::Cookie
+depending on mod_perl version.
+
+=head1 SYNOPSIS
+
+Given C<$r>, a WeBWorK::Request object
+
+ my $cookie = new WeBWorK::Cookie
 
 =cut
 
 use strict;
 use warnings;
 
-use constant TABLES => qw(password permission key user set set_user problem problem_user);
-use constant STYLE  => "null";
-
-################################################################################
-# table access functions
-################################################################################
-
-sub count  { return 0;       }
-sub list   { return ();      }
-sub exists { return 1;       }
-sub add    { return 0;       }
-sub get    { return undef;   }
-sub gets   { return (undef); }
-sub put    { return 0;       }
-sub delete { return 1;       }
+use mod_perl;
+use constant MP2 => ( exists $ENV{MOD_PERL_API_VERSION} and $ENV{MOD_PERL_API_VERSION} >= 2 );
+
+# This class inherits from Apache::Cookie under mod_perl and Apache2::Cookie under mod_perl2
+BEGIN {
+	if (MP2) {
+		require Apache2::Cookie;
+        require APR::Request::Error;
+		Apache2::Cookie->import;
+		push @WeBWorK::Cookie::ISA, "Apache2::Cookie";
+	} else {
+		require Apache::Cookie;
+		Apache::Cookie->import;
+		push @WeBWorK::Cookie::ISA, "Apache::Cookie";
+	}
+}
 
 1;
diff --git a/lib/WeBWorK/CourseEnvironment.pm b/lib/WeBWorK/CourseEnvironment.pm
index d852b1c20b..c87c7a7612 100644
--- a/lib/WeBWorK/CourseEnvironment.pm
+++ b/lib/WeBWorK/CourseEnvironment.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/CourseEnvironment.pm,v 1.37 2007/08/10 16:37:10 sh002i 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
@@ -21,59 +21,135 @@ package WeBWorK::CourseEnvironment;
 WeBWorK::CourseEnvironment - Read configuration information from global.conf
 and course.conf files.
 
+=head1 SYNOPSIS
+
+ use WeBWorK::CourseEnvironment;
+ $ce = WeBWorK::CourseEnvironment->new({
+ 	webwork_url         => "/webwork2",
+ 	webwork_dir         => "/opt/webwork2",
+ 	pg_dir              => "/opt/pg",
+ 	webwork_htdocs_url  => "/webwork2_files",
+ 	webwork_htdocs_dir  => "/opt/webwork2/htdocs",
+ 	webwork_courses_url => "/webwork2_course_files",
+ 	webwork_courses_dir => "/opt/webwork2/courses",
+ 	courseName          => "name_of_course",
+ });
+ 
+ my $timeout = $courseEnv->{sessionKeyTimeout};
+ my $mode    = $courseEnv->{pg}->{options}->{displayMode};
+ # etc...
+
+=head1 DESCRIPTION
+
+The WeBWorK::CourseEnvironment module reads the system-wide F<global.conf> and
+course-specific F<course.conf> files used by WeBWorK to calculate and store
+settings needed throughout the system. The F<.conf> files are perl source files
+that can contain any code allowed under the default safe compartment opset.
+After evaluation of both files, any package variables are copied out of the
+safe compartment into a hash. This hash becomes the course environment.
+
 =cut
 
 use strict;
 use warnings;
-use Safe;
+use Carp;
+use WWSafe;
 use WeBWorK::Utils qw(readFile);
+use WeBWorK::Debug;
 use Opcode qw(empty_opset);
 
+=head1 CONSTRUCTION
+
+=over
+
+=item new(HASHREF)
+
+HASHREF is a reference to a hash containing scalar variables with which to seed
+the course environment. It must contain at least a value for the key
+C<webworkRoot>.
+
+The C<new> method finds the file F<conf/global.conf> relative to the given
+C<webwork_dir> directory. After reading this file, it uses the
+C<$courseFiles{environment}> variable, if present, to locate the course
+environment file. If found, the file is read and added to the environment.
+
+=item new(ROOT URLROOT PGROOT COURSENAME)
+
+A deprecated form of the constructor in which four seed variables are given
+explicitly: C<webwork_dir>, C<webwork_url>, C<pg_dir>, and C<courseName>.
+
+=cut
+
+# NEW SYNTAX
+# 
+# new($invocant, $seedVarsRef)
+#   $invocant       implicitly set by caller
+#   $seedVarsRef    reference to hash containing scalar variables with which to
+#                   seed the course environment
+# 
+# OLD SYNTAX
+# 
 # new($invocant, $webworkRoot, $webworkURLRoot, $pgRoot, $courseName)
-# $invocant             implicitly set by caller
-# $webworkRoot          directory that contains the WeBWorK distribution
-# $webworkURLRoot       URL that points to the WeBWorK system
-# $pgRoot               directory that contains the PG distribution
-# $courseName		name of the course being used
+#   $invocant          implicitly set by caller
+#   $webworkRoot       directory that contains the WeBWorK distribution
+#   $webworkURLRoot    URL that points to the WeBWorK system
+#   $pgRoot            directory that contains the PG distribution
+#   $courseName        name of the course being used
 sub new {
-	my $invocant = shift;
+	my ($invocant, @rest) = @_;
 	my $class = ref($invocant) || $invocant;
-	my $webworkRoot = shift;
-	my $webworkURLRoot = shift;
-	my $pgRoot = shift;
-	my $courseName = shift || "";
-	my $safe = Safe->new;
-	
-	# set up some defaults that the environment files will need
-	$safe->reval("\$webworkRoot = '$webworkRoot'");
-	$safe->reval("\$webworkURLRoot = '$webworkURLRoot'");
-	$safe->reval("\$pgRoot = '$pgRoot'");
-	$safe->reval("\$courseName = '$courseName'");
+	
+	# contains scalar symbols/values with which to seed course environment
+	my %seedVars;
+	
+	# where do we get the seed variables?
+	if (ref $rest[0] eq "HASH") {
+		%seedVars = %{$rest[0]};
+	} else {
+		debug __PACKAGE__, ": deprecated four-argument form of new() used.\n";
+		$seedVars{webwork_dir}    = $rest[0];
+		$seedVars{webwork_url}    = $rest[1];
+		$seedVars{pg_dir}         = $rest[2];
+		$seedVars{courseName}     = $rest[3];
+	}
+	
+	my $safe = WWSafe->new;
+	
+	# seed course environment with initial values
+	while (my ($var, $val) = each %seedVars) {
+		$val = "" if not defined $val;
+		$safe->reval("\$$var = '$val';");
+	}
 	
 	# Compile the "include" function with all opcodes available.
 	my $include = q[ sub include {
 		my ($file) = @_;
-		my $fullPath = "].$webworkRoot.q[/$file";
-		# This regex matches any string that:
-		# : begins with ../
-		# : ends with /..
-		# : contains /../, or
-		# : is .. 
+		my $fullPath = "].$seedVars{webwork_dir}.q[/$file";
+		# This regex matches any string that begins with "../",
+		# ends with "/..", contains "/../", or is "..".
 		if ($fullPath =~ m!(?:^|/)\.\.(?:/|$)!) {
 			die "Included file $file has potentially insecure path: contains \"..\"";
 		} else {
 			local @INC = ();
-			do $fullPath or die "\n\n Couldn't include $fullPath.  Has it been created from a distribution file?\n\n";
+			my $result = do $fullPath;
+			if ($!) {
+				warn "Failed to read include file $fullPath (has it been created from the corresponding .dist file?): $!";
+			} elsif ($@) {
+				warn "Failed to compile include file $fullPath: $@";
+			} elsif (not $result) {
+				warn "Include file $fullPath did not return a true value.";
+			}
 		}
 	} ];
 	
 	my $maskBackup = $safe->mask;
 	$safe->mask(empty_opset);
 	$safe->reval($include);
+	$@ and die "Failed to reval include subroutine: $@";
 	$safe->mask($maskBackup);
-
+	
 	# determine location of globalEnvironmentFile
-	my $globalEnvironmentFile = "$webworkRoot/conf/global.conf";
+	my $globalEnvironmentFile = "$seedVars{webwork_dir}/conf/global.conf";
 	
 	# read and evaluate the global environment file
 	my $globalFileContents = readFile($globalEnvironmentFile);
@@ -83,17 +159,21 @@ sub new {
 	# we need a global environment!
 	$@ and die "Could not evaluate global environment file $globalEnvironmentFile: $@";
 	
-	# determine location of courseEnvironmentFile
+	# determine location of courseEnvironmentFile and simple configuration file
 	# pull it out of $safe's symbol table ad hoc
 	# (we don't want to do the hash conversion yet)
 	no strict 'refs';
 	my $courseEnvironmentFile = ${*{${$safe->root."::"}{courseFiles}}}{environment};
+	my $courseWebConfigFile = $seedVars{web_config_filename} ||
+		${*{${$safe->root."::"}{courseFiles}}}{simpleConfig};
 	use strict 'refs';
 	
 	# read and evaluate the course environment file
 	# if readFile failed, we don't bother trying to reval
 	my $courseFileContents = eval { readFile($courseEnvironmentFile) }; # catch exceptions
 	$@ or $safe->reval($courseFileContents);
+	my $courseWebConfigContents = eval { readFile($courseWebConfigFile) }; # catch exceptions
+	$@ or $safe->reval($courseWebConfigContents);
 	
 	# get the safe compartment's namespace as a hash
 	no strict 'refs';
@@ -104,7 +184,7 @@ sub new {
 	my $self = {};
 	foreach my $name (keys %symbolHash) {
 		# weed out internal symbols
-		next if $name =~ /^(INC|_|__ANON__|main::)$/;
+		next if $name =~ /^(INC|_.*|__ANON__|main::)$/;
 		# pull scalar, array, and hash values for this symbol
 		my $scalar = ${*{$symbolHash{$name}}};
 		my @array = @{*{$symbolHash{$name}}};
@@ -121,54 +201,140 @@ sub new {
 	}
 	
 	bless $self, $class;
+	
+	# here is where we can do evil things to the course environment *sigh*
+	# anything changed has to be done here. after this, CE is considered read-only
+	# anything added must be prefixed with an underscore.
+	
+	# create reverse-lookup hash mapping status abbreviations to real names
+	$self->{_status_abbrev_to_name} = {
+		map { my $name = $_; map { $_ => $name } @{$self->{statuses}{$name}{abbrevs}} }
+			keys %{$self->{statuses}}
+	};
+	
+	# now that we're done, we can go ahead and return...
 	return $self;
 }
 
-1;
+=back
 
-__END__
+=head1 ACCESS
 
-=head1 SYNOPSIS
+There are no formal accessor methods. However, since the course environemnt is
+a hash of hashes and arrays, is exists as the self hash of an instance
+variable:
 
-	use WeBWorK::CourseEnvironment;
-	$courseEnv = WeBWorK::CourseEnvironment->new($webworkRoot, $courseName);
-	
-	$timeout = $courseEnv->{sessionKeyTimeout};
-	$mode    = $courseEnv->{pg}->{options}->{displayMode};
-	# etc...
+	$ce->{someKey}{someOtherKey};
 
-=head1 DESCRIPTION
+=head1 EXPERIMENTAL ACCESS METHODS
 
-The WeBWorK::CourseEnvironment module reads the system-wide F<global.conf> and
-course-specific F<course.conf> files used by WeBWorK to calculate and store
-settings needed throughout the system. The F<.conf> files are perl source files
-that can contain any code allowed under the default safe compartment opset.
-After evaluation of both files, any package variables are copied out of the
-safe compartment into a hash. This hash becomes the course environment.
+This is an experiment in extending CourseEnvironment to know a little more about
+its contents, and perform useful operations for me.
 
-=head1 CONSTRUCTION
+There is a set of operations that require certain data from the course
+environment. Most of these are un Utils.pm. I've been forced to pass $ce into
+them, so that they can get their data out. But some things are so intrinsically
+linked to the course environment that they might as well be methods in this
+class.
+
+=head2 STATUS METHODS
 
 =over
 
-=item new (ROOT, COURSE)
+=item status_abbrev_to_name($status_abbrev)
 
-The C<new> method finds the file F<conf/global.conf> relative to the given ROOT
-directory. After reading this file, it uses the C<$courseFiles{environment}>
-variable, if present, to locate the course environment file. If found, the file
-is read and added to the environment.
+Given the abbreviation for a status, return the name. Returns undef if the
+abbreviation is not found.
 
-=back
+=cut
 
-=head1 ACCESS
+sub status_abbrev_to_name {
+	my ($ce, $status_abbrev) = @_;
+	if (not defined $status_abbrev or $status_abbrev eq "") {
+		carp "status_abbrev_to_name: status_abbrev (first argument) must be defined and non-empty";
+		return;
+	}
+	
+	return $ce->{_status_abbrev_to_name}{$status_abbrev};
+}
 
-There are no formal accessor methods. However, since the course environemnt is
-a hash of hashes and arrays, is exists as the self hash of an instance
-variable:
+=item status_name_to_abbrevs($status_name)
+
+Returns the list of abbreviations for a given status. Returns an empty list if
+the status is not found.
+
+=cut
 
-	$courseEnvironment->{someKey}->{someOtherKey};
+sub status_name_to_abbrevs {
+	my ($ce, $status_name) = @_;
+	if (not defined $status_name or $status_name eq "") {
+		carp "status_name_to_abbrevs: status_name (first argument) must be defined and non-empty";
+		return;
+	}
+	
+	return unless exists $ce->{statuses}{$status_name};
+	return @{$ce->{statuses}{$status_name}{abbrevs}};
+}
 
-=head1 AUTHOR
+=item status_has_behavior($status_name, $behavior)
 
-Written by Sam Hathaway, sh002i (at) math.rochester.edu.
+Return true if $status_name lists $behavior.
 
 =cut
+
+sub status_has_behavior {
+	my ($ce, $status_name, $behavior) = @_;
+	if (not defined $status_name or $status_name eq "") {
+		carp "status_has_behavior: status_name (first argument) must be defined and non-empty";
+		return;
+	}
+	if (not defined $behavior or $behavior eq "") {
+		carp "status_has_behavior: behavior (second argument) must be defined and non-empty";
+		return;
+	}
+	
+	if (exists $ce->{statuses}{$status_name}) {
+		if (exists $ce->{statuses}{$status_name}{behaviors}) {
+			my $num_matches = grep { $_ eq $behavior } @{$ce->{statuses}{$status_name}{behaviors}};
+			return $num_matches > 0;
+		} else {
+			return 0; # no behaviors
+		}
+	} else {
+		warn "status '$status_name' not found in \%statuses -- assuming no behaviors.\n";
+		return 0;
+	}
+}
+
+=item status_abbrev_has_behavior($status_abbrev, $behavior)
+
+Return true if the status abbreviated by $status_abbrev lists $behavior.
+
+=cut
+
+sub status_abbrev_has_behavior {
+	my ($ce, $status_abbrev, $behavior) = @_;
+	if (not defined $status_abbrev or $status_abbrev eq "") {
+		carp "status_abbrev_has_behavior: status_abbrev (first argument) must be defined and non-empty";
+		return;
+	}
+	if (not defined $behavior or $behavior eq "") {
+		carp "status_abbrev_has_behavior: behavior (second argument) must be defined and non-empty";
+		return;
+	}
+	
+	my $status_name = $ce->status_abbrev_to_name($status_abbrev);
+	if (defined $status_name) {
+		return $ce->status_has_behavior($status_name, $behavior);
+	} else {
+		warn "status abbreviation '$status_abbrev' not found in \%statuses -- assuming no behaviors.\n";
+	}
+}
+
+=back
+
+=cut
+
+1;
+
+# perl doesn't look like line noise. line noise has way more alphanumerics.
diff --git a/lib/WeBWorK/DB.pm b/lib/WeBWorK/DB.pm
index 8bf54e3d44..ed899a2e81 100644
--- a/lib/WeBWorK/DB.pm
+++ b/lib/WeBWorK/DB.pm
@@ -1,7 +1,7 @@
 ################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader: webwork-modperl/lib/WeBWorK/DB.pm,v 1.42 2003/12/12 20:23:26 sh002i Exp $
+# WeBWorK Online Homework Delivery System>
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/DB.pm,v 1.111 2010/05/19 01:44:05 gage 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
@@ -22,7 +22,7 @@ WeBWorK::DB - interface with the WeBWorK databases.
 
 =head1 SYNOPSIS
 
- my $db = WeBWorK::DB->new($courseEnvironment);
+ my $db = WeBWorK::DB->new($dbLayout);
  
  my @userIDs = $db->listUsers();
  my $Sam = $db->{user}->{record}->new();
@@ -44,8 +44,8 @@ WeBWorK::DB - interface with the WeBWorK databases.
 WeBWorK::DB provides a consistent interface to a number of database backends.
 Access and modification functions are provided for each logical table used by
 the webwork system. The particular backend ("schema" and "driver"), record
-class, data source, and additional parameters are specified by the C<%dbLayout>
-hash in the course environment.
+class, data source, and additional parameters are specified by the hash
+referenced by C<$dbLayout>, usually taken from the course environment.
 
 =head1 ARCHITECTURE
 
@@ -67,64 +67,21 @@ listed below, and uses schema modules (via tables) to implement those methods.
 
 The middle layer of the architecture is provided by one or more schema modules.
 They are called "schema" modules because they control the structure of the data
-for a table. This includes odd things like the way multiple tables are encoded
-in a single hash in the WW1Hash schema, and the encoding scheme used.
+for a table.
 
 The schema modules provide an API that matches the requirements of the DB
 layer, on a per-table basis. Each schema module has a style that determines
-which drivers it can interface with. For example, WW1Hash is a "hash" style
-schema. SQL is a "dbi" style schema.
-
-=head3 Examples
-
-Both WeBWorK 1.x and 2.x courses use:
-
-  / password  permission  key \        / user \      <- tables provided
- +-----------------------------+  +----------------+
- |          Auth1Hash          |  | Classlist1Hash |
- +-----------------------------+  +----------------+
-             \ hash /                  \ hash /      <- driver style required
-
-WeBWorK 1.x courses also use:
-
-  / set_user problem_user \       / set problem \    
- +-------------------------+  +---------------------+
- |         WW1Hash         |  | GlobalTableEmulator |
- +-------------------------+  +---------------------+
-           \ hash /                   \ null /       
-
-The GlobalTableEmulator schema emulates the global set and problem tables using
-data from the set_user and problem_user tables.
-
-WeBWorK 2.x courses also use:
-
-  / set set_user problem problem_user \ 
- +-------------------------------------+
- |               WW2Hash               |
- +-------------------------------------+
-                 \ hash /               
+which drivers it can interface with. For example, SQL is an "dbi" style
+schema.
 
 =head2 Bottom Layer: Drivers
 
 Driver modules implement a style for a schema. They provide physical access to
 a data source containing the data for a table. The style of a driver determines
 what methods it provides. All drivers provide C<connect(MODE)> and
-C<disconnect()> methods. A hash style driver provides a C<hash()> method which
-returns the tied hash. A dbi style driver provides a C<handle()> method which
+C<disconnect()> methods. A dbi style driver provides a C<handle()> method which
 returns the DBI handle.
 
-=head3 Examples
-
-  / hash \    / hash \    / hash \  <- style
- +--------+  +--------+  +--------+
- |   DB   |  |  GDBM  |  |   DB3  |
- +--------+  +--------+  +--------+
-
-  / dbi \    / ldap \ 
- +-------+  +--------+
- |  SQL  |  |  LDAP  |
- +-------+  +--------+
-
 =head2 Record Types
 
 In C<%dblayout>, each table is assigned a record class, used for passing
@@ -140,9 +97,70 @@ use strict;
 use warnings;
 use Carp;
 use Data::Dumper;
-use WeBWorK::Timing;
+use Scalar::Util qw/blessed/;
+use WeBWorK::DB::Schema;
+use WeBWorK::DB::Utils qw/make_vsetID grok_vsetID grok_setID_from_vsetID_sql
+	grok_versionID_from_vsetID_sql/;
+use WeBWorK::Debug;
 use WeBWorK::Utils qw(runtime_use);
 
+=for comment
+
+These exceptions will replace the ones in WeBWorK::DB::Schema and will be
+allowed to propagate out to calling code. The following callers will have to be
+changed to catch these exceptions instead of doing string matching:
+
+lib/WebworkSOAP.pm:     if ($@ =~ m/user set exists/) {
+lib/WeBWorK/ContentGenerator/Instructor.pm:             if ($@ =~ m/user set exists/) {
+lib/WeBWorK/ContentGenerator/Instructor.pm:     if ( $@ =~ m/user set exists/ ) {
+lib/WeBWorK/ContentGenerator/Instructor.pm:             if ($@ =~ m/user problem exists/) {
+lib/WeBWorK/ContentGenerator/Instructor.pm:             if ($@ =~ m/user problem exists/) {
+lib/WeBWorK/ContentGenerator/Instructor.pm:                     next if $@ =~ m/user set exists/;
+lib/WeBWorK/Utils/DBImportExport.pm:                            if ($@ =~ m/exists/) {
+lib/WeBWorK/DB.pm:                              if ($@ and $@ !~ m/password exists/) {
+lib/WeBWorK/DB.pm:                              if ($@ and $@ !~ m/permission level exists/) {
+
+How these exceptions should be used:
+
+* RecordExists is thrown by the DBI error handler (handle_error in
+Schema::NewSQL::Std) when in INSERT fails because a record exists. Thus it can
+be thrown via addUser, addPassword, etc.
+
+* RecordNotFound should be thrown when we try to UPDATE and zero rows were
+affected. Problem: Frank Wolfs (UofR PAS) may have a MySQL server that returns 0
+when updating even when a record was modified. What's up with that? There's some
+question as to where we should throw this: in this file's put* methods? In
+Std.pm's put method? Or in update_fields and update_fields_i?
+
+* DependencyNotFound should be throws when we check for a record that is needed
+to insert another record (e.g. password depends on user). These checks are done
+in this file, so we'll throw this exception from there.
+
+=cut
+
+use Exception::Class (
+	'WeBWorK::DB::Ex' => {
+		description => 'unknown database error',
+	},
+	'WeBWorK::DB::Ex::RecordExists' => {
+		isa => 'WeBWorK::DB::Ex',
+		fields => ['type', 'key'],
+		description =>"record exists"
+	},
+	'WeBWorK::DB::Ex::RecordNotFound' => {
+		isa => 'WeBWorK::DB::Ex',
+		fields => ['type', 'key'],
+		description =>"record not found"
+	},
+	'WeBWorK::DB::Ex::DependencyNotFound' => {
+		isa => 'WeBWorK::DB::Ex::RecordNotFound',
+	},
+	'WeBWorK::DB::Ex::TableMissing' => {
+    	isa => 'WeBWorK::DB::Ex',
+    	description =>"missing table",
+	},
+);
+
 ################################################################################
 # constructor
 ################################################################################
@@ -151,18 +169,17 @@ use WeBWorK::Utils qw(runtime_use);
 
 =over
 
-=item new($ce)
+=item new($dbLayout)
 
-The C<new> method creates a DB object and brings up the underlying
-schema/driver structure according to the C<%dbLayout> hash in C<$ce>, a
-WeBWorK::CourseEnvironment object.
+The C<new> method creates a DB object and brings up the underlying schema/driver
+structure according to the hash referenced by C<$dbLayout>.
 
 =back
 
-=head2 C<%dbLayout> Format
+=head2 C<$dbLayout> Format
 
-The C<%dbLayout> hash consists of items keyed by table names. The value of each
-item is a reference to a hash containing the following items:
+C<$dbLayout> is a hash reference consisting of items keyed by table names. The
+value of each item is a reference to a hash containing the following items:
 
 =over
 
@@ -191,7 +208,7 @@ schema in question.
 
 =back
 
-For each table defined in C<%dbLayout>, C<new> loads the record, schema, and
+For each table defined in C<$dbLayout>, C<new> loads the record, schema, and
 driver modules. It the schema module's C<tables> method lists the current table
 (or contains the string "*") and the output of the schema and driver modules'
 C<style> methods match, the table is installed. Otherwise, an exception is
@@ -199,158 +216,383 @@ thrown.
 
 =cut
 
-sub new($$) {
-	my ($invocant, $ce) = @_;
+sub new {
+	my ($invocant, $dbLayout) = @_;
 	my $class = ref($invocant) || $invocant;
 	my $self = {};
 	bless $self, $class; # bless this here so we can pass it to the schema
 	
 	# load the modules required to handle each table, and create driver
-	my %dbLayout = %{$ce->{dbLayout}};
-	foreach my $table (keys %dbLayout) {
-		my $layout = $dbLayout{$table};
-		my $record = $layout->{record};
-		my $schema = $layout->{schema};
-		my $driver = $layout->{driver};
-		my $source = $layout->{source};
-		my $params = $layout->{params};
-		
-		runtime_use($record);
-		
-		runtime_use($driver);
-		my $driverObject = eval { $driver->new($source, $params) };
-		croak "error instantiating DB driver $driver for table $table: $@"
-			if $@;
-		
-		runtime_use($schema);
-		my $schemaObject = eval { $schema->new(
-			$self, $driver->new($source, $params),
-			$table, $record, $params) };
-		croak "error instantiating DB schema $schema for table $table: $@"
-			if $@;
-		
-		$self->{$table} = $schemaObject;
+	foreach my $table (keys %$dbLayout) {
+		$self->init_table($dbLayout, $table);
 	}
 	
 	return $self;
 }
 
-=head1 METHODS
-
-=cut
+sub init_table {
+	my ($self, $dbLayout, $table) = @_;
+	
+	if (exists $self->{$table}) {
+		if (defined $self->{$table}) {
+			return;
+		} else {
+			die "loop in dbLayout table dependencies involving table '$table'\n";
+		}
+	}
+	
+	my $layout = $dbLayout->{$table};
+	my $record = $layout->{record};
+	my $schema = $layout->{schema};
+	my $driver = $layout->{driver};
+	my $source = $layout->{source};
+	my $depend = $layout->{depend};
+	my $params = $layout->{params};
+	
+	# add a key for this table to the self hash, but don't define it yet
+	# this for loop detection
+	$self->{$table} = undef;
+	
+	if ($depend) {
+		foreach my $dep (@$depend) {
+			$self->init_table($dbLayout, $dep);
+		}
+	}
+	
+	runtime_use($record);
+	
+	runtime_use($driver);
+	my $driverObject = eval { $driver->new($source, $params) };
+	croak "error instantiating DB driver $driver for table $table: $@"
+		if $@;
+	
+	runtime_use($schema);
+	my $schemaObject = eval { $schema->new(
+		$self, $driverObject, $table, $record, $params) };
+	croak "error instantiating DB schema $schema for table $table: $@"
+		if $@;
+	
+	$self->{$table} = $schemaObject;
+}
 
 ################################################################################
-# password functions
+# methods that can be autogenerated
 ################################################################################
 
-=head2 Password Methods
+sub gen_schema_accessor {
+	my $schema = shift;
+	return sub { shift->{$schema} };
+}
 
-=over
+sub gen_new {
+	my $table = shift;
+	return sub { shift->{$table}{record}->new(@_) };
+}
+
+sub gen_count_where {
+	my $table = shift;
+	return sub {
+		my ($self, $where) = @_;
+		return $self->{$table}->count_where($where);
+	};
+}
 
-=item newPassword()
+sub gen_exists_where {
+	my $table = shift;
+	return sub {
+		my ($self, $where) = @_;
+		return $self->{$table}->exists_where($where);
+	};
+}
 
-Returns a new, empty password object.
+sub gen_list_where {
+	my $table = shift;
+	return sub {
+		my ($self, $where, $order) = @_;
+		if (wantarray) {
+			return $self->{$table}->list_where($where, $order);
+		} else {
+			return $self->{$table}->list_where_i($where, $order);
+		}
+	};
+}
 
-=cut 
+sub gen_get_records_where {
+	my $table = shift;
+	return sub {
+		my ($self, $where, $order) = @_;
+		if (wantarray) {
+			return $self->{$table}->get_records_where($where, $order);
+		} else {
+			return $self->{$table}->get_records_where_i($where, $order);
+		}
+	};
+}
 
-sub newPassword {
-	my ($self, @prototype) = @_;
-	return $self->{password}->{record}->new(@prototype);
+sub gen_insert_records {
+	my $table = shift;
+	return sub {
+		my ($self, @records) = @_;
+		if (@records == 1 and blessed $records[0] and $records[0]->isa("Iterator")) {
+			return $self->{$table}->insert_records_i($records[0]);
+		} else {
+			return $self->{$table}->insert_records(@records);
+		}
+	};
 }
 
-=item listPasswords()
+sub gen_update_records {
+	my $table = shift;
+	return sub {
+		my ($self, @records) = @_;
+		if (@records == 1 and blessed $records[0] and $records[0]->isa("Iterator")) {
+			return $self->{$table}->update_records_i($records[0]);
+		} else {
+			return $self->{$table}->update_records(@records);
+		}
+	};
+}
 
-Returns a list of user IDs representing the records in the password table.
+sub gen_delete_where {
+	my $table = shift;
+	return sub {
+		my ($self, $where) = @_;
+		return $self->{$table}->delete_where($where);
+	};
+}
 
-=cut
+################################################################################
+# create/rename/delete/dump/restore tables
+################################################################################
 
-sub listPasswords {
+sub create_tables {
 	my ($self) = @_;
 	
-	croak "listPasswords: requires 0 arguments"
-		unless @_ == 1;
+	foreach my $table (keys %$self) {
+		next if $table =~ /^_/; # skip non-table self fields (none yet)
+		next if $self->{$table}{params}{non_native}; # skip non-native tables
+		my $schema_obj = $self->{$table};
+		if ($schema_obj->can("create_table")) {
+			$schema_obj->create_table;
+		} else {
+			warn "skipping creation of '$table' table: no create_table method\n";
+		}
+	}
+	
+	return 1;
+}
+
+sub rename_tables {
+	my ($self, $new_dblayout) = @_;
+	
+	foreach my $table (keys %$self) {
+		next if $table =~ /^_/; # skip non-table self fields (none yet)
+		next if $self->{$table}{params}{non_native}; # skip non-native tables
+		my $schema_obj = $self->{$table};
+		if (exists $new_dblayout->{$table}) {
+			if ($schema_obj->can("rename_table")) {
+				# we look into the new dblayout to determine the new table names
+				my $new_sql_table_name = defined $new_dblayout->{$table}{params}{tableOverride}
+					? $new_dblayout->{$table}{params}{tableOverride}
+					: $table;
+				$schema_obj->rename_table($new_sql_table_name);
+			} else {
+				warn "skipping renaming of '$table' table: no rename_table method\n";
+			}
+		} else {
+			warn "skipping renaming of '$table' table: table doesn't exist in new dbLayout\n";
+		}
+	}
 	
-	return map { $_->[0] }
-		$self->{password}->list(undef);
+	return 1;
 }
 
-=item addPassword($Password)
-
-$Password is a record object. The password will be added to the password table
-if a password with the same user ID does not already exist. If one does exist,
-an exception is thrown. To add a password, a user with a matching user ID must
-exist in the user table.
-
-=cut
+sub delete_tables {
+	my ($self) = @_;
+	
+	foreach my $table (keys %$self) {
+		next if $table =~ /^_/; # skip non-table self fields (none yet)
+		next if $self->{$table}{params}{non_native}; # skip non-native tables
+		my $schema_obj = $self->{$table};
+		if ($schema_obj->can("delete_table")) {
+			$schema_obj->delete_table;
+		} else {
+			warn "skipping deletion of '$table' table: no delete_table method\n";
+		}
+	}
+	
+	return 1;
+}
 
-sub addPassword {
-	my ($self, $Password) = @_;
+sub dump_tables {
+	my ($self, $dump_dir) = @_;
 	
-	croak "addPassword: requires 1 argument"
-		unless @_ == 2;
-	croak "addPassword: argument 1 must be of type ", $self->{password}->{record}
-		unless ref $Password eq $self->{password}->{record};
+	foreach my $table (keys %$self) {
+		next if $table =~ /^_/; # skip non-table self fields (none yet)
+		next if $self->{$table}{params}{non_native}; # skip non-native tables
+		my $schema_obj = $self->{$table};
+		if ($schema_obj->can("dump_table")) {
+			my $dump_file = "$dump_dir/$table.sql";
+			$schema_obj->dump_table($dump_file);
+		} else {
+			warn "skipping dump of '$table' table: no dump_table method\n";
+		}
+	}
 	
-	checkKeyfields($Password);
+	return 1;
+}
+
+sub restore_tables {
+	my ($self, $dump_dir) = @_;
 	
-	croak "addPassword: password exists (perhaps you meant to use putPassword?)"
-		if $self->{password}->exists($Password->user_id);
-	croak "addPassword: user ", $Password->user_id, " not found"
-		unless $self->{user}->exists($Password->user_id);
+	foreach my $table (keys %$self) {
+		next if $table =~ /^_/; # skip non-table self fields (none yet)
+		next if $self->{$table}{params}{non_native}; # skip non-native tables
+		my $schema_obj = $self->{$table};
+		if ($schema_obj->can("restore_table")) {
+			my $dump_file = "$dump_dir/$table.sql";
+			$schema_obj->restore_table($dump_file);
+		} else {
+			warn "skipping restore of '$table' table: no restore_table method\n";
+		}
+	}
 	
-	return $self->{password}->add($Password);
+	return 1;
 }
 
-=item getPassword($userID)
+################################################################################
+# user functions
+################################################################################
 
-If a record with a matching user ID exists, a record object containting that
-record's data will be returned. If no such record exists, one will be created.
+BEGIN {
+	*User = gen_schema_accessor("user");
+	*newUser = gen_new("user");
+	*countUsersWhere = gen_count_where("user");
+	*existsUserWhere = gen_exists_where("user");
+	*listUsersWhere = gen_list_where("user");
+	*getUsersWhere = gen_get_records_where("user");
+}
 
-=cut
+sub countUsers { return scalar shift->listUsers(@_) }
 
-sub getPassword {
-	my ($self, $userID) = @_;
-	
-	croak "getPassword: requires 1 argument"
-		unless @_ == 2;
-	croak "getPassword: argument 1 must contain a user_id"
-		unless defined $userID;
-	
-	#return $self->{password}->get($userID);
-	return ( $self->getPasswords($userID) )[0];
+sub listUsers {
+	my ($self) = shift->checkArgs(\@_);
+	if (wantarray) {
+		return map { @$_ } $self->{user}->get_fields_where(["user_id"]);
+	} else {
+		return $self->{user}->count_where;
+	}
 }
 
-=item getPasswords(@uesrIDs)
+sub existsUser {
+	my ($self, $userID) = shift->checkArgs(\@_, qw/user_id/);
+	return $self->{user}->exists($userID);
+}
 
-Return a list of password records associated with the user IDs given. If there
-is no record associated with a given user ID, one will be created.
+sub getUser {
+	my ($self, $userID) = shift->checkArgs(\@_, qw/user_id/);
+	return ( $self->getUsers($userID) )[0];
+}
 
-=cut
+sub getUsers {
+	my ($self, @userIDs) = shift->checkArgs(\@_, qw/user_id*/);
+	return $self->{user}->gets(map { [$_] } @userIDs);
+}
 
-sub getPasswords {
-	my ($self, @userIDs) = @_;
-	
-	#croak "getPasswords: requires 1 or more argument"
-	#	unless @_ >= 2;
-	foreach my $i (0 .. $#userIDs) {
-		croak "getPasswords: element $i of argument list must contain a user_id"
-			unless defined $userIDs[$i];
+sub addUser {
+	my ($self, $User) = shift->checkArgs(\@_, qw/REC:user/);
+	eval {
+		return $self->{user}->add($User);
+	};
+	if (my $ex = caught WeBWorK::DB::Ex::RecordExists) {
+		croak "addUser: user exists (perhaps you meant to use putUser?)";
+	} elsif ($@) {
+		die $@;
+	}
+	# FIXME about these exceptions: eventually the exceptions should be part of
+	# WeBWorK::DB rather than WeBWorK::DB::Schema, and we should just let them
+	# through to the calling code. however, right now we have code that checks
+	# for the string "... exists" in the error message, so we need to convert
+	# here.
+	# 
+	# WeBWorK::DB::Ex::RecordExists
+	# WeBWorK::DB::Ex::DependencyNotFound - i.e. inserting a password for a nonexistent user
+	# ?
+}
+
+sub putUser {
+	my ($self, $User) = shift->checkArgs(\@_, qw/REC:user/);
+	my $rows = $self->{user}->put($User); # DBI returns 0E0 for 0.
+	if ($rows == 0) {
+		croak "putUser: user not found (perhaps you meant to use addUser?)";
+	} else {
+		return $rows;
+	}
+}
+
+sub deleteUser {
+	my ($self, $userID) = shift->checkArgs(\@_, qw/user_id/);
+	$self->deleteUserSet($userID, undef);
+	$self->deletePassword($userID);
+	$self->deletePermissionLevel($userID);
+	$self->deleteKey($userID);
+	return $self->{user}->delete($userID);
+}
+
+################################################################################
+# password functions
+################################################################################
+
+BEGIN {
+	*Password = gen_schema_accessor("password");
+	*newPassword = gen_new("password");
+	*countPasswordsWhere = gen_count_where("password");
+	*existsPasswordWhere = gen_exists_where("password");
+	*listPasswordsWhere = gen_list_where("password");
+	*getPasswordsWhere = gen_get_records_where("password");
+}
+
+sub countPasswords { return scalar shift->countPasswords(@_) }
+
+sub listPasswords {
+	my ($self) = shift->checkArgs(\@_);
+	if (wantarray) {
+		return map { @$_ } $self->{password}->get_fields_where(["user_id"]);
+	} else {
+		return $self->{password}->count_where;
 	}
+}
+
+sub existsPassword {
+	my ($self, $userID) = shift->checkArgs(\@_, qw/user_id/);
+	# FIXME should we claim that a password exists if the user exists, since
+	# password records are auto-created?
+	return $self->{password}->exists($userID);
+}
+
+sub getPassword {
+	my ($self, $userID) = shift->checkArgs(\@_, qw/user_id/);
+	return ( $self->getPasswords($userID) )[0];
+}
+
+sub getPasswords {
+	my ($self, @userIDs) = shift->checkArgs(\@_, qw/user_id*/);
 	
 	my @Passwords = $self->{password}->gets(map { [$_] } @userIDs);
 	
+	# AUTO-CREATE missing password records
+	# (this code is duplicated in getPermissionLevels, below)
 	for (my $i = 0; $i < @Passwords; $i++) {
 		my $Password = $Passwords[$i];
 		my $userID = $userIDs[$i];
 		if (not defined $Password) {
-			#warn "not defined\n";
 			if ($self->{user}->exists($userID)) {
-				#warn "user exists\n";
 				$Password = $self->newPassword(user_id => $userID);
 				eval { $self->addPassword($Password) };
 				if ($@ and $@ !~ m/password exists/) {
-					die "error while auto-creating password record for user $userID: \"$@\"";
+					die "error while auto-creating password record for user $userID: $@";
 				}
+				$Passwords[$i] = $Password;
 			}
 		}
 	}
@@ -358,167 +600,92 @@ sub getPasswords {
 	return @Passwords;
 }
 
-=item putPassword($Password)
-
-$Password is a record object. If a password record with the same user ID exists
-in the password table, the data in the record is replaced with the data in
-$Password. If a matching password record does not exist, an exception is
-thrown.
-
-=cut
-
-sub putPassword($$) {
-	my ($self, $Password) = @_;
-	
-	croak "putPassword: requires 1 argument"
-		unless @_ == 2;
-	croak "putPassword: argument 1 must be of type ", $self->{password}->{record}
-		unless ref $Password eq $self->{password}->{record};
-	
-	checkKeyfields($Password);
+sub addPassword {
+	my ($self, $Password) = shift->checkArgs(\@_, qw/REC:password/);
 	
-	croak "putPassword: password not found (perhaps you meant to use addPassword?)"
-		unless $self->{password}->exists($Password->user_id);
+	croak "addPassword: user ", $Password->user_id, " not found"
+		unless $self->{user}->exists($Password->user_id);
 	
-	return $self->{password}->put($Password);
+	eval {
+		return $self->{password}->add($Password);
+	};
+	if (my $ex = caught WeBWorK::DB::Ex::RecordExists) {
+		croak "addPassword: password exists (perhaps you meant to use putPassword?)";
+	} elsif ($@) {
+		die $@;
+	}
 }
 
-=item deletePassword($userID)
-
-If a password record with a user ID matching $userID exists in the password
-table, it is removed and the method returns a true value. If one does exist,
-a false value is returned.
-
-=cut
+sub putPassword {
+	my ($self, $Password) = shift->checkArgs(\@_, qw/REC:password/);
+	my $rows = $self->{password}->put($Password); # DBI returns 0E0 for 0.
+	if ($rows == 0) {
+		# AUTO-CREATE permission level records
+		return $self->addPassword($Password);
+	} else {
+		return $rows;
+	}
+}
 
-sub deletePassword($$) {
-	my ($self, $userID) = @_;
-	
-	croak "putPassword: requires 1 argument"
-		unless @_ == 2;
-	croak "deletePassword: argument 1 must contain a user_id"
-		unless defined $userID;
-	
+sub deletePassword {
+	my ($self, $userID) = shift->checkArgs(\@_, qw/user_id/);
 	return $self->{password}->delete($userID);
 }
 
-=back
-
-=cut
-
 ################################################################################
 # permission functions
 ################################################################################
 
-=head2 Permission Level Methods
-
-=over
-
-=item newPermissionLevel()
-
-Returns a new, empty permission level object.
-
-=cut 
-
-sub newPermissionLevel {
-	my ($self, @prototype) = @_;
-	return $self->{permission}->{record}->new(@prototype);
+BEGIN {
+	*PermissionLevel = gen_schema_accessor("permission");
+	*newPermissionLevel = gen_new("permission");
+	*countPermissionLevelsWhere = gen_count_where("permission");
+	*existsPermissionLevelWhere = gen_exists_where("permission");
+	*listPermissionLevelsWhere = gen_list_where("permission");
+	*getPermissionLevelsWhere = gen_get_records_where("permission");
 }
 
-=item listPermissionLevels()
+sub countPermissionLevels { return scalar shift->listPermissionLevels(@_) }
 
-Returns a list of user IDs representing the records in the permission table.
-
-=cut
-
-sub listPermissionLevels($) {
-	my ($self) = @_;
-	
-	croak "listPermissionLevels: requires 0 arguments"
-		unless @_ == 1;
-	
-	return map { $_->[0] }
-		$self->{permission}->list(undef);
+sub listPermissionLevels {
+	my ($self) = shift->checkArgs(\@_);
+	if (wantarray) {
+		return map { @$_ } $self->{permission}->get_fields_where(["user_id"]);
+	} else {
+		return $self->{permission}->count_where;
+	}
 }
 
-=item addPermissionLevel($PermissionLevel)
-
-$PermissionLevel is a record object. The permission level will be added to the
-permission table if a permission level with the same user ID does not already
-exist. If one does exist, an exception is thrown. To add a permission level, a
-user with a matching user ID must exist in the user table.
-
-=cut
-
-sub addPermissionLevel($$) {
-	my ($self, $PermissionLevel) = @_;
-	
-	croak "addPermissionLevel: requires 1 argument"
-		unless @_ == 2;
-	croak "addPermissionLevel: argument 1 must be of type ", $self->{permission}->{record}
-		unless ref $PermissionLevel eq $self->{permission}->{record};
-	
-	checkKeyfields($PermissionLevel);
-	
-	croak "addPermissionLevel: permission level exists (perhaps you meant to use putPermissionLevel?)"
-		if $self->{permission}->exists($PermissionLevel->user_id);
-	croak "addPermissionLevel: user ", $PermissionLevel->user_id, " not found"
-		unless $self->{user}->exists($PermissionLevel->user_id);
-	
-	return $self->{permission}->add($PermissionLevel);
+sub existsPermissionLevel {
+	my ($self, $userID) = shift->checkArgs(\@_, qw/user_id/);
+	# FIXME should we claim that a permission level exists if the user exists,
+	# since password records are auto-created?
+	return $self->{permission}->exists($userID);
 }
 
-=item getPermissionLevel($userID)
-
-If a record with a matching user ID exists, a record object containting that
-record's data will be returned. If no such record exists, one will be created.
-
-=cut
-
-sub getPermissionLevel($$) {
-	my ($self, $userID) = @_;
-	
-	croak "getPermissionLevel: requires 1 argument"
-		unless @_ == 2;
-	croak "getPermissionLevel: argument 1 must contain a user_id"
-		unless defined $userID;
-	
-	#return $self->{permission}->get($userID);
+sub getPermissionLevel {
+	my ($self, $userID) = shift->checkArgs(\@_, qw/user_id/);
 	return ( $self->getPermissionLevels($userID) )[0];
 }
 
-=item getPermissionLevels(@uesrIDs)
-
-Return a list of permission level records associated with the user IDs given. If
-there is no record associated with a given user ID, one will be created.
-
-=cut
-
 sub getPermissionLevels {
-	my ($self, @userIDs) = @_;
-	
-	#croak "getPermissionLevels: requires 1 or more argument"
-	#	unless @_ >= 2;
-	foreach my $i (0 .. $#userIDs) {
-		croak "getPermissionLevels: element $i of argument list must contain a user_id"
-			unless defined $userIDs[$i];
-	}
+	my ($self, @userIDs) = shift->checkArgs(\@_, qw/user_id*/);
 	
 	my @PermissionLevels = $self->{permission}->gets(map { [$_] } @userIDs);
 	
+	# AUTO-CREATE missing permission level records
+	# (this code is duplicated in getPasswords, above)
 	for (my $i = 0; $i < @PermissionLevels; $i++) {
 		my $PermissionLevel = $PermissionLevels[$i];
 		my $userID = $userIDs[$i];
 		if (not defined $PermissionLevel) {
-			#warn "not defined\n";
 			if ($self->{user}->exists($userID)) {
-				#warn "user exists\n";
 				$PermissionLevel = $self->newPermissionLevel(user_id => $userID);
-				warn $PermissionLevel->toString, "\n";
 				eval { $self->addPermissionLevel($PermissionLevel) };
 				if ($@ and $@ !~ m/permission level exists/) {
-					die "error while auto-creating permission level record for user $userID: \"$@\"";
+					die "error while auto-creating permission level record for user $userID: $@";
 				}
+				$PermissionLevels[$i] = $PermissionLevel;
 			}
 		}
 	}
@@ -526,47 +693,35 @@ sub getPermissionLevels {
 	return @PermissionLevels;
 }
 
-=item putPermissionLevel($PermissionLevel)
-
-$PermissionLevel is a record object. If a permission level record with the same
-user ID exists in the permission table, the data in the record is replaced with
-the data in $PermissionLevel. If a matching permission level record does not
-exist, an exception is thrown.
-
-=cut
-
-sub putPermissionLevel($$) {
-	my ($self, $PermissionLevel) = @_;
-	
-	croak "putPermissionLevel: requires 1 argument"
-		unless @_ == 2;
-	croak "putPermissionLevel: argument 1 must be of type ", $self->{permission}->{record}
-		unless ref $PermissionLevel eq $self->{permission}->{record};
-	
-	checkKeyfields($PermissionLevel);
+sub addPermissionLevel {
+	my ($self, $PermissionLevel) = shift->checkArgs(\@_, qw/REC:permission/);
 	
-	croak "putPermissionLevel: permission level not found (perhaps you meant to use addPermissionLevel?)"
-		unless $self->{permission}->exists($PermissionLevel->user_id);
+	croak "addPermissionLevel: user ", $PermissionLevel->user_id, " not found"
+		unless $self->{user}->exists($PermissionLevel->user_id);
 	
-	return $self->{permission}->put($PermissionLevel);
+	eval {
+		return $self->{permission}->add($PermissionLevel);
+	};
+	if (my $ex = caught WeBWorK::DB::Ex::RecordExists) {
+		croak "addPermissionLevel: permission level exists (perhaps you meant to use putPermissionLevel?)";
+	} elsif ($@) {
+		die $@;
+	}
 }
 
-=item deletePermissionLevel($userID)
-
-If a permission level record with a user ID matching $userID exists in the
-permission table, it is removed and the method returns a true value. If one
-does exist, a false value is returned.
-
-=cut
+sub putPermissionLevel {
+	my ($self, $PermissionLevel) = shift->checkArgs(\@_, qw/REC:permission/);
+	my $rows = $self->{permission}->put($PermissionLevel); # DBI returns 0E0 for 0.
+	if ($rows == 0) {
+		# AUTO-CREATE permission level records
+		return $self->addPermissionLevel($PermissionLevel);
+	} else {
+		return $rows;
+	}
+}
 
-sub deletePermissionLevel($$) {
-	my ($self, $userID) = @_;
-	
-	croak "deletePermissionLevel: requires 1 argument"
-		unless @_ == 2;
-	croak "deletePermissionLevel: argument 1 must contain a user_id"
-		unless defined $userID;
-	
+sub deletePermissionLevel {
+	my ($self, $userID) = shift->checkArgs(\@_, qw/user_id/);
 	return $self->{permission}->delete($userID);
 }
 
@@ -574,1138 +729,1329 @@ sub deletePermissionLevel($$) {
 # key functions
 ################################################################################
 
-=head2 Key Methods
-
-=over
-
-=item newKey()
-
-Returns a new, empty key object.
+BEGIN {
+	*Key = gen_schema_accessor("key");
+	*newKey = gen_new("key");
+	*countKeysWhere = gen_count_where("key");
+	*existsKeyWhere = gen_exists_where("key");
+	*listKeysWhere = gen_list_where("key");
+	*getKeysWhere = gen_get_records_where("key");
+}
 
-=cut 
+sub countKeys { return scalar shift->listKeys(@_) }
 
-sub newKey {
-	my ($self, @prototype) = @_;
-	return $self->{key}->{record}->new(@prototype);
+sub listKeys {
+	my ($self) = shift->checkArgs(\@_);
+	if (wantarray) {
+		return map { @$_ } $self->{key}->get_fields_where(["user_id"]);
+	} else {
+		return $self->{key}->count_where;
+	}
 }
 
-=item listKeys()
+sub existsKey {
+	my ($self, $userID) = shift->checkArgs(\@_, qw/user_id/);
+	return $self->{key}->exists($userID);
+}
 
-Returns a list of user IDs representing the records in the key table.
+sub getKey {
+	my ($self, $userID) = shift->checkArgs(\@_, qw/user_id/);
+	return ( $self->getKeys($userID) )[0];
+}
 
-=cut
+sub getKeys {
+	my ($self, @userIDs) = shift->checkArgs(\@_, qw/user_id*/);
+	return $self->{key}->gets(map { [$_] } @userIDs);
+}
 
-sub listKeys($) {
-	my ($self) = @_;
-	
-	croak "listKeys: requires 0 arguments"
-		unless @_ == 1;
+sub addKey {
+	# PROCTORING - allow comma in keyfields
+	my ($self, $Key) = shift->checkArgs(\@_, qw/VREC:key/);
+	
+	# PROCTORING -  check for both user and proctor
+	# we allow for two entries for proctor keys, one of the form 
+	#    userid,proctorid (which authorizes login), and the other 
+	#    of the form userid,proctorid,g (which authorizes grading)
+	# (having two of these means that a proctored test will require 
+	#    authorization for both login and grading).
+	if ($Key->user_id =~ /([^,]+)(?:,([^,]*))?(,g)?/) {
+		my ($userID, $proctorID) = ($1, $2);
+		croak "addKey: user $userID not found"
+			unless $self->{user}->exists($userID);
+		croak "addKey: proctor $proctorID not found"
+			unless $self->{user}->exists($proctorID);
+	} else {
+		croak "addKey: user ", $Key->user_id, " not found"
+			unless $self->{user}->exists($Key->user_id);
+	}
 	
-	return map { $_->[0] }
-		$self->{key}->list(undef);
+	eval {
+		return $self->{key}->add($Key);
+	};
+	if (my $ex = caught WeBWorK::DB::Ex::RecordExists) {
+		croak "addKey: key exists (perhaps you meant to use putKey?)";
+	} elsif ($@) {
+		die $@;
+	}
 }
 
-=item addKey($Key)
+sub putKey {
+	# PROCTORING - allow comma in keyfields
+	my ($self, $Key) = shift->checkArgs(\@_, qw/VREC:key/);
+	my $rows = $self->{key}->put($Key); # DBI returns 0E0 for 0.
+	if ($rows == 0) {
+		croak "putKey: key not found (perhaps you meant to use addKey?)";
+	} else {
+		return $rows;
+	}
+}
 
-$Key is a record object. The key will be added to the key table if a key with
-the same user ID does not already exist. If one does exist, an exception is
-thrown. To add a key, a user with a matching user ID must exist in the user
-table.
+sub deleteKey {
+	my ($self, $userID) = shift->checkArgs(\@_, qw/user_id/);
+	return $self->{key}->delete($userID);
+}
 
-=cut
+sub deleteAllProctorKeys {
+	my ($self, $userID) = shift->checkArgs(\@_, qw/user_id/);
+	my $where = [user_id_like => "$userID,%"];
 
-sub addKey($$) {
-	my ($self, $Key) = @_;
-	
-	croak "addKey: requires 1 argument"
-		unless @_ == 2;
-	croak "addKey: argument 1 must be of type ", $self->{key}->{record}
-		unless ref $Key eq $self->{key}->{record};
-	
-	checkKeyfields($Key);
-	
-	croak "addKey: key exists (perhaps you meant to use putKey?)"
-		if $self->{key}->exists($Key->user_id);
-	croak "addKey: user ", $Key->user_id, " not found"
-		unless $self->{user}->exists($Key->user_id);
-	
-	return $self->{key}->add($Key);
+	return $self->{key}->delete_where($where);
 }
 
-=item getKey($userID)
+################################################################################
+# setting functions
+################################################################################
 
-If a record with a matching user ID exists, a record object containting that
-record's data will be returned. If no such record exists, an undefined value
-will be returned.
+BEGIN {
+	*Setting = gen_schema_accessor("setting");
+	*newSetting = gen_new("setting");
+	*countSettingsWhere = gen_count_where("setting");
+	*existsSettingWhere = gen_exists_where("setting");
+	*listSettingsWhere = gen_list_where("setting");
+	*getSettingsWhere = gen_get_records_where("setting");
+	*addSettings = gen_insert_records("setting");
+	*putSettings = gen_update_records("setting");
+	*deleteSettingsWhere = gen_delete_where("setting");
+}
+
+# minimal set of routines for basic setting operation
+# we don't need a full set, since the usage of settings is somewhat limited
+# we also don't want to bother with records, since a setting is just a pair
+
+sub settingExists {
+	my ($self, $name) = @_;
+	return $self->{setting}->exists_where([name_eq=>$name]);
+}
+
+sub getSettingValue {
+	my ($self, $name) = @_;
+	return map { @$_ } $self->{setting}->get_fields_where(['value'], [name_eq=>$name]);
+}
+
+# we totally don't care if a setting already exists (and in fact i find that
+# whole distinction somewhat annoying lately) so we hide the fact that we're
+# either calling insert or update. at some point we could stand to add a
+# method to Std.pm that used REPLACE INTO and then we'd be able to not care
+# at all whether a setting was already there
+sub setSettingValue {
+	my ($self, $name, $value) = @_;
+	if ($self->settingExists($name)) {
+		return $self->{setting}->update_where({value=>$value}, [name_eq=>$name]);
+	} else {
+		return $self->{setting}->insert_fields(['name','value'], [[$name,$value]]);
+	}
+}
 
-=cut
-
-sub getKey($$) {
-	my ($self, $userID) = @_;
-	
-	croak "getKey: requires 1 argument"
-		unless @_ == 2;
-	croak "getKey: argument 1 must contain a user_id"
-		unless defined $userID;
-	
-	return $self->{key}->get($userID);
+sub deleteSetting {
+	my ($self, $name) = shift->checkArgs(\@_, qw/name/);
+	return $self->{setting}->delete_where([name_eq=>$name]);
 }
 
-=item getKeys(@uesrIDs)
+################################################################################
+# locations functions
+################################################################################
+# this database table is for ip restrictions by assignment
+# the locations table defines names of locations consisting of 
+#    lists of ip masks (found in the location_addresses table)
+#    to which assignments can be restricted to or denied from.
+
+BEGIN { 
+	*Location = gen_schema_accessor("locations");
+	*newLocation = gen_new("locations");
+	*countLocationsWhere = gen_count_where("locations");
+	*existsLocationWhere = gen_exists_where("locations");
+	*listLocationsWhere = gen_list_where("locations");
+	*getLocationsWhere = gen_get_records_where("locations");
+}
+
+sub countLocations { return scalar shift->listLocations(@_) }
+
+sub listLocations {
+	my ( $self ) = shift->checkArgs(\@_);
+	if ( wantarray ) {
+	    return map {@$_} $self->{locations}->get_fields_where(["location_id"]);
+	} else {
+		return $self->{locations}->count_where;
+	}
+}
 
-Return a list of key records associated with the user IDs given. If there is no
-record associated with a given user ID, that element of the list will be
-undefined.
+sub existsLocation { 
+	my ( $self, $locationID ) = shift->checkArgs(\@_, qw/location_id/);
+	return $self->{locations}->exists($locationID);
+}
 
-=cut
+sub getLocation { 
+	my ( $self, $locationID ) = shift->checkArgs(\@_, qw/location_id/);
+	return ( $self->getLocations($locationID) )[0];
+}
 
-sub getKeys {
-	my ($self, @userIDs) = @_;
-	
-	#croak "getKeys: requires 1 or more argument"
-	#	unless @_ >= 2;
-	foreach my $i (0 .. $#userIDs) {
-		croak "getKeys: element $i of argument list must contain a user_id"
-			unless defined $userIDs[$i];
-	}
-	
-	return $self->{key}->gets(map { [$_] } @userIDs);
+sub getLocations {
+	my ( $self, @locationIDs ) = shift->checkArgs(\@_, qw/location_id*/);
+	return $self->{locations}->gets(map {[$_]} @locationIDs);
 }
 
-=item putKey($Key)
+sub getAllLocations { 
+	my ( $self ) = shift->checkArgs(\@_);
+	return $self->{locations}->get_records_where();
+}
 
-$Key is a record object. If a key record with the same user ID exists in the
-key table, the data in the record is replaced with the data in $Key. If a
-matching key record does not exist, an exception is thrown.
+sub addLocation { 
+	my ( $self, $Location ) = shift->checkArgs(\@_, qw/REC:locations/);
 
-=cut
+	eval {
+		return $self->{locations}->add($Location);
+	};
+	if ( my $ex = caught WeBWorK::DB::Ex::RecordExists ) {
+		croak "addLocation: location exists (perhaps you meant to use putLocation?)";
+	} elsif ($@) {
+		die $@;
+	}
+}
 
-sub putKey($$) {
-	my ($self, $Key) = @_;
-	
-	croak "putKey: requires 1 argument"
-		unless @_ == 2;
-	croak "putKey: argument 1 must be of type ", $self->{key}->{record}
-		unless ref $Key eq $self->{key}->{record};
-	
-	checkKeyfields($Key);
-	
-	croak "putKey: key not found (perhaps you meant to use addKey?)"
-		unless $self->{key}->exists($Key->user_id);
-	
-	return $self->{key}->put($Key);
+sub putLocation { 
+	my ($self, $Location) = shift->checkArgs(\@_, qw/REC:locations/);
+	my $rows = $self->{locations}->put($Location);
+	if ( $rows == 0 ) {
+		croak "putLocation: location not found (perhaps you meant to use addLocation?)";
+	} else {
+		return $rows;
+	}
 }
 
-=item deleteKey($userID)
+sub deleteLocation {
+	# do we need to allow calls from this package?  I can't think of
+	#    any case where that would happen, but we include it for other
+	#    deletions, so I'll keep it here.
+	my $U = caller eq __PACKAGE__ ? "!" : "";
+	my ( $self, $locationID ) = shift->checkArgs(\@_, "location_id$U");
+	$self->deleteGlobalSetLocation(undef, $locationID);
+	$self->deleteUserSetLocation(undef, undef, $locationID);
 
-If a key record with a user ID matching $userID exists in the key table, it is
-removed and the method returns a true value. If one does exist, a false value
-is returned.
+	# NOTE: the one piece of this that we don't address is if this 
+	#    results in all of the locations in a set's restriction being
+	#    cleared; in this case, we should probably also reset the 
+	#    set->restrict_ip setting as well.  but that requires going 
+	#    out and doing a bunch of manipulations that well exceed what
+	#    we want to do in this routine, so we'll assume that the user
+	#    is smart enough to deal with that on her own.
 
-=cut
+	# addresses in the location_addresses table also need to be cleared
+	$self->deleteLocationAddress($locationID, undef);
 
-sub deleteKey($$) {
-	my ($self, $userID) = @_;
-	
-	croak "deleteKey: requires 1 argument"
-		unless @_ == 2;
-	croak "deleteKey: argument 1 must contain a user_id"
-		unless defined $userID;
-	
-	return $self->{key}->delete($userID);
+	return $self->{locations}->delete($locationID);
 }
 
 ################################################################################
-# user functions
+# location_addresses functions
 ################################################################################
+# this database table is for ip restrictions by assignment
+# the location_addresses table defines the ipmasks associate 
+#    with the locations that are used for restrictions.
+
+BEGIN { 
+	*LocationAddress = gen_schema_accessor("location_addresses");
+	*newLocationAddress = gen_new("location_addresses");
+	*countLocationAddressesWhere = gen_count_where("location_addresses");
+	*existsLocationAddressWhere = gen_exists_where("location_addresses");
+	*listLocationAddressesWhere = gen_list_where("location_addresses");
+	*getLocationAddressesWhere = gen_get_records_where("location_addresses");
+}
+
+sub countAddressLocations { return scalar shift->listAddressLocations(@_) }
+
+sub listAddressLocations { 
+	my ($self, $ipmask) = shift->checkArgs(\@_, qw/ip_mask/);
+	my $where = [ip_mask_eq => $ipmask];
+	if ( wantarray ) {
+		return map {@$_} $self->{location_addresses}->get_fields_where(["location_id"],$where);
+	} else {
+		return $self->{location_addresses}->count_where($where);
+	}
+}
 
-=head2 User Methods
-
-=over
+sub countLocationAddresses { return scalar shift->listLocationAddresses(@_) }
 
-=item newUser()
+sub listLocationAddresses {
+	my ($self, $locationID) = shift->checkArgs(\@_, qw/location_id/);
+	my $where = [location_id_eq => $locationID];
+	if ( wantarray ) { 
+		return map {@$_} $self->{location_addresses}->get_fields_where(["ip_mask"],$where);
+	} else {
+		return $self->{location_addresses}->count_where($where);
+	}
+}
 
-Returns a new, empty user object.
+sub existsLocationAddress { 
+	my ($self, $locationID, $ipmask) = shift->checkArgs(\@_, qw/location_id ip_mask/);
+	return $self->{location_addresses}->exists($locationID, $ipmask);
+}
 
-=cut 
+# we wouldn't ever getLocationAddress or getLocationAddresses; to use those
+#   we would have to know all of the information that we're getting
 
-sub newUser {
-	my ($self, @prototype) = @_;
-	return $self->{user}->{record}->new(@prototype);
+sub getAllLocationAddresses { 
+	my ($self, $locationID) = shift->checkArgs(\@_, qw/location_id/);
+	my $where = [location_id_eq => $locationID];
+	return $self->{location_addresses}->get_records_where($where);
 }
 
-=item listUsers()
-
-Returns a list of user IDs representing the records in the user table.
+sub addLocationAddress { 
+	my ($self, $LocationAddress) = shift->checkArgs(\@_, qw/REC:location_addresses/);
+	croak "addLocationAddress: location ", $LocationAddress->location_id, " not found" 
+		unless $self->{locations}->exists($LocationAddress->location_id);
+	eval {
+		return $self->{location_addresses}->add($LocationAddress);
+	};
+	if (my $ex = caught WeBWorK::DB::Ex::RecordExists) {
+		croak "addLocationAddress: location address exists (perhaps you meant to use putLocationAddress?)";
+	} elsif ($@) {
+		die $@;
+	}
+}
 
-=cut
+sub putLocationAddress { 
+	my ($self, $LocationAddress) = shift->checkArgs(\@_, qw/REC:location_addresses/);
+	my $rows = $self->{location_addresses}->put($LocationAddress);
+	if ( $rows == 0 ) {
+		croak "putLocationAddress: location address not found (perhaps you meant to use addLocationAddress?)";
+	} else {
+		return $rows;
+	}
+}
 
-sub listUsers {
-	my ($self) = @_;
-	
-	croak "listUsers: requires 0 arguments"
-		unless @_ == 1;
-	
-	return map { $_->[0] }
-		$self->{user}->list(undef);
+sub deleteLocationAddress { 
+	# allow for undef values
+	my $U = caller eq __PACKAGE__ ? "!" : "";
+	my ($self, $locationID, $ipmask) = shift->checkArgs(\@_, "location_id$U", "ip_mask$U");
+	return $self->{location_addresses}->delete($locationID, $ipmask);
 }
 
-=item addUser($User)
 
-$User is a record object. The user will be added to the user table if a user
-with the same user ID does not already exist. If one does exist, an exception
-is thrown.
+################################################################################
+# set functions
+################################################################################
 
-=cut
+BEGIN {
+	*GlobalSet = gen_schema_accessor("set");
+	*newGlobalSet = gen_new("set");
+	*countGlobalSetsWhere = gen_count_where("set");
+	*existsGlobalSetWhere = gen_exists_where("set");
+	*listGlobalSetsWhere = gen_list_where("set");
+	*getGlobalSetsWhere = gen_get_records_where("set");
+}
 
-sub addUser {
-	my ($self, $User) = @_;
-	
-	croak "addUser: requires 1 argument"
-		unless @_ == 2;
-	croak "addUser: argument 1 must be of type ", $self->{user}->{record}
-		unless ref $User eq $self->{user}->{record};
-	
-	checkKeyfields($User);
-	
-	croak "addUser: user exists (perhaps you meant to use putUser?)"
-		if $self->{user}->exists($User->user_id);
-	
-	return $self->{user}->add($User);
+sub countGlobalSets { return scalar shift->listGlobalSets(@_) }
+
+sub listGlobalSets {
+	my ($self) = shift->checkArgs(\@_);
+	if (wantarray) {
+		return map { @$_ } $self->{set}->get_fields_where(["set_id"]);
+	} else {
+		return $self->{set}->count_where;
+	}
 }
 
-=item getUser($userID)
+sub existsGlobalSet {
+	my ($self, $setID) = shift->checkArgs(\@_, qw/set_id/);
+	return $self->{set}->exists($setID);
+}
 
-If a record with a matching user ID exists, a record object containting that
-record's data will be returned. If no such record exists, an undefined value
-will be returned.
+sub getGlobalSet {
+	my ($self, $setID) = shift->checkArgs(\@_, qw/set_id/);
+	return ( $self->getGlobalSets($setID) )[0];
+}
 
-=cut
+sub getGlobalSets {
+	my ($self, @setIDs) = shift->checkArgs(\@_, qw/set_id*/);
+	return $self->{set}->gets(map { [$_] } @setIDs);
+}
 
-sub getUser {
-	my ($self, $userID) = @_;
-	
-	croak "getUser: requires 1 argument"
-		unless @_ == 2;
-	croak "getUser: argument 1 must contain a user_id"
-		unless defined $userID;
+sub addGlobalSet {
+	my ($self, $GlobalSet) = shift->checkArgs(\@_, qw/REC:set/);
 	
-	return $self->{user}->get($userID);
+	eval {
+
+		return $self->{set}->add($GlobalSet);
+	};
+	if (my $ex = caught WeBWorK::DB::Ex::RecordExists) {
+		croak "addGlobalSet: global set exists (perhaps you meant to use putGlobalSet?)";
+	} elsif ($@) {
+		die $@;
+	}
 }
 
-=item getUsers(@uesrIDs)
+sub putGlobalSet {
+	my ($self, $GlobalSet) = shift->checkArgs(\@_, qw/REC:set/);
+	my $rows = $self->{set}->put($GlobalSet); # DBI returns 0E0 for 0.
+	if ($rows == 0) {
+		croak "putGlobalSet: global set not found (perhaps you meant to use addGlobalSet?)";
+	} else {
+		return $rows;
+	}
+}
 
-Return a list of user records associated with the user IDs given. If there is no
-record associated with a given user ID, that element of the list will be
-undefined.
+sub deleteGlobalSet {
+	# setID can be undefined if being called from this package
+	my $U = caller eq __PACKAGE__ ? "!" : "";
+	my ($self, $setID) = shift->checkArgs(\@_, "set_id$U");
+	$self->deleteUserSet(undef, $setID);
+	$self->deleteGlobalProblem($setID, undef);
+	$self->deleteGlobalSetLocation($setID, undef);
+	return $self->{set}->delete($setID);
+}
 
-=cut
+################################################################################
+# set_user functions
+################################################################################
 
-sub getUsers {
-	my ($self, @userIDs) = @_;
-	
-	#croak "getUsers: requires 1 or more argument"
-	#	unless @_ >= 2;
-	foreach my $i (0 .. $#userIDs) {
-		croak "getUsers: element $i of argument list must contain a user_id"
-			unless defined $userIDs[$i];
-	}
-	
-	return $self->{user}->gets(map { [$_] } @userIDs);
+BEGIN {
+	*UserSet = gen_schema_accessor("set_user");
+	*newUserSet = gen_new("set_user");
+	*countUserSetsWhere = gen_count_where("set_user");
+	*existsUserSetWhere = gen_exists_where("set_user");
+	*listUserSetsWhere = gen_list_where("set_user");
+	*getUserSetsWhere = gen_get_records_where("set_user");
 }
 
-=item putUser($User)
+sub countSetUsers { return scalar shift->listSetUsers(@_) }
 
-$User is a record object. If a user record with the same user ID exists in the
-user table, the data in the record is replaced with the data in $User. If a
-matching user record does not exist, an exception is thrown.
+sub listSetUsers {
+	my ($self, $setID) = shift->checkArgs(\@_, qw/set_id/);
+	my $where = [set_id_eq => $setID];
+	if (wantarray) {
+		return map { @$_ } $self->{set_user}->get_fields_where(["user_id"], $where);
+	} else {
+		return $self->{set_user}->count_where($where);
+	}
+}
 
-=cut
+sub countUserSets { return scalar shift->listUserSets(@_) }
 
-sub putUser {
-	my ($self, $User) = @_;
-	
-	croak "putUser: requires 1 argument"
-		unless @_ == 2;
-	croak "putUser: argument 1 must be of type ", $self->{user}->{record}
-		unless ref $User eq $self->{user}->{record};
-	
-	checkKeyfields($User);
-	
-	croak "putUser: user not found (perhaps you meant to use addUser?)"
-		unless $self->{user}->exists($User->user_id);
-	
-	return $self->{user}->put($User);
+sub listUserSets {
+	my ($self, $userID) = shift->checkArgs(\@_, qw/user_id/);
+	my $where = [user_id_eq => $userID];
+	if (wantarray) {
+		return map { @$_ } $self->{set_user}->get_fields_where(["set_id"], $where);
+	} else {
+		return $self->{set_user}->count_where($where);
+	}
 }
 
-=item deleteUser($userID)
+sub existsUserSet {
+	my ($self, $userID, $setID) = shift->checkArgs(\@_, qw/user_id set_id/);
+	return $self->{set_user}->exists($userID, $setID);
+}
 
-If a user record with a user ID matching $userID exists in the user table, it
-is removed and the method returns a true value. If one does exist, a false
-value is returned. When a user record is deleted, all records associated with
-that user are also deleted. This includes the password, permission, and key
-records, and all user set records for that user.
+sub getUserSet {
+	my ($self, $userID, $setID) = shift->checkArgs(\@_, qw/user_id set_id/);
+	return ( $self->getUserSets([$userID, $setID]) )[0];
+}
 
-=cut
+sub getUserSets {
+	my ($self, @userSetIDs) = shift->checkArgsRefList(\@_, qw/user_id set_id/);
+	return $self->{set_user}->gets(@userSetIDs);
+}
 
-sub deleteUser {
-	my ($self, $userID) = @_;
+# the code from addUserSet() is duplicated in large part following in 
+# addVersionedUserSet; changes here should accordingly be propagated down there
+sub addUserSet {
+	my ($self, $UserSet) = shift->checkArgs(\@_, qw/REC:set_user/);
 	
-	croak "deleteUser: requires 1 argument"
-		unless @_ == 2;
-	croak "deleteUser: argument 1 must contain a user_id"
-		unless defined $userID;
+	croak "addUserSet: user ", $UserSet->user_id, " not found"
+		unless $self->{user}->exists($UserSet->user_id);
+	croak "addUserSet: set ", $UserSet->set_id, " not found"
+		unless $self->{set}->exists($UserSet->set_id);
 	
-	$self->deleteUserSet($userID, undef);
-	$self->deletePassword($userID);
-	$self->deletePermissionLevel($userID);
-	$self->deleteKey($userID);
-	return $self->{user}->delete($userID);
+	eval {
+		return $self->{set_user}->add($UserSet);
+	};
+	if (my $ex = caught WeBWorK::DB::Ex::RecordExists) {
+		croak "addUserSet: user set exists (perhaps you meant to use putUserSet?)";
+	} elsif ($@) {
+		die $@;
+	}
 }
 
-=back
+# the code from putUserSet() is duplicated in large part in the following
+# putVersionedUserSet; c.f. that routine
+sub putUserSet {
+	my ($self, $UserSet) = shift->checkArgs(\@_, qw/REC:set_user/);
+	my $rows = $self->{set_user}->put($UserSet); # DBI returns 0E0 for 0.
+	if ($rows == 0) {
+		croak "putUserSet: user set not found (perhaps you meant to use addUserSet?)";
+	} else {
+		return $rows;
+	}
+}
 
-=cut
+sub deleteUserSet {
+	# userID and setID can be undefined if being called from this package
+	my $U = caller eq __PACKAGE__ ? "!" : "";
+	my ($self, $userID, $setID) = shift->checkArgs(\@_, "user_id$U", "set_id$U");
+	$self->deleteSetVersion($userID, $setID, undef);
+	$self->deleteUserProblem($userID, $setID, undef);
+	return $self->{set_user}->delete($userID, $setID);
+}
 
 ################################################################################
-# set functions
+# set_merged functions
 ################################################################################
 
-=head2 Global Set Methods
+BEGIN {
+	*MergedSet = gen_schema_accessor("set_merged");
+	#*newMergedSet = gen_new("set_merged");
+	#*countMergedSetsWhere = gen_count_where("set_merged");
+	*existsMergedSetWhere = gen_exists_where("set_merged");
+	#*listMergedSetsWhere = gen_list_where("set_merged");
+	*getMergedSetsWhere = gen_get_records_where("set_merged");
+}
 
-FIXME: write this
+sub existsMergedSet {
+	my ($self, $userID, $setID) = shift->checkArgs(\@_, qw/user_id set_id/);
+	return $self->{set_merged}->exists($userID, $setID);
+}
 
-=over
+sub getMergedSet {
+	my ($self, $userID, $setID) = shift->checkArgs(\@_, qw/user_id set_id/);
+	return ( $self->getMergedSets([$userID, $setID]) )[0];
+}
 
-=cut
+sub getMergedSets {
+	my ($self, @userSetIDs) = shift->checkArgsRefList(\@_, qw/user_id set_id/);
+	return $self->{set_merged}->gets(@userSetIDs);
+}
+
+################################################################################
+# set_version functions (NEW)
+################################################################################
 
-sub newGlobalSet {
-	my ($self, @prototype) = @_;
-	return $self->{set}->{record}->new(@prototype);
+BEGIN {
+	*SetVersion = gen_schema_accessor("set_version");
+	*newSetVersion = gen_new("set_version");
+	*countSetVersionsWhere = gen_count_where("set_version");
+	*existsSetVersionWhere = gen_exists_where("set_version");
+	*listSetVersionsWhere = gen_list_where("set_version");
+	*getSetVersionsWhere = gen_get_records_where("set_version");
+}
+
+# versioned analog of countUserSets
+sub countSetVersions { return scalar shift->listSetVersions(@_) }
+
+# versioned analog of listUserSets
+sub listSetVersions {
+	my ($self, $userID, $setID) = shift->checkArgs(\@_, qw/user_id set_id/);
+	my $where = [user_id_eq_set_id_eq => $userID,$setID];
+	my $order = [ 'version_id' ];
+	if (wantarray) {
+		return map { @$_ } $self->{set_version}->get_fields_where(["version_id"], $where, $order);
+	} else {
+		return $self->{set_version}->count_where($where);
+	}
 }
 
-sub listGlobalSets {
-	my ($self) = @_;
-	
-	croak "listGlobalSets: requires 0 arguments"
-		unless @_ == 1;
-	
-	return map { $_->[0] }
-		$self->{set}->list(undef);
+# versioned analog of existsUserSet
+sub existsSetVersion {
+	my ($self, $userID, $setID, $versionID) = shift->checkArgs(\@_, qw/user_id set_id version_id/);
+	return $self->{set_version}->exists($userID, $setID, $versionID);
 }
 
-sub addGlobalSet {
-	my ($self, $GlobalSet) = @_;
-	
-	croak "addGlobalSet: requires 1 argument"
-		unless @_ == 2;
-	croak "addGlobalSet: argument 1 must be of type ", $self->{set}->{record}
-		unless ref $GlobalSet eq $self->{set}->{record};
-	
-	checkKeyfields($GlobalSet);
-	
-	croak "addGlobalSet: global set exists (perhaps you meant to use putGlobalSet?)"
-		if $self->{set}->exists($GlobalSet->set_id);
-	
-	return $self->{set}->add($GlobalSet);
+# versioned analog of getUserSet
+sub getSetVersion {
+	my ($self, $userID, $setID, $versionID) = shift->checkArgs(\@_, qw/user_id set_id version_id/);
+	return ( $self->getSetVersions([$userID, $setID, $versionID]) )[0];
 }
 
-sub getGlobalSet {
-	my ($self, $setID) = @_;
+# versioned analog of getUserSets
+sub getSetVersions {
+	my ($self, @setVersionIDs) = shift->checkArgsRefList(\@_, qw/user_id set_id version_id/);
+	return $self->{set_version}->gets(@setVersionIDs);
+}
+
+# versioned analog of addUserSet
+sub addSetVersion {
+	my ($self, $SetVersion) = shift->checkArgs(\@_, qw/REC:set_version/);
 	
-	croak "getGlobalSet: requires 1 argument"
-		unless @_ == 2;
-	croak "getGlobalSet: argument 1 must contain a set_id"
-		unless defined $setID;
+	croak "addSetVersion: set ", $SetVersion->set_id, " not found for user ", $SetVersion->user_id
+		unless $self->{set_user}->exists($SetVersion->user_id, $SetVersion->set_id);
 	
-	return $self->{set}->get($setID);
+	eval {
+		return $self->{set_version}->add($SetVersion);
+	};
+	if (my $ex = caught WeBWorK::DB::Ex::RecordExists) {
+		croak "addSetVersion: set version exists (perhaps you meant to use putSetVersion?)";
+	} elsif ($@) {
+		die $@;
+	}
 }
 
-=item getGlobalSets(@setIDs)
+# versioned analog of putUserSet
+sub putSetVersion {
+	my ($self, $SetVersion) = shift->checkArgs(\@_, qw/REC:set_version/);
+	my $rows = $self->{set_version}->put($SetVersion); # DBI returns 0E0 for 0.
+	if ($rows == 0) {
+		croak "putSetVersion: set version not found (perhaps you meant to use addSetVersion?)";
+	} else {
+		return $rows;
+	}
+}
 
-Return a list of global set records associated with the record IDs given. If
-there is no record associated with a given record ID, that element of the list
-will be undefined.
+# versioned analog of deleteUserSet
+sub deleteSetVersion {
+	# userID, setID, and versionID can be undefined if being called from this package
+	my $U = caller eq __PACKAGE__ ? "!" : "";
+	my ($self, $userID, $setID, $versionID) = shift->checkArgs(\@_, "user_id$U", "set_id$U", "version_id$U");
+	$self->deleteProblemVersion($userID, $setID, $versionID, undef);
+	return $self->{set_version}->delete($userID, $setID, $versionID);
+}
 
-=cut
+################################################################################
+# set_version_merged functions (NEW)
+################################################################################
 
-sub getGlobalSets {
-	my ($self, @setIDs) = @_;
-	
-	#croak "getGlobalSets: requires 1 or more argument"
-	#	unless @_ >= 2;
-	foreach my $i (0 .. $#setIDs) {
-		croak "getGlobalSets: element $i of argument list must contain a set_id"
-			unless defined $setIDs[$i];
-	}
-	
-	return $self->{set}->gets(map { [$_] } @setIDs);
+BEGIN {
+	*MergedSetVersion = gen_schema_accessor("set_version_merged");
+	#*newMergedSetVersion = gen_new("set_version_merged");
+	#*countMergedSetVersionsWhere = gen_count_where("set_version_merged");
+	*existsMergedSetVersionWhere = gen_exists_where("set_version_merged");
+	#*listMergedSetVersionsWhere = gen_list_where("set_version_merged");
+	*getMergedSetVersionsWhere = gen_get_records_where("set_version_merged");
 }
 
-sub putGlobalSet {
-	my ($self, $GlobalSet) = @_;
-	
-	croak "putGlobalSet: requires 1 argument"
-		unless @_ == 2;
-	croak "putGlobalSet: argument 1 must be of type ", $self->{set}->{record}
-		unless ref $GlobalSet eq $self->{set}->{record};
-	
-	checkKeyfields($GlobalSet);
-	
-	croak "putGlobalSet: global set not found (perhaps you meant to use addGlobalSet?)"
-		unless $self->{set}->exists($GlobalSet->set_id);
-	
-	return $self->{set}->put($GlobalSet);
+sub existsMergedSetVersion {
+	my ($self, $userID, $setID, $versionID) = shift->checkArgs(\@_, qw/user_id set_id version_id/);
+	return $self->{set_version_merged}->exists($userID, $setID, $versionID);
 }
 
-sub deleteGlobalSet {
-	my ($self, $setID) = @_;
-	
-	croak "deleteGlobalSet: requires 1 argument"
-		unless @_ == 2;
-	croak "deleteGlobalSet: argument 1 must contain a set_id"
-		unless defined $setID or caller eq __PACKAGE__;
-	
-	$self->deleteUserSet(undef, $setID);
-	$self->deleteGlobalProblem($setID, undef);
-	return $self->{set}->delete($setID);
+sub getMergedSetVersion {
+	my ($self, $userID, $setID, $versionID) = shift->checkArgs(\@_, qw/user_id set_id version_id/);
+	return ( $self->getMergedSetVersions([$userID, $setID, $versionID]) )[0];
 }
 
-=back
-
-=cut
+sub getMergedSetVersions {
+	my ($self, @setVersionIDs) = shift->checkArgsRefList(\@_, qw/user_id set_id version_id/);
+	return $self->{set_version_merged}->gets(@setVersionIDs);
+}
 
 ################################################################################
-# set_user functions
+# set_locations functions
 ################################################################################
+# this database table is for ip restrictions by assignment
+# the set_locations table defines the association between a 
+#    global set and the locations to which the set may be 
+#    restricted or denied.
+
+BEGIN {
+	*GlobalSetLocation = gen_schema_accessor("set_locations");
+	*newGlobalSetLocation = gen_new("set_locations");
+	*countGlobalSetLocationsWhere = gen_count_where("set_locations");
+	*existsGlobalSetLocationWhere = gen_exists_where("set_locations");
+	*listGlobalSetLocationsWhere = gen_list_where("set_locations");
+	*getGlobalSetLocationsWhere = gen_get_records_where("set_locations");
+}
+
+sub countGlobalSetLocations { return scalar shift->listGlobalSetLocations(@_) }
+
+sub listGlobalSetLocations {
+	my ( $self, $setID ) = shift->checkArgs(\@_, qw/set_id/);
+	my $where = [set_id_eq => $setID];
+	if ( wantarray ) {
+		my $order = ['location_id'];
+		return map { @$_ } $self->{set_locations}->get_fields_where(["location_id"], $where, $order);
+	} else {
+		return $self->{set_user}->count_where( $where );
+	}
+}
 
-=head2 User-Specific Set Methods
-
-FIXME: write this
+sub existsGlobalSetLocation { 
+	my ( $self, $setID, $locationID ) = shift->checkArgs(\@_, qw/set_id location_id/);
+	return $self->{set_locations}->exists( $setID, $locationID );
+}
 
-=over
+sub getGlobalSetLocation { 
+	my ( $self, $setID, $locationID ) = shift->checkArgs(\@_, qw/set_id location_id/);
+	return ( $self->getGlobalSetLocations([$setID, $locationID]) )[0];
+}
 
-=cut
+sub getGlobalSetLocations {
+	my ( $self, @locationIDs ) = shift->checkArgsRefList(\@_, qw/set_id location_id/);
+	return $self->{set_locations}->gets(@locationIDs);
+}
 
-sub newUserSet {
-	my ($self, @prototype) = @_;
-	return $self->{set_user}->{record}->new(@prototype);
+sub getAllGlobalSetLocations {
+	my ( $self, $setID ) = shift->checkArgs(\@_, qw/set_id/);
+	my $where = [set_id_eq => $setID];
+	return $self->{set_locations}->get_records_where( $where );
 }
 
-sub countSetUsers {
-	my ($self, $setID) = @_;
-	
-	croak "listSetUsers: requires 1 argument"
-		unless @_ == 2;
-	croak "listSetUsers: argument 1 must contain a set_id"
-		unless defined $setID;
+sub addGlobalSetLocation { 
+	my ( $self, $GlobalSetLocation ) = shift->checkArgs(\@_, qw/REC:set_locations/);
+	croak "addGlobalSetLocation: set ", $GlobalSetLocation->set_id, " not found"
+		unless $self->{set}->exists($GlobalSetLocation->set_id);
 	
-	# inefficient way
-	#return scalar $self->{set_user}->list(undef, $setID);
-	
-	# efficient way
-	return $self->{set_user}->count(undef, $setID);
+	eval {
+		return $self->{set_locations}->add($GlobalSetLocation);
+	};
+	if (my $ex = caught WeBWorK::DB::Ex::RecordExists) {
+		croak "addGlobalSetLocation: global set_location exists (perhaps you meant to use putGlobalSetLocation?)";
+	} elsif ($@) {
+		die $@;
+	}
 }
 
-sub listSetUsers {
-	my ($self, $setID) = @_;
-	
-	carp "listSetUsers called in SCALAR context: use countSetUsers instead!\n"
-		unless wantarray;
-	
-	croak "listSetUsers: requires 1 argument"
-		unless @_ == 2;
-	croak "listSetUsers: argument 1 must contain a set_id"
-		unless defined $setID;
-	
-	return map { $_->[0] } # extract user_id
-		$self->{set_user}->list(undef, $setID);
+sub putGlobalSetLocation {
+	my ($self, $GlobalSetLocation) = shift->checkArgs(\@_, qw/REC:set_locations/);
+	my $rows = $self->{set_locations}->put($GlobalSetLocation); # DBI returns 0E0 for 0.
+	if ($rows == 0) {
+		croak "putGlobalSetLocation: global problem not found (perhaps you meant to use addGlobalSetLocation?)";
+	} else {
+		return $rows;
+	}
 }
 
-sub listUserSets {
-	my ($self, $userID) = @_;
-	
-	croak "listUserSets: requires 1 argument"
-		unless @_ == 2;
-	croak "listUserSets: argument 1 must contain a user_id"
-		unless defined $userID;
-	
-	return map { $_->[1] } # extract set_id
-		$self->{set_user}->list($userID, undef);
+sub deleteGlobalSetLocation {
+	# setID and locationID can be undefined if being called from this package
+	my $U = caller eq __PACKAGE__ ? "!" : "";
+	my ($self, $setID, $locationID) = shift->checkArgs(\@_, "set_id$U", "location_id$U");
+	$self->deleteUserSetLocation(undef, $setID, $locationID);
+	return $self->{set_locations}->delete($setID, $locationID);
 }
 
-sub addUserSet {
-	my ($self, $UserSet) = @_;
-	
-	croak "addUserSet: requires 1 argument"
-		unless @_ == 2;
-	croak "addUserSet: argument 1 must be of type ", $self->{set_user}->{record}
-		unless ref $UserSet eq $self->{set_user}->{record};
-	
-	checkKeyfields($UserSet);
-	
-	croak "addUserSet: user set exists (perhaps you meant to use putUserSet?)"
-		if $self->{set_user}->exists($UserSet->user_id, $UserSet->set_id);
-	croak "addUserSet: user ", $UserSet->user_id, " not found"
-		unless $self->{user}->exists($UserSet->user_id);
-	croak "addUserSet: set ", $UserSet->set_id, " not found"
-		unless $self->{set}->exists($UserSet->set_id);
-	
-	return $self->{set_user}->add($UserSet);
+################################################################################
+# set_locations_user functions
+################################################################################
+# this database table is for ip restrictions by assignment
+# the set_locations_user table defines the set_user level
+#    modifications to the set_locations defined for the 
+#    global set
+
+BEGIN {
+	*UserSetLocation = gen_schema_accessor("set_locations_user");
+	*newUserSetLocation = gen_new("set_locations_user");
+	*countUserSetLocationWhere = gen_count_where("set_locations_user");
+	*existsUserSetLocationWhere = gen_exists_where("set_locations_user");
+	*listUserSetLocationsWhere = gen_list_where("set_locations_user");
+	*getUserSetLocationsWhere = gen_get_records_where("set_locations_user");
+}
+
+sub countSetLocationUsers { return scalar shift->listSetLocationUsers(@_) }
+
+sub listSetLocationUsers {
+	my ($self, $setID, $locationID) = shift->checkArgs(\@_, qw/set_id location_id/);
+	my $where = [set_id_eq_location_id_eq => $setID,$locationID];
+	if (wantarray) {
+		return map { @$_ } $self->{set_locations_user}->get_fields_where(["user_id"], $where);
+	} else {
+		return $self->{set_locations_user}->count_where($where);
+	}
 }
 
-sub getUserSet {
-	my ($self, $userID, $setID) = @_;
-	
-	croak "getUserSet: requires 2 arguments"
-		unless @_ == 3;
-	croak "getUserSet: argument 1 must contain a user_id"
-		unless defined $userID;
-	croak "getUserSet: argument 2 must contain a set_id"
-		unless defined $setID;
-	
-	#return $self->{set_user}->get($userID, $setID);
-	return ( $self->getUserSets([$userID, $setID]) )[0];
+sub countUserSetLocations { return scalar shift->listUserSetLocations(@_) }
+
+sub listUserSetLocations {
+	my ($self, $userID, $setID) = shift->checkArgs(\@_, qw/user_id set_id/);
+	my $where = [user_id_eq_set_id_eq => $userID,$setID];
+	if (wantarray) {
+		return map { @$_ } $self->{set_locations_user}->get_fields_where(["location_id"], $where);
+	} else {
+		return $self->{set_locations_user}->count_where($where);
+	}
 }
 
-=item getUserSets(@userSetIDs)
+sub existsUserSetLocation {
+	my ($self, $userID, $setID, $locationID) = shift->checkArgs(\@_, qw/user_id set_id location_id/);
+	return $self->{set_locations_user}->exists($userID,$setID,$locationID);
+}
 
-Return a list of user set records associated with the record IDs given. If there
-is no record associated with a given record ID, that element of the list will be
-undefined. @userProblemIDs consists of references to arrays in which the first
-element is the user_id and the second element is the set_id.
+# FIXME: we won't ever use this because all fields are key fields
+sub getUserSetLocation {
+	my ($self, $userID, $setID, $locationID) = shift->checkArgs(\@_, qw/user_id set_id location_id/);
+	return( $self->getUserSetLocations([$userID, $setID, $locationID]) )[0];
+}
 
-=cut
+# FIXME: we won't ever use this because all fields are key fields
+sub getUserSetLocations {
+	my ($self, @userSetLocationIDs) = shift->checkArgsRefList(\@_, qw/user_id set_id location_id/);
+	return $self->{set_locations_user}->gets(@userSetLocationIDs);
+}
 
-sub getUserSets {
-	my ($self, @userSetIDs) = @_;
-	
-	#croak "getUserSets: requires 1 or more argument"
-	#	unless @_ >= 2;
-	foreach my $i (0 .. $#userSetIDs) {
-		croak "getUserSets: element $i of argument list must contain a <user_id, set_id> pair"
-			unless defined $userSetIDs[$i]
-			       and ref $userSetIDs[$i] eq "ARRAY"
-			       and @{$userSetIDs[$i]} == 2
-			       and defined $userSetIDs[$i]->[0]
-			       and defined $userSetIDs[$i]->[1];
-	}
-	
-	return $self->{set_user}->gets(@userSetIDs);
+sub getAllUserSetLocations {
+	my ($self, $userID, $setID) = shift->checkArgs(\@_, qw/user_id set_id/);
+	my $where = [user_id_eq_set_id_eq => $userID,$setID];
+	return $self->{set_locations_user}->get_records_where($where);
 }
 
-sub putUserSet {
-	my ($self, $UserSet) = @_;
+sub addUserSetLocation {
+	# VERSIONING - accept versioned ID fields
+	my ($self, $UserSetLocation) = shift->checkArgs(\@_, qw/VREC:set_locations_user/);
 	
-	croak "putUserSet: requires 1 argument"
-		unless @_ == 2;
-	croak "putUserSet: argument 1 must be of type ", $self->{set_user}->{record}
-		unless ref $UserSet eq $self->{set_user}->{record};
+	croak "addUserSetLocation: user set ", $UserSetLocation->set_id, " for user ", $UserSetLocation->user_id, " not found"
+		unless $self->{set_user}->exists($UserSetLocation->user_id, $UserSetLocation->set_id);
 	
-	checkKeyfields($UserSet);
-	
-	croak "putUserSet: user set not found (perhaps you meant to use addUserSet?)"
-		unless $self->{set_user}->exists($UserSet->user_id, $UserSet->set_id);
-	croak "putUserSet: user ", $UserSet->user_id, " not found"
-		unless $self->{user}->exists($UserSet->user_id);
-	croak "putUserSet: set ", $UserSet->set_id, " not found"
-		unless $self->{set}->exists($UserSet->set_id);
-	
-	return $self->{set_user}->put($UserSet);
+	eval {
+		return $self->{set_locations_user}->add($UserSetLocation);
+	};
+	if (my $ex = caught WeBWorK::DB::Ex::RecordExists) {
+		croak "addUserSetLocation: user set_location exists (perhaps you meant to use putUserSetLocation?)";
+	} elsif ($@) {
+		die $@;
+	}
 }
 
-sub deleteUserSet {
-	my ($self, $userID, $setID) = @_;
+# FIXME: we won't ever use this because all fields are key fields
+# versioned_ok is an optional argument which lets us slip versioned setIDs through checkArgs.
+sub putUserSetLocation {
+	my $V = $_[2] ? "V" : "";
+	my ($self, $UserSetLocation, undef) = shift->checkArgs(\@_, "${V}REC:set_locations_user", "versioned_ok!?");
 	
-	croak "getUserSet: requires 2 arguments"
-		unless @_ == 3;
-	croak "getUserSet: argument 1 must contain a user_id"
-		unless defined $userID or caller eq __PACKAGE__;
-	croak "getUserSet: argument 2 must contain a set_id"
-		unless defined $userID or caller eq __PACKAGE__;
-	
-	$self->deleteUserProblem($userID, $setID, undef);
-	return $self->{set_user}->delete($userID, $setID);
+	my $rows = $self->{set_locations_user}->put($UserSetLocation); # DBI returns 0E0 for 0.
+	if ($rows == 0) {
+		croak "putUserSetLocation: user set location not found (perhaps you meant to use addUserSetLocation?)";
+	} else {
+		return $rows;
+	}
 }
 
-=back
-
-=cut
+sub deleteUserSetLocation {
+	# userID, setID, and locationID can be undefined if being called from this package
+	my $U = caller eq __PACKAGE__ ? "!" : "";
+	my ($self, $userID, $setID, $locationID) = shift->checkArgs(\@_, "user_id$U", "set_id$U", "set_locations_id$U");
+	return $self->{set_locations_user}->delete($userID,$setID,$locationID);
+}
 
 ################################################################################
-# problem functions
+# set_locations_merged functions
 ################################################################################
+# this is different from other set_merged functions, because
+#    in this case the only data that we have are the set_id,
+#    location_id, and user_id, and we want to replace all 
+#    locations from GlobalSetLocations with those from 
+#    UserSetLocations if the latter exist.
 
-=head2 Global Problem Methods
+sub getAllMergedSetLocations {
+	my ($self, $userID, $setID) = shift->checkArgs(\@_, qw/user_id set_id/);
 
-FIXME: write this
+	if ( $self->countUserSetLocations($userID, $setID) ) {
+		return $self->getAllUserSetLocations( $userID, $setID );
+	} else {
+		return $self->getAllGlobalSetLocations( $setID );
+	}
+}
 
-=over
 
-=cut
+################################################################################
+# problem functions
+################################################################################
 
-sub newGlobalProblem {
-	my ($self, @prototype) = @_;
-	return $self->{problem}->{record}->new(@prototype);
+BEGIN {
+	*GlobalProblem = gen_schema_accessor("problem");
+	*newGlobalProblem = gen_new("problem");
+	*countGlobalProblemsWhere = gen_count_where("problem");
+	*existsGlobalProblemWhere = gen_exists_where("problem");
+	*listGlobalProblemsWhere = gen_list_where("problem");
+	*getGlobalProblemsWhere = gen_get_records_where("problem");
 }
 
+sub countGlobalProblems { return scalar shift->listGlobalProblems(@_) }
+
 sub listGlobalProblems {
-	my ($self, $setID) = @_;
-	
-	croak "listGlobalProblems: requires 1 arguments"
-		unless @_ == 2;
-	croak "listGlobalProblems: argument 1 must contain a set_id"
-		unless defined $setID;
-	
-	return map { $_->[1] }
-		$self->{problem}->list($setID, undef);
+	my ($self, $setID) = shift->checkArgs(\@_, qw/set_id/);
+	my $where = [set_id_eq => $setID];
+	if (wantarray) {
+		return map { @$_ } $self->{problem}->get_fields_where(["problem_id"], $where);
+	} else {
+		return $self->{problem}->count_where($where);
+	}
 }
 
-sub addGlobalProblem {
-	my ($self, $GlobalProblem) = @_;
-	
-	croak "addGlobalProblem: requires 1 argument"
-		unless @_ == 2;
-	croak "addGlobalProblem: argument 1 must be of type ", $self->{problem}->{record}
-		unless ref $GlobalProblem eq $self->{problem}->{record};
-	
-	checkKeyfields($GlobalProblem);
-	
-	croak "addGlobalProblem: global problem exists (perhaps you meant to use putGlobalProblem?)"
-		if $self->{problem}->exists($GlobalProblem->set_id, $GlobalProblem->problem_id);
-	croak "addGlobalProblem: set ", $GlobalProblem->set_id, " not found"
-		unless $self->{set}->exists($GlobalProblem->set_id);
-	
-	return $self->{problem}->add($GlobalProblem);
+sub existsGlobalProblem {
+	my ($self, $setID, $problemID) = shift->checkArgs(\@_, qw/set_id problem_id/);
+	return $self->{problem}->exists($setID, $problemID);
 }
 
 sub getGlobalProblem {
-	my ($self, $setID, $problemID) = @_;
-	
-	croak "getGlobalProblem: requires 2 arguments"
-		unless @_ == 3;
-	croak "getGlobalProblem: argument 1 must contain a set_id"
-		unless defined $setID;
-	croak "getGlobalProblem: argument 2 must contain a problem_id"
-		unless defined $problemID;
-	
-	return $self->{problem}->get($setID, $problemID);
+	my ($self, $setID, $problemID) = shift->checkArgs(\@_, qw/set_id problem_id/);
+	return ( $self->getGlobalProblems([$setID, $problemID]) )[0];
 }
 
-=item getGlobalProblems(@problemIDs)
-
-Return a list of global set records associated with the record IDs given. If
-there is no record associated with a given record ID, that element of the list
-will be undefined. @problemIDs consists of references to arrays in which the
-first element is the set_id, and the second element is the problem_id.
-
-=cut
-
 sub getGlobalProblems {
-	my ($self, @problemIDs) = @_;
-	
-	#croak "getGlobalProblems: requires 1 or more argument"
-	#	unless @_ >= 2;
-	foreach my $i (0 .. $#problemIDs) {
-		croak "getUserSets: element $i of argument list must contain a <set_id, problem_id> pair"
-			unless defined $problemIDs[$i]
-			       and ref $problemIDs[$i] eq "ARRAY"
-			       and @{$problemIDs[$i]} == 2
-			       and defined $problemIDs[$i]->[0]
-			       and defined $problemIDs[$i]->[1];
-	}
-	
+	my ($self, @problemIDs) = shift->checkArgsRefList(\@_, qw/set_id problem_id/);
 	return $self->{problem}->gets(@problemIDs);
 }
 
-=item getAllGlobalProblems($setID)
-
-Returns a list of Problem objects representing all the problems in the given
-global set. When using the WW1Hash/GlobalTableEmulator schemas, this is far
-more efficient than using listGlobalProblems and getGlobalProblems.
-
-=cut
-
 sub getAllGlobalProblems {
-	my ($self, $setID) = @_;
+	my ($self, $setID) = shift->checkArgs(\@_, qw/set_id/);
+	my $where = [set_id_eq => $setID];
+	return $self->{problem}->get_records_where($where);
+}
+
+sub addGlobalProblem {	my ($self, $GlobalProblem) = shift->checkArgs(\@_, qw/REC:problem/);
 	
-	croak "getAllGlobalProblems: requires 1 arguments"
-		unless @_ == 2;
-	croak "getAllGlobalProblems: argument 1 must contain a set_id"
-		unless defined $setID;
+	croak "addGlobalProblem: set ", $GlobalProblem->set_id, " not found"
+		unless $self->{set}->exists($GlobalProblem->set_id);
 	
-	if ($self->{problem}->can("getAll")) {
-		return $self->{problem}->getAll($setID);
-	} else {
-		my @problemIDPairs = $self->{problem}->list($setID, undef);
-		return $self->{problem}->gets(@problemIDPairs);
+	eval {
+		return $self->{problem}->add($GlobalProblem);
+	};
+	if (my $ex = caught WeBWorK::DB::Ex::RecordExists) {
+		croak "addGlobalProblem: global problem exists (perhaps you meant to use putGlobalProblem?)";
+	} elsif ($@) {
+		die $@;
 	}
 }
 
 sub putGlobalProblem {
-	my ($self, $GlobalProblem) = @_;
-	
-	croak "putGlobalProblem: requires 1 argument"
-		unless @_ == 2;
-	croak "putGlobalProblem: argument 1 must be of type ", $self->{problem}->{record}
-		unless ref $GlobalProblem eq $self->{problem}->{record};
-	
-	checkKeyfields($GlobalProblem);
-	
-	croak "putGlobalProblem: global problem not found (perhaps you meant to use addGlobalProblem?)"
-		unless $self->{problem}->exists($GlobalProblem->set_id, $GlobalProblem->problem_id);
-	croak "putGlobalProblem: set ", $GlobalProblem->set_id, " not found"
-		unless $self->{set}->exists($GlobalProblem->set_id);
-	
-	return $self->{problem}->put($GlobalProblem);
+	my ($self, $GlobalProblem) = shift->checkArgs(\@_, qw/REC:problem/);
+	my $rows = $self->{problem}->put($GlobalProblem); # DBI returns 0E0 for 0.
+	if ($rows == 0) {
+		croak "putGlobalProblem: global problem not found (perhaps you meant to use addGlobalProblem?)";
+	} else {
+		return $rows;
+	}
 }
 
 sub deleteGlobalProblem {
-	my ($self, $setID, $problemID) = @_;
-	
-	croak "deleteGlobalProblem: requires 2 arguments"
-		unless @_ == 3;
-	croak "deleteGlobalProblem: argument 1 must contain a set_id"
-		unless defined $setID or caller eq __PACKAGE__;
-	croak "deleteGlobalProblem: argument 2 must contain a problem_id"
-		unless defined $problemID or caller eq __PACKAGE__;
-	
+	# userID and setID can be undefined if being called from this package
+	my $U = caller eq __PACKAGE__ ? "!" : "";
+	my ($self, $setID, $problemID) = shift->checkArgs(\@_, "set_id$U", "problem_id$U");
 	$self->deleteUserProblem(undef, $setID, $problemID);
 	return $self->{problem}->delete($setID, $problemID);
 }
 
-=back
-
-=cut
-
 ################################################################################
 # problem_user functions
 ################################################################################
 
-=head2 User-Specific Problem Methods
-
-FIXME: write this
-
-=over
-
-=cut
-
-sub newUserProblem {
-	my ($self, @prototype) = @_;
-	return $self->{problem_user}->{record}->new(@prototype);
+BEGIN {
+	*UserProblem = gen_schema_accessor("problem_user");
+	*newUserProblem = gen_new("problem_user");
+	*countUserProblemsWhere = gen_count_where("problem_user");
+	*existsUserProblemWhere = gen_exists_where("problem_user");
+	*listUserProblemsWhere = gen_list_where("problem_user");
+	*getUserProblemsWhere = gen_get_records_where("problem_user");
 }
 
-sub countProblemUsers {
-	my ($self, $setID, $problemID) = @_;
-	
-	croak "countProblemUsers: requires 2 arguments"
-		unless @_ == 3;
-	croak "countProblemUsers: argument 1 must contain a set_id"
-		unless defined $setID;
-	croak "countProblemUsers: argument 2 must contain a problem_id"
-		unless defined $problemID;
-	
-	# the slow way
-	#return scalar $self->{problem_user}->list(undef, $setID, $problemID);
-	
-	# the fast way
-	return $self->{problem_user}->count(undef, $setID, $problemID);
-}
+sub countProblemUsers { return scalar shift->listProblemUsers(@_) }
 
 sub listProblemUsers {
-	my ($self, $setID, $problemID) = @_;
-	
-	carp "listProblemUsers called in SCALAR context: use countProblemUsers instead!\n"
-		unless wantarray;
-	
-	croak "listProblemUsers: requires 2 arguments"
-		unless @_ == 3;
-	croak "listProblemUsers: argument 1 must contain a set_id"
-		unless defined $setID;
-	croak "listProblemUsers: argument 2 must contain a problem_id"
-		unless defined $problemID;
-	
-	return map { $_->[0] } # extract user_id
-		$self->{problem_user}->list(undef, $setID, $problemID);
+	my ($self, $setID, $problemID) = shift->checkArgs(\@_, qw/set_id problem_id/);
+	my $where = [set_id_eq_problem_id_eq => $setID,$problemID];
+	if (wantarray) {
+		return map { @$_ } $self->{problem_user}->get_fields_where(["user_id"], $where);
+	} else {
+		return $self->{problem_user}->count_where($where);
+	}
 }
 
+sub countUserProblems { return scalar shift->listUserProblems(@_) }
+
 sub listUserProblems {
-	my ($self, $userID, $setID) = @_;
-	
-	croak "listUserProblems: requires 2 arguments"
-		unless @_ == 3;
-	croak "listUserProblems: argument 1 must contain a user_id"
-		unless defined $userID;
-	croak "listUserProblems: argument 2 must contain a set_id"
-		unless defined $setID;
-	
-	return map { $_->[2] } # extract problem_id
-		$self->{problem_user}->list($userID, $setID, undef);
+	my ($self, $userID, $setID) = shift->checkArgs(\@_, qw/user_id set_id/);
+	my $where = [user_id_eq_set_id_eq => $userID,$setID];
+	if (wantarray) {
+		return map { @$_ } $self->{problem_user}->get_fields_where(["problem_id"], $where);
+	} else {
+		return $self->{problem_user}->count_where($where);
+	}
 }
 
-sub addUserProblem {
-	my ($self, $UserProblem) = @_;
-	
-	croak "addUserProblem: requires 1 argument"
-		unless @_ == 2;
-	croak "addUserProblem: argument 1 must be of type ", $self->{problem_user}->{record}
-		unless ref $UserProblem eq $self->{problem_user}->{record};
-	
-	checkKeyfields($UserProblem);
-	
-	croak "addUserProblem: user problem exists (perhaps you meant to use putUserProblem?)"
-		if $self->{problem_user}->exists($UserProblem->user_id, $UserProblem->set_id, $UserProblem->problem_id);
-	croak "addUserProblem: user set ", $UserProblem->set_id, " for user ", $UserProblem->user_id, " not found"
-		unless $self->{set_user}->exists($UserProblem->user_id, $UserProblem->set_id);
-	croak "addUserProblem: problem ", $UserProblem->problem_id, " in set ", $UserProblem->set_id, " not found"
-		unless $self->{problem}->exists($UserProblem->set_id, $UserProblem->problem_id);
-	
-	return $self->{problem_user}->add($UserProblem);
+sub existsUserProblem {
+	my ($self, $userID, $setID, $problemID) = shift->checkArgs(\@_, qw/user_id set_id problem_id/);
+	return $self->{problem_user}->exists($userID, $setID, $problemID);
 }
 
 sub getUserProblem {
-	my ($self, $userID, $setID, $problemID) = @_;
-	
-	croak "getUserProblem: requires 3 arguments"
-		unless @_ == 4;
-	croak "getUserProblem: argument 1 must contain a user_id"
-		unless defined $userID;
-	croak "getUserProblem: argument 2 must contain a set_id"
-		unless defined $setID;
-	croak "getUserProblem: argument 3 must contain a problem_id"
-		unless defined $problemID;
-	
+	my ($self, $userID, $setID, $problemID) = shift->checkArgs(\@_, qw/user_id set_id problem_id/);
 	return ( $self->getUserProblems([$userID, $setID, $problemID]) )[0];
 }
 
-=item getUserProblems(@userProblemIDs)
-
-Return a list of user set records associated with the user IDs given. If there
-is no record associated with a given user ID, that element of the list will be
-undefined. @userProblemIDs consists of references to arrays in which the first
-element is the user_id, the second element is the set_id, and the third element
-is the problem_id.
-
-=cut
-
 sub getUserProblems {
-	my ($self, @userProblemIDs) = @_;
-	
-	#croak "getUserProblems: requires 1 or more argument"
-	#	unless @_ >= 2;
-	foreach my $i (0 .. $#userProblemIDs) {
-		croak "getUserProblems: element $i of argument list must contain a <user_id, set_id, problem_id> triple"
-			unless defined $userProblemIDs[$i]
-			       and ref $userProblemIDs[$i] eq "ARRAY"
-			       and @{$userProblemIDs[$i]} == 3
-			       and defined $userProblemIDs[$i]->[0]
-			       and defined $userProblemIDs[$i]->[1]
-			       and defined $userProblemIDs[$i]->[2];
-	}
-	
+	my ($self, @userProblemIDs) = shift->checkArgsRefList(\@_, qw/user_id set_id problem_id/);
 	return $self->{problem_user}->gets(@userProblemIDs);
 }
 
-=item getAllUserProblems($userID, $setID)
+sub getAllUserProblems {
+	my ($self, $userID, $setID) = shift->checkArgs(\@_, qw/user_id set_id/);
+	my $where = [user_id_eq_set_id_eq => $userID,$setID];
+	return $self->{problem_user}->get_records_where($where);
+}
 
-Returns a list of UserProblem objects representing all the problems in the
-given set. When using the WW1Hash/GlobalTableEmulator schemas, this is far
-more efficient than using listUserProblems and getUserProblems.
+sub addUserProblem {
+	# VERSIONING - accept versioned ID fields
+	my ($self, $UserProblem) = shift->checkArgs(\@_, qw/VREC:problem_user/);
+	
+	croak "addUserProblem: user set ", $UserProblem->set_id, " for user ", $UserProblem->user_id, " not found"
+		unless $self->{set_user}->exists($UserProblem->user_id, $UserProblem->set_id);
 
-=cut
+	my ( $nv_set_id, $versionNum ) = grok_vsetID( $UserProblem->set_id );
 
-sub getAllUserProblems {
-	my ($self, $userID, $setID) = @_;
-	
-	croak "getAllUserProblems: requires 2 arguments"
-		unless @_ == 3;
-	croak "getAllUserProblems: argument 1 must contain a user_id"
-		unless defined $userID;
-	croak "getAllUserProblems: argument 2 must contain a set_id"
-		unless defined $setID;
+	croak "addUserProblem: problem ", $UserProblem->problem_id, " in set $nv_set_id not found"
+		unless $self->{problem}->exists($nv_set_id, $UserProblem->problem_id);
 	
-	if ($self->{problem_user}->can("getAll")) {
-		return $self->{problem_user}->getAll($userID, $setID);
-	} else {
-		my @problemIDTriples = $self->{problem_user}->list($userID, $setID, undef);
-		return $self->{problem_user}->gets(@problemIDTriples);
+	eval {
+		return $self->{problem_user}->add($UserProblem);
+	};
+	if (my $ex = caught WeBWorK::DB::Ex::RecordExists) {
+		croak "addUserProblem: user problem exists (perhaps you meant to use putUserProblem?)";
+	} elsif ($@) {
+		die $@;
 	}
 }
 
+# versioned_ok is an optional argument which lets us slip versioned setIDs through checkArgs.
 sub putUserProblem {
-	my ($self, $UserProblem) = @_;
-	
-	croak "putUserProblem: requires 1 argument"
-		unless @_ == 2;
-	croak "putUserProblem: argument 1 must be of type ", $self->{problem_user}->{record}
-		unless ref $UserProblem eq $self->{problem_user}->{record};
-	
-	checkKeyfields($UserProblem);
+	my $V = $_[2] ? "V" : "";
+	my ($self, $UserProblem, undef) = shift->checkArgs(\@_, "${V}REC:problem_user", "versioned_ok!?");
 	
-	croak "putUserProblem: user set ", $UserProblem->set_id, " for user ", $UserProblem->user_id, " not found"
-		unless $self->{set_user}->exists($UserProblem->user_id, $UserProblem->set_id);
-	croak "putUserProblem: user problem not found (perhaps you meant to use addUserProblem?)"
-		unless $self->{problem_user}->exists($UserProblem->user_id, $UserProblem->set_id, $UserProblem->problem_id);
-	croak "putUserProblem: problem ", $UserProblem->problem_id, " in set ", $UserProblem->set_id, " not found"
-		unless $self->{problem}->exists($UserProblem->set_id, $UserProblem->problem_id);
-	
-	return $self->{problem_user}->put($UserProblem);
+	my $rows = $self->{problem_user}->put($UserProblem); # DBI returns 0E0 for 0.
+	if ($rows == 0) {
+		croak "putUserProblem: user problem not found (perhaps you meant to use addUserProblem?)";
+	} else {
+		return $rows;
+	}
 }
 
 sub deleteUserProblem {
-	my ($self, $userID, $setID, $problemID) = @_;
-	
-	croak "getUserProblem: requires 3 arguments"
-		unless @_ == 4;
-	croak "getUserProblem: argument 1 must contain a user_id"
-		unless defined $userID or caller eq __PACKAGE__;
-	croak "getUserProblem: argument 2 must contain a set_id"
-		unless defined $setID or caller eq __PACKAGE__;
-	croak "getUserProblem: argument 3 must contain a problem_id"
-		unless defined $problemID or caller eq __PACKAGE__;
-	
+	# userID, setID, and problemID can be undefined if being called from this package
+	my $U = caller eq __PACKAGE__ ? "!" : "";
+	my ($self, $userID, $setID, $problemID) = shift->checkArgs(\@_, "user_id$U", "set_id$U", "problem_id$U");
 	return $self->{problem_user}->delete($userID, $setID, $problemID);
 }
 
-=back
-
-=cut
-
 ################################################################################
-# set+set_user functions
+# problem_merged functions
 ################################################################################
 
-=head2 Set Merging Methods
-
-These functions combine a global set and a user set to create a merged set,
-which is returned. Any field that is not defined in the user set is taken from
-the global set. Merged sets have the same type as user sets.
-
-=over
-
-=cut
-
-sub getGlobalUserSet {
-	carp "getGlobalUserSet: this method is deprecated -- use getMergedSet instead";
-	return shift->getMergedSet(@_);
+BEGIN {
+	*MergedProblem = gen_schema_accessor("problem_merged");
+	#*newMergedProblem = gen_new("problem_merged");
+	#*countMergedProblemsWhere = gen_count_where("problem_merged");
+	*existsMergedProblemWhere = gen_exists_where("problem_merged");
+	#*listMergedProblemsWhere = gen_list_where("problem_merged");
+	*getMergedProblemsWhere = gen_get_records_where("problem_merged");
 }
 
-=item getMergedSet($userID, $setID)
-
-Returns a merged set record associated with the record IDs given. If there is no
-record associated with a given record ID, the undefined value is returned.
-
-=cut
-
-sub getMergedSet {
-	my ($self, $userID, $setID) = @_;
-	
-	croak "getMergedSet: requires 2 arguments"
-		unless @_ == 3;
-	croak "getMergedSet: argument 1 must contain a user_id"
-		unless defined $userID;
-	croak "getMergedSet: argument 2 must contain a set_id"
-		unless defined $setID;
-	
-	return ( $self->getMergedSets([$userID, $setID]) )[0];
+sub existsMergedProblem {
+	my ($self, $userID, $setID, $problemID) = shift->checkArgs(\@_, qw/user_id set_id problem_id/);
+	return $self->{problem_merged}->exists($userID, $setID, $problemID);
 }
 
-=item getMegedSets(@userSetIDs)
-
-Return a list of merged set records associated with the record IDs given. If
-there is no record associated with a given record ID, that element of the list
-will be undefined. @userSetIDs consists of references to arrays in which the
-first element is the user_id and the second element is the set_id.
-
-=cut
-
-sub getMergedSets {
-	my ($self, @userSetIDs) = @_;
-	
-	#croak "getMergedSets: requires 1 or more argument"
-	#	unless @_ >= 2;
-	foreach my $i (0 .. $#userSetIDs) {
-		croak "getMergedSets: element $i of argument list must contain a <user_id, set_id> pair"
-			unless defined $userSetIDs[$i]
-			       and ref $userSetIDs[$i] eq "ARRAY"
-			       and @{$userSetIDs[$i]} == 2
-			       and defined $userSetIDs[$i]->[0]
-			       and defined $userSetIDs[$i]->[1];
-	}
-	
-	# a horrible, terrible hack ;)
-	if (ref $self->{set_user} eq "WeBWorK::DB::Schema::WW1Hash"
-			and ref $self->{set} eq "WeBWorK::DB::Schema::GlobalTableEmulator") {
-		#warn __PACKAGE__.": using a terrible hack.\n";
-		$WeBWorK::timer->continue("DB: getsNoFilter start") if defined($WeBWorK::timer);
-		my @MergedSets = $self->{set_user}->getsNoFilter(@userSetIDs);
-		$WeBWorK::timer->continue("DB: getsNoFilter end") if defined($WeBWorK::timer);
-		return @MergedSets;
-	}
-	
-	$WeBWorK::timer->continue("DB: getUserSets start") if defined($WeBWorK::timer);
-	my @UserSets = $self->getUserSets(@userSetIDs); # checked
-	
-	$WeBWorK::timer->continue("DB: pull out set IDs start") if defined($WeBWorK::timer);
-	my @globalSetIDs = map { $_->[1] } @userSetIDs;
-	$WeBWorK::timer->continue("DB: getGlobalSets start") if defined($WeBWorK::timer);
-	my @GlobalSets = $self->getGlobalSets(@globalSetIDs); # checked
-	
-	$WeBWorK::timer->continue("DB: calc common fields start") if defined($WeBWorK::timer);
-	my %globalSetFields = map { $_ => 1 } $self->newGlobalSet->FIELDS;
-	my @commonFields = grep { exists $globalSetFields{$_} } $self->newUserSet->FIELDS;
-	
-	$WeBWorK::timer->continue("DB: merge start") if defined($WeBWorK::timer);
-	for (my $i = 0; $i < @UserSets; $i++) {
-		my $UserSet = $UserSets[$i];
-		my $GlobalSet = $GlobalSets[$i];
-		next unless defined $UserSet and defined $GlobalSet;
-		foreach my $field (@commonFields) {
-			next if defined $UserSet->$field;
-			$UserSet->$field($GlobalSet->$field);
-		}
-	}
-	$WeBWorK::timer->continue("DB: merge done!") if defined($WeBWorK::timer);
-	
-	return @UserSets;
+sub getMergedProblem {
+	my ($self, $userID, $setID, $problemID) = shift->checkArgs(\@_, qw/user_id set_id problem_id/);
+	return ( $self->getMergedProblems([$userID, $setID, $problemID]) )[0];
 }
 
-=back
+sub getMergedProblems {
+	my ($self, @userProblemIDs) = shift->checkArgsRefList(\@_, qw/user_id set_id problem_id/);
+	return $self->{problem_merged}->gets(@userProblemIDs);
+}
 
-=cut
+sub getAllMergedUserProblems {
+	my ($self, $userID, $setID) = shift->checkArgs(\@_, qw/user_id set_id/);
+	my $where = [user_id_eq_set_id_eq => $userID,$setID];
+	return $self->{problem_merged}->get_records_where($where);
+}
 
 ################################################################################
-# problem+problem_user functions
+# problem_version functions (NEW)
 ################################################################################
 
-=head2 Problem Merging Methods
-
-These functions combine a global problem and a user problem to create a merged
-problem, which is returned. Any field that is not defined in the user problem is
-taken from the global problem. Merged problems have the same type as user
-problems.
-
-=over
+BEGIN {
+	*ProblemVersion = gen_schema_accessor("problem_version");
+	*newProblemVersion = gen_new("problem_version");
+	*countProblemVersionsWhere = gen_count_where("problem_version");
+	*existsProblemVersionWhere = gen_exists_where("problem_version");
+	*listProblemVersionsWhere = gen_list_where("problem_version");
+	*getProblemVersionsWhere = gen_get_records_where("problem_version");
+}
 
-=cut
+# versioned analog of countUserProblems
+sub countProblemVersions { return scalar shift->listProblemVersions(@_) }
 
-sub getGlobalUserProblem {
-	carp "getGlobalUserProblem: this method is deprecated -- use getMergedProblem instead";
-	return shift->getMergedProblem(@_);
+# versioned analog of listUserProblems
+sub listProblemVersions { 
+	my ($self, $userID, $setID, $versionID) = shift->checkArgs(\@_, qw/user_id set_id version_id/);
+	my $where = [user_id_eq_set_id_eq_version_id_eq => $userID,$setID,$versionID];
+	if (wantarray) {
+		return map { @$_ } $self->{problem_version}->get_fields_where(["problem_id"], $where);
+	} else {
+		return $self->{problem_version}->count_where($where);
+	}
 }
 
-=item getMergedProblem($userID, $setID, $problemID)
-
-Returns a merged problem record associated with the record IDs given. If there
-is no record associated with a given record ID, the undefined value is returned.
+# this code returns a list of all problem versions with the given userID,
+# setID, and problemID, but that is (darn well ought to be) the same as 
+# listSetVersions, so it's not so useful as all that; c.f. above.
+# sub listProblemVersions {
+# 	my ($self, $userID, $setID, $problemID) = shift->checkArgs(\@_, qw/user_id set_id problem_id/);
+# 	my $where = [user_id_eq_set_id_eq_problem_id_eq => $userID,$setID,$problemID];
+# 	if (wantarray) {
+# 		return grep { @$_ } $self->{problem_version}->get_fields_where(["version_id"], $where);
+# 	} else {
+# 		return $self->{problem_version}->count_where($where);
+# 	}
+# }
 
-=cut
+# versioned analog of existsUserProblem
+sub existsProblemVersion {
+	my ($self, $userID, $setID, $versionID, $problemID) = shift->checkArgs(\@_, qw/user_id set_id version_id problem_id/);
+	return $self->{problem_version}->exists($userID, $setID, $versionID, $problemID);
+}
 
-sub getMergedProblem {
-	my ($self, $userID, $setID, $problemID) = @_;
-	
-	croak "getGlobalUserSet: requires 3 arguments"
-		unless @_ == 4;
-	croak "getGlobalUserSet: argument 1 must contain a user_id"
-		unless defined $userID;
-	croak "getGlobalUserSet: argument 2 must contain a set_id"
-		unless defined $setID;
-	croak "getGlobalUserSet: argument 3 must contain a problem_id"
-		unless defined $problemID;
-	
-	return ( $self->getMergedProblems([$userID, $setID, $problemID]) )[0];
+# versioned analog of getUserProblem
+sub getProblemVersion {
+	my ($self, $userID, $setID, $versionID, $problemID) = shift->checkArgs(\@_, qw/user_id set_id version_id problem_id/);
+	return ( $self->getProblemVersions([$userID, $setID, $versionID, $problemID]) )[0];
 }
 
-=item getMergedProblems(@userProblemIDs)
+# versioned analog of getUserProblems
+sub getProblemVersions {
+	my ($self, @problemVersionIDs) = shift->checkArgsRefList(\@_, qw/user_id set_id version_id problem_id/);
+	return $self->{problem_version}->gets(@problemVersionIDs);
+}
 
-Return a list of merged problem records associated with the record IDs given. If
-there is no record associated with a given record ID, that element of the list
-will be undefined. @userProblemIDs consists of references to arrays in which the
-first element is the user_id, the second element is the set_id, and the third
-element is the problem_id.
+# versioned analog of getAllUserProblems
+sub getAllProblemVersions {
+	my ( $self, $userID, $setID, $versionID ) = shift->checkArgs(\@_, qw/user_id set_id version_id/);
+	my $where = [user_id_eq_set_id_eq_version_id_eq => $userID,$setID,$versionID];
+	my $order = ["problem_id"];
+	return $self->{problem_version_merged}->get_records_where($where,$order);
+}
 
-=cut
 
-sub getMergedProblems {
-	my ($self, @userProblemIDs) = @_;
-	
-	#croak "getMergedProblems: requires 1 or more argument"
-	#	unless @_ >= 2;
-	foreach my $i (0 .. $#userProblemIDs) {
-		croak "getMergedProblems: element $i of argument list must contain a <user_id, set_id, problem_id> triple"
-			unless defined $userProblemIDs[$i]
-			       and ref $userProblemIDs[$i] eq "ARRAY"
-			       and @{$userProblemIDs[$i]} == 3
-			       and defined $userProblemIDs[$i]->[0]
-			       and defined $userProblemIDs[$i]->[1]
-			       and defined $userProblemIDs[$i]->[2];
-	}
-	
-	$WeBWorK::timer->continue("DB: getUserProblems start") if defined($WeBWorK::timer);
-	my @UserProblems = $self->getUserProblems(@userProblemIDs); # checked
+# versioned analog of addUserProblem
+sub addProblemVersion {
+	my ($self, $ProblemVersion) = shift->checkArgs(\@_, qw/REC:problem_version/);
 	
-	$WeBWorK::timer->continue("DB: pull out set/problem IDs start") if defined($WeBWorK::timer);
-	my @globalProblemIDs = map { [ $_->[1], $_->[2] ] } @userProblemIDs;
-	$WeBWorK::timer->continue("DB: getGlobalProblems start") if defined($WeBWorK::timer);
-	my @GlobalProblems = $self->getGlobalProblems(@globalProblemIDs); # checked
+	croak "addProblemVersion: set version ", $ProblemVersion->version_id, " of set ", $ProblemVersion->set_id, " not found for user ", $ProblemVersion->user_id
+		unless $self->{set_version}->exists($ProblemVersion->user_id, $ProblemVersion->set_id, $ProblemVersion->version_id);
+	croak "addProblemVersion: problem ", $ProblemVersion->problem_id, " of set ", $ProblemVersion->set_id, " not found for user ", $ProblemVersion->user_id
+		unless $self->{problem_user}->exists($ProblemVersion->user_id, $ProblemVersion->set_id, $ProblemVersion->problem_id);
 	
-	$WeBWorK::timer->continue("DB: calc common fields start") if defined($WeBWorK::timer);
-	my %globalProblemFields = map { $_ => 1 } $self->newGlobalProblem->FIELDS;
-	my @commonFields = grep { exists $globalProblemFields{$_} } $self->newUserProblem->FIELDS;
-	
-	$WeBWorK::timer->continue("DB: merge start") if defined($WeBWorK::timer);
-	for (my $i = 0; $i < @UserProblems; $i++) {
-		my $UserProblem = $UserProblems[$i];
-		my $GlobalProblem = $GlobalProblems[$i];
-		next unless defined $UserProblem and defined $GlobalProblem;
-		foreach my $field (@commonFields) {
-			next if defined $UserProblem->$field;
-			$UserProblem->$field($GlobalProblem->$field);
-		}
+	eval {
+		return $self->{problem_version}->add($ProblemVersion);
+	};
+	if (my $ex = caught WeBWorK::DB::Ex::RecordExists) {
+		croak "addProblemVersion: problem version exists (perhaps you meant to use putProblemVersion?)";
+	} elsif ($@) {
+		die $@;
 	}
-	$WeBWorK::timer->continue("DB: merge done!") if defined($WeBWorK::timer);
-	
-	return @UserProblems;
 }
 
-=back
+# versioned analog of putUserProblem
+sub putProblemVersion {
+	my ($self, $ProblemVersion) = shift->checkArgs(\@_, qw/REC:problem_version/);
+	my $rows = $self->{problem_version}->put($ProblemVersion); # DBI returns 0E0 for 0.
+	if ($rows == 0) {
+		croak "putProblemVersion: problem version not found (perhaps you meant to use addProblemVersion?)";
+	} else {
+		return $rows;
+	}
+}
 
-=cut
+# versioned analog of deleteUserProblem
+sub deleteProblemVersion {
+	# userID, setID, versionID, and problemID can be undefined if being called from this package
+	my $U = caller eq __PACKAGE__ ? "!" : "";
+	my ($self, $userID, $setID, $versionID, $problemID) = shift->checkArgs(\@_, "user_id$U", "set_id$U", "version_id$U", "problem_id$U");
+	return $self->{problem_version}->delete($userID, $setID, $versionID, $problemID);
+}
 
 ################################################################################
-# debugging
+# problem_version_merged functions (NEW)
 ################################################################################
 
-#sub dumpDB($$) {
-#	my ($self, $table) = @_;
-#	return $self->{$table}->dumpDB();
-#}
+BEGIN {
+	*MergedProblemVersion = gen_schema_accessor("problem_version_merged");
+	#*newMergedProblemVersion = gen_new("problem_version_merged");
+	#*countMergedProblemVersionsWhere = gen_count_where("problem_version_merged");
+	*existsMergedProblemVersionWhere = gen_exists_where("problem_version_merged");
+	#*listMergedProblemVersionsWhere = gen_list_where("problem_version_merged");
+	*getMergedProblemVersionsWhere = gen_get_records_where("problem_version_merged");
+}
+
+sub existsMergedProblemVersion {
+	my ($self, $userID, $setID, $versionID, $problemID) = shift->checkArgs(\@_, qw/user_id set_id version_id problem_id/);
+	return $self->{problem_version_merged}->exists($userID, $setID, $versionID, $problemID);
+}
+
+sub getMergedProblemVersion {
+	my ($self, $userID, $setID, $versionID, $problemID) = shift->checkArgs(\@_, qw/user_id set_id version_id problem_id/);
+	return ( $self->getMergedProblemVersions([$userID, $setID, $versionID, $problemID]) )[0];
+}
+
+sub getMergedProblemVersions {
+	my ($self, @problemVersionIDs) = shift->checkArgsRefList(\@_, qw/user_id set_id version_id problem_id/);
+	return $self->{problem_version_merged}->gets(@problemVersionIDs);
+}
+
+sub getAllMergedProblemVersions {
+	my ($self, $userID, $setID, $versionID) = shift->checkArgs(\@_, qw/user_id set_id version_id/);
+	my $where = [user_id_eq_set_id_eq_version_id_eq => $userID,$setID,$versionID];
+	my $order = ["problem_id"];
+	return $self->{problem_version_merged}->get_records_where($where,$order);
+}
 
 ################################################################################
 # utilities
 ################################################################################
 
-sub checkKeyfields($) {
-	my ($Record) = @_;
+sub check_user_id { #  (valid characters are [-a-zA-Z0-9_.,@]) 
+	my $value = shift;
+	if ($value =~ m/^[-a-zA-Z0-9_.@]*,?(set_id:)?[-a-zA-Z0-9_.@]*(,g)?$/ ) {
+		return 1;
+	} else {
+		croak "invalid characters in user_id field: '$value' (valid characters are [-a-zA-Z0-9_.,@])";
+		return 0;
+	}
+}
+# the (optional) second argument to checkKeyfields is to support versioned
+# (gateway) sets, which may include commas in certain fields (in particular,
+# set names (e.g., setDerivativeGateway,v1) and user names (e.g., 
+# username,proctorname)
+
+sub checkKeyfields($;$) {
+	my ($Record, $versioned) = @_;
 	foreach my $keyfield ($Record->KEYFIELDS) {
 		my $value = $Record->$keyfield;
-		croak "checkKeyfields: $keyfield is empty"
-			unless defined $value and $value ne "";
+		
+		croak "undefined '$keyfield' field"
+			unless defined $value;
+		croak "empty '$keyfield' field"
+			unless $value ne "";
 		
 		if ($keyfield eq "problem_id") {
-			croak "checkKeyfields: invalid characters in $keyfield field: $value (valid characters are [0-9])"
-				unless $value =~ m/^\d*$/;
+			croak "invalid characters in '$keyfield' field: '$value' (valid characters are [0-9])"
+				unless $value =~ m/^[0-9]*$/;
+		} elsif ($versioned and $keyfield eq "set_id") {
+			croak "invalid characters in '$keyfield' field: '$value' (valid characters are [-a-zA-Z0-9_.,])"
+				unless $value =~ m/^[-a-zA-Z0-9_.,]*$/;
+		# } elsif ($versioned and $keyfield eq "user_id") { 
+		} elsif ($keyfield eq "user_id") { 
+			check_user_id($value); #  (valid characters are [-a-zA-Z0-9_.,]) see above.
+		} elsif ($keyfield eq "ip_mask") {
+			croak "invalid characters in '$keyfield' field: '$value' (valid characters are [-a-fA-F0-9_.:/])"
+				unless $value =~ m/^[-a-fA-F0-9_.:\/]*$/;
+			    
 		} else {
-			croak "checkKeyfields: invalid characters in $keyfield field: $value (valid characters are [A-Za-z0-9_])"
-				unless $value =~ m/^[\w-]*$/;
+			croak "invalid characters in '$keyfield' field: '$value' (valid characters are [-a-zA-Z0-9_.])"
+				unless $value =~ m/^[-a-zA-Z0-9_.]*$/;
 		}
 	}
 }
 
-=head1 AUTHOR
 
-Written by Sam Hathaway, sh002i (at) math.rochester.edu.
+# checkArgs spec syntax:
+# 
+# spec = list_item | item*
+# list_item = item is_list
+# is_list = "*"
+# item = item_name undef_ok? optional?
+# item_name = record_item | bare_item
+# record_item = is_versioned? "REC:" table
+# is_versioned = "V"
+# table = \w+
+# bare_item = \w+
+# undef_ok = "!"
+# optional = "?"
+# 
+# [[V]REC:]foo[!][?][*]
 
-=cut
+sub checkArgs {
+	my ($self, $args, @spec) = @_;
+	
+	my $is_list = @spec == 1 && $spec[0] =~ s/\*$//;
+	my ($min_args, $max_args);
+	if ($is_list) {
+		$min_args = 0;
+	} else {
+		foreach my $i (0..$#spec) {
+			#print "$i - $spec[$i]\n";
+			if ($spec[$i] =~ s/\?$//) {
+				#print "$i - matched\n";
+				$min_args = $i unless defined $min_args;
+			}
+		}
+		$min_args = @spec unless defined $min_args;
+		$max_args = @spec;
+	}
+	
+	if (@$args < $min_args or defined $max_args and @$args > $max_args) {
+		if ($min_args == $max_args) {
+			my $s = $min_args == 1 ? "" : "s";
+			croak "requires $min_args argument$s";
+		} elsif (defined $max_args) {
+			croak "requires between $min_args and $max_args arguments";
+		} else {
+			my $s = $min_args == 1 ? "" : "s";
+			croak "requires at least $min_args argument$s";
+		}
+	}
+	
+	my ($name, $versioned, $table);
+	if ($is_list) {
+		$name = $spec[0];
+		($versioned, $table) = $name =~ /^(V?)REC:(.*)/;
+	}
+	
+	foreach my $i (0..@$args-1) {
+		my $arg = $args->[$i];
+		my $pos = $i+1;
+		
+		unless ($is_list) {
+			$name = $spec[$i];
+			($versioned, $table) = $name =~ /^(V?)REC:(.*)/;
+		}
+		
+		if (defined $table) {
+			my $class = $self->{$table}{record};
+			#print "arg=$arg class=$class\n";
+			croak "argument $pos must be of type $class"
+				unless defined $arg and ref $arg and $arg->isa($class);
+			eval { checkKeyfields($arg, $versioned) };
+			croak "argument $pos contains $@" if $@;
+		} else {
+			if ($name !~ /!$/) {
+				croak "argument $pos must contain a $name"
+					unless defined $arg;
+			}
+		}
+	}
+	
+	return $self, @$args;
+}
+
+sub checkArgsRefList {
+	my ($self, $items, @spec) = @_;
+	foreach my $i (0..@$items-1) {
+		my $item = $items->[$i];
+		my $pos = $i+1;
+		croak "item $pos must be a reference to an array"
+			unless UNIVERSAL::isa($item, "ARRAY");
+		eval { $self->checkArgs($item, @spec) };
+		croak "item $pos $@" if $@;
+	}
+	
+	return $self, @$items;
+}
 
 1;
diff --git a/lib/WeBWorK/DB/Driver.pm b/lib/WeBWorK/DB/Driver.pm
index 22804459b7..feffcb681e 100644
--- a/lib/WeBWorK/DB/Driver.pm
+++ b/lib/WeBWorK/DB/Driver.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/DB/Driver.pm,v 1.3 2006/01/25 23:13:54 sh002i 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
diff --git a/lib/WeBWorK/DB/Driver/GDBM.pm b/lib/WeBWorK/DB/Driver/GDBM.pm
deleted file mode 100644
index ff30c37bf8..0000000000
--- a/lib/WeBWorK/DB/Driver/GDBM.pm
+++ /dev/null
@@ -1,95 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
-# 
-# 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
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-# 
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-package WeBWorK::DB::Driver::GDBM;
-use base qw(WeBWorK::DB::Driver);
-
-=head1 NAME
-
-WeBWorK::DB::Driver::GDBM - hash style interface to GDBM databases.
-
-=cut
-
-use strict;
-use warnings;
-use GDBM_File;
-
-use constant STYLE => "hash";
-
-use constant MAX_TIE_ATTEMPTS => 30;
-use constant TIE_RETRY_DELAY  => 2;
-use constant TIE_PERMISSION   => 0660;
-
-################################################################################
-# constructor - GDBM-specific settings
-################################################################################
-
-sub new($$$) {
-	my ($proto, $source, $params) = @_;
-	
-	my $self = $proto->SUPER::new($source, $params);
-	
-	# hashref for tied hash
-	$self->{hash} = {};
-	
-	return $self;
-}
-
-################################################################################
-# common methods
-################################################################################
-
-sub connect($$) {
-	my ($self, $mode) = @_;
-	my $hash = $self->{hash};
-	my $source = $self->{source};
-	
-	return 1 if tied %$hash; # already tied!
-	if (lc $mode eq "ro" and not -e $source) {
-		$self->connect("rw");
-		$self->disconnect;
-	}
-	my $flags = lc $mode eq "rw" ? GDBM_WRCREAT() : GDBM_READER();
-	foreach (1 .. MAX_TIE_ATTEMPTS) {
-		return 1 if tie %$hash,
-			"GDBM_File",    # class
-			$source,        # file name
-			$flags,         # I/O flags
-			TIE_PERMISSION; # access mode
-		warn __PACKAGE__, ": tie failed with error $!, (attempt $_)\n";
-		sleep TIE_RETRY_DELAY;
-	}
-	die "$source: connection failed";
-}
-
-sub disconnect($) {
-	my $self = shift;
-	return 1 unless tied %{$self->{hash}}; # not tied!
-	return untie %{$self->{hash}}; 
-}
-
-################################################################################
-# hash-style methods
-################################################################################
-
-sub hash($) {
-	my ($self) = @_;
-	die "hash not tied"
-		unless tied %{$self->{hash}};
-	return $self->{hash};
-}
-
-1;
diff --git a/lib/WeBWorK/DB/Driver/Null.pm b/lib/WeBWorK/DB/Driver/Null.pm
index 3b22afcb5b..20653430b9 100644
--- a/lib/WeBWorK/DB/Driver/Null.pm
+++ b/lib/WeBWorK/DB/Driver/Null.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/DB/Driver/Null.pm,v 1.5 2006/01/25 23:13:54 sh002i 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
diff --git a/lib/WeBWorK/DB/Driver/SQL.pm b/lib/WeBWorK/DB/Driver/SQL.pm
index 0aab0430a9..a3fbee75ff 100644
--- a/lib/WeBWorK/DB/Driver/SQL.pm
+++ b/lib/WeBWorK/DB/Driver/SQL.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/DB/Driver/SQL.pm,v 1.15 2007/07/19 21:02:42 sh002i 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
@@ -29,6 +29,29 @@ use DBI;
 
 use constant STYLE => "dbi";
 
+=head1 SOURCE FORMAT
+
+The C<source> entry for tables handled by this driver should consist of a DBI
+data source.
+
+=head1 SUPPORTED PARAMS
+
+This driver pays attention to the following items in the C<params> entry.
+
+=over
+
+=item username
+
+Username for access to SQL database.
+
+=item password
+
+Password for access to SQL database.
+
+=back
+
+=cut
+
 ################################################################################
 # constructor
 ################################################################################
@@ -36,18 +59,22 @@ use constant STYLE => "dbi";
 sub new($$$) {
 	my ($proto, $source, $params) = @_;
 	
-	my $handleRO = DBI->connect_cached($source, $params->{usernameRO}, $params->{passwordRO});
-	return 0 unless defined $handleRO;
-	
-	my $handleRW = DBI->connect_cached($source, $params->{usernameRW}, $params->{passwordRW});
-	return 0 unless defined $handleRW;
-	
 	my $self = $proto->SUPER::new($source, $params);
 	
-	# add DBI-specific data
-	$self->{handle}   = undef;
-	$self->{handleRO} = $handleRO;
-	$self->{handleRW} = $handleRW;
+	# add handle
+	$self->{handle} = DBI->connect_cached(
+		$source,
+		$params->{username},
+		$params->{password},
+		{
+			PrintError => 0,
+			RaiseError => 1,
+		},
+	);
+	die $DBI::errstr unless defined $self->{handle};
+	
+	# set trace level from debug param
+	#$self->{handle}->trace($params->{debug}) if $params->{debug};
 	
 	return $self;
 }
@@ -56,23 +83,13 @@ sub new($$$) {
 # common methods
 ################################################################################
 
-sub connect($$) {
-	my ($self, $mode) = @_;
-	
-	if ($mode eq "ro") {
-		$self->{handle} = $self->{handleRO};
-	} else {
-		$self->{handle} = $self->{handleRW};
-	}
-	
+# deprecated, no-op
+sub connect {
 	return 1;
 }
 
-sub disconnect($) {
-	my $self = shift;
-	
-	undef $self->{handle};
-	
+# deprecated, no-op
+sub disconnect {
 	return 1;
 }
 
@@ -80,9 +97,10 @@ sub disconnect($) {
 # dbi-style methods
 ################################################################################
 
-sub dbi($) {
+sub dbi {
 	my ($self) = @_;
 	return $self->{handle};
 }
 
 1;
+
diff --git a/lib/WeBWorK/DB/Record.pm b/lib/WeBWorK/DB/Record.pm
index 6319259208..e6ab0c037a 100644
--- a/lib/WeBWorK/DB/Record.pm
+++ b/lib/WeBWorK/DB/Record.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/DB/Record.pm,v 1.13 2007/07/22 05:25:14 sh002i 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,62 +40,138 @@ $Prototype, which must be a subclass of WeBWorK::DB::Record.
 Create a new record object, set initial values from the hash %fields, which
 must contain keys equal to the field names of the record class.
 
-=back
-
 =cut
 
 sub new {
-	my ($invocant, @rest) = @_;
-	my $class = ref($invocant) || $invocant;
-	my $self = {};
+	my $invocant = shift;
+	my $self = bless {}, ref($invocant) || $invocant;
 	
-	if (@rest) {
-		if ((ref $rest[0]) =~ /^WeBWorK::DB::Record/) {
-			my $prototype = $rest[0];
-			foreach ($invocant->FIELDS) {
-				$self->{$_} = $prototype->{$_}
-					if exists $prototype->{$_};
-			}
-		} elsif (@rest % 2 == 0) {
-			my %fields = @rest;
-			foreach ($invocant->FIELDS) {
-				$self->{$_} = $fields{$_}
-					if exists $fields{$_};
-			}
+	if (@_) {
+		if (UNIVERSAL::isa($_[0], __PACKAGE__)) {
+			$self->init_from_object($_[0]);
+		} elsif (ref $_[0] eq "HASH") {
+			$self->init_from_hashref($_[0]);
+		} elsif (ref $_[0] eq "ARRAY") {
+			$self->init_from_arrayref($_[0]);
+		} else {
+			$self->init_from_hashref({@_});
 		}
 	}
 	
-	bless $self, $class;
 	return $self;
 }
 
-sub can {
-	my ($self, $function) = @_;
-	return grep { $_ eq $function } $self->FIELDS;
+# this will have to be changed if we actually implement any custom accessors/mutators
+sub init_from_object { shift->init_from_hashref(shift) }
+
+sub init_from_hashref {
+	my ($self, $prototype) = @_;
+	@$self{$self->FIELDS} = @$prototype{$self->FIELDS};
+}
+
+sub init_from_arrayref {
+	my ($self, $prototype) = @_;
+	@$self{$self->FIELDS} = @$prototype;
 }
 
-sub AUTOLOAD {
-	my ($self, @args) = @_;
-	our $AUTOLOAD;
-	my ($package, $function) = $AUTOLOAD =~ m/^(.*)::(.*)$/;
-	return if $function eq "DESTROY";
-	if (grep { $_ eq $function } $self->FIELDS) {
-		$self->{$function} = $args[0] if @args;
-		return $self->{$function};
-	} else {
-		croak "Undefined subroutine $package\::$function called";
-	}
+=back
+
+=head1 BASE METHODS
+
+=over
+
+=item idsToString
+
+Returns a string representation of the object's keyfields.
+
+=cut
+
+sub idsToString {
+	my $self = shift;
+	return join " ", map { "$_=" . (defined $self->$_ ? "'".$self->$_."'" : "undef") } $self->KEYFIELDS;
 }
 
+=item idsToString
+
+Returns a string representation of the object's fields.
+
+=cut
+
 sub toString {
 	my $self = shift;
-	my $result;
-	foreach ($self->FIELDS) {
-		$result .= "$_ => ";
-		$result .= defined $self->$_() ? $self->$_() : "";
-		$result .= "\n";
+	return join " ", map { "$_=" . (defined $self->$_ ? "'".$self->$_."'" : "undef") } $self->FIELDS;
+}
+
+=item toHash
+
+Returns a hash representation of the object's fields. If interpreted as a list,
+the fields will be in order.
+
+=cut
+
+sub toHash {
+	my $self = shift;
+	return map { $_ => $self->$_ } $self->FIELDS;
+}
+
+=item toArray
+
+Returns an array representation of the object's fields.
+
+=cut
+
+sub toArray {
+	my $self = shift;
+	return map { $self->$_ } $self->FIELDS;
+}
+
+=back
+
+=cut
+
+sub _fields {
+	my $invocant = shift;
+	my $class = ref $invocant || $invocant;
+	my @field_data = @_;
+	
+	my %field_data = @field_data;
+	my @field_order = @field_data[ grep {$_%2==0} 0..$#field_data ];
+	my @keyfields = grep { $field_data{$_}{key} } @field_order;
+	my @nonkeyfields = grep { not $field_data{$_}{key} } @field_order;
+	my @sql_types = map { $field_data{$_}{type} } @field_order;
+	
+	no strict 'refs';
+	
+	# class methods that return field info
+	*{$class."::FIELD_DATA"} = sub { return \%field_data };
+	*{$class."::FIELDS"} = sub { return @field_order };
+	*{$class."::KEYFIELDS"} = sub { return @keyfields };
+	*{$class."::NONKEYFIELDS"} = sub { return @nonkeyfields };
+	*{$class."::SQL_TYPES"} = sub { return @sql_types };
+	
+	# accessor functions
+	foreach my $field (@field_order) {
+		# always define a "base" accessor
+		# custom public accessors can use this to actually do the getting and setting
+		*{$class."::_base_$field"} = sub {
+			my $self = shift;
+			$self->{$field} = shift if @_;
+			return $self->{$field};
+		};
+		# if there isn't a public accessor in the subclass, alias it to the base accessor
+		next if exists ${$class."::"}{$field};
+		*{$class."::$field"} = *{$class."::_base_$field"};
 	}
-	return $result;
+}
+
+sub _initial_records {
+	my $invocant = shift;
+	my $class = ref $invocant || $invocant;
+	my @initializers = @_;
+	
+	no strict 'refs';
+	*{$class."::INITIAL_RECORDS"} = sub { return @initializers };
 }
 
 1;
+
diff --git a/lib/WeBWorK/DB/Record/Depths.pm b/lib/WeBWorK/DB/Record/Depths.pm
new file mode 100644
index 0000000000..8c58bf6104
--- /dev/null
+++ b/lib/WeBWorK/DB/Record/Depths.pm
@@ -0,0 +1,40 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/DB/Record/Setting.pm,v 1.2 2007/07/22 05:25:17 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::DB::Record::Depths;
+use base WeBWorK::DB::Record;
+
+=head1 NAME
+
+WeBWorK::DB::Record::Depths - represent a record from the depths table.
+
+=cut
+
+use strict;
+use warnings;
+
+#use WeBWorK::Utils::DBUpgrade;
+
+BEGIN {
+	__PACKAGE__->_fields(
+		md5   => { type=>"CHAR(33) NOT NULL", key=>1 },
+		depth => { type=>"SMALLINT" },
+	);
+
+}
+
+1;
+
diff --git a/lib/WeBWorK/DB/Record/Key.pm b/lib/WeBWorK/DB/Record/Key.pm
index 2be22281a6..c70cd65af6 100644
--- a/lib/WeBWorK/DB/Record/Key.pm
+++ b/lib/WeBWorK/DB/Record/Key.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/DB/Record/Key.pm,v 1.10 2006/10/02 15:04:27 sh002i 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
@@ -26,19 +26,12 @@ WeBWorK::DB::Record::Key - represent a record from the key table.
 use strict;
 use warnings;
 
-sub KEYFIELDS {qw(
-	user_id
-)}
-
-sub NONKEYFIELDS {qw(
-	key
-	timestamp
-)}
-
-sub FIELDS {qw(
-	user_id
-	key
-	timestamp
-)}
+BEGIN {
+	__PACKAGE__->_fields(
+		user_id   => { type=>"TINYBLOB NOT NULL", key=>1 },
+		key       => { type=>"TEXT" },
+		timestamp => { type=>"BIGINT" },
+	);
+}
 
 1;
diff --git a/lib/WeBWorK/DB/Record/LocationAddresses.pm b/lib/WeBWorK/DB/Record/LocationAddresses.pm
new file mode 100644
index 0000000000..4bac5ebac9
--- /dev/null
+++ b/lib/WeBWorK/DB/Record/LocationAddresses.pm
@@ -0,0 +1,35 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright � 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/bin/readURClassList.pl,v 1.2.2.1 2007/08/13 22:53:39 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+package WeBWorK::DB::Record::LocationAddresses;
+use base WeBWorK::DB::Record;
+
+=head1 NAME
+
+WeBWorK::DB::Record::LocationAddresses - represent a record from the location_addresses table.
+
+=cut
+
+use strict;
+use warnings;
+
+BEGIN { 
+	__PACKAGE__->_fields(
+		location_id => { type=>"TINYBLOB NOT NULL", key=> 1 },
+		ip_mask     => { type=>"VARCHAR(255)", key=> 1 },
+	);
+}
+
+1;
diff --git a/lib/WeBWorK/DB/Record/Locations.pm b/lib/WeBWorK/DB/Record/Locations.pm
new file mode 100644
index 0000000000..5d11b43e00
--- /dev/null
+++ b/lib/WeBWorK/DB/Record/Locations.pm
@@ -0,0 +1,35 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright � 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/bin/readURClassList.pl,v 1.2.2.1 2007/08/13 22:53:39 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+package WeBWorK::DB::Record::Locations;
+use base WeBWorK::DB::Record;
+
+=head1 NAME
+
+WeBWorK::DB::Record::Locations - represent a record from the locations table.
+
+=cut
+
+use strict;
+use warnings;
+
+BEGIN { 
+	__PACKAGE__->_fields(
+		location_id => { type=>"TINYBLOB NOT NULL", key=>1 },
+		description => { type=>"TEXT" },
+	);
+}
+
+1;
diff --git a/lib/WeBWorK/DB/Record/Password.pm b/lib/WeBWorK/DB/Record/Password.pm
index 2d1d4b90aa..24c94de9ca 100644
--- a/lib/WeBWorK/DB/Record/Password.pm
+++ b/lib/WeBWorK/DB/Record/Password.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/DB/Record/Password.pm,v 1.9 2006/10/02 15:04:27 sh002i 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
@@ -26,17 +26,11 @@ WeBWorK::DB::Record::Password - represent a record from the password table.
 use strict;
 use warnings;
 
-sub KEYFIELDS {qw(
-	user_id
-)}
-
-sub NONKEYFIELDS {qw(
-	password
-)}
-
-sub FIELDS {qw(
-	user_id
-	password
-)}
+BEGIN {
+	__PACKAGE__->_fields(
+		user_id  => { type=>"TINYBLOB NOT NULL", key=>1 },
+		password => { type=>"TEXT" },
+	);
+}
 
 1;
diff --git a/lib/WeBWorK/DB/Record/PermissionLevel.pm b/lib/WeBWorK/DB/Record/PermissionLevel.pm
index 6f8970b3bc..db983b41a2 100644
--- a/lib/WeBWorK/DB/Record/PermissionLevel.pm
+++ b/lib/WeBWorK/DB/Record/PermissionLevel.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/DB/Record/PermissionLevel.pm,v 1.10 2006/10/02 15:04:27 sh002i 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
@@ -27,17 +27,12 @@ table.
 use strict;
 use warnings;
 
-sub KEYFIELDS {qw(
-	user_id
-)}
+BEGIN {
+	__PACKAGE__->_fields(
+		user_id    => { type=>"TINYBLOB NOT NULL", key=>1 },
+		permission => { type=>"INT" },
 
-sub NONKEYFIELDS {qw(
-	permission
-)}
-
-sub FIELDS {qw(
-	user_id
-	permission
-)}
+	);
+}
 
 1;
diff --git a/lib/WeBWorK/DB/Record/Problem.pm b/lib/WeBWorK/DB/Record/Problem.pm
index 120344dc55..400773ea02 100644
--- a/lib/WeBWorK/DB/Record/Problem.pm
+++ b/lib/WeBWorK/DB/Record/Problem.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/DB/Record/Problem.pm,v 1.9 2006/10/02 15:04:27 sh002i 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
@@ -26,23 +26,14 @@ WeBWorK::DB::Record::Problem - represent a record from the problem table.
 use strict;
 use warnings;
 
-sub KEYFIELDS {qw(
-	set_id
-	problem_id
-)}
-
-sub NONKEYFIELDS {qw(
-	source_file
-	value
-	max_attempts
-)}
-
-sub FIELDS {qw(
-	set_id
-	problem_id
-	source_file
-	value
-	max_attempts
-)}
+BEGIN {
+	__PACKAGE__->_fields(
+		set_id       => { type=>"TINYBLOB NOT NULL", key=>1 },
+		problem_id   => { type=>"INT NOT NULL", key=>1 },
+		source_file  => { type=>"TEXT" },
+		value        => { type=>"INT" },
+		max_attempts => { type=>"INT" },
+	);
+}
 
 1;
diff --git a/lib/WeBWorK/DB/Record/ProblemVersion.pm b/lib/WeBWorK/DB/Record/ProblemVersion.pm
new file mode 100644
index 0000000000..eb5938f004
--- /dev/null
+++ b/lib/WeBWorK/DB/Record/ProblemVersion.pm
@@ -0,0 +1,44 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/DB/Record/ProblemVersion.pm,v 1.2 2007/02/22 01:25:11 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::DB::Record::ProblemVersion;
+use base WeBWorK::DB::Record::UserProblem;
+
+=head1 NAME
+
+WeBWorK::DB::Record::ProblemVersion - represent a record from the virtual 
+problem_version table.
+
+=cut
+
+use strict;
+use warnings;
+
+BEGIN {
+	our @ISA;
+	my $base = $ISA[0];
+	my $field_data = $base->FIELD_DATA;
+	my @nonkeyfields = map { $_ => $field_data->{$_} } $base->NONKEYFIELDS;
+	__PACKAGE__->_fields(
+		user_id       => { type=>"TINYBLOB NOT NULL", key=>1 },
+		set_id        => { type=>"TINYBLOB NOT NULL", key=>1 },
+		version_id    => { type=>"INT NOT NULL", key=>1 },
+		problem_id    => { type=>"INT NOT NULL", key=>1 },
+		@nonkeyfields,
+	);
+}
+
+1;
diff --git a/lib/WeBWorK/DB/Record/Set.pm b/lib/WeBWorK/DB/Record/Set.pm
index b577f784bb..84b7173193 100644
--- a/lib/WeBWorK/DB/Record/Set.pm
+++ b/lib/WeBWorK/DB/Record/Set.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/DB/Record/Set.pm,v 1.22 2007/08/13 22:59:57 sh002i 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
@@ -26,25 +26,33 @@ WeBWorK::DB::Record::Set - represent a record from the set table.
 use strict;
 use warnings;
 
-sub KEYFIELDS {qw(
-	set_id
-)}
-
-sub NONKEYFIELDS {qw(
-	set_header
-	problem_header
-	open_date
-	due_date
-	answer_date
-)}
-
-sub FIELDS {qw(
-	set_id
-	set_header
-	problem_header
-	open_date
-	due_date
-	answer_date
-)}
+BEGIN {
+	__PACKAGE__->_fields(
+		set_id                    => { type=>"TINYBLOB NOT NULL", key=>1 },
+		set_header                => { type=>"TEXT" },
+		hardcopy_header           => { type=>"TEXT" },
+		open_date                 => { type=>"BIGINT" },
+		due_date                  => { type=>"BIGINT" },
+		answer_date               => { type=>"BIGINT" },
+		visible                   => { type=>"INT" },
+		enable_reduced_scoring    => { type=>"INT" },
+		assignment_type           => { type=>"TEXT" },
+		attempts_per_version      => { type=>"INT" },
+		time_interval             => { type=>"INT" },
+		versions_per_interval     => { type=>"INT" },
+		version_time_limit        => { type=>"INT" },
+		version_creation_time     => { type=>"BIGINT" },
+		problem_randorder         => { type=>"INT" },
+		version_last_attempt_time => { type=>"BIGINT" },
+		problems_per_page         => { type=>"INT" },
+		hide_score                => { type=>"ENUM('N','Y','BeforeAnswerDate')" },
+		hide_score_by_problem     => { type=>"ENUM('N','Y')" },
+		hide_work                 => { type=>"ENUM('N','Y','BeforeAnswerDate')" },
+		time_limit_cap            => { type=>"ENUM('0','1')" },
+		restrict_ip               => { type=>"ENUM('No','RestrictTo','DenyFrom') DEFAULT 'No'" },
+		relax_restrict_ip         => { type=>"ENUM('No','AfterAnswerDate','AfterVersionAnswerDate') DEFAULT 'No'" },
+		restricted_login_proctor  => { type=>"ENUM('No','Yes')" },
+	);
+}
 
 1;
diff --git a/lib/WeBWorK/DB/Record/SetLocations.pm b/lib/WeBWorK/DB/Record/SetLocations.pm
new file mode 100644
index 0000000000..bb9622c3e6
--- /dev/null
+++ b/lib/WeBWorK/DB/Record/SetLocations.pm
@@ -0,0 +1,35 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright � 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/bin/readURClassList.pl,v 1.2.2.1 2007/08/13 22:53:39 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+package WeBWorK::DB::Record::SetLocations;
+use base WeBWorK::DB::Record;
+
+=head1 NAME
+
+WeBWorK::DB::Record::SetLocations - represent a record from the set_locations table.
+
+=cut
+
+use strict;
+use warnings;
+
+BEGIN {
+        __PACKAGE__->_fields(
+                set_id      => { type=>"TINYBLOB NOT NULL", key=>1 },
+                location_id => { type=>"TINYBLOB NOT NULL", key=>1 },
+        );
+}
+
+1;
diff --git a/lib/WeBWorK/DB/Record/SetVersion.pm b/lib/WeBWorK/DB/Record/SetVersion.pm
new file mode 100644
index 0000000000..4c61b003d8
--- /dev/null
+++ b/lib/WeBWorK/DB/Record/SetVersion.pm
@@ -0,0 +1,43 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/DB/Record/SetVersion.pm,v 1.2 2007/02/22 01:25:11 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::DB::Record::SetVersion;
+use base WeBWorK::DB::Record::UserSet;
+
+=head1 NAME
+
+WeBWorK::DB::Record::SetVersion - represent a record from the virtual 
+set_version table.
+
+=cut
+
+use strict;
+use warnings;
+
+BEGIN {
+	our @ISA;
+	my $base = $ISA[0];
+	my $field_data = $base->FIELD_DATA;
+	my @nonkeyfields = map { $_ => $field_data->{$_} } $base->NONKEYFIELDS;
+	__PACKAGE__->_fields(
+		user_id    => { type=>"TINYBLOB NOT NULL", key=>1 },
+		set_id     => { type=>"TINYBLOB NOT NULL", key=>1 },
+		version_id => { type=>"INT NOT NULL", key=>1 },
+		@nonkeyfields,
+	);
+}
+
+1;
diff --git a/lib/WeBWorK/DB/Record/Setting.pm b/lib/WeBWorK/DB/Record/Setting.pm
new file mode 100644
index 0000000000..4835455dbe
--- /dev/null
+++ b/lib/WeBWorK/DB/Record/Setting.pm
@@ -0,0 +1,43 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/DB/Record/Setting.pm,v 1.2 2007/07/22 05:25:17 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::DB::Record::Setting;
+use base WeBWorK::DB::Record;
+
+=head1 NAME
+
+WeBWorK::DB::Record::Setting - represent a record from the setting table.
+
+=cut
+
+use strict;
+use warnings;
+
+use WeBWorK::Utils::DBUpgrade;
+
+BEGIN {
+	__PACKAGE__->_fields(
+		name  => { type=>"VARCHAR(255) NOT NULL", key=>1 },
+		value => { type=>"TEXT" },
+	);
+	__PACKAGE__->_initial_records(
+		{ name=>"db_version", value=> 3.1415926   # $WeBWorK::Utils::DBUpgrade::THIS_DB_VERSION 
+		},
+	);
+}
+
+1;
+
diff --git a/lib/WeBWorK/DB/Record/User.pm b/lib/WeBWorK/DB/Record/User.pm
index 525b1fde4e..ff4c9f2e55 100644
--- a/lib/WeBWorK/DB/Record/User.pm
+++ b/lib/WeBWorK/DB/Record/User.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/DB/Record/User.pm,v 1.12 2006/10/02 15:04:27 sh002i 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
@@ -26,31 +26,75 @@ WeBWorK::DB::Record::User - represent a record from the user table.
 use strict;
 use warnings;
 
-sub KEYFIELDS {qw(
-	user_id
-)}
-
-sub NONKEYFIELDS {qw(
-	first_name
-	last_name
-	email_address
-	student_id
-	status
-	section
-	recitation
-	comment
-)}
-
-sub FIELDS {qw(
-	user_id
-	first_name
-	last_name
-	email_address
-	student_id
-	status
-	section
-	recitation
-	comment
-)}
+BEGIN {
+	__PACKAGE__->_fields(
+		user_id       => { type=>"TINYBLOB NOT NULL", key=>1 },
+		first_name    => { type=>"TEXT" },
+		last_name     => { type=>"TEXT" },
+		email_address => { type=>"TEXT" },
+		student_id    => { type=>"TEXT" },
+		status        => { type=>"TEXT" },
+		section       => { type=>"TEXT" },
+		recitation    => { type=>"TEXT" },
+		comment       => { type=>"TEXT" },
+	);
+}
+
+sub full_name {
+	my ($self) = @_;
+	
+	my $first = $self->first_name;
+	my $last = $self->last_name;
+	
+	if (defined $first and $first ne "" and defined $last and $last ne "") {
+		return "$first $last";
+	} elsif (defined $first and $first ne "") {
+		return $first;
+	} elsif (defined $last and $last ne "") {
+		return $last;
+	} else {
+		return "";
+	}
+}
+
+# phrase      =  1*word                       ; Sequence of words
+# word        =  atom / quoted-string
+# atom        =  1*<any CHAR except specials, SPACE and CTLs>
+# specials    =  "(" / ")" / "<" / ">" / "@"  ; Must be in quoted-
+#             /  "," / ";" / ":" / "\" / <">  ;  string, to use
+#             /  "." / "[" / "]"              ;  within a word.
+# SPACE       =  <ASCII SP, space>            ; (     40,      32.)
+# CTL         =  <any ASCII control           ; (  0- 37,  0.- 31.)
+#                 character and DEL>          ; (    177,     127.)
+# quoted-string = <"> *(qtext/quoted-pair) <">; Regular qtext or
+#                                             ;   quoted chars.
+# qtext       =  <any CHAR excepting <">,     ; => may be folded
+#                "\" & CR, and including
+#                linear-white-space>
+# CR          =  <ASCII CR, carriage return>  ; (     15,      13.)
+# quoted-pair =  "\" CHAR                     ; may quote any char
+
+sub rfc822_mailbox {
+	my ($self) = @_;
+	
+	my $full_name = $self->full_name;
+	my $address = $self->email_address;
+	
+	if (defined $address and $address ne "") {
+		if (defined $full_name and $full_name ne "") {
+			# see if we need to quote the phrase
+			# (this regex matches CTL, SPACE, and specials)
+			if ($full_name =~ /[\0-\037\177 ()<>@,;:\\".\[\]]/) {
+				$full_name =~ s/(["\\\r])/\\$1/g; # escape <">, "\", or CR
+				$full_name = "\"$full_name\"";
+			}
+			return "$full_name <$address>";
+		} else {
+			return $address;
+		}
+	} else {
+		return "";
+	}
+}
 
 1;
diff --git a/lib/WeBWorK/DB/Record/UserProblem.pm b/lib/WeBWorK/DB/Record/UserProblem.pm
index eee0827929..4d490117b4 100644
--- a/lib/WeBWorK/DB/Record/UserProblem.pm
+++ b/lib/WeBWorK/DB/Record/UserProblem.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/DB/Record/UserProblem.pm,v 1.11 2007/08/13 22:59:57 sh002i 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
@@ -27,37 +27,23 @@ table.
 use strict;
 use warnings;
 
-sub KEYFIELDS {qw(
-	user_id
-	set_id
-	problem_id
-)}
-
-sub NONKEYFIELDS {qw(
-	source_file
-	value
-	max_attempts
-	problem_seed
-	status
-	attempted
-	last_answer
-	num_correct
-	num_incorrect
-)}
-
-sub FIELDS {qw(
-	user_id
-	set_id
-	problem_id
-	source_file
-	value
-	max_attempts
-	problem_seed
-	status
-	attempted
-	last_answer
-	num_correct
-	num_incorrect
-)}
+BEGIN {
+	__PACKAGE__->_fields(
+		user_id       => { type=>"TINYBLOB NOT NULL", key=>1 },
+		set_id        => { type=>"TINYBLOB NOT NULL", key=>1 },
+		problem_id    => { type=>"INT NOT NULL", key=>1 },
+		source_file   => { type=>"TEXT" },
+		# FIXME i think value should be able to hold decimal values...
+		value         => { type=>"INT" },
+		max_attempts  => { type=>"INT" },
+		problem_seed  => { type=>"INT" },
+		status        => { type=>"FLOAT" },
+		attempted     => { type=>"INT" },
+		last_answer   => { type=>"TEXT" },
+		num_correct   => { type=>"INT" },
+		num_incorrect => { type=>"INT" },
+		sub_status    => { type=>"FLOAT" },    # A subsidiary status used to implement the reduced scoring period
+	);
+}
 
 1;
diff --git a/lib/WeBWorK/DB/Record/UserSet.pm b/lib/WeBWorK/DB/Record/UserSet.pm
index 9848f1c5b9..a7baad2906 100644
--- a/lib/WeBWorK/DB/Record/UserSet.pm
+++ b/lib/WeBWorK/DB/Record/UserSet.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/DB/Record/UserSet.pm,v 1.21 2007/08/13 22:59:57 sh002i 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
@@ -26,29 +26,35 @@ WeBWorK::DB::Record::UserSet - represent a record from the set_user table.
 use strict;
 use warnings;
 
-sub KEYFIELDS {qw(
-	user_id
-	set_id
-)}
-
-sub NONKEYFIELDS {qw(
-	psvn
-	set_header
-	problem_header
-	open_date
-	due_date
-	answer_date
-)}
-
-sub FIELDS {qw(
-	user_id
-	set_id
-	psvn
-	set_header
-	problem_header
-	open_date
-	due_date
-	answer_date
-)}
+BEGIN {
+	__PACKAGE__->_fields(
+		user_id                   => { type=>"TINYBLOB NOT NULL", key=>1 },
+		set_id                    => { type=>"TINYBLOB NOT NULL", key=>1 },
+		psvn                      => { type=>"INT UNIQUE NOT NULL AUTO_INCREMENT" },
+		set_header                => { type=>"TEXT" },
+		hardcopy_header           => { type=>"TEXT" },
+		open_date                 => { type=>"BIGINT" },
+		due_date                  => { type=>"BIGINT" },
+		answer_date               => { type=>"BIGINT" },
+		visible                   => { type=>"INT" },
+		enable_reduced_scoring    => { type=>"INT" },
+		assignment_type           => { type=>"TEXT" },
+		attempts_per_version      => { type=>"INT" },
+		time_interval             => { type=>"INT" },
+		versions_per_interval     => { type=>"INT" },
+		version_time_limit        => { type=>"INT" },
+		version_creation_time     => { type=>"BIGINT" },
+		problem_randorder         => { type=>"INT" },
+		version_last_attempt_time => { type=>"BIGINT" },
+		problems_per_page         => { type=>"INT" },
+		hide_score                => { type=>"ENUM('N','Y','BeforeAnswerDate')" },
+		hide_score_by_problem     => { type=>"ENUM('N','Y')" },
+		hide_work                 => { type=>"ENUM('N','Y','BeforeAnswerDate')" },
+		time_limit_cap            => { type=>"ENUM('0','1')" },
+		restrict_ip               => { type=>"ENUM('No','RestrictTo','DenyFrom')" },
+		relax_restrict_ip         => { type=>"ENUM('No','AfterAnswerDate','AfterVersionAnswerDate')" },
+		restricted_login_proctor  => { type=>"ENUM('No','Yes')" },
+	);
+}
 
 1;
diff --git a/lib/WeBWorK/DB/Record/UserSetLocations.pm b/lib/WeBWorK/DB/Record/UserSetLocations.pm
new file mode 100644
index 0000000000..5ef94a622d
--- /dev/null
+++ b/lib/WeBWorK/DB/Record/UserSetLocations.pm
@@ -0,0 +1,36 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright � 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/bin/readURClassList.pl,v 1.2.2.1 2007/08/13 22:53:39 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+package WeBWorK::DB::Record::UserSetLocations;
+use base WeBWorK::DB::Record;
+
+=head1 NAME
+
+WeBWorK::DB::Record::UserSetLocations - represent a record from the set_locations_user table.
+
+=cut
+
+use strict;
+use warnings;
+
+BEGIN {
+        __PACKAGE__->_fields(
+		user_id     => { type=>"TINYBLOB NOT NULL", key=>1 },
+                set_id      => { type=>"TINYBLOB NOT NULL", key=>1 },
+                location_id => { type=>"TINYBLOB NOT NULL", key=>1 },
+        );
+}
+
+1;
diff --git a/lib/WeBWorK/DB/Schema.pm b/lib/WeBWorK/DB/Schema.pm
index 320f13fda4..822b7bd8d6 100644
--- a/lib/WeBWorK/DB/Schema.pm
+++ b/lib/WeBWorK/DB/Schema.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader: webwork-modperl/lib/WeBWorK/DB/Schema.pm,v 1.6 2003/12/09 01:12:31 sh002i Exp $
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/DB/Schema.pm,v 1.13 2009/01/25 15:30:35 gage 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
@@ -50,6 +50,18 @@ of the table's record class.
 use strict;
 use warnings;
 
+# use Exception::Class (
+# 	'WeBWorK::DB::Schema::Ex' => {},
+# 	'WeBWorK::DB::Schema::Ex::RecordExists' => {
+# 		isa => 'WeBWorK::DB::Schema::Ex',
+# 		description => "Record exists",
+# 	},
+#     'WeBWorK::DB::Schema::Ex::TableMissing' => {
+#     	isa => 'WeBWorK::DB::Schema::Ex',
+#     	description =>"missing table",
+# 	},
+# );
+
 ################################################################################
 # constructor
 ################################################################################
@@ -93,7 +105,7 @@ sub new {
 	return $self;
 }
 
-=head1 REQUIRED METHODS
+=head1 TABLE ACCESS METHODS
 
 =over
 
diff --git a/lib/WeBWorK/DB/Schema/Auth1Hash.pm b/lib/WeBWorK/DB/Schema/Auth1Hash.pm
deleted file mode 100644
index 759451eca6..0000000000
--- a/lib/WeBWorK/DB/Schema/Auth1Hash.pm
+++ /dev/null
@@ -1,179 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader: webwork-modperl/lib/WeBWorK/DB/Schema/Auth1Hash.pm,v 1.9 2003/12/09 01:12:32 sh002i 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
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-# 
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-package WeBWorK::DB::Schema::Auth1Hash;
-use base qw(WeBWorK::DB::Schema);
-
-=head1 NAME
-
-WeBWorK::DB::Schema::Auth1Hash - support access to the password, permission,
-and key tables with a WWDBv1 hash-style backend.
-
-=cut
-
-use strict;
-use warnings;
-
-use constant TABLES => qw(password permission key);
-use constant STYLE  => "hash";
-
-################################################################################
-# table access functions
-#  Auth1Hash provides access to three tables, so it checks the $self->{table}
-#  field to know what data its dealing with.
-################################################################################
-
-sub count {
-	my ($self, @keyparts) = @_;
-	my ($matchUserID) = @keyparts;
-	my $count;
-	$self->{driver}->connect("ro");
-	if (defined $matchUserID) {
-		$count = exists $self->{driver}->hash()->{$matchUserID};
-	} else {
-		$count = scalar keys %{ $self->{driver}->hash() };
-	}
-	$self->{driver}->disconnect();
-	return $count;
-}
-
-sub list {
-	my ($self, @keyparts) = @_;
-	my ($matchUserID) = @keyparts;
-	$self->{driver}->connect("ro");
-	my @keys = keys %{ $self->{driver}->hash() };
-	$self->{driver}->disconnect();
-	if (defined $matchUserID) {
-		@keys = grep { $_ eq $matchUserID } @keys;
-	}
-	return map { [$_] } @keys;
-}
-
-sub exists {
-	my ($self, $userID) = @_;
-	$self->{driver}->connect("ro");
-	my $result;
-	if (defined $userID) {
-		$result = exists $self->{driver}->hash()->{$userID};
-	} else {
-		$result = keys %{$self->{driver}->hash()} ? 1 : 0;
-	}
-	$self->{driver}->disconnect();
-	return $result;
-}
-
-sub add {
-	my ($self, $Record) = @_;
-	my $valueName = $self->{table};
-	$self->{driver}->connect("rw");
-	my $hash = $self->{driver}->hash();
-	die $Record->user_id, ": $valueName exists"
-		if exists $hash->{$Record->user_id};
-	if ($self->{table} eq "key") {
-		# key's value contains two fields
-		$hash->{$Record->user_id} = $Record->key() . " " . $Record->timestamp();
-	} else {
-		$hash->{$Record->user_id} = $Record->$valueName();
-	}
-	$self->{driver}->disconnect();
-}
-
-sub get {
-	my ($self, $userID) = @_;
-#	$self->{driver}->connect("ro");
-#	my $value = $self->{driver}->hash()->{$userID};
-#	$self->{driver}->disconnect();
-#	return undef unless defined $value;
-#	if ($self->{table} eq "key") {
-#		# key's value contains two fields
-#		my ($key, $timestamp) = $value =~ m/^(\S+)\s+(.*)$/;
-#		return $self->{record}->new(
-#			user_id => $userID,
-#			key => $key,
-#			timestamp => $timestamp,
-#		);
-#	} else {
-#		return $self->{record}->new(
-#			user_id => $userID,
-#			$self->{table} => $value,
-#		);
-#	}
-	my @results = 
-	return ($self->gets([$userID]))[0];
-}
-
-sub gets {
-	my ($self, @keypartsRefList) = @_;
-	$self->{driver}->connect("ro");
-	my @records;
-	foreach my $keypartsRef (@keypartsRefList) {
-		my $userID = $keypartsRef->[0];
-		my $string = $self->{driver}->hash()->{$userID};
-		if (defined $string) {
-			if ($self->{table} eq "key") {
-				# key's value contains two fields
-				my ($key, $timestamp) = $string =~ m/^(\S+)\s+(.*)$/;
-				push @records, $self->{record}->new(
-					user_id => $userID,
-					key => $key,
-					timestamp => $timestamp,
-				);
-			} else {
-				push @records, $self->{record}->new(
-					user_id => $userID,
-					$self->{table} => $string,
-				);
-			}
-		} else {
-			push @records, undef;
-		}
-	}
-	$self->{driver}->disconnect();
-	return @records;
-}
-
-sub put {
-	my ($self, $Record) = @_;
-	my $valueName = $self->{table};
-	$self->{driver}->connect("rw");
-	my $hash = $self->{driver}->hash();
-	die $Record->user_id, ": $valueName not found"
-		unless exists $hash->{$Record->user_id};
-	if ($self->{table} eq "key") {
-		# key's value contains two fields
-		$hash->{$Record->user_id} = $Record->key() . " " . $Record->timestamp();
-	} else {
-		$hash->{$Record->user_id} = $Record->$valueName();
-	}
-	$self->{driver}->disconnect();
-}
-
-sub delete {
-	my ($self, $userID) = @_;
-	my $valueName = $self->{table};
-	return 0 unless $self->{driver}->connect("rw");
-	my $hash = $self->{driver}->hash();
-	if (defined $userID) {
-		delete $hash->{$userID};
-	} else {
-		# delete all elements
-		delete @$hash{keys %$hash};
-	}
-	$self->{driver}->disconnect();
-	return 1;
-}
-
-1;
diff --git a/lib/WeBWorK/DB/Schema/Classlist1Hash.pm b/lib/WeBWorK/DB/Schema/Classlist1Hash.pm
deleted file mode 100644
index bb8d4787e2..0000000000
--- a/lib/WeBWorK/DB/Schema/Classlist1Hash.pm
+++ /dev/null
@@ -1,140 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader: webwork-modperl/lib/WeBWorK/DB/Schema/Classlist1Hash.pm,v 1.10 2003/12/09 01:12:32 sh002i 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
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-# 
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-package WeBWorK::DB::Schema::Classlist1Hash;
-use base qw(WeBWorK::DB::Schema);
-
-=head1 NAME
-
-WeBWorK::DB::Schema::Classlist1Hash - support access to the user table with a
-WWDBv1 hash-style backend.
-
-=cut
-
-use strict;
-use warnings;
-use WeBWorK::DB::Utils qw(record2hash hash2record hash2string string2hash);
-
-use constant TABLES => qw(user);
-use constant STYLE  => "hash";
-
-################################################################################
-# table access functions
-################################################################################
-
-sub count {
-	my ($self, @keyparts) = @_;
-	my ($matchUserID) = @keyparts;
-	my $count;
-	$self->{driver}->connect("ro");
-	if (defined $matchUserID) {
-		$count = exists $self->{driver}->hash()->{$matchUserID};
-	} else {
-		$count = scalar grep { not m/^>>/ } keys %{ $self->{driver}->hash() };
-	}
-	$self->{driver}->disconnect();
-	return $count;
-}
-
-sub list {
-	my ($self, @keyparts) = @_;
-	my ($matchUserID) = @keyparts;
-	$self->{driver}->connect("ro");
-	my @keys = grep { not m/^>>/ } keys %{ $self->{driver}->hash() };
-	$self->{driver}->disconnect();
-	if (defined $matchUserID) {
-		@keys = grep { $_ eq $matchUserID } @keys;
-	}
-	return map { [$_] } @keys;
-}
-
-sub exists {
-	my ($self, $userID) = @_;
-	$self->{driver}->connect("ro");
-	my $result;
-	if (defined $userID) {
-		$result = exists $self->{driver}->hash()->{$userID};
-	} else {
-		$result = keys %{$self->{driver}->hash()} ? 1 : 0;
-	}
-	$self->{driver}->disconnect();
-	return $result;
-}
-
-sub add {
-	my ($self, $User) = @_;
-	$self->{driver}->connect("rw");
-	my $hash = $self->{driver}->hash();
-	die $User->user_id, ": user exists" if exists $hash->{$User->user_id};
-	$hash->{$User->user_id} = hash2string(record2hash($User));
-	$self->{driver}->disconnect();
-}
-
-sub get {
-	my ($self, $userID) = @_;
-#	$self->{driver}->connect("ro");
-#	my $string = $self->{driver}->hash()->{$userID};
-#	$self->{driver}->disconnect();
-#	return undef unless defined $string;
-#	my $record = hash2record($self->{record}, string2hash($string));
-#	$record->user_id($userID);
-#	return $record;
-	return ($self->gets([$userID]))[0];
-}
-
-sub gets {
-	my ($self, @keypartsRefList) = @_;
-	$self->{driver}->connect("ro");
-	my @records;
-	foreach my $keypartsRef (@keypartsRefList) {
-		my $userID = $keypartsRef->[0];
-		my $string = $self->{driver}->hash()->{$userID};
-		if (defined $string) {
-			my $record = hash2record($self->{record}, string2hash($string));
-			$record->user_id($userID);
-			push @records, $record;
-		} else {
-			push @records, undef;
-		}
-	}
-	$self->{driver}->disconnect();
-	return @records;
-}
-
-sub put {
-	my ($self, $User) = @_;
-	$self->{driver}->connect("rw");
-	my $hash = $self->{driver}->hash();
-	die $User->user_id, ": user not found" unless exists $hash->{$User->user_id};
-	$hash->{$User->user_id} = hash2string(record2hash($User));
-	$self->{driver}->disconnect();
-}
-
-sub delete {
-	my ($self, $userID) = @_;
-	return 0 unless $self->{driver}->connect("rw");
-	my $hash = $self->{driver}->hash();
-	if (defined $userID) {
-		delete $hash->{$userID};
-	} else {
-		# delete all elements
-		delete @$hash{keys %$hash};
-	}
-	$self->{driver}->disconnect();
-	return 1;
-}
-
-1;
diff --git a/lib/WeBWorK/DB/Schema/GlobalTableEmulator.pm b/lib/WeBWorK/DB/Schema/GlobalTableEmulator.pm
deleted file mode 100644
index dead1d1776..0000000000
--- a/lib/WeBWorK/DB/Schema/GlobalTableEmulator.pm
+++ /dev/null
@@ -1,294 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader: webwork-modperl/lib/WeBWorK/DB/Schema/GlobalTableEmulator.pm,v 1.16 2003/12/09 02:42:28 sh002i 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
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-# 
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-package WeBWorK::DB::Schema::GlobalTableEmulator;
-use base qw(WeBWorK::DB::Schema);
-
-=head1 NAME
-
-WeBWorK::DB::Schema::GlobalTableEmulator - emulate the global 'set' and
-'problem' tables using access to the 'set_user' and 'problem_user' tables.
-
-=cut
-
-use strict;
-use warnings;
-use Carp;
-use Data::Dumper;
-use WeBWorK::DB::Utils qw(global2user user2global initializeUserProblem findDefaults);
-
-use constant TABLES => qw(set problem);
-use constant STYLE  => "null";
-
-################################################################################
-# constructor
-################################################################################
-
-sub new {
-	my ($proto, $db, $driver, $table, $record, $params) = @_;
-	
-	die "parameter globalUserID not found"
-		unless exists $params->{globalUserID};
-	
-	my $self = $proto->SUPER::new($db, $driver, $table, $record, $params);
-	
-	return $self;
-}
-
-################################################################################
-# table access functions
-################################################################################
-
-sub count {
-	my ($self, @keyparts) = @_;
-	
-	my $db = $self->{db};
-	my $table = $self->{table};
-	my $userSchema = $db->{"${table}_user"};
-	my $globalUserID = $self->{params}->{globalUserID};
-	
-	return $userSchema->count($globalUserID, @keyparts);
-}
-
-sub list {
-	my ($self, @keyparts) = @_;
-	
-	my $db = $self->{db};
-	my $table = $self->{table};
-	my $userSchema = $db->{"${table}_user"};
-	my $globalUserID = $self->{params}->{globalUserID};
-	
-	my @userRecordIDs = $userSchema->list($globalUserID, @keyparts);
-	my @recordIDs;
-	foreach my $userRecordID (@userRecordIDs) {
-		shift @$userRecordID; # take off the userID
-		push @recordIDs, $userRecordID;
-	}
-	
-	return @recordIDs;
-}
-
-sub exists {
-	my ($self, @keyparts) = @_;
-	
-	my $db = $self->{db};
-	my $table = $self->{table};
-	my $userSchema = $db->{"${table}_user"};
-	my $globalUserID = $self->{params}->{globalUserID};
-	
-	return $userSchema->exists($globalUserID, @keyparts);
-}
-
-sub add {
-	my ($self, $Record) = @_;
-	
-	my $db = $self->{db};
-	my $table = $self->{table};
-	my $userSchema = $db->{"${table}_user"};
-	my $globalUserID = $self->{params}->{globalUserID};
-	
-	# make sure record doesn't already exist
-	my $setID = $Record->set_id();
-	if ($self->{table} eq "set") {
-		die "($setID): Set exists.\n"
-			if $self->exists($setID);
-	} elsif ($self->{table} eq "problem") {
-		my $problemID = $Record->problem_id();
-		die "($setID, $problemID): Problem exists.\n"
-			if $self->exists($setID, $problemID);
-	}
-	
-	# convert global record to a user record for user $globalUserID
-	my $UserRecord = global2user($userSchema->{record}, $Record);
-	$UserRecord->user_id($globalUserID);
-	
-	# if this is the problem table, set the user-specific fields of the user
-	# problem to sane defaults (and generate a problem seed). this allows
-	# the user $globalUserID to use this problem as a user problem.
-	if ($table eq "problem") {
-		initializeUserProblem($UserRecord);
-	}
-	
-	# add the record to the database
-	return $userSchema->add($UserRecord);
-}
-
-sub get {
-	my ($self, @keyparts) = @_;
-	
-	return ($self->gets(\@keyparts))[0];
-}
-
-sub gets {
-	my ($self, @keypartsRefList) = @_;
-	
-	my $db = $self->{db};
-	my $table = $self->{table};
-	my $userSchema = $db->{"${table}_user"};
-	
-	$userSchema->{driver}->connect("ro");
-	my @records;
-	foreach my $keypartsRef (@keypartsRefList) {
-		my @keyparts = @$keypartsRef;
-		push @records, $self->get1(@keyparts);
-	}
-	$userSchema->{driver}->disconnect;
-	
-	return @records;
-}
-
-# helper used by gets
-sub get1 {
-	my ($self, @keyparts) = @_;
-	my $db = $self->{db};
-	my $table = $self->{table};
-	my $userSchema = $db->{"${table}_user"};
-	my $globalUserID = $self->{params}->{globalUserID};
-	
-	my $UserRecord = $userSchema->get1NoFilter($globalUserID, @keyparts);
-	return unless $UserRecord; # maybe it didn't exist?
-	return user2global($self->{record}, $UserRecord);
-}
-
-sub getAll {
-	my ($self, @keyparts) = @_;
-	my $db = $self->{db};
-	my $table = $self->{table};
-	my $userSchema = $db->{"${table}_user"};
-	my $globalUserID = $self->{params}->{globalUserID};
-	
-	croak "getAll: only supported for the problem table"
-		unless $table eq "problem";
-	
-	my @UserProblems = $userSchema->getAllNoFilter($globalUserID, @keyparts);
-	
-	foreach my $UserProblem (@UserProblems) {
-		next unless $UserProblem; # maybe it didn't exist?
-		$UserProblem = user2global($self->{record}, $UserProblem);
-	}
-	
-	return @UserProblems;
-}
-
-sub put {
-	my ($self, $Record) = @_;
-	
-	my $db = $self->{db};
-	my $table = $self->{table};
-	my $userSchema = $db->{"${table}_user"};
-	my $classlistSchema = $db->{"user"}; # oh god.
-	my $globalUserID = $self->{params}->{globalUserID};
-	
-	my @keyparts = map { $Record->$_() } $Record->KEYFIELDS();
-	
-	# retrieve the current global values for this record
-	$userSchema->{driver}->connect("ro");
-	my $CurrentUserRecord = $userSchema->get1NoFilter($globalUserID, @keyparts);
-	$userSchema->{driver}->disconnect;
-	my $CurrentGlobalRecord = user2global($self->{record}, $CurrentUserRecord);
-	
-	# convert new global record to a user record for user $globalUserID
-	my $NewUserRecord = global2user($userSchema->{record}, $Record);
-	$NewUserRecord->user_id($globalUserID);
-	
-	# if this is the problem table, copy the user-specific fields of the
-	# user problem from the old global record. this allows the user
-	# $globalUserID to use this problem as a user problem.
-	if ($table eq "problem") {
-		foreach my $field (qw(status attempted num_correct num_incorrect problem_seed)) {
-			my $currentValue = $CurrentUserRecord->$field;
-			$NewUserRecord->$field($currentValue);
-		}
-	}
-	# *** WARNING: here is a place where field names are referenced directly
-	
-	# store user record containing new global values
-	my $result = $userSchema->put($NewUserRecord);
-	
-	# distribute new global values to each user
-	# don't overwrite the user record that's storing global values
-	my @userIDs = grep { $_ ne $globalUserID } map {$_->[0]} $classlistSchema->list(undef);
-	$self->distGlobalValues($CurrentGlobalRecord, $Record, @userIDs);
-	
-	return $result;
-}
-
-sub delete {
-	my ($self, @keyparts) = @_;
-	
-	my $db = $self->{db};
-	my $table = $self->{table};
-	my $userSchema = $db->{"${table}_user"};
-	my $globalUserID = $self->{params}->{globalUserID};
-	
-	# we can assume that DB has already deleted all the user-specific
-	# records it could find. we can just go ahead and delete the one
-	# that's being used as a global record (if it exists).
-	
-	return $userSchema->delete($globalUserID, @keyparts);
-}
-
-################################################################################
-# function to distribute new global values to each user-specific record
-################################################################################
-
-sub distGlobalValues {
-	my ($self, $OldGlobalRecord, $NewGlobalRecord, @userIDs) = @_;
-	
-	my $db = $self->{db};
-	my $table = $self->{table};
-	my $userSchema = $db->{"${table}_user"};
-	
-	my @keyparts = map { $NewGlobalRecord->$_() } $NewGlobalRecord->KEYFIELDS();
-	
-	# figure out which fields (if any) were changed
-	my @changedFields;
-	foreach my $field ($OldGlobalRecord->FIELDS()) {
-		#FIXME  these warnings may not be needed in production
-	    warn "Undefined field |$field| in old Global record" unless defined($OldGlobalRecord->$field());
-	    warn "Undefined field |$field| in new Global record" unless defined($NewGlobalRecord->$field());
-	    if (defined($OldGlobalRecord->$field()) and defined($NewGlobalRecord->$field()) and $OldGlobalRecord->$field() ne $NewGlobalRecord->$field()) {
-			push @changedFields, $field;
-		}
-	}
-	
-	# if no fields were changed, we're done
-	return 0 unless @changedFields;
-	
-	# impose the new values for each user
-	my $anyChanged = 0;
-	foreach my $userID (@userIDs) {
-		$userSchema->{driver}->connect("ro");
-		my $UserRecord = $userSchema->get1NoFilter($userID, @keyparts);
-		$userSchema->{driver}->disconnect;
-		next unless defined $UserRecord;
-		my $changed = 0;
-		foreach my $field (@changedFields) {
-			if ($UserRecord->$field() eq $OldGlobalRecord->$field()) {
-				$changed = 1;
-				$UserRecord->$field($NewGlobalRecord->$field());
-			}
-		}
-		if ($changed) {
-			$anyChanged = 1;
-			$userSchema->put($UserRecord);
-		}
-	}
-	
-	return $anyChanged;
-}
-
-1;
diff --git a/lib/WeBWorK/DB/Schema/NewSQL.pm b/lib/WeBWorK/DB/Schema/NewSQL.pm
new file mode 100644
index 0000000000..d6a53d9774
--- /dev/null
+++ b/lib/WeBWorK/DB/Schema/NewSQL.pm
@@ -0,0 +1,357 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/DB/Schema/NewSQL.pm,v 1.25 2008/06/21 16:38:49 gage 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::DB::Schema::NewSQL;
+use base qw(WeBWorK::DB::Schema);
+
+=head1 NAME
+
+WeBWorK::DB::Schema::NewSQL - base class for SQL access.
+
+=cut
+
+use strict;
+use warnings;
+use Carp qw(croak);
+use WeBWorK::Utils qw/undefstr/;
+
+use constant TABLES => qw(*);
+use constant STYLE  => "dbi";
+
+################################################################################
+# where clauses (not sure if this is where these belong...)
+################################################################################
+
+# default where clause (does nothing)
+sub where_DEFAULT {
+	return {};
+}
+
+# can be used for user,password,permission,key,set_user,problem_user,vset_user
+sub where_user_id_eq {
+	my ($self, $flags, $user_id) = @_;
+	return {user_id=>$user_id};
+}
+
+# can be used for user,password,permission,key,set_user,problem_user
+sub where_user_id_like {
+	my ($self, $flags, $user_id) = @_;
+	return {user_id=>{LIKE=>$user_id}};
+}
+
+# can be used for user
+sub where_email_address_nonempty {
+	my ($self, $flags) = @_;
+	return {email_address=>{'!=',[undef,""]}};
+}
+
+# can be used for user
+sub where_status_eq {
+	my ($self, $flags, $status) = @_;
+	return {status=>$status};
+}
+
+# can be used for user
+sub where_section_eq {
+	my ($self, $flags, $section) = @_;
+	return {section=>$section};
+}
+
+# can be used for user
+sub where_recitation_eq {
+	my ($self, $flags, $recitation) = @_;
+	return {recitation=>$recitation};
+}
+
+# can be used for user
+sub where_section_eq_recitation_eq {
+	my ($self, $flags, $section, $recitation) = @_;
+	return {section=>$section,recitation=>$recitation};
+}
+
+# can be used for user
+sub where_student_id_eq {
+        my ($self, $flags, $student_id) = @_;
+        return {student_id=>$student_id};
+}
+
+# can be used for password
+sub where_password_eq {
+	my ($self, $flags, $password) = @_;
+	return {password=>$password};
+}
+
+# can be used for permission
+sub where_permission_eq {
+	my ($self, $flags, $permission) = @_;
+	return {permission=>$permission};
+}
+
+# can be used for permission
+sub where_permission_in_range {
+	my ($self, $flags, $min, $max) = @_;
+	if (defined $min and defined $max) {
+		return {-and=>[ {permission=>{">=",$min}}, {permission=>{"<=",$max}} ]};
+	} elsif (defined $min) {
+		return {permission=>{">=",$min}};
+	} elsif (defined $max) {
+		return {permission=>{"<=",$max}};
+	} else {
+		return {};
+	}
+}
+
+# can be used for set,set_user,problem,problem_user
+sub where_set_id_eq {
+	my ($self, $flags, $set_id) = @_;
+	return {set_id=>$set_id};
+}
+
+# can be used for problem,problem_user
+sub where_set_id_eq_problem_id_eq {
+	my ($self, $flags, $set_id, $problem_id) = @_;
+	return {set_id=>$set_id,problem_id=>$problem_id};
+}
+
+# can be used for set_user,problem_user
+sub where_user_id_eq_set_id_eq {
+	my ($self, $flags, $user_id, $set_id) = @_;
+	return {user_id=>$user_id,set_id=>$set_id};
+}
+
+# added where clauses for locations and set_locations
+
+sub where_location_id_eq { 
+	my ($self, $flags, $location_id) = @_;
+	return {location_id=>$location_id};
+}
+
+sub where_set_id_eq_location_id_eq {
+	my ($self, $flags, $set_id, $location_id) = @_;
+	return {set_id=>$set_id,location_id=>$location_id};
+}
+
+sub where_ip_mask_eq {
+	my ($self, $flags, $ip_mask) = @_;
+	return {ip_mask=>$ip_mask};
+}
+
+sub where_name_eq {
+	my ($self, $flags, $name) = @_;
+	return {name=>$name};
+} # gotta get rid of this stupid way of specifying where clauses...
+
+################################################################################
+# utility methods
+################################################################################
+
+sub table {
+	return shift->{table};
+}
+
+sub dbh {
+	return shift->{driver}->dbi;
+}
+
+sub keyfields {
+	return shift->{record}->KEYFIELDS;
+}
+
+sub nonkeyfields {
+	return shift->{record}->NONKEYFIELDS;
+}
+
+sub fields {
+	return shift->{record}->FIELDS;
+}
+
+sub field_data {
+	return shift->{record}->FIELD_DATA;
+}
+
+sub initial_records {
+	my ($self) = @_;
+	if ($self->{record}->can("INITIAL_RECORDS")) {
+		return $self->{record}->INITIAL_RECORDS;
+	} else {
+		return ();
+	}
+}
+
+sub box {
+	my ($self, $values) = @_;
+	# promote undef values to empty strings. eventually we'd like to stop doing this (FIXME)
+	map { $_ = "" if not defined $_ } @$values;
+	return $self->{record}->new($values);
+}
+
+sub unbox {
+	my ($self, $Record) = @_;
+	my @values = $Record->toArray;
+	# demote empty strings to undef. eventually we'd like to stop doing this (FIXME)
+	map { $_ = undef if defined $_ and $_ eq "" } @values;
+	return \@values;
+}
+
+sub conv_where {
+	my ($self, $where) = @_;
+	my $flags = {};
+	if (not defined $where) {
+		# allow schema module to specify a default where clause
+		$where = $self->where_DEFAULT($flags);
+	} elsif (ref $where eq "ARRAY") {
+		my ($clause, @args) = @$where;
+		my $func = "where_$clause";
+		croak "Unrecognized where clause '$clause'" unless $self->can($func);
+		$where = $self->$func($flags, @args);
+	}
+	if (wantarray) {
+		return $where, $flags;
+	} else {
+		return $where;
+	}
+}
+
+sub keyparts_to_where {
+	my ($self, @keyparts) = @_;
+	
+	my $table = $self->{table};
+	my @keynames = $self->keyfields;
+	croak "got ", scalar @keyparts, " keyparts, expected at most ", scalar @keynames, " (@keynames) for table $table"
+		if @keyparts > @keynames;
+	
+	# generate a where clause for the keyparts spec
+	my %where;
+	
+	foreach my $i (0 .. $#keyparts) {
+		next if not defined $keyparts[$i]; # undefined keypart == not restrained
+		$where{$keynames[$i]} = $keyparts[$i];
+	}
+	
+	return \%where;
+}
+
+sub keyparts_list_to_where {
+	my ($self, @keyparts_list) = @_;
+	
+	map { $_ = $self->keyparts_to_where(@$_) } @keyparts_list;
+	return \@keyparts_list;
+}
+
+sub gen_update_hashes {
+	my ($self, $fields) = @_;
+	
+	# the values for the values hash are the index of each field in the fields list
+	my %values;
+	@values{@$fields} = (0..@$fields-1);
+	
+	# the values for the where hash are the index of each keyfield in the fields list
+	my @keyfields = $self->keyfields;
+	my %where;
+	@where{@keyfields} = map { exists $values{$_} ? $values{$_} : die "missing keypart '$_'" } @keyfields;
+	
+	# don't need to update keyfields, so take them out of the values hash
+	delete @values{@keyfields};
+	
+	return \%values, \%where;
+}
+
+our $__PACKAGE__ = __PACKAGE__;
+sub debug_stmt {
+	my ($self, $sth, @bind_vals) = @_;
+	return unless $self->{params}{debug};
+	my ($subroutine) = (caller(1))[3];
+	$subroutine =~ s/^${__PACKAGE__}:://;
+	my $stmt = $sth->{Statement};
+	@bind_vals = undefstr("#UNDEF#", @bind_vals);
+	#print STDERR "$subroutine: |$stmt| => |@bind_vals|\n";
+	print STDERR "$subroutine: ", $self->bind($stmt, @bind_vals), "\n";
+}
+
+sub bind {
+	my ($self, $stmt, @bind_vals) = @_;
+	$stmt =~ s/\?/@bind_vals ? "?[".$self->dbh->quote(shift @bind_vals)."]" : "###NO BIND VALS###"/eg;
+	$stmt .= " ###EXTRA BIND VALS |@bind_vals|###" if @bind_vals;
+	return $stmt;
+}
+
+####################################################
+# checking Tables
+####################################################
+sub tableExists {
+	my $self = shift;
+	my $stmt = $self->_exists_table_stmt;
+	my $result = eval { $self->dbh->do($stmt); };
+	( caught WeBWorK::DB::Ex::TableMissing ) ? 0:1;
+}
+
+sub _exists_table_stmt {
+	my $self = shift;	
+	my $sql_table_name = $self->sql_table_name;
+	return "Describe `$sql_table_name` ";
+}
+
+################################################################################
+# null implementations (to provide slightly nicer error messages)
+################################################################################
+
+our %API;
+@API{qw/
+	create_table
+	rename_table
+	delete_table
+	count_where
+	exists_where
+	get_fields_where
+	get_fields_where_i
+	list_where
+	list_where_i
+	get_records_where
+	get_records_where_i
+	insert_fields
+	insert_fields_i
+	insert_records
+	insert_records_i
+	update_where
+	update_fields
+	update_fields_i
+	update_records
+	update_records_i
+	delete_where
+	delete_fields
+	delete_fields_i
+	delete_records
+	delete_records_i
+	count
+	list
+	exists
+	get
+	gets
+	add
+	put
+	delete
+/} = ();
+
+sub AUTOLOAD {
+	our $AUTOLOAD =~ /(.*)::(.*)/;
+	if (exists $API{$2}) {
+		croak sprintf("%s does not implement &%s", $1, $2);
+	} else {
+		croak sprintf("Undefined subroutine &%s called ", $AUTOLOAD," stack trace: ", caller());
+	}
+}
+
+1;
diff --git a/lib/WeBWorK/DB/Schema/NewSQL/Merge.pm b/lib/WeBWorK/DB/Schema/NewSQL/Merge.pm
new file mode 100644
index 0000000000..acc108494c
--- /dev/null
+++ b/lib/WeBWorK/DB/Schema/NewSQL/Merge.pm
@@ -0,0 +1,245 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/DB/Schema/NewSQL/Merge.pm,v 1.11 2007/03/02 23:26:30 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::DB::Schema::NewSQL::Merge;
+use base qw(WeBWorK::DB::Schema::NewSQL);
+
+=head1 NAME
+
+WeBWorK::DB::Schema::NewSQL::Merge - get merged records from multiple tables in
+an SQL database.
+
+=cut
+
+use strict;
+use warnings;
+use Carp qw(croak);
+use Iterator;
+use Iterator::Util;
+use WeBWorK::DB::Utils::SQLAbstractIdentTrans;
+use WeBWorK::Debug;
+
+=head1 SUPPORTED PARAMS
+
+This schema pays attention to the following items in the C<params> entry.
+
+=over
+
+=item merge
+
+A reference to an array listing the tables to merge, from highest priority to
+lowest priority.
+
+=back
+
+=cut
+
+################################################################################
+# constructor for merge-specific behavior
+################################################################################
+
+sub new {
+	my $self = shift->SUPER::new(@_);
+	
+	$self->merge_init;
+	$self->sql_init;
+	
+	return $self;
+}
+
+sub merge_init {
+	my $self = shift;
+	my $db = $self->{db};
+	
+	my @merge_tables = @{$self->{params}{merge}};
+	
+	my %sql_table_aliases;
+	@sql_table_aliases{@merge_tables} = map { "merge$_" } 1 .. @merge_tables;
+	
+	my @sql_tableexprs;
+	my %sql_field_names;
+	foreach my $table (@merge_tables) {
+		push @sql_tableexprs, "`" . $db->{$table}->sql_table_name . "` AS `$sql_table_aliases{$table}`";
+		my @fields = $db->{$table}->fields;
+		@{$sql_field_names{$table}}{@fields} = map { $db->{$table}->sql_field_name($_) } @fields;
+	}
+	
+	my $pri = $merge_tables[0];
+	
+	my %sql_fieldexprs;
+	my @sql_whereprefix;
+	
+	foreach my $field ($db->{$pri}->fields) {
+		my $sql_field_name = $sql_field_names{$pri}{$field};
+		
+		if ($db->{$pri}->field_data->{$field}{key}) {
+			# if it's a keyfield, use the version from the primary table
+			# (they're all going to be the same anyway)
+			$sql_fieldexprs{$field} = $db->{$pri}->sql_field_expression($field, $sql_table_aliases{$pri});
+			
+			# add this field to the where clause, by matching the value in the
+			# primary table to the values in all other tables that have that field
+			foreach my $table (@merge_tables[1..$#merge_tables]) {
+				next unless exists $db->{$table}->field_data->{$field};
+				push @sql_whereprefix,
+					$db->{$pri}->sql_field_expression($field, $sql_table_aliases{$pri})
+					. "=" . $db->{$table}->sql_field_expression($field, $sql_table_aliases{$table});
+			}
+		} else {
+			# if it's not a keyfield, we use the COALESCE function to select a
+			# value from the table that has the first non-NULL value
+			my @coalesce;
+			foreach my $table (@merge_tables) {
+				next unless exists $db->{$table}->field_data->{$field};
+				push @coalesce, $db->{$table}->sql_field_expression($field, $sql_table_aliases{$table});
+			}
+			# VERSIONING: we may need something other than COALESCE() here as well, because 
+			# it works with NULL/not-NULL, and SUBSTRING() returns empty strings if no match.
+			$sql_fieldexprs{$field} = "COALESCE(" . join(",", @coalesce) . ")";
+		}
+	}
+	
+	$self->{pri} = $pri;
+	$self->{sql_table_aliases} = \%sql_table_aliases;
+	$self->{sql_field_names} = \%sql_field_names;
+	$self->{sql_fieldexprs} = \%sql_fieldexprs;
+	$self->{sql_whereprefix} = join(" AND ", @sql_whereprefix);
+	$self->{sql_tableexpr} = join(", ", @sql_tableexprs);
+}
+
+sub sql_init {
+	my $self = shift;
+	
+	# transformation functions for table and field names: these allow us to pass
+	# the WeBWorK table/field names to SQL::Abstract, and have it translate them
+	# to the SQL table/field names from tableOverride and fieldOverride.
+	# (Without this, it would be hard to translate field names in WHERE
+	# structures, since they're so convoluted.)
+	my $transform_table = sub {
+		my $label = shift;
+		if (exists $self->{sql_table_aliases}{$label}) {
+			return $self->{sql_table_aliases}{$label};
+		} else {
+			warn "can't transform unrecognized table name '$label'";
+			return $label;
+		}
+	};
+	
+	# This transformation is called both on bare field names and on qualified
+	# field names (i.e. "table.field"), but not on bare table names.
+	my $transform_all = sub {
+		my $label = shift;
+		my ($table, $field) = $label =~ /(?:(.+)\.)?(.+)/;
+		$table = $self->{pri} unless defined $table;
+		if (exists $self->{sql_field_names}{$table}{$field}) {
+			$field = $self->{sql_field_names}{$table}{$field};
+		} else {
+			warn "can't transform unrecognized field name '$field' for table name '$table'";
+		}
+		$table = $transform_table->($table);
+		return "`$table`.`$field`";
+	};
+	
+	# add SQL statement generation object
+	$self->{sql} = new WeBWorK::DB::Utils::SQLAbstractIdentTrans(
+		quote_char => "`",
+		name_sep => ".",
+		transform_table => $transform_table,
+		transform_all => $transform_all,
+	);
+}
+
+################################################################################
+# lowlevel get
+################################################################################
+
+*get_fields_where = *WeBWorK::DB::Schema::NewSQL::Std::get_fields_where;
+*get_fields_where_i = *WeBWorK::DB::Schema::NewSQL::Std::get_fields_where_i;
+
+# helper, returns a prepared statement handle
+sub _get_fields_where_prepex {
+	my ($self, $fields, $where, $order) = @_;
+	$where = $self->conv_where($where);
+	
+	# pull the requested fields out of $self->{sql_fieldexprs}
+	my $sql_fields = join(", ", @{$self->{sql_fieldexprs}}{@$fields});
+	
+	my @where = $self->{sql_whereprefix};
+	my @bind_vals;
+	
+	my ($base_where_clause, @base_bind_vals) = $self->sql->_recurse_where($where) if $where;
+	if (defined $base_where_clause and $base_where_clause =~ /\S/) {
+		push @where, $base_where_clause;
+		push @bind_vals, @base_bind_vals;
+	}
+	
+	my $where_clause = @where ? "WHERE " . join(" AND ", @where) : "";
+	my $order_by_clause = $order ? $self->sql->_order_by($order) : "";
+	
+	# scalar ref so _quote_table will leave table expression alone
+	my $stmt = $self->sql->select(\($self->{sql_tableexpr}), $sql_fields)
+		. " $where_clause $order_by_clause";
+	
+	my $sth = $self->dbh->prepare_cached($stmt, undef, 3); # 3: see DBI docs
+	$self->debug_stmt($sth, @bind_vals);
+	$sth->execute(@bind_vals);	
+	return $sth;
+}
+
+################################################################################
+# override where clause handlers to use versions from schema of primary table
+################################################################################
+
+sub conv_where {
+	my $self = shift;
+	return $self->{db}{$self->{pri}}->conv_where(@_);
+}
+
+sub keyparts_to_where {
+	my $self = shift;
+	return $self->{db}{$self->{pri}}->keyparts_to_where(@_);
+}
+
+################################################################################
+# getting keyfields (a.k.a. listing)
+################################################################################
+
+*list_where = *WeBWorK::DB::Schema::NewSQL::Std::list_where;
+*list_where_i = *WeBWorK::DB::Schema::NewSQL::Std::list_where_i;
+
+################################################################################
+# getting records
+################################################################################
+
+*get_records_where = *WeBWorK::DB::Schema::NewSQL::Std::get_records_where;
+*get_records_where_i = *WeBWorK::DB::Schema::NewSQL::Std::get_records_where_i;
+
+################################################################################
+# compatibility methods for old API
+################################################################################
+
+*get = *WeBWorK::DB::Schema::NewSQL::Std::get;
+*gets = *WeBWorK::DB::Schema::NewSQL::Std::gets;
+
+################################################################################
+# utility methods
+################################################################################
+
+*sql = *WeBWorK::DB::Schema::NewSQL::Std::sql;
+*sql_table_name=  *WeBWorK::DB::Schema::NewSQL::Std::sql_table_name;
+*sql_field_name=  *WeBWorK::DB::Schema::NewSQL::Std::sql_field_name;
+
+1;
diff --git a/lib/WeBWorK/DB/Schema/NewSQL/NonVersioned.pm b/lib/WeBWorK/DB/Schema/NewSQL/NonVersioned.pm
new file mode 100644
index 0000000000..d49a353c99
--- /dev/null
+++ b/lib/WeBWorK/DB/Schema/NewSQL/NonVersioned.pm
@@ -0,0 +1,70 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/DB/Schema/NewSQL/NonVersioned.pm,v 1.5 2007/08/10 16:44:57 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::DB::Schema::NewSQL::NonVersioned;
+use base qw(WeBWorK::DB::Schema::NewSQL::Std);
+
+=head1 NAME
+
+WeBWorK::DB::Schema::NewSQL::NonVersioned - provide access to non-versioned sets.
+
+=cut
+
+use strict;
+use warnings;
+use WeBWorK::DB::Utils qw/make_vsetID/;
+
+use constant TABLES => qw/set_user problem_user/;
+
+################################################################################
+# where clause
+################################################################################
+
+# Override where clause generators that can be used with non-versioned sets so
+# that they only match non-versioned sets.
+
+sub where_DEFAULT {
+	my ($self, $flags) = @_;
+	return {set_id=>{NOT_LIKE=>make_vsetID("%","%")}};
+}
+
+sub where_user_id_eq {
+	my ($self, $flags, $user_id) = @_;
+	return {user_id=>$user_id,set_id=>{NOT_LIKE=>make_vsetID("%","%")}};
+}
+
+sub where_user_id_like {
+	my ($self, $flags, $user_id) = @_;
+	return {user_id=>{LIKE=>$user_id},set_id=>{NOT_LIKE=>make_vsetID("%","%")}};
+}
+
+################################################################################
+# override keyparts_to_where to limit scope of where clauses
+################################################################################
+
+sub keyparts_to_where {
+	my ($self, @keyparts) = @_;
+	
+	my $where = $self->SUPER::keyparts_to_where(@keyparts);
+	
+	unless (exists $where->{set_id}) {
+		$where->{set_id} = {NOT_LIKE=>make_vsetID("%","%")};
+	}
+	
+	return $where;
+}
+
+1;
diff --git a/lib/WeBWorK/DB/Schema/NewSQL/Std.pm b/lib/WeBWorK/DB/Schema/NewSQL/Std.pm
new file mode 100644
index 0000000000..b022572873
--- /dev/null
+++ b/lib/WeBWorK/DB/Schema/NewSQL/Std.pm
@@ -0,0 +1,821 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/DB/Schema/NewSQL/Std.pm,v 1.22 2009/02/02 03:18:09 gage 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::DB::Schema::NewSQL::Std;
+use base qw(WeBWorK::DB::Schema::NewSQL);
+
+=head1 NAME
+
+WeBWorK::DB::Schema::NewSQL - support SQL access to single tables.
+
+=cut
+
+use strict;
+use warnings;
+use Carp qw(croak);
+use Iterator;
+use Iterator::Util;
+use File::Temp;
+use String::ShellQuote;
+use WeBWorK::DB::Utils::SQLAbstractIdentTrans;
+use WeBWorK::Debug;
+
+=head1 SUPPORTED PARAMS
+
+This schema pays attention to the following items in the C<params> entry.
+
+=over
+
+=item tableOverride
+
+Alternate name for this table, to satisfy SQL naming requirements.
+
+=item fieldOverride
+
+A reference to a hash mapping field names to alternate names, to satisfy SQL
+naming requirements.
+
+=back
+
+=cut
+
+################################################################################
+# constructor for SQL-specific behavior
+################################################################################
+
+sub new {
+	my $self = shift->SUPER::new(@_);
+	
+	$self->sql_init;
+	
+	# provide a custom error handler
+	$self->dbh->{HandleError} = \&handle_error;
+	
+	return $self;
+}
+
+sub sql_init {
+	my $self = shift;
+	
+	# transformation functions for table and field names: these allow us to pass
+	# the WeBWorK table/field names to SQL::Abstract, and have it translate them
+	# to the SQL table/field names from tableOverride and fieldOverride.
+	# (Without this, it would be hard to translate field names in WHERE
+	# structures, since they're so convoluted.)
+	my ($transform_table, $transform_field);
+	if (defined $self->{params}{tableOverride}) {
+		$transform_table = sub {
+			my $label = shift;
+			if ($label eq $self->{table}) {
+				return $self->{params}{tableOverride};
+			} else {
+				#warn "can't transform unrecognized table name '$label'";
+				return $label;
+			}
+		};
+	}
+	if (defined $self->{params}{fieldOverride}) {
+		$transform_field = sub {
+			my $label = shift;
+			return defined $self->{params}{fieldOverride}{$label}
+				? $self->{params}{fieldOverride}{$label}
+				: $label;
+		};
+	}
+	
+	# add SQL statement generation object
+	$self->{sql} = new WeBWorK::DB::Utils::SQLAbstractIdentTrans(
+		quote_char => "`",
+		name_sep => ".",
+		transform_table => $transform_table,
+		transform_field => $transform_field,
+	);
+}
+
+################################################################################
+# table creation
+################################################################################
+
+sub create_table {
+	my ($self) = @_;
+	
+	my $stmt = $self->_create_table_stmt;
+	$self->dbh->do($stmt);
+	my @fields = $self->fields;
+	my @rows = map { [ @$_{@fields} ] } $self->initial_records;
+	return $self->insert_fields(\@fields, \@rows);
+}
+
+# this is mostly ripped off from wwdb_check, which is pretty much a per-table
+# version of the table creation code in sql_single.pm. wwdb_check is going away
+# after 2.3.x, and sql_single.pm is being replaced by this code.
+sub _create_table_stmt {
+	my ($self) = @_;
+	
+	my $sql_table_name = $self->sql_table_name;
+	
+	my @field_list;
+	
+	# generate a column specification for each field
+	foreach my $field ($self->fields) {
+		my $sql_field_name = $self->sql_field_name($field);
+		my $sql_field_type = $self->field_data->{$field}{type};
+		
+		push @field_list, "`$sql_field_name` $sql_field_type";
+	}
+	
+	# generate an INDEX specification for each all possible sets of keyfields (i.e. 0+1+2, 1+2, 2)
+	my @keyfields = $self->keyfields;
+	foreach my $start (0 .. $#keyfields) {
+		my @index_components;
+		
+		foreach my $component (@keyfields[$start .. $#keyfields]) {
+			my $sql_field_name = $self->sql_field_name($component);
+			my $sql_field_type = $self->field_data->{$component}{type};
+			my $length_specifier = $sql_field_type =~ /(text|blob)/i ? "(255)" : "";
+			if ($start == 0 and $length_specifier and $sql_field_type !~ /tiny/i) {
+				warn "warning: UNIQUE KEY component $sql_field_name is a $sql_field_type, which can"
+					. " hold values longer than 255 characters. However, the maximum key prefix"
+					. " length for text/blob fields is 255. Therefore, uniqueness must occur within"
+					. " the first 255 characters of this field.";
+			}
+			push @index_components, "`$sql_field_name`$length_specifier";
+		}
+		
+		my $index_string = join(", ", @index_components);
+		my $index_type = $start == 0 ? "UNIQUE KEY" : "KEY";
+		push @field_list, "$index_type ( $index_string )";
+	}
+	
+	my $field_string = join(", ", @field_list);
+	return "CREATE TABLE `$sql_table_name` ( $field_string )";
+}
+
+################################################################################
+# table renaming
+################################################################################
+
+sub rename_table {
+	my ($self, $new_sql_table_name) = @_;
+	
+	my $stmt = $self->_rename_table_stmt($new_sql_table_name);
+	return $self->dbh->do($stmt);
+}
+
+sub _rename_table_stmt {
+	my ($self, $new_sql_table_name) = @_;
+	
+	my $sql_table_name = $self->sql_table_name;
+	return "RENAME TABLE `$sql_table_name` TO `$new_sql_table_name`";
+}
+
+################################################################################
+# table deletion
+################################################################################
+
+sub delete_table {
+	my ($self) = @_;
+	
+	my $stmt = $self->_delete_table_stmt;
+	return $self->dbh->do($stmt);
+}
+
+sub _delete_table_stmt {
+	my ($self) = @_;
+	
+	my $sql_table_name = $self->sql_table_name;
+	return "DROP TABLE IF EXISTS `$sql_table_name`";
+}
+
+################################################################################
+# table dumping and restoring
+################################################################################
+
+# These are limited to mysql, since they use the mysql monitor and mysqldump.
+# An exception will be thrown if the table in question doesn't use mysql.
+# It also requires some additions to the params:
+#     mysqldump_path - path to mysqldump(1)
+#     mysql_path - path to mysql(1)
+
+sub dump_table {
+	my ($self, $dumpfile_path) = @_;
+	
+	my ($my_cnf, $database) = $self->_get_db_info;
+	my $mysqldump = $self->{params}{mysqldump_path};
+	
+	# 2>&1 is specified first, which apparently makes stderr go to stdout
+	# and stdout (not including stderr) go to the dumpfile. see bash(1).
+	my $dump_cmd = "2>&1 " . shell_quote($mysqldump)
+# 		. " --defaults-extra-file=" . shell_quote($my_cnf->filename)
+		. " --defaults-file=" . shell_quote($my_cnf->filename) # work around for mysqldump bug
+		. " " . shell_quote($database)
+		. " " . shell_quote($self->sql_table_name)
+		. " > " . shell_quote($dumpfile_path);
+	my $dump_out = readpipe $dump_cmd;
+	if ($?) {
+		my $exit = $? >> 8;
+		my $signal = $? & 127;
+		my $core = $? & 128;
+		warn "Warning: Failed to dump table '".$self->sql_table_name."' with command '$dump_cmd' (exit=$exit signal=$signal core=$core): $dump_out\n";
+		warn "This can be expected if the course was created with an earlier version of WeBWorK.";
+	}
+	
+	return 1;
+}
+
+sub restore_table {
+	my ($self, $dumpfile_path) = @_;
+	
+	my ($my_cnf, $database) = $self->_get_db_info;
+	my $mysql = $self->{params}{mysql_path};
+	
+	my $restore_cmd = "2>&1 " . shell_quote($mysql)
+# 		. " --defaults-extra-file=" . shell_quote($my_cnf->filename)
+		. " --defaults-file=" . shell_quote($my_cnf->filename) # work around for mysqldump bug
+		. " " . shell_quote($database)
+		. " < " . shell_quote($dumpfile_path);
+	my $restore_out = readpipe $restore_cmd;
+	if ($?) {
+		my $exit = $? >> 8;
+		my $signal = $? & 127;
+		my $core = $? & 128;
+		warn "Failed to restore table '".$self->sql_table_name."' with command '$restore_cmd' (exit=$exit signal=$signal core=$core): $restore_out\n";
+	}
+	
+	return 1;
+}
+
+sub _get_db_info {
+	my ($self) = @_;
+	my $dsn = $self->{driver}{source};
+	my $username = $self->{params}{username};
+	my $password = $self->{params}{password};
+	
+	die "Can't call dump_table or restore_table on a table with a non-MySQL source"
+		unless $dsn =~ s/^dbi:mysql://i;
+	
+	# this is an internal function which we probably shouldn't be using here
+	# but it's quick and gets us what we want (FIXME what about sockets, etc?)
+	my %dsn;
+	DBD::mysql->_OdbcParse($dsn, \%dsn, ['database', 'host', 'port']);
+	die "no database specified in DSN!" unless defined $dsn{database};
+	
+	# doing this securely is kind of a hassle...
+	my $my_cnf = new File::Temp;
+	$my_cnf->unlink_on_destroy(1);
+	chmod 0600, $my_cnf or die "failed to chmod 0600 $my_cnf: $!"; # File::Temp objects stringify with ->filename
+	print $my_cnf "[client]\n";
+	print $my_cnf "user=$username\n" if defined $username and length($username) > 0;
+	print $my_cnf "password=$password\n" if defined $password and length($password) > 0;
+	print $my_cnf "host=$dsn{host}\n" if defined $dsn{host} and length($dsn{host}) > 0;
+	print $my_cnf "port=$dsn{port}\n" if defined $dsn{port} and length($dsn{port}) > 0;
+	
+	return ($my_cnf, $dsn{database});
+}
+####################################################
+# checking Fields
+####################################################
+
+sub tableFieldExists {
+	my $self = shift;
+	my $field_name = shift;
+	my $stmt = $self->_exists_field_stmt($field_name);
+	my $result = $self->dbh->do($stmt);
+	return  ($result eq "1") ? 1 : 0;    # failed result is 0E0
+}
+
+sub _exists_field_stmt {
+	my $self = shift;	
+	my $field_name=shift;
+	my $sql_table_name = $self->sql_table_name;
+	return "Describe `$sql_table_name` `$field_name`";
+}
+####################################################
+# adding Field column
+####################################################
+
+sub add_column_field {
+	my $self = shift;
+	my $field_name = shift;
+	my $stmt = $self->_add_column_field_stmt($field_name);
+	#warn "database command $stmt";
+	my $result = $self->dbh->do($stmt);
+	#warn "result of add column is $result";
+	#return  ($result eq "0E0") ? 0 : 1;    # failed result is 0E0
+	return 1;   #FIXME  how to determine if database update was successful???
+}
+
+sub _add_column_field_stmt {
+	my $self = shift;	
+	my $field_name=shift;
+	my $sql_table_name = $self->sql_table_name;
+	my $sql_field_name = $self->sql_field_name($field_name);
+	my $sql_field_type = $self->field_data->{$field_name}{type};		
+	return "Alter table `$sql_table_name` add column `$sql_field_name` $sql_field_type";
+}
+####################################################
+# checking Tables
+####################################################
+sub tableExists {
+	my $self = shift;
+	my $stmt = $self->_exists_table_stmt;
+	my $result = eval { $self->dbh->do($stmt); };
+	( caught WeBWorK::DB::Ex::TableMissing ) ? 0:1;
+}
+
+sub _exists_table_stmt {
+	my $self = shift;	
+	my $sql_table_name = $self->sql_table_name;
+	return "Describe `$sql_table_name` ";
+}
+
+
+################################################################################
+# counting/existence
+################################################################################
+
+# returns the number of matching rows
+sub count_where {
+	my ($self, $where) = @_;
+	$where = $self->conv_where($where);
+	
+	my ($stmt, @bind_vals) = $self->sql->select($self->table, "COUNT(*)", $where);
+	my $sth = $self->dbh->prepare_cached($stmt, undef, 3); # 3 -- see DBI docs
+	$self->debug_stmt($sth, @bind_vals);
+	$sth->execute(@bind_vals);
+	my ($result) = $sth->fetchrow_array;
+	$sth->finish;
+	
+	return $result;
+}
+
+# returns true iff there is at least one matching row
+sub exists_where {
+	my ($self, $where) = @_;
+	return $self->count_where($where) > 0;
+}
+
+################################################################################
+# lowlevel get
+################################################################################
+
+# returns a list of refs to arrays containing field values for each matching row
+sub get_fields_where {
+	my ($self, $fields, $where, $order) = @_;
+	$fields ||= [$self->fields];
+	
+	my $sth = $self->_get_fields_where_prepex($fields, $where, $order);
+	my @results = @{ $sth->fetchall_arrayref };
+	$sth->finish;
+	return @results;
+}
+
+# returns an Iterator that generates refs to arrays containg field values for each matching row
+sub get_fields_where_i {
+	my ($self, $fields, $where, $order) = @_;
+	$fields ||= [$self->fields];
+	
+	my $sth = $self->_get_fields_where_prepex($fields, $where, $order);
+	return new Iterator sub {
+		my @row = $sth->fetchrow_array;
+		if (@row) {
+			return \@row;
+		} else {
+			$sth->finish; # let the server know we're done getting values
+			undef $sth; # allow the statement handle to get garbage-collected
+			Iterator::is_done();
+		}
+	};
+}
+
+# helper, returns a prepared statement handle
+sub _get_fields_where_prepex {
+	my ($self, $fields, $where, $order) = @_;
+	$where = $self->conv_where($where);
+	
+	my ($stmt, @bind_vals) = $self->sql->select($self->table, $fields, $where, $order);
+	my $sth = $self->dbh->prepare_cached($stmt, undef, 3); # 3: see DBI docs
+	$self->debug_stmt($sth, @bind_vals);
+	$sth->execute(@bind_vals);	
+	return $sth;
+}
+
+################################################################################
+# getting keyfields (a.k.a. listing)
+################################################################################
+
+# returns a list of refs to arrays containing keyfield values for each matching row
+sub list_where {
+	my ($self, $where, $order) = @_;
+	return $self->get_fields_where([$self->keyfields], $where, $order);
+}
+
+# returns an iterator that generates refs to arrays containing keyfield values for each matching row
+sub list_where_i {
+	my ($self, $where, $order) = @_;
+	return $self->get_fields_where_i([$self->keyfields], $where, $order);
+}
+
+################################################################################
+# getting records
+################################################################################
+
+# returns a record objects for each matching row
+sub get_records_where {
+	my ($self, $where, $order) = @_;
+	
+	return map { $self->box($_) }
+		$self->get_fields_where([$self->fields], $where, $order);
+}
+
+# returns an iterator that generates a record object for each matching row
+sub get_records_where_i {
+	my ($self, $where, $order) = @_;
+	
+	return imap { $self->box($_) }
+		$self->get_fields_where_i([$self->fields], $where, $order);
+}
+
+################################################################################
+# lowlevel insert
+################################################################################
+
+# returns the number of rows affected by inserting each row
+sub insert_fields {
+	my ($self, $fields, $rows) = @_;
+	
+	my ($sth, @order) = $self->_insert_fields_prep($fields);
+	my @results;
+	foreach my $row (@$rows) {
+		my @bind_vals = @$row[@order];
+		$self->debug_stmt($sth, @bind_vals);
+		push @results, $sth->execute(@bind_vals);
+	}
+	$sth->finish;
+	return @results;
+}
+
+# returns the number of rows affected by inserting each row
+sub insert_fields_i {
+	my ($self, $fields, $rows_i) = @_;
+	
+	my ($sth, @order) = $self->_insert_fields_prep($fields);
+	my @results;
+	until ($rows_i->is_exhausted) {
+		my @bind_vals = @{$rows_i->value}[@order];
+		$self->debug_stmt($sth, @bind_vals);
+		push @results, $sth->execute(@bind_vals);
+	}
+	$sth->finish;
+	return @results;
+}
+
+# helper, returns a prepared statement handle
+sub _insert_fields_prep {
+	my ($self, $fields) = @_;
+	
+	# we'll use dummy values to determine bind order
+	my %values;
+	@values{@$fields} = (0..@$fields-1);
+	
+	my ($stmt, @order) = $self->sql->insert($self->table, \%values);
+	my $sth = $self->dbh->prepare_cached($stmt, undef, 3); # 3: see DBI docs
+	return $sth, @order;
+}
+
+################################################################################
+# inserting records
+################################################################################
+
+# returns the number of rows affected by inserting each record
+sub insert_records {
+	my ($self, $Records) = @_;
+	return $self->insert_fields_i([$self->fields], imap { $self->unbox($_) } iarray $Records);
+}
+
+# returns the number of rows affected by inserting each record
+sub insert_records_i {
+	my ($self, $Records_i) = @_;
+	return $self->insert_fields_i([$self->fields], imap { $self->unbox($_) } $Records_i);
+}
+
+################################################################################
+# lowlevel update-where
+################################################################################
+
+# execute a single UPDATE by passing a ref to a hash mapping field names to new
+# values and a reference to a hash specifying a where clause
+
+# returns number of rows affected by update
+sub update_where {
+	my ($self, $fieldvals, $where) = @_;
+	$where = $self->conv_where($where);
+	
+	my ($stmt, @bind_vals) = $self->sql->update($self->table, $fieldvals, $where);
+	my $sth = $self->dbh->prepare_cached($stmt, undef, 3); # 3 -- see DBI docs
+	$self->debug_stmt($sth, @bind_vals);
+	my $result = $sth->execute(@bind_vals);
+	$sth->finish;
+	
+	return $result;
+}
+
+################################################################################
+# lowlevel update-fields
+################################################################################
+
+# rather than allowing an unrestrained where clause here, we generate one based
+# on the value of the keyfields in each row. in this respect, the behavior is
+# more like "REPLACE INTO", except that a record with matching keys must already
+# exist.
+
+# returns the number of rows affected by updating each row
+sub update_fields {
+	my ($self, $fields, $rows) = @_;
+	
+	my ($sth, $val_order, $where_order) = $self->_update_fields_prep($fields);
+	my @results;
+	foreach my $row (@$rows) {
+		my @bind_vals = @$row[@$val_order,@$where_order];
+		$self->debug_stmt($sth, @bind_vals);
+		push @results, $sth->execute(@bind_vals);
+	}
+	$sth->finish;
+	return @results;
+}
+
+# returns the number of rows affected by updating each row
+sub update_fields_i {
+	my ($self, $fields, $rows_i) = @_;
+	
+	my ($sth, $val_order, $where_order) = $self->_update_fields_prep($fields);
+	my @results;
+	until ($rows_i->is_exhausted) {
+		my @bind_vals = @{$rows_i->value}[@$val_order,@$where_order];
+		$self->debug_stmt($sth, @bind_vals);
+		push @results, $sth->execute(@bind_vals);
+	}
+	$sth->finish;
+	return @results;
+}
+
+# helper, returns a prepared statement handle
+sub _update_fields_prep {
+	my ($self, $fields) = @_;
+	
+	# get hashes to pass to update() and where()
+	# (dies if any keyfield is missing from @$fields)
+	my ($values, $where) = $self->gen_update_hashes($fields);
+	
+	# do the where clause separately so we get a separate bind list (cute substr trick, huh?)
+	my ($stmt, @val_order) = $self->sql->update($self->table, $values);
+	(substr($stmt,length($stmt),0), my @where_order) = $self->sql->where($where);
+	
+	my $sth = $self->dbh->prepare_cached($stmt, undef, 3); # 3: see DBI docs
+	return $sth, \@val_order, \@where_order;
+}
+
+################################################################################
+# updating records
+################################################################################
+
+# returns the number of rows affected by updating each record
+sub update_records {
+	my ($self, $Records) = @_;
+	return $self->update_fields_i([$self->fields], imap { $self->unbox($_) } iarray $Records);
+}
+
+# returns the number of rows affected by updating each record
+sub update_records_i {
+	my ($self, $Records_i) = @_;
+	return $self->update_fields_i([$self->fields], imap { $self->unbox($_) } $Records_i);
+}
+
+################################################################################
+# lowlevel delete-where
+################################################################################
+
+# execute a single DELETE by passing a ref to a hash specifying a where clause
+
+# returns number of rows affected by delete
+sub delete_where {
+	my ($self, $where) = @_;
+	$where = $self->conv_where($where);
+	
+	my ($stmt, @bind_vals) = $self->sql->delete($self->table, $where);
+	my $sth = $self->dbh->prepare_cached($stmt, undef, 3); # 3 -- see DBI docs
+	$self->debug_stmt($sth, @bind_vals);
+	my $result = $sth->execute(@bind_vals);
+	$sth->finish;
+	
+	return $result;
+}
+
+################################################################################
+# lowlevel delete-fields
+################################################################################
+
+# rather than allowing an unrestrained where clause here, we generate one based
+# on the value of the keyfields in each row. this allows us to delete a bunch
+# of records with a single statement handle, if what we have is a big list of
+# record IDs (i.e. keyfields)
+
+# an alternate approach would be to generate one big WHERE clause by ORing
+# together the ANDed keyfields for each record to delete. This has the potential
+# to accumulate a huge stmt string, but it's just one execute.
+
+# this doesn't support NULL in keyfields, because the WHERE clause is
+# constructed differently for NULL and non-NULL values. use delete_where.
+
+# returns the number of rows affected by deleting each row
+sub delete_fields {
+	my ($self, $fields, $rows) = @_;
+	
+	my ($sth, @order) = $self->_delete_fields_prep($fields);
+	my @results;
+	foreach my $row (@$rows) {
+		my @bind_vals = @$row[@order];
+		$self->debug_stmt($sth, @bind_vals);
+		push @results, $sth->execute(@bind_vals);
+	}
+	$sth->finish;
+	return @results;
+}
+
+# returns the number of rows affected by deleting each row
+sub delete_fields_i {
+	my ($self, $fields, $rows_i) = @_;
+	
+	my ($sth, @order) = $self->_delete_fields_prep($fields);
+	
+	my @results;
+	until ($rows_i->is_exhausted) {
+		my @bind_vals = @{$rows_i->value}[@order];
+		$self->debug_stmt($sth, @bind_vals);
+		push @results, $sth->execute(@bind_vals);
+	}
+	$sth->finish;
+	return @results;
+}
+
+# helper, returns a prepared statement handle
+sub _delete_fields_prep {
+	my ($self, $fields) = @_;
+	
+	# get hashes to pass to update() and where()
+	# (dies if any keyfield is missing from @$fields)
+	my (undef, $where) = $self->gen_update_hashes($fields);
+	
+	# do the where clause separately so we get a separate bind list (cute substr trick, huh?)
+	my ($stmt, @order) = $self->sql->delete($self->table, $where);
+	
+	my $sth = $self->dbh->prepare_cached($stmt, undef, 3); # 3: see DBI docs
+	return $sth, @order;
+}
+
+################################################################################
+# deleting records
+################################################################################
+
+# we can pass whole records in here, even though all that's needed to delete is
+# the keyfields. will be unboxed, and then _delete_fields_prep will ignore the
+# non-keyfields when generating the WHERE clause template.
+
+# returns the number of rows affected by deleting each record
+sub delete_records {
+	my ($self, $Records) = @_;
+	return $self->delete_fields_i([$self->fields], imap { $self->unbox($_) } iarray $Records);
+}
+
+# returns the number of rows affected by deleting each record
+sub delete_records_i {
+	my ($self, $Records_i) = @_;
+	return $self->delete_fields_i([$self->fields], imap { $self->unbox($_) } $Records_i);
+}
+
+################################################################################
+# compatibility methods for old API
+################################################################################
+
+# oldapi
+sub count {
+	my ($self, @keyparts) = @_;
+	return $self->count_where($self->keyparts_to_where(@keyparts));
+}
+
+# oldapi
+sub list {
+	my ($self, @keyparts) = @_;
+	return $self->list_where($self->keyparts_to_where(@keyparts));
+}
+
+# oldapi
+sub exists {
+	my ($self, @keyparts) = @_;
+	return $self->exists_where($self->keyparts_to_where(@keyparts));
+}
+
+# oldapi
+sub get {
+	my ($self, @keyparts) = @_;
+	return ( $self->get_records_where($self->keyparts_to_where(@keyparts)) )[0];
+}
+
+# oldapi
+sub gets {
+	my ($self, @keypartsRefList) = @_;
+	return map { $self->get_records_where($self->keyparts_to_where(@$_)) } @keypartsRefList;
+}
+
+# oldapi
+sub add {
+	my ($self, $Record) = @_;
+	return ( $self->insert_records([$Record]) )[0];
+}
+
+# oldapi
+sub put {
+	my ($self, $Record) = @_;
+	return ( $self->update_records([$Record]) )[0];
+}
+
+# oldapi
+sub delete {
+	my ($self, @keyparts) = @_;
+	return $self->delete_where($self->keyparts_to_where(@keyparts));
+}
+
+################################################################################
+# utility methods
+################################################################################
+
+sub sql {
+	return shift->{sql};
+}
+
+# returns non-quoted SQL name of current table
+sub sql_table_name {
+	my ($self) = @_;
+	return defined $self->{params}{tableOverride}
+		? $self->{params}{tableOverride}
+		: $self->table;
+}
+
+# returns non-quoted SQL name of given field
+sub sql_field_name {
+	my ($self, $field) = @_;
+	return defined $self->{params}{fieldOverride}{$field}
+		? $self->{params}{fieldOverride}{$field}
+		: $field;
+}
+
+# returns fully quoted expression refering to the specified field
+# if $include_table is true, the field name is prefixed with the table name
+sub sql_field_expression {
+	my ($self, $field, $table) = @_;
+	
+	# _quote will do native-to-SQL table/field name translation
+	if (defined $table) {
+		return $self->sql->_quote("$table.$field");
+	} else {
+		return $self->sql->_quote($field);
+	}
+}
+
+# maps error numbers to exception classes for MySQL
+our %MYSQL_ERROR_CODES = (
+	1062 => 'WeBWorK::DB::Ex::RecordExists',
+	1146 => 'WeBWorK::DB::Ex::TableMissing',
+);
+
+# turns MySQL error codes into exceptions -- WeBWorK::DB::Schema::Ex objects
+# for known error types, and normal die STRING exceptions for unknown errors.
+# This is one method you'd want to override if you were writing a subclass for
+# another RDBMS.
+sub handle_error {
+	my ($errmsg, $handle, $returned) = @_;
+	
+	if (exists $MYSQL_ERROR_CODES{$handle->err}) {
+		$MYSQL_ERROR_CODES{$handle->err}->throw;
+	} else {
+	    my $error = $errmsg."\n".join("\n",caller(1),caller(2),caller(3));
+	    #$error =~ s|\n|<br/>|;
+		die $error ;
+	}
+}
+
+1;
+
diff --git a/lib/WeBWorK/DB/Schema/NewSQL/Versioned.pm b/lib/WeBWorK/DB/Schema/NewSQL/Versioned.pm
new file mode 100644
index 0000000000..cb0558a6b3
--- /dev/null
+++ b/lib/WeBWorK/DB/Schema/NewSQL/Versioned.pm
@@ -0,0 +1,291 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/DB/Schema/NewSQL/Versioned.pm,v 1.7 2007/03/02 23:11:42 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::DB::Schema::NewSQL::Versioned;
+use base qw(WeBWorK::DB::Schema::NewSQL::Std);
+
+=head1 NAME
+
+WeBWorK::DB::Schema::NewSQL::Versioned - provide access to versioned sets.
+
+=cut
+
+use strict;
+use warnings;
+use WeBWorK::DB::Utils qw/make_vsetID make_vsetID_sql
+	grok_setID_from_vsetID_sql grok_versionID_from_vsetID_sql/;
+
+use constant TABLES => qw/set_version problem_version/;
+
+################################################################################
+# where clause
+################################################################################
+
+# Override where clause generators that can be used with versioned sets so that
+# they only match versioned sets.
+
+sub where_DEFAULT {
+	my ($self, $flags) = @_;
+	return {set_id=>{LIKE=>make_vsetID("%","%")}};
+}
+
+# replaces where_versionedset_user_id_eq in NewSQL
+sub where_user_id_eq {
+	my ($self, $flags, $user_id) = @_;
+	return {user_id=>$user_id,set_id=>{LIKE=>make_vsetID("%","%")}};
+}
+
+sub where_user_id_like {
+	my ($self, $flags, $user_id) = @_;
+	return {user_id=>{LIKE=>$user_id},set_id=>{LIKE=>make_vsetID("%","%")}};
+}
+
+sub where_set_id_eq {
+	my ($self, $flags, $set_id) = @_;
+	return {set_id=>{LIKE=>make_vsetID($set_id,"%")}};
+}
+
+# replaces where_versionedset_user_id_eq_set_id_eq in NewSQL
+sub where_user_id_eq_set_id_eq {
+	my ($self, $flags, $user_id, $set_id) = @_;
+	return {user_id=>$user_id,set_id=>{LIKE=>make_vsetID($set_id,"%")}};
+}
+
+# replaces where_versionedset_user_id_eq_set_id_eq_version_id_le in NewSQL
+sub where_user_id_eq_set_id_eq_version_id_le {
+	my ($self, $flags, $user_id, $set_id, $version_id) = @_;
+	if ($version_id >= 1) {
+		my @vsetIDs = map { make_vsetID($set_id,$_) } 1 .. $version_id;
+		return {user_id=>$user_id,set_id=>\@vsetIDs};
+	} else {
+		# nothing matches an invalid version id
+		return {-and=>\("0==1")};
+	}
+}
+
+sub where_user_id_eq_set_id_eq_version_id_eq {
+	my ($self, $flags, $user_id, $set_id, $version_id) = @_;
+	if ($version_id >= 1) {
+		return {user_id=>$user_id,set_id=>make_vsetID($set_id,$version_id)};
+	} else {
+		# nothing matches an invalid version id
+		return {-and=>\("0==1")};
+	}
+}
+
+# for problem versions only (set versions don't have a problem_id field)
+sub where_user_id_eq_set_id_eq_problem_id_eq {
+	my ( $self, $flags, $user_id, $set_id, $problem_id ) = @_;
+	return {user_id=>$user_id,set_id=>{LIKE=>make_vsetID($set_id,"%")},problem_id=>$problem_id};
+}
+
+################################################################################
+# override sql_field_expression to return SUBSTRING(...) expressions
+################################################################################
+
+# FIXME the rest of the places in this class that generate field lists (basically
+# anywhere that calls grok_*_from_vsetID_sql), should call this method instead.
+# this method can handle if the set_id field has a fieldOverride set for it, and
+# the other methods can't.
+sub sql_field_expression {
+	my ($self, $field, $table) = @_;
+	
+	if ($field eq "set_id" or $field eq "version_id") {
+		# this value will already be properly quoted
+		my $sql_field_name = $self->SUPER::sql_field_expression("set_id", $table);
+		
+		if ($field eq "set_id") {
+			return grok_setID_from_vsetID_sql($sql_field_name);
+		} elsif ($field eq "version_id") {
+			return grok_versionID_from_vsetID_sql($sql_field_name);
+		}
+	} else {
+		return $self->SUPER::sql_field_expression($field, $table);
+	}
+}
+
+# FIXME sql_field_expression will work in WHERE clauses, but do we need an
+# analogous routine for SET lvalues?
+
+################################################################################
+# override keyparts_to_where to limit scope of where clauses
+################################################################################
+
+sub keyparts_to_where {
+	my ($self, @keyparts) = @_;
+	
+	my $where = $self->SUPER::keyparts_to_where(@keyparts);
+	
+	if (exists $where->{set_id} and exists $where->{version_id}) {
+		$where->{set_id} = make_vsetID($where->{set_id}, $where->{version_id});
+		delete $where->{version_id};
+	} else {
+		my $set_id_part = exists $where->{set_id} ? $where->{set_id} : "%";
+		my $version_id_part = exists $where->{version_id} ? $where->{version_id} : "%";
+		$where->{set_id} = {LIKE => make_vsetID($set_id_part, $version_id_part)};
+		delete $where->{version_id};
+	}
+	
+	return $where;
+}
+
+################################################################################
+# overrides to fake version_id field
+################################################################################
+
+# replace the virutal set_id and version_id fields with expressions that extract
+# the set and version IDs from the real set_id field
+sub _get_fields_where_prepex {
+	my ($self, $fields, $where, $order) = @_;
+	
+	if (ref $fields eq "ARRAY") {
+		my @fields = @$fields; # don't want to mess up caller's copy
+		foreach my $field (@fields) {
+			if (lc $field eq "set_id") {
+				# FIXME use sql_field_expression here
+				$field = grok_setID_from_vsetID_sql($self->sql->_quote("set_id"))
+					. " AS " . $self->sql->_quote("set_id");
+			} elsif (lc $field eq "version_id") {
+				# FIXME use sql_field_expression here
+				$field = grok_versionID_from_vsetID_sql($self->sql->_quote("set_id"))
+					. " AS " . $self->sql->_quote("version_id");
+			} else {
+				$field = $self->sql->_quote($field);
+			}
+		}
+		$fields = join(", ", @fields);
+	}
+	
+	return $self->SUPER::_get_fields_where_prepex($fields, $where, $order);
+}
+
+# modify the INSERT expression so that it looks like this:
+# INSERT ... SET (..., set_id, ...) VALUES (..., CONCAT(?,',v',?), ...)
+# this is mostly a copy of Std::_insert_fields_prep
+sub _insert_fields_prep {
+	my ($self, $fields) = @_;
+	
+	# we'll use dummy values to determine bind order
+	my %values;
+	@values{@$fields} = (0..@$fields-1);
+	
+	# VERSIONING
+	if (exists $values{set_id} and exists $values{version_id}) {
+		# the array form allows raw SQL and bind values
+		$values{set_id} = [make_vsetID_sql("?","?"), @values{qw/set_id version_id/}];
+		delete $values{version_id};
+	} elsif (exists $values{set_id} or exists $values{version_id}) {
+		die "can't re-create versioned set_id field without virtual set_id and version_id fields";
+	} else {
+		# neither set_id nor version_id present, so that's fine
+		# (fine with us that is, mysql will complain that keys are missing)
+	}
+	
+	my ($stmt, @order) = $self->sql->insert($self->table, \%values);
+	my $sth = $self->dbh->prepare_cached($stmt, undef, 3); # 3: see DBI docs
+	return $sth, @order;
+}
+
+# where clause is already in native format (see where subroutines above)
+# fieldvals (a hashref) might contain decomposed set_id/version_id fields
+# set_id value:
+#   +set_id, +version_id => CONCAT(?, ',v', ?) BIND: set_id, version_id
+#   +set_id, -version_id => CONCAT(?, ',v', grok_versionID_from_vsetID_sql("set_id")) BIND: set_id
+#   -set_id, +version_id => CONCAT(grok_setID_from_vsetID_sql("set_id", ',v', ?) BIND: version_id
+#   -set_id, -version_id => not included
+sub update_where {
+	my ($self, $fieldvals, $where) = @_;
+	
+	my %fieldvals = %$fieldvals; # don't want to mess up the caller's version
+	
+	if (exists $fieldvals{set_id} or exists $fieldvals{version_id}) {
+		my ($set_id_part, $version_id_part, @bind);
+		if (exists $fieldvals{set_id}) {
+			$set_id_part = "?";
+			push @bind, $fieldvals{set_id};
+		} else {
+			# FIXME use sql_field_expression here?
+			$set_id_part = grok_setID_from_vsetID_sql($self->sql->_quote("set_id"));
+		}
+		if (exists $fieldvals{version_id}) {
+			$version_id_part = "?";
+			push @bind, $fieldvals{version_id};
+		} else {
+			# FIXME use sql_field_expression here?
+			$version_id_part = grok_versionID_from_vsetID_sql($self->sql->_quote("set_id"));
+		}
+		$fieldvals{set_id} = [make_vsetID_sql($set_id_part, $version_id_part), @bind];
+		delete $fieldvals{version_id};
+	}
+	
+	$self->SUPER::update_where(\%fieldvals, $where);
+}
+
+# this is mostly a copy of Std::_update_fields_prep
+sub _update_fields_prep {
+	my ($self, $fields) = @_;
+	
+	# get hashes to pass to update() and where()
+	# (dies if any keyfield is missing from @$fields)
+	my ($values, $where) = $self->gen_update_hashes($fields);
+	
+	# grab bind order for set_id/version_id virtual fields
+	my $set_id_index = $where->{set_id};
+	my $version_id_index = $where->{version_id};
+	delete @$where{qw/set_id version_id/};
+	
+	# do the where clause separately so we get a separate bind list (cute substr trick, huh?)
+	my ($stmt, @val_order) = $self->sql->update($self->table, $values);
+	(substr($stmt,length($stmt),0), my @where_order) = $self->sql->where($where);
+	
+	# append physical set_id match clause
+	$stmt .= " AND " . $self->sql->_quote("set_id") . " = " . make_vsetID_sql("?","?");
+	push @where_order, $set_id_index, $version_id_index;
+	
+	my $sth = $self->dbh->prepare_cached($stmt, undef, 3); # 3: see DBI docs
+	return $sth, \@val_order, \@where_order;
+}
+
+# don't need to override delete_where, since it'll get a pre-converted where clause
+#sub delete_where;
+
+# pretty much the same modification as _update_fields_prep
+# this is mostly a copy of Std::_delete_fields_prep
+sub _delete_fields_prep {
+	my ($self, $fields) = @_;
+	
+	# get hashes to pass to update() and where()
+	# (dies if any keyfield is missing from @$fields)
+	my (undef, $where) = $self->gen_update_hashes($fields);
+	
+	# grab bind order for set_id/version_id virtual fields
+	my $set_id_index = $where->{set_id};
+	my $version_id_index = $where->{version_id};
+	delete @$where{qw/set_id version_id/};
+	
+	# do the where clause separately so we get a separate bind list (cute substr trick, huh?)
+	my ($stmt, @order) = $self->sql->delete($self->table, $where);
+	
+	# append physical set_id match clause
+	$stmt .= " AND " . $self->sql->_quote("set_id") . " = " . make_vsetID_sql("?","?");
+	push @order, $set_id_index, $version_id_index;
+	
+	print STDERR "stmt=$stmt\norder=@order\n";
+	my $sth = $self->dbh->prepare_cached($stmt, undef, 3); # 3: see DBI docs
+	return $sth, @order;
+}
+
+1;
diff --git a/lib/WeBWorK/DB/Schema/NewSQL/VersionedMerge.pm b/lib/WeBWorK/DB/Schema/NewSQL/VersionedMerge.pm
new file mode 100644
index 0000000000..67b1a58c48
--- /dev/null
+++ b/lib/WeBWorK/DB/Schema/NewSQL/VersionedMerge.pm
@@ -0,0 +1,208 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/DB/Schema/NewSQL/VersionedMerge.pm,v 1.1 2007/03/01 22:09:51 glarose 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::DB::Schema::NewSQL::VersionedMerge;
+use base qw(WeBWorK::DB::Schema::NewSQL::Merge);
+
+=head1 NAME
+
+WeBWorK::DB::Schema::NewSQL::VersionedMerge - hack to get merged records 
+from multiple tables in the SQL database, for versioned sets and problems
+
+=cut
+
+use strict;
+use warnings;
+use Carp qw(croak);
+use Iterator;
+use Iterator::Util;
+use WeBWorK::DB::Utils::SQLAbstractIdentTrans;
+use WeBWorK::Debug;
+use WeBWorK::DB::Utils qw/make_vsetID/;
+
+=head1 SUPPORTED PARAMS
+
+This schema pays attention to the following items in the C<params> entry.
+
+=over
+
+=item merge
+
+A reference to an array listing the tables to merge, from highest priority to
+lowest priority.
+
+=back
+
+=cut
+
+################################################################################
+# constructor for merge-specific behavior, and methods fundamental 
+# to the merge, are inherited from Merge.pm
+################################################################################
+
+################################################################################
+# lowlevel get
+################################################################################
+
+sub get_fields_where {
+	my ( $self, $fields, $where, $order ) = @_;
+
+	# note: this is ugly because we've got two different table models 
+        #   that we're combining: {}_user and {}_version.  $self is inheriting
+	#   from Merge.pm, and so is using the first model; thus it doesn't
+        #   know how to deal with where clauses that include version_ids, 
+        #   and calling $self->conv_where() will therefore bail when we have
+        #   a restriction on the version_id.  if we use 
+	#   $db->{*_version}->conv_where(), there's no error, and the set_id
+	#   gets converted to the form we need to find the record in the 
+	#   *_user table.
+        # however, to make things more interesting, if we're entering here 
+        #   from a call of $db->{set_version_merged}->gets(), there's no 
+	#   trouble, because we're using $self->keyparts_to_where(), which 
+	#   has no trouble returning a %$where hash including a version_id key.
+	# the result is that we have to check for what $where is saying
+	#   here, even though we'd like to suppress that for the different
+	#   _get_fields_where_prepex() routines, because we have to be sure 
+	#   that we don't hand a @$where clause including version_id 
+	#   information to $self->conv_where().  yuck!
+
+	if ( ref($where) eq 'ARRAY' ) {
+	    my ( $nvtable ) = ( $self->table =~ /(.+)_merged/ );
+	    my $newWhere = $self->{db}->{$nvtable}->conv_where( $where );
+	    if ( defined( $newWhere->{set_id} ) && 
+		 $newWhere->{set_id} =~ /,v(\d+)$/ ) {
+		$newWhere->{version_id} = $1;
+		$newWhere->{set_id} =~ s/,v(\d+)$//; 
+	    }
+	    $where = $newWhere;
+	}
+
+	# get merged {}_user and {} records; to do this we have to be 
+	# careful that we don't get fooled by references to versions
+	my %nvWhere = %$where;
+	for my $key ( keys %nvWhere ) {
+		delete( $nvWhere{$key} ) if $key eq 'version_id';
+	}
+	my @nvFields = grep { $_ ne 'version_id' } @$fields;
+
+	my $sth = $self->_get_fields_where_prepex(\@nvFields, \%nvWhere, $order);
+	my @results = @{ $sth->fetchall_arrayref };
+	$sth->finish;
+
+	# then get data for this version
+	$sth = $self->_get_fields_where_prepex_extra( $fields, $where, $order );
+	my @vresults = @{ $sth->fetchall_arrayref };
+	$sth->finish;
+
+	# build a set of results hashes to facilitate merging the two sets
+	# of data, which will have different fields
+	my @res = ();
+	foreach my $r ( @results ) {
+		push(@res, { map {$nvFields[$_]=>$r->[$_]} (0..$#nvFields) });
+	}
+	my @vres = ();
+	foreach my $r ( @vresults ) {
+		push(@vres, {map {$fields->[$_]=>$r->[$_]} (0..$#{@$fields})});
+	}
+
+# 	my $rstr = "( ";
+# 	foreach (@results) { $rstr .= "[" . join(',', @{$_}) . "]\n"; }
+# 	warn("$rstr )\n");
+# 	my $vstr = "( ";
+# 	foreach (@vresults) { $vstr .= "[" . join(',', @{$_}) . "]\n"; }
+# 	warn("$vstr )\n");
+
+	# finally, brutally merge these
+	my @mergedResults = ();
+	for ( my $i=0; $i<@vres; $i++ ) {
+		my @mres = ();
+		foreach my $f ( @$fields ) {
+		    # there should be a more elegant way of doing this
+			if ( defined( $vres[$i]->{$f} ) ) {
+				push( @mres, $vres[$i]->{$f} );
+			} elsif ( defined( $res[$i]->{$f} ) ) {
+				push( @mres, $res[$i]->{$f} );
+			} else {
+				push( @mres, undef );
+			}
+		}
+		push( @mergedResults, [ @mres ] );
+	}
+
+# 	$rstr = "( ";
+# 	foreach (@mergedResults) { $rstr .= "[" . join(',', @{$_}) . "]\n"; }
+# 	warn("$rstr )\n");
+
+	return @mergedResults;
+}
+
+sub _get_fields_where_prepex_extra { 
+	my ( $self, $fields, $where, $order ) = @_;
+
+	# we have a problem with the $where parameters, because they 
+	# haven't been sent through the Versioned where clause generators
+	# manually fix those to deal with the set_id and version_id keys
+	my %vWhere = %$where;
+	if ( defined($vWhere{'set_id'}) && defined($vWhere{'version_id'}) ) {
+		$vWhere{'set_id'} = make_vsetID($vWhere{'set_id'}, $vWhere{'version_id'});
+		delete( $vWhere{'version_id'} );
+	} elsif ( defined($vWhere{'set_id'}) || defined($vWhere{'version_id'}) ) {
+		if ( defined($vWhere{'version_id'}) ) {
+			warn("Error: where clause includes version_id and not a set_id.\n");
+			delete( $vWhere{'version_id'} );
+		}
+		if ( defined($vWhere{'set_id'}) ) {
+			warn("Error: where clause includes set_id and not a version_id ($vWhere{set_id}).\n");
+			delete( $vWhere{'set_id'} );
+		}
+	}
+# 	warn("fields = ", "@$fields", "\n");
+# 	warn("vWhere = ", join("; ", map{"$_=>$vWhere{$_}"} keys %vWhere), "\n");
+
+	my $db = $self->{db};
+
+	my ($table) = ($self->table =~ /(.+)_merged/);
+	return $db->{$table}->_get_fields_where_prepex( $fields, \%vWhere, $order );
+}
+
+################################################################################
+# getting keyfields (a.k.a. listing)
+################################################################################
+
+*list_where = *WeBWorK::DB::Schema::NewSQL::Versioned::list_where;
+*list_where_i = *WeBWorK::DB::Schema::NewSQL::Versioned::list_where_i;
+
+################################################################################
+# getting records
+################################################################################
+
+*get_records_where = *WeBWorK::DB::Schema::NewSQL::Versioned::get_records_where;
+*get_records_where_i = *WeBWorK::DB::Schema::NewSQL::Versioned::get_records_where_i;
+
+################################################################################
+# compatibility methods for old API
+################################################################################
+
+*get = *WeBWorK::DB::Schema::NewSQL::Versioned::get;
+*gets = *WeBWorK::DB::Schema::NewSQL::Versioned::gets;
+
+################################################################################
+# utility methods
+################################################################################
+
+*sql = *WeBWorK::DB::Schema::NewSQL::Versioned::sql;
+
+1;
diff --git a/lib/WeBWorK/DB/Schema/SQL.pm b/lib/WeBWorK/DB/Schema/SQL.pm
deleted file mode 100644
index 98448fdac8..0000000000
--- a/lib/WeBWorK/DB/Schema/SQL.pm
+++ /dev/null
@@ -1,318 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader: webwork-modperl/lib/WeBWorK/DB/Schema/SQL.pm,v 1.15 2003/12/13 01:30:20 sh002i 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
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-# 
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-package WeBWorK::DB::Schema::SQL;
-use base qw(WeBWorK::DB::Schema);
-
-=head1 NAME
-
-WeBWorK::DB::Schema::SQL - support SQL access to all tables.
-
-=cut
-
-use strict;
-use warnings;
-use Carp qw(croak);
-
-use constant TABLES => qw(*);
-use constant STYLE  => "dbi";
-
-################################################################################
-# constructor for SQL-specific behavior
-################################################################################
-
-sub new {
-	my ($proto, $db, $driver, $table, $record, $params) = @_;
-	my $self = $proto->SUPER::new($db, $driver, $table, $record, $params);
-	
-	# override table name if tableOverride param is given
-	$self->{table} = $params->{tableOverride} if $params->{tableOverride};
-	
-	return $self;
-}
-
-################################################################################
-# table access functions
-################################################################################
-
-sub count {
-	my ($self, @keyparts) = @_;
-	
-	my $table = $self->{table};
-	my @keynames = $self->sqlKeynames();
-	
-	croak "too many keyparts for table $table (need at most: @keynames)"
-		if @keyparts > @keynames;
-	
-	my $stmt = "SELECT COUNT(*) FROM $table ";
-	$stmt .= $self->makeWhereClause(@keyparts);
-	$self->debug("SQL-count: $stmt\n");
-	
-	$self->{driver}->connect("ro");
-	my @result = $self->{driver}->dbi()->selectrow_array($stmt);
-	$self->{driver}->disconnect();
-	
-	return $result[0];
-}
-
-sub list($@) {
-	my ($self, @keyparts) = @_;
-	
-	my $table = $self->{table};
-	my @keynames = $self->sqlKeynames();
-	my $keynames = join(", ", @keynames);
-	
-	croak "too many keyparts for table $table (need at most: @keynames)"
-		if @keyparts > @keynames;
-	
-	my $stmt = "SELECT $keynames FROM $table ";
-	$stmt .= $self->makeWhereClause(@keyparts);
-	$self->debug("SQL-list: $stmt\n");
-	
-	$self->{driver}->connect("ro");
-	my $result = $self->{driver}->dbi()->selectall_arrayref($stmt);
-	$self->{driver}->disconnect();
-	croak "failed to SELECT: $DBI::errstr" unless defined $result;
-	return @$result;
-}
-
-sub exists($@) {
-	my ($self, @keyparts) = @_;
-	
-	my $table = $self->{table};
-	my @keynames = $self->sqlKeynames();
-	
-	croak "wrong number of keyparts for table $table (needs: @keynames)"
-		unless @keyparts == @keynames;
-	
-	my $stmt = "SELECT COUNT(*) FROM $table ";
-	$stmt .= $self->makeWhereClause(@keyparts);
-	$self->debug("SQL-exists: $stmt\n");
-	
-	$self->{driver}->connect("ro");
-	my ($result) = $self->{driver}->dbi()->selectrow_array($stmt);
-	$self->{driver}->disconnect();
-	croak "failed to SELECT: $DBI::errstr" unless defined $result;
-	return $result > 0;
-}
-
-sub add($$) {
-	my ($self, $Record) = @_;
-	
-	my @realKeynames = $self->{record}->KEYFIELDS();
-	my @keyparts = map { $Record->$_() } @realKeynames;
-	croak "(" . join(", ", @keyparts) . "): exists (use put)"
-		if $self->exists(@keyparts);
-	
-	my $table = $self->{table};
-	my @fieldnames = $self->sqlFieldnames();
-	my $fieldnames = join(", ", @fieldnames);
-	my $marks = join(", ", map { "?" } @fieldnames);
-	
-	my @realFieldnames = $self->{record}->FIELDS();
-	my @fieldvalues = map { $Record->$_() } @realFieldnames;
-	
-	my $stmt = "INSERT INTO $table ($fieldnames) VALUES ($marks)";
-	$self->debug("SQL-add: $stmt\n");
-	
-	$self->{driver}->connect("rw");
-	my $sth = $self->{driver}->dbi()->prepare($stmt);
-	my $result = $sth->execute(@fieldvalues);
-	$self->{driver}->disconnect();
-	
-	unless (defined $result) {
-		my @realKeynames = $self->{record}->KEYFIELDS();
-		my @keyvalues = map { $Record->$_() } @realKeynames;
-		croak "(" . join(", ", @keyvalues) . "): failed to INSERT: $DBI::errstr";
-	}
-	
-	return 1;
-}
-
-sub get($@) {
-	my ($self, @keyparts) = @_;
-#	
-#	my $table = $self->{table};
-#	my @keynames = $self->sqlKeynames();
-#	
-#	croak "wrong number of keyparts for table $table (needs: @keynames)"
-#		unless @keyparts == @keynames;
-#	
-#	my $stmt = "SELECT * FROM $table ";
-#	$stmt .= $self->makeWhereClause(@keyparts);
-#	$self->debug("SQL-get: $stmt\n");
-#	
-#	$self->{driver}->connect("ro");
-#	my $result = $self->{driver}->dbi()->selectrow_arrayref($stmt);
-#	$self->{driver}->disconnect();
-#	# $result comes back undefined if there are no matches. hmm...
-#	return undef unless defined $result;
-#	
-#	my @record = @$result;
-#	my $Record = $self->{record}->new();
-#	my @realFieldnames = $self->{record}->FIELDS();
-#	foreach (@realFieldnames) {
-#		$Record->$_(shift @record);
-#	}
-#	
-#	return $Record;
-	return ($self->gets(\@keyparts))[0];
-}
-
-sub gets($@) {
-	my ($self, @keypartsRefList) = @_;
-	
-	my $table = $self->{table};
-	my @keynames = $self->sqlKeynames();
-	
-	my @records;
-	$self->{driver}->connect("ro");
-	foreach my $keypartsRef (@keypartsRefList) {
-		my @keyparts = @$keypartsRef;
-		
-		croak "wrong number of keyparts for table $table (needs: @keynames)"
-			unless @keyparts == @keynames;
-		
-		my $stmt = "SELECT * FROM $table ";
-		$stmt .= $self->makeWhereClause(@keyparts);
-		$self->debug("SQL-get: $stmt\n");
-		my $result = $self->{driver}->dbi()->selectrow_arrayref($stmt);
-		
-		if (defined $result) {
-			my @record = @$result;
-			my $Record = $self->{record}->new();
-			my @realFieldnames = $self->{record}->FIELDS();
-			foreach (@realFieldnames) {
-				$Record->$_(shift @record);
-			}
-			push @records, $Record;
-		} else {
-			push @records, undef;
-		}
-	}
-	$self->{driver}->disconnect();
-	
-	return @records;
-}
-
-sub put($$) {
-	my ($self, $Record) = @_;
-	
-	my @realKeynames = $self->{record}->KEYFIELDS();
-	my @keyparts = map { $Record->$_() } @realKeynames;
-	croak "(" . join(", ", @keyparts) . "): not found (use add)"
-		unless $self->exists(@keyparts);
-	
-	my $table = $self->{table};
-	my @fieldnames = $self->sqlFieldnames();
-	my $fieldnames = join(", ", @fieldnames);
-	my $marks = join(", ", map { "?" } @fieldnames);
-	
-	my @realFieldnames = $self->{record}->FIELDS();
-	my @fieldvalues = map { $Record->$_() } @realFieldnames;
-	
-	my $stmt = "UPDATE $table SET";
-	while (@fieldnames) {
-		$stmt .= " " . (shift @fieldnames) . "=?";
-		$stmt .= "," if @fieldnames;
-	}
-	$stmt .= " ";
-	$stmt .= $self->makeWhereClause(map { $Record->$_() } @realKeynames);
-	$self->debug("SQL-put: $stmt\n");
-	
-	$self->{driver}->connect("rw");
-	my $sth = $self->{driver}->dbi()->prepare($stmt);
-	my $result = $sth->execute(@fieldvalues);
-	$self->{driver}->disconnect();
-	
-	unless (defined $result) {
-		croak "(" . join(", ", @keyparts) . "): failed to UPDATE: $DBI::errstr";
-	}
-	
-	return 1;
-}
-
-sub delete($@) {
-	my ($self, @keyparts) = @_;
-	
-	return 0 unless $self->exists(@keyparts);
-	
-	my $table = $self->{table};
-	my @keynames = $self->sqlKeynames();
-	
-	croak "wrong number of keyparts for table $table (needs: @keynames)"
-		unless @keyparts == @keynames;
-	
-	my $stmt = "DELETE FROM $table ";
-	$stmt .= $self->makeWhereClause(@keyparts);
-	$self->debug("SQL-delete: $stmt\n");
-	
-	$self->{driver}->connect("rw");
-	my $result = $self->{driver}->dbi()->do($stmt);
-	$self->{driver}->disconnect();
-	croak "failed to DELETE: $DBI::errstr" unless defined $result;
-	
-	return $result;
-}
-
-################################################################################
-# utility functions
-################################################################################
-
-sub makeWhereClause($@) {
-	my ($self, @keyparts) = @_;
-	
-	my @keynames = $self->sqlKeynames();
-	my $where;
-	my $first = 1;
-	while (@keyparts) {
-		unless (defined $keyparts[0]) {
-			shift @keynames;
-			shift @keyparts;
-			next;
-		}
-		$where .= " AND" unless $first;
-		$where .= " " . (shift @keynames);
-		$where .= "='" . (shift @keyparts) . "'";
-		$first = 0;
-	}
-	
-	return $where ? "WHERE$where" : "";
-}
-
-sub sqlKeynames($) {
-	my ($self) = @_;
-	my @keynames = $self->{record}->KEYFIELDS();
-	return map { $self->{params}->{fieldOverride}->{$_} || $_ }
-		@keynames;
-}
-
-sub sqlFieldnames($) {
-	my ($self) = @_;
-	my @keynames = $self->{record}->FIELDS();
-	return map { $self->{params}->{fieldOverride}->{$_} || $_ }
-		@keynames;
-}
-
-sub debug($@) {
-	my ($self, @string) = @_;
-	
-	if ($self->{params}->{debug}) {
-		warn @string;
-	}
-}
-
-1;
diff --git a/lib/WeBWorK/DB/Schema/WW1Hash.pm b/lib/WeBWorK/DB/Schema/WW1Hash.pm
deleted file mode 100644
index e68a454b2c..0000000000
--- a/lib/WeBWorK/DB/Schema/WW1Hash.pm
+++ /dev/null
@@ -1,885 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader: webwork-modperl/lib/WeBWorK/DB/Schema/WW1Hash.pm,v 1.21 2003/12/12 20:23:27 sh002i 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
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-# 
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-package WeBWorK::DB::Schema::WW1Hash;
-use base qw(WeBWorK::DB::Schema);
-
-=head1 NAME
-
-WeBWorK::DB::Schema::WW1Hash - support access to the set_user and problem_user
-tables with a WWDBv1 hash-style backend.
-
-=cut
-
-use strict;
-use warnings;
-use Carp;
-use WeBWorK::DB::Utils qw(hash2string string2hash);
-use WeBWorK::Timing;
-
-use constant TABLES => qw(set_user problem_user);
-use constant STYLE  => "hash";
-
-use constant LOGIN_PREFIX => "login<>";
-use constant SET_PREFIX   => "set<>";
-use constant MAX_PSVN_GENERATION_ATTEMPTS => 200;
-
-################################################################################
-# table access functions
-################################################################################
-
-=head1 ADDITIONAL METHODS
-
-=over
-
-=cut
-
-sub count {
-	my ($self, @keyparts) = @_;
-	my ($matchUserID, $matchSetID) = @keyparts[0 .. 1];
-	
-	# connect
-	return unless $self->{driver}->connect("ro");
-	
-	# get a list of PSVNs that match the userID and setID given
-	my @matchingPSVNs;
-	if (defined $matchUserID and not defined $matchSetID) {
-		@matchingPSVNs = $self->getPSVNsForUser($matchUserID);
-	} elsif (defined $matchSetID and not defined $matchUserID) {
-		@matchingPSVNs = $self->getPSVNsForSet($matchSetID);
-	} elsif (defined $matchUserID and defined $matchSetID) {
-		@matchingPSVNs = $self->getPSVN($matchUserID, $matchSetID);
-	} else {
-		# we need all PSVNs, so we have to do this ourselves.
-		@matchingPSVNs =
-			grep { m/^\d+$/ }
-				keys %{ $self->{driver}->hash() };
-	}
-	
-	my $result = 0;
-	if ($self->{table} eq "set_user") {
-		$result = @matchingPSVNs;
-	} elsif ($self->{table} eq "problem_user") {
-		my $matchProblemID = $keyparts[2];
-		foreach (@matchingPSVNs) {
-			my $string = $self->fetchString($_);
-			next unless defined $string;
-			my %hash = string2hash($string);
-			my $userID = $hash{stlg};
-			my $setID = $hash{stnm};
-			if (defined $matchProblemID) {
-				# we only want one 
-				if (exists $hash{"pfn$matchProblemID"}) {
-					$result++;
-				}
-			} else {
-				my (undef, undef, @problemIDs) = $self->hash2IDs(%hash);
-				$result += @problemIDs;
-			}
-		}
-	}
-	
-	# disconnect
-	$self->{driver}->disconnect();
-	
-	return $result;
-}
-
-sub list {
-	my ($self, @keyparts) = @_;
-	my ($matchUserID, $matchSetID) = @keyparts[0 .. 1];
-	
-	# connect
-	return unless $self->{driver}->connect("ro");
-	
-	# get a list of PSVNs that match the userID and setID given
-	my @matchingPSVNs;
-	if (defined $matchUserID and not defined $matchSetID) {
-		@matchingPSVNs = $self->getPSVNsForUser($matchUserID);
-	} elsif (defined $matchSetID and not defined $matchUserID) {
-		@matchingPSVNs = $self->getPSVNsForSet($matchSetID);
-	} elsif (defined $matchUserID and defined $matchSetID) {
-		@matchingPSVNs = $self->getPSVN($matchUserID, $matchSetID);
-	} else {
-		# we need all PSVNs, so we have to do this ourselves.
-		@matchingPSVNs =
-			grep { m/^\d+$/ }
-				keys %{ $self->{driver}->hash() };
-	}
-	
-	# retrieve the strings associated with those PSVNs and retrieve the
-	# desired parts of that record
-	my @result;
-	if ($self->{table} eq "set_user") {
-		foreach (@matchingPSVNs) {
-			my $string = $self->fetchString($_);
-			next unless defined $string;
-			my %hash = string2hash($string);
-			push @result, [$hash{stlg}, $hash{stnm}];
-		}
-	} elsif ($self->{table} eq "problem_user") {
-		my $matchProblemID = $keyparts[2];
-		foreach (@matchingPSVNs) {
-			my $string = $self->fetchString($_);
-			next unless defined $string;
-			my %hash = string2hash($string);
-			my $userID = $hash{stlg};
-			my $setID = $hash{stnm};
-			if (defined $matchProblemID) {
-				# we only want one 
-				if (exists $hash{"pfn$matchProblemID"}) {
-					push @result, [$userID, $setID, $matchProblemID];
-				}
-			} else {
-				my (undef, undef, @problemIDs) = $self->hash2IDs(%hash);
-				foreach my $n (@problemIDs) {
-					if (exists $hash{"pfn$n"}) {
-						push @result, [$userID, $setID, $n];
-					}
-				}
-			}
-		}
-	}
-	
-	# disconnect
-	$self->{driver}->disconnect();
-	
-	return @result;
-}
-
-sub exists {
-	my ($self, @keyparts) = @_;
-	my ($userID, $setID) = @keyparts[0 .. 1];
-	
-	return 0 unless $self->{driver}->connect("ro");
-	
-	# get a list of PSVNs that match the userID and setID given
-	my @matchingPSVNs;
-	if (defined $userID and not defined $setID) {
-		@matchingPSVNs = $self->getPSVNsForUser($userID);
-	} elsif (defined $setID and not defined $userID) {
-		@matchingPSVNs = $self->getPSVNsForSet($setID);
-	} elsif (defined $userID and defined $setID) {
-		@matchingPSVNs = $self->getPSVN($userID, $setID);
-	} else {
-		# we need all PSVNs, so we have to do this ourselves.
-		@matchingPSVNs =
-			grep { m/^\d+$/ }
-				keys %{ $self->{driver}->hash() };
-	}
-	
-	my $result = 0;
-	if (@matchingPSVNs) {
-		if ($self->{table} eq "set_user") {
-			# at least one set matched
-			$result = 1;
-		} elsif ($self->{table} eq "problem_user") {
-			my $problemID = $keyparts[2];
-			if (defined $problemID) {
-				# check each set for a matching problem
-				foreach my $PSVN (@matchingPSVNs) {
-					my $string = $self->fetchString($PSVN);
-					next unless defined $string;
-					my @problemIDs = $self->string2IDs($string);
-					shift @problemIDs; # remove userID
-					shift @problemIDs; # remove setID
-					if (grep { $_ eq $problemID } @problemIDs) {
-						$result = 1;
-						last;
-					}
-				}
-			} else {
-				# we'll take ANY problem in ANY set
-				$result = 1;
-			}
-		}
-	}
-	
-	$self->{driver}->disconnect();
-	return $result;
-}
-
-sub add {
-	my ($self, $Record) = @_;
-	my $userID = $Record->user_id();
-	my $setID = $Record->set_id();
-	my $db = $self->{db};
-	my $table = $self->{table};
-	$table =~ m/^(.*)_user$/;
-	my $globalSchema = $db->{$1};
-	
-	return 0 unless $self->{driver}->connect("rw");
-	
-	my $PSVN = $self->getPSVN($userID, $setID);
-	
-	my $result;
-	if ($self->{table} eq "set_user") {
-		$self->{driver}->disconnect();
-		my $globalSet = $globalSchema->get($setID);
-		$self->{driver}->connect("rw");
-		$self->copyOverrides($globalSet, $Record);
-		if (defined $PSVN) {
-			$self->{driver}->disconnect();
-			die "($userID, $setID): UserSet exists.\n";
-		}
-		my $PSVN = $self->setPSVN($userID, $setID); # create new psvn
-		my $string = $self->records2string($Record); # no problems
-		$self->storeString($PSVN, $string);
-		$result = 1;
-	} elsif ($self->{table} eq "problem_user") {
-		my $problemID = $Record->problem_id();
-		$self->{driver}->disconnect();
-		my $globalProblem = $globalSchema->get($setID, $problemID);
-		$self->{driver}->connect("rw");
-		$self->copyOverrides($globalProblem, $Record);
-		unless (defined $PSVN) {
-			$self->{driver}->disconnect();
-			die "($userID, $setID): UserSet not found.\n";
-		}
-		my $string = $self->fetchString($PSVN);
-		if (defined $string) {
-			my ($Set, @Problems) = $self->string2records($string);
-			if (grep { $_->problem_id() eq $problemID } @Problems) {
-				$self->{driver}->disconnect();
-				die "($userID, $setID, $problemID): UserProblem exists.\n"
-			}
-			push @Problems, $Record;
-			$string = $self->records2string($Set, @Problems);
-			$self->storeString($PSVN, $string);
-			$result = 1;
-		} else {
-			$result = 0;
-		}
-	}
-	
-	$self->{driver}->disconnect();
-	return $result;
-}
-
-sub get {
-	my ($self, @keyparts) = @_;
-	
-	return ( $self->gets(\@keyparts) )[0];
-}
-
-sub gets {
-	my ($self, @keypartsRefList) = @_;
-	
-	my @records;
-	$self->{driver}->connect("ro");
-	foreach my $keypartsRef (@keypartsRefList) {
-		my @keyparts = @$keypartsRef;
-		my $UserSet = $self->get1(@keyparts);
-		push @records, $UserSet;
-	}
-	$self->{driver}->disconnect();
-	
-	return @records;
-}
-
-=item get1(@keyparts)
-
-Retrieves one set or problem from the database, packages it into a record
-object, and removes values that match global defaults. Assumes that the driver
-is already connected to the database. Used by gets().
-
-=cut
-
-sub get1 {
-	my ($self, @keyparts) = @_;
-	my $db = $self->{db};
-	my $table = $self->{table};
-	my ($globalTable) = $table =~ m/^(.*)_user$/;
-	my $globalSchema = $db->{$globalTable};
-	
-	my $UserRecord = $self->get1NoFilter(@keyparts);
-	
-	# filter values that are identical to global values
-	if (defined $UserRecord) {
-		my $GlobalRecord = $globalSchema->get1(@keyparts[1..$#keyparts]);
-		if (defined $GlobalRecord) {
-			foreach my $field ($GlobalRecord->NONKEYFIELDS) {
-				if ($UserRecord->$field eq $GlobalRecord->$field) {
-					$UserRecord->$field(undef);
-				}
-			}
-		} else {
-			warn __PACKAGE__, ": keyparts=@keyparts: $table record exists, but $globalTable record does not. returning user record unmodified. this could cause problems later.";
-		}
-	}
-	
-	return $UserRecord;
-}
-
-=item getsNoFilter(@keypartsRefList)
-
-Similar to gets(), but does not remove values that match global defaults.
-
-=cut
-
-sub getsNoFilter {
-	my ($self, @keypartsRefList) = @_;
-	
-	my @records;
-	$self->{driver}->connect("ro");
-	foreach my $keypartsRef (@keypartsRefList) {
-		my @keyparts = @$keypartsRef;
-		my $UserSet = $self->get1NoFilter(@keyparts);
-		push @records, $UserSet;
-	}
-	$self->{driver}->disconnect();
-	
-	return @records;
-}
-
-# helper used by get1
-# also used by GlobalTableEmulator when it needs "real" records
-
-=item get1NoFilter(@keyparts)
-
-Similar to get1(), but does not remove values that match global defaults. Used
-by getsNoFilter() and several methods in GlobalTableEmulator.
-
-=cut
-
-sub get1NoFilter {
-	my ($self, @keyparts) = @_;
-	
-	my ($userID, $setID) = @keyparts[0 .. 1];
-	# FIXME: move these checks up to DB
-	die "userID not specified." unless defined $userID;
-	die "setID not specified." unless defined $setID;
-	
-	my $PSVN = $self->getPSVN($userID, $setID);
-	
-	unless (defined $PSVN) {
-		return;
-	}
-	my $string = $self->fetchString($PSVN);
-	
-	if ($self->{table} eq "set_user") {
-		my $UserSet = $self->string2set($string);
-		$UserSet->psvn($PSVN);
-		return $UserSet;
-	} elsif ($self->{table} eq "problem_user") {
-		my ($problemID) = $keyparts[2];
-		die "problemID not specified." unless defined $problemID;
-		my $UserProblem = $self->string2problem($string, $problemID);
-		return $UserProblem;
-	}
-}
-
-=item getAll($userID, $setID)
-
-Returns all problems in a given set. Only supported for the problem_user table.
-
-=cut
-
-sub getAll {
-	my ($self, @keyparts) = @_;
-	my $db = $self->{db};
-	my $table = $self->{table};
-	my ($globalTable) = $table =~ m/^(.*)_user$/;
-	my $globalSchema = $db->{$globalTable};
-	
-	croak "getAll: only supported for the problem_user table"
-		unless $table eq "problem_user";
-	
-	my @UnsortedUserProblems = $self->getAllNoFilter(@keyparts);
-	my @UnsortedGlobalProblems = $globalSchema->getAll(@keyparts[1 .. $#keyparts]);
-	
-	# FIXME FIXME FIXME: Danger! This code assumes that problem IDs are NUMERIC!
-	# I don't want to fix it right now, since there is currently no way to
-	# specify a non-numeric problem ID. However, it should be fixed at some
-	# point!
-
-	my (@UserProblems, @GlobalProblems);
-	foreach my $UserProblem (@UnsortedUserProblems) {
-		@UserProblems[$UserProblem->problem_id] = $UserProblem;
-	}
-	foreach my $GlobalProblem (@UnsortedGlobalProblems) {
-		@GlobalProblems[$GlobalProblem->problem_id] = $GlobalProblem;
-	}
-	
-	foreach my $problemID (0 .. $#GlobalProblems) {
-		my $GlobalProblem = $GlobalProblems[$problemID];
-		my $UserProblem = $UserProblems[$problemID];
-		
-		next unless defined $UserProblem;
-		
-		if (defined $GlobalProblem) {
-			foreach my $field ($GlobalProblem->NONKEYFIELDS) {
-				if ($UserProblem->$field eq $GlobalProblem->$field) {
-					$UserProblem->$field(undef);
-				}
-			}
-		} else {
-			warn __PACKAGE__, ": keyparts=@keyparts: $table record exists, but $globalTable record does not. returning user record unmodified. this could cause problems later.";
-		}
-	}
-	
-	return @UnsortedUserProblems;
-}
-
-=item getAllNoFilter($userID, $setID)
-
-Similar to getAll(), but does not remove values that match global defaults.
-Used by getAll() and the getAll() method in GlobalTableEmulator.
-
-=cut
-
-sub getAllNoFilter {
-	my ($self, $userID, $setID) = @_;
-	
-	croak "getAll: only supported for the problem_user table"
-		unless $self->{table} eq "problem_user";
-	
-	$self->{driver}->connect("ro");
-	
-	my $PSVN = $self->getPSVN($userID, $setID);
-	return unless defined $PSVN;
-	
-	my $string = $self->fetchString($PSVN);
-	my @UserProblems = $self->string2problems($string);
-	
-	$self->{driver}->disconnect;
-	
-	return @UserProblems;
-}
-
-sub put {
-	my ($self, $Record) = @_;
-	my $userID = $Record->user_id();
-	my $setID = $Record->set_id();
-	my $db = $self->{db};
-	my $table = $self->{table};
-	$table =~ m/^(.*)_user$/;
-	my $globalSchema = $db->{$1};
-	
-	return 0 unless $self->{driver}->connect("rw");
-	
-	my $PSVN = $self->getPSVN($userID, $setID);
-	
-	unless (defined $PSVN) {
-		$self->{driver}->disconnect();
-		die "($userID, $setID): UserSet not found.\n";
-	}
-	
-	my $string = $self->fetchString($PSVN);
-	
-	my $result;
-	if (defined $string) {
-		my ($Set, @Problems) = $self->string2records($string);
-		if ($self->{table} eq "set_user") {
-			$self->{driver}->disconnect();
-			# This call makes database connections, so we
-			# have to release our control on it.
-			my $globalSet = $globalSchema->get($setID);
-			$self->{driver}->connect("rw");
-	 		$self->copyOverrides($globalSet, $Record);
-			$string = $self->records2string($Record, @Problems);
-		} elsif ($self->{table} eq "problem_user") {
-			my $problemID = $Record->problem_id();
-			$self->{driver}->disconnect();
-			my $globalProblem = $globalSchema->get($setID, $problemID);
-			$self->{driver}->connect("rw");
-			$self->copyOverrides($globalProblem, $Record);
-			my $found = 0;
-			foreach (@Problems) {
-				if ($_->problem_id() eq $problemID) {
-					$found = 1;
-					$_ = $Record;
-				}
-			}
-			unless ($found) {
-				$self->{driver}->disconnect();
-				die "($userID, $setID, $problemID): UserProblem not found.\n";
-			}
-			$string = $self->records2string($Set, @Problems);
-		}
-		$self->storeString($PSVN, $string);
-		$result = 1;
-	} else {
-		$result = 0;
-	}
-	
-	$self->{driver}->disconnect();
-	return $result;
-}
-
-sub delete {
-	my ($self, $userID, $setID, $problemID) = @_;
-	
-	return 0 unless $self->{driver}->connect("rw");
-	
-	# get a list of PSVNs that match the userID and setID given
-	my @matchingPSVNs;
-	if (defined $userID and not defined $setID) {
-		@matchingPSVNs = $self->getPSVNsForUser($userID);
-	} elsif (defined $setID and not defined $userID) {
-		@matchingPSVNs = $self->getPSVNsForSet($setID);
-	} elsif (defined $userID and defined $setID) {
-		@matchingPSVNs = $self->getPSVN($userID, $setID);
-	} else {
-		# we need all PSVNs, so we have to do this ourselves.
-		@matchingPSVNs =
-			grep { m/^\d+$/ }
-				keys %{ $self->{driver}->hash() };
-	}
-	
-	if (@matchingPSVNs) {
-		foreach my $PSVN (@matchingPSVNs) {
-			$self->delete1($PSVN, $problemID);
-		}
-	}
-	
-	$self->{driver}->disconnect();
-	return 1;
-}
-
-=item delete1($PSVN, $problemID)
-
-for the set_user table,  ignore $problemID and deletes the set with the
-matching $PSVN. for the problem_user table, deletes the problem matching
-$problemID from the set matching $PSVN, or all problems if $problemID is not
-defined. Assumes that the driver is already connected to the database. Used by
-delete().
-
-=cut
-
-sub delete1 {
-	my ($self, $PSVN, $problemID) = @_;
-	
-	my $string = $self->fetchString($PSVN);
-	return 0 unless defined $string;
-	my ($userID, $setID) = $self->string2IDs($string);
-	
-	my $result = 1;
-	if ($self->{table} eq "set_user") {
-		$self->deletePSVN($userID, $setID);
-		$self->deleteString($PSVN);
-		$result = 1;
-	} elsif ($self->{table} eq "problem_user") {
-		my ($Set, @Problems) = $self->string2records($string);
-		my $length = @Problems;
-		if (defined $problemID) {
-			@Problems = grep { not $_->problem_id() eq $problemID } @Problems;
-		} else {
-			@Problems = (); # delete all problems
-		}
-		if ($length != @Problems) {
-			# removed one, store the new version
-			$string = $self->records2string($Set, @Problems);
-			$self->storeString($PSVN, $string);
-		}
-		$result = 1;
-	}
-	
-	return $result;
-}
-
-=back
-
-=cut
-
-################################################################################
-# add/put override copy helper
-################################################################################
-
-sub copyOverrides {
-	my ($self, $globalRecord, $userRecord) = @_;
-	
-	# This could happen if a Null schema is being used.
-	unless (defined $globalRecord and defined $userRecord) {
-		return $userRecord;
-	}
-	
-	foreach my $field ($globalRecord->FIELDS) {
-		unless (defined $userRecord->$field) {
-			$userRecord->$field($globalRecord->$field);
-		}
-	}
-	
-	return $userRecord; # The edit happens in place, so this is unneccesary.
-	                    # Nevertheless, it is common courtesy.
-}
-
-################################################################################
-# string <-> data conversion functions
-################################################################################
-
-sub string2IDs {
-	my ($self, $string) = @_;
-	return $self->hash2IDs(string2hash($string));
-}
- 
-sub string2set {
-	my ($self, $string) = @_;
-	return $self->hash2set(string2hash($string));
-}
-
-sub string2problem {
-	my ($self, $string, $problemID) = @_;
-	return $self->hash2problem($problemID, string2hash($string));
-}
-
-sub string2problems {
-	my ($self, $string) = @_;
-	my %hash = string2hash($string);
-	my @Problems;
-	foreach my $problemID (grep { s/^pfn// } keys %hash) {
-		push @Problems, $self->hash2problem($problemID, %hash);
-	}
-	return @Problems;
-}
-
-sub string2records {
-	my ($self, $string) = @_;
-	my %hash = string2hash($string);
-	my @Records = $self->hash2set(%hash);
-	if (wantarray) {
-		foreach my $problemID (grep { s/^pfn// } keys %hash) {
-			push @Records, $self->hash2problem($problemID, %hash);
-		}
-	}
-	return @Records;
-}
-
-sub records2string {
-	my ($self, $Set, @Problems) = @_;
-	my @hashArray = $self->set2hash($Set);
-	foreach my $Problem (@Problems) {
-		push @hashArray, $self->problem2hash($Problem);
-	}
-	my %hash = @hashArray;
-	return hash2string(%hash);
-}
-
-################################################################################
-# table multiplexing functions
-#  both the set_user and problem_user tables are stored in one hash, keyed by
-#  PSVN. we need to be able to split a hash value into two records, and combine
-#  two records into a single hash value.
-################################################################################
-
-sub hash2IDs {
-	my ($self, %hash) = @_;
-	my $userID = $hash{stlg};
-	my $setID = $hash{stnm};
-	my @problemIDs = grep { s/^pfn// } keys %hash;
-	return $userID, $setID, @problemIDs;
-}
-
-sub hash2set {
-	my ($self, %hash) = @_;
-	return $self->{db}->{set_user}->{record}->new(
-		user_id        => $hash{stlg},
-		set_id         => $hash{stnm},
-		set_header     => $hash{shfn},
-		problem_header => $hash{phfn},
-		open_date      => $hash{opdt},
-		due_date       => $hash{dudt},
-		answer_date    => $hash{andt},
-	);
-}
-
-sub hash2problem {
-	my ($self, $n, %hash) = @_;
-	return $self->{db}->{problem_user}->{record}->new(
-		user_id       => $hash{"stlg"},
-		set_id        => $hash{"stnm"},
-		problem_id    => $n,
-		source_file   => $hash{"pfn$n"},
-		value         => $hash{"pva$n"},
-		max_attempts  => $hash{"pmia$n"},
-		problem_seed  => $hash{"pse$n"},
-		status        => $hash{"pst$n"},
-		attempted     => $hash{"pat$n"},
-		last_answer   => $hash{"pan$n"},
-		num_correct   => $hash{"pca$n"},
-		num_incorrect => $hash{"pia$n"},
-	);
-}
-
-sub set2hash {
-	my ($self, $Set) = @_;
-	return (
-		stlg => $Set->user_id,
-		stnm => $Set->set_id,
-		shfn => $Set->set_header,
-		phfn => $Set->problem_header,
-		opdt => $Set->open_date,
-		dudt => $Set->due_date,
-		andt => $Set->answer_date,
-	);
-}
-
-sub problem2hash {
-	my ($self, $Problem) = @_;
-	my $n = $Problem->problem_id;
-	return (
-		"stlg"   => $Problem->user_id,
-		"stnm"   => $Problem->set_id,
-		"pfn$n"  => $Problem->source_file,
-		"pva$n"  => $Problem->value,
-		"pmia$n" => $Problem->max_attempts,
-		"pse$n"  => $Problem->problem_seed,
-		"pst$n"  => $Problem->status,
-		"pat$n"  => $Problem->attempted,
-		"pan$n"  => $Problem->last_answer,
-		"pca$n"  => $Problem->num_correct,
-		"pia$n"  => $Problem->num_incorrect,
-	);
-}
-
-################################################################################
-# PSVN and index functions
-#  the PSVN pseudo-table and the set and user indexes are not visible to the
-#  API, but we need to be able to update them to remain compatible with WWDBv1.
-################################################################################
-
-# retrieves a list of existing PSVNs from the user PSVN index
-sub getPSVNsForUser {
-	my ($self, $userID) = @_;
-	my $setsForUser = $self->fetchString(LOGIN_PREFIX.$userID);
-	return unless defined $setsForUser;
-	my %sets = string2hash($setsForUser);
-	return values %sets;
-}
-
-# retrieves a list of existing PSVNs from the set PSVN index
-sub getPSVNsForSet {
-	my ($self, $setID) = @_;
-	my $usersForSet = $self->fetchString(SET_PREFIX.$setID);
-	return unless defined $usersForSet;
-	my %users = string2hash($usersForSet);
-	return values %users;
-}
-
-# retrieves an existing PSVN from the PSVN indexes
-sub getPSVN {
-	my ($self, $userID, $setID) = @_;
-	my $setsForUser = $self->{driver}->hash()->{LOGIN_PREFIX.$userID};
-	my $usersForSet = $self->{driver}->hash()->{SET_PREFIX.$setID};
-	# * if setsForUser is non-empty, then there are sets built for this
-	#   user.
-	# * if usersForSet is non-empty, then this set has been built for at
-	#   least one user.
-	# * if either are empty, it is guaranteed that this set has not been
-	#   built for this user.
-	return unless defined $setsForUser and defined $usersForSet; #shut up, shut up, shut up!
-	return unless $setsForUser and $usersForSet;
-	my %sets = string2hash($setsForUser);
-	my %users = string2hash($usersForSet);
-	return unless exists $sets{$setID} and exists $users{$userID};
-	# more sanity checks: the following should never happen.
-	# if they do, run screaming for the hills.
-	if (defined $sets{$setID} and not defined $users{$userID}) {
-		die "PSVN indexes inconsistent: set exists in user index ",
-		    "but user does not exist in set index.";
-	} elsif (not defined $sets{$setID} and defined $users{$userID}) {
-		die "PSVN indexes inconsistent: user exists in set index ",
-		    "but set does not exist in user index.";
-	} elsif ($sets{$setID} != $users{$userID}) {
-		die "PSVN indexes inconsistent: user index and set index ",
-		    "gave different PSVN values.";
-	}
-	return $sets{$setID};
-}
-
-# generates a new PSVN, updates the PSVN indexes, returns the PSVN
-# if there is already a PSVN for this pair, reuse it
-sub setPSVN {
-	my ($self, $userID, $setID) = @_;
-	my $PSVN = $self->getPSVN($userID, $setID);
-	unless ($PSVN) {
-		# yeah, create a new PSVN here
-		my $min_psvn = 10**($self->{params}->{psvnLength} - 1);
-		my $max_psvn = 10**$self->{params}->{psvnLength} - 1;
-		my $attempts = 0;
-		do {
-			if (++$attempts > MAX_PSVN_GENERATION_ATTEMPTS) {
-				die "failed to find an unused PSVN within ",
-				    MAX_PSVN_GENERATION_ATTEMPTS, " attempts.";
-			}
-			$PSVN = int(rand($max_psvn-$min_psvn+1)) + $min_psvn;
-		} while ($self->fetchString($PSVN));
-		# get current PSVN indexes
-		my $setsForUser = $self->{driver}->hash()->{LOGIN_PREFIX.$userID};
-		my $usersForSet = $self->{driver}->hash()->{SET_PREFIX.$setID};
-		my %sets = string2hash($setsForUser);  # sets built for user $userID
-		my %users = string2hash($usersForSet); # users for which set $setID has been built
-		# insert new PSVN into each hash
-		$sets{$setID} = $PSVN;
-		$users{$userID} = $PSVN;
-		# re-encode the hashes
-		$setsForUser = hash2string(%sets);
-		$usersForSet = hash2string(%users);
-		# store 'em in the database
-		$self->{driver}->hash()->{LOGIN_PREFIX.$userID} = $setsForUser;
-		$self->{driver}->hash()->{SET_PREFIX.$setID} = $usersForSet;
-	};
-	return $PSVN;
-}
-
-# remove an existing PSVN from the PSVN indexes
-sub deletePSVN {
-	my ($self, $userID, $setID) = @_;
-	my $PSVN = $self->getPSVN($userID, $setID);
-	return unless $PSVN;
-	my $setsForUser = $self->{driver}->hash()->{LOGIN_PREFIX.$userID};
-	my $usersForSet = $self->{driver}->hash()->{SET_PREFIX.$setID};
-	my %sets = string2hash($setsForUser);  # sets built for user $userID
-	my %users = string2hash($usersForSet); # users for which set $setID has been built
-	delete $sets{$setID};
-	delete $users{$userID};
-	$setsForUser = hash2string(%sets);
-	$usersForSet = hash2string(%users);
-	if ($setsForUser) {
-		$self->{driver}->hash()->{LOGIN_PREFIX.$userID} = $setsForUser;
-	} else {
-		delete $self->{driver}->hash()->{LOGIN_PREFIX.$userID};
-	}
-	if ($usersForSet) {
-		$self->{driver}->hash()->{SET_PREFIX.$setID} = $usersForSet;
-	} else {
-		delete $self->{driver}->hash()->{SET_PREFIX.$setID};
-	}
-	return 1;
-}
-
-################################################################################
-# hash string interface
-################################################################################
-
-sub fetchString {
-	my ($self, $PSVN) = @_;
-	my $string = $self->{driver}->hash()->{$PSVN};
-	return $string;
-}
-
-
-sub storeString {
-	my ($self, $PSVN, $string) = @_;
-	$self->{driver}->hash()->{$PSVN} = $string;
-}
-
-sub deleteString {
-	my ($self, $PSVN) = @_;
-	delete $self->{driver}->hash()->{$PSVN};
-}
-
-1;
diff --git a/lib/WeBWorK/DB/Utils.pm b/lib/WeBWorK/DB/Utils.pm
index ca8cd8f3c3..a9739bdd2c 100644
--- a/lib/WeBWorK/DB/Utils.pm
+++ b/lib/WeBWorK/DB/Utils.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/DB/Utils.pm,v 1.24 2007/08/13 22:59:56 sh002i 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
@@ -25,123 +25,19 @@ WeBWorK::DB::Utils - useful utilities for the database modules.
 
 use strict;
 use warnings;
-use Data::Dumper;
 
 our @EXPORT    = ();
 our @EXPORT_OK = qw(
-	record2hash
-	hash2record
-	hash2string
-	string2hash
 	global2user
 	user2global
 	initializeUserProblem
-	findDefaults
+	make_vsetID
+	make_vsetID_sql
+	grok_vsetID
+	grok_setID_from_vsetID_sql
+	grok_versionID_from_vsetID_sql
 );
 
-################################################################################
-# WWDBv2 record <-> WWDBv1 hash
-#  not in the Record classes, since they are for legacy support
-################################################################################
-
-# FIXME: this should go away -- let WW1Hash and Classlist1Hash handle their own
-# stupid conversions!
-
-# RECORDHASH defines the correspondance between WWDBv1 hash keys and WWDBv2
-# record fields.
-use constant RECORDHASH => {
-	"WeBWorK::DB::Record::User" => [
-		['stfn', "first_name"   ],
-		['stln', "last_name"    ],
-		['stea', "email_address"],
-		['stid', "student_id"   ],
-		['stst', "status"       ],
-		['clsn', "section"      ],
-		['clrc', "recitation"   ],
-		['comt', "comment"      ],
-	],
-#	"WeBWorK::DB::Record::UserSet" => [
-#		['stlg', "user_id"       ],
-#		['stnm', "set_id"        ],
-#		['shfn', "set_header"    ],
-#		['phfn', "problem_header"],
-#		['opdt', "open_date"     ],
-#		['dudt', "due_date"      ],
-#		['andt', "answer_date"   ],
-#	],
-#	# a hash destined to be converted into a UserProblem must be converted
-#	# so that the hash keys, rather than containing the problem number,
-#	# contain the character '#'. Also, a new hash key '#' must be added
-#	# which contains the problem number.
-#	"WeBWorK::DB::Record::UserProblem" => [
-#		['stlg',  "user_id"      ],
-#		['stnm',  "set_id"       ],
-#		['#',     "problem_id"   ],
-#		['pfn#',  "source_file"  ],
-#		['pva#',  "value"        ],
-#		['pmia#', "max_attempts" ],
-#		['pse#',  "problem_seed" ],
-#		['pst#',  "status"       ],
-#		['pat#',  "attempted"    ],
-#		['pan#',  "last_answer"  ],
-#		['pca#',  "num_correct"  ],
-#		['pia#',  "num_incorrect"],
-#	],
-};
-
-sub record2hash($) {
-	my ($record) = @_;
-	my $map = RECORDHASH->{ref $record};
-	die ref $record, ": unknown record type" unless defined $map;
-	my %hash;
-	for (my $i = 0; $i < @$map; $i++) {
-		my ($v1, $v2) = @{$map->[$i]};
-		$hash{$v1} = $record->$v2;
-	}
-	return %hash;
-}
-
-sub hash2record($@) {
-	my ($type, %hash) = @_;
-	my $map = RECORDHASH->{$type};
-	die $type, ": unknown record type" unless defined $map;
-	my $record = $type->new();
-	for (my $i = 0; $i < @$map; $i++) {
-		my ($v1, $v2) = @{$map->[$i]};
-		$record->$v2($hash{$v1});
-	}
-	return $record;
-}
-
-################################################################################
-# WWDBv1 hash <-> WWDBv1 string
-################################################################################
-
-sub hash2string(@) {
-	my (%hash) = @_;
-	my $string;
-	return "" unless keys %hash;
-	foreach (keys %hash) {
-		$hash{$_} = "" unless defined $hash{$_}; # promote undef to ""
-		$hash{$_} =~ s/(=|&)/\\$1/g; # escape & and =
-		$string .= "$_=$hash{$_}&";
-	}
-	chop $string; # remove final '&' from string for old code :p
-	return $string;
-}
-
-sub string2hash($) {
-	my $string = shift;
-	return unless defined $string and $string;
-	my %hash = $string =~ /(.*?)(?<!\\)=(.*?)(?:(?<!\\)&|$)/g;
-	$hash{$_} =~ s/\\(&|=)/$1/g foreach keys %hash; # unescape & and =
-	return %hash;
-}
-
-################################################################################
-# global <-> user record conversion
-################################################################################
-
 sub global2user($$) {
 	my ($userRecordClass, $GlobalRecord) = @_;
 	my $UserRecord = $userRecordClass->new();
@@ -164,59 +60,53 @@ sub user2global($$) {
 # This function edits the record in place, so you can discard
 # the return value.
 sub initializeUserProblem {
-	my ($userProblem) = @_;
+	my ($userProblem, $seed) = @_;
+	$seed = int rand 5000 unless defined $seed;
 	$userProblem->status(0.0);
 	$userProblem->attempted(0);
 	$userProblem->num_correct(0);
 	$userProblem->num_incorrect(0);
-	$userProblem->problem_seed(int(rand(5000)));
+	$userProblem->problem_seed($seed);
+	$userProblem->sub_status(0.0);
 
 	return $userProblem;
 }
 
 ################################################################################
-# default generation
+# versioning utilities
 ################################################################################
 
-sub findDefaults($@) {
-	my ($globalClass, @Records) = @_;
-	
-	my %fields = map { $_ => {} } $globalClass->FIELDS();
-	#delete $fields{$_} foreach $globalClass->KEYFIELDS();
-	
-	foreach my $Record (@Records) {
-		foreach my $field (keys %fields) {
-			my $value = $Record->$field();
-			if ($value eq "UNDEFINED") {
-				die "Uh oh... value eq \"UNDEFINED\"\n";
-			}
-			unless (defined $value) {
-				$value = "UNDEFINED";
-			}
-			$fields{$field}{$value}++;
-		}
-	}
-	
-	#warn "Frequencies: ", Dumper(\%fields);
-	
-	my $Defaults = $globalClass->new();
-	foreach my $field (keys %fields) {
-		my $maxFreq = 0;
-		my $maxValue;
-		foreach my $value (keys %{$fields{$field}}) {
-			my $freq = $fields{$field}{$value};
-			if ($freq > $maxFreq) {
-				$maxFreq = $freq;
-				$maxValue = $value;
-			}
-		}
-		undef $maxValue if $maxValue eq "UNDEFINED";
-		$Defaults->$field($maxValue);
-	}
-	
-	#warn "Consensus defaults: ", Dumper($Defaults);
-	
-	return $Defaults;
+sub make_vsetID($$) {
+	my ($setID, $versionID) = @_;
+	return "$setID,v$versionID";
+}
+
+# does not quote $setID and $versionID, because they could be strings, qualified
+# or unqualified field names, or complex expression
+sub make_vsetID_sql {
+	my ($setID, $versionID) = @_;
+	return "CONCAT($setID,',v',$versionID)";
+}
+
+sub grok_vsetID($) {
+	my ($vsetID) = @_;
+	my ($setID, $versionID) = $vsetID =~ /([^,]+)(?:,v(.*))?/;
+	return $setID, $versionID;
+}
+
+# does not quote $field, because it could be a string, a qualified or
+# unqualified field name, or a complex expression
+sub grok_setID_from_vsetID_sql($) {
+	my ($field) = @_;
+	return "SUBSTRING($field,1,INSTR($field,',v')-1)";
+}
+
+# does not quote $field, because it could be a string, a qualified or
+# unqualified field name, or a complex expression
+sub grok_versionID_from_vsetID_sql($) {
+	my ($field) = @_;
+	# the "+0" casts the resulting value as a number
+	return "(SUBSTRING($field,INSTR($field,',v')+2)+0)";
 }
 
 1;
diff --git a/lib/WeBWorK/DB/Utils/SQLAbstractIdentTrans.pm b/lib/WeBWorK/DB/Utils/SQLAbstractIdentTrans.pm
new file mode 100644
index 0000000000..8cf39548ce
--- /dev/null
+++ b/lib/WeBWorK/DB/Utils/SQLAbstractIdentTrans.pm
@@ -0,0 +1,97 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/DB/Utils/SQLAbstractIdentTrans.pm,v 1.4 2007/03/02 23:12:28 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.	 See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::DB::Utils::SQLAbstractIdentTrans;
+use base qw(SQL::Abstract);
+
+=head1 NAME
+
+WeBWorK::DB::Utils::SQLAbstractIdentTrans - subclass of SQL::Abstract that
+allows custom hooks to transform identifiers.
+
+=cut
+
+use strict;
+use warnings;
+
+sub _table	{
+	my $self = shift;
+	my $tab	 = shift;
+	if (ref $tab eq 'ARRAY') {
+		return join ', ', map { $self->_quote_table($_) } @$tab;
+	} else {
+		return $self->_quote_table($tab);
+	}
+}
+
+sub _quote {
+	my $self  = shift;
+	my $label = shift;
+	
+	return $label if $label eq '*';
+	
+	return $self->_quote_field($label)
+		if !defined $self->{name_sep};
+	
+	if (defined $self->{transform_all}) {
+		return $self->{transform_all}->($label);
+	} elsif ($label =~ /(.+)\.(.+)/) {
+		return $self->_quote_table($1) . $self->{name_sep} . $self->_quote_field($2);
+	} else {
+		return $self->_quote_field($label);
+	}
+}
+
+sub _quote_table {
+	my $self  = shift;
+	my $label = shift;
+	
+	# if the table name is a scalar reference, leave it alone (but dereference it)
+	return $$label if ref $label eq "SCALAR";
+	
+	# call custom transform function
+	$label = $self->{transform_table}->($label)
+		if defined $self->{transform_table};
+	
+	return $self->{quote_char} . $label . $self->{quote_char};
+}
+
+sub _quote_field {
+	my $self  = shift;
+	my $label = shift;
+	
+	# call custom transform function
+	$label = $self->{transform_field}->($label)
+		if defined $self->{transform_field};
+	
+	return $self->{quote_char} . $label . $self->{quote_char};
+}
+
+sub _order_by {
+    my $self = shift;
+    my $ref = ref $_[0];
+
+    my @vals = $ref eq 'ARRAY'  ? @{$_[0]} :
+               $ref eq 'SCALAR' ? $_[0]    : # modification: don't dereference scalar refs
+               $ref eq ''       ? $_[0]    :
+               SQL::Abstract::puke "Unsupported data struct $ref for ORDER BY";
+
+    # modification: if an item is a scalar ref, don't quote it, only dereference it
+    my $val = join ', ', map { ref $_ eq "SCALAR" ? $$_ : $self->_quote($_) } @vals;
+    return $val ? $self->_sqlcase(' order by')." $val" : '';
+}
+
+1;
diff --git a/lib/WeBWorK/Debug.pm b/lib/WeBWorK/Debug.pm
new file mode 100644
index 0000000000..927e3937be
--- /dev/null
+++ b/lib/WeBWorK/Debug.pm
@@ -0,0 +1,142 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/Debug.pm,v 1.10 2006/06/28 16:20:39 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::Debug;
+use base qw(Exporter);
+use Date::Format;
+our @EXPORT = qw(debug);
+
+=head1 NAME
+
+WeBWorK::Debug - Print (or don't print) debugging output.
+
+head1 SYNOPSIS
+
+ use WeBWorK::Debug;
+ 
+ # Enable debugging
+ $WeBWorK::Debug::Enabled = 1;
+ 
+ # Log to a file instead of STDERR
+ $WeBWorK::Debug::Logfile = "/path/to/debug.log";
+ 
+ # log some debugging output
+ debug("Generated 5 widgets.");
+
+=cut
+
+use strict;
+use warnings;
+use Time::HiRes qw/gettimeofday/;
+use WeBWorK::Constants;
+use WeBWorK::Utils qw/undefstr/;
+
+################################################################################
+
+=head1 CONFIGURATION VARIABLES
+
+=over
+
+=item $Enabled
+
+If true, debugging messages will be output. If false, they will be ignored.
+
+=cut
+
+our $Enabled = 0 unless defined $Enabled;
+
+=item $Logfile
+
+If non-empty, debugging output will be sent to the file named rather than STDERR.
+
+=cut
+
+our $Logfile = "" unless defined $Logfile;
+
+=item $DenySubroutineOutput
+
+If defined, prevent subroutines matching the following regular expression from
+logging.
+
+=cut
+
+our $DenySubroutineOutput;
+
+=item $AllowSubroutineOutput
+
+If defined, allow only subroutines matching the following regular expression to
+log.
+
+=cut
+
+our $AllowSubroutineOutput;
+
+=back
+
+=cut
+
+################################################################################
+
+=head1 FUNCTIONS
+
+=over
+
+=item debug(@messages)
+
+Write @messages to the debugging log.
+
+=cut
+
+sub debug {
+	my (@message) = undefstr("###UNDEF###", @_);
+	
+	if ($Enabled) {
+		my ($package, $filename, $line, $subroutine) = caller(1);
+		return if defined $AllowSubroutineOutput and not $subroutine =~ m/$AllowSubroutineOutput/;
+		return if defined $DenySubroutineOutput and $subroutine =~ m/$DenySubroutineOutput/;
+		
+		my ($sec, $msec) = gettimeofday;
+		my $date = time2str("%a %b %d %H:%M:%S.$msec %Y", $sec);
+		my $finalMessage = "[$date] $subroutine: " . join("", @message);
+		$finalMessage .= "\n" unless $finalMessage =~ m/\n$/;
+		
+		if ($WeBWorK::Debug::Logfile ne "") {
+			if (open my $fh, ">>", $Logfile) {
+				print $fh $finalMessage;
+				close $fh;
+			} else {
+				warn "Failed to open debug log '$Logfile' in append mode: $!";
+				print STDERR $finalMessage;
+			}
+		} else {
+			print STDERR $finalMessage;
+		}
+	}
+}
+
+=back
+
+=cut
+
+################################################################################
+
+=head1 AUTHOR
+
+Written by Sam Hathaway, sh002i (at) math.rochester.edu.
+
+=cut
+
+1;
diff --git a/lib/WeBWorK/File/Classlist.pm b/lib/WeBWorK/File/Classlist.pm
new file mode 100644
index 0000000000..cd6312f085
--- /dev/null
+++ b/lib/WeBWorK/File/Classlist.pm
@@ -0,0 +1,107 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/File/Classlist.pm,v 1.10 2007/08/13 22:59:58 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::File::Classlist;
+use base qw/Exporter/;
+
+=head1 NAME
+
+WeBWorK::File::Classlist - parse and write classlist files.
+
+=cut
+
+use strict;
+use warnings;
+use IO::File;
+
+our $MIN_FIELDS = 9;
+our $MAX_FIELDS = 11;
+
+our @FIELD_ORDER = qw/student_id last_name first_name status comment
+section recitation email_address user_id password permission/;
+
+our @EXPORT = qw/parse_classlist write_classlist/;
+
+sub parse_classlist($) {
+	my ($file) = @_;
+	
+	my $fh = new IO::File($file, "<")
+		or die "Failed to open classlist '$file' for reading: $!\n";
+	
+	my (@records);
+	
+	while (<$fh>) {
+		chomp;
+		next if /^#/;
+		next unless /\S/;
+		s/^\s*//;
+		s/\s*$//;
+		
+		my @fields = split /\s*,\s*/, $_, -1; # -1 == don't delete empty trailing fields
+		my $fields = @fields;
+		if ($fields < $MIN_FIELDS) {
+			warn "Skipped invalid line $. of classlist '$file': expected at least $MIN_FIELDS fields, got $fields fields.\n";
+			next;
+		}
+		
+		if ($fields > $MAX_FIELDS) {
+			my $extra = $fields - $MAX_FIELDS;
+			warn "$extra extra fields in line $. of classlist '$file' ignored.\n";
+			$fields = $MAX_FIELDS;
+		}
+		
+		my @fields_in_this_record = @FIELD_ORDER[0 .. $fields-1];
+		my @data_in_this_record = @fields[0 .. $fields-1];
+		
+		my %record;
+		@record{@fields_in_this_record} = @data_in_this_record;
+		
+		push @records, \%record;
+	}
+	
+	$fh->close;
+	
+	return @records;
+}
+
+sub write_classlist($@) {
+	my ($file, @records) = @_;
+	
+	my $fh = new IO::File($file, ">")
+		or die "Failed to open classist '$file' for writing: $!\n";
+	
+	print $fh '# Generated by $Id$', "\n";
+	print $fh "# Field order: ", join(",", @FIELD_ORDER), "\n";
+	
+	foreach my $i (0 .. $#records) {
+		my $record = $records[$i];
+		unless (ref $record eq "HASH") {
+			warn "Skipping record $i: not a reference to a hash.\n";
+			next;
+		}
+		
+		my %record = %$record;
+		my @fields = @record{@FIELD_ORDER};
+		
+		my $string = join ",", @fields;
+		
+		print $fh "$string\n";
+	}
+	
+	$fh->close;
+}
+
+1;
diff --git a/lib/WeBWorK/File/Scoring.pm b/lib/WeBWorK/File/Scoring.pm
new file mode 100644
index 0000000000..4634198b64
--- /dev/null
+++ b/lib/WeBWorK/File/Scoring.pm
@@ -0,0 +1,67 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/File/Scoring.pm,v 1.2 2007/08/09 17:22:37 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::File::Scoring;
+use base qw/Exporter/;
+
+=head1 NAME
+
+WeBWorK::File::Scoring - parse scoring files.
+
+=cut
+
+use strict;
+use warnings;
+use IO::File;
+
+our $MIN_FIELDS = 6; # there are six "info" fields. we need at least those
+#our $MAX_FIELDS; # no maximum in scoring files
+
+our $KEY_INDEX = 0; # index of field to use for record key in resulting hash
+
+our @EXPORT = qw/parse_scoring_file/;
+
+sub parse_scoring_file($) {
+	my ($file) = @_;
+	
+	my $fh = new IO::File($file, "<")
+		or die "Failed to open scoring file '$file' for reading: $!\n";
+	
+	my %records;
+	
+	while (<$fh>) {
+		chomp;
+		next if /^#/;
+		next unless /\S/;
+		s/^\s*//;
+		s/\s*$//;
+		
+		my @fields = split /\s*,\s*/, $_, -1; # -1 == don't delete empty trailing fields
+		my $fields = @fields;
+		if ($fields < $MIN_FIELDS) {
+			warn "Skipped invalid line $. of scoring files '$file': expected at least $MIN_FIELDS fields, got $fields fields.\n";
+			next;
+		}
+		
+		$records{$fields[$KEY_INDEX]} = \@fields;
+	}
+	
+	$fh->close;
+	
+	return \%records;
+}
+
+1;
diff --git a/lib/WeBWorK/Form.pm b/lib/WeBWorK/Form.pm
index 4ec1336067..a3d9528dad 100644
--- a/lib/WeBWorK/Form.pm
+++ b/lib/WeBWorK/Form.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/Form.pm,v 1.8 2008/04/26 23:13:59 gage 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
@@ -170,6 +170,15 @@ sub printable {
 # supported is being called in scalar context, which in CGI.pm returned a
 # tied hashref to the original form data.  WeBWorK didn't need that, so I
 # didn't add it.  If you're feeling industrious...
+
+#FIXME?  I originally changed   join("\0",....)  to join(\0, ....) since I'm pretty sure that what was desired
+# was a string separated by nulls.   If one of the items in the list began with a number  eg 14
+# you would get    \014....\0name...\0   etc.  I think \0name evaluates properly but I'm pretty
+# sure that \014 does not.
+#
+# Then I backed out of the change until this gets checked more thoroughly by Sam
+# -- Mike
+
 sub Vars {
 	my $self = shift;
 	my %varsFormat = ();
diff --git a/lib/WeBWorK/HTML/ComboBox.pm b/lib/WeBWorK/HTML/ComboBox.pm
new file mode 100644
index 0000000000..7d722f7426
--- /dev/null
+++ b/lib/WeBWorK/HTML/ComboBox.pm
@@ -0,0 +1,133 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: 
+# 
+# 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::HTML::ComboBox;
+use base qw(Exporter);
+
+=head1 NAME
+
+WeBWorK::HTML::ComboBox - HTML widget for a textfield with a dropdown list
+
+=cut
+
+use strict;
+use warnings;
+use Carp;
+
+our @EXPORT    = ();
+our @EXPORT_OK = qw(
+	comboBox
+);
+
+
+
+sub comboBox {
+	my ($options, @Records) = @_;
+	
+	my %options = (%$options);
+	# %options must contain:
+	#  name - name of combo list -- use $r->param("$name")
+	#  request - the WeBWorK::Request object for the current request
+	# may contain:
+	#  default - default selection from pop_up list
+	#  rows - number of rows shown in option list
+	#  multiple - are multiple selections allowed?
+	
+	croak "name not found in options" unless exists $options{name};
+	croak "request not found in options" unless exists $options{request};
+	my $name = $options{name};
+	my $r = $options{request};
+	
+	my $default = $options{default};
+	my $size = $options{size};
+	$size = 1 unless defined $size;
+	my $multiple = $options{multiple};
+	$multiple = 0 unless defined $multiple;
+
+	my $value = $r->param($name) || $default || "";
+	
+	my @values = ref $options{values} eq "ARRAY" ? @{ $options{values} } : ();
+	my %labels = ref $options{labels} eq "HASH" ? %{ $options{labels} } : map { $_ => $_ } @values;
+	
+	# if someone just sends in the labels parameter, use all of them as values
+	@values = keys %labels if (%labels and not @values);
+
+	# makes $size = length of longest value + 4
+	my $width = 20;
+	map { $width = 4 + length if (length) > $width } @values;
+
+	
+
+	my %textfield_options = (
+			-name => $name,
+			-value => $value,
+			-size => $width,		# we need to calculate this to be the same as the popup_menu
+			-onKeyUp => "followType('$name')",
+	);
+	
+	my %popup_options = (
+			-name => $name,
+			-values => \@values,
+			-labels => \%labels,
+			-default => $default || $r->param($name) || 0,
+			-size => $size,
+			-onChange => "changeText('$name')",
+	);	
+
+	return CGI::span({-class=>"OptionList"},
+		CGI::table({cellpadding => 0, cellspacing => 0, border => 0}, 
+			CGI::Tr({}, CGI::td({}, CGI::textfield({%textfield_options}))),
+			CGI::Tr({}, CGI::td({}, CGI::popup_menu({%popup_options}))),
+		),
+		# this script alters the text box to be the same size as the select menu
+		# and also provides a function to change the textbox text to the currently selected option
+		CGI::script(join ("\n",
+			"// set textbox width to be same as that of select menu",
+			"document.getElementsByName('$name')[0].style.width = document.getElementsByName('$name')[1].offsetWidth;",
+			"// set textbox text to be same as that of select menu",
+			"function changeText (name) {
+				var textbox = document.getElementsByName(name)[0];
+				var select = document.getElementsByName(name)[1];
+				textbox.value = select.options[select.selectedIndex].value;
+			}",
+			"// try to select best option in select menu as user types in textbox",
+			"function followType (name) {
+				var textbox = document.getElementsByName(name)[0];
+				var select = document.getElementsByName(name)[1];
+				var textboxValue = textbox.value
+				for (var i = 0; (i < select.options.length) && (select.options[i].value.indexOf(textboxValue) != 0); i++) {}
+				select.selectedIndex = i;
+			}",
+#			"changeText('$name');",
+		)),
+	);
+
+	return CGI::span({-class=>"OptionList"},
+		CGI::textfield({
+			name => $name,
+			value => $value,
+			size => $size,		# we need to calculate this to be the same as the popup_menu
+		}), CGI::br(),
+		CGI::popup_menu(
+			-name => $name,
+			-values => \@values,
+			-labels => \%labels,
+			-default => $r->param($name),
+		),
+	);
+}
+
+1;
diff --git a/lib/WeBWorK/HTML/DropdownList.pm b/lib/WeBWorK/HTML/DropdownList.pm
new file mode 100644
index 0000000000..61cd8e39b0
--- /dev/null
+++ b/lib/WeBWorK/HTML/DropdownList.pm
@@ -0,0 +1,180 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: 
+# 
+# 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::HTML::DropdownRecordList;
+use base qw(Exporter);
+
+=head1 NAME
+
+WeBWorK::HTML::DropdownList - HTML widget for a scrolling list of
+records.
+
+=cut
+
+use strict;
+use warnings;
+use Carp;
+use WeBWorK::Utils::FormatRecords qw/getFormatsForClass formatRecords/;
+use WeBWorK::Utils::SortRecords qw/getSortsForClass sortRecords/;
+use WeBWorK::Utils::FilterRecords qw/getFiltersForClass filterRecords/;
+
+our @EXPORT    = ();
+our @EXPORT_OK = qw(
+	dropdownRecordList
+);
+
+
+
+sub dropdownRecordList {
+	my ($options, @Records) = @_;
+	
+	my %options = (default_filters=>[],default_sort=>"",default_format=>"",%$options);
+	# %options must contain:
+	#  name - name of scrolling list -- use $r->param("$name")
+	#  request - the WeBWorK::Request object for the current request
+	# may contain:
+	#  default_sort - name of sort to use by default
+	#  default_format - name of format to use by default
+	#  default_filter - listref, names of filters to apply by default (unimpl.)
+	#  allowed_filters - hashref, mapping field name to list of allowed values (unimpl.)
+	#  size - number of rows shown in scrolling list
+	#  multiple - are multiple selections allowed?
+	
+	croak "name not found in options" unless exists $options{name};
+	croak "request not found in options" unless exists $options{request};
+	my $name = $options{name};
+	my $r = $options{request};
+	
+	my $default_sort = $options{default_sort} || "";
+	my $default_format = $options{default_format} || "";
+
+	my @default_filters = @{$options{default_filters}} ;
+
+	my $size = $options{size};
+	my $multiple = $options{multiple};
+	
+	my $sorts = [];
+	my $sort_labels = {};
+	my $selected_sort = "";
+	
+	my $formats = [];
+	my $format_labels = {};
+	my $selected_format = "";
+	
+	my $filters = [];
+	my $filter_labels = {};
+	my @selected_filters= ();
+	
+	my @ids = ();
+	my %labels = ();
+	
+	my @selected_records = $r->param("$name");
+
+	if (@Records) {
+		my $class = ref $Records[0];
+
+		($filters, $filter_labels) = getFiltersForClass(@Records);
+		if (defined $r->param("$name!filter")){
+			@selected_filters = $r->param("$name!filter");
+			@selected_filters = ("all") unless @selected_filters;
+		}
+		else {
+			@selected_filters = @default_filters;
+		}
+	
+		($sorts, $sort_labels) = getSortsForClass($class);
+		$selected_sort = $r->param("$name!sort")
+			|| $default_sort
+			|| (@$sorts ? $sorts->[0] : "");
+		
+		($formats, $format_labels) = getFormatsForClass($class);
+		$selected_format = $r->param("$name!format")
+			|| $default_format
+			|| (@$formats ? $formats->[0] : "");
+		
+		@Records = filterRecords({filter=>\@selected_filters},@Records);
+		
+		@Records = sortRecords({preset=>$selected_sort}, @Records);
+		
+		# generate IDs from keyfields
+		my @keyfields = $class->KEYFIELDS;
+		foreach my $Record (@Records) {
+			push @ids, join("!", map { $Record->$_ } @keyfields);
+		}
+		
+		# generate labels hash
+		@labels{@ids} = @Records;
+		%labels = formatRecords({preset=>$selected_format}, %labels);
+	}
+	
+	my %sort_popup_options = (
+		-name => "$name!sort",
+		-values => $sorts,
+		-default => $selected_sort,
+		-labels => $sort_labels,
+	);
+	
+	my %format_popup_options = (
+		-name => "$name!format",
+		-values => $formats,
+		-default => $selected_format,
+		-labels => $format_labels,
+	);
+
+	my %filter_options = (
+		-name => "$name!filter",
+		-values => $filters,
+		-default => \@selected_filters,
+		-labels => $filter_labels,
+		-size => 3,
+		-multiple => 1,
+	);
+
+	my %list_options = (
+		-class=>"ScrollingRecordList",
+		-name => "$name",
+		-values => \@ids,
+		-default => \@selected_records,
+		-labels => \%labels,
+	);
+	$list_options{-size} = $size if $size;
+	$list_options{-multiple} = $multiple if $multiple;
+	
+	my $value = $r->param($name) || "";
+	
+	map { $size = 4 + length if length > $size } values %{ $options{values} };
+
+	my %textfield_options = (
+			name => $name,
+			value => $value,
+			size => $size,		# we need to calculate this to be the same as the popup_menu
+	);	
+	
+	return CGI::div({-class=>"ScrollingRecordList"},
+		CGI::textfield(%textfield_options),
+		CGI::scrolling_list(%list_options)
+	);
+	
+	return CGI::div({-class=>"ScrollingRecordList"},
+		"Sort: ", CGI::popup_menu(%sort_popup_options), CGI::br(),
+		"Format: ", CGI::popup_menu(%format_popup_options), CGI::br(),
+		"Filter: ", CGI::scrolling_list(%filter_options), CGI::br(),
+		CGI::submit("$name!refresh", "Change Display Settings"), CGI::br(),
+		CGI::scrolling_list(%list_options)
+	);
+}
+
+1;
diff --git a/lib/WeBWorK/HTML/InfoBox.pm b/lib/WeBWorK/HTML/InfoBox.pm
new file mode 100644
index 0000000000..4b82245fd5
--- /dev/null
+++ b/lib/WeBWorK/HTML/InfoBox.pm
@@ -0,0 +1,40 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/HTML/InfoBox.pm,v 1.2 2006/01/25 23:13:55 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::HTML::InfoBox;
+use base qw(Exporter);
+
+=head1 NAME
+
+WeBWorK::HTML::InfoBox - HTML widget for a box to display information in.
+
+=cut
+
+use strict;
+use warnings;
+use Carp;
+
+our @EXPORT    = ();
+our @EXPORT_OK = qw(
+	infoBox
+);
+
+sub infoBox {
+	# FIXME: write this!
+	# see: Login, ProblemSets, ProblemSet for disasters
+}
+
+1;
diff --git a/lib/WeBWorK/HTML/OptionList.pm b/lib/WeBWorK/HTML/OptionList.pm
new file mode 100644
index 0000000000..3b2ae66440
--- /dev/null
+++ b/lib/WeBWorK/HTML/OptionList.pm
@@ -0,0 +1,106 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: 
+# 
+# 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::HTML::OptionList;
+use base qw(Exporter);
+
+=head1 NAME
+
+WeBWorK::HTML::ScrollingRecordList - HTML widget for a textfield with a dropdown list
+
+=cut
+
+use strict;
+use warnings;
+use Carp;
+
+our @EXPORT    = ();
+our @EXPORT_OK = qw(
+	optionList
+);
+
+
+
+sub optionList {
+	my ($options, @Records) = @_;
+	
+	my %options = (%$options);
+	# %options must contain:
+	#  name - name of option list -- use $r->param("$name")
+	#  request - the WeBWorK::Request object for the current request
+	# may contain:
+	#  default - default selection from pop_up list
+	#  size - number of rows shown in option list
+	#  multiple - are multiple selections allowed?
+	
+	croak "name not found in options" unless exists $options{name};
+	croak "request not found in options" unless exists $options{request};
+	my $name = $options{name};
+	my $r = $options{request};
+	
+	my $default = $options{default};
+	my $size = $options{size};
+	$size = 1 unless defined $size;
+	my $multiple = $options{multiple};
+	$multiple = 0 unless defined $multiple;
+
+	my $value = $r->param($name) || "";
+	
+	my @values = ref $options{values} eq "ARRAY" ? @{ $options{values} } : ();
+	my %labels = ref $options{labels} eq "HASH" ? %{ $options{labels} } : map { $_ => $_ } @values;
+	
+	# if someone just sends in the labels parameter, use all of them as values
+	@values = keys %labels if (%labels and not @values);
+
+
+	map { $size = 4 + length if (length) > $size } @values;
+
+	my %textfield_options = (
+			name => $name,
+			value => $value,
+			size => $size,		# we need to calculate this to be the same as the popup_menu
+	);
+	
+	my %popup_options = (
+			-name => $name,
+			-values => \@values,
+			-labels => \%labels,
+			-default => $default || $r->param($name) || 0,
+	);	
+
+	return CGI::span({-class=>"OptionList"},
+		CGI::table({cellpadding => 0, cellspacing => 0, border => 0}, 
+			CGI::Tr({}, CGI::td({}, CGI::textfield({%textfield_options}))),
+			CGI::Tr({}, CGI::td({}, CGI::popup_menu({%popup_options}))),
+		)
+	);
+
+	return CGI::span({-class=>"OptionList"},
+		CGI::textfield({
+			name => $name,
+			value => $value,
+			size => $size,		# we need to calculate this to be the same as the popup_menu
+		}), CGI::br(),
+		CGI::popup_menu(
+			-name => $name,
+			-values => \@values,
+			-labels => \%labels,
+			-default => $r->param($name),
+		),
+	);
+}
+
+1;
diff --git a/lib/WeBWorK/HTML/ScrollingRecordList.pm b/lib/WeBWorK/HTML/ScrollingRecordList.pm
new file mode 100644
index 0000000000..ec114e6f52
--- /dev/null
+++ b/lib/WeBWorK/HTML/ScrollingRecordList.pm
@@ -0,0 +1,176 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/HTML/ScrollingRecordList.pm,v 1.9 2006/07/11 16:13:10 gage 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::HTML::ScrollingRecordList;
+use base qw(Exporter);
+
+=head1 NAME
+
+WeBWorK::HTML::ScrollingRecordList - HTML widget for a scrolling list of
+records.
+
+=cut
+
+use strict;
+use warnings;
+use Carp;
+use WeBWorK::Utils::FormatRecords qw/getFormatsForClass formatRecords/;
+use WeBWorK::Utils::SortRecords qw/getSortsForClass sortRecords/;
+use WeBWorK::Utils::FilterRecords qw/getFiltersForClass filterRecords/;
+
+our @EXPORT    = ();
+our @EXPORT_OK = qw(
+	scrollingRecordList
+);
+
+
+
+sub scrollingRecordList {
+	my ($options, @Records) = @_;
+	
+	my %options = (default_filters=>[],default_sort=>"",default_format=>"",%$options);
+	# %options must contain:
+	#  name - name of scrolling list -- use $r->param("$name")
+	#  request - the WeBWorK::Request object for the current request
+	# may contain:
+	#  default_sort - name of sort to use by default
+	#  default_format - name of format to use by default
+	#  default_filter - listref, names of filters to apply by default (unimpl.)
+	#  allowed_filters - hashref, mapping field name to list of allowed values (unimpl.)
+	#  size - number of rows shown in scrolling list
+	#  multiple - are multiple selections allowed?
+	
+	croak "name not found in options" unless exists $options{name};
+	croak "request not found in options" unless exists $options{request};
+	my $name = $options{name};
+	my $r = $options{request};
+	
+	my $default_sort = $options{default_sort} || "";
+	my $default_format = $options{default_format} || "";
+
+	my @default_filters = @{$options{default_filters}} ;
+
+	my $size = $options{size};
+	my $multiple = $options{multiple};
+	
+	my $sorts = [];
+	my $sort_labels = {};
+	my $selected_sort = "";
+	
+	my $formats = [];
+	my $format_labels = {};
+	my $selected_format = "";
+	
+	my $filters = [];
+	my $filter_labels = {};
+	my @selected_filters= ();
+	
+	my @ids = ();
+	my %labels = ();
+	
+	my $refresh_button_name    = defined($options{refresh_button_name}) ? $options{refresh_button_name}:"Change Display Settings";
+	
+	my @selected_records = $r->param("$name");
+
+	if (@Records) {
+		my $class = ref $Records[0];
+
+		($filters, $filter_labels) = getFiltersForClass(@Records);
+		if (defined $r->param("$name!filter")){
+			@selected_filters = $r->param("$name!filter");
+			@selected_filters = ("all") unless @selected_filters;
+		}
+		else {
+			@selected_filters = @default_filters;
+		}
+	
+		($sorts, $sort_labels) = getSortsForClass($class);
+		$selected_sort = $r->param("$name!sort")
+			|| $default_sort
+			|| (@$sorts ? $sorts->[0] : "");
+		
+		($formats, $format_labels) = getFormatsForClass($class);
+		$selected_format = $r->param("$name!format")
+			|| $default_format
+			|| (@$formats ? $formats->[0] : "");
+		
+		@Records = filterRecords({filter=>\@selected_filters},@Records);
+		
+		@Records = sortRecords({preset=>$selected_sort}, @Records);
+		
+		# generate IDs from keyfields
+		my @keyfields = $class->KEYFIELDS;
+		foreach my $Record (@Records) {
+			push @ids, join("!", map { $Record->$_ } @keyfields);
+		}
+		
+		# generate labels hash
+		@labels{@ids} = @Records;
+		%labels = formatRecords({preset=>$selected_format}, %labels);
+	}
+	
+	my %sort_popup_options = (
+		-name => "$name!sort",
+		-values => $sorts,
+		-default => $selected_sort,
+		-labels => $sort_labels,
+	);
+	
+	my %format_popup_options = (
+		-name => "$name!format",
+		-values => $formats,
+		-default => $selected_format,
+		-labels => $format_labels,
+	);
+
+	my %filter_options = (
+		-name => "$name!filter",
+		-values => $filters,
+		-default => \@selected_filters,
+		-labels => $filter_labels,
+		-size => 5,
+		-multiple => 1,
+	);
+
+	my %list_options = (
+		-class=>"ScrollingRecordList",
+		-name => "$name",
+		-values => \@ids,
+		-default => \@selected_records,
+		-labels => \%labels,
+	);
+	$list_options{-size} = $size if $size;
+	$list_options{-multiple} = $multiple if $multiple;
+	
+	return CGI::div({-class=>"ScrollingRecordList"},
+	       CGI::table({-border=>0, -cellspacing=>0, -cellpadding=>0},
+			  CGI::Tr({valign=>"top"},[
+		   CGI::td({-align=>"right"},"Sort:&nbsp;").
+		   CGI::td(CGI::popup_menu(%sort_popup_options)),
+
+		   CGI::td({-align=>"right"},"Format:&nbsp;").
+		   CGI::td(CGI::popup_menu(%format_popup_options)),
+
+		   CGI::td({-align=>"right"},"Filter:&nbsp;").
+		   CGI::td(CGI::scrolling_list(%filter_options)),
+		 ]),
+	       ),
+	       CGI::submit(-name=>"$name!refresh", -label=>$refresh_button_name), CGI::br(),
+	       CGI::scrolling_list(%list_options),
+       );
+}
+
+1;
diff --git a/lib/WeBWorK/Localize.pm b/lib/WeBWorK/Localize.pm
new file mode 100644
index 0000000000..1705b897bf
--- /dev/null
+++ b/lib/WeBWorK/Localize.pm
@@ -0,0 +1,106 @@
+
+
+
+package WeBWorK::Localize;
+
+
+use Locale::Maketext::Simple;  
+use base ("Locale::Maketext::Simple");
+
+print STDERR "Localize.pm: Full path for the localization directory set to |$WeBWorK::Constants::WEBWORK_DIRECTORY/lib/WeBWorK/Localize|\n";
+Locale::Maketext::Simple->import(Path => "$WeBWorK::Constants::WEBWORK_DIRECTORY/lib/WeBWorK/Localize");
+# use Locale::Maketext;
+# use base ('Locale::Maketext');
+
+sub getLoc {
+	my $lang = shift;
+	loc_lang($lang);
+	
+	return \&loc;
+}
+
+# this is like [quant] but it doesn't write the number
+#  usage: [quant,_1,<singular>,<plural>,<optional zero>]
+
+sub plural {
+    my($handle, $num, @forms) = @_;
+
+    return "" if @forms == 0;  
+    return $forms[2] if @forms > 2 and $num == 0; 
+
+    # Normal case:
+    return(  $handle->numerate($num, @forms) );
+}
+
+# this is like [quant] but it also has -1 case 
+#  usage: [negquant,_1,<neg case>,<singular>,<plural>,<optional zero>]
+
+sub negquant {
+    my($handle, $num, @forms) = @_;
+
+    return $num if @forms == 0;
+
+    my $negcase = shift @forms;
+    return $negcase if $num < 0;
+
+    return $forms[2] if @forms > 2 and $num == 0; 
+    return( $handle->numf($num) . ' ' . $handle->numerate($num, @forms) );
+}
+
+
+
+%Lexicon = (
+	'_AUTO' => 1,
+	'_REQUEST_ERROR' => q{
+WeBWorK has encountered a software error while attempting to process this
+problem. It is likely that there is an error in the problem itself. If you are a
+student, report this error message to your professor to have it corrected. If
+you are a professor, please consult the error output below for more information.
+},
+	'_LOGIN_MESSAGE' => q{
+If you check [_1] your 
+login information will be remembered by the browser 
+you are using, allowing you to visit WeBWorK pages 
+without typing your user name and password (until your 
+session expires). This feature is not safe for public 
+workstations, untrusted machines, and machines over 
+which you do not have direct control.
+},
+'_HMWKSETS_EDITOR_DESCRIPTION' => q{ 
+This is the homework sets editor page where you can view and edit the homework sets that exist in
+this course and the problems that they contain. The top of the page contains forms which allow you
+to filter which sets to display in the table, sort the sets in a chosen order, edit homework sets,
+publish homework sets, import/export sets from/to an external file, score sets, or create/delete
+sets.  To use, please select the action you would like to perform, enter in the relevant information
+in the fields below, and hit the \"Take Action!\" button at the bottom of the form.  The bottom of
+the page contains a table displaying the sets and several pieces of relevant information.",
+},
+"_CLASSLIST_EDITOR_DESCRIPTION" => q{
+tr: This is the classlist editor page, where you can view and edit the records of all the students
+currently enrolled in this course.  The top of the page contains forms which allow you to filter
+which students to view, sort your students in a chosen order, edit student records, give new
+passwords to students, import/export student records from/to external files, or add/delete students.
+ To use, please select the action you would like to perform, enter in the relevant information in
+the fields below, and hit the \"Take Action!\" button at the bottom of the form.  The bottom of the
+page contains a table containing the student usernames and their information.
+},
+"_REDUCED_CREDIT_MESSAGE_1" => q{
+tr: This assignment has a Reduced Credit Period that begins [_1] and
+ends on the due date, [_2].  During this period all additional work done counts [_3]\% of the
+original.
+},
+
+"_REDUCED_CREDIT_MESSAGE_2" => q{
+tr: This assignment had a Reduced Credit Period that began [_1] and
+ended on the due date, [_2].  During that period all additional work done counted [_3]\% of the
+original.
+},
+"_GUEST_LOGIN_MESSAGE" => q{tr: This course supports guest logins. Click [_1] to log into this course as a guest.},
+
+"_EXTERNAL_AUTH_MESSAGE" => q{[_1] uses an external authentication system.  You've authenticated through that system, but aren't allowed to log in to this course.},
+
+	);
+package WeBWorK::Localize::I18N;
+use base(WeBWorK::Localize);
+
+1;
diff --git a/lib/WeBWorK/Localize/en.mo b/lib/WeBWorK/Localize/en.mo
new file mode 100644
index 0000000000..aa367bc35f
Binary files /dev/null and b/lib/WeBWorK/Localize/en.mo differ
diff --git a/lib/WeBWorK/Localize/en.po b/lib/WeBWorK/Localize/en.po
new file mode 100644
index 0000000000..919041b220
--- /dev/null
+++ b/lib/WeBWorK/Localize/en.po
@@ -0,0 +1,82 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: WeBWorK Online Homework System\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: Michael Gage <gage@math.rochester.edu>\n"
+"Language-Team: Webwork language team <gage@math.rochester.edu>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: English\n"
+"X-Poedit-Country: UNITED STATES\n"
+
+#
+msgid "_REDUCED_CREDIT_MESSAGE_1"
+msgstr "This assignment has a Reduced Credit Period that begins %1 and ends on the due date, %2.  During this period all additional work done counts %3 % of the original."
+
+#
+msgid "_REQUEST_ERROR"
+msgstr "WeBWorK has encountered a software error while attempting to process this problem. It is likely that there is an error in the problem itself. If you are a student, report this error message to your professor to have it corrected. If you are a professor, please consult the error output below for more information."
+
+#
+msgid "_HMWKSETS_EDITOR_DESCRIPTION"
+msgstr " This is the homework sets editor page where you can view and edit the homework sets that exist in this course and the problems that they contain. The top of the page contains forms which allow you to filter which sets to display in the table, sort the sets in a chosen order, edit homework sets, publish homework sets, import/export sets from/to an external file, score sets, or create/delete sets.  To use, please select the action you would like to perform, enter in the relevant information in the fields below, and hit the \"Take Action!\" button at the bottom of the form.  The bottom of the page contains a table displaying the sets and several pieces of relevant information."
+
+#
+msgid "_EXTERNAL_AUTH_MESSAGE"
+msgstr "%1 uses an external authentication system.  You've authenticated through that system, but aren't allowed to log in to this course."
+
+#
+msgid "navProbList"
+msgstr "Up"
+
+#
+msgid "navNext"
+msgstr "Next"
+
+#
+msgid "_AUTO"
+msgstr "1"
+
+#
+msgid "navPrevGrey"
+msgstr "Prev"
+
+#
+msgid "navProbListGrey"
+msgstr "Up"
+
+#
+msgid "navNextGrey"
+msgstr "Next"
+
+#
+msgid "_CLASSLIST_EDITOR_DESCRIPTION"
+msgstr "This is the classlist editor page, where you can view and edit the records of all the students currently enrolled in this course.  The top of the page contains forms which allow you to filter which students to view, sort your students in a chosen order, edit student records, give new passwords to students, import/export student records from/to external files, or add/delete students. To use, please select the action you would like to perform, enter in the relevant information in the fields below, and hit the \"Take Action!\" button at the bottom of the form.  The bottom of the page contains a table containing the student usernames and their information."
+
+#
+msgid "_REDUCED_CREDIT_MESSAGE_2"
+msgstr "This assignment had a Reduced Credit Period that began %1 andended on the due date, %2.  During that period all additional work done counted %3 % of the original."
+
+#
+msgid "_LOGIN_MESSAGE"
+msgstr "If you check %1 your login information will be remembered by the browser you are using, allowing you to visit WeBWorK pages without typing your user name and password (until your session expires). This feature is not safe for public workstations, untrusted machines, and machines over which you do not have direct control."
+
+#
+msgid "navUp"
+msgstr "Up"
+
+#
+msgid "navPrev"
+msgstr "Prev"
+
+#
+msgid "_GUEST_LOGIN_MESSAGE"
+msgstr "This course supports guest logins. Click %1 to log into this course as a guest."
+
diff --git a/lib/WeBWorK/Localize/en_us.po b/lib/WeBWorK/Localize/en_us.po
new file mode 100644
index 0000000000..22972376a0
--- /dev/null
+++ b/lib/WeBWorK/Localize/en_us.po
@@ -0,0 +1,64 @@
+
+#
+msgid "_REDUCED_CREDIT_MESSAGE_1"
+msgstr "tr: This assignment has a Reduced Credit Period that begins %1 and ends on the due date, %2.  During this period all additional work done counts %3\% of the original."
+
+#
+msgid "_REQUEST_ERROR"
+msgstr "WeBWorK has encountered a software error while attempting to process thisproblem. It is likely that there is an error in the problem itself. If you are a student, report this error message to your professor to have it corrected. If you are a professor, please consult the error output below for more information."
+
+#
+msgid "_HMWKSETS_EDITOR_DESCRIPTION"
+msgstr "This is the homework sets editor page where you can view and edit the homework sets that exist in this course and the problems that they contain. The top of the page contains forms which allow you to filter which sets to display in the table, sort the sets in a chosen order, edit homework sets, publish homework sets, import/export sets from/to an external file, score sets, or create/delete sets.  To use, please select the action you would like to perform, enter in the relevant information in the fields below, and hit the \"Take Action!\" button at the bottom of the form.  The bottom of the page contains a table displaying the sets and several pieces of relevant information."
+
+#
+msgid "_EXTERNAL_AUTH_MESSAGE"
+msgstr "%1 uses an external authentication system.  You've authenticated through that system, but aren't allowed to log in to this course."
+
+#
+msgid "navProbList"
+msgstr "Up"
+
+#
+msgid "navNext"
+msgstr "Next"
+
+#
+msgid "_AUTO"
+msgstr "1"
+
+#
+msgid "navPrevGrey"
+msgstr "Prev"
+
+#
+msgid "navProbListGrey"
+msgstr "tr: Up"
+
+#
+msgid "navNextGrey"
+msgstr "Next"
+
+#
+msgid "_CLASSLIST_EDITOR_DESCRIPTION"
+msgstr "tr: This is the classlist editor page, where you can view and edit the records of all the studentscurrently enrolled in this course.  The top of the page contains forms which allow you to filterwhich students to view, sort your students in a chosen order, edit student records, give new passwords to students, import/export student records from/to external files, or add/delete students. To use, please select the action you would like to perform, enter in the relevant information in the fields below, and hit the \"Take Action!\" button at the bottom of the form.  The bottom of the page contains a table containing the student usernames and their information."
+
+#
+msgid "_REDUCED_CREDIT_MESSAGE_2"
+msgstr "tr: This assignment had a Reduced Credit Period that began %1 and ended on the due date, %2.  During that period all additional work done counted %3\% of the original."
+
+#
+msgid "_LOGIN_MESSAGE"
+msgstr "If you check %1 your login information will be remembered by the browser you are using, allowing you to visit WeBWorK pages without typing your user name and password (until your session expires). This feature is not safe for public workstations, untrusted machines, and machines over which you do not have direct control."
+
+#
+msgid "navUp"
+msgstr "Up"
+
+#
+msgid "navPrev"
+msgstr "Prev"
+
+#
+msgid "_GUEST_LOGIN_MESSAGE"
+msgstr "tr: This course supports guest logins. Click %1 to log into this course as a guest."
diff --git a/lib/WeBWorK/Localize/es.mo b/lib/WeBWorK/Localize/es.mo
new file mode 100644
index 0000000000..4f3bcabc07
Binary files /dev/null and b/lib/WeBWorK/Localize/es.mo differ
diff --git a/lib/WeBWorK/Localize/es.po b/lib/WeBWorK/Localize/es.po
new file mode 100644
index 0000000000..f6079171bb
--- /dev/null
+++ b/lib/WeBWorK/Localize/es.po
@@ -0,0 +1,2579 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: WeBWorK Online Homework System\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-12-10 17:43-0500\n"
+"Last-Translator: Michael Gage <gage@math.rochester.edu>\n"
+"Language-Team: Webwork Language team\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Spanish\n"
+"X-Poedit-Country: MEXICO\n"
+
+#
+#. ($name, $vnum)
+#: ContentGenerator/ProblemSets.pm:416
+#, fuzzy
+msgid "%1 (test %2)"
+msgstr "tr: %1 (test %2)"
+
+#
+#. ($numAdded, $numSkipped, join(", ", @$skipped)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1581
+#, fuzzy
+msgid "%1 sets added, %2 sets skipped. Skipped sets: (%3)"
+msgstr "tr: %1 sets exported, %2 sets skipped. Skipped sets: (%3)"
+
+#
+#. ($numExported, $numSkipped, (($numSkipped)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1701
+#, fuzzy
+msgid "%1 sets exported, %2 sets skipped. Skipped sets: (%3)"
+msgstr "tr: %1 sets exported, %2 sets skipped. Skipped sets: (%3)"
+
+#
+#. ($name)
+#: ContentGenerator/ProblemSets.pm:427
+#: ContentGenerator/ProblemSets.pm:441
+#, fuzzy
+msgid "%1 test"
+msgstr "tr: %1 test"
+
+#
+#. (scalar @userIDsToExport, $dir, $fileName)
+#: ContentGenerator/Instructor/UserList.pm:1385
+#, fuzzy
+msgid "%1 users exported to file %2/%3"
+msgstr "tr: %1 users exported to file %2/%3"
+
+#
+#. ($numReplaced, $numAdded, $numSkipped, join (", ", @$skipped)
+#: ContentGenerator/Instructor/UserList.pm:1269
+#, fuzzy
+msgid "%1 users replaced, %2 users added, %3 users skipped. Skipped users: (%4)"
+msgstr "tr: %1 users replaced, %2 users added, %3 users skipped.  Skipped users: (%4)"
+
+#
+#. (int($answerScore*100)
+#: ContentGenerator/Problem.pm:265
+#, fuzzy
+msgid "%1% correct"
+msgstr "%1% correcto"
+
+#
+#. ($e_user_name)
+#: ContentGenerator/Options.pm:171
+#, fuzzy
+msgid "%1's Current Address"
+msgstr " %1's E-mail actual"
+
+#
+#. ($user_name)
+#: ContentGenerator/Options.pm:126
+#, fuzzy
+msgid "%1's Current Password"
+msgstr "Contraseña actual"
+
+#
+#. ($e_user_name)
+#: ContentGenerator/Options.pm:175
+#, fuzzy
+msgid "%1's New Address"
+msgstr "%1's nuevo correo"
+
+#
+#. ($e_user_name)
+#: ContentGenerator/Options.pm:130
+#, fuzzy
+msgid "%1's New Password"
+msgstr "Nueva Contraseña"
+
+#
+#. ($e_user_name)
+#: ContentGenerator/Options.pm:101
+#, fuzzy
+msgid "%1's new password cannot be blank."
+msgstr "%1 nueva contraseña no puede dejarse en blanco."
+
+#
+#. ($e_user_name)
+#: ContentGenerator/Options.pm:84
+#, fuzzy
+msgid "%1's password has been changed."
+msgstr "La contraseña de %1 ha sido cambiada."
+
+#
+#. ($setID, $problemID)
+#: ContentGenerator/Problem.pm:884
+#, fuzzy
+msgid "%1: Problem %2"
+msgstr "%1: Problema %2."
+
+#
+#. ($numBlanks)
+#: ContentGenerator/Problem.pm:319
+#, fuzzy
+msgid "%quant(%1,of the questions remains,of the questions remain) unanswered."
+msgstr "[quant,_1,de las preguntas permanecen,  pregunta permanece ] sin contestar."
+
+#
+#: ContentGenerator/Problem.pm:1188
+#, fuzzy
+msgid "(This problem will not count towards your grade.)"
+msgstr "(Este problema no cuenta para tu evaluación)."
+
+#
+#: ContentGenerator/Problem.pm:1299
+#, fuzzy
+msgid "ANSWERS ONLY CHECKED -- ANSWERS NOT RECORDED"
+msgstr "RESPUESTAS SOLO VERIFICADAS--RESPUESTAS NO GUARDADAS"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1708
+#: ContentGenerator/Instructor/UserList.pm:1391
+#: ContentGenerator/Instructor/UserList.pm:1463
+msgid "Abandon changes"
+msgstr "tr: Abandon changes"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1647
+msgid "Abandon export"
+msgstr "tr: Abandon export"
+
+#
+#. ($eUserID)
+#: ContentGenerator.pm:848
+#, fuzzy
+msgid "Acting as %1. "
+msgstr "Actuando como %1"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1927
+msgid "Active"
+msgstr "tr: Active"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1142
+msgid "Add how many students?"
+msgstr "tr: Add how many students?"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1220
+msgid "Add which new users?"
+msgstr "tr: Add which new users?"
+
+#
+#: ContentGenerator/Problem.pm:311
+#, fuzzy
+msgid "All of the answers above are correct."
+msgstr "Todas las respuestas son correctas"
+
+#
+#. ($verb)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1052
+#, fuzzy
+msgid "All selected sets %1 all students"
+msgstr "tr: All selected sets %1 all students"
+
+#
+#. ($verb)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1046
+#, fuzzy
+msgid "All sets %1 all students"
+msgstr "tr: All sets %1 all students"
+
+#
+#. ($verb)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1049
+#, fuzzy
+msgid "All visible sets %1 all students"
+msgstr "tr: All visible sets %1 all students"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:446
+#: ContentGenerator/Instructor/ProblemSetList.pm:832
+#: ContentGenerator/Instructor/ProblemSetList.pm:870
+msgid "Answer Date"
+msgstr "tr: Answer Date"
+
+#
+#: ContentGenerator/Problem.pm:242
+msgid "Answer Preview"
+msgstr "Previsualizar respuesta"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:531
+msgid "Any changes made below will be reflected in the set for ALL students."
+msgstr "tr: Any changes made below will be reflected in the set for ALL students."
+
+#
+#: ContentGenerator.pm:1481
+msgid "Apply Options"
+msgstr "tr: Apply Options"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1545
+msgid "Assign this set to which users?"
+msgstr "tr: Assign this set to which users?"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2064
+#, fuzzy
+msgid "Assigned Sets"
+msgstr "tr: Edit Assigned Users"
+
+#
+#. ($fully)
+#: ContentGenerator/Problem.pm:315
+#, fuzzy
+msgid "At least one of the answers above is NOT %1correct."
+msgstr "Al menos una de las respuestas no es %1 correcta"
+
+#
+#: ContentGenerator/ProblemSet.pm:350
+#, fuzzy
+msgid "Attempts"
+msgstr "Intentos"
+
+#
+#. ($eUserID,$@)
+#: ContentGenerator/Options.pm:71
+#, fuzzy
+msgid "Can't get password record for effective user '%1': %2"
+msgstr "No se puede obtener la contraseña para el usuario efectivo '%1': %2"
+
+#
+#. ($userID,$@)
+#: ContentGenerator/Options.pm:68
+#, fuzzy
+msgid "Can't get password record for user '%1': %2"
+msgstr "No se puede obtener la contraseña para el usuario '%1': %2"
+
+#
+#: ContentGenerator/Options.pm:142
+#, fuzzy
+msgid "Change Email Address"
+msgstr "Cambio de e-mail"
+
+#
+#: ContentGenerator/Options.pm:61
+#, fuzzy
+msgid "Change Password"
+msgstr "Cambio de contraseña"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1409
+#: ContentGenerator/Instructor/UserList.pm:1481
+#, fuzzy
+msgid "Changes abandoned"
+msgstr "tr: changes abandoned"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1457
+#, fuzzy
+msgid "Changes saved"
+msgstr "tr: changes saved"
+
+#
+#: ContentGenerator/Problem.pm:1118
+#, fuzzy
+msgid "Check Answers"
+msgstr "Checar respuestas"
+
+#
+#: ContentGenerator/Problem.pm:1227
+msgid "Checking additional error messages"
+msgstr "tr: Checking additional error messages"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1011
+msgid "Choose visibility of the sets to be affected"
+msgstr "tr: Choose visibility of the sets to be affected"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1084
+#: ContentGenerator/Instructor/ProblemSetList.pm:982
+msgid "Choose which sets to be affected"
+msgstr "tr: Choose which sets to be affected"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:597
+#: ContentGenerator/Instructor/UserList.pm:550
+#: ContentGenerator/ProblemSets.pm:288
+msgid "Clear"
+msgstr "tr: Clear"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:562
+#, fuzzy
+msgid "Click on the login name to edit individual problem set data, (e.g. due dates) for these students."
+msgstr "tr: Click on the login name to edit individual problem set data, (e.g. due dates) for these students."
+
+#
+#: ContentGenerator/ProblemSets.pm:435
+msgid "Closed"
+msgstr "tr: Closed"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2072
+#: ContentGenerator/Instructor/UserList.pm:290
+#: ContentGenerator/Instructor/UserList.pm:818
+#: ContentGenerator/Instructor/UserList.pm:861
+#: ContentGenerator/Instructor/UserList.pm:904
+msgid "Comment"
+msgstr "tr: Comment"
+
+#
+#. ($e_user_name)
+#: ContentGenerator/Options.pm:134
+#: ContentGenerator/Options.pm:95
+#, fuzzy
+msgid "Confirm %1's New Password"
+msgstr "Confirme su nueva contraseña."
+
+#
+#: ContentGenerator/Login.pm:206
+msgid "Continue"
+msgstr "tr: Continue"
+
+#
+#: ContentGenerator/Problem.pm:243
+msgid "Correct"
+msgstr "Correcto"
+
+#
+#. ($e_user_name,$@)
+#: ContentGenerator/Options.pm:80
+#, fuzzy
+msgid "Couldn't change %1's password: %2"
+msgstr "No se puede cambiar la contraseña %2 de %1."
+
+#
+#. ($@)
+#: ContentGenerator/Options.pm:153
+#, fuzzy
+msgid "Couldn't change your email address: %1"
+msgstr "No se pudo cambiar su dirección de correo."
+
+#
+#: ContentGenerator/ProblemSets.pm:71
+#: ContentGenerator/ProblemSets.pm:73
+msgid "Course Info"
+msgstr "Información del curso"
+
+#
+#: ContentGenerator.pm:657
+#: ContentGenerator/Home.pm:94
+msgid "Courses"
+msgstr "Cursos"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1351
+msgid "Create as what type of set?"
+msgstr "tr: Create as what type of set?"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1263
+#: ContentGenerator/Instructor/UserList.pm:1082
+msgid "Delete how many?"
+msgstr "tr: Delete how many?"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1119
+msgid "Disable"
+msgstr "tr: Disable"
+
+#
+#: ContentGenerator.pm:1442
+msgid "Display Options"
+msgstr "tr: Display Options"
+
+#
+#. ($pl)
+#: ContentGenerator/ProblemSets.pm:283
+#, fuzzy
+msgid "Download Hardcopy for Selected %plural(%1,Set,Sets)"
+msgstr "Baja la copia escrita de: [plural,_1,Set,Sets] "
+
+#
+#: ContentGenerator/ProblemSet.pm:321
+msgid "Download PDF or TeX Hardcopy for Current Set"
+msgstr "tr: Download PDF or TeX Hardcopy for Current Set"
+
+#
+#: ContentGenerator/ProblemSets.pm:289
+msgid "Download PDF or TeX Hardcopy for Selected Sets"
+msgstr "tr: Download PDF or TeX Hardcopy for Selected Sets"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:445
+#: ContentGenerator/Instructor/ProblemSetList.pm:831
+#: ContentGenerator/Instructor/ProblemSetList.pm:869
+msgid "Due Date"
+msgstr "tr: Due Date"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1812
+msgid "Duplicate this set and name it"
+msgstr "tr: Duplicate this set and name it"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1720
+#: ContentGenerator/Instructor/UserList.pm:1785
+#: ContentGenerator/Instructor/UserList.pm:1818
+msgid "Edit"
+msgstr "tr: Edit"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:603
+msgid "Edit All Set Data"
+msgstr "tr: Edit All Set Data"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:439
+msgid "Edit Assigned Users"
+msgstr "tr: Edit Assigned Users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:438
+msgid "Edit Problems"
+msgstr "tr: Edit Problems"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:441
+msgid "Edit Set Data"
+msgstr "tr: Edit Set Data"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:961
+msgid "Edit Which Users?"
+msgstr "tr: Edit Which Users?"
+
+#
+#: ContentGenerator/Problem.pm:1011
+msgid "Edit this problem"
+msgstr "tr: Edit this problem"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:923
+msgid "Edit which sets?"
+msgstr "tr: Edit which sets?"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2067
+#: ContentGenerator/Instructor/UserList.pm:285
+#: ContentGenerator/Instructor/UserList.pm:813
+#: ContentGenerator/Instructor/UserList.pm:856
+#: ContentGenerator/Instructor/UserList.pm:899
+msgid "Email Address"
+msgstr "tr: Email Address"
+
+#
+#: ContentGenerator.pm:1526
+#: ContentGenerator.pm:1549
+#: ContentGenerator.pm:1572
+msgid "Email instructor"
+msgstr "E-mail del profesor"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1120
+msgid "Enable"
+msgstr "tr: Enable"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:604
+msgid "Enable Reduced Credit"
+msgstr "tr: Enable Reduced Credit"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1113
+msgid "Enable/Disable reduced scoring for selected sets"
+msgstr "tr: Enable/Disable reduced scoring for selected sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:815
+#: ContentGenerator/Instructor/UserList.pm:858
+#: ContentGenerator/Instructor/UserList.pm:901
+msgid "Enrollment Status"
+msgstr "tr: Enrollment Status"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1321
+msgid "Enter filename below"
+msgstr "tr: Enter filename below"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1502
+msgid "Enter filenames below"
+msgstr "tr: Enter filenames below"
+
+#
+#: ContentGenerator/Problem.pm:240
+msgid "Entered"
+msgstr "Enviado"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1671
+msgid "Export selected sets"
+msgstr "tr: Export selected sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1317
+msgid "Export to what kind of file?"
+msgstr "tr: Export to what kind of file?"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1604
+msgid "Export which sets?"
+msgstr "tr: Export which sets?"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1292
+msgid "Export which users?"
+msgstr "tr: Export which users?"
+
+#
+#. ($@)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1435
+#, fuzzy
+msgid "Failed to create new set: %1"
+msgstr "tr: Failed to duplicate set: %1"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1374
+msgid "Failed to create new set: no set name specified!"
+msgstr "tr: Failed to create new set: no set name specified!"
+
+#
+#. ($@)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1848
+#, fuzzy
+msgid "Failed to duplicate set: %1"
+msgstr "tr: Failed to duplicate set: %1"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1832
+msgid "Failed to duplicate set: no set name specified!"
+msgstr "tr: Failed to duplicate set: no set name specified!"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1396
+#: ContentGenerator/Instructor/ProblemSetList.pm:1830
+msgid "Failed to duplicate set: no set selected for duplication!"
+msgstr "tr: Failed to duplicate set: no set selected for duplication!"
+
+#
+#. ($newSetID)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1834
+#, fuzzy
+msgid "Failed to duplicate set: set %1 already exists!"
+msgstr "tr: Failed to duplicate set: set %1 already exists!"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1339
+msgid "Filename"
+msgstr "tr: Filename"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:678
+msgid "Filter by what text?"
+msgstr "tr: Filter by what text?"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2065
+#: ContentGenerator/Instructor/UserList.pm:283
+#: ContentGenerator/Instructor/UserList.pm:811
+#: ContentGenerator/Instructor/UserList.pm:854
+#: ContentGenerator/Instructor/UserList.pm:897
+msgid "First Name"
+msgstr "tr: First Name"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1020
+msgid "Give new password to which users?"
+msgstr "tr: Give new password to which users?"
+
+#
+#: ContentGenerator/Login.pm:231
+msgid "Guest Login"
+msgstr "tr: Guest Login"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:443
+#: ContentGenerator/Instructor/ProblemSetList.pm:829
+#: ContentGenerator/Instructor/ProblemSetList.pm:867
+msgid "Hardcopy Header"
+msgstr "tr: Hardcopy Header"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1017
+msgid "Hidden"
+msgstr "tr: Hidden"
+
+#
+#: ContentGenerator.pm:667
+#: ContentGenerator/ProblemSet.pm:110
+#: ContentGenerator/ProblemSets.pm:226
+msgid "Homework Sets"
+msgstr "Tareas"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:558
+msgid "If a password field is left blank, the student's current password will be maintained."
+msgstr "tr: If a password field is left blank, the student's current password will be maintained."
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1498
+msgid "Import from where?"
+msgstr "tr: Import from where?"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1473
+msgid "Import how many sets?"
+msgstr "tr: Import how many sets?"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1520
+msgid "Import sets with names"
+msgstr "tr: Import sets with names"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1165
+msgid "Import users from what file?"
+msgstr "tr: Import users from what file?"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1927
+msgid "Inactive"
+msgstr "tr: Inactive"
+
+#
+#: Authen.pm:148
+msgid "Invalid user ID or password."
+msgstr "Usuario o contraseña inválidos."
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2066
+#: ContentGenerator/Instructor/UserList.pm:284
+#: ContentGenerator/Instructor/UserList.pm:812
+#: ContentGenerator/Instructor/UserList.pm:855
+#: ContentGenerator/Instructor/UserList.pm:898
+msgid "Last Name"
+msgstr "tr: Last Name"
+
+#
+#: ContentGenerator.pm:730
+msgid "Library Browser"
+msgstr "Explorador de bibliotecas"
+
+#
+#: ContentGenerator.pm:731
+#, fuzzy
+msgid "Library Browser 2"
+msgstr "Explorador de bibliotecas"
+
+#
+#: ContentGenerator/Logout.pm:124
+#, fuzzy
+msgid "Log In Again"
+msgstr "Volver a iniciar sesión"
+
+#
+#: ContentGenerator.pm:845
+#: ContentGenerator.pm:847
+msgid "Log Out"
+msgstr "Salir"
+
+#
+#. ($userID)
+#: ContentGenerator.pm:845
+#: ContentGenerator.pm:847
+#, fuzzy
+msgid "Logged in as %1. "
+msgstr "Autentificado como: %1"
+
+#
+#: ContentGenerator/Login.pm:74
+#: ContentGenerator/Login.pm:77
+#, fuzzy
+msgid "Login Info"
+msgstr "tr: Login Name"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2062
+#: ContentGenerator/Instructor/UserList.pm:282
+#: ContentGenerator/Instructor/UserList.pm:810
+#: ContentGenerator/Instructor/UserList.pm:853
+#: ContentGenerator/Instructor/UserList.pm:896
+msgid "Login Name"
+msgstr "tr: Login Name"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2063
+#, fuzzy
+msgid "Login Status"
+msgstr "tr: Login Name"
+
+#
+#: ContentGenerator.pm:654
+msgid "Main Menu"
+msgstr "Ana Menü"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:705
+msgid "Match on what? (separate multiple IDs with commas)"
+msgstr "tr: Match on what? (separate multiple IDs with commas)"
+
+#
+#: ContentGenerator/Problem.pm:245
+msgid "Messages"
+msgstr "Mensajes"
+
+#
+#: ContentGenerator/ProblemSet.pm:349
+#: ContentGenerator/ProblemSets.pm:212
+#: ContentGenerator/ProblemSets.pm:213
+#, fuzzy
+msgid "Name"
+msgstr " ## edited - ozcanNombre"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1328
+msgid "Name the new set"
+msgstr "tr: Name the new set"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1937
+#: ContentGenerator/Instructor/UserList.pm:2077
+msgid "New Password"
+msgstr "tr: New Password"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1519
+msgid "New passwords saved"
+msgstr "tr: New passwords saved"
+
+#
+#: ContentGenerator/Problem.pm:864
+#: ContentGenerator/Problem.pm:866
+msgid "Next Problem"
+msgstr "Problema siguiente"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2625
+#: ContentGenerator/Instructor/ProblemSetList.pm:2626
+msgid "No"
+msgstr "tr: No"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1043
+#: ContentGenerator/Instructor/ProblemSetList.pm:1145
+msgid "No change made to any set"
+msgstr "tr: No change made to any set"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1217
+msgid "No sets selected for scoring"
+msgstr "tr: No sets selected for scoring"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:266
+#, fuzzy
+msgid "No sets selected for scoring."
+msgstr "tr: No sets selected for scoring"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2722
+msgid "No sets shown.  Choose one of the options above to list the sets in the course."
+msgstr "tr: No sets shown.  Choose one of the options above to list the sets in the course."
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2110
+#, fuzzy
+msgid ""
+"No students shown.  Choose one of the options above to \n"
+"\t              list the students in the course."
+msgstr "tr: No students shown.  Choose one of the options above to list the students in the course."
+
+#
+#: ContentGenerator.pm:851
+msgid "Not logged in."
+msgstr "No ha iniciado sesión"
+
+#
+#: ContentGenerator/Problem.pm:975
+msgid "Note"
+msgstr "tr: Note"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:444
+#: ContentGenerator/Instructor/ProblemSetList.pm:830
+#: ContentGenerator/Instructor/ProblemSetList.pm:868
+msgid "Open Date"
+msgstr "tr: Open Date"
+
+#
+#: ContentGenerator/Problem.pm:1307
+#, fuzzy
+msgid "PREVIEW ONLY -- ANSWERS NOT RECORDED"
+msgstr "SOLAMENTE PREVISUALIZACIÓN -- RESPUESTAS NO GUARDADAS"
+
+#
+#. (timestamp($self)
+#: ContentGenerator.pm:953
+#, fuzzy
+msgid "Page generated at %1"
+msgstr "tr: Page generated at %1"
+
+#
+#: ContentGenerator/Login.pm:202
+#, fuzzy
+msgid "Password"
+msgstr "tr: New Password"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2073
+#: ContentGenerator/Instructor/UserList.pm:291
+#: ContentGenerator/Instructor/UserList.pm:819
+#: ContentGenerator/Instructor/UserList.pm:862
+#: ContentGenerator/Instructor/UserList.pm:905
+msgid "Permission Level"
+msgstr "tr: Permission Level"
+
+#
+#. (CGI::b($r->maketext($course)
+#: ContentGenerator/Login.pm:154
+#, fuzzy
+msgid "Please enter your username and password for %1 below:"
+msgstr "Lütfen %1 dersi için kullanici adi ve sifrenizi giriniz:"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:396
+msgid "Please select action to be performed."
+msgstr "tr: Please select action to be performed."
+
+#
+#: ContentGenerator/Problem.pm:1116
+#, fuzzy
+msgid "Preview Answers"
+msgstr "Previsualizar respuestas"
+
+#
+#: ContentGenerator/Problem.pm:850
+#: ContentGenerator/Problem.pm:852
+msgid "Previous Problem"
+msgstr "Problema anterior"
+
+#
+#. ($problemID)
+#: ContentGenerator.pm:686
+#: ContentGenerator/Problem.pm:808
+#: ContentGenerator/ProblemSet.pm:424
+#, fuzzy
+msgid "Problem %1"
+msgstr "tr: Problem"
+
+#
+#: ContentGenerator/Problem.pm:856
+#: ContentGenerator/Problem.pm:858
+msgid "Problem List"
+msgstr "Lista de problemas"
+
+#
+#: ContentGenerator/Problem.pm:796
+#: ContentGenerator/ProblemSet.pm:346
+msgid "Problems"
+msgstr "Problemas"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2071
+#: ContentGenerator/Instructor/UserList.pm:289
+#: ContentGenerator/Instructor/UserList.pm:817
+#: ContentGenerator/Instructor/UserList.pm:860
+#: ContentGenerator/Instructor/UserList.pm:903
+msgid "Recitation"
+msgstr "tr: Recitation"
+
+#
+#. ($verb)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1148
+#, fuzzy
+msgid "Reduced Credit %1 for all sets"
+msgstr "tr: Reduced Credit %1 for all sets"
+
+#
+#. ($verb)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1154
+#, fuzzy
+msgid "Reduced Credit %1 for selected sets"
+msgstr "tr: Reduced Credit %1 for selected sets"
+
+#
+#. ($verb)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1151
+#, fuzzy
+msgid "Reduced Credit %1 for visable sets"
+msgstr "tr: Reduced Credit %1 for visable sets"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2523
+msgid "Reduced Credit Disabled"
+msgstr "tr: Reduced Credit Disabled"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2523
+#: ContentGenerator/Instructor/ProblemSetList.pm:448
+msgid "Reduced Credit Enabled"
+msgstr "tr: Reduced Credit Enabled"
+
+#
+#. ($beginReducedScoringPeriod)
+#: ContentGenerator/ProblemSets.pm:459
+#, fuzzy
+msgid "Reduced Credit Starts: %1"
+msgstr "tr: Reduced Credit Starts: %1"
+
+#
+#: ContentGenerator/ProblemSet.pm:351
+#, fuzzy
+msgid "Remaining"
+msgstr "Quedan"
+
+#
+#: ContentGenerator/Login.pm:204
+msgid "Remember Me"
+msgstr "tr: Remember Me"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1190
+msgid "Replace which users?"
+msgstr "tr: Replace which users?"
+
+#
+#: ContentGenerator.pm:799
+msgid "Report bugs"
+msgstr "Reportar problemas (bugs)"
+
+#
+#: ContentGenerator/Problem.pm:244
+msgid "Result"
+msgstr "Resultado"
+
+#
+#. (CGI::i($self->$actionHandler(\%genericParams, \%actionParams, \%tableParams)
+#: ContentGenerator/Instructor/UserList.pm:376
+#, fuzzy
+msgid "Result of last action performed: %1"
+msgstr "tr: Result of last action performed: %1"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:386
+msgid "Results of last action performed"
+msgstr "tr: Results of last action performed"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1732
+#: ContentGenerator/Instructor/UserList.pm:1415
+#: ContentGenerator/Instructor/UserList.pm:1487
+msgid "Save changes"
+msgstr "tr: Save changes"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1186
+msgid "Score which sets?"
+msgstr "tr: Score which sets?"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2070
+#: ContentGenerator/Instructor/UserList.pm:288
+#: ContentGenerator/Instructor/UserList.pm:816
+#: ContentGenerator/Instructor/UserList.pm:859
+#: ContentGenerator/Instructor/UserList.pm:902
+msgid "Section"
+msgstr "tr: Section"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:582
+msgid "Select all sets"
+msgstr "tr: Select all sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:535
+msgid "Select all users"
+msgstr "tr: Select all users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:534
+#: ContentGenerator/Instructor/UserList.pm:512
+msgid "Select an action to perform"
+msgstr "tr: Select an action to perform"
+
+#
+#. ($newSetID)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1375
+#, fuzzy
+msgid "Set %1 exists.  No set created"
+msgstr "tr: Set %1 exists.  No set created"
+
+#: ContentGenerator/Instructor/ProblemSetList.pm:440
+msgid "Set Definition Filename"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:442
+#: ContentGenerator/Instructor/ProblemSetList.pm:828
+#: ContentGenerator/Instructor/ProblemSetList.pm:866
+msgid "Set Header"
+msgstr "tr: Set Header"
+
+#
+#: ContentGenerator/ProblemSet.pm:273
+#: ContentGenerator/ProblemSet.pm:275
+msgid "Set Info"
+msgstr "tr: Set Info"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2700
+msgid "Set List"
+msgstr "tr: Set List"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:827
+#: ContentGenerator/Instructor/ProblemSetList.pm:865
+msgid "Set Name"
+msgstr "tr: Set Name"
+
+#
+#: ContentGenerator/ProblemSet.pm:153
+msgid "Sets"
+msgstr "tr: Sets"
+
+#
+#: ContentGenerator/Problem.pm:1063
+#, fuzzy
+msgid "Show Hints"
+msgstr "Mostrar ayuda"
+
+#
+#: ContentGenerator/Problem.pm:1370
+#, fuzzy
+msgid "Show Past Answers"
+msgstr "Mostrar la respuesta anterior"
+
+#
+#: ContentGenerator/Problem.pm:1082
+#, fuzzy
+msgid "Show Solutions"
+msgstr "Mostrar soluciones"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:645
+msgid "Show Which Users?"
+msgstr "tr: Show Which Users?"
+
+#
+#: ContentGenerator/Problem.pm:1044
+#, fuzzy
+msgid "Show correct answers"
+msgstr "Mostrar las respuestas correctas"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:683
+msgid "Show which sets?"
+msgstr "tr: Show which sets?"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:497
+#: ContentGenerator/Instructor/UserList.pm:475
+msgid "Show/Hide Site Description"
+msgstr "tr: Show/Hide Site Description"
+
+#
+#. (scalar @visibleSetIDs, scalar @allSetIDs)
+#: ContentGenerator/Instructor/ProblemSetList.pm:607
+#, fuzzy
+msgid "Showing %1 out of %2 sets."
+msgstr "tr: Showing %1 out of %2 sets."
+
+#
+#. (scalar @Users, scalar @allUserIDs)
+#: ContentGenerator/Instructor/UserList.pm:556
+#, fuzzy
+msgid "Showing %1 out of %2 users"
+msgstr "tr: Showing %1 out of %2 users"
+
+#
+#: ContentGenerator/Login.pm:96
+#: ContentGenerator/Login.pm:99
+#, fuzzy
+msgid "Site Information"
+msgstr "tr: Options Information"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:821
+#: ContentGenerator/Instructor/UserList.pm:804
+msgid "Sort by"
+msgstr "tr: Sort by"
+
+#
+#. ($names{$primary}, $names{$secondary})
+#: ContentGenerator/Instructor/ProblemSetList.pm:899
+#, fuzzy
+msgid "Sort by %1 and then by %2"
+msgstr "tr: Sort by %1 and then by %2"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2069
+#: ContentGenerator/Instructor/UserList.pm:287
+#: ContentGenerator/ProblemSet.pm:353
+#: ContentGenerator/ProblemSets.pm:215
+#: ContentGenerator/ProblemSets.pm:216
+#, fuzzy
+msgid "Status"
+msgstr "Estatus"
+
+#
+#: ContentGenerator.pm:848
+msgid "Stop Acting"
+msgstr "Volver al usuario original"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2068
+#: ContentGenerator/Instructor/UserList.pm:286
+#: ContentGenerator/Instructor/UserList.pm:814
+#: ContentGenerator/Instructor/UserList.pm:857
+#: ContentGenerator/Instructor/UserList.pm:900
+msgid "Student ID"
+msgstr "tr: Student ID"
+
+#
+#: ContentGenerator/Problem.pm:1127
+#, fuzzy
+msgid "Submit Answers"
+msgstr "Enviar respuestas"
+
+#
+#. ($effectiveUser)
+#: ContentGenerator/Problem.pm:1124
+#, fuzzy
+msgid "Submit Answers for %1"
+msgstr "Enviar respuestas por %1"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1850
+msgid "Success"
+msgstr "tr: Success"
+
+#. ($newSetID)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1437
+msgid "Successfully created new set %1"
+msgstr ""
+
+#
+#. ($name)
+#: ContentGenerator/ProblemSets.pm:424
+#: ContentGenerator/ProblemSets.pm:433
+#: ContentGenerator/ProblemSets.pm:439
+#, fuzzy
+msgid "Take %1 test"
+msgstr "tr: Take %1 test"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:598
+#: ContentGenerator/Instructor/UserList.pm:551
+msgid "Take Action!"
+msgstr "tr: Take Action!"
+
+#
+#: ContentGenerator/ProblemSets.pm:236
+msgid "Test Date"
+msgstr "tr: Test Date"
+
+#
+#: ContentGenerator/ProblemSets.pm:235
+msgid "Test Score"
+msgstr "tr: Test Score"
+
+#
+#: ContentGenerator.pm:954
+msgid "The WeBWorK Project"
+msgstr "tr: The WeBWorK Project"
+
+#
+#. ($fully)
+#: ContentGenerator/Problem.pm:307
+#, fuzzy
+msgid "The answer above is NOT %1correct."
+msgstr "La respuesta arriba no es %1 correcta"
+
+#
+#: ContentGenerator/Problem.pm:305
+#, fuzzy
+msgid "The answer above is correct."
+msgstr "La respuesta arriba es correcta"
+
+#
+#. (CGI::b($r->maketext("[_1]'s Current Password",$user_name)
+#: ContentGenerator/Options.pm:107
+#, fuzzy
+msgid ""
+"The password you entered in the %1 \n"
+"\t\t\t\t\t\tfield does not match your current\n"
+"\t\t\t\t\t\tpassword. Please retype your current password and try\n"
+"\t\t\t\t\t\tagain."
+msgstr "La contraseña introducida en el campo %1 no corresponde a su contraseña actual. \tPor favor reescriba su contraseña actual e intente de nuevo."
+
+#
+#. (CGI::b($r->maketext("[_1]'s New Password",$e_user_name)
+#: ContentGenerator/Options.pm:91
+#, fuzzy
+msgid ""
+"The passwords you entered in the \n"
+"\t\t\t\t\t\t\t\t%1 and %2\n"
+"\t\t\t\t\t\t\t\tfields don't match. Please retype your new password and try\n"
+"\t\t\t\t\t\t\t\tagain."
+msgstr "La contraseña introducida en %1 y el campo %2 no coinciden. Por favor introduzca nuevamente su contraseña. "
+
+#
+#. ($setName,$effectiveUser)
+#: ContentGenerator/ProblemSet.pm:308
+#, fuzzy
+msgid "The selected problem set (%1) is not a valid set for %2"
+msgstr "tr: The selected problem set (%1) is not a valid set for %2"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:859
+#: ContentGenerator/Instructor/UserList.pm:847
+#: ContentGenerator/Instructor/UserList.pm:890
+msgid "Then by"
+msgstr "tr: Then by"
+
+#
+#: ContentGenerator/ProblemSet.pm:365
+#, fuzzy
+msgid "This homework set contains no problems."
+msgstr "Esta tarea no contiene problemas."
+
+#
+#: ContentGenerator/Problem.pm:1175
+#, fuzzy
+msgid "This homework set is closed."
+msgstr "Esta tarea está cerrada"
+
+#
+#: ContentGenerator/Problem.pm:1173
+#, fuzzy
+msgid "This homework set is not yet open."
+msgstr "Esta tarea aun no está abierta."
+
+#
+#: ContentGenerator/Problem.pm:611
+#, fuzzy
+msgid "This problem will not count towards your grade."
+msgstr "Este problema no cuenta para la evaluación."
+
+#
+#. (CGI::font({class=>$visiblityStateClass}, $visiblityStateText)
+#: ContentGenerator/Problem.pm:605
+#: ContentGenerator/ProblemSet.pm:88
+#, fuzzy
+msgid "This set is %1"
+msgstr "tr: This set is %1"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:588
+msgid "Unselect all sets"
+msgstr "tr: Unselect all sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:541
+msgid "Unselect all users"
+msgstr "tr: Unselect all users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2683
+msgid "Use System Default"
+msgstr "tr: Use System Default"
+
+#
+#: ContentGenerator/Login.pm:200
+#, fuzzy
+msgid "Username"
+msgstr "tr: Filename"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2087
+msgid "Users List"
+msgstr "tr: Users List"
+
+#
+#. ($names{$primary}, $names{$secondary}, $names{$ternary})
+#: ContentGenerator/Instructor/UserList.pm:938
+#, fuzzy
+msgid "Users sorted by %1, then by %2, then by %3"
+msgstr "tr: Users sorted by %1, then by %2, then by %3"
+
+#
+#: ContentGenerator/ProblemSet.pm:230
+msgid "Viewing temporary file"
+msgstr "tr: Viewing temporary file"
+
+#
+#: ContentGenerator/Problem.pm:1332
+#: ContentGenerator/ProblemSets.pm:63
+msgid "Viewing temporary file: "
+msgstr "Viendo archivo temporal"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:833
+#: ContentGenerator/Instructor/ProblemSetList.pm:871
+msgid "Visibility"
+msgstr "tr: Visibility"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1018
+#: ContentGenerator/Instructor/ProblemSetList.pm:447
+msgid "Visible"
+msgstr "tr: Visible"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1259
+#: ContentGenerator/Instructor/UserList.pm:1078
+msgid "Warning: Deletion destroys all user-related data and is not undoable!"
+msgstr "tr: Warning: Deletion destroys all user-related data and is not undoable!"
+
+#
+#: ContentGenerator/Home.pm:87
+msgid "Welcome to WeBWorK!"
+msgstr "Bienvenido a WeBWork!"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:665
+msgid "What field should filtered users match on?"
+msgstr "tr: What field should filtered users match on?"
+
+#
+#: ContentGenerator/ProblemSet.pm:352
+#, fuzzy
+msgid "Worth"
+msgstr "Valor"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2625
+#: ContentGenerator/Instructor/ProblemSetList.pm:2626
+msgid "Yes"
+msgstr "tr: Yes"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:306
+#: ContentGenerator/Instructor/ProblemSetList.pm:418
+#: ContentGenerator/Instructor/UserList.pm:262
+msgid "You are not authorized to access the instructor tools."
+msgstr "tr: You are not authorized to access the instructor tools."
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:339
+msgid "You are not authorized to modify homework sets."
+msgstr "tr: You are not authorized to modify homework sets."
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:344
+msgid "You are not authorized to modify set definition files."
+msgstr "tr: You are not authorized to modify set definition files."
+
+#
+#: ContentGenerator/Instructor/UserList.pm:329
+#: ContentGenerator/Instructor/UserList.pm:335
+#, fuzzy
+msgid "You are not authorized to modify student data"
+msgstr "tr: You are not authorized to modify student data."
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:389
+#: ContentGenerator/Instructor/UserList.pm:380
+msgid "You are not authorized to perform this action."
+msgstr "tr: You are not authorized to perform this action."
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1121
+msgid "You cannot delete yourself!"
+msgstr "tr: You cannot delete yourself!"
+
+#
+#: ContentGenerator/Options.pm:163
+#: ContentGenerator/Options.pm:180
+msgid "You do not have permission to change email addresses."
+msgstr "Usted no tiene permiso para cambiar su dirección de correo."
+
+#
+#: ContentGenerator/Options.pm:117
+#: ContentGenerator/Options.pm:139
+msgid "You do not have permission to change your password."
+msgstr "Usted no tiene permiso para cambar su contraseña."
+
+#
+#. ($attemptsLeft,$attemptsLeftNoun)
+#: ContentGenerator/Problem.pm:1196
+#, fuzzy
+msgid "You have %1 %2 remaining."
+msgstr " Te quedan %1 %2 intentos"
+
+#
+#. ($attemptsLeft)
+#: ContentGenerator/Problem.pm:1197
+#, fuzzy
+msgid "You have %negquant(%1,unlimited attempts,attempt,attempts) remaining."
+msgstr "Te quedan [negquant,_1,unlimited attempts,attempt,attempts]."
+
+#
+#. ($attempts)
+#: ContentGenerator/Problem.pm:1191
+#, fuzzy
+msgid "You have attempted this problem %quant(%1,time,times)."
+msgstr "Tu has intentado este problema [quant,_1,vez,veces]."
+
+#
+#: ContentGenerator/Logout.pm:119
+msgid "You have been logged out of WeBWorK."
+msgstr "Has salido de WeBWork"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1933
+msgid "You may not change your own password here!"
+msgstr "tr: You may not change your own password here!"
+
+#
+#: Authen.pm:317
+msgid "You must specify a user ID."
+msgstr "Debe especificar un ID de usuario."
+
+#
+#. (sprintf("%.0f%%", $pg->{result}->{score} * 100)
+#: ContentGenerator/Problem.pm:1192
+#, fuzzy
+msgid "You received a score of %1 for this attempt."
+msgstr "Tu has recibido una evaluación de %1 por este intento."
+
+#
+#: ContentGenerator/Options.pm:157
+msgid "Your email address has been changed."
+msgstr "Su dirección de correo ha sido cambiada."
+
+#
+#. ($lastScore,$notCountedMessage)
+#: ContentGenerator/Problem.pm:1194
+#, fuzzy
+msgid "Your overall recorded score is %1.  %2"
+msgstr "Tu calificación total es de %1.  %2."
+
+#
+#: Authen.pm:416
+msgid "Your session has timed out due to inactivity. Please log in again."
+msgstr "Tu sesión ha terminado debido a inactividad. Por favor reinicia sesión."
+
+#
+#: ContentGenerator/ProblemSet.pm:273
+#: ContentGenerator/ProblemSets.pm:71
+#, fuzzy
+msgid "[edit]"
+msgstr "~[editar~]"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:476
+msgid "_CLASSLIST_EDITOR_DESCRIPTION"
+msgstr "tr: This is the classlist editor page, where you can view and edit the records of all the students currently enrolled in this course.  The top of the page contains forms which allow you to filter which students to view, sort your students in a chosen order, edit student records, give new passwords to students, import/export student records from/to external files, or add/delete students.  To use, please select the action you would like to perform, enter in the relevant information in the fields below, and hit the \"Take Action!\" button at the bottom of the form.  The bottom of the page contains a table containing the student usernames and their information."
+
+#
+#. (CGI::strong($r->maketext($course)
+#: ContentGenerator/Login.pm:151
+msgid "_EXTERNAL_AUTH_MESSAGE"
+msgstr "%1 uses an external authentication system.  You've authenticated through that system, but aren't allowed to log in to this course."
+
+#
+#. (CGI::b($r->maketext("Guest Login")
+#: ContentGenerator/Login.pm:230
+msgid "_GUEST_LOGIN_MESSAGE"
+msgstr "tr: This course supports guest logins. Click %1 to log into this course as a guest."
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:498
+msgid "_HMWKSETS_EDITOR_DESCRIPTION"
+msgstr "tr: This is the homework sets editor page where you can view and edit the homework sets that exist in this course and the problems that they contain. The top of the page contains forms which allow you to filter which sets to display in the table, sort the sets in a chosen order, edit homework sets, publish homework sets, import/export sets from/to an external file, score sets, or create/delete sets.  To use, please select the action you would like to perform, enter in the relevant information in the fields below, and hit the \"Take Action!\" button at the bottom of the form.  The bottom of the page contains a table displaying the sets and several pieces of relevant information."
+
+#
+#. (CGI::b($r->maketext("Remember Me")
+#: ContentGenerator/Login.pm:155
+msgid "_LOGIN_MESSAGE"
+msgstr "If you check %1 your login information will be remembered by the browser you are using, allowing you to visit WeBWorK pages without typing your user name and password (until your session expires). This feature is not safe for public workstations, untrusted machines, and machines over which you do not have direct control."
+
+#
+#. ($beginReducedScoringPeriod,$dueDate,$reducedScoringPerCent)
+#: ContentGenerator/ProblemSet.pm:333
+msgid "_REDUCED_CREDIT_MESSAGE_1"
+msgstr "tr: This assignment has a Reduced Credit Period that begins %1 and ends on the due date, %2.  During this period all additional work done counts %3% of the original."
+
+#
+#. ($beginReducedScoringPeriod,$dueDate,$reducedScoringPerCent)
+#: ContentGenerator/ProblemSet.pm:335
+msgid "_REDUCED_CREDIT_MESSAGE_2"
+msgstr "tr: This assignment had a Reduced Credit Period that began %1 and ended on the due date, %2.  During that period all additional work done counted %3% of the original."
+
+#
+#: ContentGenerator.pm:1951
+msgid "_REQUEST_ERROR"
+msgstr "WebWork ha detectado un error de software al intentar procesar este problema. Es probable que hay un error en el problema mismo. Si usted es un estudiante, el informe de este mensaje de error al profesor para que sea subsanado. Si usted es un profesor, por favor consulte la salida de error para obtener más información."
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1358
+msgid "a duplicate of the first selected set"
+msgstr "tr: a duplicate of the first selected set"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1357
+msgid "a new empty set"
+msgstr "tr: a new empty set"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1479
+msgid "a single set"
+msgstr "tr: a single set"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1091
+#: ContentGenerator/Instructor/ProblemSetList.pm:1193
+#: ContentGenerator/Instructor/ProblemSetList.pm:1610
+#: ContentGenerator/Instructor/ProblemSetList.pm:689
+#: ContentGenerator/Instructor/ProblemSetList.pm:929
+#: ContentGenerator/Instructor/ProblemSetList.pm:989
+msgid "all sets"
+msgstr "tr: all sets"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1551
+#: ContentGenerator/Instructor/UserList.pm:1026
+#: ContentGenerator/Instructor/UserList.pm:1298
+#: ContentGenerator/Instructor/UserList.pm:651
+#: ContentGenerator/Instructor/UserList.pm:967
+msgid "all users"
+msgstr "tr: all users"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1196
+#: ContentGenerator/Instructor/UserList.pm:1226
+msgid "any users"
+msgstr "tr: any users"
+
+#
+#: ContentGenerator/Problem.pm:1165
+#, fuzzy
+msgid "attempt"
+msgstr "intento"
+
+#
+#: ContentGenerator/Problem.pm:1162
+#: ContentGenerator/Problem.pm:1165
+#, fuzzy
+msgid "attempts"
+msgstr "intentos"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1726
+msgid "changes abandoned"
+msgstr "tr: changes abandoned"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1790
+msgid "changes saved"
+msgstr "tr: changes saved"
+
+#
+#: ContentGenerator/ProblemSets.pm:468
+msgid "closed, answers available"
+msgstr "Cerrada, respuestas disponibles"
+
+#
+#. ($self->formatDateTime($set->answer_date)
+#: ContentGenerator/ProblemSets.pm:464
+#, fuzzy
+msgid "closed, answers on %1"
+msgstr "Cerrada, respuestas el %1"
+
+#
+#: ContentGenerator/ProblemSets.pm:466
+msgid "closed, answers recently available"
+msgstr "Cerrada, respuestas recientemente disponibles"
+
+#
+#: ContentGenerator/ProblemSets.pm:402
+#, fuzzy
+msgid "completed."
+msgstr "tr: completely"
+
+#
+#: ContentGenerator/Problem.pm:267
+msgid "completely"
+msgstr "tr: completely"
+
+#
+#: ContentGenerator/Problem.pm:264
+msgid "correct"
+msgstr "correcto"
+
+#
+#. ($num)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1310
+#, fuzzy
+msgid "deleted %1 sets"
+msgstr "tr: deleted %1 sets"
+
+#
+#. ($num)
+#: ContentGenerator/Instructor/UserList.pm:1135
+#, fuzzy
+msgid "deleted %1 users"
+msgstr "tr: deleted %1 users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:947
+msgid "editing all sets"
+msgstr "tr: editing all sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:985
+msgid "editing all users"
+msgstr "tr: editing all users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:953
+msgid "editing selected sets"
+msgstr "tr: editing selected sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:991
+msgid "editing selected users"
+msgstr "tr: editing selected users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:950
+msgid "editing visible sets"
+msgstr "tr: editing visible sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:988
+msgid "editing visible users"
+msgstr "tr: editing visible users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:694
+msgid "enter matching set IDs below"
+msgstr "tr: enter matching set IDs below"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1665
+msgid "export abandoned"
+msgstr "tr: export abandoned"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1629
+msgid "exporting all sets"
+msgstr "tr: exporting all sets"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1636
+msgid "exporting selected sets"
+msgstr "tr: exporting selected sets"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1633
+msgid "exporting visible sets"
+msgstr "tr: exporting visible sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1044
+msgid "giving new passwords to all users"
+msgstr "tr: giving new passwords to all users"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1050
+msgid "giving new passwords to selected users"
+msgstr "tr: giving new passwords to selected users"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1047
+msgid "giving new passwords to visible users"
+msgstr "tr: giving new passwords to visible users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2522
+#: ContentGenerator/Problem.pm:603
+#, fuzzy
+msgid "hidden"
+msgstr "tr: Hidden"
+
+#
+#: ContentGenerator/Problem.pm:604
+#: ContentGenerator/ProblemSet.pm:86
+msgid "hidden from students"
+msgstr "tr: hidden from students"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:693
+msgid "hidden sets"
+msgstr "tr: hidden sets"
+
+#
+#: ContentGenerator/Problem.pm:266
+msgid "incorrect"
+msgstr "incorrecto"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1480
+msgid "multiple sets"
+msgstr "tr: multiple sets"
+
+#
+#: ContentGenerator/Problem.pm:864
+msgid "navNext"
+msgstr "images_es/navNext"
+
+#
+#: ContentGenerator/Problem.pm:866
+msgid "navNextGrey"
+msgstr "images_es/navNextGrey"
+
+#
+#: ContentGenerator/Problem.pm:850
+msgid "navPrev"
+msgstr "images_es/navPrev"
+
+#
+#: ContentGenerator/Problem.pm:852
+msgid "navPrevGrey"
+msgstr "images_es/navPrevGrey"
+
+#
+#: ContentGenerator/Problem.pm:856
+msgid "navProbList"
+msgstr "images_es/navProbList"
+
+#
+#: ContentGenerator/Problem.pm:858
+msgid "navProbListGrey"
+msgstr "images_es/navProbListGrey"
+
+#
+#: ContentGenerator/ProblemSet.pm:110
+msgid "navUp"
+msgstr "images_es/navUp"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1090
+#: ContentGenerator/Instructor/ProblemSetList.pm:1192
+#: ContentGenerator/Instructor/ProblemSetList.pm:1269
+#: ContentGenerator/Instructor/ProblemSetList.pm:690
+#: ContentGenerator/Instructor/ProblemSetList.pm:988
+msgid "no sets"
+msgstr "tr: no sets"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1552
+#: ContentGenerator/Instructor/UserList.pm:1088
+#: ContentGenerator/Instructor/UserList.pm:1199
+#: ContentGenerator/Instructor/UserList.pm:1227
+#: ContentGenerator/Instructor/UserList.pm:652
+msgid "no users"
+msgstr "tr: no users"
+
+#
+#: ContentGenerator/ProblemSets.pm:430
+#: ContentGenerator/ProblemSets.pm:452
+msgid "now open, due "
+msgstr "Abierta, se entrega"
+
+#
+#. ($self->formatDateTime($set->due_date()
+#: ContentGenerator/ProblemSets.pm:408
+#, fuzzy
+msgid "open: complete by %1"
+msgstr "Abierta: completa por %1"
+
+#
+#: ContentGenerator/ProblemSets.pm:405
+msgid "over time: closed."
+msgstr "Tiempo terminado: cerrada."
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1093
+#: ContentGenerator/Instructor/ProblemSetList.pm:1194
+#: ContentGenerator/Instructor/ProblemSetList.pm:1271
+#: ContentGenerator/Instructor/ProblemSetList.pm:1612
+#: ContentGenerator/Instructor/ProblemSetList.pm:691
+#: ContentGenerator/Instructor/ProblemSetList.pm:931
+#: ContentGenerator/Instructor/ProblemSetList.pm:991
+msgid "selected sets"
+msgstr "tr: selected sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1028
+#: ContentGenerator/Instructor/UserList.pm:1090
+#: ContentGenerator/Instructor/UserList.pm:1198
+#: ContentGenerator/Instructor/UserList.pm:1300
+#: ContentGenerator/Instructor/UserList.pm:653
+#: ContentGenerator/Instructor/UserList.pm:969
+msgid "selected users"
+msgstr "tr: selected users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:762
+msgid "showing all sets"
+msgstr "tr: showing all sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:738
+msgid "showing all users"
+msgstr "tr: showing all users"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:747
+msgid "showing matching users"
+msgstr "tr: showing matching users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:765
+msgid "showing no sets"
+msgstr "tr: showing no sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:741
+msgid "showing no users"
+msgstr "tr: showing no users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:768
+msgid "showing selected sets"
+msgstr "tr: showing selected sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:744
+msgid "showing selected users"
+msgstr "tr: showing selected users"
+
+#
+#: ContentGenerator/Problem.pm:1124
+#, fuzzy
+msgid "submitAnswers"
+msgstr "Enviar respuestas"
+
+#
+#: ContentGenerator/Problem.pm:1154
+#, fuzzy
+msgid "time"
+msgstr "tiempo"
+
+#
+#: ContentGenerator/Problem.pm:1154
+#, fuzzy
+msgid "times"
+msgstr "tiempos"
+
+#
+#: ContentGenerator/Problem.pm:1161
+#: ContentGenerator/ProblemSet.pm:427
+#, fuzzy
+msgid "unlimited"
+msgstr "ilimitado"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:654
+msgid "users who match on selected field"
+msgstr "tr: users who match on selected field"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2522
+#: ContentGenerator/Problem.pm:603
+#, fuzzy
+msgid "visible"
+msgstr "tr: Visible"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1611
+#: ContentGenerator/Instructor/ProblemSetList.pm:692
+#: ContentGenerator/Instructor/ProblemSetList.pm:930
+msgid "visible sets"
+msgstr "tr: visible sets"
+
+#
+#: ContentGenerator/Problem.pm:604
+#: ContentGenerator/ProblemSet.pm:86
+msgid "visible to students"
+msgstr "tr: visible to students"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1027
+#: ContentGenerator/Instructor/UserList.pm:1197
+#: ContentGenerator/Instructor/UserList.pm:1299
+#: ContentGenerator/Instructor/UserList.pm:968
+msgid "visible users"
+msgstr "tr: visible users"
+
+#
+#. ($self->formatDateTime($set->open_date)
+#: ContentGenerator/ProblemSets.pm:420
+#: ContentGenerator/ProblemSets.pm:448
+#, fuzzy
+msgid "will open on %1"
+msgstr "Abrirá el %1"
+
+#
+msgid "Add to which set?"
+msgstr "tr: Add to which set?"
+
+#
+msgid "Course Information for course [_1]"
+msgstr "tr: Course Information for course %1"
+
+#
+msgid "report bugs in this problem"
+msgstr "tr: report bugs in this problem"
+
+#
+msgid "Problem [_1]"
+msgstr "Problema %1"
+
+#
+msgid "Cancel Password"
+msgstr "tr: Cancel Password"
+
+#
+msgid "WeBWorK"
+msgstr "WeBWorK"
+
+#
+msgid "Audit"
+msgstr "tr: Enrolled"
+
+#
+msgid "Hardcopy Header for set [_1]"
+msgstr "tr: Hardcopy Header for set %1"
+
+#
+msgid "Report bugs in a WeBWorK question/problem using this link. The very first time you do this you will need to register with an email address so that information on the bug fix can be reported back to you."
+msgstr "tr: Report bugs in a WeBWorK question/problem using this link. The very first time you do this you will need to register with an email address so that information on the bug fix can be reported back to you."
+
+#
+msgid "Pad Fields"
+msgstr "tr: Pad Fields"
+
+#
+msgid "Set Header for set [_1]"
+msgstr "tr: Set Header for set %1"
+
+#
+#, fuzzy
+msgid "Statistics for [_1]"
+msgstr "Estadísticas"
+
+#
+msgid "Filter"
+msgstr "tr: Filter"
+
+#
+msgid "set [_1]/problem [_2]"
+msgstr "tr: set %1/problem %2"
+
+#
+msgid "You are not authorized to modify problems."
+msgstr "tr: You are not authorized to modify problems."
+
+#
+msgid "hardcopy header file"
+msgstr "tr: hardcopy header file"
+
+#
+msgid "Write permissions have not been enabled in the templates directory.  No changes can be made."
+msgstr "tr: Write permissions have not been enabled in the templates directory.  No changes can be made."
+
+#
+msgid "Save [_1] and View"
+msgstr "tr: Save %1 and View"
+
+#
+msgid "Create"
+msgstr "tr: Create"
+
+#
+msgid "Changes in this file have not yet been permanently saved."
+msgstr "tr: Changes in this file have not yet been permanently saved."
+
+#
+msgid "Instructor Tools"
+msgstr "Herramientas del instructor"
+
+#
+msgid "Score"
+msgstr "Calificación"
+
+#
+msgid "Show in another window"
+msgstr "tr: Show in another window"
+
+#
+msgid "Copied auxiliary files from [_1] to  new location at [_2]"
+msgstr "tr: Copied auxiliary files from %1 to  new location at %2"
+
+#
+#, fuzzy
+msgid "Unpublished"
+msgstr "No publicado"
+
+#
+#, fuzzy
+msgid "Login"
+msgstr "tr: Login Name"
+
+#
+msgid "Email"
+msgstr "E-mail"
+
+#
+msgid "File Manager"
+msgstr "Administrador de archivos"
+
+#
+msgid "Unable to change the hardcopy header for set [_1]. Unknown error."
+msgstr "tr: Unable to change the hardcopy header for set %1. Unknown error."
+
+#
+msgid "Unable to make '[_1]' the set header for [_2]"
+msgstr "tr: Unable to make '%1' the set header for %2"
+
+#
+msgid "Can't determine user of temporary edit file [_1]."
+msgstr "tr: Can't determine user of temporary edit file %1."
+
+#
+#, fuzzy
+msgid "Download a hardcopy of this homework set."
+msgstr "Obtén una copia escrita de esta tarea."
+
+#
+msgid "Problem Editor"
+msgstr "Editor de problemas"
+
+#
+msgid "The file '[_1]' is protected!"
+msgstr "tr: The file '%1' is protected!"
+
+#
+msgid "Top level of author information on the wiki."
+msgstr "tr: Top level of author information on the wiki."
+
+#
+msgid "Score selected set(s) and save to:"
+msgstr "tr: Score selected set(s) and save to:"
+
+#
+msgid "Save Password"
+msgstr "tr: Save Password"
+
+#
+msgid "The file '[_1]' is a blank problem!"
+msgstr "tr: The file '%1' is a blank problem!"
+
+#
+msgid "Add as what filetype?"
+msgstr "tr: Add as what filetype?"
+
+#
+msgid "no action"
+msgstr "tr: no action"
+
+#
+msgid "Added '[_1]' to [_2] as new set header"
+msgstr "tr: Added '%1' to %2 as new set header"
+
+#
+msgid "View statistics by set"
+msgstr "tr: View statistics by set"
+
+#
+msgid "Set"
+msgstr "Tarea"
+
+#
+msgid "This is a blank problem template file and can not be edited directly. Use the 'Save as' action below to create a local copy of the file and add it to the current problem set."
+msgstr "tr: This is a blank problem template file and can not be edited directly. Use the 'Save as' action below to create a local copy of the file and add it to the current problem set."
+
+#
+msgid "Logout"
+msgstr "Salir"
+
+#
+#, fuzzy
+msgid "You do not have permission to view the details of this error."
+msgstr "Usted no tiene permiso para ver los detalles de este error."
+
+#
+msgid "Reverting to original file '[_1]'"
+msgstr "tr: Reverting to original file '%1'"
+
+#
+msgid "Delete"
+msgstr "tr: Delete"
+
+#
+msgid "Wiki summary page for MathObjects"
+msgstr "tr: Wiki summary page for MathObjects"
+
+#
+#, fuzzy
+msgid "Your score was recorded."
+msgstr "Tu evaluación ha sido registrada."
+
+#
+msgid "You must specify an file name in order to save a new file."
+msgstr "tr: You must specify an file name in order to save a new file."
+
+#
+msgid "To edit this text you must first make a copy of this file using the 'Save as' action below."
+msgstr "tr: To edit this text you must first make a copy of this file using the 'Save as' action below."
+
+#
+msgid "unassigned problem file"
+msgstr "tr: unassigned problem file"
+
+#
+msgid "View statistics by student"
+msgstr "tr: View statistics by student"
+
+#
+msgid "Publish"
+msgstr "tr: Publish"
+
+#
+msgid "Password/Email"
+msgstr "Contraseña/Email"
+
+#
+msgid "Cancel Edit"
+msgstr "tr: Cancel Edit"
+
+#
+msgid "Math Objects"
+msgstr "tr: Math Objects"
+
+#
+msgid "Snippets of PG code illustrating specific techniques"
+msgstr "tr: Snippets of PG code illustrating specific techniques"
+
+#
+msgid "Error copying [_1] to [_2]"
+msgstr "tr: Error copying %1 to %2"
+
+#
+msgid "Hmwk Sets Editor"
+msgstr "Editor de tareas"
+
+#
+#, fuzzy
+msgid "This set is [_1] students."
+msgstr "Este conjunto es de %1 estudiantes"
+
+#
+msgid "header file"
+msgstr "tr: header file"
+
+#
+msgid "Include Index"
+msgstr "tr: Include Index"
+
+#
+msgid "Display Mode"
+msgstr "tr: Display Mode"
+
+#
+msgid "You can earn partial credit on this problem."
+msgstr "En este problema puedes obtener crédito parcial."
+
+#
+msgid "Write permissions have not been enabled in '[_1]'.  Changes must be saved to a different directory for viewing."
+msgstr "tr: Write permissions have not been enabled in '%1'.  Changes must be saved to a different directory for viewing."
+
+#
+msgid "blank problem"
+msgstr "tr: blank problem"
+
+#
+msgid "Save Edit"
+msgstr "tr: Save Edit"
+
+#
+msgid "Enrolled"
+msgstr "tr: Enrolled"
+
+#
+msgid "Write permissions have not been enabled for '[_1]'.  Changes must be saved to another file for viewing."
+msgstr "tr: Write permissions have not been enabled for '%1'.  Changes must be saved to another file for viewing."
+
+#
+msgid "Note: this problem viewer is for viewing purposes only. As of right now, testing functionality is not possible."
+msgstr "tr: Note: this problem viewer is for viewing purposes only. As of right now, testing functionality is not possible."
+
+#
+msgid "Save Export"
+msgstr "tr: Save Export"
+
+#
+msgid "webwork"
+msgstr "webwork"
+
+#
+msgid "Problem Viewer"
+msgstr "tr: Problem Viewer"
+
+#
+#, fuzzy
+msgid "submit button clicked"
+msgstr "Botón enviar pulsado."
+
+#
+#, fuzzy
+msgid "Student Progress for [_1]"
+msgstr "Enviar respuestas por %1"
+
+#
+msgid "A new file has been created at '[_1]' with the contents below. No changes have been made to set [_2]."
+msgstr "tr: A new file has been created at '%1' with the contents below. No changes have been made to set %2."
+
+#
+#, fuzzy
+msgid "Your score was not recorded because this problem has not been assigned to you."
+msgstr "Tu calificación no fue registrada porque este problema no te fue asignado."
+
+#
+msgid "Sort"
+msgstr "tr: Sort"
+
+#
+msgid "Add problem"
+msgstr "tr: Add problem"
+
+#
+msgid "Author Info"
+msgstr "tr: Author Info"
+
+#
+msgid "Replace [_1]"
+msgstr "tr: Replace %1"
+
+#
+msgid "Help"
+msgstr "tr: Help"
+
+#
+msgid "Add Users"
+msgstr "Agregar usuarios"
+
+#
+msgid "Problem Source Code"
+msgstr "tr: Problem Source Code"
+
+#
+msgid "Test snippets of PG code in interactive lab.  Good way to learn PG language."
+msgstr "tr: Test snippets of PG code in interactive lab.  Good way to learn PG language."
+
+#
+#, fuzzy
+msgid "Page generated at [_1] at [_2]"
+msgstr "tr: Page generated at %1"
+
+#
+msgid "Import"
+msgstr "tr: Import"
+
+#
+msgid "View Using Seed Number"
+msgstr "tr: View Using Seed Number"
+
+#
+msgid "Grades"
+msgstr "Notas"
+
+#
+msgid "Published"
+msgstr "Publicado"
+
+#
+#, fuzzy
+msgid "Your score was not recorded because this homework set is closed."
+msgstr "Tu evaluación no fue registrada porque esta tarea está cerrada."
+
+#
+msgid "The text box now contains the source of the original problem. You can recover lost edits by using the Back button on your browser."
+msgstr "tr: The text box now contains the source of the original problem. You can recover lost edits by using the Back button on your browser."
+
+#
+msgid "The file '[_1]' is a directory!"
+msgstr "tr: The file '%1' is a directory!"
+
+#
+msgid "Save As"
+msgstr "tr: Save As [TMPL]/"
+
+#
+msgid "Documentation from source code for PG modules and macro files. Often the most up-to-date information."
+msgstr "tr: Documentation from source code for PG modules and macro files. Often the most up-to-date information."
+
+#
+msgid "Problem Techniques"
+msgstr "tr: Problem Techniques"
+
+#
+msgid "Course Configuration"
+msgstr "Configuración del curso"
+
+#
+msgid "Feedback"
+msgstr "Retroalimentación"
+
+#
+msgid "Export"
+msgstr "tr: Export"
+
+#
+msgid "PG mark down syntax used to format WeBWorK questions. This interactive lab can help you to learn the techniques."
+msgstr "tr: PG mark down syntax used to format WeBWorK questions. This interactive lab can help you to learn the techniques."
+
+#
+msgid "Record Scores for Single Sets"
+msgstr "tr: Record Scores for Single Sets"
+
+#
+msgid "Append to end of set [_1]"
+msgstr "tr: Append to end of set %1"
+
+#
+msgid "Unrecognized saveMode: |[_1]|. Unknown error."
+msgstr "tr: Unrecognized saveMode: |%1|. Unknown error."
+
+#
+#, fuzzy
+msgid "Your score was not recorded because there was a failure in storing the problem record to the database."
+msgstr "Tu evaluación no fue registrada porque hubo una falla al almacenar la información en la base de datos."
+
+#
+msgid "The hardcopy header for set [_1] has been renamed to '[_2]'."
+msgstr "tr: The hardcopy header for set %1 has been renamed to '%2'."
+
+#
+msgid "Save as"
+msgstr "tr: Save as"
+
+#
+msgid "Select action below"
+msgstr "tr: Select action below"
+
+#
+msgid "The file '[_1]' cannot be found."
+msgstr "tr: The file '%1' cannot be found."
+
+#
+msgid "Unable to write to '[_1]': [_2]"
+msgstr "tr: Unable to write to '%1': %2"
+
+#
+msgid "Save"
+msgstr "tr: Save"
+
+#
+msgid "File '[_1]' exists. File not saved. No changes have been made. You can change the file path for this problem manually from the 'Hmwk Sets Editor' page"
+msgstr "tr: File '%1' exists. File not saved. No changes have been made. You can change the file path for this problem manually from the 'Hmwk Sets Editor' page"
+
+#
+msgid "The set header for set [_1] has been renamed to '[_2]'."
+msgstr "tr: The set header for set %1 has been renamed to '%2'."
+
+#
+msgid "Error: This path is already in the temporary edit directory -- no new temporary file is created. path = [_1]"
+msgstr "tr: Error: This path is already in the temporary edit directory -- no new temporary file is created. path = %1"
+
+#
+msgid "Please use radio buttons to choose the method for saving this file. Can't recognize saveMode: |[_1]|."
+msgstr "tr: Please use radio buttons to choose the method for saving this file. Can't recognize saveMode: |%1|."
+
+#
+msgid "Saved to file '[_1]'"
+msgstr "tr: Saved to file '%1'"
+
+#
+msgid "Please specify a file to save to."
+msgstr "tr: Please specify a file to save to."
+
+#
+#, fuzzy
+msgid "The selected problem ([_1]) is not a valid problem for set [_2]."
+msgstr "El problema seleccionado (%1) no es un problema válido para el conjunto %2."
+
+#
+msgid "Editing [_1] in file '[_2]'"
+msgstr "tr: Editing %1 in file '%2'"
+
+#
+msgid "Deleting temp file at [_1]"
+msgstr "tr: Deleting temp file at %1"
+
+#
+#, fuzzy
+msgid "hidden from"
+msgstr "oculta para"
+
+#
+msgid "View student progress by set"
+msgstr "tr: View student progress by set"
+
+#
+msgid "View"
+msgstr "tr: View"
+
+#
+msgid "Resources"
+msgstr "tr: Resources"
+
+#
+msgid "Scoring Download"
+msgstr "Bajar Calificaciones"
+
+#
+msgid "Duplicate"
+msgstr "tr: Duplicate"
+
+#
+msgid "This path |[_1]| is not the path to a temporary edit file."
+msgstr "tr: This path |%1| is not the path to a temporary edit file."
+
+#
+#, fuzzy
+msgid "visible to"
+msgstr "visible para"
+
+#
+msgid "Unable to change the source file path for set [_1], problem [_2]. Unknown error."
+msgstr "tr: Unable to change the source file path for set %1, problem %2. Unknown error."
+
+#
+msgid "Course Administration"
+msgstr "Administración del curso"
+
+#
+msgid "Added [_1] to [_2] as problem [_3]"
+msgstr "tr: Added %1 to %2 as problem %3"
+
+#
+msgid "Options Information"
+msgstr "tr: Options Information"
+
+#
+msgid "Proctor"
+msgstr "tr: Proctor"
+
+#
+#, fuzzy
+msgid "Student Progress"
+msgstr "tr: Student ID"
+
+#
+msgid "Revert"
+msgstr "tr: Revert"
+
+#
+msgid "Statistics"
+msgstr "Estadísticas"
+
+#
+msgid "Save as new independent problem"
+msgstr "tr: Save as new independent problem"
+
+#
+msgid "Scoring Tools"
+msgstr "Herramientas para evaluar"
+
+#
+msgid "The source file for 'set [_1] / problem [_2]' has been changed from [_3] to '[_4]'."
+msgstr "tr: The source file for 'set %1 / problem %2' has been changed from %3 to '%4'."
+
+#
+msgid "Cancel Export"
+msgstr "tr: Cancel Export"
+
+#
+msgid "View student progress by student"
+msgstr "tr: View student progress by student"
+
+#
+msgid "Revert to [_1]"
+msgstr "tr: Revert to %1"
+
+#
+msgid "Classlist Editor"
+msgstr "Editor de la lista de clases"
+
+#
+msgid "Add"
+msgstr "tr: Add"
+
+#
+msgid "the original path to the file is [_1]"
+msgstr "tr: the original path to the file is %1"
+
+#
+msgid "The path to the original file should be absolute"
+msgstr "tr: The path to the original file should be absolute"
+
+#
+msgid "To edit this text you must use the 'Save AS' action below to save it to another file."
+msgstr "tr: To edit this text you must use the 'Save AS' action below to save it to another file."
+
+#
+msgid "Error: The original file [_1] cannot be read."
+msgstr "tr: Error: The original file %1 cannot be read."
+
+#
+msgid "Unable to change the set header for set [_1]. Unknown error."
+msgstr "tr: Unable to change the set header for set %1. Unknown error."
+
+#
+msgid "options information"
+msgstr "tr: options information"
+
+#
+msgid "The selected problem([_1]) is not a valid problem for set [_2]."
+msgstr "El problema seleccionado (%1) no es válido para el conjunto de problemas (%2). "
+
+#
+msgid "Unknown file type"
+msgstr "tr: Unknown file type"
+
+#
+msgid "course information"
+msgstr "tr: course information"
+
+#
+#, fuzzy
+msgid "Change User Options"
+msgstr "Cambio de opciones de usuario"
+
+#
+msgid "Drop"
+msgstr "tr: Drop"
+
+#
+msgid "Viewing temporary file:  "
+msgstr "Viendo el archivo temporal"
+
diff --git a/lib/WeBWorK/Localize/fr.mo b/lib/WeBWorK/Localize/fr.mo
new file mode 100644
index 0000000000..a44788b53e
Binary files /dev/null and b/lib/WeBWorK/Localize/fr.mo differ
diff --git a/lib/WeBWorK/Localize/fr.po b/lib/WeBWorK/Localize/fr.po
new file mode 100644
index 0000000000..44fb2de0fa
--- /dev/null
+++ b/lib/WeBWorK/Localize/fr.po
@@ -0,0 +1,2605 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Michael Gage <gage@math.rochester.edu>, 2011.
+# Sébastien Labbé <slabqc at gmail.com>, Université du Québec à Montréal, 2011.
+# Stéphanie Lanthier <lanthier.stephanie@gmail.com>, Université du Québec à Montréal, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: WeBWorK Online Homework System\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-12-22 12:16-0500\n"
+"Last-Translator: Michael Gage <gage@math.rochester.edu>\n"
+"Language-Team: WeBWorK language team <gage@math.rochester.edu>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: French\n"
+"X-Poedit-Country: CANADA\n"
+
+#
+#. ($name, $vnum)
+#: ContentGenerator/ProblemSets.pm:416
+#, fuzzy
+msgid "%1 (test %2)"
+msgstr "tr: %1 (test %2)"
+
+#
+#. ($numAdded, $numSkipped, join(", ", @$skipped)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1581
+#, fuzzy
+msgid "%1 sets added, %2 sets skipped. Skipped sets: (%3)"
+msgstr "%1 devoirs ajoutés, %2 devoirs ignorés. Devoirs ignorés : (%3)"
+
+#
+#. ($numExported, $numSkipped, (($numSkipped)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1701
+#, fuzzy
+msgid "%1 sets exported, %2 sets skipped. Skipped sets: (%3)"
+msgstr "%1 devoirs exportés, %2 devoirs ignorés. Devoirs ignorés : (%3)"
+
+#
+#. ($name)
+#: ContentGenerator/ProblemSets.pm:427
+#: ContentGenerator/ProblemSets.pm:441
+#, fuzzy
+msgid "%1 test"
+msgstr "tr: %1 test"
+
+#
+#. (scalar @userIDsToExport, $dir, $fileName)
+#: ContentGenerator/Instructor/UserList.pm:1385
+#, fuzzy
+msgid "%1 users exported to file %2/%3"
+msgstr "%1 usagers ont été exportés dans le fichier %2/%3"
+
+#
+#. ($numReplaced, $numAdded, $numSkipped, join (", ", @$skipped)
+#: ContentGenerator/Instructor/UserList.pm:1269
+#, fuzzy
+msgid "%1 users replaced, %2 users added, %3 users skipped. Skipped users: (%4)"
+msgstr "%1 usagers remplacés, %2 usagers ajoutés, %3 usagers ignorés. Usagés ignorés : (%4)"
+
+#
+#. (int($answerScore*100)
+#: ContentGenerator/Problem.pm:265
+#, fuzzy
+msgid "%1% correct"
+msgstr "%1% correct"
+
+#
+#. ($e_user_name)
+#: ContentGenerator/Options.pm:171
+#, fuzzy
+msgid "%1's Current Address"
+msgstr "Courriel actuel %1"
+
+#
+#. ($user_name)
+#: ContentGenerator/Options.pm:126
+#, fuzzy
+msgid "%1's Current Password"
+msgstr "Mot de passe actuel %1"
+
+#
+#. ($e_user_name)
+#: ContentGenerator/Options.pm:175
+#, fuzzy
+msgid "%1's New Address"
+msgstr "Nouveau courriel %1"
+
+#
+#. ($e_user_name)
+#: ContentGenerator/Options.pm:130
+#, fuzzy
+msgid "%1's New Password"
+msgstr "Nouveau mot de passe %1"
+
+#
+#. ($e_user_name)
+#: ContentGenerator/Options.pm:101
+#, fuzzy
+msgid "%1's new password cannot be blank."
+msgstr "Le nouveau mot de passe ne peut rester vide. %1"
+
+#
+#. ($e_user_name)
+#: ContentGenerator/Options.pm:84
+#, fuzzy
+msgid "%1's password has been changed."
+msgstr "Le mot de passe de l'usager %1 a été modifié."
+
+#
+#. ($setID, $problemID)
+#: ContentGenerator/Problem.pm:884
+#, fuzzy
+msgid "%1: Problem %2"
+msgstr "%1: Problème %2."
+
+#
+#. ($numBlanks)
+#: ContentGenerator/Problem.pm:319
+#, fuzzy
+msgid "%quant(%1,of the questions remains,of the questions remain) unanswered."
+msgstr "Certaines questions %1 restent sans réponse."
+
+#
+#: ContentGenerator/Problem.pm:1188
+msgid "(This problem will not count towards your grade.)"
+msgstr "(Ce problème ne sera pas noté.)"
+
+#
+#: ContentGenerator/Problem.pm:1299
+msgid "ANSWERS ONLY CHECKED -- ANSWERS NOT RECORDED"
+msgstr "LES RÉPONSES ONT ÉTÉ VÉRIFIÉES -- MAIS ELLES N'ONT PAS ÉTÉ ENREGISTRÉES"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1708
+#: ContentGenerator/Instructor/UserList.pm:1391
+#: ContentGenerator/Instructor/UserList.pm:1463
+msgid "Abandon changes"
+msgstr "Abandonner les changements"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1647
+msgid "Abandon export"
+msgstr "Annuler l'exportation"
+
+#
+#. ($eUserID)
+#: ContentGenerator.pm:848
+#, fuzzy
+msgid "Acting as %1. "
+msgstr "Dans le rôle de %1."
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1927
+msgid "Active"
+msgstr "Actif"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1142
+msgid "Add how many students?"
+msgstr "Ajouter combien d'étudiants?"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1220
+msgid "Add which new users?"
+msgstr "Ajouter quels nouveaux usagers?"
+
+#
+#: ContentGenerator/Problem.pm:311
+msgid "All of the answers above are correct."
+msgstr "Les réponses ci-dessus sont toutes correctes."
+
+#
+#. ($verb)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1052
+#, fuzzy
+msgid "All selected sets %1 all students"
+msgstr "Tous les devoirs sélectionnés %1 à tous les étudiants"
+
+#
+#. ($verb)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1046
+#, fuzzy
+msgid "All sets %1 all students"
+msgstr "Tous les devoirs %1 à tous les étudiants"
+
+#
+#. ($verb)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1049
+#, fuzzy
+msgid "All visible sets %1 all students"
+msgstr "Tous les devoirs visibles %1 à tous les étudiants"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:446
+#: ContentGenerator/Instructor/ProblemSetList.pm:832
+#: ContentGenerator/Instructor/ProblemSetList.pm:870
+msgid "Answer Date"
+msgstr "Date de disponibilité des réponses"
+
+#
+#: ContentGenerator/Problem.pm:242
+msgid "Answer Preview"
+msgstr "Aperçu des réponses"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:531
+msgid "Any changes made below will be reflected in the set for ALL students."
+msgstr "Les changements effectués ci-bas affecteront les devoirs de TOUS les étudiants"
+
+#
+#: ContentGenerator.pm:1481
+msgid "Apply Options"
+msgstr "Appliquer les options"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1545
+msgid "Assign this set to which users?"
+msgstr "Assigner ce devoir à quels usagers?"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2064
+#, fuzzy
+msgid "Assigned Sets"
+msgstr "Devoirs assignés"
+
+#
+#. ($fully)
+#: ContentGenerator/Problem.pm:315
+msgid "At least one of the answers above is NOT %1correct."
+msgstr "Au moins une des réponses ci-dessus N'EST PAS %1 correcte."
+
+#
+#: ContentGenerator/ProblemSet.pm:350
+msgid "Attempts"
+msgstr "Essais"
+
+#
+#. ($eUserID,$@)
+#: ContentGenerator/Options.pm:71
+#, fuzzy
+msgid "Can't get password record for effective user '%1': %2"
+msgstr "Impossible d'accéder au mot de passe pour l'usager actuel '%1': %2"
+
+#
+#. ($userID,$@)
+#: ContentGenerator/Options.pm:68
+#, fuzzy
+msgid "Can't get password record for user '%1': %2"
+msgstr "Impossible d'accéder au mot de passe pour l'usager '%1': %2"
+
+#
+#: ContentGenerator/Options.pm:142
+msgid "Change Email Address"
+msgstr "Changer l'adresse courriel"
+
+#
+#: ContentGenerator/Options.pm:61
+msgid "Change Password"
+msgstr "Changer le mot de passe"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1409
+#: ContentGenerator/Instructor/UserList.pm:1481
+#, fuzzy
+msgid "Changes abandoned"
+msgstr "Les modifications ont été annulées"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1457
+#, fuzzy
+msgid "Changes saved"
+msgstr "Les modifications ont été sauvegardées"
+
+#
+#: ContentGenerator/Problem.pm:1118
+msgid "Check Answers"
+msgstr "Vérifier les réponses"
+
+#
+#: ContentGenerator/Problem.pm:1227
+msgid "Checking additional error messages"
+msgstr "tr: Checking additional error messages"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1011
+msgid "Choose visibility of the sets to be affected"
+msgstr "tr: Choose visibility of the sets to be affected"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1084
+#: ContentGenerator/Instructor/ProblemSetList.pm:982
+msgid "Choose which sets to be affected"
+msgstr "tr: Choose which sets to be affected"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:597
+#: ContentGenerator/Instructor/UserList.pm:550
+#: ContentGenerator/ProblemSets.pm:288
+msgid "Clear"
+msgstr "Effacer"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:562
+#, fuzzy
+msgid "Click on the login name to edit individual problem set data, (e.g. due dates) for these students."
+msgstr "Cliquer sur le nom d'usager pour éditer les devoirs individuellement (par ex. la date de remise) pour ces étudiants"
+
+#
+#: ContentGenerator/ProblemSets.pm:435
+msgid "Closed"
+msgstr "Fermé"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2072
+#: ContentGenerator/Instructor/UserList.pm:290
+#: ContentGenerator/Instructor/UserList.pm:818
+#: ContentGenerator/Instructor/UserList.pm:861
+#: ContentGenerator/Instructor/UserList.pm:904
+msgid "Comment"
+msgstr "Commenter"
+
+#
+#. ($e_user_name)
+#: ContentGenerator/Options.pm:134
+#: ContentGenerator/Options.pm:95
+#, fuzzy
+msgid "Confirm %1's New Password"
+msgstr "Confirmer le nouveau mot de passe %1"
+
+#
+#: ContentGenerator/Login.pm:206
+msgid "Continue"
+msgstr "Continuer"
+
+#
+#: ContentGenerator/Problem.pm:243
+msgid "Correct"
+msgstr "Correct"
+
+#
+#. ($e_user_name,$@)
+#: ContentGenerator/Options.pm:80
+msgid "Couldn't change %1's password: %2"
+msgstr "Il n'a pas été possible de modifier le mot de passe : %2 de l'usager : %1"
+
+#
+#. ($@)
+#: ContentGenerator/Options.pm:153
+#, fuzzy
+msgid "Couldn't change your email address: %1"
+msgstr "Il n'a pas été possible de modifier votre courriel : %1"
+
+#
+#: ContentGenerator/ProblemSets.pm:71
+#: ContentGenerator/ProblemSets.pm:73
+msgid "Course Info"
+msgstr "Informations sur le cours"
+
+#
+#: ContentGenerator.pm:657
+#: ContentGenerator/Home.pm:94
+msgid "Courses"
+msgstr "Cours"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1351
+msgid "Create as what type of set?"
+msgstr "tr: Create as what type of set?"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1263
+#: ContentGenerator/Instructor/UserList.pm:1082
+msgid "Delete how many?"
+msgstr "En supprimer combien?"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1119
+msgid "Disable"
+msgstr "Désactiver"
+
+#
+#: ContentGenerator.pm:1442
+msgid "Display Options"
+msgstr "Options d'affichage"
+
+#
+#. ($pl)
+#: ContentGenerator/ProblemSets.pm:283
+#, fuzzy
+msgid "Download Hardcopy for Selected %plural(%1,Set,Sets)"
+msgstr "Télécharger une copie de : [plural,_1,Set,Sets]"
+
+#
+#: ContentGenerator/ProblemSet.pm:321
+msgid "Download PDF or TeX Hardcopy for Current Set"
+msgstr "Télécharger une copie PDF ou TeX pour le devoir en cours"
+
+#
+#: ContentGenerator/ProblemSets.pm:289
+msgid "Download PDF or TeX Hardcopy for Selected Sets"
+msgstr "Télécharger une copie PDF ou TeX pour les devoir sélectionnés"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:445
+#: ContentGenerator/Instructor/ProblemSetList.pm:831
+#: ContentGenerator/Instructor/ProblemSetList.pm:869
+msgid "Due Date"
+msgstr "Date de remise"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1812
+msgid "Duplicate this set and name it"
+msgstr "Copier ce devoir et le renommer"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1720
+#: ContentGenerator/Instructor/UserList.pm:1785
+#: ContentGenerator/Instructor/UserList.pm:1818
+msgid "Edit"
+msgstr "Editer"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:603
+msgid "Edit All Set Data"
+msgstr "Editer les données de tous les devoirs"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:439
+msgid "Edit Assigned Users"
+msgstr "Éditer les usagers assignés"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:438
+msgid "Edit Problems"
+msgstr "Éditer les problèmes"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:441
+msgid "Edit Set Data"
+msgstr "Éditer les données des devoirs"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:961
+msgid "Edit Which Users?"
+msgstr "Éditer quels usagers?"
+
+#
+#: ContentGenerator/Problem.pm:1011
+msgid "Edit this problem"
+msgstr "Éditer ce problème"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:923
+msgid "Edit which sets?"
+msgstr "Éditer quels devoirs?"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2067
+#: ContentGenerator/Instructor/UserList.pm:285
+#: ContentGenerator/Instructor/UserList.pm:813
+#: ContentGenerator/Instructor/UserList.pm:856
+#: ContentGenerator/Instructor/UserList.pm:899
+msgid "Email Address"
+msgstr "Adresse courriel"
+
+#
+#: ContentGenerator.pm:1526
+#: ContentGenerator.pm:1549
+#: ContentGenerator.pm:1572
+msgid "Email instructor"
+msgstr "Envoyer un courriel à l'enseignant"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1120
+msgid "Enable"
+msgstr "Activer"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:604
+msgid "Enable Reduced Credit"
+msgstr "tr: Enable Reduced Credit"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1113
+msgid "Enable/Disable reduced scoring for selected sets"
+msgstr "tr: Enable/Disable reduced scoring for selected sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:815
+#: ContentGenerator/Instructor/UserList.pm:858
+#: ContentGenerator/Instructor/UserList.pm:901
+msgid "Enrollment Status"
+msgstr "Statut d'étudiant"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1321
+msgid "Enter filename below"
+msgstr "Entrer le nom du fichier ci-bas"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1502
+msgid "Enter filenames below"
+msgstr "Entrer les noms de fichiers ci-bas"
+
+#
+#: ContentGenerator/Problem.pm:240
+msgid "Entered"
+msgstr "Saisi"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1671
+msgid "Export selected sets"
+msgstr "Exporter les devoirs sélectionnés"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1317
+msgid "Export to what kind of file?"
+msgstr "Exporter sous quel sorte de fichier?"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1604
+msgid "Export which sets?"
+msgstr "Exporter quels devoirs?"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1292
+msgid "Export which users?"
+msgstr "Exporter quels usagers?"
+
+#
+#. ($@)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1435
+#, fuzzy
+msgid "Failed to create new set: %1"
+msgstr "Impossible de créer le nouveau devoir : %1"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1374
+msgid "Failed to create new set: no set name specified!"
+msgstr "Impossible de créer le nouveau devoir : aucun nom n'a été spécifié!"
+
+#
+#. ($@)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1848
+#, fuzzy
+msgid "Failed to duplicate set: %1"
+msgstr "Impossible de dupliquer le devoir : %1"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1832
+msgid "Failed to duplicate set: no set name specified!"
+msgstr "Impossible de dupliquer le devoir : aucun nom n'a été spécifié!"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1396
+#: ContentGenerator/Instructor/ProblemSetList.pm:1830
+msgid "Failed to duplicate set: no set selected for duplication!"
+msgstr "Impossible de dupliquer le devoir : aucun devoir n'a été sélectionné pour la duplication!"
+
+#
+#. ($newSetID)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1834
+#, fuzzy
+msgid "Failed to duplicate set: set %1 already exists!"
+msgstr "Impossible de dupliquer le devoir : le devoir %1 existe déjà!"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1339
+msgid "Filename"
+msgstr "Nom de fichier"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:678
+msgid "Filter by what text?"
+msgstr "Filtrer avec quelle chaîne de caractères?"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2065
+#: ContentGenerator/Instructor/UserList.pm:283
+#: ContentGenerator/Instructor/UserList.pm:811
+#: ContentGenerator/Instructor/UserList.pm:854
+#: ContentGenerator/Instructor/UserList.pm:897
+msgid "First Name"
+msgstr "Prénom"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1020
+msgid "Give new password to which users?"
+msgstr "Donner un nouveau mot de passe à quels usagers?"
+
+#
+#: ContentGenerator/Login.pm:231
+msgid "Guest Login"
+msgstr "Invité"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:443
+#: ContentGenerator/Instructor/ProblemSetList.pm:829
+#: ContentGenerator/Instructor/ProblemSetList.pm:867
+msgid "Hardcopy Header"
+msgstr "Entête d'impression"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1017
+msgid "Hidden"
+msgstr "Caché"
+
+#
+#: ContentGenerator.pm:667
+#: ContentGenerator/ProblemSet.pm:110
+#: ContentGenerator/ProblemSets.pm:226
+msgid "Homework Sets"
+msgstr "Devoirs"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:558
+msgid "If a password field is left blank, the student's current password will be maintained."
+msgstr "Si le champ d'un mot de passe est vide, le mot de passe actuel sera conservé."
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1498
+msgid "Import from where?"
+msgstr "Importer d'où?"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1473
+msgid "Import how many sets?"
+msgstr "Importer combien de devoirs?"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1520
+msgid "Import sets with names"
+msgstr "Importer les devoirs avec le nom"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1165
+msgid "Import users from what file?"
+msgstr "Importer les usagers à partir de quel fichier?"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1927
+msgid "Inactive"
+msgstr "Inactif"
+
+#
+#: Authen.pm:148
+msgid "Invalid user ID or password."
+msgstr "Code d'usager ou mot de passe invalides"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2066
+#: ContentGenerator/Instructor/UserList.pm:284
+#: ContentGenerator/Instructor/UserList.pm:812
+#: ContentGenerator/Instructor/UserList.pm:855
+#: ContentGenerator/Instructor/UserList.pm:898
+msgid "Last Name"
+msgstr "Nom de famille"
+
+#
+#: ContentGenerator.pm:730
+msgid "Library Browser"
+msgstr "Choisir des problèmes"
+
+#
+#: ContentGenerator.pm:731
+msgid "Library Browser 2"
+msgstr "Choisir des problèmes 2"
+
+#
+#: ContentGenerator/Logout.pm:124
+msgid "Log In Again"
+msgstr "Se connecter à nouveau"
+
+#
+#: ContentGenerator.pm:845
+#: ContentGenerator.pm:847
+msgid "Log Out"
+msgstr "Se déconnecter"
+
+#
+#. ($userID)
+#: ContentGenerator.pm:845
+#: ContentGenerator.pm:847
+#, fuzzy
+msgid "Logged in as %1. "
+msgstr "Connecté sous le nom %1"
+
+#
+#: ContentGenerator/Login.pm:74
+#: ContentGenerator/Login.pm:77
+#, fuzzy
+msgid "Login Info"
+msgstr "tr: Login Info"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2062
+#: ContentGenerator/Instructor/UserList.pm:282
+#: ContentGenerator/Instructor/UserList.pm:810
+#: ContentGenerator/Instructor/UserList.pm:853
+#: ContentGenerator/Instructor/UserList.pm:896
+msgid "Login Name"
+msgstr "Nom d'usager"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2063
+#, fuzzy
+msgid "Login Status"
+msgstr "Statut"
+
+#
+#: ContentGenerator.pm:654
+msgid "Main Menu"
+msgstr "Menu principal"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:705
+msgid "Match on what? (separate multiple IDs with commas)"
+msgstr "tr: Match on what? (separate multiple IDs with commas)"
+
+#
+#: ContentGenerator/Problem.pm:245
+msgid "Messages"
+msgstr "Messages"
+
+#
+#: ContentGenerator/ProblemSet.pm:349
+#: ContentGenerator/ProblemSets.pm:212
+#: ContentGenerator/ProblemSets.pm:213
+msgid "Name"
+msgstr "Nom"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1328
+msgid "Name the new set"
+msgstr "Nommer le nouveau devoir"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1937
+#: ContentGenerator/Instructor/UserList.pm:2077
+msgid "New Password"
+msgstr "Nouveau mot de passe"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1519
+msgid "New passwords saved"
+msgstr "Nouveaux mots de passe sauvegardés"
+
+#
+#: ContentGenerator/Problem.pm:864
+#: ContentGenerator/Problem.pm:866
+msgid "Next Problem"
+msgstr "Problème suivant"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2625
+#: ContentGenerator/Instructor/ProblemSetList.pm:2626
+msgid "No"
+msgstr "Non"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1043
+#: ContentGenerator/Instructor/ProblemSetList.pm:1145
+msgid "No change made to any set"
+msgstr "Aucun changement effectué à aucun devoir"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1217
+msgid "No sets selected for scoring"
+msgstr "Aucun devoir sélectionné pour la notation"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:266
+#, fuzzy
+msgid "No sets selected for scoring."
+msgstr "Aucun devoir sélectionné pour la notation."
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2722
+msgid "No sets shown.  Choose one of the options above to list the sets in the course."
+msgstr "Aucun devoir affiché. Choisir l'une des options ci-dessus pour afficher les devoirs de ce cours."
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2110
+#, fuzzy
+msgid ""
+"No students shown.  Choose one of the options above to \n"
+"\t              list the students in the course."
+msgstr "Aucun étudiant affiché. Choisir l'une des options ci-dessus pour afficher les étudiants de ce cours."
+
+#
+#: ContentGenerator.pm:851
+msgid "Not logged in."
+msgstr "Non connecté."
+
+#
+#: ContentGenerator/Problem.pm:975
+msgid "Note"
+msgstr "Note"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:444
+#: ContentGenerator/Instructor/ProblemSetList.pm:830
+#: ContentGenerator/Instructor/ProblemSetList.pm:868
+msgid "Open Date"
+msgstr "Date d'ouverture"
+
+#
+#: ContentGenerator/Problem.pm:1307
+msgid "PREVIEW ONLY -- ANSWERS NOT RECORDED"
+msgstr "Visualiser seulement  --  SANS ENREGISTRER LES RÉPONSES"
+
+#
+#. (timestamp($self)
+#: ContentGenerator.pm:953
+#, fuzzy
+msgid "Page generated at %1"
+msgstr "Page generée à %1"
+
+#
+#: ContentGenerator/Login.pm:202
+#, fuzzy
+msgid "Password"
+msgstr "Nouveau mot de passe"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2073
+#: ContentGenerator/Instructor/UserList.pm:291
+#: ContentGenerator/Instructor/UserList.pm:819
+#: ContentGenerator/Instructor/UserList.pm:862
+#: ContentGenerator/Instructor/UserList.pm:905
+msgid "Permission Level"
+msgstr "Niveau de permission"
+
+#
+#. (CGI::b($r->maketext($course)
+#: ContentGenerator/Login.pm:154
+#, fuzzy
+msgid "Please enter your username and password for %1 below:"
+msgstr "Lütfen %1 dersi için kullanici adi ve sifrenizi giriniz:"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:396
+msgid "Please select action to be performed."
+msgstr "tr: Please select action to be performed."
+
+#
+#: ContentGenerator/Problem.pm:1116
+msgid "Preview Answers"
+msgstr "Visualiser les réponses"
+
+#
+#: ContentGenerator/Problem.pm:850
+#: ContentGenerator/Problem.pm:852
+msgid "Previous Problem"
+msgstr "Problème précédent"
+
+#
+#. ($problemID)
+#: ContentGenerator.pm:686
+#: ContentGenerator/Problem.pm:808
+#: ContentGenerator/ProblemSet.pm:424
+#, fuzzy
+msgid "Problem %1"
+msgstr "tr: Problem"
+
+#
+#: ContentGenerator/Problem.pm:856
+#: ContentGenerator/Problem.pm:858
+msgid "Problem List"
+msgstr "Liste des problèmes"
+
+#
+#: ContentGenerator/Problem.pm:796
+#: ContentGenerator/ProblemSet.pm:346
+msgid "Problems"
+msgstr "Problèmes"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2071
+#: ContentGenerator/Instructor/UserList.pm:289
+#: ContentGenerator/Instructor/UserList.pm:817
+#: ContentGenerator/Instructor/UserList.pm:860
+#: ContentGenerator/Instructor/UserList.pm:903
+msgid "Recitation"
+msgstr "tr: Recitation"
+
+#
+#. ($verb)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1148
+#, fuzzy
+msgid "Reduced Credit %1 for all sets"
+msgstr "tr: Reduced Credit %1 for all sets"
+
+#
+#. ($verb)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1154
+#, fuzzy
+msgid "Reduced Credit %1 for selected sets"
+msgstr "tr: Reduced Credit %1 for selected sets"
+
+#
+#. ($verb)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1151
+#, fuzzy
+msgid "Reduced Credit %1 for visable sets"
+msgstr "tr: Reduced Credit %1 for visable sets"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2523
+msgid "Reduced Credit Disabled"
+msgstr "tr: Reduced Credit Disabled"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2523
+#: ContentGenerator/Instructor/ProblemSetList.pm:448
+msgid "Reduced Credit Enabled"
+msgstr "tr: Reduced Credit Enabled"
+
+#
+#. ($beginReducedScoringPeriod)
+#: ContentGenerator/ProblemSets.pm:459
+#, fuzzy
+msgid "Reduced Credit Starts: %1"
+msgstr "tr: Reduced Credit Starts: %1"
+
+#
+#: ContentGenerator/ProblemSet.pm:351
+msgid "Remaining"
+msgstr "Nombre d'essais restants"
+
+#
+#: ContentGenerator/Login.pm:204
+msgid "Remember Me"
+msgstr "Souvien mois"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1190
+msgid "Replace which users?"
+msgstr "tr: Replace which users?"
+
+#
+#: ContentGenerator.pm:799
+msgid "Report bugs"
+msgstr "Signaler un bogue"
+
+#
+#: ContentGenerator/Problem.pm:244
+msgid "Result"
+msgstr "Résultat"
+
+#
+#. (CGI::i($self->$actionHandler(\%genericParams, \%actionParams, \%tableParams)
+#: ContentGenerator/Instructor/UserList.pm:376
+#, fuzzy
+msgid "Result of last action performed: %1"
+msgstr "tr: Result of last action performed: %1"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:386
+msgid "Results of last action performed"
+msgstr "tr: Results of last action performed"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1732
+#: ContentGenerator/Instructor/UserList.pm:1415
+#: ContentGenerator/Instructor/UserList.pm:1487
+msgid "Save changes"
+msgstr "tr: Save changes"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1186
+msgid "Score which sets?"
+msgstr "tr: Score which sets?"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2070
+#: ContentGenerator/Instructor/UserList.pm:288
+#: ContentGenerator/Instructor/UserList.pm:816
+#: ContentGenerator/Instructor/UserList.pm:859
+#: ContentGenerator/Instructor/UserList.pm:902
+msgid "Section"
+msgstr "tr: Section"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:582
+msgid "Select all sets"
+msgstr "tr: Select all sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:535
+msgid "Select all users"
+msgstr "tr: Select all users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:534
+#: ContentGenerator/Instructor/UserList.pm:512
+msgid "Select an action to perform"
+msgstr "tr: Select an action to perform"
+
+#
+#. ($newSetID)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1375
+#, fuzzy
+msgid "Set %1 exists.  No set created"
+msgstr "tr: Set %1 exists.  No set created"
+
+#: ContentGenerator/Instructor/ProblemSetList.pm:440
+msgid "Set Definition Filename"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:442
+#: ContentGenerator/Instructor/ProblemSetList.pm:828
+#: ContentGenerator/Instructor/ProblemSetList.pm:866
+msgid "Set Header"
+msgstr "tr: Set Header"
+
+#
+#: ContentGenerator/ProblemSet.pm:273
+#: ContentGenerator/ProblemSet.pm:275
+msgid "Set Info"
+msgstr "tr: Set Info"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2700
+msgid "Set List"
+msgstr "tr: Set List"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:827
+#: ContentGenerator/Instructor/ProblemSetList.pm:865
+msgid "Set Name"
+msgstr "tr: Set Name"
+
+#
+#: ContentGenerator/ProblemSet.pm:153
+msgid "Sets"
+msgstr "Devoirs"
+
+#
+#: ContentGenerator/Problem.pm:1063
+msgid "Show Hints"
+msgstr "Recourir à des indices"
+
+#
+#: ContentGenerator/Problem.pm:1370
+msgid "Show Past Answers"
+msgstr "Afficher les réponses précédentes"
+
+#
+#: ContentGenerator/Problem.pm:1082
+msgid "Show Solutions"
+msgstr "Afficher les solutions"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:645
+msgid "Show Which Users?"
+msgstr "tr: Show Which Users?"
+
+#
+#: ContentGenerator/Problem.pm:1044
+msgid "Show correct answers"
+msgstr "Montrer les bonnes réponses"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:683
+msgid "Show which sets?"
+msgstr "tr: Show which sets?"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:497
+#: ContentGenerator/Instructor/UserList.pm:475
+msgid "Show/Hide Site Description"
+msgstr "tr: Show/Hide Site Description"
+
+#
+#. (scalar @visibleSetIDs, scalar @allSetIDs)
+#: ContentGenerator/Instructor/ProblemSetList.pm:607
+#, fuzzy
+msgid "Showing %1 out of %2 sets."
+msgstr "tr: Showing %1 out of %2 sets."
+
+#
+#. (scalar @Users, scalar @allUserIDs)
+#: ContentGenerator/Instructor/UserList.pm:556
+#, fuzzy
+msgid "Showing %1 out of %2 users"
+msgstr "tr: Showing %1 out of %2 users"
+
+#
+#: ContentGenerator/Login.pm:96
+#: ContentGenerator/Login.pm:99
+#, fuzzy
+msgid "Site Information"
+msgstr "tr: Options Information"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:821
+#: ContentGenerator/Instructor/UserList.pm:804
+msgid "Sort by"
+msgstr "tr: Sort by"
+
+#
+#. ($names{$primary}, $names{$secondary})
+#: ContentGenerator/Instructor/ProblemSetList.pm:899
+#, fuzzy
+msgid "Sort by %1 and then by %2"
+msgstr "tr: Sort by %1 and then by %2"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2069
+#: ContentGenerator/Instructor/UserList.pm:287
+#: ContentGenerator/ProblemSet.pm:353
+#: ContentGenerator/ProblemSets.pm:215
+#: ContentGenerator/ProblemSets.pm:216
+msgid "Status"
+msgstr "Statut"
+
+#
+#: ContentGenerator.pm:848
+msgid "Stop Acting"
+msgstr "Cesser de jouer le rôle"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2068
+#: ContentGenerator/Instructor/UserList.pm:286
+#: ContentGenerator/Instructor/UserList.pm:814
+#: ContentGenerator/Instructor/UserList.pm:857
+#: ContentGenerator/Instructor/UserList.pm:900
+msgid "Student ID"
+msgstr "tr: Student ID"
+
+#
+#: ContentGenerator/Problem.pm:1127
+msgid "Submit Answers"
+msgstr "Soumettre ses réponses"
+
+#
+#. ($effectiveUser)
+#: ContentGenerator/Problem.pm:1124
+#, fuzzy
+msgid "Submit Answers for %1"
+msgstr "%1 Soumettre ses réponses"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1850
+msgid "Success"
+msgstr "tr: Success"
+
+#. ($newSetID)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1437
+msgid "Successfully created new set %1"
+msgstr ""
+
+#
+#. ($name)
+#: ContentGenerator/ProblemSets.pm:424
+#: ContentGenerator/ProblemSets.pm:433
+#: ContentGenerator/ProblemSets.pm:439
+#, fuzzy
+msgid "Take %1 test"
+msgstr "tr: Take %1 test"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:598
+#: ContentGenerator/Instructor/UserList.pm:551
+msgid "Take Action!"
+msgstr "tr: Take Action!"
+
+#
+#: ContentGenerator/ProblemSets.pm:236
+msgid "Test Date"
+msgstr "tr: Test Date"
+
+#
+#: ContentGenerator/ProblemSets.pm:235
+msgid "Test Score"
+msgstr "tr: Test Score"
+
+#
+#: ContentGenerator.pm:954
+msgid "The WeBWorK Project"
+msgstr "tr: The WeBWorK Project"
+
+#
+#. ($fully)
+#: ContentGenerator/Problem.pm:307
+#, fuzzy
+msgid "The answer above is NOT %1correct."
+msgstr "La réponse ci-dessus N'EST PAS %1correcte."
+
+#
+#: ContentGenerator/Problem.pm:305
+msgid "The answer above is correct."
+msgstr "La réponse ci-dessus est correcte."
+
+#
+#. (CGI::b($r->maketext("[_1]'s Current Password",$user_name)
+#: ContentGenerator/Options.pm:107
+#, fuzzy
+msgid ""
+"The password you entered in the %1 \n"
+"\t\t\t\t\t\tfield does not match your current\n"
+"\t\t\t\t\t\tpassword. Please retype your current password and try\n"
+"\t\t\t\t\t\tagain."
+msgstr "Le mot de passe que vous avez entré dans la case %1 est erroné. Veuillez le corriger et essayer de nouveau."
+
+#
+#. (CGI::b($r->maketext("[_1]'s New Password",$e_user_name)
+#: ContentGenerator/Options.pm:91
+#, fuzzy
+msgid ""
+"The passwords you entered in the \n"
+"\t\t\t\t\t\t\t\t%1 and %2\n"
+"\t\t\t\t\t\t\t\tfields don't match. Please retype your new password and try\n"
+"\t\t\t\t\t\t\t\tagain."
+msgstr "Les mots de passe saisis dans les champs %1 et %2 sont différents. Veuillez essayer à nouveau"
+
+#
+#. ($setName,$effectiveUser)
+#: ContentGenerator/ProblemSet.pm:308
+#, fuzzy
+msgid "The selected problem set (%1) is not a valid set for %2"
+msgstr "tr: The selected problem set (%1) is not a valid set for %2"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:859
+#: ContentGenerator/Instructor/UserList.pm:847
+#: ContentGenerator/Instructor/UserList.pm:890
+msgid "Then by"
+msgstr "tr: Then by"
+
+#
+#: ContentGenerator/ProblemSet.pm:365
+msgid "This homework set contains no problems."
+msgstr "Ce devoir ne contient aucun problème."
+
+#
+#: ContentGenerator/Problem.pm:1175
+msgid "This homework set is closed."
+msgstr "Ce devoir est échu."
+
+#
+#: ContentGenerator/Problem.pm:1173
+msgid "This homework set is not yet open."
+msgstr "Ce devoir n'est pas encore disponible."
+
+#
+#: ContentGenerator/Problem.pm:611
+msgid "This problem will not count towards your grade."
+msgstr "Ce problème n'est pas noté."
+
+#
+#. (CGI::font({class=>$visiblityStateClass}, $visiblityStateText)
+#: ContentGenerator/Problem.pm:605
+#: ContentGenerator/ProblemSet.pm:88
+#, fuzzy
+msgid "This set is %1"
+msgstr "tr: This set is %1"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:588
+msgid "Unselect all sets"
+msgstr "tr: Unselect all sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:541
+msgid "Unselect all users"
+msgstr "tr: Unselect all users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2683
+msgid "Use System Default"
+msgstr "tr: Use System Default"
+
+#
+#: ContentGenerator/Login.pm:200
+#, fuzzy
+msgid "Username"
+msgstr "tr: Filename"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2087
+msgid "Users List"
+msgstr "tr: Users List"
+
+#
+#. ($names{$primary}, $names{$secondary}, $names{$ternary})
+#: ContentGenerator/Instructor/UserList.pm:938
+#, fuzzy
+msgid "Users sorted by %1, then by %2, then by %3"
+msgstr "tr: Users sorted by %1, then by %2, then by %3"
+
+#
+#: ContentGenerator/ProblemSet.pm:230
+msgid "Viewing temporary file"
+msgstr "tr: Viewing temporary file"
+
+#
+#: ContentGenerator/Problem.pm:1332
+#: ContentGenerator/ProblemSets.pm:63
+msgid "Viewing temporary file: "
+msgstr "Visionnement du fichier temporaire : "
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:833
+#: ContentGenerator/Instructor/ProblemSetList.pm:871
+msgid "Visibility"
+msgstr "tr: Visibility"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1018
+#: ContentGenerator/Instructor/ProblemSetList.pm:447
+msgid "Visible"
+msgstr "tr: Visible"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1259
+#: ContentGenerator/Instructor/UserList.pm:1078
+msgid "Warning: Deletion destroys all user-related data and is not undoable!"
+msgstr "tr: Warning: Deletion destroys all user-related data and is not undoable!"
+
+#
+#: ContentGenerator/Home.pm:87
+msgid "Welcome to WeBWorK!"
+msgstr "Bienvenue sur WeBWorK!"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:665
+msgid "What field should filtered users match on?"
+msgstr "tr: What field should filtered users match on?"
+
+#
+#: ContentGenerator/ProblemSet.pm:352
+msgid "Worth"
+msgstr "Pondération"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2625
+#: ContentGenerator/Instructor/ProblemSetList.pm:2626
+msgid "Yes"
+msgstr "Oui"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:306
+#: ContentGenerator/Instructor/ProblemSetList.pm:418
+#: ContentGenerator/Instructor/UserList.pm:262
+msgid "You are not authorized to access the instructor tools."
+msgstr "tr: You are not authorized to access the instructor tools."
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:339
+msgid "You are not authorized to modify homework sets."
+msgstr "tr: You are not authorized to modify homework sets."
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:344
+msgid "You are not authorized to modify set definition files."
+msgstr "tr: You are not authorized to modify set definition files."
+
+#
+#: ContentGenerator/Instructor/UserList.pm:329
+#: ContentGenerator/Instructor/UserList.pm:335
+#, fuzzy
+msgid "You are not authorized to modify student data"
+msgstr "tr: You are not authorized to modify student data."
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:389
+#: ContentGenerator/Instructor/UserList.pm:380
+msgid "You are not authorized to perform this action."
+msgstr "tr: You are not authorized to perform this action."
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1121
+msgid "You cannot delete yourself!"
+msgstr "tr: You cannot delete yourself!"
+
+#
+#: ContentGenerator/Options.pm:163
+#: ContentGenerator/Options.pm:180
+msgid "You do not have permission to change email addresses."
+msgstr "Vos droits ne vous permettent pas de modifier des adresses de courriel."
+
+#
+#: ContentGenerator/Options.pm:117
+#: ContentGenerator/Options.pm:139
+msgid "You do not have permission to change your password."
+msgstr "Vos droits ne vous permettent pas de modifier votre mot de passe."
+
+#
+#. ($attemptsLeft,$attemptsLeftNoun)
+#: ContentGenerator/Problem.pm:1196
+#, fuzzy
+msgid "You have %1 %2 remaining."
+msgstr "Il reste %1 %2."
+
+#
+#. ($attemptsLeft)
+#: ContentGenerator/Problem.pm:1197
+#, fuzzy
+msgid "You have %negquant(%1,unlimited attempts,attempt,attempts) remaining."
+msgstr "Il reste [negquant,_1,un nombre illimité d'essais,essai,essais]."
+
+#
+#. ($attempts)
+#: ContentGenerator/Problem.pm:1191
+#, fuzzy
+msgid "You have attempted this problem %quant(%1,time,times)."
+msgstr "Vous avez essayé ce problème à [quant,_1,reprise,reprises]."
+
+#
+#: ContentGenerator/Logout.pm:119
+msgid "You have been logged out of WeBWorK."
+msgstr "Vous êtes déconnecté de WeBWorK."
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1933
+msgid "You may not change your own password here!"
+msgstr "tr: You may not change your own password here!"
+
+#
+#: Authen.pm:317
+msgid "You must specify a user ID."
+msgstr "Spécifier le code d'usager."
+
+#
+#. (sprintf("%.0f%%", $pg->{result}->{score} * 100)
+#: ContentGenerator/Problem.pm:1192
+#, fuzzy
+msgid "You received a score of %1 for this attempt."
+msgstr "Résultat pour cette tentative : %1."
+
+#
+#: ContentGenerator/Options.pm:157
+msgid "Your email address has been changed."
+msgstr "Votre courriel a été modifié."
+
+#
+#. ($lastScore,$notCountedMessage)
+#: ContentGenerator/Problem.pm:1194
+#, fuzzy
+msgid "Your overall recorded score is %1.  %2"
+msgstr "Le résultat final est : %1.  %2"
+
+#
+#: Authen.pm:416
+msgid "Your session has timed out due to inactivity. Please log in again."
+msgstr "Cette session est échue. Veuillez vous reconnecter"
+
+#
+#: ContentGenerator/ProblemSet.pm:273
+#: ContentGenerator/ProblemSets.pm:71
+#, fuzzy
+msgid "[edit]"
+msgstr "~[modifier~]"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:476
+msgid "_CLASSLIST_EDITOR_DESCRIPTION"
+msgstr "tr: This is the classlist editor page, where you can view and edit the records of all the students currently enrolled in this course.  The top of the page contains forms which allow you to filter which students to view, sort your students in a chosen order, edit student records, give new passwords to students, import/export student records from/to external files, or add/delete students.  To use, please select the action you would like to perform, enter in the relevant information in the fields below, and hit the \"Take Action!\" button at the bottom of the form.  The bottom of the page contains a table containing the student usernames and their information."
+
+#
+#. (CGI::strong($r->maketext($course)
+#: ContentGenerator/Login.pm:151
+msgid "_EXTERNAL_AUTH_MESSAGE"
+msgstr "%1 uses an external authentication system.  You've authenticated through that system, but aren't allowed to log in to this course."
+
+#
+#. (CGI::b($r->maketext("Guest Login")
+#: ContentGenerator/Login.pm:230
+msgid "_GUEST_LOGIN_MESSAGE"
+msgstr " This course supports guest logins. Click %1 to log into this course as a guest."
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:498
+msgid "_HMWKSETS_EDITOR_DESCRIPTION"
+msgstr "tr: This is the homework sets editor page where you can view and edit the homework sets that exist in this course and the problems that they contain. The top of the page contains forms which allow you to filter which sets to display in the table, sort the sets in a chosen order, edit homework sets, publish homework sets, import/export sets from/to an external file, score sets, or create/delete sets.  To use, please select the action you would like to perform, enter in the relevant information in the fields below, and hit the \"Take Action!\" button at the bottom of the form.  The bottom of the page contains a table displaying the sets and several pieces of relevant information."
+
+#
+#. (CGI::b($r->maketext("Remember Me")
+#: ContentGenerator/Login.pm:155
+msgid "_LOGIN_MESSAGE"
+msgstr "Si l'option %1 est cochée, le navigateur que vous utilisez retiendra le login et votre mot de passe que vous avez entré lors de visites ultérieures. Évitez d'utiliser cette fonctionnalité sur les ordinateurs publics, les ordinateurs qui ne sont pas sûrs ou qui n'ont pas de contrôle direct. Utilisez cette fonctionalité que pour les ordinateurs de confiance."
+
+#
+#. ($beginReducedScoringPeriod,$dueDate,$reducedScoringPerCent)
+#: ContentGenerator/ProblemSet.pm:333
+msgid "_REDUCED_CREDIT_MESSAGE_1"
+msgstr "tr: This assignment has a Reduced Credit Period that begins %1 and ends on the due date, %2.  During this period all additional work done counts %3% of the original."
+
+#
+#. ($beginReducedScoringPeriod,$dueDate,$reducedScoringPerCent)
+#: ContentGenerator/ProblemSet.pm:335
+msgid "_REDUCED_CREDIT_MESSAGE_2"
+msgstr "tr: This assignment had a Reduced Credit Period that began %1 and ended on the due date, %2.  During that period all additional work done counted %3% of the original."
+
+#
+#: ContentGenerator.pm:1951
+msgid "_REQUEST_ERROR"
+msgstr "WebWork a rencontré une erreur logicielle lors de la manipulation de ce problème. Le problème lui-même est susceptible d'être la cause de l'erreur. Si vous êtes un étudiant, mentionner l'erreur aux responsables du cours. Si vous avez les droits, alors vous pouvez voir le rapport d'erreur suivant."
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1358
+msgid "a duplicate of the first selected set"
+msgstr "tr: a duplicate of the first selected set"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1357
+msgid "a new empty set"
+msgstr "tr: a new empty set"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1479
+msgid "a single set"
+msgstr "tr: a single set"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1091
+#: ContentGenerator/Instructor/ProblemSetList.pm:1193
+#: ContentGenerator/Instructor/ProblemSetList.pm:1610
+#: ContentGenerator/Instructor/ProblemSetList.pm:689
+#: ContentGenerator/Instructor/ProblemSetList.pm:929
+#: ContentGenerator/Instructor/ProblemSetList.pm:989
+msgid "all sets"
+msgstr "tr: all sets"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1551
+#: ContentGenerator/Instructor/UserList.pm:1026
+#: ContentGenerator/Instructor/UserList.pm:1298
+#: ContentGenerator/Instructor/UserList.pm:651
+#: ContentGenerator/Instructor/UserList.pm:967
+msgid "all users"
+msgstr "tr: all users"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1196
+#: ContentGenerator/Instructor/UserList.pm:1226
+msgid "any users"
+msgstr "tr: any users"
+
+#
+#: ContentGenerator/Problem.pm:1165
+msgid "attempt"
+msgstr "essai"
+
+#
+#: ContentGenerator/Problem.pm:1162
+#: ContentGenerator/Problem.pm:1165
+msgid "attempts"
+msgstr "essais"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1726
+msgid "changes abandoned"
+msgstr "tr: changes abandoned"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1790
+msgid "changes saved"
+msgstr "tr: changes saved"
+
+#
+#: ContentGenerator/ProblemSets.pm:468
+msgid "closed, answers available"
+msgstr "échu, réponses disponibles"
+
+#
+#. ($self->formatDateTime($set->answer_date)
+#: ContentGenerator/ProblemSets.pm:464
+#, fuzzy
+msgid "closed, answers on %1"
+msgstr "échu, réponses disponibles le %1"
+
+#
+#: ContentGenerator/ProblemSets.pm:466
+msgid "closed, answers recently available"
+msgstr "échu, réponses disponibles depuis peu"
+
+#
+#: ContentGenerator/ProblemSets.pm:402
+#, fuzzy
+msgid "completed."
+msgstr "tr: completely"
+
+#
+#: ContentGenerator/Problem.pm:267
+msgid "completely"
+msgstr "tr: completely"
+
+#
+#: ContentGenerator/Problem.pm:264
+msgid "correct"
+msgstr "correct"
+
+#
+#. ($num)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1310
+#, fuzzy
+msgid "deleted %1 sets"
+msgstr "tr: deleted %1 sets"
+
+#
+#. ($num)
+#: ContentGenerator/Instructor/UserList.pm:1135
+#, fuzzy
+msgid "deleted %1 users"
+msgstr "tr: deleted %1 users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:947
+msgid "editing all sets"
+msgstr "tr: editing all sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:985
+msgid "editing all users"
+msgstr "tr: editing all users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:953
+msgid "editing selected sets"
+msgstr "tr: editing selected sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:991
+msgid "editing selected users"
+msgstr "tr: editing selected users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:950
+msgid "editing visible sets"
+msgstr "tr: editing visible sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:988
+msgid "editing visible users"
+msgstr "tr: editing visible users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:694
+msgid "enter matching set IDs below"
+msgstr "tr: enter matching set IDs below"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1665
+msgid "export abandoned"
+msgstr "tr: export abandoned"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1629
+msgid "exporting all sets"
+msgstr "tr: exporting all sets"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1636
+msgid "exporting selected sets"
+msgstr "tr: exporting selected sets"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1633
+msgid "exporting visible sets"
+msgstr "tr: exporting visible sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1044
+msgid "giving new passwords to all users"
+msgstr "tr: giving new passwords to all users"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1050
+msgid "giving new passwords to selected users"
+msgstr "tr: giving new passwords to selected users"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1047
+msgid "giving new passwords to visible users"
+msgstr "tr: giving new passwords to visible users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2522
+#: ContentGenerator/Problem.pm:603
+#, fuzzy
+msgid "hidden"
+msgstr "tr: Hidden"
+
+#
+#: ContentGenerator/Problem.pm:604
+#: ContentGenerator/ProblemSet.pm:86
+msgid "hidden from students"
+msgstr "tr: hidden from students"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:693
+msgid "hidden sets"
+msgstr "tr: hidden sets"
+
+#
+#: ContentGenerator/Problem.pm:266
+msgid "incorrect"
+msgstr "erroné"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1480
+msgid "multiple sets"
+msgstr "tr: multiple sets"
+
+#
+#: ContentGenerator/Problem.pm:864
+msgid "navNext"
+msgstr "Suivant"
+
+#
+#: ContentGenerator/Problem.pm:866
+msgid "navNextGrey"
+msgstr "Suivant"
+
+#
+#: ContentGenerator/Problem.pm:850
+msgid "navPrev"
+msgstr "Précédent"
+
+#
+#: ContentGenerator/Problem.pm:852
+msgid "navPrevGrey"
+msgstr "Précédent"
+
+#
+#: ContentGenerator/Problem.pm:856
+msgid "navProbList"
+msgstr "Liste de problèmes"
+
+#
+#: ContentGenerator/Problem.pm:858
+msgid "navProbListGrey"
+msgstr "Liste de problèmes"
+
+#
+#: ContentGenerator/ProblemSet.pm:110
+msgid "navUp"
+msgstr "Haut"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1090
+#: ContentGenerator/Instructor/ProblemSetList.pm:1192
+#: ContentGenerator/Instructor/ProblemSetList.pm:1269
+#: ContentGenerator/Instructor/ProblemSetList.pm:690
+#: ContentGenerator/Instructor/ProblemSetList.pm:988
+msgid "no sets"
+msgstr "tr: no sets"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1552
+#: ContentGenerator/Instructor/UserList.pm:1088
+#: ContentGenerator/Instructor/UserList.pm:1199
+#: ContentGenerator/Instructor/UserList.pm:1227
+#: ContentGenerator/Instructor/UserList.pm:652
+msgid "no users"
+msgstr "tr: no users"
+
+#
+#: ContentGenerator/ProblemSets.pm:430
+#: ContentGenerator/ProblemSets.pm:452
+msgid "now open, due "
+msgstr "Disponible, date de remise : "
+
+#
+#. ($self->formatDateTime($set->due_date()
+#: ContentGenerator/ProblemSets.pm:408
+#, fuzzy
+msgid "open: complete by %1"
+msgstr "Disponible : date de remise : %1"
+
+#
+#: ContentGenerator/ProblemSets.pm:405
+msgid "over time: closed."
+msgstr "Le temps est écoulé. Fin."
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1093
+#: ContentGenerator/Instructor/ProblemSetList.pm:1194
+#: ContentGenerator/Instructor/ProblemSetList.pm:1271
+#: ContentGenerator/Instructor/ProblemSetList.pm:1612
+#: ContentGenerator/Instructor/ProblemSetList.pm:691
+#: ContentGenerator/Instructor/ProblemSetList.pm:931
+#: ContentGenerator/Instructor/ProblemSetList.pm:991
+msgid "selected sets"
+msgstr "tr: selected sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1028
+#: ContentGenerator/Instructor/UserList.pm:1090
+#: ContentGenerator/Instructor/UserList.pm:1198
+#: ContentGenerator/Instructor/UserList.pm:1300
+#: ContentGenerator/Instructor/UserList.pm:653
+#: ContentGenerator/Instructor/UserList.pm:969
+msgid "selected users"
+msgstr "tr: selected users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:762
+msgid "showing all sets"
+msgstr "tr: showing all sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:738
+msgid "showing all users"
+msgstr "tr: showing all users"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:747
+msgid "showing matching users"
+msgstr "tr: showing matching users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:765
+msgid "showing no sets"
+msgstr "tr: showing no sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:741
+msgid "showing no users"
+msgstr "tr: showing no users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:768
+msgid "showing selected sets"
+msgstr "tr: showing selected sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:744
+msgid "showing selected users"
+msgstr "tr: showing selected users"
+
+#
+#: ContentGenerator/Problem.pm:1124
+#, fuzzy
+msgid "submitAnswers"
+msgstr "Soumettre ses réponses"
+
+#
+#: ContentGenerator/Problem.pm:1154
+msgid "time"
+msgstr "reprise"
+
+#
+#: ContentGenerator/Problem.pm:1154
+msgid "times"
+msgstr "reprises"
+
+#
+#: ContentGenerator/Problem.pm:1161
+#: ContentGenerator/ProblemSet.pm:427
+msgid "unlimited"
+msgstr "illimité"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:654
+msgid "users who match on selected field"
+msgstr "tr: users who match on selected field"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2522
+#: ContentGenerator/Problem.pm:603
+#, fuzzy
+msgid "visible"
+msgstr "tr: Visible"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1611
+#: ContentGenerator/Instructor/ProblemSetList.pm:692
+#: ContentGenerator/Instructor/ProblemSetList.pm:930
+msgid "visible sets"
+msgstr "tr: visible sets"
+
+#
+#: ContentGenerator/Problem.pm:604
+#: ContentGenerator/ProblemSet.pm:86
+msgid "visible to students"
+msgstr "tr: visible to students"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1027
+#: ContentGenerator/Instructor/UserList.pm:1197
+#: ContentGenerator/Instructor/UserList.pm:1299
+#: ContentGenerator/Instructor/UserList.pm:968
+msgid "visible users"
+msgstr "tr: visible users"
+
+#
+#. ($self->formatDateTime($set->open_date)
+#: ContentGenerator/ProblemSets.pm:420
+#: ContentGenerator/ProblemSets.pm:448
+#, fuzzy
+msgid "will open on %1"
+msgstr "sera disponible le %1"
+
+#
+#
+msgid "Add to which set?"
+msgstr "tr: Add to which set?"
+
+#
+msgid "Course Information for course [_1]"
+msgstr "tr: Course Information for course %1"
+
+#
+msgid "report bugs in this problem"
+msgstr "tr: report bugs in this problem"
+
+#
+msgid "Problem [_1]"
+msgstr "Problème %1"
+
+#
+msgid "Cancel Password"
+msgstr "tr: Cancel Password"
+
+#
+msgid "WeBWorK"
+msgstr "WeBWorK"
+
+#
+msgid "Audit"
+msgstr "tr: Enrolled"
+
+#
+msgid "Hardcopy Header for set [_1]"
+msgstr "tr: Hardcopy Header for set %1"
+
+#
+msgid "Report bugs in a WeBWorK question/problem using this link. The very first time you do this you will need to register with an email address so that information on the bug fix can be reported back to you."
+msgstr "tr: Report bugs in a WeBWorK question/problem using this link. The very first time you do this you will need to register with an email address so that information on the bug fix can be reported back to you."
+
+#
+msgid "Pad Fields"
+msgstr "Remplir les champs"
+
+#
+msgid "Set Header for set [_1]"
+msgstr "tr: Set Header for set %1"
+
+#
+#, fuzzy
+msgid "Statistics for [_1]"
+msgstr "Statistiques"
+
+#
+msgid "Filter"
+msgstr "tr: Filter"
+
+#
+msgid "set [_1]/problem [_2]"
+msgstr "tr: set %1/problem %2"
+
+#
+msgid "You are not authorized to modify problems."
+msgstr "tr: You are not authorized to modify problems."
+
+#
+msgid "hardcopy header file"
+msgstr "tr: hardcopy header file"
+
+#
+msgid "Write permissions have not been enabled in the templates directory.  No changes can be made."
+msgstr "tr: Write permissions have not been enabled in the templates directory.  No changes can be made."
+
+#
+msgid "Save [_1] and View"
+msgstr "tr: Save %1 and View"
+
+#
+msgid "Create"
+msgstr "tr: Create"
+
+#
+msgid "Changes in this file have not yet been permanently saved."
+msgstr "tr: Changes in this file have not yet been permanently saved."
+
+#
+msgid "Instructor Tools"
+msgstr "Outils pour l'enseignant"
+
+#
+msgid "Score"
+msgstr "Résultat"
+
+#
+msgid "Show in another window"
+msgstr "Afficher dans une autre fenêtre"
+
+#
+msgid "Copied auxiliary files from [_1] to  new location at [_2]"
+msgstr "Les fichiers auxiliares de %1 ont été copiés dans %2"
+
+#
+msgid "Unpublished"
+msgstr "Non publié"
+
+#
+#, fuzzy
+msgid "Login"
+msgstr "tr: Login Name"
+
+#
+msgid "Email"
+msgstr "Courriel"
+
+#
+msgid "File Manager"
+msgstr "Gestionnaire de fichiers"
+
+#
+msgid "Unable to change the hardcopy header for set [_1]. Unknown error."
+msgstr "Impossible de modifier l'entête d'impression du devoir %1. Erreur inconnue."
+
+#
+msgid "Unable to make '[_1]' the set header for [_2]"
+msgstr "Impossible de faire de '%1' l'entête du devoir %2"
+
+#
+msgid "Can't determine user of temporary edit file [_1]."
+msgstr "Impossible de déterminer l'utilisateur du fichier temporaire : %1."
+
+#
+msgid "Download a hardcopy of this homework set."
+msgstr "Télécharger une copie de ce devoir."
+
+#
+msgid "Problem Editor"
+msgstr "Éditeur de problèmes"
+
+#
+msgid "The file '[_1]' is protected!"
+msgstr "Le fichier '%1' est protégé."
+
+#
+msgid "Top level of author information on the wiki."
+msgstr "tr: Top level of author information on the wiki."
+
+#
+msgid "Score selected set(s) and save to:"
+msgstr "Sauvegarder les résultats sélectionnés sous"
+
+#
+msgid "Save Password"
+msgstr "Enregistrer le mot de passe"
+
+#
+msgid "The file '[_1]' is a blank problem!"
+msgstr "Le fichier '%1' est un problème vierge!"
+
+#
+msgid "Add as what filetype?"
+msgstr "Spécifier le type du fichier"
+
+#
+msgid "no action"
+msgstr "aucune action"
+
+#
+msgid "Added '[_1]' to [_2] as new set header"
+msgstr "tr: Added '%1' to %2 as new set header"
+
+#
+msgid "View statistics by set"
+msgstr "Statistiques par devoir"
+
+#
+msgid "Set"
+msgstr "Devoirs"
+
+#
+msgid "This is a blank problem template file and can not be edited directly. Use the 'Save as' action below to create a local copy of the file and add it to the current problem set."
+msgstr "Ceci est un fichier modèle d'un problème vierge et on ne peut le modifier directement. Utiliser la fonction \"Enregistrer sous\" pour créer une copie locale du fichier et l'ajouter au devoir courant."
+
+#
+msgid "Logout"
+msgstr "Déconnexion"
+
+#
+msgid "You do not have permission to view the details of this error."
+msgstr "Les droits qui vous sont assignés ne permettent pas de voir les détails de cette erreur."
+
+#
+msgid "Reverting to original file '[_1]'"
+msgstr "Revenir au fichier original '%1'"
+
+#
+msgid "Delete"
+msgstr "Supprimer"
+
+#
+msgid "Wiki summary page for MathObjects"
+msgstr "Sommaire Wiki de MathObjects"
+
+#
+msgid "Your score was recorded."
+msgstr "Votre résultat a été enregistré"
+
+#
+msgid "You must specify an file name in order to save a new file."
+msgstr "Spécifier un nom au fichier pour l'enregistrer."
+
+#
+msgid "To edit this text you must first make a copy of this file using the 'Save as' action below."
+msgstr "Pour modifier ce texte, d'abord faire une copie du fichier à l'aide de la fonction \"Enregistrer sous\"."
+
+#
+msgid "unassigned problem file"
+msgstr "Fichier de problèmes non assigné."
+
+#
+msgid "View statistics by student"
+msgstr "Statistiques par étudiant"
+
+#
+msgid "Publish"
+msgstr "Publier"
+
+#
+msgid "Password/Email"
+msgstr "Mot de passe/courriel"
+
+#
+msgid "Cancel Edit"
+msgstr "Annuler la modification"
+
+#
+msgid "Math Objects"
+msgstr "Math Objects"
+
+#
+msgid "Snippets of PG code illustrating specific techniques"
+msgstr "Bouts de code PG illustrant des techniques spécifiques"
+
+#
+msgid "Error copying [_1] to [_2]"
+msgstr "Erreur lors de la copie de %1 vers %2"
+
+#
+msgid "Hmwk Sets Editor"
+msgstr "Éditeur de devoirs"
+
+#
+msgid "This set is [_1] students."
+msgstr "Ce devoir est %1 pour les étudiants."
+
+#
+msgid "header file"
+msgstr "Fichier d'entête"
+
+#
+msgid "Include Index"
+msgstr "Inclure l'index"
+
+#
+msgid "Display Mode"
+msgstr "Mode d'affichage"
+
+#
+msgid "You can earn partial credit on this problem."
+msgstr "Vous pouvez obtenir une partie des points pour ce problème."
+
+#
+msgid "Write permissions have not been enabled in '[_1]'.  Changes must be saved to a different directory for viewing."
+msgstr "Il n'est pas permis d'écrire dans le dossier '%1'.  Les modifications doivent d'abord être enregistrées dans un autre dossier."
+
+#
+msgid "blank problem"
+msgstr "Problème vierge"
+
+#
+msgid "Save Edit"
+msgstr "Enregistrer la modification"
+
+#
+msgid "Enrolled"
+msgstr "Inscrit"
+
+#
+msgid "Write permissions have not been enabled for '[_1]'.  Changes must be saved to another file for viewing."
+msgstr "Il n'est pas permis d'écrire dans '%1'.  Les modifications doivent d'abord être enregistrées dans un autre fichier."
+
+#
+msgid "Note: this problem viewer is for viewing purposes only. As of right now, testing functionality is not possible."
+msgstr "tr: Note: this problem viewer is for viewing purposes only. As of right now, testing functionality is not possible."
+
+#
+msgid "Save Export"
+msgstr "Enregistrer l'exportation"
+
+#
+msgid "webwork"
+msgstr "webwork"
+
+#
+msgid "Problem Viewer"
+msgstr "tr: Problem Viewer"
+
+#
+msgid "submit button clicked"
+msgstr "On a appuyé sur le bouton Soumission"
+
+#
+#, fuzzy
+msgid "Student Progress for [_1]"
+msgstr "Progrès des étudiants"
+
+#
+msgid "A new file has been created at '[_1]' with the contents below. No changes have been made to set [_2]."
+msgstr "Un nouveau fichier nommé '%1' a été créé avec le contenu ci-dessous. Aucune modification n'a été appliquée au devoir %2."
+
+#
+msgid "Your score was not recorded because this problem has not been assigned to you."
+msgstr "Votre résultat n'a pas été enregistré car ce problème ne vous a pas été assigné."
+
+#
+msgid "Sort"
+msgstr "Trier"
+
+#
+msgid "Add problem"
+msgstr "Ajouter un problème"
+
+#
+msgid "Author Info"
+msgstr "À propos de l'auteur"
+
+#
+msgid "Replace [_1]"
+msgstr "Remplacer %1"
+
+#
+msgid "Help"
+msgstr "Aide"
+
+#
+msgid "Add Users"
+msgstr "Ajouter des usagers"
+
+#
+msgid "Problem Source Code"
+msgstr "Code source du problème"
+
+#
+msgid "Test snippets of PG code in interactive lab.  Good way to learn PG language."
+msgstr "Tester des bouts de code PG dans un labo interactif.  Une bonne façon d'apprendre le langage PG."
+
+#
+#, fuzzy
+msgid "Page generated at [_1] at [_2]"
+msgstr "tr: Page generated at %1"
+
+#
+msgid "Import"
+msgstr "Importer"
+
+#
+msgid "View Using Seed Number"
+msgstr "tr: View Using Seed Number"
+
+#
+msgid "Grades"
+msgstr "Résultats"
+
+#
+msgid "Published"
+msgstr "Publié"
+
+#
+msgid "Your score was not recorded because this homework set is closed."
+msgstr "Votre résultat n'a pas été enregistré car la date de remise est passée."
+
+#
+msgid "The text box now contains the source of the original problem. You can recover lost edits by using the Back button on your browser."
+msgstr "La boîte de saisie contient actuellement le code source du problème original. Les modifications perdues peuvent être retrouvées en utilisant le bouton précédent de son fureteur web."
+
+#
+msgid "The file '[_1]' is a directory!"
+msgstr "Le fichier '%1' est en fait un dossier!"
+
+#
+msgid "Save As"
+msgstr "Enregistrer sous [TMPL]/"
+
+#
+msgid "Documentation from source code for PG modules and macro files. Often the most up-to-date information."
+msgstr "Documentation des modules PG et des fichiers de macro à partir du code source. Il s'agit souvent de l'information la plus à jour."
+
+#
+msgid "Problem Techniques"
+msgstr "Techniques de problèmes"
+
+#
+msgid "Course Configuration"
+msgstr "Configuration du cours"
+
+#
+msgid "Feedback"
+msgstr "Commentaires"
+
+#
+msgid "Export"
+msgstr "Exporter"
+
+#
+msgid "PG mark down syntax used to format WeBWorK questions. This interactive lab can help you to learn the techniques."
+msgstr "Syntaxe PG utilisée pour formater les questions WeBWorK. Ce labo interactif peut vous aider à apprendre les techniques."
+
+#
+msgid "Record Scores for Single Sets"
+msgstr "Ajouter les résultats de chaque devoir"
+
+#
+msgid "Append to end of set [_1]"
+msgstr "Ajouter à la fin du devoir %1"
+
+#
+msgid "Unrecognized saveMode: |[_1]|. Unknown error."
+msgstr "Méthode d'enregistrement inconnue |%1|. Erreur inconnue."
+
+#
+msgid "Your score was not recorded because there was a failure in storing the problem record to the database."
+msgstr "Votre résultat n'a pas été enregistré à cause d'une défaillance dans le processus d'enregistrement dans la base de données."
+
+#
+msgid "The hardcopy header for set [_1] has been renamed to '[_2]'."
+msgstr "L'entête d'impression du devoir %1 a été renommée '%2'."
+
+#
+msgid "Save as"
+msgstr "Enregistrer sous"
+
+#
+msgid "Select action below"
+msgstr "Sélectionner une action"
+
+#
+msgid "The file '[_1]' cannot be found."
+msgstr "Impossible de trouver le fichier '%1'"
+
+#
+msgid "Unable to write to '[_1]': [_2]"
+msgstr "Impossible d'écrire dans  '%1': %2"
+
+#
+msgid "Save"
+msgstr "Enregistrer"
+
+#
+msgid "File '[_1]' exists. File not saved. No changes have been made. You can change the file path for this problem manually from the 'Hmwk Sets Editor' page"
+msgstr "Le fichier '%1' existe déjà. Le fichier ne sera pas enregistré. Aucun changement n'a été effectué. Il est possible de modifier manuellement le chemin de ce fichier par le biais de l'éditeur de devoirs."
+
+#
+msgid "The set header for set [_1] has been renamed to '[_2]'."
+msgstr "L'entête de devoir pour le devoir %1 a été renommée par '%2'."
+
+#
+msgid "Error: This path is already in the temporary edit directory -- no new temporary file is created. path = [_1]"
+msgstr "Erreur : ce fichier existe déjà dans le dossier temporaire -- aucun nouveau fichier na été créé. Chemin = %1"
+
+#
+msgid "Please use radio buttons to choose the method for saving this file. Can't recognize saveMode: |[_1]|."
+msgstr "Veuillez sélectionner la méthode d'enregistrement à l'aide des boutons radio. Impossible d'identifier le mode d'enregistrement : |%1|."
+
+#
+msgid "Saved to file '[_1]'"
+msgstr "Fichier  '%1' enregistré"
+
+#
+msgid "Please specify a file to save to."
+msgstr "Spécifier où le fichier doit être enregistré."
+
+#
+msgid "The selected problem ([_1]) is not a valid problem for set [_2]."
+msgstr "Le problème choisi (%1) n'est pas valide pour l'ensemble %2."
+
+#
+msgid "Editing [_1] in file '[_2]'"
+msgstr "Modification de %1 du fichier '%2'"
+
+#
+msgid "Deleting temp file at [_1]"
+msgstr "Destruction du fichier temporaire %1"
+
+#
+msgid "hidden from"
+msgstr "invisible"
+
+#
+#, fuzzy
+msgid "View student progress by set"
+msgstr "Progrès des étudiants"
+
+#
+msgid "View"
+msgstr "Voir"
+
+#
+msgid "Resources"
+msgstr "Ressources"
+
+#
+msgid "Scoring Download"
+msgstr "Télécharger les résultats"
+
+#
+msgid "Duplicate"
+msgstr "Dupliquer"
+
+#
+msgid "This path |[_1]| is not the path to a temporary edit file."
+msgstr "Ce chemin |%1| ne décrit pas un fichier temporaire modifiable"
+
+#
+msgid "visible to"
+msgstr "visible"
+
+#
+msgid "Unable to change the source file path for set [_1], problem [_2]. Unknown error."
+msgstr "Impossible de modifier le chemin du fichier source du devoir %1, problème %2. Erreur inconnue."
+
+#
+msgid "Course Administration"
+msgstr "Administration du cours"
+
+#
+msgid "Added [_1] to [_2] as problem [_3]"
+msgstr "Le problème %1 a été ajouté à %2 en tant que problème %3"
+
+#
+msgid "Options Information"
+msgstr "Information sur les options"
+
+#
+msgid "Proctor"
+msgstr "tr: Proctor"
+
+#
+msgid "Student Progress"
+msgstr "Progrès des étudiants"
+
+#
+msgid "Revert"
+msgstr "tr: Revert"
+
+#
+msgid "Statistics"
+msgstr "Statistiques"
+
+#
+msgid "Save as new independent problem"
+msgstr "Enregistrer en tant que nouveau problème indépendant"
+
+#
+msgid "Scoring Tools"
+msgstr "Exporter les résultats"
+
+#
+msgid "The source file for 'set [_1] / problem [_2]' has been changed from [_3] to '[_4]'."
+msgstr "Le fichier source du 'devoir %1 / problème %2' a été changé de %3 à '%4'."
+
+#
+msgid "Cancel Export"
+msgstr "Annuler l'exportation"
+
+#
+msgid "View student progress by student"
+msgstr "Voir le progrès individuel d'un étudiant"
+
+#
+msgid "Revert to [_1]"
+msgstr "Retourner à %1"
+
+#
+msgid "Classlist Editor"
+msgstr "Liste d'usagers"
+
+#
+msgid "Add"
+msgstr "Ajouter"
+
+#
+msgid "the original path to the file is [_1]"
+msgstr "Le chemin original de ce fichier est %1"
+
+#
+msgid "The path to the original file should be absolute"
+msgstr "Le chemin du fichier original devrait être décrit de manière absolue"
+
+#
+msgid "To edit this text you must use the 'Save AS' action below to save it to another file."
+msgstr "Pour modifier ce texte, utiliser l'action \"Enregistrer sous\" offerte plus bas pour l'enregistrer dans un autre fichier."
+
+#
+msgid "Error: The original file [_1] cannot be read."
+msgstr "Erreur : Le fichier original %1 ne peut être lu."
+
+#
+msgid "Unable to change the set header for set [_1]. Unknown error."
+msgstr "Impossible de modifier l'entête du devoir %1. Erreur inconnue."
+
+#
+msgid "options information"
+msgstr "Information sur les options"
+
+#
+msgid "The selected problem([_1]) is not a valid problem for set [_2]."
+msgstr "Le problème choisi(%1) n'est pas valide pour le devoir %2."
+
+#
+msgid "Unknown file type"
+msgstr "Format de fichier inconnu"
+
+#
+msgid "course information"
+msgstr "Information sur le cours"
+
+#
+msgid "Change User Options"
+msgstr "Changer les options d'usager"
+
+#
+msgid "Drop"
+msgstr "tr: Drop"
+
+#
+msgid "Solutions"
+msgstr "Solutions"
+
+#
+msgid "Show:"
+msgstr "Afficher : "
+
+#
+msgid "WeBWorK Assignment [_1] is due : [_2]."
+msgstr "Date de remise du devoir %1 : %2"
+
+#
+msgid "Hardcopy Generator"
+msgstr "Imprimer dans un fichier"
+
+#
+msgid "This set is visible to students."
+msgstr "Les étudiants voient ce devoir."
+
+#
+msgid "View equations as"
+msgstr "Afficher les équations à l'aide de"
+
+#
+msgid "From:"
+msgstr "De :"
+
+#
+msgid "Generate Hardcopy"
+msgstr "Générer le fichier"
+
+#
+msgid "You may choose to show any of the following data. Correct answers and solutions are only available after the answer date of the homework set."
+msgstr "Options. Les bonnes réponses et les solutions ne sont disponibles qu'après la date de remise."
+
+#
+msgid "E-mail Instructor"
+msgstr "Envoyer un courriel à l'enseignant"
+
+#
+msgid "Send E-mail:"
+msgstr "Envoyer"
+
+#
+msgid "Cancel Email"
+msgstr "Annuler"
+
+#
+msgid "E-mail:"
+msgstr "Corps du message :"
+
+#
+msgid "Correct answers"
+msgstr "Bonnes réponses"
+
+#
+msgid "Use this form to report to your professor a problem with the WeBWorK system or an error in a problem you are attempting. Along with your message, additional information about the state of the system will be included."
+msgstr "Utiliser ce formulaire pour signaler à l'enseignant un problème avec le système WeBWorK ou une erreur dans un problème d'un devoir. Des informations additionnelles sur l'état du système utilisé accompagneront votre message."
+
+#
+msgid "Student answers"
+msgstr "Réponses de l'étudiant"
+
+#
+msgid "Hints"
+msgstr "Indices"
+
+#
+msgid "Hardcopy Format:"
+msgstr "Format :"
+
diff --git a/lib/WeBWorK/Localize/heb.mo b/lib/WeBWorK/Localize/heb.mo
new file mode 100644
index 0000000000..0f37e1efb6
Binary files /dev/null and b/lib/WeBWorK/Localize/heb.mo differ
diff --git a/lib/WeBWorK/Localize/heb.po b/lib/WeBWorK/Localize/heb.po
new file mode 100644
index 0000000000..0c5d8929ab
--- /dev/null
+++ b/lib/WeBWorK/Localize/heb.po
@@ -0,0 +1,2524 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: WeBWorK Online Homework System\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-12-10 17:46-0500\n"
+"Last-Translator: Michael Gage <gage@math.rochester.edu>\n"
+"Language-Team: WeBWorK language team <gage@math.rochester.edu>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Hebrew\n"
+"X-Poedit-Country: ISRAEL\n"
+
+#
+#. ($name, $vnum)
+#: ContentGenerator/ProblemSets.pm:416
+#, fuzzy
+msgid "%1 (test %2)"
+msgstr "tr: %1 (test %2)"
+
+#
+#. ($numAdded, $numSkipped, join(", ", @$skipped)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1581
+#, fuzzy
+msgid "%1 sets added, %2 sets skipped. Skipped sets: (%3)"
+msgstr "tr: %1 sets exported, %2 sets skipped. Skipped sets: (%3)"
+
+#
+#. ($numExported, $numSkipped, (($numSkipped)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1701
+#, fuzzy
+msgid "%1 sets exported, %2 sets skipped. Skipped sets: (%3)"
+msgstr "tr: %1 sets exported, %2 sets skipped. Skipped sets: (%3)"
+
+#
+#. ($name)
+#: ContentGenerator/ProblemSets.pm:427
+#: ContentGenerator/ProblemSets.pm:441
+#, fuzzy
+msgid "%1 test"
+msgstr "tr: %1 test"
+
+#
+#. (scalar @userIDsToExport, $dir, $fileName)
+#: ContentGenerator/Instructor/UserList.pm:1385
+#, fuzzy
+msgid "%1 users exported to file %2/%3"
+msgstr "tr: %1 users exported to file %2/%3"
+
+#
+#. ($numReplaced, $numAdded, $numSkipped, join (", ", @$skipped)
+#: ContentGenerator/Instructor/UserList.pm:1269
+#, fuzzy
+msgid "%1 users replaced, %2 users added, %3 users skipped. Skipped users: (%4)"
+msgstr "tr: %1 users replaced, %2 users added, %3 users skipped.  Skipped users: (%4)"
+
+#
+#. (int($answerScore*100)
+#: ContentGenerator/Problem.pm:265
+#, fuzzy
+msgid "%1% correct"
+msgstr "נכון [1_]%"
+
+#
+#. ($e_user_name)
+#: ContentGenerator/Options.pm:171
+#, fuzzy
+msgid "%1's Current Address"
+msgstr "%1 için Mevcut Adres"
+
+#
+#. ($user_name)
+#: ContentGenerator/Options.pm:126
+#, fuzzy
+msgid "%1's Current Password"
+msgstr "%1 için Mevcut Şifre"
+
+#
+#. ($e_user_name)
+#: ContentGenerator/Options.pm:175
+#, fuzzy
+msgid "%1's New Address"
+msgstr "%1 için Yeni Adres"
+
+#
+#. ($e_user_name)
+#: ContentGenerator/Options.pm:130
+#, fuzzy
+msgid "%1's New Password"
+msgstr "%1 için Yeni Şifre"
+
+#
+#. ($e_user_name)
+#: ContentGenerator/Options.pm:101
+#, fuzzy
+msgid "%1's new password cannot be blank."
+msgstr "%1 için yeni şifre boş bırakılamaz."
+
+#
+#. ($e_user_name)
+#: ContentGenerator/Options.pm:84
+#, fuzzy
+msgid "%1's password has been changed."
+msgstr "%1 adlı kullanıcının şifresi değiştirildi."
+
+#
+#. ($setID, $problemID)
+#: ContentGenerator/Problem.pm:884
+#, fuzzy
+msgid "%1: Problem %2"
+msgstr "בעיה [2_[1_]"
+
+#
+#. ($numBlanks)
+#: ContentGenerator/Problem.pm:319
+msgid "%quant(%1,of the questions remains,of the questions remain) unanswered."
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:1188
+msgid "(This problem will not count towards your grade.)"
+msgstr "(Bu soru notunuzu etkilemeyecektir.)"
+
+#
+#: ContentGenerator/Problem.pm:1299
+msgid "ANSWERS ONLY CHECKED -- ANSWERS NOT RECORDED"
+msgstr "YANITLAR SADECE KONTROL EDÄ°LÄ°YOR -- YANITLAR KAYDEDÄ°LMEDÄ°"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1708
+#: ContentGenerator/Instructor/UserList.pm:1391
+#: ContentGenerator/Instructor/UserList.pm:1463
+msgid "Abandon changes"
+msgstr "tr: Abandon changes"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1647
+msgid "Abandon export"
+msgstr "tr: Abandon export"
+
+#
+#. ($eUserID)
+#: ContentGenerator.pm:848
+#, fuzzy
+msgid "Acting as %1. "
+msgstr "%1 gibi davranılıyor."
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1927
+msgid "Active"
+msgstr "tr: Active"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1142
+msgid "Add how many students?"
+msgstr "tr: Add how many students?"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1220
+msgid "Add which new users?"
+msgstr "tr: Add which new users?"
+
+#
+#: ContentGenerator/Problem.pm:311
+msgid "All of the answers above are correct."
+msgstr "Yanıtların tümü doğru"
+
+#
+#. ($verb)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1052
+#, fuzzy
+msgid "All selected sets %1 all students"
+msgstr "tr: All selected sets %1 all students"
+
+#
+#. ($verb)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1046
+#, fuzzy
+msgid "All sets %1 all students"
+msgstr "tr: All sets %1 all students"
+
+#
+#. ($verb)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1049
+#, fuzzy
+msgid "All visible sets %1 all students"
+msgstr "tr: All visible sets %1 all students"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:446
+#: ContentGenerator/Instructor/ProblemSetList.pm:832
+#: ContentGenerator/Instructor/ProblemSetList.pm:870
+msgid "Answer Date"
+msgstr "tr: Answer Date"
+
+#
+#: ContentGenerator/Problem.pm:242
+msgid "Answer Preview"
+msgstr "תצוגה מקדימה של תשובות"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:531
+msgid "Any changes made below will be reflected in the set for ALL students."
+msgstr "tr: Any changes made below will be reflected in the set for ALL students."
+
+#
+#: ContentGenerator.pm:1481
+msgid "Apply Options"
+msgstr "tr: Apply Options"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1545
+msgid "Assign this set to which users?"
+msgstr "tr: Assign this set to which users?"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2064
+#, fuzzy
+msgid "Assigned Sets"
+msgstr "tr: Edit Assigned Users"
+
+#
+#. ($fully)
+#: ContentGenerator/Problem.pm:315
+#, fuzzy
+msgid "At least one of the answers above is NOT %1correct."
+msgstr "Yanıtların en az bir tanesi %1doğru değil."
+
+#
+#: ContentGenerator/ProblemSet.pm:350
+msgid "Attempts"
+msgstr "ניסיונות"
+
+#
+#. ($eUserID,$@)
+#: ContentGenerator/Options.pm:71
+#, fuzzy
+msgid "Can't get password record for effective user '%1': %2"
+msgstr "Can't get password record for effective user '%1': %2"
+
+#
+#. ($userID,$@)
+#: ContentGenerator/Options.pm:68
+#, fuzzy
+msgid "Can't get password record for user '%1': %2"
+msgstr "Can't get password record for user '%1': %2"
+
+#
+#: ContentGenerator/Options.pm:142
+msgid "Change Email Address"
+msgstr "E-posta Adresi DeÄŸiÅŸtir"
+
+#
+#: ContentGenerator/Options.pm:61
+msgid "Change Password"
+msgstr "Åžifre DeÄŸiÅŸtir"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1409
+#: ContentGenerator/Instructor/UserList.pm:1481
+#, fuzzy
+msgid "Changes abandoned"
+msgstr "tr: changes abandoned"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1457
+#, fuzzy
+msgid "Changes saved"
+msgstr "tr: changes saved"
+
+#
+#: ContentGenerator/Problem.pm:1118
+msgid "Check Answers"
+msgstr "בדוק תשובות"
+
+#
+#: ContentGenerator/Problem.pm:1227
+msgid "Checking additional error messages"
+msgstr "tr: Checking additional error messages"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1011
+msgid "Choose visibility of the sets to be affected"
+msgstr "tr: Choose visibility of the sets to be affected"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1084
+#: ContentGenerator/Instructor/ProblemSetList.pm:982
+msgid "Choose which sets to be affected"
+msgstr "tr: Choose which sets to be affected"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:597
+#: ContentGenerator/Instructor/UserList.pm:550
+#: ContentGenerator/ProblemSets.pm:288
+msgid "Clear"
+msgstr "tr: Clear"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:562
+#, fuzzy
+msgid "Click on the login name to edit individual problem set data, (e.g. due dates) for these students."
+msgstr "tr: Click on the login name to edit individual problem set data, (e.g. due dates) for these students."
+
+#
+#: ContentGenerator/ProblemSets.pm:435
+msgid "Closed"
+msgstr "tr: Closed"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2072
+#: ContentGenerator/Instructor/UserList.pm:290
+#: ContentGenerator/Instructor/UserList.pm:818
+#: ContentGenerator/Instructor/UserList.pm:861
+#: ContentGenerator/Instructor/UserList.pm:904
+msgid "Comment"
+msgstr "tr: Comment"
+
+#
+#. ($e_user_name)
+#: ContentGenerator/Options.pm:134
+#: ContentGenerator/Options.pm:95
+#, fuzzy
+msgid "Confirm %1's New Password"
+msgstr "%1 için Şifre Onayı"
+
+#
+#: ContentGenerator/Login.pm:206
+msgid "Continue"
+msgstr "tr: Continue"
+
+#
+#: ContentGenerator/Problem.pm:243
+msgid "Correct"
+msgstr "נכון"
+
+#
+#. ($e_user_name,$@)
+#: ContentGenerator/Options.pm:80
+#, fuzzy
+msgid "Couldn't change %1's password: %2"
+msgstr "%1 adlı kullanıcının şifresi değiştirilemedi: %2"
+
+#
+#. ($@)
+#: ContentGenerator/Options.pm:153
+#, fuzzy
+msgid "Couldn't change your email address: %1"
+msgstr "E-posta adresiniz deÄŸiÅŸtirilemedi: %1"
+
+#
+#: ContentGenerator/ProblemSets.pm:71
+#: ContentGenerator/ProblemSets.pm:73
+msgid "Course Info"
+msgstr "מידע על הקורס"
+
+#
+#: ContentGenerator.pm:657
+#: ContentGenerator/Home.pm:94
+msgid "Courses"
+msgstr "קורסי�"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1351
+msgid "Create as what type of set?"
+msgstr "tr: Create as what type of set?"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1263
+#: ContentGenerator/Instructor/UserList.pm:1082
+msgid "Delete how many?"
+msgstr "tr: Delete how many?"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1119
+msgid "Disable"
+msgstr "tr: Disable"
+
+#
+#: ContentGenerator.pm:1442
+msgid "Display Options"
+msgstr "tr: Display Options"
+
+#
+#. ($pl)
+#: ContentGenerator/ProblemSets.pm:283
+#, fuzzy
+msgid "Download Hardcopy for Selected %plural(%1,Set,Sets)"
+msgstr "Seçili Setleri Yazdır: [plural,_1,Set,Sets]"
+
+#
+#: ContentGenerator/ProblemSet.pm:321
+msgid "Download PDF or TeX Hardcopy for Current Set"
+msgstr "tr: Download PDF or TeX Hardcopy for Current Set"
+
+#
+#: ContentGenerator/ProblemSets.pm:289
+msgid "Download PDF or TeX Hardcopy for Selected Sets"
+msgstr "tr: Download PDF or TeX Hardcopy for Selected Sets"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:445
+#: ContentGenerator/Instructor/ProblemSetList.pm:831
+#: ContentGenerator/Instructor/ProblemSetList.pm:869
+msgid "Due Date"
+msgstr "tr: Due Date"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1812
+msgid "Duplicate this set and name it"
+msgstr "tr: Duplicate this set and name it"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1720
+#: ContentGenerator/Instructor/UserList.pm:1785
+#: ContentGenerator/Instructor/UserList.pm:1818
+msgid "Edit"
+msgstr "tr: Edit"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:603
+msgid "Edit All Set Data"
+msgstr "tr: Edit All Set Data"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:439
+msgid "Edit Assigned Users"
+msgstr "tr: Edit Assigned Users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:438
+msgid "Edit Problems"
+msgstr "tr: Edit Problems"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:441
+msgid "Edit Set Data"
+msgstr "tr: Edit Set Data"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:961
+msgid "Edit Which Users?"
+msgstr "tr: Edit Which Users?"
+
+#
+#: ContentGenerator/Problem.pm:1011
+msgid "Edit this problem"
+msgstr "tr: Edit this problem"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:923
+msgid "Edit which sets?"
+msgstr "tr: Edit which sets?"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2067
+#: ContentGenerator/Instructor/UserList.pm:285
+#: ContentGenerator/Instructor/UserList.pm:813
+#: ContentGenerator/Instructor/UserList.pm:856
+#: ContentGenerator/Instructor/UserList.pm:899
+msgid "Email Address"
+msgstr "tr: Email Address"
+
+#
+#: ContentGenerator.pm:1526
+#: ContentGenerator.pm:1549
+#: ContentGenerator.pm:1572
+msgid "Email instructor"
+msgstr "מדריך דו�"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1120
+msgid "Enable"
+msgstr "tr: Enable"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:604
+msgid "Enable Reduced Credit"
+msgstr "tr: Enable Reduced Credit"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1113
+msgid "Enable/Disable reduced scoring for selected sets"
+msgstr "tr: Enable/Disable reduced scoring for selected sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:815
+#: ContentGenerator/Instructor/UserList.pm:858
+#: ContentGenerator/Instructor/UserList.pm:901
+msgid "Enrollment Status"
+msgstr "tr: Enrollment Status"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1321
+msgid "Enter filename below"
+msgstr "tr: Enter filename below"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1502
+msgid "Enter filenames below"
+msgstr "tr: Enter filenames below"
+
+#
+#: ContentGenerator/Problem.pm:240
+msgid "Entered"
+msgstr "נכנסו"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1671
+msgid "Export selected sets"
+msgstr "tr: Export selected sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1317
+msgid "Export to what kind of file?"
+msgstr "tr: Export to what kind of file?"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1604
+msgid "Export which sets?"
+msgstr "tr: Export which sets?"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1292
+msgid "Export which users?"
+msgstr "tr: Export which users?"
+
+#
+#. ($@)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1435
+#, fuzzy
+msgid "Failed to create new set: %1"
+msgstr "tr: Failed to duplicate set: %1"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1374
+msgid "Failed to create new set: no set name specified!"
+msgstr "tr: Failed to create new set: no set name specified!"
+
+#
+#. ($@)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1848
+#, fuzzy
+msgid "Failed to duplicate set: %1"
+msgstr "tr: Failed to duplicate set: %1"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1832
+msgid "Failed to duplicate set: no set name specified!"
+msgstr "tr: Failed to duplicate set: no set name specified!"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1396
+#: ContentGenerator/Instructor/ProblemSetList.pm:1830
+msgid "Failed to duplicate set: no set selected for duplication!"
+msgstr "tr: Failed to duplicate set: no set selected for duplication!"
+
+#
+#. ($newSetID)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1834
+#, fuzzy
+msgid "Failed to duplicate set: set %1 already exists!"
+msgstr "tr: Failed to duplicate set: set %1 already exists!"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1339
+msgid "Filename"
+msgstr "tr: Filename"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:678
+msgid "Filter by what text?"
+msgstr "tr: Filter by what text?"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2065
+#: ContentGenerator/Instructor/UserList.pm:283
+#: ContentGenerator/Instructor/UserList.pm:811
+#: ContentGenerator/Instructor/UserList.pm:854
+#: ContentGenerator/Instructor/UserList.pm:897
+msgid "First Name"
+msgstr "tr: First Name"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1020
+msgid "Give new password to which users?"
+msgstr "tr: Give new password to which users?"
+
+#
+#: ContentGenerator/Login.pm:231
+msgid "Guest Login"
+msgstr "tr: Guest Login"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:443
+#: ContentGenerator/Instructor/ProblemSetList.pm:829
+#: ContentGenerator/Instructor/ProblemSetList.pm:867
+msgid "Hardcopy Header"
+msgstr "tr: Hardcopy Header"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1017
+msgid "Hidden"
+msgstr "tr: Hidden"
+
+#
+#: ContentGenerator.pm:667
+#: ContentGenerator/ProblemSet.pm:110
+#: ContentGenerator/ProblemSets.pm:226
+msgid "Homework Sets"
+msgstr "שיעורי בית"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:558
+msgid "If a password field is left blank, the student's current password will be maintained."
+msgstr "tr: If a password field is left blank, the student's current password will be maintained."
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1498
+msgid "Import from where?"
+msgstr "tr: Import from where?"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1473
+msgid "Import how many sets?"
+msgstr "tr: Import how many sets?"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1520
+msgid "Import sets with names"
+msgstr "tr: Import sets with names"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1165
+msgid "Import users from what file?"
+msgstr "tr: Import users from what file?"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1927
+msgid "Inactive"
+msgstr "tr: Inactive"
+
+#
+#: Authen.pm:148
+msgid "Invalid user ID or password."
+msgstr "Yanlış kullanıcı adı ya da şifre."
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2066
+#: ContentGenerator/Instructor/UserList.pm:284
+#: ContentGenerator/Instructor/UserList.pm:812
+#: ContentGenerator/Instructor/UserList.pm:855
+#: ContentGenerator/Instructor/UserList.pm:898
+msgid "Last Name"
+msgstr "tr: Last Name"
+
+#
+#: ContentGenerator.pm:730
+msgid "Library Browser"
+msgstr "דפדפן ספרייה"
+
+#
+#: ContentGenerator.pm:731
+#, fuzzy
+msgid "Library Browser 2"
+msgstr "דפדפן ספרייה"
+
+#
+#: ContentGenerator/Logout.pm:124
+msgid "Log In Again"
+msgstr "Tekrar giriÅŸ yap"
+
+#
+#: ContentGenerator.pm:845
+#: ContentGenerator.pm:847
+msgid "Log Out"
+msgstr "יצי�ה"
+
+#
+#. ($userID)
+#: ContentGenerator.pm:845
+#: ContentGenerator.pm:847
+#, fuzzy
+msgid "Logged in as %1. "
+msgstr "היכנס כ-[1_]."
+
+#
+#: ContentGenerator/Login.pm:74
+#: ContentGenerator/Login.pm:77
+msgid "Login Info"
+msgstr "tr: Login Info"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2062
+#: ContentGenerator/Instructor/UserList.pm:282
+#: ContentGenerator/Instructor/UserList.pm:810
+#: ContentGenerator/Instructor/UserList.pm:853
+#: ContentGenerator/Instructor/UserList.pm:896
+msgid "Login Name"
+msgstr "tr: Login Name"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2063
+#, fuzzy
+msgid "Login Status"
+msgstr "Durumu"
+
+#
+#: ContentGenerator.pm:654
+msgid "Main Menu"
+msgstr "תפריט ר�שי"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:705
+msgid "Match on what? (separate multiple IDs with commas)"
+msgstr "tr: Match on what? (separate multiple IDs with commas)"
+
+#
+#: ContentGenerator/Problem.pm:245
+msgid "Messages"
+msgstr "הודעות"
+
+#
+#: ContentGenerator/ProblemSet.pm:349
+#: ContentGenerator/ProblemSets.pm:212
+#: ContentGenerator/ProblemSets.pm:213
+msgid "Name"
+msgstr "ש�"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1328
+msgid "Name the new set"
+msgstr "tr: Name the new set"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1937
+#: ContentGenerator/Instructor/UserList.pm:2077
+msgid "New Password"
+msgstr "tr: New Password"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1519
+msgid "New passwords saved"
+msgstr "tr: New passwords saved"
+
+#
+#: ContentGenerator/Problem.pm:864
+#: ContentGenerator/Problem.pm:866
+msgid "Next Problem"
+msgstr "בעיה הב�ה"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2625
+#: ContentGenerator/Instructor/ProblemSetList.pm:2626
+msgid "No"
+msgstr "tr: No"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1043
+#: ContentGenerator/Instructor/ProblemSetList.pm:1145
+msgid "No change made to any set"
+msgstr "tr: No change made to any set"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1217
+msgid "No sets selected for scoring"
+msgstr "tr: No sets selected for scoring"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:266
+#, fuzzy
+msgid "No sets selected for scoring."
+msgstr "tr: No sets selected for scoring"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2722
+msgid "No sets shown.  Choose one of the options above to list the sets in the course."
+msgstr "tr: No sets shown.  Choose one of the options above to list the sets in the course."
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2110
+#, fuzzy
+msgid ""
+"No students shown.  Choose one of the options above to \n"
+"\t              list the students in the course."
+msgstr "tr: No students shown.  Choose one of the options above to list the students in the course."
+
+#
+#: ContentGenerator.pm:851
+msgid "Not logged in."
+msgstr "ל� רשו� ב."
+
+#
+#: ContentGenerator/Problem.pm:975
+msgid "Note"
+msgstr "tr: Note"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:444
+#: ContentGenerator/Instructor/ProblemSetList.pm:830
+#: ContentGenerator/Instructor/ProblemSetList.pm:868
+msgid "Open Date"
+msgstr "tr: Open Date"
+
+#
+#: ContentGenerator/Problem.pm:1307
+msgid "PREVIEW ONLY -- ANSWERS NOT RECORDED"
+msgstr "GÖSTERİM -- YANITLAR KAYDEDİLMEDİ "
+
+#
+#. (timestamp($self)
+#: ContentGenerator.pm:953
+#, fuzzy
+msgid "Page generated at %1"
+msgstr "tr: Page generated at %1"
+
+#
+#: ContentGenerator/Login.pm:202
+msgid "Password"
+msgstr "סיסמ�"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2073
+#: ContentGenerator/Instructor/UserList.pm:291
+#: ContentGenerator/Instructor/UserList.pm:819
+#: ContentGenerator/Instructor/UserList.pm:862
+#: ContentGenerator/Instructor/UserList.pm:905
+msgid "Permission Level"
+msgstr "tr: Permission Level"
+
+#
+#. (CGI::b($r->maketext($course)
+#: ContentGenerator/Login.pm:154
+#, fuzzy
+msgid "Please enter your username and password for %1 below:"
+msgstr "הכנס ש� משתמש וסיסמ� ב-[1_]"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:396
+msgid "Please select action to be performed."
+msgstr "tr: Please select action to be performed."
+
+#
+#: ContentGenerator/Problem.pm:1116
+msgid "Preview Answers"
+msgstr "הר�ה תשובות"
+
+#
+#: ContentGenerator/Problem.pm:850
+#: ContentGenerator/Problem.pm:852
+msgid "Previous Problem"
+msgstr "בעיה קודמת"
+
+#
+#. ($problemID)
+#: ContentGenerator.pm:686
+#: ContentGenerator/Problem.pm:808
+#: ContentGenerator/ProblemSet.pm:424
+#, fuzzy
+msgid "Problem %1"
+msgstr "tr: Problem"
+
+#
+#: ContentGenerator/Problem.pm:856
+#: ContentGenerator/Problem.pm:858
+msgid "Problem List"
+msgstr "רשימת בעיות"
+
+#
+#: ContentGenerator/Problem.pm:796
+#: ContentGenerator/ProblemSet.pm:346
+msgid "Problems"
+msgstr "בעיות"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2071
+#: ContentGenerator/Instructor/UserList.pm:289
+#: ContentGenerator/Instructor/UserList.pm:817
+#: ContentGenerator/Instructor/UserList.pm:860
+#: ContentGenerator/Instructor/UserList.pm:903
+msgid "Recitation"
+msgstr "tr: Recitation"
+
+#
+#. ($verb)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1148
+#, fuzzy
+msgid "Reduced Credit %1 for all sets"
+msgstr "tr: Reduced Credit %1 for all sets"
+
+#
+#. ($verb)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1154
+#, fuzzy
+msgid "Reduced Credit %1 for selected sets"
+msgstr "tr: Reduced Credit %1 for selected sets"
+
+#
+#. ($verb)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1151
+#, fuzzy
+msgid "Reduced Credit %1 for visable sets"
+msgstr "tr: Reduced Credit %1 for visable sets"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2523
+msgid "Reduced Credit Disabled"
+msgstr "tr: Reduced Credit Disabled"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2523
+#: ContentGenerator/Instructor/ProblemSetList.pm:448
+msgid "Reduced Credit Enabled"
+msgstr "tr: Reduced Credit Enabled"
+
+#
+#. ($beginReducedScoringPeriod)
+#: ContentGenerator/ProblemSets.pm:459
+#, fuzzy
+msgid "Reduced Credit Starts: %1"
+msgstr "tr: Reduced Credit Starts: %1"
+
+#
+#: ContentGenerator/ProblemSet.pm:351
+msgid "Remaining"
+msgstr "נש�ר"
+
+#
+#: ContentGenerator/Login.pm:204
+msgid "Remember Me"
+msgstr "tr: Remember Me"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1190
+msgid "Replace which users?"
+msgstr "tr: Replace which users?"
+
+#
+#: ContentGenerator.pm:799
+msgid "Report bugs"
+msgstr "דווח על וירוסי�"
+
+#
+#: ContentGenerator/Problem.pm:244
+msgid "Result"
+msgstr "תוצ�ות"
+
+#
+#. (CGI::i($self->$actionHandler(\%genericParams, \%actionParams, \%tableParams)
+#: ContentGenerator/Instructor/UserList.pm:376
+#, fuzzy
+msgid "Result of last action performed: %1"
+msgstr "tr: Result of last action performed: %1"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:386
+msgid "Results of last action performed"
+msgstr "tr: Results of last action performed"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1732
+#: ContentGenerator/Instructor/UserList.pm:1415
+#: ContentGenerator/Instructor/UserList.pm:1487
+msgid "Save changes"
+msgstr "tr: Save changes"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1186
+msgid "Score which sets?"
+msgstr "tr: Score which sets?"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2070
+#: ContentGenerator/Instructor/UserList.pm:288
+#: ContentGenerator/Instructor/UserList.pm:816
+#: ContentGenerator/Instructor/UserList.pm:859
+#: ContentGenerator/Instructor/UserList.pm:902
+msgid "Section"
+msgstr "tr: Section"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:582
+msgid "Select all sets"
+msgstr "tr: Select all sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:535
+msgid "Select all users"
+msgstr "tr: Select all users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:534
+#: ContentGenerator/Instructor/UserList.pm:512
+msgid "Select an action to perform"
+msgstr "tr: Select an action to perform"
+
+#
+#. ($newSetID)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1375
+#, fuzzy
+msgid "Set %1 exists.  No set created"
+msgstr "tr: Set %1 exists.  No set created"
+
+#: ContentGenerator/Instructor/ProblemSetList.pm:440
+msgid "Set Definition Filename"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:442
+#: ContentGenerator/Instructor/ProblemSetList.pm:828
+#: ContentGenerator/Instructor/ProblemSetList.pm:866
+msgid "Set Header"
+msgstr "tr: Set Header"
+
+#
+#: ContentGenerator/ProblemSet.pm:273
+#: ContentGenerator/ProblemSet.pm:275
+msgid "Set Info"
+msgstr "tr: Set Info"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2700
+msgid "Set List"
+msgstr "tr: Set List"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:827
+#: ContentGenerator/Instructor/ProblemSetList.pm:865
+msgid "Set Name"
+msgstr "tr: Set Name"
+
+#
+#: ContentGenerator/ProblemSet.pm:153
+msgid "Sets"
+msgstr "tr: Sets"
+
+#
+#: ContentGenerator/Problem.pm:1063
+msgid "Show Hints"
+msgstr "הר�ה רמזי�"
+
+#
+#: ContentGenerator/Problem.pm:1370
+msgid "Show Past Answers"
+msgstr "Önceki Yanıtları Göster"
+
+#
+#: ContentGenerator/Problem.pm:1082
+msgid "Show Solutions"
+msgstr "הר�ה פתרונות"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:645
+msgid "Show Which Users?"
+msgstr "tr: Show Which Users?"
+
+#
+#: ContentGenerator/Problem.pm:1044
+msgid "Show correct answers"
+msgstr "Doğru yanıtları göster"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:683
+msgid "Show which sets?"
+msgstr "tr: Show which sets?"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:497
+#: ContentGenerator/Instructor/UserList.pm:475
+msgid "Show/Hide Site Description"
+msgstr "tr: Show/Hide Site Description"
+
+#
+#. (scalar @visibleSetIDs, scalar @allSetIDs)
+#: ContentGenerator/Instructor/ProblemSetList.pm:607
+#, fuzzy
+msgid "Showing %1 out of %2 sets."
+msgstr "tr: Showing %1 out of %2 sets."
+
+#
+#. (scalar @Users, scalar @allUserIDs)
+#: ContentGenerator/Instructor/UserList.pm:556
+#, fuzzy
+msgid "Showing %1 out of %2 users"
+msgstr "tr: Showing %1 out of %2 users"
+
+#
+#: ContentGenerator/Login.pm:96
+#: ContentGenerator/Login.pm:99
+msgid "Site Information"
+msgstr "tr: Site Information"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:821
+#: ContentGenerator/Instructor/UserList.pm:804
+msgid "Sort by"
+msgstr "tr: Sort by"
+
+#
+#. ($names{$primary}, $names{$secondary})
+#: ContentGenerator/Instructor/ProblemSetList.pm:899
+#, fuzzy
+msgid "Sort by %1 and then by %2"
+msgstr "tr: Sort by %1 and then by %2"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2069
+#: ContentGenerator/Instructor/UserList.pm:287
+#: ContentGenerator/ProblemSet.pm:353
+#: ContentGenerator/ProblemSets.pm:215
+#: ContentGenerator/ProblemSets.pm:216
+msgid "Status"
+msgstr "Durumu"
+
+#
+#: ContentGenerator.pm:848
+msgid "Stop Acting"
+msgstr "Rol Yapmayı bırak"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2068
+#: ContentGenerator/Instructor/UserList.pm:286
+#: ContentGenerator/Instructor/UserList.pm:814
+#: ContentGenerator/Instructor/UserList.pm:857
+#: ContentGenerator/Instructor/UserList.pm:900
+msgid "Student ID"
+msgstr "tr: Student ID"
+
+#
+#: ContentGenerator/Problem.pm:1127
+msgid "Submit Answers"
+msgstr "שלח תשובות"
+
+#
+#. ($effectiveUser)
+#: ContentGenerator/Problem.pm:1124
+#, fuzzy
+msgid "Submit Answers for %1"
+msgstr "שלח תשובות של [1_]"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1850
+msgid "Success"
+msgstr "tr: Success"
+
+#. ($newSetID)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1437
+msgid "Successfully created new set %1"
+msgstr ""
+
+#
+#. ($name)
+#: ContentGenerator/ProblemSets.pm:424
+#: ContentGenerator/ProblemSets.pm:433
+#: ContentGenerator/ProblemSets.pm:439
+#, fuzzy
+msgid "Take %1 test"
+msgstr "tr: Take %1 test"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:598
+#: ContentGenerator/Instructor/UserList.pm:551
+msgid "Take Action!"
+msgstr "tr: Take Action!"
+
+#
+#: ContentGenerator/ProblemSets.pm:236
+msgid "Test Date"
+msgstr "tr: Test Date"
+
+#
+#: ContentGenerator/ProblemSets.pm:235
+msgid "Test Score"
+msgstr "tr: Test Score"
+
+#
+#: ContentGenerator.pm:954
+msgid "The WeBWorK Project"
+msgstr "tr: The WeBWorK Project"
+
+#
+#. ($fully)
+#: ContentGenerator/Problem.pm:307
+#, fuzzy
+msgid "The answer above is NOT %1correct."
+msgstr "Yukarıdaki yanıt %1doğru değil."
+
+#
+#: ContentGenerator/Problem.pm:305
+msgid "The answer above is correct."
+msgstr "Yukarıdaki yanıt doğru."
+
+#
+#. (CGI::b($r->maketext("[_1]'s Current Password",$user_name)
+#: ContentGenerator/Options.pm:107
+#, fuzzy
+msgid ""
+"The password you entered in the %1 \n"
+"\t\t\t\t\t\tfield does not match your current\n"
+"\t\t\t\t\t\tpassword. Please retype your current password and try\n"
+"\t\t\t\t\t\tagain."
+msgstr "%1 alanına girdiğiniz şifre ile mevcut şifreniz uyuşmamaktadır. Lütfen şirfenizi girerek tekrar deneyiniz."
+
+#
+#. (CGI::b($r->maketext("[_1]'s New Password",$e_user_name)
+#: ContentGenerator/Options.pm:91
+#, fuzzy
+msgid ""
+"The passwords you entered in the \n"
+"\t\t\t\t\t\t\t\t%1 and %2\n"
+"\t\t\t\t\t\t\t\tfields don't match. Please retype your new password and try\n"
+"\t\t\t\t\t\t\t\tagain."
+msgstr "%1 ve %2  alanlarına girdiğiniz şifreler uyuşmadı. Yeni şifrenizi girerek tekrar deneyiniz."
+
+#
+#. ($setName,$effectiveUser)
+#: ContentGenerator/ProblemSet.pm:308
+#, fuzzy
+msgid "The selected problem set (%1) is not a valid set for %2"
+msgstr "tr: The selected problem set (%1) is not a valid set for %2"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:859
+#: ContentGenerator/Instructor/UserList.pm:847
+#: ContentGenerator/Instructor/UserList.pm:890
+msgid "Then by"
+msgstr "tr: Then by"
+
+#
+#: ContentGenerator/ProblemSet.pm:365
+msgid "This homework set contains no problems."
+msgstr "Bu soru grubunda soru bulunmamaktadır."
+
+#
+#: ContentGenerator/Problem.pm:1175
+msgid "This homework set is closed."
+msgstr "Bu soru grubu kapalı."
+
+#
+#: ContentGenerator/Problem.pm:1173
+msgid "This homework set is not yet open."
+msgstr "Bu soru grubu henüz açık değil."
+
+#
+#: ContentGenerator/Problem.pm:611
+msgid "This problem will not count towards your grade."
+msgstr "Bu soru, notunuzu etkilemeyecektir."
+
+#
+#. (CGI::font({class=>$visiblityStateClass}, $visiblityStateText)
+#: ContentGenerator/Problem.pm:605
+#: ContentGenerator/ProblemSet.pm:88
+#, fuzzy
+msgid "This set is %1"
+msgstr "tr: This set is %1"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:588
+msgid "Unselect all sets"
+msgstr "tr: Unselect all sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:541
+msgid "Unselect all users"
+msgstr "tr: Unselect all users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2683
+msgid "Use System Default"
+msgstr "tr: Use System Default"
+
+#
+#: ContentGenerator/Login.pm:200
+msgid "Username"
+msgstr "ש� משתמש"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2087
+msgid "Users List"
+msgstr "tr: Users List"
+
+#
+#. ($names{$primary}, $names{$secondary}, $names{$ternary})
+#: ContentGenerator/Instructor/UserList.pm:938
+#, fuzzy
+msgid "Users sorted by %1, then by %2, then by %3"
+msgstr "tr: Users sorted by %1, then by %2, then by %3"
+
+#
+#: ContentGenerator/ProblemSet.pm:230
+msgid "Viewing temporary file"
+msgstr "tr: Viewing temporary file"
+
+#
+#: ContentGenerator/Problem.pm:1332
+#: ContentGenerator/ProblemSets.pm:63
+msgid "Viewing temporary file: "
+msgstr "Geçici dosya görüntüleniyor: "
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:833
+#: ContentGenerator/Instructor/ProblemSetList.pm:871
+msgid "Visibility"
+msgstr "tr: Visibility"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1018
+#: ContentGenerator/Instructor/ProblemSetList.pm:447
+msgid "Visible"
+msgstr "tr: Visible"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1259
+#: ContentGenerator/Instructor/UserList.pm:1078
+msgid "Warning: Deletion destroys all user-related data and is not undoable!"
+msgstr "tr: Warning: Deletion destroys all user-related data and is not undoable!"
+
+#
+#: ContentGenerator/Home.pm:87
+msgid "Welcome to WeBWorK!"
+msgstr "!WebWork ברוכי� הב�י� ל-"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:665
+msgid "What field should filtered users match on?"
+msgstr "tr: What field should filtered users match on?"
+
+#
+#: ContentGenerator/ProblemSet.pm:352
+msgid "Worth"
+msgstr "DeÄŸeri"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2625
+#: ContentGenerator/Instructor/ProblemSetList.pm:2626
+msgid "Yes"
+msgstr "tr: Yes"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:306
+#: ContentGenerator/Instructor/ProblemSetList.pm:418
+#: ContentGenerator/Instructor/UserList.pm:262
+msgid "You are not authorized to access the instructor tools."
+msgstr "tr: You are not authorized to access the instructor tools."
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:339
+msgid "You are not authorized to modify homework sets."
+msgstr "tr: You are not authorized to modify homework sets."
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:344
+msgid "You are not authorized to modify set definition files."
+msgstr "tr: You are not authorized to modify set definition files."
+
+#
+#: ContentGenerator/Instructor/UserList.pm:329
+#: ContentGenerator/Instructor/UserList.pm:335
+#, fuzzy
+msgid "You are not authorized to modify student data"
+msgstr "tr: You are not authorized to modify student data."
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:389
+#: ContentGenerator/Instructor/UserList.pm:380
+msgid "You are not authorized to perform this action."
+msgstr "tr: You are not authorized to perform this action."
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1121
+msgid "You cannot delete yourself!"
+msgstr "tr: You cannot delete yourself!"
+
+#
+#: ContentGenerator/Options.pm:163
+#: ContentGenerator/Options.pm:180
+msgid "You do not have permission to change email addresses."
+msgstr "Adres değiştirmek için yetkiniz yok."
+
+#
+#: ContentGenerator/Options.pm:117
+#: ContentGenerator/Options.pm:139
+msgid "You do not have permission to change your password."
+msgstr "Şifre değiştirmek için yetkiniz yok."
+
+#
+#. ($attemptsLeft,$attemptsLeftNoun)
+#: ContentGenerator/Problem.pm:1196
+#, fuzzy
+msgid "You have %1 %2 remaining."
+msgstr "%1 %2 kaldı."
+
+#
+#. ($attemptsLeft)
+#: ContentGenerator/Problem.pm:1197
+#, fuzzy
+msgid "You have %negquant(%1,unlimited attempts,attempt,attempts) remaining."
+msgstr "[negquant,_1,Sınırsız deneme hakkı,deneme hakkı,deneme hakkı] kaldı."
+
+#
+#. ($attempts)
+#: ContentGenerator/Problem.pm:1191
+#, fuzzy
+msgid "You have attempted this problem %quant(%1,time,times)."
+msgstr "Bu soru için [quant,_1,deneme hakkı,deneme hakkı] kullandınız."
+
+#
+#: ContentGenerator/Logout.pm:119
+msgid "You have been logged out of WeBWorK."
+msgstr "WeBWorK sisteminden çıkış yaptınız."
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1933
+msgid "You may not change your own password here!"
+msgstr "tr: You may not change your own password here!"
+
+#
+#: Authen.pm:317
+msgid "You must specify a user ID."
+msgstr "Bir kullanıcı adı girmelisiniz."
+
+#
+#. (sprintf("%.0f%%", $pg->{result}->{score} * 100)
+#: ContentGenerator/Problem.pm:1192
+#, fuzzy
+msgid "You received a score of %1 for this attempt."
+msgstr "Bu soru için %1 puan aldınız."
+
+#
+#: ContentGenerator/Options.pm:157
+msgid "Your email address has been changed."
+msgstr "E-posta adresiniz deÄŸiÅŸtirildi."
+
+#
+#. ($lastScore,$notCountedMessage)
+#: ContentGenerator/Problem.pm:1194
+#, fuzzy
+msgid "Your overall recorded score is %1.  %2"
+msgstr "Ortalama puanınız: %1.  %2"
+
+#
+#: Authen.pm:416
+msgid "Your session has timed out due to inactivity. Please log in again."
+msgstr "Oturumunuz zaman aşımına uğradı. Lütfen tekrar giriş yapınız."
+
+#
+#: ContentGenerator/ProblemSet.pm:273
+#: ContentGenerator/ProblemSets.pm:71
+#, fuzzy
+msgid "[edit]"
+msgstr "עריכה []"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:476
+msgid "_CLASSLIST_EDITOR_DESCRIPTION"
+msgstr "tr: This is the classlist editor page, where you can view and edit the records of all the students currently enrolled in this course.  The top of the page contains forms which allow you to filter which students to view, sort your students in a chosen order, edit student records, give new passwords to students, import/export student records from/to external files, or add/delete students.  To use, please select the action you would like to perform, enter in the relevant information in the fields below, and hit the \"Take Action!\" button at the bottom of the form.  The bottom of the page contains a table containing the student usernames and their information."
+
+#
+#. (CGI::strong($r->maketext($course)
+#: ContentGenerator/Login.pm:151
+msgid "_EXTERNAL_AUTH_MESSAGE"
+msgstr "%1 uses an external authentication system.  You've authenticated through that system, but aren't allowed to log in to this course."
+
+#
+#. (CGI::b($r->maketext("Guest Login")
+#: ContentGenerator/Login.pm:230
+msgid "_GUEST_LOGIN_MESSAGE"
+msgstr "tr: This course supports guest logins. Click %1 to log into this course as a guest."
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:498
+msgid "_HMWKSETS_EDITOR_DESCRIPTION"
+msgstr "tr: This is the homework sets editor page where you can view and edit the homework sets that exist in this course and the problems that they contain. The top of the page contains forms which allow you to filter which sets to display in the table, sort the sets in a chosen order, edit homework sets, publish homework sets, import/export sets from/to an external file, score sets, or create/delete sets.  To use, please select the action you would like to perform, enter in the relevant information in the fields below, and hit the \"Take Action!\" button at the bottom of the form.  The bottom of the page contains a table displaying the sets and several pieces of relevant information."
+
+#
+#. (CGI::b($r->maketext("Remember Me")
+#: ContentGenerator/Login.pm:155
+msgid "_LOGIN_MESSAGE"
+msgstr "If you check %1 your login information will be remembered by the browser you are using, allowing you to visit WeBWorK pages without typing your user name and password (until your session expires). This feature is not safe for public workstations, untrusted machines, and machines over which you do not have direct control."
+
+#
+#. ($beginReducedScoringPeriod,$dueDate,$reducedScoringPerCent)
+#: ContentGenerator/ProblemSet.pm:333
+msgid "_REDUCED_CREDIT_MESSAGE_1"
+msgstr "tr: This assignment has a Reduced Credit Period that begins %1 and ends on the due date, %2.  During this period all additional work done counts %3% of the original."
+
+#
+#. ($beginReducedScoringPeriod,$dueDate,$reducedScoringPerCent)
+#: ContentGenerator/ProblemSet.pm:335
+msgid "_REDUCED_CREDIT_MESSAGE_2"
+msgstr "tr: This assignment had a Reduced Credit Period that began %1 and ended on the due date, %2.  During that period all additional work done counted %3% of the original."
+
+#
+#: ContentGenerator.pm:1951
+msgid "_REQUEST_ERROR"
+msgstr " WebWork bu problemi işlerken bir yazılım hatası ile karşılaştı. Problemin kendisinde bir hata olması muhtemeldir. Eğer bir öğrenci iseniz bu hatayı ilgili kişilere bildiriniz. Eğer yetkili bir kişiyseniz daha fazla bilgi için alttaki hata raporunu inceleyiniz."
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1358
+msgid "a duplicate of the first selected set"
+msgstr "tr: a duplicate of the first selected set"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1357
+msgid "a new empty set"
+msgstr "tr: a new empty set"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1479
+msgid "a single set"
+msgstr "tr: a single set"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1091
+#: ContentGenerator/Instructor/ProblemSetList.pm:1193
+#: ContentGenerator/Instructor/ProblemSetList.pm:1610
+#: ContentGenerator/Instructor/ProblemSetList.pm:689
+#: ContentGenerator/Instructor/ProblemSetList.pm:929
+#: ContentGenerator/Instructor/ProblemSetList.pm:989
+msgid "all sets"
+msgstr "tr: all sets"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1551
+#: ContentGenerator/Instructor/UserList.pm:1026
+#: ContentGenerator/Instructor/UserList.pm:1298
+#: ContentGenerator/Instructor/UserList.pm:651
+#: ContentGenerator/Instructor/UserList.pm:967
+msgid "all users"
+msgstr "tr: all users"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1196
+#: ContentGenerator/Instructor/UserList.pm:1226
+msgid "any users"
+msgstr "tr: any users"
+
+#
+#: ContentGenerator/Problem.pm:1165
+msgid "attempt"
+msgstr "ניסיון"
+
+#
+#: ContentGenerator/Problem.pm:1162
+#: ContentGenerator/Problem.pm:1165
+msgid "attempts"
+msgstr "ניסיונות"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1726
+msgid "changes abandoned"
+msgstr "tr: changes abandoned"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1790
+msgid "changes saved"
+msgstr "tr: changes saved"
+
+#
+#: ContentGenerator/ProblemSets.pm:468
+msgid "closed, answers available"
+msgstr "סגור, תשובות זמינות"
+
+#
+#. ($self->formatDateTime($set->answer_date)
+#: ContentGenerator/ProblemSets.pm:464
+#, fuzzy
+msgid "closed, answers on %1"
+msgstr "סגור, תשובות ב-[1_],"
+
+#
+#: ContentGenerator/ProblemSets.pm:466
+msgid "closed, answers recently available"
+msgstr "סגור, תשובות זמינות �חרונות"
+
+#
+#: ContentGenerator/ProblemSets.pm:402
+#, fuzzy
+msgid "completed."
+msgstr "tr: completely"
+
+#
+#: ContentGenerator/Problem.pm:267
+msgid "completely"
+msgstr "tr: completely"
+
+#
+#: ContentGenerator/Problem.pm:264
+msgid "correct"
+msgstr "נכון"
+
+#
+#. ($num)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1310
+#, fuzzy
+msgid "deleted %1 sets"
+msgstr "tr: deleted %1 sets"
+
+#
+#. ($num)
+#: ContentGenerator/Instructor/UserList.pm:1135
+#, fuzzy
+msgid "deleted %1 users"
+msgstr "tr: deleted %1 users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:947
+msgid "editing all sets"
+msgstr "tr: editing all sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:985
+msgid "editing all users"
+msgstr "tr: editing all users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:953
+msgid "editing selected sets"
+msgstr "tr: editing selected sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:991
+msgid "editing selected users"
+msgstr "tr: editing selected users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:950
+msgid "editing visible sets"
+msgstr "tr: editing visible sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:988
+msgid "editing visible users"
+msgstr "tr: editing visible users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:694
+msgid "enter matching set IDs below"
+msgstr "tr: enter matching set IDs below"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1665
+msgid "export abandoned"
+msgstr "tr: export abandoned"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1629
+msgid "exporting all sets"
+msgstr "tr: exporting all sets"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1636
+msgid "exporting selected sets"
+msgstr "tr: exporting selected sets"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1633
+msgid "exporting visible sets"
+msgstr "tr: exporting visible sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1044
+msgid "giving new passwords to all users"
+msgstr "tr: giving new passwords to all users"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1050
+msgid "giving new passwords to selected users"
+msgstr "tr: giving new passwords to selected users"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1047
+msgid "giving new passwords to visible users"
+msgstr "tr: giving new passwords to visible users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2522
+#: ContentGenerator/Problem.pm:603
+#, fuzzy
+msgid "hidden"
+msgstr "tr: Hidden"
+
+#
+#: ContentGenerator/Problem.pm:604
+#: ContentGenerator/ProblemSet.pm:86
+msgid "hidden from students"
+msgstr "tr: hidden from students"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:693
+msgid "hidden sets"
+msgstr "tr: hidden sets"
+
+#
+#: ContentGenerator/Problem.pm:266
+msgid "incorrect"
+msgstr "ל� נכון"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1480
+msgid "multiple sets"
+msgstr "tr: multiple sets"
+
+#
+#: ContentGenerator/Problem.pm:864
+msgid "navNext"
+msgstr "tr:&nbspNext"
+
+#
+#: ContentGenerator/Problem.pm:866
+msgid "navNextGrey"
+msgstr "tr:&nbspNext"
+
+#
+#: ContentGenerator/Problem.pm:850
+msgid "navPrev"
+msgstr "tr:&nbspPrev"
+
+#
+#: ContentGenerator/Problem.pm:852
+msgid "navPrevGrey"
+msgstr "tr:&nbspPrev"
+
+#
+#: ContentGenerator/Problem.pm:856
+msgid "navProbList"
+msgstr "tr:&nbspUp"
+
+#
+#: ContentGenerator/Problem.pm:858
+msgid "navProbListGrey"
+msgstr "tr:&nbspUp"
+
+#
+#: ContentGenerator/ProblemSet.pm:110
+msgid "navUp"
+msgstr "tr:&nbspUp"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1090
+#: ContentGenerator/Instructor/ProblemSetList.pm:1192
+#: ContentGenerator/Instructor/ProblemSetList.pm:1269
+#: ContentGenerator/Instructor/ProblemSetList.pm:690
+#: ContentGenerator/Instructor/ProblemSetList.pm:988
+msgid "no sets"
+msgstr "tr: no sets"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1552
+#: ContentGenerator/Instructor/UserList.pm:1088
+#: ContentGenerator/Instructor/UserList.pm:1199
+#: ContentGenerator/Instructor/UserList.pm:1227
+#: ContentGenerator/Instructor/UserList.pm:652
+msgid "no users"
+msgstr "tr: no users"
+
+#
+#: ContentGenerator/ProblemSets.pm:430
+#: ContentGenerator/ProblemSets.pm:452
+msgid "now open, due "
+msgstr "פתח עכשיו מכיוון ש"
+
+#
+#. ($self->formatDateTime($set->due_date()
+#: ContentGenerator/ProblemSets.pm:408
+#, fuzzy
+msgid "open: complete by %1"
+msgstr "tr: completely"
+
+#
+#: ContentGenerator/ProblemSets.pm:405
+msgid "over time: closed."
+msgstr "ת� הזמן: סגור"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1093
+#: ContentGenerator/Instructor/ProblemSetList.pm:1194
+#: ContentGenerator/Instructor/ProblemSetList.pm:1271
+#: ContentGenerator/Instructor/ProblemSetList.pm:1612
+#: ContentGenerator/Instructor/ProblemSetList.pm:691
+#: ContentGenerator/Instructor/ProblemSetList.pm:931
+#: ContentGenerator/Instructor/ProblemSetList.pm:991
+msgid "selected sets"
+msgstr "tr: selected sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1028
+#: ContentGenerator/Instructor/UserList.pm:1090
+#: ContentGenerator/Instructor/UserList.pm:1198
+#: ContentGenerator/Instructor/UserList.pm:1300
+#: ContentGenerator/Instructor/UserList.pm:653
+#: ContentGenerator/Instructor/UserList.pm:969
+msgid "selected users"
+msgstr "tr: selected users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:762
+msgid "showing all sets"
+msgstr "tr: showing all sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:738
+msgid "showing all users"
+msgstr "tr: showing all users"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:747
+msgid "showing matching users"
+msgstr "tr: showing matching users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:765
+msgid "showing no sets"
+msgstr "tr: showing no sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:741
+msgid "showing no users"
+msgstr "tr: showing no users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:768
+msgid "showing selected sets"
+msgstr "tr: showing selected sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:744
+msgid "showing selected users"
+msgstr "tr: showing selected users"
+
+#
+#: ContentGenerator/Problem.pm:1124
+#, fuzzy
+msgid "submitAnswers"
+msgstr "שלח תשובות"
+
+#
+#: ContentGenerator/Problem.pm:1154
+msgid "time"
+msgstr "זמן"
+
+#
+#: ContentGenerator/Problem.pm:1154
+msgid "times"
+msgstr "מספר פעמי�"
+
+#
+#: ContentGenerator/Problem.pm:1161
+#: ContentGenerator/ProblemSet.pm:427
+msgid "unlimited"
+msgstr "ל� מוגבל"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:654
+msgid "users who match on selected field"
+msgstr "tr: users who match on selected field"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2522
+#: ContentGenerator/Problem.pm:603
+#, fuzzy
+msgid "visible"
+msgstr "tr: Visible"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1611
+#: ContentGenerator/Instructor/ProblemSetList.pm:692
+#: ContentGenerator/Instructor/ProblemSetList.pm:930
+msgid "visible sets"
+msgstr "tr: visible sets"
+
+#
+#: ContentGenerator/Problem.pm:604
+#: ContentGenerator/ProblemSet.pm:86
+msgid "visible to students"
+msgstr "tr: visible to students"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1027
+#: ContentGenerator/Instructor/UserList.pm:1197
+#: ContentGenerator/Instructor/UserList.pm:1299
+#: ContentGenerator/Instructor/UserList.pm:968
+msgid "visible users"
+msgstr "tr: visible users"
+
+#
+#. ($self->formatDateTime($set->open_date)
+#: ContentGenerator/ProblemSets.pm:420
+#: ContentGenerator/ProblemSets.pm:448
+#, fuzzy
+msgid "will open on %1"
+msgstr "יפתח ב-[1_]"
+
+#
+#
+msgid "Add to which set?"
+msgstr "tr: Add to which set?"
+
+#
+msgid "Course Information for course [_1]"
+msgstr "tr: Course Information for course %1"
+
+#
+msgid "report bugs in this problem"
+msgstr "tr: report bugs in this problem"
+
+#
+msgid "Problem [_1]"
+msgstr "תרגיל [1_]"
+
+#
+msgid "Cancel Password"
+msgstr "tr: Cancel Password"
+
+#
+msgid "WeBWorK"
+msgstr "WeBWorK"
+
+#
+msgid "Audit"
+msgstr "tr: Enrolled"
+
+#
+msgid "Hardcopy Header for set [_1]"
+msgstr "tr: Hardcopy Header for set %1"
+
+#
+msgid "Report bugs in a WeBWorK question/problem using this link. The very first time you do this you will need to register with an email address so that information on the bug fix can be reported back to you."
+msgstr "tr: Report bugs in a WeBWorK question/problem using this link. The very first time you do this you will need to register with an email address so that information on the bug fix can be reported back to you."
+
+#
+msgid "Pad Fields"
+msgstr "tr: Pad Fields"
+
+#
+msgid "Set Header for set [_1]"
+msgstr "tr: Set Header for set %1"
+
+#
+msgid "Statistics for [_1]"
+msgstr "tr: Statistics for %1"
+
+#
+msgid "Filter"
+msgstr "tr: Filter"
+
+#
+msgid "set [_1]/problem [_2]"
+msgstr "tr: set %1/problem %2"
+
+#
+msgid "You are not authorized to modify problems."
+msgstr "tr: You are not authorized to modify problems."
+
+#
+msgid "hardcopy header file"
+msgstr "tr: hardcopy header file"
+
+#
+msgid "Write permissions have not been enabled in the templates directory.  No changes can be made."
+msgstr "tr: Write permissions have not been enabled in the templates directory.  No changes can be made."
+
+#
+msgid "Save [_1] and View"
+msgstr "tr: Save %1 and View"
+
+#
+msgid "Create"
+msgstr "tr: Create"
+
+#
+msgid "Changes in this file have not yet been permanently saved."
+msgstr "tr: Changes in this file have not yet been permanently saved."
+
+#
+msgid "Instructor Tools"
+msgstr "כלי מנחה"
+
+#
+msgid "Score"
+msgstr "ניקוד"
+
+#
+msgid "Show in another window"
+msgstr "tr: Show in another window"
+
+#
+msgid "Copied auxiliary files from [_1] to  new location at [_2]"
+msgstr "tr: Copied auxiliary files from %1 to  new location at %2"
+
+#
+msgid "Unpublished"
+msgstr "ל� פורס�"
+
+#
+msgid "Login"
+msgstr "כניסה"
+
+#
+msgid "Email"
+msgstr "דו�ל �לקטרוני"
+
+#
+msgid "File Manager"
+msgstr "מנהל קבצי�"
+
+#
+msgid "Unable to change the hardcopy header for set [_1]. Unknown error."
+msgstr "tr: Unable to change the hardcopy header for set %1. Unknown error."
+
+#
+msgid "Unable to make '[_1]' the set header for [_2]"
+msgstr "tr: Unable to make '%1' the set header for %2"
+
+#
+msgid "Can't determine user of temporary edit file [_1]."
+msgstr "tr: Can't determine user of temporary edit file %1."
+
+#
+msgid "Download a hardcopy of this homework set."
+msgstr "Bu soru grubunu basılı halde indirin."
+
+#
+msgid "Problem Editor"
+msgstr "עורך בעיות"
+
+#
+msgid "The file '[_1]' is protected!"
+msgstr "tr: The file '%1' is protected!"
+
+#
+msgid "Top level of author information on the wiki."
+msgstr "tr: Top level of author information on the wiki."
+
+#
+msgid "Score selected set(s) and save to:"
+msgstr "tr: Score selected set(s) and save to:"
+
+#
+msgid "Save Password"
+msgstr "tr: Save Password"
+
+#
+msgid "The file '[_1]' is a blank problem!"
+msgstr "tr: The file '%1' is a blank problem!"
+
+#
+msgid "Add as what filetype?"
+msgstr "tr: Add as what filetype?"
+
+#
+msgid "no action"
+msgstr "tr: no action"
+
+#
+msgid "Added '[_1]' to [_2] as new set header"
+msgstr "tr: Added '%1' to %2 as new set header"
+
+#
+msgid "View statistics by set"
+msgstr "tr: View statistics by set"
+
+#
+msgid "Set"
+msgstr "סט"
+
+#
+msgid "This is a blank problem template file and can not be edited directly. Use the 'Save as' action below to create a local copy of the file and add it to the current problem set."
+msgstr "tr: This is a blank problem template file and can not be edited directly. Use the 'Save as' action below to create a local copy of the file and add it to the current problem set."
+
+#
+msgid "Logout"
+msgstr "יצי�ה"
+
+#
+msgid "You do not have permission to view the details of this error."
+msgstr "Bu hatanın detaylarını görmeye yetkiniz yok."
+
+#
+msgid "Reverting to original file '[_1]'"
+msgstr "tr: Reverting to original file '%1'"
+
+#
+msgid "Delete"
+msgstr "tr: Delete"
+
+#
+msgid "Wiki summary page for MathObjects"
+msgstr "tr: Wiki summary page for MathObjects"
+
+#
+msgid "Your score was recorded."
+msgstr "Notunuz kaydedildi."
+
+#
+msgid "You must specify an file name in order to save a new file."
+msgstr "tr: You must specify an file name in order to save a new file."
+
+#
+msgid "To edit this text you must first make a copy of this file using the 'Save as' action below."
+msgstr "tr: To edit this text you must first make a copy of this file using the 'Save as' action below."
+
+#
+msgid "unassigned problem file"
+msgstr "tr: unassigned problem file"
+
+#
+msgid "View statistics by student"
+msgstr "tr: View statistics by student"
+
+#
+msgid "Publish"
+msgstr "tr: Publish"
+
+#
+msgid "Password/Email"
+msgstr "סיסמ�/מייל"
+
+#
+msgid "Cancel Edit"
+msgstr "tr: Cancel Edit"
+
+#
+msgid "Math Objects"
+msgstr "tr: Math Objects"
+
+#
+msgid "Snippets of PG code illustrating specific techniques"
+msgstr "tr: Snippets of PG code illustrating specific techniques"
+
+#
+msgid "Error copying [_1] to [_2]"
+msgstr "tr: Error copying %1 to %2"
+
+#
+msgid "Hmwk Sets Editor"
+msgstr "עורך שיעורי בית"
+
+#
+msgid "This set is [_1] students."
+msgstr "Bu soru grubu öğrenciler tarafından %1."
+
+#
+msgid "header file"
+msgstr "tr: header file"
+
+#
+msgid "Include Index"
+msgstr "tr: Include Index"
+
+#
+msgid "Display Mode"
+msgstr "tr: Display Mode"
+
+#
+msgid "You can earn partial credit on this problem."
+msgstr "ניתן להרוויח ניקוד חלקי בבעיה זו"
+
+#
+msgid "Write permissions have not been enabled in '[_1]'.  Changes must be saved to a different directory for viewing."
+msgstr "tr: Write permissions have not been enabled in '%1'.  Changes must be saved to a different directory for viewing."
+
+#
+msgid "blank problem"
+msgstr "tr: blank problem"
+
+#
+msgid "Save Edit"
+msgstr "tr: Save Edit"
+
+#
+msgid "Enrolled"
+msgstr "tr: Enrolled"
+
+#
+msgid "Write permissions have not been enabled for '[_1]'.  Changes must be saved to another file for viewing."
+msgstr "tr: Write permissions have not been enabled for '%1'.  Changes must be saved to another file for viewing."
+
+#
+msgid "Note: this problem viewer is for viewing purposes only. As of right now, testing functionality is not possible."
+msgstr "tr: Note: this problem viewer is for viewing purposes only. As of right now, testing functionality is not possible."
+
+#
+msgid "Save Export"
+msgstr "tr: Save Export"
+
+#
+msgid "webwork"
+msgstr "webwork"
+
+#
+msgid "Problem Viewer"
+msgstr "tr: Problem Viewer"
+
+#
+msgid "submit button clicked"
+msgstr "gönder düğmesine basıldı"
+
+#
+msgid "Student Progress for [_1]"
+msgstr "tr: Student Progress for %1"
+
+#
+msgid "A new file has been created at '[_1]' with the contents below. No changes have been made to set [_2]."
+msgstr "tr: A new file has been created at '%1' with the contents below. No changes have been made to set %2."
+
+#
+msgid "Your score was not recorded because this problem has not been assigned to you."
+msgstr "Notunuz kaydedilmedi çünkü bu soru size yöneltilmedi."
+
+#
+msgid "Sort"
+msgstr "tr: Sort"
+
+#
+msgid "Add problem"
+msgstr "tr: Add problem"
+
+#
+msgid "Author Info"
+msgstr "tr: Author Info"
+
+#
+msgid "Replace [_1]"
+msgstr "tr: Replace %1"
+
+#
+msgid "Help"
+msgstr "tr: Help"
+
+#
+msgid "Add Users"
+msgstr "הוסף משתמשי�"
+
+#
+msgid "Problem Source Code"
+msgstr "tr: Problem Source Code"
+
+#
+msgid "Test snippets of PG code in interactive lab.  Good way to learn PG language."
+msgstr "tr: Test snippets of PG code in interactive lab.  Good way to learn PG language."
+
+#
+msgid "Page generated at [_1] at [_2]"
+msgstr "tr: Page generated at %1 at %2"
+
+#
+msgid "Import"
+msgstr "tr: Import"
+
+#
+msgid "View Using Seed Number"
+msgstr "tr: View Using Seed Number"
+
+#
+msgid "Grades"
+msgstr "ציוני�"
+
+#
+msgid "Published"
+msgstr "פורס�"
+
+#
+msgid "Your score was not recorded because this homework set is closed."
+msgstr "Notunuz kaydedilemedi çünkü bu soru grubu kapalı."
+
+#
+msgid "The text box now contains the source of the original problem. You can recover lost edits by using the Back button on your browser."
+msgstr "tr: The text box now contains the source of the original problem. You can recover lost edits by using the Back button on your browser."
+
+#
+msgid "The file '[_1]' is a directory!"
+msgstr "tr: The file '%1' is a directory!"
+
+#
+msgid "Save As"
+msgstr "tr: Save As [TMPL]/"
+
+#
+msgid "Documentation from source code for PG modules and macro files. Often the most up-to-date information."
+msgstr "tr: Documentation from source code for PG modules and macro files. Often the most up-to-date information."
+
+#
+msgid "Problem Techniques"
+msgstr "tr: Problem Techniques"
+
+#
+msgid "Course Configuration"
+msgstr "תצורת קורס"
+
+#
+msgid "Feedback"
+msgstr "משוב"
+
+#
+msgid "Export"
+msgstr "tr: Export"
+
+#
+msgid "PG mark down syntax used to format WeBWorK questions. This interactive lab can help you to learn the techniques."
+msgstr "tr: PG mark down syntax used to format WeBWorK questions. This interactive lab can help you to learn the techniques."
+
+#
+msgid "Record Scores for Single Sets"
+msgstr "tr: Record Scores for Single Sets"
+
+#
+msgid "Append to end of set [_1]"
+msgstr "tr: Append to end of set %1"
+
+#
+msgid "Unrecognized saveMode: |[_1]|. Unknown error."
+msgstr "tr: Unrecognized saveMode: |%1|. Unknown error."
+
+#
+msgid "Your score was not recorded because there was a failure in storing the problem record to the database."
+msgstr "Notunuz kaydedilemedi, çünkü notun veritabanına kaydı sırasında bir hata oluştu."
+
+#
+msgid "The hardcopy header for set [_1] has been renamed to '[_2]'."
+msgstr "tr: The hardcopy header for set %1 has been renamed to '%2'."
+
+#
+msgid "Save as"
+msgstr "tr: Save as"
+
+#
+msgid "Select action below"
+msgstr "tr: Select action below"
+
+#
+msgid "The file '[_1]' cannot be found."
+msgstr "tr: The file '%1' cannot be found."
+
+#
+msgid "Unable to write to '[_1]': [_2]"
+msgstr "tr: Unable to write to '%1': %2"
+
+#
+msgid "Save"
+msgstr "tr: Save"
+
+#
+msgid "File '[_1]' exists. File not saved. No changes have been made. You can change the file path for this problem manually from the 'Hmwk Sets Editor' page"
+msgstr "tr: File '%1' exists. File not saved. No changes have been made. You can change the file path for this problem manually from the 'Hmwk Sets Editor' page"
+
+#
+msgid "The set header for set [_1] has been renamed to '[_2]'."
+msgstr "tr: The set header for set %1 has been renamed to '%2'."
+
+#
+msgid "Error: This path is already in the temporary edit directory -- no new temporary file is created. path = [_1]"
+msgstr "tr: Error: This path is already in the temporary edit directory -- no new temporary file is created. path = %1"
+
+#
+msgid "Please use radio buttons to choose the method for saving this file. Can't recognize saveMode: |[_1]|."
+msgstr "tr: Please use radio buttons to choose the method for saving this file. Can't recognize saveMode: |%1|."
+
+#
+msgid "Saved to file '[_1]'"
+msgstr "tr: Saved to file '%1'"
+
+#
+msgid "Please specify a file to save to."
+msgstr "tr: Please specify a file to save to."
+
+#
+msgid "The selected problem ([_1]) is not a valid problem for set [_2]."
+msgstr "Seçilen problem (%1), %2 soru drubu için geçerli bir soru değil."
+
+#
+msgid "Editing [_1] in file '[_2]'"
+msgstr "tr: Editing %1 in file '%2'"
+
+#
+msgid "Deleting temp file at [_1]"
+msgstr "tr: Deleting temp file at %1"
+
+#
+msgid "hidden from"
+msgstr "görüntülenmiyor"
+
+#
+msgid "View student progress by set"
+msgstr "tr: View student progress by set"
+
+#
+msgid "View"
+msgstr "tr: View"
+
+#
+msgid "Resources"
+msgstr "tr: Resources"
+
+#
+msgid "Scoring Download"
+msgstr "הורדת ניקוד"
+
+#
+msgid "Duplicate"
+msgstr "tr: Duplicate"
+
+#
+msgid "This path |[_1]| is not the path to a temporary edit file."
+msgstr "tr: This path |%1| is not the path to a temporary edit file."
+
+#
+msgid "visible to"
+msgstr "görüntüleniyor"
+
+#
+msgid "Unable to change the source file path for set [_1], problem [_2]. Unknown error."
+msgstr "tr: Unable to change the source file path for set %1, problem %2. Unknown error."
+
+#
+msgid "Course Administration"
+msgstr "�דמיניסטרצית קורס"
+
+#
+msgid "Added [_1] to [_2] as problem [_3]"
+msgstr "tr: Added %1 to %2 as problem %3"
+
+#
+msgid "Options Information"
+msgstr "tr: Options Information"
+
+#
+msgid "Proctor"
+msgstr "tr: Proctor"
+
+#
+msgid "Student Progress"
+msgstr "tr: Student Progress"
+
+#
+msgid "Revert"
+msgstr "tr: Revert"
+
+#
+msgid "Statistics"
+msgstr "סטטיסטיקות"
+
+#
+msgid "Save as new independent problem"
+msgstr "tr: Save as new independent problem"
+
+#
+msgid "Scoring Tools"
+msgstr "כלי ניקוד"
+
+#
+msgid "The source file for 'set [_1] / problem [_2]' has been changed from [_3] to '[_4]'."
+msgstr "tr: The source file for 'set %1 / problem %2' has been changed from %3 to '%4'."
+
+#
+msgid "Cancel Export"
+msgstr "tr: Cancel Export"
+
+#
+msgid "View student progress by student"
+msgstr "tr: View student progress by student"
+
+#
+msgid "Revert to [_1]"
+msgstr "tr: Revert to %1"
+
+#
+msgid "Classlist Editor"
+msgstr "עורך רשימות כיתה"
+
+#
+msgid "Add"
+msgstr "tr: Add"
+
+#
+msgid "the original path to the file is [_1]"
+msgstr "tr: the original path to the file is %1"
+
+#
+msgid "The path to the original file should be absolute"
+msgstr "tr: The path to the original file should be absolute"
+
+#
+msgid "To edit this text you must use the 'Save AS' action below to save it to another file."
+msgstr "tr: To edit this text you must use the 'Save AS' action below to save it to another file."
+
+#
+msgid "Error: The original file [_1] cannot be read."
+msgstr "tr: Error: The original file %1 cannot be read."
+
+#
+msgid "Unable to change the set header for set [_1]. Unknown error."
+msgstr "tr: Unable to change the set header for set %1. Unknown error."
+
+#
+msgid "options information"
+msgstr "tr: options information"
+
+#
+msgid "The selected problem([_1]) is not a valid problem for set [_2]."
+msgstr "tr: The selected problem(%1) is not a valid problem for set %2."
+
+#
+msgid "Unknown file type"
+msgstr "tr: Unknown file type"
+
+#
+msgid "course information"
+msgstr "tr: course information"
+
+#
+msgid "Change User Options"
+msgstr "Kullanıcı bilgilerini güncelle"
+
+#
+msgid "Drop"
+msgstr "tr: Drop"
+
diff --git a/lib/WeBWorK/Localize/tr.bak b/lib/WeBWorK/Localize/tr.bak
new file mode 100644
index 0000000000..65fda1765c
--- /dev/null
+++ b/lib/WeBWorK/Localize/tr.bak
@@ -0,0 +1,261 @@
+## WeBWorK-tr  Turkish language lexicon
+
+package WeBWorK::Localize::tr;
+
+use base qw(WeBWorK::Localize);
+use strict;
+use vars qw(%Lexicon);
+
+%Lexicon = (
+
+## File locations
+"navPrevGrey" =>			"images_tr/navPrevGrey",
+"navPrev" =>				"images_tr/navPrev",
+"navProbListGrey" =>			"images_tr/navProbListGrey",
+"navProbList" =>			"images_tr/navProbList",
+"navNextGrey" =>			"images_tr/navNextGrey",
+"navNext" =>				"images_tr/navNext",
+"navUp" =>				"images_tr/navUp",
+
+## UNTRANSLATED
+
+"Next Problem" =>			"Next Problem",
+"Previous Problem" =>			"Previous Problem",
+"Problem List" =>			"Problem List",
+"now open, due " =>			"now open, due ",
+"Set" =>				"Set",
+"Score" =>				"Score",
+"Problems" =>				"Problems",
+"You can earn partial credit on this problem." =>
+	"You can earn partial credit on this problem.",
+"You have [negquant,_1,unlimited attempts,attempt,attempts] remaining." =>
+	"[negquant,_1,Sınırsız deneme hakkı,deneme hakkı,deneme hakkı] kaldı.",
+
+## TRANSLATED BY SALIH
+
+"over time: closed." =>			"süre bitti: kapalı.",
+"open: complete by [_1]" =>		"açık: [_1] tarihine kadar tamamlayın",
+"will open on [_1]" =>			"[_1] tarihinde açılacak",
+"closed, answers on [_1]" =>		"kapalı, cevaplar [_1] tarihinde",
+"closed, answers recently available" =>	"kapalı, cevaplar yeni açıklandı",
+"closed, answers available" =>		"kapalı, cevaplar açıklandı",
+"Viewing temporary file: " =>		"Geçici dosyayı görüntülüyor: ",
+"Course Info" =>			"Ders bilgileri",
+"~[edit~]" =>				"~[düzenlemek~]",
+"Download Hardcopy for Selected [plural,_1,Set,Sets]" => "Seçili Setleri Yazdır: [plural,_1,Set,Sets]",  
+"Course Administration" =>		"Ders Yönetimi",
+"Feedback" =>				"Geri Bildirim",
+"Grades" =>				"Notlar",
+"Instructor Tools" =>			"Eğitmen Araçları",
+"Classlist Editor" =>			"Sınıf Listesi Düzenleyici",
+"Hmwk Sets Editor" =>			"Ödev Setleri Düzenleyici",
+"Add Users" =>				"Kullanıcı Ekle",
+"Course Configuration" =>		"Ders Seçenekleri",
+"Library Browser" =>			"Kütüphane Tarayıcı",
+"File Manager" =>			"Dosya Yöneticisi",
+"Problem Editor" =>			"Soru Düzenleyici",
+"Scoring Tools" =>			"Notlama Araçları",
+"Scoring Download" =>			"Notları İndir",
+"Email" =>				"E-posta",
+"Email instructor" =>			"EÄŸitmene E-posta",
+"Logout" => 				"Çıkış",
+"Password/Email" =>			"Åžifre/E-posta",
+"Statistics" =>				"Ä°statistikler",
+
+## TRANSLATED by OZCAN
+
+
+"Courses" =>		"Dersler",
+"Homework Sets" => 	"Soru Grupları",
+"Problem [_1]" => 	"Soru [_1]",
+"Library Browser" => 	"Soru Kütüphaneleri",
+"Report bugs" => 	"Hataları bildir",
+
+"Logged in as [_1]. " => "[_1] olarak giriş yaptınız. ", # Note space! 
+"Log Out" => 		"Çıkış Yap",
+"Not logged in." => 	"Giriş yapmadınız.",
+"Acting as [_1]. " =>  	"[_1] gibi davranılıyor. ",      # Note space!
+"Stop Acting" => 	"Rol Yapmayı bırak",
+
+"Welcome to WeBWorK!" => "WeBWorK sitemize hoÅŸgeldiniz!",
+"Messages" => 		"Mesajlar",
+"Entered" => 		"Yanıt",
+"Result" => 		"Sonuç",
+"Answer Preview" => 	"Gösterim",
+
+"Correct" => 		"Doğru yanıt",
+"correct" => 		"doÄŸru",
+"[_1]% correct" => 	"[_1]% doÄŸru",
+"incorrect" => 		"yanlış",
+"Published" => 		"Yayınlandı",
+
+"Unpublished" => 	"Yayınlanmadı",
+"Show Hints" => 	"İpuçlarını göster",
+"Show Solutions" => 	"Çözümleri göster",
+"Preview Answers" => 	"Yanıtları görüntüle",
+"Check Answers" => 	"Yanıtları kontrol et",
+
+"Submit Answers" => 	"Yanıtları Gönder",
+"Submit Answers for [_1]" => 
+	"[_1] için Yanıtları Gönder",
+"times" => 		"deneme hakkı",
+"time" => 		"deneme hakkı",
+"unlimited" =>  	"sınırsız",
+
+"attempts" =>  		"deneme hakkı",
+"attempt" => 		"deneme hakkı",
+"Name" => 		"Soru",
+"Attempts" => 		"Deneme sayısı",
+"Remaining" => 		"Kalan hak",
+
+"Worth" => 		"DeÄŸeri",
+"Status" => 		"Durumu",
+"Change Password" => 		"Åžifre DeÄŸiÅŸtir",
+"[_1]'s Current Password" => 	"[_1] için Mevcut Şifre",
+"[_1]'s New Password" => 	"[_1] için Yeni Şifre",
+
+"Change Email Address" => 	"E-posta Adresi DeÄŸiÅŸtir",
+"[_1]'s Current Address" => 	"[_1] için Mevcut Adres",
+"[_1]'s New Address" => 	"[_1] için Yeni Adres",
+"Change User Options" => 	"Kullanıcı bilgilerini güncelle",
+"Your score was recorded." => 	"Notunuz kaydedildi.",
+
+"Show correct answers" => 	"Doğru yanıtları göster",
+"This homework set is closed." => "Bu soru grubu kapalı.",
+"Show Past Answers" => 		"Önceki Yanıtları Göster",
+"Log In Again" => 		"Tekrar giriÅŸ yap",
+
+
+"The answer above is correct." => 
+	"Yukarıdaki yanıt doğru.",
+
+"The answer above is NOT [_1]correct." => 
+	"Yukarıdaki yanıt [_1]doğru değil.",
+
+"All of the answers above are correct." => 
+	"Yanıtların tümü doğru",
+
+"At least one of the answers above is NOT [_1]correct." => 
+	"Yanıtların en az bir tanesi [_1]doğru değil.",
+
+"[quant,_1,of the questions remains,of the questions remain] unanswered." => 
+	"Soruların [_1] tanesi yanıtsız bırakıldı.",
+
+"This set is [_1] students." =>	
+	"Bu soru grubu öğrenciler tarafından [_1].",
+
+"visible to" => 
+	"görüntüleniyor",
+
+"hidden from" => 
+	"görüntülenmiyor",
+
+"This problem will not count towards your grade." => 
+	"Bu soru, notunuzu etkilemeyecektir.",
+
+"The selected problem ([_1]) is not a valid problem for set [_2]." =>
+	"Seçilen problem ([_1]), [_2] soru drubu için geçerli bir soru değil.",
+
+"You do not have permission to view the details of this error." => 
+	"Bu hatanın detaylarını görmeye yetkiniz yok.",
+
+"Your score was not recorded because there was a failure in storing the problem record to the database." =>
+	"Notunuz kaydedilemedi, çünkü notun veritabanına kaydı sırasında bir hata oluştu.",
+
+"Your score was not recorded because this homework set is closed." =>
+	"Notunuz kaydedilemedi çünkü bu soru grubu kapalı.",
+
+"Your score was not recorded because this problem has not been assigned to you." =>
+	"Notunuz kaydedilmedi çünkü bu soru size yöneltilmedi.",
+
+"Viewing temporary file: " => 	
+	"Geçici dosya görüntüleniyor: ",
+
+"ANSWERS ONLY CHECKED -- ANSWERS NOT RECORDED" => 
+	"YANITLAR SADECE KONTROL EDÄ°LÄ°YOR -- YANITLAR KAYDEDÄ°LMEDÄ°",
+
+"PREVIEW ONLY -- ANSWERS NOT RECORDED" => 
+	"GÖSTERİM -- YANITLAR KAYDEDİLMEDİ ",
+
+"submit button clicked" =>
+ 	"gönder düğmesine basıldı",
+
+"This homework set is not yet open." => 
+	"Bu soru grubu henüz açık değil.",
+
+"(This problem will not count towards your grade.)" => 
+	"(Bu soru notunuzu etkilemeyecektir.)",
+
+"You have attempted this problem [quant,_1,time,times]." => 
+	"Bu soru için [quant,_1,deneme hakkı,deneme hakkı] kullandınız.",
+
+"You received a score of [_1] for this attempt." => 
+	"Bu soru için [_1] puan aldınız.",
+
+"Your overall recorded score is [_1].  [_2]" => 
+	"Ortalama puanınız: [_1].  [_2]",
+
+"You have [_1] [_2] remaining." => 
+	"[_1] [_2] kaldı.",
+
+"Download a hardcopy of this homework set." => 
+	"Bu soru grubunu basılı halde indirin." ,
+
+"This homework set contains no problems." => 
+	"Bu soru grubunda soru bulunmamaktadır.",
+
+"Can't get password record for user '[_1]': [_2]" => 
+	"Can't get password record for user '[_1]': [_2]",
+
+"Can't get password record for effective user '[_1]': [_2]" => 
+	"Can't get password record for effective user '[_1]': [_2]",
+
+"Couldn't change [_1]'s password: [_2]" => 
+	"[_1] adlı kullanıcının şifresi değiştirilemedi: [_2]",
+
+"[_1]'s password has been changed." => 
+	"[_1] adlı kullanıcının şifresi değiştirildi.",
+
+"The passwords you entered in the [_1] and [_2] fields don't match. Please retype your new password and try again." =>
+   "[_1] ve [_2]  alanlarına girdiğiniz şifreler uyuşmadı. Yeni şifrenizi girerek tekrar deneyiniz.",
+
+"Confirm [_1]'s New Password" => 
+	"[_1] için Şifre Onayı",
+
+"[_1]'s new password cannot be blank." => 
+	"[_1] için yeni şifre boş bırakılamaz.",
+
+"The password you entered in the [_1] field does not match your current password. 
+Please retype your current password and try again." => 
+	"[_1] alanına girdiğiniz şifre ile mevcut şifreniz uyuşmamaktadır. Lütfen şirfenizi girerek tekrar deneyiniz.",
+
+"You do not have permission to change your password." => 
+	"Şifre değiştirmek için yetkiniz yok.",
+
+"Couldn't change your email address: [_1]" => 
+	"E-posta adresiniz deÄŸiÅŸtirilemedi: [_1]", 
+
+"Your email address has been changed." => 
+	"E-posta adresiniz deÄŸiÅŸtirildi.",
+
+"You do not have permission to change email addresses." => 
+	"Adres değiştirmek için yetkiniz yok.",
+
+"You have been logged out of WeBWorK." => 
+	"WeBWorK sisteminden çıkış yaptınız.", 
+
+"Invalid user ID or password." =>
+	"Yanlış kullanıcı adı ya da şifre.",
+
+"You must specify a user ID." =>
+	"Bir kullanıcı adı girmelisiniz.",
+
+"Your session has timed out due to inactivity. Please log in again." => 
+	"Oturumunuz zaman aşımına uğradı. Lütfen tekrar giriş yapınız.",
+
+"_REQUEST_ERROR" => q{
+ WebWork bu problemi işlerken bir yazılım hatası ile karşılaştı. Problemin kendisinde bir hata olması muhtemeldir. Eğer bir öğrenci iseniz bu hatayı ilgili kişilere bildiriniz. Eğer yetkili bir kişiyseniz daha fazla bilgi için alttaki hata raporunu inceleyiniz.
+},
+);
+1;
+
diff --git a/lib/WeBWorK/Localize/tr.mo b/lib/WeBWorK/Localize/tr.mo
new file mode 100644
index 0000000000..d85e61864d
Binary files /dev/null and b/lib/WeBWorK/Localize/tr.mo differ
diff --git a/lib/WeBWorK/Localize/tr.po b/lib/WeBWorK/Localize/tr.po
new file mode 100644
index 0000000000..4e9219a458
--- /dev/null
+++ b/lib/WeBWorK/Localize/tr.po
@@ -0,0 +1,2562 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: WeBWorK Online Homework System\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-12-20 11:29-0500\n"
+"Last-Translator: Michael Gage <gage@math.rochester.edu>\n"
+"Language-Team: Webwork Turkish language team <Ben Walter <benwalt@gmail.com>>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
+"X-Poedit-Language: Turkish\n"
+"X-Poedit-Country: TURKEY\n"
+
+#
+#. ($name, $vnum)
+#: ContentGenerator/ProblemSets.pm:416
+msgid "%1 (test %2)"
+msgstr "%1 (test %2)"
+
+#
+#. ($numAdded, $numSkipped, join(", ", @$skipped)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1581
+msgid "%1 sets added, %2 sets skipped. Skipped sets: (%3)"
+msgstr "%1 set eklendi, %2 sets atlandı. Atlanan setler: (%3)"
+
+#
+#. ($numExported, $numSkipped, (($numSkipped)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1701
+msgid "%1 sets exported, %2 sets skipped. Skipped sets: (%3)"
+msgstr "%1 set aktarıldı, %2 set atlandı. Atlanan setler: (%3)"
+
+#
+#. ($name)
+#: ContentGenerator/ProblemSets.pm:427
+#: ContentGenerator/ProblemSets.pm:441
+msgid "%1 test"
+msgstr " %1 test"
+
+#
+#. (scalar @userIDsToExport, $dir, $fileName)
+#: ContentGenerator/Instructor/UserList.pm:1385
+msgid "%1 users exported to file %2/%3"
+msgstr "%1 kullanıcı %2/%3 dosyasına aktarıldı."
+
+#
+#. ($numReplaced, $numAdded, $numSkipped, join (", ", @$skipped)
+#: ContentGenerator/Instructor/UserList.pm:1269
+msgid "%1 users replaced, %2 users added, %3 users skipped. Skipped users: (%4)"
+msgstr "%1 kullanıcı değiştirildi, %2 kullanıcı eklendi, %3 kullanıcı atlandı. Atlanan kullanıcılar: (%4)"
+
+#. (int($answerScore*100)
+#: ContentGenerator/Problem.pm:265
+#, fuzzy
+msgid "%1% correct"
+msgstr "%1% doÄŸru"
+
+#
+#. ($e_user_name)
+#: ContentGenerator/Options.pm:171
+#, fuzzy
+msgid "%1's Current Address"
+msgstr "%1 için Mevcut Adres"
+
+#
+#. ($user_name)
+#: ContentGenerator/Options.pm:126
+#, fuzzy
+msgid "%1's Current Password"
+msgstr "%1 için Mevcut Şifre"
+
+#
+#. ($e_user_name)
+#: ContentGenerator/Options.pm:175
+#, fuzzy
+msgid "%1's New Address"
+msgstr "%1 için Yeni Adres"
+
+#
+#. ($e_user_name)
+#: ContentGenerator/Options.pm:130
+#, fuzzy
+msgid "%1's New Password"
+msgstr "%1 için Yeni Şifre"
+
+#
+#. ($e_user_name)
+#: ContentGenerator/Options.pm:101
+#, fuzzy
+msgid "%1's new password cannot be blank."
+msgstr "%1 için yeni şifre boş bırakılamaz."
+
+#
+#. ($e_user_name)
+#: ContentGenerator/Options.pm:84
+#, fuzzy
+msgid "%1's password has been changed."
+msgstr "%1 adlı kullanıcının şifresi değiştirildi."
+
+#
+#. ($setID, $problemID)
+#: ContentGenerator/Problem.pm:884
+#, fuzzy
+msgid "%1: Problem %2"
+msgstr "%1: Soru %2."
+
+#
+#. ($numBlanks)
+#: ContentGenerator/Problem.pm:319
+#, fuzzy
+msgid "%quant(%1,of the questions remains,of the questions remain) unanswered."
+msgstr "Soruların %1 tanesi yanıtsız bırakıldı."
+
+#
+#: ContentGenerator/Problem.pm:1188
+msgid "(This problem will not count towards your grade.)"
+msgstr "(Bu soru notunuzu etkilemeyecektir.)"
+
+#
+#: ContentGenerator/Problem.pm:1299
+msgid "ANSWERS ONLY CHECKED -- ANSWERS NOT RECORDED"
+msgstr "YANITLAR SADECE KONTROL EDÄ°LÄ°YOR -- YANITLAR KAYDEDÄ°LMEDÄ°"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1708
+#: ContentGenerator/Instructor/UserList.pm:1391
+#: ContentGenerator/Instructor/UserList.pm:1463
+msgid "Abandon changes"
+msgstr "DeÄŸiÅŸiklikleri kaydetme"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1647
+msgid "Abandon export"
+msgstr "Dışa aktarımı iptal et"
+
+#
+#. ($eUserID)
+#: ContentGenerator.pm:848
+#, fuzzy
+msgid "Acting as %1. "
+msgstr "%1 gibi davranılıyor."
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1927
+msgid "Active"
+msgstr "Aktif"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1142
+msgid "Add how many students?"
+msgstr "Kaç öğrenci eklenecek?"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1220
+msgid "Add which new users?"
+msgstr "Hangi yeni kullanıcılar eklenecek?"
+
+#
+#: ContentGenerator/Problem.pm:311
+msgid "All of the answers above are correct."
+msgstr "Yanıtların tümü doğru"
+
+#
+#. ($verb)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1052
+msgid "All selected sets %1 all students"
+msgstr "Bütün seçili setler her e %1"
+
+#
+#. ($verb)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1046
+msgid "All sets %1 all students"
+msgstr "Bütün setler %1 all students"
+
+#
+#. ($verb)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1049
+msgid "All visible sets %1 all students"
+msgstr "Görünür bütün setler her öğrenciye %1"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:446
+#: ContentGenerator/Instructor/ProblemSetList.pm:832
+#: ContentGenerator/Instructor/ProblemSetList.pm:870
+msgid "Answer Date"
+msgstr "Cevap tarihi"
+
+#
+#: ContentGenerator/Problem.pm:242
+msgid "Answer Preview"
+msgstr "Gösterim"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:531
+msgid "Any changes made below will be reflected in the set for ALL students."
+msgstr "Aşağıda yapılan değişiklikler seti çözen HER öğrenci için uygulanacakç"
+
+#
+#: ContentGenerator.pm:1481
+msgid "Apply Options"
+msgstr "Seçenekleri Uygula"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1545
+msgid "Assign this set to which users?"
+msgstr "Bu set hangi kullanıcılara ödev verilecek?"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2064
+msgid "Assigned Sets"
+msgstr "Ödev verilmiş setler"
+
+#
+#. ($fully)
+#: ContentGenerator/Problem.pm:315
+#, fuzzy
+msgid "At least one of the answers above is NOT %1correct."
+msgstr "Yanıtların en az bir tanesi %1doğru değil."
+
+#
+#: ContentGenerator/ProblemSet.pm:350
+msgid "Attempts"
+msgstr "Deneme sayısı"
+
+#
+#. ($eUserID,$@)
+#: ContentGenerator/Options.pm:71
+msgid "Can't get password record for effective user '%1': %2"
+msgstr "Mevcut kullanıcı için şifre bilgileri alınamadı '%1': %2"
+
+#
+#. ($userID,$@)
+#: ContentGenerator/Options.pm:68
+msgid "Can't get password record for user '%1': %2"
+msgstr "kullanıcı için şifre bilgileri alınamadı '%1': %2"
+
+#
+#: ContentGenerator/Options.pm:142
+msgid "Change Email Address"
+msgstr "E-posta Adresi DeÄŸiÅŸtir"
+
+#
+#: ContentGenerator/Options.pm:61
+msgid "Change Password"
+msgstr "Åžifre DeÄŸiÅŸtir"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1409
+#: ContentGenerator/Instructor/UserList.pm:1481
+msgid "Changes abandoned"
+msgstr "DeÄŸiÅŸiklikler kaydedilmedi"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1457
+msgid "Changes saved"
+msgstr "DeÄŸiÅŸiklikler kaydedildi"
+
+#
+#: ContentGenerator/Problem.pm:1118
+msgid "Check Answers"
+msgstr "Yanıtları kontrol et"
+
+#
+#: ContentGenerator/Problem.pm:1227
+msgid "Checking additional error messages"
+msgstr "Diğer hata mesajları kontrol ediliyor"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1011
+msgid "Choose visibility of the sets to be affected"
+msgstr "Etkilenecek setlerin görünürlüğünü seçin"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1084
+#: ContentGenerator/Instructor/ProblemSetList.pm:982
+msgid "Choose which sets to be affected"
+msgstr "Hangi setlerin etkileneceğini seçin"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:597
+#: ContentGenerator/Instructor/UserList.pm:550
+#: ContentGenerator/ProblemSets.pm:288
+msgid "Clear"
+msgstr "Temizle"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:562
+msgid "Click on the login name to edit individual problem set data, (e.g. due dates) for these students."
+msgstr "Bu öğrenciler için problem setlerinde değişiklik (teslim tarihi vb.) yapmak için isimlerinin üzerine tıklayın."
+
+#
+#: ContentGenerator/ProblemSets.pm:435
+msgid "Closed"
+msgstr "Kapalı"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2072
+#: ContentGenerator/Instructor/UserList.pm:290
+#: ContentGenerator/Instructor/UserList.pm:818
+#: ContentGenerator/Instructor/UserList.pm:861
+#: ContentGenerator/Instructor/UserList.pm:904
+msgid "Comment"
+msgstr "Yorum"
+
+#
+#. ($e_user_name)
+#: ContentGenerator/Options.pm:134
+#: ContentGenerator/Options.pm:95
+#, fuzzy
+msgid "Confirm %1's New Password"
+msgstr "%1 için Şifre Onayı"
+
+#
+#: ContentGenerator/Login.pm:206
+msgid "Continue"
+msgstr "Devam"
+
+#
+#: ContentGenerator/Problem.pm:243
+msgid "Correct"
+msgstr "Doğru yanıt"
+
+#
+#. ($e_user_name,$@)
+#: ContentGenerator/Options.pm:80
+#, fuzzy
+msgid "Couldn't change %1's password: %2"
+msgstr "%1 adlı kullanıcının şifresi değiştirilemedi: %2"
+
+#
+#. ($@)
+#: ContentGenerator/Options.pm:153
+#, fuzzy
+msgid "Couldn't change your email address: %1"
+msgstr "E-posta adresiniz deÄŸiÅŸtirilemedi: %1"
+
+#
+#: ContentGenerator/ProblemSets.pm:71
+#: ContentGenerator/ProblemSets.pm:73
+msgid "Course Info"
+msgstr "Ders bilgileri"
+
+#
+#: ContentGenerator.pm:657
+#: ContentGenerator/Home.pm:94
+msgid "Courses"
+msgstr "Dersler"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1351
+msgid "Create as what type of set?"
+msgstr "Ne tip set oluÅŸturulacak?"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1263
+#: ContentGenerator/Instructor/UserList.pm:1082
+msgid "Delete how many?"
+msgstr "Kaç tane silinecek?"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1119
+msgid "Disable"
+msgstr "Devre dişi bırak"
+
+#
+#: ContentGenerator.pm:1442
+msgid "Display Options"
+msgstr "Görünüm Seçenekleri"
+
+#
+#. ($pl)
+#: ContentGenerator/ProblemSets.pm:283
+msgid "Download Hardcopy for Selected %plural(%1,Set,Sets)"
+msgstr "Seçili Setleri Yazdırmak için dosya indir: [plural,_1,Set,Sets]"
+
+#
+#: ContentGenerator/ProblemSet.pm:321
+msgid "Download PDF or TeX Hardcopy for Current Set"
+msgstr "Mevcut seti Yazdırmak için dosya indir"
+
+#
+#: ContentGenerator/ProblemSets.pm:289
+msgid "Download PDF or TeX Hardcopy for Selected Sets"
+msgstr "Seçili Setleri Yazdırmak için dosya indir"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:445
+#: ContentGenerator/Instructor/ProblemSetList.pm:831
+#: ContentGenerator/Instructor/ProblemSetList.pm:869
+msgid "Due Date"
+msgstr "Teslim Tarihi"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1812
+msgid "Duplicate this set and name it"
+msgstr "Bu seti çoğalt ve isimlendir"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1720
+#: ContentGenerator/Instructor/UserList.pm:1785
+#: ContentGenerator/Instructor/UserList.pm:1818
+msgid "Edit"
+msgstr "Düzenle"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:603
+msgid "Edit All Set Data"
+msgstr "Bütün set bilgilerini düzenle"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:439
+msgid "Edit Assigned Users"
+msgstr "Ödev verilmiş kullanıcıları düzenle"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:438
+msgid "Edit Problems"
+msgstr "Soruları Düzenle"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:441
+msgid "Edit Set Data"
+msgstr "Set Bilgilerini Düzenle"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:961
+msgid "Edit Which Users?"
+msgstr "Hangi Kullanıcılar Düzenlenecek?"
+
+#
+#: ContentGenerator/Problem.pm:1011
+msgid "Edit this problem"
+msgstr "Bu soruyu düzenle"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:923
+msgid "Edit which sets?"
+msgstr "Hangi setler düzenlecek?"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2067
+#: ContentGenerator/Instructor/UserList.pm:285
+#: ContentGenerator/Instructor/UserList.pm:813
+#: ContentGenerator/Instructor/UserList.pm:856
+#: ContentGenerator/Instructor/UserList.pm:899
+msgid "Email Address"
+msgstr "E-posta Adresi"
+
+#
+#: ContentGenerator.pm:1526
+#: ContentGenerator.pm:1549
+#: ContentGenerator.pm:1572
+msgid "Email instructor"
+msgstr "EÄŸitmene E-posta"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1120
+msgid "Enable"
+msgstr "EtkinleÅŸtir"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:604
+msgid "Enable Reduced Credit"
+msgstr "Azaltılmiş Notu Etkinleştir"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1113
+msgid "Enable/Disable reduced scoring for selected sets"
+msgstr "Seçili setler için azaltılmış not seçenegini etkinleştir/kaldır"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:815
+#: ContentGenerator/Instructor/UserList.pm:858
+#: ContentGenerator/Instructor/UserList.pm:901
+msgid "Enrollment Status"
+msgstr "Kayıt Durumu"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1321
+msgid "Enter filename below"
+msgstr "Aşağıya dosya adı girin"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1502
+msgid "Enter filenames below"
+msgstr "Aşağıya dosya isimlerini girin"
+
+#
+#: ContentGenerator/Problem.pm:240
+msgid "Entered"
+msgstr "Yanıt"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1671
+msgid "Export selected sets"
+msgstr "Şeçili setleri dışarı aktar"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1317
+msgid "Export to what kind of file?"
+msgstr "Ne çeşit dosyaya aktarılacak?"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1604
+msgid "Export which sets?"
+msgstr "Hangı setler dışarı aktarılacak?"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1292
+msgid "Export which users?"
+msgstr "Hangi kullanıcılar dışarı aktarılacak?"
+
+#
+#. ($@)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1435
+msgid "Failed to create new set: %1"
+msgstr "Yeni set yaratılamadı: %1"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1374
+msgid "Failed to create new set: no set name specified!"
+msgstr "Yeni set oluşturulamadı: set adı belirtilmemiş!"
+
+#
+#. ($@)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1848
+msgid "Failed to duplicate set: %1"
+msgstr "Set çoğaltılamadı: %1"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1832
+msgid "Failed to duplicate set: no set name specified!"
+msgstr "Set çoğaltılamadı: set adı belirtilmemiş!"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1396
+#: ContentGenerator/Instructor/ProblemSetList.pm:1830
+msgid "Failed to duplicate set: no set selected for duplication!"
+msgstr "Set çoğaltılamadı: herhangi bir set seçili değil!"
+
+#
+#. ($newSetID)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1834
+msgid "Failed to duplicate set: set %1 already exists!"
+msgstr "Set çoğaltılamadı: set %1 zaten mevcut!"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1339
+msgid "Filename"
+msgstr "Dosya adı"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:678
+msgid "Filter by what text?"
+msgstr "Hangi metin ile filtrelenecek?"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2065
+#: ContentGenerator/Instructor/UserList.pm:283
+#: ContentGenerator/Instructor/UserList.pm:811
+#: ContentGenerator/Instructor/UserList.pm:854
+#: ContentGenerator/Instructor/UserList.pm:897
+msgid "First Name"
+msgstr "Ä°sim"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1020
+msgid "Give new password to which users?"
+msgstr "Hangi kullanıcılara yeni şifre verilecek?"
+
+#
+#: ContentGenerator/Login.pm:231
+msgid "Guest Login"
+msgstr "Misafir Kullanıcı Girişi"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:443
+#: ContentGenerator/Instructor/ProblemSetList.pm:829
+#: ContentGenerator/Instructor/ProblemSetList.pm:867
+msgid "Hardcopy Header"
+msgstr "Çıktı Dosyası Başlığı"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1017
+msgid "Hidden"
+msgstr "Gizli"
+
+#
+#: ContentGenerator.pm:667
+#: ContentGenerator/ProblemSet.pm:110
+#: ContentGenerator/ProblemSets.pm:226
+msgid "Homework Sets"
+msgstr "Soru Grupları"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:558
+msgid "If a password field is left blank, the student's current password will be maintained."
+msgstr "Şifre alanı boş bırakılırsa kullanıcının mevcut şifresi kullanılır."
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1498
+msgid "Import from where?"
+msgstr "Nereden aktarılacak?"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1473
+msgid "Import how many sets?"
+msgstr "Kaç set aktarılacak?"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1520
+msgid "Import sets with names"
+msgstr "Setleri isimleriyle beraber aktar"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1165
+msgid "Import users from what file?"
+msgstr "Kullanıcılar hangi dosyadan aktarılacak?"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1927
+msgid "Inactive"
+msgstr "Aktif DeÄŸil"
+
+#
+#: Authen.pm:148
+msgid "Invalid user ID or password."
+msgstr "Yanlış kullanıcı adı ya da şifre."
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2066
+#: ContentGenerator/Instructor/UserList.pm:284
+#: ContentGenerator/Instructor/UserList.pm:812
+#: ContentGenerator/Instructor/UserList.pm:855
+#: ContentGenerator/Instructor/UserList.pm:898
+msgid "Last Name"
+msgstr "Soyadı"
+
+#
+#: ContentGenerator.pm:730
+msgid "Library Browser"
+msgstr "Soru Kütüphaneleri"
+
+#
+#: ContentGenerator.pm:731
+msgid "Library Browser 2"
+msgstr "Soru Kütüphane Tarayıcısı 2"
+
+#
+#: ContentGenerator/Logout.pm:124
+msgid "Log In Again"
+msgstr "Tekrar giriÅŸ yap"
+
+#
+#: ContentGenerator.pm:845
+#: ContentGenerator.pm:847
+msgid "Log Out"
+msgstr "Çıkış Yap"
+
+#
+#. ($userID)
+#: ContentGenerator.pm:845
+#: ContentGenerator.pm:847
+#, fuzzy
+msgid "Logged in as %1. "
+msgstr "%1 olarak giriş yaptınız."
+
+#
+#: ContentGenerator/Login.pm:74
+#: ContentGenerator/Login.pm:77
+msgid "Login Info"
+msgstr "GiriÅŸ Bilgileri"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2062
+#: ContentGenerator/Instructor/UserList.pm:282
+#: ContentGenerator/Instructor/UserList.pm:810
+#: ContentGenerator/Instructor/UserList.pm:853
+#: ContentGenerator/Instructor/UserList.pm:896
+msgid "Login Name"
+msgstr "Kullanıcı adı"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2063
+#, fuzzy
+msgid "Login Status"
+msgstr "Durumu"
+
+#
+#: ContentGenerator.pm:654
+msgid "Main Menu"
+msgstr "Ana Menü"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:705
+msgid "Match on what? (separate multiple IDs with commas)"
+msgstr "Hangi özellikler eşleştirilecek? (birden fazla kullanıcı adını virgülle ayırın)"
+
+#
+#: ContentGenerator/Problem.pm:245
+msgid "Messages"
+msgstr "Mesajlar"
+
+#
+#: ContentGenerator/ProblemSet.pm:349
+#: ContentGenerator/ProblemSets.pm:212
+#: ContentGenerator/ProblemSets.pm:213
+msgid "Name"
+msgstr "Grup Adı"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1328
+msgid "Name the new set"
+msgstr "Yeni seti adlandırın"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1937
+#: ContentGenerator/Instructor/UserList.pm:2077
+msgid "New Password"
+msgstr "Yeni Åžifre"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1519
+msgid "New passwords saved"
+msgstr "Yeni ÅŸifreler kaydedildi"
+
+#
+#: ContentGenerator/Problem.pm:864
+#: ContentGenerator/Problem.pm:866
+msgid "Next Problem"
+msgstr "Sonraki Soru"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2625
+#: ContentGenerator/Instructor/ProblemSetList.pm:2626
+msgid "No"
+msgstr "Hayır"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1043
+#: ContentGenerator/Instructor/ProblemSetList.pm:1145
+msgid "No change made to any set"
+msgstr "Herhangi bir sete değişiklik yapılmadı"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1217
+msgid "No sets selected for scoring"
+msgstr "Notlamak için bir set seçili değil"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:266
+msgid "No sets selected for scoring."
+msgstr "Notlama için bir set seçili değil."
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2722
+msgid "No sets shown.  Choose one of the options above to list the sets in the course."
+msgstr "Hiç set gösterilmiyor. Dersteki setleri görmek için yukarıdaki seçeneklerden birini işaretleyin."
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2110
+msgid ""
+"No students shown.  Choose one of the options above to \n"
+"\t              list the students in the course."
+msgstr "Hiç öğrenci gösterilmiyor. Dersteki öğrencileri görmek için yukarıdaki seçeneklerden birisini seçin."
+
+#
+#: ContentGenerator.pm:851
+msgid "Not logged in."
+msgstr "Giriş yapmadınız."
+
+#
+#: ContentGenerator/Problem.pm:975
+msgid "Note"
+msgstr "Not"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:444
+#: ContentGenerator/Instructor/ProblemSetList.pm:830
+#: ContentGenerator/Instructor/ProblemSetList.pm:868
+msgid "Open Date"
+msgstr "Açılış tarihi"
+
+#
+#: ContentGenerator/Problem.pm:1307
+msgid "PREVIEW ONLY -- ANSWERS NOT RECORDED"
+msgstr "GÖSTERİM -- YANITLAR KAYDEDİLMEDİ "
+
+#
+#. (timestamp($self)
+#: ContentGenerator.pm:953
+msgid "Page generated at %1"
+msgstr "Sayfa %1de yaratıldı"
+
+#
+#: ContentGenerator/Login.pm:202
+msgid "Password"
+msgstr "Sifre"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2073
+#: ContentGenerator/Instructor/UserList.pm:291
+#: ContentGenerator/Instructor/UserList.pm:819
+#: ContentGenerator/Instructor/UserList.pm:862
+#: ContentGenerator/Instructor/UserList.pm:905
+msgid "Permission Level"
+msgstr "Yetki seviyesi"
+
+#
+#. (CGI::b($r->maketext($course)
+#: ContentGenerator/Login.pm:154
+#, fuzzy
+msgid "Please enter your username and password for %1 below:"
+msgstr "Lütfen %1 dersi için kullanici adi ve sifrenizi giriniz:"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:396
+msgid "Please select action to be performed."
+msgstr "Lütfen gerçekleştirilecek işlemi seçin."
+
+#
+#: ContentGenerator/Problem.pm:1116
+msgid "Preview Answers"
+msgstr "Yanıtları görüntüle"
+
+#
+#: ContentGenerator/Problem.pm:850
+#: ContentGenerator/Problem.pm:852
+msgid "Previous Problem"
+msgstr "Önceki Soru"
+
+#
+#. ($problemID)
+#: ContentGenerator.pm:686
+#: ContentGenerator/Problem.pm:808
+#: ContentGenerator/ProblemSet.pm:424
+msgid "Problem %1"
+msgstr "Soru %1"
+
+#
+#: ContentGenerator/Problem.pm:856
+#: ContentGenerator/Problem.pm:858
+msgid "Problem List"
+msgstr "Soru Listesi"
+
+#
+#: ContentGenerator/Problem.pm:796
+#: ContentGenerator/ProblemSet.pm:346
+msgid "Problems"
+msgstr "Sorular"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2071
+#: ContentGenerator/Instructor/UserList.pm:289
+#: ContentGenerator/Instructor/UserList.pm:817
+#: ContentGenerator/Instructor/UserList.pm:860
+#: ContentGenerator/Instructor/UserList.pm:903
+msgid "Recitation"
+msgstr "Problem cozum dersi"
+
+#
+#. ($verb)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1148
+msgid "Reduced Credit %1 for all sets"
+msgstr "Bütün setler için notlar %1 azaltıldı"
+
+#
+#. ($verb)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1154
+msgid "Reduced Credit %1 for selected sets"
+msgstr "Seçili setler için notlar %1 azaltıldı"
+
+#
+#. ($verb)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1151
+msgid "Reduced Credit %1 for visable sets"
+msgstr "Görünür setler için notlar %1 azaltıldı"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2523
+msgid "Reduced Credit Disabled"
+msgstr "Azaltılmış not etkin değil"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2523
+#: ContentGenerator/Instructor/ProblemSetList.pm:448
+msgid "Reduced Credit Enabled"
+msgstr "Azaltılmış not etkin"
+
+#
+#. ($beginReducedScoringPeriod)
+#: ContentGenerator/ProblemSets.pm:459
+msgid "Reduced Credit Starts: %1"
+msgstr "Azaltılmiş not başlangıç tarihi: %1"
+
+#
+#: ContentGenerator/ProblemSet.pm:351
+msgid "Remaining"
+msgstr "Kalan hak"
+
+#
+#: ContentGenerator/Login.pm:204
+msgid "Remember Me"
+msgstr "Beni hatırla"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1190
+msgid "Replace which users?"
+msgstr "Hangi kullanıcılar değiştirilecek?"
+
+#
+#: ContentGenerator.pm:799
+msgid "Report bugs"
+msgstr "Hataları bildir"
+
+#
+#: ContentGenerator/Problem.pm:244
+msgid "Result"
+msgstr "Sonuç"
+
+#
+#. (CGI::i($self->$actionHandler(\%genericParams, \%actionParams, \%tableParams)
+#: ContentGenerator/Instructor/UserList.pm:376
+msgid "Result of last action performed: %1"
+msgstr "En son gerçekleştilen işlemin sonucu: %1"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:386
+msgid "Results of last action performed"
+msgstr "En son gerçekleştirilen işlemin sonuçları"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1732
+#: ContentGenerator/Instructor/UserList.pm:1415
+#: ContentGenerator/Instructor/UserList.pm:1487
+msgid "Save changes"
+msgstr "DeÄŸiÅŸiklikleri kaydet"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1186
+msgid "Score which sets?"
+msgstr "Hangi setler notlanacak?"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2070
+#: ContentGenerator/Instructor/UserList.pm:288
+#: ContentGenerator/Instructor/UserList.pm:816
+#: ContentGenerator/Instructor/UserList.pm:859
+#: ContentGenerator/Instructor/UserList.pm:902
+msgid "Section"
+msgstr "Bölüm"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:582
+msgid "Select all sets"
+msgstr "Bütün setleri seç"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:535
+msgid "Select all users"
+msgstr "Bütün kullanıcıları seç"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:534
+#: ContentGenerator/Instructor/UserList.pm:512
+msgid "Select an action to perform"
+msgstr "Yapılacak işlemi seç"
+
+#
+#. ($newSetID)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1375
+msgid "Set %1 exists.  No set created"
+msgstr "Set %1 mevcut. Yeni set oluşturulmadı"
+
+#: ContentGenerator/Instructor/ProblemSetList.pm:440
+msgid "Set Definition Filename"
+msgstr "Set Tanım Dosyası Adı"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:442
+#: ContentGenerator/Instructor/ProblemSetList.pm:828
+#: ContentGenerator/Instructor/ProblemSetList.pm:866
+msgid "Set Header"
+msgstr "Set Başlığı"
+
+#
+#: ContentGenerator/ProblemSet.pm:273
+#: ContentGenerator/ProblemSet.pm:275
+msgid "Set Info"
+msgstr "Set Bilgileri"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2700
+msgid "Set List"
+msgstr "Set Listesi"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:827
+#: ContentGenerator/Instructor/ProblemSetList.pm:865
+msgid "Set Name"
+msgstr "Set Adı"
+
+#
+#: ContentGenerator/ProblemSet.pm:153
+msgid "Sets"
+msgstr "Setler"
+
+#
+#: ContentGenerator/Problem.pm:1063
+msgid "Show Hints"
+msgstr "İpuçlarını göster"
+
+#
+#: ContentGenerator/Problem.pm:1370
+msgid "Show Past Answers"
+msgstr "Önceki Yanıtları Göster"
+
+#
+#: ContentGenerator/Problem.pm:1082
+msgid "Show Solutions"
+msgstr "Çözümleri göster"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:645
+msgid "Show Which Users?"
+msgstr "Hangi kullanıcılar gösterilecek?"
+
+#
+#: ContentGenerator/Problem.pm:1044
+msgid "Show correct answers"
+msgstr "Doğru yanıtları göster"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:683
+msgid "Show which sets?"
+msgstr "Hangi setler gösterilecek?"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:497
+#: ContentGenerator/Instructor/UserList.pm:475
+msgid "Show/Hide Site Description"
+msgstr "Web Alanı Açıklamasını Göster/Gizle"
+
+#
+#. (scalar @visibleSetIDs, scalar @allSetIDs)
+#: ContentGenerator/Instructor/ProblemSetList.pm:607
+msgid "Showing %1 out of %2 sets."
+msgstr "%2 setin %1 tanesi gösteriliyor."
+
+#
+#. (scalar @Users, scalar @allUserIDs)
+#: ContentGenerator/Instructor/UserList.pm:556
+msgid "Showing %1 out of %2 users"
+msgstr "%2 kullanıcının %1 tanesi gösteriliyor."
+
+#
+#: ContentGenerator/Login.pm:96
+#: ContentGenerator/Login.pm:99
+msgid "Site Information"
+msgstr "Web Alanı Bilgileri"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:821
+#: ContentGenerator/Instructor/UserList.pm:804
+msgid "Sort by"
+msgstr "Kriterlere Göre Sırala"
+
+#
+#. ($names{$primary}, $names{$secondary})
+#: ContentGenerator/Instructor/ProblemSetList.pm:899
+msgid "Sort by %1 and then by %2"
+msgstr "Önce %1 sonra %2 kriteriyle sırala"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2069
+#: ContentGenerator/Instructor/UserList.pm:287
+#: ContentGenerator/ProblemSet.pm:353
+#: ContentGenerator/ProblemSets.pm:215
+#: ContentGenerator/ProblemSets.pm:216
+msgid "Status"
+msgstr "Durumu"
+
+#
+#: ContentGenerator.pm:848
+msgid "Stop Acting"
+msgstr "Rol Yapmayı bırak"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2068
+#: ContentGenerator/Instructor/UserList.pm:286
+#: ContentGenerator/Instructor/UserList.pm:814
+#: ContentGenerator/Instructor/UserList.pm:857
+#: ContentGenerator/Instructor/UserList.pm:900
+msgid "Student ID"
+msgstr "Kullanıcı Adı"
+
+#
+#: ContentGenerator/Problem.pm:1127
+msgid "Submit Answers"
+msgstr "Yanıtları Gönder"
+
+#
+#. ($effectiveUser)
+#: ContentGenerator/Problem.pm:1124
+#, fuzzy
+msgid "Submit Answers for %1"
+msgstr "%1 için Yanıtları Gönder"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1850
+msgid "Success"
+msgstr "Başarılı"
+
+#. ($newSetID)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1437
+msgid "Successfully created new set %1"
+msgstr "Yeni set %1 başarıyla yaratıldı"
+
+#
+#. ($name)
+#: ContentGenerator/ProblemSets.pm:424
+#: ContentGenerator/ProblemSets.pm:433
+#: ContentGenerator/ProblemSets.pm:439
+msgid "Take %1 test"
+msgstr "%1 testini çöz"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:598
+#: ContentGenerator/Instructor/UserList.pm:551
+msgid "Take Action!"
+msgstr "İşlemi Gerçekleştir!"
+
+#
+#: ContentGenerator/ProblemSets.pm:236
+msgid "Test Date"
+msgstr "Sınav Tarihi"
+
+#
+#: ContentGenerator/ProblemSets.pm:235
+msgid "Test Score"
+msgstr "Sınav Notu"
+
+#
+#: ContentGenerator.pm:954
+msgid "The WeBWorK Project"
+msgstr "WeBWorK Projesi"
+
+#
+#. ($fully)
+#: ContentGenerator/Problem.pm:307
+#, fuzzy
+msgid "The answer above is NOT %1correct."
+msgstr "Yukarıdaki yanıt %1doğru değil."
+
+#
+#: ContentGenerator/Problem.pm:305
+msgid "The answer above is correct."
+msgstr "Yukarıdaki yanıt doğru."
+
+#
+#. (CGI::b($r->maketext("[_1]'s Current Password",$user_name)
+#: ContentGenerator/Options.pm:107
+#, fuzzy
+msgid ""
+"The password you entered in the %1 \n"
+"\t\t\t\t\t\tfield does not match your current\n"
+"\t\t\t\t\t\tpassword. Please retype your current password and try\n"
+"\t\t\t\t\t\tagain."
+msgstr "%1 alanına girdiğiniz şifre ile mevcut şifreniz uyuşmamaktadır. Lütfen şirfenizi girerek tekrar deneyiniz."
+
+#
+#. (CGI::b($r->maketext("[_1]'s New Password",$e_user_name)
+#: ContentGenerator/Options.pm:91
+#, fuzzy
+msgid ""
+"The passwords you entered in the \n"
+"\t\t\t\t\t\t\t\t%1 and %2\n"
+"\t\t\t\t\t\t\t\tfields don't match. Please retype your new password and try\n"
+"\t\t\t\t\t\t\t\tagain."
+msgstr "%1 ve %2  alanlarına girdiğiniz şifreler uyuşmadı. Yeni şifrenizi girerek tekrar deneyiniz."
+
+#
+#. ($setName,$effectiveUser)
+#: ContentGenerator/ProblemSet.pm:308
+msgid "The selected problem set (%1) is not a valid set for %2"
+msgstr "Seçtiğiniz soru seti (%1) set %2 için geçerli değil"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:859
+#: ContentGenerator/Instructor/UserList.pm:847
+#: ContentGenerator/Instructor/UserList.pm:890
+msgid "Then by"
+msgstr "sonra"
+
+#
+#: ContentGenerator/ProblemSet.pm:365
+msgid "This homework set contains no problems."
+msgstr "Bu soru grubunda soru bulunmamaktadır."
+
+#
+#: ContentGenerator/Problem.pm:1175
+msgid "This homework set is closed."
+msgstr "Bu soru grubu kapalı."
+
+#
+#: ContentGenerator/Problem.pm:1173
+msgid "This homework set is not yet open."
+msgstr "Bu soru grubu henüz açık değil."
+
+#
+#: ContentGenerator/Problem.pm:611
+msgid "This problem will not count towards your grade."
+msgstr "Bu soru, notunuzu etkilemeyecektir."
+
+#
+#. (CGI::font({class=>$visiblityStateClass}, $visiblityStateText)
+#: ContentGenerator/Problem.pm:605
+#: ContentGenerator/ProblemSet.pm:88
+msgid "This set is %1"
+msgstr "Bu set %1"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:588
+msgid "Unselect all sets"
+msgstr "Bütün setlerdeki seçimi kaldır"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:541
+msgid "Unselect all users"
+msgstr "Bütün kullanıcılardaki seçimi kaldir"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2683
+msgid "Use System Default"
+msgstr "Varsayılan Ayarları Kullan"
+
+#
+#: ContentGenerator/Login.pm:200
+msgid "Username"
+msgstr "Kullanici adi"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2087
+msgid "Users List"
+msgstr "Kullanıcı Listesi"
+
+#
+#. ($names{$primary}, $names{$secondary}, $names{$ternary})
+#: ContentGenerator/Instructor/UserList.pm:938
+msgid "Users sorted by %1, then by %2, then by %3"
+msgstr "Kullanıcılar sırasıyla %1, %2 ve %3 kriterlerine göre sıları"
+
+#
+#: ContentGenerator/ProblemSet.pm:230
+msgid "Viewing temporary file"
+msgstr "Geçici dosya gösteriliyor"
+
+#
+#: ContentGenerator/Problem.pm:1332
+#: ContentGenerator/ProblemSets.pm:63
+msgid "Viewing temporary file: "
+msgstr "Geçici dosya görüntüleniyor: "
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:833
+#: ContentGenerator/Instructor/ProblemSetList.pm:871
+msgid "Visibility"
+msgstr "Görünürlük"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1018
+#: ContentGenerator/Instructor/ProblemSetList.pm:447
+msgid "Visible"
+msgstr "Görünür"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1259
+#: ContentGenerator/Instructor/UserList.pm:1078
+msgid "Warning: Deletion destroys all user-related data and is not undoable!"
+msgstr "Dikkat: Silme işlemi kullanıcının bütün bilgilerini yok eder ve bu işlem geri döndürelemez!"
+
+#
+#: ContentGenerator/Home.pm:87
+msgid "Welcome to WeBWorK!"
+msgstr "WeBWorK sitemize hoÅŸgeldiniz!"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:665
+msgid "What field should filtered users match on?"
+msgstr "Seçili kullanıcılar hangi kriterlerde eşleşmeli?"
+
+#
+#: ContentGenerator/ProblemSet.pm:352
+msgid "Worth"
+msgstr "DeÄŸeri"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2625
+#: ContentGenerator/Instructor/ProblemSetList.pm:2626
+msgid "Yes"
+msgstr "Evet"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:306
+#: ContentGenerator/Instructor/ProblemSetList.pm:418
+#: ContentGenerator/Instructor/UserList.pm:262
+msgid "You are not authorized to access the instructor tools."
+msgstr "Eğitmen araçlarına erişim yetkiniz yok."
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:339
+msgid "You are not authorized to modify homework sets."
+msgstr "Ödev setlerini değiştirme yetkiniz yok."
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:344
+msgid "You are not authorized to modify set definition files."
+msgstr "Set tanım dosyalarını değiştirme yetkiniz yok."
+
+#
+#: ContentGenerator/Instructor/UserList.pm:329
+#: ContentGenerator/Instructor/UserList.pm:335
+msgid "You are not authorized to modify student data"
+msgstr "Öğrenci bilgilerini değiştirme yetkisine sahip değilsiniz."
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:389
+#: ContentGenerator/Instructor/UserList.pm:380
+msgid "You are not authorized to perform this action."
+msgstr "Bu işlemi gerçekleştirme yetkiniz yok."
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1121
+msgid "You cannot delete yourself!"
+msgstr "Kendinizi silemezsiniz!"
+
+#
+#: ContentGenerator/Options.pm:163
+#: ContentGenerator/Options.pm:180
+msgid "You do not have permission to change email addresses."
+msgstr "Adres değiştirmek için yetkiniz yok."
+
+#
+#: ContentGenerator/Options.pm:117
+#: ContentGenerator/Options.pm:139
+msgid "You do not have permission to change your password."
+msgstr "Şifre değiştirmek için yetkiniz yok."
+
+#
+#. ($attemptsLeft,$attemptsLeftNoun)
+#: ContentGenerator/Problem.pm:1196
+#, fuzzy
+msgid "You have %1 %2 remaining."
+msgstr "%1 %2 kaldı."
+
+#
+#. ($attemptsLeft)
+#: ContentGenerator/Problem.pm:1197
+#, fuzzy
+msgid "You have %negquant(%1,unlimited attempts,attempt,attempts) remaining."
+msgstr "[negquant,_1,Sınırsız deneme hakkı,deneme hakkı,deneme hakkı] kaldı."
+
+#
+#. ($attempts)
+#: ContentGenerator/Problem.pm:1191
+#, fuzzy
+msgid "You have attempted this problem %quant(%1,time,times)."
+msgstr "Bu soru için [quant,_1,deneme hakkı,deneme hakkı] kullandınız."
+
+#
+#: ContentGenerator/Logout.pm:119
+msgid "You have been logged out of WeBWorK."
+msgstr "WeBWorK sisteminden çıkış yaptınız."
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1933
+msgid "You may not change your own password here!"
+msgstr "Åžifrenizi buradan deÄŸiÅŸtiremezsiniz!"
+
+#
+#: Authen.pm:317
+msgid "You must specify a user ID."
+msgstr "Bir kullanıcı adı girmelisiniz."
+
+#
+#. (sprintf("%.0f%%", $pg->{result}->{score} * 100)
+#: ContentGenerator/Problem.pm:1192
+#, fuzzy
+msgid "You received a score of %1 for this attempt."
+msgstr "Bu soru için %1 puan aldınız."
+
+#
+#: ContentGenerator/Options.pm:157
+msgid "Your email address has been changed."
+msgstr "E-posta adresiniz deÄŸiÅŸtirildi."
+
+#
+#. ($lastScore,$notCountedMessage)
+#: ContentGenerator/Problem.pm:1194
+#, fuzzy
+msgid "Your overall recorded score is %1.  %2"
+msgstr "Ortalama puanınız: %1.  %2"
+
+#
+#: Authen.pm:416
+msgid "Your session has timed out due to inactivity. Please log in again."
+msgstr "Oturumunuz zaman aşımına uğradı. Lütfen tekrar giriş yapınız."
+
+#
+#: ContentGenerator/ProblemSet.pm:273
+#: ContentGenerator/ProblemSets.pm:71
+#, fuzzy
+msgid "[edit]"
+msgstr "~[düzenle~]"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:476
+msgid "_CLASSLIST_EDITOR_DESCRIPTION"
+msgstr "Bu sayfa sınıf listesi editörü. Burada derse kayıtlı öğrencilerin bilgilerini görebilir ve değiştirebilirsiniz. Sayfanın yukarısında hangi öğrencileri görmek istediğinizi belirleyebileceğiniz filtre formları var. Bunları kullanarak öğrencileri belirlediğiniz kriterlere göre sıralayabilir, öğrenci bilgilerini değiştirebilir,öğrencilere yeni şifre verebilir, dışarıdan öğrenci bilgileri alabilir yahut derse yeni öğrenciler ekleyip çıkarabilirsiniz. Hangi işlemi yapmak istiyorsanız seçin ve gerekli bilgileri girin daha sonra \"İşlemi Gerçekleştir!\" tuşuna basın. Sayfanın altında öğrencilerin bilgilerini gösteren bir tablo var."
+
+#
+#. (CGI::strong($r->maketext($course)
+#: ContentGenerator/Login.pm:151
+msgid "_EXTERNAL_AUTH_MESSAGE"
+msgstr "%1 harici bir kimlik doğrulama sistemi kullanıyor.  Bu sistemle kimliğinizi doğruladınız fakat bu derse giriş yapma izniniz yok."
+
+#
+#. (CGI::b($r->maketext("Guest Login")
+#: ContentGenerator/Login.pm:230
+msgid "_GUEST_LOGIN_MESSAGE"
+msgstr "Bu derse misafir olarak girebilirsiniz. Misafir olarak girmek için %1 linkine basın. "
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:498
+msgid "_HMWKSETS_EDITOR_DESCRIPTION"
+msgstr "Bu sayfa ödev setleri editörü. Burada bu derse ait ödev setlerini görebilir ve üzerlerinde değişiklikler yapabilirsiniz. Yukarıdaki formları kullanarak setleri istediğiniz kriterlere göre görüntüleyebilir, setleri düzenleyebilir, yeni setler yayımlayabilir, dışarıdan ödev setleri aktarabilir, ödevleri notlayabilir yahut var olan setleri silebilirsiniz.  Hangi işlemi yapmak istiyorsanız seçin ve gerekli bilgileri girin daha sonra \"İşlemi Gerçekleştir!\" tuşuna basın. Sayfanın aşağısında mevcut setler hakkında bir takım bilgiler var."
+
+#
+#. (CGI::b($r->maketext("Remember Me")
+#: ContentGenerator/Login.pm:155
+msgid "_LOGIN_MESSAGE"
+msgstr " Eğer %1 seçeneğini işaretlerseniz, giriş bilgileriniz kullandığınız tarayıcı tarafından hatırlanacak ve sonraki girişlerinizde kullanıcı adı ve şifre girmeden WebWork sayfalarını kullanabileceksiniz. Bu özellik, ortak kullanıma açık bilgisayarlar, güvenli olmayan bilgisayarlar, ve doğrudan kontrole sahip olmadığınız bilgisayarlarda kullanmak için güvenli değildir."
+
+#
+#. ($beginReducedScoringPeriod,$dueDate,$reducedScoringPerCent)
+#: ContentGenerator/ProblemSet.pm:333
+msgid "_REDUCED_CREDIT_MESSAGE_1"
+msgstr "Bu ödev seti için Azaltılmış Not süresi var. Bu süre %1 tarihinde başlıyor ve %2 tarihinde son buluyor. Bu süre içinde cevaplanan bütün sorular asıl değerlerinin yüzde %3 değerinde olacak."
+
+#
+#. ($beginReducedScoringPeriod,$dueDate,$reducedScoringPerCent)
+#: ContentGenerator/ProblemSet.pm:335
+msgid "_REDUCED_CREDIT_MESSAGE_2"
+msgstr "Bu ödev seti için Azaltılmış Not süresi vardı. Bu süre %1 tarihinde başladı ve %2 tarihinde bitti. Bu süre içinde cevaplanan bütün sorular asıl değerlerinin yüzde %3 değerinde notlandı."
+
+#
+#: ContentGenerator.pm:1951
+msgid "_REQUEST_ERROR"
+msgstr " WebWork bu problemi işlerken bir yazılım hatası ile karşılaştı. Problemin kendisinde bir hata olması muhtemeldir. Eğer bir öğrenci iseniz bu hatayı ilgili kişilere bildiriniz. Eğer yetkili bir kişiyseniz daha fazla bilgi için alttaki hata raporunu inceleyiniz."
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1358
+msgid "a duplicate of the first selected set"
+msgstr "İlk seçilen setin bir kopyası"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1357
+msgid "a new empty set"
+msgstr "BoÅŸ bir yeni set"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1479
+msgid "a single set"
+msgstr "tek bir set"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1091
+#: ContentGenerator/Instructor/ProblemSetList.pm:1193
+#: ContentGenerator/Instructor/ProblemSetList.pm:1610
+#: ContentGenerator/Instructor/ProblemSetList.pm:689
+#: ContentGenerator/Instructor/ProblemSetList.pm:929
+#: ContentGenerator/Instructor/ProblemSetList.pm:989
+msgid "all sets"
+msgstr "bütün setler"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1551
+#: ContentGenerator/Instructor/UserList.pm:1026
+#: ContentGenerator/Instructor/UserList.pm:1298
+#: ContentGenerator/Instructor/UserList.pm:651
+#: ContentGenerator/Instructor/UserList.pm:967
+msgid "all users"
+msgstr "bütün kullanıcılar"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1196
+#: ContentGenerator/Instructor/UserList.pm:1226
+msgid "any users"
+msgstr "her kullanıcı"
+
+#
+#: ContentGenerator/Problem.pm:1165
+msgid "attempt"
+msgstr "deneme hakkı"
+
+#
+#: ContentGenerator/Problem.pm:1162
+#: ContentGenerator/Problem.pm:1165
+msgid "attempts"
+msgstr "deneme hakkı"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1726
+msgid "changes abandoned"
+msgstr "deÄŸiÅŸiklikler kaydedilmedi"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1790
+msgid "changes saved"
+msgstr "deÄŸiÅŸiklikler kaydedildi"
+
+#
+#: ContentGenerator/ProblemSets.pm:468
+msgid "closed, answers available"
+msgstr "kapalı, cevaplar açıklandı"
+
+#
+#. ($self->formatDateTime($set->answer_date)
+#: ContentGenerator/ProblemSets.pm:464
+#, fuzzy
+msgid "closed, answers on %1"
+msgstr "kapalı, cevaplar %1 tarihinde"
+
+#
+#: ContentGenerator/ProblemSets.pm:466
+msgid "closed, answers recently available"
+msgstr "kapalı, cevaplar yeni açıklandı"
+
+#
+#: ContentGenerator/ProblemSets.pm:402
+msgid "completed."
+msgstr "tamamlandı."
+
+#
+#: ContentGenerator/Problem.pm:267
+msgid "completely"
+msgstr "tamamen"
+
+#
+#: ContentGenerator/Problem.pm:264
+msgid "correct"
+msgstr "doÄŸru"
+
+#
+#. ($num)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1310
+msgid "deleted %1 sets"
+msgstr "%1 set silindi."
+
+#
+#. ($num)
+#: ContentGenerator/Instructor/UserList.pm:1135
+msgid "deleted %1 users"
+msgstr "%1 kullanıcı silindi."
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:947
+msgid "editing all sets"
+msgstr "bütün setler düzenleniyor"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:985
+msgid "editing all users"
+msgstr "bütün kullancılar düzenleniyor"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:953
+msgid "editing selected sets"
+msgstr "seçili setler düzenleniyor"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:991
+msgid "editing selected users"
+msgstr "seçili kullanıcılar düzenleniyor"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:950
+msgid "editing visible sets"
+msgstr "görünür setler düzenleniyor"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:988
+msgid "editing visible users"
+msgstr "görünür kullanıcılar düzenleniyor"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:694
+msgid "enter matching set IDs below"
+msgstr "eşleşen ödev setlerini aşağıya girin"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1665
+msgid "export abandoned"
+msgstr "dışarı aktarım yapılmadı"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1629
+msgid "exporting all sets"
+msgstr "bürün setler dışarı aktarılıyor"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1636
+msgid "exporting selected sets"
+msgstr "seçili setler dışarı aktarılıyor"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1633
+msgid "exporting visible sets"
+msgstr "görünür setler dışarı aktarılıyor"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1044
+msgid "giving new passwords to all users"
+msgstr "bütün kullanıcılara yeni şifre veriliyor"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1050
+msgid "giving new passwords to selected users"
+msgstr "seçili kullanıcılara yeni şifre veriliyor"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1047
+msgid "giving new passwords to visible users"
+msgstr "görünür kullanıcılara yeni şifre veriliyor"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2522
+#: ContentGenerator/Problem.pm:603
+msgid "hidden"
+msgstr "gizli"
+
+#
+#: ContentGenerator/Problem.pm:604
+#: ContentGenerator/ProblemSet.pm:86
+msgid "hidden from students"
+msgstr "öğrenciler tarafından görülemez"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:693
+msgid "hidden sets"
+msgstr "gizli setler"
+
+#
+#: ContentGenerator/Problem.pm:266
+msgid "incorrect"
+msgstr "yanlış"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1480
+msgid "multiple sets"
+msgstr "birden fazla set"
+
+#
+#: ContentGenerator/Problem.pm:864
+msgid "navNext"
+msgstr "&nbspSonraki"
+
+#
+#: ContentGenerator/Problem.pm:866
+msgid "navNextGrey"
+msgstr "&nbspSonraki"
+
+#
+#: ContentGenerator/Problem.pm:850
+msgid "navPrev"
+msgstr "&nbspÖnceki"
+
+#
+#: ContentGenerator/Problem.pm:852
+msgid "navPrevGrey"
+msgstr "&nbspÖnceki"
+
+#
+#: ContentGenerator/Problem.pm:856
+msgid "navProbList"
+msgstr "&nbspSorular"
+
+#
+#: ContentGenerator/Problem.pm:858
+msgid "navProbListGrey"
+msgstr "&nbspSorular"
+
+#
+#: ContentGenerator/ProblemSet.pm:110
+msgid "navUp"
+msgstr "tr:&nbspYukarı"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1090
+#: ContentGenerator/Instructor/ProblemSetList.pm:1192
+#: ContentGenerator/Instructor/ProblemSetList.pm:1269
+#: ContentGenerator/Instructor/ProblemSetList.pm:690
+#: ContentGenerator/Instructor/ProblemSetList.pm:988
+msgid "no sets"
+msgstr "Set yok"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1552
+#: ContentGenerator/Instructor/UserList.pm:1088
+#: ContentGenerator/Instructor/UserList.pm:1199
+#: ContentGenerator/Instructor/UserList.pm:1227
+#: ContentGenerator/Instructor/UserList.pm:652
+msgid "no users"
+msgstr "kullanıcı yok"
+
+#
+#: ContentGenerator/ProblemSets.pm:430
+#: ContentGenerator/ProblemSets.pm:452
+msgid "now open, due "
+msgstr "açık, bitiş tarihi: "
+
+#
+#. ($self->formatDateTime($set->due_date()
+#: ContentGenerator/ProblemSets.pm:408
+#, fuzzy
+msgid "open: complete by %1"
+msgstr "açık: %1 tarihine kadar tamamlayın"
+
+#
+#: ContentGenerator/ProblemSets.pm:405
+msgid "over time: closed."
+msgstr "süre bitti: kapalı."
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1093
+#: ContentGenerator/Instructor/ProblemSetList.pm:1194
+#: ContentGenerator/Instructor/ProblemSetList.pm:1271
+#: ContentGenerator/Instructor/ProblemSetList.pm:1612
+#: ContentGenerator/Instructor/ProblemSetList.pm:691
+#: ContentGenerator/Instructor/ProblemSetList.pm:931
+#: ContentGenerator/Instructor/ProblemSetList.pm:991
+msgid "selected sets"
+msgstr "seçili setler"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1028
+#: ContentGenerator/Instructor/UserList.pm:1090
+#: ContentGenerator/Instructor/UserList.pm:1198
+#: ContentGenerator/Instructor/UserList.pm:1300
+#: ContentGenerator/Instructor/UserList.pm:653
+#: ContentGenerator/Instructor/UserList.pm:969
+msgid "selected users"
+msgstr "seçili kullanıcılar"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:762
+msgid "showing all sets"
+msgstr "bütün setler gösteriliyor"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:738
+msgid "showing all users"
+msgstr "bütün kullanıcılar gösteriliyor"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:747
+msgid "showing matching users"
+msgstr "eşleşen kullanıcılar gösteriliyor"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:765
+msgid "showing no sets"
+msgstr "hiçbir set gösterilmiyor"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:741
+msgid "showing no users"
+msgstr "hiçbir kullanıcı gösterilmiyor"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:768
+msgid "showing selected sets"
+msgstr "seçili setler gösteriliyor"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:744
+msgid "showing selected users"
+msgstr "seçili kullanıcılar gösteriliyor"
+
+#
+#: ContentGenerator/Problem.pm:1124
+#, fuzzy
+msgid "submitAnswers"
+msgstr "Yanıtları Gönder"
+
+#
+#: ContentGenerator/Problem.pm:1154
+msgid "time"
+msgstr "deneme hakkı"
+
+#
+#: ContentGenerator/Problem.pm:1154
+msgid "times"
+msgstr "deneme hakkı"
+
+#
+#: ContentGenerator/Problem.pm:1161
+#: ContentGenerator/ProblemSet.pm:427
+msgid "unlimited"
+msgstr "sınırsız"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:654
+msgid "users who match on selected field"
+msgstr "seçili alanla eşleşen kullanıcılar"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2522
+#: ContentGenerator/Problem.pm:603
+msgid "visible"
+msgstr "Görünür"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1611
+#: ContentGenerator/Instructor/ProblemSetList.pm:692
+#: ContentGenerator/Instructor/ProblemSetList.pm:930
+msgid "visible sets"
+msgstr "görünür setler"
+
+#
+#: ContentGenerator/Problem.pm:604
+#: ContentGenerator/ProblemSet.pm:86
+msgid "visible to students"
+msgstr "öğrencilere görüntüleyebilir"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1027
+#: ContentGenerator/Instructor/UserList.pm:1197
+#: ContentGenerator/Instructor/UserList.pm:1299
+#: ContentGenerator/Instructor/UserList.pm:968
+msgid "visible users"
+msgstr "kullanıcılar görüntüleyebilir"
+
+#
+#. ($self->formatDateTime($set->open_date)
+#: ContentGenerator/ProblemSets.pm:420
+#: ContentGenerator/ProblemSets.pm:448
+#, fuzzy
+msgid "will open on %1"
+msgstr "%1 tarihinde açılacak"
+
+#
+msgid "Add to which set?"
+msgstr "Hangi sete eklenecek?"
+
+#
+msgid "Course Information for course [_1]"
+msgstr "%1 dersinin bilgileri"
+
+#
+msgid "report bugs in this problem"
+msgstr "Soruda hata olduÄŸunu bildir"
+
+#
+msgid "Problem [_1]"
+msgstr "Soru %1"
+
+#
+msgid "Cancel Password"
+msgstr "Åžifreyi iptal et"
+
+#
+msgid "WeBWorK"
+msgstr "WeBWorK"
+
+#
+msgid "Audit"
+msgstr "Denetle"
+
+#
+msgid "Hardcopy Header for set [_1]"
+msgstr "Set %1 için yazdırılabilir dosya başlığı"
+
+#
+msgid "Report bugs in a WeBWorK question/problem using this link. The very first time you do this you will need to register with an email address so that information on the bug fix can be reported back to you."
+msgstr "WebWork veya soruyla ilgili hata bildirmek için bu linki kullanın. Bunu ilk kez yaparken e-posta adresinizle kayıt olmanız gerekmektedir."
+
+#
+msgid "Pad Fields"
+msgstr "tr: Pad Fields"
+
+#
+msgid "Set Header for set [_1]"
+msgstr "Set %1 başlığı"
+
+#
+msgid "Statistics for [_1]"
+msgstr "Set %1 istatistikleri"
+
+#
+msgid "Filter"
+msgstr "Filtre"
+
+#
+msgid "set [_1]/problem [_2]"
+msgstr " set %1/soru %2"
+
+#
+msgid "You are not authorized to modify problems."
+msgstr "Sorularda deÄŸiÅŸklik yapma yetkiniz yok."
+
+#
+msgid "hardcopy header file"
+msgstr "Yazdırılabilir ödev başlığı dosyası"
+
+#
+msgid "Write permissions have not been enabled in the templates directory.  No changes can be made."
+msgstr "Şablon klasörü yazmaya kapalı. Değişiklik yapılamaz."
+
+#
+msgid "Save [_1] and View"
+msgstr "%1 Kaydet ve Görüntüle"
+
+#
+msgid "Create"
+msgstr "OluÅŸtur"
+
+#
+msgid "Changes in this file have not yet been permanently saved."
+msgstr "Dosyadaki değişiklikler henüz kalıcı olarak kaydedilmedi."
+
+#
+msgid "Instructor Tools"
+msgstr "Eğitmen Araçları"
+
+#
+msgid "Score"
+msgstr "Not"
+
+#
+msgid "Show in another window"
+msgstr "Yani pencerede göster"
+
+#
+msgid "Copied auxiliary files from [_1] to  new location at [_2]"
+msgstr "Ek dosyalar %1 dizininden %2 dizinine kopyalandı"
+
+#
+msgid "Unpublished"
+msgstr "Yayınlanmadı"
+
+#
+msgid "Login"
+msgstr "Devam et"
+
+#
+msgid "Email"
+msgstr "E-posta"
+
+#
+msgid "File Manager"
+msgstr "Dosya Yöneticisi"
+
+#
+msgid "Unable to change the hardcopy header for set [_1]. Unknown error."
+msgstr "%1 seti için yazdırılabilir dosya başlığı değiştirilemedi. Bilinmeyen hata."
+
+#
+msgid "Unable to make '[_1]' the set header for [_2]"
+msgstr "'%1' set %2 için dosya başlığı yapılamadı"
+
+#
+msgid "Can't determine user of temporary edit file [_1]."
+msgstr "Geçici dosya %1 için kullanıcı belirlenemedi."
+
+#
+msgid "Download a hardcopy of this homework set."
+msgstr "Bu set için yazdırılabilir dosya indirin."
+
+#
+msgid "Problem Editor"
+msgstr "Soru Düzenleyici"
+
+#
+msgid "The file '[_1]' is protected!"
+msgstr "'%1' dosyası korumalı!"
+
+#
+msgid "Top level of author information on the wiki."
+msgstr "Wikide yazar bilgilerinin en üst seviyesi."
+
+#
+msgid "Score selected set(s) and save to:"
+msgstr "Seçili setleri notla ve dosyaya kaydet:"
+
+#
+msgid "Save Password"
+msgstr "Åžifreyi kaydet"
+
+#
+msgid "The file '[_1]' is a blank problem!"
+msgstr "'%1' dosyası boş bir soru!"
+
+#
+msgid "Add as what filetype?"
+msgstr "Hangi dosya tipi olarak eklenecek?"
+
+#
+msgid "no action"
+msgstr "Ä°ÅŸlem yapma"
+
+#
+msgid "Added '[_1]' to [_2] as new set header"
+msgstr "'%1' dosyası %2 dosyasına yeni set başlığı olarak eklendi"
+
+#
+msgid "View statistics by set"
+msgstr "Setlere göre istatistikleri göster"
+
+#
+msgid "Set"
+msgstr "Set"
+
+#
+msgid "This is a blank problem template file and can not be edited directly. Use the 'Save as' action below to create a local copy of the file and add it to the current problem set."
+msgstr "Bu boş bir soru şablonu ve üzerinde değişiklik yapılamaz. Aşağıdaki farklı kaydet işlemini kullarak dosyanın yerel bir kopyasını oluşturdaktan sonra üzerinde değişiklik yapabilirsiniz."
+
+#
+msgid "Logout"
+msgstr "Çıkış"
+
+#
+msgid "You do not have permission to view the details of this error."
+msgstr "Bu hatanın detaylarını görmeye yetkiniz yok."
+
+#
+msgid "Reverting to original file '[_1]'"
+msgstr "Asıl dosyaya geri dönülüyor ('%1')"
+
+#
+msgid "Delete"
+msgstr "Sil"
+
+#
+msgid "Wiki summary page for MathObjects"
+msgstr "MathObjects için özet wiki sayfası"
+
+#
+msgid "Your score was recorded."
+msgstr "Notunuz kaydedildi."
+
+#
+msgid "You must specify an file name in order to save a new file."
+msgstr "Yeni dosya kaydetmek için dosya adı belirtmelisiniz."
+
+#
+msgid "To edit this text you must first make a copy of this file using the 'Save as' action below."
+msgstr "tr: To edit this text you must first make a copy of this file using the 'Save as' action below."
+
+#
+msgid "unassigned problem file"
+msgstr "tr: unassigned problem file"
+
+#
+msgid "View statistics by student"
+msgstr "tr: View statistics by student"
+
+#
+msgid "Publish"
+msgstr "tr: Publish"
+
+#
+msgid "Password/Email"
+msgstr "Åžifre/E-posta"
+
+#
+msgid "Cancel Edit"
+msgstr "tr: Cancel Edit"
+
+#
+msgid "Math Objects"
+msgstr "tr: Math Objects"
+
+#
+msgid "Snippets of PG code illustrating specific techniques"
+msgstr "tr: Snippets of PG code illustrating specific techniques"
+
+#
+msgid "Error copying [_1] to [_2]"
+msgstr "tr: Error copying %1 to %2"
+
+#
+msgid "Hmwk Sets Editor"
+msgstr "Ödev Setleri Düzenleyici"
+
+#
+msgid "This set is [_1] students."
+msgstr "Bu soru grubu öğrenciler tarafından %1."
+
+#
+msgid "header file"
+msgstr "tr: header file"
+
+#
+msgid "Include Index"
+msgstr "tr: Include Index"
+
+#
+msgid "Display Mode"
+msgstr "tr: Display Mode"
+
+#
+msgid "You can earn partial credit on this problem."
+msgstr "Bu sorudan kısmi puan alabilirsiniz."
+
+#
+msgid "Write permissions have not been enabled in '[_1]'.  Changes must be saved to a different directory for viewing."
+msgstr "tr: Write permissions have not been enabled in '%1'.  Changes must be saved to a different directory for viewing."
+
+#
+msgid "blank problem"
+msgstr "tr: blank problem"
+
+#
+msgid "Save Edit"
+msgstr "tr: Save Edit"
+
+#
+msgid "Enrolled"
+msgstr "tr: Enrolled"
+
+#
+msgid "Write permissions have not been enabled for '[_1]'.  Changes must be saved to another file for viewing."
+msgstr "tr: Write permissions have not been enabled for '%1'.  Changes must be saved to another file for viewing."
+
+#
+msgid "Note: this problem viewer is for viewing purposes only. As of right now, testing functionality is not possible."
+msgstr "tr: Note: this problem viewer is for viewing purposes only. As of right now, testing functionality is not possible."
+
+#
+msgid "Save Export"
+msgstr "tr: Save Export"
+
+#
+msgid "webwork"
+msgstr "webwork"
+
+#
+msgid "Problem Viewer"
+msgstr "tr: Problem Viewer"
+
+#
+msgid "submit button clicked"
+msgstr "gönder düğmesine basıldı"
+
+#
+msgid "Student Progress for [_1]"
+msgstr "tr: Student Progress for %1"
+
+#
+msgid "A new file has been created at '[_1]' with the contents below. No changes have been made to set [_2]."
+msgstr "tr: A new file has been created at '%1' with the contents below. No changes have been made to set %2."
+
+#
+msgid "Your score was not recorded because this problem has not been assigned to you."
+msgstr "Notunuz kaydedilmedi çünkü bu soru size yöneltilmedi."
+
+#
+msgid "Sort"
+msgstr "tr: Sort"
+
+#
+msgid "Add problem"
+msgstr "tr: Add problem"
+
+#
+msgid "Author Info"
+msgstr "tr: Author Info"
+
+#
+msgid "Replace [_1]"
+msgstr "tr: Replace %1"
+
+#
+msgid "Help"
+msgstr "tr: Help"
+
+#
+msgid "Add Users"
+msgstr "Kullanıcı Ekle"
+
+#
+msgid "Problem Source Code"
+msgstr "tr: Problem Source Code"
+
+#
+msgid "Test snippets of PG code in interactive lab.  Good way to learn PG language."
+msgstr "tr: Test snippets of PG code in interactive lab.  Good way to learn PG language."
+
+#
+msgid "Page generated at [_1] at [_2]"
+msgstr "tr: Page generated at %1 at %2"
+
+#
+msgid "Import"
+msgstr "tr: Import"
+
+#
+msgid "View Using Seed Number"
+msgstr "tr: View Using Seed Number"
+
+#
+msgid "Grades"
+msgstr "Notlar"
+
+#
+msgid "Published"
+msgstr "Yayınlandı"
+
+#
+msgid "Your score was not recorded because this homework set is closed."
+msgstr "Notunuz kaydedilemedi çünkü bu soru grubu kapalı."
+
+#
+msgid "The text box now contains the source of the original problem. You can recover lost edits by using the Back button on your browser."
+msgstr "tr: The text box now contains the source of the original problem. You can recover lost edits by using the Back button on your browser."
+
+#
+msgid "The file '[_1]' is a directory!"
+msgstr "tr: The file '%1' is a directory!"
+
+#
+msgid "Save As"
+msgstr "tr: Save As [TMPL]/"
+
+#
+msgid "Documentation from source code for PG modules and macro files. Often the most up-to-date information."
+msgstr "tr: Documentation from source code for PG modules and macro files. Often the most up-to-date information."
+
+#
+msgid "Problem Techniques"
+msgstr "tr: Problem Techniques"
+
+#
+msgid "Course Configuration"
+msgstr "Ders Seçenekleri"
+
+#
+msgid "Feedback"
+msgstr "Geri Bildirim"
+
+#
+msgid "Export"
+msgstr "tr: Export"
+
+#
+msgid "PG mark down syntax used to format WeBWorK questions. This interactive lab can help you to learn the techniques."
+msgstr "tr: PG mark down syntax used to format WeBWorK questions. This interactive lab can help you to learn the techniques."
+
+#
+msgid "Record Scores for Single Sets"
+msgstr "tr: Record Scores for Single Sets"
+
+#
+msgid "Append to end of set [_1]"
+msgstr "tr: Append to end of set %1"
+
+#
+msgid "Unrecognized saveMode: |[_1]|. Unknown error."
+msgstr "tr: Unrecognized saveMode: |%1|. Unknown error."
+
+#
+msgid "Your score was not recorded because there was a failure in storing the problem record to the database."
+msgstr "Notunuz kaydedilemedi, çünkü notun veritabanına kaydı sırasında bir hata oluştu."
+
+#
+msgid "The hardcopy header for set [_1] has been renamed to '[_2]'."
+msgstr "tr: The hardcopy header for set %1 has been renamed to '%2'."
+
+#
+msgid "Save as"
+msgstr "tr: Save as"
+
+#
+msgid "Select action below"
+msgstr "tr: Select action below"
+
+#
+msgid "The file '[_1]' cannot be found."
+msgstr "tr: The file '%1' cannot be found."
+
+#
+msgid "Unable to write to '[_1]': [_2]"
+msgstr "tr: Unable to write to '%1': %2"
+
+#
+msgid "Save"
+msgstr "tr: Save"
+
+#
+msgid "File '[_1]' exists. File not saved. No changes have been made. You can change the file path for this problem manually from the 'Hmwk Sets Editor' page"
+msgstr "tr: File '%1' exists. File not saved. No changes have been made. You can change the file path for this problem manually from the 'Hmwk Sets Editor' page"
+
+#
+msgid "The set header for set [_1] has been renamed to '[_2]'."
+msgstr "tr: The set header for set %1 has been renamed to '%2'."
+
+#
+msgid "Error: This path is already in the temporary edit directory -- no new temporary file is created. path = [_1]"
+msgstr "tr: Error: This path is already in the temporary edit directory -- no new temporary file is created. path = %1"
+
+#
+msgid "Please use radio buttons to choose the method for saving this file. Can't recognize saveMode: |[_1]|."
+msgstr "tr: Please use radio buttons to choose the method for saving this file. Can't recognize saveMode: |%1|."
+
+#
+msgid "Saved to file '[_1]'"
+msgstr "tr: Saved to file '%1'"
+
+#
+msgid "Please specify a file to save to."
+msgstr "tr: Please specify a file to save to."
+
+#
+msgid "The selected problem ([_1]) is not a valid problem for set [_2]."
+msgstr "Seçilen problem (%1), %2 soru drubu için geçerli bir soru değil."
+
+#
+msgid "Editing [_1] in file '[_2]'"
+msgstr "tr: Editing %1 in file '%2'"
+
+#
+msgid "Deleting temp file at [_1]"
+msgstr "tr: Deleting temp file at %1"
+
+#
+msgid "hidden from"
+msgstr "görüntülenmiyor"
+
+#
+msgid "View student progress by set"
+msgstr "tr: View student progress by set"
+
+#
+msgid "View"
+msgstr "tr: View"
+
+#
+msgid "Resources"
+msgstr "tr: Resources"
+
+#
+msgid "Scoring Download"
+msgstr "Notları İndir"
+
+#
+msgid "Duplicate"
+msgstr "tr: Duplicate"
+
+#
+msgid "This path |[_1]| is not the path to a temporary edit file."
+msgstr "tr: This path |%1| is not the path to a temporary edit file."
+
+#
+msgid "visible to"
+msgstr "görüntüleniyor"
+
+#
+msgid "Unable to change the source file path for set [_1], problem [_2]. Unknown error."
+msgstr "tr: Unable to change the source file path for set %1, problem %2. Unknown error."
+
+#
+msgid "Course Administration"
+msgstr "Ders Yönetimi"
+
+#
+msgid "Added [_1] to [_2] as problem [_3]"
+msgstr "tr: Added %1 to %2 as problem %3"
+
+#
+msgid "Options Information"
+msgstr "tr: Options Information"
+
+#
+msgid "Proctor"
+msgstr "tr: Proctor"
+
+#
+msgid "Student Progress"
+msgstr "tr: Student Progress"
+
+#
+msgid "Revert"
+msgstr "tr: Revert"
+
+#
+msgid "Statistics"
+msgstr "Ä°statistikler"
+
+#
+msgid "Save as new independent problem"
+msgstr "tr: Save as new independent problem"
+
+#
+msgid "Scoring Tools"
+msgstr "Notlama Araçları"
+
+#
+msgid "The source file for 'set [_1] / problem [_2]' has been changed from [_3] to '[_4]'."
+msgstr "tr: The source file for 'set %1 / problem %2' has been changed from %3 to '%4'."
+
+#
+msgid "Cancel Export"
+msgstr "tr: Cancel Export"
+
+#
+msgid "View student progress by student"
+msgstr "tr: View student progress by student"
+
+#
+msgid "Revert to [_1]"
+msgstr "tr: Revert to %1"
+
+#
+msgid "Classlist Editor"
+msgstr "Sınıf Listesi Düzenleyici"
+
+#
+msgid "Add"
+msgstr "tr: Add"
+
+#
+msgid "the original path to the file is [_1]"
+msgstr "tr: the original path to the file is %1"
+
+#
+msgid "The path to the original file should be absolute"
+msgstr "tr: The path to the original file should be absolute"
+
+#
+msgid "To edit this text you must use the 'Save AS' action below to save it to another file."
+msgstr "tr: To edit this text you must use the 'Save AS' action below to save it to another file."
+
+#
+msgid "Error: The original file [_1] cannot be read."
+msgstr "tr: Error: The original file %1 cannot be read."
+
+#
+msgid "Unable to change the set header for set [_1]. Unknown error."
+msgstr "tr: Unable to change the set header for set %1. Unknown error."
+
+#
+msgid "options information"
+msgstr "tr: options information"
+
+#
+msgid "The selected problem([_1]) is not a valid problem for set [_2]."
+msgstr "tr: The selected problem(%1) is not a valid problem for set %2."
+
+#
+msgid "Unknown file type"
+msgstr "tr: Unknown file type"
+
+#
+msgid "course information"
+msgstr "tr: course information"
+
+#
+msgid "Change User Options"
+msgstr "Kullanıcı bilgilerini güncelle"
+
+#
+msgid "Drop"
+msgstr "tr: Drop"
+
+#
+#, fuzzy
+msgid "Solutions"
+msgstr "Çözümleri göster"
+
+#
+msgid "Show:"
+msgstr ""
+
+#
+msgid "WeBWorK Assignment [_1] is due : [_2]."
+msgstr ""
+
+#
+#, fuzzy
+msgid "Hardcopy Generator"
+msgstr "Çıktı Dosyası Başlığı"
+
+#
+#, fuzzy
+msgid "This set is visible to students."
+msgstr "Bu soru grubu öğrenciler tarafından %1."
+
+#
+msgid "View equations as"
+msgstr ""
+
+#
+msgid "From:"
+msgstr ""
+
+#
+msgid "Generate Hardcopy"
+msgstr ""
+
+#
+msgid "You may choose to show any of the following data. Correct answers and solutions are only available after the answer date of the homework set."
+msgstr ""
+
+#
+#, fuzzy
+msgid "E-mail Instructor"
+msgstr "EÄŸitmene E-posta"
+
+#
+msgid "Send E-mail:"
+msgstr ""
+
+#
+#, fuzzy
+msgid "Cancel Email"
+msgstr "tr: Cancel Edit"
+
+#
+#, fuzzy
+msgid "E-mail:"
+msgstr "E-posta"
+
+#
+#, fuzzy
+msgid "Correct answers"
+msgstr "Doğru yanıtları göster"
+
+#
+msgid "Use this form to report to your professor a problem with the WeBWorK system or an error in a problem you are attempting. Along with your message, additional information about the state of the system will be included."
+msgstr ""
+
+#
+#, fuzzy
+msgid "Student answers"
+msgstr "Yanıtları Gönder"
+
+#
+#, fuzzy
+msgid "Hints"
+msgstr "İpuçlarını göster"
+
+#
+#, fuzzy
+msgid "Hardcopy Format:"
+msgstr "Çıktı Dosyası Başlığı"
+
diff --git a/lib/WeBWorK/Localize/webwork2.pot b/lib/WeBWorK/Localize/webwork2.pot
new file mode 100644
index 0000000000..0fae1aafe6
--- /dev/null
+++ b/lib/WeBWorK/Localize/webwork2.pot
@@ -0,0 +1,2594 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-12-07 14:01-0500\n"
+"Last-Translator: Michael Gage <gage@math.rochester.edu>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#
+#. ($name, $vnum)
+#: ContentGenerator/ProblemSets.pm:416
+#, fuzzy
+msgid "%1 (test %2)"
+msgstr ""
+
+#
+#. ($numAdded, $numSkipped, join(", ", @$skipped)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1581
+#, fuzzy
+msgid "%1 sets added, %2 sets skipped. Skipped sets: (%3)"
+msgstr ""
+
+#
+#. ($numExported, $numSkipped, (($numSkipped)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1701
+#, fuzzy
+msgid "%1 sets exported, %2 sets skipped. Skipped sets: (%3)"
+msgstr ""
+
+#
+#. ($name)
+#: ContentGenerator/ProblemSets.pm:427
+#: ContentGenerator/ProblemSets.pm:441
+#, fuzzy
+msgid "%1 test"
+msgstr ""
+
+#
+#. (scalar @userIDsToExport, $dir, $fileName)
+#: ContentGenerator/Instructor/UserList.pm:1385
+#, fuzzy
+msgid "%1 users exported to file %2/%3"
+msgstr ""
+
+#
+#. ($numReplaced, $numAdded, $numSkipped, join (", ", @$skipped)
+#: ContentGenerator/Instructor/UserList.pm:1269
+#, fuzzy
+msgid "%1 users replaced, %2 users added, %3 users skipped. Skipped users: (%4)"
+msgstr ""
+
+#
+#. (int($answerScore*100)
+#: ContentGenerator/Problem.pm:265
+#, fuzzy
+msgid "%1% correct"
+msgstr ""
+
+#
+#. ($e_user_name)
+#: ContentGenerator/Options.pm:171
+#, fuzzy
+msgid "%1's Current Address"
+msgstr ""
+
+#
+#. ($user_name)
+#: ContentGenerator/Options.pm:126
+#, fuzzy
+msgid "%1's Current Password"
+msgstr ""
+
+#
+#. ($e_user_name)
+#: ContentGenerator/Options.pm:175
+#, fuzzy
+msgid "%1's New Address"
+msgstr ""
+
+#
+#. ($e_user_name)
+#: ContentGenerator/Options.pm:130
+#, fuzzy
+msgid "%1's New Password"
+msgstr ""
+
+#
+#. ($e_user_name)
+#: ContentGenerator/Options.pm:101
+#, fuzzy
+msgid "%1's new password cannot be blank."
+msgstr ""
+
+#
+#. ($e_user_name)
+#: ContentGenerator/Options.pm:84
+#, fuzzy
+msgid "%1's password has been changed."
+msgstr ""
+
+#
+#. ($setID, $problemID)
+#: ContentGenerator/Problem.pm:884
+#, fuzzy
+msgid "%1: Problem %2"
+msgstr ""
+
+#
+#. ($numBlanks)
+#: ContentGenerator/Problem.pm:319
+#, fuzzy
+msgid "%quant(%1,of the questions remains,of the questions remain) unanswered."
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:1188
+msgid "(This problem will not count towards your grade.)"
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:1299
+msgid "ANSWERS ONLY CHECKED -- ANSWERS NOT RECORDED"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1708
+#: ContentGenerator/Instructor/UserList.pm:1391
+#: ContentGenerator/Instructor/UserList.pm:1463
+msgid "Abandon changes"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1647
+msgid "Abandon export"
+msgstr ""
+
+#
+#. ($eUserID)
+#: ContentGenerator.pm:848
+#, fuzzy
+msgid "Acting as %1. "
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1927
+msgid "Active"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1142
+msgid "Add how many students?"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1220
+msgid "Add which new users?"
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:311
+msgid "All of the answers above are correct."
+msgstr ""
+
+#
+#. ($verb)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1052
+#, fuzzy
+msgid "All selected sets %1 all students"
+msgstr ""
+
+#
+#. ($verb)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1046
+#, fuzzy
+msgid "All sets %1 all students"
+msgstr ""
+
+#
+#. ($verb)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1049
+#, fuzzy
+msgid "All visible sets %1 all students"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:446
+#: ContentGenerator/Instructor/ProblemSetList.pm:832
+#: ContentGenerator/Instructor/ProblemSetList.pm:870
+msgid "Answer Date"
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:242
+msgid "Answer Preview"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:531
+msgid "Any changes made below will be reflected in the set for ALL students."
+msgstr ""
+
+#
+#: ContentGenerator.pm:1481
+msgid "Apply Options"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1545
+msgid "Assign this set to which users?"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2064
+#, fuzzy
+msgid "Assigned Sets"
+msgstr ""
+
+#
+#. ($fully)
+#: ContentGenerator/Problem.pm:315
+#, fuzzy
+msgid "At least one of the answers above is NOT %1correct."
+msgstr ""
+
+#
+#: ContentGenerator/ProblemSet.pm:350
+msgid "Attempts"
+msgstr ""
+
+#
+#. ($eUserID,$@)
+#: ContentGenerator/Options.pm:71
+#, fuzzy
+msgid "Can't get password record for effective user '%1': %2"
+msgstr ""
+
+#
+#. ($userID,$@)
+#: ContentGenerator/Options.pm:68
+#, fuzzy
+msgid "Can't get password record for user '%1': %2"
+msgstr ""
+
+#
+#: ContentGenerator/Options.pm:142
+msgid "Change Email Address"
+msgstr ""
+
+#
+#: ContentGenerator/Options.pm:61
+msgid "Change Password"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1409
+#: ContentGenerator/Instructor/UserList.pm:1481
+#, fuzzy
+msgid "Changes abandoned"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1457
+#, fuzzy
+msgid "Changes saved"
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:1118
+msgid "Check Answers"
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:1227
+msgid "Checking additional error messages"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1011
+msgid "Choose visibility of the sets to be affected"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1084
+#: ContentGenerator/Instructor/ProblemSetList.pm:982
+msgid "Choose which sets to be affected"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:597
+#: ContentGenerator/Instructor/UserList.pm:550
+#: ContentGenerator/ProblemSets.pm:288
+msgid "Clear"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:562
+#, fuzzy
+msgid "Click on the login name to edit individual problem set data, (e.g. due dates) for these students."
+msgstr ""
+
+#
+#: ContentGenerator/ProblemSets.pm:435
+msgid "Closed"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2072
+#: ContentGenerator/Instructor/UserList.pm:290
+#: ContentGenerator/Instructor/UserList.pm:818
+#: ContentGenerator/Instructor/UserList.pm:861
+#: ContentGenerator/Instructor/UserList.pm:904
+msgid "Comment"
+msgstr ""
+
+#
+#. ($e_user_name)
+#: ContentGenerator/Options.pm:134
+#: ContentGenerator/Options.pm:95
+#, fuzzy
+msgid "Confirm %1's New Password"
+msgstr ""
+
+#
+#: ContentGenerator/Login.pm:206
+msgid "Continue"
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:243
+msgid "Correct"
+msgstr ""
+
+#
+#. ($e_user_name,$@)
+#: ContentGenerator/Options.pm:80
+#, fuzzy
+msgid "Couldn't change %1's password: %2"
+msgstr ""
+
+#
+#. ($@)
+#: ContentGenerator/Options.pm:153
+#, fuzzy
+msgid "Couldn't change your email address: %1"
+msgstr ""
+
+#
+#: ContentGenerator/ProblemSets.pm:71
+#: ContentGenerator/ProblemSets.pm:73
+msgid "Course Info"
+msgstr ""
+
+#
+#: ContentGenerator.pm:657
+#: ContentGenerator/Home.pm:94
+msgid "Courses"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1351
+msgid "Create as what type of set?"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1263
+#: ContentGenerator/Instructor/UserList.pm:1082
+msgid "Delete how many?"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1119
+msgid "Disable"
+msgstr ""
+
+#
+#: ContentGenerator.pm:1442
+msgid "Display Options"
+msgstr ""
+
+#
+#. ($pl)
+#: ContentGenerator/ProblemSets.pm:283
+#, fuzzy
+msgid "Download Hardcopy for Selected %plural(%1,Set,Sets)"
+msgstr ""
+
+#
+#: ContentGenerator/ProblemSet.pm:321
+msgid "Download PDF or TeX Hardcopy for Current Set"
+msgstr ""
+
+#
+#: ContentGenerator/ProblemSets.pm:289
+msgid "Download PDF or TeX Hardcopy for Selected Sets"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:445
+#: ContentGenerator/Instructor/ProblemSetList.pm:831
+#: ContentGenerator/Instructor/ProblemSetList.pm:869
+msgid "Due Date"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1812
+msgid "Duplicate this set and name it"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1720
+#: ContentGenerator/Instructor/UserList.pm:1785
+#: ContentGenerator/Instructor/UserList.pm:1818
+msgid "Edit"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:603
+msgid "Edit All Set Data"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:439
+msgid "Edit Assigned Users"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:438
+msgid "Edit Problems"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:441
+msgid "Edit Set Data"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:961
+msgid "Edit Which Users?"
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:1011
+msgid "Edit this problem"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:923
+msgid "Edit which sets?"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2067
+#: ContentGenerator/Instructor/UserList.pm:285
+#: ContentGenerator/Instructor/UserList.pm:813
+#: ContentGenerator/Instructor/UserList.pm:856
+#: ContentGenerator/Instructor/UserList.pm:899
+msgid "Email Address"
+msgstr ""
+
+#
+#: ContentGenerator.pm:1526
+#: ContentGenerator.pm:1549
+#: ContentGenerator.pm:1572
+msgid "Email instructor"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1120
+msgid "Enable"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:604
+msgid "Enable Reduced Credit"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1113
+msgid "Enable/Disable reduced scoring for selected sets"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:815
+#: ContentGenerator/Instructor/UserList.pm:858
+#: ContentGenerator/Instructor/UserList.pm:901
+msgid "Enrollment Status"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1321
+msgid "Enter filename below"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1502
+msgid "Enter filenames below"
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:240
+msgid "Entered"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1671
+msgid "Export selected sets"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1317
+msgid "Export to what kind of file?"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1604
+msgid "Export which sets?"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1292
+msgid "Export which users?"
+msgstr ""
+
+#
+#. ($@)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1435
+#, fuzzy
+msgid "Failed to create new set: %1"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1374
+msgid "Failed to create new set: no set name specified!"
+msgstr ""
+
+#
+#. ($@)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1848
+#, fuzzy
+msgid "Failed to duplicate set: %1"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1832
+msgid "Failed to duplicate set: no set name specified!"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1396
+#: ContentGenerator/Instructor/ProblemSetList.pm:1830
+msgid "Failed to duplicate set: no set selected for duplication!"
+msgstr ""
+
+#
+#. ($newSetID)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1834
+#, fuzzy
+msgid "Failed to duplicate set: set %1 already exists!"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1339
+msgid "Filename"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:678
+msgid "Filter by what text?"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2065
+#: ContentGenerator/Instructor/UserList.pm:283
+#: ContentGenerator/Instructor/UserList.pm:811
+#: ContentGenerator/Instructor/UserList.pm:854
+#: ContentGenerator/Instructor/UserList.pm:897
+msgid "First Name"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1020
+msgid "Give new password to which users?"
+msgstr ""
+
+#
+#: ContentGenerator/Login.pm:231
+msgid "Guest Login"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:443
+#: ContentGenerator/Instructor/ProblemSetList.pm:829
+#: ContentGenerator/Instructor/ProblemSetList.pm:867
+msgid "Hardcopy Header"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1017
+msgid "Hidden"
+msgstr ""
+
+#
+#: ContentGenerator.pm:667
+#: ContentGenerator/ProblemSet.pm:110
+#: ContentGenerator/ProblemSets.pm:226
+msgid "Homework Sets"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:558
+msgid "If a password field is left blank, the student's current password will be maintained."
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1498
+msgid "Import from where?"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1473
+msgid "Import how many sets?"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1520
+msgid "Import sets with names"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1165
+msgid "Import users from what file?"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1927
+msgid "Inactive"
+msgstr ""
+
+#
+#: Authen.pm:148
+msgid "Invalid user ID or password."
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2066
+#: ContentGenerator/Instructor/UserList.pm:284
+#: ContentGenerator/Instructor/UserList.pm:812
+#: ContentGenerator/Instructor/UserList.pm:855
+#: ContentGenerator/Instructor/UserList.pm:898
+msgid "Last Name"
+msgstr ""
+
+#
+#: ContentGenerator.pm:730
+msgid "Library Browser"
+msgstr ""
+
+#
+#: ContentGenerator.pm:731
+#, fuzzy
+msgid "Library Browser 2"
+msgstr ""
+
+#
+#: ContentGenerator/Logout.pm:124
+msgid "Log In Again"
+msgstr ""
+
+#
+#: ContentGenerator.pm:845
+#: ContentGenerator.pm:847
+msgid "Log Out"
+msgstr ""
+
+#
+#. ($userID)
+#: ContentGenerator.pm:845
+#: ContentGenerator.pm:847
+#, fuzzy
+msgid "Logged in as %1. "
+msgstr ""
+
+#
+#: ContentGenerator/Login.pm:74
+#: ContentGenerator/Login.pm:77
+msgid "Login Info"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2062
+#: ContentGenerator/Instructor/UserList.pm:282
+#: ContentGenerator/Instructor/UserList.pm:810
+#: ContentGenerator/Instructor/UserList.pm:853
+#: ContentGenerator/Instructor/UserList.pm:896
+msgid "Login Name"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2063
+#, fuzzy
+msgid "Login Status"
+msgstr ""
+
+#
+#: ContentGenerator.pm:654
+msgid "Main Menu"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:705
+msgid "Match on what? (separate multiple IDs with commas)"
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:245
+msgid "Messages"
+msgstr ""
+
+#
+#: ContentGenerator/ProblemSet.pm:349
+#: ContentGenerator/ProblemSets.pm:212
+#: ContentGenerator/ProblemSets.pm:213
+msgid "Name"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1328
+msgid "Name the new set"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1937
+#: ContentGenerator/Instructor/UserList.pm:2077
+msgid "New Password"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1519
+msgid "New passwords saved"
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:864
+#: ContentGenerator/Problem.pm:866
+msgid "Next Problem"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2625
+#: ContentGenerator/Instructor/ProblemSetList.pm:2626
+msgid "No"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1043
+#: ContentGenerator/Instructor/ProblemSetList.pm:1145
+msgid "No change made to any set"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1217
+msgid "No sets selected for scoring"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:266
+#, fuzzy
+msgid "No sets selected for scoring."
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2722
+msgid "No sets shown.  Choose one of the options above to list the sets in the course."
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2110
+#, fuzzy
+msgid ""
+"No students shown.  Choose one of the options above to \n"
+"\t              list the students in the course."
+msgstr ""
+
+#
+#: ContentGenerator.pm:851
+msgid "Not logged in."
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:975
+msgid "Note"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:444
+#: ContentGenerator/Instructor/ProblemSetList.pm:830
+#: ContentGenerator/Instructor/ProblemSetList.pm:868
+msgid "Open Date"
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:1307
+msgid "PREVIEW ONLY -- ANSWERS NOT RECORDED"
+msgstr ""
+
+#
+#. (timestamp($self)
+#: ContentGenerator.pm:953
+#, fuzzy
+msgid "Page generated at %1"
+msgstr ""
+
+#
+#: ContentGenerator/Login.pm:202
+msgid "Password"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2073
+#: ContentGenerator/Instructor/UserList.pm:291
+#: ContentGenerator/Instructor/UserList.pm:819
+#: ContentGenerator/Instructor/UserList.pm:862
+#: ContentGenerator/Instructor/UserList.pm:905
+msgid "Permission Level"
+msgstr ""
+
+#
+#. (CGI::b($r->maketext($course)
+#: ContentGenerator/Login.pm:154
+#, fuzzy
+msgid "Please enter your username and password for %1 below:"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:396
+msgid "Please select action to be performed."
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:1116
+msgid "Preview Answers"
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:850
+#: ContentGenerator/Problem.pm:852
+msgid "Previous Problem"
+msgstr ""
+
+#
+#. ($problemID)
+#: ContentGenerator.pm:686
+#: ContentGenerator/Problem.pm:808
+#: ContentGenerator/ProblemSet.pm:424
+#, fuzzy
+msgid "Problem %1"
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:856
+#: ContentGenerator/Problem.pm:858
+msgid "Problem List"
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:796
+#: ContentGenerator/ProblemSet.pm:346
+msgid "Problems"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2071
+#: ContentGenerator/Instructor/UserList.pm:289
+#: ContentGenerator/Instructor/UserList.pm:817
+#: ContentGenerator/Instructor/UserList.pm:860
+#: ContentGenerator/Instructor/UserList.pm:903
+msgid "Recitation"
+msgstr ""
+
+#
+#. ($verb)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1148
+#, fuzzy
+msgid "Reduced Credit %1 for all sets"
+msgstr ""
+
+#
+#. ($verb)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1154
+#, fuzzy
+msgid "Reduced Credit %1 for selected sets"
+msgstr ""
+
+#
+#. ($verb)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1151
+#, fuzzy
+msgid "Reduced Credit %1 for visable sets"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2523
+msgid "Reduced Credit Disabled"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2523
+#: ContentGenerator/Instructor/ProblemSetList.pm:448
+msgid "Reduced Credit Enabled"
+msgstr ""
+
+#
+#. ($beginReducedScoringPeriod)
+#: ContentGenerator/ProblemSets.pm:459
+#, fuzzy
+msgid "Reduced Credit Starts: %1"
+msgstr ""
+
+#
+#: ContentGenerator/ProblemSet.pm:351
+msgid "Remaining"
+msgstr ""
+
+#
+#: ContentGenerator/Login.pm:204
+msgid "Remember Me"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1190
+msgid "Replace which users?"
+msgstr ""
+
+#
+#: ContentGenerator.pm:799
+msgid "Report bugs"
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:244
+msgid "Result"
+msgstr ""
+
+#
+#. (CGI::i($self->$actionHandler(\%genericParams, \%actionParams, \%tableParams)
+#: ContentGenerator/Instructor/UserList.pm:376
+#, fuzzy
+msgid "Result of last action performed: %1"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:386
+msgid "Results of last action performed"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1732
+#: ContentGenerator/Instructor/UserList.pm:1415
+#: ContentGenerator/Instructor/UserList.pm:1487
+msgid "Save changes"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1186
+msgid "Score which sets?"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2070
+#: ContentGenerator/Instructor/UserList.pm:288
+#: ContentGenerator/Instructor/UserList.pm:816
+#: ContentGenerator/Instructor/UserList.pm:859
+#: ContentGenerator/Instructor/UserList.pm:902
+msgid "Section"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:582
+msgid "Select all sets"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:535
+msgid "Select all users"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:534
+#: ContentGenerator/Instructor/UserList.pm:512
+msgid "Select an action to perform"
+msgstr ""
+
+#
+#. ($newSetID)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1375
+#, fuzzy
+msgid "Set %1 exists.  No set created"
+msgstr ""
+
+#: ContentGenerator/Instructor/ProblemSetList.pm:440
+msgid "Set Definition Filename"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:442
+#: ContentGenerator/Instructor/ProblemSetList.pm:828
+#: ContentGenerator/Instructor/ProblemSetList.pm:866
+msgid "Set Header"
+msgstr ""
+
+#
+#: ContentGenerator/ProblemSet.pm:273
+#: ContentGenerator/ProblemSet.pm:275
+msgid "Set Info"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2700
+msgid "Set List"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:827
+#: ContentGenerator/Instructor/ProblemSetList.pm:865
+msgid "Set Name"
+msgstr ""
+
+#
+#: ContentGenerator/ProblemSet.pm:153
+msgid "Sets"
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:1063
+msgid "Show Hints"
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:1370
+msgid "Show Past Answers"
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:1082
+msgid "Show Solutions"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:645
+msgid "Show Which Users?"
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:1044
+msgid "Show correct answers"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:683
+msgid "Show which sets?"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:497
+#: ContentGenerator/Instructor/UserList.pm:475
+msgid "Show/Hide Site Description"
+msgstr ""
+
+#
+#. (scalar @visibleSetIDs, scalar @allSetIDs)
+#: ContentGenerator/Instructor/ProblemSetList.pm:607
+#, fuzzy
+msgid "Showing %1 out of %2 sets."
+msgstr ""
+
+#
+#. (scalar @Users, scalar @allUserIDs)
+#: ContentGenerator/Instructor/UserList.pm:556
+#, fuzzy
+msgid "Showing %1 out of %2 users"
+msgstr ""
+
+#
+#: ContentGenerator/Login.pm:96
+#: ContentGenerator/Login.pm:99
+msgid "Site Information"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:821
+#: ContentGenerator/Instructor/UserList.pm:804
+msgid "Sort by"
+msgstr ""
+
+#
+#. ($names{$primary}, $names{$secondary})
+#: ContentGenerator/Instructor/ProblemSetList.pm:899
+#, fuzzy
+msgid "Sort by %1 and then by %2"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2069
+#: ContentGenerator/Instructor/UserList.pm:287
+#: ContentGenerator/ProblemSet.pm:353
+#: ContentGenerator/ProblemSets.pm:215
+#: ContentGenerator/ProblemSets.pm:216
+msgid "Status"
+msgstr ""
+
+#
+#: ContentGenerator.pm:848
+msgid "Stop Acting"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2068
+#: ContentGenerator/Instructor/UserList.pm:286
+#: ContentGenerator/Instructor/UserList.pm:814
+#: ContentGenerator/Instructor/UserList.pm:857
+#: ContentGenerator/Instructor/UserList.pm:900
+msgid "Student ID"
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:1127
+msgid "Submit Answers"
+msgstr ""
+
+#
+#. ($effectiveUser)
+#: ContentGenerator/Problem.pm:1124
+#, fuzzy
+msgid "Submit Answers for %1"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1850
+msgid "Success"
+msgstr ""
+
+#. ($newSetID)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1437
+msgid "Successfully created new set %1"
+msgstr ""
+
+#
+#. ($name)
+#: ContentGenerator/ProblemSets.pm:424
+#: ContentGenerator/ProblemSets.pm:433
+#: ContentGenerator/ProblemSets.pm:439
+#, fuzzy
+msgid "Take %1 test"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:598
+#: ContentGenerator/Instructor/UserList.pm:551
+msgid "Take Action!"
+msgstr ""
+
+#
+#: ContentGenerator/ProblemSets.pm:236
+msgid "Test Date"
+msgstr ""
+
+#
+#: ContentGenerator/ProblemSets.pm:235
+msgid "Test Score"
+msgstr ""
+
+#
+#: ContentGenerator.pm:954
+msgid "The WeBWorK Project"
+msgstr ""
+
+#
+#. ($fully)
+#: ContentGenerator/Problem.pm:307
+#, fuzzy
+msgid "The answer above is NOT %1correct."
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:305
+msgid "The answer above is correct."
+msgstr ""
+
+#
+#. (CGI::b($r->maketext("[_1]'s Current Password",$user_name)
+#: ContentGenerator/Options.pm:107
+#, fuzzy
+msgid ""
+"The password you entered in the %1 \n"
+"\t\t\t\t\t\tfield does not match your current\n"
+"\t\t\t\t\t\tpassword. Please retype your current password and try\n"
+"\t\t\t\t\t\tagain."
+msgstr ""
+
+#
+#. (CGI::b($r->maketext("[_1]'s New Password",$e_user_name)
+#: ContentGenerator/Options.pm:91
+#, fuzzy
+msgid ""
+"The passwords you entered in the \n"
+"\t\t\t\t\t\t\t\t%1 and %2\n"
+"\t\t\t\t\t\t\t\tfields don't match. Please retype your new password and try\n"
+"\t\t\t\t\t\t\t\tagain."
+msgstr ""
+
+#
+#. ($setName,$effectiveUser)
+#: ContentGenerator/ProblemSet.pm:308
+#, fuzzy
+msgid "The selected problem set (%1) is not a valid set for %2"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:859
+#: ContentGenerator/Instructor/UserList.pm:847
+#: ContentGenerator/Instructor/UserList.pm:890
+msgid "Then by"
+msgstr ""
+
+#
+#: ContentGenerator/ProblemSet.pm:365
+msgid "This homework set contains no problems."
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:1175
+msgid "This homework set is closed."
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:1173
+msgid "This homework set is not yet open."
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:611
+msgid "This problem will not count towards your grade."
+msgstr ""
+
+#
+#. (CGI::font({class=>$visiblityStateClass}, $visiblityStateText)
+#: ContentGenerator/Problem.pm:605
+#: ContentGenerator/ProblemSet.pm:88
+#, fuzzy
+msgid "This set is %1"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:588
+msgid "Unselect all sets"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:541
+msgid "Unselect all users"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2683
+msgid "Use System Default"
+msgstr ""
+
+#
+#: ContentGenerator/Login.pm:200
+msgid "Username"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2087
+msgid "Users List"
+msgstr ""
+
+#
+#. ($names{$primary}, $names{$secondary}, $names{$ternary})
+#: ContentGenerator/Instructor/UserList.pm:938
+#, fuzzy
+msgid "Users sorted by %1, then by %2, then by %3"
+msgstr ""
+
+#
+#: ContentGenerator/ProblemSet.pm:230
+msgid "Viewing temporary file"
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:1332
+#: ContentGenerator/ProblemSets.pm:63
+msgid "Viewing temporary file: "
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:833
+#: ContentGenerator/Instructor/ProblemSetList.pm:871
+msgid "Visibility"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1018
+#: ContentGenerator/Instructor/ProblemSetList.pm:447
+msgid "Visible"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1259
+#: ContentGenerator/Instructor/UserList.pm:1078
+msgid "Warning: Deletion destroys all user-related data and is not undoable!"
+msgstr ""
+
+#
+#: ContentGenerator/Home.pm:87
+msgid "Welcome to WeBWorK!"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:665
+msgid "What field should filtered users match on?"
+msgstr ""
+
+#
+#: ContentGenerator/ProblemSet.pm:352
+msgid "Worth"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2625
+#: ContentGenerator/Instructor/ProblemSetList.pm:2626
+msgid "Yes"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:306
+#: ContentGenerator/Instructor/ProblemSetList.pm:418
+#: ContentGenerator/Instructor/UserList.pm:262
+msgid "You are not authorized to access the instructor tools."
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:339
+msgid "You are not authorized to modify homework sets."
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:344
+msgid "You are not authorized to modify set definition files."
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:329
+#: ContentGenerator/Instructor/UserList.pm:335
+#, fuzzy
+msgid "You are not authorized to modify student data"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:389
+#: ContentGenerator/Instructor/UserList.pm:380
+msgid "You are not authorized to perform this action."
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1121
+msgid "You cannot delete yourself!"
+msgstr ""
+
+#
+#: ContentGenerator/Options.pm:163
+#: ContentGenerator/Options.pm:180
+msgid "You do not have permission to change email addresses."
+msgstr ""
+
+#
+#: ContentGenerator/Options.pm:117
+#: ContentGenerator/Options.pm:139
+msgid "You do not have permission to change your password."
+msgstr ""
+
+#
+#. ($attemptsLeft,$attemptsLeftNoun)
+#: ContentGenerator/Problem.pm:1196
+#, fuzzy
+msgid "You have %1 %2 remaining."
+msgstr ""
+
+#
+#. ($attemptsLeft)
+#: ContentGenerator/Problem.pm:1197
+#, fuzzy
+msgid "You have %negquant(%1,unlimited attempts,attempt,attempts) remaining."
+msgstr ""
+
+#
+#. ($attempts)
+#: ContentGenerator/Problem.pm:1191
+#, fuzzy
+msgid "You have attempted this problem %quant(%1,time,times)."
+msgstr ""
+
+#
+#: ContentGenerator/Logout.pm:119
+msgid "You have been logged out of WeBWorK."
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1933
+msgid "You may not change your own password here!"
+msgstr ""
+
+#
+#: Authen.pm:317
+msgid "You must specify a user ID."
+msgstr ""
+
+#
+#. (sprintf("%.0f%%", $pg->{result}->{score} * 100)
+#: ContentGenerator/Problem.pm:1192
+#, fuzzy
+msgid "You received a score of %1 for this attempt."
+msgstr ""
+
+#
+#: ContentGenerator/Options.pm:157
+msgid "Your email address has been changed."
+msgstr ""
+
+#
+#. ($lastScore,$notCountedMessage)
+#: ContentGenerator/Problem.pm:1194
+#, fuzzy
+msgid "Your overall recorded score is %1.  %2"
+msgstr ""
+
+#
+#: Authen.pm:416
+msgid "Your session has timed out due to inactivity. Please log in again."
+msgstr ""
+
+#
+#: ContentGenerator/ProblemSet.pm:273
+#: ContentGenerator/ProblemSets.pm:71
+#, fuzzy
+msgid "[edit]"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:476
+msgid "_CLASSLIST_EDITOR_DESCRIPTION"
+msgstr ""
+
+#
+#. (CGI::strong($r->maketext($course)
+#: ContentGenerator/Login.pm:151
+msgid "_EXTERNAL_AUTH_MESSAGE"
+msgstr ""
+
+#
+#. (CGI::b($r->maketext("Guest Login")
+#: ContentGenerator/Login.pm:230
+msgid "_GUEST_LOGIN_MESSAGE"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:498
+msgid "_HMWKSETS_EDITOR_DESCRIPTION"
+msgstr ""
+
+#
+#. (CGI::b($r->maketext("Remember Me")
+#: ContentGenerator/Login.pm:155
+msgid "_LOGIN_MESSAGE"
+msgstr ""
+
+#
+#. ($beginReducedScoringPeriod,$dueDate,$reducedScoringPerCent)
+#: ContentGenerator/ProblemSet.pm:333
+msgid "_REDUCED_CREDIT_MESSAGE_1"
+msgstr ""
+
+#
+#. ($beginReducedScoringPeriod,$dueDate,$reducedScoringPerCent)
+#: ContentGenerator/ProblemSet.pm:335
+msgid "_REDUCED_CREDIT_MESSAGE_2"
+msgstr ""
+
+#
+#: ContentGenerator.pm:1951
+msgid "_REQUEST_ERROR"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1358
+msgid "a duplicate of the first selected set"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1357
+msgid "a new empty set"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1479
+msgid "a single set"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1091
+#: ContentGenerator/Instructor/ProblemSetList.pm:1193
+#: ContentGenerator/Instructor/ProblemSetList.pm:1610
+#: ContentGenerator/Instructor/ProblemSetList.pm:689
+#: ContentGenerator/Instructor/ProblemSetList.pm:929
+#: ContentGenerator/Instructor/ProblemSetList.pm:989
+msgid "all sets"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1551
+#: ContentGenerator/Instructor/UserList.pm:1026
+#: ContentGenerator/Instructor/UserList.pm:1298
+#: ContentGenerator/Instructor/UserList.pm:651
+#: ContentGenerator/Instructor/UserList.pm:967
+msgid "all users"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1196
+#: ContentGenerator/Instructor/UserList.pm:1226
+msgid "any users"
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:1165
+msgid "attempt"
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:1162
+#: ContentGenerator/Problem.pm:1165
+msgid "attempts"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1726
+msgid "changes abandoned"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1790
+msgid "changes saved"
+msgstr ""
+
+#
+#: ContentGenerator/ProblemSets.pm:468
+msgid "closed, answers available"
+msgstr ""
+
+#
+#. ($self->formatDateTime($set->answer_date)
+#: ContentGenerator/ProblemSets.pm:464
+#, fuzzy
+msgid "closed, answers on %1"
+msgstr ""
+
+#
+#: ContentGenerator/ProblemSets.pm:466
+msgid "closed, answers recently available"
+msgstr ""
+
+#
+#: ContentGenerator/ProblemSets.pm:402
+#, fuzzy
+msgid "completed."
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:267
+msgid "completely"
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:264
+msgid "correct"
+msgstr ""
+
+#
+#. ($num)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1310
+#, fuzzy
+msgid "deleted %1 sets"
+msgstr ""
+
+#
+#. ($num)
+#: ContentGenerator/Instructor/UserList.pm:1135
+#, fuzzy
+msgid "deleted %1 users"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:947
+msgid "editing all sets"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:985
+msgid "editing all users"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:953
+msgid "editing selected sets"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:991
+msgid "editing selected users"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:950
+msgid "editing visible sets"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:988
+msgid "editing visible users"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:694
+msgid "enter matching set IDs below"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1665
+msgid "export abandoned"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1629
+msgid "exporting all sets"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1636
+msgid "exporting selected sets"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1633
+msgid "exporting visible sets"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1044
+msgid "giving new passwords to all users"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1050
+msgid "giving new passwords to selected users"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1047
+msgid "giving new passwords to visible users"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2522
+#: ContentGenerator/Problem.pm:603
+#, fuzzy
+msgid "hidden"
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:604
+#: ContentGenerator/ProblemSet.pm:86
+msgid "hidden from students"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:693
+msgid "hidden sets"
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:266
+msgid "incorrect"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1480
+msgid "multiple sets"
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:864
+msgid "navNext"
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:866
+msgid "navNextGrey"
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:850
+msgid "navPrev"
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:852
+msgid "navPrevGrey"
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:856
+msgid "navProbList"
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:858
+msgid "navProbListGrey"
+msgstr ""
+
+#
+#: ContentGenerator/ProblemSet.pm:110
+msgid "navUp"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1090
+#: ContentGenerator/Instructor/ProblemSetList.pm:1192
+#: ContentGenerator/Instructor/ProblemSetList.pm:1269
+#: ContentGenerator/Instructor/ProblemSetList.pm:690
+#: ContentGenerator/Instructor/ProblemSetList.pm:988
+msgid "no sets"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1552
+#: ContentGenerator/Instructor/UserList.pm:1088
+#: ContentGenerator/Instructor/UserList.pm:1199
+#: ContentGenerator/Instructor/UserList.pm:1227
+#: ContentGenerator/Instructor/UserList.pm:652
+msgid "no users"
+msgstr ""
+
+#
+#: ContentGenerator/ProblemSets.pm:430
+#: ContentGenerator/ProblemSets.pm:452
+msgid "now open, due "
+msgstr ""
+
+#
+#. ($self->formatDateTime($set->due_date()
+#: ContentGenerator/ProblemSets.pm:408
+#, fuzzy
+msgid "open: complete by %1"
+msgstr ""
+
+#
+#: ContentGenerator/ProblemSets.pm:405
+msgid "over time: closed."
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1093
+#: ContentGenerator/Instructor/ProblemSetList.pm:1194
+#: ContentGenerator/Instructor/ProblemSetList.pm:1271
+#: ContentGenerator/Instructor/ProblemSetList.pm:1612
+#: ContentGenerator/Instructor/ProblemSetList.pm:691
+#: ContentGenerator/Instructor/ProblemSetList.pm:931
+#: ContentGenerator/Instructor/ProblemSetList.pm:991
+msgid "selected sets"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1028
+#: ContentGenerator/Instructor/UserList.pm:1090
+#: ContentGenerator/Instructor/UserList.pm:1198
+#: ContentGenerator/Instructor/UserList.pm:1300
+#: ContentGenerator/Instructor/UserList.pm:653
+#: ContentGenerator/Instructor/UserList.pm:969
+msgid "selected users"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:762
+msgid "showing all sets"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:738
+msgid "showing all users"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:747
+msgid "showing matching users"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:765
+msgid "showing no sets"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:741
+msgid "showing no users"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:768
+msgid "showing selected sets"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:744
+msgid "showing selected users"
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:1124
+#, fuzzy
+msgid "submitAnswers"
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:1154
+msgid "time"
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:1154
+msgid "times"
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:1161
+#: ContentGenerator/ProblemSet.pm:427
+msgid "unlimited"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:654
+msgid "users who match on selected field"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2522
+#: ContentGenerator/Problem.pm:603
+#, fuzzy
+msgid "visible"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1611
+#: ContentGenerator/Instructor/ProblemSetList.pm:692
+#: ContentGenerator/Instructor/ProblemSetList.pm:930
+msgid "visible sets"
+msgstr ""
+
+#
+#: ContentGenerator/Problem.pm:604
+#: ContentGenerator/ProblemSet.pm:86
+msgid "visible to students"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1027
+#: ContentGenerator/Instructor/UserList.pm:1197
+#: ContentGenerator/Instructor/UserList.pm:1299
+#: ContentGenerator/Instructor/UserList.pm:968
+msgid "visible users"
+msgstr ""
+
+#
+#. ($self->formatDateTime($set->open_date)
+#: ContentGenerator/ProblemSets.pm:420
+#: ContentGenerator/ProblemSets.pm:448
+#, fuzzy
+msgid "will open on %1"
+msgstr ""
+
+#
+msgid "Add to which set?"
+msgstr ""
+
+#
+msgid "Course Information for course [_1]"
+msgstr ""
+
+#
+msgid "report bugs in this problem"
+msgstr ""
+
+#
+msgid "Problem [_1]"
+msgstr ""
+
+#
+msgid "Cancel Password"
+msgstr ""
+
+#
+msgid "WeBWorK"
+msgstr ""
+
+#
+msgid "Audit"
+msgstr ""
+
+#
+msgid "Hardcopy Header for set [_1]"
+msgstr ""
+
+#
+msgid "Report bugs in a WeBWorK question/problem using this link. The very first time you do this you will need to register with an email address so that information on the bug fix can be reported back to you."
+msgstr ""
+
+#
+msgid "Pad Fields"
+msgstr ""
+
+#
+msgid "Set Header for set [_1]"
+msgstr ""
+
+#
+msgid "Statistics for [_1]"
+msgstr ""
+
+#
+msgid "Filter"
+msgstr ""
+
+#
+msgid "set [_1]/problem [_2]"
+msgstr ""
+
+#
+msgid "You are not authorized to modify problems."
+msgstr ""
+
+#
+msgid "hardcopy header file"
+msgstr ""
+
+#
+msgid "Write permissions have not been enabled in the templates directory.  No changes can be made."
+msgstr ""
+
+#
+msgid "Save [_1] and View"
+msgstr ""
+
+#
+msgid "Create"
+msgstr ""
+
+#
+msgid "Changes in this file have not yet been permanently saved."
+msgstr ""
+
+#
+msgid "Instructor Tools"
+msgstr ""
+
+#
+msgid "Score"
+msgstr ""
+
+#
+msgid "Show in another window"
+msgstr ""
+
+#
+msgid "Copied auxiliary files from [_1] to  new location at [_2]"
+msgstr ""
+
+#
+msgid "Unpublished"
+msgstr ""
+
+#
+msgid "Login"
+msgstr ""
+
+#
+msgid "Email"
+msgstr ""
+
+#
+msgid "File Manager"
+msgstr ""
+
+#
+msgid "Unable to change the hardcopy header for set [_1]. Unknown error."
+msgstr ""
+
+#
+msgid "Unable to make '[_1]' the set header for [_2]"
+msgstr ""
+
+#
+msgid "Can't determine user of temporary edit file [_1]."
+msgstr ""
+
+#
+msgid "Download a hardcopy of this homework set."
+msgstr ""
+
+#
+msgid "Problem Editor"
+msgstr ""
+
+#
+msgid "The file '[_1]' is protected!"
+msgstr ""
+
+#
+msgid "Top level of author information on the wiki."
+msgstr ""
+
+#
+msgid "Score selected set(s) and save to:"
+msgstr ""
+
+#
+msgid "Save Password"
+msgstr ""
+
+#
+msgid "The file '[_1]' is a blank problem!"
+msgstr ""
+
+#
+msgid "Add as what filetype?"
+msgstr ""
+
+#
+msgid "no action"
+msgstr ""
+
+#
+msgid "Added '[_1]' to [_2] as new set header"
+msgstr ""
+
+#
+msgid "View statistics by set"
+msgstr ""
+
+#
+msgid "Set"
+msgstr ""
+
+#
+msgid "This is a blank problem template file and can not be edited directly. Use the 'Save as' action below to create a local copy of the file and add it to the current problem set."
+msgstr ""
+
+#
+msgid "Logout"
+msgstr ""
+
+#
+msgid "You do not have permission to view the details of this error."
+msgstr ""
+
+#
+msgid "Reverting to original file '[_1]'"
+msgstr ""
+
+#
+msgid "Delete"
+msgstr ""
+
+#
+msgid "Wiki summary page for MathObjects"
+msgstr ""
+
+#
+msgid "Your score was recorded."
+msgstr ""
+
+#
+msgid "You must specify an file name in order to save a new file."
+msgstr ""
+
+#
+msgid "To edit this text you must first make a copy of this file using the 'Save as' action below."
+msgstr ""
+
+#
+msgid "unassigned problem file"
+msgstr ""
+
+#
+msgid "View statistics by student"
+msgstr ""
+
+#
+msgid "Publish"
+msgstr ""
+
+#
+msgid "Password/Email"
+msgstr ""
+
+#
+msgid "Cancel Edit"
+msgstr ""
+
+#
+msgid "Math Objects"
+msgstr ""
+
+#
+msgid "Snippets of PG code illustrating specific techniques"
+msgstr ""
+
+#
+msgid "Error copying [_1] to [_2]"
+msgstr ""
+
+#
+msgid "Hmwk Sets Editor"
+msgstr ""
+
+#
+msgid "This set is [_1] students."
+msgstr ""
+
+#
+msgid "header file"
+msgstr ""
+
+#
+msgid "Include Index"
+msgstr ""
+
+#
+msgid "Display Mode"
+msgstr ""
+
+#
+msgid "You can earn partial credit on this problem."
+msgstr ""
+
+#
+msgid "Write permissions have not been enabled in '[_1]'.  Changes must be saved to a different directory for viewing."
+msgstr ""
+
+#
+msgid "blank problem"
+msgstr ""
+
+#
+msgid "Save Edit"
+msgstr ""
+
+#
+msgid "Enrolled"
+msgstr ""
+
+#
+msgid "Write permissions have not been enabled for '[_1]'.  Changes must be saved to another file for viewing."
+msgstr ""
+
+#
+msgid "Note: this problem viewer is for viewing purposes only. As of right now, testing functionality is not possible."
+msgstr ""
+
+#
+msgid "Save Export"
+msgstr ""
+
+#
+msgid "webwork"
+msgstr ""
+
+#
+msgid "Problem Viewer"
+msgstr ""
+
+#
+msgid "submit button clicked"
+msgstr ""
+
+#
+msgid "Student Progress for [_1]"
+msgstr ""
+
+#
+msgid "A new file has been created at '[_1]' with the contents below. No changes have been made to set [_2]."
+msgstr ""
+
+#
+msgid "Your score was not recorded because this problem has not been assigned to you."
+msgstr ""
+
+#
+msgid "Sort"
+msgstr ""
+
+#
+msgid "Add problem"
+msgstr ""
+
+#
+msgid "Author Info"
+msgstr ""
+
+#
+msgid "Replace [_1]"
+msgstr ""
+
+#
+msgid "Help"
+msgstr ""
+
+#
+msgid "Add Users"
+msgstr ""
+
+#
+msgid "Problem Source Code"
+msgstr ""
+
+#
+msgid "Test snippets of PG code in interactive lab.  Good way to learn PG language."
+msgstr ""
+
+#
+msgid "Page generated at [_1] at [_2]"
+msgstr ""
+
+#
+msgid "Import"
+msgstr ""
+
+#
+msgid "View Using Seed Number"
+msgstr ""
+
+#
+msgid "Grades"
+msgstr ""
+
+#
+msgid "Published"
+msgstr ""
+
+#
+msgid "Your score was not recorded because this homework set is closed."
+msgstr ""
+
+#
+msgid "The text box now contains the source of the original problem. You can recover lost edits by using the Back button on your browser."
+msgstr ""
+
+#
+msgid "The file '[_1]' is a directory!"
+msgstr ""
+
+#
+msgid "Save As"
+msgstr ""
+
+#
+msgid "Documentation from source code for PG modules and macro files. Often the most up-to-date information."
+msgstr ""
+
+#
+msgid "Problem Techniques"
+msgstr ""
+
+#
+msgid "Course Configuration"
+msgstr ""
+
+#
+msgid "Feedback"
+msgstr ""
+
+#
+msgid "Export"
+msgstr ""
+
+#
+msgid "PG mark down syntax used to format WeBWorK questions. This interactive lab can help you to learn the techniques."
+msgstr ""
+
+#
+msgid "Record Scores for Single Sets"
+msgstr ""
+
+#
+msgid "Append to end of set [_1]"
+msgstr ""
+
+#
+msgid "Unrecognized saveMode: |[_1]|. Unknown error."
+msgstr ""
+
+#
+msgid "Your score was not recorded because there was a failure in storing the problem record to the database."
+msgstr ""
+
+#
+msgid "The hardcopy header for set [_1] has been renamed to '[_2]'."
+msgstr ""
+
+#
+msgid "Save as"
+msgstr ""
+
+#
+msgid "Select action below"
+msgstr ""
+
+#
+msgid "The file '[_1]' cannot be found."
+msgstr ""
+
+#
+msgid "Unable to write to '[_1]': [_2]"
+msgstr ""
+
+#
+msgid "Save"
+msgstr ""
+
+#
+msgid "File '[_1]' exists. File not saved. No changes have been made. You can change the file path for this problem manually from the 'Hmwk Sets Editor' page"
+msgstr ""
+
+#
+msgid "The set header for set [_1] has been renamed to '[_2]'."
+msgstr ""
+
+#
+msgid "Error: This path is already in the temporary edit directory -- no new temporary file is created. path = [_1]"
+msgstr ""
+
+#
+msgid "Please use radio buttons to choose the method for saving this file. Can't recognize saveMode: |[_1]|."
+msgstr ""
+
+#
+msgid "Saved to file '[_1]'"
+msgstr ""
+
+#
+msgid "Please specify a file to save to."
+msgstr ""
+
+#
+msgid "The selected problem ([_1]) is not a valid problem for set [_2]."
+msgstr ""
+
+#
+msgid "Editing [_1] in file '[_2]'"
+msgstr ""
+
+#
+msgid "Deleting temp file at [_1]"
+msgstr ""
+
+#
+msgid "hidden from"
+msgstr ""
+
+#
+msgid "View student progress by set"
+msgstr ""
+
+#
+msgid "View"
+msgstr ""
+
+#
+msgid "Resources"
+msgstr ""
+
+#
+msgid "Scoring Download"
+msgstr ""
+
+#
+msgid "Duplicate"
+msgstr ""
+
+#
+msgid "This path |[_1]| is not the path to a temporary edit file."
+msgstr ""
+
+#
+msgid "visible to"
+msgstr ""
+
+#
+msgid "Unable to change the source file path for set [_1], problem [_2]. Unknown error."
+msgstr ""
+
+#
+msgid "Course Administration"
+msgstr ""
+
+#
+msgid "Added [_1] to [_2] as problem [_3]"
+msgstr ""
+
+#
+msgid "Options Information"
+msgstr ""
+
+#
+msgid "Proctor"
+msgstr ""
+
+#
+msgid "Student Progress"
+msgstr ""
+
+#
+msgid "Revert"
+msgstr ""
+
+#
+msgid "Statistics"
+msgstr ""
+
+#
+msgid "Save as new independent problem"
+msgstr ""
+
+#
+msgid "Scoring Tools"
+msgstr ""
+
+#
+msgid "The source file for 'set [_1] / problem [_2]' has been changed from [_3] to '[_4]'."
+msgstr ""
+
+#
+msgid "Cancel Export"
+msgstr ""
+
+#
+msgid "View student progress by student"
+msgstr ""
+
+#
+msgid "Revert to [_1]"
+msgstr ""
+
+#
+msgid "Classlist Editor"
+msgstr ""
+
+#
+msgid "Add"
+msgstr ""
+
+#
+msgid "the original path to the file is [_1]"
+msgstr ""
+
+#
+msgid "The path to the original file should be absolute"
+msgstr ""
+
+#
+msgid "To edit this text you must use the 'Save AS' action below to save it to another file."
+msgstr ""
+
+#
+msgid "Error: The original file [_1] cannot be read."
+msgstr ""
+
+#
+msgid "Unable to change the set header for set [_1]. Unknown error."
+msgstr ""
+
+#
+msgid "options information"
+msgstr ""
+
+#
+msgid "The selected problem([_1]) is not a valid problem for set [_2]."
+msgstr ""
+
+#
+msgid "Unknown file type"
+msgstr ""
+
+#
+msgid "course information"
+msgstr ""
+
+#
+msgid "Change User Options"
+msgstr ""
+
+#
+msgid "Drop"
+msgstr ""
+
+#
+msgid "Solutions"
+msgstr ""
+
+#
+msgid "Show:"
+msgstr ""
+
+#
+msgid "WeBWorK Assignment [_1] is due : [_2]."
+msgstr ""
+
+#
+msgid "Hardcopy Generator"
+msgstr ""
+
+#
+msgid "This set is visible to students."
+msgstr ""
+
+#
+msgid "View equations as"
+msgstr ""
+
+#
+msgid "From:"
+msgstr ""
+
+#
+msgid "Generate Hardcopy"
+msgstr ""
+
+#
+msgid "You may choose to show any of the following data. Correct answers and solutions are only available after the answer date of the homework set."
+msgstr ""
+
+#
+msgid "E-mail Instructor"
+msgstr ""
+
+#
+msgid "Send E-mail:"
+msgstr ""
+
+#
+msgid "Cancel Email"
+msgstr ""
+
+#
+msgid "E-mail:"
+msgstr ""
+
+#
+msgid "Correct answers"
+msgstr ""
+
+#
+msgid "Use this form to report to your professor a problem with the WeBWorK system or an error in a problem you are attempting. Along with your message, additional information about the state of the system will be included."
+msgstr ""
+
+#
+msgid "Student answers"
+msgstr ""
+
+#
+msgid "Hints"
+msgstr ""
+
+#
+msgid "Hardcopy Format:"
+msgstr ""
+
diff --git a/lib/WeBWorK/Localize/zh_hk.mo b/lib/WeBWorK/Localize/zh_hk.mo
new file mode 100644
index 0000000000..46d0fec012
Binary files /dev/null and b/lib/WeBWorK/Localize/zh_hk.mo differ
diff --git a/lib/WeBWorK/Localize/zh_hk.po b/lib/WeBWorK/Localize/zh_hk.po
new file mode 100644
index 0000000000..8e6b2cbf0e
--- /dev/null
+++ b/lib/WeBWorK/Localize/zh_hk.po
@@ -0,0 +1,2537 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: WeBWorK Online Homework System\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-12-10 17:50-0500\n"
+"Last-Translator: Michael Gage <gage@math.rochester.edu>\n"
+"Language-Team: Webwork Language Team <gage@math.rochester.edu>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Chinese\n"
+"X-Poedit-Country: CHINA\n"
+
+#
+#. ($name, $vnum)
+#: ContentGenerator/ProblemSets.pm:416
+#, fuzzy
+msgid "%1 (test %2)"
+msgstr "tr: [_1] (test [_2])"
+
+#
+#. ($numAdded, $numSkipped, join(", ", @$skipped)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1581
+#, fuzzy
+msgid "%1 sets added, %2 sets skipped. Skipped sets: (%3)"
+msgstr "tr: [_1] sets exported, [_2] sets skipped. Skipped sets: ([_3])"
+
+#
+#. ($numExported, $numSkipped, (($numSkipped)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1701
+#, fuzzy
+msgid "%1 sets exported, %2 sets skipped. Skipped sets: (%3)"
+msgstr "tr: [_1] sets exported, [_2] sets skipped. Skipped sets: ([_3])"
+
+#
+#. ($name)
+#: ContentGenerator/ProblemSets.pm:427
+#: ContentGenerator/ProblemSets.pm:441
+#, fuzzy
+msgid "%1 test"
+msgstr "tr: [_1] test"
+
+#
+#. (scalar @userIDsToExport, $dir, $fileName)
+#: ContentGenerator/Instructor/UserList.pm:1385
+#, fuzzy
+msgid "%1 users exported to file %2/%3"
+msgstr "tr: [_1] users exported to file [_2]/[_3]"
+
+#
+#. ($numReplaced, $numAdded, $numSkipped, join (", ", @$skipped)
+#: ContentGenerator/Instructor/UserList.pm:1269
+#, fuzzy
+msgid "%1 users replaced, %2 users added, %3 users skipped. Skipped users: (%4)"
+msgstr "tr: [_1] users replaced, [_2] users added, [_3] users skipped.  Skipped users: ([_4])"
+
+#
+#. (int($answerScore*100)
+#: ContentGenerator/Problem.pm:265
+#, fuzzy
+msgid "%1% correct"
+msgstr "[_1]% 正确"
+
+#
+#. ($e_user_name)
+#: ContentGenerator/Options.pm:171
+#, fuzzy
+msgid "%1's Current Address"
+msgstr "[_1] i莽in Mevcut Adres"
+
+#
+#. ($user_name)
+#: ContentGenerator/Options.pm:126
+#, fuzzy
+msgid "%1's Current Password"
+msgstr "[_1] i莽in Mevcut 艦ifre"
+
+#
+#. ($e_user_name)
+#: ContentGenerator/Options.pm:175
+#, fuzzy
+msgid "%1's New Address"
+msgstr "[_1] i莽in Yeni Adres"
+
+#
+#. ($e_user_name)
+#: ContentGenerator/Options.pm:130
+#, fuzzy
+msgid "%1's New Password"
+msgstr "[_1] i莽in Yeni 艦ifre"
+
+#
+#. ($e_user_name)
+#: ContentGenerator/Options.pm:101
+#, fuzzy
+msgid "%1's new password cannot be blank."
+msgstr "[_1] i莽in yeni 艧ifre bo艧 b谋rak谋lamaz."
+
+#
+#. ($e_user_name)
+#: ContentGenerator/Options.pm:84
+#, fuzzy
+msgid "%1's password has been changed."
+msgstr "[_1] adl谋 kullan谋c谋n谋n 艧ifresi de臒i艧tirildi."
+
+#
+#. ($setID, $problemID)
+#: ContentGenerator/Problem.pm:884
+#, fuzzy
+msgid "%1: Problem %2"
+msgstr "[_1]: 题目 [_2]."
+
+#
+#. ($numBlanks)
+#: ContentGenerator/Problem.pm:319
+#, fuzzy
+msgid "%quant(%1,of the questions remains,of the questions remain) unanswered."
+msgstr "Sorularè°‹n [_1] tanesi yanè°‹tsè°‹z bè°‹rakè°‹ldè°‹."
+
+#
+#: ContentGenerator/Problem.pm:1188
+msgid "(This problem will not count towards your grade.)"
+msgstr "(Bu soru notunuzu etkilemeyecektir.)"
+
+#
+#: ContentGenerator/Problem.pm:1299
+msgid "ANSWERS ONLY CHECKED -- ANSWERS NOT RECORDED"
+msgstr "YANITLAR SADECE KONTROL ED陌L陌YOR -- YANITLAR KAYDED陌LMED陌"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1708
+#: ContentGenerator/Instructor/UserList.pm:1391
+#: ContentGenerator/Instructor/UserList.pm:1463
+msgid "Abandon changes"
+msgstr "tr: Abandon changes"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1647
+msgid "Abandon export"
+msgstr "tr: Abandon export"
+
+#
+#. ($eUserID)
+#: ContentGenerator.pm:848
+#, fuzzy
+msgid "Acting as %1. "
+msgstr "[_1] gibi davranè°‹lè°‹yor."
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1927
+msgid "Active"
+msgstr "tr: Active"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1142
+msgid "Add how many students?"
+msgstr "tr: Add how many students?"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1220
+msgid "Add which new users?"
+msgstr "tr: Add which new users?"
+
+#
+#: ContentGenerator/Problem.pm:311
+msgid "All of the answers above are correct."
+msgstr "Yan谋tlar谋n t眉m眉 do臒ru"
+
+#
+#. ($verb)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1052
+#, fuzzy
+msgid "All selected sets %1 all students"
+msgstr "tr: All selected sets [_1] all students"
+
+#
+#. ($verb)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1046
+#, fuzzy
+msgid "All sets %1 all students"
+msgstr "tr: All sets [_1] all students"
+
+#
+#. ($verb)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1049
+#, fuzzy
+msgid "All visible sets %1 all students"
+msgstr "tr: All visible sets [_1] all students"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:446
+#: ContentGenerator/Instructor/ProblemSetList.pm:832
+#: ContentGenerator/Instructor/ProblemSetList.pm:870
+msgid "Answer Date"
+msgstr "tr: Answer Date"
+
+#
+#: ContentGenerator/Problem.pm:242
+msgid "Answer Preview"
+msgstr "答案预览"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:531
+msgid "Any changes made below will be reflected in the set for ALL students."
+msgstr "tr: Any changes made below will be reflected in the set for ALL students."
+
+#
+#: ContentGenerator.pm:1481
+msgid "Apply Options"
+msgstr "Appliquer"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1545
+msgid "Assign this set to which users?"
+msgstr "tr: Assign this set to which users?"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2064
+#, fuzzy
+msgid "Assigned Sets"
+msgstr "tr: Edit Assigned Users"
+
+#
+#. ($fully)
+#: ContentGenerator/Problem.pm:315
+#, fuzzy
+msgid "At least one of the answers above is NOT %1correct."
+msgstr "Yan谋tlar谋n en az bir tanesi [_1]do臒ru de臒il."
+
+#
+#: ContentGenerator/ProblemSet.pm:350
+msgid "Attempts"
+msgstr "Deneme sayè°‹sè°‹"
+
+#
+#. ($eUserID,$@)
+#: ContentGenerator/Options.pm:71
+#, fuzzy
+msgid "Can't get password record for effective user '%1': %2"
+msgstr "Can't get password record for effective user '[_1]': [_2]"
+
+#
+#. ($userID,$@)
+#: ContentGenerator/Options.pm:68
+#, fuzzy
+msgid "Can't get password record for user '%1': %2"
+msgstr "Can't get password record for user '[_1]': [_2]"
+
+#
+#: ContentGenerator/Options.pm:142
+msgid "Change Email Address"
+msgstr "E-posta Adresi De臒i艧tir"
+
+#
+#: ContentGenerator/Options.pm:61
+msgid "Change Password"
+msgstr "艦ifre De臒i艧tir"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1409
+#: ContentGenerator/Instructor/UserList.pm:1481
+#, fuzzy
+msgid "Changes abandoned"
+msgstr "tr: changes abandoned"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1457
+#, fuzzy
+msgid "Changes saved"
+msgstr "tr: changes saved"
+
+#
+#: ContentGenerator/Problem.pm:1118
+msgid "Check Answers"
+msgstr "Yanè°‹tlarè°‹ kontrol et"
+
+#
+#: ContentGenerator/Problem.pm:1227
+msgid "Checking additional error messages"
+msgstr "tr: Checking additional error messages"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1011
+msgid "Choose visibility of the sets to be affected"
+msgstr "tr: Choose visibility of the sets to be affected"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1084
+#: ContentGenerator/Instructor/ProblemSetList.pm:982
+msgid "Choose which sets to be affected"
+msgstr "tr: Choose which sets to be affected"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:597
+#: ContentGenerator/Instructor/UserList.pm:550
+#: ContentGenerator/ProblemSets.pm:288
+msgid "Clear"
+msgstr "tr: Clear"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:562
+#, fuzzy
+msgid "Click on the login name to edit individual problem set data, (e.g. due dates) for these students."
+msgstr "tr: Click on the login name to edit individual problem set data, (e.g. due dates) for these students."
+
+#
+#: ContentGenerator/ProblemSets.pm:435
+msgid "Closed"
+msgstr "tr: Closed"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2072
+#: ContentGenerator/Instructor/UserList.pm:290
+#: ContentGenerator/Instructor/UserList.pm:818
+#: ContentGenerator/Instructor/UserList.pm:861
+#: ContentGenerator/Instructor/UserList.pm:904
+msgid "Comment"
+msgstr "tr: Comment"
+
+#
+#. ($e_user_name)
+#: ContentGenerator/Options.pm:134
+#: ContentGenerator/Options.pm:95
+#, fuzzy
+msgid "Confirm %1's New Password"
+msgstr "[_1] i莽in 艦ifre Onay谋"
+
+#
+#: ContentGenerator/Login.pm:206
+msgid "Continue"
+msgstr "tr: Continue"
+
+#
+#: ContentGenerator/Problem.pm:243
+msgid "Correct"
+msgstr "正确"
+
+#
+#. ($e_user_name,$@)
+#: ContentGenerator/Options.pm:80
+#, fuzzy
+msgid "Couldn't change %1's password: %2"
+msgstr "[_1] adl谋 kullan谋c谋n谋n 艧ifresi de臒i艧tirilemedi: [_2]"
+
+#
+#. ($@)
+#: ContentGenerator/Options.pm:153
+#, fuzzy
+msgid "Couldn't change your email address: %1"
+msgstr "E-posta adresiniz de臒i艧tirilemedi: [_1]"
+
+#
+#: ContentGenerator/ProblemSets.pm:71
+#: ContentGenerator/ProblemSets.pm:73
+msgid "Course Info"
+msgstr "课程信�"
+
+#
+#: ContentGenerator.pm:657
+#: ContentGenerator/Home.pm:94
+msgid "Courses"
+msgstr "Dersler"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1351
+msgid "Create as what type of set?"
+msgstr "tr: Create as what type of set?"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1263
+#: ContentGenerator/Instructor/UserList.pm:1082
+msgid "Delete how many?"
+msgstr "tr: Delete how many?"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1119
+msgid "Disable"
+msgstr "tr: Disable"
+
+#
+#: ContentGenerator.pm:1442
+msgid "Display Options"
+msgstr "Options d'affichage"
+
+#
+#. ($pl)
+#: ContentGenerator/ProblemSets.pm:283
+#, fuzzy
+msgid "Download Hardcopy for Selected %plural(%1,Set,Sets)"
+msgstr "Télécharger une copie de : [plural,_1,Set,Sets]"
+
+#
+#: ContentGenerator/ProblemSet.pm:321
+msgid "Download PDF or TeX Hardcopy for Current Set"
+msgstr "tr: Download PDF or TeX Hardcopy for Current Set"
+
+#
+#: ContentGenerator/ProblemSets.pm:289
+msgid "Download PDF or TeX Hardcopy for Selected Sets"
+msgstr "tr: Download PDF or TeX Hardcopy for Selected Sets"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:445
+#: ContentGenerator/Instructor/ProblemSetList.pm:831
+#: ContentGenerator/Instructor/ProblemSetList.pm:869
+msgid "Due Date"
+msgstr "tr: Due Date"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1812
+msgid "Duplicate this set and name it"
+msgstr "tr: Duplicate this set and name it"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1720
+#: ContentGenerator/Instructor/UserList.pm:1785
+#: ContentGenerator/Instructor/UserList.pm:1818
+msgid "Edit"
+msgstr "tr: Edit"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:603
+msgid "Edit All Set Data"
+msgstr "tr: Edit All Set Data"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:439
+msgid "Edit Assigned Users"
+msgstr "tr: Edit Assigned Users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:438
+msgid "Edit Problems"
+msgstr "tr: Edit Problems"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:441
+msgid "Edit Set Data"
+msgstr "tr: Edit Set Data"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:961
+msgid "Edit Which Users?"
+msgstr "tr: Edit Which Users?"
+
+#
+#: ContentGenerator/Problem.pm:1011
+msgid "Edit this problem"
+msgstr "tr: Edit this problem"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:923
+msgid "Edit which sets?"
+msgstr "tr: Edit which sets?"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2067
+#: ContentGenerator/Instructor/UserList.pm:285
+#: ContentGenerator/Instructor/UserList.pm:813
+#: ContentGenerator/Instructor/UserList.pm:856
+#: ContentGenerator/Instructor/UserList.pm:899
+msgid "Email Address"
+msgstr "tr: Email Address"
+
+#
+#: ContentGenerator.pm:1526
+#: ContentGenerator.pm:1549
+#: ContentGenerator.pm:1572
+msgid "Email instructor"
+msgstr "�电�邮件给授课人"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1120
+msgid "Enable"
+msgstr "tr: Enable"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:604
+msgid "Enable Reduced Credit"
+msgstr "tr: Enable Reduced Credit"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1113
+msgid "Enable/Disable reduced scoring for selected sets"
+msgstr "tr: Enable/Disable reduced scoring for selected sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:815
+#: ContentGenerator/Instructor/UserList.pm:858
+#: ContentGenerator/Instructor/UserList.pm:901
+msgid "Enrollment Status"
+msgstr "tr: Enrollment Status"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1321
+msgid "Enter filename below"
+msgstr "tr: Enter filename below"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1502
+msgid "Enter filenames below"
+msgstr "tr: Enter filenames below"
+
+#
+#: ContentGenerator/Problem.pm:240
+msgid "Entered"
+msgstr "Yanè°‹t"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1671
+msgid "Export selected sets"
+msgstr "tr: Export selected sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1317
+msgid "Export to what kind of file?"
+msgstr "tr: Export to what kind of file?"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1604
+msgid "Export which sets?"
+msgstr "tr: Export which sets?"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1292
+msgid "Export which users?"
+msgstr "tr: Export which users?"
+
+#
+#. ($@)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1435
+#, fuzzy
+msgid "Failed to create new set: %1"
+msgstr "tr: Failed to duplicate set: [_1]"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1374
+msgid "Failed to create new set: no set name specified!"
+msgstr "tr: Failed to create new set: no set name specified!"
+
+#
+#. ($@)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1848
+#, fuzzy
+msgid "Failed to duplicate set: %1"
+msgstr "tr: Failed to duplicate set: [_1]"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1832
+msgid "Failed to duplicate set: no set name specified!"
+msgstr "tr: Failed to duplicate set: no set name specified!"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1396
+#: ContentGenerator/Instructor/ProblemSetList.pm:1830
+msgid "Failed to duplicate set: no set selected for duplication!"
+msgstr "tr: Failed to duplicate set: no set selected for duplication!"
+
+#
+#. ($newSetID)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1834
+#, fuzzy
+msgid "Failed to duplicate set: set %1 already exists!"
+msgstr "tr: Failed to duplicate set: set [_1] already exists!"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1339
+msgid "Filename"
+msgstr "tr: Filename"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:678
+msgid "Filter by what text?"
+msgstr "tr: Filter by what text?"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2065
+#: ContentGenerator/Instructor/UserList.pm:283
+#: ContentGenerator/Instructor/UserList.pm:811
+#: ContentGenerator/Instructor/UserList.pm:854
+#: ContentGenerator/Instructor/UserList.pm:897
+msgid "First Name"
+msgstr "tr: First Name"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1020
+msgid "Give new password to which users?"
+msgstr "tr: Give new password to which users?"
+
+#
+#: ContentGenerator/Login.pm:231
+msgid "Guest Login"
+msgstr "tr: Guest Login"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:443
+#: ContentGenerator/Instructor/ProblemSetList.pm:829
+#: ContentGenerator/Instructor/ProblemSetList.pm:867
+msgid "Hardcopy Header"
+msgstr "tr: Hardcopy Header"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1017
+msgid "Hidden"
+msgstr "tr: Hidden"
+
+#
+#: ContentGenerator.pm:667
+#: ContentGenerator/ProblemSet.pm:110
+#: ContentGenerator/ProblemSets.pm:226
+msgid "Homework Sets"
+msgstr "Soru Gruplarè°‹"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:558
+msgid "If a password field is left blank, the student's current password will be maintained."
+msgstr "tr: If a password field is left blank, the student's current password will be maintained."
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1498
+msgid "Import from where?"
+msgstr "tr: Import from where?"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1473
+msgid "Import how many sets?"
+msgstr "tr: Import how many sets?"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1520
+msgid "Import sets with names"
+msgstr "tr: Import sets with names"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1165
+msgid "Import users from what file?"
+msgstr "tr: Import users from what file?"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1927
+msgid "Inactive"
+msgstr "tr: Inactive"
+
+#
+#: Authen.pm:148
+msgid "Invalid user ID or password."
+msgstr "Yanl谋艧 kullan谋c谋 ad谋 ya da 艧ifre."
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2066
+#: ContentGenerator/Instructor/UserList.pm:284
+#: ContentGenerator/Instructor/UserList.pm:812
+#: ContentGenerator/Instructor/UserList.pm:855
+#: ContentGenerator/Instructor/UserList.pm:898
+msgid "Last Name"
+msgstr "tr: Last Name"
+
+#
+#: ContentGenerator.pm:730
+msgid "Library Browser"
+msgstr "K眉t眉phane Taray谋c谋"
+
+#
+#: ContentGenerator.pm:731
+#, fuzzy
+msgid "Library Browser 2"
+msgstr "K眉t眉phane Taray谋c谋"
+
+#
+#: ContentGenerator/Logout.pm:124
+msgid "Log In Again"
+msgstr "Tekrar giri艧 yap"
+
+#
+#: ContentGenerator.pm:845
+#: ContentGenerator.pm:847
+msgid "Log Out"
+msgstr "脟谋k谋艧 Yap"
+
+#
+#. ($userID)
+#: ContentGenerator.pm:845
+#: ContentGenerator.pm:847
+#, fuzzy
+msgid "Logged in as %1. "
+msgstr "[_1] olarak giri艧 yapt谋n谋z."
+
+#
+#: ContentGenerator/Login.pm:74
+#: ContentGenerator/Login.pm:77
+#, fuzzy
+msgid "Login Info"
+msgstr "tr: Login Name"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2062
+#: ContentGenerator/Instructor/UserList.pm:282
+#: ContentGenerator/Instructor/UserList.pm:810
+#: ContentGenerator/Instructor/UserList.pm:853
+#: ContentGenerator/Instructor/UserList.pm:896
+msgid "Login Name"
+msgstr "tr: Login Name"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2063
+#, fuzzy
+msgid "Login Status"
+msgstr "Durumu"
+
+#
+#: ContentGenerator.pm:654
+msgid "Main Menu"
+msgstr "Ana Menü"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:705
+msgid "Match on what? (separate multiple IDs with commas)"
+msgstr "tr: Match on what? (separate multiple IDs with commas)"
+
+#
+#: ContentGenerator/Problem.pm:245
+msgid "Messages"
+msgstr "Mesajlar"
+
+#
+#: ContentGenerator/ProblemSet.pm:349
+#: ContentGenerator/ProblemSets.pm:212
+#: ContentGenerator/ProblemSets.pm:213
+msgid "Name"
+msgstr "Grup Adè°‹"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1328
+msgid "Name the new set"
+msgstr "tr: Name the new set"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1937
+#: ContentGenerator/Instructor/UserList.pm:2077
+msgid "New Password"
+msgstr "tr: New Password"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1519
+msgid "New passwords saved"
+msgstr "tr: New passwords saved"
+
+#
+#: ContentGenerator/Problem.pm:864
+#: ContentGenerator/Problem.pm:866
+msgid "Next Problem"
+msgstr "下一题"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2625
+#: ContentGenerator/Instructor/ProblemSetList.pm:2626
+msgid "No"
+msgstr "tr: No"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1043
+#: ContentGenerator/Instructor/ProblemSetList.pm:1145
+msgid "No change made to any set"
+msgstr "tr: No change made to any set"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1217
+msgid "No sets selected for scoring"
+msgstr "tr: No sets selected for scoring"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:266
+#, fuzzy
+msgid "No sets selected for scoring."
+msgstr "tr: No sets selected for scoring"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2722
+msgid "No sets shown.  Choose one of the options above to list the sets in the course."
+msgstr "tr: No sets shown.  Choose one of the options above to list the sets in the course."
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2110
+#, fuzzy
+msgid ""
+"No students shown.  Choose one of the options above to \n"
+"\t              list the students in the course."
+msgstr "tr: No students shown.  Choose one of the options above to list the students in the course."
+
+#
+#: ContentGenerator.pm:851
+msgid "Not logged in."
+msgstr "Giri艧 yapmad谋n谋z."
+
+#
+#: ContentGenerator/Problem.pm:975
+msgid "Note"
+msgstr "tr: Note"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:444
+#: ContentGenerator/Instructor/ProblemSetList.pm:830
+#: ContentGenerator/Instructor/ProblemSetList.pm:868
+msgid "Open Date"
+msgstr "tr: Open Date"
+
+#
+#: ContentGenerator/Problem.pm:1307
+msgid "PREVIEW ONLY -- ANSWERS NOT RECORDED"
+msgstr "G脰STER陌M -- YANITLAR KAYDED陌LMED陌 "
+
+#
+#. (timestamp($self)
+#: ContentGenerator.pm:953
+#, fuzzy
+msgid "Page generated at %1"
+msgstr "tr: Page generated at [_1]"
+
+#
+#: ContentGenerator/Login.pm:202
+#, fuzzy
+msgid "Password"
+msgstr "tr: New Password"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2073
+#: ContentGenerator/Instructor/UserList.pm:291
+#: ContentGenerator/Instructor/UserList.pm:819
+#: ContentGenerator/Instructor/UserList.pm:862
+#: ContentGenerator/Instructor/UserList.pm:905
+msgid "Permission Level"
+msgstr "tr: Permission Level"
+
+#
+#. (CGI::b($r->maketext($course)
+#: ContentGenerator/Login.pm:154
+#, fuzzy
+msgid "Please enter your username and password for %1 below:"
+msgstr "请在下�[_1]处输入你的用户�和密� :"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:396
+msgid "Please select action to be performed."
+msgstr "tr: Please select action to be performed."
+
+#
+#: ContentGenerator/Problem.pm:1116
+msgid "Preview Answers"
+msgstr "答案预览"
+
+#
+#: ContentGenerator/Problem.pm:850
+#: ContentGenerator/Problem.pm:852
+msgid "Previous Problem"
+msgstr "上一题"
+
+#
+#. ($problemID)
+#: ContentGenerator.pm:686
+#: ContentGenerator/Problem.pm:808
+#: ContentGenerator/ProblemSet.pm:424
+#, fuzzy
+msgid "Problem %1"
+msgstr "tr: Problem"
+
+#
+#: ContentGenerator/Problem.pm:856
+#: ContentGenerator/Problem.pm:858
+msgid "Problem List"
+msgstr "题目列表"
+
+#
+#: ContentGenerator/Problem.pm:796
+#: ContentGenerator/ProblemSet.pm:346
+msgid "Problems"
+msgstr "题目"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2071
+#: ContentGenerator/Instructor/UserList.pm:289
+#: ContentGenerator/Instructor/UserList.pm:817
+#: ContentGenerator/Instructor/UserList.pm:860
+#: ContentGenerator/Instructor/UserList.pm:903
+msgid "Recitation"
+msgstr "tr: Recitation"
+
+#
+#. ($verb)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1148
+#, fuzzy
+msgid "Reduced Credit %1 for all sets"
+msgstr "tr: Reduced Credit [_1] for all sets"
+
+#
+#. ($verb)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1154
+#, fuzzy
+msgid "Reduced Credit %1 for selected sets"
+msgstr "tr: Reduced Credit [_1] for selected sets"
+
+#
+#. ($verb)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1151
+#, fuzzy
+msgid "Reduced Credit %1 for visable sets"
+msgstr "tr: Reduced Credit [_1] for visable sets"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2523
+msgid "Reduced Credit Disabled"
+msgstr "tr: Reduced Credit Disabled"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2523
+#: ContentGenerator/Instructor/ProblemSetList.pm:448
+msgid "Reduced Credit Enabled"
+msgstr "tr: Reduced Credit Enabled"
+
+#
+#. ($beginReducedScoringPeriod)
+#: ContentGenerator/ProblemSets.pm:459
+#, fuzzy
+msgid "Reduced Credit Starts: %1"
+msgstr "tr: Reduced Credit Starts: [_1]"
+
+#
+#: ContentGenerator/ProblemSet.pm:351
+msgid "Remaining"
+msgstr "Kalan hak"
+
+#
+#: ContentGenerator/Login.pm:204
+msgid "Remember Me"
+msgstr "tr: Remember Me"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1190
+msgid "Replace which users?"
+msgstr "tr: Replace which users?"
+
+#
+#: ContentGenerator.pm:799
+msgid "Report bugs"
+msgstr "Hataları bildir"
+
+#
+#: ContentGenerator/Problem.pm:244
+msgid "Result"
+msgstr "Sonu莽"
+
+#
+#. (CGI::i($self->$actionHandler(\%genericParams, \%actionParams, \%tableParams)
+#: ContentGenerator/Instructor/UserList.pm:376
+#, fuzzy
+msgid "Result of last action performed: %1"
+msgstr "tr: Result of last action performed: [_1]"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:386
+msgid "Results of last action performed"
+msgstr "tr: Results of last action performed"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1732
+#: ContentGenerator/Instructor/UserList.pm:1415
+#: ContentGenerator/Instructor/UserList.pm:1487
+msgid "Save changes"
+msgstr "tr: Save changes"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1186
+msgid "Score which sets?"
+msgstr "tr: Score which sets?"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2070
+#: ContentGenerator/Instructor/UserList.pm:288
+#: ContentGenerator/Instructor/UserList.pm:816
+#: ContentGenerator/Instructor/UserList.pm:859
+#: ContentGenerator/Instructor/UserList.pm:902
+msgid "Section"
+msgstr "tr: Section"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:582
+msgid "Select all sets"
+msgstr "tr: Select all sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:535
+msgid "Select all users"
+msgstr "tr: Select all users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:534
+#: ContentGenerator/Instructor/UserList.pm:512
+msgid "Select an action to perform"
+msgstr "tr: Select an action to perform"
+
+#
+#. ($newSetID)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1375
+#, fuzzy
+msgid "Set %1 exists.  No set created"
+msgstr "tr: Set [_1] exists.  No set created"
+
+#: ContentGenerator/Instructor/ProblemSetList.pm:440
+msgid "Set Definition Filename"
+msgstr ""
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:442
+#: ContentGenerator/Instructor/ProblemSetList.pm:828
+#: ContentGenerator/Instructor/ProblemSetList.pm:866
+msgid "Set Header"
+msgstr "tr: Set Header"
+
+#
+#: ContentGenerator/ProblemSet.pm:273
+#: ContentGenerator/ProblemSet.pm:275
+msgid "Set Info"
+msgstr "Informations"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2700
+msgid "Set List"
+msgstr "tr: Set List"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:827
+#: ContentGenerator/Instructor/ProblemSetList.pm:865
+msgid "Set Name"
+msgstr "tr: Set Name"
+
+#
+#: ContentGenerator/ProblemSet.pm:153
+msgid "Sets"
+msgstr "Devoirs"
+
+#
+#: ContentGenerator/Problem.pm:1063
+msgid "Show Hints"
+msgstr "展示�示"
+
+#
+#: ContentGenerator/Problem.pm:1370
+msgid "Show Past Answers"
+msgstr "è„°nceki Yanè°‹tlarè°‹ Gæžšster"
+
+#
+#: ContentGenerator/Problem.pm:1082
+msgid "Show Solutions"
+msgstr "展示答案"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:645
+msgid "Show Which Users?"
+msgstr "tr: Show Which Users?"
+
+#
+#: ContentGenerator/Problem.pm:1044
+msgid "Show correct answers"
+msgstr "Do臒ru yan谋tlar谋 g枚ster"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:683
+msgid "Show which sets?"
+msgstr "tr: Show which sets?"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:497
+#: ContentGenerator/Instructor/UserList.pm:475
+msgid "Show/Hide Site Description"
+msgstr "tr: Show/Hide Site Description"
+
+#
+#. (scalar @visibleSetIDs, scalar @allSetIDs)
+#: ContentGenerator/Instructor/ProblemSetList.pm:607
+#, fuzzy
+msgid "Showing %1 out of %2 sets."
+msgstr "tr: Showing [_1] out of [_2] sets."
+
+#
+#. (scalar @Users, scalar @allUserIDs)
+#: ContentGenerator/Instructor/UserList.pm:556
+#, fuzzy
+msgid "Showing %1 out of %2 users"
+msgstr "tr: Showing [_1] out of [_2] users"
+
+#
+#: ContentGenerator/Login.pm:96
+#: ContentGenerator/Login.pm:99
+#, fuzzy
+msgid "Site Information"
+msgstr "tr: Options Information"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:821
+#: ContentGenerator/Instructor/UserList.pm:804
+msgid "Sort by"
+msgstr "tr: Sort by"
+
+#
+#. ($names{$primary}, $names{$secondary})
+#: ContentGenerator/Instructor/ProblemSetList.pm:899
+#, fuzzy
+msgid "Sort by %1 and then by %2"
+msgstr "tr: Sort by [_1] and then by [_2]"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2069
+#: ContentGenerator/Instructor/UserList.pm:287
+#: ContentGenerator/ProblemSet.pm:353
+#: ContentGenerator/ProblemSets.pm:215
+#: ContentGenerator/ProblemSets.pm:216
+msgid "Status"
+msgstr "Durumu"
+
+#
+#: ContentGenerator.pm:848
+msgid "Stop Acting"
+msgstr "Rol Yapmayè°‹ bè°‹rak"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2068
+#: ContentGenerator/Instructor/UserList.pm:286
+#: ContentGenerator/Instructor/UserList.pm:814
+#: ContentGenerator/Instructor/UserList.pm:857
+#: ContentGenerator/Instructor/UserList.pm:900
+msgid "Student ID"
+msgstr "tr: Student ID"
+
+#
+#: ContentGenerator/Problem.pm:1127
+msgid "Submit Answers"
+msgstr "�交答案"
+
+#
+#. ($effectiveUser)
+#: ContentGenerator/Problem.pm:1124
+#, fuzzy
+msgid "Submit Answers for %1"
+msgstr "[_1] i莽in Yan谋tlar谋 G枚nder"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1850
+msgid "Success"
+msgstr "tr: Success"
+
+#. ($newSetID)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1437
+msgid "Successfully created new set %1"
+msgstr ""
+
+#
+#. ($name)
+#: ContentGenerator/ProblemSets.pm:424
+#: ContentGenerator/ProblemSets.pm:433
+#: ContentGenerator/ProblemSets.pm:439
+#, fuzzy
+msgid "Take %1 test"
+msgstr "tr: Take [_1] test"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:598
+#: ContentGenerator/Instructor/UserList.pm:551
+msgid "Take Action!"
+msgstr "tr: Take Action!"
+
+#
+#: ContentGenerator/ProblemSets.pm:236
+msgid "Test Date"
+msgstr "tr: Test Date"
+
+#
+#: ContentGenerator/ProblemSets.pm:235
+msgid "Test Score"
+msgstr "tr: Test Score"
+
+#
+#: ContentGenerator.pm:954
+msgid "The WeBWorK Project"
+msgstr "tr: The WeBWorK Project"
+
+#
+#. ($fully)
+#: ContentGenerator/Problem.pm:307
+#, fuzzy
+msgid "The answer above is NOT %1correct."
+msgstr "Yukar谋daki yan谋t [_1]do臒ru de臒il."
+
+#
+#: ContentGenerator/Problem.pm:305
+msgid "The answer above is correct."
+msgstr "Yukar谋daki yan谋t do臒ru."
+
+#
+#. (CGI::b($r->maketext("[_1]'s Current Password",$user_name)
+#: ContentGenerator/Options.pm:107
+#, fuzzy
+msgid ""
+"The password you entered in the %1 \n"
+"\t\t\t\t\t\tfield does not match your current\n"
+"\t\t\t\t\t\tpassword. Please retype your current password and try\n"
+"\t\t\t\t\t\tagain."
+msgstr "[_1] alan谋na girdi臒iniz 艧ifre ile mevcut 艧ifreniz uyu艧mamaktad谋r. L眉tfen 艧irfenizi girerek tekrar deneyiniz."
+
+#
+#. (CGI::b($r->maketext("[_1]'s New Password",$e_user_name)
+#: ContentGenerator/Options.pm:91
+#, fuzzy
+msgid ""
+"The passwords you entered in the \n"
+"\t\t\t\t\t\t\t\t%1 and %2\n"
+"\t\t\t\t\t\t\t\tfields don't match. Please retype your new password and try\n"
+"\t\t\t\t\t\t\t\tagain."
+msgstr "[_1] ve [_2]  alanlar谋na girdi臒iniz 艧ifreler uyu艧mad谋. Yeni 艧ifrenizi girerek tekrar deneyiniz."
+
+#
+#. ($setName,$effectiveUser)
+#: ContentGenerator/ProblemSet.pm:308
+#, fuzzy
+msgid "The selected problem set (%1) is not a valid set for %2"
+msgstr "tr: The selected problem set ([_1]) is not a valid set for [_2]"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:859
+#: ContentGenerator/Instructor/UserList.pm:847
+#: ContentGenerator/Instructor/UserList.pm:890
+msgid "Then by"
+msgstr "tr: Then by"
+
+#
+#: ContentGenerator/ProblemSet.pm:365
+msgid "This homework set contains no problems."
+msgstr "Bu soru grubunda soru bulunmamaktadè°‹r."
+
+#
+#: ContentGenerator/Problem.pm:1175
+msgid "This homework set is closed."
+msgstr "Bu soru grubu kapalè°‹."
+
+#
+#: ContentGenerator/Problem.pm:1173
+msgid "This homework set is not yet open."
+msgstr "Bu soru grubu hen眉z a莽谋k de臒il."
+
+#
+#: ContentGenerator/Problem.pm:611
+msgid "This problem will not count towards your grade."
+msgstr "Bu soru, notunuzu etkilemeyecektir."
+
+#
+#. (CGI::font({class=>$visiblityStateClass}, $visiblityStateText)
+#: ContentGenerator/Problem.pm:605
+#: ContentGenerator/ProblemSet.pm:88
+#, fuzzy
+msgid "This set is %1"
+msgstr "tr: This set is [_1]"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:588
+msgid "Unselect all sets"
+msgstr "tr: Unselect all sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:541
+msgid "Unselect all users"
+msgstr "tr: Unselect all users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2683
+msgid "Use System Default"
+msgstr "tr: Use System Default"
+
+#
+#: ContentGenerator/Login.pm:200
+#, fuzzy
+msgid "Username"
+msgstr "tr: Filename"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:2087
+msgid "Users List"
+msgstr "tr: Users List"
+
+#
+#. ($names{$primary}, $names{$secondary}, $names{$ternary})
+#: ContentGenerator/Instructor/UserList.pm:938
+#, fuzzy
+msgid "Users sorted by %1, then by %2, then by %3"
+msgstr "tr: Users sorted by [_1], then by [_2], then by [_3]"
+
+#
+#: ContentGenerator/ProblemSet.pm:230
+msgid "Viewing temporary file"
+msgstr "tr: Viewing temporary file"
+
+#
+#: ContentGenerator/Problem.pm:1332
+#: ContentGenerator/ProblemSets.pm:63
+msgid "Viewing temporary file: "
+msgstr "打开临时文件: "
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:833
+#: ContentGenerator/Instructor/ProblemSetList.pm:871
+msgid "Visibility"
+msgstr "tr: Visibility"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1018
+#: ContentGenerator/Instructor/ProblemSetList.pm:447
+msgid "Visible"
+msgstr "tr: Visible"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1259
+#: ContentGenerator/Instructor/UserList.pm:1078
+msgid "Warning: Deletion destroys all user-related data and is not undoable!"
+msgstr "tr: Warning: Deletion destroys all user-related data and is not undoable!"
+
+#
+#: ContentGenerator/Home.pm:87
+msgid "Welcome to WeBWorK!"
+msgstr "WeBWorK sitemize ho艧geldiniz!"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:665
+msgid "What field should filtered users match on?"
+msgstr "tr: What field should filtered users match on?"
+
+#
+#: ContentGenerator/ProblemSet.pm:352
+msgid "Worth"
+msgstr "De臒eri"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2625
+#: ContentGenerator/Instructor/ProblemSetList.pm:2626
+msgid "Yes"
+msgstr "tr: Yes"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:306
+#: ContentGenerator/Instructor/ProblemSetList.pm:418
+#: ContentGenerator/Instructor/UserList.pm:262
+msgid "You are not authorized to access the instructor tools."
+msgstr "tr: You are not authorized to access the instructor tools."
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:339
+msgid "You are not authorized to modify homework sets."
+msgstr "tr: You are not authorized to modify homework sets."
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:344
+msgid "You are not authorized to modify set definition files."
+msgstr "tr: You are not authorized to modify set definition files."
+
+#
+#: ContentGenerator/Instructor/UserList.pm:329
+#: ContentGenerator/Instructor/UserList.pm:335
+#, fuzzy
+msgid "You are not authorized to modify student data"
+msgstr "tr: You are not authorized to modify student data."
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:389
+#: ContentGenerator/Instructor/UserList.pm:380
+msgid "You are not authorized to perform this action."
+msgstr "tr: You are not authorized to perform this action."
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1121
+msgid "You cannot delete yourself!"
+msgstr "tr: You cannot delete yourself!"
+
+#
+#: ContentGenerator/Options.pm:163
+#: ContentGenerator/Options.pm:180
+msgid "You do not have permission to change email addresses."
+msgstr "Adres de臒i艧tirmek i莽in yetkiniz yok."
+
+#
+#: ContentGenerator/Options.pm:117
+#: ContentGenerator/Options.pm:139
+msgid "You do not have permission to change your password."
+msgstr "艦ifre de臒i艧tirmek i莽in yetkiniz yok."
+
+#
+#. ($attemptsLeft,$attemptsLeftNoun)
+#: ContentGenerator/Problem.pm:1196
+#, fuzzy
+msgid "You have %1 %2 remaining."
+msgstr "[_1] [_2] kaldè°‹."
+
+#
+#. ($attemptsLeft)
+#: ContentGenerator/Problem.pm:1197
+#, fuzzy
+msgid "You have %negquant(%1,unlimited attempts,attempt,attempts) remaining."
+msgstr "你还有[negquant,_1,无�次�试,�试,�试] 机会."
+
+#
+#. ($attempts)
+#: ContentGenerator/Problem.pm:1191
+#, fuzzy
+msgid "You have attempted this problem %quant(%1,time,times)."
+msgstr "Bu soru i莽in [quant,_1,deneme hakk谋,deneme hakk谋] kulland谋n谋z."
+
+#
+#: ContentGenerator/Logout.pm:119
+msgid "You have been logged out of WeBWorK."
+msgstr "WeBWorK sisteminden 莽谋k谋艧 yapt谋n谋z."
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1933
+msgid "You may not change your own password here!"
+msgstr "tr: You may not change your own password here!"
+
+#
+#: Authen.pm:317
+msgid "You must specify a user ID."
+msgstr "Bir kullanè°‹cè°‹ adè°‹ girmelisiniz."
+
+#
+#. (sprintf("%.0f%%", $pg->{result}->{score} * 100)
+#: ContentGenerator/Problem.pm:1192
+#, fuzzy
+msgid "You received a score of %1 for this attempt."
+msgstr "Bu soru i莽in [_1] puan ald谋n谋z."
+
+#
+#: ContentGenerator/Options.pm:157
+msgid "Your email address has been changed."
+msgstr "E-posta adresiniz de臒i艧tirildi."
+
+#
+#. ($lastScore,$notCountedMessage)
+#: ContentGenerator/Problem.pm:1194
+#, fuzzy
+msgid "Your overall recorded score is %1.  %2"
+msgstr "Ortalama puanè°‹nè°‹z: [_1].  [_2]"
+
+#
+#: Authen.pm:416
+msgid "Your session has timed out due to inactivity. Please log in again."
+msgstr "Oturumunuz zaman a艧谋m谋na u臒rad谋. L眉tfen tekrar giri艧 yap谋n谋z."
+
+#
+#: ContentGenerator/ProblemSet.pm:273
+#: ContentGenerator/ProblemSets.pm:71
+#, fuzzy
+msgid "[edit]"
+msgstr "~[编辑~]"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:476
+msgid "_CLASSLIST_EDITOR_DESCRIPTION"
+msgstr "tr: This is the classlist editor page, where you can view and edit the records of all the students currently enrolled in this course.  The top of the page contains forms which allow you to filter which students to view, sort your students in a chosen order, edit student records, give new passwords to students, import/export student records from/to external files, or add/delete students.  To use, please select the action you would like to perform, enter in the relevant information in the fields below, and hit the \"Take Action!\" button at the bottom of the form.  The bottom of the page contains a table containing the student usernames and their information."
+
+#
+#. (CGI::strong($r->maketext($course)
+#: ContentGenerator/Login.pm:151
+msgid "_EXTERNAL_AUTH_MESSAGE"
+msgstr "[_1] uses an external authentication system.  You've authenticated through that system, but aren't allowed to log in to this course."
+
+#
+#. (CGI::b($r->maketext("Guest Login")
+#: ContentGenerator/Login.pm:230
+msgid "_GUEST_LOGIN_MESSAGE"
+msgstr "tr: This course supports guest logins. Click [_1] to log into this course as a guest."
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:498
+msgid "_HMWKSETS_EDITOR_DESCRIPTION"
+msgstr "tr: This is the homework sets editor page where you can view and edit the homework sets that exist in this course and the problems that they contain. The top of the page contains forms which allow you to filter which sets to display in the table, sort the sets in a chosen order, edit homework sets, publish homework sets, import/export sets from/to an external file, score sets, or create/delete sets.  To use, please select the action you would like to perform, enter in the relevant information in the fields below, and hit the \"Take Action!\" button at the bottom of the form.  The bottom of the page contains a table displaying the sets and several pieces of relevant information."
+
+#
+#. (CGI::b($r->maketext("Remember Me")
+#: ContentGenerator/Login.pm:155
+msgid "_LOGIN_MESSAGE"
+msgstr "If you check %1 your login information will be remembered by the browser you are using, allowing you to visit WeBWorK pages without typing your user name and password (until your session expires). This feature is not safe for public workstations, untrusted machines, and machines over which you do not have direct control."
+
+#
+#. ($beginReducedScoringPeriod,$dueDate,$reducedScoringPerCent)
+#: ContentGenerator/ProblemSet.pm:333
+msgid "_REDUCED_CREDIT_MESSAGE_1"
+msgstr "tr: This assignment has a Reduced Credit Period that begins [_1] and ends on the due date, [_2].  During this period all additional work done counts [_3]% of the original."
+
+#
+#. ($beginReducedScoringPeriod,$dueDate,$reducedScoringPerCent)
+#: ContentGenerator/ProblemSet.pm:335
+msgid "_REDUCED_CREDIT_MESSAGE_2"
+msgstr "tr: This assignment had a Reduced Credit Period that began [_1] and ended on the due date, [_2].  During that period all additional work done counted [_3]% of the original."
+
+#
+#: ContentGenerator.pm:1951
+msgid "_REQUEST_ERROR"
+msgstr "WeBWorK has encountered a software error while attempting to process this problem. It is likely that there is an error in the problem itself. If you are a student, report this error message to your professor to have it corrected. If you are a professor, please consult the error output below for more information."
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1358
+msgid "a duplicate of the first selected set"
+msgstr "tr: a duplicate of the first selected set"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1357
+msgid "a new empty set"
+msgstr "tr: a new empty set"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1479
+msgid "a single set"
+msgstr "tr: a single set"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1091
+#: ContentGenerator/Instructor/ProblemSetList.pm:1193
+#: ContentGenerator/Instructor/ProblemSetList.pm:1610
+#: ContentGenerator/Instructor/ProblemSetList.pm:689
+#: ContentGenerator/Instructor/ProblemSetList.pm:929
+#: ContentGenerator/Instructor/ProblemSetList.pm:989
+msgid "all sets"
+msgstr "tr: all sets"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1551
+#: ContentGenerator/Instructor/UserList.pm:1026
+#: ContentGenerator/Instructor/UserList.pm:1298
+#: ContentGenerator/Instructor/UserList.pm:651
+#: ContentGenerator/Instructor/UserList.pm:967
+msgid "all users"
+msgstr "tr: all users"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1196
+#: ContentGenerator/Instructor/UserList.pm:1226
+msgid "any users"
+msgstr "tr: any users"
+
+#
+#: ContentGenerator/Problem.pm:1165
+msgid "attempt"
+msgstr "�试"
+
+#
+#: ContentGenerator/Problem.pm:1162
+#: ContentGenerator/Problem.pm:1165
+msgid "attempts"
+msgstr "�试"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1726
+msgid "changes abandoned"
+msgstr "tr: changes abandoned"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1790
+msgid "changes saved"
+msgstr "tr: changes saved"
+
+#
+#: ContentGenerator/ProblemSets.pm:468
+msgid "closed, answers available"
+msgstr "已关闭, cevaplar a莽谋kland谋"
+
+#
+#. ($self->formatDateTime($set->answer_date)
+#: ContentGenerator/ProblemSets.pm:464
+#, fuzzy
+msgid "closed, answers on %1"
+msgstr "kapalè°‹, cevaplar [_1] tarihinde"
+
+#
+#: ContentGenerator/ProblemSets.pm:466
+msgid "closed, answers recently available"
+msgstr "已关闭, 近期"
+
+#
+#: ContentGenerator/ProblemSets.pm:402
+#, fuzzy
+msgid "completed."
+msgstr "tr: completely"
+
+#
+#: ContentGenerator/Problem.pm:267
+msgid "completely"
+msgstr "tr: completely"
+
+#
+#: ContentGenerator/Problem.pm:264
+msgid "correct"
+msgstr "正确"
+
+#
+#. ($num)
+#: ContentGenerator/Instructor/ProblemSetList.pm:1310
+#, fuzzy
+msgid "deleted %1 sets"
+msgstr "tr: deleted [_1] sets"
+
+#
+#. ($num)
+#: ContentGenerator/Instructor/UserList.pm:1135
+#, fuzzy
+msgid "deleted %1 users"
+msgstr "tr: deleted [_1] users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:947
+msgid "editing all sets"
+msgstr "tr: editing all sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:985
+msgid "editing all users"
+msgstr "tr: editing all users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:953
+msgid "editing selected sets"
+msgstr "tr: editing selected sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:991
+msgid "editing selected users"
+msgstr "tr: editing selected users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:950
+msgid "editing visible sets"
+msgstr "tr: editing visible sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:988
+msgid "editing visible users"
+msgstr "tr: editing visible users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:694
+msgid "enter matching set IDs below"
+msgstr "tr: enter matching set IDs below"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1665
+msgid "export abandoned"
+msgstr "tr: export abandoned"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1629
+msgid "exporting all sets"
+msgstr "tr: exporting all sets"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1636
+msgid "exporting selected sets"
+msgstr "tr: exporting selected sets"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1633
+msgid "exporting visible sets"
+msgstr "tr: exporting visible sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1044
+msgid "giving new passwords to all users"
+msgstr "tr: giving new passwords to all users"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1050
+msgid "giving new passwords to selected users"
+msgstr "tr: giving new passwords to selected users"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1047
+msgid "giving new passwords to visible users"
+msgstr "tr: giving new passwords to visible users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2522
+#: ContentGenerator/Problem.pm:603
+#, fuzzy
+msgid "hidden"
+msgstr "tr: Hidden"
+
+#
+#: ContentGenerator/Problem.pm:604
+#: ContentGenerator/ProblemSet.pm:86
+msgid "hidden from students"
+msgstr "tr: hidden from students"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:693
+msgid "hidden sets"
+msgstr "tr: hidden sets"
+
+#
+#: ContentGenerator/Problem.pm:266
+msgid "incorrect"
+msgstr "错误"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1480
+msgid "multiple sets"
+msgstr "tr: multiple sets"
+
+#
+#: ContentGenerator/Problem.pm:864
+msgid "navNext"
+msgstr "tr:&nbsp;Next"
+
+#
+#: ContentGenerator/Problem.pm:866
+msgid "navNextGrey"
+msgstr "tr:&nbsp;Next"
+
+#
+#: ContentGenerator/Problem.pm:850
+msgid "navPrev"
+msgstr "tr:&nbsp;Prev"
+
+#
+#: ContentGenerator/Problem.pm:852
+msgid "navPrevGrey"
+msgstr "tr:&nbsp;Prev"
+
+#
+#: ContentGenerator/Problem.pm:856
+msgid "navProbList"
+msgstr "tr:&nbsp;Up"
+
+#
+#: ContentGenerator/Problem.pm:858
+msgid "navProbListGrey"
+msgstr "tr:&nbsp;Up"
+
+#
+#: ContentGenerator/ProblemSet.pm:110
+msgid "navUp"
+msgstr "tr:&nbsp;Up"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1090
+#: ContentGenerator/Instructor/ProblemSetList.pm:1192
+#: ContentGenerator/Instructor/ProblemSetList.pm:1269
+#: ContentGenerator/Instructor/ProblemSetList.pm:690
+#: ContentGenerator/Instructor/ProblemSetList.pm:988
+msgid "no sets"
+msgstr "tr: no sets"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1552
+#: ContentGenerator/Instructor/UserList.pm:1088
+#: ContentGenerator/Instructor/UserList.pm:1199
+#: ContentGenerator/Instructor/UserList.pm:1227
+#: ContentGenerator/Instructor/UserList.pm:652
+msgid "no users"
+msgstr "tr: no users"
+
+#
+#: ContentGenerator/ProblemSets.pm:430
+#: ContentGenerator/ProblemSets.pm:452
+msgid "now open, due "
+msgstr "现在开放, 截止 "
+
+#
+#. ($self->formatDateTime($set->due_date()
+#: ContentGenerator/ProblemSets.pm:408
+#, fuzzy
+msgid "open: complete by %1"
+msgstr "a莽谋k: [_1] tarihine kadar tamamlay谋n"
+
+#
+#: ContentGenerator/ProblemSets.pm:405
+msgid "over time: closed."
+msgstr "超时: 已关闭."
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1093
+#: ContentGenerator/Instructor/ProblemSetList.pm:1194
+#: ContentGenerator/Instructor/ProblemSetList.pm:1271
+#: ContentGenerator/Instructor/ProblemSetList.pm:1612
+#: ContentGenerator/Instructor/ProblemSetList.pm:691
+#: ContentGenerator/Instructor/ProblemSetList.pm:931
+#: ContentGenerator/Instructor/ProblemSetList.pm:991
+msgid "selected sets"
+msgstr "tr: selected sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1028
+#: ContentGenerator/Instructor/UserList.pm:1090
+#: ContentGenerator/Instructor/UserList.pm:1198
+#: ContentGenerator/Instructor/UserList.pm:1300
+#: ContentGenerator/Instructor/UserList.pm:653
+#: ContentGenerator/Instructor/UserList.pm:969
+msgid "selected users"
+msgstr "tr: selected users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:762
+msgid "showing all sets"
+msgstr "tr: showing all sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:738
+msgid "showing all users"
+msgstr "tr: showing all users"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:747
+msgid "showing matching users"
+msgstr "tr: showing matching users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:765
+msgid "showing no sets"
+msgstr "tr: showing no sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:741
+msgid "showing no users"
+msgstr "tr: showing no users"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:768
+msgid "showing selected sets"
+msgstr "tr: showing selected sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:744
+msgid "showing selected users"
+msgstr "tr: showing selected users"
+
+#
+#: ContentGenerator/Problem.pm:1124
+#, fuzzy
+msgid "submitAnswers"
+msgstr "�交答案"
+
+#
+#: ContentGenerator/Problem.pm:1154
+msgid "time"
+msgstr "次"
+
+#
+#: ContentGenerator/Problem.pm:1154
+msgid "times"
+msgstr "次"
+
+#
+#: ContentGenerator/Problem.pm:1161
+#: ContentGenerator/ProblemSet.pm:427
+msgid "unlimited"
+msgstr "无�"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:654
+msgid "users who match on selected field"
+msgstr "tr: users who match on selected field"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:2522
+#: ContentGenerator/Problem.pm:603
+#, fuzzy
+msgid "visible"
+msgstr "tr: Visible"
+
+#
+#: ContentGenerator/Instructor/ProblemSetList.pm:1611
+#: ContentGenerator/Instructor/ProblemSetList.pm:692
+#: ContentGenerator/Instructor/ProblemSetList.pm:930
+msgid "visible sets"
+msgstr "tr: visible sets"
+
+#
+#: ContentGenerator/Problem.pm:604
+#: ContentGenerator/ProblemSet.pm:86
+#, fuzzy
+msgid "visible to students"
+msgstr "tr: visible sets"
+
+#
+#: ContentGenerator/Instructor/UserList.pm:1027
+#: ContentGenerator/Instructor/UserList.pm:1197
+#: ContentGenerator/Instructor/UserList.pm:1299
+#: ContentGenerator/Instructor/UserList.pm:968
+msgid "visible users"
+msgstr "tr: visible users"
+
+#
+#. ($self->formatDateTime($set->open_date)
+#: ContentGenerator/ProblemSets.pm:420
+#: ContentGenerator/ProblemSets.pm:448
+#, fuzzy
+msgid "will open on %1"
+msgstr "将在[_1]时开放 "
+
+#
+msgid "Add to which set?"
+msgstr "tr: Add to which set?"
+
+#
+msgid "Course Information for course [_1]"
+msgstr "tr: Course Information for course [_1]"
+
+#
+msgid "report bugs in this problem"
+msgstr "tr: report bugs in this problem"
+
+#
+msgid "Problem [_1]"
+msgstr "Soru [_1]"
+
+#
+msgid "Cancel Password"
+msgstr "tr: Cancel Password"
+
+#
+msgid "WeBWorK"
+msgstr "WeBWorK"
+
+#
+msgid "Audit"
+msgstr "tr: Enrolled"
+
+#
+msgid "Hardcopy Header for set [_1]"
+msgstr "tr: Hardcopy Header for set [_1]"
+
+#
+msgid "Report bugs in a WeBWorK question/problem using this link. The very first time you do this you will need to register with an email address so that information on the bug fix can be reported back to you."
+msgstr "tr: Report bugs in a WeBWorK question/problem using this link. The very first time you do this you will need to register with an email address so that information on the bug fix can be reported back to you."
+
+#
+msgid "Pad Fields"
+msgstr "Remplir les champs"
+
+#
+msgid "Set Header for set [_1]"
+msgstr "tr: Set Header for set [_1]"
+
+#
+#, fuzzy
+msgid "Statistics for [_1]"
+msgstr "统计数�"
+
+#
+msgid "Filter"
+msgstr "tr: Filter"
+
+#
+msgid "set [_1]/problem [_2]"
+msgstr "tr: set [_1]/problem [_2]"
+
+#
+msgid "You are not authorized to modify problems."
+msgstr "tr: You are not authorized to modify problems."
+
+#
+msgid "hardcopy header file"
+msgstr "tr: hardcopy header file"
+
+#
+msgid "Write permissions have not been enabled in the templates directory.  No changes can be made."
+msgstr "tr: Write permissions have not been enabled in the templates directory.  No changes can be made."
+
+#
+msgid "Save [_1] and View"
+msgstr "tr: Save [_1] and View"
+
+#
+msgid "Create"
+msgstr "tr: Create"
+
+#
+msgid "Changes in this file have not yet been permanently saved."
+msgstr "tr: Changes in this file have not yet been permanently saved."
+
+#
+msgid "Instructor Tools"
+msgstr "授课人工具"
+
+#
+msgid "Score"
+msgstr "�绩"
+
+#
+msgid "Show in another window"
+msgstr "tr: Show in another window"
+
+#
+msgid "Copied auxiliary files from [_1] to  new location at [_2]"
+msgstr "tr: Copied auxiliary files from [_1] to  new location at [_2]"
+
+#
+msgid "Unpublished"
+msgstr "Yayè°‹nlanmadè°‹"
+
+#
+#, fuzzy
+msgid "Login"
+msgstr "tr: Login Name"
+
+#
+msgid "Email"
+msgstr "电�邮件"
+
+#
+msgid "File Manager"
+msgstr "文件管�"
+
+#
+msgid "Unable to change the hardcopy header for set [_1]. Unknown error."
+msgstr "tr: Unable to change the hardcopy header for set [_1]. Unknown error."
+
+#
+msgid "Unable to make '[_1]' the set header for [_2]"
+msgstr "tr: Unable to make '[_1]' the set header for [_2]"
+
+#
+msgid "Can't determine user of temporary edit file [_1]."
+msgstr "tr: Can't determine user of temporary edit file [_1]."
+
+#
+msgid "Download a hardcopy of this homework set."
+msgstr "Bu soru grubunu basè°‹lè°‹ halde indirin."
+
+#
+msgid "Problem Editor"
+msgstr "题目编辑"
+
+#
+msgid "The file '[_1]' is protected!"
+msgstr "tr: The file '[_1]' is protected!"
+
+#
+msgid "Top level of author information on the wiki."
+msgstr "tr: Top level of author information on the wiki."
+
+#
+msgid "Score selected set(s) and save to:"
+msgstr "Sauvegarder les résultats sélectionnés sous"
+
+#
+msgid "Save Password"
+msgstr "tr: Save Password"
+
+#
+msgid "The file '[_1]' is a blank problem!"
+msgstr "tr: The file '[_1]' is a blank problem!"
+
+#
+msgid "Add as what filetype?"
+msgstr "tr: Add as what filetype?"
+
+#
+msgid "no action"
+msgstr "tr: no action"
+
+#
+msgid "Added '[_1]' to [_2] as new set header"
+msgstr "tr: Added '[_1]' to [_2] as new set header"
+
+#
+msgid "View statistics by set"
+msgstr "tr: View statistics by set"
+
+#
+msgid "Set"
+msgstr "Soru Grubu"
+
+#
+msgid "This is a blank problem template file and can not be edited directly. Use the 'Save as' action below to create a local copy of the file and add it to the current problem set."
+msgstr "tr: This is a blank problem template file and can not be edited directly. Use the 'Save as' action below to create a local copy of the file and add it to the current problem set."
+
+#
+msgid "Logout"
+msgstr "登出"
+
+#
+msgid "You do not have permission to view the details of this error."
+msgstr "Bu hatanè°‹n detaylarè°‹nè°‹ gæžšrmeye yetkiniz yok."
+
+#
+msgid "Reverting to original file '[_1]'"
+msgstr "tr: Reverting to original file '[_1]'"
+
+#
+msgid "Delete"
+msgstr "tr: Delete"
+
+#
+msgid "Wiki summary page for MathObjects"
+msgstr "tr: Wiki summary page for MathObjects"
+
+#
+msgid "Your score was recorded."
+msgstr "Notunuz kaydedildi."
+
+#
+msgid "You must specify an file name in order to save a new file."
+msgstr "tr: You must specify an file name in order to save a new file."
+
+#
+msgid "To edit this text you must first make a copy of this file using the 'Save as' action below."
+msgstr "tr: To edit this text you must first make a copy of this file using the 'Save as' action below."
+
+#
+msgid "unassigned problem file"
+msgstr "tr: unassigned problem file"
+
+#
+msgid "View statistics by student"
+msgstr "tr: View statistics by student"
+
+#
+msgid "Publish"
+msgstr "tr: Publish"
+
+#
+msgid "Password/Email"
+msgstr "密�/电�邮件"
+
+#
+msgid "Cancel Edit"
+msgstr "tr: Cancel Edit"
+
+#
+msgid "Math Objects"
+msgstr "tr: Math Objects"
+
+#
+msgid "Snippets of PG code illustrating specific techniques"
+msgstr "tr: Snippets of PG code illustrating specific techniques"
+
+#
+msgid "Error copying [_1] to [_2]"
+msgstr "tr: Error copying [_1] to [_2]"
+
+#
+msgid "Hmwk Sets Editor"
+msgstr "作业编辑"
+
+#
+msgid "This set is [_1] students."
+msgstr "Bu soru grubu 枚臒renciler taraf谋ndan [_1]."
+
+#
+msgid "header file"
+msgstr "tr: header file"
+
+#
+msgid "Include Index"
+msgstr "Inclure l'index"
+
+#
+msgid "Display Mode"
+msgstr "tr: Display Mode"
+
+#
+msgid "You can earn partial credit on this problem."
+msgstr "这一题你�以得到部分�绩"
+
+#
+msgid "Write permissions have not been enabled in '[_1]'.  Changes must be saved to a different directory for viewing."
+msgstr "tr: Write permissions have not been enabled in '[_1]'.  Changes must be saved to a different directory for viewing."
+
+#
+msgid "blank problem"
+msgstr "tr: blank problem"
+
+#
+msgid "Save Edit"
+msgstr "tr: Save Edit"
+
+#
+msgid "Enrolled"
+msgstr "tr: Enrolled"
+
+#
+msgid "Write permissions have not been enabled for '[_1]'.  Changes must be saved to another file for viewing."
+msgstr "tr: Write permissions have not been enabled for '[_1]'.  Changes must be saved to another file for viewing."
+
+#
+msgid "Note: this problem viewer is for viewing purposes only. As of right now, testing functionality is not possible."
+msgstr "tr: Note: this problem viewer is for viewing purposes only. As of right now, testing functionality is not possible."
+
+#
+msgid "Save Export"
+msgstr "tr: Save Export"
+
+#
+msgid "webwork"
+msgstr "webwork"
+
+#
+msgid "Problem Viewer"
+msgstr "tr: Problem Viewer"
+
+#
+msgid "submit button clicked"
+msgstr "g枚nder d眉臒mesine bas谋ld谋"
+
+#
+#, fuzzy
+msgid "Student Progress for [_1]"
+msgstr "Progrès des étudiants"
+
+#
+msgid "A new file has been created at '[_1]' with the contents below. No changes have been made to set [_2]."
+msgstr "tr: A new file has been created at '[_1]' with the contents below. No changes have been made to set [_2]."
+
+#
+msgid "Your score was not recorded because this problem has not been assigned to you."
+msgstr "Notunuz kaydedilmedi 莽眉nk眉 bu soru size y枚neltilmedi."
+
+#
+msgid "Sort"
+msgstr "tr: Sort"
+
+#
+msgid "Add problem"
+msgstr "tr: Add problem"
+
+#
+msgid "Author Info"
+msgstr "tr: Author Info"
+
+#
+msgid "Replace [_1]"
+msgstr "tr: Replace [_1]"
+
+#
+msgid "Help"
+msgstr "Aide"
+
+#
+msgid "Add Users"
+msgstr "添加用户"
+
+#
+msgid "Problem Source Code"
+msgstr "tr: Problem Source Code"
+
+#
+msgid "Test snippets of PG code in interactive lab.  Good way to learn PG language."
+msgstr "tr: Test snippets of PG code in interactive lab.  Good way to learn PG language."
+
+#
+#, fuzzy
+msgid "Page generated at [_1] at [_2]"
+msgstr "tr: Page generated at [_1]"
+
+#
+msgid "Import"
+msgstr "tr: Import"
+
+#
+msgid "View Using Seed Number"
+msgstr "tr: View Using Seed Number"
+
+#
+msgid "Grades"
+msgstr "�绩"
+
+#
+msgid "Published"
+msgstr "Yayè°‹nlandè°‹"
+
+#
+msgid "Your score was not recorded because this homework set is closed."
+msgstr "Notunuz kaydedilemedi 莽眉nk眉 bu soru grubu kapal谋."
+
+#
+msgid "The text box now contains the source of the original problem. You can recover lost edits by using the Back button on your browser."
+msgstr "tr: The text box now contains the source of the original problem. You can recover lost edits by using the Back button on your browser."
+
+#
+msgid "The file '[_1]' is a directory!"
+msgstr "tr: The file '[_1]' is a directory!"
+
+#
+msgid "Save As"
+msgstr "tr: Save As [TMPL]/"
+
+#
+msgid "Documentation from source code for PG modules and macro files. Often the most up-to-date information."
+msgstr "tr: Documentation from source code for PG modules and macro files. Often the most up-to-date information."
+
+#
+msgid "Problem Techniques"
+msgstr "tr: Problem Techniques"
+
+#
+msgid "Course Configuration"
+msgstr "课程结构"
+
+#
+msgid "Feedback"
+msgstr "�馈信�"
+
+#
+msgid "Export"
+msgstr "tr: Export"
+
+#
+msgid "PG mark down syntax used to format WeBWorK questions. This interactive lab can help you to learn the techniques."
+msgstr "tr: PG mark down syntax used to format WeBWorK questions. This interactive lab can help you to learn the techniques."
+
+#
+msgid "Record Scores for Single Sets"
+msgstr "Ajouter les résultats de chaque devoir"
+
+#
+msgid "Append to end of set [_1]"
+msgstr "tr: Append to end of set [_1]"
+
+#
+msgid "Unrecognized saveMode: |[_1]|. Unknown error."
+msgstr "tr: Unrecognized saveMode: |[_1]|. Unknown error."
+
+#
+msgid "Your score was not recorded because there was a failure in storing the problem record to the database."
+msgstr "Notunuz kaydedilemedi, 莽眉nk眉 notun veritaban谋na kayd谋 s谋ras谋nda bir hata olu艧tu."
+
+#
+msgid "The hardcopy header for set [_1] has been renamed to '[_2]'."
+msgstr "tr: The hardcopy header for set [_1] has been renamed to '[_2]'."
+
+#
+msgid "Save as"
+msgstr "tr: Save as"
+
+#
+msgid "Select action below"
+msgstr "tr: Select action below"
+
+#
+msgid "The file '[_1]' cannot be found."
+msgstr "tr: The file '[_1]' cannot be found."
+
+#
+msgid "Unable to write to '[_1]': [_2]"
+msgstr "tr: Unable to write to '[_1]': [_2]"
+
+#
+msgid "Save"
+msgstr "tr: Save"
+
+#
+msgid "File '[_1]' exists. File not saved. No changes have been made. You can change the file path for this problem manually from the 'Hmwk Sets Editor' page"
+msgstr "tr: File '[_1]' exists. File not saved. No changes have been made. You can change the file path for this problem manually from the 'Hmwk Sets Editor' page"
+
+#
+msgid "The set header for set [_1] has been renamed to '[_2]'."
+msgstr "tr: The set header for set [_1] has been renamed to '[_2]'."
+
+#
+msgid "Error: This path is already in the temporary edit directory -- no new temporary file is created. path = [_1]"
+msgstr "tr: Error: This path is already in the temporary edit directory -- no new temporary file is created. path = [_1]"
+
+#
+msgid "Please use radio buttons to choose the method for saving this file. Can't recognize saveMode: |[_1]|."
+msgstr "tr: Please use radio buttons to choose the method for saving this file. Can't recognize saveMode: |[_1]|."
+
+#
+msgid "Saved to file '[_1]'"
+msgstr "tr: Saved to file '[_1]'"
+
+#
+msgid "Please specify a file to save to."
+msgstr "tr: Please specify a file to save to."
+
+#
+msgid "The selected problem ([_1]) is not a valid problem for set [_2]."
+msgstr "Se莽ilen problem ([_1]), [_2] soru drubu i莽in ge莽erli bir soru de臒il."
+
+#
+msgid "Editing [_1] in file '[_2]'"
+msgstr "tr: Editing [_1] in file '[_2]'"
+
+#
+msgid "Deleting temp file at [_1]"
+msgstr "tr: Deleting temp file at [_1]"
+
+#
+msgid "hidden from"
+msgstr "g枚r眉nt眉lenmiyor"
+
+#
+#, fuzzy
+msgid "View student progress by set"
+msgstr "Progrès des étudiants"
+
+#
+msgid "View"
+msgstr "tr: View"
+
+#
+msgid "Resources"
+msgstr "tr: Resources"
+
+#
+msgid "Scoring Download"
+msgstr "�绩下载"
+
+#
+msgid "Duplicate"
+msgstr "tr: Duplicate"
+
+#
+msgid "This path |[_1]| is not the path to a temporary edit file."
+msgstr "tr: This path |[_1]| is not the path to a temporary edit file."
+
+#
+msgid "visible to"
+msgstr "g枚r眉nt眉leniyor"
+
+#
+msgid "Unable to change the source file path for set [_1], problem [_2]. Unknown error."
+msgstr "tr: Unable to change the source file path for set [_1], problem [_2]. Unknown error."
+
+#
+msgid "Course Administration"
+msgstr "课程管�"
+
+#
+msgid "Added [_1] to [_2] as problem [_3]"
+msgstr "tr: Added [_1] to [_2] as problem [_3]"
+
+#
+msgid "Options Information"
+msgstr "tr: Options Information"
+
+#
+msgid "Proctor"
+msgstr "tr: Proctor"
+
+#
+msgid "Student Progress"
+msgstr "Progrès des étudiants"
+
+#
+msgid "Revert"
+msgstr "tr: Revert"
+
+#
+msgid "Statistics"
+msgstr "统计数�"
+
+#
+msgid "Save as new independent problem"
+msgstr "tr: Save as new independent problem"
+
+#
+msgid "Scoring Tools"
+msgstr "�绩编辑工具"
+
+#
+msgid "The source file for 'set [_1] / problem [_2]' has been changed from [_3] to '[_4]'."
+msgstr "tr: The source file for 'set [_1] / problem [_2]' has been changed from [_3] to '[_4]'."
+
+#
+msgid "Cancel Export"
+msgstr "tr: Cancel Export"
+
+#
+msgid "View student progress by student"
+msgstr "tr: View student progress by student"
+
+#
+msgid "Revert to [_1]"
+msgstr "tr: Revert to [_1]"
+
+#
+msgid "Classlist Editor"
+msgstr "课程��编辑"
+
+#
+msgid "Add"
+msgstr "tr: Add"
+
+#
+msgid "the original path to the file is [_1]"
+msgstr "tr: the original path to the file is [_1]"
+
+#
+msgid "The path to the original file should be absolute"
+msgstr "tr: The path to the original file should be absolute"
+
+#
+msgid "To edit this text you must use the 'Save AS' action below to save it to another file."
+msgstr "tr: To edit this text you must use the 'Save AS' action below to save it to another file."
+
+#
+msgid "Error: The original file [_1] cannot be read."
+msgstr "tr: Error: The original file [_1] cannot be read."
+
+#
+msgid "Unable to change the set header for set [_1]. Unknown error."
+msgstr "tr: Unable to change the set header for set [_1]. Unknown error."
+
+#
+msgid "options information"
+msgstr "tr: options information"
+
+#
+msgid "The selected problem([_1]) is not a valid problem for set [_2]."
+msgstr "Le problème choisi([_1]) n'est pas valide pour le devoir [_2]."
+
+#
+msgid "Unknown file type"
+msgstr "tr: Unknown file type"
+
+#
+msgid "course information"
+msgstr "tr: course information"
+
+#
+msgid "Change User Options"
+msgstr "Kullan谋c谋 bilgilerini g眉ncelle"
+
+#
+msgid "Drop"
+msgstr "tr: Drop"
+
+msgid " (modified)"
+msgstr " (已�修改过)"
+
diff --git a/lib/WeBWorK/NPL.pm b/lib/WeBWorK/NPL.pm
new file mode 100644
index 0000000000..3447388149
--- /dev/null
+++ b/lib/WeBWorK/NPL.pm
@@ -0,0 +1,625 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/NPL.pm,v 1.1 2007/10/17 16:56:16 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+# 
+# Contributed by W.H. Freeman; Bedford, Freeman, and Worth Publishing Group.
+################################################################################
+
+package WeBWorK::NPL;
+use base 'Exporter';
+
+=head1 NAME
+
+WeBWorK::NPL - Parse formats used by the National Problem Library.
+
+=head1 SYNOPSIS
+
+	use WeBWorK::NPL qw/read_textbooks read_tags format_tags gen_find_tags/;
+	
+	open TEXTS, "<", "Textbooks";
+	my $textbooks = [];
+	read_textbooks(\*TEXTS, $textbooks);
+	
+	open PGFILE, "<", "file.pg";
+	my $tags = {};
+	read_tags(\*PGFILE, $tags);
+	
+	foreach my $string (format_tags($tags)) {
+		$string =~ s/^/## /gm;
+		print "TAG: $string\n";
+	}
+	
+	use File::Find;
+	my $process = sub { print "Found: $_[0]\n" };
+	my $wanted = gen_find_tags({author=>'Rogawski'}, $process);
+	find({wanted=>$wanted}, @ARGV);
+
+=head1 DESCRIPTION
+
+This package contains parsing routines for the various data formats associated
+with the National Problem Library.
+
+=cut
+
+use strict;
+use warnings;
+use Data::Dumper;
+
+our @EXPORT_OK = qw(
+	read_textbooks
+	read_tags
+	format_tags
+	gen_find_tags
+);
+
+our @global_fields = qw(DESCRIPTION KEYWORDS DBsubject DBchapter DBsection Date
+Institution Author UsesAuxiliaryFiles);
+our @textbook_fields = qw(title edition author chapter section problem);
+
+our %tag2field = ( TitleText => "title", EditionText => "edition",
+AuthorText => "author", Section => "section", Problem => "problem", );
+our %field2tag = reverse %tag2field;
+
+=head1 FUNCTIONS
+
+=head2 read_textbooks
+
+	read_textbooks($fh, $arrayref)
+
+Reads a Textbooks file opened for reading on $fh and appends its contents to
+$arrayref. Each item appended to $arrayref is a reference to a hash containing
+the following keys:
+
+	_title      The title of the textbook
+	_edition    The edition of the textbook
+	_author     The author of the textbook
+	1           The name of chapter 1
+	1.1         The name of section 1.1
+	1.2         The name of section 1.2
+	...
+	2           The name of chapter 2
+	2.1         The name of section 2.1
+	...
+
+Since the number of sections in a textbook is typically small, it is not terribly
+inefficient to pull chapters or sections out:
+
+	@chapters = grep { /^\d+$/ } keys %textbook;
+	@sections = grep { /^\d+\.\d+$/ } keys %textbook;
+
+=cut
+
+sub read_textbooks {
+	my ($fh, $result) = @_;
+	
+	my %curr_textbook;
+	
+	while (<$fh>) {
+		s/#.*$//g;
+		next unless /\S/;
+		s/^\s*//;
+		s/\s*$//;
+		
+		if (/^(TitleText|EditionText|AuthorText)\(\s*'(.*?)'\s*\)/) {
+			my $field = $tag2field{$1};
+			my $value = $2;
+			if (exists $curr_textbook{"_$field"}) {
+				# repeated tag -- this is a new textbook
+				push @$result, {%curr_textbook};
+				%curr_textbook = ();
+			}
+			$curr_textbook{"_$field"} = $value;
+		} elsif (/^(\d+)(?:\.(\d+))?\s*>>>\s*(.*)$/) {
+			my $chapter = $1;
+			my $section = $2;
+			my $name = $3;
+			if (defined $section and length $section > 0) {
+				$curr_textbook{"$chapter.$section"} = $name;
+			} else {
+				$curr_textbook{$chapter} = $name;
+			}
+		}
+	}
+	push @$result, {%curr_textbook};
+}
+
+=head2 read_tags
+
+	read_tags($fh, $hashref, $extra_editing_info);
+
+Reads the NPL tags from a PG file opened for reading on $fh and stores the tags
+in %$hashref. The following keys may be added to %$hashref:
+
+	DESCRIPTION
+	KEYWORDS
+	DBsubject
+	DBchapter
+	DBsection
+	Date
+	Institution
+	Author
+	UsesAuxiliaryFiles      (experimental, subject to change)
+	textbooks               (arrayref)
+
+The value for the C<textbooks> key will be a reference to an array of textbook
+hashes containing the textbook tags from the source file. In each textbook hash,
+entries with empty values (e.g. C<TitleText1('')>) will be omitted. This is to
+deal with the large number of empty-valued tags in the NPL. The keys of each
+textbook hash will be among:
+
+	title
+	edition
+	author
+	chapter
+	section
+	problem        (arrayref)
+
+The value for the C<problem> key will be a reference to an array of problem
+numbers.
+
+If $extra_editing_info is true, special hash items _pos, _rest, and _maxtextbook
+will also be added to %$hashref.
+
+_pos will contain the position of the first byte of the next line after the last
+tag in the file. _rest will contain the bytes of the "rest" of the file, after
+all tags, starting at _pos. _maxtextbook will contain the highest number used to
+identify a textbook in the file. (e.g. If TitleText1 and TitleText3 appear in
+the  file, there will only be two items in the textbooks array, but _maxtextbook
+will be 3.)
+
+This is useful for appending tags to a file which contains existing tags, where
+the new tags should appear immediately after the existing tags:
+
+	open PGFILE, "+<", "file.pg";
+	my $tags = {};
+	read_tags(\*PGFILE, $tags, 1);
+	my $pos = $tags{_pos};
+	my $rest = $tags{_rest};
+	seek PGFILE, $pos, 0;
+	print PGFILE "## SomeNewTag('foo','bar')\n";
+	print PGFILE $rest;
+	close PGFILE;
+
+=cut
+
+sub read_tags {
+	my ($file, $result, $extra_editing_info) = @_;
+	
+	my $fh;
+	if (ref $file) {
+		$fh = $file;
+	} elsif (defined $file and not ref $file) {
+		$fh = new IO::File($file, 'r');
+	}
+	
+	my $pos;
+	my $rest = '';
+	my $maxtextbook;
+	while (<$fh>) {
+		#if (0) {
+		if (/^(.*?\#.*?)(\s*)DESCRIPTION/) {
+			my $prefix = $1;
+			my $whitespace = $2;
+			my $description = '';
+			while (<$fh>) {
+				if (/\#.*ENDDESCRIPTION/) {
+					chomp $description;
+					$result->{DESCRIPTION} = $description if length $description > 0;
+					last;
+				} else {
+					# handle prefix and whitespace separately so that we can still
+					# chop the prefix off even if people are being careless about
+					# whitespace. :P
+					s/^$prefix//;
+					s/^$whitespace//;
+					$description .= $_;
+				}
+			}
+			if ($extra_editing_info) {
+				$pos = tell $fh;
+				$rest = '';
+			}
+		} elsif (/\#.*KEYWORDS\((.*)\)/) {
+			my $keywords = $1;
+			push @{$result->{KEYWORDS}}, parse_keywords($keywords);
+			if ($extra_editing_info) {
+				$pos = tell $fh;
+				$rest = '';
+			}
+		} elsif (/\#.*(DBsubject|DBchapter|DBsection|Date|Institution|Author)\(\s*(.*?)\s*\)/) {
+			my $field = $1;
+			my $value = $2;
+			my ($parsed_value, $parse_errors) = parse_normal_value($field, $value);
+			if (@$parse_errors) {
+				warn "error while parsing value \"$value\" in field $field:\n"
+					. join('', @$parse_errors)
+					. "value may be incomplete. use with caution.\n"
+					. "(line $. of file $file)\n";
+			}
+			$result->{$field} = $parsed_value;
+			if ($extra_editing_info) {
+				$pos = tell $fh;
+				$rest = '';
+			}
+		} elsif (/\#.*(TitleText|EditionText|AuthorText|Section|Problem)(\d+)\(\s*'(.*?)'\s*\)/) {
+			my $field = $tag2field{$1};
+			my $num = $2;
+			my $value = $3;
+			next unless $value =~ /\S/;
+			$value = [ parse_problems($value) ] if $field eq "problem";
+			if ($field eq "section") {
+				my ($ch, $sec) = split /\./, $value;
+				$result->{textbooks}[$num]{chapter} = $ch;
+				$result->{textbooks}[$num]{section} = $sec if defined $sec and length $sec > 0;
+			} else {
+				$result->{textbooks}[$num]{$field} = $value;
+			}
+			if ($extra_editing_info) {
+				$pos = tell $fh;
+				$rest = '';
+				$maxtextbook = $num if not defined $maxtextbook or $num > $maxtextbook;
+			}
+		} elsif (/\#.*(UsesAuxiliaryFiles)\(\s*(.*?)\s*\)/) {
+			my $field = $1;
+			my $value = $2;
+			my ($parsed_value, $parse_errors) = parse_normal_list($field, $value);
+			if (@$parse_errors) {
+				warn "error while parsing list value \"$value\" in field $field:\n"
+					. join('', @$parse_errors)
+					. "value may be incomplete. use with caution.\n"
+					. "(line $. of file $file)\n";
+			}
+			$result->{$field} = $parsed_value;
+			if ($extra_editing_info) {
+				$pos = tell $fh;
+				$rest = '';
+			}
+		} else {
+			if ($extra_editing_info) {
+				$rest .= $_;
+			}
+		}
+	}
+	
+	# remove holes in textbook numbering
+	@{$result->{textbooks}} = grep { defined } @{$result->{textbooks}};
+	delete $result->{textbooks} unless @{$result->{textbooks}};
+	
+	if ($extra_editing_info) {
+		$result->{_pos} = $pos;
+		$result->{_rest} = $rest;
+		$result->{_maxtextbook} = $maxtextbook;
+	}
+}
+
+sub parse_normal_list {
+	my ($name, $string) = @_;
+	
+	use constant NRM=>0;
+	use constant STR=>1;
+	use constant ESC=>2;
+	use constant STP=>3;
+	my $state = NRM;
+	my @errors;
+	my @items;
+	my $curr_item = '';
+	my $next_item = 0;
+	foreach my $i (0 .. length($string)-1) {
+		my $c = substr($string,$i,1);
+		#print "i=$i c=$c state=$state curr_item=$curr_item next_item=$next_item\n";
+		# state changes
+		if ($state == NRM) {
+			if ($c eq "'") {
+				$state = STR;
+			} elsif ($c eq ',' or $c eq ' ') {
+				# do nothing -- closequote already consumed curr_item
+			} else {
+				push @errors, 
+					"illegal char '$c' in state NRM while parsing value for $name.\n"
+					. "    $string\n"
+					. '    ' . ' 'x$i . "^\n";
+				$next_item = 1;
+				$state = STP;
+			}
+		} elsif ($state == STR) {
+			if ($c eq "'") {
+				$state = NRM;
+				$next_item = 1;
+			} elsif ($c eq '\\') {
+				$state = ESC;
+			} else {
+				$curr_item .= $c;
+			}
+		} elsif ($state == ESC) {
+			$curr_item .= $c;
+			$state = STR;
+		} elsif ($state == STP) {
+			last;
+		} else {
+			die "unexpected state $state while parsing value for $name.\n";
+		}
+		#print "i=$i c=$c state=$state curr_item=$curr_item next_item=$next_item\n";
+		# actions
+		if ($next_item) {
+			push @items, $curr_item;
+			$curr_item = '';
+			$next_item = 0;
+			#print "stored item to list\n";
+		}
+	}
+	
+	return \@items, \@errors;
+}
+
+sub parse_normal_value {
+	my ($name, $string) = @_;
+	my ($items, $errors) = parse_normal_list($name, $string);
+	push @$errors, "only one item allowed in value for $name.\n" if @$items > 1;
+	return shift @$items, $errors;
+}
+
+# this now works for keywords is embedded spaces (which are later stripped out
+# by kwtidy) but now it doesn't work for values with double quotes or no quotes!
+sub parse_keywords {
+	my $string = shift;
+	my ($items, $errors) = parse_normal_list('KEYWORDS', $string);
+	if (@$errors) {
+		warn "errors while parsing KEYWORDS list:\n@$errors\n"
+			. "Partially-parsed KEYWORDS: @$items\n"
+			. "Resorting to old-style KEYWORDS parsing...\n";
+		@$items = split /(?:,|\s)+/, $string;
+		warn "Old-style parse result: ", join('|', @$items), "\n";
+	}
+	return map { kwtidy($_) } @$items;
+}
+
+sub kwtidy {
+	my $keyword = shift;
+	$keyword =~ s/\W//g;
+	$keyword =~ s/_//g;
+	return lc $keyword;
+}
+
+sub parse_problems {
+	my $string = shift;
+	$string =~ s/\D/ /g;
+	return grep { /\S/ } split /\s+/, $string;
+}
+
+=head2 format_tags
+
+	format_tags($tags, $mintextbook);
+
+Given a reference to a hash of tags, return a list of strings representing said
+tags. The strings do not begin with the standard NPL comment prefix ("## ") or
+end with newlines. These must be added by the caller if the strings are to be
+inserted into a PG source file.
+
+One complication is the DESCRIPTION field, which contains embedded newlines. If
+a DESCRIPTION tag occurs in %$tags, it will be formatted with embedded newlines
+but without a trailing newline. For example, after this code executes,
+
+	$tags = { DESCRIPTION => "line one\nline two\nline three" };
+	($desc) = format_tags($tags);
+
+$desc will contain the string:
+
+	"DESCRIPTION\nline one\nline two\nline three\nENDDESCRIPTION"
+
+To account for this when writing to a PG file, you could use:
+
+	foreach my $string (format_tags($tags)) {
+		$string =~ s/^/## /gm;
+		print PGFILE "$string\n";
+	}
+
+=cut
+
+sub format_tags {
+	my ($tags, $mintextbook) = @_;
+	$mintextbook ||= 1;
+	my @result;
+	my @ordered_fields = grep { exists $tags->{$_} } @global_fields, "textbooks";
+	foreach my $field (@ordered_fields) {
+		my $value = $tags->{$field};
+		if ($field eq "DESCRIPTION") {
+			push @result, format_description($value);
+		} elsif ($field eq "textbooks") {
+			push @result, format_textbooks($value, $mintextbook);
+		} else {
+			push @result, format_tag($field, $value);
+		}
+	}
+	return @result;
+}
+
+sub format_tag {
+	my ($field, $value, $n) = @_;
+	my $tag = $field2tag{$field} || $field;
+	
+	# problems are always listed in a single string in the tag.
+	if ($field eq "problem") {
+		$value = format_problems($value);
+	}
+	
+	# if we have an arrayref, we represent it as multiple strings in one tag.
+	if (ref $value) {
+		$value = join(',', map { "'$_'" } @$value);
+	} elsif (defined $value) {
+		$value = "'$value'";
+	} else {
+		warn "value is not defined for field $field!\n";
+		$value = "''";
+	}
+	
+	if (defined $n) {
+		return "$tag$n($value)";
+	} else {
+		return "$tag($value)";
+	}
+}
+
+sub format_description {
+	my $value = shift;
+	return "DESCRIPTION\n$value\nENDDESCRIPTION";
+}
+
+sub format_textbooks {
+	my ($textbook, $n) = @_;
+	my @textbooks = @$textbook;
+	my @result;
+	foreach my $textbook (@textbooks) {
+		push @result, format_textbook($textbook, $n);
+		$n++;
+	}
+	return @result;
+}
+
+sub format_textbook {
+	my ($textbook, $n) = @_;
+	
+	# combine chapter/section into single section tag
+	my $chapter = $textbook->{chapter};
+	my $section = $textbook->{section};
+	if (defined $chapter or defined $section) {
+		$section = ".$section" if defined $section;
+		$section = "$chapter$section" if defined $chapter;
+		delete $textbook->{chapter};
+		$textbook->{section} = $section;
+	}
+	
+	my @result;
+	my @ordered_fields = grep { exists $textbook->{$_} } @textbook_fields;
+	foreach my $field (@ordered_fields) {
+		my $value = $textbook->{$field};
+		push @result, format_tag($field, $value, $n);
+	}
+	return @result;
+}
+
+sub format_problems {
+	my $first = shift;
+	my @problems;
+	if (ref $first) {
+		@problems = @$first;
+	} else {
+		@problems = ($first, @_);
+	}
+	
+	return join(',', @problems);
+}
+
+=head2 gen_find_tags
+
+	gen_find_tags($pattern, $action, $extra_editing_info);
+
+Generates an anonymous subroutine suitable for passing the the find() function
+of the File::Find module. The no_chdir=>1 option must be passed to find() for
+the generated subroutine to operate properly.
+
+$pattern is a reference to a hash describing the fields that must match. $action
+is a reference to a subroutine that will be called if all fields match. 
+$extra_editing_info is passed to read_tags().
+
+Legal fields for $pattern are as follows:
+
+B<Global fields:> DESCRIPTION, KEYWORDS, DBsubject, DBchapter, DBsection, Date,
+Institution, Author. (The experimental UsesAuxiliaryFiles field may be supported
+in the future.)
+
+B<Text-specific fields:> title, edition, author, chapter, section, problem.
+
+If multiple text-specific keys are given, then all must match for a single
+textbook.
+
+$action is called as follows:
+
+	$action->($path, $tags, $text_index)
+
+There $path the path to the matching file, $tags a reference to the tag hash for
+the matching file, and $text_index the index into the @{$tags->{textbooks}} array
+if $pattern included textbook-specific tags.
+
+=cut
+
+sub gen_find_tags {
+	my ($pattern, $action, $extra_editing_info) = @_;
+	return sub {
+		return unless /\.pg$/ and -f $File::Find::name;
+		
+		my $name = $File::Find::name;
+		#my $relpath = $name;
+		#$relpath =~ s/^$src\///;
+		
+		my %tags;
+		
+		open my $fh, "<", $name or do {
+			warn "skipping $name: $!\n";
+			return;
+		};
+		read_tags($fh, \%tags, $extra_editing_info);
+		close $fh;
+		
+		my (%global_pattern, %textbook_pattern);
+		foreach my $field (@global_fields) {
+			$global_pattern{$field} = $pattern->{$field} if exists $pattern->{$field};
+		}
+		foreach my $field (@textbook_fields) {
+			$textbook_pattern{$field} = $pattern->{$field} if exists $pattern->{$field};
+		}
+		
+		if (%global_pattern) {
+			return unless match_global(\%tags, \%global_pattern);
+		}
+		my $text_index;
+		if (%textbook_pattern) {
+			$text_index = match_textbook(\%tags, \%textbook_pattern);
+			return unless $text_index >= 0;
+		}
+		
+		$action->($name, \%tags, $text_index);
+	};
+}
+
+sub match_global {
+	my ($tags, $matches) = @_;
+	foreach my $field (keys %$matches) {
+		return 0 unless $tags->{$field} eq $matches->{$field};
+	}
+	return 1;
+}
+
+sub match_textbook {
+	my ($tags, $matches) = @_;
+	return -1 unless defined $tags->{textbooks};
+	my @textbooks = @{$tags->{textbooks}};
+	
+	#textbook: foreach my $textbook (@{$tags->{textbooks}}) {
+	textbook: foreach my $i (0 .. $#{$tags->{textbooks}}) {
+		my $textbook = $tags->{textbooks}[$i];
+		foreach my $field (keys %$matches) {
+			next if $field !~ /^(title|edition|author|chapter|section|problem)$/;
+			next textbook unless $textbook->{$field} eq $matches->{$field};
+		}
+		#warn "matched text i=$i: ", Dumper($textbook);
+		return $i;
+	}
+	return -1;
+}
+
+=back
+
+=cut
+
+1;
diff --git a/lib/WeBWorK/PG.pm b/lib/WeBWorK/PG.pm
index 7f11740079..88d77209f8 100644
--- a/lib/WeBWorK/PG.pm
+++ b/lib/WeBWorK/PG.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/PG.pm,v 1.76 2009/07/18 02:52:51 gage 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
@@ -27,6 +27,19 @@ use strict;
 use warnings;
 use WeBWorK::PG::ImageGenerator;
 use WeBWorK::Utils qw(runtime_use formatDateTime makeTempDirectory);
+use WeBWorK::Utils::RestrictedClosureClass;
+
+use constant DISPLAY_MODES => {
+	# display name   # mode name
+	tex           => "TeX",
+	plainText     => "HTML",
+	formattedText => "HTML_tth",
+	images        => "HTML_dpng",
+	jsMath	      => "HTML_jsMath",
+	MathJax	      => "HTML_MathJax",
+	asciimath     => "HTML_asciimath",
+	LaTeXMathML   => "HTML_LaTeXMathML",
+};
 
 sub new {
 	shift; # throw away invocant -- we don't need it
@@ -48,9 +61,10 @@ sub defineProblemEnvir {
 		$key,
 		$set,
 		$problem,
-		$psvn,
+		$psvn,  #FIXME  -- not used
 		$formFields,
 		$options,
+		$extras,
 	) = @_;
 	
 	my %envir;
@@ -62,37 +76,38 @@ sub defineProblemEnvir {
 	# any changes are noted by "ADDED:" or "REMOVED:"
 	
 	# Vital state information
-	# ADDED: displayHintsQ, displaySolutionsQ, refreshMath2img,
-	#        texDisposition
+	# ADDED: displayModeFailover, displayHintsQ, displaySolutionsQ,
+	#        refreshMath2img, texDisposition
 	
-	$envir{psvn}              = $set->psvn;
-	$envir{psvnNumber}        = $envir{psvn};
-	$envir{probNum}           = $problem->problem_id;
-	$envir{questionNumber}    = $envir{probNum};
-	$envir{fileName}          = $problem->source_file;	 
-	$envir{probFileName}      = $envir{fileName};		 
-	$envir{problemSeed}       = $problem->problem_seed;
-	$envir{displayMode}       = translateDisplayModeNames($options->{displayMode});
-	$envir{languageMode}      = $envir{displayMode};	 
-	$envir{outputMode}        = $envir{displayMode};	 
-	$envir{displayHintsQ}     = $options->{showHints};	 
-	$envir{displaySolutionsQ} = $options->{showSolutions};
-	$envir{texDisposition}    = "pdf"; # in webwork-modperl, we use pdflatex
+	$envir{psvn}                = $set->psvn;
+	$envir{psvnNumber}          = "psvnNumber-is-deprecated-Please-use-psvn-Instead"; #FIXME
+	$envir{probNum}             = $problem->problem_id;
+	$envir{questionNumber}      = $envir{probNum};
+	$envir{fileName}            = $problem->source_file;	 
+	$envir{probFileName}        = $envir{fileName};		 
+	$envir{problemSeed}         = $problem->problem_seed;
+	$envir{displayMode}         = translateDisplayModeNames($options->{displayMode});
+	$envir{languageMode}        = $envir{displayMode};	 
+	$envir{outputMode}          = $envir{displayMode};	 
+	$envir{displayHintsQ}       = $options->{showHints};	 
+	$envir{displaySolutionsQ}   = $options->{showSolutions};
+	$envir{texDisposition}      = "pdf"; # in webwork2, we use pdflatex
 	
 	# Problem Information
-	# ADDED: courseName, formatedDueDate
+	# ADDED: courseName, formatedDueDate, enable_reduced_scoring
 	
 	$envir{openDate}            = $set->open_date;
-	$envir{formattedOpenDate}   = formatDateTime($envir{openDate});
+	$envir{formattedOpenDate}   = formatDateTime($envir{openDate}, $ce->{siteDefaults}{timezone});
 	$envir{dueDate}             = $set->due_date;
-	$envir{formattedDueDate}    = formatDateTime($envir{dueDate});
+	$envir{formattedDueDate}    = formatDateTime($envir{dueDate}, $ce->{siteDefaults}{timezone});
 	$envir{formatedDueDate}     = $envir{formattedDueDate}; # typo in many header files
 	$envir{answerDate}          = $set->answer_date;
-	$envir{formattedAnswerDate} = formatDateTime($envir{answerDate});
+	$envir{formattedAnswerDate} = formatDateTime($envir{answerDate}, $ce->{siteDefaults}{timezone});
 	$envir{numOfAttempts}       = ($problem->num_correct || 0) + ($problem->num_incorrect || 0);
 	$envir{problemValue}        = $problem->value;
 	$envir{sessionKey}          = $key;
 	$envir{courseName}          = $ce->{courseName};
+	$envir{enable_reduced_scoring} = $set->enable_reduced_scoring;
 	
 	# Student Information
 	# ADDED: studentID
@@ -105,6 +120,9 @@ sub defineProblemEnvir {
 	$envir{studentLogin}     = $user->user_id;
 	$envir{studentName}      = $user->first_name . " " . $user->last_name;
 	$envir{studentID}        = $user->student_id;
+	$envir{permissionLevel}  = $options->{permissionLevel};  # permission level of actual user
+	$envir{effectivePermissionLevel}  = $options->{effectivePermissionLevel}; # permission level of user assigned to this question
+	
 	
 	# Answer Information
 	# REMOVED: refSubmittedAnswers
@@ -121,23 +139,38 @@ sub defineProblemEnvir {
 	$envir{externalGif2EpsPath}  = $ce->{externalPrograms}->{gif2eps};
 	$envir{externalPng2EpsPath}  = $ce->{externalPrograms}->{png2eps};
 	$envir{externalGif2PngPath}  = $ce->{externalPrograms}->{gif2png};
-	
+	$envir{externalCheckUrl}     = $ce->{externalPrograms}->{checkurl};
 	# Directories and URLs
 	# REMOVED: courseName
 	# ADDED: dvipngTempDir
+	# ADDED: jsMathURL
+	# ADDED: MathJaxURL
+	# ADDED: asciimathURL
+	# ADDED: macrosPath
+	# REMOVED: macrosDirectory, courseScriptsDirectory
+	# ADDED: LaTeXMathML
 	
 	$envir{cgiDirectory}           = undef;
 	$envir{cgiURL}                 = undef;
 	$envir{classDirectory}         = undef;
-	$envir{courseScriptsDirectory} = $ce->{pg}->{directories}->{macros}."/";
+    $envir{macrosPath}             = $ce->{pg}->{directories}{macrosPath};
+    $envir{appletPath}             = $ce->{pg}->{directories}{appletPath};
+    $envir{pgDirectories}          = $ce->{pg}->{directories};
+	$envir{webworkHtmlDirectory}   = $ce->{webworkDirs}->{htdocs}."/";
+	$envir{webworkHtmlURL}         = $ce->{webworkURLs}->{htdocs}."/";
 	$envir{htmlDirectory}          = $ce->{courseDirs}->{html}."/";
 	$envir{htmlURL}                = $ce->{courseURLs}->{html}."/";
-	$envir{macroDirectory}         = $ce->{courseDirs}->{macros}."/";
 	$envir{templateDirectory}      = $ce->{courseDirs}->{templates}."/";
 	$envir{tempDirectory}          = $ce->{courseDirs}->{html_temp}."/";
 	$envir{tempURL}                = $ce->{courseURLs}->{html_temp}."/";
 	$envir{scriptDirectory}        = undef;
 	$envir{webworkDocsURL}         = $ce->{webworkURLs}->{docs}."/";
+	$envir{localHelpURL}           = $ce->{webworkURLs}->{local_help}."/";
+	$envir{jsMathURL}              = $ce->{webworkURLs}->{jsMath};
+	$envir{MathJaxURL}             = $ce->{webworkURLs}->{MathJax};
+	$envir{asciimathURL}	         = $ce->{webworkURLs}->{asciimath};
+	$envir{LaTeXMathMLURL}	       = $ce->{webworkURLs}->{LaTeXMathML};
+	$envir{server_root_url}        = $ce->{apache_root_url}|| '';
 	
 	# Information for sending mail
 	
@@ -152,42 +185,50 @@ sub defineProblemEnvir {
 	
 	# ----------------------------------------------------------------------
 	
-	my $basename = "equation-$envir{psvn}.$envir{probNum}";
-	$basename .= ".$envir{problemSeed}" if $envir{problemSeed};
-		
-	# Object for generating equation images
-	$envir{imagegen} = WeBWorK::PG::ImageGenerator->new(
-		tempDir  => $ce->{webworkDirs}->{tmp}, # global temp dir
-		latex	 => $envir{externalLaTeXPath},
-		dvipng   => $envir{externalDvipngPath},
-		useCache => 1,
-		cacheDir => $ce->{webworkDirs}->{equationCache},
-		cacheURL => $ce->{webworkURLs}->{equationCache},
-		cacheDB  => $ce->{webworkFiles}->{equationCacheDB},
-	);
+	# ADDED: ImageGenerator for images mode
+	if (defined $extras->{image_generator}) {
+		#$envir{imagegen} = $extras->{image_generator};
+		# only allow access to the add() method
+		$envir{imagegen} = new WeBWorK::Utils::RestrictedClosureClass($extras->{image_generator}, 'add','addToTeXPreamble', 'refresh');
+	}
+	
+	if (defined $extras->{mailer}) {
+		#my $rmailer = new WeBWorK::Utils::RestrictedClosureClass($extras->{mailer},
+		#	qw/Open SendEnc Close Cancel skipped_recipients error error_msg/);
+		#my $safe_hole = new Safe::Hole {};
+		#$envir{mailer} = $safe_hole->wrap($rmailer);
+		$envir{mailer} = new WeBWorK::Utils::RestrictedClosureClass($extras->{mailer}, "add_message");
+	}
+	
+	#  ADDED: jsMath options
+	$envir{jsMath} = {%{$ce->{pg}{displayModeOptions}{jsMath}}};
 	
 	# Other things...
 	$envir{QUIZ_PREFIX}              = $options->{QUIZ_PREFIX}; # used by quizzes
 	$envir{PROBLEM_GRADER_TO_USE}    = $ce->{pg}->{options}->{grader};
 	$envir{PRINT_FILE_NAMES_FOR}     = $ce->{pg}->{specialPGEnvironmentVars}->{PRINT_FILE_NAMES_FOR};
+
+        #  ADDED: __files__
+        #    an array for mapping (eval nnn) to filenames in error messages
+	$envir{__files__} = {
+	  root => $ce->{webworkDirs}{root},     # used to shorten filenames
+	  pg   => $ce->{pg}{directories}{root}, # ditto
+	  tmpl => $ce->{courseDirs}{templates}, # ditto
+	};
 	
-	# variables for interpreting capa problems.
-	$envir{CAPA_Tools}               = $ce->{pg}->{specialPGEnvironmentVars}->{CAPA_Tools};
-	$envir{CAPA_MCTools}             = $ce->{pg}->{specialPGEnvironmentVars}->{CAPA_MCTools};
-	$envir{CAPA_Graphics_URL}        = $ce->{pg}->{specialPGEnvironmentVars}->{CAPA_Graphics_URL};
-	$envir{CAPA_GraphicsDirectory}   = $ce->{pg}->{specialPGEnvironmentVars}->{CAPA_GraphicsDirectory};
+	# variables for interpreting capa problems and other things to be
+        # seen in a pg file
+	my $specialPGEnvironmentVarHash = $ce->{pg}->{specialPGEnvironmentVars};
+	for my $SPGEV (keys %{$specialPGEnvironmentVarHash}) {
+		$envir{$SPGEV} = $specialPGEnvironmentVarHash->{$SPGEV};
+	}
 	
 	return \%envir;
 }
 
 sub translateDisplayModeNames($) {
 	my $name = shift;
-	return {
-		tex           => "TeX",
-		plainText     => "HTML",
-		formattedText => "HTML_tth",
-		images        => "HTML_dpng", # "HTML_img",
-	}->{$name};
+	return DISPLAY_MODES()->{$name};
 }
 
 sub oldSafetyFilter {
@@ -244,6 +285,7 @@ __END__
  $translator = $pg->{translator}; # WeBWorK::PG::Translator
  $body       = $pg->{body_text};  # text string
  $header     = $pg->{head_text};  # text string
+ $post_header_text = $pg->{post_header_text};  # text string
  $answerHash = $pg->{answers};    # WeBWorK::PG::AnswerHash
  $result     = $pg->{result};     # hash reference
  $state      = $pg->{state};      # hash reference
@@ -301,7 +343,7 @@ passing!>
 
 =item PSVN
 
-the problem set version number
+the problem set version number: use variable $psvn
 
 =item FIELDS
 
diff --git a/lib/WeBWorK/PG/Local.pm b/lib/WeBWorK/PG/Local.pm
index 62fafdc8fb..8e5a50c6fc 100644
--- a/lib/WeBWorK/PG/Local.pm
+++ b/lib/WeBWorK/PG/Local.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/PG/Local.pm,v 1.28 2009/10/17 15:50:33 apizer 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
@@ -26,7 +26,7 @@ WeBWorK::PG::Translator object.
 
 WeBWorK::PG::Local encapsulates the PG translation process, making multiple
 calls to WeBWorK::PG::Translator. Much of the flexibility of the Translator is
-hidden, instead making choices that are appropriate for the webwork-modperl
+hidden, instead making choices that are appropriate for the webwork2
 system
 
 It implements the WeBWorK::PG interface and uses a local
@@ -37,19 +37,45 @@ the WeBWorK::PG module for information about the API.
 
 use strict;
 use warnings;
+use WeBWorK::Constants;
 use File::Path qw(rmtree);
 use WeBWorK::PG::Translator;
 use WeBWorK::Utils qw(readFile writeTimingLogEntry);
+#use WeBWorK::Utils::RestrictedMailer;
+use WeBWorK::Utils::DelayedMailer;
+
+use mod_perl;
+use constant MP2 => ( exists $ENV{MOD_PERL_API_VERSION} and $ENV{MOD_PERL_API_VERSION} >= 2 );
+
+# Problem processing will time out after this number of seconds.
+use constant TIMEOUT => $WeBWorK::PG::Local::TIMEOUT || 10;
 
 BEGIN {
 	# This safe compartment is used to read the large macro files such as
 	# PG.pl, PGbasicmacros.pl and PGanswermacros and cache the results so that
 	# future calls have preloaded versions of these large files. This saves a
 	# significant amount of time.
-	$WeBWorK::PG::Local::safeCache = new Safe;
+	$WeBWorK::PG::Local::safeCache = new WWSafe;
+}
+
+sub alarm_handler {
+	my $msg = "Timeout after processing this problem for ". TIMEOUT. " seconds. Check for infinite loops in problem source.\n";
+	warn $msg;
+	CORE::die $msg;
 }
 
 sub new {
+	my $invocant = shift;
+	local $SIG{ALRM} = \&alarm_handler;
+	alarm TIMEOUT;
+	my $result = eval { $invocant->new_helper(@_) };
+	alarm 0;
+	die $@ if $@;
+	return $result;
+}
+
+
+sub new_helper {
 	my $invocant = shift;
 	my $class = ref($invocant) || $invocant;
 	my (
@@ -58,7 +84,7 @@ sub new {
 		$key,
 		$set,
 		$problem,
-		$psvn,
+		$psvn, #FIXME -- not used
 		$formFields, # in CGI::Vars format
 		$translationOptions, # hashref containing options for the
 		                     # translator, such as whether to show
@@ -66,14 +92,14 @@ sub new {
 	) = @_;
 	
 	# write timing log entry
-	writeTimingLogEntry($ce, "WeBWorK::PG::new",
-		"user=".$user->user_id.",problem=".$ce->{courseName}."/".$set->set_id."/".$problem->problem_id.",mode=".$translationOptions->{displayMode},
-		"begin");
+# 	writeTimingLogEntry($ce, "WeBWorK::PG::new",
+# 		"user=".$user->user_id.",problem=".$ce->{courseName}."/".$set->set_id."/".$problem->problem_id.",mode=".$translationOptions->{displayMode},
+# 		"begin");
 	
-	# install a local warn handler to collect warnings
+	# install a local warn handler to collect warnings  FIXME -- figure out what I meant to do here.
 	my $warnings = "";
-	local $SIG{__WARN__} = sub { $warnings .= shift }
-		if $ce->{pg}->{options}->{catchWarnings};
+	#local $SIG{__WARN__} = sub { $warnings .= shift()."<br/>\n"};
+		#if $ce->{pg}->{options}->{catchWarnings};
 	
 	# create a Translator
 	#warn "PG: creating a Translator\n"; 
@@ -81,16 +107,25 @@ sub new {
 	
 	# set the directory hash
 	#warn "PG: setting the directory hash\n";
-	$translator->rh_directories({
-		courseScriptsDirectory => $ce->{pg}->{directories}->{macros},
-		macroDirectory         => $ce->{courseDirs}->{macros},
-		templateDirectory      => $ce->{courseDirs}->{templates},
-		tempDirectory          => $ce->{courseDirs}->{html_temp},
-	});
+	# FIXME rh_directories does not appear to be used. ever.
+#	$translator->rh_directories({
+#		macrosPath             => $ce->{courseDirs}->{macrosPath},
+#		templateDirectory      => $ce->{courseDirs}->{templates},
+#		tempDirectory          => $ce->{courseDirs}->{html_temp},
+#	});
 	
+	############################################################################
 	# evaluate modules and "extra packages"
+	############################################################################
+	
 	#warn "PG: evaluating modules and \"extra packages\"\n";
 	my @modules = @{ $ce->{pg}->{modules} };
+	# HACK for apache2
+	if (MP2) {
+		push @modules, ["Apache2::Log"], ["APR::Table"];
+	} else {
+		push @modules, ["Apache::Log"];
+	}
 	foreach my $module_packages_ref (@modules) {
 		my ($module, @extra_packages) = @$module_packages_ref;
 		# the first item is the main package
@@ -99,7 +134,55 @@ sub new {
 		$translator->load_extra_packages(@extra_packages);
 	}
 	
+	############################################################################
+	# prepare an imagegenerator object (if we're in "images" mode)
+	############################################################################
+	my $image_generator;
+	if ($translationOptions->{displayMode} eq "images") {
+		my %imagesModeOptions = %{$ce->{pg}{displayModeOptions}{images}};
+		$image_generator = WeBWorK::PG::ImageGenerator->new(
+			tempDir         => $ce->{webworkDirs}->{tmp}, # global temp dir
+			latex	        => $ce->{externalPrograms}->{latex},
+			dvipng          => $ce->{externalPrograms}->{dvipng},
+			useCache        => 1,
+			cacheDir        => $ce->{webworkDirs}{equationCache},
+			cacheURL        => $ce->{webworkURLs}{equationCache},
+			cacheDB         => $ce->{webworkFiles}{equationCacheDB},
+			useMarkers      => ($imagesModeOptions{dvipng_align} && $imagesModeOptions{dvipng_align} eq 'mysql'),
+			dvipng_align    => $imagesModeOptions{dvipng_align},
+			dvipng_depth_db => $imagesModeOptions{dvipng_depth_db},
+		);
+	}
+	
+	############################################################################
+	# create a "delayed mailer" object that will send emails after the page is finished.
+	############################################################################
+
+	my $mailer = new WeBWorK::Utils::DelayedMailer(
+		smtp_server => $ce->{mail}{smtpServer},
+		smtp_sender => $ce->{mail}{smtpSender},
+		smtp_timeout => $ce->{mail}{smtpTimeout},
+		# FIXME I'd like to have an X-Remote-Host header, but before I do that I have to
+		# factor out the remote host/remote port code from Feedback.pm and Authen.pm and
+		# put it in Utils! (or maybe in WW::Request?)
+		headers => "X-WeBWorK-Module: " . __PACKAGE__ . "\n"
+			. "X-WeBWorK-Course: " . $ce->{courseName} . "\n"
+			# can't add user-related information because this is used for anonymous questionnaires
+			#. "X-WeBWorK-User: " . $user->user_id . "\n"
+			#. "X-WeBWorK-Section: " . $user->section . "\n"
+			#. "X-WeBWorK-Recitation: " . $user->recitation . "\n"
+			. "X-WeBWorK-Set: " . $set->set_id . "\n"
+			. "X-WeBWorK-Problem: " . $problem->problem_id . "\n"
+			. "X-WeBWorK-PGSourceFile: " . $problem->source_file . "\n",
+		allowed_recipients => $ce->{mail}{allowedRecipients},
+		on_illegal_rcpt => "carp",
+	);
+	
+	
+	############################################################################
 	# set the environment (from defineProblemEnvir)
+	############################################################################
+	
 	#warn "PG: setting the environment (from defineProblemEnvir)\n";
 	my $envir = $class->defineProblemEnvir(
 		$ce,
@@ -107,16 +190,28 @@ sub new {
 		$key,
 		$set,
 		$problem,
-		$psvn,
+		$psvn, #FIXME -- not used
 		$formFields,
 		$translationOptions,
+		{ #extras (this is kind of a hack, but not a serious one)
+			image_generator => $image_generator,
+			mailer => $mailer,
+		},
 	);
 	$translator->environment($envir);
 	
+	############################################################################
 	# initialize the Translator
+	############################################################################
 	#warn "PG: initializing the Translator\n";
 	$translator->initialize();
 	
+	
+	############################################################################
+	# preload macros
+	############################################################################
+	# This is in transition.  here are the old instructions
+	
 	# Preload the macros files which are used routinely: PG.pl,
 	# dangerousMacros.pl, IO.pl, PGbasicmacros.pl, and PGanswermacros.pl
 	# (Preloading the last two files safes a significant amount of time.)
@@ -146,114 +241,159 @@ sub new {
 	# at compile time.
 	# 
 	# TO ENABLE CACHEING UNCOMMENT THE FOLLOWING:
-	eval{$translator->pre_load_macro_files(
-		$WeBWorK::PG::Local::safeCache,
-		$ce->{pg}->{directories}->{macros}, 
-		'PG.pl', 'dangerousMacros.pl','IO.pl','PGbasicmacros.pl','PGanswermacros.pl'
-	)};
-    warn "Error while preloading macro files: $@" if $@;
-
+# 	eval{$translator->pre_load_macro_files(
+# 		$WeBWorK::PG::Local::safeCache,
+# 		$ce->{pg}->{directories}->{macros}, 
+# 		#'PG.pl', 'dangerousMacros.pl','IO.pl','PGbasicmacros.pl','PGanswermacros.pl'
+# 	)};
+#   warn "Error while preloading macro files: $@" if $@;
+
+    ############################################################################
+    # Here are the new instructions for preloading the macros
+    ############################################################################
+    
 	# STANDARD LOADING CODE: for cached script files, this merely
 	# initializes the constants.
-	foreach (qw(PG.pl dangerousMacros.pl IO.pl)) {
+	#2010 -- in the new scheme PG.pl is the only file guaranteed
+	# initialization -- it reads in everything that dangerous macros
+	# and IO.pl
+	# did before.  Mostly it just defines access to the PGcore object
+	
+	# 2010 the loop is overkill since there is just one file, we'll leave it for now in case there are more.
+	foreach (qw(PG.pl )) {   # dangerousMacros.pl IO.pl
 		my $macroPath = $ce->{pg}->{directories}->{macros} . "/$_";
 		my $err = $translator->unrestricted_load($macroPath);
 		warn "Error while loading $macroPath: $err" if $err;
 	}
 	
+	############################################################################
 	# set the opcode mask (using default values)
+	############################################################################
 	#warn "PG: setting the opcode mask (using default values)\n";
 	$translator->set_mask();
 	
-	# store the problem source
+	############################################################################
+	# get the problem source
+	# FIXME -- this operation can be moved out of the translator.
+	############################################################################
 	#warn "PG: storing the problem source\n";
-	my $sourceFile = $problem->source_file;
-	$sourceFile = $ce->{courseDirs}->{templates}."/".$sourceFile
-		unless ($sourceFile =~ /^\//);
-	eval { $translator->source_string(readFile($sourceFile)) };
-	if ($@) {
+	my $source ='';
+	my $sourceFilePath = '';
+	my $readErrors = undef;
+	if (ref($translationOptions->{r_source}) ) {
+		# the source for the problem is already given to us as a reference to a string
+		$source = ${$translationOptions->{r_source}};
+	} else {
+	    # the source isn't given to us so we need to read it 
+	    # from a file defined by the problem
+	    
+		# we  grab the sourceFilePath from the problem
+		$sourceFilePath = $problem->source_file;
+	    	
+	    # the path to the source file is usually given relative to the 
+	    # the templates directory. Unless the path starts with / assume
+	    # that it is relative to the templates directory
+	    
+	    $sourceFilePath = $ce->{courseDirs}->{templates}."/"
+	    	         .$sourceFilePath unless ($sourceFilePath =~ /^\//);
+	    #now grab the source
+		eval {$source = readFile($sourceFilePath) };
+		$readErrors = $@ if $@;
+	 }
+	 
+	############################################################################
+    # put the source into the translator object
+    ############################################################################
+    
+	eval { $translator->source_string( $source ) } unless $readErrors;
+	$readErrors .="\n  $@ " if $@;
+	if ($readErrors) {
 		# well, we couldn't get the problem source, for some reason.
 		return bless {
 			translator => $translator,
 			head_text  => "", 
+			post_header_text => "",
 			body_text  => <<EOF,
-WeBWorK::Utils::readFile($sourceFile) says: 
+WeBWorK::Utils::readFile($sourceFilePath) says: 
 $@
 EOF
 			answers    => {},
 			result     => {},
 			state      => {},
 			errors     => "Failed to read the problem source file.",
-			warnings   => $warnings,
+			warnings   => "$warnings",
 			flags      => {error_flag => 1},
+			pgcore     => $translator->{rh_pgcore},
 		}, $class;
 	}
 	
+	############################################################################
 	# install a safety filter
+	# FIXME -- I believe that since MathObjects this is no longer operational
+	############################################################################
 	#warn "PG: installing a safety filter\n";
 	#$translator->rf_safety_filter(\&oldSafetyFilter);
 	$translator->rf_safety_filter(\&WeBWorK::PG::nullSafetyFilter);
 	
+	############################################################################
 	# write timing log entry -- the translator is now all set up
-	writeTimingLogEntry($ce, "WeBWorK::PG::new",
-		"initialized",
-		"intermediate");
+	############################################################################
+# 	writeTimingLogEntry($ce, "WeBWorK::PG::new",
+# 		"initialized",
+# 		"intermediate");
 	
+	############################################################################
 	# translate the PG source into text
+	############################################################################
+	
 	#warn "PG: translating the PG source into text\n";
 	$translator->translate();
 	
-	# after we're done translating, we may have to clean up after the
-	# translator:
-	
-	# for example, HTML_img mode uses a tempdir for dvipng's temp files.\
-	# We have to remove it.
-	if ($envir->{dvipngTempDir}) {
-		rmtree($envir->{dvipngTempDir}, 0, 0);
-	}
-	
-	# HTML_dpng, on the other hand, uses an ImageGenerator. We have to
-	# render the queued equations.
-	if ($envir->{imagegen}) {
-		my $sourceFile = $ce->{courseDirs}->{templates} . "/" . $problem->source_file;
-		my %mtimeOption = -e $sourceFile
-			? (mtime => (stat $sourceFile)[9])
-			: ();
-		
-		$envir->{imagegen}->render(
-			refresh => $translationOptions->{refreshMath2img},
-			%mtimeOption,
-		);
-	}
+	############################################################################
+	# !!!!!!!! IMPORTANT: $envir shouldn't be trusted after problem code runs!
+	############################################################################
 	
 	my ($result, $state); # we'll need these on the other side of the if block!
 	if ($translationOptions->{processAnswers}) {
 		
+		############################################################################
 		# process student answers
+		############################################################################
+		
 		#warn "PG: processing student answers\n";
 		$translator->process_answers($formFields);
 
+        ############################################################################
 		# retrieve the problem state and give it to the translator
+		############################################################################		
 		#warn "PG: retrieving the problem state and giving it to the translator\n";
+		
 		$translator->rh_problem_state({
 			recorded_score =>       $problem->status,
+			sub_recorded_score =>   $problem->sub_status,
 			num_of_correct_ans =>   $problem->num_correct,
 			num_of_incorrect_ans => $problem->num_incorrect,
 		});
 
+        ############################################################################
 		# determine an entry order -- the ANSWER_ENTRY_ORDER flag is built by
 		# the PG macro package (PG.pl)
+		############################################################################
 		#warn "PG: determining an entry order\n";
+		
 		my @answerOrder =
 			$translator->rh_flags->{ANSWER_ENTRY_ORDER}
 				? @{ $translator->rh_flags->{ANSWER_ENTRY_ORDER} }
 				: keys %{ $translator->rh_evaluated_answers };
 
+        ############################################################################
 		# install a grader -- use the one specified in the problem,
 		# or fall back on the default from the course environment.
 		# (two magic strings are accepted, to avoid having to
 		# reference code when it would be difficult.)
+		############################################################################
 		#warn "PG: installing a grader\n";
+		
 		my $grader = $translator->rh_flags->{PROBLEM_GRADER_TO_USE}
 			|| $ce->{pg}->{options}->{grader};
 		$grader = $translator->rf_std_problem_grader
@@ -264,31 +404,73 @@ EOF
 			unless ref $grader eq "CODE";
 		$translator->rf_problem_grader($grader);
 
+        ############################################################################
 		# grade the problem
+		############################################################################
 		#warn "PG: grading the problem\n";
+		
 		($result, $state) = $translator->grade_problem(
 			answers_submitted  => $translationOptions->{processAnswers},
 			ANSWER_ENTRY_ORDER => \@answerOrder,
+			%{$formFields},  #FIXME?  this is used by sequentialGrader is there a better way
 		);
 		
 	}
 	
+	############################################################################
+	# after we're done translating, we may have to clean up after the
+	# translator:
+	############################################################################
+	
+	############################################################################
+	# HTML_dpng uses an ImageGenerator. We have to render the queued equations.
+	############################################################################
+	my $body_text_ref  = $translator->r_text;
+	if ($image_generator) {
+		my $sourceFile = $ce->{courseDirs}->{templates} . "/" . $problem->source_file;
+		my %mtimeOption = -e $sourceFile ? (mtime => (stat $sourceFile)[9]) : ();
+		
+		$image_generator->render(
+			refresh => $translationOptions->{refreshMath2img},
+			%mtimeOption,
+			body_text => $body_text_ref,
+		);
+	}
+	
+	############################################################################
+	# send any queued mail messages
+	############################################################################
+	
+	if ($mailer) {
+		$mailer->send_messages;
+	}
+	
+	############################################################################
+	# end of cleanup phase
+	############################################################################
+	
+	############################################################################
 	# write timing log entry
-	writeTimingLogEntry($ce, "WeBWorK::PG::new", "", "end");
+	############################################################################
+# 	writeTimingLogEntry($ce, "WeBWorK::PG::new", "", "end");
 	
+	############################################################################
 	# return an object which contains the translator and the results of
-	# the translation process. this is DIFFERENT from the "format expected
-	# by Webwork.pm (and I believe processProblem8, but check.)"
+	# the translation process. 
+	############################################################################
+	
 	return bless {
 		translator => $translator,
 		head_text  => ${ $translator->r_header },
-		body_text  => ${ $translator->r_text   },
+		post_header_text => ${ $translator->r_post_header},
+		body_text  => ${ $body_text_ref } ,
 		answers    => $translator->rh_evaluated_answers,
 		result     => $result,
 		state      => $state,
 		errors     => $translator->errors,
 		warnings   => $warnings,
 		flags      => $translator->rh_flags,
+		pgcore     => $translator->{rh_pgcore},
 	}, $class;
 }
 
diff --git a/lib/WeBWorK/PG/Remote.pm b/lib/WeBWorK/PG/Remote.pm
index 029a2d6dad..a46cdefac5 100644
--- a/lib/WeBWorK/PG/Remote.pm
+++ b/lib/WeBWorK/PG/Remote.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/PG/Remote.pm,v 1.6 2007/08/13 22:59:58 sh002i 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
@@ -27,7 +27,7 @@ renderer via SOAP.
 use strict;
 use warnings;
 use SOAP::Lite;
-use WeBWorK::Utils qw(readFile formatDateTime writeTimingLogEntry);
+use WeBWorK::Utils qw(readFile);
 
 sub new {
 	my $invocant = shift;
@@ -38,7 +38,7 @@ sub new {
 		$key,
 		$set,
 		$problem,
-		$psvn,
+		$psvn, #FIXME -- not used
 		$formFields, # in CGI::Vars format
 		$translationOptions, # hashref containing options for the
 		                     # translator, such as whether to show
@@ -77,7 +77,7 @@ EOF
 		$key,
 		$set,
 		$problem,
-		$psvn,
+		$psvn, #FIXME -- not used
 		$formFields,
 		$translationOptions,
 	);
@@ -100,6 +100,7 @@ EOF
 		envir                  => $envir,
 		problem_state          => {
 			recorded_score       => $problem->status,
+			sub_recorded_score =>   $problem->sub_status,
 			num_of_correct_ans   => $problem->num_correct,
 			num_of_incorrect_ans => $problem->num_incorrect,
 		},
diff --git a/lib/WeBWorK/RPC.pm b/lib/WeBWorK/RPC.pm
new file mode 100644
index 0000000000..aa5a1087ab
--- /dev/null
+++ b/lib/WeBWorK/RPC.pm
@@ -0,0 +1,109 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/RPC.pm,v 1.2 2006/08/05 02:15:31 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::RPC;
+
+=head1 NAME
+
+WeBWorK::RPC - Remote Procedure Calls for WeBWorK.
+
+=cut
+
+use strict;
+use warnings;
+
+use Data::Dumper;
+use WeBWorK::Authen;
+use WeBWorK::Authz;
+use WeBWorK::CourseEnvironment;
+use WeBWorK::DB;
+use WeBWorK::RPC::Request;
+use WeBWorK::Utils qw/runtime_use/;
+
+sub bootstrap {
+	my ($invocant, %params) = @_;
+	my $class = ref $invocant || $invocant;
+	my $self = bless {}, $class;
+	
+	my $r = $self->{r} = new WeBWorK::RPC::Request;
+	
+	my $ce = eval { new WeBWorK::CourseEnvironment(\%WeBWorK::SeedCE) };
+	$@ and die "Failed to initialize course environment: $@\n";
+	$r->ce($ce);
+	
+	my $authz = new WeBWorK::Authz($r);
+	$r->authz($authz);
+	
+	my $authen_module = WeBWorK::Authen::class($ce, "user_module");
+	runtime_use $authen_module;
+	my $authen = $authen_module->new($r);
+	$r->authen($authen);
+	
+	if (defined $ce->{courseName} and $ce->{courseName} ne "") {
+		my $db = new WeBWorK::DB($ce->{dbLayout});
+		$r->db($db);
+	}
+	
+	return $self, %params;
+}
+
+sub hi {
+	print STDERR __PACKAGE__."::hi(@_) called\n";
+	return "hello, world";
+}
+
+sub bye {
+	print STDERR __PACKAGE__."::bye(@_) called\n";
+	return "goodbye, cruel world";
+}
+
+sub dumper {
+	print STDERR __PACKAGE__."::dumper(@_) called\n";
+	return Dumper(\@_);
+}
+
+sub get_course_environment {
+	my ($self, %params) = bootstrap(@_);
+	return $self->{r}->ce;
+}
+
+################################################################################
+
+package WeBWorK::RPC::CourseManagement;
+
+use WeBWorK::Utils::CourseManagement;
+
+sub listCourses {
+	my ($self) = WeBWorK::RPC::bootstrap(@_);
+	return WeBWorK::Utils::CourseManagement::listCourses($self->{r}->ce);
+}
+
+sub listArchivedCourses {
+	my ($self) = WeBWorK::RPC::bootstrap(@_);
+	return WeBWorK::Utils::CourseManagement::listArchivedCourses($self->{r}->ce);
+}
+
+sub addCourse {
+	my ($self, %options) = WeBWorK::RPC::bootstrap(@_);
+	die "missing courseID in \%options" unless defined $options{courseID};
+	$options{ce} = new WeBWorK::CourseEnvironment({
+		webwork_dir => $self->{r}->ce->{webwork_dir},
+		courseName => $options{courseID},
+	});
+	return WeBWorK::Utils::CourseManagement::addCourse(%options);
+}
+
+1;
diff --git a/lib/WeBWorK/RPC/Request.pm b/lib/WeBWorK/RPC/Request.pm
new file mode 100644
index 0000000000..0219d2d58f
--- /dev/null
+++ b/lib/WeBWorK/RPC/Request.pm
@@ -0,0 +1,50 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/RPC/Request.pm,v 1.1 2006/07/28 04:33:28 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::RPC::Request;
+use base "WeBWorK::Request";
+
+=head1 NAME
+
+WeBWorK::Request - a request to the WeBWorK system, a subclass of
+Apache::Request with additional WeBWorK-specific fields.
+
+=cut
+
+use strict;
+use warnings;
+
+=head1 CONSTRUCTOR
+
+=over
+
+=item new(@args)
+
+Creates an new WeBWorK::RPC::Request. No underlying Apache[2]::Request is created.
+
+=cut
+
+sub new {
+	my ($invocant, @args) = @_;
+	my $class = ref $invocant || $invocant;
+	return bless {}, $class;
+}
+
+=back
+
+=cut
+
+1;
diff --git a/lib/WeBWorK/Request.pm b/lib/WeBWorK/Request.pm
new file mode 100644
index 0000000000..2cca7cf83d
--- /dev/null
+++ b/lib/WeBWorK/Request.pm
@@ -0,0 +1,213 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/Request.pm,v 1.10 2007/07/23 04:06:32 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::Request;
+
+=head1 NAME
+
+WeBWorK::Request - a request to the WeBWorK system, a subclass of
+Apache::Request with additional WeBWorK-specific fields.
+
+=cut
+
+use strict;
+use warnings;
+
+use mod_perl;
+use constant MP2 => ( exists $ENV{MOD_PERL_API_VERSION} and $ENV{MOD_PERL_API_VERSION} >= 2 );
+
+
+use WeBWorK::Localize;
+
+# This class inherits from Apache::Request under mod_perl and Apache2::Request under mod_perl2
+BEGIN {
+    push @WeBWorK::Request::ISA, "WeBWorK::Localize";
+	if (MP2) {
+		require Apache2::Request;
+		Apache2::Request->import;
+		push @WeBWorK::Request::ISA, "Apache2::Request";
+	} else {
+		require Apache::Request;
+		Apache::Request->import;
+		push @WeBWorK::Request::ISA, "Apache::Request";
+	}
+}
+
+# Apache2::Request's param method doesn't support setting parameters, so we need to provide the
+# behavior in this class if we're running under mod_perl2.
+BEGIN {
+	if (MP2) {
+		*param = *mutable_param;
+	}
+}
+
+sub mutable_param {
+	my $self = shift;
+	
+	if (not defined $self->{paramcache}) {
+		my @names = $self->SUPER::param;
+		@{$self->{paramcache}}{@names} = map { [ $self->SUPER::param($_) ] } @names;
+	}
+	
+	@_ or return keys %{$self->{paramcache}};
+	
+	my $name = shift;
+	if (@_) {
+		my $val = shift;
+		if (ref $val eq "ARRAY") {
+			$self->{paramcache}{$name} = [@$val]; # make a copy
+		} else {
+			$self->{paramcache}{$name} = [$val];
+		}
+	}
+	return unless exists $self->{paramcache}{$name};
+	return wantarray ? @{$self->{paramcache}{$name}} : $self->{paramcache}{$name}->[0];
+}
+
+=head1 CONSTRUCTOR
+
+=over
+
+=item new(@args)
+
+Creates an new WeBWorK::Request. All arguments are passed to Apache::Request's
+constructor. You must specify at least an Apache request_rec object.
+
+=for comment
+
+From: http://search.cpan.org/~joesuf/libapreq-1.3/Request/Request.pm#SUBCLASSING_Apache::Request
+
+If the instances of your subclass are hash references then you can actually
+inherit from Apache::Request as long as the Apache::Request object is stored in
+an attribute called "r" or "_r". (The Apache::Request class effectively does the
+delegation for you automagically, as long as it knows where to find the
+Apache::Request object to delegate to.)
+
+=cut
+
+sub new {
+	my ($invocant, @args) = @_;
+	my $class = ref $invocant || $invocant;
+	# construct the appropriate superclass instance depending on mod_perl version
+	my $apreq_class = MP2 ? "Apache2::Request" : "Apache::Request";
+	return bless { r => $apreq_class->new(@args) }, $class;
+}
+
+=back
+
+=cut
+
+=head1 METHODS
+
+=over
+
+=item ce([$new])
+
+Return the course environment (WeBWorK::CourseEnvironment) associated with this
+request. If $new is specified, set the course environment to $new before
+returning the value.
+
+=cut
+
+sub ce {
+	my $self = shift;
+	$self->{ce} = shift if @_;
+	return $self->{ce};
+}
+
+=item db([$new])
+
+Return the database (WeBWorK::DB) associated with this request. If $new is
+specified, set the database to $new before returning the value.
+
+=cut
+
+sub db {
+	my $self = shift;
+	$self->{db} = shift if @_;
+	return $self->{db};
+}
+
+=item authen([$new])
+
+Return the authenticator (WeBWorK::Authen) associated with this request. If $new
+is specified, set the authenticator to $new before returning the value.
+
+=cut
+
+sub authen {
+	my $self = shift;
+	$self->{authen} = shift if @_;
+	return $self->{authen};
+}
+
+=item authz([$new])
+
+Return the authorizer (WeBWorK::Authz) associated with this request. If $new is
+specified, set the authorizer to $new before returning the value.
+
+=cut
+
+sub authz {
+	my $self = shift;
+	$self->{authz} = shift if @_;
+	return $self->{authz};
+}
+
+=item urlpath([$new])
+
+Return the URL path (WeBWorK::URLPath) associated with this request. If $new is
+specified, set the URL path to $new before returning the value.
+
+=cut
+
+sub urlpath {
+	my $self = shift;
+	$self->{urlpath} = shift if @_;
+	return $self->{urlpath};
+}
+
+sub language_handle {
+	my $self = shift;
+	$self->{language_handle} = shift if @_;
+	return $self->{language_handle};
+}
+
+sub maketext {
+	my $self = shift;
+	# $self->{language_handle}->maketext(@_);
+	&{ $self->{language_handle} }(@_);
+}
+
+=item location()
+
+Overrides the location() method in Apache::Request (or Apache2::Request) so that
+if the location is "/", the empty string is returned.
+
+=cut
+
+sub location {
+	my $self = shift;
+	my $location = $self->SUPER::location;
+	return $location eq "/" ? "" : $location;
+}
+
+=back
+
+=cut
+
+1;
+
diff --git a/lib/WeBWorK/Template.pm b/lib/WeBWorK/Template.pm
new file mode 100644
index 0000000000..02f420da98
--- /dev/null
+++ b/lib/WeBWorK/Template.pm
@@ -0,0 +1,223 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/Template.pm,v 1.3 2006/01/25 23:13:51 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::Template;
+use base qw(Exporter);
+
+=head1 NAME
+
+WeBWorK::Template - apply a template to a ContentGenerator.
+
+=head1 SYNOPSIS
+
+ use WeBWorK::Template qw/template/;
+ 
+ my $templateFile = "default.template";
+ my $cg = WeBWorK::ContentGenerator::SomeSubclass->new($r);
+ 
+ template($templateFile, $cg);
+
+=head1 DESCRIPTION
+
+WeBWorK uses templates to customize the presentation of pages. A template is a
+complete HTML document, containing normal HTML code and special escape
+sequences.
+
+=head2 ESCAPE SEQUENCES
+
+Escape sequences have a format similar to that of server-side includes (SSI).
+The format is as follows:
+
+ <!--#NAME ARG1="VALUE1" ARG2="VALUE2" ...-->
+
+An escape's C<NAME> and arguments (C<ARG1>, C<ARG2>, etc.) are case-sensitive,
+the argument values may or may not be depending on the particular escape. Most
+escapes have case-sensitive values.
+
+Escape equences are replaced by dynamically generated content from WeBWorK's
+content generation system, WeBWorK::ContentGenerator. When a template escape
+C<NAME> is encountered in the document, the template processor checks for a
+method of the same name in the current content generator. If found, that method
+is invoked as follows:
+
+ @result = $contentGenerator->NAME(\%escapeArguments);
+
+where %escapeArguments contains the key/value pairs of arguments in the escape
+sequence (like C<ARG1="VALUE1" ARG2="VALUE2">). The method may print() output
+directly to the client or return a result. If the method returns a non-empty
+value, it is sent to the client.
+
+=head2 CONDITIONAL PROCESSING
+
+In addition to the normal escape sequences above, the escape sequences C<#if>,
+C<#else>, and C<#endif> are reserved and used to conditionally include portions
+of the template in the output.
+
+The C<#if> escape sequence has the following form:
+
+ <!--#if PRED1="VALUE1" PRED2="VALUE2" ...->
+
+When an C<#if> escape is evaluated, each predicate (C<PRED1>, C<PRED2>, etc.) is
+evaluated by calling a method named C<if_PRED> in the current content generator
+with the predicate's value as the sole argument. If no such method exists, the
+predicate is false. If the method returns a true value, the predicate is true.
+
+If any predicate is true, the code between the C<#if> escape and a matching
+C<#else> or C<#endif> escape is included in the output. C<#if> statements can be
+nested.
+
+For example:
+
+ <!--#if loggedin="1"-->
+ <!--#if can="loginstatus"-->
+ <div class="LoginStatus">
+ 	<!--#loginstatus-->
+ </div>
+ <!--#endif-->
+ <!--#endif-->
+ <!--#if can="path"-->
+ <div class="Path">
+ 	<!--#path style="text" image="/webwork2_files/images/right_arrow.png" text=" > "-->
+ </div>
+ <!--#endif-->
+
+Several predicate functions are defined in WeBWorK::ContentGenerator.
+
+=cut
+
+use strict;
+use warnings;
+use WeBWorK::Utils qw(readFile);
+
+our @EXPORT    = ();
+our @EXPORT_OK = qw(
+	template
+);
+
+=head1 FUNCTIONS
+
+=over
+
+=item template($templatePath, $cg)
+
+Process the template file $templatePath. Methods from $cg, an instance of
+WeBWorK::ContentGenerator, are called to handle escape sequences in the
+template.
+
+=cut
+
+sub template {
+	my ($templatePath, $cg) = @_;
+	
+	# the truth value of the top of this stack determines if we're printing output or not.
+	# we want to start off in printing mode.
+	# say $ifstack[-1] to get the result of the last <#!--if-->
+	my @ifstack = (1);
+	
+	my @template = split /\n/, readFile($templatePath);
+	
+	foreach my $line (@template) {
+		# This is incremental regex processing.
+		# the /c is so that pos($line) doesn't die when the regex fails.
+		while ($line =~ m/\G(.*?)<!--#(\w*)((?:\s+.*?)?)-->/gc) {
+			my ($before, $function, $raw_args) = ($1, $2, $3);
+			my @args = ($raw_args =~ /\S/) ? cook_args($raw_args) : ();
+			
+			if ($ifstack[-1]) {
+				print $before;
+			}
+			
+			if ($function eq "if") {
+				# a predicate can only be true if everything else on the ifstack is already true, for ANDing
+				push @ifstack, (if_handler($cg, [@args]) && $ifstack[-1]);
+			} elsif ($function eq "else" and @ifstack > 1) {
+				$ifstack[-1] = not $ifstack[-1];
+			} elsif ($function eq "endif" and @ifstack > 1) {
+				pop @ifstack;
+			} elsif ($ifstack[-1]) {
+				if ($cg->can($function)) {
+					my @result = $cg->$function({@args});
+					if (@result) {
+						print @result;
+					} else {
+						warn "Template escape $function returned an empty list.";
+					}
+				}
+			}
+		}
+		
+		if ($ifstack[-1]) {
+			print substr($line, (defined pos $line) ? pos $line : 0), "\n";
+		}
+	}
+}
+
+# cook_args(STRING) - parses a string of the form ARG1="FOO" ARG2="BAR". Returns
+# a list which pairs into key/values and fits nicely in {}s.
+# 
+sub cook_args($) { # ... also used by bin/wwdb, so watch out
+	my ($raw_args) = @_;
+	my @args = ();
+	
+	# Boy I love m//g in scalar context!  Go read the camel book, heathen.
+	# First, get the whole token with the quotes on both ends...
+	while ($raw_args =~ m/\G\s*(\w*)="((?:[^"\\]|\\.)*)"/g) {
+		my ($key, $value) = ($1, $2);
+		# ... then, rip out all the protecty backspaces
+		$value =~ s/\\(.)/$1/g;
+		push @args, $key => $value;
+	}
+	
+	return @args;
+}
+
+# This is different.  It probably shouldn't print anything (except in debugging cases)
+# and it should return a boolean, not a string.  &if is called in a nonstandard way
+# by &template, with $args as an arrayref instead of a hashref.  this is a hack!  yay!
+# 
+# OK, this is a pluggin architecture.  it iterates through attributes of the "if" tag,
+# and for each predicate $p, it calls &if_$p in an object-oriented way, continuing the
+# grand templating theme of an object-oriented pluggable architecture using ->can($).
+# 
+sub if_handler {
+	my ($cg, $args) = @_;
+	# A single if "or"s it's components.  Nesting produces "and".
+	
+	my @args = @$args; # Hahahahaha, get it?!
+	
+	if (@args % 2 != 0) {
+		# flip out and kill people, but do not commit seppuku
+		print '<!--&if recieved an uneven number of arguments.  This shouldn\'t happen, but I\'ll let it slide.-->\n';
+	}
+	
+	while (@args > 1) {
+		my ($key, $value) = (shift @args, shift @args);
+		
+		# a non-existent &if_$key is the same as a false result, but we're ORing, so it's OK
+		my $sub = "if_$key"; # perl doesn't like it when you try to construct a string right in a method invocation
+		if ($cg->can("if_$key") and $cg->$sub("$value")) {
+			return 1;
+		}
+	}
+	
+	return 0;
+}
+
+=back
+
+=cut
+
+1;
diff --git a/lib/WeBWorK/Timing.pm b/lib/WeBWorK/Timing.pm
deleted file mode 100644
index 73937e01eb..0000000000
--- a/lib/WeBWorK/Timing.pm
+++ /dev/null
@@ -1,200 +0,0 @@
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
-# 
-# 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
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-# 
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
-
-package WeBWorK::Timing;
-
-=head1 NAME
-
-WeBWorK::Timing - Log timing data.
-
-head1 SYNOPSIS
-
- use WeBWorK::Timing;
- 
- my $timer = WeBWorK::Timing->new("do some processesing");
- $timer->start;
- do_some_processing();
- $timer->continue("
- do_some_more_processing();
- $timer->stop;
- $timer->save;
- 
- my $timer0 = WeBWorK::Timing->new("main task");
- my $timer1 = WeBWorK::Timing->new("subtask 1");
- my $timer2 = WeBWorK::Timing->new("subtask 1");
- 
- $timer0->start;
- $timer1->start;
- sub_task(1);
- $timer1->stop;
- $timer2->start;
- sub_task(2);
- $timer2->stop;
- $timer0->stop;
-
- # timing data is saved when objects go out of scope
-
-=cut
-
-use strict;
-use warnings;
-use Time::HiRes qw(gettimeofday tv_interval);
-
-our $TASK_COUNT = 0; # number of tasks processed in this child process
-# You can customize the output to go to some file besides STDERR (usually ErrorLog for Apache)
-our $TIMING_LOG = '';
-=head1 CONSTRUCTOR
-
-=over
-
-=item new($task)
-
-C<new> creates a new timing object, with the task given in $task.
-
-=back
-
-=cut
-
-sub new {
-	my ($invocant, $task) = @_;
-	my $self = {
-		id    => $TASK_COUNT++,
-		task  => $task,
-		ctime => scalar gettimeofday(),
-		saved => 0,
-	};
-	return bless $self, ref $invocant || $invocant
-}
-
-=head1 METHODS
-
-=over
-
-=item start(), begin()
-
-Marks the current time as the start time for the task.
-
-=cut
-
-sub start {
-	my ($self) = @_;
-	$self->{start} = gettimeofday();
-}
-
-sub begin { shift->start(@_); }
-
-=item continue($data)
-
-Stores the current time as an intermediate time, associated with the string
-given in $data.
-
-=cut
-
-sub continue {
-	my ($self, $data) = @_;
-	push @{$self->{steps}}, [ scalar gettimeofday(), $data ];
-}
-
-=item stop(), finish(), end()
-
-Marks the current time as the stop time for the task.
-
-=cut
-
-sub stop {
-	my ($self) = @_;
-	$self->{stop} = gettimeofday();
-}
-
-sub finish { shift->stop(@_); }
-sub end    { shift->stop(@_); }
-
-=item save()
-
-Writes the timing data for this task to the standard error stream. If save is
-not called explicitly, it is called when the object goes out of scope.
-
-=cut
-
-sub save {
-	my ($self) = @_;
-	local(*TIMING);
-	if ($TIMING_LOG =~ /\S/) { 
-		open(TIMING, ">>$TIMING_LOG") || die "Can't open timing log: $TIMING_LOG";
-	} else {
-		*TIMING = *STDERR;
-	} 
-		
-	my $id = $self->{id};
-	my $task = $self->{task};
-	my $now = gettimeofday();
-	
-	my $diff = sprintf("%.6f", 0);
-	if ($self->{start}) {
-		my $start = sprintf("%.6f", $self->{start});
-		print TIMING "TIMING $$ $id $start ($diff) $task: START\n";
-	} else {
-		my $ctime = sprintf("%.6f", $self->{ctime});
-		print TIMING "TIMING $$ $id $ctime ($diff) $task: START (assumed)\n";
-	}
-	
-	if ($self->{steps}) {
-		my @steps = @{$self->{steps}};
-		foreach my $step (@steps) {
-			my ($time, $data) = @$step;
-			$time = sprintf("%.6f", $time);
-			my $start = sprintf("%.6f", $self->{start});
-			my $diff  = sprintf("%.6f", $time-$start);
-			print TIMING "TIMING $$ $id $time ($diff) $task: $data\n";
-		}
-	}
-	
-	if ($self->{stop}) {
-		my $stop = sprintf("%.6f", $self->{stop});
-		my $start = sprintf("%.6f", $self->{start});
-		my $diff  = sprintf("%.6f", $stop-$start);
-		print TIMING "TIMING $$ $id $stop ($diff) $task: END\n";
-	} else {
-		$now = sprintf("%.6f", $now);
-		my $start = sprintf("%.6f", $self->{start});
-		my $diff  = sprintf("%.6f", $now-$start);
-		print TIMING "TIMING $$ $id $now ($diff) $task: END (assumed)\n";
-	}
-	
-	$self->{saved} = 1;
-}
-
-sub DESTROY {
-	my ($self) = shift;
-	
-	$self->save unless $self->{saved};
-}
-
-=head1 AUTHOR
-
-Written by Sam Hathaway, sh002i (at) math.rochester.edu.
-
-=head1 BUGS
-
-Currently outputs to STDERR instead of something more graceful.
-
-=head1 SEE ALSO
-
-The F<timing> utility can be used to parse and sort log output.
-
-=cut
-
-1;
diff --git a/lib/WeBWorK/URLPath.pm b/lib/WeBWorK/URLPath.pm
new file mode 100644
index 0000000000..021df7fd80
--- /dev/null
+++ b/lib/WeBWorK/URLPath.pm
@@ -0,0 +1,1073 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/URLPath.pm,v 1.36 2008/04/29 19:27:34 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::URLPath;
+
+=head1 NAME
+
+WeBWorK::URLPath - the WeBWorK virtual URL heirarchy.
+
+=cut
+
+use strict;
+use warnings;
+use Carp;
+use WeBWorK::Debug;
+use WeBWorK::Localize;
+{
+	no warnings "redefine";
+	
+	sub debug {
+		my ($label, $indent, @message) = @_;
+		my $header = " "x$indent;
+		$header .= "$label: " if $label ne "";
+		WeBWorK::Debug::debug($header, @message);
+	}
+}
+
+=head1 VIRTUAL HEIRARCHY
+
+PLEASE FOR THE LOVE OF GOD UPDATE THIS IF YOU CHANGE THE HEIRARCHY BELOW!!!
+
+ root                                /
+ 
+ course_admin                        /admin/ -> logout, options, instructor_tools
+ html2xml                            /html2xml/
+ set_list                            /$courseID/
+ 
+ equation_display                    /$courseID/equation/
+ feedback                            /$courseID/feedback/
+ gateway_quiz                        /$courseID/quiz_mode/$setID/
+ proctored_gateway_quiz              /$courseID/proctored_quiz_mode/$setID/
+ proctored_gateway_proctor_login     /$courseID/proctored_quiz_mode/$setID/proctor_login/
+ grades                              /$courseID/grades/
+ hardcopy                            /$courseID/hardcopy/
+ hardcopy_preselect_set              /$courseID/hardcopy/$setID/
+ logout                              /$courseID/logout/
+ options                             /$courseID/options/
+ #test                               /$courseID/test/
+ #render                              /$courseID/render/
+ 
+ instructor_tools                    /$courseID/instructor/
+ 
+ instructor_user_list                /$courseID/instructor/users/
+ instructor_user_detail              /$courseID/instructor/users/$userID/
+ instructor_sets_assigned_to_user    /$courseID/instructor/users/$userID/sets/
+ 
+ instructor_set_list                 /$courseID/instructor/sets/
+ instructor_set_detail               /$courseID/instructor/sets/$setID/
+ instructor_users_assigned_to_set    /$courseID/instructor/sets/$setID/users/
+ 
+ instructor_add_users                /$courseID/instructor/add_users/
+ instructor_set_assigner             /$courseID/instructor/assigner/
+ instructor_file_transfer            /$courseID/instructor/files/
+ instructor_file_manager             /$courseID/instructor/file_manager/
+ instructor_set_maker                /$courseID/instructor/setmaker/
+ instructor_set_maker2               /$courseID/instructor/setmaker2/
+ instructor_get_target_set_problems  /$courseID/instructor/GetTargetSetProblems/
+ instructor_get_library_set_problems /$courseID/instructor/GetLibrarySetProblems/
+ instructor_config                   /$courseID/instructor/config/
+ instructor_compare                  /$courseID/instructor/compare/
+ 
+ instructor_problem_editor           /$courseID/instructor/pgProblemEditor/
+ instructor_problem_editor_withset   /$courseID/instructor/pgProblemEditor/$setID/
+ instructor_problem_editor_withset_withproblem
+                                     /$courseID/instructor/pgProblemEditor/$setID/$problemID/
+ 
+ instructor_scoring                  /$courseID/instructor/scoring/
+ instructor_scoring_download         /$courseID/instructor/scoringDownload/
+ instructor_mail_merge               /$courseID/instructor/send_mail/
+ instructor_answer_log               /$courseID/instructor/show_answers/
+ instructor_preflight               /$courseID/instructor/preflight/
+ 
+ instructor_statistics               /$courseID/instructor/stats/
+ instructor_set_statistics           /$courseID/instructor/stats/set/$setID/
+ instructor_user_statistics          /$courseID/instructor/stats/student/$userID/
+ 
+ instructor_progress                  /$courseID/instructor/StudentProgress/
+ instructor_set_progress              /$courseID/instructor/StudentProgress/set/$setID/
+ instructor_user_progress             /$courseID/instructor/StudentProgress/student/$userID/
+ 
+ problem_list                        /$courseID/$setID/
+ problem_detail                      /$courseID/$setID/$problemID/
+
+=cut
+
+################################################################################
+# tree of path types
+################################################################################
+
+our %pathTypes = (
+	root => {
+		name    => 'WeBWorK',
+		parent  => '',
+		kids    => [ qw/course_admin  html2xml set_list / ],
+		match   => qr|^/|,
+		capture => [ qw// ],
+		produce => '/',
+		display => 'WeBWorK::ContentGenerator::Home',
+	},
+	course_admin => {
+		name    => 'Course Administration',
+		parent  => 'root',
+		kids    => [ qw/logout options instructor_tools/ ],
+		match   => qr|^(admin)/|,
+		capture => [ qw/courseID/ ],
+		produce => 'admin/',
+		display => 'WeBWorK::ContentGenerator::CourseAdmin',
+	},
+	
+	################################################################################
+	html2xml => {
+		name    => 'html2xml',
+		parent  => 'root', #    'set_list',
+		kids    => [ qw// ],
+		match   => qr|^html2xml/|,
+		capture => [ qw// ],
+		produce => 'html2xml/',
+		display => 'WeBWorK::ContentGenerator::renderViaXMLRPC',
+	},
+
+	set_list => {
+		name    => '$courseID',
+		parent  => 'root',
+		kids    => [ qw/equation_display feedback gateway_quiz proctored_gateway_quiz grades hardcopy
+			logout options instructor_tools problem_list
+		/ ],
+		match   => qr|^([^/]+)/|,
+		capture => [ qw/courseID/ ],
+		produce => '$courseID/',
+		display => 'WeBWorK::ContentGenerator::ProblemSets',
+	},
+	
+	################################################################################
+	
+	equation_display => {
+		name    => 'Equation Display',
+		parent  => 'set_list',
+		kids    => [ qw// ],
+		match   => qr|^equation/|,
+		capture => [ qw// ],
+		produce => 'equation/',
+		display => 'WeBWorK::ContentGenerator::EquationDisplay',
+	},
+	feedback => {
+		name    => 'Feedback',
+		parent  => 'set_list',
+		kids    => [ qw// ],
+		match   => qr|^feedback/|,
+		capture => [ qw// ],
+		produce => 'feedback/',
+		display => 'WeBWorK::ContentGenerator::Feedback',
+	},
+	gateway_quiz => {
+		name    => 'Gateway Quiz $setID',
+		parent  => 'set_list',
+		kids    => [ qw// ],
+		match   => qr|^quiz_mode/([^/]+)/|,
+		capture => [ qw/setID/ ],
+		produce => 'quiz_mode/$setID/',
+		display => 'WeBWorK::ContentGenerator::GatewayQuiz',
+	},
+	proctored_gateway_quiz => {
+		name    => 'Proctored Gateway Quiz $setID',
+		parent  => 'set_list',
+		kids    => [ qw/proctored_gateway_proctor_login/ ],
+		match   => qr|^proctored_quiz_mode/([^/]+)/|,
+		capture => [ qw/setID/ ],
+		produce => 'proctored_quiz_mode/$setID/',
+		display => 'WeBWorK::ContentGenerator::GatewayQuiz',
+	},
+	proctored_gateway_proctor_login => {
+		name    => 'Proctored Gateway Quiz $setID Proctor Login',
+		parent  => 'proctored_gateway_quiz',
+		kids    => [ qw// ],
+		match   => qr|^proctored_quiz_mode/([^/]+)/|,
+		capture => [ qw/setID/ ],
+		produce => 'proctored_quiz_mode/$setID/proctor_login',
+		display => 'WeBWorK::ContentGenerator::LoginProctor',
+	},
+	grades => {
+		name    => 'Grades',
+		parent  => 'set_list',
+		kids    => [ qw// ],
+		match   => qr|^grades/|,
+		capture => [ qw// ],
+		produce => 'grades/',
+		display => 'WeBWorK::ContentGenerator::Grades',
+	},
+	hardcopy => {
+		name    => 'Hardcopy Generator',
+		parent  => 'set_list',
+		kids    => [ qw/hardcopy_preselect_set/ ],
+		match   => qr|^hardcopy/|,
+		capture => [ qw// ],
+		produce => 'hardcopy/',
+		display => 'WeBWorK::ContentGenerator::Hardcopy',
+	},
+	hardcopy_preselect_set => {
+		name    => 'Hardcopy Generator',
+		parent  => 'hardcopy',
+		kids    => [ qw// ],
+		match   => qr|^([^/]+)/|,
+		capture => [ qw/setID/ ],
+		produce => '$setID/',
+		display => 'WeBWorK::ContentGenerator::Hardcopy',
+	},
+	logout => {
+		name    => 'Logout',
+		parent  => 'set_list',
+		kids    => [ qw// ],
+		match   => qr|^logout/|,
+		capture => [ qw// ],
+		produce => 'logout/',
+		display => 'WeBWorK::ContentGenerator::Logout',
+	},
+	options => {
+		name    => 'Password/Email',
+		parent  => 'set_list',
+		kids    => [ qw// ],
+		match   => qr|^options/|,
+		capture => [ qw// ],
+		produce => 'options/',
+		display => 'WeBWorK::ContentGenerator::Options',
+	},
+	#test => {
+	#	name    => 'Test',
+	#	parent  => 'set_list',
+	#	kids    => [ qw// ],
+	#	match   => qr|^test/|,
+	#	capture => [ qw// ],
+	#	produce => 'test/',
+	#	display => 'WeBWorK::ContentGenerator::Test',
+	#},
+	#render => {
+	#	name    => 'Render',
+	#	parent  => 'set_list',
+	#	kids    => [ qw// ],
+	#	match   => qr|^render/|,
+	#	capture => [ qw// ],
+	#	produce => 'render/',
+	#	display => 'WeBWorK::ContentGenerator::ProblemRenderer',
+	#},
+	
+	################################################################################
+	
+	instructor_tools => {
+		name    => 'Instructor Tools',
+		parent  => 'set_list',
+		kids    => [ qw/instructor_user_list instructor_set_list instructor_add_users
+			instructor_set_assigner instructor_file_manager
+			instructor_problem_editor instructor_set_maker instructor_set_maker2 instructor_get_target_set_problems instructor_get_library_set_problems instructor_compare
+			instructor_config
+			instructor_scoring instructor_scoring_download instructor_mail_merge
+			instructor_answer_log instructor_preflight instructor_statistics
+			instructor_progress			
+		/ ],
+		match   => qr|^instructor/|,
+		capture => [ qw// ],
+		produce => 'instructor/',
+		display => 'WeBWorK::ContentGenerator::Instructor::Index',
+	},
+	
+	################################################################################
+	
+	instructor_user_list => {
+		name    => 'Classlist Editor',
+		parent  => 'instructor_tools',
+		kids    => [ qw/instructor_user_detail/ ],
+		match   => qr|^users/|,
+		capture => [ qw// ],
+		produce => 'users/',
+		display => 'WeBWorK::ContentGenerator::Instructor::UserList',
+	},
+	instructor_user_detail => {
+		name    => 'Sets assigned to $userID',
+		parent  => 'instructor_user_list',
+		kids    => [ qw/instructor_sets_assigned_to_user/ ],
+		match   => qr|^([^/]+)/|,
+		capture => [ qw/userID/ ],
+		produce => '$userID/',
+		display => 'WeBWorK::ContentGenerator::Instructor::UserDetail',
+	},
+	instructor_sets_assigned_to_user => {
+		name    => 'Sets Assigned to User',
+		parent  => 'instructor_user_detail',
+		kids    => [ qw// ],
+		match   => qr|^sets/|,
+		capture => [ qw// ],
+		produce => 'sets/',
+		display => 'WeBWorK::ContentGenerator::Instructor::SetsAssignedToUser',
+	},
+	
+	################################################################################
+	
+	instructor_set_list => {
+		name    => 'Hmwk Sets Editor',
+		parent  => 'instructor_tools',
+		kids    => [ qw/instructor_set_detail/ ],
+		match   => qr|^sets/|,
+		capture => [ qw// ],
+		produce => 'sets/',
+		display => 'WeBWorK::ContentGenerator::Instructor::ProblemSetList',
+	},
+	instructor_set_detail => {
+		name    => 'Set Detail for set $setID',
+		parent  => 'instructor_set_list',
+		kids    => [ qw/instructor_users_assigned_to_set/ ],
+		match   => qr|^([^/]+)/|,
+		capture => [ qw/setID/ ],
+		produce => '$setID/',
+		display => 'WeBWorK::ContentGenerator::Instructor::ProblemSetDetail',
+	},
+	instructor_users_assigned_to_set => {
+		name    => 'Users Assigned to Set $setID',
+		parent  => 'instructor_set_detail',
+		kids    => [ qw// ],
+		match   => qr|^users/|,
+		capture => [ qw// ],
+		produce => 'users/',
+		display => 'WeBWorK::ContentGenerator::Instructor::UsersAssignedToSet',
+	},
+	
+	################################################################################
+	
+	instructor_add_users => {
+		name    => 'Add Users',
+		parent  => 'instructor_tools',
+		kids    => [ qw// ],
+		match   => qr|^add_users/|,
+		capture => [ qw// ],
+		produce => 'add_users/',
+		display => 'WeBWorK::ContentGenerator::Instructor::AddUsers',
+	},
+	instructor_set_assigner => {
+		name    => 'Set Assigner',
+		parent  => 'instructor_tools',
+		kids    => [ qw// ],
+		match   => qr|^assigner/|,
+		capture => [ qw// ],
+		produce => 'assigner/',
+		display => 'WeBWorK::ContentGenerator::Instructor::Assigner',
+	},
+	instructor_config => {
+		name    => 'Course Configuration',
+		parent  => 'instructor_tools',
+		kids    => [ qw// ],
+		match   => qr|^config/|,
+		capture => [ qw// ],
+		produce => 'config/',
+		display => 'WeBWorK::ContentGenerator::Instructor::Config',
+	},
+	instructor_compare => {
+		name    => 'File Compare',
+		parent  => 'instructor_tools',
+		kids    => [ qw// ],
+		match   => qr|^compare/|,
+		capture => [ qw// ],
+		#produce => 'comp/',
+		produce => 'compare/',
+		display => 'WeBWorK::ContentGenerator::Instructor::Compare',
+	},
+	instructor_set_maker => {
+		name    => 'Library Browser',
+		parent  => 'instructor_tools',
+		kids    => [ qw// ],
+		match   => qr|^setmaker/|,
+		capture => [ qw// ],
+		produce => 'setmaker/',
+		display => 'WeBWorK::ContentGenerator::Instructor::SetMaker',
+	},
+	instructor_set_maker2 => {
+		name    => 'Library Browser 2',
+		parent  => 'instructor_tools',
+		kids    => [ qw// ],
+		match   => qr|^setmaker2/|,
+		capture => [ qw// ],
+		produce => 'setmaker2/',
+		display => 'WeBWorK::ContentGenerator::Instructor::SetMaker2',
+	},
+	instructor_get_target_set_problems => {
+		name    => 'Get Target Set Problems',
+		parent  => 'instructor_tools',
+		kids    => [ qw// ],
+		match   => qr|^GetTargetSetProblems/|,
+		capture => [ qw// ],
+		produce => 'GetTargetSetProblems/',
+		display => 'WeBWorK::ContentGenerator::Instructor::GetTargetSetProblems',
+	},
+	instructor_get_library_set_problems => {
+		name    => 'Get Library Set Problems',
+		parent  => 'instructor_tools',
+		kids    => [ qw// ],
+		match   => qr|^GetLibrarySetProblems/|,
+		capture => [ qw// ],
+		produce => 'GetLibrarySetProblems/',
+		display => 'WeBWorK::ContentGenerator::Instructor::GetLibrarySetProblems',
+	},
+	instructor_file_manager => {
+		name    => 'File Manager',
+		parent  => 'instructor_tools',
+		kids    => [ qw// ],
+		match   => qr|^file_manager/|,
+		capture => [ qw// ],
+		produce => 'file_manager/',
+		display => 'WeBWorK::ContentGenerator::Instructor::FileManager',
+	},
+	instructor_problem_editor => {
+		name    => 'Problem Editor',
+		parent  => 'instructor_tools',
+		kids    => [ qw/instructor_problem_editor_withset/ ],
+		match   => qr|^pgProblemEditor/|,
+		capture => [ qw// ],
+		produce => 'pgProblemEditor/',
+		display => 'WeBWorK::ContentGenerator::Instructor::PGProblemEditor',
+	},
+	instructor_problem_editor_withset => {
+		name    => '$setID',
+		parent  => 'instructor_problem_editor',
+		kids    => [ qw/instructor_problem_editor_withset_withproblem/ ],
+		match   => qr|^([^/]+)/|,
+		capture => [ qw/setID/ ],
+		produce => '$setID/',
+		display => undef,
+	},
+	instructor_problem_editor_withset_withproblem => {
+		name    => '$problemID',
+		parent  => 'instructor_problem_editor_withset',
+		kids    => [ qw// ],
+		match   => qr|^([^/]+)/|,
+		capture => [ qw/problemID/ ],
+		produce => '$problemID/',
+		display => 'WeBWorK::ContentGenerator::Instructor::PGProblemEditor',
+	},
+	instructor_scoring => {
+		name    => 'Scoring Tools',
+		parent  => 'instructor_tools',
+		kids    => [ qw// ],
+		match   => qr|^scoring/|,
+		capture => [ qw// ],
+		produce => 'scoring/',
+		display => 'WeBWorK::ContentGenerator::Instructor::Scoring',
+	},
+	instructor_scoring_download => {
+		name    => 'Scoring Download',
+		parent  => 'instructor_tools',
+		kids    => [ qw// ],
+		match   => qr|^scoringDownload/|,
+		capture => [ qw// ],
+		produce => 'scoringDownload/',
+		display => 'WeBWorK::ContentGenerator::Instructor::ScoringDownload',
+	},
+	instructor_mail_merge => {
+		name    => 'Email',
+		parent  => 'instructor_tools',
+		kids    => [ qw// ],
+		match   => qr|^send_mail/|,
+		capture => [ qw// ],
+		produce => 'send_mail/',
+		display => 'WeBWorK::ContentGenerator::Instructor::SendMail',
+	},
+	instructor_answer_log => {
+		name    => 'Answer Log',
+		parent  => 'instructor_tools',
+		kids    => [ qw// ],
+		match   => qr|^show_answers/|,
+		capture => [ qw// ],
+		produce => 'show_answers/',
+		display => 'WeBWorK::ContentGenerator::Instructor::ShowAnswers',
+	},
+	instructor_preflight => {
+		name    => 'Preflight Log',
+		parent  => 'instructor_tools',
+		kids    => [ qw// ],
+		match   => qr|^preflight/|,
+		capture => [ qw// ],
+		produce => 'preflight/',
+		display => 'WeBWorK::ContentGenerator::Instructor::Preflight',
+	},
+	
+	################################################################################
+	
+	instructor_statistics => {
+		name    => 'Statistics',
+		parent  => 'instructor_tools',
+		kids    => [ qw/instructor_set_statistics instructor_user_statistics/ ],
+		match   => qr|^stats/|,
+		capture => [ qw// ],
+		produce => 'stats/',
+		display => 'WeBWorK::ContentGenerator::Instructor::Stats',
+	},
+	instructor_set_statistics => {
+		name    => 'Statistics',
+		parent  => 'instructor_statistics',
+		kids    => [ qw// ],
+		match   => qr|^(set)/([^/]+)/|,
+		capture => [ qw/statType setID/ ],
+		produce => 'set/$setID/',
+		display => 'WeBWorK::ContentGenerator::Instructor::Stats',
+	},
+	instructor_user_statistics => {
+		name    => 'Statistics',
+		parent  => 'instructor_statistics',
+		kids    => [ qw// ],
+		match   => qr|^(student)/([^/]+)/|,
+		capture => [ qw/statType userID/ ],
+		produce => 'student/$userID/',
+		display => 'WeBWorK::ContentGenerator::Instructor::Stats',
+	},
+	
+	################################################################################
+	
+	instructor_progress => {
+		name    => 'Student Progress',
+		parent  => 'instructor_tools',
+		kids    => [ qw/instructor_set_progress instructor_user_progress/ ],
+		match   => qr|^progress/|,
+		capture => [ qw// ],
+		produce => 'progress/',
+		display => 'WeBWorK::ContentGenerator::Instructor::StudentProgress',
+	},
+	instructor_set_progress => {
+		name    => 'Student Progress',
+		parent  => 'instructor_progress',
+		kids    => [ qw// ],
+		match   => qr|^(set)/([^/]+)/|,
+		capture => [ qw/statType setID/ ],
+		produce => 'set/$setID/',
+		display => 'WeBWorK::ContentGenerator::Instructor::StudentProgress',
+	},
+	instructor_user_progress => {
+		name    => 'Student Progress',
+		parent  => 'instructor_progress',
+		kids    => [ qw// ],
+		match   => qr|^(student)/([^/]+)/|,
+		capture => [ qw/statType userID/ ],
+		produce => 'student/$userID/',
+		display => 'WeBWorK::ContentGenerator::Instructor::StudentProgress',
+	},
+	
+	################################################################################
+	
+	problem_list => {
+		name    => '$setID',
+		parent  => 'set_list',
+		kids    => [ qw/problem_detail/ ],
+		match   => qr|^([^/]+)/|,
+		capture => [ qw/setID/ ],
+		produce => '$setID/',
+		display => 'WeBWorK::ContentGenerator::ProblemSet',
+	},
+	problem_detail => {
+		name    => '$problemID',
+		parent  => 'problem_list',
+		kids    => [ qw// ],
+		match   => qr|^([^/]+)/|,
+		capture => [ qw/problemID/ ],
+		produce => '$problemID/',
+		display => 'WeBWorK::ContentGenerator::Problem',
+	},
+	
+);
+
+=for comment
+
+a handy template:
+
+	id => {
+		name    => '',
+		parent  => '',
+		kids    => [ qw// ],
+		match   => qr|^/|,
+		capture => [ qw// ],
+		produce => '',
+		display => '',
+	},
+
+=cut
+
+################################################################################
+
+=head1 CONSTRUCTORS
+
+=over
+
+=item new(%fields)
+
+Creates a new WeBWorK::URLPath. %fields may contain the following:
+
+ type => the internal path type associated with this 
+ args => a reference to a hash associating path arguments with values
+
+This constructor is used internally. Refer to newFromPath() and newFromModule()
+for more useful constructors.
+
+=cut
+
+sub new {
+	my ($invocant, %fields) = @_;
+	my $class = ref $invocant || $invocant;
+	my $self = {
+		type => undef,
+		r    => undef,             # will point to the parent request object (for access to the $ce)
+		args => {},
+		%fields,
+	};
+	return bless $self, $class;
+}
+
+=item newFromPath($path)
+
+Creates a new WeBWorK::URLPath by parsing the path given in $path. It the path
+is invalid, an exception is thrown.
+
+=cut
+
+sub newFromPath {
+	my ($invocant,  $path, $r) = @_;
+	
+	my ($type, %args) = getPathType($path);
+	croak "no type matches path $path" unless $type;
+	croak "URLPath requires a request object parent as second element" unless (ref($r) =~/WeBWorK::Request/);
+	
+	return $invocant->new(
+		type => $type,
+		r    => $r,             # will point to the parent request object (for access to the $ce)
+		args => \%args,
+	);
+}
+
+=item newFromModule($module,  $r, %args)
+
+Creates a new WeBWorK::URLPath by finding a path type which matches the module
+and path arguments given. If no type matches, an exception is thrown.
+
+=cut
+
+sub newFromModule {
+	my ($invocant, $module, $r, %args) = @_;
+	
+	my $type = getModuleType($module, keys %args);
+	croak "URLPath requires a request object parent as second element" unless (ref($r) =~/WeBWorK::Request/);
+	croak "no type matches module $module with args", map { " $_=>$args{$_}" } keys %args unless $type;
+	
+	return $invocant->new(
+		type => $type,
+		r    => $r,
+		args => \%args
+	);
+}
+
+=back
+
+=cut
+
+################################################################################
+
+=head1 METHODS
+
+=head2 Methods that return information from the object itself
+
+=over
+
+=item type()
+
+Returns the path type of the WeBWorK::URLPath.
+
+=cut
+
+sub type {
+	my ($self) = @_;
+	my $type = $self->{type};
+	
+	return $type;
+}
+
+=item args()
+
+Returns a hash of arguments derived from the WeBWorK::URLPath.
+
+=cut
+
+sub args {
+	my ($self) = @_;
+	my %args = %{ $self->{args} };
+	
+	return %args;
+}
+
+=item arg($name)
+
+Returns the named argument, as derived from the WeBWorK::URLPath.
+
+=cut
+
+sub arg {
+	my ($self, $name) = @_;
+	my %args = %{ $self->{args} };
+	
+	return $args{$name};
+}
+
+=back
+
+=cut
+
+# ------------------------------------------------------------------------------
+
+=head2 Methods that return information from path node associated with the object
+
+=over
+
+=item name()
+
+Returns the human-readable name of this WeBWorK::URLPath.
+
+=cut
+
+sub name {
+	my ($self) = @_;
+	my $type = $self->{type};
+	my %args = $self->args;
+	
+	my $name = $pathTypes{$type}->{name};
+	$name = $self->{r}->maketext($name);   # translate the display name
+	$name = interpolate($name, %args);
+	
+	return $name;
+}
+
+=item module()
+
+Returns the name of the module that will handle this WeBWorK::URLPath.
+
+=cut
+
+sub module {
+	my ($self) = @_;
+	my $type = $self->{type};
+	
+	return $pathTypes{$type}->{display};
+}
+
+=back
+
+=cut
+
+# ------------------------------------------------------------------------------
+
+=head2 Methods that search the virtual heirarchy
+
+=over
+
+=item parent()
+
+Returns a new WeBWorK::URLPath representing the parent of the current URLPath.
+Returns an undefined value if the URLPath has no parent.
+
+=cut
+
+sub parent {
+	my ($self) = @_;
+	my $type = $self->{type};
+	
+	my $newType = $pathTypes{$self->{type}}->{parent};
+	return undef unless $newType;
+	
+	# remove any arguments added by the current node (and therefore not needed by the parent)
+	my @currArgs = @{ $pathTypes{$type}->{capture} };
+	my %newArgs = %{ $self->{args} };
+	delete @newArgs{@currArgs} if @currArgs;
+	# use the same request object "parent" for parent URLPath as for the child
+	return $self->new(type => $newType, r => $self->{r}, args => \%newArgs);
+}
+
+=item child($module, %newArgs)
+
+Returns a new WeBWorK::URLPath representing the child of the current URLPath
+whose module is C<$module>. If no child matches, an undefined value is returned.
+Pass additional arguments needed by the child in C<%newArgs>.
+
+=cut
+
+sub child {
+	my ($self, $module, %newArgs) = @_;
+	my $type = $self->{type};
+	
+	my @kids = @{ $pathTypes{$type}->{kids} };
+	my $newType;
+	foreach my $kid (@kids) {
+		if ($pathTypes{$kid}->{module} eq $module) {
+			$newType = $kid;
+			last;
+		}
+	}
+	
+	if ($newType) {
+		return $self->new(type => $newType, args => \%newArgs);
+	} else {
+		return undef;
+	}
+}
+
+=item path()
+
+Reconstructs the path string from a WeBWorK::URLPath.
+
+=cut
+
+sub path {
+	my ($self) = @_;
+	my $type = $self->type;
+	my %args = %{ $self->{args} };
+	
+	my $path = buildPathFromType($type);
+	$path = interpolate($path, %args);
+	
+	return $path;
+}
+
+=back
+
+=cut
+
+
+
+################################################################################
+
+=head1 UTILITY FUNCTIONS
+
+=over
+
+=item all_modules()
+
+Return a list of the display modules associated with all possible path types.
+
+=cut
+
+sub all_modules {
+	my @modules = grep { defined } map { $pathTypes{$_}{display} } keys %pathTypes;
+	my %modules; @modules{@modules} = (); # remove duplicates
+	return keys %modules;
+}
+
+=item interpolate($string, %symbols)
+
+Replaces simple scalars (\$\w+) in $string with values in %symbols. If a scalar
+does not exist in %symbols, it is left alone.
+
+=cut
+
+sub interpolate {
+	my ($string, %symbols) = @_;
+	
+	$string =~ s/\$(\w+)/exists $symbols{$1} ? $symbols{$1} : "\$$1"/eg;
+	
+	return $string;
+}
+
+=back
+
+=cut
+
+# ------------------------------------------------------------------------------
+
+=over
+
+=item getPathType($path)
+
+Parse the string $path, determining the path type. Returns ($type, %args), where
+$type is the type of the path and %args contains any extracted path arguments.
+If conversion fails, a false value is returned.
+
+=cut
+
+sub getPathType($) {
+	my ($path) = @_;
+	
+	my %args;
+	my $context = visitPathTypeNode("root", $path, \%args, 0);
+	
+	return $context, %args;
+}
+
+=item getModuleType($module, @args)
+
+Returns the path type matching the given module and argument names, or a false
+value if no type matches.
+
+=cut
+
+sub getModuleType {
+	my ($module, @args) = @_;
+	@args = sort @args;
+	my %args;
+	@args{@args} = ();
+	
+	NODE: foreach my $nodeID (keys %pathTypes) {
+		my $node = $pathTypes{$nodeID};
+		
+		# module name matches?
+		next NODE unless defined $node->{display} and $node->{display} eq $module;
+		
+		# collect all captures from here to root
+		my @captures;
+		my $tmpNodeID = $nodeID;
+		while ($tmpNodeID) {
+			my $tmpNode = $pathTypes{$tmpNodeID};
+			push @captures, @{ $tmpNode->{capture} };
+			$tmpNodeID = $tmpNode->{parent};
+		}
+		
+		# same number of captures?
+		next NODE unless @captures == @args;
+		
+		# same captures?
+		@captures = sort @captures;
+		for (my $i = 0; $i < @args; $i++) {
+			next NODE unless $args[$i] eq $captures[$i];
+		}
+		
+		# if we got here, this node matches
+		return $nodeID;
+	}
+	
+	return 0; # no node matches
+}
+
+=item buildPathFromType($type)
+
+Returns a string path for the given path type. Since arguments are not supplied,
+the string may contain scalar variables ripe for interpolation.
+
+=cut
+
+sub buildPathFromType($) {
+	my ($type) = @_;
+	
+	my $path = "";
+	
+	while ($type) {
+		$path = $pathTypes{$type}->{produce} . $path;
+		$type = $pathTypes{$type}->{parent};
+	};
+	
+	return $path;
+}
+
+=item visitPathTypeNode($nodeID, $path, $argsRef, $indent)
+
+Internal search function. See getPathType().
+
+Returns the nodeID of the node that consumed the final characters in $path, or
+the following failure conditions:
+
+Returns 0 if $nodeID doesn't match $path.
+
+Returns -1 if $nodeID matched $path, but no children of $nodeID consumed the
+remaining path. In this case, the stack is unwound immediately.
+
+=cut
+
+sub visitPathTypeNode($$$$);
+
+sub visitPathTypeNode($$$$) {
+	my ($nodeID, $path, $argsRef, $indent) = @_;
+	debug("visitPathTypeNode", $indent, "visiting node $nodeID with path $path");
+	
+	unless (exists $pathTypes{$nodeID}) {
+		debug("visitPathTypeNode", $indent, "node $nodeID doesn't exist in node list: failed");
+		die "node $nodeID doesn't exist in node list: failed";
+	}
+	
+	my %node = %{ $pathTypes{$nodeID} };
+	my $match = $node{match};
+	my @capture_names = @{ $node{capture} };
+	
+	# attempt to match $path against $match.
+	debug("visitPathTypeNode", $indent, "trying to match $match: ");
+	if ($path =~ s/($match)//) {
+		# it matches! store captured strings in $argsRef and remove the matched
+		# characters from $path. waste a lot of lines on sanity checking... ;)
+		debug("", 0, "success!");
+		my @capture_values = $1 =~ m/$match/;
+		if (@capture_names) {
+			my $nexpected = @capture_names;
+			my $ncaptured = @capture_values;
+			my $max = $nexpected > $ncaptured ? $nexpected : $ncaptured;
+			warn "captured $ncaptured arguments, expected $nexpected." unless $ncaptured == $nexpected;
+			for (my $i = 0; $i < $max; $i++) {
+				my $name = $capture_names[$i];
+				my $value = $capture_values[$i];
+				if ($i > $nexpected) {
+					warn "captured an unexpected argument: $value -- ignoring it.";
+					next;
+				}
+				if ($i > $ncaptured) {
+					warn "expected an uncaptured argument named: $name -- ignoring it.";
+					next;
+				}
+				if (exists $argsRef->{$name}) {
+					my $old = $argsRef->{$name};
+					warn "encountered argument $name again, old value: $old new value: $value -- replacing.";
+				}
+				debug("visitPathTypeNode", $indent, "setting argument $name => $value.");
+				$argsRef->{$name} = $value;
+			}
+		}
+	} else {
+		# it doesn't match. bail out now with return value 0
+		debug("", 0, "failed.");
+		return 0;
+	}
+	
+	##### if we're here we matched #####
+	
+	# if there's no more path left, then this node is the one! return $nodeID
+	if ($path eq "") {
+		debug("visitPathTypeNode", $indent, "no path left, type is $nodeID");
+		return $nodeID;
+	}
+	
+	# otherwise, we have to send the remaining path to the node's children
+	debug("visitPathTypeNode", $indent, "but path remains: $path");
+	my @kids = @{ $node{kids} };
+	if (@kids) {
+		foreach my $kid (@kids) {
+			debug("visitPathTypeNode", $indent, "trying child $kid:");
+			my $result = visitPathTypeNode($kid, $path, $argsRef, $indent+1);
+			# we return in two situations:
+			# if $result is -1, then the kid matched but couldn't consume the rest of the path
+			# if $result is the ID of a node, then the kid matched and consumed the rest of the path
+			# these are all true values (assuming that "0" isn't a valid node ID), so we say:
+			return $result if $result;
+		}
+		debug("visitPathTypeNode", $indent, "no children claimed the remaining path: failed.");
+	} else {
+		debug("visitPathTypeNode", $indent, "no children to claim the remaining path: failed.");
+	}
+	
+	# in both of the above cases, we matched but couldn't provide children that
+	# would consume the rest of the path. so we return -1, causing the whole
+	# stack to unwind. WHEEEEEEE!
+	return -1;
+}
+
+=back
+
+=cut
+
+1;
diff --git a/lib/WeBWorK/Upload.pm b/lib/WeBWorK/Upload.pm
index 598eb74388..7e452a6806 100644
--- a/lib/WeBWorK/Upload.pm
+++ b/lib/WeBWorK/Upload.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/Upload.pm,v 1.7 2006/01/25 23:13:51 sh002i 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
diff --git a/lib/WeBWorK/Utils.pm b/lib/WeBWorK/Utils.pm
index 0796087a24..76a55986aa 100644
--- a/lib/WeBWorK/Utils.pm
+++ b/lib/WeBWorK/Utils.pm
@@ -1,7 +1,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader$
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/Utils.pm,v 1.83 2009/07/12 23:48:00 gage 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
@@ -26,44 +26,101 @@ WeBWorK::Utils - useful utilities used by other WeBWorK modules.
 use strict;
 use warnings;
 #use Apache::DB;
-use Date::Format;
+use DateTime;
 use Date::Parse;
+use Date::Format;
+use File::Copy;
+use File::Spec;
+use Time::Zone;
+use MIME::Base64;
 use Errno;
 use File::Path qw(rmtree);
+use Storable;
+use Carp;
 
 use constant MKDIR_ATTEMPTS => 10;
 
+# "standard" WeBWorK date/time format (for set definition files):
+#     %m/%d/%y at %I:%M%P
+# where:
+#     %m = month number, starting with 01
+#     %d = numeric day of the month, with leading zeros (eg 01..31)
+#     %Y = year (4 digits)
+#     %I = hour, 12 hour clock, leading 0's)
+#     %M = minute, leading 0's
+#     %P = am or pm (Yes %p and %P are backwards :)
+use constant DATE_FORMAT => "%m/%d/%Y at %I:%M%P %Z";
+
 our @EXPORT    = ();
 our @EXPORT_OK = qw(
-	runtime_use
-	readFile
-	readDirectory
+	after
+	before
+	between
+	constituency_hash
+	cryptPassword
+	decodeAnswers
+	dequote
+	encodeAnswers
+	fisher_yates_shuffle
 	formatDateTime
-	parseDateTime
-	writeLog
-	writeCourseLog
-	writeTimingLogEntry
+	has_aux_files
+	intDateTime
 	list2hash
+	listFilesRecursive
+	makeTempDirectory
 	max
-	dbDecode
-	dbEncode
-	decodeAnswers
-	encodeAnswers
+	not_blank
+	parseDateTime
+	path_is_subdir
+	pretty_print_rh
+	readDirectory
+	readFile
 	ref2string
-	sortByName
-	makeTempDirectory
 	removeTempDirectory
-	pretty_print_rh
-	cryptPassword
+	runtime_use
+	sortByName
+	surePathToFile
+	textDateTime
+	timeToSec
+	trim_spaces
+	undefstr
+	writeCourseLog
+	writeLog
+	writeTimingLogEntry
 );
 
-sub runtime_use($) {
-	return unless @_;
-	eval "package Main; require $_[0]; import $_[0]";
+=head1 FUNCTIONS
+
+=cut
+
+################################################################################
+# Lowlevel thingies
+################################################################################
+
+# This is like use, except it happens at runtime. You have to quote the module name and put a
+# comma after it if you're specifying an import list. Also, to specify an empty import list (as
+# opposed to no import list) use an empty arrayref instead of an empty array.
+# 
+#   use Xyzzy;               =>    runtime_use "Xyzzy";
+#   use Foo qw/pine elm/;    =>    runtime_use "Foo", qw/pine elm/;
+#   use Foo::Bar ();         =>    runtime_use "Foo::Bar", [];
+
+sub runtime_use($;@) {
+	my ($module, @import_list) = @_;
+	my $package = (caller)[0]; # import into caller's namespace
+	
+	my $import_string;
+	if (@import_list == 1 and ref $import_list[0] eq "ARRAY" and @{$import_list[0]} == 0) {
+		$import_string = "";
+	} else {
+		# \Q = quote metachars \E = end quoting
+		$import_string = "import $module " . join(",", map { qq|"\Q$_\E"| } @import_list);
+	}
+	eval "package $package; require $module; $import_string";
 	die $@ if $@;
 }
 
-#sub backtrace {
+#sub backtrace($) {
 #	my ($style) = @_;
 #	$style = "warn" unless $style;
 #	my @bt = DB->backtrace;
@@ -79,6 +136,24 @@ sub runtime_use($) {
 #	}
 #}
 
+################################################################################
+# Filesystem interaction
+################################################################################
+
+=head2 Filesystem interaction
+
+=over
+
+=cut
+
+# Convert Windows and Mac (classic) line endings to UNIX line endings in a string.
+# Windows uses CRLF, Mac uses CR, UNIX uses LF. (CR is ASCII 15, LF if ASCII 12)
+sub force_eoln($) {
+	my ($string) = @_;
+	$string =~ s/\015\012?/\012/g;
+	return $string;
+}
+
 sub readFile($) {
 	my $fileName = shift;
 	local $/ = undef; # slurp the whole thing into one string
@@ -86,7 +161,7 @@ sub readFile($) {
 		or die "failed to read file $fileName: $!";
 	my $result = <$dh>;
 	close $dh;
-	return $result;
+	return force_eoln($result);
 }
 
 sub readDirectory($) {
@@ -98,26 +173,525 @@ sub readDirectory($) {
 	return @result;
 }
 
-sub formatDateTime($) {
-	my $dateTime = shift;
-	# "standard" WeBWorK date/time format (for set definition files):
-	# %m 	month number, starting with 01
-	# %d 	numeric day of the month, with leading zeros (eg 01..31)
-	# %y	year (2 digits)
-	# %I 	hour, 12 hour clock, leading 0's)
-	# %M 	minute, leading 0's
-	# %P 	am or pm (Yes %p and %P are backwards :)
-	#return time2str("%m/%d/%y %I:%M%P", $dateTime); 
-	return time2str("%m/%d/%y at %I:%M%P", $dateTime);
+=item @matches = listFilesRecusive($dir, $match_qr, $prune_qr, $match_full, $prune_full)
+
+Traverses the directory tree rooted at $dir, returning a list of files, named
+pipes, and sockets matching the regular expression $match_qr. Directories
+matching the regular expression $prune_qr are not visited.
+
+$match_full and $prune_full are boolean values that indicate whether $match_qr
+and $prune_qr, respectively, should be applied to the bare directory entry
+(false) or to the path to the directory entry relative to $dir.
+
+@matches is a list of paths relative to $dir.
+
+=cut
+
+sub listFilesRecursiveHelper($$$$$$);
+sub listFilesRecursive($;$$$$) {
+	my ($dir, $match_qr, $prune_qr, $match_full, $prune_full) = @_;
+	return listFilesRecursiveHelper($dir, "", $match_qr, $prune_qr, $match_full, $prune_full);
+}
+
+sub listFilesRecursiveHelper($$$$$$) {
+	my ($base_dir, $curr_dir, $match_qr, $prune_qr, $match_full, $prune_full) = @_;
+	
+	my $full_dir = "$base_dir/$curr_dir";
+	
+	my @dir_contents = readDirectory($full_dir);
+	
+	my @matches;
+	
+	foreach my $dir_entry (@dir_contents) {
+		my $full_path = "$full_dir/$dir_entry";
+		
+		# determine whether the entry is a directory or a file, taking into account the 
+		my $is_dir;
+		my $is_file;
+		if (-l $full_path) {
+			my $link_target = "$full_dir/" . readlink $full_path;
+			if ($link_target) {
+				$is_dir = -d $link_target;
+				$is_file = !$is_dir && -f $link_target || -p $link_target || -S $link_target;
+			} else {
+				warn "Couldn't resolve symlink $full_path: $!";
+			}
+		} else {
+			$is_dir = -d $full_path;
+			$is_file = !$is_dir && -f $full_path || -p $full_path || -S $full_path;
+		}
+		
+		if ($is_dir) {
+			# standard things to skip
+			next if $dir_entry eq ".";
+			next if $dir_entry eq "..";
+			
+			# skip unreadable directories (and broken symlinks, incidentally)
+			unless (-r $full_path) {
+				warn "Directory/symlink $full_path not readable";
+				next;
+			}
+			
+			# check $prune_qr
+			my $subdir = ($curr_dir eq "") ? $dir_entry : "$curr_dir/$dir_entry";
+			if (defined $prune_qr) {
+				my $prune_string = $prune_full ? $subdir : $dir_entry;
+				next if $prune_string =~ m/$prune_qr/;
+			}
+			
+			# everything looks good, time to recurse!
+			push @matches, listFilesRecursiveHelper($base_dir, $subdir, $match_qr, $prune_qr, $match_full, $prune_full);
+		} elsif ($is_file) {
+			my $file = ($curr_dir eq "") ? $dir_entry : "$curr_dir/$dir_entry";
+			my $match_string = $match_full ? $file : $dir_entry;
+			if (not defined $match_string or $match_string =~ m/$match_qr/) {
+				push @matches, $file;
+			}
+		} else {
+			# otherwise, it's a character device or a block device, and i don't
+			# suppose we want anything to do with those ;-)
+		}
+	}
+	
+	return @matches;
+}
+
+# A very useful macro for making sure that all of the directories to a file have
+# been constructed.
+sub surePathToFile($$) {
+	# constructs intermediate directories enroute to the file 
+	# the input path must be the path relative to this starting directory
+	my $start_directory = shift;
+	my $path = shift;
+	my $delim = "/"; 
+	unless ($start_directory and $path ) {
+		warn "missing directory<br> surePathToFile  start_directory   path ";
+		return '';
+	}
+	# use the permissions/group on the start directory itself as a template
+	my ($perms, $groupID) = (stat $start_directory)[2,5];
+	#warn "&urePathToTmpFile: perms=$perms groupID=$groupID\n";
+	
+	# if the path starts with $start_directory (which is permitted but optional) remove this initial segment
+	$path =~ s|^$start_directory|| if $path =~ m|^$start_directory|;
+
+	
+	# find the nodes on the given path
+        my @nodes = split("$delim",$path);
+	
+	# create new path
+	$path = $start_directory; #convertPath("$tmpDirectory");
+	
+	while (@nodes>1) {  # the last node is the file name
+		$path = $path . shift (@nodes) . "/"; #convertPath($path . shift (@nodes) . "/");
+		#FIXME  this make directory command may not be fool proof.
+		unless (-e $path) {
+			mkdir($path, $perms)
+				or warn "Failed to create directory $path with start directory $start_directory ";
+		}
+
+	}
+	
+	$path = $path . shift(@nodes); #convertPath($path . shift(@nodes));
+	return $path;
+}
+
+sub makeTempDirectory($$) {
+	my ($parent, $basename) = @_;
+	# Loop until we're able to create a directory, or it fails for some
+	# reason other than there already being something there.
+	my $triesRemaining = MKDIR_ATTEMPTS;
+	my ($fullPath, $success);
+	do {
+		my $suffix = join "", map { ('A'..'Z','a'..'z','0'..'9')[int rand 62] } 1 .. 8;
+		$fullPath = "$parent/$basename.$suffix";
+		$success = mkdir $fullPath;
+	} until ($success or not $!{EEXIST});
+	die "Failed to create directory $fullPath: $!"
+		unless $success;
+	return $fullPath;
+}
+
+sub removeTempDirectory($) {
+	my ($dir) = @_;
+	rmtree($dir, 0, 0);
+}
+
+=item path_is_subdir($path, $dir, $allow_relative)
+
+Ensures that $path refers to a location "inside" $dir. If $allow_relative is
+true and $path is not absoulte, it is assumed to be relative to $dir.
+
+The method of checking is rather rudimentary at the moment. First, upreferences
+("..") are disallowed, in $path, then it is checked to make sure that some
+prefix of it matches $dir.
+
+If either of these checks fails, a false value is returned. Otherwise, a true
+value is returned.
+
+=cut
+
+sub path_is_subdir($$;$) {
+	my ($path, $dir, $allow_relative) = @_;
+	
+	unless ($path =~ /^\//) {
+		if ($allow_relative) {
+			$path = "$dir/$path";
+		} else {
+			return 0;
+		}
+	}
+	
+	$path = File::Spec->canonpath($path);
+	$path .= "/" unless $path =~ m|/$|;
+	return 0 if $path =~ m#(^\.\.$|^\.\./|/\.\./|/\.\.$)#;
+	
+	$dir = File::Spec->canonpath($dir);
+	$dir .= "/" unless $dir =~ m|/$|;
+	return 0 unless $path =~ m|^$dir|;
+	
+	return 1;
+}
+
+=back
+
+=cut
+
+################################################################################
+# Date/time processing
+################################################################################
+
+=head2 Date/time processing
+
+=over
+
+=item $dateTime = parseDateTime($string, $display_tz)
+
+Parses $string as a datetime. If $display_tz is given, $string is assumed to be
+in that timezone. Otherwise, the server's timezone is used. The result,
+$dateTime, is an integer UNIX datetime (epoch) in the server's timezone.
+
+=cut
+
+# This is a modified version of the subroutine of the same name from WeBWorK
+# 1.9.05's scripts/FILE.pl (v1.13). It has been modified to understand time
+# zones. The time zone specification must appear at the end of the string and be
+# preceded by whitespace. The return value is a list consisting of the following
+# elements:
+# 
+#     ($second, $minute, $hour, $day, $month, $year, $zone)
+# 
+# $second, $minute, $hour, $day, and $month are zero-indexed. $year is the
+# number of years since 1900. $zone is a string (hopefully) representing the
+# time zone.
+# 
+# Error handling has also been improved. Exceptions are now thrown for errors,
+# and more information is given about the nature of errors.
+# 
+sub unformatDateAndTime {
+	my ($string) = @_;
+	my $orgString = $string;
+	
+	$string =~ s|^\s+||;
+	$string =~ s|\s+$||;
+	$string =~ s|at| at |i; ## OK if forget to enter spaces or use wrong case
+	$string =~ s|AM| AM|i;	## OK if forget to enter spaces or use wrong case
+	$string =~ s|PM| PM|i;	## OK if forget to enter spaces or use wrong case
+	$string =~ s|,| at |;	## start translating old form of date/time to new form
+	
+	# case where the at is missing: MM/DD/YYYY at HH:MM AMPM ZONE
+	unformatDateAndTime_error($orgString, "The 'at' appears to be missing.")
+		if $string =~ m|^\s*[\/\d]+\s+[:\d]+|;
+	
+	my ($date, $at, $time, $AMPM, $TZ) = split /\s+/, $string;
+	
+	unformatDateAndTime_error($orgString, "The date and/or time appear to be missing.", $date, $time, $AMPM, $TZ)
+		unless defined $date and defined $at and defined $time;
+	
+	# deal with military time
+	unless ($time =~ /:/) {
+		{  ##bare block for 'case" structure
+			$time =~ /(\d\d)(\d\d)/;
+			my $tmp_hour = $1;
+			my $tmp_min = $2;
+			if ($tmp_hour eq '00') {$time = "12:$tmp_min"; $AMPM = 'AM';last;}
+			if ($tmp_hour eq '12') {$time = "12:$tmp_min"; $AMPM = 'PM';last;}
+			if ($tmp_hour < 12) {$time = "$tmp_hour:$tmp_min"; $AMPM = 'AM';last;}
+			if ($tmp_hour < 24) {
+				$tmp_hour = $tmp_hour - 12;
+				$time = "$tmp_hour:$tmp_min";
+				$AMPM = 'PM';
+			}
+		}  ##end of bare block for 'case" structure
+
+	}
+	
+	# default value for $AMPM
+	$AMPM = "AM" unless defined $AMPM;
+ 	
+	my ($mday, $mon, $year, $wday, $yday, $sec, $pm, $min, $hour);
+	$sec=0;
+	$time =~ /^([0-9]+)\s*\:\s*([0-9]*)/;
+	$min=$2;
+	$hour = $1;
+	unformatDateAndTime_error($orgString, "Hour must be in the range [1,12].", $date, $time, $AMPM, $TZ)
+		if $hour < 1 or $hour > 12;
+	unformatDateAndTime_error($orgString, "Minute must be in the range [0-59].", $date, $time, $AMPM, $TZ)
+		if $min < 0 or $min > 59;
+	$pm = 0;
+	$pm = 12 if ($AMPM =~/PM/ and $hour < 12);
+	$hour += $pm;
+	$hour = 0 if ($AMPM =~/AM/ and $hour == 12);
+	$date =~  m|([0-9]+)\s*/\s*([0-9]+)/\s*([0-9]+)|;
+	$mday =$2;
+	$mon=($1-1);
+	unformatDateAndTime_error($orgString, "Day must be in the range [1,31].", $date, $time, $AMPM, $TZ)
+		if $mday < 1 or $mday > 31;
+	unformatDateAndTime_error($orgString, "Month must be in the range [1,12].", $date, $time, $AMPM, $TZ)
+		if $mon < 0 or $mon > 11;
+	$year=$3;
+	$wday="";
+	$yday="";
+	return ($sec, $min, $hour, $mday, $mon, $year, $TZ);
+}
+
+sub unformatDateAndTime_error {
+	
+	if (@_ > 2) {
+		my ($orgString, $error, $date, $time, $AMPM, $TZ) = @_;
+		$date = "(undefined)" unless defined $date;
+		$time = "(undefined)" unless defined $time;
+		$AMPM = "(undefined)" unless defined $AMPM;
+		$TZ   = "(undefined)" unless defined $TZ;
+		die "Incorrect date/time format \"$orgString\": $error\n",
+			"Correct format is MM/DD/YY at HH:MM AMPM ZONE\n",
+			"\tdate = $date\n",
+			"\ttime = $time\n",
+			"\tampm = $AMPM\n",
+			"\tzone = $TZ\n";
+	} else {
+		my ($orgString, $error) = @_;
+		die "Incorrect date/time format \"$orgString\": $error\n",
+			"Correct format is MM/DD/YY at HH:MM AMPM ZONE\n";
+	}
+}
+
+sub parseDateTime($;$) {
+	my ($string, $display_tz) = @_;
+	warn "time zone not defined".caller() unless defined($display_tz);
+	$display_tz ||= "local";
+
+
+	# use WeBWorK 1 date parsing routine
+	my ($second, $minute, $hour, $day, $month, $year, $zone) = unformatDateAndTime($string);
+	my $zone_str = defined $zone ? $zone : "UNDEF";
+	#warn "\tunformatDateAndTime: $second $minute $hour $day $month $year $zone_str\n";
+	
+	# DateTime expects month 1-12, not 0-11
+	$month++;
+	
+	# Do what Time::Local does to ambiguous years
+	{
+		my $ThisYear     = (localtime())[5]; # FIXME: should be relative to $string's timezone
+		my $Breakpoint   = ($ThisYear + 50) % 100;
+		my $NextCentury  = $ThisYear - $ThisYear % 100;
+		   $NextCentury += 100 if $Breakpoint < 50;
+		my $Century      = $NextCentury - 100;
+		my $SecOff       = 0;
+		
+		if ($year >= 1000) {
+			# leave alone
+		} elsif ($year < 100 and $year >= 0) {
+			$year += ($year > $Breakpoint) ? $Century : $NextCentury;
+			$year += 1900;
+		} else {
+			$year += 1900;
+		}
+	}
+	
+	my $epoch;
+	
+	if (defined $zone and $zone ne "") {
+		if (DateTime::TimeZone->is_valid_name($zone)) {
+			#warn "\t\$zone is valid according to DateTime::TimeZone\n";
+			
+			my $dt = new DateTime(
+				year      => $year,
+				month     => $month,
+				day       => $day,
+				hour      => $hour,
+				minute    => $minute,
+				second    => $second,
+				time_zone => $zone,
+			);
+			#warn "\t\$dt = ", $dt->strftime(DATE_FORMAT), "\n";
+			
+			$epoch = $dt->epoch;
+			#warn "\t\$dt->epoch = $epoch\n";
+		} else {
+			#warn "\t\$zone is invalid according to DateTime::TimeZone, so we ask Time::Zone\n";
+			
+			# treat the date/time as UTC
+			my $dt = new DateTime(
+				year      => $year,
+				month     => $month,
+				day       => $day,
+				hour      => $hour,
+				minute    => $minute,
+				second    => $second,
+				time_zone => "UTC",
+			);
+			#warn "\t\$dt = ", $dt->strftime(DATE_FORMAT), "\n";
+			
+			# convert to an epoch value
+			my $utc_epoch = $dt->epoch
+				or die "Date/time '$string' not representable as an epoch. Get more bits!\n";
+			#warn "\t\$utc_epoch = $utc_epoch\n";
+			
+			# get offset for supplied timezone and utc_epoch
+			my $offset = tz_offset($zone, $utc_epoch) or die "Time zone '$zone' not recognized.\n";
+			#warn "\t\$zone is valid according to Time::Zone (\$offset = $offset)\n";
+			
+			#$epoch = $utc_epoch + $offset;
+			##warn "\t\$epoch = \$utc_epoch + \$offset = $epoch\n";
+			
+			$dt->subtract(seconds => $offset);
+			#warn "\t\$dt - \$offset = ", $dt->strftime(DATE_FORMAT), "\n";
+			
+			$epoch = $dt->epoch;
+			#warn "\t\$epoch = $epoch\n";
+		}
+	} else {
+		#warn "\t\$zone not supplied, using \$display_tz\n";
+		
+		my $dt = new DateTime(
+			year      => $year,
+			month     => $month,
+			day       => $day,
+			hour      => $hour,
+			minute    => $minute,
+			second    => $second,
+			time_zone => $display_tz,
+		);
+		#warn "\t\$dt = ", $dt->strftime(DATE_FORMAT), "\n";
+		
+		$epoch = $dt->epoch;
+		#warn "\t\$epoch = $epoch\n";
+	}
+	
+	return $epoch;
 }
 
-sub parseDateTime($) {
-	my $string = shift;
-	# need to bring our string from  "%m/%d/%y at %I:%M%P" to "%m/%d/%y %I:%M%P" format.
-	$string =~ s/\bat\b/ /;
-	return str2time($string);
+=item $string = formatDateTime($dateTime, $display_tz)
+
+Formats the UNIX datetime $dateTime in the standard WeBWorK datetime format.
+$dateTime is assumed to be in the server's time zone. If $display_tz is given,
+the datetime is converted from the server's timezone to the timezone specified.
+
+=cut
+
+sub formatDateTime($;$) {
+	my ($dateTime, $display_tz) = @_;
+	warn "Utils::formatDateTime is not a method. ", join(" ",caller(2)) if ref($dateTime); # catch bad calls to Utils::formatDateTime
+	warn "not defined formatDateTime('$dateTime', '$display_tz') ",join(" ",caller(2)) unless  $display_tz;
+	$dateTime = $dateTime ||0;  # do our best to provide default values
+	$display_tz ||= "local";    # do our best to provide default vaules
+	
+	my $dt = DateTime->from_epoch(epoch => $dateTime, time_zone => $display_tz);
+	#warn "\t\$dt = ", $dt->strftime(DATE_FORMAT), "\n";
+	return $dt->strftime(DATE_FORMAT);
+}
+
+=item $string = textDateTime($string_or_dateTime)
+
+Accepts a UNIX datetime or a formatted string, returns a formatted string.
+
+=cut
+
+sub textDateTime($) {
+	return ($_[0] =~ m/^\d*$/) ? formatDateTime($_[0]) : $_[0];
 }
 
+=item $dateTIme = intDateTime($string_or_dateTime)
+
+Accepts a UNIX datetime or a formatted string, returns a UNIX datetime.
+
+=cut
+
+sub intDateTime($) {
+	return ($_[0] =~ m/^\d*$/) ?  $_[0] : parseDateTime($_[0]);
+}
+
+=item $timeinsec = timeToSec($time)
+
+Makes a stab at converting a time (with a possible unit) into a number of 
+seconds.  
+
+=cut
+
+sub timeToSec($) {
+    my $t = shift();
+    if ( $t =~ /^(\d+)\s+(\S+)\s*$/ ) {
+	my ( $val, $unit ) = ( $1, $2 );
+	if ( $unit =~ /month/i || $unit =~ /mon/i ) {
+	    $val *= 18144000;  # this assumes 30 days/month
+	} elsif ( $unit =~ /week/i || $unit =~ /wk/i ) {
+	    $val *= 604800;
+	} elsif ( $unit =~ /day/i || $unit =~ /dy/i ) {
+	    $val *= 86400;
+	} elsif ( $unit =~ /hour/i || $unit =~ /hr/i ) {
+	    $val *= 3600;
+	} elsif ( $unit =~ /minute/i || $unit =~ /min/i ) {
+	    $val *= 60;
+	} elsif ( $unit =~ /second/i || $unit =~ /sec/i || $unit =~ /^s$/i ) {
+	    # do nothing
+	} else {
+	    warn("Unrecognized time unit $unit.\nAssuming seconds.\n");
+	}
+	return $val;
+    } elsif ( $t =~ /^(\d+)$/ ) {
+	return $t;
+    } else {
+	warn("Unrecognized time interval: $t\n");
+	return 0;
+    }
+}
+
+=item before($time, $now)
+
+True if $now is less than $time. If $now is not specified, the value of time()
+is used.
+
+=cut
+
+sub before  { return (@_==2) ? $_[1] < $_[0] : time < $_[0] }
+
+=item after($time, $now)
+
+True if $now is greater than $time. If $now is not specified, the value of time()
+is used.
+
+=cut
+
+sub after   { return (@_==2) ? $_[1] > $_[0] : time > $_[0] }
+
+=item between($start, $end, $now)
+
+True if $now is greater than or equal to $start and less than or equal to $end.
+If $now is not specified, the value of time() is used.
+
+=cut
+
+sub between { my $t = (@_==3) ? $_[2] : time; return $t >= $_[0] && $t <= $_[1] }
+
+=back
+
+=cut
+
+################################################################################
+# Logging
+################################################################################
+
 sub writeLog($$@) {
 	my ($ce, $facility, @message) = @_;
 	unless ($ce->{webworkFiles}->{logs}->{$facility}) {
@@ -125,6 +699,7 @@ sub writeLog($$@) {
 		return;
 	}
 	my $logFile = $ce->{webworkFiles}->{logs}->{$facility};
+	surePathToFile($ce->{webworkDirs}->{root}, $logFile);
 	local *LOG;
 	if (open LOG, ">>", $logFile) {
 		print LOG "[", time2str("%a %b %d %H:%M:%S %Y", time), "] @message\n";
@@ -141,6 +716,7 @@ sub writeCourseLog($$@) {
 		return;
 	}
 	my $logFile = $ce->{courseFiles}->{logs}->{$facility};
+	surePathToFile($ce->{courseDirs}->{root}, $logFile);
 	local *LOG;
 	if (open LOG, ">>", $logFile) {
 		print LOG "[", time2str("%a %b %d %H:%M:%S %Y", time), "] @message\n";
@@ -150,65 +726,38 @@ sub writeCourseLog($$@) {
 	}
 }
 
-
 # $ce - a WeBWork::CourseEnvironment object
 # $function - fully qualified function name
 # $details - any information, do not use the characters '[' or ']'
 # $beginEnd - the string "begin", "intermediate", or "end"
 # use the intermediate step begun or completed for INTERMEDIATE
 # use an empty string for $details when calling for END
+# Information printed in format:
+# [formatted date & time ] processID unixTime BeginEnd $function  $details
 sub writeTimingLogEntry($$$$) {
 	my ($ce, $function, $details, $beginEnd) = @_;
-	return unless defined $ce->{webworkFiles}->{logs}->{timing};
 	$beginEnd = ($beginEnd eq "begin") ? ">" : ($beginEnd eq "end") ? "<" : "-";
 	writeLog($ce, "timing", "$$ ".time." $beginEnd $function [$details]");
 }
 
-sub list2hash {
-	map {$_ => "0"} @_;
-}
-
-sub max {
-	my $soFar;
-	foreach my $item (@_) {
-		$soFar = $item unless defined $soFar;
-		if ($item > $soFar) {
-			$soFar = $item;
-		}
-	}
-	return defined $soFar ? $soFar : 0;
+################################################################################
+# Data munging
+################################################################################
+## Utility function to trim whitespace off the start and end of its input
+sub trim_spaces {
+	my $in = shift;
+	return '' unless $in;  # skip blank spaces
+	$in =~ s/^\s*(.*?)\s*$/$1/;
+	return($in);
 }
-
-sub decodeAnswers($) {
-	my $string = shift;
-	return unless defined $string and $string;
-	my @array = split m/##/, $string;
-	$array[$_] =~ s/\\#\\/#/g foreach 0 .. $#array;
-	push @array, "" if @array%2;
-	return @array; # it's actually a hash ;)
+sub list2hash(@) {
+	map {$_ => "0"} @_;
 }
 
-sub encodeAnswers(\%\@) {
-	my %hash = %{ shift() };
-	my @order = @{ shift() };
-	my $string;
-	foreach my $name (@order) {
-		my $value = defined $hash{$name} ? $hash{$name} : "";
-		$name  =~ s/#/\\#\\/g; # this is a WEIRD way to escape things
-		$value =~ s/#/\\#\\/g; # and it's not my fault!
-		if ($value =~ m/\\$/) {
-			# if the value ends with a backslash, string2hash will
-			# interpret that as a normal escape sequence (not part
-			# of the weird pound escape sequence) if the next
-			# character is &. So we have to protect against this.
-			# will adding a spcae at the end of the last answer
-			# hurt anything? i don't think so...
-			$value .= " ";
-		}
-		$string .= "$name##$value##"; # this is also not my fault
-	}
-	$string =~ s/##$//; # remove last pair of hashs
-	return $string;
+sub refBaseType($) {
+	my $ref = shift;
+	$ref =~ m/(\w+)\(/; # this might not be robust...
+	return $1;
 }
 
 sub ref2string($;$);
@@ -262,23 +811,200 @@ sub ref2string($;$) {
 		$result .= defined $ref ? $ref : '<font color="red">undef</font>';
 	}	
 }
+our $BASE64_ENCODED = 'base64_encoded:';  
+#  use constant BASE64_ENCODED = 'base64_encoded;
+#  was not evaluated in the matching and substitution
+#  statements
 
-sub refBaseType($) {
-	my $ref = shift;
-	$ref =~ m/(\w+)\(/; # this might not be robust...
-	return $1;
+# sub decodeAnswers($) {
+# 	my $string = shift;
+# 	return unless defined $string and $string;
+# 	
+# 	if ($string =~/^$BASE64_ENCODED/o) {
+# 		$string =~ s/^$BASE64_ENCODED//o;
+# 		$string = decode_base64($string);
+# 	}
+# 
+# 	my @array = split m/##/, $string;
+# 	$array[$_] =~ s/\\#\\/#/g foreach 0 .. $#array;
+# 	push @array, "" if @array%2;
+# 	return @array; # it's actually a hash ;)
+# }
+
+sub decodeAnswers($) {
+	my $serialized = shift;
+	return unless defined $serialized and $serialized;
+	my $array_ref = eval{ Storable::thaw($serialized) };
+	if ($@) {
+		warn "problem fetching answers -- possibly left over from base64 days. Not to worry -- press preview or submit and this will go away  permanently for this question.   $@";
+		return ();
+	} else {
+		return @{$array_ref};
+	}
 }
 
+sub encodeAnswers(\%\@) {
+	my %hash = %{shift()};
+	my @order = @{shift()};
+	my @ordered_hash = ();
+	foreach my $key (@order) {
+		push @ordered_hash, $key, $hash{$key};
+	}
+	return Storable::freeze( \@ordered_hash);
+
+}
+
+# sub encodeAnswers(\%\@) {
+# 	my %hash = %{ shift() };
+# 	my @order = @{ shift() };
+# 	my $string = "";
+# 	foreach my $name (@order) {
+# 		my $value = defined $hash{$name} ? $hash{$name} : "";
+# 		$name  =~ s/#/\\#\\/g; # this is a WEIRD way to escape things
+# 		$value =~ s/#/\\#\\/g; # and it's not my fault!
+# 		if ($value =~ m/\\$/) {
+# 			# if the value ends with a backslash, string2hash will
+# 			# interpret that as a normal escape sequence (not part
+# 			# of the weird pound escape sequence) if the next
+# 			# character is &. So we have to protect against this.
+# 			# will adding a spcae at the end of the last answer
+# 			# hurt anything? i don't think so...
+# 			$value .= " ";
+# 		}
+# 		$string .= "$name##$value##"; # this is also not my fault
+# 	}
+# 	$string =~ s/##$//; # remove last pair of hashs
+# 
+# 	$string = $BASE64_ENCODED.encode_base64($string, "");
+# 	# Empty string in second argument prevents end-of-line characters from being used.
+# 	# This is nice for examining database contents manually since it prevents newlines
+# 	# from being introduced into database records.
+# 
+# 	return $string;
+# }
+
+sub max(@) {
+	my $soFar;
+	foreach my $item (@_) {
+		$soFar = $item unless defined $soFar;
+		if ($item > $soFar) {
+			$soFar = $item;
+		}
+	}
+	return defined $soFar ? $soFar : 0;
+}
+
+sub pretty_print_rh($) {
+	my $rh = shift;
+	foreach my $key (sort keys %{$rh})  {
+		warn "  $key => ",$rh->{$key},"\n";
+	}
+}
+
+sub cryptPassword($) {
+	my ($clearPassword) = @_;
+	my $salt = join("", ('.','/','0'..'9','A'..'Z','a'..'z')[rand 64, rand 64]);
+	my $cryptPassword = crypt($clearPassword, $salt);
+	return $cryptPassword;
+}
+
+# from the Perl Cookbook, first edition, page 25:
+sub dequote($) {
+	local $_ = shift;
+	my ($white, $leader); # common whitespace and common leading string
+	if (/^\s*(?:([^\w\s]+)(\s*).*\n)(?:\s*\1\2?.*\n)+$/) {
+		($white, $leader) = ($2, quotemeta($1));
+	} else {
+		($white, $leader) = (/^(\s+)/, '');
+	}
+	s/^\s*?$leader(?:$white)?//gm;
+	return $_;
+}
+
+sub undefstr($@) {
+	map { defined $_ ? $_ : $_[0] } @_[1..$#_];
+}
+
+
+# shuffle an array in place
+# Perl Cookbook, Recipe 4.17. Randomizing an Array
+sub fisher_yates_shuffle {
+	my $array = shift;
+	my $i;
+	for ($i = @$array; --$i; ) {
+		my $j = int rand ($i+1);
+		next if $i == $j;
+		@$array[$i,$j] = @$array[$j,$i];
+	}
+}
+
+sub constituency_hash {
+	my $hash = {};
+	@$hash{@_} = ();
+	return $hash;
+}
+
+################################################################################
+# Sorting
+################################################################################
+
 # p. 101, Camel, 3rd ed.
 # The <=> and cmp operators return -1 if the left operand is less than the
 # right operand, 0 if they are equal, and +1 if the left operand is greater
 # than the right operand.
+#
+# FIXME: I've added the ability to do multiple field sorts, below; I'm 
+#    leaving this code, commented out, in case there's a good reason to 
+#    revert to this and do multiple field sorts differently.  -glr 2007/03/05
+# sub sortByName($@) {
+# 	my ($field, @items) = @_;
+# 	return sort {
+# 		my @aParts = split m/(?<=\D)(?=\d)|(?<=\d)(?=\D)/, defined $field ? $a->$field : $a;
+# 		my @bParts = split m/(?<=\D)(?=\d)|(?<=\d)(?=\D)/, defined $field ? $b->$field : $b;
+# 		while (@aParts and @bParts) {
+# 			my $aPart = shift @aParts;
+# 			my $bPart = shift @bParts;
+# 			my $aNumeric = $aPart =~ m/^\d*$/;
+# 			my $bNumeric = $bPart =~ m/^\d*$/;
 
-sub sortByName {
+# 			# numbers should come before words
+# 			return -1 if     $aNumeric and not $bNumeric;
+# 			return +1 if not $aNumeric and     $bNumeric;
+
+# 			# both have the same type
+# 			if ($aNumeric and $bNumeric) {
+# 				next if $aPart == $bPart; # check next pair
+# 				return $aPart <=> $bPart; # compare numerically
+# 			} else {
+# 				next if $aPart eq $bPart; # check next pair
+# 				return $aPart cmp $bPart; # compare lexicographically
+# 			}
+# 		}
+# 		return +1 if @aParts; # a has more sections, should go second
+# 		return -1 if @bParts; # a had fewer sections, should go first
+# 	} @items;
+# }
+
+sub sortByName($@) {
 	my ($field, @items) = @_;
-	return sort {
-		my @aParts = split m/(?<=\D)(?=\d)|(?<=\d)(?=\D)/, $a->$field;
-		my @bParts = split m/(?<=\D)(?=\d)|(?<=\d)(?=\D)/, $b->$field;
+
+	my %itemsByIndex = ();
+	if ( ref( $field ) eq 'ARRAY' ) {
+		foreach my $item ( @items ) {
+			my $key = '';
+			foreach ( @$field ) {
+		    		$key .= $item->$_;  # in this case we assume 
+			}                           #    all entries in @$field
+			$itemsByIndex{$key} = $item;  #  are defined.
+	    	}
+	} else {
+	    %itemsByIndex = map {(defined $field)?$_->$field:$_ => $_} @items;
+	}
+
+	my @sKeys = sort {
+		my @aParts = split m/(?<=\D)(?=\d)|(?<=\d)(?=\D)/, $a;
+		my @bParts = split m/(?<=\D)(?=\d)|(?<=\d)(?=\D)/, $b;
+
 		while (@aParts and @bParts) {
 			my $aPart = shift @aParts;
 			my $bPart = shift @bParts;
@@ -300,42 +1026,35 @@ sub sortByName {
 		}
 		return +1 if @aParts; # a has more sections, should go second
 		return -1 if @bParts; # a had fewer sections, should go first
-	} @items;
-}
+	} (keys %itemsByIndex);
 
-sub makeTempDirectory($$) {
-	my ($parent, $basename) = @_;
-	# Loop until we're able to create a directory, or it fails for some
-	# reason other than there already being something there.
-	my $triesRemaining = MKDIR_ATTEMPTS;
-	my ($fullPath, $success);
-	do {
-		my $suffix = join "", map { ('A'..'Z','a'..'z','0'..'9')[int rand 62] } 1 .. 8;
-		$fullPath = "$parent/$basename.$suffix";
-		$success = mkdir $fullPath;
-	} until ($success or not $!{EEXIST});
-	die "Failed to create directory $fullPath: $!"
-		unless $success;
-	return $fullPath;
+	return map{$itemsByIndex{$_}} @sKeys;
 }
 
-sub removeTempDirectory($) {
-	my ($dir) = @_;
-	rmtree($dir, 0, 0);
-}
+################################################################################
+# Validate strings and labels
+################################################################################
 
-sub pretty_print_rh {
-	my $rh = shift;
-	foreach my $key (sort keys %{$rh})  {
-		warn "  $key => ",$rh->{$key},"\n";
-	}
+sub not_blank ($) {     # check that a string exists and is not blank
+	my $str = shift;
+	return( defined($str) and $str =~/\S/ );
 }
 
-sub cryptPassword {
-	my ($clearPassword) = @_;
-	my $salt = join("", ('.','/','0'..'9','A'..'Z','a'..'z')[rand 64, rand 64]);
-	my $cryptPassword = crypt($clearPassword, $salt);
-	return $cryptPassword;
+###########################################################
+    # If things have worked so far determine if the file might be accompanied by auxiliary files
+    
+    #
+sub has_aux_files ($) { #  determine whether a question has auxiliary files
+                        # a path ending in    foo/foo.pg  is assumed to contain auxilliary files
+    my $path = shift;
+    if ( not_blank($path) ) {
+    	    my ($dir, $prob) = $path =~ m|([^/]+)/([^/]+)\.pg$|;  # must be a problem file ending in .pg
+			return 1 if (defined($dir) and defined ($prob) and $dir eq $prob);
+    } else {
+    	warn "This subroutine cannot handle empty paths: |$path|",caller();
+    }
+    return 0;    # no aux files with this .pg file
+
 }
 
 1;
diff --git a/lib/WeBWorK/Utils/CourseIntegrityCheck.pm b/lib/WeBWorK/Utils/CourseIntegrityCheck.pm
new file mode 100644
index 0000000000..78dbac7793
--- /dev/null
+++ b/lib/WeBWorK/Utils/CourseIntegrityCheck.pm
@@ -0,0 +1,453 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/Utils/CourseIntegrityCheck.pm,v 1.8 2010/06/12 01:44:33 gage 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::Utils::CourseIntegrityCheck;
+
+=head1 NAME
+
+WeBWorK::Utils::CourseIntegrityCheck - check that course  database tables agree with database schema and
+that course directory structure is correct.
+
+=cut
+
+use strict;
+use warnings;
+use WeBWorK::Debug;
+use WeBWorK::Utils::CourseManagement qw/listCourses/;
+use WeBWorK::PG::IO;
+
+use constant {             # constants describing the comparison of two hashes.
+           ONLY_IN_A=>0, 
+           ONLY_IN_B=>1,
+           DIFFER_IN_A_AND_B=>2, 
+           SAME_IN_A_AND_B=>3
+};
+################################################################################
+
+sub new {
+	my $invocant = shift;
+	my $class = ref $invocant || $invocant;
+	my $self = bless {}, $class;
+	$self->init(@_);
+	return $self;
+}
+
+sub init {
+	my ($self, %options) = @_;
+	
+	$self->{dbh} = DBI->connect(
+		$options{ce}{database_dsn},
+		$options{ce}{database_username},
+		$options{ce}{database_password},
+		{
+			PrintError => 0,
+			RaiseError => 1,
+		},
+	);
+	
+	$self->{verbose_sub} = $options{verbose_sub} || \&debug;
+	$self->{confirm_sub} = $options{confirm_sub} || \&ask_permission_stdio;
+	$self->{ce} = $options{ce};
+    my $dbLayoutName = $self->{ce}->{dbLayoutName};
+	$self->{db} =new WeBWorK::DB($self->{ce}->{dbLayouts}->{$dbLayoutName});
+}
+
+sub ce { return shift->{ce} }
+sub db { return shift->{db} }
+sub dbh { return shift->{dbh} }
+sub verbose { my $sub = shift->{verbose_sub}; return &$sub(@_) }
+sub confirm { my $sub = shift->{confirm_sub}; return &$sub(@_) }
+
+sub DESTROY {
+	my ($self) = @_;
+	$self->unlock_database;
+	$self->SUPER::DESTROY if $self->can("SUPER::DESTROY");
+}
+
+##################################################################
+
+
+
+=item $CIchecker->checkCourseTables($courseName);
+
+Checks the course tables in the mysql database and ensures that they are the 
+same as the ones specified by the databaseLayout
+
+
+=cut
+
+sub checkCourseTables {
+	my ($self, $courseName) = @_;
+	my $str='';
+    my $tables_ok = 1;
+    my %dbStatus = ();
+    #################################
+	# fetch schema from course environment and search database
+	# for corresponding tables.
+	##########################################################
+	my $db = $self->db;
+	my $ce = $self->{ce};
+	$self->lock_database;
+	foreach my $table (sort keys %$db) {
+	    next if $db->{$table}{params}{non_native}; # skip non-native tables
+	    my $table_name = (exists $db->{$table}->{params}->{tableOverride})? $db->{$table}->{params}->{tableOverride}:$table;
+	    my $database_table_exists = ($db->{$table}->tableExists) ? 1:0;
+	    if ($database_table_exists ) { # exists means the table can be described;
+	       my( $fields_ok, $fieldStatus) = $self->checkTableFields($courseName, $table);
+	       if ($fields_ok) {
+	       	     $dbStatus{$table} = [SAME_IN_A_AND_B()];
+	       } else {
+	       		$dbStatus{$table} = [DIFFER_IN_A_AND_B(),$fieldStatus];
+	       		$tables_ok=0;
+	       }
+	    } else {
+	    	$tables_ok=0;
+	    	$dbStatus{$table}=[ONLY_IN_A(),];
+	    }
+	}
+	##########################################################
+	# fetch fetch corresponding tables in the database and
+	# search for corresponding schema entries.
+	##########################################################
+ 
+	my $dbh = $self->dbh;
+	my $tablePrefix = "${courseName}\\_";   # _ represents any single character in the MySQL like statement so we escape it
+	my $stmt = "show tables like '${tablePrefix}%'";    # mysql request
+	my $result = $dbh->selectall_arrayref($stmt) ;
+	my @tableNames = map {@$_} @$result;             # drill down in the result to the table name level
+
+#  Table names are of the form courseID_table (with an underscore). So if we have two courses mth101 and mth101_fall09
+#  when we check the tables for mth101 we will inadvertantly pick up the tables for mth101_fall09.  Thus we find all 
+#  courseID's and exclude the extraneous tables.
+
+	my @courseIDs = listCourses($ce);
+	my @similarIDs =();
+	foreach my $courseID (@courseIDs) {
+	    next unless $courseID =~/^${courseName}\_(.*)/;
+	    push(@similarIDs, $courseID);
+	}
+
+	OUTER_LOOP:
+	foreach my $table (sort @tableNames) {
+	    next unless $table =~/^${courseName}\_(.*)/;  #double check that we only have our course tables and similar ones
+
+	    foreach my $courseID (@similarIDs) {          #exclude tables with similar but wrong names
+		next OUTER_LOOP if $table =~/^${courseID}\_(.*)/;
+	    }
+
+	    my $schema_name = $1;
+		my $exists = exists($db->{$schema_name});
+        $tables_ok = 0 unless exists($db->{$schema_name});
+		$dbStatus{$schema_name} =[ONLY_IN_B] unless $exists;
+	}
+	$self->unlock_database;
+	return ($tables_ok,\%dbStatus); # table in both schema & database; found in schema only; found in database only
+}
+
+=item $CIchecker-> updateCourseTables($courseName,  $table_names);
+
+Adds schema tables to the database that had been missing from the database.
+
+=cut
+
+sub updateCourseTables {
+	my ($self, $courseName, $schema_table_names) = @_;
+	my $db = $self->db;
+	$self->lock_database;
+	warn "Programmers: Pass reference to the array of table names to be updated." unless ref($schema_table_names)=~/ARRAY/;
+	# warn "table names are ".join(" ", @$schema_table_names);
+	my $str='';
+	foreach my $schema_table_name (sort @$schema_table_names) {    # remainder copied from db->create_table
+		# next if $table =~ /^_/; # skip non-table self fields (none yet)
+		# warn "not a non-table self field";
+		next if $db->{$schema_table_name}{params}{non_native}; # skip non-native tables
+		my $schema_obj = $db->{$schema_table_name};
+		my $database_table_name = (exists $db->{$schema_table_name}->{params}->{tableOverride})? 
+		                   $db->{$schema_table_name}->{params}->{tableOverride}:$schema_table_name;
+		if ($schema_obj->can("create_table")) {
+		   # warn "creating table $schema_obj";
+			$schema_obj->create_table;
+			$str .= "Table $schema_table_name created as $database_table_name in database.".CGI::br();
+		} else {
+			warn "Skipping creation of '$schema_table_name' table: no create_table method\n";
+		}
+	}
+	$self->unlock_database;
+	$str;
+	
+}
+
+=cut
+
+
+
+=item  $CIchecker->checkTableFields($courseName, $table);
+
+Checks the course tables in the mysql database and insures that they are the same as the ones specified by the databaseLayout
+
+
+=cut
+
+
+sub checkTableFields {
+	my ($self,$courseName, $table) = @_;
+	my $fields_ok = 1;
+	my %fieldStatus = ();
+	##########################################################
+	# fetch schema from course environment and search database
+	# for corresponding tables.
+	##########################################################
+	my $db = $self->db;
+	my $table_name = (exists $db->{$table}->{params}->{tableOverride})? $db->{$table}->{params}->{tableOverride}:$table;
+	warn "$table_name is a non native table" if $db->{$table}{params}{non_native}; # skip non-native tables
+	my @schema_field_names =  $db->{$table}->{record}->FIELDS;
+	my %schema_override_field_names=();
+	foreach my $field (sort @schema_field_names) {
+	    my $field_name  = $db->{$table}->{params}->{fieldOverride}->{$field} ||$field;
+	    $schema_override_field_names{$field_name}=$field;	
+	    my $database_field_exists = $db->{$table}->tableFieldExists($field_name);
+	    if ($database_field_exists) { 
+	    	$fieldStatus{$field} =[SAME_IN_A_AND_B]
+	    } else {
+            $fields_ok = 0;
+	    	$fieldStatus{$field} =[ONLY_IN_A];
+	    }
+	       
+	}
+	##########################################################
+	# fetch fetch corresponding tables in the database and
+	# search for corresponding schema entries.
+	##########################################################
+    
+    my $dbh =$self->dbh;                        # grab any database handle
+ 	my $stmt = "SHOW COLUMNS FROM `$table_name`";    # mysql request
+ 	my $result = $dbh->selectall_arrayref($stmt) ;
+ 	my %database_field_names =  map {${$_}[0]=>[$_]} @$result;             # drill down in the result to the field name level
+                                                           #  result is array:  Field      | Type     | Null | Key | Default | Extra 
+ 	foreach my $field_name (sort keys %database_field_names) {
+ 		my $exists = exists($schema_override_field_names{$field_name} );
+ 		$fields_ok=0 unless $exists;
+ 		$fieldStatus{$field_name} = [ONLY_IN_B] unless $exists;
+ 	}
+ 	
+
+ 	return ($fields_ok, \%fieldStatus); # table in both schema & database; found in schema only; found in database only
+}
+
+
+=item  $CIchecker->updateTableFields($courseName, $table);
+
+Checks the fields in the table in the mysql database and insures that they are the same as the ones specified by the databaseLayout
+
+
+=cut
+
+
+sub updateTableFields {
+	my ($self,$courseName, $table) = @_;
+	my $msg='';
+	##########################################################
+	# fetch schema from course environment and search database
+	# for corresponding tables.
+	##########################################################
+	my $db = $self->db;
+	my $table_name = (exists $db->{$table}->{params}->{tableOverride})? $db->{$table}->{params}->{tableOverride}:$table;
+	warn "$table_name is a non native table" if $db->{$table}{params}{non_native}; # skip non-native tables
+    my ($fields_ok, $fieldStatus) = $self->checkTableFields($courseName,$table);
+    # add fields
+    foreach my $field_name (keys %$fieldStatus) {
+     	next unless $fieldStatus->{$field_name}->[0] == ONLY_IN_A; 
+     	my $schema_obj = $db->{$table};
+     	if ( $schema_obj->can("add_column_field") ) {
+     		$msg.= "Added column '$field_name' to table '$table'".CGI::br() if $schema_obj->add_column_field($field_name);
+     	}
+    }
+	return $msg;
+	
+}
+
+
+
+
+
+=item $CIchecker->checkCourseDirectories($courseName);
+
+Checks the course directories to make sure they exist and have the correct
+permissions.
+
+
+=cut
+
+sub checkCourseDirectories {
+	my ($self) = @_;
+	my $ce = $self->{ce};
+	my @webworkDirectories = keys %{$ce->{webworkDirs}};
+    my @courseDirectories = keys %{$ce->{courseDirs}};
+    my $str = '';
+    my @results;
+    my $directories_ok =1;
+    foreach my $dir (sort @courseDirectories) {
+        my $path = $ce->{courseDirs}->{$dir};
+        my $status = (-e $path) ? 
+          ((-r $path)?'r':'-') . 
+    	  ((-w _ )?'w':'-'   ) .
+    	  ((-x _ )?'x':'-'   )    : "missing";
+ 
+    	#all directories should be readable, writable and executable
+    	my $style;
+	    if ($status eq 'rwx') {
+	    	$style = "color:green";
+	    } else {
+	    	$directories_ok = 0;
+	    	$style = "color:red";
+	    }
+	    	
+    	push @results, CGI::li( "$dir =>".CGI::span({style=>$style}," $path $status <br/>\n")  );
+    }
+    $str = CGI::start_ul(). join(" ",@results) .  CGI::end_ul();
+    return ( $directories_ok, $str);
+}
+
+=item $CIchecker->updateCourseDirectories($courseName);
+
+Creates some course directories automatically.
+
+
+=cut
+
+sub updateCourseDirectories {
+	my $self = shift;
+	my $ce = $self->{ce};
+	my @webworkDirectories = keys %{$ce->{webworkDirs}};
+    my @courseDirectories = keys %{$ce->{courseDirs}};
+    
+    my %updateable_directories = (html_temp=>1,mailmerge=>1,tmpEditFileDir=>1);  #FIXME this is hardwired for the time being.
+    
+    foreach my $dir (sort @courseDirectories) {
+        next unless exists $updateable_directories{$dir};
+        my $path = $ce->{courseDirs}->{$dir};
+        unless ( -e $path) {   # if by some unlucky chance the tmpDirectory hasn't been created, create it.
+			my $parentDirectory =  $path;
+			$parentDirectory =~s|/$||;  # remove a trailing /
+			$parentDirectory =~s|/\w*$||; # remove last node
+			my ($perms, $groupID) = (stat $parentDirectory)[2,5];
+			WeBWorK::PG::IO::createDirectory($path, $perms, $groupID)
+					or warn "Failed to create directory at $path";
+		
+		}
+	}
+
+    return ( );
+}
+
+
+
+
+##############################################################################
+# Database utilities -- borrowed from DBUpgrade.pm ??use or modify??? --MEG
+##############################################################################
+
+sub lock_database {   # lock named 'webwork.dbugrade' times out after 10 seconds
+	my $self =shift;
+	my $dbh = $self->dbh; 
+	my ($lock_status) = $dbh->selectrow_array("SELECT GET_LOCK('webwork.dbupgrade', 10)");
+	if (not defined $lock_status) {
+		die "Couldn't obtain lock because an error occurred.\n";
+	}
+	if ($lock_status) {
+	} else {
+		die "Timed out while waiting for lock.\n";
+	}
+}
+
+sub unlock_database {
+	my $self =shift;
+	my $dbh = $self->dbh;
+	my ($lock_status) = $dbh->selectrow_array("SELECT RELEASE_LOCK('webwork.dbupgrade')");
+	if (not defined $lock_status) {
+		# die "Couldn't release lock because the lock does not exist.\n";
+	}elsif ($lock_status) {
+	    return;
+	} else {
+		die "Couldn't release lock because the lock is not held by this thread.\n";
+	}
+}
+
+##############################################################################
+
+sub load_sql_table_list {
+	my $self =shift;
+	my $dbh = $self->dbh;
+	my $sql_tables_ref = $dbh->selectcol_arrayref("SHOW TABLES");
+	$self->{sql_tables} = {}; @{$self->{sql_tables}}{@$sql_tables_ref} = ();
+}
+
+sub register_sql_table {
+	my $self =shift;
+	my $table = shift;
+	my $dbh = $self->dbh;
+	$self->{sql_tables}{$table} = ();
+}
+
+sub unregister_sql_table {
+	my $self =shift;
+	my $table = shift;
+	my $dbh = $self->dbh;
+	delete $self->{sql_tables}{$table};
+}
+
+sub sql_table_exists {
+	my $self =shift;
+	my $table=shift;
+	my $dbh = $self->dbh;
+	return exists $self->{sql_tables}{$table};
+}
+
+
+################################################################################
+
+sub ask_permission_stdio {
+	my ($prompt, $default) = @_;
+	
+	$default = 1 if not defined $default;
+	my $options = $default ? "[Y/n]" : "[y/N]";
+	
+	while (1) {
+		print "$prompt $options ";
+		my $resp = <STDIN>;
+		chomp $resp;
+		return $default if $resp eq "";
+		return 1 if lc $resp eq "y";
+		return 0 if lc $resp eq "n";
+		$prompt = 'Please enter "y" or "n".';
+	}
+}
+
+
+# 
+# 
+# =item checkCourseDirectories($courseName)
+# 
+# Checks the course files and directories to make sure they exist and have the correct permissions.
+# 
+# =cut
+# 
+# 
+# 
+
+
+
+1;
diff --git a/lib/WeBWorK/Utils/CourseManagement.pm b/lib/WeBWorK/Utils/CourseManagement.pm
new file mode 100644
index 0000000000..0ed61ce6f4
--- /dev/null
+++ b/lib/WeBWorK/Utils/CourseManagement.pm
@@ -0,0 +1,1242 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/Utils/CourseManagement.pm,v 1.48 2009/10/01 21:28:46 gage 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::Utils::CourseManagement;
+use base qw(Exporter);
+
+=head1 NAME
+
+WeBWorK::Utils::CourseManagement - create, rename, and delete courses.
+
+=cut
+
+use strict;
+use warnings;
+use Carp;
+use DBI;
+use File::Path qw(rmtree);
+use File::Spec;
+use String::ShellQuote;
+use WeBWorK::CourseEnvironment;
+use WeBWorK::Debug;
+use WeBWorK::Utils qw(runtime_use readDirectory pretty_print_rh);
+use UUID::Tiny qw(create_uuid_as_string);
+#use WeBWorK::Utils::DBUpgrade;
+use PGcore; # for not_null() macro
+
+our @EXPORT    = ();
+our @EXPORT_OK = qw(
+	listCourses
+	listArchivedCourses
+	addCourse
+	renameCourse
+	deleteCourse
+	archiveCourse
+	unarchiveCourse
+	dbLayoutSQLSources
+	initNonNativeTables
+
+);
+
+# 	checkCourseTables
+# 	updateCourseTables
+# 	checkCourseDirectories
+
+=head1 FUNCTIONS
+
+=over
+
+=cut
+
+################################################################################
+
+=item listCourses($ce)
+
+Lists the courses defined. 
+
+=cut
+
+sub listCourses {
+	my ($ce) = @_;
+	my $coursesDir = $ce->{webworkDirs}->{courses};
+	return grep { not (m/^\./ or m/^CVS$/) and -d "$coursesDir/$_" } readDirectory($coursesDir);
+}
+
+=item listArchivedCourses($ce)
+
+Lists the courses which have been archived (end in .tar.gz). 
+
+=cut
+
+sub listArchivedCourses {
+	my ($ce) = @_;
+	my $coursesDir = $ce->{webworkDirs}->{courses};
+	return grep { m/\.tar\.gz$/ } readDirectory($coursesDir);
+}
+
+################################################################################
+
+=item addCourse(%options)
+
+%options must contain:
+
+ courseID => $courseID,
+ ce => $ce,
+ courseOptions => $courseOptions, 
+ dbOptions => $dbOptions,
+ users => $users
+
+%options may contain:
+
+ templatesFrom => $templatesCourseID,
+
+Create a new course named $courseID.
+
+$ce is a WeBWorK::CourseEnvironment object that describes the new course's
+environment.
+
+$courseOptions is a reference to a hash containing the following options:
+
+ dbLayoutName         => $dbLayoutName
+ allowedRecipients    => $mail{allowedRecipients}
+ feedbackRecipients   => $mail{feedbackRecipients}
+ PRINT_FILE_NAMES_FOR => $pg{specialPGEnvironmentVars}->{PRINT_FILE_NAMES_FOR}
+
+C<dbLayoutName> is required. C<allowedRecipients>, C<feedbackRecipients>, and
+C<PRINT_FILE_NAMES_FOR> are references to arrays.
+
+$dbOptions is a reference to a hash containing information required to create a
+database for the course. Current database layouts do not require additional
+information, so specify a reference to an empty hash. If $dbOptions is
+undefined, addCourse() assumes that the database has already been created, and
+skips that step in the course creation process.
+
+$users is a list of arrayrefs, each containing a User, Password, and
+PermissionLevel record for a single user:
+
+ $users = [ $User, $Password, $PermissionLevel ]
+
+These users are added to the course.
+
+$templatesCourseID indicates the ID of a course from which the contents of the
+templates directory will be copied to the new course.
+
+=cut
+
+sub addCourse {
+	my (%options) = @_;
+	
+	my $courseID = $options{courseID};
+	my $ce = $options{ce};
+	my %courseOptions = %{ $options{courseOptions} };
+	my %dbOptions = defined $options{dbOptions} ? %{ $options{dbOptions} } : ();
+	my @users = exists $options{users} ? @{ $options{users} } : ();
+	
+	# get the database layout out of the options hash
+	my $dbLayoutName = $courseOptions{dbLayoutName};
+	
+	# collect some data
+	my $coursesDir = $ce->{webworkDirs}->{courses};
+	my $courseDir = "$coursesDir/$courseID";
+	
+	# fail if the course already exists
+	# IMPORTANT: this must be the first check! if any check other than this one
+	# fails, CourseAdmin deletes the course!! Oh no!!!
+	# DO NOT CHANGE THE DIE MESSAGE -- CourseAdmin checks it to determine whether
+	# a course was partially created and should be deleted!
+	# FIXME -- this is bad, and addCourse should deal with cleaning up partially
+	# created courses itself
+	if (-e $courseDir) {
+		croak "$courseID: course exists";
+	}
+	
+	# fail if the course ID contains invalid characters
+	croak "Invalid characters in course ID: '$courseID' (valid characters are [-A-Za-z0-9_])"
+		unless $courseID =~ m/^[-A-Za-z0-9_]*$/;
+	
+	# if we didn't get a database layout, use the default one
+	if (not defined $dbLayoutName) {
+		$dbLayoutName = $ce->{dbLayoutName};
+	}
+	
+	# fail if the database layout is invalid
+	if (not exists $ce->{dbLayouts}->{$dbLayoutName}) {
+		croak "$dbLayoutName: not found in \%dbLayouts";
+	}
+	
+	##### step 1: create course directory structure #####
+	
+	my %courseDirs = %{$ce->{courseDirs}};
+	
+	# deal with root directory first -- if we can't create it, we have to give up.
+	
+	exists $courseDirs{root} or croak "Can't create the course '$courseID' because no root directory is specified in the '%courseDirs' hash.";
+	my $root = $courseDirs{root};
+	delete $courseDirs{root};
+	{
+		# does the directory already exist?
+		-e $root and croak "Can't create the course '$courseID' because the root directory '$root' already exists.";
+		# is the parent directory writeable?
+		my @rootElements = File::Spec->splitdir($root);
+		pop @rootElements;
+		my $rootParent = File::Spec->catdir(@rootElements);
+		-w $rootParent or croak "Can't create the course '$courseID' because the courses directory '$rootParent' is not writeable.";
+		# try to create it
+		mkdir $root or croak "Can't create the course '$courseID' becasue the root directory '$root' could not be created: $!.";
+	}
+	
+	# deal with the rest of the directories
+	
+	my @courseDirNames = sort { $courseDirs{$a} cmp $courseDirs{$b} } keys %courseDirs;
+	foreach my $courseDirName (@courseDirNames) {
+		my $courseDir = File::Spec->canonpath($courseDirs{$courseDirName});
+		
+		# does the directory already exist?
+		if (-e $courseDir) {
+			warn "Can't create $courseDirName directory '$courseDir', since it already exists. Using existing directory.\n";
+			next;
+		}
+		
+		# is the parent directory writeable?
+		my @courseDirElements = File::Spec->splitdir($courseDir);
+		pop @courseDirElements;
+		my $courseDirParent = File::Spec->catdir(@courseDirElements);
+		unless (-w $courseDirParent) {
+			warn "Can't create $courseDirName directory '$courseDir', since the parent directory is not writeable. You will have to create this directory manually.\n";
+			next;
+		}
+		
+		# try to create it
+		mkdir $courseDir or warn "Failed to create $courseDirName directory '$courseDir': $!. You will have to create this directory manually.\n";
+	}
+	
+	##### step 2: create course database #####
+	
+	my $db = new WeBWorK::DB($ce->{dbLayouts}->{$dbLayoutName});
+	my $create_db_result = $db->create_tables;
+	die "$courseID: course database creation failed.\n" unless $create_db_result;
+	
+	##### step 3: populate course database #####
+	
+	if ($ce->{dbLayouts}{$dbLayoutName}{user}{params}{non_native}) {
+		debug("not adding users to the course database: 'user' table is non-native.\n");
+	} else {
+		# see above
+		#my $db = WeBWorK::DB->new($ce->{dbLayouts}->{$dbLayoutName});
+		
+		foreach my $userTriple (@users) {
+			my ($User, $Password, $PermissionLevel) = @$userTriple;
+			
+			eval { $db->addUser($User)                       }; warn $@ if $@;
+			eval { $db->addPassword($Password)               }; warn $@ if $@;
+			eval { $db->addPermissionLevel($PermissionLevel) }; warn $@ if $@;
+		}
+	}
+	
+	##### step 4: write course.conf file #####
+	
+	my $courseEnvFile = $ce->{courseFiles}->{environment};
+	open my $fh, ">", $courseEnvFile
+		or die "failed to open $courseEnvFile for writing.\n";
+	writeCourseConf($fh, $ce, %courseOptions);
+	close $fh;
+	
+	##### step 5: copy templates #####
+	
+	if (exists $options{templatesFrom}) {
+		my $sourceCourse = $options{templatesFrom};
+		my $sourceCE = new WeBWorK::CourseEnvironment({
+			get_SeedCE($ce),
+			courseName => $sourceCourse,        # override courseName
+		});
+		my $sourceDir = $sourceCE->{courseDirs}->{templates};
+		
+		if (-d $sourceDir) {
+			my $destDir = $ce->{courseDirs}{templates};
+			my $cp_cmd = "2>&1 " . $ce->{externalPrograms}{cp} . " -R " . shell_quote($sourceDir) . "/* " . shell_quote($destDir);
+			my $cp_out = readpipe $cp_cmd;
+			if ($?) {
+				my $exit = $? >> 8;
+				my $signal = $? & 127;
+				my $core = $? & 128;
+				warn "Failed to copy templates from course '$sourceCourse' with command '$cp_cmd' (exit=$exit signal=$signal core=$core): $cp_out\n";
+			}
+		} else {
+			warn "Failed to copy templates from course '$sourceCourse': templates directory '$sourceDir' does not exist.\n";
+		}
+	}
+}
+
+################################################################################
+
+=item renameCourse(%options)
+
+%options must contain:
+
+ courseID => $courseID,
+ ce => $ce,
+ dbOptions => $dbOptions,
+ newCourseID => $newCourseID,
+
+%options may also contain:
+
+ skipDBRename => $skipDBRename,
+
+Rename the course named $courseID to $newCourseID.
+
+$ce is a WeBWorK::CourseEnvironment object that describes the existing course's
+environment.
+
+$dbOptions is a reference to a hash containing information required to create
+the course's new database and delete the course's old database. Current database
+layouts do not require additional information, so specify a reference to an
+empty hash.
+
+The name of the course's directory is changed to $newCourseID.
+
+If the course's database layout is C<sql_single> or C<sql_moodle>, new tables
+are created in the current database, course data is copied from the old tables
+to the new tables, and the old tables are deleted.
+
+If the course's database layout is something else, no database changes are made.
+
+If $skipDBRename is true, no database changes are made. This is useful if a
+course is being unarchived and no database was found, or for renaming the
+modelCourse.
+
+Any errors encountered while renaming the course are returned.
+
+=cut
+
+sub renameCourse {
+	my (%options) = @_;
+	
+	# renameCourseHelper needs:
+	#    $fromCourseID ($oldCourseID)
+	#    $fromCE ($oldCE)
+	#    $toCourseID ($newCourseID)
+	#    $toCE (construct from $oldCE)
+	#    $dbLayoutName ($oldCE->{dbLayoutName})
+	#    %options ($dbOptions)
+	
+	my $oldCourseID = $options{courseID};
+	my $oldCE = $options{ce};
+	my %dbOptions = defined $options{dbOptions} ? %{ $options{dbOptions} } : ();
+	my $newCourseID = $options{newCourseID};
+	my $skipDBRename = $options{skipDBRename} || 0;
+	
+	# get the database layout out of the options hash
+	my $dbLayoutName = $oldCE->{dbLayoutName};
+	
+	# collect some data
+	my $coursesDir = $oldCE->{webworkDirs}->{courses};
+	my $oldCourseDir = "$coursesDir/$oldCourseID";
+	my $newCourseDir = "$coursesDir/$newCourseID";
+	
+	# fail if the target course already exists
+	if (-e $newCourseDir) {
+		croak "$newCourseID: course exists";
+	}
+	
+	# fail if the source course does not exist
+	unless (-e $oldCourseDir) {
+		croak "$oldCourseID: course not found";
+	}
+	
+	##### step 1: move course directory #####
+	
+	# move top-level course directory
+	my $mv_cmd = "2>&1"." ".$oldCE->{externalPrograms}{mv}." ".shell_quote($oldCourseDir)." ".shell_quote($newCourseDir);
+	debug("moving course dir: $mv_cmd");
+	my $mv_out = readpipe $mv_cmd;
+	if ($?) {
+		my $exit = $? >> 8;
+		my $signal = $? & 127;
+		my $core = $? & 128;
+		die "Failed to move course directory with command '$mv_cmd' (exit=$exit signal=$signal core=$core): $mv_out\n";
+	}
+	
+	# get new course environment
+	my $newCE = $oldCE->new(
+		$oldCE->{webworkDirs}->{root},
+		$oldCE->{webworkURLs}->{root},
+		$oldCE->{pg}->{directories}->{root},
+		$newCourseID,
+	);
+	
+	# find the course dirs that still exist in their original locations
+	# (i.e. are not subdirs of $courseDir)
+	my %oldCourseDirs = %{ $oldCE->{courseDirs} };
+	my %newCourseDirs = %{ $newCE->{courseDirs} };
+	my @courseDirNames = sort { $oldCourseDirs{$a} cmp $oldCourseDirs{$b} } keys %oldCourseDirs;
+	foreach my $courseDirName (@courseDirNames) {
+		my $oldDir = File::Spec->canonpath($oldCourseDirs{$courseDirName});
+		my $newDir = File::Spec->canonpath($newCourseDirs{$courseDirName});
+		if (-e $oldDir) {
+			debug("oldDir $oldDir still exists. might move it...\n");
+			
+			# check for a few likely error conditions, since the mv error is not that helpful
+			
+			# is the source really a directory
+			unless (-d $oldDir) {
+				warn "$courseDirName: Can't move '$oldDir' to '$newDir', since the source is not a directory. You will have to move this directory manually.\n";
+				next;
+			}
+			
+			# does the destination already exist?
+			# (this should only happen on extra-coursedir directories, since we make sure the root dir doesn't exist above.)
+			if (-e $newDir) {
+				warn "$courseDirName: Can't move '$oldDir' to '$newDir', since the target already exists. You will have to move this directory manually.\n";
+				next;
+			}
+			
+			# is oldDir's parent writeable
+			my @oldDirElements = File::Spec->splitdir($oldDir);
+			pop @oldDirElements;
+			my $oldDirParent = File::Spec->catdir(@oldDirElements);
+			unless (-w $oldDirParent) {
+				warn "$courseDirName: Can't move '$oldDir' to '$newDir', since the source parent directory is not writeable. You will have to move this directory manually.\n";
+				next;
+			}
+			
+			# is newDir's parent writeable?
+			my @newDirElements = File::Spec->splitdir($newDir);
+			pop @newDirElements;
+			my $newDirParent = File::Spec->catdir(@newDirElements);
+			unless (-w $newDirParent) {
+				warn "$courseDirName: Can't move '$oldDir' to '$newDir', since the destination parent directory is not writeable. You will have to move this directory manually.\n";
+				next;
+			}
+			
+			# try to move the directory
+			debug("Going to move $oldDir to $newDir...\n");
+			my $mv_cmd = "2>&1"." ".$oldCE->{externalPrograms}{mv}." ".shell_quote($oldDir)." ".shell_quote($newDir);
+			my $mv_out = readpipe $mv_cmd;
+			if ($?) {
+				my $exit = $? >> 8;
+				my $signal = $? & 127;
+				my $core = $? & 128;
+				warn "Failed to move directory with command '$mv_cmd' (exit=$exit signal=$signal core=$core): $mv_out\n";
+			}
+		} else {
+			debug("oldDir $oldDir was already moved.\n");
+		}
+	}
+	
+	##### step 2: rename database #####
+	
+	unless ($skipDBRename) {
+		my $oldDB = new WeBWorK::DB($oldCE->{dbLayouts}{$dbLayoutName});
+		my $rename_db_result = $oldDB->rename_tables($newCE->{dbLayouts}{$dbLayoutName});
+		die "$oldCourseID: course database renaming failed.\n" unless $rename_db_result;
+	}
+}
+
+################################################################################
+
+=item deleteCourse(%options)
+
+Options must contain:
+
+ courseID => $courseID,
+ ce => $ce,
+ dbOptions => $dbOptions,
+
+$ce is a WeBWorK::CourseEnvironment object that describes the course's
+environment. It is your responsability to pass a course environment object that
+describes the course to be deleted. Do not pass the course environment object
+associated with the request, unless you are deleting the course you're currently
+using.
+
+$dbOptions is a reference to a hash containing information required to delete
+the database for the course. Current database layouts do not require additional
+information, so specify a reference to an empty hash. If $dbOptions is
+undefined, addCourse() assumes that the database has already been deleted, and
+skips that step in the course deletion process.
+
+Deletes the course named $courseID. The course directory is removed.
+
+Any errors encountered while deleting the course are returned.
+
+=cut
+
+sub deleteCourse {
+	my (%options) = @_;
+	
+	my $courseID = $options{courseID};
+	my $ce = $options{ce};
+	my %dbOptions = defined $options{dbOptions} ? %{ $options{dbOptions} } : ();
+	
+	# make sure the user isn't brain damaged
+	die "the course environment supplied doesn't appear to describe the course $courseID. can't proceed."
+		unless $ce->{courseName} eq $courseID;
+	
+	my %courseDirs = %{$ce->{courseDirs}};
+	
+	##### step 0: make sure course directory is deleteable #####
+	
+	# deal with root directory first -- if we won't be able to delete it, we have to give up.
+	
+	exists $courseDirs{root} or croak "Can't delete the course '$courseID' because no root directory is specified in the '%courseDirs' hash.";
+	my $root = $courseDirs{root};
+	if (-e $root) {
+		# is the parent directory writeable?
+		my @rootElements = File::Spec->splitdir($root);
+		pop @rootElements;
+		my $rootParent = File::Spec->catdir(@rootElements);
+		-w $rootParent or croak "Can't delete the course '$courseID' because the courses directory '$rootParent' is not writeable.";
+	} else {
+		warn "Warning: the course root directory '$root' does not exist. Attempting to delete the course database and other course directories...\n";
+	}
+	
+	##### step 1: delete course database (if necessary) #####
+	
+	my $dbLayoutName = $ce->{dbLayoutName};
+	my $db = new WeBWorK::DB($ce->{dbLayouts}->{$dbLayoutName});
+	my $create_db_result = $db->delete_tables;
+	die "$courseID: course database deletion failed.\n" unless $create_db_result;
+	
+	##### step 2: delete course directory structure #####
+	
+	my @courseDirNames = sort { $courseDirs{$a} cmp $courseDirs{$b} } keys %courseDirs;
+	foreach my $courseDirName (@courseDirNames) {
+		my $courseDir = File::Spec->canonpath($courseDirs{$courseDirName});
+		if (-e $courseDir) {
+			debug("courseDir $courseDir still exists. might delete it...\n");
+			
+			# check for a few likely error conditions, since the mv error is not that helpful
+			
+			# is it really a directory
+			unless (-d $courseDir) {
+				warn "Can't delete $courseDirName directory '$courseDir', since is not a directory. If it is not wanted, you will have to delete it manually.\n";
+				next;
+			}
+			
+			# is the parent writeable
+			my @courseDirElements = File::Spec->splitdir($courseDir);
+			pop @courseDirElements;
+			my $courseDirParent = File::Spec->catdir(@courseDirElements);
+			unless (-w $courseDirParent) {
+				warn "Can't delete $courseDirName directory '$courseDir', since its parent directory is not writeable. If it is not wanted, you will have to delete it manually.\n";
+				next;
+			}
+			
+			# try to delete the directory
+			debug("Going to delete $courseDir...\n");
+			rmtree($courseDir, 0, 1);
+		} else {
+			debug("courseDir $courseDir was already deleted.\n");
+		}
+	}
+}
+
+################################################################################
+
+=item archiveCourse(%options)
+
+%options must contain:
+
+ courseID  => $courseID,
+ ce        => $ce,
+
+Creates a gzipped tar archive (.tar.gz) of the course $courseID in the WeBWorK
+courses directory. Before archiving, the course database is dumped into a
+subdirectory of the course's DATA directory.
+
+Only files and directories stored directly in the course directory are archived.
+The contents of linked files is not archived although the symbolic links
+themselves are saved.
+
+$courseID is the name of the course to archive.
+
+$ce is a WeBWorK::CourseEnvironment object that describes the course's
+environment. (This is used to access the course database and get path
+information.)
+
+If an error occurs, an exception is thrown.
+
+=cut
+
+sub archiveCourse {
+	my (%options) = @_;
+	my $courseID = $options{courseID};
+	my $ce = $options{ce};
+	
+	# make sure the user isn't brain damaged
+	croak "The course environment supplied doesn't appear to match the course $courseID. Can't proceed"
+		unless $ce->{courseName} eq $courseID;
+	
+	# grab some values we'll need
+	my $course_dir = $ce->{courseDirs}{root};
+	
+	# tmp_archive_path is used as the target of the tar.gz operation
+	# After this is done the final tar.gz file is moved either to the course directory
+	# or the course/myCourse/templates   directory (when saving individual courses)
+	# this prevents us from tarring a directory to which we have just added a file
+	# see bug #2022 -- for error messages on some operating systems
+	my $uuidStub = create_uuid_as_string();
+	my $tmp_archive_path = $ce->{webworkDirs}{courses} . "/ ${uuidStub}_$courseID.tar.gz";
+	my $data_dir = $ce->{courseDirs}{DATA};
+	my $dump_dir = "$data_dir/mysqldump";
+	my $archive_path;
+	if ( PGcore::not_null( $options{archive_path} ) ) {
+		$archive_path = $options{archive_path};
+	} else {
+		$archive_path = $ce->{webworkDirs}{courses} . "/$courseID.tar.gz";
+	}
+	
+	
+	# fail if the source course does not exist
+	unless (-e $course_dir) {
+		croak "$courseID: course not found";
+	}
+	
+    # replace previous archived file if it exists.
+	if (-e $archive_path) {
+		unlink($archive_path) if (-w $archive_path);
+		unless (-e $archive_path) {
+			print CGI::p({-style=>'color:red; font-weight:bold'}, "The archival version of '$courseID' has been replaced'.\n");
+		} else {
+			croak "Unable to replace the archival version of '$courseID'";
+		}
+	}
+	
+	#### step 1: dump tables #####
+	
+	unless (-e $dump_dir) {
+		mkdir $dump_dir or croak "Failed to create course database dump directory '$dump_dir': $!";
+	}
+	
+	my $db = new WeBWorK::DB($ce->{dbLayout});
+	my $dump_db_result = $db->dump_tables($dump_dir);
+	unless ($dump_db_result) {
+		_archiveCourse_remove_dump_dir($ce, $dump_dir);
+		croak "$courseID: course database dump failed.\n";
+	}
+	
+	##### step 2: tar and gzip course directory (including dumped database) #####
+	
+	# we want tar to run from the parent directory of the course directory
+	my $chdir_to = "$course_dir/..";
+	
+	my $tar_cmd = "2>&1 " . $ce->{externalPrograms}{tar}
+		. " -C " . shell_quote($chdir_to)
+		. " -czf " . shell_quote($tmp_archive_path)
+		. " " . shell_quote($courseID);
+	my $tar_out = readpipe $tar_cmd;
+	if ($?) {
+		my $exit = $? >> 8;
+		my $signal = $? & 127;
+		my $core = $? & 128;
+		_archiveCourse_remove_dump_dir($ce, $dump_dir);
+		croak "Failed to archive course directory '$course_dir' with command '$tar_cmd' (exit=$exit signal=$signal core=$core): $tar_out\n";
+	}
+	
+	##### step 3: cleanup -- remove database dump files from course directory #####
+	
+	unless (-e $archive_path) {
+		rename $tmp_archive_path, $archive_path;
+	} else {  
+		croak "Failed to create archived file at  '$archive_path'. File already exists.";
+		unlink($tmp_archive_path);  #clean up	
+	}
+	_archiveCourse_remove_dump_dir($ce, $dump_dir);
+}
+
+sub _archiveCourse_remove_dump_dir {
+	my ($ce, $dump_dir) = @_;
+	my $rm_cmd = "2>&1 " . $ce->{externalPrograms}{rm}
+		. " -rf " . shell_quote($dump_dir);
+	my $rm_out = readpipe $rm_cmd;
+	if ($?) {
+		my $exit = $? >> 8;
+		my $signal = $? & 127;
+		my $core = $? & 128;
+		carp "Failed to remove course database dump directory '$dump_dir' with command '$rm_cmd' (exit=$exit signal=$signal core=$core): $rm_out\n";
+	}
+}
+
+################################################################################
+
+=item unarchiveCourse(%options)
+
+%options must contain:
+
+ oldCourseID => $oldCourseID,
+ archivePath => $archivePath,
+ ce          => $ce,
+
+%options may also contain:
+
+ newCourseID => $newCourseID,
+
+Restores course $oldCourseID from a gzipped tar archive (.tar.gz) located at
+$archivePath. After unarchiving, the course database is restored from a
+subdirectory of the course's DATA directory.
+
+If $newCourseID is defined and differs from $oldCourseID, the course is renamed
+after unarchiving.
+
+$ce is a WeBWorK::CourseEnvironment object that describes the some course's
+environment. (Usually this would be the admin course.) This is used to access
+the course database and get path information.
+
+If an error occurs, an exception is thrown.
+
+=cut
+
+sub unarchiveCourse {
+	my (%options) = @_;
+	
+	my $newCourseID = $options{newCourseID};
+	my $currCourseID = $options{oldCourseID};
+	my $archivePath = $options{archivePath};
+	my $ce = $options{ce};
+	
+	my $coursesDir  = $ce->{webworkDirs}{courses};
+	
+	# Double check that the new course does not exist
+	if (-e "$coursesDir/$newCourseID") {
+		die "Cannot overwrite existing course $coursesDir/$newCourseID";
+	}
+	
+	##### step 1: move a conflicting course away #####
+	
+	# if this function returns undef, it means there was no course in the way
+	my $restoreCourseData = _unarchiveCourse_move_away($ce, $currCourseID);
+	
+	##### step 2: crack open the tarball #####
+	
+	my $tar_cmd = "2>&1 " . $ce->{externalPrograms}{tar}
+		. " -C " . shell_quote($coursesDir)
+		. " -xzf " . shell_quote($archivePath);
+	my $tar_out = readpipe $tar_cmd;
+	if ($?) {
+		my $exit = $? >> 8;
+		my $signal = $? & 127;
+		my $core = $? & 128;
+		_unarchiveCourse_move_back($restoreCourseData);
+		die "Failed to unarchive course directory with command '$tar_cmd' (exit=$exit signal=$signal core=$core): $tar_out\n";
+	}
+	
+	##### step 3: read the course environment for this course #####
+	
+	my $ce2 = new WeBWorK::CourseEnvironment({
+		get_SeedCE($ce),
+		courseName => $currCourseID,
+	});
+	
+	# pull out some useful stuff
+	my $course_dir = $ce2->{courseDirs}{root};
+	my $data_dir = $ce2->{courseDirs}{DATA};
+	my $dump_dir = "$data_dir/mysqldump";
+	my $old_dump_file = "$data_dir/${currCourseID}_mysql.database";
+	
+	##### step 4: restore the database tables #####
+	
+	my $no_database;
+	my $restore_db_result = 1;
+	if (-e $dump_dir) {
+		my $db = new WeBWorK::DB($ce2->{dbLayout});
+		$restore_db_result = $db->restore_tables($dump_dir);
+	} elsif (-e $old_dump_file) {
+		my $dbLayoutName = $ce2->{dbLayoutName};
+		if (ref getHelperRef("unarchiveCourseHelper", $dbLayoutName)) {
+			eval {
+				$restore_db_result = unarchiveCourseHelper($currCourseID, $ce2, $dbLayoutName,
+					unarchiveDatabasePath=>$old_dump_file);
+			};
+			if ($@) {
+				warn "failed to unarchive course database from dump file '$old_dump_file: $@\n";
+			}
+		} else {
+			warn "course '$currCourseID' uses dbLayout '$dbLayoutName', which doesn't support restoring database tables. database tables will not be restored.\n";
+			$no_database = 1;
+		}
+	} else {
+		warn "course '$currCourseID' has no database dump in its data directory (checked for $dump_dir and $old_dump_file). database tables will not be restored.\n";
+		$no_database = 1;
+	}
+	
+	unless ($restore_db_result) {
+		warn "database restore of course '$currCourseID' failed: the course will probably not be usable.\n";
+	}
+	
+	##### step 5: delete dump_dir and/or old_dump_file #####
+	
+	if (-e $dump_dir) {
+		_archiveCourse_remove_dump_dir($ce, $dump_dir);
+	}
+	if (-e $old_dump_file) {
+		unlink $old_dump_file or carp "Failed to unlink course database dump file '$old_dump_file: $_\n";
+	}
+	
+	##### step 6: rename course #####
+	
+	if (defined $newCourseID and $newCourseID ne $currCourseID) {
+		renameCourse(
+			courseID     => $currCourseID,
+			ce           => $ce2,
+			newCourseID  => $newCourseID,
+			skipDBRename => $no_database,
+		);
+	}
+	
+	##### step 7: return conflicting course to its rightful place #####
+	
+	_unarchiveCourse_move_back($restoreCourseData);
+}
+
+sub _unarchiveCourse_move_away {
+	my ($ce, $courseID) = @_;
+	
+	# course environment for before the course is moved
+	my $ce2 = new WeBWorK::CourseEnvironment({
+		get_SeedCE($ce),
+		courseName => $courseID,
+	});
+	
+	# if course directory doesn't exist, we don't have to do anything
+	return unless -e $ce2->{courseDirs}{root};
+	
+	# temporary name for course
+	my $tmpCourseID = "${courseID}_tmp";
+	
+	debug("Temporarily moving $courseID to $tmpCourseID to make room for course unarchiving");
+	renameCourse(
+		courseID    => $courseID,
+		ce          => $ce2,
+		newCourseID => $tmpCourseID,
+	);
+	
+	# course environment for after the course is moved
+	my $ce3 = new WeBWorK::CourseEnvironment({
+		get_SeedCE($ce),
+		courseName => $tmpCourseID,
+	});
+	
+	# data to pass to renameCourse when moving the course back to it's original name
+	my $restore_course_data = {
+		courseID    => $tmpCourseID,
+		ce          => $ce3, # course environment for moved course
+		newCourseID => $courseID,
+	};
+	
+	return $restore_course_data;
+}
+
+sub _unarchiveCourse_move_back {
+	my ($restore_course_data) = @_;
+	
+	return unless $restore_course_data;
+	
+	debug("Moving $$restore_course_data{courseID} back to $$restore_course_data{newCourseID} after course unarchiving");
+	renameCourse(%$restore_course_data);
+}
+
+################################################################################
+
+=item dbLayoutSQLSources($dbLayout)
+
+Retrun a hash of database sources for the sql and sql_single database layouts.
+Each element of the hash takes this form:
+
+ dbi_source => {
+     tables => [ 'table1', 'table2', ... ],
+     username => 'username',
+     password => 'password',
+ }
+
+In the common case, there will only be one source returned.
+
+=cut
+
+sub dbLayoutSQLSources {
+	my ($dbLayout) = @_;
+	
+	my %dbLayout = %$dbLayout;
+	my @tables = keys %dbLayout;
+	
+	my %sources;
+	
+	foreach my $table (@tables) {
+		my %table = %{ $dbLayout{$table} };
+		my %params = %{ $table{params} };
+		
+		if ($params{non_native}) {
+			debug("$table: marked non-native, skipping\n");
+			next;
+		}
+		
+		my $source = $table{source};
+		my $username = $params{username};
+		my $password = $params{password};
+		
+		push @{$sources{$source}{tables}}, $table;
+		
+		if (defined $sources{$source}{username}) {
+			if ($sources{$source}{username} ne $username) {
+				warn "conflicting usernames for source '$source':",
+					" '$sources{$source}{username}', '$username'\n";
+			} else {
+				# it's all good
+			}
+		} else {
+			$sources{$source}{username} = $username;
+		}
+		
+		if (defined $sources{$source}{password}) {
+			if ($sources{$source}{password} ne $password) {
+				warn "conflicting passwords for source '$source':",
+					" '$sources{$source}{password}', '$password'\n";
+			} else {
+				# it's all good
+			}
+		} else {
+			$sources{$source}{password} = $password;
+		}
+	}
+	
+	return %sources;
+}
+
+=back
+
+=cut
+
+################################################################################
+# database helpers
+################################################################################
+
+=head1 DATABASE-LAYOUT SPECIFIC HELPER FUNCTIONS
+
+These functions are used to perform database-layout specific operations.
+
+The implementations in this class do nothing, but if an appropriate function
+exists in a class with the name
+WeBWorK::Utils::CourseManagement::I<$dbLayoutName>, it will be used instead.
+
+=over
+
+=item archiveCourseHelper($courseID, $ce, $dbLayoutName, %options)
+
+Perform database-layout specific operations for archiving the data in a course.
+
+=cut
+
+sub archiveCourseHelper {
+	my ($courseID, $ce, $dbLayoutName, %options) = @_;
+	my $result = callHelperIfExists("archiveCourseHelper", $dbLayoutName, @_);
+	return $result;
+}
+
+=item unarchiveCourseHelper($courseID, $ce, $dbLayoutName, %options)
+
+Perform database-layout specific operations for unarchiving the data in a course
+and placing it in the database.
+
+=cut
+
+sub unarchiveCourseHelper {
+	my ($courseID, $ce, $dbLayoutName, %options) = @_;
+	my $result = callHelperIfExists("unarchiveCourseHelper", $dbLayoutName, @_);
+	return $result;
+}
+
+=item initNonNativeTables($ce, $db, $dbLayoutName, %options)
+
+Perform database-layout specific operations for initializing non-native database tables
+that are not associated with a particular course
+
+=cut
+
+sub initNonNativeTables {
+	my($ce, $dbLayoutName, %options) = @_;
+	my $str = '';
+	# Create a database handler
+	my $db = new WeBWorK::DB($ce->{dbLayouts}->{$dbLayoutName});
+	
+	 # lock database
+	 
+	# Find the names of the non-native database tables 
+	foreach my $table (sort keys %$db) {
+	    next unless $db->{$table}{params}{non_native}; # only look at non-native tables
+	    my $database_table_name = (exists $db->{$table}->{params}->{tableOverride})? $db->{$table}->{params}->{tableOverride}:$table;
+	    #warn "table is $table";
+	    #warn "checking $database_table_name";
+	    my $database_table_exists = ($db->{$table}->tableExists) ? 1:0;
+	    unless ($database_table_exists ) { # exists means the table can be described;
+	    	my $schema_obj = $db->{$table};
+	    	if ($schema_obj->can("create_table")) {
+			    #warn "creating table $database_table_name  with object $schema_obj";
+				$schema_obj->create_table;
+				$str .= "Table '$table' created as '$database_table_name' in database.".CGI::br();
+			} else {
+				# warn "Skipping creation of '$table' table: no create_table method\n";
+			}
+	    
+	    }
+	   
+	}
+	
+	# unlock database
+	$str;
+
+
+}
+
+
+
+################################################################################
+# utilities
+################################################################################
+
+=head1 UTILITIES
+
+These functions are used by this class's public functions and should not be
+called directly.
+
+=over
+
+=item callHelperIfExists($helperName, $dbLayoutName, @args)
+
+Call a database-specific helper function, if a database-layout specific helper
+class exists and contains a function named "${helperName}Helper".
+
+=cut
+
+sub callHelperIfExists {
+	my ($helperName, $dbLayoutName, @args) = @_;
+	
+	my $helperRef = getHelperRef($helperName, $dbLayoutName);
+	if (ref $helperRef) {
+		return $helperRef->(@args);
+	} else {
+		return $helperRef;
+	}
+}
+
+=over
+
+=item getHelperRef($helperName, $dbLayoutName)
+
+Call a database-specific helper function, if a database-layout specific helper
+class exists and contains a function named "${helperName}Helper".
+
+=cut
+sub getHelperRef {
+	my ($helperName, $dbLayoutName) = @_;
+	
+	my $result;
+	
+	my $package = __PACKAGE__ . "::$dbLayoutName";
+	
+	eval { runtime_use $package };
+	if ($@) {
+		if ($@ =~ /^Can't locate/) {
+			debug("No database-layout specific library for layout '$dbLayoutName'.\n");
+			$result = 1;
+		} else {
+			warn "Failed to load database-layout specific library: $@\n";
+			$result = 0;
+		}
+	} else {
+		my %syms = do { no strict 'refs'; %{$package."::"} };
+		if (exists $syms{$helperName}) {
+			$result = do { no strict 'refs'; \&{$package."::".$helperName} };
+		} else {
+			debug("No helper defined for operation '$helperName'.\n");
+			$result = 1;
+		}
+	}
+	
+	#warn "getHelperRef = '$result'\n";
+	return $result;
+}
+
+=item protectQString($string)
+
+Protects the contents of a single-quoted Perl string.
+
+=cut
+
+sub protectQString {
+	my ($string) = @_;
+	$string =~ s/'/\'/g;
+	return $string;
+}
+
+=item writeCourseConf($fh, $ce, %options)
+
+Writes a course.conf file to $fh, a file handle, using defaults from the course
+environment object $ce and overrides from %options. %options can contain any of
+the pairs accepted in %courseOptions by addCourse(), above.
+
+=cut
+
+sub writeCourseConf {
+	my ($fh, $ce, %options) = @_;
+	
+	# several options should be defined no matter what
+	$options{dbLayoutName} = $ce->{dbLayoutName} unless defined $options{dbLayoutName};
+	
+	print $fh <<'EOF';
+#!perl
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# 
+# 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+# This file is used to override the global WeBWorK course environment for
+# requests to this course. All package variables set in this file are added to
+# the course environment. If you wish to set a variable here but omit it from
+# the course environment,  use the "my" keyword. Commonly changed configuration
+# options are noted below.
+
+EOF
+	
+	print $fh <<'EOF';
+# Database Layout (global value typically defined in global.conf)
+# 
+# Several database are defined in the file conf/database.conf and stored in the
+# hash %dbLayouts.
+# 
+# The database layout is always set here, since one should be able to change the
+# default value in global.conf without disrupting existing courses.
+# 
+# global.conf values:
+EOF
+	
+	print $fh "# \t", '$dbLayoutName = \'', protectQString($ce->{dbLayoutName}), '\';', "\n";
+	print $fh "# \t", '*dbLayout = $dbLayouts{$dbLayoutName};', "\n";
+	print $fh "\n";
+	
+	if (defined $options{dbLayoutName}) {
+		print $fh '$dbLayoutName = \'', protectQString($options{dbLayoutName}), '\';', "\n";
+		print $fh '*dbLayout = $dbLayouts{$dbLayoutName};', "\n";
+		print $fh "\n";
+	} else {
+		print $fh "\n\n\n";
+	}
+	
+	print $fh <<'EOF';
+# Allowed Mail Recipients (global value typically not defined)
+# 
+# Defines addresses to which the PG system is allowed to send mail. This should
+# probably be set to the addresses of professors of this course. Sending mail
+# from the PG system (i.e. questionaires, essay questions) will fail if this is
+# not set.
+# 
+# global.conf values:
+EOF
+	
+	if (defined $ce->{mail}->{allowedRecipients}) {
+		print $fh "# \t", '$mail{allowedRecipients} = [',
+				join(", ", map { "'" . protectQString($_) . "'" } @{ $ce->{mail}->{allowedRecipients} }), '];', "\n";
+	} else {
+		print $fh "# \t", '$mail{allowedRecipients} = [  ];', "\n";
+	}
+	print $fh "\n";
+	
+	if (defined $options{allowedRecipients}) {
+		print $fh '$mail{allowedRecipients} = [',
+				join(", ", map { "'" . protectQString($_) . "'" } @{ $options{allowedRecipients} }), '];', "\n";
+		print $fh "\n";
+	} else {
+		print $fh "\n\n\n";
+	}
+	
+	print $fh <<'EOF';
+# By default, feeback is sent to all users who have permission to
+# receive_feedback. If this list is non-empty, feedback is also sent to the
+# addresses specified here.
+# 
+# * If you want to disable feedback altogether, leave this empty and set
+#   $permissionLevels{submit_feeback} = undef;
+#   This will cause the
+#   feedback button to go away as well.
+# 
+# * If you want to send email ONLY to addresses in this list, set
+#   $permissionLevels{receive_feedback} = undef; 
+# 
+# It's often useful to set this in the course.conf to change the behavior of
+# feedback for a specific course.
+# global.conf values:
+EOF
+	
+	if (defined $ce->{mail}->{feedbackRecipients}) {
+		print $fh "# \t", '$mail{feedbackRecipients} = [',
+				join(", ", map { "'" . protectQString($_) . "'" } @{ $ce->{mail}->{feedbackRecipients} }), '];', "\n";
+	} else {
+		print $fh "# \t", '$mail{feedbackRecipients} = [  ];', "\n";
+	}
+	print $fh "\n";
+	
+	if (defined $options{feedbackRecipients}) {
+		print $fh '$mail{feedbackRecipients} = [',
+				join(", ", map { "'" . protectQString($_) . "'" } @{ $options{feedbackRecipients} }), '];', "\n";
+		print $fh "\n";
+	} else {
+		print $fh "\n\n\n";
+	}
+	
+	print $fh <<'EOF';
+# Users for whom to label problems with the PG file name (global value typically "professor")
+# 
+# For users in this list, PG will display the source file name when rendering a problem.
+# 
+# global.conf values:
+EOF
+	
+	if (defined $ce->{pg}{specialPGEnvironmentVars}{PRINT_FILE_NAMES_FOR}) {
+		print $fh "# \t", '$pg{specialPGEnvironmentVars}{PRINT_FILE_NAMES_FOR} = [',
+				join(", ", map { "'" . protectQString($_) . "'" } @{ $ce->{pg}{specialPGEnvironmentVars}{PRINT_FILE_NAMES_FOR} }), '];', "\n";
+	} else {
+		print $fh "# \t", '$pg{specialPGEnvironmentVars}{PRINT_FILE_NAMES_FOR} = [  ];', "\n";
+	}
+	print $fh "\n";
+	
+	if (defined $options{PRINT_FILE_NAMES_FOR}) {
+		print $fh '$pg{specialPGEnvironmentVars}{PRINT_FILE_NAMES_FOR} = [',
+				join(", ", map { "'" . protectQString($_) . "'" } @{ $options{PRINT_FILE_NAMES_FOR} }), '];', "\n";
+		print $fh "\n";
+	} else {
+		print $fh "\n\n\n";
+	}
+}
+
+
+sub get_SeedCE {     # helper subroutine to produce a stripped down seed Course Environment from an arbitrary course environment
+	my $ce = shift;
+	warn "get_SeedCE needs current Course environment to create seed CE" unless ref($ce) ;
+	my %seedCE=();
+	my @conf_items = qw( webwork_dir webwork_url pg_dir courseName)   ;  # items to transfer. courseName is often overridden
+	foreach my $item (@conf_items) {
+			$seedCE{$item} = $ce->{$item};
+	}
+    return( %seedCE);
+}
+1;
diff --git a/lib/WeBWorK/Utils/CourseManagement/sql_moodle.pm b/lib/WeBWorK/Utils/CourseManagement/sql_moodle.pm
new file mode 100644
index 0000000000..8966f651ae
--- /dev/null
+++ b/lib/WeBWorK/Utils/CourseManagement/sql_moodle.pm
@@ -0,0 +1,34 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/Utils/CourseManagement/sql_moodle.pm,v 1.2 2006/09/29 19:41:36 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::Utils::CourseManagement::sql_moodle;
+
+=head1 NAME
+
+WeBWorK::Utils::CourseManagement::sql_moodle - create and delete courses using
+the sql_moodle database layout. Delegates functionality to
+WeBWorK::Utils::CourseManagement::sql_single.
+
+=cut
+
+use strict;
+use warnings;
+use WeBWorK::Utils::CourseManagement::sql_single;
+
+*archiveCourseHelper = \&WeBWorK::Utils::CourseManagement::sql_single::archiveCourseHelper;
+*unarchiveCourseHelper = \&WeBWorK::Utils::CourseManagement::sql_single::unarchiveCourseHelper;
+
+1;
diff --git a/lib/WeBWorK/Utils/CourseManagement/sql_single.pm b/lib/WeBWorK/Utils/CourseManagement/sql_single.pm
new file mode 100644
index 0000000000..5ef059474d
--- /dev/null
+++ b/lib/WeBWorK/Utils/CourseManagement/sql_single.pm
@@ -0,0 +1,248 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/Utils/CourseManagement/sql_single.pm,v 1.16 2007/07/21 19:13:10 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::Utils::CourseManagement::sql_single;
+
+=head1 NAME
+
+WeBWorK::Utils::CourseManagement::sql_single - create and delete courses using
+the sql_single database layout.
+
+=cut
+
+use strict;
+use warnings;
+#use Data::Dumper;
+#use DBI;
+use File::Temp;
+use String::ShellQuote;
+use WeBWorK::Debug;
+use WeBWorK::Utils qw/runtime_use/;
+#use WeBWorK::Utils::CourseManagement qw/dbLayoutSQLSources/;
+
+=for comment
+
+# DBFIXME this whole process should be through an abstraction layer
+# DBFIXME (we shouldn't be calling mysqldump here
+sub archiveCourseHelper {
+	my ($courseID, $ce,  $dbLayoutName, %options) = @_;
+	debug("courseID=$courseID, ce=$ce dbLayoutName=$dbLayoutName\n");
+	
+	##### get list of tables to archive #####
+	
+	my $dbLayout    = $ce->{dbLayouts}->{$dbLayoutName};
+	debug("dbLayout=$dbLayout\n");
+	my %sources     = dbLayoutSQLSources($dbLayout);
+	debug("fSources: ", Dumper(\%sources));
+	my $source    = mostPopularSource(%sources);
+	debug("source=$source\n");
+	my %source = %{ $sources{$source} };
+	my @tables = @{ $source{tables} };
+	my $username = $source{username};
+	my $password = $source{password};
+	my $archiveDatabasePath = $options{archiveDatabasePath};
+	
+	##### construct SQL statements to copy the data in each table #####
+	
+	my @stmts;
+	my @dataTables = ();
+	foreach my $table (@tables) {
+		debug("Table: $table\n");
+		
+		if ($dbLayout->{$table}{params}{non_native}) {
+			debug("$table: marked non-native, skipping\n");
+			next;
+		}
+		
+		my $table = do {
+			my $paramsRef = $dbLayout->{$table}->{params};
+			if ($paramsRef) {
+				if (exists $paramsRef->{tableOverride}) {
+					$paramsRef->{tableOverride}
+				} else {
+					""; # no override
+				}
+			} else {
+				""; # no params
+			}
+		} || $table;
+		debug("sql \"real\" table name: $table\n");
+		
+       
+        # this method would be mysql specific but it's a start
+		# mysqldump  --user=$username   --password=$password database   tables
+#		my $stmt = "DUMP SELECT * FROM `$fromTable`";
+#		debug("stmt = $stmt\n");
+#		push @stmts, $stmt;
+	    push @dataTables, $table;
+	}
+	debug("Database tables to export are ",join(" ", @dataTables));
+	# this method would be mysql specific but it's a start
+	my $mysqldumpCommand = $ce->{externalPrograms}{mysqldump};
+	my $exportStatement = " $mysqldumpCommand  --user=$username  ".
+	"--password=$password " .
+	" webwork   ".
+	join(" ", @dataTables).
+	"   >$archiveDatabasePath";
+	debug($exportStatement);
+	my $exportResult = system $exportStatement;
+	$exportResult and die "Failed to export database with command: '$exportStatement ' (errno: $exportResult): $!
+	\n\n Check server error log for more information.";
+
+	##### issue SQL statements #####
+	
+# 	my $dbh = DBI->connect($source, $username, $password);
+# 	unless (defined $dbh) {
+# 		die "sql_single: failed to connect to DBI source '$source': $DBI::errstr\n";
+# 	}
+# 	
+# 	foreach my $stmt (@stmts) {
+# 		my $rows = $dbh->do($stmt);
+# 		unless (defined $rows) {
+# 			die "sql_single: failed to execute SQL statement '$stmt': $DBI::errstr\n";
+# 		}
+# 	}
+# 	
+# 	$dbh->disconnect;
+	
+	return 1;
+}
+
+=cut
+
+=for comment
+
+# DBFIXME this whole process should be through an abstraction layer
+# DBFIXME (we shouldn't be calling mysqldump here!)
+sub unarchiveCourseHelper {
+	my ($courseID, $ce,  $dbLayoutName, %options) = @_;
+	debug("courseID=$courseID, ce=$ce dbLayoutName=$dbLayoutName\n");
+	
+	##### get list of tables to archive #####
+	
+	my $dbLayout    = $ce->{dbLayouts}->{$dbLayoutName};
+	debug("dbLayout=$dbLayout\n");
+	my %sources     = dbLayoutSQLSources($dbLayout);
+	debug("fSources: ", Dumper(\%sources));
+	my $source    = mostPopularSource(%sources);
+	debug("source=$source\n");
+	my %source = %{ $sources{$source} };
+	my @tables = @{ $source{tables} };
+	my $username = $source{username};
+	my $password = $source{password};
+	my $unarchiveDatabasePath = $options{unarchiveDatabasePath};
+	debug( "unarchive database Path is $unarchiveDatabasePath");
+	##### construct SQL statements to copy the data in each table #####
+	
+
+	# this method would be mysql specific but it's a start
+	my $mysqlCommand = $ce->{externalPrograms}{mysql};
+	my $importStatement = " $mysqlCommand  --user=$username  ".
+	"--password=$password " .
+	"-D webwork".        # specifies database name
+	"   <$unarchiveDatabasePath";
+	debug($importStatement);
+	my $importResult = system $importStatement;
+	$importResult and die "<pre>Failed to import database with command: \n
+	'$importStatement ' \n
+	(errno: $importResult): $!
+	\n Check server error log for more information.\n</pre>";
+	#FIXME  -- what should the return be??
+	return 1;
+}
+
+=cut
+
+# TOTALLY STOLEN FROM NewSQL::Std.
+sub unarchiveCourseHelper {
+	my ($courseID, $ce,  $dbLayoutName, %options) = @_;
+	my $dumpfile_path = $options{unarchiveDatabasePath};
+	
+	my ($my_cnf, $database) = _get_db_info($ce);
+	my $mysql = $ce->{externalPrograms}{mysql};
+	
+	my $restore_cmd = "2>&1 " . shell_quote($mysql)
+		. " --defaults-extra-file=" . shell_quote($my_cnf->filename)
+		. " " . shell_quote($database)
+		. " < " . shell_quote($dumpfile_path);
+	my $restore_out = readpipe $restore_cmd;
+	if ($?) {
+		my $exit = $? >> 8;
+		my $signal = $? & 127;
+		my $core = $? & 128;
+		die "Failed to restore database for course '$courseID' with command '$restore_cmd' (exit=$exit signal=$signal core=$core): $restore_out\n";
+	}
+	
+	return 1;
+}
+
+# TOTALLY STOLEN FROM NewSQL::Std.
+sub _get_db_info {
+	my ($ce) = @_;
+	my $dsn = $ce->{database_dsn};
+	my $username = $ce->{database_username};
+	my $password = $ce->{database_password};
+	
+	die "Can't call dump_table or restore_table on a table with a non-MySQL source"
+		unless $dsn =~ s/^dbi:mysql://i;
+	
+	# this is an internal function which we probably shouldn't be using here
+	# but it's quick and gets us what we want (FIXME what about sockets, etc?)
+	my %dsn;
+	runtime_use "DBD::mysql";
+	DBD::mysql->_OdbcParse($dsn, \%dsn, ['database', 'host', 'port']);
+	die "no database specified in DSN!" unless defined $dsn{database};
+	
+	# doing this securely is kind of a hassle...
+	my $my_cnf = new File::Temp;
+	$my_cnf->unlink_on_destroy(1);
+	chmod 0600, $my_cnf or die "failed to chmod 0600 $my_cnf: $!"; # File::Temp objects stringify with ->filename
+	print $my_cnf "[client]\n";
+	print $my_cnf "user=$username\n" if defined $username and length($username) > 0;
+	print $my_cnf "password=$password\n" if defined $password and length($password) > 0;
+	print $my_cnf "host=$dsn{host}\n" if defined $dsn{host} and length($dsn{host}) > 0;
+	print $my_cnf "port=$dsn{port}\n" if defined $dsn{port} and length($dsn{port}) > 0;
+	
+	return ($my_cnf, $dsn{database});
+}
+
+=for comment
+
+# returns the name of the source with the most tables
+sub mostPopularSource {
+	my (%sources) = @_;
+	
+	my $source;
+	if (keys %sources > 1) {
+		# more than one -- warn and select the most popular source
+ 		debug("more than one SQL source defined.\n");
+		foreach my $curr (keys %sources) {
+			$source = $curr if not defined $source or @{ $sources{$curr}->{tables} } > @{ $sources{$source}->{tables} };
+ 		}
+ 		debug("only handling tables with source \"$source\".\n");
+ 		debug("others will have to be handled manually (or not at all).\n");
+ 	} else {
+		# there's only one
+		($source) = keys %sources;
+	}
+	
+	return $source;
+}
+
+=cut
+
+1;
+
diff --git a/lib/WeBWorK/Utils/DBImportExport.pm b/lib/WeBWorK/Utils/DBImportExport.pm
new file mode 100644
index 0000000000..08f068b2f8
--- /dev/null
+++ b/lib/WeBWorK/Utils/DBImportExport.pm
@@ -0,0 +1,503 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/Utils/DBImportExport.pm,v 1.10 2006/09/26 15:57:41 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::Utils::DBImportExport;
+use base qw(Exporter);
+
+=head1 NAME
+
+WeBWorK::Utils::DBImportExport - import and export the database.
+
+=cut
+
+use strict;
+use warnings;
+use Carp;
+use XML::Parser;
+use XML::Parser::EasyTree; $XML::Parser::EasyTree::Noempty = 1;
+use XML::Writer;
+use WeBWorK::Utils qw();
+
+our @EXPORT    = ();
+our @EXPORT_OK = qw(
+	listTables
+	dbExport
+	dbImport
+);
+
+our $DB_VERSION = "WWDBv2";
+
+# table order is important
+our @TABLE_ORDER = qw/user password permission key set problem set_user problem_user/;
+
+# each subroutine should take a WeBWorK::DB object and return all records of a
+# given type. these are tricky!
+#our %EXPORT_SUBS = (
+#	user         => sub { $_[0]->getUsers($_[0]->listUsers) },
+#	password     => sub { $_[0]->getPasswords($_[0]->listPasswords) },
+#	permission   => sub { $_[0]->getPermissionLevels($_[0]->listPermissionLevels) },
+#	key          => sub { $_[0]->getKeys($_[0]->listKeys) },
+#	set          => sub { $_[0]->getGlobalSets($_[0]->listGlobalSets) },
+#	problem      => sub { map { $_[0]->getAllGlobalProblems($_) } $_[0]->listGlobalSets },
+#	set_user     => sub { $_[0]->getUserSets( map { my $u=$_; map { [$u, $_] } $_[0]->listUserSets($u) } $_[0]->listUsers ) },
+#	problem_user => sub { map { my $u=$_; map { $_[0]->getAllUserProblems($u, $_) } $_[0]->listUserSets($u) } $_[0]->listUsers },
+#);
+# The above isn't used any more because it was waaay toooo sloowwww...
+
+# each subroutine should take a WeBWorK::DB object and return a new, empty
+# record object for a table.
+our %NEW_SUBS = (
+	user         => sub { $_[0]->newUser },
+	password     => sub { $_[0]->newPassword },
+	permission   => sub { $_[0]->newPermissionLevel },
+	key          => sub { $_[0]->newKey },
+	set          => sub { $_[0]->newGlobalSet },
+	problem      => sub { $_[0]->newGlobalProblem },
+	set_user     => sub { $_[0]->newUserSet },
+	problem_user => sub { $_[0]->newUserProblem },
+);
+
+# each subroutine should take a WeBWorK::DB object and a subclass of 
+# WeBWorK::DB::Record, and should add that record into a table in the given
+# database.
+our %ADD_SUBS = (
+	user         => sub { $_[0]->addUser($_[1]) },
+	password     => sub { $_[0]->addPassword($_[1]) },
+	permission   => sub { $_[0]->addPermissionLevel($_[1]) },
+	key          => sub { $_[0]->addKey($_[1]) },
+	set          => sub { $_[0]->addGlobalSet($_[1]) },
+	problem      => sub { $_[0]->addGlobalProblem($_[1]) },
+	set_user     => sub { $_[0]->addUserSet($_[1]) },
+	problem_user => sub { $_[0]->addUserProblem($_[1]) },
+);
+
+# each subroutine should take a WeBWorK::DB object and a subclass of 
+# WeBWorK::DB::Record, and should put that record into a table in the given
+# database.
+our %PUT_SUBS = (
+	user         => sub { $_[0]->putUser($_[1]) },
+	password     => sub { $_[0]->putPassword($_[1]) },
+	permission   => sub { $_[0]->putPermissionLevel($_[1]) },
+	key          => sub { $_[0]->putKey($_[1]) },
+	set          => sub { $_[0]->putGlobalSet($_[1]) },
+	problem      => sub { $_[0]->putGlobalProblem($_[1]) },
+	set_user     => sub { $_[0]->putUserSet($_[1]) },
+	problem_user => sub { $_[0]->putUserProblem($_[1]) },
+);
+
+=head1 FUNCTIONS
+
+=over
+
+=item listTables()
+
+List the names of the tables supported for export.
+
+=cut
+
+sub listTables {
+	return @TABLE_ORDER;
+}
+
+=item dbExport(%options)
+
+Exports data from a WeBWorK database to a WWDBv2 XML document.
+
+%options can contain:
+
+=over
+
+=item db
+
+A WeBWorK::DB instance. Data will be exported from this database.
+
+=item xml
+
+A file handle, opened for writing. The XML output will we written to this file
+handle.
+
+=item tables
+
+A reference to a list specifying the set of tables from which to export data.
+
+=item records
+
+Unimplemented.
+
+=back
+
+=cut
+
+# DBFIXME this whole module is a MESS! we need efficient dump/restore functionality in the abstraction layer!
+sub dbExport {
+	my (%options) = @_;
+	
+	croak "options: 'xml' required.\n" unless exists $options{xml};
+	croak "options: 'db' required.\n" unless exists $options{db};
+	
+	my @tables = exists $options{tables} ? @{$options{tables}} : ();
+	@tables = @TABLE_ORDER unless @tables;
+	my %tables;
+	@tables{@tables} = ();
+
+	my $writer = new XML::Writer(OUTPUT => $options{xml}, NEWLINES => 0, DATA_MODE => 1);
+	$writer->startTag("webwork", version => $DB_VERSION);
+	
+	#foreach my $table (@TABLE_ORDER) {
+	#	next unless exists $tables{$table}; # skip unrequested tables
+	#	$writer->startTag($table."s"); # plural
+	#	
+	#	my @Records = $EXPORT_SUBS{$table}->($options{db});
+	#	foreach my $Record (@Records) {
+	#		next unless $Record; # skip undefined records
+	#		$writer->startTag($table);
+	#		foreach my $field ($Record->FIELDS) {
+	#			$writer->dataElement($field, $Record->$field);
+	#		}
+	#		$writer->endTag;
+	#	}
+	#	$writer->endTag;
+	#	delete $tables{$table}; # finished with that table
+	#}
+	
+	my $db = $options{db};
+	
+	if (exists $tables{user}) {
+		$writer->startTag("users");
+		my @recordIDs = $db->listUsers;
+		foreach my $recordID (@recordIDs) {
+			my $Record = $db->getUser($recordID);
+			next unless $Record;
+			$writer->startTag("user");
+			foreach my $field ($Record->FIELDS) {
+				$writer->dataElement($field, $Record->$field);
+			}
+			$writer->endTag; # user
+		}
+		$writer->endTag; # users
+		delete $tables{user}; # finished with that table
+	}
+	
+	if (exists $tables{password}) {
+		$writer->startTag("passwords");
+		my @recordIDs = $db->listPasswords;
+		foreach my $recordID (@recordIDs) {
+			my $Record = $db->getPassword($recordID);
+			next unless $Record;
+			$writer->startTag("password");
+			foreach my $field ($Record->FIELDS) {
+				$writer->dataElement($field, $Record->$field);
+			}
+			$writer->endTag; # password
+		}
+		$writer->endTag; # passwords
+		delete $tables{password}; # finished with that table
+	}
+	
+	if (exists $tables{permission}) {
+		$writer->startTag("permissions");
+		my @recordIDs = $db->listPermissionLevels;
+		foreach my $recordID (@recordIDs) {
+			my $Record = $db->getPermissionLevel($recordID);
+			next unless $Record;
+			$writer->startTag("permission");
+			foreach my $field ($Record->FIELDS) {
+				$writer->dataElement($field, $Record->$field);
+			}
+			$writer->endTag; # permission
+		}
+		$writer->endTag; # permissions
+		delete $tables{permission}; # finished with that table
+	}
+	
+	if (exists $tables{key}) {
+		$writer->startTag("keys");
+		my @recordIDs = $db->listKeys;
+		foreach my $recordID (@recordIDs) {
+			my $Record = $db->getKey($recordID);
+			next unless $Record;
+			$writer->startTag("key");
+			foreach my $field ($Record->FIELDS) {
+				$writer->dataElement($field, $Record->$field);
+			}
+			$writer->endTag; # key
+		}
+		$writer->endTag; # keys
+		delete $tables{key}; # finished with that table
+	}
+	
+	if (exists $tables{set}) {
+		$writer->startTag("sets");
+		my @recordIDs = $db->listGlobalSets;
+		foreach my $recordID (@recordIDs) {
+			my $Record = $db->getGlobalSet($recordID);
+			next unless $Record;
+			$writer->startTag("set");
+			foreach my $field ($Record->FIELDS) {
+				$writer->dataElement($field, $Record->$field);
+			}
+			$writer->endTag; # set
+		}
+		$writer->endTag; # sets
+		delete $tables{set}; # finished with that table
+	}
+	
+	if (exists $tables{problem}) {
+		$writer->startTag("problems");
+		my @setIDs = $db->listGlobalSets;
+		foreach my $setID (@setIDs) {
+			# BEGIN old
+			#my @problemIDs = $db->listGlobalProblems($setID);
+			#foreach my $problemID (@problemIDs) {
+			#	my $Record = $db->getGlobalProblem($setID, $problemID);
+			# END old
+			# BEGIN new
+			my @Problems = $db->getAllGlobalProblems($setID);
+			foreach my $Record (@Problems) {
+			# END new
+				next unless $Record;
+				$writer->startTag("problem");
+				foreach my $field ($Record->FIELDS) {
+					$writer->dataElement($field, $Record->$field);
+				}
+				$writer->endTag; # problem
+			}
+		}
+		$writer->endTag; # problems
+		delete $tables{problem}; # finished with that table
+	}
+	
+	if (exists $tables{set_user}) {
+		$writer->startTag("set_users");
+		my @userIDs = $db->listUsers;
+		foreach my $userID (@userIDs) {
+			my @setIDs = $db->listUserSets($userID);
+			foreach my $setID (@setIDs) {
+				my $Record = $db->getUserSet($userID, $setID);
+				next unless $Record;
+				$writer->startTag("set_user");
+				foreach my $field ($Record->FIELDS) {
+					$writer->dataElement($field, $Record->$field);
+				}
+				$writer->endTag; # set_user
+			}
+		}
+		$writer->endTag; # set_users
+		delete $tables{set_user}; # finished with that table
+	}
+	
+	if (exists $tables{problem_user}) {
+		$writer->startTag("problem_users");
+		my @userIDs = $db->listUsers;
+		foreach my $userID (@userIDs) {
+			my @setIDs = $db->listUserSets($userID);
+			foreach my $setID (@setIDs) {
+				# BEGIN old
+				#my @problemIDs = $db->listUserProblems($userID, $setID);
+				#foreach my $problemID (@problemIDs) {
+				#	my $Record = $db->getUserProblem($userID, $setID, $problemID);
+				# END old
+				# BEGIN new
+				my @Problems = $db->getAllUserProblems($userID, $setID);
+				foreach my $Record (@Problems) {
+				# END new
+					next unless $Record;
+					$writer->startTag("problem_user");
+					foreach my $field ($Record->FIELDS) {
+						$writer->dataElement($field, $Record->$field);
+					}
+					$writer->endTag; # problem_user
+				}
+			}
+		}
+		$writer->endTag; # problem_users
+		delete $tables{problem_user}; # finished with that table
+	}
+	
+	$writer->endTag; # webwork
+	$writer->end;
+	
+	foreach my $table (keys %tables) {
+		warn "skipped unknown table \"$table\".\n";
+	}
+	
+	return ();
+}
+
+=item dbImport(%options)
+
+Imports the data from a WWDBv2 XML document into a WeBWorK database.
+
+In this version, the entire XML parse tree is held in RAM during the import.
+This can be very memory intensive for large import files.
+
+%options can contain:
+
+=over
+
+=item xml
+
+A string containing WWDBv2 XML data or a file handle opened for reading from a
+WWDBv2 XML document.
+
+=item db
+
+A WeBWorK::DB instance. Imported data will be added to this database.
+
+=item tables
+
+A reference to a list specifying the set of tables from which to import data.
+
+=item records
+
+Unimplemented.
+
+=item conflict
+
+A string, containing either "skip" or "replace", indicating what to do with
+duplicate records. If not set, duplicate records are skipped.
+
+=back
+
+=cut
+
+# DBFIXME this whole module is a MESS! we need efficient dump/restore functionality in the abstraction layer!
+sub dbImport {
+	my (%options) = @_;
+	
+	croak "options: 'xml' required.\n" unless exists $options{xml};
+	croak "options: 'db' required.\n" unless exists $options{db};
+	
+	my $replace = exists $options{conflict} && $options{conflict} eq "replace";
+	
+	my @tables = exists $options{tables} ? @{$options{tables}} : ();
+	@tables = @TABLE_ORDER unless @tables;
+	my %tables;
+	@tables{@tables} = ();
+	
+	my ($parser, $tree);
+	eval {
+		$parser = new XML::Parser(Style => "EasyTree");
+		$tree = $parser->parse($options{xml});
+	};
+	if ($@) {
+		return "Failed to parse XML document: $@";
+	}
+	
+	# find "webwork" node
+	my ($root_element) = findNodes($tree, "e", "webwork");
+	unless (defined $root_element) {
+		return "Format error: 'webwork' element not found.";
+	}
+	
+	# verify version
+	unless (exists $root_element->{attrib}->{version}) {
+		return "Version mismatch: XML document has no version attribute.";
+	}
+	unless ($root_element->{attrib}->{version} eq $DB_VERSION) {
+		return "Version mismatch: XML document has version \""
+			. $root_element->{attrib}->{version} . "\" (expected $DB_VERSION).";
+	}
+	
+	my @nonfatal_errors;
+	
+	TABLE: foreach my $table (@TABLE_ORDER) {
+		next TABLE unless exists $tables{$table}; # skip unrequested tables
+		
+		my ($table_element) = findNodes($root_element->{content}, "e", $table."s");
+		unless ($table_element) {
+			push @nonfatal_errors, "Format error: '${table}s' element not found.";
+			next TABLE;
+		}
+		
+		my $add_sub = $ADD_SUBS{$table};
+		my $put_sub = $PUT_SUBS{$table};
+		
+		my @record_elements = findNodes($table_element->{content}, "e", $table);
+		foreach my $record_element (@record_elements) {
+			my $Record = $NEW_SUBS{$table}->($options{db});
+			element2record($record_element, $Record);
+			
+			eval { $options{db}->$add_sub($Record) };
+			if ($@) {
+				if ($@ =~ m/exists/) {
+					if ($replace) {
+						eval { $options{db}->$put_sub($Record) };
+						if ($@) {
+							push @nonfatal_errors, "$table record with @{[$Record->idsToString]} exists, failed to replace: $@";
+						}
+					} else {
+						push @nonfatal_errors, "$table record with @{[$Record->idsToString]} exists, skipping";
+					}
+				} else {
+					push @nonfatal_errors, "$table record with @{[$Record->idsToString]}: $@";
+				}
+			}
+		}
+	}
+	
+	return @nonfatal_errors;
+}
+
+sub findNodes {
+	my ($tree, $type, $name) = @_;
+	my @found;
+	foreach my $node (@$tree) {
+		if ((not defined $type or $node->{type} eq $type)
+				and (not defined $name or $node->{name} eq $name)) {
+			push @found, $node;
+		}
+	}
+	return @found;
+}
+
+sub element2record {
+	my ($element, $Record) = @_;
+	my %fields;
+	@fields{$Record->FIELDS} = ();
+	
+	foreach my $field_element (@{$element->{content}}) {
+		my $type = $field_element->{type};
+		my $name = $field_element->{name};
+		unless ($type eq "e") {
+			warn "found unexpected node of type '$type', ignoring.\n";
+			next;
+		}
+		unless (exists $fields{$name}) {
+			warn "found unexpected element with name '$name', ignoring.\n";
+			next;
+		}
+		if ($fields{$name}) {
+			warn "found duplicate element with name '$name', ignoring.\n";
+			next;
+		}
+		
+		$fields{$name}++;
+		my ($content_node) = findNodes($field_element->{content}, "t", undef);
+		unless ($content_node) {
+			#warn "field element '$name' has no content, ignoring.\n";
+			next;
+		}
+		$Record->$name($content_node->{content});
+	}
+	return $Record;
+}
+
+=back
+
+=cut
+
+1;
diff --git a/lib/WeBWorK/Utils/DBUpgrade.pm b/lib/WeBWorK/Utils/DBUpgrade.pm
new file mode 100644
index 0000000000..bea9d3b10b
--- /dev/null
+++ b/lib/WeBWorK/Utils/DBUpgrade.pm
@@ -0,0 +1,695 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/Utils/DBUpgrade.pm,v 1.4 2007/08/13 22:59:59 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::Utils::DBUpgrade;
+
+=head1 NAME
+
+WeBWorK::Utils::DBUpgrade - upgrade WeBWorK SQL databases.
+
+=cut
+
+use strict;
+use warnings;
+use WeBWorK::Debug;
+#use WeBWorK::Utils::CourseManagement qw/listCourses/;
+
+################################################################################
+
+# dummy package variable to localize later
+our $self;
+
+my $i = -1;
+our @DB_VERSIONS;
+
+$DB_VERSIONS[++$i]{desc} = "is the initial version of database, identical to database structure in WeBWorK 2.2.x.";
+
+$DB_VERSIONS[++$i]{desc} = "adds dbupgrade table to facilitate automatic database upgrades.";
+$DB_VERSIONS[  $i]{global_code} = sub {
+	$self->dbh->do("CREATE TABLE `dbupgrade` (`name` VARCHAR(255) NOT NULL PRIMARY KEY, `value` TEXT)");
+	$self->dbh->do("INSERT INTO `dbupgrade` (`name`, `value`) VALUES (?, ?)", {}, "db_version", 1);
+	$self->register_sql_table("dbupgrade");
+};
+
+$DB_VERSIONS[++$i]{desc} = "adds problems_per_page field to set and set_user tables of each course.";
+$DB_VERSIONS[  $i]{course_code} = sub {
+	my $course = shift;
+	$self->dbh->do("ALTER TABLE `${course}_set` ADD COLUMN `problems_per_page` INT")
+		if $self->sql_table_exists("${course}_set");
+	$self->dbh->do("ALTER TABLE `${course}_set_user` ADD COLUMN `problems_per_page` INT")
+		if $self->sql_table_exists("${course}_set_user");
+};
+
+$DB_VERSIONS[++$i]{desc} = "adds depths table to keep track of dvipng depth information.";
+$DB_VERSIONS[  $i]{global_code} = sub {
+	$self->dbh->do("CREATE TABLE depths (md5 CHAR(33) NOT NULL, depth SMALLINT, PRIMARY KEY (md5))");
+	$self->register_sql_table("depths");
+};
+
+$DB_VERSIONS[++$i]{desc} = "changes type of key timestamp field to BIGINT";
+$DB_VERSIONS[  $i]{course_code} = sub {
+	my $course = shift;
+	return unless $self->sql_table_exists("${course}_key");
+	$self->dbh->do("ALTER TABLE `${course}_key` CHANGE COLUMN `timestamp` `timestamp` BIGINT");
+};
+
+$DB_VERSIONS[++$i]{desc} = "changes type of problem_user status field to FLOAT";
+$DB_VERSIONS[  $i]{course_code} = sub {
+	my $course = shift;
+	return unless $self->sql_table_exists("${course}_problem_user");
+	$self->dbh->do("UPDATE `${course}_problem_user` SET `status`=NULL WHERE `status`=''");
+	$self->dbh->do("ALTER TABLE `${course}_problem_user` CHANGE COLUMN `status` `status` FLOAT");
+};
+
+$DB_VERSIONS[++$i]{desc} = "changes types of alphanumeric keyfields to TINYBLOB NOT NULL";
+$DB_VERSIONS[  $i]{course_code} = sub {
+	my $course = shift;
+	$self->dbh->do("ALTER TABLE `${course}_user` CHANGE COLUMN `user_id` `user_id` TINYBLOB NOT NULL")
+		if $self->sql_table_exists("${course}_user");
+	$self->dbh->do("ALTER TABLE `${course}_password` CHANGE COLUMN `user_id` `user_id` TINYBLOB NOT NULL")
+		if $self->sql_table_exists("${course}_password");
+	$self->dbh->do("ALTER TABLE `${course}_permission` CHANGE COLUMN `user_id` `user_id` TINYBLOB NOT NULL")
+		if $self->sql_table_exists("${course}_permission");
+	$self->dbh->do("ALTER TABLE `${course}_key` CHANGE COLUMN `user_id` `user_id` TINYBLOB NOT NULL")
+		if $self->sql_table_exists("${course}_key");
+	$self->dbh->do("ALTER TABLE `${course}_set` CHANGE COLUMN `set_id` `set_id` TINYBLOB NOT NULL")
+		if $self->sql_table_exists("${course}_set");
+	$self->dbh->do("ALTER TABLE `${course}_problem` CHANGE COLUMN `set_id` `set_id` TINYBLOB NOT NULL")
+		if $self->sql_table_exists("${course}_problem");
+	$self->dbh->do("ALTER TABLE `${course}_set_user` CHANGE COLUMN `user_id` `user_id` TINYBLOB NOT NULL")
+		if $self->sql_table_exists("${course}_set_user");
+	$self->dbh->do("ALTER TABLE `${course}_set_user` CHANGE COLUMN `set_id` `set_id` TINYBLOB NOT NULL")
+		if $self->sql_table_exists("${course}_set_user");
+	$self->dbh->do("ALTER TABLE `${course}_problem_user` CHANGE COLUMN `user_id` `user_id` TINYBLOB NOT NULL")
+		if $self->sql_table_exists("${course}_problem_user");
+	$self->dbh->do("ALTER TABLE `${course}_problem_user` CHANGE COLUMN `set_id` `set_id` TINYBLOB NOT NULL")
+		if $self->sql_table_exists("${course}_problem_user");
+};
+
+$DB_VERSIONS[++$i]{desc} = "fixes KEY length, adds UNIQUE KEY for user table";
+$DB_VERSIONS[  $i]{course_code} = sub {
+	my $course = shift;
+	return unless $self->sql_table_eixsts("${course}_user");
+	$self->dbh->do("ALTER TABLE `${course}_user` DROP KEY `user_id`");
+	$self->dbh->do("ALTER TABLE `${course}_user` ADD UNIQUE KEY (`user_id`(255))");
+};
+
+$DB_VERSIONS[++$i]{desc} = "fixes KEY length, adds UNIQUE KEY for password table";
+$DB_VERSIONS[  $i]{course_code} = sub {
+	my $course = shift;
+	return unless $self->sql_table_exists("${course}_password");
+	$self->dbh->do("ALTER TABLE `${course}_password` DROP KEY `user_id`");
+	$self->dbh->do("ALTER TABLE `${course}_password` ADD UNIQUE KEY (`user_id`(255))");
+};
+
+$DB_VERSIONS[++$i]{desc} = "fixes KEY length, adds UNIQUE KEY for permission table";
+$DB_VERSIONS[  $i]{course_code} = sub {
+	my $course = shift;
+	return unless $self->sql_table_exists("${course}_permission");
+	$self->dbh->do("ALTER TABLE `${course}_permission` DROP KEY `user_id`");
+	$self->dbh->do("ALTER TABLE `${course}_permission` ADD UNIQUE KEY (`user_id`(255))");
+};
+
+$DB_VERSIONS[++$i]{desc} = "fixes KEY length, adds UNIQUE KEY for key table";
+$DB_VERSIONS[  $i]{course_code} = sub {
+	my $course = shift;
+	return unless $self->sql_table_exists("${course}_key");
+	$self->dbh->do("ALTER TABLE `${course}_key` DROP KEY `user_id`");
+	$self->dbh->do("ALTER TABLE `${course}_key` ADD UNIQUE KEY (`user_id`(255))");
+};
+
+$DB_VERSIONS[++$i]{desc} = "fixes KEY length, adds UNIQUE KEY for set table";
+$DB_VERSIONS[  $i]{course_code} = sub {
+	my $course = shift;
+	return unless $self->sql_table_exists("${course}_set");
+	$self->dbh->do("ALTER TABLE `${course}_set` DROP KEY `set_id`");
+	$self->dbh->do("ALTER TABLE `${course}_set` ADD UNIQUE KEY (`set_id`(255))");
+};
+
+$DB_VERSIONS[++$i]{desc} = "fixes KEY length, adds UNIQUE KEY for problem table";
+$DB_VERSIONS[  $i]{course_code} = sub {
+	my $course = shift;
+	return unless $self->sql_table_exists("${course}_problem");
+	$self->dbh->do("ALTER TABLE `${course}_problem` DROP KEY `set_id`");
+	$self->dbh->do("ALTER TABLE `${course}_problem` ADD UNIQUE KEY (`set_id`(255), `problem_id`)");
+	$self->dbh->do("ALTER TABLE `${course}_problem` DROP KEY `problem_id`");
+	$self->dbh->do("ALTER TABLE `${course}_problem` ADD KEY (`problem_id`)");
+};
+
+$DB_VERSIONS[++$i]{desc} = "fixes KEY length, adds UNIQUE KEY for set_user table";
+$DB_VERSIONS[  $i]{course_code} = sub {
+	my $course = shift;
+	return unless $self->sql_table_exists("${course}_set_user");
+	$self->dbh->do("ALTER TABLE `${course}_set_user` DROP KEY `user_id`");
+	$self->dbh->do("ALTER TABLE `${course}_set_user` ADD UNIQUE KEY (`user_id`(255), `set_id`(255))");
+	$self->dbh->do("ALTER TABLE `${course}_set_user` DROP KEY `set_id`");
+	$self->dbh->do("ALTER TABLE `${course}_set_user` ADD KEY (`set_id`(255))");
+};
+
+$DB_VERSIONS[++$i]{desc} = "fixes KEY length, adds UNIQUE KEY for problem_user table";
+$DB_VERSIONS[  $i]{course_code} = sub {
+	my $course = shift;
+	return unless $self->sql_table_exists("${course}_problem_user");
+	$self->dbh->do("ALTER TABLE `${course}_problem_user` DROP KEY `user_id`");
+	$self->dbh->do("ALTER TABLE `${course}_problem_user` ADD UNIQUE KEY (`user_id`(255), `set_id`(255), `problem_id`)");
+	$self->dbh->do("ALTER TABLE `${course}_problem_user` DROP KEY `set_id`");
+	$self->dbh->do("ALTER TABLE `${course}_problem_user` ADD KEY (`set_id`(255), `problem_id`)");
+	$self->dbh->do("ALTER TABLE `${course}_problem_user` DROP KEY `problem_id`");
+	$self->dbh->do("ALTER TABLE `${course}_problem_user` ADD KEY (`problem_id`)");
+};
+
+$DB_VERSIONS[++$i]{desc} = "changes psvn index from PRIMARY KEY to UNIQUE KEY";
+$DB_VERSIONS[  $i]{course_code} = sub {
+	my $course = shift;
+	return unless $self->sql_table_exists("${course}_set_user");
+	$self->dbh->do("ALTER TABLE `${course}_set_user` ADD UNIQUE KEY (`psvn`)");
+	$self->dbh->do("ALTER TABLE `${course}_set_user` DROP PRIMARY KEY");
+};
+
+$DB_VERSIONS[++$i]{desc} = "adds hide_score and hide_work fields to set and set_user";
+$DB_VERSIONS[  $i]{course_code} = sub {
+	my $course = shift;
+	if ( $self->sql_table_exists("${course}_set") ) {
+		$self->dbh->do("ALTER TABLE `${course}_set` ADD COLUMN `hide_score` ENUM('0','1')");
+		$self->dbh->do("ALTER TABLE `${course}_set` ADD COLUMN `hide_work` ENUM('0','1')");
+	}
+	if ( $self->sql_table_exists("${course}_set_user") ) {
+		$self->dbh->do("ALTER TABLE `${course}_set_user` ADD COLUMN `hide_score` ENUM('0','1')");
+		$self->dbh->do("ALTER TABLE `${course}_set_user` ADD COLUMN `hide_work` ENUM('0','1')");
+	}
+};
+
+$DB_VERSIONS[++$i]{desc} = "updates hide_score and hide_work in set and set_user tables to allow more (and more descriptive) possible values";
+$DB_VERSIONS[  $i]{course_code} = sub {
+	my $course = shift;
+	if ( $self->sql_table_exists("${course}_set") ) {
+		$self->dbh->do("ALTER TABLE `${course}_set` MODIFY COLUMN `hide_score` ENUM('0','1','2')");
+		$self->dbh->do("ALTER TABLE `${course}_set` MODIFY COLUMN `hide_work` ENUM('0','1','2')");
+	}
+	if ( $self->sql_table_exists("${course}_set_user") ) {
+		$self->dbh->do("ALTER TABLE `${course}_set_user` MODIFY COLUMN `hide_score` ENUM('0','1','2')");
+		$self->dbh->do("ALTER TABLE `${course}_set_user` MODIFY COLUMN `hide_work` ENUM('0','1','2')");
+	}
+};
+
+$DB_VERSIONS[++$i]{desc} = "adds time_limit_cap field to set and set_user tables";
+$DB_VERSIONS[  $i]{course_code} = sub {
+	my $course = shift;
+	if ( $self->sql_table_exists("${course}_set") ) {
+		$self->dbh->do("ALTER TABLE `${course}_set` ADD COLUMN `time_limit_cap` ENUM('0','1')");
+	}
+	if ( $self->sql_table_exists("${course}_set_user") ) {
+		$self->dbh->do("ALTER TABLE `${course}_set_user` ADD COLUMN `time_limit_cap` ENUM('0','1')");
+	}
+};
+
+$DB_VERSIONS[++$i]{desc} = "updates hide_score and hide_work in set and set_user tables to have more descriptive values, set default values";
+$DB_VERSIONS[  $i]{course_code} = sub {
+	my $course = shift;
+	if ( $self->sql_table_exists("${course}_set") ) {
+		$self->dbh->do("ALTER TABLE `${course}_set` MODIFY COLUMN `hide_score` ENUM('N','Y','BeforeAnswerDate') DEFAULT 'N'");
+		$self->dbh->do("ALTER TABLE `${course}_set` MODIFY COLUMN `hide_work` ENUM('N','Y','BeforeAnswerDate') DEFAULT 'N'");
+	}
+	if ( $self->sql_table_exists("${course}_set_user") ) {
+		$self->dbh->do("ALTER TABLE `${course}_set_user` MODIFY COLUMN `hide_score` ENUM('N','Y','BeforeAnswerDate') DEFAULT 'N'");
+		$self->dbh->do("ALTER TABLE `${course}_set_user` MODIFY COLUMN `hide_work` ENUM('N','Y','BeforeAnswerDate') DEFAULT 'N'");
+	}
+};
+
+$DB_VERSIONS[++$i]{desc} = "adds locations, location_addresses, set_locations and set_locations_user tables to database, and add restrict_ip to set and set_user.";
+$DB_VERSIONS[  $i]{global_code} = sub {
+	$self->dbh->do("CREATE TABLE locations (location_id TINYBLOB NOT NULL, description TEXT, PRIMARY KEY (location_id(1000)))");
+	$self->dbh->do("CREATE TABLE location_addresses (location_id TINYBLOB NOT NULL, ip_mask TINYBLOB NOT NULL, PRIMARY KEY (location_id(500),ip_mask(500)))");
+};
+$DB_VERSIONS[  $i]{course_code} = sub {
+	my $course = shift;
+	
+	$self->dbh->do("CREATE TABLE `${course}_set_locations` (set_id TINYBLOB NOT NULL, location_id TINYBLOB NOT NULL, PRIMARY KEY (set_id(500),location_id(500)))");
+	$self->dbh->do("CREATE TABLE `${course}_set_locations_user` (set_id TINYBLOB NOT NULL, user_id TINYBLOB NOT NULL, location_id TINYBLOB NOT NULL, PRIMARY KEY (set_id(300),user_id(300),location_id(300)))");
+
+	if ( $self->sql_table_exists("${course}_set") ) {
+		$self->dbh->do("ALTER TABLE `${course}_set` ADD COLUMN `restrict_ip` enum('No','RestrictTo','DenyFrom') DEFAULT 'No'");
+	}
+	if ( $self->sql_table_exists("${course}_set_user") ) {
+		$self->dbh->do("ALTER TABLE `${course}_set_user` ADD COLUMN `restrict_ip` enum('No','RestrictTo','DenyFrom')");
+	}
+};
+
+$DB_VERSIONS[++$i]{desc} = "updates defaults for hide_work and hide_score in set_user tables.";
+$DB_VERSIONS[  $i]{course_code} = sub {
+	my $course = shift;
+
+	if ( $self->sql_table_exists("${course}_set_user") ) {
+		$self->dbh->do("ALTER TABLE `${course}_set_user` MODIFY COLUMN `hide_score` ENUM('N','Y','BeforeAnswerDate')");
+		$self->dbh->do("ALTER TABLE `${course}_set_user` MODIFY COLUMN `hide_work` ENUM('N','Y','BeforeAnswerDate')");
+	}
+};
+
+$DB_VERSIONS[++$i]{desc} = "adds relax_restrict_ip, hide_problem_score columns to set and set_user tables.";
+$DB_VERSIONS[  $i]{course_code} = sub {
+	my $course = shift;
+
+	if ( $self->sql_table_exists("${course}_set") ) {
+		$self->dbh->do("ALTER TABLE `${course}_set` ADD COLUMN `relax_restrict_ip` ENUM('No','AfterAnswerDate','AfterVersionAnswerDate') DEFAULT 'No'");
+		$self->dbh->do("ALTER TABLE `${course}_set` ADD COLUMN `hide_score_by_problem` ENUM('N','Y') DEFAULT 'N'");
+	}
+	if ( $self->sql_table_exists("${course}_set_user") ) {
+		$self->dbh->do("ALTER TABLE `${course}_set_user` ADD COLUMN `relax_restrict_ip` ENUM('No','AfterAnswerDate','AfterVersionAnswerDate')");
+		$self->dbh->do("ALTER TABLE `${course}_set_user` ADD COLUMN `hide_score_by_problem` ENUM('N','Y')");
+	}
+};
+
+$DB_VERSIONS[++$i]{desc} = "adds set and set_user fields to allow set-level proctor, updates permissions to allow finer-grained regulation of proctoring.";
+$DB_VERSIONS[  $i]{course_code} = sub {
+	my $course = shift;
+	if ( $self->sql_table_exists("${course}_permission") ) {
+		$self->dbh->do("UPDATE `${course}_permission` SET `permission`=3 where `permission`=2");
+	}
+	if ( $self->sql_table_exists("${course}_set") ) {
+		$self->dbh->do("ALTER TABLE `${course}_set` ADD COLUMN `restricted_login_proctor` ENUM('No','Yes') DEFAULT 'No'");
+	}
+	if ( $self->sql_table_exists("${course}_set_user") ) {
+		$self->dbh->do("ALTER TABLE `${course}_set_user` ADD COLUMN `restricted_login_proctor` ENUM('No','Yes')");
+	}
+};
+
+$DB_VERSIONS[++$i]{desc} = "adds per-course setting table";
+$DB_VERSIONS[  $i]{course_code} = sub {
+	my $course = shift;
+	$self->dbh->do("CREATE TABLE `${course}_setting` (`name` VARCHAR(255) NOT NULL PRIMARY KEY, `value` TEXT)");
+	$self->register_sql_table("${course}_setting");
+	$self->dbh->do("INSERT INTO `${course}_setting` (`name`, `value`) VALUES (?, ?)", {}, "db_version", $i);
+};
+our $FIRST_COURSE_DB_VERSION = $i;
+
+our $THIS_DB_VERSION = $i;
+
+################################################################################
+
+sub new {
+	my $invocant = shift;
+	my $class = ref $invocant || $invocant;
+	my $self = bless {}, $class;
+	$self->init(@_);
+	return $self;
+}
+
+sub init {
+	my ($self, %options) = @_;
+	
+	$self->{dbh} = DBI->connect(
+		$options{ce}{database_dsn},
+		$options{ce}{database_username},
+		$options{ce}{database_password},
+		{
+			PrintError => 0,
+			RaiseError => 1,
+		},
+	);
+	$self->{verbose_sub} = $options{verbose_sub} || \&debug;
+	$self->{confirm_sub} = $options{confirm_sub} || \&ask_permission_stdio;
+	$self->{ce} = $options{ce};
+	$self->{course_db_versions} = {};
+}
+
+sub ce { return shift->{ce} }
+sub dbh { return shift->{dbh} }
+sub verbose { my $sub = shift->{verbose_sub}; return &$sub(@_) }
+sub confirm { my $sub = shift->{confirm_sub}; return &$sub(@_) }
+
+sub DESTROY {
+	my ($self) = @_;
+	$self->unlock_database;
+	$self->SUPER::DESTROY if $self->can("SUPER::DESTROY");
+}
+
+################################################################################
+
+sub lock_database {
+	my ($self) = @_;
+	
+	$self->verbose("Obtaining dbupgrade lock...\n");
+	my ($lock_status) = $self->dbh->selectrow_array("SELECT GET_LOCK('dbupgrade', 10)");
+	if (not defined $lock_status) {
+		die "Couldn't obtain lock because an error occurred.\n";
+	}
+	if ($lock_status) {
+		$self->verbose("Got lock.\n");
+	} else {
+		die "Timed out while waiting for lock.\n";
+	}
+}
+
+sub unlock_database {
+	my ($self) = @_;
+	
+	$self->verbose("Releasing dbupgrade lock...\n");
+	my ($lock_status) = $self->dbh->selectrow_array("SELECT RELEASE_LOCK('dbupgrade')");
+	if (not defined $lock_status) {
+		die "Couldn't release lock because the lock does not exist.\n";
+	}
+	if ($lock_status) {
+		$self->verbose("Released lock.\n");
+	} else {
+		die "Couldn't release lock because the lock is not held by this thread.\n";
+	}
+}
+
+################################################################################
+
+sub load_sql_table_list {
+	my ($self) = @_;
+	my $sql_tables_ref = $self->dbh->selectcol_arrayref("SHOW TABLES");
+	$self->{sql_tables} = {}; @{$self->{sql_tables}}{@$sql_tables_ref} = ();
+}
+
+sub register_sql_table {
+	my ($self, $table) = @_;
+	$self->{sql_tables}{$table} = ();
+}
+
+sub unregister_sql_table {
+	my ($self, $table) = @_;
+	delete $self->{sql_tables}{$table};
+}
+
+sub sql_table_exists {
+	my ($self, $table) = @_;
+	return exists $self->{sql_tables}{$table};
+}
+
+################################################################################
+
+use constant DB_TABLE_MISSING  => -1;
+use constant DB_RECORD_MISSING => -2;
+
+sub get_db_version {
+	my ($self, $course) = @_;
+	my $table = defined $course ? "${course}_setting" : "dbupgrade";
+	if ($self->sql_table_exists($table)) {
+		my $table_quoted = $self->dbh->quote_identifier($table);
+		my @record = $self->dbh->selectrow_array("SELECT `value` FROM $table_quoted WHERE `name`='db_version'");
+		if (@record) {
+			return $record[0];
+		} else {
+			return DB_RECORD_MISSING;
+		}
+	} else {
+		return DB_TABLE_MISSING;
+	}
+}
+
+my $vers_value_should_be = "The value should always be a positive integer.";
+sub check_db_version_format {
+	my ($self, $db_version) = @_;
+	if (not defined $db_version) {
+		return "'db_version' has a NULL value. $vers_value_should_be";
+	} elsif ($db_version !~ /^-?\d+$/) {
+		return "'db_version' is set to the non-numeric value '$db_version'. $vers_value_should_be";
+	} elsif ($db_version < 0) {
+		return "'db_version' is set to the negative value '$db_version'. $vers_value_should_be";
+	} elsif ($db_version == 0) {
+		return "'db_version' is set to 0, which is reserved to indicate a pre-automatic-upgrade version. $vers_value_should_be";
+	} else {
+		# db_version is a positive integer! yay!
+		return;
+	}
+}
+
+sub set_db_version {
+	my ($self, $vers, $course) = @_;
+	my $table = defined $course ? "${course}_setting" : "dbupgrade";
+	my $table_quoted = $self->dbh->quote_identifier($table);
+	$self->dbh->do("UPDATE $table_quoted SET `value`=? WHERE `name`='db_version'", {}, $vers);
+}
+
+################################################################################
+
+sub do_upgrade {
+	my ($self) = @_;
+	
+	$self->lock_database;
+	$self->load_sql_table_list;
+	
+	#### Get system's database version
+	
+	my $system_db_version = $self->get_db_version();
+	
+	if ($system_db_version == DB_TABLE_MISSING) {
+		warn "No 'upgrade' table exists: assuming system database version is 0.\n";
+		$system_db_version = 0;
+	} elsif ($system_db_version == DB_RECORD_MISSING) {
+		die "The 'dbupgrade' table exists in the database, but no 'db_version' record exists in it. Can't continue.\n";
+	} elsif (my $error = $self->check_db_version_format($system_db_version)) {
+		die "$error Can't continue.\n";
+	} elsif ($system_db_version > $THIS_DB_VERSION) {
+		die "This database's system db_version value is $system_db_version, but the current database version is only $THIS_DB_VERSION. This database was probably used with a newer version of WeBWorK. Can't continue.\n";
+	}
+	
+	$self->verbose("Initial system db_version is $system_db_version\n");
+	
+	#### Get database version for each course
+	# If $system_db_version < $FIRST_COURSE_DB_VERSION, most courses will not have
+	# a db_version, but some might. (Say, if they were imported from a newer
+	# version of WeBWorK.)
+	
+	my @ww_courses = listCourses($self->ce);
+	$self->{ww_courses} = \@ww_courses;
+
+	my $course_db_versions = $self->{course_db_versions};
+
+	foreach my $course (@ww_courses) {
+		my $course_db_version = $self->get_db_version($course);
+		
+		if ($system_db_version < $FIRST_COURSE_DB_VERSION) {
+			
+			if ($course_db_version == DB_TABLE_MISSING) {
+				# this is to be expected -- we assume the course is at the current system version
+				$self->verbose("Course '$course' has no db_version of it's own, assuming system db_version $system_db_version.\n");
+				$course_db_versions->{$course} = $system_db_version;
+			} else {
+				# there is a settings table -- the course is probably from a later version of WW
+				warn "The course '$course' already contains a '${course}_setting' table."
+					." Settings tables were introduced at db_version $FIRST_COURSE_DB_VERSION,"
+					." but the current system db_version is only $system_db_version."
+					." We'll assume that this course is from a later version of WeBWorK"
+					." and try to determine the course's version...\n";
+				if ($course_db_version == DB_RECORD_MISSING) {
+					warn "There is no 'db_version' record in the course's settings table,"
+						." so we can't determine the version. This course will be excluded from upgrades."
+						." If you know the version of this course,"
+						." add a 'db_version' record with the appropriate value to the '${course}_setting' table.\n";
+				} elsif (my $error = check_db_version_format($course_db_version)) {
+					warn "$error\n";
+					warn "There is a 'db_version' record in the course's settings table,"
+						." but it has an invalid value , so we can't determine the version."
+						." This course will be excluded from upgrades."
+						." If you know the version of this course,"
+						." update 'db_version' record in the '${course}_setting' table with the appropriate value.\n";
+				} elsif ($course_db_version < $FIRST_COURSE_DB_VERSION) {
+					warn "This course's version is $course_db_version, which is before per-course versioning was introduced."
+						." Therefore, a course at version $course_db_version should have neither a '${course}_setting' table"
+						." nor a 'db_version' record in that table. Regardless, we will assume the recorded version is correct.\n";
+					$course_db_versions->{$course} = $system_db_version;
+				} else {
+					warn "This course's version is $course_db_version, which makes sense.\n";
+					$course_db_versions->{$course} = $course_db_version;
+				}
+			}
+			
+		} else {
+			
+			if ($course_db_version == DB_TABLE_MISSING) {
+				warn "The course '$course' is missing a '${course}_setting' table, so we can't determine the version."
+					." This course will be ignored."
+					." If you know the version of this course, add a '${course}_setting' table"
+					." and add a 'db_version' record with the appropriate value to the table.\n";
+			} else {
+				# there is a settings table -- good
+				if ($course_db_version == DB_RECORD_MISSING) {
+					warn "The course '$course' is missing a 'db_version' record in its '${course}_setting' table,"
+						." so we can't determine the version. This course will be ignored."
+						." If you know the version of this course,"
+						." add a 'db_version' record with the appropriate value to the '${course}_setting' table.\n";
+				} elsif (my $error = check_db_version_format($course_db_version)) {
+					warn "$error\n";
+					warn "The course '$course' has an invalid value in the 'db_version' record in its '${course}_setting' table,"
+						." so we can't determine the version. This course will be ignored."
+						." If you know the version of this course,"
+						." update the 'db_version' record in the '${course}_setting' table with the appropriate value.\n";
+				} elsif ($course_db_version < $FIRST_COURSE_DB_VERSION) {
+					warn "This course's version is $course_db_version, which is before per-course versioning was introduced."
+						." Therefore, a course at version $course_db_version should have neither a '${course}_setting' table"
+						." nor a 'db_version' record in that table. Regardless, we will assume the recorded version is correct.\n";
+					$course_db_versions->{$course} = $course_db_version;
+				} else {
+					$self->verbose("Course '$course' has valid db_version $course_db_version.\n");
+					$course_db_versions->{$course} = $system_db_version;
+				}
+			}
+			
+		}
+	}
+
+	$self->verbose(map { "$_ => $$course_db_versions{$_}\n" } keys %$course_db_versions);
+
+	#### Determine lowest version
+
+	my $lowest_db_version = $system_db_version;
+	foreach my $v (values %$course_db_versions) {
+		$lowest_db_version = $v if $v < $lowest_db_version;
+	}
+
+	$self->verbose("Lowest db_version is $lowest_db_version\n");
+
+	#### Do the upgrades
+
+	# upgrade_to_version uses this
+	$self->{system_db_version} = $system_db_version;
+	
+	my $vers = $lowest_db_version;
+	while ($vers < $THIS_DB_VERSION) {
+		$vers++;
+		unless ($self->upgrade_to_version($vers)) {
+			print "\nUpgrading from version ".($vers-1)." to $vers failed.\n\n";
+			unless ($self->ask_permission("Ignore this error and go on to the next version?", 0)) {
+				exit 3;
+			}
+		}
+	}
+	
+	#### All done!
+	
+	print "\nDatabase is up-to-date at version $vers.\n";
+}
+
+################################################################################
+
+use constant OK => 0;
+use constant SKIPPED => 1;
+use constant ERROR => 2;
+
+sub upgrade_to_version {
+	my ($self, $vers) = @_;
+	my %info = %{$DB_VERSIONS[$vers]};
+	
+	print "\nUpgrading database from version " . ($vers-1) . " to $vers...\n";
+	my $desc = $info{desc} || "has no description.";
+	print "(Version $vers $desc)\n";
+	
+	if ($self->{system_db_version} < $vers and exists $info{global_code}) {
+		eval {
+			local $WeBWorK::Utils::DBUpgrade::self = $self;
+			$info{global_code}->();
+		};
+		if ($@) {
+			print "\nAn error occured while running the system upgrade code for version $vers:\n";
+			print "$@";
+			return 0 unless $self->ask_permission("Ignore this error and keep going?", 0);
+		}
+	}
+	$self->set_db_version($vers);
+	
+	my $do_upgrade = 1;
+	foreach my $course (@{$self->{ww_courses}}) {
+		if ($do_upgrade) {
+			my $result = $self->upgrade_course_to_version($course, $vers);
+			if ($result == ERROR) {
+				if ($self->ask_permission("Update course's stored db_version to $vers anyway?", 0)) {
+					set_db_version($vers, $course);
+					print "OK, updated course's stored db_version.\n";
+				} else {
+					print "OK, not updating course's stored db_version.\n";
+				}
+				if ($self->ask_permission("Upgrade the remaining courses to version $vers?", 0)) {
+					print "OK, going on to the next course...\n";
+				} else {
+					print "OK, we'll skip upgrading the rest of the courses to version $vers.\n";
+					if ($self->ask_permission("Update the stored db_version for the courses we're skipping, as if we had upgraded them?", 1)) {
+						$do_upgrade = 0;
+					} else {
+						return 0;
+					}
+				}
+			} elsif ($result == OK) {
+				$self->set_db_version($vers, $course);
+			} elsif ($result == SKIPPED) {
+				# do nothing
+			}
+		} else {
+			$self->set_db_version($vers, $course);
+		}
+	}
+	
+	return 1;
+}
+
+sub upgrade_course_to_version {
+	my ($self, $course, $vers) = @_;
+	my $course_db_versions = $self->{course_db_versions};
+	my %info = %{$DB_VERSIONS[$vers]};
+	
+	my $course_vers = $course_db_versions->{$course};
+	#$self->verbose("course=$course course_vers=$course_vers vers=$vers\n");
+	if (not defined $course_vers) {
+		$self->verbose("Course '$course' has a missing or invalid version -- skipping.\n");
+		return SKIPPED;
+	} elsif ($course_vers == $vers) {
+		$self->verbose("Course '$course' is already at version $vers -- skipping.\n");
+		return SKIPPED;
+	} elsif ($course_vers > $vers) {
+		$self->verbose("Course '$course' version $course_vers > target version $vers -- skipping.\n");
+		return SKIPPED;
+	} elsif ($course_vers < $vers-1) {
+		warn "Course '$course' at version $course_vers, which is too old to upgrade to $vers. This should never happen. Not upgrading.\n";
+		return SKIPPED;
+	}
+	
+	$self->verbose("Upgrading course '$course' to version $vers...\n");
+	eval {
+		local $WeBWorK::Utils::DBUpgrade::self = $self;
+		$info{course_code}->($course);
+	};
+	if ($@) {
+		print "\nAn error occured while running the course upgrade code for version $vers on course $course:\n";
+		print "$@";
+		return ERROR;
+	} else {
+		return OK;
+	}
+}
+
+################################################################################
+
+sub ask_permission_stdio {
+	my ($prompt, $default) = @_;
+	
+	$default = 1 if not defined $default;
+	my $options = $default ? "[Y/n]" : "[y/N]";
+	
+	while (1) {
+		print "$prompt $options ";
+		my $resp = <STDIN>;
+		chomp $resp;
+		return $default if $resp eq "";
+		return 1 if lc $resp eq "y";
+		return 0 if lc $resp eq "n";
+		$prompt = 'Please enter "y" or "n".';
+	}
+}
+
+1;
+
diff --git a/lib/WeBWorK/Utils/DelayedMailer.mail-sender.pm b/lib/WeBWorK/Utils/DelayedMailer.mail-sender.pm
new file mode 100644
index 0000000000..69004a9a9e
--- /dev/null
+++ b/lib/WeBWorK/Utils/DelayedMailer.mail-sender.pm
@@ -0,0 +1,155 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/Utils/DelayedMailer.mail-sender.pm,v 1.1 2007/01/30 21:35:28 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::Utils::DelayedMailer;
+
+use strict;
+use warnings;
+use Carp;
+use Mail::Sender;
+use Storable qw/dclone/;
+use WeBWorK::Utils qw/constituency_hash/;
+
+use constant SAFE_MAILMSG_PARAMS => qw/fake_from to fake_to cc fake_cc bcc subject msg/;
+
+sub new {
+	my ($invocant, %options) = @_;
+	my $class = ref $invocant || $invocant;
+	my $self = bless {}, $class;
+	
+	# messages get queued here. format: hashref, safe arguments to MailMsg
+	$$self{msgs} = [];
+	
+	# options to pass to Mail::Sender::new
+	$$self{new_opts} = $options{new_opts};
+	
+	# recipients are checked against this list before sending
+	# these should be bare rfc822 addresses, not "Name <email@addr>"
+	$$self{allowed_recipients} = constituency_hash(@{$options{allowed_recipients}});
+	
+	# what to do if an illegal recipient is specified
+	# "croak" (default), "carp", or "ignore"
+	$$self{on_illegal_rcpt} = $options{on_illegal_rcpt};
+	
+	# what to do if an unsafe argument is passed to add_message
+	# "croak" (default), "carp", or "ignore"
+	$$self{on_unsafe_arg} = $options{on_unsafe_arg};
+	
+	return $self;
+}
+
+sub add_message {
+	my ($self, %msg) = @_;
+	
+	#warn "*** add_message: ", join(", ", map { "$_=>$msg{$_}" } keys %msg), "\n";
+	
+	my %safe_msg = $self->_check_fields(%msg);
+	$safe_msg{to}  = $self->_check_recipients($safe_msg{to})  if defined $safe_msg{to};
+	$safe_msg{cc}  = $self->_check_recipients($safe_msg{cc})  if defined $safe_msg{cc};
+	$safe_msg{bcc} = $self->_check_recipients($safe_msg{bcc}) if defined $safe_msg{bcc};
+	
+	#warn "*** add_message: ", join(", ", map { "$_=>$safe_msg{$_}" } keys %safe_msg), "\n";
+	
+	push @{$$self{msgs}}, \%safe_msg;
+}
+
+sub _check_fields {
+	my ($self, %msg) = @_;
+	
+	my %safe;
+	foreach my $key (SAFE_MAILMSG_PARAMS) {
+		$safe{$key} = $msg{$key} if exists $msg{$key};
+		delete $msg{$key};
+	}
+	
+	if (my @unsafe = keys %msg) {
+		if (not defined $$self{on_unsafe_arg} or $$self{on_unsafe_arg} eq "croak") {
+			die "unsafe fields '@unsafe'";
+		} elsif ($$self{on_unsafe_arg} eq "carp") {
+			warn "unsafe fields '@unsafe'";
+		}
+	}
+	
+	return %safe;
+}
+
+sub _check_recipients {
+	my ($self, $rcpts) = @_;
+	my @rcpts = ref $rcpts eq "ARRAY" ? @$rcpts : $rcpts;
+	
+	my @legal;
+	foreach my $rcpt (@rcpts) {
+		my ($base) = $rcpt =~ /<([^<>]*)>\s*$/; # works for addresses generated by Record::User
+		$base ||= $rcpt; # if it doesn't match, it's a plain address
+		if (exists $$self{allowed_recipients}{$base}) {
+			push @legal, $rcpt;
+		} else {
+			if (not defined $$self{on_illegal_rcpt} or $$self{on_illegal_rcpt} eq "croak") {
+				die "can't address message to illegal recipient '$rcpt'";
+			} elsif ($$self{on_illegal_rcpt} eq "carp") {
+				warn "can't address message to illegal recipient '$rcpt'";
+			}
+		}
+	}
+	
+	return @legal;
+}
+
+sub send_messages {
+	my ($self) = @_;
+	
+	#warn "*** send_messages called! there are ", scalar @{$$self{msgs}}, " messages to send.\n";
+	#return;
+	return unless @{$$self{msgs}};
+	
+	my $mailer = new Mail::Sender {
+		keepconnection => 1,
+		skip_bad_recipients => 1,
+		%{$$self{new_opts}},
+	};
+	ref $mailer or die $Mail::Sender::Error;
+	
+	my @results;
+	foreach my $msg (@{$$self{msgs}}) {
+		push @results, _send_msg($mailer, $msg);
+	}
+}
+
+# return format:
+#   success => true if all succeeded (no need for error reporting)
+#   error => Mail::Sender error code
+#   error_msg => Mail::Sender error message
+#   skipped_recipients => Mail::Sender skipped_recipients hash
+sub _send_msg {
+	my ($mailer, $msg) = @_;
+	
+	my %result;
+	my $ret = $mailer->MailMsg($msg);
+	if (ref $ret) {
+		if (defined $mailer->{skipped_recipients}) {
+			$result{skipped_recipients} = $mailer->{skipped_recipients};
+		} else {
+			$result{success} = 1;
+		}	
+	} else {
+		$result{error} = $mailer->{error};
+		$result{error_msg} = $mailer->{error_msg};
+	}
+	
+	return \%result;
+}
+
+1;
diff --git a/lib/WeBWorK/Utils/DelayedMailer.pm b/lib/WeBWorK/Utils/DelayedMailer.pm
new file mode 100644
index 0000000000..c746d89395
--- /dev/null
+++ b/lib/WeBWorK/Utils/DelayedMailer.pm
@@ -0,0 +1,165 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/Utils/DelayedMailer.pm,v 1.2 2007/08/13 22:59:59 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::Utils::DelayedMailer;
+
+use strict;
+use warnings;
+use Carp;
+use Net::SMTP;
+use WeBWorK::Utils qw/constituency_hash/;
+
+sub new {
+	my ($invocant, %options) = @_;
+	my $class = ref $invocant || $invocant;
+	my $self = bless {}, $class;
+	
+	# messages get queued here. format: hashref, safe arguments to MailMsg
+	$$self{msgs} = [];
+	
+	# SMTP settings
+	$$self{smtp_server} = $options{smtp_server};
+	$$self{smtp_sender} = $options{smtp_sender};
+	$$self{smtp_timeout} = $options{smtp_timeout};
+	
+	# extra headers
+	$$self{headers} = $options{headers};
+	
+	# recipients are checked against this list before sending
+	# these should be bare rfc822 addresses, not "Name <email@addr>"
+	$$self{allowed_recipients} = constituency_hash(@{$options{allowed_recipients}});
+	
+	# what to do if an illegal recipient is specified
+	# "croak" (default), "carp", or "ignore"
+	$$self{on_illegal_rcpt} = $options{on_illegal_rcpt};
+	
+	return $self;
+}
+
+# %msg format:
+#   $msg{to}      = either a single address or an arrayref containing multiple addresses
+#   $msg{subject} = string subject
+#   $msg{msg}     = string body of email (this is what Mail::Sender::MailMsg uses)
+sub add_message {
+	my ($self, %msg) = @_;
+	
+	# make sure recipients are allowed
+	$msg{to} = $self->_check_recipients($msg{to});
+	
+	push @{$$self{msgs}}, \%msg;
+}
+
+sub _check_recipients {
+	my ($self, $rcpts) = @_;
+	my @rcpts = ref $rcpts eq "ARRAY" ? @$rcpts : $rcpts;
+	
+	my @legal;
+	foreach my $rcpt (@rcpts) {
+		my ($base) = $rcpt =~ /<([^<>]*)>\s*$/; # works for addresses generated by Record::User
+		$base ||= $rcpt; # if it doesn't match, it's a plain address
+		if (exists $$self{allowed_recipients}{$base}) {
+			push @legal, $rcpt;
+		} else {
+			if (not defined $$self{on_illegal_rcpt} or $$self{on_illegal_rcpt} eq "croak") {
+				die "can't address message to illegal recipient '$rcpt'";
+			} elsif ($$self{on_illegal_rcpt} eq "carp") {
+				warn "can't address message to illegal recipient '$rcpt'";
+			}
+		}
+	}
+	
+	return \@legal;
+}
+
+sub send_messages {
+	my ($self) = @_;
+	
+	return unless @{$$self{msgs}};
+	
+	my $smtp = new Net::SMTP($$self{smtp_server}, Timeout=>$$self{smtp_timeout})
+		or die "failed to create Net::SMTP object";
+	
+	my @results;
+	foreach my $msg (@{$$self{msgs}}) {
+		push @results, $self->_send_msg($smtp, $msg);
+	}
+	
+	return @results;
+}
+
+sub _send_msg {
+	my ($self, $smtp, $msg) = @_;
+	
+	my $sender = $$self{smtp_sender};
+	my @recipients = @{$$msg{to}};
+	my $message = $self->_format_msg($msg);
+	
+	# reduce "Foo <bar@bar>" to "bar@bar"
+	foreach my $rcpt (@recipients) {
+		my ($base) = $rcpt =~ /<([^<>]*)>\s*$/;
+		$rcpt = $base if defined $base;
+	}
+	
+	my %result;
+	
+	$smtp->mail($sender);
+	my @good_rcpts = $smtp->recipient(@recipients, {SkipBad=>1});
+	if (@good_rcpts) {
+		my $data_sent = $smtp->data($message);
+		unless ($data_sent) {
+			$result{error} = "(Error number not available with Net::SMTP)";
+			$result{error_msg} = "Unknown error sending message data to SMTP server";
+		}
+	} else {
+		$result{error} = "(Error number not available with Net::SMTP)";
+		$result{error_msg} = "No recipient addresses were accepted by SMTP server";
+	}
+	
+	# figure out which recipients were rejected
+	my %bad_rcpts;
+	@bad_rcpts{@recipients} = ();
+	delete @bad_rcpts{@good_rcpts};
+	my @bad_rcpts = keys %bad_rcpts;
+	if (@bad_rcpts) {
+		$result{skipped_recipients} =
+			{ map { $_ => "(Server message not available with Net::SMTP)" } @bad_rcpts };
+	}
+	
+	return \%result;
+}
+
+sub _format_msg {
+	my ($self, $msg) = @_;
+	
+	my $from = $$self{smtp_sender};
+	my $to = join(", ", @{$$msg{to}});
+	my $subject = $$msg{subject};
+	my $headers = $$self{headers};
+	my $body = $$msg{msg};
+	
+	my $formatted_msg = "From: $from\n"
+		. "To: $to\n"
+		. "Subject: $subject\n";
+	if (defined $headers) {
+		$formatted_msg .= $headers;
+		$formatted_msg .= "\n" unless $formatted_msg =~ /\n$/;
+	}
+	$formatted_msg .= "\n$body";
+	
+	return $formatted_msg;
+}
+
+1;
diff --git a/lib/WeBWorK/Utils/FilterRecords.pm b/lib/WeBWorK/Utils/FilterRecords.pm
new file mode 100644
index 0000000000..fcfba4a1fa
--- /dev/null
+++ b/lib/WeBWorK/Utils/FilterRecords.pm
@@ -0,0 +1,200 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/Utils/FilterRecords.pm,v 1.5 2006/09/25 22:14:54 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::Utils::FilterRecords;
+use base qw(Exporter);
+
+use WeBWorK::Utils qw(sortByName);
+
+=head1 NAME
+
+WeBWorK::Utils::FilterRecords - utilities for sorting database records.
+
+=head1 SYNOPSIS
+
+ use WeBWorK::Utils::FilterRecords qw/getFiltersForClass/;
+ 
+ # get a list of sorts
+ my ($FiltersRef, $FilterLabelsRef) = getFiltersForClass(@Users);
+ my @filters      = @$filtersRef;      # filter names
+ my %FilterLabels = %$FilterLabelsRef; # suitable for CGI's "-labels" parameter
+
+ use WeBWorK::Utils::FilterRecords qw/FilterRecords/;
+ 
+ # start with a list of records
+ my @Users = $db->getUsers($db->listUsers);
+ 
+ # sort the records using a preset
+ @FilteredUsers = FilterRecords({preset=>"none"}, @Users);
+ 
+ # or provide a custom sort
+ @FilteredUsers = FilterRecords({fields=>[qw/section /]}, @Users);
+
+=head1 DESCRIPTION
+
+This module provides record filtering functions, and a collection of preset filters
+for the standard WeBWorK record classes. Filters are specified by a list
+of field names. Records that match the current user in the specified field will be 
+allowed through
+
+=cut
+
+use strict;
+use warnings;
+use Carp;
+our @EXPORT    = ();
+our @EXPORT_OK = qw(
+	getFiltersForClass
+	filterRecords
+);
+
+#use constant PRESET_FILTERS => {
+#	"WeBWorK::DB::Record::User" => {
+#		"all" => {
+#			name => "List all available students",
+#			fields => [ qw// ],
+#		},
+#	},
+#};
+
+
+=head1 FUNCTIONS
+
+=over
+
+=item getFiltersForClass($class)
+
+Given the name of a record class, returns the preset filters available for that
+class.
+
+The return value consists of a two-element list. The first element is a
+reference to a list of filter names. The second element is a reference to a hash
+mapping filter names to string descriptions.
+
+Together, these two lists are suitable for passing to the C<-values> and
+C<-labels> parameters of several CGI module methods, i.e. popup_menu(),
+scrolling_list(), checkbox_group(), and radio_group().
+
+=cut
+
+sub getFiltersForClass {
+	my (@Records) = @_;
+
+	my (%sections, %recitations);
+	my (@names,%labels);
+	push @names, "all";
+	$labels{all} = "Display all possible records";
+	
+	if (ref $Records[0] eq "WeBWorK::DB::Record::User"){
+		foreach my $user (@Records){
+			$sections{$user->section}++;
+			$recitations{$user->recitation}++;
+		}
+	
+		if (scalar(keys %sections) > 1) {
+		  foreach my $sec (sortByName(undef, keys %sections)){
+			push @names, "section:$sec";
+			if ($sec ne ""){
+				$labels{"section:$sec"} = "Display section $sec";
+			} else {
+				$labels{"section:$sec"} = "Display section <blank>";
+			}
+		  }
+		}
+
+		if (scalar(keys %recitations) > 1) {
+		  foreach my $rec (sortByName(undef, keys %recitations)){
+			push @names, "recitation:$rec";
+			if ($rec ne ""){
+				$labels{"recitation:$rec"} = "Display recitation $rec";
+			} else {
+			        $labels{"recitation:$rec"} = "Display recitation <blank>";
+			}
+		  }
+		}
+	}
+	return ( \@names, \%labels );
+}
+
+=item sortRecords(\%options, @Records)
+
+Given a sort specification (or the name of a preset format) and a list of
+records, returns a list of the same records in order according to the sort.
+
+%options can consist of either:
+
+ preset => the name of a preset format listed by getFormatsForClass()
+
+or:
+
+ fields => a reference to a list of fields in the records' class
+
+If C<preset> is given, and its value does not match any known preset but I<is>
+the name of a field in the record class, the records will be sorted by that
+field.
+
+If C<fields> is given, the records are sorted according to the specified fields.
+If multiple fields are specified, the second field is is consulted if two
+records are found to have identical first fields, and so on.
+
+=cut
+
+# DBFIXME filtering should happen in the database (WHERE clauses)
+sub filterRecords {
+	my ($options, @Records) = @_;
+	
+	# nothing to do
+	return () unless @Records;
+	
+	# get class info (we assume that the records are all of the same type)
+	
+	my %options = %$options;
+	
+	my @filtersToUse = @{$options{filter}};
+
+	if (grep {$_ eq "all"} @filtersToUse) {return @Records;}
+	
+	my @GoodRecords = ();
+	foreach my $record (@Records){
+	foreach my $fil (@filtersToUse){
+		my ($name, $value) = split(/:/, $fil);
+		#warn "filter = $fil";
+		#warn "name = $name";
+		#warn "value = $value";
+		#warn "section = $record->section";
+#		my @data = split(/::/, $record);
+		if ($record->$name eq $value) {push @GoodRecords, $record}
+	}
+	}
+	return @GoodRecords;
+}
+
+=back
+
+=head1 BUGS
+
+No provision for case-insensitive, descending, or numeric sorting.
+
+No provision for programmatic sorts. While a one-time programmatic sort can be
+done easily without using this module, programmatic preset sorts would be
+useful, i.e. for intelligent sorting of set IDs.
+
+The fields being compared cannot contain nulls, because of the way packed keys
+are being generated.
+
+=cut
+
+1;
diff --git a/lib/WeBWorK/Utils/FormatRecords.pm b/lib/WeBWorK/Utils/FormatRecords.pm
new file mode 100644
index 0000000000..457df47c38
--- /dev/null
+++ b/lib/WeBWorK/Utils/FormatRecords.pm
@@ -0,0 +1,276 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/Utils/FormatRecords.pm,v 1.9 2007/04/09 21:01:50 glarose 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::Utils::FormatRecords;
+use base qw(Exporter);
+
+=head1 NAME
+
+WeBWorK::Utils::FormatRecords - utilities for formatting database records as
+strings.
+
+=head1 SYNOPSIS
+
+ use WeBWorK::Utils::FormatRecords qw/getFormatsForClass/;
+ 
+ # get a list of formats
+ my ($formatsRef, $formatLabelsRef) = getFormatsForClass(ref $Users[0]);
+ my @formats      = @$formatsRef;      # format names
+ my %formatLabels = %$formatLabelsRef; # suitable for CGI's "-labels" parameter
+
+ use WeBWorK::Utils::FormatRecords qw/formatRecords/;
+ 
+ # start with a hash mapping identifiers to records
+ my %Records = map { $_->user_id => $_ } $db->getUsers($db->listUsers);
+ 
+ # format the records using a preset
+ my %recordLabels = formatRecords({preset=>"lnfn_uid"}, %Records);
+ 
+ # or provide a custom format
+ my %options = {
+ 	field_order   => [ qw/user_id section recitation/ ],
+ 	format_string => "%s %s/%s", # suitable for sprintf
+ };
+ my %recordLabels = formatRecords(\%options, %Records);
+ 
+ # %recordLabels is suitable for CGI's "-labels" parameter
+
+=head1 DESCRIPTION
+
+This module provides record formatting functions, and a collection of preset
+formats for the standard WeBWorK record classes. Formats are specified by a list
+of field names and an sprintf format string.
+
+=cut
+
+use strict;
+use warnings;
+use Carp;
+use WeBWorK::Utils qw/formatDateTime/;
+
+our @EXPORT    = ();
+our @EXPORT_OK = qw(
+	getFormatsForClass
+	formatRecords
+);
+
+use constant PRESET_FORMATS => {
+	"WeBWorK::DB::Record::User" => {
+		"uid_lnfn" => {
+			name => "user_id - last_name, first_name",
+			field_order => [ qw/user_id last_name first_name/ ],
+			format_string => "%s - %s, %s",
+		},
+		"lnfn_uid" => {
+			name => "last_name, first_name (user_id)",
+			field_order => [ qw/last_name first_name user_id/ ],
+			format_string => "%s, %s (%s)",
+		},
+		"lnfn_section" => {
+			name => "last_name, first_name (section)",
+			field_order => [ qw/last_name first_name section/ ],
+			format_string => "%s, %s (%s)",
+		},
+		"lnfn_recitation" => {
+			name => "last_name, first_name (recitation)",
+			field_order => [ qw/last_name first_name recitation/ ],
+			format_string => "%s, %s (%s)",
+		},
+		"lnfn_secrec" => {
+			name => "last_name, first_name (section/recitation)",
+			field_order => [ qw/last_name first_name section recitation/ ],
+			format_string => "%s, %s (%s/%s)",
+		},
+		"lnfn_email" => {
+			name => "last_name, first_name (email_address)",
+			field_order => [ qw/last_name first_name email_address/ ],
+			format_string => "%s, %s (%s)",
+		},
+	},
+	"WeBWorK::DB::Record::Set" => {
+		"sid" => {
+			name => "set_id",
+			field_order => [ qw/set_id/ ],
+		},
+		#"sid_open" => {
+		#	name => "set_id (open_date)",
+		#	field_order => [ qw/set_id open_date/ ],
+		#	format_function => sub { sprintf("%s (%s)", $_[0], formatDateTime($_[1])) }
+		#},
+		#"sid_due" => {
+		#	name => "set_id (due_date)",
+		#	field_order => [ qw/set_id due_date/ ],
+		#	format_function => sub { sprintf("%s (%s)", $_[0], formatDateTime($_[1])) }
+		#},
+		#"sid_answer" => {
+		#	name => "set_id (answer_date)",
+		#	field_order => [ qw/set_id answer_date/ ],
+		#	format_function => sub { sprintf("%s (%s)", $_[0], formatDateTime($_[1])) }
+		#},
+	},
+        "WeBWorK::DB::Record::SetVersion" => {
+                "sid" => {
+                        name => "set_id",
+                        field_order => [ qw/set_id/ ],
+                },
+        },
+};
+
+=head1 FUNCTIONS
+
+=over
+
+=item getFormatsForClass($class)
+
+Given the name of a record class, returns the preset formats available for that
+class.
+
+The return value consists of a two-element list. The first element is a
+reference to a list of format names. The second element is a reference to a hash
+mapping format names to string descriptions.
+
+Together, these two lists are suitable for passing to the C<-values> and
+C<-labels> parameters of several CGI module methods, i.e. popup_menu(),
+scrolling_list(), checkbox_group(), and radio_group().
+
+=cut
+
+sub getFormatsForClass {
+	my ($class) = @_;
+	
+	my %class_presets = exists PRESET_FORMATS->{$class} ? %{ PRESET_FORMATS->{$class} } : ();
+	
+	# i don't think we want formats consisting of a single field, so these are disabled
+	#my @field_order = $class->FIELDS;
+	my @preset_order = sort { $class_presets{$a}{name} cmp $class_presets{$b}{name} } keys %class_presets;
+	
+	#my %fields = map { $_ => "Field: $_" } @field_order;
+	#my %presets = map { $_ => "Preset: $class_presets{$_}{name}" } @preset_order;
+	my %presets = map { $_ => $class_presets{$_}{name} } @preset_order;
+	
+	#return ( [@field_order, @preset_order], {%fields, %presets} );
+	return ( \@preset_order, \%presets );
+}
+
+=item formatRecords(\%options, %Records)
+
+Given a format specification (or the name of a preset format) and a hash mapping
+record identifiers to records, returns a hash mapping identifiers to formatted
+strings.
+
+The keys of the %Records hash are not used by formatRecords() They are a
+convenience for you.
+
+%options can consist of:
+
+ preset => the name of a preset format listed by getFormatsForClass()
+
+or:
+
+ field_order   => a reference to a list of fields in the records' class
+ format_string => an sprintf format string corresponding to the fields listed above
+
+or:
+
+ field_order     => a reference to a list of fields in the records' class
+ format_function => a coderef to which to pass the contents of the fields in field_order
+
+If C<preset> is given, and its value does not match any known preset but I<is>
+the name of a field in the record class, the format is assumed to consist of
+that single field.
+
+If C<format_function> is given, the subroutine referenced is passed to contents
+of each field listed in C<field_order>. The subroutine should return a formatted
+string.
+
+The return value is suitable for passing to the C<-labels> parameter of several
+CGI module methods, i.e. popup_menu(), scrolling_list(), checkbox_group(), and
+radio_group().
+
+=cut
+
+sub formatRecords {
+	my ($options, %Records) = @_;
+	
+	# nothing to do
+	return () unless %Records;
+	
+	# get class info (we assume that the records are all of the same type)
+	my ($tempKey, $tempValue) = each %Records;
+	my $class = ref $tempValue;
+	my %class_fields = map { $_ => 1 } $class->FIELDS;
+	
+	my %options = %$options;
+	
+	if (exists $options{"preset"}) {
+		my $preset = $options{preset};
+		
+		if (exists PRESET_FORMATS->{$class} and exists PRESET_FORMATS->{$class}->{$preset}) {
+			# an explicit preset exists
+			# replace the contents of %options with the values from the preset
+			%options = %{ PRESET_FORMATS->{$class}->{$preset} };
+		} elsif (exists $class_fields{$preset}) {
+			# it's the name of a field in the current class, in which case we treat it as
+			# a "fields" sort with a single field
+			%options = ( field_order => [ $preset ] );
+		} else {
+			croak "preset \"$preset\" not found for class \"$class\"";
+		}
+	}
+	
+	croak "field_order not found in options list" unless exists $options{field_order};
+	croak "field_order is not an arrayref" unless ref $options{field_order} eq "ARRAY";
+	my @field_order = @{ $options{field_order} };
+	croak "field_order is empty -- no fields to display" unless @field_order;
+	
+	my $format_function;
+	if (exists $options{format_function}) {
+		croak "format_function is not a coderef" unless ref $options{format_function} eq "CODE";
+		$format_function = $options{format_function};
+	}
+	
+	# default format_string is "%s %s %s ... %s".
+	my $format_string = $options{format_string} || "%s " x (@field_order-1) . "%s";
+	
+	if ($format_function) {
+		# if we were passed format_function, call it on each record
+		foreach my $value (values %Records) {
+			# $value is initially a record, and is then replaced with a formatted string
+			$value = $format_function->(map { $value->$_ } @field_order);
+		}
+	} else {
+		# otherwise, use sprintf and format_string
+		foreach my $value (values %Records) {
+			# $value is initially a record, and is then replaced with a formatted string
+			$value = sprintf($format_string, map { $value->$_ } @field_order);
+		}
+	}
+	
+	return %Records;
+}
+
+=back
+
+=cut
+
+=head1 BUGS
+
+The calling semantics of formatRecords is somewhat inflexible. We shouldn't make
+the user pass a hash if a list is sufficient for their use.
+
+=cut
+
+1;
diff --git a/lib/WeBWorK/Utils/Grades.pm b/lib/WeBWorK/Utils/Grades.pm
new file mode 100644
index 0000000000..4695f0f6c9
--- /dev/null
+++ b/lib/WeBWorK/Utils/Grades.pm
@@ -0,0 +1,66 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright � 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/Utils/ListingDB.pm,v 1.19 2007/08/13 22:59:59 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::Utils::Grades;
+use base qw(Exporter);
+
+use strict;
+use warnings;
+use Carp;
+
+our @EXPORT    = ();
+our @EXPORT_OK = qw(
+	list_set_versions
+);
+
+###########################
+# Utils::Grades
+#
+# Provides common grading methods for grading a set  or a versioned set
+###########################
+
+######################################################
+# build list of versioned sets for this student user
+# inputs:  $studentID, $setID
+# returns;    ref to array of names of set versions OR (if not versioned) the $setID
+#              notAssignedSet
+######################################################
+
+sub list_set_versions {
+	my ($db, $studentName, $setName, $setIsVersioned) = @_;
+	return ("list_set_versions requires a database reference as the first element") unless ref($db)=~/DB/;
+	my @allSetNames = ();
+	my $notAssignedSet = 0;
+	if ( $setIsVersioned ) {
+		my @setVersions = $db->listSetVersions($studentName, $setName);
+		@allSetNames = map { "$setName,v$_" } @setVersions;
+		# if there aren't any set versions, is it because
+		#    the user isn't assigned the set (e.g., is a 
+		#    proctor), or because the user hasn't completed
+		#    any versions?
+		if ( ! @setVersions ) {
+			$notAssignedSet = 1 if (! $db->existsUserSet($studentName,$setName));
+		}
+
+	} else {
+		@allSetNames = ( "$setName" );
+	}
+	(\@allSetNames, $notAssignedSet);
+}
+
+
+
+1;
diff --git a/lib/WeBWorK/Utils/ListingDB.pm b/lib/WeBWorK/Utils/ListingDB.pm
new file mode 100644
index 0000000000..a9eeedacb4
--- /dev/null
+++ b/lib/WeBWorK/Utils/ListingDB.pm
@@ -0,0 +1,658 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright � 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/Utils/ListingDB.pm,v 1.19 2007/08/13 22:59:59 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::Utils::ListingDB;
+
+use strict;
+use DBI;
+use WeBWorK::Utils qw(sortByName);
+
+use constant LIBRARY_STRUCTURE => {
+	textbook => { select => 'tbk.textbook_id,tbk.title,tbk.author,tbk.edition',
+	name => 'library_textbook', where => 'tbk.textbook_id'},
+	textchapter => { select => 'tc.number,tc.name', name=>'library_textchapter',
+	where => 'tc.name'},
+	textsection => { select => 'ts.number,ts.name', name=>'library_textsection',
+	where => 'ts.name'},
+	problem => { select => 'prob.name' },
+	};
+
+BEGIN
+{
+	require Exporter;
+	use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
+	
+	$VERSION		=1.0;
+	@ISA		=qw(Exporter);
+	@EXPORT	=qw(
+	&createListing &updateListing &deleteListing &getAllChapters
+	&getAllSections &searchListings &getAllListings &getSectionListings
+	&getAllDBsubjects &getAllDBchapters &getAllDBsections &getDBTextbooks
+	&getDBListings &countDBListings
+	);
+	%EXPORT_TAGS		=();
+	@EXPORT_OK		=qw();
+}
+use vars @EXPORT_OK;
+
+
+sub getDB {
+	my $ce = shift;
+	my $dbh = DBI->connect(
+		$ce->{problemLibrary_db}->{dbsource},
+		$ce->{problemLibrary_db}->{user},
+		$ce->{problemLibrary_db}->{passwd},
+		{
+			PrintError => 0,
+			RaiseError => 1,
+		},
+	);
+	die "Cannot connect to problem library database" unless $dbh;
+	return($dbh);
+}
+
+=item kwtidy($s) and keywordcleaner($s)
+Both take a string and perform utility functions related to keywords.
+keywordcleaner splits a string, and uses kwtidy to regularize punctuation
+and case for an individual entry.
+                                                                                
+=cut                                                                            
+
+sub kwtidy {
+	my $s = shift;
+	$s =~ s/\W//g;
+	$s =~ s/_//g;
+	$s = lc($s);
+	return($s);
+}
+
+sub keywordCleaner {
+	my $string = shift;
+	my @spl1 = split /\s*,\s*/, $string;
+	my @spl2 = map(kwtidy($_), @spl1);
+	return(@spl2);
+}
+
+sub makeKeywordWhere {
+	my $kwstring = shift;
+	my @kwlist = keywordCleaner($kwstring);
+	@kwlist = map { "kw.keyword = \"$_\"" } @kwlist;
+	my $where = join(" OR ", @kwlist);
+	return "AND ( $where )";
+}
+
+=item getDBTextbooks($r)                                                    
+Returns textbook dependent entries.
+                                                                                
+$r is a Apache request object so we can extract whatever parameters we want
+
+$thing is a string of either 'textbook', 'textchapter', or 'textsection' to
+specify what to return.
+
+If we are to return textbooks, then return an array of textbook names
+consistent with the DB subject, chapter, section selected.
+
+=cut                                                                            
+
+sub getDBTextbooks {
+	my $r = shift;
+	my $thing = shift || 'textbook';
+	my $dbh = getDB($r->ce);
+	my $extrawhere = '';
+	# Handle DB* restrictions
+	my $subj = $r->param('library_subjects') || "";
+	my $chap = $r->param('library_chapters') || "";
+	my $sec = $r->param('library_sections') || "";
+	if($subj) {
+		$subj =~ s/'/\\'/g;
+		$extrawhere .= " AND t.name = \'$subj\'\n";
+	}
+	if($chap) {
+		$chap =~ s/'/\\'/g;
+		$extrawhere .= " AND c.name = \'$chap\' AND c.DBsubject_id=t.DBsubject_id\n";
+	}
+	if($sec) {
+		$sec =~ s/'/\\'/g;
+		$extrawhere .= " AND s.name = \'$sec\' AND s.DBchapter_id = c.DBchapter_id AND s.DBsection_id=pgf.DBsection_id";
+	}
+	my $textextrawhere = '';
+	my $textid = $r->param('library_textbook') || '';
+	if($textid and $thing ne 'textbook') {
+		$textextrawhere .= " AND tbk.textbook_id=\"$textid\" ";
+	} else {
+		return([]) if($thing ne 'textbook');
+	}
+
+	my $textchap = $r->param('library_textchapter') || '';
+	$textchap =~ s/^\s*\d+\.\s*//;
+	if($textchap and $thing eq 'textsection') {
+		$textextrawhere .= " AND tc.name=\"$textchap\" ";
+	} else {
+		return([]) if($thing eq 'textsection');
+	}
+
+	my $selectwhat = LIBRARY_STRUCTURE->{$thing}{select};
+	
+	my $query = "SELECT DISTINCT $selectwhat
+          FROM `NPL-textbook` tbk, `NPL-problem` prob, 
+			`NPL-pgfile-problem` pg, `NPL-pgfile` pgf,
+            `NPL-DBsection` s, `NPL-DBchapter` c, `NPL-DBsubject` t,
+			`NPL-chapter` tc, `NPL-section` ts
+          WHERE ts.section_id=prob.section_id AND 
+            prob.problem_id=pg.problem_id AND
+            s.DBchapter_id=c.DBchapter_id AND 
+            c.DBsubject_id=t.DBsubject_id AND
+            pgf.DBsection_id=s.DBsection_id AND
+            pgf.pgfile_id=pg.pgfile_id AND
+            ts.chapter_id=tc.chapter_id AND
+            tc.textbook_id=tbk.textbook_id
+            $extrawhere $textextrawhere ";
+#$query =~ s/\n/ /g;
+#warn $query;
+	my $text_ref = $dbh->selectall_arrayref($query);
+	my @texts = @{$text_ref};
+	if( $thing eq 'textbook') {
+		@texts = grep { $_->[1] =~ /\S/ } @texts;
+		my @sortarray = map { $_->[1] . $_->[2] . $_->[3] } @texts;
+		@texts = indirectSortByName( \@sortarray, @texts );
+		return(\@texts);
+	} else {
+		@texts = grep { $_->[1] =~ /\S/ } @texts;
+		my @sortarray = map { $_->[0] .". " . $_->[1] } @texts;
+		@texts = map { [ $_ ] } @sortarray;
+		@texts = indirectSortByName(\@sortarray, @texts);
+		return(\@texts);
+	}
+}
+
+=item getAllDBsubjects($r)
+Returns an array of DBsubject names                                             
+                                                                                
+$r is the Apache request object
+                                                                                
+=cut                                                                            
+
+sub getAllDBsubjects {
+	my $r = shift;
+	my @results=();
+	my $row;
+	my $query = "SELECT DISTINCT name FROM `NPL-DBsubject`";
+	my $dbh = getDB($r->ce);
+	my $sth = $dbh->prepare($query);
+	$sth->execute();
+	while ($row = $sth->fetchrow_array()) {
+		push @results, $row;
+	}
+	@results = sortByName(undef, @results);
+	return @results;
+}
+
+
+=item getAllDBchapters($r)
+Returns an array of DBchapter names                                             
+                                                                                
+$r is the Apache request object
+                                                                                
+=cut                                                                            
+
+sub getAllDBchapters {
+	my $r = shift;
+	my $subject = $r->param('library_subjects');
+	return () unless($subject);
+	my $dbh = getDB($r->ce);
+	my $query = "SELECT DISTINCT c.name FROM `NPL-DBchapter` c, 
+				`NPL-DBsubject` t
+                 WHERE c.DBsubject_id = t.DBsubject_id AND
+                 t.name = \"$subject\"";
+	my $all_chaps_ref = $dbh->selectall_arrayref($query);
+	my @results = map { $_->[0] } @{$all_chaps_ref};
+	@results = sortByName(undef, @results);
+	return @results;
+}
+
+=item getAllDBsections($r)                                            
+Returns an array of DBsection names                                             
+                                                                                
+$r is the Apache request object
+
+=cut                                                                            
+
+sub getAllDBsections {
+	my $r = shift;
+	my $subject = $r->param('library_subjects');
+	return () unless($subject);
+	my $chapter = $r->param('library_chapters');
+	return () unless($chapter);
+	my $dbh = getDB($r->ce);
+	my $query = "SELECT DISTINCT s.name FROM `NPL-DBsection` s,
+                 `NPL-DBchapter` c, `NPL-DBsubject` t
+                 WHERE s.DBchapter_id = c.DBchapter_id AND
+                 c.DBsubject_id = t.DBsubject_id AND
+                 t.name = \"$subject\" AND c.name = \"$chapter\"";
+	my $all_sections_ref = $dbh->selectall_arrayref($query);
+	my @results = map { $_->[0] } @{$all_sections_ref};
+	@results = sortByName(undef, @results);
+	return @results;
+}
+
+=item getDBSectionListings($r)                             
+Returns an array of hash references with the keys: path, filename.              
+                                                                                
+$r is an Apache request object that has all needed data inside of it
+
+Here, we search on all known fields out of r
+                                                                                
+=cut                                                                            
+
+sub getDBListings {
+	my $r = shift;
+	my $amcounter = shift;
+	my $ce = $r->ce;
+	my $subj = $r->param('library_subjects') || "";
+	my $chap = $r->param('library_chapters') || "";
+	my $sec = $r->param('library_sections') || "";
+	my $keywords = $r->param('library_keywords') || "";
+	my ($kw1, $kw2) = ('','');
+	if($keywords) {
+		$kw1 = ", `NPL-keyword` kw, `NPL-pgfile-keyword` pgkey";
+		$kw2 = " AND kw.keyword_id=pgkey.keyword_id AND
+			 pgkey.pgfile_id=pgf.pgfile_id ". 
+			makeKeywordWhere($keywords) ;
+	}
+
+	my $dbh = getDB($ce);
+
+	my $extrawhere = '';
+	if($subj) {
+		$subj =~ s/'/\\'/g;
+		$extrawhere .= " AND dbsj.name=\"$subj\" ";
+	}
+	if($chap) {
+		$chap =~ s/'/\\'/g;
+		$extrawhere .= " AND dbc.name=\"$chap\" ";
+	}
+	if($sec) {
+		$sec =~ s/'/\\'/g;
+		$extrawhere .= " AND dbsc.name=\"$sec\" ";
+	}
+	my $textextrawhere = '';
+    my $haveTextInfo=0;
+	for my $j (qw( textbook textchapter textsection )) {
+		my $foo = $r->param(LIBRARY_STRUCTURE->{$j}{name}) || '';
+		$foo =~ s/^\s*\d+\.\s*//;
+		if($foo) {
+            $haveTextInfo=1;
+			$foo =~ s/'/\\'/g;
+			$textextrawhere .= " AND ".LIBRARY_STRUCTURE->{$j}{where}."=\"$foo\" ";
+		}
+	}
+
+	my $selectwhat = 'DISTINCT pgf.pgfile_id';
+	$selectwhat = 'COUNT(' . $selectwhat . ')' if ($amcounter);
+
+	my $query = "SELECT $selectwhat from `NPL-pgfile` pgf, 
+         `NPL-DBsection` dbsc, `NPL-DBchapter` dbc, `NPL-DBsubject` dbsj $kw1
+        WHERE dbsj.DBsubject_id = dbc.DBsubject_id AND
+              dbc.DBchapter_id = dbsc.DBchapter_id AND
+              dbsc.DBsection_id = pgf.DBsection_id 
+              \n $extrawhere 
+              $kw2";
+	if($haveTextInfo) {
+      $query = "SELECT $selectwhat from `NPL-pgfile` pgf, 
+        `NPL-DBsection` dbsc, `NPL-DBchapter` dbc, `NPL-DBsubject` dbsj,
+		`NPL-pgfile-problem` pgp, `NPL-problem` prob, `NPL-textbook` tbk ,
+		`NPL-chapter` tc, `NPL-section` ts $kw1
+        WHERE dbsj.DBsubject_id = dbc.DBsubject_id AND
+              dbc.DBchapter_id = dbsc.DBchapter_id AND
+              dbsc.DBsection_id = pgf.DBsection_id AND
+              pgf.pgfile_id = pgp.pgfile_id AND
+              pgp.problem_id = prob.problem_id AND
+              tc.textbook_id = tbk.textbook_id AND
+              ts.chapter_id = tc.chapter_id AND
+              prob.section_id = ts.section_id \n $extrawhere \n $textextrawhere
+              $kw2";
+     }
+#$query =~ s/\n/ /g;
+#warn $query;
+	my $pg_id_ref = $dbh->selectall_arrayref($query);
+	my @pg_ids = map { $_->[0] } @{$pg_id_ref};
+	if($amcounter) {
+		return(@pg_ids[0]);
+	}
+	my @results=();
+	for my $pgid (@pg_ids) {
+		$query = "SELECT path, filename FROM `NPL-pgfile` pgf, `NPL-path` p 
+          WHERE p.path_id = pgf.path_id AND pgf.pgfile_id=\"$pgid\"";
+		my $row = $dbh->selectrow_arrayref($query);
+		push @results, {'path' => $row->[0], 'filename' => $row->[1] };
+		
+	}
+	return @results;
+}
+
+sub countDBListings {
+	my $r = shift;
+	return (getDBListings($r,1));
+}
+
+##############################################################################
+# input expected: keywords,<keywords>,chapter,<chapter>,section,<section>,path,<path>,filename,<filename>,author,<author>,instituition,<instituition>,history,<history>
+#
+#
+# Warning - this function is out of date (but currently unused)
+#
+
+sub createListing {
+	my $ce = shift;
+	my %listing_data = @_; 
+	my $classify_id;
+	my $dbh = getDB($ce);
+	#	my $dbh = WeBWorK::ProblemLibrary::DB::getDB();
+	my $query = "INSERT INTO classify
+		(filename,chapter,section,keywords)
+		VALUES
+		($listing_data{filename},$listing_data{chapter},$listing_data{section},$listing_data{keywords})";
+	$dbh->do($query);	 #TODO: watch out for comma delimited keywords, sections, chapters!
+
+	$query = "SELECT id FROM classify WHERE filename = $listing_data{filename}";
+	my $sth = $dbh->prepare($query);
+	$sth->execute();
+	if ($sth->rows())
+	{
+		($classify_id) = $sth->fetchrow_array;
+	}
+	else
+	{
+		#print STDERR "ListingDB::createListingPGfiles: $listing_data{filename} failed insert into classify table";
+		return 0;
+	};
+
+	$query = "INSERT INTO pgfiles
+   (
+   classify_id,
+   path,
+   author,
+   institution,
+   history
+   )
+   VALUES
+  (
+   $classify_id,
+   $listing_data{path},
+   $listing_data{author},
+   $listing_data{institution},
+   $listing_data{history}
+   )";
+	
+	$dbh->do($query);
+	return 1;
+}
+
+##############################################################################
+# input expected any pair of: keywords,<keywords data>,chapter,<chapter data>,section,<section data>,filename,<filename data>,author,<author data>,instituition,<instituition data>
+# returns an array of hash references
+#
+# Warning - out of date (and unusued)
+#
+
+sub searchListings {
+	my $ce = shift;
+	my %searchterms = @_;
+	#print STDERR "ListingDB::searchListings  input array @_\n";
+	my @results;
+	my ($row,$key);
+	my $dbh = getDB($ce);
+	my $query = "SELECT c.filename, p.path
+		FROM classify c, pgfiles p
+		WHERE c.id = p.classify_id";
+	foreach $key (keys %searchterms) {
+		$query .= " AND c.$key = $searchterms{$key}";
+	};
+	my $sth = $dbh->prepare($query);
+	$sth->execute();
+	if ($sth->rows())
+	{
+		while (1)
+		{
+			$row = $sth->fetchrow_hashref();
+			if (!defined($row))
+			{
+				last;
+			}
+			else
+			{
+				#print STDERR "ListingDB::searchListings(): found $row->{id}\n";
+				my $listing = $row;
+				push @results, $listing;
+			}
+		}
+	}
+	return @results;
+}
+##############################################################################
+# returns a list of chapters
+#
+# Warning - out of date
+#
+
+sub getAllChapters {
+	#print STDERR "ListingDB::getAllChapters\n";
+	my $ce = shift;
+	my @results=();
+	my ($row,$listing);
+	my $query = "SELECT DISTINCT chapter FROM classify";
+	my $dbh = getDB($ce);
+	my $sth = $dbh->prepare($query);
+	$sth->execute();
+	while (1)
+	{
+		$row = $sth->fetchrow_array;
+		if (!defined($row))
+		{
+			last;
+		}
+		else
+		{
+			my $listing = $row;
+			push @results, $listing;
+			#print STDERR "ListingDB::getAllChapters $listing\n";
+		}
+	}
+	return @results;
+}
+##############################################################################
+# input chapter
+# returns a list of sections
+#
+# Warning - out of date (and unused)
+#
+
+sub getAllSections {
+	#print STDERR "ListingDB::getAllSections\n";
+	my $ce = shift;
+	my $chapter = shift;
+	my @results=();
+	my ($row,$listing);
+	my $query = "SELECT DISTINCT section FROM classify
+				WHERE chapter = \'$chapter\'";
+	my $dbh = getDB($ce);
+	my $sth = $dbh->prepare($query);
+	$sth->execute();
+	while (1)
+	{
+		$row = $sth->fetchrow_array;
+		if (!defined($row))
+		{
+			last;
+		}
+		else
+		{
+			my $listing = $row;
+			push @results, $listing;
+			#print STDERR "ListingDB::getAllSections $listing\n";
+		}
+	}
+	return @results;
+}
+
+##############################################################################
+# returns an array of hash references
+#
+# Warning - out of date (and unused)
+#
+
+sub getAllListings {
+	#print STDERR "ListingDB::getAllListings\n";
+	my $ce = shift;
+	my @results;
+	my ($row,$key);
+	my $dbh = getDB($ce);
+	my $query = "SELECT c.*, p.path
+			FROM classify c, pgfiles p
+			WHERE c.pgfiles_id = p.pgfiles_id";
+	my $sth = $dbh->prepare($query);
+	$sth->execute();
+	while (1)
+	{
+		$row = $sth->fetchrow_hashref();
+		last if (!defined($row));
+		my $listing = $row;
+		push @results, $listing;
+		#print STDERR "ListingDB::getAllListings $listing\n";
+	}
+	return @results;
+}
+
+##############################################################################
+# input chapter, section
+# returns an array of hash references.
+# if section is omitted, get all from the chapter
+sub getSectionListings	{
+	#print STDERR "ListingDB::getSectionListings(chapter,section)\n";
+	my $r = shift;
+	my $ce = $r->ce;
+	my $version = $ce->{problemLibrary}->{version} || 1;
+	if($version == 2) { return(getDBListings($r, 0))}
+	my $subj = $r->param('library_subjects') || "";
+	my $chap = $r->param('library_chapters') || "";
+	my $sec = $r->param('library_sections') || "";
+
+	my $chapstring = '';
+	if($chap) {
+		$chap =~ s/'/\\'/g;
+		$chapstring = " c.chapter = \'$chap\' AND ";
+	}
+	my $secstring = '';
+	if($sec) {
+		$sec =~ s/'/\\'/g;
+		$secstring = " c.section = \'$sec\' AND ";
+	}
+
+	my @results; #returned
+	my $query = "SELECT c.*, p.path
+	FROM classify c, pgfiles p
+	WHERE $chapstring $secstring c.pgfiles_id = p.pgfiles_id";
+	my $dbh = getDB($ce);
+	my $sth = $dbh->prepare($query);
+	
+	$sth->execute();
+	while (1)
+	{
+		my $row = $sth->fetchrow_hashref();
+		if (!defined($row))
+		{
+			last;
+		}
+		else
+		{
+			push @results, $row;
+			#print STDERR "ListingDB::getSectionListings $row\n";
+		}
+	}
+	return @results;
+}
+
+###############################################################################
+# INPUT:
+#  listing id number
+# RETURN:
+#  1 = all ok
+#
+# not implemented yet
+sub deleteListing {
+	my $ce = shift;
+	my $listing_id = shift;
+	#print STDERR "ListingDB::deleteListing(): listing == '$listing_id'\n";
+
+	my $dbh = getDB($ce);
+
+	return undef;
+}
+
+
+# Use sortByName($aref, @b) to sort list @b using parallel list @a.
+# Here, $aref is a reference to the array @a
+
+sub indirectSortByName {
+	my $aref = shift ;
+	my @a = @$aref;
+	my @b = @_;
+	my %pairs ;
+	for my $j (1..scalar(@a)) {
+		$pairs{$a[$j-1]} = $b[$j-1];
+	}
+	my @list = sortByName(undef, @a);
+	@list = map { $pairs{$_} } @list;
+	return(@list);
+}
+
+
+
+##############################################################################
+1;
+
+__END__
+
+=head1 DESCRIPTION
+
+This module provides access to the database of classify in the
+system. This includes the filenames, along with the table of
+search terms.
+
+=head1 FUNCTION REFERENCE
+
+=over 4
+
+=item $result = createListing( %listing_data );
+
+Creates a new listing populated with data from %listing_data. On
+success, 1 is returned, 0 is returned on failure. The %listing_data
+hash has the following format:
+=cut
+
+=back
+
+=head1 AUTHOR
+
+Written by Bill Ziemer.
+Modified by John Jones.
+
+=cut
+
+
+##############################################################################
+# end of ListingDB.pm
+##############################################################################
diff --git a/lib/WeBWorK/Utils/RestrictedClosureClass.pm b/lib/WeBWorK/Utils/RestrictedClosureClass.pm
new file mode 100644
index 0000000000..87051db478
--- /dev/null
+++ b/lib/WeBWorK/Utils/RestrictedClosureClass.pm
@@ -0,0 +1,117 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/Utils/RestrictedClosureClass.pm,v 1.4 2007/08/10 00:27:14 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::Utils::RestrictedClosureClass;
+
+=head1 NAME
+
+WeBWorK::Utils::RestrictedClosureClass - Protect instance data and only allow
+calling of specified methods.
+
+=head1 SYNPOSIS
+
+ package MyScaryClass;
+ 
+ sub new { return bless { @_[1..$#_] }, ref $_[0] || $_[0] }
+ sub get_secret { return $_[0]->{secret_data} }
+ sub set_secret { $_[0]->{secret_data} = $_[1] }
+ sub use_secret { print "Secret length is ".length($_[0]->get_secret) }
+ sub call_for_help { print "HELP!!" }
+ 
+ package main;
+ use WeBWorK::Utils::RestrictedClosureClass;
+ 
+ my $unlocked = new MyScaryClass(secret_data => "pErL iS gReAt");
+ my $locked = new WeBWorK::Utils::RestrictedClosureClass($obj, qw/use_secret call_for_help/);
+ 
+ $unlocked->get_secret;                # OK
+ $unlocked->set_secret("fOoBaR");      # OK
+ $unlocked->use_secret;                # OK
+ $unlocked->call_for_help;             # OK
+ print $unlocked->{secret_data};       # OK
+ $unlocked->{secret_data} = "WySiWyG"; # OK
+ 
+ $locked->get_secret;                  # NG (not in method list)
+ $locked->set_secret("fOoBaR");        # NG (not in method list)
+ $locked->use_secret;                  # OK
+ $locked->call_for_help;               # OK
+ print $locked->{secret_data};         # NG (not a hash reference)
+ $locked->{secret_data} = "WySiWyG";   # NG (not a hash reference)
+
+=head1 DESCRIPTION
+
+RestrictedClosureClass generates a wrapper object for a given object that
+prevents access to the objects instance data and only allows specified method
+calls. The wrapper object is a closure that calls methods of the underlying
+object, if permitted.
+
+This is great for exposing a limited API to an untrusted environment, i.e. the
+PG Safe compartment.
+
+=head1 CONSTRUCTOR
+
+=over
+
+=item $wrapper_object = CLASS->new($object, @methods)
+
+Generate a wrapper object for the given $object. Only calls to the methods
+listed in @methods will be permitted.
+
+=back
+
+=head1 LIMITATIONS
+
+You can't call SUPER methods, or methods with an explicit class given:
+
+ $locked->SUPER::call_for_help         # NG, would be superclass of RestrictedClosureClass
+
+=head1 SEE ALSO
+
+L<perltoot/Closures-as-Objects>
+
+=cut
+
+use strict;
+use warnings;
+use Carp;
+use Scalar::Util qw/blessed/;
+
+sub new {
+	my ($invocant, $object, @methods) = @_;
+	croak "wrapper class with no methods is dumb" unless @methods;
+	my $class = ref $invocant || $invocant;
+	croak "object is not a blessed reference" unless blessed $object;
+	my %methods; @methods{@methods} = ();
+	my $self = sub { # CLOSURE over $object, %methods;
+		my $method = shift;
+		if (not exists $methods{$method}) {
+			croak "Can't locate object method \"$method\" via package \"".ref($object)."\" fnord";
+		}
+		return $object->$method(@_);
+	};
+	return bless $self, $class;
+}
+
+sub AUTOLOAD {
+	my $self = shift;
+	my $name = our $AUTOLOAD;
+	$name =~ s/.*:://;
+	return if $name eq "DESTROY"; # real obj's DESTROY method called when closure goes out of scope
+	return $self->($name, @_);
+}
+
+1;
+
diff --git a/lib/WeBWorK/Utils/RestrictedMailer.pm b/lib/WeBWorK/Utils/RestrictedMailer.pm
new file mode 100644
index 0000000000..5e2523de23
--- /dev/null
+++ b/lib/WeBWorK/Utils/RestrictedMailer.pm
@@ -0,0 +1,306 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/Utils/RestrictedMailer.pm,v 1.2 2006/12/05 20:57:53 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::Utils::RestrictedMailer;
+use base "Mail::Sender";
+
+=for comment
+
+PLEASE NOTE
+
+This class does not impose any restrictions on its own, it simply provides
+restricted versions of Mail::Sender's Open, OpenMultipart, MailMsg, and
+MailFile methods.
+
+The restricted methods prevent the caller from overriding parameters that
+have already been specified to the constructor. For example, if the "smtp"
+parameter is specified in new(), it cannot be re-specified in Open(). To lock
+a parameter without specifying a value, set it to undef.
+
+To avoid having to list all possible parameters to lock them, specify
+lock_by_default=>1. To allow a locked parameter to be changed, list it in
+allow_change.
+
+To restrict the recipients that are allowed, list those recipients in
+allowed_recipients.
+
+By wrapping an instance of this class with RestrictedClosureClass, you can
+prevent the user from changing the SMTP server settings and sending mail to
+or from unauthorized addresses.
+
+Method summary:
+ - new (wrapped) - safe
+ - Open (wrapped) - safe
+ - OpenMultipart (wrapped) - safe
+ - MailMsg (wrapped) - safe
+ - MailFile (wrapped) - unsafe, allows read access to filesystem
+ - Send - unsafe, can be used to issue SMTP commands
+ - SendLine - unsafe, can be used to issue SMTP commands
+ - print/SendEnc - safe
+ - SendLineEnc - safe
+ - SendEx - unsafe, can be used to issue SMTP commands
+ - SendLineEx - unsafe, can be used to issue SMTP commands
+ - Part - safe, but params cannot be locked
+ - Body - safe, but params cannot be locked
+ - SendFile/Attach - unsafe, allows read access to filesystem
+ - EndPart - safe
+ - Close - safe, but allows overriding the keepconnection parameter
+ - Cancel - safe
+ - QueryAuthProtocols - unsafe, allows connection to arbitrary SMTP server
+ - GetHandle - safe
+
+FIXME MailFile needs restriction on what files can be specified.
+
+FIXME There's currently no way to restrict the arguments to Part, Body, or
+SendFile/Attach, but the only time this is actually a problem is with the "file"
+parameter to SendFile/Attach.
+
+FIXME What about ctype and charset, which appear as params to new and also
+appear separately as params to MailFile, Part, Body, and SendFile/Attach?
+
+FIXME Close should check if keepconnection is locked.
+
+FIXME QueryAuthProtocols could be made safe by prohibiting the $smtpserver
+argument.
+
+=cut
+
+use strict;
+use warnings;
+use Carp;
+use Scalar::Util qw/refaddr/;
+use Storable qw/dclone/;
+use WeBWorK::Utils qw/constituency_hash/;
+
+# params that all methods accept
+our @COMMON_PARAMS = qw/from fake_from reply replyto to fake_to cc fake_cc bcc
+smtp subject headers boundary multipart ctype charset client priority confirm
+debug debug_level auth authid authdomain auth_encoded keepconnection
+skip_bad_recipients createmessageid onerrors/;
+
+# params accepted by each method we're restricting
+our %LEGAL_PARAMS = (
+	new => constituency_hash(@COMMON_PARAMS),
+	Open => constituency_hash(@COMMON_PARAMS),
+	OpenMultipart => constituency_hash(@COMMON_PARAMS),
+	MailMsg => constituency_hash(@COMMON_PARAMS, qw/msg/),
+	MailFile => constituency_hash(@COMMON_PARAMS, qw/msg file description ctype charset encoding/),
+	#Part => constituency_hash(qw/description ctype encoding disposition content_id msg charset/),
+	Body => constituency_hash(qw/charset encoding ctype msg/),
+	Attach => constituency_hash(qw/description ctype encoding disposition file content_id/),
+);
+
+# order of positional params
+our %POSITIONAL_PARAMS = (
+	new => [qw/from reply to smtp subject headers boundary/],
+	Open => [qw/from reply to smtp subject headers/],
+	OpenMultipart => [qw/from reply to smtp subject headers boundary/],
+	MailMsg => [qw/from reply to smtp subject headers msg/],
+	MailFile => [qw/from reply to smtp subject headers msg file description/],
+	#Part => [qw/description ctype encoding disposition content_id msg/],
+	#Body => [qw/charset encoding ctype/],
+	#Attach => [qw/description ctype encoding disposition file/],
+);
+
+# legal opts:
+#   - params (parameters to pass to SUPER::new, either as an arrayref of positional params or as hashref)
+#   - lock_by_default (if true, params not listed in params or allow_change will be locked)
+#   - allow_change (params listed here will always be changeable)
+#   - allowed_recipients (if non-empty, recipient addresses must be in this list)
+#   - fatal_errors (if true, attempts to modify locked params will cause an exception)
+# 
+sub new {
+	my ($invocant, %opts) = @_;
+	
+	my $params = $opts{params};
+	$params = munge_params("new", @$params) if ref $params eq "ARRAY";
+	
+	# make a deep copy of the params that will be passed to new
+	# Mail::Sender might delete some elements, and we need the whole thing for later comparison
+	my $initial_params = dclone $params;
+	
+	# create the object, passing the params in
+	my $self = $invocant->SUPER::new($params);
+	
+	# handle errors
+	die $Mail::Sender::Error unless ref $self;
+	
+	# store the set of initial params for later perusal
+	$self->initial_params = $initial_params;
+	
+	# lock_by_default states that params listed neither in params nor in allow_change should be locked
+	$self->lock_by_default = $opts{lock_by_default};
+	
+	# allow_change lists params that can be changed even if they appear in params OR lock_by_default is true
+	# (this is stored as a HASH with undefined values for easy constituency testing)
+	$self->allow_change = constituency_hash(@{$opts{allow_change}});
+	
+	# allowed_recipients can't be handled by setting an initial param
+	$self->allowed_recipients = constituency_hash(@{$opts{allowed_recipients}});
+	
+	# fatal_errors will generate exceptions when locked params are changed
+	# (otherwise, the changes are ignored and a warning is issued)
+	$self->fatal_errors = $opts{fatal_errors};
+	
+	return $self;
+}
+
+sub Open {
+	my $self = shift;
+	my $params = munge_params("Open", @_);
+	$self->filter_params("Open", $params);
+	warn "this is Open: self=$self ISA=@WeBWorK::Utils::RestrictedMailer::ISA";
+	return $self->SUPER::Open($params);
+}
+
+sub OpenMultipart {
+	my $self = shift;
+	my $params = munge_params("OpenMultipart", @_);
+	$self->filter_params("OpenMultipart", $params);
+	return $self->SUPER::Open($params);
+}
+
+sub MailMsg {
+	my $self = shift;
+	my $params = munge_params("MailMsg", @_);
+	$self->filter_params("MailMsg", $params);
+	return $self->SUPER::MailMsg($params);
+}
+
+sub MailFile {
+	my $self = shift;
+	my $params = munge_params("MailFile", @_);
+	$self->filter_params("MailFile", $params);
+	return $self->SUPER::MailFile($params);
+}
+
+sub _prepare_addresses {
+	my ($self, $type) = @_;
+	$self->SUPER::_prepare_addresses($type);
+	foreach my $address (@{$self->{'to_list'}}, @{$self->{'cc_list'}}, @{$self->{'bcc_list'}}) {
+		$address = $1 if $address =~ /<(.*)>/;
+		croak "mail not permitted to '$address'" unless exists $self->allowed_recipients->{$address};
+	}
+}
+
+################################################################################
+
+# prefix for the keys we're adding to $self
+our $PREFIX = "WeBWorK_Utils_RestrictedMailer_";
+
+sub initial_params     : lvalue { shift->{$PREFIX."initial_params"} }
+sub lock_by_default    : lvalue { shift->{$PREFIX."lock_by_default"} }
+sub allow_change       : lvalue { shift->{$PREFIX."allow_change"} }
+sub allowed_recipients : lvalue { shift->{$PREFIX."allowed_recipients"} }
+sub fatal_errors       : lvalue { shift->{$PREFIX."fatal_errors"} }
+
+sub skipped_recipients { return shift->{skipped_recipients} }
+sub error              { return shift->{error} }
+sub error_msg          { return shift->{error_msg} }
+
+sub carp_or_croak { shift->fatal_errors ? croak @_ : carp @_ }
+
+sub munge_params {
+	my ($sub, @params) = @_;
+	
+	my $hash;
+	if (@params) {
+		if (ref $params[0] eq "HASH") {
+			$hash = $params[0];
+		} else {
+			my @names = @{$POSITIONAL_PARAMS{$sub}};
+			my $max = $#names < $#params ? $#names : $#params;
+			@$hash{@names[0..$max]} = @params[0..$max];
+		}
+	}
+	return $hash || {};
+}
+
+sub filter_params {
+	my ($self, $sub, $params) = @_;
+	
+	foreach my $param (keys %$params) {
+		if (exists $LEGAL_PARAMS{$sub}{$param}) {
+			next if exists $self->{$PREFIX."allow_change"}{$param};
+			if (exists $self->{$PREFIX."initial_params"}{$param}) {
+				my $oldval = $self->{$PREFIX."initial_params"}{$param};
+				my $newval = $params->{$param};
+				next if deq($oldval, $newval);
+				$self->carp_or_croak("failed to set param '$param' in method '$sub': param is locked");
+				delete $params->{$param};
+			} elsif ($self->{$PREFIX."lock_by_default"}) {
+				$self->carp_or_croak("failed to change param '$param' in method '$sub': param is locked");
+				delete $params->{$param};
+			}
+		} else {
+			$self->carp_or_croak("invalid param '$param' in method '$sub'");
+			delete $params->{$param};
+		}
+	}
+}
+
+sub deq {
+	my ($oldval, $newval) = @_;
+	
+	#print "oldval=$oldval newval=$newval\n";
+	if (ref $oldval and ref $newval) {
+		if (ref $oldval eq ref $newval) {
+			my $reftype = ref $oldval;
+			if ($reftype eq "HASH") {
+				my @oldkeys = sort keys %$oldval;
+				my @newkeys = sort keys %$newval;
+				#print "oldkeys=@oldkeys\n";
+				#print "newkeys=@newkeys\n";
+				return 0 unless deq(\@oldkeys, \@newkeys);
+				my @oldvals = @$oldval{@oldkeys};
+				my @newvals = @$newval{@newkeys};
+				#print "oldvals=@oldvals\n";
+				#print "newvals=@newvals\n";
+				return deq(\@oldvals, \@newvals);
+			} elsif ($reftype eq "ARRAY") {
+				return 0 unless @$oldval == @$newval;
+				for (my $i = 0; $i < @$oldval; $i++) {
+					return 0 unless deq($oldval->[$i], $newval->[$i]);
+				}
+				return 1;
+			} elsif ($reftype eq "SCALAR") {
+				return deq($$oldval, $$newval);
+			} elsif ($reftype eq "CODE") {
+				# the best we can do here is compare the addresses
+				return refaddr $oldval == refaddr $newval;
+			} else {
+				warn "unsupported reftype '$reftype' in deq()";
+				return 0;
+			}
+		} else {
+			return 0;
+		}
+	} elsif (ref $oldval) {
+		return 0;
+	} elsif (ref $newval) {
+		return 0;
+	} else {
+		if (defined $oldval and defined $newval) {
+			return $oldval eq $newval;
+		} elsif (not defined $oldval and not defined $newval) {
+			return 1;
+		} else {
+			return 0;
+		}
+	}
+}
+
+1;
diff --git a/lib/WeBWorK/Utils/SortRecords.pm b/lib/WeBWorK/Utils/SortRecords.pm
new file mode 100644
index 0000000000..b6668fbd5e
--- /dev/null
+++ b/lib/WeBWorK/Utils/SortRecords.pm
@@ -0,0 +1,194 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/Utils/SortRecords.pm,v 1.7 2006/09/25 22:14:54 sh002i 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::Utils::SortRecords;
+use base qw(Exporter);
+
+=head1 NAME
+
+WeBWorK::Utils::SortRecords - utilities for sorting database records.
+
+=head1 SYNOPSIS
+
+ use WeBWorK::Utils::SortRecords qw/getSortsForClass/;
+ 
+ # get a list of sorts
+ my ($sortsRef, $sortLabelsRef) = getSortsForClass(ref $Users[0]);
+ my @sorts      = @$sortsRef;      # sort names
+ my %sortLabels = %$sortLabelsRef; # suitable for CGI's "-labels" parameter
+
+ use WeBWorK::Utils::SortRecords qw/sortRecords/;
+ 
+ # start with a list of records
+ my @Users = $db->getUsers($db->listUsers);
+ 
+ # sort the records using a preset
+ @SortedUsers = sortRecords({preset=>"lnfn"}, @Users);
+ 
+ # or provide a custom sort
+ @SortedUsers = sortRecords({fields=>[qw/section student_id/]}, @Users);
+
+=head1 DESCRIPTION
+
+This module provides record sorting functions, and a collection of preset sorts
+for the standard WeBWorK record classes. Sorts are specified by a list
+of field names. Sorts are performed lexicographically.
+
+=cut
+
+use strict;
+use warnings;
+use Carp;
+
+our @EXPORT    = ();
+our @EXPORT_OK = qw(
+	getSortsForClass
+	sortRecords
+);
+
+use constant PRESET_SORTS => {
+	"WeBWorK::DB::Record::User" => {
+		"lnfn" => {
+			name => "last name, first name",
+			fields => [ qw/last_name first_name/ ],
+		},
+	},
+};
+
+=head1 FUNCTIONS
+
+=over
+
+=item getSortsForClass($class)
+
+Given the name of a record class, returns the preset sorts available for that
+class.
+
+The return value consists of a two-element list. The first element is a
+reference to a list of sort names. The second element is a reference to a hash
+mapping sort names to string descriptions.
+
+Together, these two lists are suitable for passing to the C<-values> and
+C<-labels> parameters of several CGI module methods, i.e. popup_menu(),
+scrolling_list(), checkbox_group(), and radio_group().
+
+=cut
+
+sub getSortsForClass {
+	my ($class) = @_;
+	
+	my %class_presets = exists PRESET_SORTS->{$class} ? %{ PRESET_SORTS->{$class} } : ();
+	
+	my @field_order = $class->FIELDS;
+	my @preset_order = sort { $class_presets{$a}{name} cmp $class_presets{$b}{name} } keys %class_presets;
+	
+	my %fields = map { $_ => "Field: $_" } @field_order;
+	my %presets = map { $_ => "Preset: $class_presets{$_}{name}" } @preset_order;
+	
+	return ( [@field_order, @preset_order], {%fields, %presets} );
+}
+
+=item sortRecords(\%options, @Records)
+
+Given a sort specification (or the name of a preset format) and a list of
+records, returns a list of the same records in order according to the sort.
+
+%options can consist of either:
+
+ preset => the name of a preset format listed by getFormatsForClass()
+
+or:
+
+ fields => a reference to a list of fields in the records' class
+
+If C<preset> is given, and its value does not match any known preset but I<is>
+the name of a field in the record class, the records will be sorted by that
+field.
+
+If C<fields> is given, the records are sorted according to the specified fields.
+If multiple fields are specified, the second field is is consulted if two
+records are found to have identical first fields, and so on.
+
+=cut
+
+# DBFIXME sorting should happen in database (ORDER BY clause)
+# DBFIXME (but what about programmatic sorting, like intelligent setID sorting à la sortByName?)
+sub sortRecords {
+	my ($options, @Records) = @_;
+	
+	# nothing to do
+	return () unless @Records;
+	
+	# get class info (we assume that the records are all of the same type)
+	my $class = ref $Records[0];
+	my %class_fields = map { $_ => 1 } $class->FIELDS;
+	
+	my %options = %$options;
+	
+	if (exists $options{"preset"}) {
+		my $preset = $options{preset};
+		
+		if (exists PRESET_SORTS->{$class} and exists PRESET_SORTS->{$class}->{$preset}) {
+			# an explicit preset exists
+			# replace the contents of %options with the values from the preset
+			%options = %{ PRESET_SORTS->{$class}->{$preset} };
+		} elsif (exists $class_fields{$preset}) {
+			# it's the name of a field in the current class, in which case we treat it as
+			# a "fields" sort with a single field
+			%options = ( fields => [ $preset ] );
+		} else {
+			croak "preset \"$preset\" not found for class \"$class\"";
+		}
+	}
+	
+	if (exists $options{fields}) {
+		my @fields = @{ $options{fields} };
+		
+		# test for existence of fields in class
+		foreach my $field (@fields) {
+			croak "field \"$field\" is not a field in class \"$class\"" unless exists $class_fields{$field};
+		}
+		my $pack_key = sub { join "\0", map { lc $_[0]->$_ } @fields };
+		
+		# use the Orcish Maneuver to pack_key only once per record
+		keys my %or_cache = @Records; # set number of hash buckets
+		
+		return sort {
+			($or_cache{$a} ||= &$pack_key($a))
+				cmp
+			($or_cache{$b} ||= &$pack_key($b))
+		} @Records;
+	} else {
+		croak "sort type missing from options. specify one of: preset, fields";
+	}
+}
+
+=back
+
+=head1 BUGS
+
+No provision for case-insensitive, descending, or numeric sorting.
+
+No provision for programmatic sorts. While a one-time programmatic sort can be
+done easily without using this module, programmatic preset sorts would be
+useful, i.e. for intelligent sorting of set IDs.
+
+The fields being compared cannot contain nulls, because of the way packed keys
+are being generated.
+
+=cut
+
+1;
diff --git a/lib/WeBWorK/Utils/Tasks.pm b/lib/WeBWorK/Utils/Tasks.pm
new file mode 100644
index 0000000000..cba582f341
--- /dev/null
+++ b/lib/WeBWorK/Utils/Tasks.pm
@@ -0,0 +1,321 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# 
+# 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::Utils::Tasks;
+use base qw(Exporter);
+
+=head1 NAME
+
+WeBWorK::Utils::Tasks - utilities for doing single tasks, like rendering a
+problem by itself.
+
+=head1 SYNOPSIS
+
+ use WeBWorK::Utils::Tasks qw(renderProblems);
+
+=head1 DESCRIPTION
+
+This module provides functions for rendering html from files outside the normal
+context of being for a particular user in an existing problem set.
+
+It also provides functions which are useful for taking problems which are not
+part of any set and making live versions of them, or loading them into the
+editor.
+
+=cut
+
+# Ultimately, this may provide functions for turning problems into hardcopy or
+# other tasks that can be separated out of specific content managers.
+
+use strict;
+use warnings;
+use Carp;
+use WeBWorK::PG; 
+use WeBWorK::PG::ImageGenerator; 
+use WeBWorK::DB::Utils qw(global2user); 
+use WeBWorK::Form;
+
+our @EXPORT    = ();
+our @EXPORT_OK = qw(
+	renderProblems
+	fake_set
+	fake_set_version
+	fake_problem
+	fake_user
+);
+
+use constant fakeSetName => "Undefined_Set";
+use constant fakeUserName => "Undefined_User";
+
+=head1 FUNCTIONS
+
+=over
+
+=item fake_set
+
+ fake_set($db);
+
+Given a database, make a temporary problem set for that database.
+
+=cut
+
+sub fake_set { 
+	my $db = shift; 
+ 
+	my $set = $db->newGlobalSet(); 
+	$set = global2user($db->{set_user}->{record}, $set); 
+	$set->psvn(123); 
+	$set->set_id(fakeSetName); 
+	$set->open_date(time());
+	$set->due_date(time());
+	$set->answer_date(time());
+	$set->visible(0);
+	$set->enable_reduced_scoring(0);
+	$set->hardcopy_header("defaultHeader");
+	return($set); 
+} 
+
+sub fake_set_version { 
+	my $db = shift; 
+ 
+	my $set = $db->newSetVersion(); 
+	# $set = global2user($db->{set_user}->{record}, $set); 
+	$set->psvn(123); 
+	$set->set_id(fakeSetName); 
+	$set->open_date(time());
+	$set->due_date(time());
+	$set->answer_date(time());
+	$set->visible(0);
+	$set->enable_reduced_scoring(); 
+	$set->hardcopy_header("defaultHeader");
+	$set->version_id(1);
+	$set->attempts_per_version(0);
+	$set->problem_randorder(0);
+	$set->problems_per_page(0);
+	$set->hide_score('N');
+	$set->hide_score_by_problem('N');
+	$set->hide_work('N');
+	$set->restrict_ip('No');
+
+	return($set); 
+} 
+
+
+=item fake_problem
+
+ fake_problem($db);
+ fake_problem($db, problem_seed=>$seed);
+
+Make a temporary problem for the given database. If a problem seed is not
+specified, 0 is used.
+
+=cut
+
+sub fake_problem { 
+	my $db = shift; 
+	my %options = @_;
+	my $problem = $db->newGlobalProblem(); 
+	$problem = global2user($db->{problem_user}->{record}, $problem); 
+	$problem->set_id(fakeSetName); 
+	$problem->value(""); 
+	$problem->max_attempts("-1"); 
+ 
+	$problem->problem_seed(0); 
+	$problem->problem_seed($options{'problem_seed'})
+		 if(defined($options{'problem_seed'}));
+
+	$problem->status(0);
+	$problem->sub_status(0); 
+	$problem->attempted(0); 
+	$problem->last_answer(""); 
+	$problem->num_correct(0); 
+	$problem->num_incorrect(0); 
+	return($problem); 
+}
+
+=item fake_user
+
+ fake_user($db);
+
+Make a temporary user for the given database.
+
+=cut
+
+sub fake_user {
+	my ($db) = @_;
+	return $db->newUser(
+		user_id => fakeUserName,
+		first_name=>'',
+		last_name=>'',
+		email_address=>'',
+		student_id=>'',
+		section=>'',
+		recitation=>'',
+		comment=>'',
+	);
+}
+
+=item render_problems
+
+ render_problems(r => $r, user => $User, problem_list => \@problem_list);
+
+Given an Apache request object, the current user, and a list of problem files,
+return a list of WeBWorK::PG objects which contain rendered versions of the
+problems.
+
+Options:
+
+=over
+
+=item r
+
+A WeBWorK::Request object. Required.
+
+=item problem_list
+
+A reference to an array of items render. Required. Each item can either be a
+string, which is interpreted as a path to a PG file, or a reference to a string,
+which is interpreted as a complete PG program.
+
+=item user
+
+A User record (e.g. a WeBWorK::DB::Record::User object). Optional. If not
+specified, fake_user() will be used to generate a temporary user record.
+
+=item this_set
+
+A Set record (e.g. a WeBWorK::DB::Record::UserSet object). Optional. If not
+specified, fake_set() will be used to generate a temporary set record.
+
+=item problem_seed
+
+The seed to use for randomization. Optional. If not specified, the Request
+object will be checked for a problem_seed parameter. If found, that value is
+used. Otherwise, 0 is used.
+
+=item displayMode
+
+The display mode to use. Optional. If not specified, the Request object will be
+checked for a displayMode parameter. If found, that value is used. Otherwise,
+the default display mode is used.
+
+If the value is 'None', then problems will not be rendered and "fake"
+WeBWorK::PG objects will be returned. Each "fake" WeBWorK::PG object will look
+like:
+
+ {body_text=>''}
+
+=item showHints
+
+Whether to show hints in the problem. Optional. If not specified, hints are not
+shown.
+
+=item showSolutions
+
+Whether to show solutions in the problem. Optional. If not specified, solutions
+are not shown.
+
+=item problemNumber
+
+Each problem in @problem_list is given a problem ID starting with this value.
+Optional. If not specified the problems are numbered from 1.
+
+=back
+
+=cut
+
+sub renderProblems {
+	my %args = @_;
+	my $r = $args{r};
+	my $db = $r->db;
+	my $ce = $r->ce; 
+
+	# Don't print file names as part of the problem to avoid redundant 
+	# paths in Library Browser and Homework Sets editor
+	$ce->{pg}->{specialPGEnvironmentVars}->{PRINT_FILE_NAMES_FOR}=[];
+
+	my @problem_list = @{$args{problem_list}};
+	my $displayMode = $args{displayMode}
+    	|| $r->param('displayMode')
+		|| $ce->{pg}{options}{displayMode};
+	
+	# special case for display mode 'None' -- we don't have to do anything
+	# FIXME i think this should be handled in SetMaker.pm
+	if ($displayMode eq 'None') {
+		return map { {body_text=>''} } @problem_list;
+	}
+	
+	my $user = $args{user} || fake_user($db);
+	my $set = $args{'this_set'} || fake_set($db);
+	my $problem_seed = $args{'problem_seed'} || $r->param('problem_seed') || 0;
+	my $showHints = $args{showHints} || 0;
+	my $showSolutions = $args{showSolutions} || 0;
+	my $problemNumber = $args{'problem_number'} || 1;
+	
+	my $key = $r->param('key');
+	
+	# remove any pretty garbage around the problem
+	local $ce->{pg}{specialPGEnvironmentVars}{problemPreamble} = {TeX=>'',HTML=>''};
+	local $ce->{pg}{specialPGEnvironmentVars}{problemPostamble} = {TeX=>'',HTML=>''};
+	my $problem = fake_problem($db, 'problem_seed'=>$problem_seed);
+	my $formFields = { WeBWorK::Form->new_from_paramable($r)->Vars };
+	
+	my @output;
+	
+	foreach my $onefile (@problem_list) {
+		my $translationOptions = {
+			displayMode     => $displayMode,
+			showHints       => $showHints,
+			showSolutions   => $showSolutions,
+			refreshMath2img => 0,
+			processAnswers  => 0,
+		};
+		
+		$problem->problem_id($problemNumber++);
+		if (ref $onefile) {
+			$problem->source_file('');
+			$translationOptions->{r_source} = $onefile;
+		} else {
+			$problem->source_file($onefile);
+		}
+		
+		my $pg = new WeBWorK::PG(
+			$ce,
+			$user,
+			$key,
+			$set,
+			$problem,
+			123, # PSVN (practically unused in PG)
+			$formFields,
+			$translationOptions,
+        );
+
+		push @output, $pg;
+	}
+	
+	return @output;
+}
+
+=back
+
+=cut
+
+=head1 AUTHOR
+
+Written by John Jones, jj (at) asu.edu.
+
+=cut
+
+1;
diff --git a/lib/WebworkClient.pm b/lib/WebworkClient.pm
new file mode 100755
index 0000000000..945b722a27
--- /dev/null
+++ b/lib/WebworkClient.pm
@@ -0,0 +1,455 @@
+#!/usr/bin/perl -w
+
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WebworkClient.pm,v 1.1 2010/06/08 11:46:38 gage 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+=head1 NAME
+
+webwork2/clients/WebworkClient.pm
+
+This script will take a file and send it to a WeBWorK daemon webservice
+to have it rendered.  The result is split into the basic HTML rendering
+and evaluation of answers and then passed to a browser for printing.
+
+The formatting allows the browser presentation to be interactive with the 
+daemon running the script webwork2/lib/renderViaXMLRPC.pm
+
+Rembember to configure the local output file and display command !!!!!!!!
+
+=cut
+
+use strict;
+use warnings;
+
+
+# To configure the target webwork server
+# two URLs are required
+# 1. $XML_URL   http://test.webwork.maa.org/mod_xmlrpc
+#    points to the Webservice.pm and Webservice/RenderProblem modules
+#    Is used by the client to send the original XML request to the webservice
+#
+# 2. $FORM_ACTION_URL      http:http://test.webwork.maa.org/webwork2/html2xml
+#    points to the renderViaXMLRPC.pm module.
+#
+#     This url is placed as form action url when the rendered HTML from the original
+#     request is returned to the client from Webservice/RenderProblem. The client
+#     reorganizes the XML it receives into an HTML page (with a WeBWorK form) and 
+#     pipes it through a local browser.
+#
+#     The browser uses this url to resubmit the problem (with answers) via the standard
+#     HTML webform used by WeBWorK to the renderViaXMLRPC.pm handler.  
+#
+#     This renderViaXMLRPC.pm handler acts as an intermediary between the browser 
+#     and the webservice.  It interprets the HTML form sent by the browser, 
+#     rewrites the form data in XML format, submits it to the WebworkWebservice.pm 
+#     which processes it and sends the the resulting HTML back to renderViaXMLRPC.pm
+#     which in turn passes it back to the browser.
+# 3.  The second time a problem is submitted renderViaXMLRPC.pm receives the WeBWorK form 
+#     submitted directly by the browser.  
+#     The renderViaXMLRPC.pm translates the WeBWorK form, has it processes by the webservice
+#     and returns the result to the browser. 
+#     The The client renderProblem.pl script is no longer involved.
+# 4.  Summary: renderProblem.pl is only involved in the first round trip
+#     of the submitted problem.  After that the communication is  between the browser and
+#     renderViaXMLRPC using HTML forms and between renderViaXMLRPC and the WebworkWebservice.pm
+#     module using XML_RPC.
+
+
+our @COMMANDS = qw( listLibraries    renderProblem  ); #listLib  readFile tex2pdf 
+
+
+
+##################################################
+# XMLRPC client -- 
+# this code is identical between renderProblem.pl and renderViaXMLRPC.pm????
+##################################################
+
+package WebworkClient;
+
+#use Crypt::SSLeay;  # needed for https
+use XMLRPC::Lite;
+use MIME::Base64 qw( encode_base64 decode_base64);
+
+use constant  TRANSPORT_METHOD => 'XMLRPC::Lite';
+use constant  REQUEST_CLASS    => 'WebworkXMLRPC';  # WebworkXMLRPC is used for soap also!!
+use constant  REQUEST_URI      => 'mod_xmlrpc';
+
+sub new {
+	my $self = {
+		output   		=> '',
+		encodedSource 	=> '',
+		url             => '',
+		password        => '',
+		course          => '',
+		displayMode     => '',
+		inputs_ref      => {		 AnSwEr0001 => '',
+				 					 AnSwEr0002 => '',
+				 					 AnSwEr0003 => '',
+		},
+	};
+
+	bless $self;
+}
+
+
+our $result;
+
+##################################################
+# Utilities -- 
+#    this code is identical between renderProblem.pl and renderViaXMLRPC.pm
+##################################################
+
+sub xmlrpcCall {
+	my $self        = shift;
+	my $command = shift;
+	$command   = 'listLibraries' unless $command;
+
+	  my $requestResult = TRANSPORT_METHOD
+			-> proxy(($self->url).'/'.REQUEST_URI);
+		
+	  my $input = $self->setInputTable();
+	  local( $result);
+	  # use eval to catch errors
+	  eval { $result = $requestResult->call(REQUEST_CLASS.'.'.$command,$input) };
+	  if ($@) {
+	  	print STDERR "There were a lot of errors for $command\n" ;
+	  	print STDERR "Errors: \n $@\n End Errors\n" ;
+	  	return 0 #failure
+	  }
+	
+	  unless (ref($result) and $result->fault) {
+	  	my $rh_result = $result->result();
+	    #print STDERR pretty_print_rh($rh_result);
+		$self->{output} = $rh_result; #$self->formatRenderedProblem($rh_result);
+		return 1; # success
+
+	  } else {
+		$self->{output} = 'Error in xmlrpcCall to server: '. join( ",\n ",
+		  $result->faultcode,
+		  $result->faultstring);
+		return 0; #failure
+	  }
+}
+  
+sub encodeSource {
+	my $self = shift;
+	my $source = shift;
+	$self->{encodedSource} =encode_base64($source);
+}
+sub url {
+	my $self = shift;
+	my $new_url = shift;
+	$self->{url} = $new_url if defined($new_url) and $new_url =~ /\S/;
+	$self->{url};
+}
+sub pretty_print {    # provides html output -- NOT a method
+    my $r_input = shift;
+    my $level = shift;
+    $level = 4 unless defined($level);
+    $level--;
+    return '' unless $level > 0;  # only print three levels of hashes (safety feature)
+    my $out = '';
+    if ( not ref($r_input) ) {
+    	$out = $r_input if defined $r_input;    # not a reference
+    	$out =~ s/</&lt;/g  ;  # protect for HTML output
+    } elsif ("$r_input" =~/hash/i) {  # this will pick up objects whose '$self' is hash and so works better than ref($r_iput).
+	    local($^W) = 0;
+	    
+		$out .= "$r_input " ."<TABLE border = \"2\" cellpadding = \"3\" BGCOLOR = \"#FFFFFF\">";
+		
+		
+		foreach my $key ( sort ( keys %$r_input )) {
+			$out .= "<tr><TD> $key</TD><TD>=&gt;</td><td>&nbsp;".pretty_print($r_input->{$key}) . "</td></tr>";
+		}
+		$out .="</table>";
+	} elsif (ref($r_input) eq 'ARRAY' ) {
+		my @array = @$r_input;
+		$out .= "( " ;
+		while (@array) {
+			$out .= pretty_print(shift @array, $level) . " , ";
+		}
+		$out .= " )";
+	} elsif (ref($r_input) eq 'CODE') {
+		$out = "$r_input";
+	} else {
+		$out = $r_input;
+		$out =~ s/</&lt;/g; # protect for HTML output
+	}
+	
+	return $out." ";
+}
+
+sub setInputTable_for_listLib {
+	my $self = shift;
+	my $out = {
+		pw          =>   $self->{password},
+		set         =>   'set0',
+		library_name =>  'Library',
+		command      =>  'all',
+	};
+
+	$out;
+}
+sub setInputTable {
+	my $self = shift;
+	my $out = {
+		pw          =>   $self->{password},
+		library_name =>  'Library',
+		command      =>  'renderProblem',
+		answer_form_submitted   => 1,
+		course                  => $self->{course},
+		extra_packages_to_load  => [qw( AlgParserWithImplicitExpand Expr
+		                                ExprWithImplicitExpand AnswerEvaluator
+		                                AnswerEvaluatorMaker 
+		)],
+		mode                    => $self->{displayMode},
+		modules_to_evaluate     => [ qw( 
+Exporter
+DynaLoader								
+GD
+WWPlot
+Fun
+Circle
+Label								
+PGrandom
+Units
+Hermite
+List								
+Match
+Multiple
+Select							
+AlgParser
+AnswerHash							
+Fraction
+VectorField							
+Complex1
+Complex							
+MatrixReal1 Matrix							
+Distributions
+Regression
+
+		)], 
+		envir                   => $self->environment(),
+		problem_state           => {
+		
+			num_of_correct_ans  => 0,
+			num_of_incorrect_ans => 4,
+			recorded_score       => 1.0,
+		},
+		source                   => $self->{encodedSource},  #base64 encoded
+		
+		
+		
+	};
+
+	$out;
+}
+
+sub environment {
+	my $self = shift;
+	my $envir = {
+		answerDate  => '4014438528',
+		CAPA_Graphics_URL=>'http://webwork-db.math.rochester.edu/capa_graphics/',
+		CAPA_GraphicsDirectory =>'/ww/webwork/CAPA/CAPA_Graphics/',
+		CAPA_MCTools=>'/ww/webwork/CAPA/CAPA_MCTools/',
+		CAPA_Tools=>'/ww/webwork/CAPA/CAPA_Tools/',
+		cgiDirectory=>'Not defined',
+		cgiURL => 'foobarNot defined',
+		classDirectory=> 'Not defined',
+		courseName=>'Not defined',
+		courseScriptsDirectory=>'not defined',
+		displayMode=>$self->{displayMode},
+		dueDate=> '4014438528',
+		effectivePermissionLevel => 10,
+		externalGif2EpsPath=>'not defined',
+		externalPng2EpsPath=>'not defined',
+		externalTTHPath=>'/usr/local/bin/tth',
+		fileName=>'set0/prob1a.pg',
+		formattedAnswerDate=>'6/19/00',
+		formattedDueDate=>'6/19/00',
+		formattedOpenDate=>'6/19/00',
+		functAbsTolDefault=> 0.0000001,
+		functLLimitDefault=>0,
+		functMaxConstantOfIntegration=> 1000000000000.0,
+		functNumOfPoints=> 5,
+		functRelPercentTolDefault=> 0.000001,
+		functULimitDefault=>1,
+		functVarDefault=> 'x',
+		functZeroLevelDefault=> 0.000001,
+		functZeroLevelTolDefault=>0.000001,
+		htmlDirectory =>'not defined',
+		htmlURL =>'not defined',
+		inputs_ref => $self->{inputs_ref},
+		macroDirectory=>'not defined',
+		numAbsTolDefault=>0.0000001,
+		numFormatDefault=>'%0.13g',
+		numOfAttempts=> 0,
+		numRelPercentTolDefault => 0.0001,
+		numZeroLevelDefault =>0.000001,
+		numZeroLevelTolDefault =>0.000001,
+		openDate=> '3014438528',
+		permissionLevel =>10,
+		PRINT_FILE_NAMES_FOR => [ 'gage'],
+		probFileName => 'set0/prob1a.pg',
+		problemSeed  => 1234,
+		problemValue =>1,
+		probNum => 13,
+		psvn => 54321,
+		psvn=> 54321,
+		questionNumber => 1,
+		scriptDirectory => 'Not defined',
+		sectionName => 'Gage',
+		sectionNumber => 1,
+		server_root_url =>"foobarfoobar", 
+		sessionKey=> 'Not defined',
+		setNumber =>'not defined',
+		studentLogin =>'gage',
+		studentName => 'Mike Gage',
+		tempDirectory => 'not defined',
+		templateDirectory=>'not defined',
+		tempURL=>'not defined',
+		webworkDocsURL => 'not defined',
+		
+		showHints => 1,               # extra options -- usually passed from the input form
+		showSolutions => 1,
+		
+	};
+	$envir;
+};
+
+sub formatAnswerRow {
+	my $self = shift;
+	my $rh_answer = shift;
+	my $problemNumber = shift;
+	my $answerString  = $rh_answer->{original_student_ans}||'&nbsp;';
+	my $correctAnswer = $rh_answer->{correct_ans}||'';
+	my $ans_message   = $rh_answer->{ans_message}||'';
+	my $score         = ($rh_answer->{score}) ? 'Correct' : 'Incorrect';
+	my $row = qq{
+		<tr>
+		    <td>
+				Prob: $problemNumber
+			</td>
+			<td>
+				$answerString
+			</td>
+			<td>
+			    $score
+			</td>
+			<td>
+				Correct answer is $correctAnswer
+			</td>
+			<td>
+				<i>$ans_message</i>
+			</td>
+		</tr>\n
+	};
+	$row;
+}
+	
+sub formatRenderedProblem {
+	my $self 			  = shift;
+	my $rh_result         = $self->{output};  # wrap problem in formats
+	my $problemText       = decode_base64($rh_result->{text});
+	my $rh_answers        = $rh_result->{answers};
+	my $encodedSource     = $self->{encodedSource}||'foobar';
+	my $warnings          = '';
+	#################################################
+	# regular Perl warning messages generated with warn
+	#################################################
+
+	if ( defined ($rh_result->{WARNINGS}) and $rh_result->{WARNINGS} ){
+		$warnings = "<div style=\"background-color:pink\">
+		             <p >WARNINGS</p><p>".decode_base64($rh_result->{WARNINGS})."</p></div>";
+	}
+	#warn "keys: ", join(" | ", sort keys %{$rh_result });
+	
+	#################################################	
+	# PG debug messages generated with DEBUG_message();
+	#################################################
+	
+	my $debug_messages = $rh_result->{flags}->{DEBUG_messages} ||     [];
+    $debug_messages = join("<br/>\n", @{  $debug_messages }    );
+    
+	#################################################    
+	# PG warning messages generated with WARN_message();
+	#################################################
+
+    my $PG_warning_messages =  $rh_result->{flags}->{WARNING_messages} ||     [];
+    $PG_warning_messages = join("<br/>\n", @{  $PG_warning_messages }    );
+    
+	#################################################
+	# internal debug messages generated within PG_core
+	# these are sometimes needed if the PG_core warning message system
+	# isn't properly set up before the bug occurs.
+	# In general don't use these unless necessary.
+	#################################################
+
+    my $internal_debug_messages = $rh_result->{internal_debug_messages} || [];
+    $internal_debug_messages = join("<br/>\n", @{ $internal_debug_messages  } );
+	# collect answers
+	my $answerTemplate    = q{<hr>ANSWERS <table border="3" align="center">};
+	my $problemNumber     = 1;
+    foreach my $key (sort  keys %{$rh_answers}) {
+    	$answerTemplate  .= $self->formatAnswerRow($rh_answers->{$key}, $problemNumber++);
+    }
+	$answerTemplate      .= q{</table> <hr>};
+
+
+	my $XML_URL      = $self->url;
+	my $FORM_ACTION_URL  =  $self->{form_action_url};
+	my $problemTemplate = <<ENDPROBLEMTEMPLATE;
+
+
+<html>
+<head>
+<base href="$XML_URL">
+<title>$XML_URL WeBWorK Editor using host $XML_URL</title>
+</head>
+<body>
+<h2> WeBWorK Editor using host $XML_URL</h2>
+		    $answerTemplate
+		    <form action="$FORM_ACTION_URL" method="post">
+			$problemText
+	       <input type="hidden" name="answersSubmitted" value="1"> 
+	       <input type="hidden" name="problemAddress" value="probSource"> 
+	       <input type="hidden" name="problemSource" value="$encodedSource"> 
+	       <input type="hidden" name="problemSeed" value="1234"> 
+	       <input type="hidden" name="pathToProblemFile" value="foobar">
+	       <p><input type="submit" name="submit" value="submit answers"></p>
+	     </form>
+<HR>
+<h3> Perl warning section </h3>
+$warnings
+<h3> PG Warning section </h3>
+$PG_warning_messages;
+<h3> Debug message section </h3>
+$debug_messages
+<h3> internal errors </h3>
+$internal_debug_messages
+
+</body>
+</html>
+
+ENDPROBLEMTEMPLATE
+
+
+
+	$problemTemplate;
+}
+
+
+1;
diff --git a/lib/WebworkSOAP.pm b/lib/WebworkSOAP.pm
new file mode 100644
index 0000000000..d153c77f5a
--- /dev/null
+++ b/lib/WebworkSOAP.pm
@@ -0,0 +1,1177 @@
+package WebworkSOAP;
+
+use strict;
+
+use WeBWorK::Utils qw(pretty_print_rh);
+use WeBWorK::Utils::CourseManagement qw(addCourse renameCourse deleteCourse listCourses archiveCourse listArchivedCourses unarchiveCourse);
+use WeBWorK::DB;
+use WeBWorK::DB::Utils qw(initializeUserProblem);
+use WeBWorK::CourseEnvironment;
+use WeBWorK::ContentGenerator::Instructor;
+
+use WebworkSOAP::Classes::GlobalSet;
+use WebworkSOAP::Classes::UserSet;
+use WebworkSOAP::Classes::GlobalProblem;
+use WebworkSOAP::Classes::UserProblem;
+use WebworkSOAP::Classes::User;
+use WebworkSOAP::Classes::Key;
+use WebworkSOAP::Classes::Password;
+use WebworkSOAP::Classes::Permission;
+
+#init
+
+use constant {
+        SOAPERROR_MAJOR             => 1,
+        SOAPERROR_MINOR             => 2,
+        SOAPERROR_CLASS_NOT_FOUND   => 3,
+        SOAPERROR_USER_NOT_FOUND    => 4,
+        SOAPERROR_SET_NOT_FOUND     => 5,
+        SOAPERROR_PROBLEM_NOT_FOUND => 6,
+        SOAPERROR_KEY_NOT_FOUND     => 7,
+        SOAPERROR_AUTHEN_FAILED     => 8
+};
+
+our %SeedCE;
+%WebworkSOAP::SeedCE = %WeBWorK::SeedCE;
+
+$WebworkSOAP::SeedCE{soap_authen_key} = "123456789123456789";
+#$WebworkSOAP::SeedCE{webwork_dir} = $ENV{WEBWORK_ROOT}|| warn "\$ENV{WEBWORK_ROOT} is undefined -- check your httpd configuration. Error caught ";
+
+
+sub new {
+    my($self,$authenKey,$courseName) = @_;
+    $self = {};
+    #Construct Course
+    my $ce = eval { new WeBWorK::CourseEnvironment({%SeedCE, courseName => $courseName }) };
+    $@ and soap_fault_major("Course Environment cannot be constructed.<br>$@");
+    #Authentication Check
+    if($ce->{soap_authen_key} != $authenKey) {
+        soap_fault_authen();
+    }
+    #Construct DB handle
+    my $db = eval { new WeBWorK::DB($ce->{dbLayout}); };
+    $@ and soap_fault_major("Failed to initialize database handle.<br>$@");
+    $self->{db} = $db;
+    $self->{ce} = $ce;
+    bless $self;
+    return $self;
+}
+
+sub array_to_soap_string {
+	my @array = @_;
+	@array = map { SOAP::Data->type( 'string', $_ ) } @array;
+	return \@array;
+}
+
+sub soap_fault_authen {
+    die SOAP::Fault->faultcode(SOAPERROR_AUTHEN_FAILED)
+                    ->faultstring("SOAP Webservice Authentication Failed!");
+}
+
+sub soap_fault {
+    my ($errorCode,$errorMsg) = @_;
+    die SOAP::Fault->faultcode($errorCode)
+                   ->faultstring($errorMsg);
+}
+
+sub soap_fault_major {
+    my ($errorMsg) = @_;
+    soap_fault(SOAPERROR_MAJOR,$errorMsg);
+}
+####################################################################################
+#SOAP CALLABLE FUNCTIONS
+####################################################################################
+
+=pod
+=begin WSDL
+_RETURN $string Hello World!
+=cut
+sub hello {
+    return "Hello world!";
+}
+
+#################################################
+#Course
+#################################################
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_RETURN @string
+=end WSDL
+=cut
+sub list_courses {
+    my ($self,$authenKey) = @_;
+    my $ce = eval { new WeBWorK::CourseEnvironment({%WeBWorK::SeedCE })};
+    $@ and soap_fault_major("Internal Course Environment cannot be constructed.");
+    if($authenKey != $WebworkSOAP::SeedCE{soap_authen_key}) {
+        soap_fault_authen;
+    }
+    $@ and soap_fault_major("Course Environment cannot be constructed.");
+    my @test = listCourses($ce);
+    return array_to_soap_string( @test );
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN userID $string
+_RETURN $string
+=end WSDL
+=cut
+sub login_user {
+    my ($self,$authenKey,$courseName,$userID) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my $newKey;
+    my $timestamp = time;
+    my @chars = @{ $soapEnv->{ce}->{sessionKeyChars} };
+    my $length = $soapEnv->{ce}->{sessionKeyLength};
+    srand;
+    $newKey = join ("", @chars[map rand(@chars), 1 .. $length]);
+    my $Key = $soapEnv->{db}->newKey(user_id=>$userID, key=>$newKey, timestamp=>$timestamp);
+    eval { $soapEnv->{db}->deleteKey($userID) };
+    eval { $soapEnv->{db}->addKey($Key) };
+    $@ and soap_fault(SOAPERROR_USER_NOT_FOUND,"User not found.");
+    return SOAP::Data->type( 'string', $newKey );
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN userID $string
+_IN setID $string
+_RETURN $string
+=end WSDL
+=cut
+sub assign_set_to_user {
+    my ($self,$authenKey,$courseName,$userID,$setID) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my $GlobalSet = eval {$soapEnv->{db}->getGlobalSet($setID)};
+    $@ and soap_fault(SOAPERROR_SET_NOT_FOUND,"Set not found.");
+    my $setID = $GlobalSet->set_id;
+    my $db = $soapEnv->{db};
+    my $UserSet = $db->newUserSet;
+    $UserSet->user_id($userID);
+    $UserSet->set_id($setID);
+    my @results;
+    my $set_assigned = 0;
+    eval { $db->addUserSet($UserSet) };
+    if ($@) {
+    	if ($@ =~ m/user set exists/) {
+	    	push @results, "set $setID is already assigned to user $userID.";
+	    	$set_assigned = 1;
+    	} else {
+        	die $@;
+        }
+    }
+
+    my @GlobalProblems = grep { defined $_ } $db->getAllGlobalProblems($setID);
+    foreach my $GlobalProblem (@GlobalProblems) {
+        my $seed = int( rand( 2423) ) + 36;
+        my $UserProblem = $db->newUserProblem;
+	$UserProblem->user_id($userID);
+	$UserProblem->set_id($GlobalProblem->set_id);
+	$UserProblem->problem_id($GlobalProblem->problem_id);
+	initializeUserProblem($UserProblem, $seed);
+	eval { $db->addUserProblem($UserProblem) };
+    }
+    return array_to_soap_string( @results ); #FIXME WSDL says $string, not @string?
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN userIDs @string
+_IN setID $string
+_RETURN @string
+=end WSDL
+=cut
+sub grade_users_sets {
+    my ($self,$authenKey,$courseName,$userIDs,$setID) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my @grades;
+    #open (LOG, ">>/opt/webwork/tmp_log") or die "Can't open log file";
+    #print LOG "\n\nhi there\n\n";
+
+    my $db = $soapEnv->{db};
+    foreach my $userID (@{$userIDs}) {
+#         my @problemData = $soapEnv->{db}->getAllMergedUserProblems($userID,$setID);
+#         
+#         my $grade = 0;
+#         for(my $i=0;$i<@problemData;$i++) {
+#                 #print LOG "$userID problem Data",join(" ", %{$problemData[$i]}),"\n\n";
+#                 $grade += ($problemData[$i]->status)*($problemData[$i]->value);
+#                 #print LOG "grade is $grade\n";
+#         }
+            #print LOG "grade_users_sets: get user $userID set $setID\n";
+         	my $grade = get_wwassignment_grade_for_one_user($db, $userID,$setID );
+         	#print LOG " grade is $grade \n\n";
+        push(@grades,$grade);
+    }
+    #close(LOG);
+    return array_to_soap_string( @grades );
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN setID $string
+_RETURN $WebworkSOAP::Classes::GlobalSet
+=end WSDL
+=cut
+sub get_set_data {
+    my ($self,$authenKey,$courseName,$setID) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my $setData = $soapEnv->{db}->getGlobalSet($setID);
+    if(not defined $setData) {
+        return -1;
+    }
+    my $set = new WebworkSOAP::Classes::GlobalSet($setData);
+    return $set;
+}
+
+####################################################################
+##FUNCTIONS DIRECTLY MAPPED TO FUNCTIONS IN DB.pm
+####################################################################
+###############################################
+##Password
+###############################################
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN record $WebworkSOAP::Classes::Password
+_RETURN $string
+=end WSDL
+=cut
+sub add_password {
+    my ($self,$authenKey,$courseName,$record) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my $newPassword = $soapEnv->{db}->newPassword;
+    %$newPassword = %$record;
+    return SOAP::Data->type( 'string', $soapEnv->{db}->addPassword($newPassword) );
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN record $WebworkSOAP::Classes::Password
+_RETURN $string
+=end WSDL
+=cut
+sub put_password {
+    my ($self,$authenKey,$courseName,$record) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    return SOAP::Data->type( 'string', $soapEnv->{db}->putPassword($record) );
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_RETURN @string
+=end WSDL
+=cut
+sub list_password {
+    my ($self,$authenKey,$courseName) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my @tempArray = $soapEnv->{db}->listPasswords;
+    return array_to_soap_string( @tempArray );
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN userIDs @string
+_RETURN @WebworkSOAP::Classes::Password Array of user objects
+=end WSDL
+=cut
+sub get_passwords {
+    my ($self,$authenKey,$courseName,$userIDs) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my @passwordData = $soapEnv->{db}->getPasswords(@$userIDs);
+    my @passwords;
+    for(my $i=0;$i<@passwordData;$i++) {
+        push(@passwords,new WebworkSOAP::Classes::Password(@passwordData[$i]));
+    }
+    return \@passwords;
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN userID $string
+_RETURN $WebworkSOAP::Classes::Password of names objects.
+=end WSDL
+=cut
+sub get_password {
+    my ($self,$authenKey,$courseName,$userID) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my $passwordData = $soapEnv->{db}->getPassword($userID);
+    if(not defined $passwordData) {
+        return -1;
+    }
+    my $password = new WebworkSOAP::Classes::Password($passwordData);
+    return ($password);
+}
+
+##################################################
+##Permission
+##################################################
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN record $WebworkSOAP::Classes::Permission
+_RETURN $string
+=end WSDL
+=cut
+sub add_permission {
+    my ($self,$authenKey,$courseName,$record) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my $newPermissionLevel = $soapEnv->{db}->newPermissionLevel;
+    %$newPermissionLevel = %$record;
+    return SOAP::Data->type( 'string', $soapEnv->{db}->addPermissionLevel($newPermissionLevel) );
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN record $WebworkSOAP::Classes::Permission
+_RETURN $string
+=end WSDL
+=cut
+sub put_permission {
+    my ($self,$authenKey,$courseName,$record) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my $newPermissionLevel = $soapEnv->{db}->newPermissionLevel;
+    %$newPermissionLevel = %$record;
+    return SOAP::Data->type( 'string',
+        $soapEnv->{db}->putPermissionLevel($newPermissionLevel) );
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_RETURN @string
+=end WSDL
+=cut
+sub list_permissions {
+    my ($self,$authenKey,$courseName) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my @tempArray = $soapEnv->{db}->listPermissionLevels;
+    return array_to_soap_string( @tempArray );
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN userIDs @string
+_RETURN @WebworkSOAP::Classes::Permission Array of user objects
+=end WSDL
+=cut
+sub get_permissions {
+    my ($self,$authenKey,$courseName,$userIDs) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my @permissionData = $soapEnv->{db}->getPermissionLevels(@$userIDs);
+    my @permissions;
+    for(my $i=0;$i<@permissionData;$i++) {
+        push(@permissions,new WebworkSOAP::Classes::Permission(@permissionData[$i]));
+    }
+    return \@permissions;
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN userID $string
+_RETURN $WebworkSOAP::Classes::Permission of names objects.
+=end WSDL
+=cut
+sub get_permission {
+    my ($self,$authenKey,$courseName,$userID) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my $permissionData = $soapEnv->{db}->getPermissionLevel($userID);
+    if(not defined $permissionData) {
+        return -1;
+    }
+    my $permission = new WebworkSOAP::Classes::Permission($permissionData);
+    return ($permission);
+}
+
+##################################################
+##Key
+##################################################
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN record $WebworkSOAP::Classes::Key
+_RETURN $string
+=end WSDL
+=cut
+sub add_key {
+    my ($self,$authenKey,$courseName,$record) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my $newKey = $soapEnv->{db}->newKey;
+    %$newKey = %$record;
+    return SOAP::Data->type( 'string', $soapEnv->{db}->addKey($newKey) );
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN record $WebworkSOAP::Classes::Key
+_RETURN $string
+=end WSDL
+=cut
+sub put_key {
+    my ($self,$authenKey,$courseName,$record) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    return SOAP::Data->type( 'string', $soapEnv->{db}->putKey($record) );
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_RETURN @string
+=end WSDL
+=cut
+sub list_keys {
+    my ($self,$authenKey,$courseName) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my @tempArray = $soapEnv->{db}->listKeys;
+    return array_to_soap_string( @tempArray );
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN userIDs @string
+_RETURN @WebworkSOAP::Classes::Key Array of user objects
+=end WSDL
+=cut
+sub get_keys {
+    my ($self,$authenKey,$courseName,$userIDs) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my @keyData = $soapEnv->{db}->getKeys(@$userIDs);
+    my @keys;
+    for(my $i=0;$i<@keyData;$i++) {
+        push(@keys,new WebworkSOAP::Classes::Key(@keyData[$i]));
+    }
+    return \@keys;
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN userID $string
+_RETURN $WebworkSOAP::Classes::Key of names objects.
+=end WSDL
+=cut
+sub get_key {
+    my ($self,$authenKey,$courseName,$userID) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my $keyData = $soapEnv->{db}->getKey($userID);
+    if(not defined $keyData) {
+        return -1;
+    }
+    my $key = new WebworkSOAP::Classes::Key($keyData);
+    return ($key);
+}
+
+##################################################
+##User
+##################################################
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN record $WebworkSOAP::Classes::User
+_RETURN $string
+=end WSDL
+=cut
+sub add_user {
+    my ($self,$authenKey,$courseName,$record) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my $newUser = $soapEnv->{db}->newUser;
+    %$newUser = %$record;
+    return SOAP::Data->type( 'string', $soapEnv->{db}->addUser($newUser) );
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN record $WebworkSOAP::Classes::User
+_RETURN $string
+=end WSDL
+=cut
+sub put_user {
+    my ($self,$authenKey,$courseName,$record) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    return SOAP::Data->type( 'string', $soapEnv->{db}->putUser($record) );
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_RETURN @string of names objects.
+=end WSDL
+=cut
+sub list_users {
+    my ($self,$authenKey,$courseName) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my @tempArray = $soapEnv->{db}->listUsers;
+    return array_to_soap_string( @tempArray );
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN userID $string
+_RETURN $WebworkSOAP::Classes::User of names objects.
+=end WSDL
+=cut
+sub get_user {
+    my ($self,$authenKey,$courseName,$userID) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my $userData = $soapEnv->{db}->getUser($userID);
+    if(not defined $userData) {
+        return -1;
+    }
+    my $user = new WebworkSOAP::Classes::User($userData);
+    return ($user);
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN userIDs @string
+_RETURN @WebworkSOAP::Classes::User Array of user objects
+=end WSDL
+=cut
+sub get_users {
+    my ($self,$authenKey,$courseName,$userIDs) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my @userData = $soapEnv->{db}->getUsers(@$userIDs);
+    my @users;
+    for(my $i=0;$i<@userData;$i++) {
+        push(@users,new WebworkSOAP::Classes::User(@userData[$i]));
+    }
+    return \@users;
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN userID $string
+_RETURN $string
+=end WSDL
+=cut
+sub delete_user {
+    my ($self,$authenKey,$courseName,$userID) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    return SOAP::Data->type( 'string', $soapEnv->{db}->deleteUser($userID) );
+}
+
+##################################################
+##Global Sets
+##################################################
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN record $WebworkSOAP::Classes::GlobalSet
+_RETURN $string
+=end WSDL
+=cut
+sub add_global_set {
+    my ($self,$authenKey,$courseName,$record) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my $newGlobalSet = $soapEnv->{db}->newGlobalSet;
+    %$newGlobalSet = %$record;
+    return SOAP::Data->type( 'string', $soapEnv->{db}->addGlobalSet($newGlobalSet) );
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN record $WebworkSOAP::Classes::GlobalSet
+_RETURN $string
+=end WSDL
+=cut
+sub put_global_set {
+    my ($self,$authenKey,$courseName,$record) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    return SOAP::Data->type( 'string', $soapEnv->{db}->putGlobalSet($record) );
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_RETURN @string of names objects.
+=end WSDL
+=cut
+sub list_global_sets {
+    my ($self,$authenKey,$courseName) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my @tempArray = $soapEnv->{db}->listGlobalSets;
+    return array_to_soap_string( @tempArray );
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_RETURN @WebworkSOAP::Classes::GlobalSet Array of user objects
+=end WSDL
+=cut
+sub get_all_global_sets {
+    my ($self,$authenKey,$courseName) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my @tempArray = $soapEnv->{db}->listGlobalSets;
+    my @setData = $soapEnv->{db}->getGlobalSets(@tempArray);
+    my @sets;
+    for(my $i=0;$i<@setData;$i++) {
+        push(@sets,new WebworkSOAP::Classes::GlobalSet(@setData[$i]));
+    }
+    return \@sets;
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN setIDs @string
+_RETURN @WebworkSOAP::Classes::GlobalSet Array of user objects
+=end WSDL
+=cut
+sub get_global_sets {
+    my ($self,$authenKey,$courseName,$setIDs) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my @setData = $soapEnv->{db}->getGlobalSets(@$setIDs);
+    my @sets;
+    for(my $i=0;$i<@setData;$i++) {
+        push(@sets,new WebworkSOAP::Classes::GlobalSet(@setData[$i]));
+    }
+    return \@sets;
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN setID $string
+_RETURN $WebworkSOAP::Classes::GlobalSet
+=end WSDL
+=cut
+sub get_global_set {
+    my ($self,$authenKey,$courseName,$setID) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my $setData = $soapEnv->{db}->getGlobalSet($setID);
+    if(not defined $setData) {
+        return -1;
+    }
+    my $set = new WebworkSOAP::Classes::GlobalSet($setData);
+    return ($set);
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN setID $string
+_RETURN $string
+=end WSDL
+=cut
+sub delete_global_set {
+    my ($self,$authenKey,$courseName,$setID) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    return SOAP::Data->type( 'string', $soapEnv->{db}->deleteGlobalSet($setID) );
+}
+
+##################################################
+##Global Problems
+##################################################
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN record $WebworkSOAP::Classes::GlobalProblem
+_RETURN $string
+=end WSDL
+=cut
+sub add_global_problem {
+    my ($self,$authenKey,$courseName,$record) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my $newGlobalProblem = $soapEnv->{db}->newGlobalProblem;
+    %$newGlobalProblem = %$record;
+    return SOAP::Data->type( 'string', $soapEnv->{db}->addGlobalProblem($newGlobalProblem) );
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN record $WebworkSOAP::Classes::GlobalProblem
+_RETURN $string
+=end WSDL
+=cut
+sub put_global_problem {
+    my ($self,$authenKey,$courseName,$record) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    return SOAP::Data->type( 'string', $soapEnv->{db}->putGlobalProblem($record) );
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN setID $string
+_RETURN @string of names objects.
+=end WSDL
+=cut
+sub list_global_problems {
+    my ($self,$authenKey,$courseName,$setID) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my @tempArray = $soapEnv->{db}->listGlobalProblems($setID);
+    return array_to_soap_string( @tempArray );
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN setID $string
+_RETURN @WebworkSOAP::Classes::GlobalProblem Array of user objects
+=end WSDL
+=cut
+sub get_all_global_problems {
+    my ($self,$authenKey,$courseName,$setID) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my @problemData = $soapEnv->{db}->getAllGlobalProblems($setID);
+    my @problems;
+    for(my $i=0;$i<@problemData;$i++) {
+        push(@problems,new WebworkSOAP::Classes::GlobalProblem(@problemData[$i]));
+    }
+    return \@problems;
+}
+
+=pod
+=begin
+_IN authenKey $string
+_IN courseName $string
+_IN problemIDs @string An array reference: [userID setID problemID]
+_RETURN @WebworkSOAP::Classes::GlobalProblem Array of user objects
+=end WSDL
+=cut
+sub get_global_problems {
+    my ($self,$authenKey,$courseName,$problemIDs) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my @problemData = $soapEnv->{db}->getGlobalProblems(@$problemIDs);
+    my @problems;
+    for(my $i=0;$i<@problemData;$i++) {
+        push(@problems,new WebworkSOAP::Classes::GlobalProblem(@problemData[$i])); #FIXME $problemData[$i]? 
+    }
+    return \@problems;
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN setID $string
+_IN problemID $string
+_RETURN $WebworkSOAP::Classes::GlobalProblem of names objects.
+=end WSDL
+=cut
+sub get_global_problem {
+    my ($self,$authenKey,$courseName,$setID,$problemID) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my $problemData = $soapEnv->{db}->getGlobalProblem($setID,$problemID);
+    if(not defined $problemData) {
+        return -1;
+    }
+    my $problem = new WebworkSOAP::Classes::GlobalProblem($problemData);
+    return ($problem);
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN setID $string
+_IN problemID $string
+_RETURN $string
+=end WSDL
+=cut
+sub delete_global_problem {
+    my ($self,$authenKey,$courseName,$setID,$problemID) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    return SOAP::Data->type( 'string', $soapEnv->{db}->deleteGlobalProblem($setID,$problemID) );
+}
+
+##################################################
+##USER PROBLEM
+##################################################
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN record $WebworkSOAP::Classes::UserProblem
+_RETURN $string
+=end WSDL
+=cut
+sub add_user_problem {
+    my ($self,$authenKey,$courseName,$record) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my $newUserProblem = $soapEnv->{db}->newUserProblem;
+    %$newUserProblem = %$record;
+    return SOAP::Data->type( 'string', $soapEnv->{db}->addUserProblem($newUserProblem) );
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN record $WebworkSOAP::Classes::UserProblem
+_RETURN $string
+=end WSDL
+=cut
+sub put_user_problem {
+    my ($self,$authenKey,$courseName,$record) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    return SOAP::Data->type( 'string', $soapEnv->{db}->putUserProblem($record) );
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN userID $string
+_IN setID $string
+_RETURN @string of names objects.
+=end WSDL
+=cut
+sub list_user_problems {
+    my ($self,$authenKey,$courseName,$userID,$setID) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my @tempArray = $soapEnv->{db}->listUserProblems($userID,$setID);
+    return array_to_soap_string( @tempArray );
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN userID $string
+_IN setID $string
+_RETURN @WebworkSOAP::Classes::UserProblem of names objects.
+=end WSDL
+=cut
+sub get_all_user_problems {
+    my ($self,$authenKey,$courseName,$userID,$setID) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my @problemData = $soapEnv->{db}->getAllUserProblems($userID,$setID);
+    my @problems;
+    for(my $i=0;$i<@problemData;$i++) {
+        push(@problems,new WebworkSOAP::Classes::UserProblem(@problemData[$i]));
+    }
+    return \@problems;
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN userProblemIDs @string A 3 element array: { user_ID, setID, problemID }
+_RETURN @WebworkSOAP::Classes::UserProblem of names objects.
+=end WSDL
+=cut
+sub get_user_problems {
+    my ($self,$authenKey,$courseName,$userProblemIDs) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my @problemData = $soapEnv->{db}->getUserProblems(@$userProblemIDs);
+    my @problems;
+    for(my $i=0;$i<@problemData;$i++) {
+        push(@problems,new WebworkSOAP::Classes::UserProblem(@problemData[$i]));
+    }
+    return \@problems;
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN userID $string
+_IN setID $string
+_IN problemID $string
+_RETURN $WebworkSOAP::Classes::UserProblem of names objects.
+=end WSDL
+=cut
+sub get_user_problem {
+    my ($self,$authenKey,$courseName,$userID,$setID,$problemID) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my $problemData = $soapEnv->{db}->getUserProblem($userID,$setID,$problemID);
+    if(not defined $problemData) {
+        return -1;
+    }
+    my $problem = new WebworkSOAP::Classes::UserProblem($problemData);
+    return ($problem);
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN userID $string
+_IN setID $string
+_IN problemID $string
+_RETURN $string
+=end WSDL
+=cut
+sub delete_user_problem {
+    my ($self,$authenKey,$courseName,$userID,$setID,$problemID) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    return SOAP::Data->type( 'string', $soapEnv->{db}->deleteUserProblem($userID,$setID,$problemID) );
+}
+
+##################################################
+##USER SET
+##################################################
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN record $WebworkSOAP::Classes::UserSet
+_RETURN $string
+=end WSDL
+=cut
+sub add_user_set {
+    my ($self,$authenKey,$courseName,$record) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my $newUserSet = $soapEnv->{db}->newUserSet;
+    %$newUserSet = %$record;
+    return SOAP::Data->type( 'string', $soapEnv->{db}->addUserSet($newUserSet) );
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN record $WebworkSOAP::Classes::UserSet
+_RETURN $string
+=end WSDL
+=cut
+sub put_user_set {
+    my ($self,$authenKey,$courseName,$record) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    return SOAP::Data->type( 'string', $soapEnv->{db}->addUserSet($record) );
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN userID $string
+_RETURN @string of names objects.
+=end WSDL
+=cut
+sub list_user_sets {
+    my ($self,$authenKey,$courseName,$userID) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my @tempArray = $soapEnv->{db}->listUserSets($userID);
+    return array_to_soap_string( @tempArray );
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_RETURN @WebworkSOAP::Classes::UserSet of names objects.
+=end WSDL
+=cut
+sub get_all_user_sets {
+    my ($self,$authenKey,$courseName) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my @setData = $soapEnv->{db}->getAllUserSets();
+    my @sets;
+    for(my $i=0;$i<@setData;$i++) {
+        push(@sets,new WebworkSOAP::Classes::UserSet(@setData[$i]));
+    }
+    return \@sets;
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN userSetIDs $string
+_RETURN @WebworkSOAP::Classes::UserSet of names objects.
+=end WSDL
+=cut
+sub get_user_sets {
+    my ($self,$authenKey,$courseName,$userSetIDs) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my @setData = $soapEnv->{db}->getUserSets(@$userSetIDs);
+    my @sets;
+    for(my $i=0;$i<@setData;$i++) {
+        push(@sets,new WebworkSOAP::Classes::UserSet(@setData[$i]));
+    }
+    return \@sets;
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN userID $string
+_IN setID $string
+_RETURN $WebworkSOAP::Classes::UserSet of names objects.
+=end WSDL
+=cut
+sub get_user_set {
+    my ($self,$authenKey,$courseName,$userID,$setID) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    my $setData = $soapEnv->{db}->getUserSet($userID,$setID);
+    if(not defined $setData) {
+        return -1;
+    }
+    my $set = new WebworkSOAP::Classes::UserSet($setData);
+    return $set;
+}
+
+=pod
+=begin WSDL
+_IN authenKey $string
+_IN courseName $string
+_IN userID $string
+_IN setID $string
+_RETURN $string
+=end WSDL
+=cut
+sub delete_user_set {
+    my ($self,$authenKey,$courseName,$userID,$setID) = @_;
+    my $soapEnv = new WebworkSOAP($authenKey,$courseName);
+    return SOAP::Data->type( 'string', $soapEnv->{db}->deleteUserSet($userID,$setID) );
+}
+
+
+###########################################
+# grading utilties -- to be moved to Utils::Grades
+############################################
+
+############################################
+# get_wwassignment_grade_for_one ($db $userID $setID);
+#input  $userID, $setID (or a UserSet record)?
+#output set grade for a homework problem or maximum grade for a gateway problem with several set versions
+############################################
+sub get_wwassignment_grade_for_one_user{
+	my($db, $userID, $setID) = @_;
+	my $user_set = $db->getMergedSet($userID,$setID);
+	print LOG "user $userID set $setID user_set ".ref($user_set)."\n";
+	return " " unless ref($user_set);  # return a blank grade if there is no user_set
+	warn " user $userID $setID ".ref($user_set)."\n";
+	my $setIsVersioned = ( defined($user_set->assignment_type) && $user_set->assignment_type =~ /gateway/)?1:0;
+	my @setVersions=();
+	if ( $setIsVersioned ) { 
+		my @vList = $db->listSetVersions($userID,$setID);
+		# we have to have the merged set versions to 
+		#    know what each of their assignment types 
+		#    are (because proctoring can change)
+		@setVersions = $db->getMergedSetVersions( map {[$userID, $setID, $_]} @vList );
+
+		# add the set versions to our list of sets
+# 		foreach ( @setVersions ) { 
+# 			$setsByID{$_->set_id . ",v" . $_->version_id} = $_; 
+# 		}
+# 		# flag the existence of set versions for this set
+# 		$setVersionsByID{$setName} = [ @vList ];
+# 		# and save the set names for display
+# 		push( @allSetIDs, $setName );
+# 		push( @allSetIDs, map { "$setName,v$_" } @vList );
+
+	} else {
+# 		push( @allSetIDs, $setName );
+# 		$setVersionsByID{$setName} = "None";
+	}
+	my $grade;
+	if ($setIsVersioned) {
+		if (@setVersions) {
+		    $grade =0;
+		    foreach my $setVersion (@setVersions) {  # get highest grade among versions
+				#print LOG "getting set $userID $setID version:".ref($setVersion)."\n";
+				my $current_grade = get_set_grade_for_UserSet($db, $setVersion);
+				$grade = $current_grade if $current_grade > $grade;
+				
+			}
+				
+		} else {
+			$grade = " ";
+		}
+	} else {  # not versioned
+	    $grade = get_set_grade_for_UserSet($db, $user_set);	
+	}
+	$grade;   # return grade
+}
+	
+############################################
+# get_set_grade_for_UserSet ($db, $user_set);
+#input  $userID, $setID (UserSet record);
+#output set grade for a homework problem or a single  set version of a gateway quiz
+############################################
+
+sub get_set_grade_for_UserSet{
+	my $db = shift;
+	my $user_set = shift;
+	warn "get_set_grade_for_UserSet(db, user_set); an argument is missing db: $db user_set $user_set" 
+	    unless ref($db) =~ /DB/  and ref($user_set) =~/Set/;
+	my $setIsVersioned = ( defined( $user_set->assignment_type() ) 
+	     && $user_set->assignment_type() =~ /gateway/ )? 1:0;
+	my @problemData=();
+	print LOG "get_set_grade_for_UserSet: getting set ".$user_set->set_id." "." for ".$user_set->user_id."\n";
+	if ($setIsVersioned) {	
+		@problemData = $db->getAllMergedProblemVersions( $user_set->user_id, $user_set->set_id, $user_set->version_id ) if $user_set->can('version_id');
+	} else {
+		@problemData = $db->getAllMergedUserProblems($user_set->user_id, $user_set->set_id);
+	}
+        
+        my $grade = 0;
+        for(my $i=0;$i<@problemData;$i++) {
+                #print LOG "$userID problem Data",join(" ", %{$problemData[$i]}),"\n\n";
+                $grade += ($problemData[$i]->status)*($problemData[$i]->value);
+                #print LOG "grade is $grade\n";
+        }
+	return $grade;
+}
+1;
diff --git a/lib/WebworkSOAP/Classes/Course.pm b/lib/WebworkSOAP/Classes/Course.pm
new file mode 100644
index 0000000000..753513a473
--- /dev/null
+++ b/lib/WebworkSOAP/Classes/Course.pm
@@ -0,0 +1,3 @@
+package WebworkSOAP::Classes::Course;
+
+1;
diff --git a/lib/WebworkSOAP/Classes/GlobalProblem.pm b/lib/WebworkSOAP/Classes/GlobalProblem.pm
new file mode 100644
index 0000000000..f6ad48fcd3
--- /dev/null
+++ b/lib/WebworkSOAP/Classes/GlobalProblem.pm
@@ -0,0 +1,23 @@
+package WebworkSOAP::Classes::GlobalProblem;
+=pod
+=begin WSDL
+        _ATTR set_id        $string set_id
+        _ATTR problem_id    $string problem_id
+        _ATTR source_file   $string source_file
+        _ATTR value         $string value
+        _ATTR max_attempts  $string max_attempts
+=cut
+sub new {
+    my $self = shift;
+    my $data = shift;
+    $self = {};
+    $self->{set_id} = SOAP::Data->type( 'string', $data->set_id );
+    $self->{problem_id} = SOAP::Data->type( 'string', $data->problem_id );
+    $self->{source_file} = SOAP::Data->type( 'string', $data->source_file );
+    $self->{value} = SOAP::Data->type( 'string', $data->value );
+    $self->{max_attempts} = SOAP::Data->type( 'string', $data->max_attempts );
+    bless $self;
+    return $self;
+}
+
+1;
diff --git a/lib/WebworkSOAP/Classes/GlobalSet.pm b/lib/WebworkSOAP/Classes/GlobalSet.pm
new file mode 100644
index 0000000000..ffe4f1791e
--- /dev/null
+++ b/lib/WebworkSOAP/Classes/GlobalSet.pm
@@ -0,0 +1,47 @@
+package WebworkSOAP::Classes::GlobalSet;
+=pod
+=begin WSDL
+        _ATTR set_id                    $string set_id
+        _ATTR set_header                $string set_header
+        _ATTR hardcopy_header           $string hardcopy_header
+        _ATTR open_date                 $string open_date
+        _ATTR due_date                  $string due_date
+        _ATTR answer_date               $string answer_date
+        _ATTR visible                   $string visible
+        _ATTR enable_reduced_scoring    $string enable_reduced_scoring
+        _ATTR assignment_type           $string assignment_type
+        _ATTR attempts_per_version      $string attempts_per_version
+        _ATTR time_interval             $string time_interval
+        _ATTR versions_per_interval     $string versions_per_interval
+        _ATTR version_time_limit        $string version_time_limit
+        _ATTR version_creation_time     $string version_creation_time
+        _ATTR problem_randorder         $string problem_randorder
+        _ATTR version_last_attempt_time $string version_last_attempt_time
+        _ATTR problems_per_page         $string problems_per_page
+=cut
+sub new() {
+        my $self = shift;
+        my $data = shift;
+        $self = {};
+        $self->{set_id} = SOAP::Data->type( 'string', $data->set_id );
+        $self->{set_header} = SOAP::Data->type( 'string', $data->set_header );
+        $self->{hardcopy_header} = SOAP::Data->type( 'string', $data->hardcopy_header );
+        $self->{open_date} = SOAP::Data->type( 'string', $data->open_date );
+        $self->{due_date} = SOAP::Data->type( 'string', $data->due_date );
+        $self->{answer_date} = SOAP::Data->type( 'string', $data->answer_date );
+        $self->{visible} = SOAP::Data->type( 'string', $data->visible );
+        $self->{enable_reduced_scoring} = SOAP::Data->type( 'string', $data->enable_reduced_scoring );
+        $self->{assignment_type} = SOAP::Data->type( 'string', $data->assignment_type );
+        $self->{attempts_per_version} = SOAP::Data->type( 'string', $data->attempts_per_version );
+        $self->{time_interval} = SOAP::Data->type( 'string', $data->time_interval );
+        $self->{versions_per_interval} = SOAP::Data->type( 'string', $data->versions_per_interval );
+        $self->{version_time_limit} = SOAP::Data->type( 'string', $data->version_time_limit );
+        $self->{version_creation_time} = SOAP::Data->type( 'string', $data->version_creation_time );
+        $self->{problem_randorder} = SOAP::Data->type( 'string', $data->problem_randorder );
+        $self->{version_last_attempt_time} = SOAP::Data->type( 'string', $data->version_last_attempt_time );
+        $self->{problems_per_page} = SOAP::Data->type( 'string', $data->problems_per_page );
+        bless $self;
+        return $self;
+}
+
+1;
diff --git a/lib/WebworkSOAP/Classes/Key.pm b/lib/WebworkSOAP/Classes/Key.pm
new file mode 100644
index 0000000000..55a55e9b25
--- /dev/null
+++ b/lib/WebworkSOAP/Classes/Key.pm
@@ -0,0 +1,21 @@
+package WebworkSOAP::Classes::Key;
+
+=pod
+=begin WSDL
+        _ATTR user_id       $string user_id
+        _ATTR key_not_a_keyboard $string key_not_a_keyboard
+        _ATTR timestamp     $string timestamp
+=end WSDL
+=cut
+sub new {
+    my $self = shift;
+    my $data = shift;
+    $self = {};
+    $self->{user_id} = SOAP::Data->type( 'string', $data->user_id );
+    $self->{key_not_a_keyboard} = SOAP::Data->type( 'string', $data->key_not_a_keyboard );
+    $self->{timestamp} = SOAP::Data->type( 'string', $data->timestamp );
+    bless $self;
+    return $self;
+}
+
+1;
diff --git a/lib/WebworkSOAP/Classes/Password.pm b/lib/WebworkSOAP/Classes/Password.pm
new file mode 100644
index 0000000000..d681b7be76
--- /dev/null
+++ b/lib/WebworkSOAP/Classes/Password.pm
@@ -0,0 +1,20 @@
+package WebworkSOAP::Classes::Password;
+
+=pod
+=begin WSDL
+        _ATTR user_id       $string user_id
+        _ATTR password      $string password
+=end WSDL
+=cut
+sub new {
+    my $self = shift;
+    my $data = shift;
+    $self = {};
+    $self->{user_id} = SOAP::Data->type( 'string', $data->user_id );
+    $self->{password} = SOAP::Data->type( 'string', $data->password );
+    bless $self;
+    return $self;
+}
+
+
+1;
diff --git a/lib/WebworkSOAP/Classes/Permission.pm b/lib/WebworkSOAP/Classes/Permission.pm
new file mode 100644
index 0000000000..20b6be0661
--- /dev/null
+++ b/lib/WebworkSOAP/Classes/Permission.pm
@@ -0,0 +1,20 @@
+package WebworkSOAP::Classes::Permission;
+
+=pod
+=begin WSDL
+        _ATTR user_id       $string user_id
+        _ATTR permission    $string permission
+=end WSDL
+=cut
+sub new {
+    my $self = shift;
+    my $data = shift;
+    $self = {};
+    $self->{user_id} = SOAP::Data->type( 'string', $data->user_id );
+    $self->{permission} = SOAP::Data->type( 'string', $data->permission );
+    bless $self;
+    return $self;
+}
+
+
+1;
diff --git a/lib/WebworkSOAP/Classes/User.pm b/lib/WebworkSOAP/Classes/User.pm
new file mode 100644
index 0000000000..b53a5552d3
--- /dev/null
+++ b/lib/WebworkSOAP/Classes/User.pm
@@ -0,0 +1,33 @@
+package WebworkSOAP::Classes::User;
+
+=pod
+=begin WSDL
+        _ATTR user_id       $string user_id
+        _ATTR first_name    $string first_name
+        _ATTR last_name     $string last_name
+        _ATTR email_address $string email_address
+        _ATTR student_id    $string student_id
+        _ATTR status        $string status
+        _ATTR section       $string section
+        _ATTR recitation    $string recitation
+        _ATTR comment       $string comment
+=end WSDL
+=cut
+sub new {
+    my $self = shift;
+    my $data = shift;
+    $self = {};
+	$self->{user_id} = SOAP::Data->type( 'string', $data->user_id );
+    $self->{first_name} = SOAP::Data->type( 'string', $data->first_name );
+    $self->{last_name} = SOAP::Data->type( 'string', $data->last_name );
+    $self->{email_address} = SOAP::Data->type( 'string', $data->email_address );
+    $self->{student_id} = SOAP::Data->type( 'string', $data->student_id );
+    $self->{status} = SOAP::Data->type( 'string', $data->status );
+    $self->{section} = SOAP::Data->type( 'string', $data->section );
+    $self->{recitation} = SOAP::Data->type( 'string', $data->recitation );
+    $self->{comment} = SOAP::Data->type( 'string', $data->comment );
+    bless $self;
+    return $self;
+}
+
+1;
diff --git a/lib/WebworkSOAP/Classes/UserProblem.pm b/lib/WebworkSOAP/Classes/UserProblem.pm
new file mode 100644
index 0000000000..bbff4de7b4
--- /dev/null
+++ b/lib/WebworkSOAP/Classes/UserProblem.pm
@@ -0,0 +1,38 @@
+package WebworkSOAP::Classes::UserProblem;
+
+=pod
+=begin WSDL
+        _ATTR user_id       $string user_id
+        _ATTR set_id        $string set_id
+        _ATTR problem_id    $string problem_id
+        _ATTR source_file   $string source_file
+        _ATTR value         $string value
+        _ATTR max_attempts  $string max_attempts
+        _ATTR problem_seed  $string problem_seed
+        _ATTR status        $string status
+        _ATTR attempted     $string attempted
+        _ATTR last_answer   $string last_answer
+        _ATTR num_correct   $string num_correct
+        _ATTR num_incorrect $string num_incorrect
+=cut
+sub new {
+    my $self = shift;
+    my $data = shift;
+    $self = {};
+    $self->{user_id} = SOAP::Data->type( 'string', $data->user_id );
+    $self->{set_id} = SOAP::Data->type( 'string', $data->set_id );
+    $self->{problem_id} = SOAP::Data->type( 'string', $data->problem_id );
+    $self->{source_file} = SOAP::Data->type( 'string', $data->source_file );
+    $self->{value} = SOAP::Data->type( 'string', $data->value );
+    $self->{max_attempts} = SOAP::Data->type( 'string', $data->max_attempts );
+    $self->{problem_seed} = SOAP::Data->type( 'string', $data->problem_seed );
+    $self->{status} = SOAP::Data->type( 'string', $data->status );
+    $self->{attempted} = SOAP::Data->type( 'string', $data->attempted );
+    $self->{last_answer} = SOAP::Data->type( 'string', $data->last_answer );
+    $self->{num_correct} = SOAP::Data->type( 'string', $data->num_correct );
+    $self->{num_incorrect} = SOAP::Data->type( 'string', $data->num_incorrect );
+    bless $self;
+    return $self;
+}
+
+1;
diff --git a/lib/WebworkSOAP/Classes/UserSet.pm b/lib/WebworkSOAP/Classes/UserSet.pm
new file mode 100644
index 0000000000..367667ab83
--- /dev/null
+++ b/lib/WebworkSOAP/Classes/UserSet.pm
@@ -0,0 +1,52 @@
+package WebworkSOAP::Classes::UserSet;
+
+=pod
+=begin WSDL
+        _ATTR user_id                   $string user_id
+        _ATTR set_id                    $string set_id
+        _ATTR psvn                      $string psvn
+        _ATTR set_header                $string set_header
+        _ATTR hardcopy_header           $string hardcopy_header
+        _ATTR open_date                 $string open_date
+        _ATTR due_date                  $string due_date
+        _ATTR answer_date               $string answer_date
+        _ATTR visible                   $string visible
+        _ATTR enable_reduced_scoring    $string enable_reduced_scoring
+        _ATTR assignment_type           $string assignment_type
+        _ATTR attempts_per_version      $string attempts_per_version
+        _ATTR time_interval             $string time_interval
+        _ATTR versions_per_interval     $string versions_per_interval
+        _ATTR version_time_limit        $string version_time_limit
+        _ATTR version_creation_time     $string version_creation_time
+        _ATTR problem_randorder         $string problem_randorder
+        _ATTR version_last_attempt_time $string version_last_attempt_time
+        _ATTR problems_per_page         $string problems_per_page
+=cut
+sub new() {
+        my $self = shift;
+        my $data = shift;
+        $self = {};
+        $self->{user_id} = SOAP::Data->type( 'string', $data->user_id );
+        $self->{set_id} = SOAP::Data->type( 'string', $data->set_id );
+        $self->{psvn} = SOAP::Data->type( 'string', $data->psvn );
+        $self->{set_header} = SOAP::Data->type( 'string', $data->set_header );
+        $self->{hardcopy_header} = SOAP::Data->type( 'string', $data->hardcopy_header );
+        $self->{open_date} = SOAP::Data->type( 'string', $data->open_date );
+        $self->{due_date} = SOAP::Data->type( 'string', $data->due_date );
+        $self->{answer_date} = SOAP::Data->type( 'string', $data->answer_date );
+        $self->{visible} = SOAP::Data->type( 'string', $data->visible );
+        $self->{enable_reduced_scoring} = SOAP::Data->type( 'string', $data->enable_reduced_scoring );
+        $self->{assignment_type} = SOAP::Data->type( 'string', $data->assignment_type );
+        $self->{attempts_per_version} = SOAP::Data->type( 'string', $data->attempts_per_version );
+        $self->{time_interval} = SOAP::Data->type( 'string', $data->time_interval );
+        $self->{versions_per_interval} = SOAP::Data->type( 'string', $data->versions_per_interval );
+        $self->{version_time_limit} = SOAP::Data->type( 'string', $data->version_time_limit );
+        $self->{version_creation_time} = SOAP::Data->type( 'string', $data->version_creation_time );
+        $self->{problem_randorder} = SOAP::Data->type( 'string', $data->problem_randorder );
+        $self->{version_last_attempt_time} = SOAP::Data->type( 'string', $data->version_last_attempt_time );
+        $self->{problems_per_page} = SOAP::Data->type( 'string', $data->problems_per_page );
+        bless $self;
+        return $self;
+}
+
+1;
diff --git a/lib/WebworkSOAP/WSDL.pm b/lib/WebworkSOAP/WSDL.pm
new file mode 100644
index 0000000000..fe184b4100
--- /dev/null
+++ b/lib/WebworkSOAP/WSDL.pm
@@ -0,0 +1,28 @@
+package WebworkSOAP::WSDL;
+
+use lib '/opt/webwork/webwork2/lib';
+use Pod::WSDL;
+use WebworkSOAP;
+
+use constant MP2 => ( exists $ENV{MOD_PERL_API_VERSION} and $ENV{MOD_PERL_API_VERSION} >= 2 );
+use constant RPC_URL => 'http://localhost/webwork2_rpc';
+
+sub handler($) {
+    my ($r) = @_;
+    my $pod = new Pod::WSDL(
+        source => 'WebworkSOAP',
+        location => RPC_URL,
+        pretty => 1,
+        withDocumentation => 0
+        );
+    #$r->content_type('application/wsdl+xml');
+    if (MP2) {
+        #$r->send_http_header;
+    } else {
+        $r->send_http_header;
+    }
+    print($pod->WSDL);
+    return 0;
+}
+
+1;
diff --git a/lib/WebworkWebservice.pm b/lib/WebworkWebservice.pm
new file mode 100644
index 0000000000..23809ea177
--- /dev/null
+++ b/lib/WebworkWebservice.pm
@@ -0,0 +1,438 @@
+#!/user/bin/perl -w
+
+ 
+
+
+BEGIN {
+    $main::VERSION = "2.4.9";
+    use Cwd;
+	use WeBWorK::PG::Local;
+
+	use constant MP2 => ( exists $ENV{MOD_PERL_API_VERSION} and $ENV{MOD_PERL_API_VERSION} >= 2 );
+
+###############################################################################
+# Configuration -- set to top webwork directory (webwork2) (set in webwork.apache2-config)
+# Configuration -- set server name
+###############################################################################
+
+    our $webwork_directory = $WeBWorK::Constants::WEBWORK_DIRECTORY; #'/opt/webwork/webwork2';
+	print "WebworkWebservice: webwork_directory set to ", $WeBWorK::Constants::WEBWORK_DIRECTORY,
+	      " via \$WeBWorK::Constants::WEBWORK_DIRECTORY set in webwork.apache2-config\n";
+
+	$WebworkWebservice::HOST_NAME     = 'localhost'; # Apache->server->server_hostname;
+	$WebworkWebservice::HOST_PORT     = '80';        # Apache->server->port;
+
+###############################################################################
+
+	eval "use lib '$webwork_directory/lib'"; die $@ if $@;
+	eval "use WeBWorK::CourseEnvironment"; die $@ if $@;
+ 	my $seed_ce = new WeBWorK::CourseEnvironment({ webwork_dir => $webwork_directory });
+ 	my $webwork_url = $seed_ce->{webwork_url};
+ 	my $pg_dir = $seed_ce->{pg_dir};
+ 	eval "use lib '$pg_dir/lib'"; die $@ if $@;
+    
+	$WebworkWebservice::WW_DIRECTORY = $webwork_directory;
+	$WebworkWebservice::PG_DIRECTORY = $pg_dir;
+	$WebworkWebservice::SeedCE       = $seed_ce;
+	
+###############################################################################
+
+	$WebworkWebservice::PASSWORD      = 'xmluser';     # default password
+	$WebworkWebservice::COURSENAME    = 'gage_course'; # default course
+}
+
+
+use strict;
+use warnings;
+
+
+	
+
+	
+###############################################################################
+###############################################################################
+
+package WebworkWebservice;
+
+
+
+sub pretty_print_rh { 
+    shift if UNIVERSAL::isa($_[0] => __PACKAGE__);
+	my $rh = shift;
+	my $indent = shift || 0;
+
+	my $out = "";
+	return $out if $indent>10;
+	my $type = ref($rh);
+
+	if (defined($type) and $type) {
+		$out .= " type = $type; ";
+	} elsif ($rh == undef) {
+		$out .= " type = scalar; ";
+	}
+	if ( ref($rh) =~/HASH/ or "$rh" =~/HASH/ ) {
+	    $out .= "{\n";
+	    $indent++;
+ 		foreach my $key (sort keys %{$rh})  {
+ 			$out .= "  "x$indent."$key => " . pretty_print_rh( $rh->{$key}, $indent ) . "\n";
+ 		}
+ 		$indent--;
+ 		$out .= "\n"."  "x$indent."}\n";
+
+ 	} elsif (ref($rh)  =~  /ARRAY/ or "$rh" =~/ARRAY/) {
+ 	    $out .= " ( ";
+ 		foreach my $elem ( @{$rh} )  {
+ 		 	$out .= pretty_print_rh($elem, $indent);
+ 		
+ 		}
+ 		$out .=  " ) \n";
+	} elsif ( ref($rh) =~ /SCALAR/ ) {
+		$out .= "scalar reference ". ${$rh};
+	} elsif ( ref($rh) =~/Base64/ ) {
+		$out .= "base64 reference " .$$rh;
+	} else {
+		$out .=  $rh;
+	}
+	
+	return $out." ";
+}
+
+
+use WebworkWebservice::RenderProblem;
+use WebworkWebservice::LibraryActions;
+use WebworkWebservice::MathTranslators;
+
+###############################################################################
+package WebworkXMLRPC;
+use base qw(WebworkWebservice); 
+use WeBWorK::Utils qw(runtime_use writeTimingLogEntry);
+
+
+
+###########################################################################
+#  authentication
+###########################################################################
+
+sub initiate_session {
+	my ($invocant, @args) = @_;
+	my $class = ref $invocant || $invocant;
+	my $rh_input     = $args[0];
+	my $user_id       = $rh_input->{userID};
+	my $password     = $rh_input->{password};
+	my $courseName   = $rh_input ->{courseID};
+	my $ce = $class->create_course_environment($courseName);
+	my $db = new WeBWorK::DB($ce->{dbLayout});
+	
+	my $language= $ce->{language} || "en";
+	my $language_handle = WeBWorK::Localize->get_handle($language) ;
+
+	my $user_authen_module = WeBWorK::Authen::class($ce, "user_module");
+    runtime_use $user_authen_module;
+
+	my $self = {
+		courseName	=>  $courseName,
+		user_id		=>  $user_id,
+		password	=>  $password,
+		ce          =>  $ce,
+		db          =>  $db,
+		language_handle => $language_handle,
+	};	
+	$self = bless $self, $class;
+	# need to bless self before it can be used as an argument for the authentication module
+	# The authentication module is expecting a WeBWorK::Request object
+	# But its only actual requirement is that the method maketext() is defined.
+	
+	my $authen = $user_authen_module->new($self);
+	my $authz  =  WeBWorK::Authz->new($self);
+	
+	$self->{authen}             =  $authen;
+	$self->{authz}              = $authz;
+#   we need to trick some of the methods within the webwork framework 
+#   since we are not coming in with a standard apache request
+#   FIXME:  can/should we change this????
+#
+#   We are borrowing tricks from the AuthenWeBWorK.pm module
+#
+# 	
+
+
+	# now, here's the problem... WeBWorK::Authen looks at $r->params directly, whereas we
+	# need to look at $user and $sent_pw. this is a perfect opportunity for a mixin, i think.
+	my $authenOK;
+	{
+		no warnings 'redefine';
+		local *WeBWorK::Authen::get_credentials   = \&WebworkXMLRPC::get_credentials;
+		local *WeBWorK::Authen::maybe_send_cookie = \&WebworkXMLRPC::noop;
+		local *WeBWorK::Authen::maybe_kill_cookie = \&WebworkXMLRPC::noop;
+		local *WeBWorK::Authen::set_params        = \&WebworkXMLRPC::noop;
+		local *WeBWorK::Authen::write_log_entry   = \&WebworkXMLRPC::noop; # maybe fix this to log interactions FIXME
+		$authenOK = $authen->verify;
+	}
+	
+	$self->{authenOK}  = $authenOK;
+	$self->{authzOK}   = $authz->hasPermissions($user_id, "access_instructor_tools");
+	return $self;
+}
+
+
+
+
+
+###########################################################################
+# identify course 
+###########################################################################
+
+sub create_course_environment {
+	my $self = shift;
+	my $courseName = shift;
+	my $ce = WeBWorK::CourseEnvironment->new( 
+				{webwork_dir		=>		$WebworkWebservice::WW_DIRECTORY, 
+				 courseName         =>      $courseName
+				 });
+	# error messages
+	return ($ce);
+}
+
+###########################################################################
+# security check -- check that the user is in fact a professor in the course
+###########################################################################
+sub ce {
+	my $self = shift;
+	$self->{ce};
+}
+sub db {
+	my $self = shift;
+	$self->{db};
+}
+sub authz {
+	my $self = shift;
+	$self->{authz};
+}
+sub maketext {
+	my $self = shift;
+	$self->{language_handle}->maketext(@_);
+}
+
+
+sub get_credentials {
+		my $self = shift;
+		# self is an Authen object it contains an object r which is the WebworkXMLRPC object
+		# confusing isn't it?
+		$self->{user_id} = $self->{r}->{user_id};
+		$self->{session_key} = "";
+		$self->{password} = $self->{r}->{password};
+		$self->{login_type} = "normal";
+		$self->{credential_source} = "params";
+		return 1;
+}
+
+sub noop {
+
+}
+sub check_authorization {
+		
+
+
+}
+
+#  respond to xmlrpc requests
+sub listLib {
+    my $class = shift;
+    my $in = shift;
+    my $self = $class->initiate_session($in);
+    warn "incomiing request to listLib:  class is ",ref($self);
+    warn "authentication for ",$self->{user_id}, " in course ", $self->{courseName}, " is = ", $self->{authenOK};
+    warn "authorization as instructor for ", $self->{user_id}, " is ", $self->{authzOK}; 
+  	return( WebworkWebservice::LibraryActions::listLib($in) );
+}
+sub listLibraries {     # returns a list of libraries for the default course
+    my $self = shift;
+    my $in = shift;
+  	return( WebworkWebservice::LibraryActions::listLibraries($in) );
+}
+sub renderProblem {
+    my $self = shift;
+    my $in = shift;
+  	return( WebworkWebservice::RenderProblem::renderProblem($in) );
+}
+sub readFile {
+    my $self = shift;
+    my $in   = shift;
+  	return( WebworkWebservice::LibraryActions::readFile($in) );
+}
+sub tex2pdf {
+    my $self = shift;
+    my $in   = shift;
+  	return( WebworkWebservice::MathTranslators::tex2pdf($in) );
+}
+
+# -- SOAP::Lite -- guide.soaplite.com -- Copyright (C) 2001 Paul Kulchenko --
+# test responses
+
+sub hi {   shift if UNIVERSAL::isa($_[0] => __PACKAGE__); # grabs class reference                 
+  return "hello, world";     
+}
+sub hello2 { shift if UNIVERSAL::isa($_[0] => __PACKAGE__);
+	#print "Receiving request for hello world\n";
+	return "Hello world2";
+}
+sub bye {shift if UNIVERSAL::isa($_[0] => __PACKAGE__);  
+	return "goodbye, sad cruel world";
+}
+
+sub languages {shift if UNIVERSAL::isa($_[0] => __PACKAGE__);
+	return ["Perl", "C", "sh"];   
+}                               
+
+sub echo_self {
+	my $self = shift;
+}
+
+sub echo { 
+    return join("|",("begin ", WebworkWebservice::pretty_print_rh(\@_), " end") );
+}
+
+sub pretty_print_rh {
+	WebworkWebservice::pretty_print_rh(@_);
+}
+
+
+sub tth {shift if UNIVERSAL::isa($_[0] => __PACKAGE__);
+	my $in = shift;
+	my $tthpath = "/usr/local/bin/tth";
+    # $tthpath -L -f5 -r 2>/dev/null " . $inputString;
+    return $in;
+
+}
+
+
+
+
+package WWd;
+
+#use lib '/home/gage/webwork/xmlrpc/daemon';
+#use WebworkXMLRPC;
+
+
+
+
+############utilities
+
+sub echo { 
+    return "WWd package ".join("|",("begin ", WebworkWebservice::pretty_print_rh(\@_), " end") );
+}
+
+sub listLib {
+    shift if UNIVERSAL::isa($_[0] => __PACKAGE__);
+    my $in = shift;
+  	return( Webwork::listLib($in) );
+}
+sub renderProblem {
+    shift if UNIVERSAL::isa($_[0] => __PACKAGE__);
+    my $in = shift;
+  	return( Filter::filterObject( Webwork::renderProblem($in) ) );
+}
+sub readFile {
+    shift if UNIVERSAL::isa($_[0] => __PACKAGE__);
+    my $in = shift;
+  	return( Webwork::readFile($in) );
+}
+# sub hello {
+# 	shift if UNIVERSAL::isa($_[0] => __PACKAGE__);
+# 	print "Receiving request for hello world\n";
+# 	return "Hello world?";
+# }
+
+
+# sub tth {
+# 	shift if UNIVERSAL::isa($_[0] => __PACKAGE__);
+# 	my $in = shift;
+# 	my $tthpath = "/usr/local/bin/tth";
+#     my $out;
+#     $inputString    = "<<END_OF_TTH_INPUT_STRING;\n\n\n" . $in . "\nEND_OF_TTH_INPUT_STRING\necho \"\" >/dev/null"; 
+#     #it's not clear why another command is needed.
+# 
+#     if (-x $tthpath ) {
+#     	my $tthcmd      = "$tthpath -L -f5 -r 2>/dev/null " . $inputString;
+#     	if (open(TTH, "$tthcmd   |")) {  
+#     	    local($/);
+# 			$/ = undef;
+# 			$out = <TTH>;
+# 			$/ = "\n";
+# 			close(TTH);
+# 	    }else {
+# 	        $out = "<BR>there has been an error in executing $tthcmd<BR>";
+# 	    }
+# 	} else {
+# 		$out = "<BR> Can't execute the program tth at |$tthpath|<BR>";
+#     }
+# 
+#     #return "<!-- \r\n" . $in . "\r\n-->\r\n\r\n" . $out . "\r\n\r\n";
+#     return $out;
+# 
+# }
+
+package Filter;
+
+
+sub is_hash_ref {
+	my $in =shift;
+	my $save_SIG_die_trap = $SIG{__DIE__};
+    $SIG{__DIE__} = sub {CORE::die(@_) };
+	my $out = eval{  %{   $in  }  };
+	$out = ($@ eq '') ? 1 : 0;
+	$@='';
+	$SIG{__DIE__} = $save_SIG_die_trap;
+	$out;
+}
+sub is_array_ref {
+	my $in =shift;
+	my $save_SIG_die_trap = $SIG{__DIE__};
+    $SIG{__DIE__} = sub {CORE::die(@_) };
+	my $out = eval{  @{   $in  }  };
+	$out = ($@ eq '') ? 1 : 0;
+	$@='';
+	$SIG{__DIE__} = $save_SIG_die_trap;
+	$out;
+}
+sub filterObject {
+
+    my $is_hash = 0;
+    my $is_array =0;
+	my $obj = shift;
+	#print "Enter filterObject ", ref($obj), "\n";
+	my $type = ref($obj);
+	unless ($type) {
+		#print "leave filterObject with nothing\n";
+		return($obj);
+	}
+
+
+	if ( is_hash_ref($obj)  ) {
+	    #print "enter hash ", %{$obj},"\n";
+	    my %obj_container= %{$obj};
+		foreach my $key (keys %obj_container) {
+			$obj_container{$key} = filterObject( $obj_container{$key} );
+			#print $key, "  ",  ref($obj_container{$key}),"   ", $obj_container{$key}, "\n";
+		}
+		#print "leave filterObject with HASH\n";
+		return( bless(\%obj_container,'HASH'));
+	};
+
+
+
+	if ( is_array_ref($obj)  ) {
+		#print "enter array ( ", @{$obj}," )\n";
+		my @obj_container= @{$obj};
+		foreach my $i (0..$#obj_container) {
+			$obj_container[$i] = filterObject( $obj_container[$i] );
+			#print "\[$i\]  ",  ref($obj_container[$i]),"   ", $obj_container[$i], "\n";
+		}
+		#print "leave filterObject with ARRAY\n";
+		return( bless(\@obj_container,'ARRAY'));
+	};
+    
+}
+
+
+1;
diff --git a/lib/WebworkWebservice/LibraryActions.pm b/lib/WebworkWebservice/LibraryActions.pm
new file mode 100644
index 0000000000..fed487e000
--- /dev/null
+++ b/lib/WebworkWebservice/LibraryActions.pm
@@ -0,0 +1,196 @@
+#!/usr/local/bin/perl -w 
+
+# Copyright (C) 2002 Michael Gage 
+
+###############################################################################
+# Web service which fetches WeBWorK problems from a library.
+###############################################################################
+
+
+#use lib '/home/gage/webwork/pg/lib';
+#use lib '/home/gage/webwork/webwork-modperl/lib';
+
+package WebworkWebservice::LibraryActions;
+use WebworkWebservice;
+use base qw(WebworkWebservice); 
+
+use strict;
+use sigtrap;
+use Carp;
+use WWSafe;
+#use Apache;
+use WeBWorK::Utils;
+use WeBWorK::CourseEnvironment;
+use WeBWorK::PG::Translator;
+use WeBWorK::PG::IO;
+use Benchmark;
+use MIME::Base64 qw( encode_base64 decode_base64);
+
+##############################################
+#   Obtain basic information about directories, course name and host 
+##############################################
+our $WW_DIRECTORY = $WebworkWebservice::WW_DIRECTORY;
+our $PG_DIRECTORY = $WebworkWebservice::PG_DIRECTORY;
+our $COURSENAME   = $WebworkWebservice::COURSENAME;
+our $HOST_NAME    = $WebworkWebservice::HOST_NAME;
+our $PASSWORD     = $WebworkWebservice::PASSWORD;
+our $ce           = WeBWorK::CourseEnvironment->new($WW_DIRECTORY, "", "", $COURSENAME);
+# warn "library ce \n ", WebworkWebservice::pretty_print_rh($ce);
+# warn "LibraryActions is ready";
+
+##############################################
+#   Obtain basic information about local libraries
+##############################################
+ my %prob_libs	= %{$ce->{courseFiles}->{problibs} };
+
+ #warn pretty_print_rh(\%prob_libs);
+ # replace library names with full paths
+ 
+ my $templateDir    = $ce->{courseDirs}->{templates};
+# warn "template Directory is $templateDir";
+ foreach my $key (keys %prob_libs) {
+ 	$prob_libs{$key} = "$templateDir/$key";
+ }
+ #warn "prob libraries", WebworkWebservice::pretty_print_rh(\%prob_libs);
+
+sub listLibraries {  # list the problem libraries that are available.
+	my $rh = shift;
+	return [sort keys %prob_libs];
+}
+
+use File::stat;
+sub readFile {
+	my $rh = shift;
+	local($|)=1;
+	my $out = {};
+	my $filePath = $rh->{filePath};
+	unless ($rh->{pw} eq $PASSWORD ) {
+		$out->{error} =404;
+		return($out);
+	}
+	if (  defined($prob_libs{$rh->{library_name}} )   ) {
+		$filePath = $prob_libs{$rh->{library_name}} .'/'. $filePath;
+	} else {
+		$out->{error} = "Could not find library:".$rh->{library_name}.":";
+		return($out);
+	}
+	
+	if (-r $filePath) {
+		open IN, "<$filePath";
+		local($/)=undef;
+		my $text = <IN>;
+		$out->{text}= encode_base64($text);
+		my $sb=stat($filePath);
+		$out->{size}=$sb->size;
+		$out->{path}=$filePath;
+		$out->{permissions}=$sb->mode&07777;
+		$out->{modTime}=scalar localtime $sb->mtime;
+		close(IN);
+	} else {
+		$out->{error} = "Could not read file at |$filePath|";
+	}
+	return($out);
+}
+
+
+
+use File::Find;	
+sub listLib {
+	my $rh = shift;
+	my $out = {};
+	my $dirPath;
+	unless ($rh->{pw} eq $PASSWORD ) {
+		$out->{error}=" 404 $PASSWORD and ".$rh->{pw};
+		return($out);
+	}
+	
+	if (  defined($prob_libs{$rh->{library_name}} )   ) {
+		$dirPath = $prob_libs{$rh->{library_name}} ;
+	} else {
+		$out->{error} = "Could not find library:".$rh->{library_name}.":";
+		return($out);
+	}
+    warn "library directory path for ",$rh->{library_name}," is $dirPath";
+	my @outListLib;
+	my %libDirectoryList;
+	my $wanted = sub {
+		unless ($File::Find::dir =~/.svn/ ) {
+			my $name = $File::Find::name;
+			if ($name =~/\S/ ) {
+				$name =~ s|^$dirPath/*||;  # cut the first directory
+				push(@outListLib, "$name") if $name =~/\.pg/;
+	
+			}
+		}
+	};
+	my $wanted_directory = sub {
+		unless ($File::Find::dir =~/.svn/ ) {
+			my $dir = $File::Find::dir;
+			if ($dir =~/\S/ ) {
+				$dir =~ s|^$dirPath/*||;  # cut the first directory
+				$libDirectoryList{$dir}++;	
+			}
+		}
+	};
+	 
+	my $command = $rh->{command};
+	warn "the command being executed is ' $command '";
+	$command = 'all' unless defined($command);
+			$command eq 'all' &&    do {
+										find({wanted=>$wanted,follow_fast=>1 }, $dirPath);
+										@outListLib = sort @outListLib;
+										$out->{ra_out} = \@outListLib;
+										$out->{text} = encode_base64( join("\n", @outListLib) );
+										return($out);
+			};
+			$command eq 'dirOnly' &&   do {
+										find({wanted=>$wanted_directory,follow_fast=>1 }, $dirPath);
+										@outListLib = sort keys %libDirectoryList;
+										$out->{ra_out} = \@outListLib;
+										$out->{text} = encode_base64( join("\n", @outListLib) );
+										return($out);
+			};
+
+			$command eq 'files' && do {  @outListLib=();
+										 my $separator = ($dirPath =~m|/$|) ?'' : '/';
+			 							 my $dirPath2 = $dirPath . $separator . $rh->{dirPath};
+			 							 if ( -e $dirPath2) {
+											 find($wanted, $dirPath2);
+											 @outListLib = sort @outListLib;
+											 $out ->{text} = encode_base64( join("\n", @outListLib ) );
+											 $out->{ra_out} = \@outListLib;
+										 } else {
+										   $out->{error} = "Can't open directory  $dirPath2";
+										 }
+										 return($out);
+
+			};
+			# else
+			$out->{error}="Unrecognized command $command";
+			return( $out );
+}
+
+
+sub pretty_print_rh {
+	my $rh = shift;
+	my $out = "";
+	my $type = ref($rh);
+	if ( ref($rh) =~/HASH/ ) {
+ 		foreach my $key (sort keys %{$rh})  {
+ 			$out .= "  $key => " . pretty_print_rh( $rh->{$key} ) . "\n";
+ 		}
+	} elsif ( ref($rh) =~ /SCALAR/ ) {
+		$out = "scalar reference ". ${$rh};
+	} elsif ( ref($rh) =~/Base64/ ) {
+		$out .= "base64 reference " .$$rh;
+	} else {
+		$out =  $rh;
+	}
+	if (defined($type) ) {
+		$out .= "type = $type \n";
+	}
+	return $out;
+}
+
+
+1;
diff --git a/lib/WebworkWebservice/MathTranslators.pm b/lib/WebworkWebservice/MathTranslators.pm
new file mode 100644
index 0000000000..3c60e5b9e0
--- /dev/null
+++ b/lib/WebworkWebservice/MathTranslators.pm
@@ -0,0 +1,194 @@
+#!/usr/local/bin/perl -w 
+
+# Copyright (C) 2002 Michael Gage 
+
+###############################################################################
+# Web service which translates TeX to pdf or to HTML
+###############################################################################
+
+#use lib '/home/gage/webwork/pg/lib';
+#use lib '/home/gage/webwork/webwork-modperl/lib';
+
+package WebworkWebservice::MathTranslators;
+use WebworkWebservice;
+use base qw(WebworkWebservice); 
+
+use strict;
+use sigtrap;
+use Carp;
+use WWSafe;
+#use Apache;
+use WeBWorK::PG::Translator;
+use WeBWorK::PG::IO;
+use Benchmark;
+use MIME::Base64 qw( encode_base64 decode_base64);
+
+
+
+our $WW_DIRECTORY = $WebworkWebservice::WW_DIRECTORY;
+our $PG_DIRECTORY = $WebworkWebservice::PG_DIRECTORY;
+our $COURSENAME   = $WebworkWebservice::COURSENAME;
+our $HOST_NAME    = $WebworkWebservice::HOST_NAME;
+
+our $ce           =$WebworkWebservice::SeedCE;
+# create a local course environment for some course
+    $ce           = WeBWorK::CourseEnvironment->new($WW_DIRECTORY, "", "", $COURSENAME);
+
+
+
+my $debugOn 	=	1; 
+my $PASSWORD 	= 	$WebworkWebservice::PASSWORD;
+
+
+my $TEMPDIRECTORY 				= 	$ce->{webworkDirs}->{htdocs_temp};
+my $TEMP_BASE_URL 				= 	$ce->{webworkURLs}->{htdocs_temp};
+my $externalLatexPath 			= 	$ce->{externalPrograms}->{latex};
+# my $externalDvipsPath 			= 	$Global::externalDvipsPath;
+my $externalpdflatexPath 		= 	$ce->{externalPrograms}->{pdflatex};;
+# my $externalGsPath 				= 	$Global::externalGsPath;
+
+
+# variables formerly set in Global
+	$Global::tmp_directory_permission = 0775; 
+	$Global::numericalGroupID='100';  # group ID for wwdev
+
+my $tmp_directory_permission 	= 	$Global::tmp_directory_permission; 
+my $numericalGroupID			=	$Global::numericalGroupID;  # group ID for webadmin
+
+sub tex2pdf {
+
+	my $rh 		= 	shift;
+	local($|)	=	1;
+	my $out 	= 	{};
+	unless ($rh->{pw} eq $PASSWORD ) {
+		$out->{error}	=	404;
+		return($out);
+	}
+	#obtain the path to the file
+	my $filePath 		= 	$rh->{fileName};
+	my @pathElements 	= 	split("/", $filePath);
+	
+	# grab the last element as the fileName
+	#remove the extension from the file name
+	my $fileName 	= 	pop @pathElements;    
+ 	$fileName 		=~ 	s/\.pg$//;
+ 	
+ 	#Create the full url and the full directory path -- If pathElements is empty this can give an extra //? Should I worry? maybe
+	my $url 			 = 	$TEMP_BASE_URL. join("/",@pathElements);
+	$url				.= 	'/' unless $url =~ m|/$|;   # only add / if it is needed.
+	$url				.= 	"$fileName.pdf";
+	my $texFileBasePath  = 	$TEMPDIRECTORY.join("/",@pathElements); 
+	$texFileBasePath 	.=	'/' unless $texFileBasePath =~ m|/$|;
+	$texFileBasePath 	.= "$fileName";
+	
+	# create the intermediate directories if they don't exists
+	# create a dummy .pdf file
+	surePathToTmpFile2($texFileBasePath.'.pdf');
+#	my $filePermission = '0775';
+#	chmod("$filePermission","$texFileBasePath.pdf") 
+#	     or die "Can't change file permissions on $texFileBasePath.pdf to $filePermission";
+	
+	# Decode and cleanup the tex string
+	my $texString = decode_base64(  $rh->{'texString'});
+	#Make sure the line endings are correct
+	$texString=~s/\r\n/\n/g;
+	$texString=~s/\r/\n/g;
+	
+	# Make sure that TeX is run in batchmode so that the tex program doesn't hang on errors
+	$texString = "\\batchmode\n".$texString;  # force errors to log.
+	
+	# Remove any old files
+	unlink("$texFileBasePath.tex","$texFileBasePath.dvi","$texFileBasePath.log","$texFileBasePath.aux",
+	       "$texFileBasePath.ps","$texFileBasePath.pdf");
+	# Create the texfile of the problem.
+	local(*TEX);
+	open(TEX,"> $texFileBasePath.tex") or die "Can't open $texFileBasePath.tex to store tex code";
+	local($/)=undef;
+	print TEX $texString;
+	close(TEX);	
+	
+	
+	# my $dviCommandLine = "$externalLatexPath $texFileBasePath.tex";# >/dev/null 2>/dev/null";
+	# my $psCommandLine = "$externalDvipsPath -o $texFileBasePath.ps $texFileBasePath.dvi >/dev/null";# 2>/dev/null";
+	# my $pdfCommandLine = "$externalGsPath -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile=$texFileBasePath.pdf -c save pop -f $texFileBasePath.ps";
+	# print "dviCommandLine:  $dviCommandLine\n";
+	# print "psCommandLine:   $psCommandLine\n";
+	# print "pdfCommandLine:  $pdfCommandLine\n";
+    #print "execute pdflatex", `$externalpdflatexPath $texFileBasePath.tex`, "\n";
+    #print "done $externalpdflatexPath   $texFileBasePath.tex\n";
+	# Change to the working directory and create the pdf files.
+	my $wd = $TEMPDIRECTORY.join("/",@pathElements); # working directory
+	# print "---cd $wd &&  $externalpdflatexPath $fileName.tex\n";
+	
+	system "cd $wd &&  $externalpdflatexPath $fileName.tex >>$fileName.log";
+	chmod 0777, "$texFileBasePath.pdf";
+	unless ($debugOn) {
+		unlink("$texFileBasePath.tex","$texFileBasePath.log","$texFileBasePath.aux",
+	       );
+	}
+ 	return({pdfURL => $url});
+
+
+
+
+}
+
+sub surePathToTmpFile2 {  # constructs intermediate directories if needed beginning at ${Global::htmlDirectory}tmp/
+               # the input path must be either the full path, or the path relative to this tmp sub directory
+         my $path      = shift;
+         my $delim    = getDirDelim();
+         my $tmpDirectory = $TEMPDIRECTORY;
+    # if the path starts with $tmpDirectory (which is permitted but optional) remove this initial segment
+    print "Original path $path\n";
+        $path =~ s|^$tmpDirectory|| if $path =~ m|^$tmpDirectory|;
+        $path = convertPath($path);
+        print "Creating path to $path using $delim\n";
+    # find the nodes on the given path
+        my @nodes     = split("$delim",$path);
+    # create new path
+        $path   = convertPath("$tmpDirectory");
+		print  "Creating path: $path\n ";
+        while (@nodes>1 ) {
+            
+            $path = convertPath($path . shift (@nodes) ."/");
+            print  "Creating path: $path\n ";
+            unless (-e $path) {
+            #   system("mkdir $path");
+                createDirectory($path,$tmp_directory_permission, $numericalGroupID) ||
+                die "Failed to create directory $path";
+
+            }
+
+        }
+        $path = convertPath($path . shift(@nodes));
+        print  "Creating path: $path\n ";
+       # system(qq!echo "" > $path! );
+
+$path;
+
+}
+
+
+sub pretty_print_rh {
+	my $rh = shift;
+	my $out = "";
+	my $type = ref($rh);
+	if ( ref($rh) =~/HASH/ ) {
+ 		foreach my $key (sort keys %{$rh})  {
+ 			$out .= "  $key => " . pretty_print_rh( $rh->{$key} ) . "\n";
+ 		}
+	} elsif ( ref($rh) =~ /SCALAR/ ) {
+		$out = "scalar reference ". ${$rh};
+	} elsif ( ref($rh) =~/Base64/ ) {
+		$out .= "base64 reference " .$$rh;
+	} else {
+		$out =  $rh;
+	}
+	if (defined($type) ) {
+		$out .= "type = $type \n";
+	}
+	return $out;
+}
+
+
+1;
diff --git a/lib/WebworkWebservice/RenderProblem.pm b/lib/WebworkWebservice/RenderProblem.pm
new file mode 100644
index 0000000000..bd79e063bf
--- /dev/null
+++ b/lib/WebworkWebservice/RenderProblem.pm
@@ -0,0 +1,674 @@
+#!/usr/local/bin/perl -w 
+
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WebworkWebservice/RenderProblem.pm,v 1.11 2010/06/08 11:22:43 gage 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
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+
+
+package WebworkWebservice::RenderProblem;
+use WebworkWebservice;
+use base qw(WebworkWebservice); 
+
+my $debugXmlCode=1;  # turns on the filter for debugging XMLRPC and SOAP code
+local(*DEBUGCODE);
+
+BEGIN { 
+	$main::VERSION = "2.5"; 
+}
+
+
+
+use strict;
+use sigtrap;
+use Carp;
+use WWSafe;
+#use Apache;
+use WeBWorK::CourseEnvironment;
+use WeBWorK::PG::Translator;
+use WeBWorK::PG::Local;
+use WeBWorK::DB;
+use WeBWorK::Constants;
+use WeBWorK::Utils qw(runtime_use formatDateTime makeTempDirectory);
+use WeBWorK::DB::Utils qw(global2user user2global);
+use WeBWorK::Utils::Tasks qw(fake_set fake_problem);
+use WeBWorK::PG::IO;
+use WeBWorK::PG::ImageGenerator;
+use Benchmark;
+use MIME::Base64 qw( encode_base64 decode_base64);
+
+#print "rereading Webwork\n";
+
+
+our $WW_DIRECTORY = $WebworkWebservice::WW_DIRECTORY;
+our $PG_DIRECTORY = $WebworkWebservice::PG_DIRECTORY;
+our $COURSENAME   = $WebworkWebservice::COURSENAME;
+our $PROTOCOL     = $WebworkWebservice::PROTOCOL;
+our $HOST_NAME    = $WebworkWebservice::HOST_NAME;
+our $PORT         = $WebworkWebservice::HOST_PORT;
+our $HOSTURL      = "$PROTOCOL://$HOST_NAME:$PORT"; 
+# 
+# #our $ce           = $WebworkWebservice::SeedCE;
+# # create a local course environment for some course
+# our $ce           = WeBWorK::CourseEnvironment->new(
+#                 {webwork_dir=> $WW_DIRECTORY,  courseName=>$COURSENAME} 
+#     );
+#     $ce->{apache_root_url} = $HOSTURL;
+# #print "\$ce = \n", WeBWorK::Utils::pretty_print_rh($ce);
+# 
+# 
+# #other services
+# # File variables
+# #our $WARNINGS='';
+# 
+# 
+# # imported constants
+# 
+# my $COURSE_TEMP_DIRECTORY 	= 	$ce->{courseDirs}->{html_tmp};
+# my $COURSE_TEMP_URL 		= 	$HOSTURL.$ce->{courseURLs}->{html_tmp};
+# 
+# my $pgMacrosDirectory 		= 	$ce->{pg_dir}.'/macros/';      
+# my $macroDirectory			=	$ce->{courseDirs}->{macros}.'/'; 
+# my $templateDirectory		= 	$ce->{courseDirs}->{templates}; 
+# 
+# my %PG_environment          =   $ce->{pg}->{specialPGEnvironmentVars};
+# 
+
+use constant DISPLAY_MODES => {
+	# display name   # mode name
+	tex           => "TeX",
+	plainText     => "HTML",
+	formattedText => "HTML_tth",
+	images        => "HTML_dpng",
+	jsMath	      => "HTML_jsMath",
+	MathJax	      => "HTML_MathJax",
+	asciimath     => "HTML_asciimath",
+};
+
+use constant DISPLAY_MODE_FAILOVER => {
+		TeX            => [],
+		HTML           => [],
+		HTML_tth       => [ "HTML", ],
+		HTML_dpng      => [ "HTML_tth", "HTML", ],
+		HTML_jsMath    => [ "HTML_dpng", "HTML_tth", "HTML", ],
+		HTML_MathJax    => [ "HTML_dpng", "HTML_tth", "HTML", ],
+		HTML_asciimath => [ "HTML_dpng", "HTML_tth", "HTML", ],
+		# legacy modes -- these are not supported, but some problems might try to
+		# set the display mode to one of these values manually and some macros may
+		# provide rendered versions for these modes but not the one we want.
+		Latex2HTML  => [ "TeX", "HTML", ],
+		HTML_img    => [ "HTML_dpng", "HTML_tth", "HTML", ],
+};
+	
+
+
+
+
+
+
+sub renderProblem {
+
+    my $rh = shift;
+###############################################################################
+# set up warning handler
+###############################################################################
+	my $warning_messages="";
+
+	my  $warning_handler = sub {
+			my ($warning) = @_;
+			CORE::warn $warning;
+			chomp $warning;
+			$warning_messages .="$warning\n";			
+		};
+
+    local $SIG{__WARN__} = $warning_handler;
+
+###########################################
+# Grab the course name, if this request is going to depend on 
+# some course other than the default course
+###########################################
+	my $courseName;
+	my $ce;
+	my $db;
+	my $user;
+	my $beginTime = new Benchmark;
+	if (defined($rh->{course}) and $rh->{course}=~/\S/ ) {
+		$courseName = $rh->{course};
+	} else {
+		$courseName = $COURSENAME;
+		# use the default $ce
+	}
+	#FIXME  put in check to make sure the course exists.
+	eval {
+		$ce           = WeBWorK::CourseEnvironment->new({webwork_dir=>$WW_DIRECTORY, courseName=> $courseName});
+		$ce->{apache_root_url}= $HOSTURL;
+	# Create database object for this course
+		$db = WeBWorK::DB->new($ce->{dbLayout});
+	};
+	# $ce->{pg}->{options}->{catchWarnings}=1;  #FIXME warnings aren't automatically caught 
+	# when using xmlrpc -- turn this on in the daemon2_course.
+	#^FIXME  need better way of determining whether the course actually exists.
+	warn "Unable to create course $courseName. Error: $@" if $@;
+	my $user = $rh->{user};
+	$user    = 'practice1' unless defined $user and $user =~/\S/;
+	
+###########################################
+# Authenticate this request
+###########################################
+
+
+
+###########################################
+# Determine the authorization level (permissions)
+###########################################
+
+
+
+
+###########################################
+# Determine the method for accessing data
+###########################################
+	my $problem_source_access    =   $rh->{problem_source_access};
+	# One of
+	#	source_from_course_set_problem
+	#   source_from_source_file_path
+	#   source_from_request
+	
+	my $data_access              =   $rh->{data_access};
+	# One of 
+	#   data_from_course
+	#   data_from_request
+
+###########################################
+# Determine an effective user for this interaction
+# or create one if it is not given
+# In order:  use effectiveUserName, studentLogin, or user  or 'foobar'
+###########################################
+	my $effectiveUserName;
+	if (defined($rh->{effectiveUser}) and $rh->{effectiveUser}=~/\S/ ) {
+		$effectiveUserName = $rh->{effectiveUser};
+	} elsif (defined($rh->{envir}->{studentLogin}) and $rh->{envir}->{studentLogin}=~/\S/ ) {
+		$effectiveUserName = $rh->{envir}->{studentLogin};
+	} elsif (defined($user) and $user =~ /\S/ ) {
+		$effectiveUserName = $user;
+	} else {
+		$effectiveUserName = 'foobar';
+	}
+	##################################################
+	my $effectiveUser = $db->getUser($effectiveUserName); # checked
+	my $effectiveUserPermissionLevel;
+	my $effectiveUserPassword;
+	unless (defined $effectiveUser ) {
+		$effectiveUser                = $db->newUser;
+		$effectiveUserPermissionLevel = $db->newPermissionLevel;
+		$effectiveUserPassword        = $db->newPassword;
+		$effectiveUser->user_id($effectiveUserName);
+		$effectiveUserPermissionLevel->user_id($effectiveUserName);
+		$effectiveUserPassword->user_id($effectiveUserName);
+		$effectiveUserPassword->password('');
+		$effectiveUser->last_name($rh->{envir}->{studentName}|| 'foobar');
+		$effectiveUser->first_name('');
+		$effectiveUser->student_id($rh->{envir}->{studentID}|| 'foobar');
+		$effectiveUser->email_address($rh->{envir}->{email}|| '');
+		$effectiveUser->section($rh->{envir}->{section} ||'');
+		$effectiveUser->recitation($rh->{envir}->{recitation} ||'');
+		$effectiveUser->comment('');
+		$effectiveUser->status('C');
+		$effectiveUser->password($rh->{envir}->{studentID}|| 'foobar');
+		$effectiveUserPermissionLevel->permission(0);
+	}		
+   #FIXME  these will fail if the keys are not defined within the environment.
+###########################################
+# Insure that set and problem are defined
+# Define the set and problem information from
+# data in the environment if necessary
+###########################################
+	# determine the set name and the set problem number
+	my $setName       =  (defined($rh->{envir}->{setNumber}) )    ? $rh->{envir}->{setNumber}    : '';
+	my $problemNumber =  (defined($rh->{envir}->{probNum})   )    ? $rh->{envir}->{probNum}      : 1 ;
+	my $problemSeed   =  (defined($rh->{envir}->{problemSeed}))   ? $rh->{envir}->{problemSeed}  : 1 ;
+	my $psvn          =  (defined($rh->{envir}->{psvn})      )    ? $rh->{envir}->{psvn}         : 1234 ;
+	my $problemStatus =  $rh->{problem_state}->{recorded_score}|| 0 ;
+	my $problemValue  =  (defined($rh->{envir}->{problemValue}))   ? $rh->{envir}->{problemValue}  : 1 ;
+	my $num_correct   =  $rh->{problem_state}->{num_correct}   || 0 ;
+	my $num_incorrect =  $rh->{problem_state}->{num_incorrect} || 0 ;
+	my $problemAttempted = ($num_correct || $num_incorrect);
+	my $lastAnswer    = '';
+	
+	my $setRecord = $db->getMergedSet($effectiveUserName, $setName);
+ 	unless (defined($setRecord) and ref($setRecord) ) {
+		# if a User Set does not exist for this user and this set
+		# then we check the Global Set
+		# if that does not exist we create a fake set
+		# if it does, we add fake user data
+		my $userSetClass = $db->{set_user}->{record};
+		my $globalSet = $db->getGlobalSet($setName); # checked
+
+		if (not defined $globalSet) {
+			$setRecord = fake_set($db);
+		} else {
+			$setRecord = global2user($userSetClass, $globalSet);
+		}
+		# initializations
+		$setRecord->set_id($setName);
+		$setRecord->set_header("");
+		$setRecord->hardcopy_header("defaultHeader");
+		$setRecord->open_date(time()-60*60*24*7); #  one week ago
+		$setRecord->due_date(time()+60*60*24*7*2); # in two weeks
+		$setRecord->answer_date(time()+60*60*24*7*3); # in three weeks
+		$setRecord->psvn($rh->{envir}->{psvn}||0);
+	}
+	#warn "set Record is $setRecord";
+	# obtain the merged problem for $effectiveUser
+	my $problemRecord = $db->getMergedProblem($effectiveUserName, $setName, $problemNumber); 
+	
+	# if that is not yet defined obtain the global problem,
+	# convert it to a user problem, and add fake user data
+	unless (defined $problemRecord) {
+		my $userProblemClass = $db->{problem_user}->{record};
+		my $globalProblem = $db->getGlobalProblem($setName, $problemNumber); # checked
+		# if the global problem doesn't exist either, bail!
+		if(not defined $globalProblem) {
+			$problemRecord = fake_problem($db);
+		} else {
+			$problemRecord = global2user($userProblemClass, $globalProblem);
+		}
+		# initializations
+		$problemRecord->user_id($effectiveUserName);
+		$problemRecord->problem_id($problemNumber);
+		$problemRecord->set_id($setName);
+		$problemRecord->problem_seed($problemSeed);
+		$problemRecord->status($problemStatus);
+		$problemRecord->value($problemValue);
+		$problemRecord->attempted($problemAttempted);
+		$problemRecord->last_answer($lastAnswer);
+		$problemRecord->num_correct($num_correct);
+		$problemRecord->num_incorrect($num_incorrect);
+	}
+	# initialize problem source
+	my $problem_source;
+	my $r_problem_source =undef;
+  	if (defined($rh->{source})) {
+  		$problem_source = decode_base64($rh->{source});
+  		$problem_source =~ tr /\r/\n/;
+		$r_problem_source =\$problem_source;
+		$problemRecord->source_file($rh->{envir}->{fileName}) if defined $rh->{envir}->{fileName};
+  	} elsif (defined($rh->{sourceFilePath}) and $rh->{sourceFilePath} =/\S/)  {
+  	    $problemRecord->source_file($rh->{sourceFilePath});
+  	}
+	$problemRecord->source_file('foobar') unless defined($problemRecord->source_file);
+
+    #warn "problem Record is $problemRecord";
+	# now we're sure we have valid UserSet and UserProblem objects
+	# yay!
+
+##################################################
+# Other initializations
+##################################################
+	my $translationOptions = {
+		displayMode     => $rh->{envir}->{displayMode},
+		showHints	    => $rh->{envir}->{showHints},
+		showSolutions   => $rh->{envir}->{showSolutions},
+ 		refreshMath2img => $rh->{envir}->{showHints} || $rh->{envir}->{showSolutions},
+ 		processAnswers  => 1,
+ 		catchWarnings   => 1,
+        # methods for supplying the source, 
+        r_source        => $r_problem_source, # reference to a source file string.
+        # if reference is not defined then the path is obtained 
+        # from the problem object.
+        permissionLevel => $rh->{envir}->{permissionLevel} || 0,
+	};
+	
+	my $formFields = $rh->{envir}->{inputs_ref};
+	my $key        = $rh->{envir}->{key} || '';
+	
+	
+	#check definitions
+	#warn "setRecord is ", WebworkWebservice::pretty_print_rh($setRecord);
+	#warn "problemRecord is",WebworkWebservice::pretty_print_rh($problemRecord);
+# 	warn "envir is\n ",WebworkWebservice::pretty_print_rh(__PACKAGE__->defineProblemEnvir(
+# 		$ce,
+# 		$effectiveUser,
+# 		$key,
+# 		$setRecord,
+# 		$problemRecord,
+# 		$psvn,  #FIXME -- not used
+# 		$formFields,
+# 		$translationOptions,
+# 	));
+#################################################
+
+# Other options can be over ridden by modifying 
+# $ce->{pg}
+
+
+
+# We'll try to use this code instead so that Local does all of the work.
+# Most of the configuration will take place in the fake course associated
+# with XMLRPC responses
+#   problem needs to be loaded with the following:
+#   	source_file
+#       status
+#       num_correct
+#       num_incorrect
+#   it doesn't seem that $effectiveUser, $set or $key is used in the subroutine
+#   except that it is passed on to defineProblemEnvironment
+
+	my $pg;
+	$pg = WebworkWebservice::RenderProblem->new(
+		$ce,
+		$effectiveUser,
+		$key,
+		$setRecord,
+		$problemRecord,
+		$setRecord->psvn, # FIXME: this field should be removed
+		$formFields,
+		# translation options
+		$translationOptions,
+# 		{ # extras
+# 				overrides       => $rh->{overrides}},
+#         }
+		
+	);
+  
+    my $internal_debug_messages;
+    if (ref ($pg->{pgcore}) ) {
+    	$internal_debug_messages = $pg->{pgcore}->get_internal_debug_messages;
+    } else {
+    	$internal_debug_messages = ['Error in obtaining debug messages from PGcore'];
+    }
+	# new version of output:
+	my $out2   = {
+		text 						=> encode_base64( $pg->{body_text}  ),
+		header_text 				=> encode_base64( $pg->{head_text} ),
+		answers 					=> $pg->{answers},
+		errors         				=> $pg->{errors},
+		WARNINGS	   				=> encode_base64( 
+		                                 "WARNINGS\n".$warning_messages."\nMore\n".$pg->{warnings} 
+		                               ),
+		problem_result 				=> $pg->{result},
+		problem_state				=> $pg->{state},
+		flags						=> $pg->{flags},
+		internal_debug_messages     => $internal_debug_messages,
+	};
+	
+	# Filter out bad reference types
+	###################
+	# DEBUGGING CODE
+	###################
+	if ($debugXmlCode) {
+		my $logDirectory =$ce->{courseDirs}->{logs};
+		my $xmlDebugLog  = "$logDirectory/xml_debug.txt";
+		warn "Opening debug log $xmlDebugLog\n" ;
+		open (DEBUGCODE, ">>$xmlDebugLog") || die "Can't open $xmlDebugLog";
+		print DEBUGCODE "\n\nStart xml encoding\n";
+	}
+	
+	$out2->{answers} = xml_filter($out2->{answers}); # check this -- it might not be working correctly
+	##################
+	close(DEBUGCODE) if $debugXmlCode;
+	###################
+	
+	$out2->{flags}->{PROBLEM_GRADER_TO_USE} = undef;
+	my $endTime = new Benchmark;
+	$out2->{compute_time} = logTimingInfo($beginTime, $endTime);
+	# warn "flags are" , WebworkWebservice::pretty_print_rh($pg->{flags});
+	
+	$out2;
+	         
+}
+
+#  insures proper conversion to xml structure.
+sub xml_filter {
+	my $input = shift;
+	my $level = shift || 0;
+	my $space="  ";
+	# Hack to filter out CODE references
+	my $type = ref($input);
+	if (!defined($type) or !$type ) {
+		print DEBUGCODE $space x $level." : scalar -- not converted\n" if $debugXmlCode;
+	} elsif( $type =~/HASH/i or "$input"=~/HASH/i) {
+		print DEBUGCODE "HASH reference with ".%{$input}." elements will be investigated\n" if $debugXmlCode;
+		$level++;
+		foreach my $item (keys %{$input}) {
+			print DEBUGCODE "  "x$level."$item is " if $debugXmlCode;
+		    $input->{$item} = xml_filter($input->{$item},$level);   
+		}
+		$level--;
+		print DEBUGCODE "  "x$level."HASH reference completed \n" if $debugXmlCode;
+	} elsif( $type=~/ARRAY/i or "$input"=~/ARRAY/i) {
+		print DEBUGCODE "  "x$level."ARRAY reference with ".@{$input}." elements will be investigated\n" if $debugXmlCode;
+		$level++;
+		my $tmp = [];
+		foreach my $item (@{$input}) {
+			$item = xml_filter($item,$level);
+			push @$tmp, $item;
+		}
+		$input = $tmp;
+		$level--;
+		print DEBUGCODE "  "x$level."ARRAY reference completed",join(" ",@$input),"\n" if $debugXmlCode;
+	} elsif($type =~ /CODE/i or "$input" =~/CODE/i) {
+		$input = "CODE reference";
+		print DEBUGCODE "  "x$level."CODE reference, converted $input\n" if $debugXmlCode;
+	} else {
+		print DEBUGCODE  "  "x$level." $type and was  converted to string\n" if $debugXmlCode;
+		$input = "$type reference";
+	}
+	$input;
+	
+}
+
+
+sub logTimingInfo{
+    my ($beginTime,$endTime,) = @_;
+    my $out = "";
+    $out .= Benchmark::timestr( Benchmark::timediff($endTime , $beginTime) );
+    $out;
+}
+
+
+######################################################################
+sub new {
+	shift; # throw away invocant -- we don't need it
+	my ($ce, $user, $key, $set, $problem, $psvn, $formFields,
+		$translationOptions) = @_;
+	
+	#my $renderer = 'WeBWorK::PG::Local';
+	my $renderer = $ce->{pg}->{renderer};
+	
+	runtime_use $renderer;
+	# the idea is to have Local call back to the defineProblemEnvir below.
+	#return WeBWorK::PG::Local::new($renderer,@_);
+	return $renderer->new(@_);
+}
+
+
+#FIXME
+# Save these subroutines.
+# I'd like to use this version of defineProblemEnvir instead of the
+# the version in PG.pm  That adds flexibility.
+
+
+# sub translateDisplayModeNames($) {
+# 	my $name = shift;
+# 	return DISPLAY_MODES()->{$name};
+# }
+# sub defineProblemEnvir {
+# 	my (
+# 		$self,
+# 		$ce,
+# 		$user,
+# 		$key,
+# 		$set,
+# 		$problem,
+# 		$psvn,
+# 		$formFields,
+# 		$options,
+# 	) = @_;
+# 	
+# 	my %envir;
+# 	
+# 	# ----------------------------------------------------------------------
+# 	
+# 	# PG environment variables
+# 	# from docs/pglanguage/pgreference/environmentvariables as of 06/25/2002
+# 	# any changes are noted by "ADDED:" or "REMOVED:"
+# 	
+# 	# Vital state information
+# 	# ADDED: displayModeFailover, displayHintsQ, displaySolutionsQ,
+# 	#        refreshMath2img, texDisposition
+# 	
+# 	$envir{psvn}                = $set->psvn;
+# 	$envir{psvn}          = $envir{psvn};
+# 	$envir{probNum}             = $problem->problem_id;
+# 	$envir{questionNumber}      = $envir{probNum};
+# 	$envir{fileName}            = $problem->source_file;	 
+# 	$envir{probFileName}        = $envir{fileName};		 
+# 	$envir{problemSeed}         = $problem->problem_seed;
+# 	$envir{displayMode}         = translateDisplayModeNames($options->{displayMode});
+# 	$envir{languageMode}        = $envir{displayMode};	 
+# 	$envir{outputMode}          = $envir{displayMode};	 
+# 	$envir{displayHintsQ}       = $options->{showHints};	 
+# 	$envir{displaySolutionsQ}   = $options->{showSolutions};
+# 	$envir{texDisposition}      = "pdf"; # in webwork2, we use pdflatex
+# 	
+# 	# Problem Information
+# 	# ADDED: courseName, formatedDueDate
+# 	
+# 	$envir{openDate}            = $set->open_date;
+# 	$envir{formattedOpenDate}   = formatDateTime($envir{openDate}, $ce->{siteDefaults}{timezone});
+# 	$envir{dueDate}             = $set->due_date;
+# 	$envir{formattedDueDate}    = formatDateTime($envir{dueDate}, $ce->{siteDefaults}{timezone});
+# 	$envir{formatedDueDate}     = $envir{formattedDueDate}; # typo in many header files
+# 	$envir{answerDate}          = $set->answer_date;
+# 	$envir{formattedAnswerDate} = formatDateTime($envir{answerDate}, $ce->{siteDefaults}{timezone});
+# 	$envir{numOfAttempts}       = ($problem->num_correct || 0) + ($problem->num_incorrect || 0);
+# 	$envir{problemValue}        = $problem->value;
+# 	$envir{sessionKey}          = $key;
+# 	$envir{courseName}          = $ce->{courseName};
+# 	
+# 	# Student Information
+# 	# ADDED: studentID
+# 	
+# 	$envir{sectionName}      = $user->section;
+# 	$envir{sectionNumber}    = $envir{sectionName};
+# 	$envir{recitationName}   = $user->recitation;
+# 	$envir{recitationNumber} = $envir{recitationName};
+# 	$envir{setNumber}        = $set->set_id;
+# 	$envir{studentLogin}     = $user->user_id;
+# 	$envir{studentName}      = $user->first_name . " " . $user->last_name;
+# 	$envir{studentID}        = $user->student_id;
+# 	
+# 	# Answer Information
+# 	# REMOVED: refSubmittedAnswers
+# 	
+# 	$envir{inputs_ref} = $formFields;
+# 	
+# 	# External Programs
+# 	# ADDED: externalLaTeXPath, externalDvipngPath,
+# 	#        externalGif2EpsPath, externalPng2EpsPath
+# 	
+# 	$envir{externalTTHPath}      = $ce->{externalPrograms}->{tth};
+# 	$envir{externalLaTeXPath}    = $ce->{externalPrograms}->{latex};
+# 	$envir{externalDvipngPath}   = $ce->{externalPrograms}->{dvipng};
+# 	$envir{externalGif2EpsPath}  = $ce->{externalPrograms}->{gif2eps};
+# 	$envir{externalPng2EpsPath}  = $ce->{externalPrograms}->{png2eps};
+# 	$envir{externalGif2PngPath}  = $ce->{externalPrograms}->{gif2png};
+# 	
+# 	# Directories and URLs
+# 	# REMOVED: courseName
+# 	# ADDED: dvipngTempDir
+# 	# ADDED: MathJaxURL
+# 	# ADDED: asciimathURL
+# 	
+# 	$envir{cgiDirectory}           = undef;
+# 	$envir{cgiURL}                 = undef;
+# 	$envir{classDirectory}         = undef;
+# 	$envir{courseScriptsDirectory} = $ce->{pg}->{directories}->{macros}."/";
+# 	$envir{htmlDirectory}          = $ce->{courseDirs}->{html}."/";
+# 	$envir{htmlURL}                = $ce->{courseURLs}->{html}."/";
+# 	$envir{macroDirectory}         = $ce->{courseDirs}->{macros}."/";
+# 	$envir{templateDirectory}      = $ce->{courseDirs}->{templates}."/";
+# 	$envir{tempDirectory}          = $ce->{courseDirs}->{html_temp}."/";
+# 	$envir{tempURL}                = $ce->{courseURLs}->{html_temp}."/";
+# 	$envir{scriptDirectory}        = undef;
+# 	$envir{webworkDocsURL}         = $ce->{webworkURLs}->{docs}."/";
+# 	$envir{localHelpURL}           = $ce->{webworkURLs}->{local_help}."/";
+# 	$envir{jsMathURL}	           = $ce->{webworkURLs}->{jsMath};
+# 	$envir{asciimathURL}	       = $ce->{webworkURLs}->{asciimath};
+# 	
+# 	# Information for sending mail
+# 	
+# 	$envir{mailSmtpServer} = $ce->{mail}->{smtpServer};
+# 	$envir{mailSmtpSender} = $ce->{mail}->{smtpSender};
+# 	$envir{ALLOW_MAIL_TO}  = $ce->{mail}->{allowedRecipients};
+# 	
+# 	# Default values for evaluating answers
+# 	
+# 	my $ansEvalDefaults = $ce->{pg}->{ansEvalDefaults};
+# 	$envir{$_} = $ansEvalDefaults->{$_} foreach (keys %$ansEvalDefaults);
+# 	
+# 	# ----------------------------------------------------------------------
+# 	
+# 	my $basename = "equation-$envir{psvn}.$envir{probNum}";
+# 	$basename .= ".$envir{problemSeed}" if $envir{problemSeed};
+# 	
+# 	# to make grabbing these options easier, we'll pull them out now...
+# 	my %imagesModeOptions = %{$ce->{pg}->{displayModeOptions}->{images}};
+# 	
+# 	# Object for generating equation images
+# 	$envir{imagegen} = WeBWorK::PG::ImageGenerator->new(
+# 		tempDir  => $ce->{webworkDirs}->{tmp}, # global temp dir
+# 		latex	 => $envir{externalLaTeXPath},
+# 		dvipng   => $envir{externalDvipngPath},
+# 		useCache => 1,
+# 		cacheDir => $ce->{webworkDirs}->{equationCache},
+# 		cacheURL => $ce->{webworkURLs}->{equationCache},
+# 		cacheDB  => $ce->{webworkFiles}->{equationCacheDB},
+# 		useMarkers      => ($imagesModeOptions{dvipng_align} && $imagesModeOptions{dvipng_align} eq 'mysql'),
+# 		dvipng_align    => $imagesModeOptions{dvipng_align},
+# 		dvipng_depth_db => $imagesModeOptions{dvipng_depth_db},
+# 	);
+# 
+# 	#  ADDED: jsMath options
+# 	$envir{jsMath} = {%{$ce->{pg}{displayModeOptions}{jsMath}}};
+# 	
+# 	# Other things...
+# 	$envir{QUIZ_PREFIX}              = $options->{QUIZ_PREFIX}; # used by quizzes
+# 	$envir{PROBLEM_GRADER_TO_USE}    = $ce->{pg}->{options}->{grader};
+# 	$envir{PRINT_FILE_NAMES_FOR}     = $ce->{pg}->{specialPGEnvironmentVars}->{PRINT_FILE_NAMES_FOR};
+# 
+#         #  ADDED: __files__
+#         #    an array for mapping (eval nnn) to filenames in error messages
+# 	$envir{__files__} = {
+# 	  root => $ce->{webworkDirs}{root},     # used to shorten filenames
+# 	  pg   => $ce->{pg}{directories}{root}, # ditto
+# 	  tmpl => $ce->{courseDirs}{templates}, # ditto
+# 	};
+# 	
+# 	# variables for interpreting capa problems and other things to be
+#         # seen in a pg file
+# 	my $specialPGEnvironmentVarHash = $ce->{pg}->{specialPGEnvironmentVars};
+# 	for my $SPGEV (keys %{$specialPGEnvironmentVarHash}) {
+# 		$envir{$SPGEV} = $specialPGEnvironmentVarHash->{$SPGEV};
+# 	}
+# 	
+# 	return \%envir;
+# }
+
+
+
+
+1;
diff --git a/logs/README b/logs/README
new file mode 100644
index 0000000000..62d842f0b5
--- /dev/null
+++ b/logs/README
@@ -0,0 +1,3 @@
+$CVSHeader: webwork-modperl/DATA/uploads/README,v 1.1 2004/06/07 23:00:01 sh002i Exp $
+
+WeBWorK log files are written to this directory.
diff --git a/tmp/README b/tmp/README
new file mode 100644
index 0000000000..48942bbd79
--- /dev/null
+++ b/tmp/README
@@ -0,0 +1,4 @@
+$CVSHeader: webwork-modperl/logs/README,v 1.1 2004/06/30 01:26:02 sh002i Exp $
+
+This directory is used for temporary files that need not be web
+accessible.