loncom/interface/lonprintout.pm - diff

Return to lonprintout.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonprintout.pm between versions 1.273 and 1.285

-version 1.273, 2004/02/03 21:57:48
+version 1.285, 2004/03/23 16:17:48
  Line 89  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?61;/\\ensuremath\{=\}/g;
-     $result =~ s/&(\#0?62|gt|\#155);/\$>\$/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;
  Line 119  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;
  Line 156  sub character_chart {
      $result =~ s/&\#126;/\~/g;
      $result =~ s/&\#131;/\\textflorin /g;
      $result =~ s/&\#132;/\"/g;
-     $result =~ s/&\#133;/\$\\ldots\$/g;
+     $result =~ s/&\#133;/\\ensuremath\{\\ldots\}/g;
-     $result =~ s/&\#134;/\$\\dagger\$/g;
+     $result =~ s/&\#134;/\\ensuremath\{\\dagger\}/g;
-     $result =~ s/&\#135;/\$\\ddagger\$/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;
-     $result =~ s/&(\#160|nbsp);//g;
+     $result =~ s/&(\#160|nbsp);/~/g;
      $result =~ s/&(\#161|iexcl);/!\`/g;
      $result =~ s/&(\#162|cent);/\\textcent /g;
      $result =~ s/&(\#163|pound);/\\pounds /g;
  Line 181  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/&(\#175|macr);/\\ensuremath\{^{-}\}/g;
-     $result =~ s/&(\#176|deg);/\$^{\\circ}\$/g;
+     $result =~ s/&(\#176|deg);/\\ensuremath\{^{\\circ}\}/g;
-     $result =~ s/&(\#177|plusmn);/\$\\pm\$/g;
+     $result =~ s/&(\#177|plusmn);/\\ensuremath\{\\pm\}/g;
-     $result =~ s/&(\#178|sup2);/\$^2\$/g;
+     $result =~ s/&(\#178|sup2);/\\ensuremath\{^2\}/g;
-     $result =~ s/&(\#179|sup3);/\$^3\$/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;
  Line 222  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;
  Line 246  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;
  Line 261  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/&(alpha|\#945);/\\ensuremath\{\\alpha\}/g;
-     $result =~ s/&(beta|\#946);/\$\\beta \$/g;
+     $result =~ s/&(beta|\#946);/\\ensuremath\{\\beta\}/g;
-     $result =~ s/&(gamma|\#947);/\$\\gamma \$/g;
+     $result =~ s/&(gamma|\#947);/\\ensuremath\{\\gamma\}/g;
-     $result =~ s/&(delta|\#948);/\$\\delta \$/g;
+     $result =~ s/&(delta|\#948);/\\ensuremath\{\\delta\}/g;
-     $result =~ s/&(epsilon|\#949);/\$\\epsilon \$/g;
+     $result =~ s/&(epsilon|\#949);/\\ensuremath\{\\epsilon\}/g;
-     $result =~ s/&(zeta|\#950);/\$\\zeta \$/g;
+     $result =~ s/&(zeta|\#950);/\\ensuremath\{\\zeta\}/g;
-     $result =~ s/&(eta|\#951);/\$\\eta \$/g;
+     $result =~ s/&(eta|\#951);/\\ensuremath\{\\eta\}/g;
-     $result =~ s/&(theta|\#952);/\$\\theta \$/g;
+     $result =~ s/&(theta|\#952);/\\ensuremath\{\\theta\}/g;
-     $result =~ s/&(iota|\#953);/\$\\iota \$/g;
+     $result =~ s/&(iota|\#953);/\\ensuremath\{\\iota\}/g;
-     $result =~ s/&(kappa|\#954);/\$\\kappa \$/g;
+     $result =~ s/&(kappa|\#954);/\\ensuremath\{\\kappa\}/g;
-     $result =~ s/&(lambda|\#955);/\$\\lambda \$/g;
+     $result =~ s/&(lambda|\#955);/\\ensuremath\{\\lambda\}/g;
-     $result =~ s/&(mu|\#956);/\$\\mu \$/g;
+     $result =~ s/&(mu|\#956);/\\ensuremath\{\\mu\}/g;
-     $result =~ s/&(nu|\#957);/\$\\nu \$/g;
+     $result =~ s/&(nu|\#957);/\\ensuremath\{\\nu\}/g;
-     $result =~ s/&(xi|\#958);/\$\\xi \$/g;
+     $result =~ s/&(xi|\#958);/\\ensuremath\{\\xi\}/g;
      $result =~ s/&(omicron|\#959);/o/g;
-     $result =~ s/&(pi|\#960);/\$\\pi \$/g;
+     $result =~ s/&(pi|\#960);/\\ensuremath\{\\pi\}/g;
-     $result =~ s/&(rho|\#961);/\$\\rho \$/g;
+     $result =~ s/&(rho|\#961);/\\ensuremath\{\\rho\}/g;
-     $result =~ s/&(sigma|\#963);/\$\\sigma \$/g;
+     $result =~ s/&(sigma|\#963);/\\ensuremath\{\\sigma\}/g;
-     $result =~ s/&(tau|\#964);/\$\\tau \$/g;
+     $result =~ s/&(tau|\#964);/\\ensuremath\{\\tau\}/g;
-     $result =~ s/&(upsilon|\#965);/\$\\upsilon \$/g;
+     $result =~ s/&(upsilon|\#965);/\\ensuremath\{\\upsilon\}/g;
-     $result =~ s/&(phi|\#966);/\$\\phi \$/g;
+     $result =~ s/&(phi|\#966);/\\ensuremath\{\\phi\}/g;
-     $result =~ s/&(chi|\#967);/\$\\chi \$/g;
+     $result =~ s/&(chi|\#967);/\\ensuremath\{\\chi\}/g;
-     $result =~ s/&(psi|\#968);/\$\\psi \$/g;
+     $result =~ s/&(psi|\#968);/\\ensuremath\{\\psi\}/g;
-     $result =~ s/&(omega|\#969);/\$\\omega \$/g;
+     $result =~ s/&(omega|\#969);/\\ensuremath\{\\omega\}/g;
-     $result =~ s/&(thetasym|\#977);/\$\\vartheta \$/g;
+     $result =~ s/&(thetasym|\#977);/\\ensuremath\{\\vartheta\}/g;
-     $result =~ s/&(piv|\#982);/\$\\varpi \$/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/&(Gamma|\#915);/\\ensuremath\{\\Gamma\}/g;
-     $result =~ s/&(Delta|\#916);/\$\\Delta \$/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/&(Upsilon|\#933);/\\ensuremath\{\\Upsilon\}/g;
-     $result =~ s/&(Phi|\#934);/\$\\Phi \$/g;
+     $result =~ s/&(Phi|\#934);/\\ensuremath\{\\Phi\}/g;
      $result =~ s/&(Chi|\#935);/X/g;
-     $result =~ s/&(Psi|\#936);/\$\\Psi \$/g;
+     $result =~ s/&(Psi|\#936);/\\ensuremath\{\\Psi\}/g;
-     $result =~ s/&(Omega|\#937);/\$\\Omega \$/g;
+     $result =~ s/&(Omega|\#937);/\\ensuremath\{\\Omega\}/g;
  #Arrows (extended HTML 4.01)
-     $result =~ s/&(larr|\#8592);/\$\\leftarrow \$/g;
+     $result =~ s/&(larr|\#8592);/\\ensuremath\{\\leftarrow\}/g;
-     $result =~ s/&(uarr|\#8593);/\$\\uparrow \$/g;
+     $result =~ s/&(uarr|\#8593);/\\ensuremath\{\\uparrow\}/g;
-     $result =~ s/&(rarr|\#8594);/\$\\rightarrow \$/g;
+     $result =~ s/&(rarr|\#8594);/\\ensuremath\{\\rightarrow\}/g;
-     $result =~ s/&(darr|\#8595);/\$\\downarrow \$/g;
+     $result =~ s/&(darr|\#8595);/\\ensuremath\{\\downarrow\}/g;
-     $result =~ s/&(harr|\#8596);/\$\\leftrightarrow \$/g;
+     $result =~ s/&(harr|\#8596);/\\ensuremath\{\\leftrightarrow\}/g;
-     $result =~ s/&(lArr|\#8656);/\$\\Leftarrow \$/g;
+     $result =~ s/&(lArr|\#8656);/\\ensuremath\{\\Leftarrow\}/g;
-     $result =~ s/&(uArr|\#8657);/\$\\Uparrow \$/g;
+     $result =~ s/&(uArr|\#8657);/\\ensuremath\{\\Uparrow\}/g;
-     $result =~ s/&(rArr|\#8658);/\$\\Rightarrow \$/g;
+     $result =~ s/&(rArr|\#8658);/\\ensuremath\{\\Rightarrow\}/g;
-     $result =~ s/&(dArr|\#8659);/\$\\Downarrow \$/g;
+     $result =~ s/&(dArr|\#8659);/\\ensuremath\{\\Downarrow\}/g;
-     $result =~ s/&(hArr|\#8660);/\$\\Leftrightarrow \$/g;
+     $result =~ s/&(hArr|\#8660);/\\ensuremath\{\\Leftrightarrow\}/g;
  #Mathematical Operators (extended HTML 4.01)
-     $result =~ s/&(forall|\#8704);/\$\\forall \$/g;
+     $result =~ s/&(forall|\#8704);/\\ensuremath\{\\forall\}/g;
-     $result =~ s/&(part|\#8706);/\$\\partial \$/g;
+     $result =~ s/&(part|\#8706);/\\ensuremath\{\\partial\}/g;
-     $result =~ s/&(exist|\#8707);/\$\\exists \$/g;
+     $result =~ s/&(exist|\#8707);/\\ensuremath\{\\exists\}/g;
-     $result =~ s/&(empty|\#8709);/\$\\emptyset \$/g;
+     $result =~ s/&(empty|\#8709);/\\ensuremath\{\\emptyset\}/g;
-     $result =~ s/&(nabla|\#8711);/\$\\nabla \$/g;
+     $result =~ s/&(nabla|\#8711);/\\ensuremath\{\\nabla\}/g;
-     $result =~ s/&(isin|\#8712);/\$\\in \$/g;
+     $result =~ s/&(isin|\#8712);/\\ensuremath\{\\in\}/g;
-     $result =~ s/&(notin|\#8713);/\$\\notin \$/g;
+     $result =~ s/&(notin|\#8713);/\\ensuremath\{\\notin\}/g;
-     $result =~ s/&(ni|\#8715);/\$\\ni \$/g;
+     $result =~ s/&(ni|\#8715);/\\ensuremath\{\\ni\}/g;
-     $result =~ s/&(prod|\#8719);/\$\\prod \$/g;
+     $result =~ s/&(prod|\#8719);/\\ensuremath\{\\prod\}/g;
-     $result =~ s/&(sum|\#8721);/\$\\sum \$/g;
+     $result =~ s/&(sum|\#8721);/\\ensuremath\{\\sum\}/g;
-     $result =~ s/&(minus|\#8722);/\$-\$/g;
+     $result =~ s/&(minus|\#8722);/\\ensuremath\{-\}/g;
-     $result =~ s/&(lowast|\#8727);/\$*\$/g;
+     $result =~ s/&(lowast|\#8727);/\\ensuremath\{*\}/g;
-     $result =~ s/&(radic|\#8730);/\$\\surd \$/g;
+     $result =~ s/&(radic|\#8730);/\\ensuremath\{\\surd\}/g;
-     $result =~ s/&(prop|\#8733);/\$\\propto \$/g;
+     $result =~ s/&(prop|\#8733);/\\ensuremath\{\\propto\}/g;
-     $result =~ s/&(infin|\#8734);/\$\\infty \$/g;
+     $result =~ s/&(infin|\#8734);/\\ensuremath\{\\infty\}/g;
-     $result =~ s/&(ang|\#8736);/\$\\angle \$/g;
+     $result =~ s/&(ang|\#8736);/\\ensuremath\{\\angle\}/g;
-     $result =~ s/&(and|\#8743);/\$\\wedge \$/g;
+     $result =~ s/&(and|\#8743);/\\ensuremath\{\\wedge\}/g;
-     $result =~ s/&(or|\#8744);/\$\\vee \$/g;
+     $result =~ s/&(or|\#8744);/\\ensuremath\{\\vee\}/g;
-     $result =~ s/&(cap|\#8745);/\$\\cap \$/g;
+     $result =~ s/&(cap|\#8745);/\\ensuremath\{\\cap\}/g;
-     $result =~ s/&(cup|\#8746);/\$\\cup \$/g;
+     $result =~ s/&(cup|\#8746);/\\ensuremath\{\\cup\}/g;
-     $result =~ s/&(int|\#8747);/\$\\int \$/g;
+     $result =~ s/&(int|\#8747);/\\ensuremath\{\\int\}/g;
-     $result =~ s/&(sim|\#8764);/\$\\sim \$/g;
+     $result =~ s/&(sim|\#8764);/\\ensuremath\{\\sim\}/g;
-     $result =~ s/&(cong|\#8773);/\$\\cong \$/g;
+     $result =~ s/&(cong|\#8773);/\\ensuremath\{\\cong\}/g;
-     $result =~ s/&(asymp|\#8776);/\$\\approx \$/g;
+     $result =~ s/&(asymp|\#8776);/\\ensuremath\{\\approx\}/g;
-     $result =~ s/&(ne|\#8800);/\$\\not= \$/g;
+     $result =~ s/&(ne|\#8800);/\\ensuremath\{\\not=\}/g;
-     $result =~ s/&(equiv|\#8801);/\$\\equiv \$/g;
+     $result =~ s/&(equiv|\#8801);/\\ensuremath\{\\equiv\}/g;
-     $result =~ s/&(le|\#8804);/\$\\leq \$/g;
+     $result =~ s/&(le|\#8804);/\\ensuremath\{\\leq\}/g;
-     $result =~ s/&(ge|\#8805);/\$\\geq \$/g;
+     $result =~ s/&(ge|\#8805);/\\ensuremath\{\\geq\}/g;
-     $result =~ s/&(sub|\#8834);/\$\\subset \$/g;
+     $result =~ s/&(sub|\#8834);/\\ensuremath\{\\subset\}/g;
-     $result =~ s/&(sup|\#8835);/\$\\supset \$/g;
+     $result =~ s/&(sup|\#8835);/\\ensuremath\{\\supset\}/g;
-     $result =~ s/&(nsub|\#8836);/\$\\not\\subset \$/g;
+     $result =~ s/&(nsub|\#8836);/\\ensuremath\{\\not\\subset\}/g;
-     $result =~ s/&(sube|\#8838);/\$\\subseteq \$/g;
+     $result =~ s/&(sube|\#8838);/\\ensuremath\{\\subseteq\}/g;
-     $result =~ s/&(supe|\#8839);/\$\\supseteq \$/g;
+     $result =~ s/&(supe|\#8839);/\\ensuremath\{\\supseteq\}/g;
-     $result =~ s/&(oplus|\#8853);/\$\\oplus \$/g;
+     $result =~ s/&(oplus|\#8853);/\\ensuremath\{\\oplus\}/g;
-     $result =~ s/&(otimes|\#8855);/\$\\otimes \$/g;
+     $result =~ s/&(otimes|\#8855);/\\ensuremath\{\\otimes\}/g;
-     $result =~ s/&(perp|\#8869);/\$\\perp \$/g;
+     $result =~ s/&(perp|\#8869);/\\ensuremath\{\\perp\}/g;
-     $result =~ s/&(sdot|\#8901);/\$\\cdot \$/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/&(spades|\#9824);/\\ensuremath\{\\spadesuit\}/g;
-     $result =~ s/&(clubs|\#9827);/\$\\clubsuit \$/g;
+     $result =~ s/&(clubs|\#9827);/\\ensuremath\{\\clubsuit\}/g;
-     $result =~ s/&(hearts|\#9829);/\$\\heartsuit \$/g;
+     $result =~ s/&(hearts|\#9829);/\\ensuremath\{\\heartsuit\}/g;
-     $result =~ s/&(diams|\#9830);/\$\\diamondsuit \$/g;
+     $result =~ s/&(diams|\#9830);/\\ensuremath\{\\diamondsuit\}/g;
      return $result;
  }
  Line 647  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 get_textwidth {
+     my ($helper,$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;
+     }
+ }
  sub output_data {
      my ($r,$helper,$rparmhash) = @_;
      my %parmhash = %$rparmhash;
- Line 696  ENDPART
+ Line 720  ENDPART
      }
      my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$laystyle,$numberofcolumns);
      my $assignment =  $ENV{'form.assignment'};
-     my $LaTeXwidth;
+     my $LaTeXwidth=&recalcto_mm($textwidth);
-     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 @print_array=();
+     my @student_names=();
      if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'current_document') {
        #-- single document - problem, page, html, xml, ...
- Line 733  ENDPART
+ Line 750  ENDPART
  		}
  		my %form;
  		$form{'grade_target'}='tex';
- 		$form{'textwidth'}=$LaTeXwidth;
+ 		$form{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
  		$form{'problem_split'}=$parmhash{'problem_stream_switch'};
  		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
  		if ($helper->{'VARS'}->{'curseed'}) {
- Line 743  ENDPART
+ Line 760  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');
  	    }
- Line 798  ENDPART
+ Line 815  ENDPART
  		    if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {
  			my %form;
  			$form{'grade_target'}='tex';
- 			$form{'textwidth'}=$LaTeXwidth;
+ 			$form{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
  			$form{'problem_split'}=$parmhash{'problem_stream_switch'};
  			$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
  			$form{'rndseed'}=$rndseed;
- Line 844  ENDPART
+ Line 861  ENDPART
  	} elsif ($currentURL=~/\/smppg$/) {
  		my %form;
  		$form{'grade_target'}='tex';
- 		$form{'textwidth'}=$LaTeXwidth;
+ 		$form{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
  		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
  		my $texversion=&Apache::lonnet::ssi($currentURL,%form);
  		$result .= $texversion;
- Line 866  ENDPART
+ Line 883  ENDPART
          #-- produce an output string
  	my %form=();
  	$form{'grade_target'}='tex';
- 	$form{'textwidth'}=$LaTeXwidth;
+ 	$form{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
  	$form{'problem_split'}=$parmhash{'problem_stream_switch'};
  	$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
  	my $flag_latex_header_remove = 'NO';
- Line 947  ENDPART
+ Line 964  ENDPART
  	&Apache::lonnet::delenv('form.counter');
  	if ($flag_page_in_sequence eq 'YES') {$result =~ s/\\usepackage{calc}/\\usepackage{calc}\\usepackage{longtable}/;}
  	$result .= '\end{document}';
-      } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') || ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students')) {
+      } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') ||
+ 	      ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students')){
       #-- prints assignments for whole class or for selected students
+ 	 my $type;
  	 if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') {
  	     $selectionmade=5;
+ 	     $type='problems';
  	 } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students') {
  	     $selectionmade=8;
+ 	     $type='resources';
  	 }
  	 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;
+ 	 $moreenv{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
- 	 &Apache::lonnet::appenv(%moreenv);
  	 my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1);
  	 my $student_counter=-1;
  	 foreach my $person (@students) {
  	     $student_counter++;
- 	    my $current_output = '';
+ 	     my $i=int($student_counter/$helper->{'VARS'}{'NUMBER_TO_PRINT'});
- 	    my ($username,$userdomain,$usersection) = split /:/,$person;
+ 	     my ($output,$fullname)=&print_resources($r,$helper,$person,$type,\%moreenv,\@master_seq,$flag_latex_header_remove);
- 	    my $fullname = &get_name($username,$userdomain);
+ 	     $print_array[$i].=$output;
+ 	     $student_names[$i].=$person.':'.$fullname.'_END_';
- 	    if ($parmhash{'anonymous_quiz'}=~/yes/) {$fullname=' ';} #put here something reasonable for anonymous exams or quiz
+ 	     &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,&mt('last student').' '.$fullname);
-             #goes through all resources, checks if they are available for current student, and produces output
+ 	     $flag_latex_header_remove = 'YES';
- 	    &Apache::lonnet::delenv('form.counter');
+ 	 }
- 	    &Apache::lonxml::init_counter();
+ 	 &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
- 	    foreach my $curresline (@master_seq)  {
+ 	 $result .= $print_array[0].'  \end{document}';
- 		if ((($curresline=~ m/\.(problem|exam|quiz|assess|survey|form|library)$/) && ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students')) || ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students')) {
+      } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon')     ||
- 		    my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline);
+ 	      ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_anon')  ) {
- 		    if (&Apache::lonnet::allowed('bre',$res_url)) {
+ 	 $selectionmade="Seems to be useless";
- 			my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,
+ 	 my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
-                                                                         $ENV{'request.course.id'},'tex');
- 			my $lonidsdir=$r->dir_config('lonIDsDir');
- 			my $envfile=$ENV{'user.environment'};
- 			$envfile=~/\/([^\/]+)\.id$/;
- 			$envfile=$1;
- 			&Apache::lonnet::transfer_profile_to_env($lonidsdir,$envfile);
- 			my $current_counter=$ENV{'form.counter'};
- 			if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
- 			   ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
- 			    my %form;
- 			    $form{'answer_output_mode'}='tex';
- 			    $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
- 			    my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,$ENV{'request.course.id'},%form);
- 			    &Apache::lonnet::appenv(('form.counter' => $current_counter));
- 			    if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
- 				$rendered=~s/(\\keephidden{ENDOFPROBLEM})/$ansrendered$1/;
- 			    } else {
- 				$rendered=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
- 				$rendered.='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($curresline).'}\vskip 0 mm ';
- 				$rendered.=&path_to_problem ($curresline,$LaTeXwidth);
- 				$rendered.='\vskip 1 mm '.$ansrendered;
- 			    }
- 			}
- 			if ($flag_latex_header_remove eq 'YES') {
- 			    $rendered = &latex_header_footer_remove($rendered);
- 			} else {
- 			    $rendered =~ s/\\end{document}//;
- 			}
- 			$current_output .= $rendered;
- 		    }
- 		    $flag_latex_header_remove = 'YES';
- 		}
- 	    }
- 	    my $courseidinfo = &get_course();
- 	    if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
-             if ($usersection ne '') {$courseidinfo.=' - Sec. '.$usersection}
- 	    my $currentassignment=&Apache::lonxml::latex_special_symbols($helper->{VARS}->{'assignment'},'header');
- 	    if ($current_output=~/\\documentclass/) {
- 		$current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\lhead{\\textit{\\textbf{$fullname}}$courseidinfo \\hfill \\thepage \\\\ \\textit{$currentassignment}}\\vskip 3 mm /;
- 	    } else {
- 		my $blanspages = '';
- 		for (my $j=0;$j<$helper->{'VARS'}->{'EMPTY_PAGES'};$j++) {$blanspages.='\clearpage\strut\clearpage';}
- 		$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;
- 	    &Apache::lonnet::delenv('form.counter');
- 	    &Apache::lonxml::init_counter();
- 	    &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
- 					     &mt('last student').' '.$fullname);
- 	}
- 	&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
- 	$result .= $print_array[0].'  \end{document}';
- 	&Apache::lonnet::delenv('form.textwidth');
      } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_from_directory') {
      #prints selected problems from the subdirectory
  	$selectionmade = 6;
- Line 1048  ENDPART
+ Line 1019  ENDPART
  	    if ($urlp=~/\//) {
  		my %form;
  		$form{'grade_target'}='tex';
- 		$form{'textwidth'}=$LaTeXwidth;
+ 		$form{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
  		$form{'rndseed'}=$rndseed;
  		if ($urlp =~ m|/home/([^/]+)/public_html|) {
  		    $urlp =~ s|/home/([^/]*)/public_html|/~$1|;
- Line 1117  ENDPART
+ Line 1088  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";
+     my $identifier = &Apache::loncommon::get_cgi_id();
-     unless ($temp_file = Apache::File->new('>'.$filename)) {
+     my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout_".$identifier.".tex";
- 	$r->log_error("Couldn't open $filename for output $!");
+     if (!($#print_array>0)) {
- 	return SERVER_ERROR;
+ 	unless ($temp_file = Apache::File->new('>'.$filename)) {
-     }
+ 	    $r->log_error("Couldn't open $filename for output $!");
-     print $temp_file $result;
+ 	    return SERVER_ERROR;
-     my $begin=index($result,'\begin{document}',0);
+ 	}
-     my $inc=substr($result,0,$begin+16);
+ 	print $temp_file $result;
-     if ($#print_array>0) {
+ 	my $begin=index($result,'\begin{document}',0);
-         for (my $i=1;$i<=$#print_array;$i++) {
+ 	my $inc=substr($result,0,$begin+16);
-             my $anobegin=index($print_array[$i],'\setcounter{page}',0);
+     } else {
- 	    substr($print_array[$i],0,$anobegin)='';
+ 	my $begin=index($result,'\begin{document}',0);
- 	    $print_array[$i]=$inc.$print_array[$i].'\end{document}';
+ 	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,
- Line 1150  ENDPART
+ Line 1156  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>
- Line 1161  FINALEND
+ Line 1168  FINALEND
  }
+ sub print_resources {
+     my ($r,$helper,$person,$type,$moreenv,$master_seq,$remove_latex_header)=@_;
+     my $current_output = '';
+     my ($username,$userdomain,$usersection) = split /:/,$person;
+     my $fullname = &get_name($username,$userdomain);
+     #goes through all resources, checks if they are available for
+     #current student, and produces output
+     &Apache::lonnet::delenv('form.counter');
+     &Apache::lonxml::init_counter();
+     foreach my $curresline (@{$master_seq})  {
+ 	if ( !($type eq 'problems' &&
+ 	       ($curresline!~ m/\.(problem|exam|quiz|assess|survey|form|library)$/)) ) {
+ 	    my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline);
+ 	    if (&Apache::lonnet::allowed('bre',$res_url)) {
+ 		my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,$ENV{'request.course.id'},'tex',$moreenv);
+ 		my $lonidsdir=$r->dir_config('lonIDsDir');
+ 		my $envfile=$ENV{'user.environment'};
+ 		$envfile=~/\/([^\/]+)\.id$/;
+ 		$envfile=$1;
+ 		&Apache::lonnet::transfer_profile_to_env($lonidsdir,$envfile);
+ 		my $current_counter=$ENV{'form.counter'};
+ 		if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
+ 		   ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
+ 		    my %form;
+ 		    $form{'answer_output_mode'}='tex';
+ 		    $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
+ 		    my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,$ENV{'request.course.id'},%form);
+ 		    &Apache::lonnet::appenv(('form.counter' => $current_counter));
+ 		    if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
+ 			$rendered=~s/(\\keephidden{ENDOFPROBLEM})/$ansrendered$1/;
+ 		    } else {
+ 			$rendered=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
+ 			$rendered.='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($curresline).'}\vskip 0 mm ';
+ 			$rendered.=&path_to_problem ($curresline,$LaTeXwidth);
+ 			$rendered.='\vskip 1 mm '.$ansrendered;
+ 		    }
+ 		}
+ 		if ($remove_latex_header eq 'YES') {
+ 		    $rendered = &latex_header_footer_remove($rendered);
+ 		} else {
+ 		    $rendered =~ s/\\end{document}//;
+ 		}
+ 		$current_output .= $rendered;
+ 	    }
+ 	    $remove_latex_header = 'YES';
+ 	}
+     }
+     my $courseidinfo = &get_course();
+     if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
+     if ($usersection ne '') {$courseidinfo.=' - Sec. '.$usersection}
+     my $currentassignment=&Apache::lonxml::latex_special_symbols($helper->{VARS}->{'assignment'},'header');
+     if ($current_output=~/\\documentclass/) {
+ 	$current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\lhead{\\textit{\\textbf{$fullname}}$courseidinfo \\hfill \\thepage \\\\ \\textit{$currentassignment}}\\vskip 3 mm /;
+     } else {
+ 	my $blankpages = '';
+ 	for (my $j=0;$j<$helper->{'VARS'}->{'EMPTY_PAGES'};$j++) {$blankpages.='\clearpage\strut\clearpage';}
+ 	$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 '.$blankpages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$fullname.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$currentassignment.'}}} \vskip -5 mm '.$current_output;
+     }
+     return ($current_output,$fullname);
+ }
  sub handler {
- Line 1398  HELPERFRAGMENT
+ Line 1467  HELPERFRAGMENT
      # problems in the course, optionally for selected students
      if ($userPriviledged && ($helper->{VARS}->{'postdata'}=~/\/res\//)) {
          push @{$printChoices}, ['<b>Problems</b> from <b>entire course</b>', 'all_problems', 'ALL_PROBLEMS'];
- 	if ($helper->{VARS}->{'assignment'}) {
+          &Apache::lonxml::xmlparse($r, 'helper', <<ALL_PROBLEMS);
- 	    push @{$printChoices}, ["<b>Problems</b> from <b><i>$sequenceTitle</i></b> for <b>selected students</b>", 'problems_for_students', 'CHOOSE_STUDENTS'];
- 	}
-         &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS);
    <state name="ALL_PROBLEMS" title="Select Problem(s) to print">
      <message>(mark them then click "next" button) <br /></message>
      <resource variable="RESOURCES" multichoice="1"
- Line 1410  HELPERFRAGMENT
+ Line 1476  HELPERFRAGMENT
        <filterfunc>return $isProblemOrMap;</filterfunc>
        <choicefunc>return $isProblem;</choicefunc>
        <valuefunc>return $symbFilter;</valuefunc>
-       </resource>
+     </resource>
-     </state>
+   </state>
+ ALL_PROBLEMS
-   <state name="CHOOSE_STUDENTS" title="Select Students and Resources">
+ 	if ($helper->{VARS}->{'assignment'}) {
-     <student multichoice='1' variable="STUDENTS" nextstate="PAGESIZE" />
+ 	    push @{$printChoices}, ["<b>Problems</b> from <b><i>$sequenceTitle</i></b> for <b>selected students</b>", 'problems_for_students', 'CHOOSE_STUDENTS'];
-     <message><br /><big><i><b>Select resources for the assignment</b></i></big><br /></message>
+ 	    push @{$printChoices}, ["<b>Problems</b> from <b><i>$sequenceTitle</i></b> for <b>anonymous students</b>", 'problems_for_anonymous', 'CHOOSE_ANON1'];
+ 	}
+ 	my $resource_selector=<<RESOURCE_SELECTOR;
+    <message><br /><big><i><b>Select resources for the assignment</b></i></big><br /></message>
      <resource variable="RESOURCES" multichoice="1" addstatus="1">
        <filterfunc>return $isProblem;</filterfunc>
        <mapurl>$map</mapurl>
- Line 1427  HELPERFRAGMENT
+ Line 1497  HELPERFRAGMENT
        <choice computer='1'>Add one empty page/column after each student\'s assignment</choice>
        <choice computer='2'>Add two empty pages/column after each student\'s assignment</choice>
        <choice computer='3'>Add three empty pages/column after each student\'s assignment</choice>
-       </choices>
+     </choices>
-     </state>
+     <message><hr width='33%' /><b>Number of assignments printed at the same time: </b></message>
+     <string variable="NUMBER_TO_PRINT" maxlength="5" size="5"><defaultvalue>"all"</defaultvalue></string>
+ RESOURCE_SELECTOR
+         &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS);
+   <state name="CHOOSE_STUDENTS" title="Select Students and Resources">
+       <student multichoice='1' variable="STUDENTS" nextstate="PAGESIZE" />
+     $resource_selector
+   </state>
  CHOOSE_STUDENTS
+         &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_ANON1);
+   <state name="CHOOSE_ANON1" title="Select Students and Resources">
+     <message><hr width='33%' /><b>How many Anonymous exams to print?</b></message>
+     <string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5"></string>
+     <message><hr width='33%' /></message>
+     $resource_selector
+   </state>
+ CHOOSE_ANON1
- 	addMessage("<hr width='33%' /><b>Number of assignments printed at the same time: </b>");
-         $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%' />");
  	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'];
+ 	    push @{$printChoices}, ["<b>Resources</b> from <b><i>$sequenceTitle</i></b> for <b>anonymous students</b>", 'resources_for_anonymous', 'CHOOSE_ANON2'];
  	}
- 	&Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS1);
-   <state name="CHOOSE_STUDENTS1" title="Select Students and Resources">
-     <student multichoice='1' variable="STUDENTS" nextstate="PAGESIZE" />
+ 	$resource_selector=<<RESOURCE_SELECTOR;
      <message><br /><big><i><b>Select resources for the assignment</b></i></big><br /></message>
      <resource variable="RESOURCES" multichoice="1" addstatus="1">
        <filterfunc>return $isNotMap;</filterfunc>
- Line 1455  CHOOSE_STUDENTS
+ Line 1537  CHOOSE_STUDENTS
        <choice computer='1'>Add one empty page/column after each student\'s assignment</choice>
        <choice computer='2'>Add two empty pages/column after each student\'s assignment</choice>
        <choice computer='3'>Add three empty pages/column after each student\'s assignment</choice>
-       </choices>
+     </choices>
+     <message><hr width='33%' /><b>Number of assignments printed at the same time: </b></message>
+     <string variable="NUMBER_TO_PRINT" maxlength="5" size="5"><defaultvalue>"all"</defaultvalue></string>
+ RESOURCE_SELECTOR
+ 	&Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS1);
+   <state name="CHOOSE_STUDENTS1" title="Select Students and Resources">
+     <student multichoice='1' variable="STUDENTS" nextstate="PAGESIZE" />
+     $resource_selector
      </state>
  CHOOSE_STUDENTS1
-  	addMessage("<hr width='33%' /><b>Number of assignments printed at the same time: </b>");
+ 	&Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_ANON2);
-         $paramHash = Apache::lonhelper::getParamHash();
+   <state name="CHOOSE_ANON2" title="Select Students and Resources">
- 	$paramHash->{'variable'} = 'NUMBER_TO_PRINT';
+     <message><hr width='33%' /><b>How many Anonymous exams to print?</b></message>
- 	$helper->declareVar('NUMBER_TO_PRINT');
+     <string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5"></string>
- 	addMessage("<input type='text' name='NUMBER_TO_PRINT.forminput' size='3' value='0' /><hr width='33%' />");
+     <message><hr width='33%' /></message>
+     $resource_selector
+   </state>
+ CHOOSE_ANON2
      }
      # FIXME: That RE should come from a library somewhere.
- Line 1861  sub render {
+ Line 1954  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

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.273
changed lines
	Added in v.1.285