[BACK]Return to londefdef.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/londefdef.pm between versions 1.381 and 1.389

version 1.381, 2008/02/14 22:37:46 version 1.389, 2008/05/28 01:32:59
Line 46  use Apache::File(); Line 46  use Apache::File();
 use Image::Magick;  use Image::Magick;
 use Apache::lonmenu();  use Apache::lonmenu();
 use Apache::lonmeta();  use Apache::lonmeta();
   use Apache::lonlocal;
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
 use File::Basename;  use File::Basename;
 use LONCAPA();  use LONCAPA();
Line 200  sub start_html { Line 201  sub start_html {
                           '\usepackage[dvips]{graphicx}'.                            '\usepackage[dvips]{graphicx}'.
   '\usepackage{wrapfig}'.    '\usepackage{wrapfig}'.
   '\usepackage{picins}'.    '\usepackage{picins}'.
     '\usepackage[T1]{fontenc}'."\n".
     '\usepackage[postscript]{ucs}'."\n".
     '\usepackage[utf8x]{inputenc}'."\n".
     '\usepackage{pifont}' ."\n".
     '\usepackage{latexsym}'."\n".
                           '\usepackage{epsfig}'.                            '\usepackage{epsfig}'.
                           '\usepackage{calc}'.                            '\usepackage{calc}'.
                           '\usepackage{amsmath}'.                            '\usepackage{amsmath}'.
Line 589  sub start_body { Line 595  sub start_body {
 }  }
   
 sub edit_controls {  sub edit_controls {
     my $result .= (<<EDITBUTTON);      my $result .= '
 <form method="post">  <form method="post">
 <input type="submit" name="editmode" accesskey="e" value="Edit" />  <div class="LC_edit_problem_header">
   <div class="LC_edit_problem_header_row1">'.
   &Apache::lonxml::renderingoptions().'
   <input type="submit" name="changeproblemmode" value="'.&mt('Change View').'" />
   </div>
   <div class="LC_edit_problem_header_edit_row"><input type="submit" name="editmode" accesskey="e" value="Edit" /></div></div>
 </form>  </form>
 <br />  <br />';
 EDITBUTTON  
     return $result;      return $result;
 }  }
   
Line 1654  sub end_a { Line 1664  sub end_a {
     &Apache::lonxml::get_param('href',$parstack,$safeeval,undef,1);      &Apache::lonxml::get_param('href',$parstack,$safeeval,undef,1);
  my $name =   my $name =
     &Apache::lonxml::get_param('name',$parstack,$safeeval,undef,1);      &Apache::lonxml::get_param('name',$parstack,$safeeval,undef,1);
  if ($href =~ /\S/) {          my $uriprint =
               &Apache::lonxml::get_param('uriprint',$parstack,$safeeval,undef,1);
           my $anchorprint =
               &Apache::lonxml::get_param('anchorprint',$parstack,$safeeval,undef,1);
    if (($href =~ /\S/) && ($uriprint=~/^on|uriprint|yes|1$/i)) {
     $href =~ s/([^\\])%/$1\\\%/g;      $href =~ s/([^\\])%/$1\\\%/g;
     # Substitute special symbols... and allow line breaks at each /      # Substitute special symbols... and allow line breaks at each /
     #      #
     $href = &Apache::lonxml::latex_special_symbols($href);      $href = &Apache::lonxml::latex_special_symbols($href);
     $href =~ s/\//\/\\-/g;              # Map / to /\- to allow hyphenation.      $href =~ s/\//\/\\-/g;              # Map / to /\- to allow hyphenation.
     $currentstring .= ' ({\tt URI:'.$href.'})';      $currentstring .= ' ({\tt URI:'.$href.'})';
  } elsif ($name =~ /\S/) {   } elsif (($name =~ /\S/) && ($anchorprint=~/^on|anchorprint|yes|1$/i)) {
     $currentstring .= ' ({\tt Anchor:'.&Apache::lonxml::latex_special_symbols($name).'})';      $currentstring .= ' ({\tt Anchor:'.&Apache::lonxml::latex_special_symbols($name).'})';
  } else {   } else {
     $currentstring.='';      $currentstring.='';
Line 2096  sub end_table { Line 2110  sub end_table {
  my $WARNING='';   my $WARNING='';
         #width of columns from TeXwidth attributes          #width of columns from TeXwidth attributes
   
    # Protect against unbalanced </table> tag.
   
    if (scalar(@Apache::londefdef::table) > 0) {
   
  for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {   for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
     for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) {      for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) {
  if ($Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]<$Apache::londefdef::table[-1]{'TeXlen'}[$in][$jn]) {   if ($Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]<$Apache::londefdef::table[-1]{'TeXlen'}[$in][$jn]) {
Line 2499  sub end_table { Line 2517  sub end_table {
     undef @Apache::londefdef::table;      undef @Apache::londefdef::table;
  }   }
     }      }
       }
     return $currentstring;      return $currentstring;
 }  }
   
Removed from v.1.381  
changed lines
  Added in v.1.389

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