--- loncom/interface/lonsyllabus.pm	2014/06/17 23:22:14	1.137
+++ loncom/interface/lonsyllabus.pm	2017/02/18 19:05:51	1.141
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Syllabus
 #
-# $Id: lonsyllabus.pm,v 1.137 2014/06/17 23:22:14 raeburn Exp $
+# $Id: lonsyllabus.pm,v 1.141 2017/02/18 19:05:51 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -116,7 +116,7 @@ sub handler {
         }
         unless ($allowed && $forceedit) {
             my $file=&Apache::lonnet::filelocation("",$item);
-            if ($file =~ /\.(tex|x?html?)$/) {  
+            if ($file =~ /\.(tex|x?html?)$/) {
                 my $filetype = $1;
                 my $filecontents=&Apache::lonnet::getfile($file);
                 if ($filecontents eq -1) {
@@ -125,8 +125,13 @@ sub handler {
                     if ($target eq 'tex') {
                         $r->print($filecontents);
                     } else {
-                        my $result = &Apache::lontexconvert::converted(\$filecontents,
-                                                                       $env{'form.texengine'});
+                        my $texengine = $env{'form.texengine'};
+                        if ($texengine eq '') {
+                            $texengine = 'tth';
+                        } elsif (lc($texengine) eq 'jsmath') {
+                            $texengine = 'MathJax';
+                        }
+                        my $result = &Apache::lontexconvert::converted(\$filecontents,$texengine);
                         my %args;
                         &get_breadcrumbs($cdom,$cnum,$crstype,\%args);
                         if ($env{'form.only_body'}) {
@@ -163,8 +168,17 @@ sub handler {
                               &mt('Print the syllabus directly from your web browser').
                               '\end{document}');
                 } else {
-                    $r->print(&Apache::lonwrapper::wrapper($item,undef,$env{'request.use_absolute'},
-                                                           undef,$is_pdf,&mt('Syllabus')));
+                    my $brcrum;
+                    if ($env{'form.folderpath'} =~ /^supplemental/) {
+                        my $title = $env{'form.title'};
+                        if ($title eq '') {
+                            $title = &mt('Syllabus');
+                        }
+                        $brcrum =
+                            &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
+                    }
+                    $r->print(&Apache::lonwrapper::wrapper($item,$brcrum,$env{'request.use_absolute'},
+                                                           undef,$is_pdf,undef,&mt('Syllabus')));
                 }
             }
             return OK;
@@ -178,12 +192,20 @@ sub handler {
                          '\end{document}');
             } else {
                 my $is_ext = 1;
-                my $is_pdf;
+                my ($is_pdf,$brcrum);
                 if ($external =~ /\.pdf$/i) {
                     $is_pdf = 1;
                 }
-                $r->print(&Apache::lonwrapper::wrapper($external,undef,$env{'request.use_absolute'},
-                                                       $is_ext,$is_pdf,&mt('Syllabus')));
+                if ($env{'form.folderpath'} =~ /^supplemental/) {
+                    my $title = $env{'form.title'};
+                    if ($title eq '') {
+                        $title = &mt('Syllabus');
+                    }
+                    $brcrum =
+                        &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
+                }
+                $r->print(&Apache::lonwrapper::wrapper($external,$brcrum,$env{'request.use_absolute'},
+                                                       $is_ext,$is_pdf,undef,&mt('Syllabus')));
             }
             return OK;
         }
@@ -580,6 +602,7 @@ ENDSCRIPT
         my $checkedstr = "var include = new Array('".join("','",@checked)."');";
         my $uncheckedstr = "var exclude = new Array('".join("','",@unchecked)."');";
         my $invurl = &mt('Invalid URL');
+        &js_escape(\$invurl);
         my $urlregexp = <<'ENDREGEXP';
 /^([a-z]([a-z]|\d|\+|-|\.)*):(\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?((\[(|(v[\da-f]{1,}\.(([a-z]|\d|-|\.|_|~)|[!\$&'\(\)\*\+,;=]|:)+))\])|((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=])*)(:\d*)?)(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*|(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)|((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)|((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)){0})(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i
 ENDREGEXP
@@ -1627,11 +1650,12 @@ sub editfile_button {
 }
 
 sub editbutton_js {
-    my %lt = &Apache::lonlocal::texthash(
+    my %js_lt = &Apache::lonlocal::texthash(
                min    => 'Are you sure you want to delete the contents of the syllabus template?',
                file   => 'Are you sure you want to delete the uploaded syllabus file?',
                noundo => 'This action cannot be reversed.'
              );
+    &js_escape(\%js_lt);
     return <<ENDJS;
                 <script type="text/javascript">
                 // <![CDATA[
@@ -1642,12 +1666,12 @@ sub editbutton_js {
                       if (document.getElementById('deleteuploaded_'+caller)) {
                           document.getElementById('deleteuploaded_'+caller).value=1;
                           if (caller == 'minimal') {
-                              if (confirm("$lt{'min'}"+"\\n"+"$lt{'noundo'}")) {
+                              if (confirm("$js_lt{'min'}"+"\\n"+"$js_lt{'noundo'}")) {
                                   document.syllabus.submit();
                               }
                           }
                           if (caller == 'file') {
-                              if (confirm("$lt{'file'}"+"\\n"+"$lt{'noundo'}")) {
+                              if (confirm("$js_lt{'file'}"+"\\n"+"$js_lt{'noundo'}")) {
                                   document.syllabus.submit();
                               }
                           }