--- loncom/interface/lonprintout.pm 2003/02/04 20:59:26 1.110
+++ loncom/interface/lonprintout.pm 2003/02/14 21:43:35 1.116
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.110 2003/02/04 20:59:26 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.116 2003/02/14 21:43:35 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -144,6 +144,7 @@ ENDMENUOUT4
+
@@ -158,9 +159,13 @@ sub sequence_content_menu {
my @sequence = split('___',$symbolic);
if ($sequence[0]=~/^uploaded/) {$primary_sequence = '/'.$sequence[0];}
else {$primary_sequence = '/res/'.$sequence[0];}
- my @master_seq = &coming_from_hash($primary_sequence,$sequence[0]);
- my @titles_master_seq = &titles_coming_from_hash($primary_sequence,$sequence[0]);
- foreach my $entity (@titles_master_seq) {$entity=~/^(.*)&&/; $entity=$1}
+ my @master_seq = &coming_from_hash($primary_sequence);
+ my @titles_master_seq = ();
+ for (my $i=0;$i<=$#master_seq;$i++) {
+ my ($path,$title,$symb) = split /&&/,$master_seq[$i];
+ $master_seq[$i] = $path.'&&'.$symb;
+ push @titles_master_seq, $title;
+ }
my @master_seq_view = @master_seq;
if ($ENV{'user.adv'}) {
for (my $i=0;$i<=$#master_seq_view;$i++) {
@@ -183,8 +188,7 @@ sub sequence_content_menu {
+DDD=$#titles_master_seq $titles_master_seq[0]
@@ -549,7 +554,11 @@ ENDPART
} else {
$main_seq = '/res/'.$ENV{'request.course.uri'};
}
- my @file_seq = &coming_from_hash_whole($main_seq);
+ my @file_seq = &coming_from_hash($main_seq);
+ for (my $i=0;$i<=$#file_seq;$i++) {
+ my ($path,$title,$symb) = split /&&/,$file_seq[$i];
+ $file_seq[$i] = $path.'&&'.$symb;
+ }
my $flag_latex_header_remove = 'NO';
#-- produce an output string
for (my $i=0;$i<=$#file_seq;$i++) {
@@ -586,8 +595,14 @@ ENDPART
#where is the primary sequence containing current resource (the same for all students)?
my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});
my @sequence = split('___',$symbolic);
- my $primary_sequence = '/res/'.$sequence[0];
- my @master_seq = &coming_from_hash($primary_sequence,$sequence[0]);
+ my $primary_sequence;
+ if ($sequence[0]=~/^uploaded/) {$primary_sequence = '/'.$sequence[0];}
+ else {$primary_sequence = '/res/'.$sequence[0];}
+ my @master_seq = &coming_from_hash($primary_sequence);
+ for (my $i=0;$i<=$#master_seq;$i++) {
+ my ($path,$title,$symb) = split /&&/,$master_seq[$i];
+ $master_seq[$i] = $path.'&&'.$symb;
+ }
#loop over students
my $flag_latex_header_remove = 'NO';
my %moreenv;
@@ -617,7 +632,7 @@ ENDPART
}
if ($current_output=~/\\documentclass/) {
my $courseidinfo = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
- $current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm}\\usepackage{fancyhdr}\\pagestyle{fancy}\\rhead{}\\chead{}\\lhead{$courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}} \\begin{document}\\noindent\\textit{\\textbf{$fullname}}\\vskip 3 mm /;
+ $current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm}\\usepackage{fancyhdr}\\pagestyle{fancy}\\rhead{}\\chead{}\\lhead{$courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}} \\begin{document}\\noindent\\textit{\\textbf{$fullname}}\\vskip 3 mm /;
} else {
my $blanspages = '';
for (my $j=0;$j<$ENV{'form.addedpages'};$j++) {$blanspages.='\clearpage\strut\clearpage';}
@@ -712,7 +727,7 @@ FINALEND
}
-sub coming_from_hash_whole {
+sub coming_from_hash {
my $mainsequence = shift;
my @resourcelist = ();
@@ -722,12 +737,12 @@ sub coming_from_hash_whole {
my $current_resource = $mapstart;
while ($current_resource ne $mapfinish) {
if ($hash{'src_'.$current_resource}=~/\.sequence$/) {
- push @resourcelist,&coming_from_hash_whole($hash{'src_'.$current_resource});
+ push @resourcelist,&coming_from_hash($hash{'src_'.$current_resource});
} else {
my $presymb;
if ($mainsequence =~ /\/res\/(.*)$/) {$presymb = $1;}
elsif ($mainsequence =~ /\/?(uploaded\/(.*))$/) {$presymb = $1;}
- my $rid = $hash{'ids_'.$hash{'src_'.$current_resource}};
+ my $rid = $current_resource;
if ($rid=~/,/) {
my @rid = split /,/, $rid;
foreach my $rid_element (@rid) {
@@ -742,98 +757,19 @@ sub coming_from_hash_whole {
}
$hash{'src_'.$current_resource} =~ m/\/res\/(.*)$/;
my $symb = $presymb.'___'.$rid.'___'.$1;
- push @resourcelist,$hash{'src_'.$current_resource}.'&&'.$symb;
- }
- $current_resource = $hash{'goesto_'.$hash{'to_'.$current_resource}};
- }
- return @resourcelist;
-}
-
-
-sub coming_from_hash {
-
- my ($mainsequence,$symb) = @_;
- my @resourcelist = ();
- my $mapid = $hash{'map_pc_'.$mainsequence};
- my $mapstart = $hash{'map_start_'.$mainsequence};
- my $mapfinish = $hash{'map_finish_'.$mainsequence};
- my ($presymb);
- if ($symb) {
- ($presymb)=split(/___/,$symb);
- } else {
- $presymb=$mainsequence;
- $presymb=~s|^/res/||;
- }
- $presymb = $presymb.'___';
- my $current_resource = $mapstart;
- while ($current_resource ne $mapfinish) {
- if (not $hash{'src_'.$current_resource}=~/\.sequence$/) {
- my $rid = $hash{'ids_'.$hash{'src_'.$current_resource}};
- if ($rid=~/,/) {
- my @rid = split /,/, $rid;
- foreach my $rid_element (@rid) {
- if ($rid_element =~ m/^$mapid\.(\d*)/) {
- $rid = $1;
- last;
- }
- }
- } else {
- $rid =~ m/^$mapid\.(\d*)/;
- $rid = $1;
- }
- $hash{'src_'.$current_resource} =~ m/\/res\/(.*)$/;
- $symb = $presymb.$rid.'___'.$1;
- push @resourcelist,$hash{'src_'.$current_resource}.'&&'.$symb;
- } else {
- push @resourcelist,&coming_from_hash($hash{'src_'.$current_resource});
+ push @resourcelist,$hash{'src_'.$current_resource}.'&&'.$hash{'title_'.$current_resource}.'&&'.$symb;
}
$current_resource = $hash{'goesto_'.$hash{'to_'.$current_resource}};
- }
+ }
#needs if final resource in the map (type="finish") contains something
- if (not $hash{'src_'.$current_resource}=~/\.sequence$/) {
- my $rid = $hash{'ids_'.$hash{'src_'.$current_resource}};
- if ($rid=~/,/) {
- my @rid = split /,/, $rid;
- foreach my $rid_element (@rid) {
- if ($rid_element =~ m/^$mapid\.(\d*)/) {
- $rid = $1;
- last;
- }
- }
- } else {
- $rid =~ m/^$mapid\.(\d*)/;
- $rid = $1;
- }
- $hash{'src_'.$current_resource} =~ m/\/res\/(.*)$/;
- $symb = $presymb.$rid.'___'.$1;
- push @resourcelist,$hash{'src_'.$current_resource}.'&&'.$symb;
- } else {
- push @resourcelist,&coming_from_hash($hash{'src_'.$current_resource});
- }
- return @resourcelist;
-}
-
-
-sub titles_coming_from_hash {
-
- my ($mainsequence,$symb) = @_;
- my @resourcelist = ();
- my $mapid = $hash{'map_pc_'.$mainsequence};
- my $mapstart = $hash{'map_start_'.$mainsequence};
- my $mapfinish = $hash{'map_finish_'.$mainsequence};
- my ($presymb);
- if ($symb) {
- ($presymb)=split(/___/,$symb);
- } else {
- $presymb=$mainsequence;
- $presymb=~s|^/res/||;
- }
- $presymb = $presymb.'___';
- my $current_resource = $mapstart;
- while ($current_resource ne $mapfinish) {
- if (not $hash{'src_'.$current_resource}=~/\.sequence$/) {
- my $rid = $hash{'ids_'.$hash{'src_'.$current_resource}};
- if ($rid=~/,/) {
+ if ($hash{'src_'.$current_resource}=~/\.sequence$/) {
+ push @resourcelist,&coming_from_hash($hash{'src_'.$current_resource});
+ } else {
+ my $presymb;
+ if ($mainsequence =~ /\/res\/(.*)$/) {$presymb = $1;}
+ elsif ($mainsequence =~ /\/?(uploaded\/(.*))$/) {$presymb = $1;}
+ my $rid = $current_resource;
+ if ($rid=~/,/) {
my @rid = split /,/, $rid;
foreach my $rid_element (@rid) {
if ($rid_element =~ m/^$mapid\.(\d*)/) {
@@ -842,41 +778,18 @@ sub titles_coming_from_hash {
}
}
} else {
- $rid =~ m/^$mapid\.(\d*)/;
+ $rid =~ m/^$mapid\.(\d*)/;
$rid = $1;
}
$hash{'src_'.$current_resource} =~ m/\/res\/(.*)$/;
- $symb = $presymb.$rid.'___'.$1;
- push @resourcelist,$hash{'title_'.$current_resource}.'&&'.$symb;
- } else {
- push @resourcelist,&titles_coming_from_hash($hash{'src_'.$current_resource});
+ my $symb = $presymb.'___'.$rid.'___'.$1;
+ push @resourcelist,$hash{'src_'.$current_resource}.'&&'.$hash{'title_'.$current_resource}.'&&'.$symb;
}
$current_resource = $hash{'goesto_'.$hash{'to_'.$current_resource}};
- }
- #needs if final resource in the map (type="finish") contains something
- if (not $hash{'src_'.$current_resource}=~/\.sequence$/) {
- my $rid = $hash{'ids_'.$hash{'src_'.$current_resource}};
- if ($rid=~/,/) {
- my @rid = split /,/, $rid;
- foreach my $rid_element (@rid) {
- if ($rid_element =~ m/^$mapid\.(\d*)/) {
- $rid = $1;
- last;
- }
- }
- } else {
- $rid =~ m/^$mapid\.(\d*)/;
- $rid = $1;
- }
- $hash{'src_'.$current_resource} =~ m/\/res\/(.*)$/;
- $symb = $presymb.$rid.'___'.$1;
- push @resourcelist,$hash{'title_'.$current_resource}.'&&'.$symb;
- } else {
- push @resourcelist,&titles_coming_from_hash($hash{'src_'.$current_resource});
- }
return @resourcelist;
}
+
sub latex_header_footer_remove {
my $text = shift;
$text =~ s/\\end{document}//;
@@ -887,326 +800,221 @@ sub latex_header_footer_remove {
sub character_chart {
my $result = shift;
- $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/�?35;/\\#/g;
-# $result =~ s/�?36;/\\\$/g;
- $result =~ s/�?37;/\\%/g;
- $result =~ s/�?38;/\\&/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/�?61;/\$=\$/g;
- $result =~ s/�?62;/\$>\$/g;
- $result =~ s/>/\$>\$/g;
- $result =~ s/�?63;/?/g;
+ $result =~ s/&\#0?0?(7|9);//g;
+ $result =~ s/&\#0?(10|13);//g;
+ $result =~ s/&\#0?32;/ /g;
+ $result =~ s/&\#0?33;/!/g;
+ $result =~ s/&(\#0?34|quot);/\"/g;
+ $result =~ s/&\#0?35;/\\\#/g;
+ $result =~ s/&\#0?36;/\\\$/g;
+ $result =~ s/&\#0?37;/\\%/g;
+ $result =~ s/&(\#0?38|amp);/\\&/g;
+ $result =~ s/&\#(0?39|146);/\'/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|130);/,/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|lt|\#139);/\$<\$/g;
+ $result =~ s/&\#0?61;/\$=\$/g;
+ $result =~ s/&(\#0?62|gt|\#155);/\$>\$/g;
+ $result =~ s/&\#0?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;
- $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/„/''/g;
- $result =~ s/…/\$\\ldots\$/g;
- $result =~ s/†/\$\\dagger\$/g;
- $result =~ s/‡/\$\\ddagger\$/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/•/\$\\bullet\$/g;
-# $result =~ s/–//g;
-# $result =~ s/—//g;
- $result =~ s/˜/~/g;
-# $result =~ s/™//g;
-# $result =~ s/š//g;
- $result =~ s/›/\$>\$/g;
- $result =~ s/œ/\\{\\oe\\}/g;
- $result =~ s/Ÿ/\\"\\{Y\\}/g;
- $result =~ s/ //g;
- $result =~ s/ //g;
- $result =~ s/¡/!`/g;
- $result =~ s/¡/!`/g; #`
-# $result =~ s/¢//g;
-# $result =~ s/¢//g;
- $result =~ s/£/\\pounds/g;
- $result =~ s/£/\\pounds/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/©/\\copyright/g;
- $result =~ s/©/\\copyright/g;
-# $result =~ s/ª//g;
-# $result =~ s/ª//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;/\$\\setminus\$/g;
+ $result =~ s/&\#0?93;/]/g;
+ $result =~ s/&\#(0?94|136);/\$\\wedge\$/g;
+ $result =~ s/&\#(0?95|138|154);/\\underline{\\makebox[2mm]{\\strut}}/g;
+ $result =~ s/&\#(0?96|145);/\`/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;
+ $result =~ s/&\#103;/g/g;
+ $result =~ s/&\#104;/h/g;
+ $result =~ s/&\#105;/i/g;
+ $result =~ s/&\#106;/j/g;
+ $result =~ s/&\#107;/k/g;
+ $result =~ s/&\#108;/l/g;
+ $result =~ s/&\#109;/m/g;
+ $result =~ s/&\#110;/n/g;
+ $result =~ s/&\#111;/o/g;
+ $result =~ s/&\#112;/p/g;
+ $result =~ s/&\#113;/q/g;
+ $result =~ s/&\#114;/r/g;
+ $result =~ s/&\#115;/s/g;
+ $result =~ s/&\#116;/t/g;
+ $result =~ s/&\#117;/u/g;
+ $result =~ s/&\#118;/v/g;
+ $result =~ s/&\#119;/w/g;
+ $result =~ s/&\#120;/x/g;
+ $result =~ s/&\#121;/y/g;
+ $result =~ s/&\#122;/z/g;
+ $result =~ s/&\#123;/\\{/g;
+ $result =~ s/&\#124;/\|/g;
+ $result =~ s/&\#125;/\\}/g;
+ $result =~ s/&\#126;/\~/g;
+ $result =~ s/&\#131;/\\textflorin /g;
+ $result =~ s/&\#132;/\"/g;
+ $result =~ s/&\#133;/\$\\ldots\$/g;
+ $result =~ s/&\#134;/\$\\dagger\$/g;
+ $result =~ s/&\#135;/\$\\ddagger\$/g;
+ $result =~ s/&\#137;/\\textperthousand /g;
+ $result =~ s/&\#140;/{\\OE}/g;
+ $result =~ s/&\#147;/\`\`/g;
+ $result =~ s/&\#148;/\'\'/g;
+ $result =~ s/&\#149;/\$\\bullet\$/g;
+ $result =~ s/&\#150;/--/g;
+ $result =~ s/&\#151;/---/g;
+ $result =~ s/&\#152;/\$\\sim\$/g;
+ $result =~ s/&\#153;/\\texttrademark /g;
+ $result =~ s/&\#156;/\\oe/g;
+ $result =~ s/&\#159;/\\\"Y/g;
+ $result =~ s/&(\#160|nbsp);//g;
+ $result =~ s/&(\#161|iexcl);/!\`/g;
+ $result =~ s/&(\#162|cent);/\\textcent /g;
+ $result =~ s/&(\#163|pound);/\\pounds /g;
+ $result =~ s/&(\#164|curren);/\\textcurrency /g;
+ $result =~ s/&(\#165|yen);/\\textyen /g;
+ $result =~ s/&(\#166|brvbar);/\\textbrokenbar /g;
+ $result =~ s/&(\#167|sect);/\\textsection /g;
+ $result =~ s/&(\#168|uml);/\\texthighdieresis /g;
+ $result =~ s/&(\#169|copy);/\\copyright /g;
+ $result =~ s/&(\#170|ordf);/\\textordfeminine /g;
# $result =~ s/«//g;
# $result =~ s/«//g;
- $result =~ s/¬/\$\\neg\$/g;
- $result =~ s/¬/\$\\neg\$/g;
-# $result =~ s///g;
-# $result =~ s///g;
-# $result =~ s/®//g;
-# $result =~ s/®//g;
-# $result =~ s/¯//g;
-# $result =~ s/¯//g;
- $result =~ s/°/\$^{\\circ}\$/g;
- $result =~ s/°/\$^{\\circ}\$/g;
- $result =~ s/±/\$\\pm\$/g;
- $result =~ s/±/\$\\pm\$/g;
- $result =~ s/²/\$^2\$/g;
- $result =~ s/²/\$^2\$/g;
- $result =~ s/³/\$^3\$/g;
- $result =~ s/³/\$^3\$/g;
-# $result =~ s/´//g;
-# $result =~ s/´//g;
- $result =~ s/µ/\$\\mu\$/g;
- $result =~ s/µ/\$\\mu\$/g;
- $result =~ s/¶/\\P/g;
- $result =~ s/¶/\\P/g;
- $result =~ s/·/\$\\cdot\$/g;
- $result =~ s/·/\$\\cdot\$/g;
-# $result =~ s/¸//g;
-# $result =~ s/¸//g;
- $result =~ s/¹/\$^1\$/g;
- $result =~ s/¹/\$^1\$/g;
-# $result =~ s/º//g;
-# $result =~ s/º//g;
+ $result =~ s/&(\#172|not);/\$\\neg\$/g;
+ $result =~ s/&(\#173|shy);/ - /g;
+ $result =~ s/&(\#174|reg);/\\textregistered /g;
+ $result =~ s/&(\#175|macr);/\$^{-}\$/g;
+ $result =~ s/&(\#176|deg);/\$^{\\circ}\$/g;
+ $result =~ s/&(\#177|plusmn);/\$\\pm\$/g;
+ $result =~ s/&(\#178|sup2);/\$^2\$/g;
+ $result =~ s/&(\#179|sup3);/\$^3\$/g;
+ $result =~ s/&(\#180|acute);/\\textacute /g;
+ $result =~ s/&(\#181|micro);/\$\\mu\$/g;
+ $result =~ s/&(\#182|para);/\\P/g;
+ $result =~ s/&(\#183|middot);/\$\\cdot\$/g;
+ $result =~ s/&(\#184|cedil);/\\c{\\strut}/g;
+ $result =~ s/&(\#185|sup1);/\$^1\$/g;
+ $result =~ s/&(\#186|ordm);/\\textordmasculine /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/À/\\`{A}/g;
- $result =~ s/À/\\`{A}/g; #`
- $result =~ s/Á/\\'{A}/g;
- $result =~ s/Á/\\'{A}/g; #'
- $result =~ s/Â/\\^{A}/g;
- $result =~ s/Â/\\^{A}/g;
- $result =~ s/Ã/\\~{A}/g;
- $result =~ s/Ã/\\~{A}/g;
- $result =~ s/Ä/\\"{A}/g;
- $result =~ s/Ä/\\"{A}/g; #"
- $result =~ s/Å/{\\AA}/g;
- $result =~ s/Å/{\\AA}/g;
- $result =~ s/Æ/{\\AE}/g;
- $result =~ s/Æ/{\\AE}/g;
-# $result =~ s/Ç//g;
-# $result =~ s/Ç//g;
- $result =~ s/È/\\`{E}/g;
- $result =~ s/È/\\`{E}/g; #`
- $result =~ s/É/\\'{E}/g; #'
- $result =~ s/É/\\'{E}/g; #'
- $result =~ s/Ê/\\^{E}/g;
- $result =~ s/Ê/\\^{E}/g;
- $result =~ s/Ë/\\`{E}/g;
- $result =~ s/Ë/\\`{E}/g; #`
- $result =~ s/Ì/\\`{I}/g;
- $result =~ s/Ì/\\`{I}/g; #`
- $result =~ s/Í/\\'{I}/g;
- $result =~ s/Í/\\'{I}/g; #'
- $result =~ s/Î/\\^{I}/g;
- $result =~ s/Î/\\^{I}/g;
- $result =~ s/Ï/\\"{I}/g;
- $result =~ s/Ï/\\"{I}/g; #"
+ $result =~ s/&(\#188|frac14);/\\textonequarter /g;
+ $result =~ s/&(\#189|frac12);/\\textonehalf /g;
+ $result =~ s/&(\#190|frac34);/\\textthreequarters /g;
+ $result =~ s/&(\#191|iquest);/?\`/g;
+ $result =~ s/&(\#192|Agrave);/\\\`{A}/g;
+ $result =~ s/&(\#193|Aacute);/\\\'{A}/g;
+ $result =~ s/&(\#194|Acirc);/\\^{A}/g;
+ $result =~ s/&(\#195|Atilde);/\\~{A}/g;
+ $result =~ s/&(\#196|Auml);/\\\"{A}/g;
+ $result =~ s/&(\#197|Aring);/{\\AA}/g;
+ $result =~ s/&(\#198|AElig);/{\\AE}/g;
+ $result =~ s/&(\#199|Ccedil);/\\c{c}/g;
+ $result =~ s/&(\#200|Egrave);/\\\`{E}/g;
+ $result =~ s/&(\#201|Eacute);/\\\'{E}/g;
+ $result =~ s/&(\#202|Ecirc);/\\^{E}/g;
+ $result =~ s/&(\#203|Euml);/\\\"{E}/g;
+ $result =~ s/&(\#204|Igrave);/\\\`{I}/g;
+ $result =~ s/&(\#205|Iacute);/\\\'{I}/g;
+ $result =~ s/&(\#206|Icirc);/\\^{I}/g;
+ $result =~ s/&(\#207|Iuml);/\\\"{I}/g;
# $result =~ s/Ð//g;
# $result =~ s/Ð//g;
- $result =~ s/Ñ/\\~{N}/g;
- $result =~ s/Ñ/\\~{N}/g;
- $result =~ s/Ò/\\`{O}/g;
- $result =~ s/Ò/\\`{O}/g; #`
- $result =~ s/Ó/\\'{O}/g;
- $result =~ s/Ó/\\'{O}/g; #'
- $result =~ s/Ô/\\^{O}/g;
- $result =~ s/Ô/\\^{O}/g;
- $result =~ s/Õ/\\~{O}/g;
- $result =~ s/Õ/\\~{O}/g;
- $result =~ s/Ö/\\"{O}/g;
- $result =~ s/Ö/\\"{O}/g; #"
- $result =~ s/×/\$\\times\$/g;
- $result =~ s/×/\$\\times\$/g;
- $result =~ s/Ø/{\\O}/g;
- $result =~ s/Ø/{\\O}/g;
- $result =~ s/Ù/\\`{U}/g;
- $result =~ s/Ù/\\`{U}/g; #`
- $result =~ s/Ú/\\'{U}/g; #'
- $result =~ s/Ú/\\'{U}/g; #'
- $result =~ s/Û/\\^{U}/g;
- $result =~ s/Û/\\^{U}/g;
- $result =~ s/Ü/\\"{U}/g; #"
- $result =~ s/Ü/\\"{U}/g; #"
- $result =~ s/Ý/\\'{Y}/g;
- $result =~ s/Ý/\\'{Y}/g; #'
+ $result =~ s/&(\#209|Ntilde);/\\~{N}/g;
+ $result =~ s/&(\#210|Ograve);/\\\`{O}/g;
+ $result =~ s/&(\#211|Oacute);/\\\'{O}/g;
+ $result =~ s/&(\#212|Ocirc);/\\^{O}/g;
+ $result =~ s/&(\#213|Otilde);/\\~{O}/g;
+ $result =~ s/&(\#214|Ouml);/\\\"{O}/g;
+ $result =~ s/&(\#215|times);/\$\\times\$/g;
+ $result =~ s/&(\#216|Oslash);/{\\O}/g;
+ $result =~ s/&(\#217|Ugrave);/\\\`{U}/g;
+ $result =~ s/&(\#218|Uacute);/\\\'{U}/g;
+ $result =~ s/&(\#219|Ucirc);/\\^{U}/g;
+ $result =~ s/&(\#220|Uuml);/\\\"{U}/g;
+ $result =~ s/&(\#221|Yacute);/\\\'{Y}/g;
# $result =~ s/Þ//g;
# $result =~ s/Þ//g;
-# $result =~ s/ß//g;
-# $result =~ s/ß//g;
- $result =~ s/à/\\`{a}/g;
- $result =~ s/à/\\`{a}/g; #`
- $result =~ s/á/\\'{a}/g;
- $result =~ s/á/\\'{a}/g; #'
- $result =~ s/â/\\^{a}/g;
- $result =~ s/â/\\^{a}/g;
- $result =~ s/ã/\\~{a}/g;
- $result =~ s/ã/\\~{a}/g;
- $result =~ s/ä/\\"{a}/g;
- $result =~ s/ä/\\"{a}/g; #"
- $result =~ s/å/{\\aa}/g;
- $result =~ s/å/{\\aa}/g;
- $result =~ s/æ/{\\ae}/g;
- $result =~ s/æ/{\\ae}/g;
-# $result =~ s/ç//g;
-# $result =~ s/ç//g;
- $result =~ s/è/\\`{e}/g;
- $result =~ s/è/\\`{e}/g; #`
- $result =~ s/é/\\'{e}/g;
- $result =~ s/é/\\'{e}/g; #'
- $result =~ s/ê/\\^{e}/g;
- $result =~ s/ê/\\^{e}/g;
- $result =~ s/ë/\\"{e}/g;
- $result =~ s/ë/\\"{e}/g; #"
- $result =~ s/ì/\\`{i}/g;
- $result =~ s/ì/\\`{i}/g; #`
- $result =~ s/í/\\'{i}/g;
- $result =~ s/í/\\'{i}/g; #'
- $result =~ s/î/\\^{i}/g;
- $result =~ s/î/\\^{i}/g;
- $result =~ s/ï/\\"{i}/g;
- $result =~ s/ï/\\"{i}/g; #"
-# $result =~ s/ð//g;
-# $result =~ s/ð//g;
- $result =~ s/ñ/\\~{n}/g;
- $result =~ s/ñ/\\~{n}/g;
- $result =~ s/ò/\\`{o}/g;
- $result =~ s/ò/\\`{o}/g; #`
- $result =~ s/ó/\\'{o}/g;
- $result =~ s/ó/\\'{o}/g; #'
- $result =~ s/ô/\\^{o}/g;
- $result =~ s/ô/\\^{o}/g;
- $result =~ s/õ/\\~{o}/g;
- $result =~ s/õ/\\~{o}/g;
- $result =~ s/ö/\\"{o}/g;
- $result =~ s/ö/\\"{o}/g; #"
- $result =~ s/÷/\$\\div\$/g;
- $result =~ s/÷/\$\\div\$/g;
- $result =~ s/ø/{\\o}/g;
- $result =~ s/ø/{\\o}/g;
- $result =~ s/ù/\\`{u}/g;
- $result =~ s/ù/\\`{u}/g; #`
- $result =~ s/ú/\\'{u}/g;
- $result =~ s/ú/\\'{u}/g; #'
- $result =~ s/û/\\^{u}/g;
- $result =~ s/û/\\^{u}/g;
- $result =~ s/ü/\\"{u}/g;
- $result =~ s/ü/\\"{u}/g; #"
- $result =~ s/ý/\\'{y}/g;
- $result =~ s/ý/\\'{y}/g; #'
+ $result =~ s/&(\#223|szlig);/\\ss/g;
+ $result =~ s/&(\#224|agrave);/\\\`{a}/g;
+ $result =~ s/&(\#225|aacute);/\\\'{a}/g;
+ $result =~ s/&(\#226|acirc);/\\^{a}/g;
+ $result =~ s/&(\#227|atilde);/\\~{a}/g;
+ $result =~ s/&(\#228|auml);/\\\"{a}/g;
+ $result =~ s/&(\#229|aring);/{\\aa}/g;
+ $result =~ s/&(\#230|aelig);/{\\ae}/g;
+ $result =~ s/&(\#231|ccedil);/\\c{c}/g;
+ $result =~ s/&(\#232|egrave);/\\\`{e}/g;
+ $result =~ s/&(\#233|eacute);/\\\'{e}/g;
+ $result =~ s/&(\#234|ecirc);/\\^{e}/g;
+ $result =~ s/&(\#235|euml);/\\\"{e}/g;
+ $result =~ s/&(\#236|igrave);/\\\`{i}/g;
+ $result =~ s/&(\#237|iacute);/\\\'{i}/g;
+ $result =~ s/&(\#238|icirc);/\\^{i}/g;
+ $result =~ s/&(\#239|iuml);/\\\"{i}/g;
+ $result =~ s/&(\#240|eth);/\$\\partial\$/g;
+ $result =~ s/&(\#241|ntilde);/\\~{n}/g;
+ $result =~ s/&(\#242|ograve);/\\\`{o}/g;
+ $result =~ s/&(\#243|oacute);/\\\'{o}/g;
+ $result =~ s/&(\#244|ocirc);/\\^{o}/g;
+ $result =~ s/&(\#245|otilde);/\\~{o}/g;
+ $result =~ s/&(\#246|ouml);/\\\"{o}/g;
+ $result =~ s/&(\#247|divide);/\$\\div\$/g;
+ $result =~ s/&(\#248|oslash);/{\\o}/g;
+ $result =~ s/&(\#249|ugrave);/\\\`{u}/g;
+ $result =~ s/&(\#250|uacute);/\\\'{u}/g;
+ $result =~ s/&(\#251|ucirc);/\\^{u}/g;
+ $result =~ s/&(\#252|uuml);/\\\"{u}/g;
+ $result =~ s/&(\#253|yacute);/\\\'{y}/g;
# $result =~ s/þ//g;
# $result =~ s/þ//g;
- $result =~ s/ÿ/\\"{y}/g;
- $result =~ s/ÿ/\\"{y}/g; #"
- $result =~ s/θ/\$\\theta\$/g; #converts theta from html into tex
+ $result =~ s/&(\#255|yuml);/\\\"{y}/g;
+ $result =~ s/&\#952;/\$\\theta\$/g;
return $result;
}
@@ -1287,16 +1095,16 @@ sub page_format_transformation {
} else {
($textwidth,$textheight,$oddoffset,$evenoffset) = ($ENV{'form.width'},$ENV{'form.height'},$ENV{'form.leftmargin'},$ENV{'form.leftmargin'});
}
- my $firstname = &special_character_corrections(&Apache::lonnet::unescape($ENV{'environment.firstname'}));
- my $lastname = &special_character_corrections(&Apache::lonnet::unescape($ENV{'environment.lastname'}));
- my $courseidinfo = &special_character_corrections(&Apache::lonnet::unescape($ENV{'course.'.$ENV{'request.course.id'}.'.description'}));
+ my $firstname = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($ENV{'environment.firstname'}),'','','header');
+ my $lastname = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($ENV{'environment.lastname'}),'','','header');
+ my $courseidinfo = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($ENV{'course.'.$ENV{'request.course.id'}.'.description'}),'','','header');
if ($layout eq 'CBI') {
$text =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}\\setlength{\\topmargin}{200pt}\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\parindent}{20pt}\\setlength{\\marginparwidth}{90pt}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm} \\begin{document}\\setcounter{page}{1}\\noindent\\parbox{\\minipagewidth}{\\noindent\\fbox{\\textbf{$firstname $lastname}} \\hfill $courseidinfo} \\vskip 5 mm /;
} elsif ($layout eq 'CAPA') {
if ($choice ne 'All class print') {
$text =~ s/\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\usepackage{fancyhdr}\\pagestyle{fancy}\\rhead{}\\chead{}\\lhead{\\textbf{$firstname $lastname} - $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1}/;
} else {
- $text =~ s/\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\begin{document}\\voffset=-1\.8cm\\setcounter{page}{1} \\vskip 5 mm /;
+ $text =~ s/\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\begin{document}\\voffset=-0\.8cm\\setcounter{page}{1} \\vskip 5 mm /;
}
}
return $text;
@@ -1342,15 +1150,6 @@ sub details_for_menu {
}
-sub special_character_corrections {
- my $argument = shift;
- $argument =~ s/_/ /g;
- $argument =~ s/\^/ /g;
- $argument =~ s/&/\\&/g;
- return $argument;
-}
-
-
sub latex_corrections {
my ($number_of_columns,$result) = @_;
@@ -1389,6 +1188,15 @@ sub handler {
my $r = shift;
+ # not sure where the form.* was getting processed.
+ Apache::loncommon::get_unprocessed_cgi($ENV{QUERY_STRING});
+
+ # A hook for me to work without disturbing Alex.
+ if ($ENV{'form.jeremy'}) {
+ printWizard($r);
+ return OK;
+ }
+
my $loaderror=&Apache::lonnet::overloaderror($r);
if ($loaderror) { return $loaderror; }
$loaderror=
@@ -1442,6 +1250,69 @@ sub handler {
}
+use Apache::lonwizard;
+
+sub printWizard {
+ my $r = shift;
+
+ if ($ENV{'request.course.id'}) {
+ my $fn=$ENV{'request.course.fn'};
+ tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640);
+ }
+
+ if ($r->header_only) {
+ if ($ENV{'browser.mathml'}) {
+ $r->content_type('text/xml');
+ } else {
+ $r->content_type('text/html');
+ }
+ $r->send_http_header;
+ return OK;
+ }
+
+ # Send header, nocache
+ if ($ENV{'browser.mathml'}) {
+ $r->content_type('text/xml');
+ } else {
+ $r->content_type('text/html');
+ }
+ &Apache::loncommon::no_cache($r);
+ $r->send_http_header;
+ $r->rflush();
+
+ my ($resourceTitle,$sequenceTitle,$mapTitle) = &details_for_menu;
+
+ my $wizard = Apache::lonwizard->new("Printing Wizard");
+ # PRINT_TYPE: What the user wants to print (current docs,
+ # whole sequence, etc.
+ $wizard->declareVars(['PRINT_TYPE']);
+
+ my $subdir = $ENV{'form.postdata'};
+ $subdir =~ s|http://[^/]+||;
+ $subdir =~ m/\/([^\/]+)$/;
+ $subdir =~ s/\Q$1\E//;
+
+ # This code also shows up above... which is prefered? Is one
+ # right for this context?
+ #my $subdir = &Apache::lonnet::filelocation("",$ENV{'form.url'});
+ #$subdir =~ s/\/[^\/]+$//;
+
+ Apache::lonwizard::switch_state->new($wizard, "START", "Selecting Resources to Print", "PRINT_TYPE", [
+ ['current_document', "$resourceTitle (exactly what was on the screen)", 'CHOOSE_FORMAT'],
+ ['map_problems', "Problems from $sequenceTitle", 'CHOOSE_FORMAT'],
+ ['map_problems_pages', "All of $sequenceTitle", 'CHOOSE_FORMAT'],
+ ['problems_for_students', "Problems from $sequenceTitle for selected students", 'CHOOSE_FORMAT'],
+ ['problems_from_directory', "Problems from $subdir", 'CHOOSE_FORMAT'] ],
+ "What do you want to print?");
+
+ $r->print($wizard->display());
+
+ untie %hash;
+
+ return OK;
+
+}
+
1;
__END__