--- loncom/xml/londefdef.pm 2009/01/20 12:01:00 1.398
+++ loncom/xml/londefdef.pm 2009/11/18 20:48:13 1.413
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Tags Default Definition Module
#
-# $Id: londefdef.pm,v 1.398 2009/01/20 12:01:00 foxr Exp $
+# $Id: londefdef.pm,v 1.413 2009/11/18 20:48:13 droeschl Exp $
#
#
# Copyright Michigan State University Board of Trustees
@@ -176,47 +176,8 @@ sub start_html {
if ($target eq 'web' || $target eq 'edit' || $target eq 'webgrade' ) {
# start_body() takes care of emitting the
} elsif ($target eq 'tex') {
- $currentstring .=
- '\documentclass[letterpaper,twoside]{article}\raggedbottom';
- if (($env{'form.latex_type'}=~'batchmode') ||
- (!$env{'request.role.adv'})) {$currentstring .='\batchmode';}
- $currentstring .= '\newcommand{\keephidden}[1]{}'.
- '\renewcommand{\deg}{$^{\circ}$}'.
- '\usepackage{multirow}'.
- '\usepackage{longtable}'.
- '\usepackage{textcomp}'.
- '\usepackage{makeidx}'.
- '\usepackage[dvips]{graphicx}'.
- '\usepackage{wrapfig}'.
- '\usepackage{picins}'.
- '\usepackage[T1]{fontenc}'."\n".
- '\usepackage{lmodern}'."\n".
- '\usepackage[postscript]{ucs}'."\n".
- '\usepackage[utf8x]{inputenc}'."\n".
- '\usepackage{pifont}' ."\n".
- '\usepackage{latexsym}'."\n".
- '\usepackage{epsfig}'.
- "\\usepackage{xtab}\n".
- "\\usepackage{tabularx}\n".
- "\\usepackage{booktabs}\n".
- "\\usepackage{array}\n".
- "\\usepackage{colortbl}\n".
- "\\usepackage{xcolor}\n".
- '\usepackage{calc}'.
- '\usepackage{amsmath}'.
- '\usepackage{amssymb}'.
- '\usepackage{amsfonts}'.
- '\usepackage{amsthm}'.
- '\usepackage{amscd}';
-
- if($env{'form.pdfFormFields'} eq 'yes') {
- $currentstring .= '\usepackage{hyperref}'.
- '\usepackage{eforms}'.
- '\usepackage{tabularx}';
- }
- $currentstring .= '\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}\setlength{\itemsep}{0.022in}\setlength{\parsep}{0in}\setlength{\belowdisplayskip}{0.04in}\setlength{\abovedisplayskip}{0.05in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.04in}}}{\end{list}}'.
- '\renewenvironment{theindex}{\begin{list}{}{{\vskip 1mm \noindent \large\textbf{Index}} \newline \setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.01in}\setlength{\itemsep}{0.1in}\setlength{\parsep}{-0.02in}\setlength{\belowdisplayskip}{0.01in}\setlength{\abovedisplayskip}{0.01in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.01in}}}{\end{list}}';
+ $currentstring .= &latex_header();
}
return $currentstring;
}
@@ -577,36 +538,75 @@ sub start_body {
my $extra_head = &generate_css_links();
+ # Breadcrumbs
+ &Apache::lonhtmlcommon::clear_breadcrumbs();
+ if ($env{'request.state'} eq 'construct') {
+ &Apache::lonhtmlcommon::add_breadcrumb({
+ 'text' => 'Construction Space',
+ 'href' => &Apache::loncommon::authorspace(),
+ });
+ &Apache::lonhtmlcommon::add_breadcrumb({
+ 'text' => 'HTML Editor',
+ 'href' => '',
+ });
+ # breadcrumbs (and tools) will be created
+ # in start_page->bodytag->innerregister
+ } else {
+ # FIXME Where are we?
+ }
+
$currentstring =
&Apache::loncommon::start_page($Apache::londefdef::title,
$Apache::londefdef::head
.$extra_head,
{'add_entries' => $token->[2],
- 'no_title' => 1,
+# 'no_title' => 1,
'force_register' => 1});
- if ($env{'request.state'} ne 'published') {
- $currentstring.=&Apache::lonmenu::constspaceform();
- $currentstring.=&Apache::londefdef::edit_controls();
- }
- $currentstring.=&Apache::lonxml::message_location();
+ my $header = '';
+ if ($env{'request.state'} ne 'published' &&
+ $env{'request.state'} ne 'construct') {
+ $header=&Apache::lonmenu::constspaceform();
+ }
+ if ($env{'request.state'} ne 'published') {
+ $header.=&Apache::londefdef::edit_controls();
+ }
+ if ($env{'request.state'} eq 'construct') {
+ $currentstring.=&Apache::loncommon::head_subbox(
+ &Apache::loncommon::CSTR_pageheader()
+ .$header);
+ } elsif ($env{'request.state'} eq 'edit') {
+ $currentstring.=&Apache::loncommon::head_subbox($header);
+ }
+ $currentstring.=&Apache::lonxml::message_location();
} elsif ($target eq 'tex') {
- $currentstring = '\begin{document}';
- }
+ $currentstring = ''; # '\begin{document}' is in header.
+ }
+
return $currentstring;
}
sub edit_controls {
+ my ($nochgview) = @_;
my $result .= '
-
';
+';
return $result;
}
@@ -1383,10 +1383,6 @@ sub start_font {
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
my $face=&Apache::lonxml::get_param('face',$parstack,$safeeval);
- if ($face!~/symbol/i) {
- if (($env{'browser.fontenhance'} eq 'on') ||
- ($env{'browser.blackwhite'} eq 'on')) { return ''; }
- }
$currentstring = $token->[4];
} elsif ($target eq 'tex') {
my $fontsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval);
@@ -1651,6 +1647,26 @@ sub start_a {
my $href=&Apache::lonxml::get_param('href',$parstack,$safeeval,
undef,1);
$currentstring=&Apache::lonenc::encrypt_ref($token,{'href'=>$href});
+ if ($href =~ /\S/) {
+ if ($href !~ m{^https?://}) {
+ my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'});
+ my $linkurl;
+ if ($href =~ m{^/uploaded/}) {
+ $linkurl = $href;
+ } elsif ($href =~ m{^[^/]}) {
+ my $path = $url;
+ $path =~ s{[^/]*$}{};
+ $linkurl = $path.$href;
+ }
+ if ($linkurl =~ m{^/uploaded/}) {
+ if (!&Apache::lonnet::allowed('bre',$linkurl)) {
+ if (&Apache::lonnet::is_on_map($url)) {
+ &Apache::lonxml::extlink($linkurl);
+ }
+ }
+ }
+ }
+ }
}
return $currentstring;
}
@@ -3522,7 +3538,7 @@ sub start_frameset {
&Apache::loncommon::start_page($Apache::londefdef::title,
$Apache::londefdef::head,
{'add_entries' => $token->[2],
- 'no_title' => 1,
+# 'no_title' => 1,
'force_register' => 1,
'frameset' => 1,});
@@ -4796,6 +4812,69 @@ sub is_inside_of {
}
+#
+# This sub provides the typical LaTeX prefix matter for tex output:
+#
+sub latex_header
+{
+ my ($mode) = @_;
+ my $currentstring = '';
+
+ $currentstring .=
+ "\n% &Apache::lonxml::londefdef \n" .
+ '\documentclass[letterpaper,twoside]{article}\raggedbottom';
+ if (($env{'form.latex_type'}=~'batchmode') ||
+ (!$env{'request.role.adv'}) ||
+ ($mode eq 'batchmode')) {$currentstring .='\batchmode';}
+ $currentstring .= '\newcommand{\keephidden}[1]{}'.
+ '\renewcommand{\deg}{$^{\circ}$}'.
+ '\usepackage{multirow}'.
+ '\usepackage{longtable}'.
+ '\usepackage{textcomp}'.
+ '\usepackage{makeidx}'.
+ '\usepackage[dvips]{graphicx}'.
+ '\usepackage{wrapfig}'.
+ '\usepackage{picins}'.
+ '\usepackage[T1]{fontenc}'."\n".
+ '\usepackage{lmodern}'."\n".
+ '\usepackage[postscript]{ucs}'."\n".
+ '\usepackage[utf8x]{inputenc}'."\n".
+ '\usepackage{pifont}' ."\n".
+ '\usepackage{latexsym}'."\n".
+ '\usepackage{epsfig}'.
+ "\\usepackage{xtab}\n".
+ "\\usepackage{tabularx}\n".
+ "\\usepackage{booktabs}\n".
+ "\\usepackage{array}\n".
+ "\\usepackage{colortbl}\n".
+ "\\usepackage{xcolor}\n".
+ '\usepackage{calc}'.
+ '\usepackage{amsmath}'.
+ '\usepackage{amssymb}'.
+ '\usepackage{amsfonts}'.
+ '\usepackage{amsthm}'.
+ '\usepackage{amscd}'
+ .'\usepackage{picins}\usepackage{calc}'."\n". # From lonprintout.pm
+ '\usepackage[T1]{fontenc}'."\n".
+ '\usepackage{lmodern}'."\n".
+ '\usepackage[postscript]{ucs}'."\n".
+ '\usepackage[utf8x]{inputenc}'."\n".
+ '\usepackage{pifont}' . "\n";
+
+ if($env{'form.pdfFormFields'} eq 'yes') {
+ $currentstring .= '\usepackage{hyperref}'.
+ '\usepackage{eforms}'.
+ '\usepackage{tabularx}';
+ }
+
+ $currentstring .= '\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}\setlength{\itemsep}{0.022in}\setlength{\parsep}{0in}\setlength{\belowdisplayskip}{0.04in}\setlength{\abovedisplayskip}{0.05in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.04in}}}{\end{list}}'.
+ '\renewenvironment{theindex}{\begin{list}{}{{\vskip 1mm \noindent \large\textbf{Index}} \newline \setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.01in}\setlength{\itemsep}{0.1in}\setlength{\parsep}{-0.02in}\setlength{\belowdisplayskip}{0.01in}\setlength{\abovedisplayskip}{0.01in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.01in}}}{\end{list}}';
+ $currentstring .= '\begin{document}';
+
+ return $currentstring;
+
+}
+
=pod
=head1 NAME