Merge branch 'wdoor-stable'

Conflicts:
	changelog

diff --git a/changelog b/changelog
index 465e6a7..8198022 100644 (file)
--- a/changelog
+++ b/changelog
@@ -34,6 +34,12 @@
            has now been fixed.
            Thanks to Hiraoka-san for debugging.
 
+2014-12-18  Daigo Moriwaki <daigo at debian dot org>
+
+       * utils/eval_graph.rb:
+         - Gnuplot 4.6.6 drew evaluation-value lines with a dashed style.
+           This issue has now been addressed so that solid lines are used.
+
 2014-11-30  Daigo Moriwaki <daigo at debian dot org>
 
        * [mk_html]

diff --git a/utils/eval_graph.rb b/utils/eval_graph.rb
index 64a5ea6..3c373ec 100755 (executable)
--- a/utils/eval_graph.rb
+++ b/utils/eval_graph.rb
@@ -224,8 +224,8 @@ def plot(csa_file, title, black, white, a_play_time)
       plot.size   "0.9,0.9"
       plot.key "left"
      
-      plot.style "line 1 linewidth 5 linetype 0 linecolor rgbcolor \"red\"" 
-      plot.style "line 2 linewidth 4 linetype 0 linecolor rgbcolor \"dark-green\"" 
+      plot.style "line 1 linewidth 5 linetype -1 linecolor rgbcolor \"red\""
+      plot.style "line 2 linewidth 4 linetype -1 linecolor rgbcolor \"dark-green\""
 
       plot.data << Gnuplot::DataSet.new( black.eval_values ) do |ds|
         ds.with  = "lines ls 1"
@@ -238,8 +238,8 @@ def plot(csa_file, title, black, white, a_play_time)
       end
 
       if a_play_time > 0
-        plot.style "line 5 linewidth 1 linetype 0 linecolor rgbcolor \"red\"" 
-        plot.style "line 6 linewidth 1 linetype 0 linecolor rgbcolor \"green\"" 
+        plot.style "line 5 linewidth 1 linetype -1 linecolor rgbcolor \"red\""
+        plot.style "line 6 linewidth 1 linetype -1 linecolor rgbcolor \"green\""
         plot.style "fill solid 0.25 noborder"
 
         plot.data << Gnuplot::DataSet.new( black.time_values(3000, a_play_time) ) do |ds|