--- loncom/interface/lonprintout.pm	2009/06/22 09:26:01	1.554.2.2
+++ loncom/interface/lonprintout.pm	2009/06/17 15:27:14	1.555
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.554.2.2 2009/06/22 09:26:01 foxr Exp $
+# $Id: lonprintout.pm,v 1.555 2009/06/17 15:27:14 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -70,10 +70,6 @@ my $ssi_last_error;		# The error text fr
 my $ssi_retry_count = 5;	# Some arbitrary value.
 
 
-#  Font size:
-
-my $font_size = 'normalsize';	# Default is normalsize...
-
 
 # Fetch the contents of a resource, uninterpreted.
 # This is used here to fetch a latex file to be included
@@ -118,24 +114,6 @@ sub annotate {
     return $result;
 }
 
-#
-#   Set a global document font size:
-#   This is done by replacing \begin{document}
-#   with \begin{document}{\some-font-directive
-#   and \end{document} with
-#   }\end{document
-#
-sub set_font_size {
-
-    my ($text) = @_;
-
-    $text =~ s/\\begin{document}/\\begin{document}{\\$font_size/;
-    $text =~ s/\\end{document}/}\\end{document}/;
-    return $text;
-
-
-}
-
 # include_pdf - PDF files are included into the 
 # output as follows:
 #  - The PDF, if necessary, is replicated.
@@ -1519,7 +1497,6 @@ sub output_data {
     my %parmhash = %$rparmhash;
     $ssi_error = 0;		# This will be set nonzero by failing ssi's.
     $resources_printed = '';
-    $font_size = $helper->{'VARS'}->{'fontsize'};
     my $do_postprocessing = 1;
     my $js = <<ENDPART;
 <script type="text/javascript">
@@ -2245,11 +2222,6 @@ ENDPART
 	    $URLback=~s|^/~|/priv/|;
 	}
     }
-    #
-    # Final adjustment of the font size:
-    #
-
-    $result = set_font_size($result);
 
 #-- writing .tex file in prtspool 
     my $temp_file;
@@ -3261,6 +3233,9 @@ CHOOSE_FROM_ANY_SEQUENCE
 	&addMessage('<br />'
                    .'<h3>'.&mt('Print Options').'</h3>'
                    .&Apache::lonhtmlcommon::start_pick_box()
+#                  .&Apache::lonhtmlcommon::row_headline()
+#                  .'<h3>'.&mt('Print Options').'</h3>'
+#                  .&Apache::lonhtmlcommon::row_closure()
                    .&Apache::lonhtmlcommon::row_title(
                        '<label for="ANSWER_TYPE_forminput">'
                       .&mt('Print Answers')
@@ -3278,34 +3253,6 @@ CHOOSE_FROM_ANY_SEQUENCE
         Apache::lonhelper::dropdown->new();
 	&addMessage(&Apache::lonhtmlcommon::row_closure());
 	$startedTable = 1;
-
-#
-#  Select font size.
-#
-
-            $helper->declareVar('fontsize');
-            &addMessage(&Apache::lonhtmlcommon::row_title(&mt('Font Size')));
-            my $xmlfrag = << "FONT_SELECTION";
-
-          
-            <dropdown variable='fontsize' multichoice='0', allowempty='0'>
-            <defaultvalue>
-		  return 'normalsize';
-            </defaultvalue>
-            <choice computer='tiny'>Tiny</choice>
-            <choice computer='sub/superscriptsize'>Script Size</choice>
-            <choice computer='footnotesize'>Footnote Size</choice>
-            <choice computer='small'>Small</choice>
-            <choice computer='normalsize'>Normal (default)</choice>
-            <choice computer='large'>larger than normal</choice>
-            <choice computer='Large'>Even larger than normal</choice>
-            <choice computer='LARGE'>Still larger than normal</choice>
-            <choice computer='huge'>huge font size</choice>
-            <choice computer='Huge'>Largest possible size</choice>
-            </dropdown>
-FONT_SELECTION
-            &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
-            &addMessage(&Apache::lonhtmlcommon::row_closure(1));
     }
 
     if ($perm{'pav'}) {
@@ -3405,7 +3352,7 @@ FONT_SELECTION
 	    $paramHash->{'multichoice'} = "true";
 	    $paramHash->{'allowempty'}  = "true";
 	    $paramHash->{'variable'}   = "showallfoils";
-	    $paramHash->{'CHOICES'} = [ ["Show all foils", "1"] ];
+	    $paramHash->{'CHOICES'} = [ [&mt('Show All Foils'), "1"] ];
 	    Apache::lonhelper::choices->new();
             &addMessage(&Apache::lonhtmlcommon::row_closure(1));
 	}
@@ -3442,7 +3389,7 @@ FONT_SELECTION
 .qq|<a href="javascript:openbrowser('helpform','style_file_forminput','sty')">|
 .$selectfiletext.'</a>'
             .&Apache::lonhtmlcommon::row_closure()
-            .&Apache::lonhtmlcommon::row_title(&mt('Show all foils'))
+            .&Apache::lonhtmlcommon::row_title(&mt('Show All Foils'))
             .'</message>
 	     <choices allowempty="1" multichoice="true" variable="showallfoils">
                 <choice computer="1">&nbsp;</choice>
@@ -3471,10 +3418,9 @@ FONT_SELECTION
 		</dropdown>
 PROBTYPE
             &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
+	    
             &addMessage(&Apache::lonhtmlcommon::row_closure(1));
 
-
-
         }
     }
 
@@ -3584,8 +3530,6 @@ sub render {
     my $pdfFormLabel=&mt('PDF-Formfields');
     my $with=&mt('with Formfields');
     my $without=&mt('without Formfields');
-    
-
     $result.='<h3>'.&mt('Layout Options').'</h3>'
             .&Apache::loncommon::start_data_table()
             .&Apache::loncommon::start_data_table_header_row()