Merge branch 'upstream'

configure.ac

@@ -1335,10 +1335,8 @@ if test "$no_x" != yes; then
     AC_MSG_RESULT([  x11 (X Window System): yes  (multi-byte fonts not supported)])
   fi
 
-  if test "$enable_x11_external" = yes; then
-    AC_MSG_RESULT([                               (enable plotting to windows opened by external apps) ])
-  else
-    AC_MSG_RESULT([                               (disable plotting to windows opened by external apps) ])
+  if test "$enable_x11_external" != yes; then
+    AC_MSG_RESULT([                              (disable plotting to windows opened by external apps) ])
   fi
 
   if test "$with_x_dcop" = yes; then
@@ -1372,6 +1370,13 @@ else
   AC_MSG_RESULT([  webp                 : no (requires cairo, pango, libwebp, libwebpmux)])
 fi
 
+if test "$with_cairo" = yes || test "$with_gd" = yes; then
+  AC_MSG_RESULT([  kitty                : yes ])
+else
+  AC_MSG_RESULT([  kitty                : no ])
+fi
+
+
 if test "$with_lua" = yes; then
   AC_MSG_RESULT([  lua/TikZ             : yes ])
 else

demo/all.dem

@@ -20,6 +20,7 @@ reset
 
 print "******************** file fillstyle.dem ********************"
 load "fillstyle.dem"
+load "fs_empty.dem"
 reset
 
 print "******************** file fillcvrs.dem ********************"

demo/armillary.dem

@@ -55,9 +55,9 @@ do for [i=1:13] {
 #
 # plot sampled parametric circles
 #
-splot sample [u=0:360] '+' using (cos(u)):(0):(sin(u)) lw 2, \
-             [u=0:360] '+' using (cos(u)):(sin(u)):(0) lw 2, \
-             [u=0:360] '+' using (0):(cos(u)):(sin(u)) lw 2
+splot [u=0:360:1] '+' using (cos(u)):(0):(sin(u)) lw 2, \
+      [u=0:360:1] '+' using (cos(u)):(sin(u)):(0) lw 2, \
+      [u=0:360:1] '+' using (0):(cos(u)):(sin(u)) lw 2
 
 pause -1 "Hit <cr> to continue"
 

demo/fs_empty.dem

@@ -0,0 +1,43 @@
+#
+# Unit test to verify that the border color of an object with
+# fillstyle "empty" can be set as a simple line property.
+#
+version = sprintf("gnuplot %.1f patchlevel %s", GPVAL_VERSION, GPVAL_PATCHLEVEL)
+set title "All borders should be drawn in color\n".version offset 0, -1
+
+set for [i=1:12] obj i circle front
+
+set label 1 at screen 0.05, first 1.2 "set obj fs empty border <color>"
+set obj 1 at 2,1 fs empty border rgb "blue" lw 2
+set obj 2 at 3,1 fs empty border rgb "green" lw 2
+set obj 3 at 4,1 fs empty border rgb "orange" lw 2
+
+set label 2 at screen 0.05, first 0.2 "set obj fs solid border <color> fc 'gray'"
+set obj 4 at 2,0 fs solid border rgb "blue" lw 2 fc "gray75" 
+set obj 5 at 3,0 fs solid border rgb "green" lw 2 fc "gray75" 
+set obj 6 at 4,0 fs solid border rgb "orange" lw 2 fc "gray75" 
+
+set label 3 at screen 0.05, first -0.8 "set obj fs empty border\nset obj lc <color>"
+set obj 10 at 2,-1 fs empty border lw 2 ; set obj 10 lc "blue"
+set obj 11 at 3,-1 fs empty border lw 2 ; set obj 11 lc "green"
+set obj 12 at 4,-1 fs empty border lw 2 ; set obj 12 lc "orange"
+
+set label 4 at screen 0.05, first -1.8 "set obj fs empty border lc 'black'\nset obj lc <color>"
+set obj 7 at 2,-2 fs empty border lw 2 lc "black"; set obj 7 lc "blue"
+set obj 8 at 3,-2 fs empty border lw 2 lc "black"; set obj 8 lc "green"
+set obj 9 at 4,-2 fs empty border lw 2 lc "black"; set obj 9 lc "orange"
+
+set obj 111 rectangle from screen 0,0 to screen 1,1 fc rgb "#779955" behind
+
+set yrange [-3:2]
+set xrange [1:5]
+unset border
+unset tics
+set lmargin screen 0.35
+set rmargin 0
+
+plot x with lines lt nodraw notitle
+
+pause -1 "<cr> to continue"
+reset
+

demo/image.dem

@@ -249,23 +249,25 @@ set origin 0.0,0.0
 set title 'Sunset on the Terrace'
 dim(x) = x * 255./400.
 plot 'blutux.rgb' binary array=(128,128) flip=y format='%uchar' using ($1):(dim($2)):(dim($3)) with rgbimage
+
 set size 0.5,0.48
 set origin 0.5,0.0
 set title 'Sultry evening'
-#set cbrange [0:400]
-plot 'blutux.rgb' binary array=(128,128) flip=y format='%uchar' using ($1 * 255./400.):($2 * 255./400.):($3 * 255./400.) with rgbimage, \
-'-' w points pt 7 ps 6 lc 'gray80', \
- '-' w points pt 7 ps 0.65 lc 'gray90'
+$Moon << EOD
 110 100
-e
+EOD
+$Stars << EOD
 10 95
 38 120
 82 102
 26 82
 93 108
 41 99
 123 84
-e
+EOD
+plot 'blutux.rgb' binary array=(128,128) flip=y format='%uchar' using ($1 * 255./400.):($2 * 255./400.):($3 * 255./400.) with rgbimage, \
+$Moon w points pt 7 ps 6 lc 'gray80', \
+$Stars w points pt 7 ps 0.65 lc 'gray90'
 unset multiplot
 pause -1 "Hit return to continue"
 reset

demo/rgba_lines.dem

@@ -26,8 +26,8 @@ set xrange [-1:1]
 set yrange [-1:1]
 set size square
 
-plot sample [i=5:360:5] '+' using (0):(0):(cos(i)):(sin(i)):(fade(i)) \
-     with vector as 1
+plot [i=5:360:5] '+' using (0):(0):(cos(i)):(sin(i)):(fade(i)) \
+     with vector arrowstyle 1
 
 pause -1 "Hit return to continue"
 reset

demo/sampling.dem

@@ -23,17 +23,17 @@ if (ARG1 <= 1) {
 }
 
 if (ARG1 <= 2) {
-    print "test 2: range set by 'sample' keyword, linear x axis"
-    plot sample [t=20:50] '+' using (t):(10. + sin(t))
+    print "test 2: range set by sampling range with second colon, linear x axis"
+    plot [t=20:50:] '+' using (t):(10. + sin(t))
     pause -1 "Hit <cr> to continue"
 }
 
 
 set log x
 
 if (ARG1 <= 3) {
-    print "test 3: range set by 'sample' keyword, logscale x axis"
-    plot sample [t=20:50] '+' using (t):(10. + sin(t))
+    print "test 3: range set by sampling range with second colon, logscale x axis"
+    plot [t=20:50:] '+' using (t):(10. + sin(t))
     pause -1 "Hit <cr> to continue"
 }
 
@@ -129,7 +129,7 @@ alpha(x,y) = radius(x,y) > 255 ? 0 : 255-radius(x,y)
 set title "3D custom sampling on u and v using pseudofile '++'"
 print "test 10: splot '++' with explicit sampling intervals"
 
-splot sample [u=25:75:1][v=25:75:4] '++' \
+splot [u=25:75:1][v=25:75:4] '++' \
       using 1:2:0:(u*4-50):(v*4-50):(255*sin(u*v/2500.)):(alpha(u,v)) with rgbalpha, \
       [u=25:75:4][v=25:75:1] '++' \
       using (u+20):(v-20):0:(u*4-50):(v*4-50):(255*sin(u*v/2500.)):(alpha(u,v)) with rgbalpha
@@ -139,7 +139,7 @@ pause -1 "Hit <cr> to continue"
 set title "2D custom sampling on u and v using pseudofile '++'"
 print "test 10: plot '++' with explicit sampling intervals"
 
-plot sample [u=25:75:1][v=25:75:4] '++' \
+plot [u=25:75:1][v=25:75:4] '++' \
       using 1:2:(u*4-50):(v*4-50):(255*sin(u*v/2500.)):(alpha(u,v)) with rgbalpha, \
       [u=25:75:4][v=25:75:1] '++' \
       using (u+20):(v-20):(u*4-50):(v*4-50):(255*sin(u*v/2500.)):(alpha(u,v)) with rgbalpha

demo/sectors.dem

@@ -68,7 +68,7 @@ set cbtics
 
 set table $data
 set view map
-splot sample [t=0:tmax-dt:dt] [r=0:rmax-dr:dr] "++" using (t):(r):(0)
+splot [t=0:tmax-dt:dt] [r=0:rmax-dr:dr] "++" using (t):(r):(0)
 unset table
 
 plot $data using 1:2:(dt):(dr):(0.5):(0):(f($1+dt/2,$2+dr/2)) with sectors fc palette fill solid, \
@@ -284,7 +284,7 @@ set cbrange [0:360]
 
 da = 15
 
-plot sample [t=0:360:da] \
+plot [t=0:360:da] \
      "+" using ($1-da/2.0):(2):(da):(2):(hsv2rgb($1/360,1,0.7)) with sectors \
                    fc rgb variable fill solid 1 border lc bgnd lw 2, \
      [t=0:360-da:da] "+" using ($1):(4.5):(sprintf("%i",$1)) with labels 
@@ -437,7 +437,7 @@ unset key
 
 set style fill solid border lc rgb "gray"
 
-plot sample [t=0:350:15] "+" using (t-5):(4):(10):(2) with sectors fc rgb "gray90" fill border lc black lw 2, \
+plot [t=0:350:15] "+" using (t-5):(4):(10):(2) with sectors fc rgb "gray90" fill border lc black lw 2, \
             [t=0:220:15] "+" using (t-5):(4):(10):(2) with sectors fc rgb "orange" fill border lc black lw 2
 
 pause -1 "<cr> to continue"

demo/short_vector.dem

@@ -11,7 +11,7 @@ set yrange [-6:6]
 vec_x(x,y) = ( lEn = sqrt(x*x+y*y), (10.**(lEn-7)) * x / lEn )
 vec_y(x,y) = ( lEn = sqrt(x*x+y*y), (10.**(lEn-7)) * y / lEn )
 
-plot sample [u=-5:5:1][v=-5:5:1] '++' using 1:2:(vec_x(u,v)):(vec_y(u,v)):(lEn) \
+plot [u=-5:5:1][v=-5:5:1] '++' using 1:2:(vec_x(u,v)):(vec_y(u,v)):(lEn) \
      with vectors size screen 0.01,20 filled fixed lc palette z
 
 pause -1 "<cr> to continue"

docs/Makefile.am

@@ -238,12 +238,13 @@ allterm-ja.h: $(CORETERM) $(LUA_HELP)
 	-mkdir ja
 	-mkdir ja/docs;
 	cp $(top_srcdir)/docs/doc2rtf.c ja/docs
+	cp $(top_srcdir)/docs/term-ja.diff ja
 	cp -r $(top_srcdir)/term $(TJ)
-	-( cd ja ; patch -p0 < $(top_srcdir)/docs/term-ja.diff )
+	-( cd ja ; patch -p0 < term-ja.diff )
 	$(AM_V_GEN) for e in `grep -E "^[ 	]*START_HELP" $(JATERM) |\
 	     LC_ALL=C sort -f -t':' -k2` ; do \
 	  f=`echo $$e |cut -d\: -f1` ; s=`echo $$e | cut -d\: -f2` ;\
-	  sed -n "/^[ 	]*$$s/,/^[ 	]*END_HELP/p" $$f ; \
+	  LC_ALL=C sed -n "/^[ 	]*$$s/,/^[ 	]*END_HELP/p" $$f ; \
 	done >allterm.tmp
 	iconv -f EUC-JP -t UTF-8 < allterm.tmp >$@
 	rm allterm.tmp

docs/term-ja.diff

@@ -3651,8 +3651,8 @@ diff -ru term/lua.trm.ORG term/lua.trm
  #ifdef HAVE_LUA
 +#ifndef JAPANESE_DOC
  #include "gnuplot-tikz.help"
-+#else
-+#include "lua/gnuplot-tikz-ja.help"
++#
++#
  #endif
 +#endif
  ""

faq/Makefile

@@ -36,5 +36,6 @@ faq.txt: faq.html
 clean:
 	-rm -f faq.aux faq.css faq.dvi faq.html faq.log faq.out faq.pdf \
 	       faq.tmp faq.ps faq.toc faq.txt faq.4tc faq.4ct faq.lg faq.idv faq.xref \
-	       faq*.png *.log *.aux
+	       faq*.png *.log *.aux \
+	       faq-ja-utf8.out faq-ja-utf8.tex faq-ja-utf8.toc faq-ja.pdf