--- loncom/xml/lonplot.pm 2005/12/01 18:46:17 1.112
+++ loncom/xml/lonplot.pm 2008/05/13 11:01:43 1.138
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Dynamic plot
#
-# $Id: lonplot.pm,v 1.112 2005/12/01 18:46:17 albertel Exp $
+# $Id: lonplot.pm,v 1.138 2008/05/13 11:01:43 foxr Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -36,8 +36,10 @@ use Apache::response;
use Apache::lonxml;
use Apache::edit;
use Apache::lonnet;
+use LONCAPA;
+
-use vars qw/$weboutputformat $versionstring/;
+use vars qw/$weboutputformat $version/;
@@ -46,8 +48,9 @@ BEGIN {
#
# Determine the version of GNUPLOT
$weboutputformat = 'gif';
- $versionstring = `gnuplot --version 2>/dev/null`;
- if ($versionstring =~ /^gnuplot 4/) {
+ my $versionstring = `gnuplot --version 2>/dev/null`;
+ ($version) = ($versionstring =~ /^gnuplot ([\d.]+)/);
+ if ($version >= 4) {
$weboutputformat = 'png';
}
@@ -88,6 +91,12 @@ BEGIN {
my $max_str_len = 50; # if a label, title, xlabel, or ylabel text
# is longer than this, it will be truncated.
+my %linetypes =
+ (
+ solid => 1,
+ dashed => 0
+ );
+
my %linestyles =
(
lines => 2, # Maybe this will be used in the future
@@ -114,7 +123,7 @@ my $pos_real_test =
my $color_test = sub {$_[0]=~s/\s+//g;$_[0]=~/^x[\da-fA-F]{6}$/};
my $onoff_test = sub {$_[0]=~/^(on|off)$/};
my $key_pos_test = sub {$_[0]=~/^(top|bottom|right|left|outside|below| )+$/};
-my $sml_test = sub {$_[0]=~/^(small|medium|large)$/};
+my $sml_test = sub {$_[0]=~/^(\d+|small|medium|large)$/};
my $linestyle_test = sub {exists($linestyles{$_[0]})};
my $words_test = sub {$_[0]=~s/\s+/ /g;$_[0]=~/^([\w~!\@\#\$\%^&\*\(\)-=_\+\[\]\{\}:\;\'<>,\.\/\?\\]+ ?)+$/};
@@ -124,9 +133,10 @@ my $words_test = sub {$_[0]=~s/\s+/
## ##
###################################################################
my @gnuplot_edit_order =
- qw/alttag bgcolor fgcolor height width font transparent grid samples
- border align texwidth texfont plotcolor plottype lmargin rmargin tmargin
- bmargin major_ticscale minor_ticscale boxwidth gridlayer fillstyle
+ qw/alttag bgcolor fgcolor height width texwidth fontface font texfont
+ transparent grid samples
+ border align plotcolor plottype gridtype lmargin rmargin
+ tmargin bmargin major_ticscale minor_ticscale boxwidth gridlayer fillstyle
pattern solid/;
my $margin_choices = ['default',0..20];
@@ -136,35 +146,35 @@ my %gnuplot_defaults =
alttag => {
default => 'dynamically generated plot',
test => $words_test,
- description => 'brief description of the plot',
+ description => 'Brief description of the plot',
edit_type => 'entry',
size => '40'
},
height => {
default => 300,
test => $int_test,
- description => 'height of image (pixels)',
+ description => 'Height of image (pixels)',
edit_type => 'entry',
size => '10'
},
width => {
default => 400,
test => $int_test,
- description => 'width of image (pixels)',
+ description => 'Width of image (pixels)',
edit_type => 'entry',
size => '10'
},
bgcolor => {
default => 'xffffff',
test => $color_test,
- description => 'background color of image (xffffff)',
+ description => 'Background color of image (xffffff)',
edit_type => 'entry',
size => '10'
},
fgcolor => {
default => 'x000000',
test => $color_test,
- description => 'foreground color of image (x000000)',
+ description => 'Foreground color of image (x000000)',
edit_type => 'entry',
size => '10'
},
@@ -200,12 +210,19 @@ my %gnuplot_defaults =
edit_type => 'onoff'
},
font => {
- default => 'medium',
+ default => '9',
test => $sml_test,
- description => 'Size of font to use',
+ description => 'Font size to use in web output (pts)',
edit_type => 'choice',
- choices => ['small','medium','large']
+ choices => [['5','5 (small)'],'6','7','8',['9','9 (medium)'],'10',['11','11 (large)'],'12','15']
},
+ fontface => {
+ default => 'sans-serif',
+ test => sub {$_[0]=~/^(sans-serif|serif|classic)$/},
+ description => 'Type of font to use',
+ edit_type => 'choice',
+ choices => ['sans-serif','serif', 'classic']
+ },
samples => {
default => '100',
test => $int_test,
@@ -214,11 +231,11 @@ my %gnuplot_defaults =
choices => ['100','200','500','1000','2000','5000']
},
align => {
- default => 'center',
- test => sub {$_[0]=~/^(left|right|center)$/},
- description => 'alignment for image in html',
+ default => 'middle',
+ test => sub {$_[0]=~/^(left|right|middle|center)$/},
+ description => 'Alignment for image in HTML',
edit_type => 'choice',
- choices => ['left','right','center']
+ choices => ['left','right','middle']
},
texwidth => {
default => '93',
@@ -244,7 +261,7 @@ my %gnuplot_defaults =
pattern => {
default => '',
test => $int_test,
- description => 'pattern value for boxes:',
+ description => 'Pattern value for boxes:',
edit_type => 'choice',
choices => [0,1,2,3,4,5,6]
},
@@ -269,6 +286,13 @@ my %gnuplot_defaults =
edit_type => 'choice',
choices => ['Cartesian','Polar']
},
+ gridtype => {
+ default => 'Cartesian',
+ test => sub {$_[0]=~/^(Polar|Cartesian|Linear-Log|Log-Linear|Log-Log)$/},
+ description => 'Grid type:',
+ edit_type => 'choice',
+ choices => ['Cartesian','Polar','Linear-Log','Log-Linear','Log-Log']
+ },
lmargin => {
default => 'default',
test => sub {$_[0]=~/^(default|\d+)$/},
@@ -300,7 +324,7 @@ my %gnuplot_defaults =
boxwidth => {
default => '',
test => $real_test,
- description => 'width of boxes default auto',
+ description => 'Width of boxes, default is auto',
edit_type => 'entry',
size => '5'
},
@@ -338,7 +362,7 @@ my %key_defaults =
pos => {
default => 'top right',
test => $key_pos_test,
- description => 'position of the key on the plot',
+ description => 'Position of the key on the plot',
edit_type => 'choice',
choices => ['top left','top right','bottom left','bottom right',
'outside','below']
@@ -350,14 +374,14 @@ my %label_defaults =
xpos => {
default => 0,
test => $real_test,
- description => 'x position of label (graph coordinates)',
+ description => 'X position of label (graph coordinates)',
edit_type => 'entry',
size => '10'
},
ypos => {
default => 0,
test => $real_test,
- description => 'y position of label (graph coordinates)',
+ description => 'Y position of label (graph coordinates)',
edit_type => 'entry',
size => '10'
},
@@ -367,6 +391,13 @@ my %label_defaults =
description => 'justification of the label text on the plot',
edit_type => 'choice',
choices => ['left','right','center']
+ },
+ rotate => {
+ default => 0,
+ test => $real_test,
+ description => 'Rotation of label (degrees)',
+ edit_type => 'entry',
+ size => '10',
}
);
@@ -384,7 +415,7 @@ my %tic_defaults =
mirror => {
default => 'on',
test => $onoff_test,
- description => 'mirror tics on opposite axis?',
+ description => 'Mirror tics on opposite axis?',
edit_type => 'onoff'
},
start => {
@@ -417,99 +448,120 @@ my %tic_defaults =
},
);
-my @axis_edit_order = ('color','xmin','xmax','ymin','ymax');
+my @axis_edit_order = ('color','xmin','xmax','ymin','ymax','xformat', 'yformat');
my %axis_defaults =
(
color => {
default => 'x000000',
test => $color_test,
- description => 'color of grid lines (x000000)',
+ description => 'Color of grid lines (x000000)',
edit_type => 'entry',
size => '10'
},
xmin => {
default => '-10.0',
test => $real_test,
- description => 'minimum x-value shown in plot',
+ description => 'Minimum x-value shown in plot',
edit_type => 'entry',
size => '10'
},
xmax => {
default => ' 10.0',
test => $real_test,
- description => 'maximum x-value shown in plot',
+ description => 'Maximum x-value shown in plot',
edit_type => 'entry',
size => '10'
},
ymin => {
default => '-10.0',
test => $real_test,
- description => 'minimum y-value shown in plot',
+ description => 'Minimum y-value shown in plot',
edit_type => 'entry',
size => '10'
},
ymax => {
default => ' 10.0',
test => $real_test,
- description => 'maximum y-value shown in plot',
+ description => 'Maximum y-value shown in plot',
edit_type => 'entry',
size => '10'
- }
+ },
+ xformat => {
+ default => 'on',
+ test => sub {$_[0]=~/^(on|off|\d+(f|F|e|E))$/},
+ description => 'X-axis number formatting',
+ edit_type => 'choice',
+ choices => ['on', 'off', '2e', '2f'],
+ },
+ yformat => {
+ default => 'on',
+ test => sub {$_[0]=~/^(on|off|\d+(f|F|e|E))$/},
+ description => 'X-axis number formatting',
+ edit_type => 'choice',
+ choices => ['on', 'off', '2e', '2f'],
+ },
+
);
-my @curve_edit_order = ('color','name','linestyle','pointtype','pointsize','limit');
+my @curve_edit_order = ('color','name','linestyle','linewidth','linetype','pointtype','pointsize','limit');
my %curve_defaults =
(
color => {
default => 'x000000',
test => $color_test,
- description => 'color of curve (x000000)',
+ description => 'Color of curve (x000000)',
edit_type => 'entry',
size => '10'
},
name => {
default => '',
test => $words_test,
- description => 'name of curve to appear in key',
+ description => 'Name of curve to appear in key',
edit_type => 'entry',
size => '20'
},
linestyle => {
default => 'lines',
test => $linestyle_test,
- description => 'Line style',
+ description => 'Plot with:',
edit_type => 'choice',
choices => [keys(%linestyles)]
},
-# gnuplots term=gif driver does not handle linewidth :(
-# linewidth => {
-# default => 1,
-# test => $int_test,
-# description => 'Line width (may not apply to all line styles)',
-# edit_type => 'choice',
-# choices => [1,2,3,4,5,6,7,8,9,10]
-# },
+ linewidth => {
+ default => 1,
+ test => $int_test,
+ description => 'Line width (may not apply to all plot styles)',
+ edit_type => 'choice',
+ choices => [1,2,3,4,5,6,7,8,9,10]
+ },
+ linetype => {
+ default => 'solid',
+ test => sub {$_[0]=~/^(solid|dashed)$/},
+ description => 'Line type (may not apply to all plot styles)',
+ edit_type => 'choice',
+ choices => ['solid', 'dashed']
+ },
pointsize => {
default => 1,
test => $pos_real_test,
- description => 'point size (may not apply to all line styles)',
+ description => 'Point size (may not apply to all plot styles)',
edit_type => 'entry',
size => '5'
},
pointtype => {
default => 1,
test => $int_test,
- description => 'point type (may not apply to all line styles)',
+ description => 'Point type (may not apply to all plot styles)',
edit_type => 'choice',
choices => [0,1,2,3,4,5,6]
},
limit => {
default => 'closed',
- test => sub {$_[0]=~/^(closed|x1|x2|y1|y2)$/},
- description => 'point to fill -- for filledcurves',
+ test => sub {$_[0]=~/^(above|below|closed|x1|x2|y1|y2)$/},
+ description => 'Point to fill -- for filledcurves',
edit_type => 'choice',
- choices => ['closed','x1','x2','y1','y2']
+ choices => ['above', 'below', 'closed','x1','x2','y1','y2']
},
);
@@ -540,7 +592,9 @@ sub start_gnuplot {
} elsif ($target eq 'edit') {
$result .= &Apache::edit::tag_start($target,$token,'GnuPlot');
$result .= &edit_attributes($target,$token,\%gnuplot_defaults,
- \@gnuplot_edit_order);
+ \@gnuplot_edit_order)
+ .&Apache::edit::end_row()
+ .&Apache::edit::start_spanning_row();
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args
($token,$parstack,$safeeval,keys(%gnuplot_defaults));
@@ -574,11 +628,11 @@ sub end_gnuplot {
'_'.time.'_'.$$.$randnumber.'_plot';
## Write the plot description to the file
&write_gnuplot_file($tmpdir,$filename,$target);
- $filename = &Apache::lonnet::escape($filename);
+ $filename = &escape($filename);
## return image tag for the plot
if ($target eq 'web') {
$result .= <<"ENDIMAGE";
-<img src = "/cgi-bin/plot.gif?file=$filename.data&output=$weboutputformat"
+<img src = "/cgi-bin/plot.$weboutputformat?file=$filename.data"
width = "$Apache::lonplot::plot{'width'}"
height = "$Apache::lonplot::plot{'height'}"
align = "$Apache::lonplot::plot{'align'}"
@@ -591,7 +645,7 @@ ENDIMAGE
&Apache::lonxml::register_ssi("/cgi-bin/plot.gif?file=$filename.data&output=eps");
$result = "%DYNAMICIMAGE:$Apache::lonplot::plot{'width'}:$Apache::lonplot::plot{'height'}:$Apache::lonplot::plot{'texwidth'}\n";
$result .= '\graphicspath{{/home/httpd/perl/tmp/}}'."\n";
- $result .= '\includegraphics[width='.$Apache::lonplot::plot{'texwidth'}.' mm]{'.&Apache::lonnet::unescape($filename).'.eps}';
+ $result .= '\includegraphics[width='.$Apache::lonplot::plot{'texwidth'}.' mm]{'.&unescape($filename).'.eps}';
}
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);
@@ -662,6 +716,51 @@ sub end_ytics {
return $result;
}
+##-----------------------------------------------------------------font
+my %font_properties =
+ (
+ 'classic' => {
+ face => 'classic',
+ file => 'DejaVuSansMono-Bold',
+ printname => 'Helvetica',
+ tex_no_file => 1,
+ },
+ 'sans-serif' => {
+ face => 'sans-serif',
+ file => 'DejaVuSans',
+ printname => 'DejaVuSans',
+ },
+ 'serif' => {
+ face => 'serif',
+ file => 'DejaVuSerif',
+ printname => 'DejaVuSerif',
+ },
+ );
+
+sub get_font {
+ my ($target) = @_;
+ my ($size, $selected_font);
+
+ if ( $Apache::lonplot::plot{'font'} =~ /^(small|medium|large)/) {
+ $selected_font = $font_properties{'classic'};
+ if ( $Apache::lonplot::plot{'font'} eq 'small') {
+ $size = '5';
+ } elsif ( $Apache::lonplot::plot{'font'} eq 'medium') {
+ $size = '9';
+ } elsif ( $Apache::lonplot::plot{'font'} eq 'large') {
+ $size = '11';
+ } else {
+ $size = '9';
+ }
+ } else {
+ $size = $Apache::lonplot::plot{'font'};
+ $selected_font = $font_properties{$Apache::lonplot::plot{'fontface'}};
+ }
+ if ($target eq 'tex' && defined($Apache::lonplot::plot{'texfont'})) {
+ $size = $Apache::lonplot::plot{'texfont'};
+ }
+ return ($size, $selected_font);
+}
##----------------------------------------------------------------- key
sub start_key {
@@ -693,6 +792,168 @@ sub end_key {
return $result;
}
+sub parse_label {
+ my ($target,$text) = @_;
+ my $parser=HTML::LCParser->new(\$text);
+ my $result;
+ while (my $token=$parser->get_token) {
+ if ($token->[0] eq 'S') {
+ if ($token->[1] eq 'sub') {
+ $result .= '_{';
+ } elsif ($token->[1] eq 'sup') {
+ $result .= '^{';
+ } else {
+ $result .= $token->[4];
+ }
+ } elsif ($token->[0] eq 'E') {
+ if ($token->[1] eq 'sub'
+ || $token->[1] eq 'sup') {
+ $result .= '}';
+ } else {
+ $result .= $token->[2];
+ }
+ } elsif ($token->[0] eq 'T') {
+ $result .= &replace_entities($target,$token->[1]);
+ }
+ }
+ return $result;
+}
+
+
+my %lookup =
+ ( # Greek alphabet:
+
+ '(Alpha|#913)' => {'tex' => '{/Symbol A}', 'web' => "\x{391}"},
+ '(Beta|#914)' => {'tex' => '{/Symbol B}', 'web' => "\x{392}"},
+ '(Chi|#935)' => {'tex' => '{/Symbol C}', 'web' => "\x{3A7}"},
+ '(Delta|#916)' => {'tex' => '{/Symbol D}', 'web' => "\x{394}"},
+ '(Epsilon|#917)' => {'tex' => '{/Symbol E}', 'web' => "\x{395}"},
+ '(Phi|#934)' => {'tex' => '{/Symbol F}', 'web' => "\x{3A6}"},
+ '(Gamma|#915)' => {'tex' => '{/Symbol G}', 'web' => "\x{393}"},
+ '(Eta|#919)' => {'tex' => '{/Symbol H}', 'web' => "\x{397}"},
+ '(Iota|#921)' => {'tex' => '{/Symbol I}', 'web' => "\x{399}"},
+ '(Kappa|#922)' => {'tex' => '{/Symbol K}', 'web' => "\x{39A}"},
+ '(Lambda|#923)' => {'tex' => '{/Symbol L}', 'web' => "\x{39B}"},
+ '(Mu|#924)' => {'tex' => '{/Symbol M}', 'web' => "\x{39C}"},
+ '(Nu|#925)' => {'tex' => '{/Symbol N}', 'web' => "\x{39D}"},
+ '(Omicron|#927)' => {'tex' => '{/Symbol O}', 'web' => "\x{39F}"},
+ '(Pi|#928)' => {'tex' => '{/Symbol P}', 'web' => "\x{3A0}"},
+ '(Theta|#920)' => {'tex' => '{/Symbol Q}', 'web' => "\x{398}"},
+ '(Rho|#929)' => {'tex' => '{/Symbol R}', 'web' => "\x{3A1}"},
+ '(Sigma|#931)' => {'tex' => '{/Symbol S}', 'web' => "\x{3A3}"},
+ '(Tau|#932)' => {'tex' => '{/Symbol T}', 'web' => "\x{3A4}"},
+ '(Upsilon|#933)' => {'tex' => '{/Symbol U}', 'web' => "\x{3A5}"},
+ '(Omega|#937)' => {'tex' => '{/Symbol W}', 'web' => "\x{3A9}"},
+ '(Xi|#926)' => {'tex' => '{/Symbol X}', 'web' => "\x{39E}"},
+ '(Psi|#936)' => {'tex' => '{/Symbol Y}', 'web' => "\x{3A8}"},
+ '(Zeta|#918)' => {'tex' => '{/Symbol Z}', 'web' => "\x{396}"},
+ '(alpha|#945)' => {'tex' => '{/Symbol a}', 'web' => "\x{3B1}"},
+ '(beta|#946)' => {'tex' => '{/Symbol b}', 'web' => "\x{3B2}"},
+ '(chi|#967)' => {'tex' => '{/Symbol c}', 'web' => "\x{3C7}"},
+ '(delta|#948)' => {'tex' => '{/Symbol d}', 'web' => "\x{3B4}"},
+ '(epsilon|#949)' => {'tex' => '{/Symbol e}', 'web' => "\x{3B5}"},
+ '(phi|#966)' => {'tex' => '{/Symbol f}', 'web' => "\x{3C6}"},
+ '(gamma|#947)' => {'tex' => '{/Symbol g}', 'web' => "\x{3B3}"},
+ '(eta|#951)' => {'tex' => '{/Symbol h}', 'web' => "\x{3B7}"},
+ '(iota|#953)' => {'tex' => '{/Symbol i}', 'web' => "\x{3B9}"},
+ '(kappa|#954)' => {'tex' => '{/Symbol k}', 'web' => "\x{3BA}"},
+ '(lambda|#955)' => {'tex' => '{/Symbol k}', 'web' => "\x{3BB}"},
+ '(mu|#956)' => {'tex' => '{/Symbol m}', 'web' => "\x{3BC}"},
+ '(nu|#957)' => {'tex' => '{/Symbol n}', 'web' => "\x{3BD}"},
+ '(omicron|#959)' => {'tex' => '{/Symbol o}', 'web' => "\x{3BF}"},
+ '(pi|#960)' => {'tex' => '{/Symbol p}', 'web' => "\x{3C0}"},
+ '(theta|#952)' => {'tex' => '{/Symbol q}', 'web' => "\x{3B8}"},
+ '(rho|#961)' => {'tex' => '{/Symbol r}', 'web' => "\x{3C1}"},
+ '(sigma|#963)' => {'tex' => '{/Symbol s}', 'web' => "\x{3C3}"},
+ '(tau|#964)' => {'tex' => '{/Symbol t}', 'web' => "\x{3C4}"},
+ '(upsilon|#965)' => {'tex' => '{/Symbol u}', 'web' => "\x{3C5}"},
+ '(omega|#969)' => {'tex' => '{/Symbol w}', 'web' => "\x{3C9}"},
+ '(xi|#958)' => {'tex' => '{/Symbol x}', 'web' => "\x{3BE}"},
+ '(psi|#968)' => {'tex' => '{/Symbol y}', 'web' => "\x{3C8}"},
+ '(zeta|#950)' => {'tex' => '{/Symbol z}', 'web' => "\x{3B6}"},
+
+ # Punctuation:
+
+ '(quot|#034)' => {'tex' => '\42', 'web' => '\42'},
+ '(amp|#038)' => {'tex' => '\46', 'web' => '\46'},
+ '(lt|#060)' => {'tex' => '\74', 'web' => '\74'},
+ '(gt|#062)' => {'tex' => '\76', 'web' => '\76'},
+ '#131' => {'tex' => '{/Symbol \246}', 'web' => "\x{192}"},
+ '#132' => {'tex' => '{/Text \271}', 'web' => "\x{201e}"},
+ '#133' => {'tex' => '{/Symbol \274}', 'web'=> "\x{2026}"},
+ '#134' => {'tex' => '{/Text \262}', 'web' => "\x{2020}"},
+ '#135' => {'tex' => '{/Text \263}', 'web' => "\x{2021}"},
+ '#136' => {'tex' => '\\\\^', 'web' => '\\\\^'},
+ '#137' => {'tex' => '{/Text \275}', 'web' => "\x{2030}"},
+ '#138' => {'tex' => 'S', 'web' => "\x{160}"}, # no S-caron in ps fonts.
+ '#139' => {'tex' => '<', 'web' => '<'},
+ '#140' => {'tex' => '{/Text \352}', 'web' => "\x{152}"},
+ '#145' => {'tex' => '\140', 'web' => "\x{2018}"},
+ '#146' => {'tex' => '\47', 'web' => "\x{2019}"},
+ '#147' => {'tex' => '{/Text \252}', 'web' => "\x{201c}"},
+ '#148' => {'tex' => '{/Text \315}', 'web' => '\\"'},
+ '#149' => {'tex' => '{/Symbol \267}', 'web' => "\x{2022}"},
+ '#150' => {'tex' => '{/Text \55}', 'web' => "\x{2013}"}, #Untested here en dash
+ '#151' => {'tex' => '{/Symbol \55}', 'web' => "\x{2014}"}, # em dash
+ '#152' => {'tex' => '~', 'web' => '~'},
+ '#153' => {'tex' => '{/Text \324}', 'web' => "\x{2122}"}, # trademark
+ '#154' => {'tex' => 's', 'web' => "\x{161}"}, # small s-caron no ps.
+ '#155' => {'tex' => '>', 'web' => '\76'}, # >
+ '#156' => {'tex' => '{/Text \372}', 'web' => "\x{153}"}, # oe ligature.
+ '#159', => {'tex' => 'Y', 'web' => "\x{178}"}, # Y-umlaut - can't print
+ '(nbsp|#160)' => {'tex' => ' ', 'web' => ' '}, # non breaking space.
+ '(iexcl|#161)' => {'tex' => '{/Text \241}', 'web' => "\x{a1}"}, # inverted !
+ '(cent|#162)' => {'tex' => '{/Text \242}', 'web' => "\x{a2}"}, # Cent currency.
+ '(pound|#163}' => {'tex' => '{/Text \243}', 'web' => "\x{a3}"}, # GB Pound currency.
+ '(curren|#164)' => {'tex' => '{/Text \250}', 'web' => "\x{a4}"}, # Generic currency symb.
+ '(yen|#165)' => {'tex' => '{/Text \245}', 'web' => "\x{a5}"}, # Yen currency.
+ '(brvbar|#166)' => {'tex' => '{/Symbol \174}', 'web' => "\x{a6}"}, # Broken vert bar no print.
+ '(sect|#167)' => {'tex' => '{\247}', 'web' => "\x{a7}"}, # Section symbol.
+ '(uml|#168)' => {'tex' => '{\250}', 'web' => "\x{a8}"}, # 'naked' umlaut.
+ '(copy|#169)' => {'tex' => '{/Symbol \343}', 'web' => "\x{a9}"}, # Copyright symbol.
+ '(ordf|#170)' => {'tex' => '{/Text \343}', 'web' => "\x{aa}"}, # Feminine ordinal.
+ '(laquo|#171)' => {'tex' => '{/Text \253}', 'web' => "\x{ab}"}, # << quotes.
+ '(not|#172)' => {'tex' => '\254', 'web' => "\x{ac}"}, # Logical not.
+ '(shy|#173)' => {'tex' => '-', 'web' => "\x{ad}"}, # soft hyphen.
+ '(reg|#174)' => {'tex' => '{/Symbol \342}', 'web' => "\x{ae}"}, # Registered tm.
+ '(macr|#175)' => {'tex' => '^{-}', 'web' => "\x{af}"}, # 'naked' macron (overbar).
+ '(deg|#176)' => {'tex' => '{/Text \312}', 'web' => "\x{b0}"}, # Degree symbo..
+ '(plusmn|#177)' => {'tex' => '{/Symbol \261}', 'web' => "\x{b1}"}, # +/- symbol.
+ '(sup2|#178)' => {'tex' => '^2', 'web' => "\x{b2}"}, # Superscript 2.
+ '(sup3|#179)' => {'tex' => '^3', 'web' => "\x{b3}"}, # Superscript 3.
+ '(acute|#180)' => {'tex' => '{/Text \302}', 'web' => "\x{b4}"}, # 'naked' acute accent.
+ '(micro|#181)' => {'tex' => '{/Symbol \155}', 'web' => "\x{b5}"}, # Micro (small mu).
+ '(para|#182)' => {'tex' => '{/Text \266}', 'web' => "\x{b6}"}, # Paragraph symbol.
+ '(middot|#183)' => {'tex' => '^.', 'web' => "\x{b7}"}, # middle dot (maybe text 267 is better)?
+ '(cedil|#184)' => {'tex' => '\233', 'web' => "\x{b8}"}, # 'naked' cedilla.
+ '(sup1|#185)' => {'tex' => '^1', 'web' => "\x{b9}"}, # superscript 1.
+ '(ordm|#186)' => {'tex' => '\353', 'web' => "\x{ba}"}, # masculine ordinal.
+ '(raquo|#187)', => {'tex' => '\273', 'web' => "\x{bb}"}, # Right angle quotes.
+ '(frac14|#188)' => {'tex' => '\274', 'web' => "\x{bc}"}, # 1/4.
+ '(frac12|#189)' => {'tex' => '\275', 'web' => "\x{bd}"}, # 1/2.
+ '(frac34|#190)' => {'tex' => '\276', 'web' => "\x{be}"}, # 3/4
+ '(iquest|#191)' => {'tex' => '{/Text \277}', 'web' => "\x{bf}"}, # Inverted ?
+ '(Agrave|#192)' => {'tex' => '\300', 'web' => "\x{c0}"}, # A Grave.
+ '(Aacute|#193)' => {'tex' => '\301', 'web' => "\x{c1}"}, # A Acute.
+ '(Acirc|#194)' => {'tex' => '\302', 'web' => "\x{c2}"}, # A Circumflex.
+ '(Atilde|#195)' => {'tex' => '\303', 'web' => "\x{c3}"}, # A tilde.
+ '(Auml|#196)' => {'tex' => '\304', 'web' => "\x{c4}"}, # A umlaut.
+ '(Aring|#197)' => {'tex' => '\305', 'web' => "\x{c5}"}, # A ring.
+ 'AElig|#198)' => {'tex' => '\306', 'web' => "\x{c6}"}, # AE ligature.
+ );
+
+
+sub replace_entities {
+ my ($target,$text) = @_;
+ $text =~ s{([_^~\{\}]|\\\\)}{\\\\$1}g;
+ while (my ($re, $replace) = each(%lookup)) {
+ my $repl = $replace->{$target};
+ $text =~ s/&$re;/$replace->{$target}/g;
+ }
+ $text =~ s{(&)}{\\\\$1}g;
+ return $text;
+}
+
##------------------------------------------------------------------- title
sub start_title {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
@@ -704,12 +965,11 @@ sub start_title {
if (length($title) > $max_str_len) {
$title = substr($title,0,$max_str_len);
}
+ $title = &parse_label($target,$title);
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token,'Plot Title');
my $text=&Apache::lonxml::get_all_text("/title",$parser,$style);
- $result.=&Apache::edit::end_row().
- &Apache::edit::start_spanning_row().
- &Apache::edit::editline('',$text,'',60);
+ $result.=&Apache::edit::editline('',$text,'',60);
} elsif ($target eq 'modified') {
$result.=&Apache::edit::rebuild_tag($token);
$result.=&Apache::edit::modifiedfield("/title",$parser);
@@ -737,12 +997,11 @@ sub start_xlabel {
if (length($xlabel) > $max_str_len) {
$xlabel = substr($xlabel,0,$max_str_len);
}
+ $xlabel = &parse_label($target,$xlabel);
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token,'Plot Xlabel');
my $text=&Apache::lonxml::get_all_text("/xlabel",$parser,$style);
- $result.=&Apache::edit::end_row().
- &Apache::edit::start_spanning_row().
- &Apache::edit::editline('',$text,'',60);
+ $result.=&Apache::edit::editline('',$text,'',60);
} elsif ($target eq 'modified') {
$result.=&Apache::edit::rebuild_tag($token);
$result.=&Apache::edit::modifiedfield("/xlabel",$parser);
@@ -771,12 +1030,11 @@ sub start_ylabel {
if (length($ylabel) > $max_str_len) {
$ylabel = substr($ylabel,0,$max_str_len);
}
+ $ylabel = &parse_label($target,$ylabel);
} elsif ($target eq 'edit') {
$result .= &Apache::edit::tag_start($target,$token,'Plot Ylabel');
my $text = &Apache::lonxml::get_all_text("/ylabel",$parser,$style);
- $result .= &Apache::edit::end_row().
- &Apache::edit::start_spanning_row().
- &Apache::edit::editline('',$text,'',60);
+ $result .= &Apache::edit::editline('',$text,'',60);
} elsif ($target eq 'modified') {
$result.=&Apache::edit::rebuild_tag($token);
$result.=&Apache::edit::modifiedfield("/ylabel",$parser);
@@ -806,7 +1064,7 @@ sub start_label {
$text = &Apache::run::evaluate($text,$safeeval,$$parstack[-1]);
$text =~ s/\n/ /g;
$text = substr($text,0,$max_str_len) if (length($text) > $max_str_len);
- $label{'text'} = $text;
+ $label{'text'} = &parse_label($target,$text);
push(@labels,\%label);
} elsif ($target eq 'edit') {
$result .= &Apache::edit::tag_start($target,$token,'Plot Label');
@@ -848,13 +1106,15 @@ sub start_curve {
} elsif ($target eq 'edit') {
$result .= &Apache::edit::tag_start($target,$token,'Curve');
$result .= &edit_attributes($target,$token,\%curve_defaults,
- \@curve_edit_order);
+ \@curve_edit_order)
+ .&Apache::edit::end_row()
+ .&Apache::edit::start_spanning_row();
+
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args
($token,$parstack,$safeeval,keys(%curve_defaults));
if ($constructtag) {
$result = &Apache::edit::rebuild_tag($token);
- $result.= &Apache::edit::handle_insert();
}
}
return $result;
@@ -892,9 +1152,7 @@ sub start_function {
} elsif ($target eq 'edit') {
$result .= &Apache::edit::tag_start($target,$token,'Gnuplot compatible curve function');
my $text = &Apache::lonxml::get_all_text("/function",$parser,$style);
- $result .= &Apache::edit::end_row().
- &Apache::edit::start_spanning_row().
- &Apache::edit::editline('',$text,'',60);
+ $result .= &Apache::edit::editline('',$text,'',60);
} elsif ($target eq 'modified') {
$result.=&Apache::edit::rebuild_tag($token);
$result.=&Apache::edit::modifiedfield("/function",$parser);
@@ -969,9 +1227,7 @@ sub start_data {
} elsif ($target eq 'edit') {
$result .= &Apache::edit::tag_start($target,$token,'Comma or space deliminated curve data');
my $text = &Apache::lonxml::get_all_text("/data",$parser,$style);
- $result .= &Apache::edit::end_row().
- &Apache::edit::start_spanning_row().
- &Apache::edit::editline('',$text,'',60);
+ $result .= &Apache::edit::editline('',$text,'',60);
} elsif ($target eq 'modified') {
$result.=&Apache::edit::rebuild_tag($token);
$result.=&Apache::edit::modifiedfield("/data",$parser);
@@ -1065,9 +1321,9 @@ sub get_attributes{
##------------------------------------------------------- write_gnuplot_file
sub write_gnuplot_file {
my ($tmpdir,$filename,$target)= @_;
+ my ($fontsize, $font_properties) = &get_font($target);
my $gnuplot_input = '';
my $curve;
- my $pt = $Apache::lonplot::plot{'texfont'};
#
# Check to be sure we do not have any empty curves
my @curvescopy;
@@ -1098,24 +1354,46 @@ sub write_gnuplot_file {
}
# set term
if ($target eq 'web') {
- $gnuplot_input .= 'set term '.$weboutputformat .' ';
+ $gnuplot_input .= 'set terminal png enhanced nocrop ';
$gnuplot_input .= 'transparent ' if ($Apache::lonplot::plot{'transparent'} eq 'on');
- $gnuplot_input .= $Apache::lonplot::plot{'font'} . ' ';
- $gnuplot_input .= 'size '.$Apache::lonplot::plot{'width'}.','.$Apache::lonplot::plot{'height'}.' ';
+ $gnuplot_input .= 'font "'.$Apache::lonnet::perlvar{'lonFontsDir'}.
+ '/'.$font_properties->{'file'}.'.ttf" ';
+ $gnuplot_input .= $fontsize;
+ $gnuplot_input .= ' size '.$Apache::lonplot::plot{'width'}.','.$Apache::lonplot::plot{'height'}.' ';
$gnuplot_input .= "@Colors\n";
# set output
$gnuplot_input .= "set output\n";
} elsif ($target eq 'tex') {
- $gnuplot_input .= "set term postscript eps $Apache::lonplot::plot{'plotcolor'} solid \"Helvetica\" $pt \n";
- $gnuplot_input .= "set output \"/home/httpd/perl/tmp/".
- &Apache::lonnet::unescape($filename).".eps\"\n";
+ $gnuplot_input .= "set term postscript eps enhanced $Apache::lonplot::plot{'plotcolor'} solid ";
+ if (!$font_properties->{'tex_no_file'}) {
+ $gnuplot_input .=
+ 'fontfile "'.$Apache::lonnet::perlvar{'lonFontsDir'}.
+ '/'.$font_properties->{'file'}.'.pfb" ';
+ }
+ $gnuplot_input .= ' "'.$font_properties->{'printname'}.'" ';
+ $gnuplot_input .= $fontsize;
+ $gnuplot_input .= "\nset output \"/home/httpd/perl/tmp/".
+ &unescape($filename).".eps\"\n";
}
- # cartesian or polar?
+ # cartesian or polar plot?
if (lc($Apache::lonplot::plot{'plottype'}) eq 'polar') {
$gnuplot_input .= 'set polar'.$/;
} else {
# Assume Cartesian
}
+ # cartesian or polar grid?
+ if (lc($Apache::lonplot::plot{'gridtype'}) eq 'polar') {
+ $gnuplot_input .= 'set grid polar'.$/;
+ } elsif (lc($Apache::lonplot::plot{'gridtype'}) eq 'linear-log') {
+ $gnuplot_input .= 'set logscale x'.$/;
+ } elsif (lc($Apache::lonplot::plot{'gridtype'}) eq 'log-linear') {
+ $gnuplot_input .= 'set logscale y'.$/;
+ } elsif (lc($Apache::lonplot::plot{'gridtype'}) eq 'log-log') {
+ $gnuplot_input .= 'set logscale x'.$/;
+ $gnuplot_input .= 'set logscale y'.$/;
+ } else {
+ # Assume Cartesian
+ }
# solid or pattern for boxes?
if (lc($Apache::lonplot::plot{'fillstyle'}) eq 'solid') {
$gnuplot_input .= 'set style fill solid '.
@@ -1137,9 +1415,15 @@ sub write_gnuplot_file {
if (lc($Apache::lonplot::plot{'bmargin'}) ne 'default') {
$gnuplot_input .= 'set bmargin '.$Apache::lonplot::plot{'bmargin'}.$/;
}
+
# tic scales
- $gnuplot_input .= 'set ticscale '.
- $Apache::lonplot::plot{'major_ticscale'}.' '.$Apache::lonplot::plot{'minor_ticscale'}.$/;
+ if ($version > 4) {
+ $gnuplot_input .= 'set tics scale '.
+ $Apache::lonplot::plot{'major_ticscale'}.', '.$Apache::lonplot::plot{'minor_ticscale'}.$/;
+ } else {
+ $gnuplot_input .= 'set ticscale '.
+ $Apache::lonplot::plot{'major_ticscale'}.' '.$Apache::lonplot::plot{'minor_ticscale'}.$/;
+ }
#boxwidth
if (lc($Apache::lonplot::plot{'boxwidth'}) ne '') {
$gnuplot_input .= 'set boxwidth '.$Apache::lonplot::plot{'boxwidth'}.$/;
@@ -1158,14 +1442,17 @@ sub write_gnuplot_file {
$gnuplot_input .= "set samples $Apache::lonplot::plot{'samples'}\n";
# title, xlabel, ylabel
# titles
+ my $extra_space_x = ($xtics{'location'} eq 'axis') ? ' 0, -0.5 ' : '';
+ my $extra_space_y = ($ytics{'location'} eq 'axis') ? ' -0.5, 0 ' : '';
+
if ($target eq 'tex') {
- $gnuplot_input .= "set title \"$title\" font \"Helvetica,".$pt."pt\"\n" if (defined($title)) ;
- $gnuplot_input .= "set xlabel \"$xlabel\" font \"Helvetica,".$pt."pt\" \n" if (defined($xlabel));
- $gnuplot_input .= "set ylabel \"$ylabel\" font \"Helvetica,".$pt."pt\"\n" if (defined($ylabel));
+ $gnuplot_input .= "set title \"$title\" font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($title)) ;
+ $gnuplot_input .= "set xlabel \"$xlabel\" $extra_space_x font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($xlabel));
+ $gnuplot_input .= "set ylabel \"$ylabel\" $extra_space_y font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($ylabel));
} else {
- $gnuplot_input .= "set title \"$title\" \n" if (defined($title)) ;
- $gnuplot_input .= "set xlabel \"$xlabel\" \n" if (defined($xlabel));
- $gnuplot_input .= "set ylabel \"$ylabel\" \n" if (defined($ylabel));
+ $gnuplot_input .= "set title \"$title\" \n" if (defined($title)) ;
+ $gnuplot_input .= "set xlabel \"$xlabel\" $extra_space_x \n" if (defined($xlabel));
+ $gnuplot_input .= "set ylabel \"$ylabel\" $extra_space_y \n" if (defined($ylabel));
}
# tics
if (%xtics) {
@@ -1190,6 +1477,22 @@ sub write_gnuplot_file {
}
# axis
if (%axis) {
+ if ($axis{'xformat'} ne 'on') {
+ $gnuplot_input .= "set format x ";
+ if ($axis{'xformat'} eq 'off') {
+ $gnuplot_input .= "\"\"\n";
+ } else {
+ $gnuplot_input .= "\"\%.".$axis{'xformat'}."\"\n";
+ }
+ }
+ if ($axis{'yformat'} ne 'on') {
+ $gnuplot_input .= "set format y ";
+ if ($axis{'yformat'} eq 'off') {
+ $gnuplot_input .= "\"\"\n";
+ } else {
+ $gnuplot_input .= "\"\%.".$axis{'yformat'}."\"\n";
+ }
+ }
$gnuplot_input .= "set xrange \[$axis{'xmin'}:$axis{'xmax'}\]\n";
$gnuplot_input .= "set yrange \[$axis{'ymin'}:$axis{'ymax'}\]\n";
}
@@ -1207,27 +1510,35 @@ sub write_gnuplot_file {
my $label;
foreach $label (@labels) {
$gnuplot_input .= 'set label "'.$label->{'text'}.'" at '.
- $label->{'xpos'}.','.$label->{'ypos'}.' '.$label->{'justify'};
+ $label->{'xpos'}.','.$label->{'ypos'};
+ if ($label->{'rotate'} ne '') {
+ $gnuplot_input .= ' rotate by '.$label->{'rotate'};
+ }
+ $gnuplot_input .= ' '.$label->{'justify'};
+
if ($target eq 'tex') {
- $gnuplot_input .=' font "Helvetica,'.$pt.'pt"' ;
+ $gnuplot_input .=' font "'.$font_properties->{'printname'}.','.$fontsize.'pt"' ;
}
$gnuplot_input .= $/;
}
if ($target eq 'tex') {
$gnuplot_input .="set size 1,".$Apache::lonplot::plot{'height'}/$Apache::lonplot::plot{'width'}*1.38;
$gnuplot_input .="\n";
- }
+ }
# curves
$gnuplot_input .= 'plot ';
for (my $i = 0;$i<=$#curves;$i++) {
$curve = $curves[$i];
$gnuplot_input.= ', ' if ($i > 0);
+ if ($target eq 'tex') {
+ $curve->{'linewidth'} *= 2;
+ }
if (exists($curve->{'function'})) {
$gnuplot_input.=
$curve->{'function'}.' title "'.
$curve->{'name'}.'" with '.
$curve->{'linestyle'};
- $gnuplot_input.= ' linewidth 4 ' if ($target eq 'tex');
+
if (($curve->{'linestyle'} eq 'points') ||
($curve->{'linestyle'} eq 'linespoints') ||
($curve->{'linestyle'} eq 'errorbars') ||
@@ -1238,7 +1549,17 @@ sub write_gnuplot_file {
$gnuplot_input.=' pointsize '.$curve->{'pointsize'};
} elsif ($curve->{'linestyle'} eq 'filledcurves') {
$gnuplot_input.= ' '.$curve->{'limit'};
+ } elsif ($curve->{'linetype'} ne '' &&
+ $curve->{'linestyle'} eq 'lines') {
+ $gnuplot_input.= ' linetype ';
+ $gnuplot_input.= $linetypes{$curve->{'linetype'}};
+ $gnuplot_input.= ' linecolor rgb "';
+ # convert color from xaaaaaa to #aaaaaa
+ $curve->{'color'} =~ s/^x/#/;
+ $gnuplot_input.= $curve->{'color'}.'"';
}
+ $gnuplot_input.= ' linewidth '.$curve->{'linewidth'};
+
} elsif (exists($curve->{'data'})) {
# Store data values in $datatext
my $datatext = '';
@@ -1257,12 +1578,11 @@ sub write_gnuplot_file {
}
# write file
print $fh $datatext;
- close ($fh);
+ close($fh);
# generate gnuplot text
$gnuplot_input.= '"'.$datafilename.'" title "'.
$curve->{'name'}.'" with '.
$curve->{'linestyle'};
- $gnuplot_input.= ' linewidth 4 ' if ($target eq 'tex');
if (($curve->{'linestyle'} eq 'points') ||
($curve->{'linestyle'} eq 'linespoints') ||
($curve->{'linestyle'} eq 'errorbars') ||
@@ -1273,11 +1593,21 @@ sub write_gnuplot_file {
$gnuplot_input.=' pointsize '.$curve->{'pointsize'};
} elsif ($curve->{'linestyle'} eq 'filledcurves') {
$gnuplot_input.= ' '.$curve->{'limit'};
+ } elsif ($curve->{'linetype'} ne '' &&
+ $curve->{'linestyle'} eq 'lines') {
+ $gnuplot_input.= ' linetype ';
+ $gnuplot_input.= $linetypes{$curve->{'linetype'}};
+ $gnuplot_input.= ' linecolor rgb "';
+ # convert color from xaaaaaa to #aaaaaa
+ $curve->{'color'} =~ s/^x/#/;
+ $gnuplot_input.= $curve->{'color'}.'"';
}
+ $gnuplot_input.= ' linewidth '.$curve->{'linewidth'};
}
}
# Write the output to a file.
- my $fh=Apache::File->new(">$tmpdir$filename.data");
+ open (my $fh,">$tmpdir$filename.data");
+ binmode($fh, ":utf8");
print $fh $gnuplot_input;
close($fh);
# That's all folks.