--- loncom/interface/printout.pl	2017/11/12 16:23:03	1.166
+++ loncom/interface/printout.pl	2021/01/25 18:06:55	1.168
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc.
 #
-# $Id: printout.pl,v 1.166 2017/11/12 16:23:03 raeburn Exp $
+# $Id: printout.pl,v 1.168 2021/01/25 18:06:55 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -211,6 +211,9 @@ if ($student_names=~/_END_/) {
     @names_pack=split(/_ENDPERSON_/,$student_names);
 }
 if ($backref) {
+    if ($backref =~ m{^(/uploaded/$LONCAPA::match_domain/$LONCAPA::match_courseid/default_\d+.page)}) {
+        $backref = $1;
+    }
     print('<p>'.&mt("[_1]Return[_2] to resource.",
 		    "<a href=\"$backref\"><b>","</b></a>").'</p>');
     print('<p><a href="javascript:gopost(\'/adm/printout\',\''.$backref.'\');">'.
@@ -981,7 +984,6 @@ sub convert_figure {
 	&File::Path::mkpath($path,0,0777);
 	$not_eps =~ s/^\s+//;
 	$not_eps =~ s/\s+$//;
-	$not_eps =~ s/ /\\ /g;
     my $prettyname=$not_eps;
 	if ($advanced_role) {
 	    $prettyname=~s|$perlvar{'lonDocRoot'}/|/|;