Commit 3b842e05 authored by Brandon Walts's avatar Brandon Walts
Browse files

Merge branch 'version/2.2' into version/2.3

* version/2.2:
  Don't use the enhanced mode as it messes up most analysis names
parents ec311ae3 c903fd87
...@@ -105,13 +105,13 @@ sub main { ...@@ -105,13 +105,13 @@ sub main {
my @palette = qw(#E41A1C #377EB8 #4DAF4A #984EA3 #FF7F00 #FFFF33 #A65628 #F781BF #999999 #8DD3C7 #BEBADA #FB8072 #80B1D3 #FDB462 #B3DE69 #FCCDE5 #D9D9D9 #BC80BD #CCEBC5 #FFED6F #2F4F4F); my @palette = qw(#E41A1C #377EB8 #4DAF4A #984EA3 #FF7F00 #FFFF33 #A65628 #F781BF #999999 #8DD3C7 #BEBADA #FB8072 #80B1D3 #FDB462 #B3DE69 #FCCDE5 #D9D9D9 #BC80BD #CCEBC5 #FFED6F #2F4F4F);
my %terminal_mapping = ( my %terminal_mapping = (
'emf' => 'emf', 'emf' => 'emf noenhanced',
'png' => 'png', 'png' => 'png noenhanced',
'svg' => 'svg', 'svg' => 'svg noenhanced',
'jpg' => 'jpeg', 'jpg' => 'jpeg noenhanced',
'gif' => 'gif', 'gif' => 'gif noenhanced',
'ps' => 'postscript eps enhanced color', 'ps' => 'postscript eps noenhanced color',
'pdf' => 'pdf color enhanced', 'pdf' => 'pdf color noenhanced',
); );
my $gnuplot_terminal = undef; my $gnuplot_terminal = undef;
if ($output and $output =~ /\.(\w+)$/) { if ($output and $output =~ /\.(\w+)$/) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment