--- loncom/interface/lonprintout.pm 2004/02/03 21:57:48 1.273
+++ loncom/interface/lonprintout.pm 2004/03/12 16:23:23 1.281
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.273 2004/02/03 21:57:48 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.281 2004/03/12 16:23:23 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -89,8 +89,8 @@ sub character_chart {
$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?61;/\\ensuremath\{=\}/g;
+ $result =~ s/&(\#0?62|gt|\#155);/\\ensuremath\{>\}/g;
$result =~ s/&\#0?63;/\?/g;
$result =~ s/&\#0?65;/A/g;
$result =~ s/&\#0?66;/B/g;
@@ -119,9 +119,9 @@ sub character_chart {
$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?92;/\\ensuremath\{\\setminus\}/g;
$result =~ s/&\#0?93;/]/g;
- $result =~ s/&\#(0?94|136);/\$\\wedge\$/g;
+ $result =~ s/&\#(0?94|136);/\\ensuremath\{\\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;
@@ -156,17 +156,17 @@ sub character_chart {
$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/&\#133;/\\ensuremath\{\\ldots\}/g;
+ $result =~ s/&\#134;/\\ensuremath\{\\dagger\}/g;
+ $result =~ s/&\#135;/\\ensuremath\{\\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/&\#149;/\\ensuremath\{\\bullet\}/g;
$result =~ s/&\#150;/--/g;
$result =~ s/&\#151;/---/g;
- $result =~ s/&\#152;/\$\\sim\$/g;
+ $result =~ s/&\#152;/\\ensuremath\{\\sim\}/g;
$result =~ s/&\#153;/\\texttrademark /g;
$result =~ s/&\#156;/\\oe/g;
$result =~ s/&\#159;/\\\"Y/g;
@@ -181,20 +181,20 @@ sub character_chart {
$result =~ s/&(\#168|uml);/\\texthighdieresis /g;
$result =~ s/&(\#169|copy);/\\copyright /g;
$result =~ s/&(\#170|ordf);/\\textordfeminine /g;
- $result =~ s/&(\#172|not);/\$\\neg\$/g;
+ $result =~ s/&(\#172|not);/\\ensuremath\{\\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/&(\#175|macr);/\\ensuremath\{^{-}\}/g;
+ $result =~ s/&(\#176|deg);/\\ensuremath\{^{\\circ}\}/g;
+ $result =~ s/&(\#177|plusmn);/\\ensuremath\{\\pm\}/g;
+ $result =~ s/&(\#178|sup2);/\\ensuremath\{^2\}/g;
+ $result =~ s/&(\#179|sup3);/\\ensuremath\{^3\}/g;
$result =~ s/&(\#180|acute);/\\textacute /g;
- $result =~ s/&(\#181|micro);/\$\\mu\$/g;
+ $result =~ s/&(\#181|micro);/\\ensuremath\{\\mu\}/g;
$result =~ s/&(\#182|para);/\\P/g;
- $result =~ s/&(\#183|middot);/\$\\cdot\$/g;
+ $result =~ s/&(\#183|middot);/\\ensuremath\{\\cdot\}/g;
$result =~ s/&(\#184|cedil);/\\c{\\strut}/g;
- $result =~ s/&(\#185|sup1);/\$^1\$/g;
+ $result =~ s/&(\#185|sup1);/\\ensuremath\{^1\}/g;
$result =~ s/&(\#186|ordm);/\\textordmasculine /g;
$result =~ s/&(\#188|frac14);/\\textonequarter /g;
$result =~ s/&(\#189|frac12);/\\textonehalf /g;
@@ -222,7 +222,7 @@ sub character_chart {
$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/&(\#215|times);/\\ensuremath\{\\times\}/g;
$result =~ s/&(\#216|Oslash);/{\\O}/g;
$result =~ s/&(\#217|Ugrave);/\\\`{U}/g;
$result =~ s/&(\#218|Uacute);/\\\'{U}/g;
@@ -246,14 +246,14 @@ sub character_chart {
$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/&(\#240|eth);/\\ensuremath\{\\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/&(\#247|divide);/\\ensuremath\{\\div\}/g;
$result =~ s/&(\#248|oslash);/{\\o}/g;
$result =~ s/&(\#249|ugrave);/\\\`{u}/g;
$result =~ s/&(\#250|uacute);/\\\'{u}/g;
@@ -261,114 +261,114 @@ sub character_chart {
$result =~ s/&(\#252|uuml);/\\\"{u}/g;
$result =~ s/&(\#253|yacute);/\\\'{y}/g;
$result =~ s/&(\#255|yuml);/\\\"{y}/g;
- $result =~ s/&\#952;/\$\\theta\$/g;
+ $result =~ s/&\#952;/\\ensuremath\{\\theta\}/g;
#Greek Alphabet
- $result =~ s/&(alpha|\#945);/\$\\alpha \$/g;
- $result =~ s/&(beta|\#946);/\$\\beta \$/g;
- $result =~ s/&(gamma|\#947);/\$\\gamma \$/g;
- $result =~ s/&(delta|\#948);/\$\\delta \$/g;
- $result =~ s/&(epsilon|\#949);/\$\\epsilon \$/g;
- $result =~ s/&(zeta|\#950);/\$\\zeta \$/g;
- $result =~ s/&(eta|\#951);/\$\\eta \$/g;
- $result =~ s/&(theta|\#952);/\$\\theta \$/g;
- $result =~ s/&(iota|\#953);/\$\\iota \$/g;
- $result =~ s/&(kappa|\#954);/\$\\kappa \$/g;
- $result =~ s/&(lambda|\#955);/\$\\lambda \$/g;
- $result =~ s/&(mu|\#956);/\$\\mu \$/g;
- $result =~ s/&(nu|\#957);/\$\\nu \$/g;
- $result =~ s/&(xi|\#958);/\$\\xi \$/g;
+ $result =~ s/&(alpha|\#945);/\\ensuremath\{\\alpha\}/g;
+ $result =~ s/&(beta|\#946);/\\ensuremath\{\\beta\}/g;
+ $result =~ s/&(gamma|\#947);/\\ensuremath\{\\gamma\}/g;
+ $result =~ s/&(delta|\#948);/\\ensuremath\{\\delta\}/g;
+ $result =~ s/&(epsilon|\#949);/\\ensuremath\{\\epsilon\}/g;
+ $result =~ s/&(zeta|\#950);/\\ensuremath\{\\zeta\}/g;
+ $result =~ s/&(eta|\#951);/\\ensuremath\{\\eta\}/g;
+ $result =~ s/&(theta|\#952);/\\ensuremath\{\\theta\}/g;
+ $result =~ s/&(iota|\#953);/\\ensuremath\{\\iota\}/g;
+ $result =~ s/&(kappa|\#954);/\\ensuremath\{\\kappa\}/g;
+ $result =~ s/&(lambda|\#955);/\\ensuremath\{\\lambda\}/g;
+ $result =~ s/&(mu|\#956);/\\ensuremath\{\\mu\}/g;
+ $result =~ s/&(nu|\#957);/\\ensuremath\{\\nu\}/g;
+ $result =~ s/&(xi|\#958);/\\ensuremath\{\\xi\}/g;
$result =~ s/&(omicron|\#959);/o/g;
- $result =~ s/&(pi|\#960);/\$\\pi \$/g;
- $result =~ s/&(rho|\#961);/\$\\rho \$/g;
- $result =~ s/&(sigma|\#963);/\$\\sigma \$/g;
- $result =~ s/&(tau|\#964);/\$\\tau \$/g;
- $result =~ s/&(upsilon|\#965);/\$\\upsilon \$/g;
- $result =~ s/&(phi|\#966);/\$\\phi \$/g;
- $result =~ s/&(chi|\#967);/\$\\chi \$/g;
- $result =~ s/&(psi|\#968);/\$\\psi \$/g;
- $result =~ s/&(omega|\#969);/\$\\omega \$/g;
- $result =~ s/&(thetasym|\#977);/\$\\vartheta \$/g;
- $result =~ s/&(piv|\#982);/\$\\varpi \$/g;
+ $result =~ s/&(pi|\#960);/\\ensuremath\{\\pi\}/g;
+ $result =~ s/&(rho|\#961);/\\ensuremath\{\\rho\}/g;
+ $result =~ s/&(sigma|\#963);/\\ensuremath\{\\sigma\}/g;
+ $result =~ s/&(tau|\#964);/\\ensuremath\{\\tau\}/g;
+ $result =~ s/&(upsilon|\#965);/\\ensuremath\{\\upsilon\}/g;
+ $result =~ s/&(phi|\#966);/\\ensuremath\{\\phi\}/g;
+ $result =~ s/&(chi|\#967);/\\ensuremath\{\\chi\}/g;
+ $result =~ s/&(psi|\#968);/\\ensuremath\{\\psi\}/g;
+ $result =~ s/&(omega|\#969);/\\ensuremath\{\\omega\}/g;
+ $result =~ s/&(thetasym|\#977);/\\ensuremath\{\\vartheta\}/g;
+ $result =~ s/&(piv|\#982);/\\ensuremath\{\\varpi\}/g;
$result =~ s/&(Alpha|\#913);/A/g;
$result =~ s/&(Beta|\#914);/B/g;
- $result =~ s/&(Gamma|\#915);/\$\\Gamma \$/g;
- $result =~ s/&(Delta|\#916);/\$\\Delta \$/g;
+ $result =~ s/&(Gamma|\#915);/\\ensuremath\{\\Gamma\}/g;
+ $result =~ s/&(Delta|\#916);/\\ensuremath\{\\Delta\}/g;
$result =~ s/&(Epsilon|\#917);/E/g;
$result =~ s/&(Zeta|\#918);/Z/g;
$result =~ s/&(Eta|\#919);/H/g;
- $result =~ s/&(Theta|\#920);/\$\\Theta \$/g;
+ $result =~ s/&(Theta|\#920);/\\ensuremath\{\\Theta\}/g;
$result =~ s/&(Iota|\#921);/I/g;
$result =~ s/&(Kappa|\#922);/K/g;
- $result =~ s/&(Lambda|\#923);/\$\\Lambda \$/g;
+ $result =~ s/&(Lambda|\#923);/\\ensuremath\{\\Lambda\}/g;
$result =~ s/&(Mu|\#924);/M/g;
$result =~ s/&(Nu|\#925);/N/g;
- $result =~ s/&(Xi|\#926);/\$\\Xi \$/g;
+ $result =~ s/&(Xi|\#926);/\\ensuremath\{\\Xi\}/g;
$result =~ s/&(Omicron|\#927);/O/g;
- $result =~ s/&(Pi|\#928);/\$\\Pi \$/g;
+ $result =~ s/&(Pi|\#928);/\\ensuremath\{\\Pi\}/g;
$result =~ s/&(Rho|\#929);/P/g;
- $result =~ s/&(Sigma|\#931);/\$\\Sigma \$/g;
+ $result =~ s/&(Sigma|\#931);/\\ensuremath\{\\Sigma\}/g;
$result =~ s/&(Tau|\#932);/T/g;
- $result =~ s/&(Upsilon|\#933);/\$\\Upsilon \$/g;
- $result =~ s/&(Phi|\#934);/\$\\Phi \$/g;
+ $result =~ s/&(Upsilon|\#933);/\\ensuremath\{\\Upsilon\}/g;
+ $result =~ s/&(Phi|\#934);/\\ensuremath\{\\Phi\}/g;
$result =~ s/&(Chi|\#935);/X/g;
- $result =~ s/&(Psi|\#936);/\$\\Psi \$/g;
- $result =~ s/&(Omega|\#937);/\$\\Omega \$/g;
+ $result =~ s/&(Psi|\#936);/\\ensuremath\{\\Psi\}/g;
+ $result =~ s/&(Omega|\#937);/\\ensuremath\{\\Omega\}/g;
#Arrows (extended HTML 4.01)
- $result =~ s/&(larr|\#8592);/\$\\leftarrow \$/g;
- $result =~ s/&(uarr|\#8593);/\$\\uparrow \$/g;
- $result =~ s/&(rarr|\#8594);/\$\\rightarrow \$/g;
- $result =~ s/&(darr|\#8595);/\$\\downarrow \$/g;
- $result =~ s/&(harr|\#8596);/\$\\leftrightarrow \$/g;
- $result =~ s/&(lArr|\#8656);/\$\\Leftarrow \$/g;
- $result =~ s/&(uArr|\#8657);/\$\\Uparrow \$/g;
- $result =~ s/&(rArr|\#8658);/\$\\Rightarrow \$/g;
- $result =~ s/&(dArr|\#8659);/\$\\Downarrow \$/g;
- $result =~ s/&(hArr|\#8660);/\$\\Leftrightarrow \$/g;
+ $result =~ s/&(larr|\#8592);/\\ensuremath\{\\leftarrow\}/g;
+ $result =~ s/&(uarr|\#8593);/\\ensuremath\{\\uparrow\}/g;
+ $result =~ s/&(rarr|\#8594);/\\ensuremath\{\\rightarrow\}/g;
+ $result =~ s/&(darr|\#8595);/\\ensuremath\{\\downarrow\}/g;
+ $result =~ s/&(harr|\#8596);/\\ensuremath\{\\leftrightarrow\}/g;
+ $result =~ s/&(lArr|\#8656);/\\ensuremath\{\\Leftarrow\}/g;
+ $result =~ s/&(uArr|\#8657);/\\ensuremath\{\\Uparrow\}/g;
+ $result =~ s/&(rArr|\#8658);/\\ensuremath\{\\Rightarrow\}/g;
+ $result =~ s/&(dArr|\#8659);/\\ensuremath\{\\Downarrow\}/g;
+ $result =~ s/&(hArr|\#8660);/\\ensuremath\{\\Leftrightarrow\}/g;
#Mathematical Operators (extended HTML 4.01)
- $result =~ s/&(forall|\#8704);/\$\\forall \$/g;
- $result =~ s/&(part|\#8706);/\$\\partial \$/g;
- $result =~ s/&(exist|\#8707);/\$\\exists \$/g;
- $result =~ s/&(empty|\#8709);/\$\\emptyset \$/g;
- $result =~ s/&(nabla|\#8711);/\$\\nabla \$/g;
- $result =~ s/&(isin|\#8712);/\$\\in \$/g;
- $result =~ s/&(notin|\#8713);/\$\\notin \$/g;
- $result =~ s/&(ni|\#8715);/\$\\ni \$/g;
- $result =~ s/&(prod|\#8719);/\$\\prod \$/g;
- $result =~ s/&(sum|\#8721);/\$\\sum \$/g;
- $result =~ s/&(minus|\#8722);/\$-\$/g;
- $result =~ s/&(lowast|\#8727);/\$*\$/g;
- $result =~ s/&(radic|\#8730);/\$\\surd \$/g;
- $result =~ s/&(prop|\#8733);/\$\\propto \$/g;
- $result =~ s/&(infin|\#8734);/\$\\infty \$/g;
- $result =~ s/&(ang|\#8736);/\$\\angle \$/g;
- $result =~ s/&(and|\#8743);/\$\\wedge \$/g;
- $result =~ s/&(or|\#8744);/\$\\vee \$/g;
- $result =~ s/&(cap|\#8745);/\$\\cap \$/g;
- $result =~ s/&(cup|\#8746);/\$\\cup \$/g;
- $result =~ s/&(int|\#8747);/\$\\int \$/g;
- $result =~ s/&(sim|\#8764);/\$\\sim \$/g;
- $result =~ s/&(cong|\#8773);/\$\\cong \$/g;
- $result =~ s/&(asymp|\#8776);/\$\\approx \$/g;
- $result =~ s/&(ne|\#8800);/\$\\not= \$/g;
- $result =~ s/&(equiv|\#8801);/\$\\equiv \$/g;
- $result =~ s/&(le|\#8804);/\$\\leq \$/g;
- $result =~ s/&(ge|\#8805);/\$\\geq \$/g;
- $result =~ s/&(sub|\#8834);/\$\\subset \$/g;
- $result =~ s/&(sup|\#8835);/\$\\supset \$/g;
- $result =~ s/&(nsub|\#8836);/\$\\not\\subset \$/g;
- $result =~ s/&(sube|\#8838);/\$\\subseteq \$/g;
- $result =~ s/&(supe|\#8839);/\$\\supseteq \$/g;
- $result =~ s/&(oplus|\#8853);/\$\\oplus \$/g;
- $result =~ s/&(otimes|\#8855);/\$\\otimes \$/g;
- $result =~ s/&(perp|\#8869);/\$\\perp \$/g;
- $result =~ s/&(sdot|\#8901);/\$\\cdot \$/g;
+ $result =~ s/&(forall|\#8704);/\\ensuremath\{\\forall\}/g;
+ $result =~ s/&(part|\#8706);/\\ensuremath\{\\partial\}/g;
+ $result =~ s/&(exist|\#8707);/\\ensuremath\{\\exists\}/g;
+ $result =~ s/&(empty|\#8709);/\\ensuremath\{\\emptyset\}/g;
+ $result =~ s/&(nabla|\#8711);/\\ensuremath\{\\nabla\}/g;
+ $result =~ s/&(isin|\#8712);/\\ensuremath\{\\in\}/g;
+ $result =~ s/&(notin|\#8713);/\\ensuremath\{\\notin\}/g;
+ $result =~ s/&(ni|\#8715);/\\ensuremath\{\\ni\}/g;
+ $result =~ s/&(prod|\#8719);/\\ensuremath\{\\prod\}/g;
+ $result =~ s/&(sum|\#8721);/\\ensuremath\{\\sum\}/g;
+ $result =~ s/&(minus|\#8722);/\\ensuremath\{-\}/g;
+ $result =~ s/&(lowast|\#8727);/\\ensuremath\{*\}/g;
+ $result =~ s/&(radic|\#8730);/\\ensuremath\{\\surd\}/g;
+ $result =~ s/&(prop|\#8733);/\\ensuremath\{\\propto\}/g;
+ $result =~ s/&(infin|\#8734);/\\ensuremath\{\\infty\}/g;
+ $result =~ s/&(ang|\#8736);/\\ensuremath\{\\angle\}/g;
+ $result =~ s/&(and|\#8743);/\\ensuremath\{\\wedge\}/g;
+ $result =~ s/&(or|\#8744);/\\ensuremath\{\\vee\}/g;
+ $result =~ s/&(cap|\#8745);/\\ensuremath\{\\cap\}/g;
+ $result =~ s/&(cup|\#8746);/\\ensuremath\{\\cup\}/g;
+ $result =~ s/&(int|\#8747);/\\ensuremath\{\\int\}/g;
+ $result =~ s/&(sim|\#8764);/\\ensuremath\{\\sim\}/g;
+ $result =~ s/&(cong|\#8773);/\\ensuremath\{\\cong\}/g;
+ $result =~ s/&(asymp|\#8776);/\\ensuremath\{\\approx\}/g;
+ $result =~ s/&(ne|\#8800);/\\ensuremath\{\\not=\}/g;
+ $result =~ s/&(equiv|\#8801);/\\ensuremath\{\\equiv\}/g;
+ $result =~ s/&(le|\#8804);/\\ensuremath\{\\leq\}/g;
+ $result =~ s/&(ge|\#8805);/\\ensuremath\{\\geq\}/g;
+ $result =~ s/&(sub|\#8834);/\\ensuremath\{\\subset\}/g;
+ $result =~ s/&(sup|\#8835);/\\ensuremath\{\\supset\}/g;
+ $result =~ s/&(nsub|\#8836);/\\ensuremath\{\\not\\subset\}/g;
+ $result =~ s/&(sube|\#8838);/\\ensuremath\{\\subseteq\}/g;
+ $result =~ s/&(supe|\#8839);/\\ensuremath\{\\supseteq\}/g;
+ $result =~ s/&(oplus|\#8853);/\\ensuremath\{\\oplus\}/g;
+ $result =~ s/&(otimes|\#8855);/\\ensuremath\{\\otimes\}/g;
+ $result =~ s/&(perp|\#8869);/\\ensuremath\{\\perp\}/g;
+ $result =~ s/&(sdot|\#8901);/\\ensuremath\{\\cdot\}/g;
#Geometric Shapes (extended HTML 4.01)
- $result =~ s/&(loz|\#9674);/\$\\Diamond \$/g;
+ $result =~ s/&(loz|\#9674);/\\ensuremath\{\\Diamond\}/g;
#Miscellaneous Symbols (extended HTML 4.01)
- $result =~ s/&(spades|\#9824);/\$\\spadesuit \$/g;
- $result =~ s/&(clubs|\#9827);/\$\\clubsuit \$/g;
- $result =~ s/&(hearts|\#9829);/\$\\heartsuit \$/g;
- $result =~ s/&(diams|\#9830);/\$\\diamondsuit \$/g;
+ $result =~ s/&(spades|\#9824);/\\ensuremath\{\\spadesuit\}/g;
+ $result =~ s/&(clubs|\#9827);/\\ensuremath\{\\clubsuit\}/g;
+ $result =~ s/&(hearts|\#9829);/\\ensuremath\{\\heartsuit\}/g;
+ $result =~ s/&(diams|\#9830);/\\ensuremath\{\\diamondsuit\}/g;
return $result;
}
@@ -647,6 +647,20 @@ sub path_to_problem {
return '{\small\noindent\verb|'.$newurlp.'|\vskip 0 mm}';
}
+sub recalcto_mm {
+ my $textwidth=shift;
+ my $LaTeXwidth;
+ if ($textwidth=~/(\d+\.?\d*)\s*cm/) {
+ $LaTeXwidth = $1*10;
+ } elsif ($textwidth=~/(\d+\.?\d*)\s*mm/) {
+ $LaTeXwidth = $1;
+ } elsif ($textwidth=~/(\d+\.?\d*)\s*in/) {
+ $LaTeXwidth = $1*25.4;
+ }
+ $LaTeXwidth.=' mm';
+ return $LaTeXwidth;
+}
+
sub output_data {
my ($r,$helper,$rparmhash) = @_;
my %parmhash = %$rparmhash;
@@ -696,16 +710,9 @@ ENDPART
}
my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$laystyle,$numberofcolumns);
my $assignment = $ENV{'form.assignment'};
- my $LaTeXwidth;
- if ($textwidth=~/(\d+\.?\d*)\s*cm/) {
- $LaTeXwidth = $1*10;
- } elsif ($textwidth=~/(\d+\.?\d*)\s*mm/) {
- $LaTeXwidth = $1;
- } elsif ($textwidth=~/(\d+\.?\d*)\s*in/) {
- $LaTeXwidth = $1*25.4;
- }
- $LaTeXwidth.=' mm';
+ my $LaTeXwidth=&recalcto_mm($textwidth);
my @print_array=();
+ my @student_names=();
if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'current_document') {
#-- single document - problem, page, html, xml, ...
@@ -733,7 +740,12 @@ ENDPART
}
my %form;
$form{'grade_target'}='tex';
- $form{'textwidth'}=$LaTeXwidth;
+ if ($helper->{'VARS'}->{'pagesize.width'}=~/\d+/ &&
+ $helper->{'VARS'}->{'pagesize.widthunit'}=~/\w+/) {
+ $form{'textwidth'}=&recalcto_mm($helper->{'VARS'}->{'pagesize.width'}.' '.$helper->{'VARS'}->{'pagesize.widthunit'});
+ } else {
+ $form{'textwidth'}=$LaTeXwidth;
+ }
$form{'problem_split'}=$parmhash{'problem_stream_switch'};
$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
if ($helper->{'VARS'}->{'curseed'}) {
@@ -743,7 +755,7 @@ ENDPART
&Apache::lonnet::appenv(%moreenv);
&Apache::lonnet::delenv('form.counter');
&Apache::lonxml::init_counter();
- $texversion=&Apache::lonnet::ssi($currentURL,%form);
+ $texversion.=&Apache::lonnet::ssi($currentURL,%form);
&Apache::lonnet::delenv('form.counter');
&Apache::lonnet::delenv('request.filename');
}
@@ -798,7 +810,12 @@ ENDPART
if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {
my %form;
$form{'grade_target'}='tex';
- $form{'textwidth'}=$LaTeXwidth;
+ if ($helper->{'VARS'}->{'pagesize.width'}=~/\d+/ &&
+ $helper->{'VARS'}->{'pagesize.widthunit'}=~/\w+/) {
+ $form{'textwidth'}=&recalcto_mm($helper->{'VARS'}->{'pagesize.width'}.' '.$helper->{'VARS'}->{'pagesize.widthunit'});
+ } else {
+ $form{'textwidth'}=$LaTeXwidth;
+ }
$form{'problem_split'}=$parmhash{'problem_stream_switch'};
$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
$form{'rndseed'}=$rndseed;
@@ -844,7 +861,12 @@ ENDPART
} elsif ($currentURL=~/\/smppg$/) {
my %form;
$form{'grade_target'}='tex';
- $form{'textwidth'}=$LaTeXwidth;
+ if ($helper->{'VARS'}->{'pagesize.width'}=~/\d+/ &&
+ $helper->{'VARS'}->{'pagesize.widthunit'}=~/\w+/) {
+ $form{'textwidth'}=&recalcto_mm($helper->{'VARS'}->{'pagesize.width'}.' '.$helper->{'VARS'}->{'pagesize.widthunit'});
+ } else {
+ $form{'textwidth'}=$LaTeXwidth;
+ }
$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
my $texversion=&Apache::lonnet::ssi($currentURL,%form);
$result .= $texversion;
@@ -866,7 +888,12 @@ ENDPART
#-- produce an output string
my %form=();
$form{'grade_target'}='tex';
- $form{'textwidth'}=$LaTeXwidth;
+ if ($helper->{'VARS'}->{'pagesize.width'}=~/\d+/ &&
+ $helper->{'VARS'}->{'pagesize.widthunit'}=~/\w+/) {
+ $form{'textwidth'}=&recalcto_mm($helper->{'VARS'}->{'pagesize.width'}.' '.$helper->{'VARS'}->{'pagesize.widthunit'});
+ } else {
+ $form{'textwidth'}=$LaTeXwidth;
+ }
$form{'problem_split'}=$parmhash{'problem_stream_switch'};
$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
my $flag_latex_header_remove = 'NO';
@@ -955,12 +982,20 @@ ENDPART
$selectionmade=8;
}
my @students=split /\|\|\|/, $helper->{'VARS'}->{'STUDENTS'};
- if ($helper->{'VARS'}->{'NUMBER_TO_PRINT'} eq '0') {$helper->{'VARS'}->{'NUMBER_TO_PRINT'}=$#students+1;}
+ if ($helper->{'VARS'}->{'NUMBER_TO_PRINT'} eq '0' ||
+ $helper->{'VARS'}->{'NUMBER_TO_PRINT'} eq 'all' ) {
+ $helper->{'VARS'}->{'NUMBER_TO_PRINT'}=$#students+1;
+ }
my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
#loop over students
my $flag_latex_header_remove = 'NO';
my %moreenv;
- $moreenv{'form.textwidth'}=$LaTeXwidth;
+ if ($helper->{'VARS'}->{'pagesize.width'}=~/\d+/ &&
+ $helper->{'VARS'}->{'pagesize.widthunit'}=~/\w+/) {
+ $moreenv{'textwidth'}=&recalcto_mm($helper->{'VARS'}->{'pagesize.width'}.' '.$helper->{'VARS'}->{'pagesize.widthunit'});
+ } else {
+ $moreenv{'textwidth'}=$LaTeXwidth;
+ }
&Apache::lonnet::appenv(%moreenv);
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1);
my $student_counter=-1;
@@ -1024,6 +1059,7 @@ ENDPART
$current_output = '\strut\\newline\\noindent\\makebox[\\textwidth/$number_of_columns][b]{\\hrulefill}\\newline\\noindent{\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License }\\newpage '.$blanspages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$fullname.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$currentassignment.'}}} \vskip -5 mm '.$current_output;
}
$print_array[int($student_counter/$helper->{'VARS'}->{'NUMBER_TO_PRINT'})].=$current_output;
+ $student_names[int($student_counter/$helper->{'VARS'}->{'NUMBER_TO_PRINT'})].=$person.':'.$fullname.'_END_';
&Apache::lonnet::delenv('form.counter');
&Apache::lonxml::init_counter();
&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
@@ -1048,7 +1084,12 @@ ENDPART
if ($urlp=~/\//) {
my %form;
$form{'grade_target'}='tex';
- $form{'textwidth'}=$LaTeXwidth;
+ if ($helper->{'VARS'}->{'pagesize.width'}=~/\d+/ &&
+ $helper->{'VARS'}->{'pagesize.widthunit'}=~/\w+/) {
+ $form{'textwidth'}=&recalcto_mm($helper->{'VARS'}->{'pagesize.width'}.' '.$helper->{'VARS'}->{'pagesize.widthunit'});
+ } else {
+ $form{'textwidth'}=$LaTeXwidth;
+ }
$form{'rndseed'}=$rndseed;
if ($urlp =~ m|/home/([^/]+)/public_html|) {
$urlp =~ s|/home/([^/]*)/public_html|/~$1|;
@@ -1117,32 +1158,67 @@ ENDPART
}
#-- writing .tex file in prtspool
my $temp_file;
- my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout_".time."_".rand(10000000).".tex";
- unless ($temp_file = Apache::File->new('>'.$filename)) {
- $r->log_error("Couldn't open $filename for output $!");
- return SERVER_ERROR;
- }
- print $temp_file $result;
- my $begin=index($result,'\begin{document}',0);
- my $inc=substr($result,0,$begin+16);
- if ($#print_array>0) {
- for (my $i=1;$i<=$#print_array;$i++) {
- my $anobegin=index($print_array[$i],'\setcounter{page}',0);
- substr($print_array[$i],0,$anobegin)='';
- $print_array[$i]=$inc.$print_array[$i].'\end{document}';
+ my $identifier = &Apache::loncommon::get_cgi_id();
+ my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout_".$identifier.".tex";
+ if (!($#print_array>0)) {
+ unless ($temp_file = Apache::File->new('>'.$filename)) {
+ $r->log_error("Couldn't open $filename for output $!");
+ return SERVER_ERROR;
+ }
+ print $temp_file $result;
+ my $begin=index($result,'\begin{document}',0);
+ my $inc=substr($result,0,$begin+16);
+ } else {
+ my $begin=index($result,'\begin{document}',0);
+ my $inc=substr($result,0,$begin+16);
+ for (my $i=0;$i<=$#print_array;$i++) {
+ if ($i==0) {
+ $print_array[$i]=$result;
+ } else {
+ my $anobegin=index($print_array[$i],'\setcounter{page}',0);
+ substr($print_array[$i],0,$anobegin)='';
+ $print_array[$i]=$inc.$print_array[$i].'\end{document}';
+ }
my $temp_file;
my $newfilename=$filename;
- $newfilename =~s/\.tex$/_add$i\.tex/;
+ my $num=$i+1;
+ $newfilename =~s/\.tex$/_$num\.tex/;
unless ($temp_file = Apache::File->new('>'.$newfilename)) {
$r->log_error("Couldn't open $newfilename for output $!");
return SERVER_ERROR;
}
print $temp_file $print_array[$i];
}
+ }
+ my $student_names='';
+ if ($#print_array>0) {
+ for (my $i=0;$i<=$#print_array;$i++) {
+ $student_names.=$student_names[$i].'_ENDPERSON_';
+ }
+ } else {
+ if ($#student_names>-1) {
+ $student_names=$student_names[0].'_ENDPERSON_';
+ } else {
+ my $fullname = &get_name($ENV{'user.name'},$ENV{'user.domain'});
+ $student_names=join(':',$ENV{'user.name'},$ENV{'user.domain'},
+ $ENV{'request.course.sec'},$fullname).
+ '_ENDPERSON_'.'_END_';
+ }
+ }
+ my $URLback=''; #link to original document
+ if ($helper->{'VARS'}->{'construction'} ne '1') {
+ #prints published resource
+ $URLback=$helper->{'VARS'}->{'postdata'};
+ } else {
+ #prints resource from the construction space
+ $URLback='/'.$helper->{'VARS'}->{'filename'};
+ if ($URLback=~/([^?]+)/) {
+ $URLback=$1;
+ $URLback=~s|^/~|/priv/|;
+ }
}
- my $identifier = time.'_'.int(rand(1000));
&Apache::lonnet::appenv('cgi.'.$identifier.'.file' => $filename,
'cgi.'.$identifier.'.layout' => $laystyle,
'cgi.'.$identifier.'.numcol' => $numberofcolumns,
@@ -1150,9 +1226,10 @@ ENDPART
'cgi.'.$identifier.'tableofcontents' => $helper->{'VARS'}->{'TABLE_CONTENTS'},
'cgi.'.$identifier.'tableofindex' => $helper->{'VARS'}->{'TABLE_INDEX'},
'cgi.'.$identifier.'role' => $ENV{'request.role.adv'},
- 'cgi.'.$identifier.'numberoffiles' => $#print_array);
+ 'cgi.'.$identifier.'numberoffiles' => $#print_array,
+ 'cgi.'.$identifier.'studentnames' => $student_names,
+ 'cgi.'.$identifier.'backref' => $URLback,);
-
$r->print(<<FINALEND);
<meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$identifier">
</body>
@@ -1435,7 +1512,7 @@ CHOOSE_STUDENTS
$paramHash = Apache::lonhelper::getParamHash();
$paramHash->{'variable'} = 'NUMBER_TO_PRINT';
$helper->declareVar('NUMBER_TO_PRINT');
- addMessage("<input type='text' name='NUMBER_TO_PRINT.forminput' size='3' value='0' /><hr width='33%' />");
+ addMessage("<input type='text' name='NUMBER_TO_PRINT.forminput' size='3' value='all' /><hr width='33%' />");
if ($helper->{VARS}->{'assignment'}) {
push @{$printChoices}, ["<b>Resources</b> from <b><i>$sequenceTitle</i></b> for <b>selected students</b>", 'resources_for_students', 'CHOOSE_STUDENTS1'];
@@ -1463,7 +1540,7 @@ CHOOSE_STUDENTS1
$paramHash = Apache::lonhelper::getParamHash();
$paramHash->{'variable'} = 'NUMBER_TO_PRINT';
$helper->declareVar('NUMBER_TO_PRINT');
- addMessage("<input type='text' name='NUMBER_TO_PRINT.forminput' size='3' value='0' /><hr width='33%' />");
+ addMessage("<input type='text' name='NUMBER_TO_PRINT.forminput' size='3' value='all' /><hr width='33%' />");
}
# FIXME: That RE should come from a library somewhere.
@@ -1861,7 +1938,7 @@ sub render {
</table>
<p>Hint: Some instructors like to leave scratch space for the student by
-making the width much smaller then the width of the page.</p>
+making the width much smaller than the width of the page.</p>
ELEMENTHTML