[LON-CAPA-cvs] cvs: loncom /interface lonprintout.pm

sakharuk lon-capa-cvs@mail.lon-capa.org
Mon, 22 Jul 2002 20:04:16 -0000


sakharuk		Mon Jul 22 16:04:16 2002 EDT

  Modified files:              
    /loncom/interface	lonprintout.pm 
  Log:
  Corrected HTML entries.
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.39 loncom/interface/lonprintout.pm:1.40
--- loncom/interface/lonprintout.pm:1.39	Thu Jul 18 13:34:29 2002
+++ loncom/interface/lonprintout.pm	Mon Jul 22 16:04:16 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.39 2002/07/18 17:34:29 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.40 2002/07/22 20:04:16 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -72,7 +72,7 @@
 <input type="radio" name="choice" value="Standard LaTeX output for current document" checked>  Current document
 (you will print what you see on the screen)<br />
 ENDMENUOUT1
-    if (!$ENV{'request.role'}=~m/^au\./) {
+    if (not $ENV{'request.role'}=~m/^au\./) {
     $r->print(<<ENDMENUOUT2);
 <input type="radio" name="choice" value="Standard LaTeX output for the primary sequence">  All problems from the primary sequence<br />
 <input type="radio" name="choice" value="Standard LaTeX output for whole primary sequence">  The whole primary sequence (problems plus all html and xml files)<br />
@@ -142,8 +142,11 @@
       &Apache::lonnet::delenv('form.grade_target');
       $result .= $texversion;
       $result = &additional_cleanup($result);
-      if ($ENV{'form.url'}=~m/\.page\s*$/) {($result,$number_of_columns) = &page_cleanup($result);}
-    } elsif ($choice eq 'Standard LaTeX output for the primary sequence' or $choice eq 'Standard LaTeX output for whole primary sequence') {
+      if ($ENV{'form.url'}=~m/\.page\s*$/) {
+	  ($result,$number_of_columns) = &page_cleanup($result);
+      }
+    } elsif ($choice eq 'Standard LaTeX output for the primary sequence' or 
+             $choice eq 'Standard LaTeX output for whole primary sequence') {
       #-- minimal sequence to which the current document belongs
         #-- where is the primary sequence containing file?
 	my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});
@@ -311,81 +314,81 @@
 
 sub character_chart {
     my $result = shift;	
-    $result =~ s/&#009;//g;
-    $result =~ s/&#010;//g;
-    $result =~ s/&#013;//g;
-    $result =~ s/&#032;/ /g;
-    $result =~ s/&#033;/!/g;
-    $result =~ s/&#034;/"/g;
+    $result =~ s/&#0?0?9;//g;
+    $result =~ s/&#0?10;//g;
+    $result =~ s/&#0?13;//g;
+    $result =~ s/&#0?32;/ /g;
+    $result =~ s/&#0?33;/!/g;
+    $result =~ s/&#0?34;/"/g;
     $result =~ s/&quot;/"/g; 
-    $result =~ s/&#035;/\\#/g;
-#    $result =~ s/&#036;/\\\$/g;
-    $result =~ s/&#037;/\\%/g; 
-    $result =~ s/&#038;/\\&/g; 
+    $result =~ s/&#0?35;/\\#/g;
+#    $result =~ s/&#0?36;/\\\$/g;
+    $result =~ s/&#0?37;/\\%/g; 
+    $result =~ s/&#0?38;/\\&/g; 
     $result =~ s/&amp;/\\&/g;
-    $result =~ s/&#039;/'/g;
-    $result =~ s/&#040;/(/g;
-    $result =~ s/&#041;/)/g;
-    $result =~ s/&#042;/\*/g;
-    $result =~ s/&#043;/\+/g;
-    $result =~ s/&#044;/,/g;
-    $result =~ s/&#045;/-/g;
-    $result =~ s/&#046;/\./g;
-    $result =~ s/&#047;/\//g;
-    $result =~ s/&#048;/0/g;
-    $result =~ s/&#049;/1/g;
-    $result =~ s/&#050;/2/g;
-    $result =~ s/&#051;/3/g;
-    $result =~ s/&#052;/4/g;
-    $result =~ s/&#053;/5/g;
-    $result =~ s/&#054;/6/g;
-    $result =~ s/&#055;/7/g;
-    $result =~ s/&#056;/8/g;
-    $result =~ s/&#057;/9/g;
-    $result =~ s/&#058;/:/g;
-    $result =~ s/&#059;/;/g;
-    $result =~ s/&#060;/\$<\$/g;
+    $result =~ s/&#0?39;/'/g;
+    $result =~ s/&#0?40;/(/g;
+    $result =~ s/&#0?41;/)/g;
+    $result =~ s/&#0?42;/\*/g;
+    $result =~ s/&#0?43;/\+/g;
+    $result =~ s/&#0?44;/,/g;
+    $result =~ s/&#0?45;/-/g;
+    $result =~ s/&#0?46;/\./g;
+    $result =~ s/&#0?47;/\//g;
+    $result =~ s/&#0?48;/0/g;
+    $result =~ s/&#0?49;/1/g;
+    $result =~ s/&#0?50;/2/g;
+    $result =~ s/&#0?51;/3/g;
+    $result =~ s/&#0?52;/4/g;
+    $result =~ s/&#0?53;/5/g;
+    $result =~ s/&#0?54;/6/g;
+    $result =~ s/&#0?55;/7/g;
+    $result =~ s/&#0?56;/8/g;
+    $result =~ s/&#0?57;/9/g;
+    $result =~ s/&#0?58;/:/g;
+    $result =~ s/&#0?59;/;/g;
+    $result =~ s/&#0?60;/\$<\$/g;
     $result =~ s/&lt;/\$<\$/g;
-    $result =~ s/&#061;/\$=\$/g;
-    $result =~ s/&#062;/\$>\$/g;
+    $result =~ s/&#0?61;/\$=\$/g;
+    $result =~ s/&#0?62;/\$>\$/g;
     $result =~ s/&gt;/\$>\$/g;
-    $result =~ s/&#063;/?/g;
-#    $result =~ s/&#064;//g;
-    $result =~ s/&#065;/A/g;
-    $result =~ s/&#066;/B/g;
-    $result =~ s/&#067;/C/g;
-    $result =~ s/&#068;/D/g;
-    $result =~ s/&#069;/E/g;
-    $result =~ s/&#070;/F/g;
-    $result =~ s/&#071;/G/g;
-    $result =~ s/&#072;/H/g;
-    $result =~ s/&#073;/I/g;
-    $result =~ s/&#074;/J/g;
-    $result =~ s/&#075;/K/g;
-    $result =~ s/&#076;/L/g;
-    $result =~ s/&#077;/M/g;
-    $result =~ s/&#078;/N/g;
-    $result =~ s/&#079;/O/g;
-    $result =~ s/&#080;/P/g;
-    $result =~ s/&#081;/Q/g;
-    $result =~ s/&#082;/R/g;
-    $result =~ s/&#083;/S/g;
-    $result =~ s/&#084;/T/g;
-    $result =~ s/&#085;/U/g;
-    $result =~ s/&#086;/V/g;
-    $result =~ s/&#087;/W/g;
-    $result =~ s/&#088;/X/g;
-    $result =~ s/&#089;/Y/g;
-    $result =~ s/&#090;/Z/g;
-    $result =~ s/&#091;/[/g;
-    $result =~ s/&#092;/\\/g;
-    $result =~ s/&#093;/]/g;
-#    $result =~ s/&#094;//g;
-#    $result =~ s/&#095;//g;
-    $result =~ s/&#096;/`/g;
-    $result =~ s/&#097;/a/g;
-    $result =~ s/&#098;/b/g;
-    $result =~ s/&#099;/c/g;
+    $result =~ s/&#0?63;/?/g;
+#    $result =~ s/&#0?64;//g;
+    $result =~ s/&#0?65;/A/g;
+    $result =~ s/&#0?66;/B/g;
+    $result =~ s/&#0?67;/C/g;
+    $result =~ s/&#0?68;/D/g;
+    $result =~ s/&#0?69;/E/g;
+    $result =~ s/&#0?70;/F/g;
+    $result =~ s/&#0?71;/G/g;
+    $result =~ s/&#0?72;/H/g;
+    $result =~ s/&#0?73;/I/g;
+    $result =~ s/&#0?74;/J/g;
+    $result =~ s/&#0?75;/K/g;
+    $result =~ s/&#0?76;/L/g;
+    $result =~ s/&#0?77;/M/g;
+    $result =~ s/&#0?78;/N/g;
+    $result =~ s/&#0?79;/O/g;
+    $result =~ s/&#0?80;/P/g;
+    $result =~ s/&#0?81;/Q/g;
+    $result =~ s/&#0?82;/R/g;
+    $result =~ s/&#0?83;/S/g;
+    $result =~ s/&#0?84;/T/g;
+    $result =~ s/&#0?85;/U/g;
+    $result =~ s/&#0?86;/V/g;
+    $result =~ s/&#0?87;/W/g;
+    $result =~ s/&#0?88;/X/g;
+    $result =~ s/&#0?89;/Y/g;
+    $result =~ s/&#0?90;/Z/g;
+    $result =~ s/&#0?91;/[/g;
+    $result =~ s/&#0?92;/\\/g;
+    $result =~ s/&#0?93;/]/g;
+#    $result =~ s/&#0?94;//g;
+#    $result =~ s/&#0?95;//g;
+    $result =~ s/&#0?96;/`/g;
+    $result =~ s/&#0?97;/a/g;
+    $result =~ s/&#0?98;/b/g;
+    $result =~ s/&#0?99;/c/g;
     $result =~ s/&#100;/d/g;
     $result =~ s/&#101;/e/g;
     $result =~ s/&#102;/f/g;