--- loncom/interface/lonprintout.pm	2007/01/08 19:07:58	1.494
+++ loncom/interface/lonprintout.pm	2007/04/17 15:45:03	1.497
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.494 2007/01/08 19:07:58 albertel Exp $
+# $Id: lonprintout.pm,v 1.497 2007/04/17 15:45:03 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -697,6 +697,20 @@ sub character_chart {
     $result =~ s/&(clubs|\#9827);/\\ensuremath\{\\clubsuit\}/g;
     $result =~ s/&(hearts|\#9829);/\\ensuremath\{\\heartsuit\}/g;
     $result =~ s/&(diams|\#9830);/\\ensuremath\{\\diamondsuit\}/g;
+#   Chemically useful 'things' contributed by Hon Kie (bug 4652).
+    $result =~ s/&\#8636;/\\ensuremath\{\\leftharpoonup\}/g;
+    $result =~ s/&\#8637;/\\ensuremath\{\\leftharpoondown\}/g;
+    $result =~ s/&\#8640;/\\ensuremath\{\\rightharpoonup\}/g;
+    $result =~ s/&\#8641;/\\ensuremath\{\\rightharpoondown\}/g;
+    $result =~ s/&\#8652;/\\ensuremath\{\\rightleftharpoons\}/g;
+    $result =~ s/&\#8605;/\\ensuremath\{\\leadsto\}/g;
+    $result =~ s/&\#8617;/\\ensuremath\{\\hookleftarrow\}/g;
+    $result =~ s/&\#8618;/\\ensuremath\{\\hookrightarrow\}/g;
+    $result =~ s/&\#8614;/\\ensuremath\{\\mapsto\}/g;
+    $result =~ s/&\#8599;/\\ensuremath\{\\nearrow\}/g;
+    $result =~ s/&\#8600;/\\ensuremath\{\\searrow\}/g;
+    $result =~ s/&\#8601;/\\ensuremath\{\\swarrow\}/g;
+    $result =~ s/&\#8598;/\\ensuremath\{\\nwarrow\}/g;
     return $result;
 }
 
@@ -709,7 +723,7 @@ my %page_formats=
 	     '2' => ['3.66 in','9.8 in', '-0.57 in','-0.57 in','0.275 in']
 	 },
 	 'album' => {
-	     '1' => [ '8.8 in', '6.8 in','-0.55 in',  '-0.55 in','1.0 in'],
+	     '1' => [ '8.8 in', '6.8 in','-0.55 in',  '-0.55 in','0.394 in'],
 	     '2' => [ '4.8 in', '6.8 in','-0.5 in', '-1.0 in','3.5 in']
 	 },
      },
@@ -766,10 +780,10 @@ my %page_formats=
      'a4' => {
 	 'book' => {
 	     '1' => ['17.6 cm','27.2 cm','-1.397 cm','-2.11 cm','-1.27 cm'],
-	     '2' => [ '9.1 cm','27.2 cm','-1.397 c,','-2.11 cm','-1.27 cm']
+	     '2' => [ '9.1 cm','27.2 cm','-1.397 cm','-2.11 cm','-1.27 cm']
 	 },
 	 'album' => {
-	     '1' => ['21.59 cm','19.558 cm','-1.27 cm','-2.11 cm','0 cm'],
+	     '1' => ['21.59 cm','19.558 cm','-1.397cm','-2.11 cm','0 cm'],
 	     '2' => ['9.91 cm','19.558 cm','-1.397 cm','-2.11 cm','0 cm']
 	 },
      },
@@ -2784,7 +2798,10 @@ CHOOSE_FROM_ANY_SEQUENCE
 
     if (($perm{'pav'} and &Apache::lonnet::allowed('vgr',$env{'request.course.id'})) or 
 	($helper->{VARS}->{'construction'} eq '1')) {
-	addMessage("<hr width='33%' /><table><tr><td align='right'>Print: </td><td>");
+	addMessage("<hr width='33%' /><table><tr><td align='right'>".
+                   '<label for="ANSWER_TYPE_forminput">'.
+                   &mt('Print').
+                   "</label>: </td><td>");
         $paramHash = Apache::lonhelper::getParamHash();
 	$paramHash->{'variable'} = 'ANSWER_TYPE';   
 	$helper->declareVar('ANSWER_TYPE');         
@@ -2800,10 +2817,16 @@ CHOOSE_FROM_ANY_SEQUENCE
 
     if ($perm{'pav'}) {
 	if (!$startedTable) {
-	    addMessage("<hr width='33%' /><table><tr><td align='right'>LaTeX mode: </td><td>");
+	    addMessage("<hr width='33%' /><table><tr><td align='right'>".
+                       '<label for="LATEX_TYPE_forminput">'.
+                       &mt('LaTeX mode').
+                       "</label>: </td><td>");
 	    $startedTable = 1;
 	} else {
-	    addMessage("<tr><td align='right'>LaTeX mode: </td><td>");
+	    addMessage("<tr><td align='right'>".
+                       '<label for="LATEX_TYPE_forminput">'.
+                        &mt('LaTeX mode').
+                       "</label>: </td><td>");
 	}
         $paramHash = Apache::lonhelper::getParamHash();
 	$paramHash->{'variable'} = 'LATEX_TYPE';   
@@ -2819,7 +2842,10 @@ CHOOSE_FROM_ANY_SEQUENCE
 	}
         Apache::lonhelper::dropdown->new();
  
-	addMessage("</td></tr><tr><td align='right'>Print Table of Contents: </td><td>");
+	addMessage("</td></tr><tr><td align='right'>".
+                   '<label="TABLE_CONTENTS_forminput">'.
+                   &mt('Print Table of Contents').
+                   "</label>: </td><td>");
         $paramHash = Apache::lonhelper::getParamHash();
 	$paramHash->{'variable'} = 'TABLE_CONTENTS';   
 	$helper->declareVar('TABLE_CONTENTS');         
@@ -2830,7 +2856,10 @@ CHOOSE_FROM_ANY_SEQUENCE
 	addMessage("</td></tr>");
         
 	if (not $helper->{VARS}->{'construction'}) {
-	    addMessage("<tr><td align='right'>Print Index: </td><td>");
+	    addMessage("<tr><td align='right'>".
+                       '<label for="TABLE_INDEX_forminput">'.
+                       &mt('Print Index').
+                       "</label>: </td><td>");
 	    $paramHash = Apache::lonhelper::getParamHash();
 	    $paramHash->{'variable'} = 'TABLE_INDEX';   
 	    $helper->declareVar('TABLE_INDEX');         
@@ -2839,7 +2868,10 @@ CHOOSE_FROM_ANY_SEQUENCE
 				     ['Yes', 'yes'] ];
 	    Apache::lonhelper::dropdown->new();
 	    addMessage("</td></tr>");
-	    addMessage("<tr><td align='right'>Print Discussions: </td><td>");
+	    addMessage("<tr><td align='right'>".
+                       '<label for="PRINT_DISCUSSIONS_forminput">'.
+                       &mt('Print Discussions').
+                       "</label>: </td><td>");
 	    $paramHash = Apache::lonhelper::getParamHash();
 	    $paramHash->{'variable'} = 'PRINT_DISCUSSIONS';   
 	    $helper->declareVar('PRINT_DISCUSSIONS');         
@@ -2861,14 +2893,21 @@ CHOOSE_FROM_ANY_SEQUENCE
 
 	if ($helper->{'VARS'}->{'construction'}) { 
 	    my $stylevalue=$env{'construct.style'};
+            my $randseedtext=&mt("Use random seed");
+            my $stylefiletext=&mt("Use style file");
+
 	    my $xmlfrag .= <<"RNDSEED";
-	    <message><tr><td align='right'>Use random seed:  </td><td></message>
+	    <message><tr><td align='right'>
+            <label for="curseed_forminput">$randseedtext</label>:
+            </td><td></message>
 	    <string variable="curseed" size="15" maxlength="15">
 		<defaultvalue>
 	            return $helper->{VARS}->{'curseed'};
 	        </defaultvalue>
 	    </string>
-	     <message></td></tr><tr><td align="right">Use style file:</td><td></message>
+	     <message></td></tr><tr><td align="right">
+             <label for="style_file_value">$stylefiletext</label>:
+             </td><td></message>
              <message><input type="text" size="40" name="style_file_value" value="$stylevalue"  />&nbsp; <a href="javascript:openbrowser('helpform','style_file_value','sty')">Select style file</a> </td><tr><td></message>
 	     <choices allowempty="1" multichoice="true" variable="showallfoils">
                 <choice computer="1">Show all foils?</choice>