--- loncom/interface/lonprintout.pm 2002/07/18 17:34:29 1.39
+++ loncom/interface/lonprintout.pm 2002/07/23 14:09:45 1.41
@@ -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.41 2002/07/23 14:09:45 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -72,7 +72,7 @@ sub menu_for_output {
Current document
(you will print what you see on the screen)
ENDMENUOUT1
- if (!$ENV{'request.role'}=~m/^au\./) {
+ if (not $ENV{'request.role'}=~m/^au\./) {
$r->print(< All problems from the primary sequence
The whole primary sequence (problems plus all html and xml files)
@@ -142,8 +142,11 @@ ENDPART
&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'});
@@ -289,7 +292,7 @@ ENDPART
$result =~ s/{\\par }\s*\\\\/\\\\/gm;
$result =~ s/\\\\\s+\[/ \[/g;
$result =~ s/θ/\$\\theta\$/g; #converts theta from html into tex
- $result =~ s/\b_+\b/\\makebox\[1 cm\]\[b\]{\\hrulefill}/g;
+ $result =~ s/\b__+\b/\\makebox\[1 cm\]\[b\]{\\hrulefill}/g;
#conversion of html characters to LaTeX equivalents
if ($result =~ m/&(\w+|#\d+);/) {
$result = &character_chart($result);
@@ -311,81 +314,82 @@ FINALEND
sub character_chart {
my $result = shift;
- $result =~ s/ //g;
- $result =~ s/
//g;
- $result =~ s/
//g;
- $result =~ s/ / /g;
- $result =~ s/!/!/g;
- $result =~ s/"/"/g;
+ $result =~ s/�?0?7;//g;
+ $result =~ s/�?0?9;//g;
+ $result =~ s/�?10;//g;
+ $result =~ s/�?13;//g;
+ $result =~ s/�?32;/ /g;
+ $result =~ s/�?33;/!/g;
+ $result =~ s/�?34;/"/g;
$result =~ s/"/"/g;
- $result =~ s/#/\\#/g;
-# $result =~ s/$/\\\$/g;
- $result =~ s/%/\\%/g;
- $result =~ s/&/\\&/g;
+ $result =~ s/�?35;/\\#/g;
+# $result =~ s/�?36;/\\\$/g;
+ $result =~ s/�?37;/\\%/g;
+ $result =~ s/�?38;/\\&/g;
$result =~ s/&/\\&/g;
- $result =~ s/'/'/g;
- $result =~ s/(/(/g;
- $result =~ s/)/)/g;
- $result =~ s/*/\*/g;
- $result =~ s/+/\+/g;
- $result =~ s/,/,/g;
- $result =~ s/-/-/g;
- $result =~ s/./\./g;
- $result =~ s///\//g;
- $result =~ s/0/0/g;
- $result =~ s/1/1/g;
- $result =~ s/2/2/g;
- $result =~ s/3/3/g;
- $result =~ s/4/4/g;
- $result =~ s/5/5/g;
- $result =~ s/6/6/g;
- $result =~ s/7/7/g;
- $result =~ s/8/8/g;
- $result =~ s/9/9/g;
- $result =~ s/:/:/g;
- $result =~ s/;/;/g;
- $result =~ s/</\$<\$/g;
+ $result =~ s/�?39;/'/g;
+ $result =~ s/�?40;/(/g;
+ $result =~ s/�?41;/)/g;
+ $result =~ s/�?42;/\*/g;
+ $result =~ s/�?43;/\+/g;
+ $result =~ s/�?44;/,/g;
+ $result =~ s/�?45;/-/g;
+ $result =~ s/�?46;/\./g;
+ $result =~ s/�?47;/\//g;
+ $result =~ s/�?48;/0/g;
+ $result =~ s/�?49;/1/g;
+ $result =~ s/�?50;/2/g;
+ $result =~ s/�?51;/3/g;
+ $result =~ s/�?52;/4/g;
+ $result =~ s/�?53;/5/g;
+ $result =~ s/�?54;/6/g;
+ $result =~ s/�?55;/7/g;
+ $result =~ s/�?56;/8/g;
+ $result =~ s/�?57;/9/g;
+ $result =~ s/�?58;/:/g;
+ $result =~ s/�?59;/;/g;
+ $result =~ s/�?60;/\$<\$/g;
$result =~ s/</\$<\$/g;
- $result =~ s/=/\$=\$/g;
- $result =~ s/>/\$>\$/g;
+ $result =~ s/�?61;/\$=\$/g;
+ $result =~ s/�?62;/\$>\$/g;
$result =~ s/>/\$>\$/g;
- $result =~ s/?/?/g;
-# $result =~ s/@//g;
- $result =~ s/A/A/g;
- $result =~ s/B/B/g;
- $result =~ s/C/C/g;
- $result =~ s/D/D/g;
- $result =~ s/E/E/g;
- $result =~ s/F/F/g;
- $result =~ s/G/G/g;
- $result =~ s/H/H/g;
- $result =~ s/I/I/g;
- $result =~ s/J/J/g;
- $result =~ s/K/K/g;
- $result =~ s/L/L/g;
- $result =~ s/M/M/g;
- $result =~ s/N/N/g;
- $result =~ s/O/O/g;
- $result =~ s/P/P/g;
- $result =~ s/Q/Q/g;
- $result =~ s/R/R/g;
- $result =~ s/S/S/g;
- $result =~ s/T/T/g;
- $result =~ s/U/U/g;
- $result =~ s/V/V/g;
- $result =~ s/W/W/g;
- $result =~ s/X/X/g;
- $result =~ s/Y/Y/g;
- $result =~ s/Z/Z/g;
- $result =~ s/[/[/g;
- $result =~ s/\/\\/g;
- $result =~ s/]/]/g;
-# $result =~ s/^//g;
-# $result =~ s/_//g;
- $result =~ s/`/`/g;
- $result =~ s/a/a/g;
- $result =~ s/b/b/g;
- $result =~ s/c/c/g;
+ $result =~ s/�?63;/?/g;
+# $result =~ s/�?64;//g;
+ $result =~ s/�?65;/A/g;
+ $result =~ s/�?66;/B/g;
+ $result =~ s/�?67;/C/g;
+ $result =~ s/�?68;/D/g;
+ $result =~ s/�?69;/E/g;
+ $result =~ s/�?70;/F/g;
+ $result =~ s/�?71;/G/g;
+ $result =~ s/�?72;/H/g;
+ $result =~ s/�?73;/I/g;
+ $result =~ s/�?74;/J/g;
+ $result =~ s/�?75;/K/g;
+ $result =~ s/�?76;/L/g;
+ $result =~ s/�?77;/M/g;
+ $result =~ s/�?78;/N/g;
+ $result =~ s/�?79;/O/g;
+ $result =~ s/�?80;/P/g;
+ $result =~ s/�?81;/Q/g;
+ $result =~ s/�?82;/R/g;
+ $result =~ s/�?83;/S/g;
+ $result =~ s/�?84;/T/g;
+ $result =~ s/�?85;/U/g;
+ $result =~ s/�?86;/V/g;
+ $result =~ s/�?87;/W/g;
+ $result =~ s/�?88;/X/g;
+ $result =~ s/�?89;/Y/g;
+ $result =~ s/�?90;/Z/g;
+ $result =~ s/�?91;/[/g;
+ $result =~ s/�?92;/\\/g;
+ $result =~ s/�?93;/]/g;
+# $result =~ s/�?94;//g;
+# $result =~ s/�?95;//g;
+ $result =~ s/�?96;/`/g;
+ $result =~ s/�?97;/a/g;
+ $result =~ s/�?98;/b/g;
+ $result =~ s/�?99;/c/g;
$result =~ s/d/d/g;
$result =~ s/e/e/g;
$result =~ s/f/f/g;
@@ -632,6 +636,9 @@ sub character_chart {
return $result;
}
+
+#'"`
+
sub additional_cleanup {
my $result = shift;
my $first_app = index($result,'\documentclass',0);