#! /bin/sh # # To apply this patch, cd to the top level Octave source directory and # run this file through /bin/sh. It will first remove any files that # have been deleted from the source distribution since the last # release and then update the sources with patch(1). # # Diffs for updating *.ps, *.dvi, *.info*, and *.html files are not # included because they can be recreated from the Texinfo files using # TeX, makeinfo, or texi2html. # # Diffs for updating parse.cc and y.tab.h are not included because # they can be recreated from the file parse.y using bison. # # Diffs for updating lex.cc are not included because it can be # recreated from lex.l using flex. # # John W. Eaton # jwe@bevo.che.wisc.edu # University of Wisconsin-Madison # Department of Chemical Engineering if test -f src/octave.cc ; then true else echo '***********************************************************' 1>&2 echo 'You must run this script in the top-level octave directory!' 1>&2 echo '***********************************************************' 1>&2 exit 1 fi ### ### Special commands should go here. ### echo 'patching existing files' patch -p1 << \PATCH_EOF diff -cNr octave-2.9.19/ChangeLog octave-3.0.0/ChangeLog *** octave-2.9.19/ChangeLog Mon Dec 10 02:33:20 2007 --- octave-3.0.0/ChangeLog Fri Dec 21 12:46:09 2007 *************** *** 1,3 **** --- 1,12 ---- + 2007-12-21 John W. Eaton + + Version 3.0.0 released. + + 2007-12-13 John W. Eaton + + * octMakefile.in (octave-bug, octave-config, mkoctfile): + Also depend on $(top_srcdir)/src/version.h. + 2007-12-10 John W. Eaton * acx_blas.m4: Use -lsunperf, not -xlic_lib=sunperf. diff -cNr octave-2.9.19/doc/ChangeLog octave-3.0.0/doc/ChangeLog *** octave-2.9.19/doc/ChangeLog Wed Dec 5 15:50:47 2007 --- octave-3.0.0/doc/ChangeLog Fri Dec 21 12:46:25 2007 *************** *** 1,3 **** --- 1,11 ---- + 2007-12-21 John W. Eaton + + Version 3.0.0 released. + + 2007-12-13 John W. Eaton + + * Makefile.in (conf.texi): Also depend on $(top_srcdir)/src/version.h. + 2007-12-05 John W. Eaton * interpreter/geometryimages.m (image_as_txt): New function. diff -cNr octave-2.9.19/doc/Makefile.in octave-3.0.0/doc/Makefile.in *** octave-2.9.19/doc/Makefile.in Fri Oct 12 17:27:12 2007 --- octave-3.0.0/doc/Makefile.in Thu Dec 13 16:35:36 2007 *************** *** 42,48 **** all: conf.texi $(SUBDIRS) .PHONY: all ! conf.texi: conf.texi.in $(TOPDIR)/Makeconf @$(do-subst-texinfo-vals) ../BUGS ../INSTALL.OCTAVE: --- 42,48 ---- all: conf.texi $(SUBDIRS) .PHONY: all ! conf.texi: conf.texi.in $(TOPDIR)/Makeconf $(top_srcdir)/src/version.h @$(do-subst-texinfo-vals) ../BUGS ../INSTALL.OCTAVE: diff -cNr octave-2.9.19/doc/conf.texi octave-3.0.0/doc/conf.texi *** octave-2.9.19/doc/conf.texi Tue Dec 11 18:04:47 2007 --- octave-3.0.0/doc/conf.texi Thu Dec 20 16:12:29 2007 *************** *** 18,26 **** @set OCTAVE_MANUAL @set top_srcdir .. ! @set abs_top_srcdir /tmp/jwe/octave @set OCTAVEHOME /usr/local ! @set VERSION 2.9.19 @set HAVE_COLAMD @set HAVE_CHOLMOD @set HAVE_UMFPACK --- 18,26 ---- @set OCTAVE_MANUAL @set top_srcdir .. ! @set abs_top_srcdir /scratch/jwe/octave-3.0/octave @set OCTAVEHOME /usr/local ! @set VERSION 3.0.0 @set HAVE_COLAMD @set HAVE_CHOLMOD @set HAVE_UMFPACK Binary files octave-2.9.19/doc/faq/Octave-FAQ.pdf and octave-3.0.0/doc/faq/Octave-FAQ.pdf differ Binary files octave-2.9.19/doc/interpreter/HTML/delaunay.png and octave-3.0.0/doc/interpreter/HTML/delaunay.png differ Binary files octave-2.9.19/doc/interpreter/HTML/errorbar.png and octave-3.0.0/doc/interpreter/HTML/errorbar.png differ Binary files octave-2.9.19/doc/interpreter/HTML/extended.png and octave-3.0.0/doc/interpreter/HTML/extended.png differ Binary files octave-2.9.19/doc/interpreter/HTML/hist.png and octave-3.0.0/doc/interpreter/HTML/hist.png differ Binary files octave-2.9.19/doc/interpreter/HTML/interpderiv1.png and octave-3.0.0/doc/interpreter/HTML/interpderiv1.png differ Binary files octave-2.9.19/doc/interpreter/HTML/interpderiv2.png and octave-3.0.0/doc/interpreter/HTML/interpderiv2.png differ Binary files octave-2.9.19/doc/interpreter/HTML/interpft.png and octave-3.0.0/doc/interpreter/HTML/interpft.png differ Binary files octave-2.9.19/doc/interpreter/HTML/plot.png and octave-3.0.0/doc/interpreter/HTML/plot.png differ Binary files octave-2.9.19/doc/interpreter/HTML/polar.png and octave-3.0.0/doc/interpreter/HTML/polar.png differ Binary files octave-2.9.19/doc/interpreter/HTML/spchol.png and octave-3.0.0/doc/interpreter/HTML/spchol.png differ Binary files octave-2.9.19/doc/interpreter/HTML/spcholperm.png and octave-3.0.0/doc/interpreter/HTML/spcholperm.png differ Binary files octave-2.9.19/doc/interpreter/HTML/spmatrix.png and octave-3.0.0/doc/interpreter/HTML/spmatrix.png differ Binary files octave-2.9.19/doc/interpreter/HTML/triplot.png and octave-3.0.0/doc/interpreter/HTML/triplot.png differ diff -cNr octave-2.9.19/doc/interpreter/contributors.in octave-3.0.0/doc/interpreter/contributors.in *** octave-2.9.19/doc/interpreter/contributors.in Tue Dec 4 13:12:32 2007 --- octave-3.0.0/doc/interpreter/contributors.in Wed Dec 19 11:57:21 2007 *************** *** 82,87 **** --- 82,88 ---- Atsushi Kajita Mohamed Kamoun Lute Kamstra + Thomas Kasper Joel Keay Mumit Khan Paul Kienzle *************** *** 113,118 **** --- 114,120 ---- Ricardo Marranita Orestes Mas Makoto Matsumoto + Tatsuro Matsuoka Laurent Mazet G. D. McBain Christoph Mayer diff -cNr octave-2.9.19/doc/interpreter/contributors.texi octave-3.0.0/doc/interpreter/contributors.texi *** octave-2.9.19/doc/interpreter/contributors.texi Tue Dec 11 19:37:59 2007 --- octave-3.0.0/doc/interpreter/contributors.texi Fri Dec 21 16:28:43 2007 *************** *** 27,69 **** @item Alan W. Irwin @tab Geoff Jacobsen @tab Mats Jansson @item Cai Jianming @tab Steven G. Johnson @tab Heikki Junes @item Atsushi Kajita @tab Mohamed Kamoun @tab Lute Kamstra ! @item Joel Keay @tab Mumit Khan @tab Paul Kienzle ! @item Aaron A. King @tab Arno J. Klaassen @tab Geoffrey Knauth ! @item Heine Kolltveit @tab Ken Kouno @tab Oyvind Kristiansen ! @item Piotr Krzyzanowski @tab Volker Kuhlmann @tab Miroslaw Kwasniak ! @item Rafael Laboissiere @tab Kai Labusch @tab Claude Lacoursiere ! @item Walter Landry @tab Bill Lash @tab Dirk Laurie ! @item Maurice LeBrun @tab Friedrich Leisch @tab Benjamin Lindner ! @item Ross Lippert @tab David Livings @tab Erik de Castro Lopo ! @item Massimo Lorenzin @tab Hoxide Ma @tab James Macnicol ! @item Jens-Uwe Mager @tab Ricardo Marranita @tab Orestes Mas ! @item Makoto Matsumoto @tab Laurent Mazet @tab G. D. McBain ! @item Christoph Mayer @tab Stefan Monnier @tab Antoine Moreau ! @item Kai P. Mueller @tab Victor Munoz @tab Carmen Navarrete ! @item Todd Neal @tab Al Niessner @tab Rick Niles ! @item Takuji Nishimura @tab Eric Norum @tab Michael O'Brien ! @item Thorsten Ohl @tab Arno Onken @tab Luis F. Ortiz ! @item Scott Pakin @tab Gabriele Pannocchia @tab Sylvain Pelissier ! @item Per Persson @tab Jim Peterson @tab Danilo Piazzalunga ! @item Nicholas Piper @tab Hans Ekkehard Plesser @tab Tom Poage ! @item Orion Poplawski @tab Ondrej Popp @tab Jef Poskanzer ! @item Francesco Potorti @tab James B. Rawlings @tab Eric S. Raymond ! @item Balint Reczey @tab Michael Reifenberger @tab Petter Risholm ! @item Matthew W. Roberts @tab Andrew Ross @tab Mark van Rossum ! @item Kevin Ruland @tab Olli Saarela @tab Toni Saarela ! @item Juhani Saastamoinen @tab Ben Sapp @tab Alois Schloegl ! @item Michel D. Schmid @tab Nicol N. Schraudolph @tab Sebastian Schubert ! @item Ludwig Schwardt @tab Daniel J. Sebald @tab Dmitri A. Sergatskov ! @item Baylis Shanks @tab Joseph P. Skudlarek @tab John Smith ! @item Julius Smith @tab Shan G. Smith @tab Joerg Specht ! @item Quentin H. Spencer @tab Christoph Spiel @tab Richard Stallman ! @item Russell Standish @tab Doug Stewart @tab Thomas Stuart ! @item John Swensen @tab Ariel Tankus @tab Georg Thimm ! @item Duncan Temple Lang @tab Olaf Till @tab Thomas Treichl ! @item Utkarsh Upadhyay @tab Stefan van der Walt @tab Peter Van Wieren ! @item James R. Van Zandt @tab Gregory Vanuxem @tab Ivana Varekova ! @item Thomas Walter @tab Olaf Weber @tab Thomas Weber ! @item Bob Weigel @tab Andreas Weingessel @tab Michael Weitzel ! @item Fook Fah Yap @tab Michael Zeising @tab Federico Zenith ! @item Alex Zvoleff @end multitable --- 27,69 ---- @item Alan W. Irwin @tab Geoff Jacobsen @tab Mats Jansson @item Cai Jianming @tab Steven G. Johnson @tab Heikki Junes @item Atsushi Kajita @tab Mohamed Kamoun @tab Lute Kamstra ! @item Thomas Kasper @tab Joel Keay @tab Mumit Khan ! @item Paul Kienzle @tab Aaron A. King @tab Arno J. Klaassen ! @item Geoffrey Knauth @tab Heine Kolltveit @tab Ken Kouno ! @item Oyvind Kristiansen @tab Piotr Krzyzanowski @tab Volker Kuhlmann ! @item Miroslaw Kwasniak @tab Rafael Laboissiere @tab Kai Labusch ! @item Claude Lacoursiere @tab Walter Landry @tab Bill Lash ! @item Dirk Laurie @tab Maurice LeBrun @tab Friedrich Leisch ! @item Benjamin Lindner @tab Ross Lippert @tab David Livings ! @item Erik de Castro Lopo @tab Massimo Lorenzin @tab Hoxide Ma ! @item James Macnicol @tab Jens-Uwe Mager @tab Ricardo Marranita ! @item Orestes Mas @tab Makoto Matsumoto @tab Tatsuro Matsuoka ! @item Laurent Mazet @tab G. D. McBain @tab Christoph Mayer ! @item Stefan Monnier @tab Antoine Moreau @tab Kai P. Mueller ! @item Victor Munoz @tab Carmen Navarrete @tab Todd Neal ! @item Al Niessner @tab Rick Niles @tab Takuji Nishimura ! @item Eric Norum @tab Michael O'Brien @tab Thorsten Ohl ! @item Arno Onken @tab Luis F. Ortiz @tab Scott Pakin ! @item Gabriele Pannocchia @tab Sylvain Pelissier @tab Per Persson ! @item Jim Peterson @tab Danilo Piazzalunga @tab Nicholas Piper ! @item Hans Ekkehard Plesser @tab Tom Poage @tab Orion Poplawski ! @item Ondrej Popp @tab Jef Poskanzer @tab Francesco Potorti ! @item James B. Rawlings @tab Eric S. Raymond @tab Balint Reczey ! @item Michael Reifenberger @tab Petter Risholm @tab Matthew W. Roberts ! @item Andrew Ross @tab Mark van Rossum @tab Kevin Ruland ! @item Olli Saarela @tab Toni Saarela @tab Juhani Saastamoinen ! @item Ben Sapp @tab Alois Schloegl @tab Michel D. Schmid ! @item Nicol N. Schraudolph @tab Sebastian Schubert @tab Ludwig Schwardt ! @item Daniel J. Sebald @tab Dmitri A. Sergatskov @tab Baylis Shanks ! @item Joseph P. Skudlarek @tab John Smith @tab Julius Smith ! @item Shan G. Smith @tab Joerg Specht @tab Quentin H. Spencer ! @item Christoph Spiel @tab Richard Stallman @tab Russell Standish ! @item Doug Stewart @tab Thomas Stuart @tab John Swensen ! @item Ariel Tankus @tab Georg Thimm @tab Duncan Temple Lang ! @item Olaf Till @tab Thomas Treichl @tab Utkarsh Upadhyay ! @item Stefan van der Walt @tab Peter Van Wieren @tab James R. Van Zandt ! @item Gregory Vanuxem @tab Ivana Varekova @tab Thomas Walter ! @item Olaf Weber @tab Thomas Weber @tab Bob Weigel ! @item Andreas Weingessel @tab Michael Weitzel @tab Fook Fah Yap ! @item Michael Zeising @tab Federico Zenith @tab Alex Zvoleff @end multitable diff -cNr octave-2.9.19/doc/interpreter/convhull.eps octave-3.0.0/doc/interpreter/convhull.eps *** octave-2.9.19/doc/interpreter/convhull.eps Tue Dec 11 18:05:29 2007 --- octave-3.0.0/doc/interpreter/convhull.eps Thu Dec 20 16:13:12 2007 *************** *** 1,7 **** %!PS-Adobe-2.0 EPSF-2.0 %%Title: convhull.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Tue Dec 11 18:05:29 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments --- 1,7 ---- %!PS-Adobe-2.0 EPSF-2.0 %%Title: convhull.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Thu Dec 20 16:13:12 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments *************** *** 48,54 **** /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Tue Dec 11 18:05:29 2007) /DOCINFO pdfmark end } ifelse --- 48,54 ---- /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Thu Dec 20 16:13:12 2007) /DOCINFO pdfmark end } ifelse *************** *** 532,537 **** --- 532,669 ---- } ifelse 1.000 UL LTb + 490 489 M + 63 0 V + 6409 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 406 489 M + [ [(Helvetica) 140.0 0.0 true true 0 (0)] + ] -46.7 MRshow + 1.000 UL + LTb + 490 1324 M + 63 0 V + 6409 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 406 1324 M + [ [(Helvetica) 140.0 0.0 true true 0 (0.2)] + ] -46.7 MRshow + 1.000 UL + LTb + 490 2159 M + 63 0 V + 6409 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 406 2159 M + [ [(Helvetica) 140.0 0.0 true true 0 (0.4)] + ] -46.7 MRshow + 1.000 UL + LTb + 490 2993 M + 63 0 V + 6409 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 406 2993 M + [ [(Helvetica) 140.0 0.0 true true 0 (0.6)] + ] -46.7 MRshow + 1.000 UL + LTb + 490 3828 M + 63 0 V + 6409 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 406 3828 M + [ [(Helvetica) 140.0 0.0 true true 0 (0.8)] + ] -46.7 MRshow + 1.000 UL + LTb + 490 4663 M + 63 0 V + 6409 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 406 4663 M + [ [(Helvetica) 140.0 0.0 true true 0 (1)] + ] -46.7 MRshow + 1.000 UL + LTb + 543 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 543 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (-3)] + ] -46.7 MCshow + 1.000 UL + LTb + 1604 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 1604 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (-2)] + ] -46.7 MCshow + 1.000 UL + LTb + 2665 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 2665 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (-1)] + ] -46.7 MCshow + 1.000 UL + LTb + 3726 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 3726 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (0)] + ] -46.7 MCshow + 1.000 UL + LTb + 4787 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 4787 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (1)] + ] -46.7 MCshow + 1.000 UL + LTb + 5848 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 5848 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (2)] + ] -46.7 MCshow + 1.000 UL + LTb + 6909 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 6909 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (3)] + ] -46.7 MCshow + 1.000 UL + LTb + 1.000 UL + LTb 490 4872 N 490 280 L 6472 0 V *************** *** 731,868 **** 6909 1078 Pls 1.000 UL LTb - 490 489 M - 63 0 V - 6409 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 406 489 M - [ [(Helvetica) 140.0 0.0 true true 0 (0)] - ] -46.7 MRshow - 1.000 UL - LTb - 490 1324 M - 63 0 V - 6409 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 406 1324 M - [ [(Helvetica) 140.0 0.0 true true 0 (0.2)] - ] -46.7 MRshow - 1.000 UL - LTb - 490 2159 M - 63 0 V - 6409 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 406 2159 M - [ [(Helvetica) 140.0 0.0 true true 0 (0.4)] - ] -46.7 MRshow - 1.000 UL - LTb - 490 2993 M - 63 0 V - 6409 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 406 2993 M - [ [(Helvetica) 140.0 0.0 true true 0 (0.6)] - ] -46.7 MRshow - 1.000 UL - LTb - 490 3828 M - 63 0 V - 6409 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 406 3828 M - [ [(Helvetica) 140.0 0.0 true true 0 (0.8)] - ] -46.7 MRshow - 1.000 UL - LTb - 490 4663 M - 63 0 V - 6409 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 406 4663 M - [ [(Helvetica) 140.0 0.0 true true 0 (1)] - ] -46.7 MRshow - 1.000 UL - LTb - 543 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 543 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (-3)] - ] -46.7 MCshow - 1.000 UL - LTb - 1604 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 1604 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (-2)] - ] -46.7 MCshow - 1.000 UL - LTb - 2665 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 2665 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (-1)] - ] -46.7 MCshow - 1.000 UL - LTb - 3726 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 3726 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (0)] - ] -46.7 MCshow - 1.000 UL - LTb - 4787 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 4787 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (1)] - ] -46.7 MCshow - 1.000 UL - LTb - 5848 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 5848 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (2)] - ] -46.7 MCshow - 1.000 UL - LTb - 6909 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 6909 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (3)] - ] -46.7 MCshow - 1.000 UL - LTb - 1.000 UL - LTb 490 4872 N 490 280 L 6472 0 V --- 863,868 ---- Binary files octave-2.9.19/doc/interpreter/convhull.pdf and octave-3.0.0/doc/interpreter/convhull.pdf differ diff -cNr octave-2.9.19/doc/interpreter/delaunay.eps octave-3.0.0/doc/interpreter/delaunay.eps *** octave-2.9.19/doc/interpreter/delaunay.eps Tue Dec 11 18:05:30 2007 --- octave-3.0.0/doc/interpreter/delaunay.eps Thu Dec 20 16:13:14 2007 *************** *** 1,7 **** %!PS-Adobe-2.0 EPSF-2.0 %%Title: delaunay.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Tue Dec 11 18:05:30 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments --- 1,7 ---- %!PS-Adobe-2.0 EPSF-2.0 %%Title: delaunay.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Thu Dec 20 16:13:14 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments *************** *** 48,54 **** /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Tue Dec 11 18:05:30 2007) /DOCINFO pdfmark end } ifelse --- 48,54 ---- /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Thu Dec 20 16:13:14 2007) /DOCINFO pdfmark end } ifelse *************** *** 532,633 **** } ifelse 1.000 UL LTb - 490 4872 N - 490 280 L - 6472 0 V - 0 4592 V - -6472 0 V - Z stroke - 1.000 UP - 1.000 UL - LTb - 0.500 UL - LT0 - 0.00 0.00 1.00 C 1066 4637 M - 316 -317 V - 555 428 L - 511 4209 V - stroke - LT1 - 0.00 0.00 1.00 C 4197 2433 M - 2323 290 L - 555 428 L - 4197 2433 L - stroke - LT2 - 0.00 0.00 1.00 C 4197 2433 M - 1382 4320 L - 555 428 L - 4197 2433 L - stroke - LT3 - 0.00 0.00 1.00 C 5415 1386 M - 4197 2433 L - 2745 -61 V - 5415 1386 L - stroke - LT4 - 0.00 0.00 1.00 C 5415 1386 M - 4197 2433 L - 2323 290 L - 5415 1386 L - stroke - LT5 - 0.00 0.00 1.00 C 3839 3768 M - 4197 2433 L - 1382 4320 L - 3839 3768 L - stroke - LT6 - 0.00 0.00 1.00 C 3839 3768 M - 1066 4637 L - 5418 212 V - 3839 3768 L - stroke - LT7 - 0.00 0.00 1.00 C 3839 3768 M - 1066 4637 L - 316 -317 V - 3839 3768 L - stroke - LT8 - 0.00 0.00 1.00 C 6290 3965 M - 194 884 V - 6942 2372 L - 6290 3965 L - stroke - LT0 - 0.00 0.00 1.00 C 6290 3965 M - 3839 3768 L - 6484 4849 L - 6290 3965 L - stroke - LT1 - 0.00 0.00 1.00 C 6290 3965 M - 4197 2433 L - 2745 -61 V - 6290 3965 L - stroke - LT2 - 0.00 0.00 1.00 C 6290 3965 M - 3839 3768 L - 4197 2433 L - 6290 3965 L - 1.000 UP - stroke - LT3 - 1.00 0.00 0.00 C 1382 4320 Star - 6942 2372 Star - 6290 3965 Star - 2323 290 Star - 4197 2433 Star - 3839 3768 Star - 5415 1386 Star - 6484 4849 Star - 1066 4637 Star - 555 428 Star - 1.000 UL - LTb 490 280 M 63 0 V 6409 0 R --- 532,537 ---- *************** *** 819,824 **** --- 723,824 ---- 1.000 UP 1.000 UL LTb + 0.500 UL + LT0 + 0.00 0.00 1.00 C 1066 4637 M + 316 -317 V + 555 428 L + 511 4209 V + stroke + LT1 + 0.00 0.00 1.00 C 4197 2433 M + 2323 290 L + 555 428 L + 4197 2433 L + stroke + LT2 + 0.00 0.00 1.00 C 4197 2433 M + 1382 4320 L + 555 428 L + 4197 2433 L + stroke + LT3 + 0.00 0.00 1.00 C 5415 1386 M + 4197 2433 L + 2745 -61 V + 5415 1386 L + stroke + LT4 + 0.00 0.00 1.00 C 5415 1386 M + 4197 2433 L + 2323 290 L + 5415 1386 L + stroke + LT5 + 0.00 0.00 1.00 C 3839 3768 M + 4197 2433 L + 1382 4320 L + 3839 3768 L + stroke + LT6 + 0.00 0.00 1.00 C 3839 3768 M + 1066 4637 L + 5418 212 V + 3839 3768 L + stroke + LT7 + 0.00 0.00 1.00 C 3839 3768 M + 1066 4637 L + 316 -317 V + 3839 3768 L + stroke + LT8 + 0.00 0.00 1.00 C 6290 3965 M + 194 884 V + 6942 2372 L + 6290 3965 L + stroke + LT0 + 0.00 0.00 1.00 C 6290 3965 M + 3839 3768 L + 6484 4849 L + 6290 3965 L + stroke + LT1 + 0.00 0.00 1.00 C 6290 3965 M + 4197 2433 L + 2745 -61 V + 6290 3965 L + stroke + LT2 + 0.00 0.00 1.00 C 6290 3965 M + 3839 3768 L + 4197 2433 L + 6290 3965 L + 1.000 UP + stroke + LT3 + 1.00 0.00 0.00 C 1382 4320 Star + 6942 2372 Star + 6290 3965 Star + 2323 290 Star + 4197 2433 Star + 3839 3768 Star + 5415 1386 Star + 6484 4849 Star + 1066 4637 Star + 555 428 Star + 1.000 UL + LTb + 490 4872 N + 490 280 L + 6472 0 V + 0 4592 V + -6472 0 V + Z stroke + 1.000 UP + 1.000 UL + LTb stroke grestore end Binary files octave-2.9.19/doc/interpreter/delaunay.pdf and octave-3.0.0/doc/interpreter/delaunay.pdf differ Binary files octave-2.9.19/doc/interpreter/delaunay.png and octave-3.0.0/doc/interpreter/delaunay.png differ diff -cNr octave-2.9.19/doc/interpreter/errorbar.eps octave-3.0.0/doc/interpreter/errorbar.eps *** octave-2.9.19/doc/interpreter/errorbar.eps Tue Dec 11 18:05:35 2007 --- octave-3.0.0/doc/interpreter/errorbar.eps Thu Dec 20 16:13:19 2007 *************** *** 1,7 **** %!PS-Adobe-2.0 EPSF-2.0 %%Title: errorbar.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Tue Dec 11 18:05:35 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments --- 1,7 ---- %!PS-Adobe-2.0 EPSF-2.0 %%Title: errorbar.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Thu Dec 20 16:13:19 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments *************** *** 48,54 **** /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Tue Dec 11 18:05:35 2007) /DOCINFO pdfmark end } ifelse --- 48,54 ---- /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Thu Dec 20 16:13:19 2007) /DOCINFO pdfmark end } ifelse *************** *** 456,535 **** 0 setgray newpath (Helvetica) findfont 140 scalefont setfont ! gsave % colour palette begin ! /maxcolors 64 def ! /HSV2RGB { exch dup 0.0 eq {pop exch pop dup dup} % achromatic gray ! { /HSVs exch def /HSVv exch def 6.0 mul dup floor dup 3 1 roll sub ! /HSVf exch def /HSVi exch cvi def /HSVp HSVv 1.0 HSVs sub mul def ! /HSVq HSVv 1.0 HSVs HSVf mul sub mul def ! /HSVt HSVv 1.0 HSVs 1.0 HSVf sub mul sub mul def ! /HSVi HSVi 6 mod def 0 HSVi eq {HSVv HSVt HSVp} ! {1 HSVi eq {HSVq HSVv HSVp}{2 HSVi eq {HSVp HSVv HSVt} ! {3 HSVi eq {HSVp HSVq HSVv}{4 HSVi eq {HSVt HSVp HSVv} ! {HSVv HSVp HSVq} ifelse} ifelse} ifelse} ifelse} ifelse ! } ifelse} def ! /Constrain { ! dup 0 lt {0 exch pop}{dup 1 gt {1 exch pop} if} ifelse} def ! /YIQ2RGB { ! 3 copy -1.702 mul exch -1.105 mul add add Constrain 4 1 roll ! 3 copy -0.647 mul exch -0.272 mul add add Constrain 5 1 roll ! 0.621 mul exch -0.956 mul add add Constrain 3 1 roll } def ! /CMY2RGB { 1 exch sub exch 1 exch sub 3 2 roll 1 exch sub 3 1 roll exch } def ! /XYZ2RGB { 3 copy -0.9017 mul exch -0.1187 mul add exch 0.0585 mul exch add ! Constrain 4 1 roll 3 copy -0.0279 mul exch 1.999 mul add exch ! -0.9844 mul add Constrain 5 1 roll -0.2891 mul exch -0.5338 mul add ! exch 1.91 mul exch add Constrain 3 1 roll} def ! /SelectSpace {ColorSpace (HSV) eq {HSV2RGB}{ColorSpace (XYZ) eq { ! XYZ2RGB}{ColorSpace (CMY) eq {CMY2RGB}{ColorSpace (YIQ) eq {YIQ2RGB} ! if} ifelse} ifelse} ifelse} def ! /InterpolatedColor true def ! /grayindex {/gidx 0 def ! {GrayA gidx get grayv ge {exit} if /gidx gidx 1 add def} loop} def ! /dgdx {grayv GrayA gidx get sub GrayA gidx 1 sub get ! GrayA gidx get sub div} def ! /redvalue {RedA gidx get RedA gidx 1 sub get ! RedA gidx get sub dgdxval mul add} def ! /greenvalue {GreenA gidx get GreenA gidx 1 sub get ! GreenA gidx get sub dgdxval mul add} def ! /bluevalue {BlueA gidx get BlueA gidx 1 sub get ! BlueA gidx get sub dgdxval mul add} def ! /interpolate { ! grayindex grayv GrayA gidx get sub abs 1e-5 le ! {RedA gidx get GreenA gidx get BlueA gidx get} ! {/dgdxval dgdx def redvalue greenvalue bluevalue} ifelse} def ! /GrayA [0 .0159 .0317 .0476 .0635 .0794 .0952 .1111 .127 .1429 .1587 .1746 ! .1905 .2063 .2222 .2381 .254 .2698 .2857 .3016 .3175 .3333 .3492 .3651 ! .381 .3968 .4127 .4286 .4444 .4603 .4762 .4921 .5079 .5238 .5397 .5556 ! .5714 .5873 .6032 .619 .6349 .6508 .6667 .6825 .6984 .7143 .7302 .746 ! .7619 .7778 .7937 .8095 .8254 .8413 .8571 .873 .8889 .9048 .9206 .9365 ! .9524 .9683 .9841 1 ] def ! /RedA [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .0238 .0873 .1508 ! .2143 .2778 .3413 .4048 .4683 .5317 .5952 .6587 .7222 .7857 .8492 .9127 ! .9762 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 .9444 .881 .8175 .754 .6905 .627 ! .5635 .5 ] def ! /GreenA [0 0 0 0 0 0 0 0 .0079 .0714 .1349 .1984 .2619 .3254 .3889 .4524 ! .5159 .5794 .6429 .7063 .7698 .8333 .8968 .9603 1 1 1 1 1 1 1 1 1 1 1 1 1 ! 1 1 1 .9603 .8968 .8333 .7698 .7063 .6429 .5794 .5159 .4524 .3889 .3254 ! .2619 .1984 .1349 .0714 .0079 0 0 0 0 0 0 0 0 ] def ! /BlueA [.5 .5635 .627 .6905 .754 .8175 .881 .9444 1 1 1 1 1 1 1 1 1 1 1 1 1 ! 1 1 1 .9762 .9127 .8492 .7857 .7222 .6587 .5952 .5317 .4683 .4048 .3413 ! .2778 .2143 .1508 .0873 .0238 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ! 0 0 ] def ! /pm3dround {maxcolors 0 gt {dup 1 ge ! {pop 1} {maxcolors mul floor maxcolors 1 sub div} ifelse} if} def ! /pm3dGamma 1.0 1.5 div def ! /ColorSpace (RGB) def ! Color true and { % COLOUR vs. GRAY map ! InterpolatedColor { %% Interpolation vs. RGB-Formula ! /g {stroke pm3dround /grayv exch def interpolate ! SelectSpace setrgbcolor} bind def ! }{ ! /g {stroke pm3dround dup cF7 Constrain exch dup cF5 Constrain exch cF15 Constrain ! SelectSpace setrgbcolor} bind def ! } ifelse ! }{ ! /g {stroke pm3dround pm3dGamma exp setgray} bind def ! } ifelse 1.000 UL LTb 574 4872 N --- 456,573 ---- 0 setgray newpath (Helvetica) findfont 140 scalefont setfont ! 1.000 UL ! LTb ! 574 280 M ! 63 0 V ! 6325 0 R ! -63 0 V ! stroke ! 0.00 0.00 0.00 C 490 280 M ! [ [(Helvetica) 140.0 0.0 true true 0 (-1)] ! ] -46.7 MRshow ! 1.000 UL ! LTb ! 574 1428 M ! 63 0 V ! 6325 0 R ! -63 0 V ! stroke ! 0.00 0.00 0.00 C 490 1428 M ! [ [(Helvetica) 140.0 0.0 true true 0 (-0.5)] ! ] -46.7 MRshow ! 1.000 UL ! LTb ! 574 2576 M ! 63 0 V ! 6325 0 R ! -63 0 V ! stroke ! 0.00 0.00 0.00 C 490 2576 M ! [ [(Helvetica) 140.0 0.0 true true 0 (0)] ! ] -46.7 MRshow ! 1.000 UL ! LTb ! 574 3724 M ! 63 0 V ! 6325 0 R ! -63 0 V ! stroke ! 0.00 0.00 0.00 C 490 3724 M ! [ [(Helvetica) 140.0 0.0 true true 0 (0.5)] ! ] -46.7 MRshow ! 1.000 UL ! LTb ! 574 4872 M ! 63 0 V ! 6325 0 R ! -63 0 V ! stroke ! 0.00 0.00 0.00 C 490 4872 M ! [ [(Helvetica) 140.0 0.0 true true 0 (1)] ! ] -46.7 MRshow ! 1.000 UL ! LTb ! 574 280 M ! 0 63 V ! 0 4529 R ! 0 -63 V ! stroke ! 0.00 0.00 0.00 C 574 140 M ! [ [(Helvetica) 140.0 0.0 true true 0 (0)] ! ] -46.7 MCshow ! 1.000 UL ! LTb ! 1852 280 M ! 0 63 V ! 0 4529 R ! 0 -63 V ! stroke ! 0.00 0.00 0.00 C 1852 140 M ! [ [(Helvetica) 140.0 0.0 true true 0 (2)] ! ] -46.7 MCshow ! 1.000 UL ! LTb ! 3129 280 M ! 0 63 V ! 0 4529 R ! 0 -63 V ! stroke ! 0.00 0.00 0.00 C 3129 140 M ! [ [(Helvetica) 140.0 0.0 true true 0 (4)] ! ] -46.7 MCshow ! 1.000 UL ! LTb ! 4407 280 M ! 0 63 V ! 0 4529 R ! 0 -63 V ! stroke ! 0.00 0.00 0.00 C 4407 140 M ! [ [(Helvetica) 140.0 0.0 true true 0 (6)] ! ] -46.7 MCshow ! 1.000 UL ! LTb ! 5684 280 M ! 0 63 V ! 0 4529 R ! 0 -63 V ! stroke ! 0.00 0.00 0.00 C 5684 140 M ! [ [(Helvetica) 140.0 0.0 true true 0 (8)] ! ] -46.7 MCshow ! 1.000 UL ! LTb ! 6962 280 M ! 0 63 V ! 0 4529 R ! 0 -63 V ! stroke ! 0.00 0.00 0.00 C 6962 140 M ! [ [(Helvetica) 140.0 0.0 true true 0 (10)] ! ] -46.7 MCshow ! 1.000 UL ! LTb 1.000 UL LTb 574 4872 N *************** *** 544,1142 **** 1.000 UP 1.000 UL LT0 ! 574 2670 M ! 0 -125 V ! -31 125 R 62 0 V ! 543 2545 M 62 0 V ! 33 435 R ! 0 31 V ! -31 -31 R 62 0 V ! -62 31 R 62 0 V ! 33 -204 R ! 0 539 V ! 671 2807 M 62 0 V ! -62 539 R 62 0 V ! 33 59 R ! 0 -402 V ! -31 402 R 62 0 V ! 735 3003 M 62 0 V ! 33 429 R ! 0 18 V ! -31 -18 R 62 0 V ! -62 18 R 62 0 V ! 32 -227 R ! 0 600 V ! 862 3223 M 62 0 V ! -62 600 R 62 0 V ! 33 -58 R ! 0 -94 V ! -31 94 R 62 0 V ! -62 -94 R 62 0 V ! 33 367 R ! 0 165 V ! 990 4038 M 62 0 V ! -62 165 R 62 0 V ! 33 61 R ! 0 -52 V ! -31 52 R 62 0 V ! -62 -52 R 62 0 V ! 33 178 R ! 0 -552 V ! -31 552 R 62 0 V ! -62 -552 R 62 0 V ! 33 772 R ! 0 -151 V ! -31 151 R 62 0 V ! -62 -151 R ! 62 0 V ! 33 387 R ! 0 26 V ! -31 -26 R 62 0 V ! -62 26 R 62 0 V ! 33 -102 R ! 0 -139 V ! -31 139 R 62 0 V ! -62 -139 R ! 62 0 V ! 32 241 R ! 0 -112 V ! -31 112 R 62 0 V ! -62 -112 R 62 0 V ! 33 2 R ! 0 -386 V ! -31 386 R 62 0 V ! -62 -386 R 62 0 V ! 33 283 R ! 0 -15 V ! -31 15 R 62 0 V ! -62 -15 R 62 0 V ! 97 45 R ! 0 183 V ! -31 -183 R 62 0 V ! -62 183 R 62 0 V ! 33 -475 R ! 0 26 V ! -31 -26 R ! 1755 4397 L ! -62 26 R 62 0 V ! 33 224 R ! 0 -180 V ! -31 180 R 62 0 V ! -62 -180 R 62 0 V ! 33 51 R ! 0 256 V ! -31 -256 R 62 0 V ! -62 256 R 62 0 V ! 32 -310 R ! 0 43 V ! -31 -43 R 62 0 V ! -62 43 R 62 0 V ! 33 -275 R ! 0 310 V ! -31 -310 R 62 0 V ! -62 310 R 62 0 V ! 33 -113 R ! 0 62 V ! -31 -62 R 62 0 V ! -62 62 R 62 0 V ! 33 -581 R ! 0 -170 V ! -31 170 R 62 0 V ! -62 -170 R 62 0 V ! 33 419 R ! 0 -221 V ! -31 221 R 62 0 V ! -62 -221 R 62 0 V ! 33 181 R ! 0 -465 V ! -31 465 R 62 0 V ! -62 -465 R 62 0 V ! 33 50 R ! 0 -211 V ! -31 211 R 62 0 V ! -62 -211 R 62 0 V ! 33 -67 R ! 0 224 V ! -31 -224 R 62 0 V ! -62 224 R 62 0 V ! 33 -99 R ! 0 -315 V ! -31 315 R 62 0 V ! -62 -315 R 62 0 V ! 32 -177 R ! 0 -244 V ! -31 244 R 62 0 V ! -62 -244 R 62 0 V ! 33 -392 R ! 0 217 V ! -31 -217 R 62 0 V ! -62 217 R 62 0 V ! 33 -401 R ! 0 -154 V ! -31 154 R 62 0 V ! -62 -154 R 62 0 V ! 33 297 R ! 0 -53 V ! -31 53 R 62 0 V ! -62 -53 R 62 0 V ! 33 -83 R ! 0 -279 V ! -31 279 R 62 0 V ! -62 -279 R 62 0 V ! 33 -238 R ! 0 -53 V ! -31 53 R 62 0 V ! -62 -53 R 62 0 V ! 33 161 R ! 2874 1553 L ! -31 284 R 62 0 V ! -62 -284 R 62 0 V ! 33 -192 R ! 0 42 V ! -31 -42 R 62 0 V ! -62 42 R 62 0 V ! 32 -284 R ! 0 -57 V ! -31 57 R 62 0 V ! -62 -57 R 62 0 V ! 33 65 R ! 0 -412 V ! -31 412 R 62 0 V ! 3034 715 M 62 0 V ! 33 148 R ! 0 90 V ! -31 -90 R 62 0 V ! -62 90 R 62 0 V ! 33 -261 R ! 0 171 V ! 3162 692 M 62 0 V ! -62 171 R 62 0 V ! 33 -182 R ! 0 59 V ! -31 -59 R 62 0 V ! -62 59 R 62 0 V ! 97 -371 R ! 0 -17 V ! -31 17 R 62 0 V ! -62 -17 R 62 0 V ! 33 -72 R ! 0 144 V ! 3418 280 M 62 0 V ! -62 144 R 62 0 V ! 32 -144 R ! 0 72 V ! -31 -72 R 62 0 V ! -62 72 R 62 0 V ! 33 180 R ! 0 -93 V ! -31 93 R 62 0 V ! -62 -93 R 62 0 V ! 33 -93 R ! 0 -66 V ! -31 66 R 62 0 V ! -62 -66 R 62 0 V ! 33 177 R ! 0 -177 V ! -31 177 R ! 62 0 V ! 3673 280 M 62 0 V ! 33 164 R ! 0 -164 V ! -31 164 R 62 0 V ! 3737 280 M 62 0 V - 33 0 R - 0 281 V 3801 280 M 62 0 V ! -62 281 R 62 0 V ! 33 -191 R ! 0 170 V ! 3865 370 M 62 0 V ! -62 170 R 62 0 V ! 33 -56 R ! 0 -66 V ! -31 66 R 62 0 V ! -62 -66 R 62 0 V ! 33 53 R ! 0 -191 V ! -31 191 R 62 0 V ! 3993 280 M ! 4055 280 L ! 32 673 R ! 0 54 V ! -31 -54 R 62 0 V ! -62 54 R 62 0 V ! 33 -306 R ! 0 650 V ! 4120 701 M 62 0 V ! -62 650 R 62 0 V ! 33 -192 R ! 0 215 V ! -31 -215 R 62 0 V ! -62 215 R 62 0 V ! 33 180 R ! 0 -377 V ! -31 377 R 62 0 V ! -62 -377 R 62 0 V ! 33 656 R ! 0 -464 V ! -31 464 R 62 0 V ! -62 -464 R 62 0 V ! 33 603 R ! 0 -211 V ! -31 211 R 62 0 V ! -62 -211 R 62 0 V ! 33 371 R ! 0 -225 V ! -31 225 R 62 0 V ! -62 -225 R 62 0 V ! 33 402 R ! 0 63 V ! -31 -63 R 62 0 V ! -62 63 R 62 0 V ! 32 239 R ! 0 -19 V ! -31 19 R 62 0 V ! -62 -19 R 62 0 V ! 33 191 R ! 0 -207 V ! -31 207 R 62 0 V ! -62 -207 R 62 0 V ! 33 280 R ! 0 232 V ! -31 -232 R 62 0 V ! -62 232 R 62 0 V ! 33 227 R ! 0 171 V ! -31 -171 R 62 0 V ! -62 171 R 62 0 V ! 33 -148 R ! 0 602 V ! -31 -602 R 62 0 V ! -62 602 R 62 0 V ! 33 -613 R ! 0 -71 V ! -31 71 R 62 0 V ! -62 -71 R 62 0 V ! 33 735 R ! 0 -302 V ! -31 302 R 62 0 V ! -62 -302 R 62 0 V ! 33 631 R ! 0 -378 V ! -31 378 R 62 0 V ! -62 -378 R 62 0 V ! 32 92 R ! 0 165 V ! -31 -165 R 62 0 V ! -62 165 R 62 0 V ! 33 22 R ! 0 441 V ! -31 -441 R ! 5204 4221 L ! -62 441 R 62 0 V ! 33 -104 R ! 0 87 V ! -31 -87 R 62 0 V ! -62 87 R 62 0 V ! 33 -145 R ! 0 -119 V ! -31 119 R 62 0 V ! -62 -119 R 62 0 V ! 33 485 R ! 0 -374 V ! -31 374 R 62 0 V ! -62 -374 R 62 0 V ! 33 380 R ! 0 -118 V ! -31 118 R 62 0 V ! -62 -118 R 62 0 V ! 33 118 R ! 0 -53 V ! -31 53 R 62 0 V ! -62 -53 R 62 0 V ! 33 -167 R ! 0 -15 V ! -31 15 R 62 0 V ! -62 -15 R ! 62 0 V ! 33 183 R ! 0 52 V ! -31 -52 R ! 62 0 V ! -62 52 R ! 62 0 V ! 32 0 R ! 0 -15 V ! -31 15 R ! 62 0 V ! -62 -15 R ! 62 0 V ! 33 -112 R ! 0 23 V ! -31 -23 R 62 0 V ! -62 23 R 62 0 V ! 33 104 R ! 0 -591 V ! -31 591 R 62 0 V ! -62 -591 R 62 0 V ! 33 415 R ! 0 -11 V ! -31 11 R 62 0 V ! -62 -11 R 62 0 V ! 33 -414 R ! 0 244 V ! -31 -244 R 62 0 V ! -62 244 R 62 0 V ! 33 -400 R ! 0 -57 V ! -31 57 R 62 0 V ! -62 -57 R 62 0 V ! 33 -226 R ! 0 -191 V ! -31 191 R 62 0 V ! -62 -191 R 62 0 V ! 33 914 R ! 0 -292 V ! -31 292 R 62 0 V ! -62 -292 R 62 0 V ! 32 -603 R ! 0 -20 V ! -31 20 R 62 0 V ! -62 -20 R 62 0 V ! 33 -80 R ! 0 -46 V ! -31 46 R 62 0 V ! -62 -46 R 62 0 V ! 33 374 R ! 6323 3643 L ! -31 245 R 62 0 V ! -62 -245 R 62 0 V ! 33 -222 R ! 0 30 V ! -31 -30 R 62 0 V ! -62 30 R 62 0 V ! 33 -309 R ! 0 -90 V ! -31 90 R 62 0 V ! -62 -90 R 62 0 V ! 33 -168 R ! 0 -1 V ! -31 1 R 62 0 V ! -62 -1 R 62 0 V ! 33 67 R ! 0 -666 V ! -31 666 R 62 0 V ! -62 -666 R 62 0 V ! 33 303 R ! 0 -478 V ! -31 478 R 62 0 V ! -62 -478 R 62 0 V ! 32 76 R ! 0 -13 V ! -31 13 R 62 0 V ! -62 -13 R 62 0 V ! 33 -290 R ! 0 -204 V ! -31 204 R 62 0 V ! -62 -204 R 62 0 V ! 33 235 R ! 0 144 V ! -31 -144 R 62 0 V ! -62 144 R 62 0 V ! 33 -622 R ! 0 367 V ! -31 -367 R 62 0 V ! -62 367 R 62 0 V ! 33 -519 R ! 0 31 V ! -31 -31 R 62 0 V ! -62 31 R 62 0 V 574 2576 Pls 638 2805 Pls --- 582,1156 ---- 1.000 UP 1.000 UL LT0 ! 574 2223 M ! 0 118 V ! 543 2223 M 62 0 V ! -62 118 R 62 0 V ! 33 517 R ! 0 250 V ! 607 2858 M 62 0 V ! -62 250 R 62 0 V ! 33 -40 R ! 0 195 V ! 671 3068 M 62 0 V ! -62 195 R 62 0 V ! 33 -228 R ! 0 25 V ! -31 -25 R 62 0 V ! -62 25 R 62 0 V ! 33 653 R ! 0 -335 V ! -31 335 R 62 0 V ! 799 3378 M 62 0 V ! 32 672 R ! 0 -396 V ! -31 396 R 62 0 V ! 862 3654 M 62 0 V ! 33 220 R ! 0 55 V ! -31 -55 R 62 0 V ! -62 55 R 62 0 V ! 33 85 R ! 0 209 V ! 990 4014 M 62 0 V ! -62 209 R 62 0 V ! 33 -391 R ! 0 239 V ! -31 -239 R 62 0 V ! -62 239 R 62 0 V ! 33 237 R ! 0 84 V ! -31 -84 R 62 0 V ! -62 84 R 62 0 V ! 33 47 R ! 0 -254 V ! -31 254 R 62 0 V ! -62 -254 R 62 0 V ! 33 233 R ! 0 -277 V ! -31 277 R 62 0 V ! -62 -277 R 62 0 V ! 33 387 R ! 0 -23 V ! -31 23 R 62 0 V ! -62 -23 R 62 0 V ! 32 131 R ! 0 -140 V ! -31 140 R 62 0 V ! -62 -140 R 62 0 V ! 33 367 R ! 0 -36 V ! -31 36 R 62 0 V ! -62 -36 R 62 0 V ! 33 -21 R ! 0 66 V ! -31 -66 R 62 0 V ! -62 66 R 62 0 V ! 33 0 R ! 0 -202 V ! -31 202 R 62 0 V ! -62 -202 R 62 0 V ! 33 202 R ! 0 -53 V ! -31 53 R ! 1691 4872 L ! -62 -53 R 62 0 V ! 33 53 R ! 0 -92 V ! -31 92 R 62 0 V ! -62 -92 R 62 0 V ! 33 41 R ! 0 -326 V ! -31 326 R 62 0 V ! -62 -326 R 62 0 V ! 33 308 R ! 0 -198 V ! -31 198 R 62 0 V ! -62 -198 R 62 0 V ! 32 82 R ! 0 29 V ! -31 -29 R 62 0 V ! -62 29 R 62 0 V ! 33 -215 R ! 0 51 V ! -31 -51 R 62 0 V ! -62 51 R 62 0 V ! 33 320 R ! 0 -534 V ! -31 534 R 62 0 V ! -62 -534 R 62 0 V ! 33 -279 R ! 0 -93 V ! -31 93 R 62 0 V ! -62 -93 R 62 0 V ! 33 63 R ! 0 -136 V ! -31 136 R 62 0 V ! -62 -136 R 62 0 V ! 33 -190 R ! 0 -398 V ! -31 398 R 62 0 V ! -62 -398 R 62 0 V ! 33 135 R ! 0 -64 V ! -31 64 R 62 0 V ! -62 -64 R 62 0 V ! 33 -79 R ! 0 -242 V ! -31 242 R 62 0 V ! -62 -242 R 62 0 V ! 33 -37 R ! 0 72 V ! -31 -72 R 62 0 V ! -62 72 R 62 0 V ! 32 22 R ! 0 -235 V ! -31 235 R 62 0 V ! -62 -235 R 62 0 V ! 33 -424 R ! 0 164 V ! -31 -164 R 62 0 V ! -62 164 R 62 0 V ! 33 152 R ! 0 -612 V ! -31 612 R 62 0 V ! -62 -612 R 62 0 V ! 33 370 R ! 0 -251 V ! -31 251 R 62 0 V ! -62 -251 R 62 0 V ! 33 215 R ! 0 -699 V ! -31 699 R 62 0 V ! -62 -699 R 62 0 V ! 33 -25 R ! 2810 1825 L ! -31 -58 R 62 0 V ! -62 58 R 62 0 V ! 33 -427 R ! 0 121 V ! -31 -121 R 62 0 V ! -62 121 R 62 0 V ! 33 -272 R ! 0 309 V ! -31 -309 R 62 0 V ! -62 309 R 62 0 V ! 32 -264 R ! 0 -24 V ! -31 24 R 62 0 V ! -62 -24 R 62 0 V ! 33 -573 R ! 0 706 V ! 3034 695 M 62 0 V ! -62 706 R 62 0 V ! 33 -728 R ! 0 375 V ! 3098 673 M 62 0 V ! -62 375 R 62 0 V ! 33 -521 R ! 0 692 V ! 3162 527 M 62 0 V ! -62 692 R 62 0 V ! 97 -452 R ! 0 -118 V ! -31 118 R 62 0 V ! 3290 649 M 62 0 V ! 33 125 R ! 0 -355 V ! -31 355 R 62 0 V ! 3354 419 M 62 0 V ! 160 -26 R ! 0 -113 V ! -31 113 R 62 0 V ! 3545 280 M 62 0 V ! 97 89 R ! 0 -75 V ! -31 75 R 62 0 V ! -62 -75 R 62 0 V ! 33 -14 R ! 0 177 V ! 3737 280 M 62 0 V ! -62 177 R 62 0 V ! 33 -59 R ! 0 -118 V ! -31 118 R 62 0 V 3801 280 M 62 0 V ! 33 211 R ! 0 69 V ! -31 -69 R 62 0 V ! -62 69 R 62 0 V ! 33 142 R ! 0 337 V ! 3929 702 M 62 0 V ! -62 337 R 62 0 V ! 33 -47 R ! 0 -209 V ! -31 209 R 62 0 V ! 3993 783 M 62 0 V ! 32 201 R ! 0 124 V ! 4056 984 M 62 0 V ! -62 124 R 62 0 V ! 33 277 R ! 0 -543 V ! -31 543 R 62 0 V ! 4120 842 M ! 4182 842 L ! 33 498 R ! 0 135 V ! -31 -135 R 62 0 V ! -62 135 R 62 0 V ! 33 -103 R ! 0 -10 V ! -31 10 R 62 0 V ! -62 -10 R 62 0 V ! 33 237 R ! 0 468 V ! -31 -468 R 62 0 V ! -62 468 R 62 0 V ! 33 -139 R ! 0 -298 V ! -31 298 R 62 0 V ! -62 -298 R 62 0 V ! 33 571 R ! 0 200 V ! -31 -200 R 62 0 V ! -62 200 R 62 0 V ! 33 -83 R ! 0 241 V ! -31 -241 R 62 0 V ! -62 241 R 62 0 V ! 32 136 R ! 0 -265 V ! -31 265 R 62 0 V ! -62 -265 R 62 0 V ! 33 935 R ! 0 -702 V ! -31 702 R 62 0 V ! -62 -702 R 62 0 V ! 33 402 R ! 0 515 V ! -31 -515 R 62 0 V ! -62 515 R 62 0 V ! 33 -143 R ! 0 133 V ! -31 -133 R 62 0 V ! -62 133 R 62 0 V ! 33 36 R ! 0 -467 V ! -31 467 R 62 0 V ! -62 -467 R 62 0 V ! 33 780 R ! 0 -46 V ! -31 46 R 62 0 V ! -62 -46 R 62 0 V ! 33 -5 R ! 0 -193 V ! -31 193 R 62 0 V ! -62 -193 R 62 0 V ! 33 721 R ! 0 -130 V ! -31 130 R 62 0 V ! -62 -130 R 62 0 V ! 32 162 R ! 0 -47 V ! -31 47 R 62 0 V ! -62 -47 R 62 0 V ! 33 223 R ! 0 -565 V ! -31 565 R 62 0 V ! -62 -565 R 62 0 V ! 33 14 R ! 0 296 V ! -31 -296 R 62 0 V ! -62 296 R 62 0 V ! 33 129 R ! 0 37 V ! -31 -37 R ! 5332 4478 L ! -62 37 R 62 0 V ! 33 243 R ! 0 100 V ! -31 -100 R 62 0 V ! -62 100 R 62 0 V ! 33 -294 R ! 0 111 V ! -31 -111 R 62 0 V ! -62 111 R 62 0 V ! 161 197 R ! 0 -128 V ! -31 128 R 62 0 V ! -62 -128 R 62 0 V ! 32 54 R ! 0 -91 V ! -31 91 R 62 0 V ! -62 -91 R 62 0 V ! 33 -261 R ! 0 426 V ! -31 -426 R 62 0 V ! -62 426 R 62 0 V ! 33 -218 R ! 0 -158 V ! -31 158 R 62 0 V ! -62 -158 R 62 0 V ! 33 -32 R ! 0 228 V ! -31 -228 R 62 0 V ! -62 228 R 62 0 V ! 33 -238 R ! 0 -130 V ! -31 130 R 62 0 V ! -62 -130 R 62 0 V ! 33 365 R ! 0 27 V ! -31 -27 R 62 0 V ! -62 27 R 62 0 V ! 33 -299 R ! 0 -328 V ! -31 328 R 62 0 V ! -62 -328 R 62 0 V ! 33 293 R ! 0 -688 V ! -31 688 R 62 0 V ! -62 -688 R 62 0 V ! 32 220 R ! 0 -10 V ! -31 10 R 62 0 V ! -62 -10 R 62 0 V ! 33 -226 R ! 0 81 V ! -31 -81 R 62 0 V ! -62 81 R 62 0 V ! 33 -815 R ! 0 607 V ! -31 -607 R 62 0 V ! -62 607 R 62 0 V ! 33 -110 R ! 0 -274 V ! -31 274 R 62 0 V ! -62 -274 R 62 0 V ! 33 -98 R ! 0 97 V ! -31 -97 R 62 0 V ! -62 97 R 62 0 V ! 33 -169 R ! 0 -190 V ! -31 190 R 62 0 V ! -62 -190 R 62 0 V ! 33 -239 R ! 6579 2483 L ! -31 85 R 62 0 V ! -62 -85 R 62 0 V ! 33 150 R ! 0 -189 V ! -31 189 R 62 0 V ! -62 -189 R 62 0 V ! 32 -520 R ! 0 469 V ! -31 -469 R 62 0 V ! -62 469 R 62 0 V ! 33 142 R ! 0 -651 V ! -31 651 R 62 0 V ! -62 -651 R 62 0 V ! 33 -403 R ! 0 148 V ! -31 -148 R 62 0 V ! -62 148 R 62 0 V ! 33 -524 R ! 0 576 V ! -31 -576 R 62 0 V ! -62 576 R 62 0 V ! 33 -535 R ! 0 -93 V ! -31 93 R 62 0 V ! -62 -93 R 62 0 V 574 2576 Pls 638 2805 Pls *************** *** 1241,1358 **** 6962 1327 Pls 1.000 UL LTb - 574 280 M - 63 0 V - 6325 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 490 280 M - [ [(Helvetica) 140.0 0.0 true true 0 (-1)] - ] -46.7 MRshow - 1.000 UL - LTb - 574 1428 M - 63 0 V - 6325 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 490 1428 M - [ [(Helvetica) 140.0 0.0 true true 0 (-0.5)] - ] -46.7 MRshow - 1.000 UL - LTb - 574 2576 M - 63 0 V - 6325 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 490 2576 M - [ [(Helvetica) 140.0 0.0 true true 0 (0)] - ] -46.7 MRshow - 1.000 UL - LTb - 574 3724 M - 63 0 V - 6325 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 490 3724 M - [ [(Helvetica) 140.0 0.0 true true 0 (0.5)] - ] -46.7 MRshow - 1.000 UL - LTb - 574 4872 M - 63 0 V - 6325 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 490 4872 M - [ [(Helvetica) 140.0 0.0 true true 0 (1)] - ] -46.7 MRshow - 1.000 UL - LTb - 574 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 574 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (0)] - ] -46.7 MCshow - 1.000 UL - LTb - 1852 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 1852 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (2)] - ] -46.7 MCshow - 1.000 UL - LTb - 3129 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 3129 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (4)] - ] -46.7 MCshow - 1.000 UL - LTb - 4407 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 4407 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (6)] - ] -46.7 MCshow - 1.000 UL - LTb - 5684 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 5684 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (8)] - ] -46.7 MCshow - 1.000 UL - LTb - 6962 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 6962 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (10)] - ] -46.7 MCshow - 1.000 UL - LTb - 1.000 UL - LTb 574 4872 N 574 280 L 6388 0 V --- 1255,1260 ---- Binary files octave-2.9.19/doc/interpreter/errorbar.pdf and octave-3.0.0/doc/interpreter/errorbar.pdf differ Binary files octave-2.9.19/doc/interpreter/errorbar.png and octave-3.0.0/doc/interpreter/errorbar.png differ diff -cNr octave-2.9.19/doc/interpreter/extended.eps octave-3.0.0/doc/interpreter/extended.eps *** octave-2.9.19/doc/interpreter/extended.eps Tue Dec 11 18:05:40 2007 --- octave-3.0.0/doc/interpreter/extended.eps Thu Dec 20 16:13:25 2007 *************** *** 1,7 **** %!PS-Adobe-2.0 EPSF-2.0 %%Title: extended.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Tue Dec 11 18:05:40 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments --- 1,7 ---- %!PS-Adobe-2.0 EPSF-2.0 %%Title: extended.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Thu Dec 20 16:13:25 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments *************** *** 48,54 **** /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Tue Dec 11 18:05:40 2007) /DOCINFO pdfmark end } ifelse --- 48,54 ---- /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Thu Dec 20 16:13:25 2007) /DOCINFO pdfmark end } ifelse *************** *** 532,537 **** --- 532,669 ---- } ifelse 1.000 UL LTb + 490 280 M + 63 0 V + 6409 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 406 280 M + [ [(Helvetica) 140.0 0.0 true true 0 (0)] + ] -46.7 MRshow + 1.000 UL + LTb + 490 1198 M + 63 0 V + 6409 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 406 1198 M + [ [(Helvetica) 140.0 0.0 true true 0 (0.2)] + ] -46.7 MRshow + 1.000 UL + LTb + 490 2117 M + 63 0 V + 6409 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 406 2117 M + [ [(Helvetica) 140.0 0.0 true true 0 (0.4)] + ] -46.7 MRshow + 1.000 UL + LTb + 490 3035 M + 63 0 V + 6409 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 406 3035 M + [ [(Helvetica) 140.0 0.0 true true 0 (0.6)] + ] -46.7 MRshow + 1.000 UL + LTb + 490 3954 M + 63 0 V + 6409 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 406 3954 M + [ [(Helvetica) 140.0 0.0 true true 0 (0.8)] + ] -46.7 MRshow + 1.000 UL + LTb + 490 4872 M + 63 0 V + 6409 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 406 4872 M + [ [(Helvetica) 140.0 0.0 true true 0 (1)] + ] -46.7 MRshow + 1.000 UL + LTb + 490 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 490 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (0)] + ] -46.7 MCshow + 1.000 UL + LTb + 1569 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 1569 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (0.5)] + ] -46.7 MCshow + 1.000 UL + LTb + 2647 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 2647 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (1)] + ] -46.7 MCshow + 1.000 UL + LTb + 3726 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 3726 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (1.5)] + ] -46.7 MCshow + 1.000 UL + LTb + 4805 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 4805 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (2)] + ] -46.7 MCshow + 1.000 UL + LTb + 5883 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 5883 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (2.5)] + ] -46.7 MCshow + 1.000 UL + LTb + 6962 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 6962 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (3)] + ] -46.7 MCshow + 1.000 UL + LTb + 1.000 UL + LTb 490 4872 N 490 280 L 6472 0 V *************** *** 950,1087 **** stroke 1.000 UL LTb - 490 280 M - 63 0 V - 6409 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 406 280 M - [ [(Helvetica) 140.0 0.0 true true 0 (0)] - ] -46.7 MRshow - 1.000 UL - LTb - 490 1198 M - 63 0 V - 6409 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 406 1198 M - [ [(Helvetica) 140.0 0.0 true true 0 (0.2)] - ] -46.7 MRshow - 1.000 UL - LTb - 490 2117 M - 63 0 V - 6409 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 406 2117 M - [ [(Helvetica) 140.0 0.0 true true 0 (0.4)] - ] -46.7 MRshow - 1.000 UL - LTb - 490 3035 M - 63 0 V - 6409 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 406 3035 M - [ [(Helvetica) 140.0 0.0 true true 0 (0.6)] - ] -46.7 MRshow - 1.000 UL - LTb - 490 3954 M - 63 0 V - 6409 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 406 3954 M - [ [(Helvetica) 140.0 0.0 true true 0 (0.8)] - ] -46.7 MRshow - 1.000 UL - LTb - 490 4872 M - 63 0 V - 6409 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 406 4872 M - [ [(Helvetica) 140.0 0.0 true true 0 (1)] - ] -46.7 MRshow - 1.000 UL - LTb - 490 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 490 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (0)] - ] -46.7 MCshow - 1.000 UL - LTb - 1569 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 1569 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (0.5)] - ] -46.7 MCshow - 1.000 UL - LTb - 2647 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 2647 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (1)] - ] -46.7 MCshow - 1.000 UL - LTb - 3726 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 3726 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (1.5)] - ] -46.7 MCshow - 1.000 UL - LTb - 4805 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 4805 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (2)] - ] -46.7 MCshow - 1.000 UL - LTb - 5883 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 5883 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (2.5)] - ] -46.7 MCshow - 1.000 UL - LTb - 6962 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 6962 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (3)] - ] -46.7 MCshow - 1.000 UL - LTb - 1.000 UL - LTb 490 4872 N 490 280 L 6472 0 V --- 1082,1087 ---- Binary files octave-2.9.19/doc/interpreter/extended.pdf and octave-3.0.0/doc/interpreter/extended.pdf differ Binary files octave-2.9.19/doc/interpreter/extended.png and octave-3.0.0/doc/interpreter/extended.png differ diff -cNr octave-2.9.19/doc/interpreter/gplot.eps octave-3.0.0/doc/interpreter/gplot.eps *** octave-2.9.19/doc/interpreter/gplot.eps Tue Dec 11 18:05:09 2007 --- octave-3.0.0/doc/interpreter/gplot.eps Thu Dec 20 16:12:53 2007 *************** *** 1,7 **** %!PS-Adobe-2.0 EPSF-2.0 %%Title: gplot.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Tue Dec 11 18:05:09 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments --- 1,7 ---- %!PS-Adobe-2.0 EPSF-2.0 %%Title: gplot.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Thu Dec 20 16:12:53 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments *************** *** 48,54 **** /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Tue Dec 11 18:05:09 2007) /DOCINFO pdfmark end } ifelse --- 48,54 ---- /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Thu Dec 20 16:12:53 2007) /DOCINFO pdfmark end } ifelse *************** *** 532,571 **** } ifelse 1.000 UL LTb - 322 4872 N - 322 280 L - 6640 0 V - 0 4592 V - -6640 0 V - Z stroke - 1.000 UP - 1.000 UL - LTb - 0.500 UL - LT0 - 0.00 0.00 1.00 C 3642 280 M - 322 3560 L - 1982 4872 M - 322 3560 L - 3642 280 L - 6962 3560 M - 3642 280 L - 6962 3560 L - 5302 4872 M - 6962 3560 L - 5302 4872 L - 3642 3560 M - 5302 4872 L - 3642 3560 L - 1982 4872 M - 3642 3560 L - -3320 0 R - 1982 4872 L - 3642 3560 M - 1982 4872 L - stroke - 1.000 UL - LTb 322 280 M 63 0 V 6577 0 R --- 532,537 ---- *************** *** 747,752 **** --- 713,752 ---- 1.000 UP 1.000 UL LTb + 0.500 UL + LT0 + 0.00 0.00 1.00 C 3642 280 M + 322 3560 L + 1982 4872 M + 322 3560 L + 3642 280 L + 6962 3560 M + 3642 280 L + 6962 3560 L + 5302 4872 M + 6962 3560 L + 5302 4872 L + 3642 3560 M + 5302 4872 L + 3642 3560 L + 1982 4872 M + 3642 3560 L + -3320 0 R + 1982 4872 L + 3642 3560 M + 1982 4872 L + stroke + 1.000 UL + LTb + 322 4872 N + 322 280 L + 6640 0 V + 0 4592 V + -6640 0 V + Z stroke + 1.000 UP + 1.000 UL + LTb stroke grestore end Binary files octave-2.9.19/doc/interpreter/gplot.pdf and octave-3.0.0/doc/interpreter/gplot.pdf differ diff -cNr octave-2.9.19/doc/interpreter/grid.eps octave-3.0.0/doc/interpreter/grid.eps *** octave-2.9.19/doc/interpreter/grid.eps Tue Dec 11 18:05:13 2007 --- octave-3.0.0/doc/interpreter/grid.eps Thu Dec 20 16:12:55 2007 *************** *** 1,7 **** %!PS-Adobe-2.0 EPSF-2.0 %%Title: grid.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Tue Dec 11 18:05:13 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments --- 1,7 ---- %!PS-Adobe-2.0 EPSF-2.0 %%Title: grid.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Thu Dec 20 16:12:55 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments *************** *** 48,54 **** /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Tue Dec 11 18:05:13 2007) /DOCINFO pdfmark end } ifelse --- 48,54 ---- /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Thu Dec 20 16:12:55 2007) /DOCINFO pdfmark end } ifelse *************** *** 1809,1816 **** LT0 0.00 0.00 1.00 C 5161 3592 M 4971 3386 L - %pm3d_map_begin - %pm3d_map_end stroke LT0 0.00 0.00 1.00 C 1.000 UL --- 1809,1814 ---- Binary files octave-2.9.19/doc/interpreter/grid.pdf and octave-3.0.0/doc/interpreter/grid.pdf differ diff -cNr octave-2.9.19/doc/interpreter/griddata.eps octave-3.0.0/doc/interpreter/griddata.eps *** octave-2.9.19/doc/interpreter/griddata.eps Tue Dec 11 18:05:28 2007 --- octave-3.0.0/doc/interpreter/griddata.eps Thu Dec 20 16:13:10 2007 *************** *** 1,7 **** %!PS-Adobe-2.0 EPSF-2.0 %%Title: griddata.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Tue Dec 11 18:05:28 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments --- 1,7 ---- %!PS-Adobe-2.0 EPSF-2.0 %%Title: griddata.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Thu Dec 20 16:13:10 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments *************** *** 48,54 **** /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Tue Dec 11 18:05:28 2007) /DOCINFO pdfmark end } ifelse --- 48,54 ---- /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Thu Dec 20 16:13:10 2007) /DOCINFO pdfmark end } ifelse Binary files octave-2.9.19/doc/interpreter/griddata.pdf and octave-3.0.0/doc/interpreter/griddata.pdf differ diff -cNr octave-2.9.19/doc/interpreter/hist.eps octave-3.0.0/doc/interpreter/hist.eps *** octave-2.9.19/doc/interpreter/hist.eps Tue Dec 11 18:05:34 2007 --- octave-3.0.0/doc/interpreter/hist.eps Thu Dec 20 16:13:18 2007 *************** *** 1,7 **** %!PS-Adobe-2.0 EPSF-2.0 %%Title: hist.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Tue Dec 11 18:05:34 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments --- 1,7 ---- %!PS-Adobe-2.0 EPSF-2.0 %%Title: hist.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Thu Dec 20 16:13:18 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments *************** *** 48,54 **** /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Tue Dec 11 18:05:34 2007) /DOCINFO pdfmark end } ifelse --- 48,54 ---- /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Thu Dec 20 16:13:18 2007) /DOCINFO pdfmark end } ifelse *************** *** 532,1145 **** } ifelse 1.000 UL LTb ! 490 4872 N ! 490 280 L ! 6472 0 V 0 4592 V ! -6472 0 V Z stroke 1.000 UP 1.000 UL LTb 1.000 UL LT0 ! 0.00 0.00 0.50 C gsave 577 280 N 0 0 V 0 5 V 211 0 V 0 -5 V 1 PolyFill ! 577 280 M ! 0 5 V 211 0 V ! 0 -5 V stroke ! LT1 ! 0.00 0.00 0.00 C 577 280 M ! 0 5 V 211 0 V ! 0 -5 V -211 0 V stroke LT2 ! 0.00 0.00 0.50 C gsave 788 280 N 0 0 V 0 30 V 210 0 V 0 -30 V 1 PolyFill ! 788 280 M ! 0 30 V ! 210 0 V ! 0 -30 V stroke ! LT3 ! 0.00 0.00 0.00 C 788 280 M ! 0 30 V ! 210 0 V ! 0 -30 V ! -210 0 V stroke LT4 ! 0.00 0.00 0.50 C gsave 998 280 N 0 0 V 0 71 V 210 0 V 0 -71 V 1 PolyFill ! 998 280 M ! 0 71 V 210 0 V - 0 -71 V stroke ! LT5 ! 0.00 0.00 0.00 C 998 280 M ! 0 71 V 210 0 V - 0 -71 V -210 0 V stroke LT6 ! 0.00 0.00 0.50 C gsave 1208 280 N 0 0 V 0 126 V 210 0 V 0 -126 V 1 PolyFill ! 1208 280 M ! 0 126 V ! 210 0 V ! 0 -126 V stroke ! LT7 ! 0.00 0.00 0.00 C 1208 280 M ! 0 126 V ! 210 0 V ! 0 -126 V ! -210 0 V stroke LT8 ! 0.00 0.00 0.50 C gsave 1418 280 N 0 0 V 0 192 V 210 0 V 0 -192 V 1 PolyFill ! 1418 280 M ! 0 192 V ! 210 0 V ! 0 -192 V stroke LT0 ! 0.00 0.00 0.00 C 1418 280 M ! 0 192 V ! 210 0 V ! 0 -192 V ! -210 0 V stroke LT1 ! 0.00 0.00 0.50 C gsave 1628 280 N 0 0 V 0 338 V 210 0 V 0 -338 V 1 PolyFill ! 1628 280 M ! 0 338 V ! 210 0 V ! 0 -338 V stroke ! LT2 ! 0.00 0.00 0.00 C 1628 280 M ! 0 338 V ! 210 0 V ! 0 -338 V ! -210 0 V stroke LT3 ! 0.00 0.00 0.50 C gsave 1838 280 N 0 0 V 0 575 V 211 0 V 0 -575 V 1 PolyFill ! 1838 280 M ! 0 575 V 211 0 V ! 0 -575 V stroke ! LT4 ! 0.00 0.00 0.00 C 1838 280 M ! 0 575 V 211 0 V ! 0 -575 V -211 0 V stroke LT5 ! 0.00 0.00 0.50 C gsave 2049 280 N 0 0 V 0 944 V 210 0 V 0 -944 V 1 PolyFill ! 2049 280 M ! 0 944 V ! 210 0 V ! 0 -944 V stroke ! LT6 ! 0.00 0.00 0.00 C 2049 280 M ! 0 944 V ! 210 0 V ! 0 -944 V ! -210 0 V stroke LT7 ! 0.00 0.00 0.50 C gsave 2259 280 N 0 0 V 0 1347 V 210 0 V 0 -1347 V 1 PolyFill ! 2259 280 M ! 0 1347 V ! 210 0 V ! 0 -1347 V stroke ! LT8 ! 0.00 0.00 0.00 C 2259 280 M ! 0 1347 V ! 210 0 V ! 0 -1347 V ! -210 0 V stroke LT0 ! 0.00 0.00 0.50 C gsave 2469 280 N 0 0 V 0 1822 V 210 0 V 0 -1822 V 1 PolyFill ! 2469 280 M ! 0 1822 V ! 210 0 V ! 0 -1822 V stroke ! LT1 ! 0.00 0.00 0.00 C 2469 280 M ! 0 1822 V ! 210 0 V ! 0 -1822 V ! -210 0 V stroke LT2 ! 0.00 0.00 0.50 C gsave 2679 280 N 0 0 V 0 2417 V 210 0 V 0 -2417 V 1 PolyFill ! 2679 280 M ! 0 2417 V 210 0 V ! 0 -2417 V stroke ! LT3 ! 0.00 0.00 0.00 C 2679 280 M ! 0 2417 V 210 0 V ! 0 -2417 V -210 0 V stroke LT4 ! 0.00 0.00 0.50 C gsave 2889 280 N 0 0 V 0 3018 V 210 0 V 0 -3018 V 1 PolyFill ! 2889 280 M ! 0 3018 V ! 210 0 V ! 0 -3018 V stroke ! LT5 ! 0.00 0.00 0.00 C 2889 280 M ! 0 3018 V ! 210 0 V ! 0 -3018 V ! -210 0 V stroke LT6 ! 0.00 0.00 0.50 C gsave 3099 280 N 0 0 V 0 3436 V 210 0 V 0 -3436 V 1 PolyFill ! 3099 280 M ! 0 3436 V ! 210 0 V ! 0 -3436 V stroke ! LT7 ! 0.00 0.00 0.00 C 3099 280 M ! 0 3436 V ! 210 0 V ! 0 -3436 V ! -210 0 V stroke LT8 ! 0.00 0.00 0.50 C gsave 3309 280 N 0 0 V 0 4405 V 211 0 V 0 -4405 V 1 PolyFill ! 3309 280 M ! 0 4405 V 211 0 V ! 0 -4405 V stroke LT0 ! 0.00 0.00 0.00 C 3309 280 M ! 0 4405 V 211 0 V ! 0 -4405 V -211 0 V stroke LT1 ! 0.00 0.00 0.50 C gsave 3520 280 N 0 0 V 0 4410 V 210 0 V 0 -4410 V 1 PolyFill ! 3520 280 M ! 0 4410 V ! 210 0 V ! 0 -4410 V stroke ! LT2 ! 0.00 0.00 0.00 C 3520 280 M ! 0 4410 V ! 210 0 V ! 0 -4410 V ! -210 0 V stroke LT3 ! 0.00 0.00 0.50 C gsave 3730 280 N 0 0 V 0 4496 V 210 0 V 0 -4496 V 1 PolyFill ! 3730 280 M ! 0 4496 V ! 210 0 V ! 0 -4496 V stroke ! LT4 ! 0.00 0.00 0.00 C 3730 280 M ! 0 4496 V ! 210 0 V ! 0 -4496 V ! -210 0 V stroke LT5 ! 0.00 0.00 0.50 C gsave 3940 280 N 0 0 V 0 4547 V 210 0 V 0 -4547 V 1 PolyFill ! 3940 280 M ! 0 4547 V ! 210 0 V ! 0 -4547 V stroke ! LT6 ! 0.00 0.00 0.00 C 3940 280 M ! 0 4547 V ! 210 0 V ! 0 -4547 V ! -210 0 V stroke LT7 ! 0.00 0.00 0.50 C gsave 4150 280 N 0 0 V 0 4284 V 210 0 V 0 -4284 V 1 PolyFill ! 4150 280 M ! 0 4284 V ! 210 0 V ! 0 -4284 V stroke ! LT8 ! 0.00 0.00 0.00 C 4150 280 M ! 0 4284 V ! 210 0 V ! 0 -4284 V ! -210 0 V stroke LT0 ! 0.00 0.00 0.50 C gsave 4360 280 N 0 0 V 0 3608 V 210 0 V 0 -3608 V 1 PolyFill ! 4360 280 M ! 0 3608 V 210 0 V ! 0 -3608 V stroke ! LT1 ! 0.00 0.00 0.00 C 4360 280 M ! 0 3608 V 210 0 V ! 0 -3608 V -210 0 V stroke LT2 ! 0.00 0.00 0.50 C gsave 4570 280 N 0 0 V 0 3013 V 211 0 V 0 -3013 V 1 PolyFill ! 4570 280 M ! 0 3013 V 211 0 V ! 0 -3013 V stroke ! LT3 ! 0.00 0.00 0.00 C 4570 280 M ! 0 3013 V 211 0 V ! 0 -3013 V -211 0 V stroke LT4 ! 0.00 0.00 0.50 C gsave 4781 280 N 0 0 V 0 2432 V 210 0 V 0 -2432 V 1 PolyFill ! 4781 280 M ! 0 2432 V ! 210 0 V ! 0 -2432 V stroke ! LT5 ! 0.00 0.00 0.00 C 4781 280 M ! 0 2432 V ! 210 0 V ! 0 -2432 V ! -210 0 V stroke LT6 ! 0.00 0.00 0.50 C gsave 4991 280 N 0 0 V 0 1685 V 210 0 V 0 -1685 V 1 PolyFill ! 4991 280 M ! 0 1685 V ! 210 0 V ! 0 -1685 V stroke ! LT7 ! 0.00 0.00 0.00 C 4991 280 M ! 0 1685 V ! 210 0 V ! 0 -1685 V ! -210 0 V stroke LT8 ! 0.00 0.00 0.50 C gsave 5201 280 N 0 0 V 0 1272 V 210 0 V 0 -1272 V 1 PolyFill ! 5201 280 M ! 0 1272 V ! 210 0 V ! 0 -1272 V stroke LT0 ! 0.00 0.00 0.00 C 5201 280 M ! 0 1272 V ! 210 0 V ! 0 -1272 V ! -210 0 V stroke LT1 ! 0.00 0.00 0.50 C gsave 5411 280 N 0 0 V 0 833 V 210 0 V 0 -833 V 1 PolyFill ! 5411 280 M ! 0 833 V ! 210 0 V ! 0 -833 V stroke ! LT2 ! 0.00 0.00 0.00 C 5411 280 M ! 0 833 V ! 210 0 V ! 0 -833 V ! -210 0 V stroke LT3 ! 0.00 0.00 0.50 C gsave 5621 280 N 0 0 V 0 575 V 210 0 V 0 -575 V 1 PolyFill ! 5621 280 M ! 0 575 V ! 210 0 V ! 0 -575 V stroke ! LT4 ! 0.00 0.00 0.00 C 5621 280 M ! 0 575 V ! 210 0 V ! 0 -575 V ! -210 0 V stroke LT5 ! 0.00 0.00 0.50 C gsave 5831 280 N 0 0 V 0 298 V 210 0 V 0 -298 V 1 PolyFill ! 5831 280 M ! 0 298 V ! 210 0 V ! 0 -298 V ! stroke ! LT6 ! 0.00 0.00 0.00 C 5831 280 M ! 0 298 V ! 210 0 V ! 0 -298 V ! -210 0 V ! stroke ! LT7 ! 0.00 0.00 0.50 C gsave 6041 280 N 0 0 V 0 151 V 211 0 V 0 -151 V 1 PolyFill ! 6041 280 M ! 0 151 V 211 0 V ! 0 -151 V stroke ! LT8 ! 0.00 0.00 0.00 C 6041 280 M ! 0 151 V 211 0 V ! 0 -151 V -211 0 V stroke ! LT0 ! 0.00 0.00 0.50 C gsave 6252 280 N 0 0 V 0 86 V 210 0 V 0 -86 V 1 PolyFill ! 6252 280 M ! 0 86 V ! 210 0 V ! 0 -86 V ! stroke ! LT1 ! 0.00 0.00 0.00 C 6252 280 M ! 0 86 V ! 210 0 V ! 0 -86 V ! -210 0 V ! stroke ! LT2 ! 0.00 0.00 0.50 C gsave 6462 280 N 0 0 V 0 25 V 210 0 V 0 -25 V 1 PolyFill ! 6462 280 M ! 0 25 V ! 210 0 V ! 0 -25 V ! stroke ! LT3 ! 0.00 0.00 0.00 C 6462 280 M ! 0 25 V ! 210 0 V ! 0 -25 V ! -210 0 V ! stroke ! LT4 ! 0.00 0.00 0.50 C gsave 6672 280 N 0 0 V 0 20 V 210 0 V 0 -20 V 1 PolyFill ! 6672 280 M ! 0 20 V 210 0 V ! 0 -20 V stroke ! LT5 ! 0.00 0.00 0.00 C 6672 280 M ! 0 20 V 210 0 V ! 0 -20 V -210 0 V stroke ! LTb ! 490 280 M ! 63 0 V ! 6409 0 R ! -63 0 V ! stroke ! 0.00 0.00 0.00 C 406 280 M ! [ [(Helvetica) 140.0 0.0 true true 0 (0)] ! ] -46.7 MRshow ! 1.000 UL ! LTb ! 490 785 M ! 63 0 V ! 6409 0 R ! -63 0 V ! stroke ! 0.00 0.00 0.00 C 406 785 M ! [ [(Helvetica) 140.0 0.0 true true 0 (100)] ! ] -46.7 MRshow ! 1.000 UL ! LTb ! 490 1289 M ! 63 0 V ! 6409 0 R ! -63 0 V ! stroke ! 0.00 0.00 0.00 C 406 1289 M ! [ [(Helvetica) 140.0 0.0 true true 0 (200)] ! ] -46.7 MRshow ! 1.000 UL ! LTb ! 490 1794 M ! 63 0 V ! 6409 0 R ! -63 0 V ! stroke ! 0.00 0.00 0.00 C 406 1794 M ! [ [(Helvetica) 140.0 0.0 true true 0 (300)] ! ] -46.7 MRshow ! 1.000 UL ! LTb ! 490 2298 M ! 63 0 V ! 6409 0 R ! -63 0 V ! stroke ! 0.00 0.00 0.00 C 406 2298 M ! [ [(Helvetica) 140.0 0.0 true true 0 (400)] ! ] -46.7 MRshow ! 1.000 UL ! LTb ! 490 2803 M ! 63 0 V ! 6409 0 R ! -63 0 V ! stroke ! 0.00 0.00 0.00 C 406 2803 M ! [ [(Helvetica) 140.0 0.0 true true 0 (500)] ! ] -46.7 MRshow ! 1.000 UL ! LTb ! 490 3308 M ! 63 0 V ! 6409 0 R ! -63 0 V ! stroke ! 0.00 0.00 0.00 C 406 3308 M ! [ [(Helvetica) 140.0 0.0 true true 0 (600)] ! ] -46.7 MRshow ! 1.000 UL ! LTb ! 490 3812 M ! 63 0 V ! 6409 0 R ! -63 0 V ! stroke ! 0.00 0.00 0.00 C 406 3812 M ! [ [(Helvetica) 140.0 0.0 true true 0 (700)] ! ] -46.7 MRshow ! 1.000 UL ! LTb ! 490 4317 M ! 63 0 V ! 6409 0 R ! -63 0 V ! stroke ! 0.00 0.00 0.00 C 406 4317 M ! [ [(Helvetica) 140.0 0.0 true true 0 (800)] ! ] -46.7 MRshow ! 1.000 UL ! LTb ! 490 4822 M ! 63 0 V ! 6409 0 R ! -63 0 V ! stroke ! 0.00 0.00 0.00 C 406 4822 M ! [ [(Helvetica) 140.0 0.0 true true 0 (900)] ! ] -46.7 MRshow ! 1.000 UL ! LTb ! 1119 280 M ! 0 63 V ! 0 4529 R ! 0 -63 V ! stroke ! 0.00 0.00 0.00 C 1119 140 M ! [ [(Helvetica) 140.0 0.0 true true 0 (-3)] ! ] -46.7 MCshow ! 1.000 UL ! LTb ! 2018 280 M ! 0 63 V ! 0 4529 R ! 0 -63 V stroke ! 0.00 0.00 0.00 C 2018 140 M ! [ [(Helvetica) 140.0 0.0 true true 0 (-2)] ! ] -46.7 MCshow ! 1.000 UL ! LTb ! 2917 280 M ! 0 63 V ! 0 4529 R ! 0 -63 V stroke ! 0.00 0.00 0.00 C 2917 140 M ! [ [(Helvetica) 140.0 0.0 true true 0 (-1)] ! ] -46.7 MCshow ! 1.000 UL ! LTb ! 3816 280 M ! 0 63 V ! 0 4529 R ! 0 -63 V stroke ! 0.00 0.00 0.00 C 3816 140 M ! [ [(Helvetica) 140.0 0.0 true true 0 (0)] ! ] -46.7 MCshow ! 1.000 UL ! LTb ! 4715 280 M ! 0 63 V ! 0 4529 R ! 0 -63 V stroke ! 0.00 0.00 0.00 C 4715 140 M ! [ [(Helvetica) 140.0 0.0 true true 0 (1)] ! ] -46.7 MCshow ! 1.000 UL ! LTb ! 5614 280 M ! 0 63 V ! 0 4529 R ! 0 -63 V stroke ! 0.00 0.00 0.00 C 5614 140 M ! [ [(Helvetica) 140.0 0.0 true true 0 (2)] ! ] -46.7 MCshow ! 1.000 UL ! LTb ! 6513 280 M ! 0 63 V ! 0 4529 R ! 0 -63 V stroke - 0.00 0.00 0.00 C 6513 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (3)] - ] -46.7 MCshow - 1.000 UL - LTb - 1.000 UL LTb ! 490 4872 N ! 490 280 L ! 6472 0 V 0 4592 V ! -6472 0 V Z stroke 1.000 UP 1.000 UL --- 532,1127 ---- } ifelse 1.000 UL LTb ! 574 280 M ! 63 0 V ! 6325 0 R ! -63 0 V ! stroke ! 0.00 0.00 0.00 C 490 280 M ! [ [(Helvetica) 140.0 0.0 true true 0 (0)] ! ] -46.7 MRshow ! 1.000 UL ! LTb ! 574 1045 M ! 63 0 V ! 6325 0 R ! -63 0 V ! stroke ! 0.00 0.00 0.00 C 490 1045 M ! [ [(Helvetica) 140.0 0.0 true true 0 (200)] ! ] -46.7 MRshow ! 1.000 UL ! LTb ! 574 1811 M ! 63 0 V ! 6325 0 R ! -63 0 V ! stroke ! 0.00 0.00 0.00 C 490 1811 M ! [ [(Helvetica) 140.0 0.0 true true 0 (400)] ! ] -46.7 MRshow ! 1.000 UL ! LTb ! 574 2576 M ! 63 0 V ! 6325 0 R ! -63 0 V ! stroke ! 0.00 0.00 0.00 C 490 2576 M ! [ [(Helvetica) 140.0 0.0 true true 0 (600)] ! ] -46.7 MRshow ! 1.000 UL ! LTb ! 574 3341 M ! 63 0 V ! 6325 0 R ! -63 0 V ! stroke ! 0.00 0.00 0.00 C 490 3341 M ! [ [(Helvetica) 140.0 0.0 true true 0 (800)] ! ] -46.7 MRshow ! 1.000 UL ! LTb ! 574 4107 M ! 63 0 V ! 6325 0 R ! -63 0 V ! stroke ! 0.00 0.00 0.00 C 490 4107 M ! [ [(Helvetica) 140.0 0.0 true true 0 (1000)] ! ] -46.7 MRshow ! 1.000 UL ! LTb ! 574 4872 M ! 63 0 V ! 6325 0 R ! -63 0 V ! stroke ! 0.00 0.00 0.00 C 490 4872 M ! [ [(Helvetica) 140.0 0.0 true true 0 (1200)] ! ] -46.7 MRshow ! 1.000 UL ! LTb ! 1155 280 M ! 0 63 V ! 0 4529 R ! 0 -63 V ! stroke ! 0.00 0.00 0.00 C 1155 140 M ! [ [(Helvetica) 140.0 0.0 true true 0 (-4)] ! ] -46.7 MCshow ! 1.000 UL ! LTb ! 1881 280 M ! 0 63 V ! 0 4529 R ! 0 -63 V ! stroke ! 0.00 0.00 0.00 C 1881 140 M ! [ [(Helvetica) 140.0 0.0 true true 0 (-3)] ! ] -46.7 MCshow ! 1.000 UL ! LTb ! 2607 280 M ! 0 63 V ! 0 4529 R ! 0 -63 V ! stroke ! 0.00 0.00 0.00 C 2607 140 M ! [ [(Helvetica) 140.0 0.0 true true 0 (-2)] ! ] -46.7 MCshow ! 1.000 UL ! LTb ! 3332 280 M ! 0 63 V ! 0 4529 R ! 0 -63 V ! stroke ! 0.00 0.00 0.00 C 3332 140 M ! [ [(Helvetica) 140.0 0.0 true true 0 (-1)] ! ] -46.7 MCshow ! 1.000 UL ! LTb ! 4058 280 M ! 0 63 V ! 0 4529 R ! 0 -63 V ! stroke ! 0.00 0.00 0.00 C 4058 140 M ! [ [(Helvetica) 140.0 0.0 true true 0 (0)] ! ] -46.7 MCshow ! 1.000 UL ! LTb ! 4784 280 M ! 0 63 V ! 0 4529 R ! 0 -63 V ! stroke ! 0.00 0.00 0.00 C 4784 140 M ! [ [(Helvetica) 140.0 0.0 true true 0 (1)] ! ] -46.7 MCshow ! 1.000 UL ! LTb ! 5510 280 M ! 0 63 V ! 0 4529 R ! 0 -63 V ! stroke ! 0.00 0.00 0.00 C 5510 140 M ! [ [(Helvetica) 140.0 0.0 true true 0 (2)] ! ] -46.7 MCshow ! 1.000 UL ! LTb ! 6236 280 M ! 0 63 V ! 0 4529 R ! 0 -63 V ! stroke ! 0.00 0.00 0.00 C 6236 140 M ! [ [(Helvetica) 140.0 0.0 true true 0 (3)] ! ] -46.7 MCshow ! 1.000 UL ! LTb ! 6962 280 M ! 0 63 V ! 0 4529 R ! 0 -63 V ! stroke ! 0.00 0.00 0.00 C 6962 140 M ! [ [(Helvetica) 140.0 0.0 true true 0 (4)] ! ] -46.7 MCshow ! 1.000 UL ! LTb ! 1.000 UL ! LTb ! 574 4872 N ! 574 280 L ! 6388 0 V 0 4592 V ! -6388 0 V Z stroke 1.000 UP 1.000 UL LTb 1.000 UL LT0 ! 0.00 0.00 0.50 C gsave 581 280 N 0 0 V 0 4 V 211 0 V 0 -4 V 1 PolyFill ! 581 280 M ! 0 4 V 211 0 V ! 0 -4 V stroke ! LT0 ! 0.00 0.00 0.00 C 581 280 M ! 0 4 V 211 0 V ! 0 -4 V -211 0 V stroke LT2 ! 0.00 0.00 0.50 C gsave 792 280 N 0 0 V 0 4 V 211 0 V 0 -4 V 1 PolyFill ! 792 280 M ! 0 4 V ! 211 0 V ! 0 -4 V stroke ! LT0 ! 0.00 0.00 0.00 C 792 280 M ! 0 4 V ! 211 0 V ! 0 -4 V ! -211 0 V stroke LT4 ! 0.00 0.00 0.50 C gsave 1003 280 N 0 0 V 0 0 V 210 0 V 0 0 V 1 PolyFill ! 1003 280 M 210 0 V stroke ! LT0 ! 0.00 0.00 0.00 C 1003 280 M 210 0 V -210 0 V stroke LT6 ! 0.00 0.00 0.50 C gsave 1213 280 N 0 0 V 0 0 V 211 0 V 0 0 V 1 PolyFill ! 1213 280 M ! 211 0 V stroke ! LT0 ! 0.00 0.00 0.00 C 1213 280 M ! 211 0 V ! -211 0 V stroke LT8 ! 0.00 0.00 0.50 C gsave 1424 280 N 0 0 V 0 15 V 211 0 V 0 -15 V 1 PolyFill ! 1424 280 M ! 0 15 V ! 211 0 V ! 0 -15 V stroke LT0 ! 0.00 0.00 0.00 C 1424 280 M ! 0 15 V ! 211 0 V ! 0 -15 V ! -211 0 V stroke LT1 ! 0.00 0.00 0.50 C gsave 1635 280 N 0 0 V 0 27 V 211 0 V 0 -27 V 1 PolyFill ! 1635 280 M ! 0 27 V ! 211 0 V ! 0 -27 V stroke ! LT0 ! 0.00 0.00 0.00 C 1635 280 M ! 0 27 V ! 211 0 V ! 0 -27 V ! -211 0 V stroke LT3 ! 0.00 0.00 0.50 C gsave 1846 280 N 0 0 V 0 80 V 211 0 V 0 -80 V 1 PolyFill ! 1846 280 M ! 0 80 V 211 0 V ! 0 -80 V stroke ! LT0 ! 0.00 0.00 0.00 C 1846 280 M ! 0 80 V 211 0 V ! 0 -80 V -211 0 V stroke LT5 ! 0.00 0.00 0.50 C gsave 2057 280 N 0 0 V 0 153 V 211 0 V 0 -153 V 1 PolyFill ! 2057 280 M ! 0 153 V ! 211 0 V ! 0 -153 V stroke ! LT0 ! 0.00 0.00 0.00 C 2057 280 M ! 0 153 V ! 211 0 V ! 0 -153 V ! -211 0 V stroke LT7 ! 0.00 0.00 0.50 C gsave 2268 280 N 0 0 V 0 222 V 211 0 V 0 -222 V 1 PolyFill ! 2268 280 M ! 0 222 V ! 211 0 V ! 0 -222 V stroke ! LT0 ! 0.00 0.00 0.00 C 2268 280 M ! 0 222 V ! 211 0 V ! 0 -222 V ! -211 0 V stroke LT0 ! 0.00 0.00 0.50 C gsave 2479 280 N 0 0 V 0 658 V 211 0 V 0 -658 V 1 PolyFill ! 2479 280 M ! 0 658 V ! 211 0 V ! 0 -658 V stroke ! LT0 ! 0.00 0.00 0.00 C 2479 280 M ! 0 658 V ! 211 0 V ! 0 -658 V ! -211 0 V stroke LT2 ! 0.00 0.00 0.50 C gsave 2690 280 N 0 0 V 0 938 V 210 0 V 0 -938 V 1 PolyFill ! 2690 280 M ! 0 938 V 210 0 V ! 0 -938 V stroke ! LT0 ! 0.00 0.00 0.00 C 2690 280 M ! 0 938 V 210 0 V ! 0 -938 V -210 0 V stroke LT4 ! 0.00 0.00 0.50 C gsave 2900 280 N 0 0 V 0 1665 V 211 0 V 0 -1665 V 1 PolyFill ! 2900 280 M ! 0 1665 V ! 211 0 V ! 0 -1665 V stroke ! LT0 ! 0.00 0.00 0.00 C 2900 280 M ! 0 1665 V ! 211 0 V ! 0 -1665 V ! -211 0 V stroke LT6 ! 0.00 0.00 0.50 C gsave 3111 280 N 0 0 V 0 2311 V 211 0 V 0 -2311 V 1 PolyFill ! 3111 280 M ! 0 2311 V ! 211 0 V ! 0 -2311 V stroke ! LT0 ! 0.00 0.00 0.00 C 3111 280 M ! 0 2311 V ! 211 0 V ! 0 -2311 V ! -211 0 V stroke LT8 ! 0.00 0.00 0.50 C gsave 3322 280 N 0 0 V 0 3073 V 211 0 V 0 -3073 V 1 PolyFill ! 3322 280 M ! 0 3073 V 211 0 V ! 0 -3073 V stroke LT0 ! 0.00 0.00 0.00 C 3322 280 M ! 0 3073 V 211 0 V ! 0 -3073 V -211 0 V stroke LT1 ! 0.00 0.00 0.50 C gsave 3533 280 N 0 0 V 0 3609 V 211 0 V 0 -3609 V 1 PolyFill ! 3533 280 M ! 0 3609 V ! 211 0 V ! 0 -3609 V stroke ! LT0 ! 0.00 0.00 0.00 C 3533 280 M ! 0 3609 V ! 211 0 V ! 0 -3609 V ! -211 0 V stroke LT3 ! 0.00 0.00 0.50 C gsave 3744 280 N 0 0 V 0 4244 V 211 0 V 0 -4244 V 1 PolyFill ! 3744 280 M ! 0 4244 V ! 211 0 V ! 0 -4244 V stroke ! LT0 ! 0.00 0.00 0.00 C 3744 280 M ! 0 4244 V ! 211 0 V ! 0 -4244 V ! -211 0 V stroke LT5 ! 0.00 0.00 0.50 C gsave 3955 280 N 0 0 V 0 4309 V 211 0 V 0 -4309 V 1 PolyFill ! 3955 280 M ! 0 4309 V ! 211 0 V ! 0 -4309 V stroke ! LT0 ! 0.00 0.00 0.00 C 3955 280 M ! 0 4309 V ! 211 0 V ! 0 -4309 V ! -211 0 V stroke LT7 ! 0.00 0.00 0.50 C gsave 4166 280 N 0 0 V 0 4450 V 211 0 V 0 -4450 V 1 PolyFill ! 4166 280 M ! 0 4450 V ! 211 0 V ! 0 -4450 V stroke ! LT0 ! 0.00 0.00 0.00 C 4166 280 M ! 0 4450 V ! 211 0 V ! 0 -4450 V ! -211 0 V stroke LT0 ! 0.00 0.00 0.50 C gsave 4377 280 N 0 0 V 0 3670 V 210 0 V 0 -3670 V 1 PolyFill ! 4377 280 M ! 0 3670 V 210 0 V ! 0 -3670 V stroke ! LT0 ! 0.00 0.00 0.00 C 4377 280 M ! 0 3670 V 210 0 V ! 0 -3670 V -210 0 V stroke LT2 ! 0.00 0.00 0.50 C gsave 4587 280 N 0 0 V 0 2908 V 211 0 V 0 -2908 V 1 PolyFill ! 4587 280 M ! 0 2908 V 211 0 V ! 0 -2908 V stroke ! LT0 ! 0.00 0.00 0.00 C 4587 280 M ! 0 2908 V 211 0 V ! 0 -2908 V -211 0 V stroke LT4 ! 0.00 0.00 0.50 C gsave 4798 280 N 0 0 V 0 2154 V 211 0 V 0 -2154 V 1 PolyFill ! 4798 280 M ! 0 2154 V ! 211 0 V ! 0 -2154 V stroke ! LT0 ! 0.00 0.00 0.00 C 4798 280 M ! 0 2154 V ! 211 0 V ! 0 -2154 V ! -211 0 V stroke LT6 ! 0.00 0.00 0.50 C gsave 5009 280 N 0 0 V 0 1680 V 211 0 V 0 -1680 V 1 PolyFill ! 5009 280 M ! 0 1680 V ! 211 0 V ! 0 -1680 V stroke ! LT0 ! 0.00 0.00 0.00 C 5009 280 M ! 0 1680 V ! 211 0 V ! 0 -1680 V ! -211 0 V stroke LT8 ! 0.00 0.00 0.50 C gsave 5220 280 N 0 0 V 0 953 V 211 0 V 0 -953 V 1 PolyFill ! 5220 280 M ! 0 953 V ! 211 0 V ! 0 -953 V stroke LT0 ! 0.00 0.00 0.00 C 5220 280 M ! 0 953 V ! 211 0 V ! 0 -953 V ! -211 0 V stroke LT1 ! 0.00 0.00 0.50 C gsave 5431 280 N 0 0 V 0 582 V 211 0 V 0 -582 V 1 PolyFill ! 5431 280 M ! 0 582 V ! 211 0 V ! 0 -582 V stroke ! LT0 ! 0.00 0.00 0.00 C 5431 280 M ! 0 582 V ! 211 0 V ! 0 -582 V ! -211 0 V stroke LT3 ! 0.00 0.00 0.50 C gsave 5642 280 N 0 0 V 0 310 V 211 0 V 0 -310 V 1 PolyFill ! 5642 280 M ! 0 310 V ! 211 0 V ! 0 -310 V stroke ! LT0 ! 0.00 0.00 0.00 C 5642 280 M ! 0 310 V ! 211 0 V ! 0 -310 V ! -211 0 V stroke LT5 ! 0.00 0.00 0.50 C gsave 5853 280 N 0 0 V 0 126 V 211 0 V 0 -126 V 1 PolyFill ! 5853 280 M ! 0 126 V 211 0 V ! 0 -126 V stroke ! LT0 ! 0.00 0.00 0.00 C 5853 280 M ! 0 126 V 211 0 V ! 0 -126 V -211 0 V stroke ! LT7 ! 0.00 0.00 0.50 C gsave 6064 280 N 0 0 V 0 69 V 210 0 V 0 -69 V 1 PolyFill ! 6064 280 M ! 0 69 V 210 0 V ! 0 -69 V stroke ! LT0 ! 0.00 0.00 0.00 C 6064 280 M ! 0 69 V 210 0 V ! 0 -69 V -210 0 V stroke ! LT0 ! 0.00 0.00 0.50 C gsave 6274 280 N 0 0 V 0 31 V 211 0 V 0 -31 V 1 PolyFill ! 6274 280 M ! 0 31 V ! 211 0 V ! 0 -31 V stroke ! LT0 ! 0.00 0.00 0.00 C 6274 280 M ! 0 31 V ! 211 0 V ! 0 -31 V ! -211 0 V stroke ! LT2 ! 0.00 0.00 0.50 C gsave 6485 280 N 0 0 V 0 15 V 211 0 V 0 -15 V 1 PolyFill ! 6485 280 M ! 0 15 V ! 211 0 V ! 0 -15 V stroke ! LT0 ! 0.00 0.00 0.00 C 6485 280 M ! 0 15 V ! 211 0 V ! 0 -15 V ! -211 0 V stroke ! LT4 ! 0.00 0.00 0.50 C gsave 6696 280 N 0 0 V 0 8 V 211 0 V 0 -8 V 1 PolyFill ! 6696 280 M ! 0 8 V ! 211 0 V ! 0 -8 V stroke ! LT0 ! 0.00 0.00 0.00 C 6696 280 M ! 0 8 V ! 211 0 V ! 0 -8 V ! -211 0 V stroke LTb ! 574 4872 N ! 574 280 L ! 6388 0 V 0 4592 V ! -6388 0 V Z stroke 1.000 UP 1.000 UL Binary files octave-2.9.19/doc/interpreter/hist.pdf and octave-3.0.0/doc/interpreter/hist.pdf differ Binary files octave-2.9.19/doc/interpreter/hist.png and octave-3.0.0/doc/interpreter/hist.png differ diff -cNr octave-2.9.19/doc/interpreter/inpolygon.eps octave-3.0.0/doc/interpreter/inpolygon.eps *** octave-2.9.19/doc/interpreter/inpolygon.eps Tue Dec 11 18:05:31 2007 --- octave-3.0.0/doc/interpreter/inpolygon.eps Thu Dec 20 16:13:15 2007 *************** *** 1,7 **** %!PS-Adobe-2.0 EPSF-2.0 %%Title: inpolygon.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Tue Dec 11 18:05:31 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments --- 1,7 ---- %!PS-Adobe-2.0 EPSF-2.0 %%Title: inpolygon.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Thu Dec 20 16:13:15 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments *************** *** 48,54 **** /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Tue Dec 11 18:05:31 2007) /DOCINFO pdfmark end } ifelse --- 48,54 ---- /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Thu Dec 20 16:13:15 2007) /DOCINFO pdfmark end } ifelse *************** *** 532,668 **** } ifelse 1.000 UL LTb - 574 4872 N - 574 280 L - 6388 0 V - 0 4592 V - -6388 0 V - Z stroke - 1.000 UP - 1.000 UL - LTb - 0.500 UL - LT0 - 0.00 0.00 1.00 C 2171 2576 M - 78 -355 V - 227 -320 V - 353 -254 V - 445 -163 V - 494 -56 V - 494 56 V - 445 163 V - 353 254 V - 227 320 V - 78 355 V - -78 355 V - -227 320 V - -353 254 V - -445 163 V - -494 56 V - -494 -56 V - 2829 3505 L - 2476 3251 L - 2249 2931 L - -78 -355 V - 1.000 UP - stroke - LT1 - 1.00 0.00 0.00 C 3026 2792 Pls - 4143 2610 Pls - 2677 2933 Pls - 2447 2255 Pls - 2492 2073 Pls - 3354 1585 Pls - 3449 2494 Pls - 3973 2105 Pls - 2920 3101 Pls - 2681 2407 Pls - 5025 2533 Pls - 3710 2839 Pls - 2243 2727 Pls - 5053 2740 Pls - 2618 2709 Pls - 4163 2577 Pls - 4308 3228 Pls - 4134 2095 Pls - 4308 1823 Pls - 3312 3041 Pls - 3728 3323 Pls - 4332 2211 Pls - 4313 2827 Pls - 3542 2816 Pls - 3153 2739 Pls - 3967 3626 Pls - 5176 2228 Pls - 5155 3111 Pls - 4102 2996 Pls - 3782 1768 Pls - 1.000 UP - 0.500 UL - LT2 - 0.00 0.00 1.00 C 1186 3820 Circle - 702 748 Circle - 4966 4402 Circle - 4130 4260 Circle - 1376 3495 Circle - 5503 2775 Circle - 1464 3045 Circle - 3182 1325 Circle - 6163 466 Circle - 3122 1198 Circle - 4026 856 Circle - 5596 3114 Circle - 4778 3482 Circle - 2756 1536 Circle - 4176 3827 Circle - 4409 4111 Circle - 5530 3509 Circle - 5975 2957 Circle - 4900 1488 Circle - 1698 1523 Circle - 5211 3409 Circle - 4908 1477 Circle - 4445 4248 Circle - 5536 3042 Circle - 1277 1412 Circle - 5657 4786 Circle - 6893 3089 Circle - 4564 3614 Circle - 6328 2644 Circle - 2270 3578 Circle - 1259 3341 Circle - 2195 2378 Circle - 5981 1594 Circle - 5502 3218 Circle - 2421 1625 Circle - 5346 1524 Circle - 4240 696 Circle - 3873 375 Circle - 5543 3022 Circle - 5053 1687 Circle - 3164 580 Circle - 1947 2388 Circle - 5709 3142 Circle - 1087 2162 Circle - 5130 3179 Circle - 5410 2620 Circle - 5783 3197 Circle - 4728 4180 Circle - 5745 3354 Circle - 2365 1558 Circle - 4166 1330 Circle - 6229 1806 Circle - 5185 3163 Circle - 1441 4785 Circle - 5090 1672 Circle - 3350 355 Circle - 5157 1210 Circle - 2696 3597 Circle - 5502 1805 Circle - 3279 869 Circle - 2838 4454 Circle - 1.000 UL - LTb 574 280 M 63 0 V 6325 0 R --- 532,537 ---- *************** *** 854,859 **** --- 723,859 ---- 1.000 UP 1.000 UL LTb + 0.500 UL + LT0 + 0.00 0.00 1.00 C 2171 2576 M + 78 -355 V + 227 -320 V + 353 -254 V + 445 -163 V + 494 -56 V + 494 56 V + 445 163 V + 353 254 V + 227 320 V + 78 355 V + -78 355 V + -227 320 V + -353 254 V + -445 163 V + -494 56 V + -494 -56 V + 2829 3505 L + 2476 3251 L + 2249 2931 L + -78 -355 V + 1.000 UP + stroke + LT1 + 1.00 0.00 0.00 C 3026 2792 Pls + 4143 2610 Pls + 2677 2933 Pls + 2447 2255 Pls + 2492 2073 Pls + 3354 1585 Pls + 3449 2494 Pls + 3973 2105 Pls + 2920 3101 Pls + 2681 2407 Pls + 5025 2533 Pls + 3710 2839 Pls + 2243 2727 Pls + 5053 2740 Pls + 2618 2709 Pls + 4163 2577 Pls + 4308 3228 Pls + 4134 2095 Pls + 4308 1823 Pls + 3312 3041 Pls + 3728 3323 Pls + 4332 2211 Pls + 4313 2827 Pls + 3542 2816 Pls + 3153 2739 Pls + 3967 3626 Pls + 5176 2228 Pls + 5155 3111 Pls + 4102 2996 Pls + 3782 1768 Pls + 1.000 UP + 0.500 UL + LT2 + 0.00 0.00 1.00 C 1186 3820 Circle + 702 748 Circle + 4966 4402 Circle + 4130 4260 Circle + 1376 3495 Circle + 5503 2775 Circle + 1464 3045 Circle + 3182 1325 Circle + 6163 466 Circle + 3122 1198 Circle + 4026 856 Circle + 5596 3114 Circle + 4778 3482 Circle + 2756 1536 Circle + 4176 3827 Circle + 4409 4111 Circle + 5530 3509 Circle + 5975 2957 Circle + 4900 1488 Circle + 1698 1523 Circle + 5211 3409 Circle + 4908 1477 Circle + 4445 4248 Circle + 5536 3042 Circle + 1277 1412 Circle + 5657 4786 Circle + 6893 3089 Circle + 4564 3614 Circle + 6328 2644 Circle + 2270 3578 Circle + 1259 3341 Circle + 2195 2378 Circle + 5981 1594 Circle + 5502 3218 Circle + 2421 1625 Circle + 5346 1524 Circle + 4240 696 Circle + 3873 375 Circle + 5543 3022 Circle + 5053 1687 Circle + 3164 580 Circle + 1947 2388 Circle + 5709 3142 Circle + 1087 2162 Circle + 5130 3179 Circle + 5410 2620 Circle + 5783 3197 Circle + 4728 4180 Circle + 5745 3354 Circle + 2365 1558 Circle + 4166 1330 Circle + 6229 1806 Circle + 5185 3163 Circle + 1441 4785 Circle + 5090 1672 Circle + 3350 355 Circle + 5157 1210 Circle + 2696 3597 Circle + 5502 1805 Circle + 3279 869 Circle + 2838 4454 Circle + 1.000 UL + LTb + 574 4872 N + 574 280 L + 6388 0 V + 0 4592 V + -6388 0 V + Z stroke + 1.000 UP + 1.000 UL + LTb stroke grestore end Binary files octave-2.9.19/doc/interpreter/inpolygon.pdf and octave-3.0.0/doc/interpreter/inpolygon.pdf differ diff -cNr octave-2.9.19/doc/interpreter/interpderiv1.eps octave-3.0.0/doc/interpreter/interpderiv1.eps *** octave-2.9.19/doc/interpreter/interpderiv1.eps Tue Dec 11 18:05:22 2007 --- octave-3.0.0/doc/interpreter/interpderiv1.eps Thu Dec 20 16:13:04 2007 *************** *** 1,7 **** %!PS-Adobe-2.0 EPSF-2.0 %%Title: interpderiv1.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Tue Dec 11 18:05:22 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments --- 1,7 ---- %!PS-Adobe-2.0 EPSF-2.0 %%Title: interpderiv1.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Thu Dec 20 16:13:04 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments *************** *** 48,54 **** /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Tue Dec 11 18:05:22 2007) /DOCINFO pdfmark end } ifelse --- 48,54 ---- /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Thu Dec 20 16:13:04 2007) /DOCINFO pdfmark end } ifelse *************** *** 532,537 **** --- 532,679 ---- } ifelse 1.000 UL LTb + 574 663 M + 63 0 V + 6325 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 490 663 M + [ [(Helvetica) 140.0 0.0 true true 0 (-1)] + ] -46.7 MRshow + 1.000 UL + LTb + 574 1619 M + 63 0 V + 6325 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 490 1619 M + [ [(Helvetica) 140.0 0.0 true true 0 (-0.5)] + ] -46.7 MRshow + 1.000 UL + LTb + 574 2576 M + 63 0 V + 6325 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 490 2576 M + [ [(Helvetica) 140.0 0.0 true true 0 (0)] + ] -46.7 MRshow + 1.000 UL + LTb + 574 3533 M + 63 0 V + 6325 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 490 3533 M + [ [(Helvetica) 140.0 0.0 true true 0 (0.5)] + ] -46.7 MRshow + 1.000 UL + LTb + 574 4489 M + 63 0 V + 6325 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 490 4489 M + [ [(Helvetica) 140.0 0.0 true true 0 (1)] + ] -46.7 MRshow + 1.000 UL + LTb + 574 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 574 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (-2)] + ] -46.7 MCshow + 1.000 UL + LTb + 1373 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 1373 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (-1.5)] + ] -46.7 MCshow + 1.000 UL + LTb + 2171 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 2171 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (-1)] + ] -46.7 MCshow + 1.000 UL + LTb + 2970 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 2970 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (-0.5)] + ] -46.7 MCshow + 1.000 UL + LTb + 3768 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 3768 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (0)] + ] -46.7 MCshow + 1.000 UL + LTb + 4567 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 4567 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (0.5)] + ] -46.7 MCshow + 1.000 UL + LTb + 5365 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 5365 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (1)] + ] -46.7 MCshow + 1.000 UL + LTb + 6164 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 6164 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (1.5)] + ] -46.7 MCshow + 1.000 UL + LTb + 6962 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 6962 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (2)] + ] -46.7 MCshow + 1.000 UL + LTb + 1.000 UL + LTb 574 4872 N 574 280 L 6388 0 V *************** *** 884,1031 **** stroke 1.000 UL LTb - 574 663 M - 63 0 V - 6325 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 490 663 M - [ [(Helvetica) 140.0 0.0 true true 0 (-1)] - ] -46.7 MRshow - 1.000 UL - LTb - 574 1619 M - 63 0 V - 6325 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 490 1619 M - [ [(Helvetica) 140.0 0.0 true true 0 (-0.5)] - ] -46.7 MRshow - 1.000 UL - LTb - 574 2576 M - 63 0 V - 6325 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 490 2576 M - [ [(Helvetica) 140.0 0.0 true true 0 (0)] - ] -46.7 MRshow - 1.000 UL - LTb - 574 3533 M - 63 0 V - 6325 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 490 3533 M - [ [(Helvetica) 140.0 0.0 true true 0 (0.5)] - ] -46.7 MRshow - 1.000 UL - LTb - 574 4489 M - 63 0 V - 6325 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 490 4489 M - [ [(Helvetica) 140.0 0.0 true true 0 (1)] - ] -46.7 MRshow - 1.000 UL - LTb - 574 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 574 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (-2)] - ] -46.7 MCshow - 1.000 UL - LTb - 1373 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 1373 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (-1.5)] - ] -46.7 MCshow - 1.000 UL - LTb - 2171 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 2171 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (-1)] - ] -46.7 MCshow - 1.000 UL - LTb - 2970 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 2970 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (-0.5)] - ] -46.7 MCshow - 1.000 UL - LTb - 3768 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 3768 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (0)] - ] -46.7 MCshow - 1.000 UL - LTb - 4567 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 4567 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (0.5)] - ] -46.7 MCshow - 1.000 UL - LTb - 5365 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 5365 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (1)] - ] -46.7 MCshow - 1.000 UL - LTb - 6164 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 6164 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (1.5)] - ] -46.7 MCshow - 1.000 UL - LTb - 6962 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 6962 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (2)] - ] -46.7 MCshow - 1.000 UL - LTb - 1.000 UL - LTb 574 4872 N 574 280 L 6388 0 V --- 1026,1031 ---- Binary files octave-2.9.19/doc/interpreter/interpderiv1.pdf and octave-3.0.0/doc/interpreter/interpderiv1.pdf differ Binary files octave-2.9.19/doc/interpreter/interpderiv1.png and octave-3.0.0/doc/interpreter/interpderiv1.png differ diff -cNr octave-2.9.19/doc/interpreter/interpderiv2.eps octave-3.0.0/doc/interpreter/interpderiv2.eps *** octave-2.9.19/doc/interpreter/interpderiv2.eps Tue Dec 11 18:05:23 2007 --- octave-3.0.0/doc/interpreter/interpderiv2.eps Thu Dec 20 16:13:06 2007 *************** *** 1,7 **** %!PS-Adobe-2.0 EPSF-2.0 %%Title: interpderiv2.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Tue Dec 11 18:05:23 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments --- 1,7 ---- %!PS-Adobe-2.0 EPSF-2.0 %%Title: interpderiv2.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Thu Dec 20 16:13:06 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments *************** *** 48,54 **** /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Tue Dec 11 18:05:23 2007) /DOCINFO pdfmark end } ifelse --- 48,54 ---- /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Thu Dec 20 16:13:06 2007) /DOCINFO pdfmark end } ifelse *************** *** 532,537 **** --- 532,699 ---- } ifelse 1.000 UL LTb + 406 810 M + 63 0 V + 6493 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 322 810 M + [ [(Helvetica) 140.0 0.0 true true 0 (-3)] + ] -46.7 MRshow + 1.000 UL + LTb + 406 1399 M + 63 0 V + 6493 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 322 1399 M + [ [(Helvetica) 140.0 0.0 true true 0 (-2)] + ] -46.7 MRshow + 1.000 UL + LTb + 406 1987 M + 63 0 V + 6493 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 322 1987 M + [ [(Helvetica) 140.0 0.0 true true 0 (-1)] + ] -46.7 MRshow + 1.000 UL + LTb + 406 2576 M + 63 0 V + 6493 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 322 2576 M + [ [(Helvetica) 140.0 0.0 true true 0 (0)] + ] -46.7 MRshow + 1.000 UL + LTb + 406 3165 M + 63 0 V + 6493 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 322 3165 M + [ [(Helvetica) 140.0 0.0 true true 0 (1)] + ] -46.7 MRshow + 1.000 UL + LTb + 406 3753 M + 63 0 V + 6493 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 322 3753 M + [ [(Helvetica) 140.0 0.0 true true 0 (2)] + ] -46.7 MRshow + 1.000 UL + LTb + 406 4342 M + 63 0 V + 6493 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 322 4342 M + [ [(Helvetica) 140.0 0.0 true true 0 (3)] + ] -46.7 MRshow + 1.000 UL + LTb + 406 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 406 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (-2)] + ] -46.7 MCshow + 1.000 UL + LTb + 1226 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 1226 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (-1.5)] + ] -46.7 MCshow + 1.000 UL + LTb + 2045 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 2045 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (-1)] + ] -46.7 MCshow + 1.000 UL + LTb + 2865 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 2865 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (-0.5)] + ] -46.7 MCshow + 1.000 UL + LTb + 3684 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 3684 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (0)] + ] -46.7 MCshow + 1.000 UL + LTb + 4504 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 4504 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (0.5)] + ] -46.7 MCshow + 1.000 UL + LTb + 5323 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 5323 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (1)] + ] -46.7 MCshow + 1.000 UL + LTb + 6143 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 6143 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (1.5)] + ] -46.7 MCshow + 1.000 UL + LTb + 6962 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 6962 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (2)] + ] -46.7 MCshow + 1.000 UL + LTb + 1.000 UL + LTb 406 4872 N 406 280 L 6556 0 V *************** *** 879,1046 **** 6594 4599 Pls 1.000 UL LTb - 406 810 M - 63 0 V - 6493 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 322 810 M - [ [(Helvetica) 140.0 0.0 true true 0 (-3)] - ] -46.7 MRshow - 1.000 UL - LTb - 406 1399 M - 63 0 V - 6493 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 322 1399 M - [ [(Helvetica) 140.0 0.0 true true 0 (-2)] - ] -46.7 MRshow - 1.000 UL - LTb - 406 1987 M - 63 0 V - 6493 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 322 1987 M - [ [(Helvetica) 140.0 0.0 true true 0 (-1)] - ] -46.7 MRshow - 1.000 UL - LTb - 406 2576 M - 63 0 V - 6493 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 322 2576 M - [ [(Helvetica) 140.0 0.0 true true 0 (0)] - ] -46.7 MRshow - 1.000 UL - LTb - 406 3165 M - 63 0 V - 6493 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 322 3165 M - [ [(Helvetica) 140.0 0.0 true true 0 (1)] - ] -46.7 MRshow - 1.000 UL - LTb - 406 3753 M - 63 0 V - 6493 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 322 3753 M - [ [(Helvetica) 140.0 0.0 true true 0 (2)] - ] -46.7 MRshow - 1.000 UL - LTb - 406 4342 M - 63 0 V - 6493 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 322 4342 M - [ [(Helvetica) 140.0 0.0 true true 0 (3)] - ] -46.7 MRshow - 1.000 UL - LTb - 406 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 406 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (-2)] - ] -46.7 MCshow - 1.000 UL - LTb - 1226 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 1226 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (-1.5)] - ] -46.7 MCshow - 1.000 UL - LTb - 2045 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 2045 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (-1)] - ] -46.7 MCshow - 1.000 UL - LTb - 2865 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 2865 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (-0.5)] - ] -46.7 MCshow - 1.000 UL - LTb - 3684 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 3684 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (0)] - ] -46.7 MCshow - 1.000 UL - LTb - 4504 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 4504 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (0.5)] - ] -46.7 MCshow - 1.000 UL - LTb - 5323 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 5323 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (1)] - ] -46.7 MCshow - 1.000 UL - LTb - 6143 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 6143 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (1.5)] - ] -46.7 MCshow - 1.000 UL - LTb - 6962 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 6962 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (2)] - ] -46.7 MCshow - 1.000 UL - LTb - 1.000 UL - LTb 406 4872 N 406 280 L 6556 0 V --- 1041,1046 ---- Binary files octave-2.9.19/doc/interpreter/interpderiv2.pdf and octave-3.0.0/doc/interpreter/interpderiv2.pdf differ Binary files octave-2.9.19/doc/interpreter/interpderiv2.png and octave-3.0.0/doc/interpreter/interpderiv2.png differ diff -cNr octave-2.9.19/doc/interpreter/interpft.eps octave-3.0.0/doc/interpreter/interpft.eps *** octave-2.9.19/doc/interpreter/interpft.eps Tue Dec 11 18:05:19 2007 --- octave-3.0.0/doc/interpreter/interpft.eps Thu Dec 20 16:13:01 2007 *************** *** 1,7 **** %!PS-Adobe-2.0 EPSF-2.0 %%Title: interpft.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Tue Dec 11 18:05:19 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments --- 1,7 ---- %!PS-Adobe-2.0 EPSF-2.0 %%Title: interpft.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Thu Dec 20 16:13:01 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments *************** *** 48,54 **** /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Tue Dec 11 18:05:19 2007) /DOCINFO pdfmark end } ifelse --- 48,54 ---- /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Thu Dec 20 16:13:01 2007) /DOCINFO pdfmark end } ifelse *************** *** 532,537 **** --- 532,699 ---- } ifelse 1.000 UL LTb + 574 535 M + 63 0 V + 6325 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 490 535 M + [ [(Helvetica) 140.0 0.0 true true 0 (-0.6)] + ] -46.7 MRshow + 1.000 UL + LTb + 574 1045 M + 63 0 V + 6325 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 490 1045 M + [ [(Helvetica) 140.0 0.0 true true 0 (-0.4)] + ] -46.7 MRshow + 1.000 UL + LTb + 574 1556 M + 63 0 V + 6325 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 490 1556 M + [ [(Helvetica) 140.0 0.0 true true 0 (-0.2)] + ] -46.7 MRshow + 1.000 UL + LTb + 574 2066 M + 63 0 V + 6325 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 490 2066 M + [ [(Helvetica) 140.0 0.0 true true 0 (0)] + ] -46.7 MRshow + 1.000 UL + LTb + 574 2576 M + 63 0 V + 6325 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 490 2576 M + [ [(Helvetica) 140.0 0.0 true true 0 (0.2)] + ] -46.7 MRshow + 1.000 UL + LTb + 574 3086 M + 63 0 V + 6325 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 490 3086 M + [ [(Helvetica) 140.0 0.0 true true 0 (0.4)] + ] -46.7 MRshow + 1.000 UL + LTb + 574 3596 M + 63 0 V + 6325 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 490 3596 M + [ [(Helvetica) 140.0 0.0 true true 0 (0.6)] + ] -46.7 MRshow + 1.000 UL + LTb + 574 4107 M + 63 0 V + 6325 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 490 4107 M + [ [(Helvetica) 140.0 0.0 true true 0 (0.8)] + ] -46.7 MRshow + 1.000 UL + LTb + 574 4617 M + 63 0 V + 6325 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 490 4617 M + [ [(Helvetica) 140.0 0.0 true true 0 (1)] + ] -46.7 MRshow + 1.000 UL + LTb + 574 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 574 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (0)] + ] -46.7 MCshow + 1.000 UL + LTb + 1542 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 1542 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (0.5)] + ] -46.7 MCshow + 1.000 UL + LTb + 2510 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 2510 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (1)] + ] -46.7 MCshow + 1.000 UL + LTb + 3478 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 3478 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (1.5)] + ] -46.7 MCshow + 1.000 UL + LTb + 4446 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 4446 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (2)] + ] -46.7 MCshow + 1.000 UL + LTb + 5413 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 5413 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (2.5)] + ] -46.7 MCshow + 1.000 UL + LTb + 6381 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 6381 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (3)] + ] -46.7 MCshow + 1.000 UL + LTb + 1.000 UL + LTb 574 4872 N 574 280 L 6388 0 V *************** *** 881,1048 **** 6594 4319 Pls 1.000 UL LTb - 574 535 M - 63 0 V - 6325 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 490 535 M - [ [(Helvetica) 140.0 0.0 true true 0 (-0.6)] - ] -46.7 MRshow - 1.000 UL - LTb - 574 1045 M - 63 0 V - 6325 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 490 1045 M - [ [(Helvetica) 140.0 0.0 true true 0 (-0.4)] - ] -46.7 MRshow - 1.000 UL - LTb - 574 1556 M - 63 0 V - 6325 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 490 1556 M - [ [(Helvetica) 140.0 0.0 true true 0 (-0.2)] - ] -46.7 MRshow - 1.000 UL - LTb - 574 2066 M - 63 0 V - 6325 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 490 2066 M - [ [(Helvetica) 140.0 0.0 true true 0 (0)] - ] -46.7 MRshow - 1.000 UL - LTb - 574 2576 M - 63 0 V - 6325 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 490 2576 M - [ [(Helvetica) 140.0 0.0 true true 0 (0.2)] - ] -46.7 MRshow - 1.000 UL - LTb - 574 3086 M - 63 0 V - 6325 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 490 3086 M - [ [(Helvetica) 140.0 0.0 true true 0 (0.4)] - ] -46.7 MRshow - 1.000 UL - LTb - 574 3596 M - 63 0 V - 6325 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 490 3596 M - [ [(Helvetica) 140.0 0.0 true true 0 (0.6)] - ] -46.7 MRshow - 1.000 UL - LTb - 574 4107 M - 63 0 V - 6325 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 490 4107 M - [ [(Helvetica) 140.0 0.0 true true 0 (0.8)] - ] -46.7 MRshow - 1.000 UL - LTb - 574 4617 M - 63 0 V - 6325 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 490 4617 M - [ [(Helvetica) 140.0 0.0 true true 0 (1)] - ] -46.7 MRshow - 1.000 UL - LTb - 574 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 574 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (0)] - ] -46.7 MCshow - 1.000 UL - LTb - 1542 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 1542 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (0.5)] - ] -46.7 MCshow - 1.000 UL - LTb - 2510 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 2510 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (1)] - ] -46.7 MCshow - 1.000 UL - LTb - 3478 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 3478 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (1.5)] - ] -46.7 MCshow - 1.000 UL - LTb - 4446 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 4446 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (2)] - ] -46.7 MCshow - 1.000 UL - LTb - 5413 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 5413 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (2.5)] - ] -46.7 MCshow - 1.000 UL - LTb - 6381 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 6381 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (3)] - ] -46.7 MCshow - 1.000 UL - LTb - 1.000 UL - LTb 574 4872 N 574 280 L 6388 0 V --- 1043,1048 ---- Binary files octave-2.9.19/doc/interpreter/interpft.pdf and octave-3.0.0/doc/interpreter/interpft.pdf differ Binary files octave-2.9.19/doc/interpreter/interpft.png and octave-3.0.0/doc/interpreter/interpft.png differ diff -cNr octave-2.9.19/doc/interpreter/interpn.eps octave-3.0.0/doc/interpreter/interpn.eps *** octave-2.9.19/doc/interpreter/interpn.eps Tue Dec 11 18:05:20 2007 --- octave-3.0.0/doc/interpreter/interpn.eps Thu Dec 20 16:13:03 2007 *************** *** 1,7 **** %!PS-Adobe-2.0 EPSF-2.0 %%Title: interpn.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Tue Dec 11 18:05:20 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments --- 1,7 ---- %!PS-Adobe-2.0 EPSF-2.0 %%Title: interpn.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Thu Dec 20 16:13:03 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments *************** *** 48,54 **** /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Tue Dec 11 18:05:20 2007) /DOCINFO pdfmark end } ifelse --- 48,54 ---- /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Thu Dec 20 16:13:03 2007) /DOCINFO pdfmark end } ifelse Binary files octave-2.9.19/doc/interpreter/interpn.pdf and octave-3.0.0/doc/interpreter/interpn.pdf differ diff -cNr octave-2.9.19/doc/interpreter/mesh.eps octave-3.0.0/doc/interpreter/mesh.eps *** octave-2.9.19/doc/interpreter/mesh.eps Tue Dec 11 18:05:38 2007 --- octave-3.0.0/doc/interpreter/mesh.eps Thu Dec 20 16:13:22 2007 *************** *** 1,7 **** %!PS-Adobe-2.0 EPSF-2.0 %%Title: mesh.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Tue Dec 11 18:05:38 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments --- 1,7 ---- %!PS-Adobe-2.0 EPSF-2.0 %%Title: mesh.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Thu Dec 20 16:13:22 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments *************** *** 48,54 **** /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Tue Dec 11 18:05:38 2007) /DOCINFO pdfmark end } ifelse --- 48,54 ---- /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Thu Dec 20 16:13:22 2007) /DOCINFO pdfmark end } ifelse Binary files octave-2.9.19/doc/interpreter/mesh.pdf and octave-3.0.0/doc/interpreter/mesh.pdf differ Binary files octave-2.9.19/doc/interpreter/octave-a4.pdf and octave-3.0.0/doc/interpreter/octave-a4.pdf differ Binary files octave-2.9.19/doc/interpreter/octave.pdf and octave-3.0.0/doc/interpreter/octave.pdf differ diff -cNr octave-2.9.19/doc/interpreter/plot.eps octave-3.0.0/doc/interpreter/plot.eps *** octave-2.9.19/doc/interpreter/plot.eps Tue Dec 11 18:05:33 2007 --- octave-3.0.0/doc/interpreter/plot.eps Thu Dec 20 16:13:17 2007 *************** *** 1,7 **** %!PS-Adobe-2.0 EPSF-2.0 %%Title: plot.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Tue Dec 11 18:05:33 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments --- 1,7 ---- %!PS-Adobe-2.0 EPSF-2.0 %%Title: plot.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Thu Dec 20 16:13:17 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments *************** *** 48,54 **** /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Tue Dec 11 18:05:33 2007) /DOCINFO pdfmark end } ifelse --- 48,54 ---- /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Thu Dec 20 16:13:17 2007) /DOCINFO pdfmark end } ifelse *************** *** 532,537 **** --- 532,639 ---- } ifelse 1.000 UL LTb + 574 280 M + 63 0 V + 6325 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 490 280 M + [ [(Helvetica) 140.0 0.0 true true 0 (-1)] + ] -46.7 MRshow + 1.000 UL + LTb + 574 1428 M + 63 0 V + 6325 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 490 1428 M + [ [(Helvetica) 140.0 0.0 true true 0 (-0.5)] + ] -46.7 MRshow + 1.000 UL + LTb + 574 2576 M + 63 0 V + 6325 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 490 2576 M + [ [(Helvetica) 140.0 0.0 true true 0 (0)] + ] -46.7 MRshow + 1.000 UL + LTb + 574 3724 M + 63 0 V + 6325 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 490 3724 M + [ [(Helvetica) 140.0 0.0 true true 0 (0.5)] + ] -46.7 MRshow + 1.000 UL + LTb + 574 4872 M + 63 0 V + 6325 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 490 4872 M + [ [(Helvetica) 140.0 0.0 true true 0 (1)] + ] -46.7 MRshow + 1.000 UL + LTb + 574 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 574 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (-10)] + ] -46.7 MCshow + 1.000 UL + LTb + 2171 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 2171 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (-5)] + ] -46.7 MCshow + 1.000 UL + LTb + 3768 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 3768 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (0)] + ] -46.7 MCshow + 1.000 UL + LTb + 5365 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 5365 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (5)] + ] -46.7 MCshow + 1.000 UL + LTb + 6962 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 6962 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (10)] + ] -46.7 MCshow + 1.000 UL + LTb + 1.000 UL + LTb 574 4872 N 574 280 L 6388 0 V *************** *** 747,854 **** stroke 1.000 UL LTb - 574 280 M - 63 0 V - 6325 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 490 280 M - [ [(Helvetica) 140.0 0.0 true true 0 (-1)] - ] -46.7 MRshow - 1.000 UL - LTb - 574 1428 M - 63 0 V - 6325 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 490 1428 M - [ [(Helvetica) 140.0 0.0 true true 0 (-0.5)] - ] -46.7 MRshow - 1.000 UL - LTb - 574 2576 M - 63 0 V - 6325 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 490 2576 M - [ [(Helvetica) 140.0 0.0 true true 0 (0)] - ] -46.7 MRshow - 1.000 UL - LTb - 574 3724 M - 63 0 V - 6325 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 490 3724 M - [ [(Helvetica) 140.0 0.0 true true 0 (0.5)] - ] -46.7 MRshow - 1.000 UL - LTb - 574 4872 M - 63 0 V - 6325 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 490 4872 M - [ [(Helvetica) 140.0 0.0 true true 0 (1)] - ] -46.7 MRshow - 1.000 UL - LTb - 574 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 574 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (-10)] - ] -46.7 MCshow - 1.000 UL - LTb - 2171 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 2171 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (-5)] - ] -46.7 MCshow - 1.000 UL - LTb - 3768 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 3768 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (0)] - ] -46.7 MCshow - 1.000 UL - LTb - 5365 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 5365 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (5)] - ] -46.7 MCshow - 1.000 UL - LTb - 6962 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 6962 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (10)] - ] -46.7 MCshow - 1.000 UL - LTb - 1.000 UL - LTb 574 4872 N 574 280 L 6388 0 V --- 849,854 ---- Binary files octave-2.9.19/doc/interpreter/plot.pdf and octave-3.0.0/doc/interpreter/plot.pdf differ Binary files octave-2.9.19/doc/interpreter/plot.png and octave-3.0.0/doc/interpreter/plot.png differ diff -cNr octave-2.9.19/doc/interpreter/plot.texi octave-3.0.0/doc/interpreter/plot.texi *** octave-2.9.19/doc/interpreter/plot.texi Tue Dec 11 19:37:58 2007 --- octave-3.0.0/doc/interpreter/plot.texi Fri Dec 21 16:28:42 2007 *************** *** 504,514 **** contour plots from three dimensional data. @anchor{doc-contour} ! @deftypefn {Function File} {@var{c} =} contour (@var{z}) ! @deftypefnx {Function File} {@var{c} =} contour (@var{z}, @var{vn}) ! @deftypefnx {Function File} {@var{c} =} contour (@var{x}, @var{y}, @var{z}) ! @deftypefnx {Function File} {@var{c} =} contour (@var{x}, @var{y}, @var{z}, @var{vn}) ! @deftypefnx {Function File} {@var{c} =} contour (@var{h}, @dots{}) @deftypefnx {Function File} {[@var{c}, @var{h}] =} contour (@dots{}) Plot level curves (contour lines) of the matrix @var{z}, using the contour matrix @var{c} computed by @code{contourc} from the same --- 504,515 ---- contour plots from three dimensional data. @anchor{doc-contour} ! @deftypefn {Function File} {} contour (@var{z}) ! @deftypefnx {Function File} {} contour (@var{z}, @var{vn}) ! @deftypefnx {Function File} {} contour (@var{x}, @var{y}, @var{z}) ! @deftypefnx {Function File} {} contour (@var{x}, @var{y}, @var{z}, @var{vn}) ! @deftypefnx {Function File} {} contour (@dots{}, @var{style}) ! @deftypefnx {Function File} {} contour (@var{h}, @dots{}) @deftypefnx {Function File} {[@var{c}, @var{h}] =} contour (@dots{}) Plot level curves (contour lines) of the matrix @var{z}, using the contour matrix @var{c} computed by @code{contourc} from the same *************** *** 524,529 **** --- 525,534 ---- @end group @end example + The style to use for the plot can be defined with a line style @var{style} + in a similar manner to the line styles used with the @code{plot} command. + Any markers defined by @var{style} are ignored. + The optional input and output argument @var{h} allows an axis handle to be passed to @code{contour} and the handles to the contour objects to be returned. diff -cNr octave-2.9.19/doc/interpreter/plot3.eps octave-3.0.0/doc/interpreter/plot3.eps *** octave-2.9.19/doc/interpreter/plot3.eps Tue Dec 11 18:05:39 2007 --- octave-3.0.0/doc/interpreter/plot3.eps Thu Dec 20 16:13:23 2007 *************** *** 1,7 **** %!PS-Adobe-2.0 EPSF-2.0 %%Title: plot3.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Tue Dec 11 18:05:39 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments --- 1,7 ---- %!PS-Adobe-2.0 EPSF-2.0 %%Title: plot3.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Thu Dec 20 16:13:23 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments *************** *** 48,54 **** /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Tue Dec 11 18:05:39 2007) /DOCINFO pdfmark end } ifelse --- 48,54 ---- /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Thu Dec 20 16:13:23 2007) /DOCINFO pdfmark end } ifelse *************** *** 1789,1796 **** LT0 0.00 0.00 1.00 C 3505 2947 M -183 10 V - %pm3d_map_begin - %pm3d_map_end stroke LT0 0.00 0.00 1.00 C 1.000 UL --- 1789,1794 ---- Binary files octave-2.9.19/doc/interpreter/plot3.pdf and octave-3.0.0/doc/interpreter/plot3.pdf differ diff -cNr octave-2.9.19/doc/interpreter/polar.eps octave-3.0.0/doc/interpreter/polar.eps *** octave-2.9.19/doc/interpreter/polar.eps Tue Dec 11 18:05:37 2007 --- octave-3.0.0/doc/interpreter/polar.eps Thu Dec 20 16:13:20 2007 *************** *** 1,7 **** %!PS-Adobe-2.0 EPSF-2.0 %%Title: polar.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Tue Dec 11 18:05:37 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments --- 1,7 ---- %!PS-Adobe-2.0 EPSF-2.0 %%Title: polar.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Thu Dec 20 16:13:20 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments *************** *** 48,54 **** /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Tue Dec 11 18:05:37 2007) /DOCINFO pdfmark end } ifelse --- 48,54 ---- /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Thu Dec 20 16:13:20 2007) /DOCINFO pdfmark end } ifelse *************** *** 532,993 **** } ifelse 1.000 UL LTb ! 490 4872 N ! 490 280 L ! 6472 0 V ! 0 4592 V ! -6472 0 V ! Z stroke ! 1.000 UP ! 1.000 UL ! LTb ! 0.500 UL ! LT0 ! 0.00 0.00 1.00 C 3567 2697 M ! 10 1 V ! 11 2 V ! 9 4 V ! 9 5 V ! 7 7 V ! 6 8 V ! 5 9 V ! 2 10 V ! 0 11 V ! -2 11 V ! -4 11 V ! -7 11 V ! -9 11 V ! -12 10 V ! -14 9 V ! -16 9 V ! -18 7 V ! -21 5 V ! -21 4 V ! -23 1 V ! -25 0 V ! -25 -3 V ! -25 -5 V ! -25 -8 V ! -25 -10 V ! -24 -12 V ! -22 -15 V ! -21 -18 V ! -19 -19 V ! -16 -22 V ! -14 -24 V ! -10 -25 V ! -7 -27 V ! -3 -28 V ! 1 -29 V ! 5 -29 V ! 10 -30 V ! 14 -29 V ! 18 -29 V ! 23 -28 V ! 28 -26 V ! 31 -25 V ! 36 -23 V ! 39 -19 V ! 43 -18 V ! 46 -13 V ! 49 -11 V ! 50 -6 V ! 53 -3 V ! 53 2 V ! 54 5 V ! 54 11 V ! 54 14 V ! 51 20 V ! 50 23 V ! 48 28 V ! 44 32 V ! 40 36 V ! 35 39 V ! 31 43 V ! 25 45 V ! 19 48 V ! 13 50 V ! 6 52 V ! -1 52 V ! -8 53 V ! -15 53 V ! -23 53 V ! -30 50 V ! -37 49 V ! -44 47 V ! -51 43 V ! -58 40 V ! -63 36 V ! -68 31 V ! -74 25 V ! -77 21 V ! -80 14 V ! -84 9 V ! -85 1 V ! -85 -4 V ! -86 -12 V ! -85 -18 V ! -83 -25 V ! -80 -31 V ! -76 -38 V ! -72 -44 V ! -66 -50 V ! -60 -56 V ! -53 -60 V ! -45 -65 V ! -37 -69 V ! -27 -72 V ! -18 -74 V ! -8 -77 V ! 2 -77 V ! 12 -78 V ! 23 -76 V ! 34 -76 V ! 44 -73 V ! 53 -71 V ! 64 -66 V ! 73 -62 V ! 81 -57 V ! 3037 1953 L ! 96 -44 V ! 103 -37 V ! 108 -29 V ! 112 -20 V ! 116 -12 V ! 118 -4 V ! 118 6 V ! 118 15 V ! 117 25 V ! 114 33 V ! 109 42 V ! 105 51 V ! 98 59 V ! 90 66 V ! 82 74 V ! 73 81 V ! 61 86 V ! 51 91 V ! 38 95 V ! 26 99 V ! 13 101 V ! -1 102 V ! -14 103 V ! -28 101 V ! -42 100 V ! -54 97 V ! -69 92 V ! -80 88 V ! -92 82 V ! -104 75 V ! -114 67 V ! -123 59 V ! -131 49 V ! -138 39 V ! -143 29 V ! -148 18 V ! -150 7 V ! -151 -5 V ! -151 -17 V ! -149 -28 V ! -146 -40 V ! -140 -51 V ! -134 -61 V ! -126 -72 V ! -117 -82 V ! -106 -91 V ! -94 -100 V ! -81 -106 V ! -67 -113 V ! -52 -118 V ! -37 -123 V ! -20 -125 V ! -3 -127 V ! 13 -128 V ! 30 -126 V ! 47 -125 V ! 64 -121 V ! 80 -116 V ! 95 -110 V ! 110 -103 V ! 124 -95 V ! 137 -85 V ! 148 -75 V ! 158 -64 V ! 167 -52 V ! 173 -39 V ! 179 -26 V ! 183 -12 V ! 184 2 V ! 184 16 V ! 182 30 V ! 179 45 V ! 172 57 V ! 165 71 V ! 156 84 V ! 145 95 V ! 132 107 V ! 118 117 V ! 102 126 V ! 86 133 V ! 68 141 V ! 50 145 V ! 30 150 V ! 11 152 V ! -10 152 V ! -30 152 V ! -50 150 V ! -70 146 V ! -89 140 V ! -108 134 V ! -125 126 V ! -142 116 V ! -158 105 V ! -171 93 V ! -184 80 V ! -195 66 V ! -203 51 V ! -210 35 V ! -214 20 V ! -217 3 V ! -218 -13 V ! -215 -30 V ! -212 -47 V ! -205 -62 V ! 2346 4112 L ! -186 -93 V ! 1986 3911 L ! 1826 3791 L ! 1682 3658 L ! 1555 3514 L ! 1448 3360 L ! -87 -161 V ! -65 -168 V ! -43 -174 V ! -20 -176 V ! 3 -178 V ! 27 -177 V ! 50 -175 V ! 73 -172 V ! 96 -165 V ! 118 -158 V ! 139 -150 V ! 158 -138 V ! 176 -126 V ! 194 -113 V ! 208 -98 V ! 220 -82 V ! 232 -65 V ! 240 -48 V ! 246 -29 V ! 249 -10 V ! 251 9 V ! 249 28 V ! 246 46 V ! 239 66 V ! 230 84 V ! 219 101 V ! 206 118 V ! 189 133 V ! 172 148 V ! 152 160 V ! 131 172 V ! 108 182 V ! 83 190 V ! 59 196 V ! 32 201 V ! 6 202 V ! -20 203 V ! -48 201 V ! -74 197 V ! -100 192 V ! -125 183 V ! -150 174 V ! -172 162 V ! -194 149 V ! -212 134 V ! -231 118 V ! -245 99 V ! -259 81 V ! -269 62 V ! -276 40 V ! -282 20 V ! -284 -2 V ! -283 -24 V ! -280 -45 V ! -273 -66 V ! -265 -87 V ! 1940 4516 L ! 1702 4390 L ! 1481 4246 L ! 1279 4085 L ! 1099 3909 L ! 943 3720 L ! 812 3519 L ! 707 3308 L ! 631 3089 L ! 583 2866 L ! 565 2638 L ! 12 -228 V ! 43 -227 V ! 72 -223 V ! 794 1742 L ! 924 1533 L ! 157 -200 V ! 184 -187 V ! 1473 974 L ! 1704 817 L ! 1955 679 L ! 2224 559 L ! 284 -99 V ! 297 -76 V ! 306 -55 V ! 313 -30 V ! 317 -7 V ! 317 17 V ! 314 41 V ! 308 65 V ! 299 89 V ! 287 111 V ! 272 133 V ! 253 153 V ! 233 173 V ! 210 189 V ! 185 206 V ! 156 219 V ! 128 230 V ! 97 240 V ! 65 247 V ! 33 252 V ! stroke ! 1.000 UL ! LTb ! 490 280 M ! 63 0 V ! 6409 0 R -63 0 V stroke ! 0.00 0.00 0.00 C 406 280 M [ [(Helvetica) 140.0 0.0 true true 0 (-30)] ] -46.7 MRshow 1.000 UL LTb ! 490 1086 M ! 63 0 V ! 6409 0 R -63 0 V stroke ! 0.00 0.00 0.00 C 406 1086 M [ [(Helvetica) 140.0 0.0 true true 0 (-20)] ] -46.7 MRshow 1.000 UL LTb ! 490 1891 M ! 63 0 V ! 6409 0 R -63 0 V stroke ! 0.00 0.00 0.00 C 406 1891 M [ [(Helvetica) 140.0 0.0 true true 0 (-10)] ] -46.7 MRshow 1.000 UL LTb ! 490 2697 M ! 63 0 V ! 6409 0 R -63 0 V stroke ! 0.00 0.00 0.00 C 406 2697 M [ [(Helvetica) 140.0 0.0 true true 0 (0)] ] -46.7 MRshow 1.000 UL LTb ! 490 3502 M ! 63 0 V ! 6409 0 R -63 0 V stroke ! 0.00 0.00 0.00 C 406 3502 M [ [(Helvetica) 140.0 0.0 true true 0 (10)] ] -46.7 MRshow 1.000 UL LTb ! 490 4308 M ! 63 0 V ! 6409 0 R -63 0 V stroke ! 0.00 0.00 0.00 C 406 4308 M [ [(Helvetica) 140.0 0.0 true true 0 (20)] ] -46.7 MRshow 1.000 UL LTb ! 1445 280 M 0 63 V ! 0 4529 R 0 -63 V stroke ! 0.00 0.00 0.00 C 1445 140 M [ [(Helvetica) 140.0 0.0 true true 0 (-20)] ] -46.7 MCshow 1.000 UL LTb ! 2506 280 M ! 0 63 V ! 0 4529 R 0 -63 V stroke ! 0.00 0.00 0.00 C 2506 140 M [ [(Helvetica) 140.0 0.0 true true 0 (-10)] ] -46.7 MCshow 1.000 UL LTb ! 3567 280 M ! 0 63 V ! 0 4529 R 0 -63 V stroke ! 0.00 0.00 0.00 C 3567 140 M [ [(Helvetica) 140.0 0.0 true true 0 (0)] ] -46.7 MCshow 1.000 UL LTb ! 4628 280 M ! 0 63 V ! 0 4529 R 0 -63 V stroke ! 0.00 0.00 0.00 C 4628 140 M [ [(Helvetica) 140.0 0.0 true true 0 (10)] ] -46.7 MCshow 1.000 UL LTb ! 5689 280 M ! 0 63 V ! 0 4529 R 0 -63 V stroke ! 0.00 0.00 0.00 C 5689 140 M [ [(Helvetica) 140.0 0.0 true true 0 (20)] ] -46.7 MCshow 1.000 UL LTb ! 6750 280 M ! 0 63 V ! 0 4529 R 0 -63 V stroke ! 0.00 0.00 0.00 C 6750 140 M [ [(Helvetica) 140.0 0.0 true true 0 (30)] ] -46.7 MCshow 1.000 UL LTb 1.000 UL LTb ! 490 4872 N ! 490 280 L ! 6472 0 V ! 0 4592 V ! -6472 0 V Z stroke 1.000 UP 1.000 UL --- 532,1019 ---- } ifelse 1.000 UL LTb ! 3600 273 M -63 0 V + 63 0 R + 63 0 V stroke ! 0.00 0.00 0.00 C 3516 273 M [ [(Helvetica) 140.0 0.0 true true 0 (-30)] ] -46.7 MRshow 1.000 UL LTb ! 3600 1022 M -63 0 V + 63 0 R + 63 0 V stroke ! 0.00 0.00 0.00 C 3516 1022 M [ [(Helvetica) 140.0 0.0 true true 0 (-20)] ] -46.7 MRshow 1.000 UL LTb ! 3600 1771 M -63 0 V + 63 0 R + 63 0 V stroke ! 0.00 0.00 0.00 C 3516 1771 M [ [(Helvetica) 140.0 0.0 true true 0 (-10)] ] -46.7 MRshow 1.000 UL LTb ! 3600 2520 M -63 0 V + 63 0 R + 63 0 V stroke ! 0.00 0.00 0.00 C 3516 2520 M [ [(Helvetica) 140.0 0.0 true true 0 (0)] ] -46.7 MRshow 1.000 UL LTb ! 3600 3269 M -63 0 V + 63 0 R + 63 0 V stroke ! 0.00 0.00 0.00 C 3516 3269 M [ [(Helvetica) 140.0 0.0 true true 0 (10)] ] -46.7 MRshow 1.000 UL LTb ! 3600 4018 M -63 0 V + 63 0 R + 63 0 V stroke ! 0.00 0.00 0.00 C 3516 4018 M [ [(Helvetica) 140.0 0.0 true true 0 (20)] ] -46.7 MRshow 1.000 UL LTb ! 3600 4767 M ! -63 0 V ! 63 0 R ! 63 0 V ! stroke ! 0.00 0.00 0.00 C 3516 4767 M ! [ [(Helvetica) 140.0 0.0 true true 0 (30)] ! ] -46.7 MRshow ! 1.000 UL ! LTb ! 1353 2520 M ! 0 -63 V ! 0 63 R 0 63 V ! stroke ! 0.00 0.00 0.00 C 1353 2317 M ! [ [(Helvetica) 140.0 0.0 true true 0 (-30)] ! ] -46.7 MCshow ! 1.000 UL ! LTb ! 2102 2520 M 0 -63 V + 0 63 R + 0 63 V stroke ! 0.00 0.00 0.00 C 2102 2317 M [ [(Helvetica) 140.0 0.0 true true 0 (-20)] ] -46.7 MCshow 1.000 UL LTb ! 2851 2520 M 0 -63 V + 0 63 R + 0 63 V stroke ! 0.00 0.00 0.00 C 2851 2317 M [ [(Helvetica) 140.0 0.0 true true 0 (-10)] ] -46.7 MCshow 1.000 UL LTb ! 3600 2520 M 0 -63 V + 0 63 R + 0 63 V stroke ! 0.00 0.00 0.00 C 3600 2317 M [ [(Helvetica) 140.0 0.0 true true 0 (0)] ] -46.7 MCshow 1.000 UL LTb ! 4349 2520 M 0 -63 V + 0 63 R + 0 63 V stroke ! 0.00 0.00 0.00 C 4349 2317 M [ [(Helvetica) 140.0 0.0 true true 0 (10)] ] -46.7 MCshow 1.000 UL LTb ! 5098 2520 M 0 -63 V + 0 63 R + 0 63 V stroke ! 0.00 0.00 0.00 C 5098 2317 M [ [(Helvetica) 140.0 0.0 true true 0 (20)] ] -46.7 MCshow 1.000 UL LTb ! 5847 2520 M 0 -63 V + 0 63 R + 0 63 V stroke ! 0.00 0.00 0.00 C 5847 2317 M [ [(Helvetica) 140.0 0.0 true true 0 (30)] ] -46.7 MCshow 1.000 UL LTb 1.000 UL + LTa + 1248 2520 M + 4704 0 V + 3600 168 M + 0 4704 V + stroke + LTb + 1248 4872 N + 0 -4704 V + 4704 0 V + 0 4704 V + -4704 0 V + Z stroke + 1.000 UP + 1.000 UL + LTb + 0.500 UL + LT0 + 0.00 0.00 1.00 C 3600 2520 M + 7 1 V + 8 2 V + 6 4 V + 7 5 V + 5 6 V + 4 7 V + 3 9 V + 2 9 V + 0 10 V + -2 10 V + -3 10 V + -4 11 V + -7 10 V + -8 9 V + -10 9 V + -11 8 V + -13 6 V + -15 5 V + -15 4 V + -16 1 V + -17 0 V + -18 -3 V + -18 -5 V + -18 -7 V + -17 -9 V + -17 -12 V + -16 -14 V + -15 -16 V + -13 -18 V + -11 -20 V + -10 -22 V + -7 -24 V + -5 -25 V + -2 -26 V + 0 -27 V + 4 -27 V + 7 -28 V + 10 -27 V + 13 -27 V + 16 -26 V + 19 -24 V + 23 -23 V + 25 -21 V + 28 -19 V + 30 -15 V + 32 -13 V + 35 -10 V + 35 -6 V + 37 -3 V + 38 2 V + 38 5 V + 38 10 V + 38 14 V + 37 17 V + 35 22 V + 33 26 V + 31 30 V + 29 33 V + 25 37 V + 22 39 V + 17 43 V + 14 44 V + 9 47 V + 4 48 V + -1 49 V + -5 49 V + -11 49 V + -16 49 V + -21 47 V + -27 45 V + -31 44 V + -36 40 V + -40 37 V + -45 33 V + -48 29 V + -52 24 V + -55 19 V + -56 13 V + -59 8 V + -60 2 V + -61 -5 V + -60 -10 V + -60 -17 V + -59 -23 V + -56 -30 V + -54 -35 V + -51 -41 V + -47 -46 V + -42 -52 V + -37 -56 V + -32 -60 V + -26 -64 V + -19 -67 V + -13 -70 V + -6 -70 V + 2 -72 V + 9 -72 V + 16 -72 V + 24 -70 V + 30 -68 V + 38 -66 V + 45 -62 V + 52 -57 V + 57 -53 V + 3226 1828 L + 68 -41 V + 73 -34 V + 76 -27 V + 79 -19 V + 82 -11 V + 83 -3 V + 83 6 V + 84 13 V + 82 23 V + 80 31 V + 78 39 V + 74 47 V + 69 55 V + 64 62 V + 58 69 V + 51 74 V + 43 81 V + 36 84 V + 27 89 V + 18 92 V + 9 94 V + 0 95 V + -10 95 V + -20 94 V + -29 93 V + -39 90 V + -48 86 V + -57 82 V + -65 76 V + -73 70 V + -81 62 V + -87 55 V + -92 45 V + -97 37 V + -102 27 V + -104 16 V + -106 7 V + -107 -5 V + -106 -15 V + -105 -27 V + -103 -36 V + -100 -48 V + -94 -57 V + -89 -67 V + -83 -76 V + -74 -85 V + -67 -92 V + -57 -99 V + -47 -105 V + -37 -110 V + -26 -114 V + -14 -117 V + -2 -118 V + 9 -118 V + 21 -118 V + 34 -116 V + 44 -112 V + 57 -108 V + 67 -103 V + 78 -96 V + 87 -88 V + 97 -79 V + 104 -70 V + 112 -59 V + 118 -48 V + 122 -36 V + 127 -24 V + 129 -12 V + 130 2 V + 130 15 V + 128 28 V + 126 41 V + 122 54 V + 116 66 V + 110 77 V + 102 89 V + 94 99 V + 83 109 V + 72 117 V + 61 124 V + 48 131 V + 35 135 V + 21 139 V + 8 141 V + -7 142 V + -21 142 V + -35 139 V + -50 135 V + -62 131 V + -77 124 V + -88 117 V + -101 108 V + -111 98 V + -121 86 V + -130 75 V + -137 61 V + -143 47 V + -148 34 V + -152 18 V + -153 3 V + -154 -13 V + -152 -28 V + -149 -43 V + -145 -58 V + 2738 3836 L + -131 -87 V + 2484 3649 L + 2371 3537 L + 2269 3413 L + -89 -133 V + -76 -143 V + -61 -150 V + -46 -157 V + -31 -161 V + -14 -164 V + 2 -165 V + 19 -165 V + 36 -163 V + 51 -159 V + 68 -154 V + 83 -147 V + 98 -139 V + 112 -129 V + 125 -117 V + 136 -105 V + 147 -91 V + 156 -76 V + 163 -61 V + 169 -44 V + 174 -27 V + 176 -9 V + 177 8 V + 176 26 V + 174 43 V + 169 61 V + 162 78 V + 155 94 V + 145 109 V + 134 124 V + 121 138 V + 107 149 V + 93 160 V + 76 169 V + 59 177 V + 41 182 V + 23 186 V + 4 189 V + -14 188 V + -34 187 V + -52 184 V + -71 178 V + -88 170 V + -106 162 V + -122 151 V + -136 138 V + -150 125 V + -163 109 V + -173 93 V + -183 75 V + -190 57 V + -195 38 V + -199 18 V + -200 -2 V + -200 -22 V + -198 -42 V + -193 -62 V + -186 -81 V + -179 -99 V + 2283 4094 L + 2127 3960 L + 1985 3811 L + 1858 3647 L + 1748 3471 L + -93 -187 V + -74 -196 V + -54 -203 V + -33 -208 V + -13 -211 V + 8 -213 V + 30 -211 V + 51 -207 V + 72 -203 V + 92 -194 V + 111 -186 V + 130 -174 V + 2122 918 L + 2285 772 L + 2462 643 L + 2652 532 L + 200 -91 V + 210 -72 V + 216 -50 V + 221 -29 V + 224 -6 V + 224 16 V + 221 38 V + 218 61 V + 211 82 V + 203 104 V + 191 123 V + 180 143 V + 164 160 V + 148 176 V + 130 191 V + 111 204 V + 90 214 V + 69 223 V + 46 230 V + 23 234 V + stroke + 1.000 UL LTb ! 1248 4872 N ! 0 -4704 V ! 4704 0 V ! 0 4704 V ! -4704 0 V Z stroke 1.000 UP 1.000 UL Binary files octave-2.9.19/doc/interpreter/polar.pdf and octave-3.0.0/doc/interpreter/polar.pdf differ Binary files octave-2.9.19/doc/interpreter/polar.png and octave-3.0.0/doc/interpreter/polar.png differ diff -cNr octave-2.9.19/doc/interpreter/sparse.texi octave-3.0.0/doc/interpreter/sparse.texi *** octave-2.9.19/doc/interpreter/sparse.texi Tue Dec 11 19:37:58 2007 --- octave-3.0.0/doc/interpreter/sparse.texi Fri Dec 21 16:28:43 2007 *************** *** 597,606 **** Create a sparse matrix from the full matrix @var{a}. is forced back to a full matrix is resulting matrix is sparse - @deftypefnx {Loadable Function} {@var{s} =} sparse (@var{a}, 1) - Create a sparse matrix and convert it back to a full matrix. - is forced back to a full matrix is resulting matrix is sparse - @deftypefnx {Loadable Function} {@var{s} =} sparse (@var{i}, @var{j}, @var{sv}, @var{m}, @var{n}, @var{nzmax}) Create a sparse matrix given integer index vectors @var{i} and @var{j}, a 1-by-@code{nnz} vector of real of complex values @var{sv}, overall --- 597,602 ---- *************** *** 987,995 **** 0 0 1 @end example ! returns a full matrix as can be seen. Additionally all sparse functions ! test the amount of memory occupied by the sparse matrix to see if the ! amount of storage used is larger than the amount used by the full equivalent. Therefore @code{speye (2) * 1} will return a full matrix as the memory used is smaller for the full version than the sparse version. --- 983,994 ---- 0 0 1 @end example ! returns a full matrix as can be seen. ! ! ! Additionally, if @code{sparse_auto_mutate} is true, all sparse functions ! test the amount of memory occupied by the sparse matrix to see if the ! amount of storage used is larger than the amount used by the full equivalent. Therefore @code{speye (2) * 1} will return a full matrix as the memory used is smaller for the full version than the sparse version. *************** *** 1016,1021 **** --- 1015,1044 ---- always returns a sparse matrix, even if the memory used will be larger than its full representation. + @anchor{doc-sparse_auto_mutate} + @deftypefn {Built-in Function} {@var{val} =} sparse_auto_mutate () + @deftypefnx {Built-in Function} {@var{old_val} =} sparse_auto_mutate (@var{new_val}) + Query or set the internal variable that controls whether Octave will + automatically mutate sparse matrices to real matrices to save memory. + For example, + + @example + s = speye(3); + sparse_auto_mutate (false) + s (:, 1) = 1; + typeinfo (s) + @result{} sparse matrix + sparse_auto_mutate (true) + s (1, :) = 1; + typeinfo (s) + @result{} matrix + @end example + @end deftypefn + + + Note that the @code{sparse_auto_mutate} option is incompatible with + @sc{Matlab}, and so it is off by default. + @node MathConsiderations, , ReturnType, Operators and Functions @subsubsection Mathematical Considerations diff -cNr octave-2.9.19/doc/interpreter/sparse.txi octave-3.0.0/doc/interpreter/sparse.txi *** octave-2.9.19/doc/interpreter/sparse.txi Mon Nov 26 15:42:09 2007 --- octave-3.0.0/doc/interpreter/sparse.txi Thu Dec 20 12:53:36 2007 *************** *** 535,543 **** 0 0 1 @end example ! returns a full matrix as can be seen. Additionally all sparse functions ! test the amount of memory occupied by the sparse matrix to see if the ! amount of storage used is larger than the amount used by the full equivalent. Therefore @code{speye (2) * 1} will return a full matrix as the memory used is smaller for the full version than the sparse version. --- 535,546 ---- 0 0 1 @end example ! returns a full matrix as can be seen. ! ! ! Additionally, if @code{sparse_auto_mutate} is true, all sparse functions ! test the amount of memory occupied by the sparse matrix to see if the ! amount of storage used is larger than the amount used by the full equivalent. Therefore @code{speye (2) * 1} will return a full matrix as the memory used is smaller for the full version than the sparse version. *************** *** 564,569 **** --- 567,577 ---- always returns a sparse matrix, even if the memory used will be larger than its full representation. + @DOCSTRING(sparse_auto_mutate) + + Note that the @code{sparse_auto_mutate} option is incompatible with + @sc{Matlab}, and so it is off by default. + @node MathConsiderations, , ReturnType, Operators and Functions @subsubsection Mathematical Considerations diff -cNr octave-2.9.19/doc/interpreter/spchol.eps octave-3.0.0/doc/interpreter/spchol.eps *** octave-2.9.19/doc/interpreter/spchol.eps Tue Dec 11 18:05:16 2007 --- octave-3.0.0/doc/interpreter/spchol.eps Thu Dec 20 16:12:58 2007 *************** *** 1,7 **** %!PS-Adobe-2.0 EPSF-2.0 %%Title: spchol.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Tue Dec 11 18:05:16 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments --- 1,7 ---- %!PS-Adobe-2.0 EPSF-2.0 %%Title: spchol.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Thu Dec 20 16:12:58 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments *************** *** 48,54 **** /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Tue Dec 11 18:05:16 2007) /DOCINFO pdfmark end } ifelse --- 48,54 ---- /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Thu Dec 20 16:12:58 2007) /DOCINFO pdfmark end } ifelse *************** *** 532,537 **** --- 532,639 ---- } ifelse 1.000 UL LTb + 490 4872 M + 63 0 V + 6409 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 406 4872 M + [ [(Helvetica) 140.0 0.0 true true 0 (0)] + ] -46.7 MRshow + 1.000 UL + LTb + 490 3730 M + 63 0 V + 6409 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 406 3730 M + [ [(Helvetica) 140.0 0.0 true true 0 (50)] + ] -46.7 MRshow + 1.000 UL + LTb + 490 2587 M + 63 0 V + 6409 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 406 2587 M + [ [(Helvetica) 140.0 0.0 true true 0 (100)] + ] -46.7 MRshow + 1.000 UL + LTb + 490 1445 M + 63 0 V + 6409 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 406 1445 M + [ [(Helvetica) 140.0 0.0 true true 0 (150)] + ] -46.7 MRshow + 1.000 UL + LTb + 490 303 M + 63 0 V + 6409 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 406 303 M + [ [(Helvetica) 140.0 0.0 true true 0 (200)] + ] -46.7 MRshow + 1.000 UL + LTb + 490 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 490 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (0)] + ] -46.7 MCshow + 1.000 UL + LTb + 2100 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 2100 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (50)] + ] -46.7 MCshow + 1.000 UL + LTb + 3710 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 3710 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (100)] + ] -46.7 MCshow + 1.000 UL + LTb + 5320 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 5320 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (150)] + ] -46.7 MCshow + 1.000 UL + LTb + 6930 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 6930 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (200)] + ] -46.7 MCshow + 1.000 UL + LTb + 1.000 UL + LTb 490 4872 N 490 280 L 6472 0 V *************** *** 10746,10853 **** 6930 303 Star 1.000 UL LTb - 490 4872 M - 63 0 V - 6409 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 406 4872 M - [ [(Helvetica) 140.0 0.0 true true 0 (0)] - ] -46.7 MRshow - 1.000 UL - LTb - 490 3730 M - 63 0 V - 6409 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 406 3730 M - [ [(Helvetica) 140.0 0.0 true true 0 (50)] - ] -46.7 MRshow - 1.000 UL - LTb - 490 2587 M - 63 0 V - 6409 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 406 2587 M - [ [(Helvetica) 140.0 0.0 true true 0 (100)] - ] -46.7 MRshow - 1.000 UL - LTb - 490 1445 M - 63 0 V - 6409 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 406 1445 M - [ [(Helvetica) 140.0 0.0 true true 0 (150)] - ] -46.7 MRshow - 1.000 UL - LTb - 490 303 M - 63 0 V - 6409 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 406 303 M - [ [(Helvetica) 140.0 0.0 true true 0 (200)] - ] -46.7 MRshow - 1.000 UL - LTb - 490 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 490 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (0)] - ] -46.7 MCshow - 1.000 UL - LTb - 2100 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 2100 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (50)] - ] -46.7 MCshow - 1.000 UL - LTb - 3710 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 3710 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (100)] - ] -46.7 MCshow - 1.000 UL - LTb - 5320 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 5320 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (150)] - ] -46.7 MCshow - 1.000 UL - LTb - 6930 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 6930 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (200)] - ] -46.7 MCshow - 1.000 UL - LTb - 1.000 UL - LTb 490 4872 N 490 280 L 6472 0 V --- 10848,10853 ---- Binary files octave-2.9.19/doc/interpreter/spchol.pdf and octave-3.0.0/doc/interpreter/spchol.pdf differ Binary files octave-2.9.19/doc/interpreter/spchol.png and octave-3.0.0/doc/interpreter/spchol.png differ diff -cNr octave-2.9.19/doc/interpreter/spcholperm.eps octave-3.0.0/doc/interpreter/spcholperm.eps *** octave-2.9.19/doc/interpreter/spcholperm.eps Tue Dec 11 18:05:17 2007 --- octave-3.0.0/doc/interpreter/spcholperm.eps Thu Dec 20 16:13:00 2007 *************** *** 1,7 **** %!PS-Adobe-2.0 EPSF-2.0 %%Title: spcholperm.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Tue Dec 11 18:05:17 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments --- 1,7 ---- %!PS-Adobe-2.0 EPSF-2.0 %%Title: spcholperm.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Thu Dec 20 16:13:00 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments *************** *** 48,54 **** /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Tue Dec 11 18:05:17 2007) /DOCINFO pdfmark end } ifelse --- 48,54 ---- /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Thu Dec 20 16:13:00 2007) /DOCINFO pdfmark end } ifelse *************** *** 532,537 **** --- 532,639 ---- } ifelse 1.000 UL LTb + 490 4872 M + 63 0 V + 6409 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 406 4872 M + [ [(Helvetica) 140.0 0.0 true true 0 (0)] + ] -46.7 MRshow + 1.000 UL + LTb + 490 3730 M + 63 0 V + 6409 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 406 3730 M + [ [(Helvetica) 140.0 0.0 true true 0 (50)] + ] -46.7 MRshow + 1.000 UL + LTb + 490 2587 M + 63 0 V + 6409 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 406 2587 M + [ [(Helvetica) 140.0 0.0 true true 0 (100)] + ] -46.7 MRshow + 1.000 UL + LTb + 490 1445 M + 63 0 V + 6409 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 406 1445 M + [ [(Helvetica) 140.0 0.0 true true 0 (150)] + ] -46.7 MRshow + 1.000 UL + LTb + 490 303 M + 63 0 V + 6409 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 406 303 M + [ [(Helvetica) 140.0 0.0 true true 0 (200)] + ] -46.7 MRshow + 1.000 UL + LTb + 490 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 490 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (0)] + ] -46.7 MCshow + 1.000 UL + LTb + 2100 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 2100 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (50)] + ] -46.7 MCshow + 1.000 UL + LTb + 3710 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 3710 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (100)] + ] -46.7 MCshow + 1.000 UL + LTb + 5320 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 5320 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (150)] + ] -46.7 MCshow + 1.000 UL + LTb + 6930 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 6930 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (200)] + ] -46.7 MCshow + 1.000 UL + LTb + 1.000 UL + LTb 490 4872 N 490 280 L 6472 0 V *************** *** 945,1052 **** 6930 303 Star 1.000 UL LTb - 490 4872 M - 63 0 V - 6409 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 406 4872 M - [ [(Helvetica) 140.0 0.0 true true 0 (0)] - ] -46.7 MRshow - 1.000 UL - LTb - 490 3730 M - 63 0 V - 6409 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 406 3730 M - [ [(Helvetica) 140.0 0.0 true true 0 (50)] - ] -46.7 MRshow - 1.000 UL - LTb - 490 2587 M - 63 0 V - 6409 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 406 2587 M - [ [(Helvetica) 140.0 0.0 true true 0 (100)] - ] -46.7 MRshow - 1.000 UL - LTb - 490 1445 M - 63 0 V - 6409 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 406 1445 M - [ [(Helvetica) 140.0 0.0 true true 0 (150)] - ] -46.7 MRshow - 1.000 UL - LTb - 490 303 M - 63 0 V - 6409 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 406 303 M - [ [(Helvetica) 140.0 0.0 true true 0 (200)] - ] -46.7 MRshow - 1.000 UL - LTb - 490 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 490 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (0)] - ] -46.7 MCshow - 1.000 UL - LTb - 2100 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 2100 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (50)] - ] -46.7 MCshow - 1.000 UL - LTb - 3710 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 3710 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (100)] - ] -46.7 MCshow - 1.000 UL - LTb - 5320 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 5320 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (150)] - ] -46.7 MCshow - 1.000 UL - LTb - 6930 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 6930 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (200)] - ] -46.7 MCshow - 1.000 UL - LTb - 1.000 UL - LTb 490 4872 N 490 280 L 6472 0 V --- 1047,1052 ---- Binary files octave-2.9.19/doc/interpreter/spcholperm.pdf and octave-3.0.0/doc/interpreter/spcholperm.pdf differ Binary files octave-2.9.19/doc/interpreter/spcholperm.png and octave-3.0.0/doc/interpreter/spcholperm.png differ diff -cNr octave-2.9.19/doc/interpreter/spmatrix.eps octave-3.0.0/doc/interpreter/spmatrix.eps *** octave-2.9.19/doc/interpreter/spmatrix.eps Tue Dec 11 18:05:14 2007 --- octave-3.0.0/doc/interpreter/spmatrix.eps Thu Dec 20 16:12:57 2007 *************** *** 1,7 **** %!PS-Adobe-2.0 EPSF-2.0 %%Title: spmatrix.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Tue Dec 11 18:05:14 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments --- 1,7 ---- %!PS-Adobe-2.0 EPSF-2.0 %%Title: spmatrix.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Thu Dec 20 16:12:57 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments *************** *** 48,54 **** /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Tue Dec 11 18:05:14 2007) /DOCINFO pdfmark end } ifelse --- 48,54 ---- /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Thu Dec 20 16:12:57 2007) /DOCINFO pdfmark end } ifelse *************** *** 532,537 **** --- 532,639 ---- } ifelse 1.000 UL LTb + 490 4872 M + 63 0 V + 6409 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 406 4872 M + [ [(Helvetica) 140.0 0.0 true true 0 (0)] + ] -46.7 MRshow + 1.000 UL + LTb + 490 3730 M + 63 0 V + 6409 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 406 3730 M + [ [(Helvetica) 140.0 0.0 true true 0 (50)] + ] -46.7 MRshow + 1.000 UL + LTb + 490 2587 M + 63 0 V + 6409 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 406 2587 M + [ [(Helvetica) 140.0 0.0 true true 0 (100)] + ] -46.7 MRshow + 1.000 UL + LTb + 490 1445 M + 63 0 V + 6409 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 406 1445 M + [ [(Helvetica) 140.0 0.0 true true 0 (150)] + ] -46.7 MRshow + 1.000 UL + LTb + 490 303 M + 63 0 V + 6409 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 406 303 M + [ [(Helvetica) 140.0 0.0 true true 0 (200)] + ] -46.7 MRshow + 1.000 UL + LTb + 490 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 490 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (0)] + ] -46.7 MCshow + 1.000 UL + LTb + 2100 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 2100 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (50)] + ] -46.7 MCshow + 1.000 UL + LTb + 3710 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 3710 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (100)] + ] -46.7 MCshow + 1.000 UL + LTb + 5320 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 5320 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (150)] + ] -46.7 MCshow + 1.000 UL + LTb + 6930 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 6930 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (200)] + ] -46.7 MCshow + 1.000 UL + LTb + 1.000 UL + LTb 490 4872 N 490 280 L 6472 0 V *************** *** 1144,1251 **** 6930 303 Star 1.000 UL LTb - 490 4872 M - 63 0 V - 6409 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 406 4872 M - [ [(Helvetica) 140.0 0.0 true true 0 (0)] - ] -46.7 MRshow - 1.000 UL - LTb - 490 3730 M - 63 0 V - 6409 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 406 3730 M - [ [(Helvetica) 140.0 0.0 true true 0 (50)] - ] -46.7 MRshow - 1.000 UL - LTb - 490 2587 M - 63 0 V - 6409 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 406 2587 M - [ [(Helvetica) 140.0 0.0 true true 0 (100)] - ] -46.7 MRshow - 1.000 UL - LTb - 490 1445 M - 63 0 V - 6409 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 406 1445 M - [ [(Helvetica) 140.0 0.0 true true 0 (150)] - ] -46.7 MRshow - 1.000 UL - LTb - 490 303 M - 63 0 V - 6409 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 406 303 M - [ [(Helvetica) 140.0 0.0 true true 0 (200)] - ] -46.7 MRshow - 1.000 UL - LTb - 490 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 490 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (0)] - ] -46.7 MCshow - 1.000 UL - LTb - 2100 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 2100 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (50)] - ] -46.7 MCshow - 1.000 UL - LTb - 3710 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 3710 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (100)] - ] -46.7 MCshow - 1.000 UL - LTb - 5320 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 5320 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (150)] - ] -46.7 MCshow - 1.000 UL - LTb - 6930 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 6930 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (200)] - ] -46.7 MCshow - 1.000 UL - LTb - 1.000 UL - LTb 490 4872 N 490 280 L 6472 0 V --- 1246,1251 ---- Binary files octave-2.9.19/doc/interpreter/spmatrix.pdf and octave-3.0.0/doc/interpreter/spmatrix.pdf differ Binary files octave-2.9.19/doc/interpreter/spmatrix.png and octave-3.0.0/doc/interpreter/spmatrix.png differ diff -cNr octave-2.9.19/doc/interpreter/triplot.eps octave-3.0.0/doc/interpreter/triplot.eps *** octave-2.9.19/doc/interpreter/triplot.eps Tue Dec 11 18:05:26 2007 --- octave-3.0.0/doc/interpreter/triplot.eps Thu Dec 20 16:13:09 2007 *************** *** 1,7 **** %!PS-Adobe-2.0 EPSF-2.0 %%Title: triplot.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Tue Dec 11 18:05:26 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments --- 1,7 ---- %!PS-Adobe-2.0 EPSF-2.0 %%Title: triplot.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Thu Dec 20 16:13:09 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments *************** *** 48,54 **** /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Tue Dec 11 18:05:26 2007) /DOCINFO pdfmark end } ifelse --- 48,54 ---- /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Thu Dec 20 16:13:09 2007) /DOCINFO pdfmark end } ifelse *************** *** 532,645 **** } ifelse 1.000 UL LTb - 490 4872 N - 490 280 L - 6472 0 V - 0 4592 V - -6472 0 V - Z stroke - 1.000 UP - 1.000 UL - LTb - 0.500 UL - LT0 - 0.00 0.00 1.00 C 5841 1967 M - 776 2406 V - 6927 1038 L - 5841 1967 L - 6662 355 M - -55 -40 V - 320 723 V - 6662 355 L - 5163 4365 M - 2830 4866 L - 6617 4373 L - -1454 -8 V - 5075 3347 M - 5841 1967 L - 776 2406 V - 5075 3347 L - 5841 1967 L - 4712 2650 L - 363 697 V - 88 1018 V - 1454 8 V - 5075 3347 L - 728 1679 M - 2355 898 V - 1228 827 L - 728 1679 L - 3180 3627 M - 3083 2577 L - 1629 73 V - 3180 3627 L - 1977 4434 L - 853 432 V - 3180 3627 L - 4277 1293 M - 6 -995 V - 1228 827 L - 3049 466 V - 1564 674 V - 6927 1038 L - 4277 1293 L - 6607 315 L - 320 723 V - 4277 1293 L - 6 -995 V - 2324 17 V - 4277 1293 L - 2249 2813 M - 728 1679 L - 535 2365 L - 1714 448 V - 728 1679 L - 2355 898 V - -834 236 V - 931 814 V - 3083 2577 L - -834 236 V - 1977 4434 L - 535 2365 L - 1714 448 V - 931 814 V - 1977 4434 L - 2249 2813 L - 3857 3920 M - 5075 3347 L - 4712 2650 L - 3857 3920 L - 3180 3627 L - 4712 2650 L - 3857 3920 L - 5075 3347 L - 88 1018 V - 3857 3920 L - 1306 445 V - 2830 4866 L - 3857 3920 L - 3180 3627 L - 2830 4866 L - 3857 3920 L - 4109 1710 M - 3083 2577 L - 1228 827 L - 2881 883 V - 168 -417 V - 1228 827 L - 2881 883 V - 3083 2577 L - 1629 73 V - 4109 1710 L - 1732 257 V - 4712 2650 L - 4109 1710 L - 168 -417 V - 1564 674 V - 4109 1710 L - stroke - 1.000 UL - LTb 490 655 M 63 0 V 6409 0 R --- 532,537 ---- *************** *** 851,856 **** --- 743,856 ---- 1.000 UP 1.000 UL LTb + 0.500 UL + LT0 + 0.00 0.00 1.00 C 5841 1967 M + 776 2406 V + 6927 1038 L + 5841 1967 L + 6662 355 M + -55 -40 V + 320 723 V + 6662 355 L + 5163 4365 M + 2830 4866 L + 6617 4373 L + -1454 -8 V + 5075 3347 M + 5841 1967 L + 776 2406 V + 5075 3347 L + 5841 1967 L + 4712 2650 L + 363 697 V + 88 1018 V + 1454 8 V + 5075 3347 L + 728 1679 M + 2355 898 V + 1228 827 L + 728 1679 L + 3180 3627 M + 3083 2577 L + 1629 73 V + 3180 3627 L + 1977 4434 L + 853 432 V + 3180 3627 L + 4277 1293 M + 6 -995 V + 1228 827 L + 3049 466 V + 1564 674 V + 6927 1038 L + 4277 1293 L + 6607 315 L + 320 723 V + 4277 1293 L + 6 -995 V + 2324 17 V + 4277 1293 L + 2249 2813 M + 728 1679 L + 535 2365 L + 1714 448 V + 728 1679 L + 2355 898 V + -834 236 V + 931 814 V + 3083 2577 L + -834 236 V + 1977 4434 L + 535 2365 L + 1714 448 V + 931 814 V + 1977 4434 L + 2249 2813 L + 3857 3920 M + 5075 3347 L + 4712 2650 L + 3857 3920 L + 3180 3627 L + 4712 2650 L + 3857 3920 L + 5075 3347 L + 88 1018 V + 3857 3920 L + 1306 445 V + 2830 4866 L + 3857 3920 L + 3180 3627 L + 2830 4866 L + 3857 3920 L + 4109 1710 M + 3083 2577 L + 1228 827 L + 2881 883 V + 168 -417 V + 1228 827 L + 2881 883 V + 3083 2577 L + 1629 73 V + 4109 1710 L + 1732 257 V + 4712 2650 L + 4109 1710 L + 168 -417 V + 1564 674 V + 4109 1710 L + stroke + 1.000 UL + LTb + 490 4872 N + 490 280 L + 6472 0 V + 0 4592 V + -6472 0 V + Z stroke + 1.000 UP + 1.000 UL + LTb stroke grestore end Binary files octave-2.9.19/doc/interpreter/triplot.pdf and octave-3.0.0/doc/interpreter/triplot.pdf differ Binary files octave-2.9.19/doc/interpreter/triplot.png and octave-3.0.0/doc/interpreter/triplot.png differ diff -cNr octave-2.9.19/doc/interpreter/voronoi.eps octave-3.0.0/doc/interpreter/voronoi.eps *** octave-2.9.19/doc/interpreter/voronoi.eps Tue Dec 11 18:05:25 2007 --- octave-3.0.0/doc/interpreter/voronoi.eps Thu Dec 20 16:13:07 2007 *************** *** 1,7 **** %!PS-Adobe-2.0 EPSF-2.0 %%Title: voronoi.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Tue Dec 11 18:05:25 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments --- 1,7 ---- %!PS-Adobe-2.0 EPSF-2.0 %%Title: voronoi.eps %%Creator: gnuplot 4.2 patchlevel 2 ! %%CreationDate: Thu Dec 20 16:13:07 2007 %%DocumentFonts: (atend) %%BoundingBox: 50 50 410 302 %%EndComments *************** *** 48,54 **** /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Tue Dec 11 18:05:25 2007) /DOCINFO pdfmark end } ifelse --- 48,54 ---- /Author (John W. Eaton,,,) % /Producer (gnuplot) % /Keywords () ! /CreationDate (Thu Dec 20 16:13:07 2007) /DOCINFO pdfmark end } ifelse *************** *** 532,537 **** --- 532,659 ---- } ifelse 1.000 UL LTb + 490 280 M + 63 0 V + 6409 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 406 280 M + [ [(Helvetica) 140.0 0.0 true true 0 (0)] + ] -46.7 MRshow + 1.000 UL + LTb + 490 1198 M + 63 0 V + 6409 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 406 1198 M + [ [(Helvetica) 140.0 0.0 true true 0 (0.2)] + ] -46.7 MRshow + 1.000 UL + LTb + 490 2117 M + 63 0 V + 6409 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 406 2117 M + [ [(Helvetica) 140.0 0.0 true true 0 (0.4)] + ] -46.7 MRshow + 1.000 UL + LTb + 490 3035 M + 63 0 V + 6409 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 406 3035 M + [ [(Helvetica) 140.0 0.0 true true 0 (0.6)] + ] -46.7 MRshow + 1.000 UL + LTb + 490 3954 M + 63 0 V + 6409 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 406 3954 M + [ [(Helvetica) 140.0 0.0 true true 0 (0.8)] + ] -46.7 MRshow + 1.000 UL + LTb + 490 4872 M + 63 0 V + 6409 0 R + -63 0 V + stroke + 0.00 0.00 0.00 C 406 4872 M + [ [(Helvetica) 140.0 0.0 true true 0 (1)] + ] -46.7 MRshow + 1.000 UL + LTb + 490 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 490 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (0)] + ] -46.7 MCshow + 1.000 UL + LTb + 1784 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 1784 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (0.2)] + ] -46.7 MCshow + 1.000 UL + LTb + 3079 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 3079 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (0.4)] + ] -46.7 MCshow + 1.000 UL + LTb + 4373 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 4373 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (0.6)] + ] -46.7 MCshow + 1.000 UL + LTb + 5668 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 5668 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (0.8)] + ] -46.7 MCshow + 1.000 UL + LTb + 6962 280 M + 0 63 V + 0 4529 R + 0 -63 V + stroke + 0.00 0.00 0.00 C 6962 140 M + [ [(Helvetica) 140.0 0.0 true true 0 (1)] + ] -46.7 MCshow + 1.000 UL + LTb + 1.000 UL + LTb 490 4872 N 490 280 L 6472 0 V *************** *** 886,1013 **** stroke 1.000 UL LTb - 490 280 M - 63 0 V - 6409 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 406 280 M - [ [(Helvetica) 140.0 0.0 true true 0 (0)] - ] -46.7 MRshow - 1.000 UL - LTb - 490 1198 M - 63 0 V - 6409 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 406 1198 M - [ [(Helvetica) 140.0 0.0 true true 0 (0.2)] - ] -46.7 MRshow - 1.000 UL - LTb - 490 2117 M - 63 0 V - 6409 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 406 2117 M - [ [(Helvetica) 140.0 0.0 true true 0 (0.4)] - ] -46.7 MRshow - 1.000 UL - LTb - 490 3035 M - 63 0 V - 6409 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 406 3035 M - [ [(Helvetica) 140.0 0.0 true true 0 (0.6)] - ] -46.7 MRshow - 1.000 UL - LTb - 490 3954 M - 63 0 V - 6409 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 406 3954 M - [ [(Helvetica) 140.0 0.0 true true 0 (0.8)] - ] -46.7 MRshow - 1.000 UL - LTb - 490 4872 M - 63 0 V - 6409 0 R - -63 0 V - stroke - 0.00 0.00 0.00 C 406 4872 M - [ [(Helvetica) 140.0 0.0 true true 0 (1)] - ] -46.7 MRshow - 1.000 UL - LTb - 490 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 490 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (0)] - ] -46.7 MCshow - 1.000 UL - LTb - 1784 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 1784 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (0.2)] - ] -46.7 MCshow - 1.000 UL - LTb - 3079 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 3079 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (0.4)] - ] -46.7 MCshow - 1.000 UL - LTb - 4373 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 4373 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (0.6)] - ] -46.7 MCshow - 1.000 UL - LTb - 5668 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 5668 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (0.8)] - ] -46.7 MCshow - 1.000 UL - LTb - 6962 280 M - 0 63 V - 0 4529 R - 0 -63 V - stroke - 0.00 0.00 0.00 C 6962 140 M - [ [(Helvetica) 140.0 0.0 true true 0 (1)] - ] -46.7 MCshow - 1.000 UL - LTb - 1.000 UL - LTb 490 4872 N 490 280 L 6472 0 V --- 1008,1013 ---- Binary files octave-2.9.19/doc/interpreter/voronoi.pdf and octave-3.0.0/doc/interpreter/voronoi.pdf differ Binary files octave-2.9.19/doc/liboctave/liboctave.pdf and octave-3.0.0/doc/liboctave/liboctave.pdf differ Binary files octave-2.9.19/doc/refcard/refcard-a4.pdf and octave-3.0.0/doc/refcard/refcard-a4.pdf differ Binary files octave-2.9.19/doc/refcard/refcard-legal.pdf and octave-3.0.0/doc/refcard/refcard-legal.pdf differ Binary files octave-2.9.19/doc/refcard/refcard-letter.pdf and octave-3.0.0/doc/refcard/refcard-letter.pdf differ diff -cNr octave-2.9.19/libcruft/ChangeLog octave-3.0.0/libcruft/ChangeLog *** octave-2.9.19/libcruft/ChangeLog Thu Nov 1 13:37:21 2007 --- octave-3.0.0/libcruft/ChangeLog Fri Dec 21 12:46:23 2007 *************** *** 1,3 **** --- 1,7 ---- + 2007-12-21 John W. Eaton + + Version 3.0.0 released. + 2007-11-01 John W. Eaton * lapack-xtra/xzlange.f: Include complete implementation of ZLANGE diff -cNr octave-2.9.19/liboctave/Array.cc octave-3.0.0/liboctave/Array.cc *** octave-2.9.19/liboctave/Array.cc Mon Dec 3 17:55:21 2007 --- octave-3.0.0/liboctave/Array.cc Mon Dec 17 22:48:03 2007 *************** *** 2246,2252 **** { dim_vector result_dims; ! if (vec_equiv) { result_dims = dv; --- 2246,2252 ---- { dim_vector result_dims; ! if (vec_equiv && ! orig_len == 1) { result_dims = dv; diff -cNr octave-2.9.19/liboctave/ChangeLog octave-3.0.0/liboctave/ChangeLog *** octave-2.9.19/liboctave/ChangeLog Tue Dec 11 17:06:49 2007 --- octave-3.0.0/liboctave/ChangeLog Fri Dec 21 12:46:22 2007 *************** *** 1,3 **** --- 1,26 ---- + 2007-12-21 John W. Eaton + + Version 3.0.0 released. + + 2007-12-18 David Bateman + + * Sparse.cc (template Sparse Sparse::index + (idx_vector&, int) const): Fix case indexing of non zero scalar + stored as a sparse matrix. + (template Sparse Sparse::index (idx_vector&, + idx_vector&, int) const): For the non permutated indexing case, + fix link list calculation and use. + + 2007-12-17 John W. Eaton + + * Array.cc (Array::indexN): Correctly handle scalar indexed by + N-d array. + + 2007-12-17 David Bateman + + * Sparse-op-defs.h (SPARSE_ANY_ALL_OP_ROW_CODE): Use ridx for row + index. + 2007-12-11 John W. Eaton * Sparse.cc (Sparse::index (idx_vector&, int) const): diff -cNr octave-2.9.19/liboctave/Sparse-op-defs.h octave-3.0.0/liboctave/Sparse-op-defs.h *** octave-2.9.19/liboctave/Sparse-op-defs.h Fri Dec 7 14:26:20 2007 --- octave-3.0.0/liboctave/Sparse-op-defs.h Mon Dec 17 14:02:13 2007 *************** *** 1697,1703 **** #define SPARSE_ANY_ALL_OP_ROW_CODE(TEST_OP, TEST_TRUE_VAL) \ if (data (i) TEST_OP 0.0) \ { \ ! tmp[i] = TEST_TRUE_VAL; \ break; \ } --- 1697,1703 ---- #define SPARSE_ANY_ALL_OP_ROW_CODE(TEST_OP, TEST_TRUE_VAL) \ if (data (i) TEST_OP 0.0) \ { \ ! tmp[ridx(i)] = TEST_TRUE_VAL; \ break; \ } diff -cNr octave-2.9.19/liboctave/Sparse.cc octave-3.0.0/liboctave/Sparse.cc *** octave-2.9.19/liboctave/Sparse.cc Tue Dec 11 17:06:49 2007 --- octave-3.0.0/liboctave/Sparse.cc Wed Dec 19 16:27:23 2007 *************** *** 1537,1543 **** for (octave_idx_type i = 0; i < n; i++) { if (i % new_nr == 0) ! retval.xcidx(i % new_nr) = ic; octave_idx_type ii = idx_arg.elem (i); if (ii == 0) --- 1537,1543 ---- for (octave_idx_type i = 0; i < n; i++) { if (i % new_nr == 0) ! retval.xcidx(i / new_nr) = ic; octave_idx_type ii = idx_arg.elem (i); if (ii == 0) *************** *** 1946,1955 **** start_nodes[ii] = i; else { ! struct idx_node inode = nodes[node]; ! while (inode.next) ! inode = *inode.next; ! inode.next = nodes + i; } } --- 1946,1954 ---- start_nodes[ii] = i; else { ! while (nodes[node].next) ! node = nodes[node].next->i; ! nodes[node].next = nodes + i; } } *************** *** 1974,1981 **** while (true) { ! if (inode.i >= 0 && ! idx_i.elem (inode.i) < nc) new_nzmx ++; if (inode.next == 0) break; --- 1973,1979 ---- while (true) { ! if (idx_i.elem (inode.i) < nr) new_nzmx ++; if (inode.next == 0) break; *************** *** 2011,2018 **** while (true) { ! if (inode.i >= 0 && ! idx_i.elem (inode.i) < nc) { X [inode.i] = data (i); retval.xridx (kk++) = inode.i; --- 2009,2015 ---- while (true) { ! if (idx_i.elem (inode.i) < nr) { X [inode.i] = data (i); retval.xridx (kk++) = inode.i; diff -cNr octave-2.9.19/octMakefile.in octave-3.0.0/octMakefile.in *** octave-2.9.19/octMakefile.in Tue Dec 4 15:51:25 2007 --- octave-3.0.0/octMakefile.in Thu Dec 13 16:35:36 2007 *************** *** 89,103 **** $(MAKE) -C $@ all .PHONY: $(SUBDIRS) ! octave-bug: octave-bug.in Makeconf octMakefile @$(do-subst-config-vals) chmod a+rx $@ ! octave-config: octave-config.in Makeconf octMakefile @$(do-subst-default-vals) chmod a+rx $@ ! mkoctfile: mkoctfile.in Makeconf octMakefile @$(do-subst-config-vals) chmod a+rx $@ --- 89,103 ---- $(MAKE) -C $@ all .PHONY: $(SUBDIRS) ! octave-bug: octave-bug.in Makeconf octMakefile $(top_srcdir)/src/version.h @$(do-subst-config-vals) chmod a+rx $@ ! octave-config: octave-config.in Makeconf octMakefile $(top_srcdir)/src/version.h @$(do-subst-default-vals) chmod a+rx $@ ! mkoctfile: mkoctfile.in Makeconf octMakefile $(top_srcdir)/src/version.h @$(do-subst-config-vals) chmod a+rx $@ diff -cNr octave-2.9.19/scripts/ChangeLog octave-3.0.0/scripts/ChangeLog *** octave-2.9.19/scripts/ChangeLog Tue Dec 11 16:49:31 2007 --- octave-3.0.0/scripts/ChangeLog Fri Dec 21 16:21:32 2007 *************** *** 1,3 **** --- 1,91 ---- + 2007-12-21 John W. Eaton + + Version 3.0.0 released. + + 2007-12-21 Soren Hauberg + + * image/imshow.m: Accept empty value for display_range. + + 2007-12-20 Michael Goffioul + + * pkg/pkg.m: Add .lib as architecture-dependent suffix. + + 2007-12-19 Soren Hauberg + + * image/imshow.m: Store uint8 images as doubles. Handle default + display ranges correctly. + + 2007-12-19 Alexander Barth + Peter A. Gustafson + + * scripts/contourc.m: Allow usage of irregular spaced x, y data. + + 2007-12-19 John W. Eaton + + * miscellaneous/edit.m: New function. + * miscellaneous/Makefile.in (SOURCES): Add it to the list. + + 2007-12-19 Michael Goffioul + + * plot/__bar__.m: Handle "basevalue" option. + * plot/__bars__.m: New arg, base_value. + + 2007-12-17 David Bateman + + * plot/rose.m, plot/feather.m, plot/compass.m: New functions + * plot/Makefiles (SOURCES): Add them to the sources + * plot/polar.m: Set the x and y limits to the maximum polar + radius. Set the axes to be square. + * plot/__go_draw_axes__.m: Allow {x|y}axislocation to be "zero" + and print axis at zero if this is used. + + * plot/__go_draw_axes__.m: Use "set pm3d explicit" so that + contours can overlay pcolor plots. Priveldge no hidden line + removal when there are multiple objects in the plot. + + 2007-12-17 Peter A. Gustafson + + * plot/__go_draw_axes__.m: Fix mirrored tics and borders for + set (gca (), "[xy]axislocation", "{right|top}", "box", "off"). + + 2007-12-17 Ben Abbott + + * miscellaneous/run.m: Replace script with f when looking for + file to run. + + 2007-12-14 David Bateman + + * plot/contour3.m, plot/__contour__.m: Handle linespec. + * plot/contour.m: Doc fix. + * plot/__go_draw_axes__.m (case "patch"): Include "lt" in lt string. + Include linetype in withclause. + + * plot/__go_draw_axes__.m (__calc_dimensions__): New function. + Use it to determine dimensions. Consolidate all 3-d settings. + + 2007-12-13 John W. Eaton + + * image/imshow.m: Turn axis visibility off. + Don't scale true color images. + * image/image.m: Set axis layer property to "top". + + 2007-12-12 John W. Eaton + + * image/loadimage.m: Avoid calling eval. Avoid calling exist. + + * plot/pie.m: Avoid calling "exist". + + * linear-algebra/condest.m: Use nargin instead of size(varargin,2). + Condense argument processing logic. Allow 6 arguments. + Use issquare. Avoid calling "exist". + + * plot/__go_draw_axes__.m: Handle the axes layer property. + + 2007-12-12 David Bateman + + * plot/ellipsoid.m: Port from octave-forge, editing for style. + * plot/Makefile.in (SOURCES): Add to the sources. + 2007-12-11 John W. Eaton * plot/surf.m: Set xgrid, ygrid, and zgrid on here. diff -cNr octave-2.9.19/scripts/DOCSTRINGS octave-3.0.0/scripts/DOCSTRINGS *** octave-2.9.19/scripts/DOCSTRINGS Tue Dec 11 18:04:47 2007 --- octave-3.0.0/scripts/DOCSTRINGS Fri Dec 21 16:28:25 2007 *************** *** 6797,6811 **** If @var{x} is a vector, return @code{nextpow2 (length (@var{x}))}. @seealso{pow2} @end deftypefn - perror - -*- texinfo -*- - @deftypefn {Function File} {} perror (@var{name}, @var{num}) - Print the error message for function @var{name} corresponding to the - error number @var{num}. This function is intended to be used to print - useful error messages for those functions that return numeric error - codes. - @seealso{strerror} - @end deftypefn nthroot -*- texinfo -*- @deftypefn {Function File} {} nthroot (@var{x}, @var{n}) --- 6797,6802 ---- *************** *** 6833,6838 **** --- 6824,6838 ---- (@pxref{Formatted Output}). @seealso{sprintf, int2str} @end deftypefn + perror + -*- texinfo -*- + @deftypefn {Function File} {} perror (@var{name}, @var{num}) + Print the error message for function @var{name} corresponding to the + error number @var{num}. This function is intended to be used to print + useful error messages for those functions that return numeric error + codes. + @seealso{strerror} + @end deftypefn pol2cart -*- texinfo -*- @deftypefn {Function File} {[@var{x}, @var{y}] =} pol2cart (@var{theta}, @var{r}) *************** *** 8492,8497 **** --- 8492,8599 ---- @var{file} in a format that can be parsed by Octave later. If @var{file} is omitted, the listing is printed to stdout. @end deftypefn + edit + -*- texinfo -*- + @deftypefn {Command} edit @var{name} + @deftypefnx {Command} edit @var{field} @var{value} + @deftypefnx {Command} @var{value} = edit get @var{field} + Edit the named function, or change editor settings. + + If @code{edit} is called with the name of a file or function as + its argument it will be opened in a text editor. + + @itemize @bullet + @item + If the function @var{name} is available in a file on your path and + that file is modifiable, then it will be edited in place. If it + is a system function, then it will first be copied to the directory + @code{HOME} (see further down) and then edited. + + @item + If @var{name} is the name of a function defined in the interpreter but + not in an m-file, then an m-file will be created in @code{HOME} + to contain that function along with its current definition. + + @item + If @code{name.cc} is specified, then it will search for @code{name.cc} + in the path and try to modify it, otherwise it will create a new + @file{.cc} file in @code{HOME}. If @var{name} happens to be an + m-file or interpreter defined function, then the text of that + function will be inserted into the .cc file as a comment. + + @item + If @var{name.ext} is on your path then it will be editted, otherwise + the editor will be started with @file{HOME/name.ext} as the + filename. If @file{name.ext} is not modifiable, it will be copied to + @code{HOME} before editing. + + @strong{WARNING!} You may need to clear name before the new definition + is available. If you are editing a .cc file, you will need + to mkoctfile @file{name.cc} before the definition will be available. + @end itemize + + If @code{edit} is called with @var{field} and @var{value} variables, + the value of the control field @var{field} will be @var{value}. + If an output argument is requested and the first argument is @code{get} + then @code{edit} will return the value of the control field @var{field}. + The following control fields are used: + + @table @samp + @item editor + This is the editor to use to modify the functions. By default it uses + Octave's @code{EDITOR} built-in function, which comes from + @code{getenv("EDITOR")} and defaults to @code{emacs}. Use @code{%s} + In place of the function name. For example, + @table @samp + @item [EDITOR, " %s"] + Use the editor which Octave uses for @code{bug_report}. + @item "xedit %s &" + pop up simple X11 editor in a separate window + @item "gnudoit -q \"(find-file \\\"%s\\\")\"" + Send it to current Emacs; must have @code{(gnuserv-start)} in @file{.emacs}. + @end table + + On cygwin, you will need to convert the cygwin path to a windows + path if you are using a native Windows editor. For example + @example + '"C:/Program Files/Good Editor/Editor.exe" "$(cygpath -wa %s)"' + @end example + + @item home + This is the location of user local m-files. Be be sure it is in your + path. The default is @file{~/octave}. + + @item author + This is the name to put after the "## Author:" field of new functions. + By default it guesses from the @code{gecos} field of password database. + + @item email + This is the e-mail address to list after the name in the author field. + By default it guesses @code{<$LOGNAME@@$HOSTNAME>}, and if @code{$HOSTNAME} + is not defined it uses @code{uname -n}. You probably want to override this. + Be sure to use @code{} as your format. + + @item license + @table @samp + @item gpl + GNU General Public License (default). + @item bsd + BSD-style license without advertising clause. + @item pd + Public domain. + @item "text" + Your own default copyright and license. + @end table + + @item mode + This value determines whether the editor should be started in async mode + or sync mode. Set it to "async" to start the editor in async mode. The + default is "sync" (see also "system"). + + Unless you specify @samp{pd}, edit will prepend the copyright statement + with "Copyright (C) yyyy Function Author". + @end table + @end deftypefn fileattrib -*- texinfo -*- @deftypefn {Function File} {[@var{status}, @var{msg}, @var{msgid}] =} fileattrib (@var{file}) *************** *** 10453,10465 **** If the argument 'peer' is given, then the following argument is treated as the axes handle on which to add the colorbar. @end deftypefn contour -*- texinfo -*- ! @deftypefn {Function File} {@var{c} =} contour (@var{z}) ! @deftypefnx {Function File} {@var{c} =} contour (@var{z}, @var{vn}) ! @deftypefnx {Function File} {@var{c} =} contour (@var{x}, @var{y}, @var{z}) ! @deftypefnx {Function File} {@var{c} =} contour (@var{x}, @var{y}, @var{z}, @var{vn}) ! @deftypefnx {Function File} {@var{c} =} contour (@var{h}, @dots{}) @deftypefnx {Function File} {[@var{c}, @var{h}] =} contour (@dots{}) Plot level curves (contour lines) of the matrix @var{z}, using the contour matrix @var{c} computed by @code{contourc} from the same --- 10555,10596 ---- If the argument 'peer' is given, then the following argument is treated as the axes handle on which to add the colorbar. @end deftypefn + compass + -*- texinfo -*- + @deftypefn {Function File} {} compass (@var{u}, @var{v}) + @deftypefnx {Function File} {} compass (@var{z}) + @deftypefnx {Function File} {} compass (@dots{}, @var{style}) + @deftypefnx {Function File} {} compass (@var{h}, @dots{}) + @deftypefnx {Function File} {@var{h} =} compass (@dots{}) + + Plot the @code{(@var{u}, @var{v})} components of a vector field emanating + from the origin of a polar polt. If a single complex argument @var{z} is + given, then @code{@var{u} = real (@var{z})} and @code{@var{v} = imag + (@var{z})}. + + The style to use for the plot can be defined with a line style @var{style} + in a similar manner to the line styles used with the @code{plot} command. + + The optional return value @var{h} provides a list of handles to the + the parts of the vector field (body, arrow and marker). + + @example + @group + a = toeplitz([1;randn(9,1)],[1,randn(1,9)]); + compass (eig (a)) + @end group + @end example + + @seealso{plot, polar, quiver, feather} + @end deftypefn contour -*- texinfo -*- ! @deftypefn {Function File} {} contour (@var{z}) ! @deftypefnx {Function File} {} contour (@var{z}, @var{vn}) ! @deftypefnx {Function File} {} contour (@var{x}, @var{y}, @var{z}) ! @deftypefnx {Function File} {} contour (@var{x}, @var{y}, @var{z}, @var{vn}) ! @deftypefnx {Function File} {} contour (@dots{}, @var{style}) ! @deftypefnx {Function File} {} contour (@var{h}, @dots{}) @deftypefnx {Function File} {[@var{c}, @var{h}] =} contour (@dots{}) Plot level curves (contour lines) of the matrix @var{z}, using the contour matrix @var{c} computed by @code{contourc} from the same *************** *** 10475,10480 **** --- 10606,10615 ---- @end group @end example + The style to use for the plot can be defined with a line style @var{style} + in a similar manner to the line styles used with the @code{plot} command. + Any markers defined by @var{style} are ignored. + The optional input and output argument @var{h} allows an axis handle to be passed to @code{contour} and the handles to the contour objects to be returned. *************** *** 10482,10492 **** @end deftypefn contour3 -*- texinfo -*- ! @deftypefn {Function File} {@var{c} =} contour3 (@var{z}) ! @deftypefnx {Function File} {@var{c} =} contour3 (@var{z}, @var{vn}) ! @deftypefnx {Function File} {@var{c} =} contour3 (@var{x}, @var{y}, @var{z}) ! @deftypefnx {Function File} {@var{c} =} contour3 (@var{x}, @var{y}, @var{z}, @var{vn}) ! @deftypefnx {Function File} {@var{c} =} contour3 (@var{h}, @dots{}) @deftypefnx {Function File} {[@var{c}, @var{h}] =} contour3 (@dots{}) Plot level curves (contour lines) of the matrix @var{z}, using the contour matrix @var{c} computed by @code{contourc} from the same --- 10617,10628 ---- @end deftypefn contour3 -*- texinfo -*- ! @deftypefn {Function File} {} contour3 (@var{z}) ! @deftypefnx {Function File} {} contour3 (@var{z}, @var{vn}) ! @deftypefnx {Function File} {} contour3 (@var{x}, @var{y}, @var{z}) ! @deftypefnx {Function File} {} contour3 (@var{x}, @var{y}, @var{z}, @var{vn}) ! @deftypefnx {Function File} {} contour3 (@dots{}, @var{style}) ! @deftypefnx {Function File} {} contour3 (@var{h}, @dots{}) @deftypefnx {Function File} {[@var{c}, @var{h}] =} contour3 (@dots{}) Plot level curves (contour lines) of the matrix @var{z}, using the contour matrix @var{c} computed by @code{contourc} from the same *************** *** 10503,10508 **** --- 10639,10648 ---- @end group @end example + The style to use for the plot can be defined with a line style @var{style} + in a similar manner to the line styles used with the @code{plot} command. + Any markers defined by @var{style} are ignored. + The optional input and output argument @var{h} allows an axis handle to be passed to @code{contour} and the handles to the contour objects to be returned. *************** *** 10620,10625 **** --- 10760,10776 ---- when @code{sleep} or @code{pause} is called, or while waiting for command-line input. @end deftypefn + ellipsoid + -*- texinfo -*- + @deftypefn {Function File} {[@var{x}, @var{y}, @var{z}] =} ellipsoid (@var{xc},@var{yc}, @var{zc}, @var{xr}, @var{yr}, @var{zr}, @var{n}) + @deftypefnx {Function File} {} ellipsoid (@var{h}, @dots{}) + Generate three matrices in @code{meshgrid} format that define an + ellipsoid. Called with no return arguments, @code{ellipsoid} calls + directly @code{surf (@var{x}, @var{y}, @var{z})}. If an axes handle + is passed as the first argument, the the surface is plotted to this + set of axes. + @seealso{sphere} + @end deftypefn errorbar -*- texinfo -*- @deftypefn {Function File} {} errorbar (@var{args}) *************** *** 10708,10713 **** --- 10859,10892 ---- and @var{y} errorbars from @var{y}-@var{ly} to @var{y}+@var{uy}. @seealso{semilogxerr, semilogyerr, loglogerr} @end deftypefn + feather + -*- texinfo -*- + @deftypefn {Function File} {} feather (@var{u}, @var{v}) + @deftypefnx {Function File} {} feather (@var{z}) + @deftypefnx {Function File} {} feather (@dots{}, @var{style}) + @deftypefnx {Function File} {} feather (@var{h}, @dots{}) + @deftypefnx {Function File} {@var{h} =} feather (@dots{}) + + Plot the @code{(@var{u}, @var{v})} components of a vector field emanating + from equidistant points on the x-axis. If a single complex argument + @var{z} is given, then @code{@var{u} = real (@var{z})} and + @code{@var{v} = imag (@var{z})}. + + The style to use for the plot can be defined with a line style @var{style} + in a similar manner to the line styles used with the @code{plot} command. + + The optional return value @var{h} provides a list of handles to the + the parts of the vector field (body, arrow and marker). + + @example + @group + phi = [0 : 15 : 360] * pi / 180; + feather (sin (phi), cos (phi)) + @end group + @end example + + @seealso{plot, quiver, compass} + @end deftypefn figure -*- texinfo -*- @deftypefn {Function File} {} figure (@var{n}) *************** *** 11666,11671 **** --- 11845,11871 ---- @var{h} of the handles to the surface objects. @seealso{gca, colorbar} @end deftypefn + rose + -*- texinfo -*- + @deftypefn {Function File} {} rose (@var{th}, @var{r}) + @deftypefnx {Function File} {} rose (@var{h}, @dots{}) + @deftypefnx {Function File} {@var{h} =} compass (@dots{}) + @deftypefnx {Function File} {[@var{r}, @var{th}] =} compass (@dots{}) + + Plot an angular histogram. With one vector argument @var{th}, plots the + histogram with 20 angular bins. If @var{th} is a matrix, then each column + of @var{th} produces a separate histogram. + + If @var{r} is given and is a scalar, then the histogram is produced with + @var{r} bins. If @var{r} is a vector, then the center of each bin are + defined by the values of @var{r}. + + The optional return value @var{h} provides a list of handles to the + the parts of the vector field (body, arrow and marker). + + If two output arguments are requested, then rather than plotting the + histogram, the polar vectors necessary to plot the histogram are + returned. scatter -*- texinfo -*- @deftypefn {Function File} {} scatter (@var{x}, @var{y}, @var{s}, @var{c}) *************** *** 15900,15912 **** For each element of @var{x}, compute the quantile (the inverse of the CDF) at @var{x} of the Laplace distribution. @end deftypefn - tcdf - -*- texinfo -*- - @deftypefn {Function File} {} tcdf (@var{x}, @var{n}) - For each element of @var{x}, compute the CDF at @var{x} of the - t (Student) distribution with @var{n} degrees of freedom, i.e., - PROB (t(@var{n}) <= @var{x}). - @end deftypefn laplace_pdf -*- texinfo -*- @deftypefn {Function File} {} laplace_pdf (@var{x}) --- 16100,16105 ---- *************** *** 16130,16135 **** --- 16323,16335 ---- Return an @var{r} by @var{c} or @code{size (@var{sz})} matrix of random numbers from the standard normal distribution. @end deftypefn + tcdf + -*- texinfo -*- + @deftypefn {Function File} {} tcdf (@var{x}, @var{n}) + For each element of @var{x}, compute the CDF at @var{x} of the + t (Student) distribution with @var{n} degrees of freedom, i.e., + PROB (t(@var{n}) <= @var{x}). + @end deftypefn tinv -*- texinfo -*- @deftypefn {Function File} {} tinv (@var{x}, @var{n}) diff -cNr octave-2.9.19/scripts/image/image.m octave-3.0.0/scripts/image/image.m *** octave-2.9.19/scripts/image/image.m Mon Dec 10 15:09:59 2007 --- octave-3.0.0/scripts/image/image.m Thu Dec 13 16:35:36 2007 *************** *** 70,75 **** --- 70,76 ---- unwind_protect axes (ax); h = __img__ (x, y, img, varargin {firstnonnumeric:end}); + set (ax, "layer", "top"); unwind_protect_cleanup axes (oldax); end_unwind_protect diff -cNr octave-2.9.19/scripts/image/imshow.m octave-3.0.0/scripts/image/imshow.m *** octave-2.9.19/scripts/image/imshow.m Fri Oct 26 13:57:34 2007 --- octave-3.0.0/scripts/image/imshow.m Fri Dec 21 12:45:15 2007 *************** *** 58,64 **** print_usage (); endif ! display_range = []; true_color = false; indexed = false; --- 58,64 ---- print_usage (); endif ! display_range = NA; true_color = false; indexed = false; *************** *** 92,98 **** while (narg <= numel (varargin)) arg = varargin{narg++}; if (isnumeric (arg)) ! if (numel (arg) == 2) display_range = arg; elseif (columns (arg) == 3) indexed = true; --- 92,98 ---- while (narg <= numel (varargin)) arg = varargin{narg++}; if (isnumeric (arg)) ! if (numel (arg) == 2 || isempty (arg)) display_range = arg; elseif (columns (arg) == 3) indexed = true; *************** *** 116,122 **** endwhile ## Set default display range. ! if (true_color || isempty (display_range)) display_range = [min(im(:)), max(im(:))]; else t = class (im); --- 116,122 ---- endwhile ## Set default display range. ! if (isempty (display_range)) display_range = [min(im(:)), max(im(:))]; else t = class (im); *************** *** 124,130 **** case {"double", "single", "logical"} display_range = [0, 1]; case {"int8", "int16", "int32", "uint8", "uint16", "uint32"} ! display_range = [intmin(t), intmax(t)]; otherwise error ("imshow: invalid data type for image"); endswitch --- 124,133 ---- case {"double", "single", "logical"} display_range = [0, 1]; case {"int8", "int16", "int32", "uint8", "uint16", "uint32"} ! ## For compatibility, uint8 data should not be handled as ! ## double. Doing so is a quick fix to allow the images to be ! ## displayed correctly. ! display_range = double ([intmin(t), intmax(t)]); otherwise error ("imshow: invalid data type for image"); endswitch *************** *** 144,155 **** endif ## This is for compatibility. ! if (ismember (class (im), {"int8", "int16", "uint32", "int32", "single"})) im = double (im); endif ## Scale the image to the interval [0, 1] according to display_range. ! if (! indexed || islogical (im)) low = display_range(1); high = display_range(2); im = (im-low)/(high-low); --- 147,158 ---- endif ## This is for compatibility. ! if (! indexed || islogical (im)) im = double (im); endif ## Scale the image to the interval [0, 1] according to display_range. ! if (! (true_color || indexed || islogical (im))) low = display_range(1); high = display_range(2); im = (im-low)/(high-low); *************** *** 158,167 **** endif if (true_color) ! tmp = __img__ ([] , [], im); else tmp = image (round ((rows (colormap ()) - 1) * im)); endif if (nargout > 0) h = tmp; --- 161,171 ---- endif if (true_color) ! tmp = __img__ ([], [], im); else tmp = image (round ((rows (colormap ()) - 1) * im)); endif + set (gca (), "visible", "off"); if (nargout > 0) h = tmp; diff -cNr octave-2.9.19/scripts/image/loadimage.m octave-3.0.0/scripts/image/loadimage.m *** octave-2.9.19/scripts/image/loadimage.m Fri Oct 12 17:27:22 2007 --- octave-3.0.0/scripts/image/loadimage.m Wed Dec 12 17:36:15 2007 *************** *** 44,61 **** ## The file is assumed to have variables img and map, or X and map. ! eval (sprintf ("load %s", file)); ! if (exist ("img")) ! img_retval = img; ! elseif (exist ("X")) ! img_retval = X; else error ("loadimage: invalid image file found"); endif ! if (exist ("map")) ! map_retval = map; else error ("loadimage: invalid image file found"); endif --- 44,61 ---- ## The file is assumed to have variables img and map, or X and map. ! vars = load (file); ! if (isfield (vars, "img")) ! img_retval = vars.img; ! elseif (isfield (vars, "X")) ! img_retval = vars.X; else error ("loadimage: invalid image file found"); endif ! if (isfield (vars, "map")) ! map_retval = vars.map; else error ("loadimage: invalid image file found"); endif diff -cNr octave-2.9.19/scripts/linear-algebra/condest.m octave-3.0.0/scripts/linear-algebra/condest.m *** octave-2.9.19/scripts/linear-algebra/condest.m Mon Dec 3 15:10:06 2007 --- octave-3.0.0/scripts/linear-algebra/condest.m Wed Dec 12 17:22:10 2007 *************** *** 105,172 **** function [est, v] = condest (varargin) ! if size (varargin, 2) < 1 || size (varargin, 2) > 5, print_usage (); endif default_t = 5; if (ismatrix (varargin{1})) ! n = size (varargin{1}, 1); ! if (n != size (varargin{1}, 2)) error ("condest: matrix must be square."); endif ! A = varargin{1}; ! if (size (varargin, 2) > 1) if (isscalar (varargin{2})) t = varargin{2}; ! else ! if (size (varargin, 2) < 3) ! error ("condest: must supply both solve and solve_t."); ! else ! solve = varargin{2}; ! solve_t = varargin{3}; ! if size (varargin, 2) > 3, ! t = varargin{4}; ! endif endif endif endif ! else ! if (size (varargin, 2) < 5) ! error ("condest: implicit form of condest requires at least 5 arguments."); ! endif apply = varargin{1}; apply_t = varargin{2}; solve = varargin{3}; solve_t = varargin{4}; n = varargin{5}; if (! isscalar (n)) error ("condest: dimension argument of implicit form must be scalar."); endif ! if (size (varargin, 2) > 5) t = varargin{6}; endif endif ! if (! exist ("t", "var")) t = min (n, default_t); endif ! if (! exist ("solve", "var")) if (issparse (A)) [L, U, P, Pc] = splu (A); ! solve = @(x) Pc' * (U\ (L\ (P*x))); ! solve_t = @(x) P'*(L'\ (U'\ (Pc*x))); else [L, U, P] = lu (A); ! solve = @(x) U\ (L\ (P*x)); ! solve_t = @(x) P' * (L'\ (U'\x)); endif endif ! if (exist ("A", "var")) Anorm = norm (A, 1); else Anorm = onenormest (apply, apply_t, n, t); --- 105,179 ---- function [est, v] = condest (varargin) ! if (nargin < 1 || nargin > 6) print_usage (); endif default_t = 5; + have_A = false; + have_t = false; + have_solve = false; + if (ismatrix (varargin{1})) ! A = varargin{1}; ! n = issquare (A); ! if (! n) error ("condest: matrix must be square."); endif ! have_A = true; ! if (nargin > 1) if (isscalar (varargin{2})) t = varargin{2}; ! have_t = true; ! elseif (nargin > 2) ! solve = varargin{2}; ! solve_t = varargin{3}; ! have_solve = true; ! if (nargin > 3) ! t = varargin{4}; ! have_t = true; endif + else + error ("condest: must supply both solve and solve_t."); endif endif ! elseif (nargin > 4) apply = varargin{1}; apply_t = varargin{2}; solve = varargin{3}; solve_t = varargin{4}; + have_solve = true; n = varargin{5}; if (! isscalar (n)) error ("condest: dimension argument of implicit form must be scalar."); endif ! if (nargin > 5) t = varargin{6}; + have_t = true; endif + else + error ("condest: implicit form of condest requires at least 5 arguments."); endif ! if (! have_t) t = min (n, default_t); endif ! if (! have_solve) if (issparse (A)) [L, U, P, Pc] = splu (A); ! solve = @(x) Pc' * (U \ (L \ (P * x))); ! solve_t = @(x) P' * (L' \ (U' \ (Pc * x))); else [L, U, P] = lu (A); ! solve = @(x) U \ (L \ (P*x)); ! solve_t = @(x) P' * (L' \ (U' \ x)); endif endif ! if (have_A) Anorm = norm (A, 1); else Anorm = onenormest (apply, apply_t, n, t); diff -cNr octave-2.9.19/scripts/miscellaneous/Makefile.in octave-3.0.0/scripts/miscellaneous/Makefile.in *** octave-2.9.19/scripts/miscellaneous/Makefile.in Tue Oct 23 04:19:49 2007 --- octave-3.0.0/scripts/miscellaneous/Makefile.in Wed Dec 19 15:21:11 2007 *************** *** 35,41 **** SOURCES = ans.m bincoeff.m bug_report.m bunzip2.m cast.m comma.m \ compare_versions.m computer.m copyfile.m \ ! delete.m dir.m doc.m dos.m dump_prefs.m \ fileattrib.m fileparts.m flops.m fullfile.m getfield.m gunzip.m \ gzip.m inputname.m ismac.m ispc.m isunix.m license.m list_primes.m ls.m \ ls_command.m menu.m mex.m mexext.m mkoctfile.m movefile.m \ --- 35,41 ---- SOURCES = ans.m bincoeff.m bug_report.m bunzip2.m cast.m comma.m \ compare_versions.m computer.m copyfile.m \ ! delete.m dir.m doc.m dos.m dump_prefs.m edit.m \ fileattrib.m fileparts.m flops.m fullfile.m getfield.m gunzip.m \ gzip.m inputname.m ismac.m ispc.m isunix.m license.m list_primes.m ls.m \ ls_command.m menu.m mex.m mexext.m mkoctfile.m movefile.m \ diff -cNr octave-2.9.19/scripts/miscellaneous/edit.m octave-3.0.0/scripts/miscellaneous/edit.m *** octave-2.9.19/scripts/miscellaneous/edit.m Wed Dec 31 19:00:00 1969 --- octave-3.0.0/scripts/miscellaneous/edit.m Thu Dec 20 12:53:36 2007 *************** *** 0 **** --- 1,425 ---- + ## Copyright (C) 2001, 2007 Paul Kienzle + ## + ## This file is part of Octave. + ## + ## Octave is free software; you can redistribute it and/or modify it + ## under the terms of the GNU General Public License as published by + ## the Free Software Foundation; either version 3 of the License, or (at + ## your option) any later version. + ## + ## Octave is distributed in the hope that it will be useful, but + ## WITHOUT ANY WARRANTY; without even the implied warranty of + ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + ## General Public License for more details. + ## + ## You should have received a copy of the GNU General Public License + ## along with Octave; see the file COPYING. If not, see + ## . + + ## -*- texinfo -*- + ## @deftypefn {Command} edit @var{name} + ## @deftypefnx {Command} edit @var{field} @var{value} + ## @deftypefnx {Command} @var{value} = edit get @var{field} + ## Edit the named function, or change editor settings. + ## + ## If @code{edit} is called with the name of a file or function as + ## its argument it will be opened in a text editor. + ## + ## @itemize @bullet + ## @item + ## If the function @var{name} is available in a file on your path and + ## that file is modifiable, then it will be edited in place. If it + ## is a system function, then it will first be copied to the directory + ## @code{HOME} (see further down) and then edited. + ## + ## @item + ## If @var{name} is the name of a function defined in the interpreter but + ## not in an m-file, then an m-file will be created in @code{HOME} + ## to contain that function along with its current definition. + ## + ## @item + ## If @code{name.cc} is specified, then it will search for @code{name.cc} + ## in the path and try to modify it, otherwise it will create a new + ## @file{.cc} file in @code{HOME}. If @var{name} happens to be an + ## m-file or interpreter defined function, then the text of that + ## function will be inserted into the .cc file as a comment. + ## + ## @item + ## If @var{name.ext} is on your path then it will be editted, otherwise + ## the editor will be started with @file{HOME/name.ext} as the + ## filename. If @file{name.ext} is not modifiable, it will be copied to + ## @code{HOME} before editing. + ## + ## @strong{WARNING!} You may need to clear name before the new definition + ## is available. If you are editing a .cc file, you will need + ## to mkoctfile @file{name.cc} before the definition will be available. + ## @end itemize + ## + ## If @code{edit} is called with @var{field} and @var{value} variables, + ## the value of the control field @var{field} will be @var{value}. + ## If an output argument is requested and the first argument is @code{get} + ## then @code{edit} will return the value of the control field @var{field}. + ## The following control fields are used: + ## + ## @table @samp + ## @item editor + ## This is the editor to use to modify the functions. By default it uses + ## Octave's @code{EDITOR} built-in function, which comes from + ## @code{getenv("EDITOR")} and defaults to @code{emacs}. Use @code{%s} + ## In place of the function name. For example, + ## @table @samp + ## @item [EDITOR, " %s"] + ## Use the editor which Octave uses for @code{bug_report}. + ## @item "xedit %s &" + ## pop up simple X11 editor in a separate window + ## @item "gnudoit -q \"(find-file \\\"%s\\\")\"" + ## Send it to current Emacs; must have @code{(gnuserv-start)} in @file{.emacs}. + ## @end table + ## + ## On cygwin, you will need to convert the cygwin path to a windows + ## path if you are using a native Windows editor. For example + ## @example + ## '"C:/Program Files/Good Editor/Editor.exe" "$(cygpath -wa %s)"' + ## @end example + ## + ## @item home + ## This is the location of user local m-files. Be be sure it is in your + ## path. The default is @file{~/octave}. + ## + ## @item author + ## This is the name to put after the "## Author:" field of new functions. + ## By default it guesses from the @code{gecos} field of password database. + ## + ## @item email + ## This is the e-mail address to list after the name in the author field. + ## By default it guesses @code{<$LOGNAME@@$HOSTNAME>}, and if @code{$HOSTNAME} + ## is not defined it uses @code{uname -n}. You probably want to override this. + ## Be sure to use @code{} as your format. + ## + ## @item license + ## @table @samp + ## @item gpl + ## GNU General Public License (default). + ## @item bsd + ## BSD-style license without advertising clause. + ## @item pd + ## Public domain. + ## @item "text" + ## Your own default copyright and license. + ## @end table + ## + ## @item mode + ## This value determines whether the editor should be started in async mode + ## or sync mode. Set it to "async" to start the editor in async mode. The + ## default is "sync" (see also "system"). + ## + ## Unless you specify @samp{pd}, edit will prepend the copyright statement + ## with "Copyright (C) yyyy Function Author". + ## @end table + ## @end deftypefn + + ## Author: Paul Kienzle + + ## Original version by Paul Kienzle distributed as free software in the + ## public domain. + + ## PKG_ADD: mark_as_command edit + + function ret = edit (file, state) + + ## Pick up globals or default them. + + persistent FUNCTION = struct ("EDITOR", strcat (EDITOR (), " %s"), + "HOME", fullfile (default_home, "octave"), + "AUTHOR", default_user(1), + "EMAIL", [], + "LICENSE", "GPL", + "MODE", "sync"); + + mlock; # make sure the state variables survive "clear functions" + + if (nargin == 2) + switch (toupper (file)) + case "EDITOR" + FUNCTION.EDITOR = state; + case "HOME" + if (! isempty (state) && state(1) == "~") + state = [ default_home, state(2:end) ]; + endif + FUNCTION.HOME = state; + case "AUTHOR" + FUNCTION.AUTHOR = state; + case "EMAIL" + FUNCTION.EMAIL = state; + case "LICENSE" + FUNCTION.LICENSE = state; + case "MODE" + if (strcmp (state, "sync") || strcmp (state, "async")) + FUNCTION.MODE = state; + else + error('expected "edit MODE sync|async"'); + endif + case "GET" + ret = FUNCTION.(toupper (state)); + otherwise + error ("expected \"edit EDITOR|HOME|AUTHOR|EMAIL|LICENSE|MODE val\""); + endswitch + return + endif + + ## Start the editor without a file if no file is given. + if (nargin < 1) + if (exist (FUNCTION.HOME, "dir") == 7 && (isunix () || ! ispc ())) + system (strcat ("cd \"", FUNCTION.HOME, "\" ; ", + sprintf (FUNCTION.EDITOR, "")), + [], FUNCTION.MODE); + else + system (sprintf (FUNCTION.EDITOR,""), [], FUNCTION.MODE); + endif + return; + endif + + ## Check whether the user is trying to edit a builtin of compiled function. + switch (exist (file)) + case {3, 5} + error ("unable to edit a built-in or compiled function"); + endswitch + + ## Find file in path. + idx = rindex (file, "."); + if (idx != 0) + ## If file has an extension, use it. + path = file_in_loadpath (file); + else + ## Otherwise try file.cc, and if that fails, default to file.m. + path = file_in_loadpath (fullfile (file, ".cc")); + if (isempty (path)) + file = fullfile (file, ".m"); + path = file_in_loadpath (file); + endif + endif + + ## If the file exists and is modifiable in place then edit it, + ## otherwise copy it and then edit it. + if (! isempty (path)) + fid = fopen (path, "r+t"); + if (fid < 0) + from = path; + path = strcat (FUNCTION.HOME, from (rindex (from, filesep):end)) + [status, msg] = copyfile (from, path, 1); + if (status == 0) + error (msg); + endif + else + fclose(fid); + endif + system (sprintf (FUNCTION.EDITOR, strcat ("\"", path, "\"")), + [], FUNCTION.MODE); + return; + endif + + ## If editing something other than a m-file or an oct-file, just + ## edit it. + idx = rindex (file, filesep); + if (idx != 0) + path = file; + else + path = fullfile (FUNCTION.HOME, file); + endif + idx = rindex (file, "."); + name = file(1:idx-1); + ext = file(idx+1:end); + switch (ext) + case { "cc", "m" } + 0; + otherwise + system (sprintf (FUNCTION.EDITOR, strcat ("\"", path, "\"")), + [], FUNCTION.MODE); + return; + endswitch + + ## The file doesn't exist in path so create it, put in the function + ## template and edit it. + + ## Guess the email name if it was not given. + if (isempty (FUNCTION.EMAIL)) + host = getenv("HOSTNAME"); + if (isempty (host) && ispc ()) + host = getenv ("COMPUTERNAME"); + endif + if (isempty (host)) + [status, host] = system ("uname -n"); + ## trim newline from end of hostname + if (! isempty (host)) + host = host(1:end-1); + endif + endif + if (isempty (host)) + FUNCTION.EMAIL = " "; + else + FUNCTION.EMAIL = strcat ("<", default_user(0), "@", host, ">"); + endif + endif + + ## Fill in the revision string. + now = localtime (time); + revs = strcat (strftime ("%Y-%m-%d", now), " ", FUNCTION.AUTHOR, " ", + FUNCTION.EMAIL, "\n* Initial revision"); + + ## Fill in the copyright string. + copyright = strcat (strftime ("Copyright (C) %Y ", now), FUNCTION.AUTHOR); + + ## Fill in the author tag field. + author = strcat ("Author: ", FUNCTION.AUTHOR, " ", FUNCTION.EMAIL); + + ## Fill in the header. + uclicense = toupper (FUNCTION.LICENSE); + switch (uclicense) + case "GPL" + head = strcat (copyright, "\n\n", "\ + This program is free software; you can redistribute it and/or modify\n\ + it under the terms of the GNU General Public License as published by\n\ + the Free Software Foundation; either version 2 of the License, or\n\ + (at your option) any later version.\n\ + \n\ + This program is distributed in the hope that it will be useful,\n\ + but WITHOUT ANY WARRANTY; without even the implied warranty of\n\ + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n\ + GNU General Public License for more details.\n\ + \n\ + You should have received a copy of the GNU General Public License\n\ + along with this program; if not, write to the Free Software\n\ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\ + "); + tail = strcat (author, "\n\n", revs); + + case "BSD" + head = strcat (copyright, "\n\n", "\ + This program is free software; redistribution and use in source and\n\ + binary forms, with or without modification, are permitted provided that\n\ + the following conditions are met:\n\ + \n\ + 1.Redistributions of source code must retain the above copyright\n\ + notice, this list of conditions and the following disclaimer.\n\ + 2.Redistributions in binary form must reproduce the above copyright\n\ + notice, this list of conditions and the following disclaimer in the\n\ + documentation and/or other materials provided with the distribution.\n\ + \n\ + THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND\n\ + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n\ + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n\ + ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE\n\ + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n\ + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\n\ + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n\ + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\n\ + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n\ + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n\ + SUCH DAMAGE.\ + "); + tail = strcat (author, "\n\n", revs); + + case "PD" + head = ""; + tail = strcat (author, "\n\n", + "This program is granted to the public domain\n\n", + revs); + + otherwise + head = ""; + tail = strcat (copyright, "\n\n", FUNCTION.LICENSE, "\n", + author, "\n\n", revs); + endswitch + + ## Generate the function template. + exists = exist (name); + switch (ext) + case {"cc", "C", "cpp"} + if (isempty (head)) + comment = strcat ("/*\n", tail, "\n\n*/\n\n"); + else + comment = strcat ("/*\n", head, "\n\n", tail, "\n\n*/\n\n"); + endif + ## If we are shadowing an m-file, paste the code for the m-file. + if (any (exists == [2, 103])) + code = strcat ("\\ ", strrep (type (name), "\n", "\n// ")); + else + code = " "; + endif + body = strcat ("#include \n\n", + "DEFUN_DLD(", name, ",args,nargout,\"\\\n", + name, "\\n\\\n\")\n{\n", + " octave_value_list retval;\n", + " int nargin = args.length();\n\n", + code, "\n return retval;\n}\n"); + + text = strcat (comment, body); + case "m" + ## If we are editing a function defined on the fly, paste the + ## code. + if (any (exists == [2, 103])) + body = type (name); + else + body = strcat ("function [ ret ] = ", name, " ()\n\nendfunction\n"); + endif + if (isempty (head)) + comment = strcat ("## ", name, "\n\n", + "## ", strrep (tail, "\n", "\n## "), "\n\n"); + else + comment = strcat ("## ", strrep(head,"\n","\n## "), "\n\n", ... + "## ", name, "\n\n", ... + "## ", strrep (tail, "\n", "\n## "), "\n\n"); + endif + text = strcat (comment, body); + endswitch + + ## Write the initial file (if there is anything to write) + fid = fopen (path, "wt"); + if (fid < 0) + error ("edit: could not create %s", path); + endif + fputs (fid, text); + fclose (fid); + + ## Finally we are ready to edit it! + system (sprintf (FUNCTION.EDITOR, strcat ("\"", path, "\"")), + [], FUNCTION.MODE); + + endfunction + + function ret = default_home () + + ret = getenv ("HOME"); + if (isempty (ret)) + ret = glob ("~"); + if (! isempty (ret)) + ret = ret{1}; + else + ret = ""; + endif + endif + + endfunction + + ## default_user (form) + ## Returns the name associated with the current user ID. + ## + ## If form==1 return the full name. This will be the + ## default author. If form==0 return the login name. + ## login@host will be the default email address. + + function ret = default_user (long_form) + + ent = getpwuid (getuid); + if (! isstruct (ent)) + ret = getenv ("USER"); + if (isempty (ret)) + ret = getenv ("USERNAME"); + endif + elseif (long_form) + ret = ent.gecos; + else + ret = ent.name; + endif + + endfunction diff -cNr octave-2.9.19/scripts/miscellaneous/run.m octave-3.0.0/scripts/miscellaneous/run.m *** octave-2.9.19/scripts/miscellaneous/run.m Wed Nov 7 21:29:23 2007 --- octave-3.0.0/scripts/miscellaneous/run.m Mon Dec 17 14:16:27 2007 *************** *** 51,58 **** error ("run: the path %s doesn't exist", d); endif else ! if (exist (script, "file")) ! evalin ("caller", [script, ";"], "rethrow (lasterror ())"); else error ("run: %s not found", s); endif --- 51,58 ---- error ("run: the path %s doesn't exist", d); endif else ! if (exist (f, "file")) ! evalin ("caller", [f, ";"], "rethrow (lasterror ())"); else error ("run: %s not found", s); endif diff -cNr octave-2.9.19/scripts/pkg/pkg.m octave-3.0.0/scripts/pkg/pkg.m *** octave-2.9.19/scripts/pkg/pkg.m Tue Nov 27 21:32:42 2007 --- octave-3.0.0/scripts/pkg/pkg.m Thu Dec 20 11:55:26 2007 *************** *** 2083,2089 **** endfunction function dep = is_architecture_dependent (nm) ! persistent archdepsuffix = {".oct",".mex",".a",".so",".so.*",".dll","dylib"}; dep = false; for i = 1 : length (archdepsuffix) --- 2083,2089 ---- endfunction function dep = is_architecture_dependent (nm) ! persistent archdepsuffix = {".oct",".mex",".a",".lib",".so",".so.*",".dll","dylib"}; dep = false; for i = 1 : length (archdepsuffix) diff -cNr octave-2.9.19/scripts/plot/Makefile.in octave-3.0.0/scripts/plot/Makefile.in *** octave-2.9.19/scripts/plot/Makefile.in Thu Nov 29 18:14:08 2007 --- octave-3.0.0/scripts/plot/Makefile.in Mon Dec 17 22:48:04 2007 *************** *** 78,90 **** --- 78,93 ---- close.m \ closereq.m \ colorbar.m \ + compass.m \ contour3.m \ contour.m \ contourc.m \ contourf.m \ cylinder.m \ drawnow.m \ + ellipsoid.m \ errorbar.m \ + feather.m \ figure.m \ fill.m \ findobj.m \ *************** *** 123,128 **** --- 126,132 ---- quiver3.m \ replot.m \ ribbon.m \ + rose.m \ scatter.m \ scatter3.m \ semilogx.m \ diff -cNr octave-2.9.19/scripts/plot/__bar__.m octave-3.0.0/scripts/plot/__bar__.m *** octave-2.9.19/scripts/plot/__bar__.m Thu Nov 29 11:44:45 2007 --- octave-3.0.0/scripts/plot/__bar__.m Wed Dec 19 15:21:11 2007 *************** *** 27,32 **** --- 27,33 ---- ## Slightly smaller than 0.8 to avoid clipping issue in gnuplot 4.0 width = 0.8 - 10 * eps; group = true; + bv = 0; if (nargin < 3) print_usage (); *************** *** 87,92 **** --- 88,97 ---- width = varargin{idx++}; elseif (idx == nargin - 2) newargs = [newargs,varargin(idx++)]; + elseif (isstr (varargin{idx}) && strcmp (tolower (varargin{idx}), "basevalue") && + isscalar (varargin{idx+1})) + bv = varargin{idx+1}; + idx += 2; else newargs = [newargs,varargin(idx:idx+1)]; idx += 2; *************** *** 122,132 **** xb(2:4:4*ylen,:) += offset; xb(3:4:4*ylen,:) += offset; xb(4:4:4*ylen,:) += offset; ! y0 = zeros (size (y)); y1 = y; else y1 = cumsum(y,2); ! y0 = [zeros(ylen,1), y1(:,1:end-1)]; endif yb = zeros (4*ylen, ycols); --- 127,137 ---- xb(2:4:4*ylen,:) += offset; xb(3:4:4*ylen,:) += offset; xb(4:4:4*ylen,:) += offset; ! y0 = zeros (size (y)) + bv; y1 = y; else y1 = cumsum(y,2); ! y0 = [zeros(ylen,1)+bv, y1(:,1:end-1)]; endif yb = zeros (4*ylen, ycols); *************** *** 145,151 **** newplot (); tmp = __bars__ (h, vertical, x, y, xb, yb, width, group, ! have_line_spec, newargs{:}); if (nargout == 1) varargout{1} = tmp; endif --- 150,156 ---- newplot (); tmp = __bars__ (h, vertical, x, y, xb, yb, width, group, ! have_line_spec, bv, newargs{:}); if (nargout == 1) varargout{1} = tmp; endif diff -cNr octave-2.9.19/scripts/plot/__bars__.m octave-3.0.0/scripts/plot/__bars__.m *** octave-2.9.19/scripts/plot/__bars__.m Tue Nov 27 21:32:42 2007 --- octave-3.0.0/scripts/plot/__bars__.m Wed Dec 19 15:21:11 2007 *************** *** 20,26 **** ## Author: jwe ! function tmp = __bars__ (h, vertical, x, y, xb, yb, width, group, have_color_spec, varargin) ycols = columns (y); clim = get (h, "clim"); --- 20,29 ---- ## Author: jwe ! function tmp = __bars__ (h, vertical, x, y, xb, yb, width, group, have_color_spec, base_value, varargin) ! ! ## Note, base_value is used by the Jhandles backend, which replaces ! ## this function with its own version. ycols = columns (y); clim = get (h, "clim"); diff -cNr octave-2.9.19/scripts/plot/__contour__.m octave-3.0.0/scripts/plot/__contour__.m *** octave-2.9.19/scripts/plot/__contour__.m Tue Nov 27 21:32:42 2007 --- octave-3.0.0/scripts/plot/__contour__.m Fri Dec 14 12:42:55 2007 *************** *** 23,33 **** ax = varargin{1}; z = varargin{2}; if (ischar (z)) if (strcmp (z, "none")) z = NaN; elseif (strcmp (z, "base")) ! if (nargin == 1) z = varargin{1}; else z = varargin{3}; --- 23,50 ---- ax = varargin{1}; z = varargin{2}; + linespec.linestyle = "-"; + linespec.color = "flat"; + for i = 3 : nargin + arg = varargin {i}; + if ((ischar (arg) || iscell (arg))) + [linespec, valid] = __pltopt__ ("quiver", arg, false); + if (isempty (linespec.color)) + linespec.color = "flat"; + endif + if (valid) + have_line_spec = true; + varargin(i) = []; + break; + endif + endif + endfor + if (ischar (z)) if (strcmp (z, "none")) z = NaN; elseif (strcmp (z, "base")) ! if (nargin < 3) z = varargin{1}; else z = varargin{3}; *************** *** 55,67 **** if (isnan (z)) h = [h; patch(ax, p(1,:), p(2,:), "facecolor", "none", ! "edgecolor", "flat", "cdata", clev)]; elseif (!ischar(z)) h = [h; patch(ax, p(1,:), p(2,:), z * ones (1, columns (p)), "facecolor", ! "none", "edgecolor", "flat", "cdata", clev)]; else h = [h; patch(ax, p(1,:), p(2,:), clev * ones (1, columns (p)), ! "facecolor", "none", "edgecolor", "flat", "cdata", clev)]; endif i1 += clen+1; endwhile --- 72,87 ---- if (isnan (z)) h = [h; patch(ax, p(1,:), p(2,:), "facecolor", "none", ! "edgecolor", linespec.color, "linestyle", ! linespec.linestyle, "cdata", clev)]; elseif (!ischar(z)) h = [h; patch(ax, p(1,:), p(2,:), z * ones (1, columns (p)), "facecolor", ! "none", "edgecolor", linespec.color, ! "linestyle", linespec.linestyle, "cdata", clev)]; else h = [h; patch(ax, p(1,:), p(2,:), clev * ones (1, columns (p)), ! "facecolor", "none", "edgecolor", linespec.color, ! "linestyle", linespec.linestyle, "cdata", clev)]; endif i1 += clen+1; endwhile diff -cNr octave-2.9.19/scripts/plot/__go_draw_axes__.m octave-3.0.0/scripts/plot/__go_draw_axes__.m *** octave-2.9.19/scripts/plot/__go_draw_axes__.m Tue Dec 11 16:25:53 2007 --- octave-3.0.0/scripts/plot/__go_draw_axes__.m Mon Dec 17 22:48:04 2007 *************** *** 64,70 **** fputs (plot_stream, "set size noratio;\n"); endif ! fputs (plot_stream, "set pm3d;\n"); fputs (plot_stream, "unset label;\n"); if (! isempty (axis_obj.title)) --- 64,70 ---- fputs (plot_stream, "set size noratio;\n"); endif ! fputs (plot_stream, "set pm3d explicit;\n"); fputs (plot_stream, "unset label;\n"); if (! isempty (axis_obj.title)) *************** *** 185,190 **** --- 185,193 ---- else xaxisloc = "x"; xaxisloc_using = "x1"; + if (strcmpi (axis_obj.xaxislocation, "zero")) + fputs (plot_stream, "set xzeroaxis;\n"); + endif endif if (strcmpi (axis_obj.yaxislocation, "right")) yaxisloc = "y2"; *************** *** 192,197 **** --- 195,203 ---- else yaxisloc = "y"; yaxisloc_using = "y1"; + if (strcmpi (axis_obj.yaxislocation, "zero")) + fputs (plot_stream, "set yzeroaxis;\n"); + endif endif have_grid = false; *************** *** 241,249 **** fputs (plot_stream, "set grid nomztics;\n"); endif ! ## Unless we force the grid to the front, tics may appear below ! ## plotted objects. ! fputs (plot_stream, "set grid front;\n"); if (! have_grid) fputs (plot_stream, "unset grid;\n"); endif --- 247,259 ---- fputs (plot_stream, "set grid nomztics;\n"); endif ! ## The grid front/back/layerdefault option also controls the ! ## appearance of tics, so it is used even if the grid is absent. ! if (strcmpi (axis_obj.layer, "top")) ! fputs (plot_stream, "set grid front;\n"); ! else ! fputs (plot_stream, "set grid layerdefault;\n"); ! endif if (! have_grid) fputs (plot_stream, "unset grid;\n"); endif *************** *** 278,284 **** kids = axis_obj.children; ! nd = 0; data_idx = 0; data = cell (); is_image_data = []; --- 288,302 ---- kids = axis_obj.children; ! nd = __calc_dimensions__ (axis_obj); ! ! if (nd == 3) ! fputs (plot_stream, "set parametric;\n"); ! fputs (plot_stream, "set style data lines;\n"); ! fputs (plot_stream, "set surface;\n"); ! fputs (plot_stream, "unset contour;\n"); ! endif ! data_idx = 0; data = cell (); is_image_data = []; *************** *** 307,320 **** switch (obj.type) case "image" - ## FIXME - Is there a better way to determine if the plot - ## command should be "plot" or "splot"????? Could have images - ## projected into 3D so there is really no reason to limit - ## this. - if (nd == 0) - nd = 2; - endif - img_data = obj.cdata; img_xdata = obj.xdata; img_ydata = obj.ydata; --- 325,330 ---- *************** *** 387,406 **** withclause{data_idx} = sprintf ("with %s linetype %d", style, typ); endif ! if (! isempty (obj.zdata)) ! nd = 3; xdat = obj.xdata(:); ydat = obj.ydata(:); ! zdat = obj.zdata(:); ! data{data_idx} = [xdat, ydat, zdat]'; usingclause{data_idx} = "using ($1):($2):($3)"; ! fputs (plot_stream, "set parametric;\n"); ! fputs (plot_stream, "set style data lines;\n"); ! fputs (plot_stream, "set surface;\n"); ! fputs (plot_stream, "unset contour;\n"); else - nd = 2; xdat = obj.xdata(:); ydat = obj.ydata(:); ldat = obj.ldata; --- 397,414 ---- withclause{data_idx} = sprintf ("with %s linetype %d", style, typ); endif ! if (nd == 3) xdat = obj.xdata(:); ydat = obj.ydata(:); ! if (! isempty (obj.zdata)) ! zdat = obj.zdata(:); ! else ! zdat = zeros (size (xdat)); ! endif data{data_idx} = [xdat, ydat, zdat]'; usingclause{data_idx} = "using ($1):($2):($3)"; ! ## fputs (plot_stream, "set parametric;\n"); else xdat = obj.xdata(:); ydat = obj.ydata(:); ldat = obj.ldata; *************** *** 494,517 **** for i = 1:nc xcol = obj.xdata(:,i); ycol = obj.ydata(:,i); ! if (! isempty (obj.zdata)) ! zcol = obj.zdata(:,i); ! else ! zcol = []; endif if (! isnan (xcol) && ! isnan (ycol)) ## Is the patch closed or not if (strncmp (obj.facecolor, "none", 4)) if (isnan (hidden_removal)) ! hidden_removal = false; endif ! else ! hidden_removal = true; ! if (! isempty (zcol)) error ("gnuplot (as of v4.2) only supports 2D filled patches"); - else - nd = 2; endif data_idx++; --- 502,525 ---- for i = 1:nc xcol = obj.xdata(:,i); ycol = obj.ydata(:,i); ! if (nd == 3) ! if (! isempty (obj.zdata)) ! zcol = obj.zdata(:,i); ! else ! zcol = zeros (size (xcol)); ! endif endif if (! isnan (xcol) && ! isnan (ycol)) ## Is the patch closed or not if (strncmp (obj.facecolor, "none", 4)) + hidden_removal = false; + else if (isnan (hidden_removal)) ! hidden_removal = true; endif ! if (nd == 3) error ("gnuplot (as of v4.2) only supports 2D filled patches"); endif data_idx++; *************** *** 606,616 **** ## patch outline if (! strncmp (obj.edgecolor, "none", 4)) - if (! isempty (zcol)) - nd = 3; - else - nd = 2; - endif data_idx++; is_image_data(data_idx) = false; --- 614,619 ---- *************** *** 669,681 **** if (isfield (obj, "linestyle")) switch (obj.linestyle) case "-" ! lt = "1"; case "--" ! lt = "2"; case ":" ! lt = "3"; case "-." ! lt = "6"; case "none" lt = ""; otherwise --- 672,684 ---- if (isfield (obj, "linestyle")) switch (obj.linestyle) case "-" ! lt = "lt 1"; case "--" ! lt = "lt 2"; case ":" ! lt = "lt 3"; case "-." ! lt = "lt 6"; case "none" lt = ""; otherwise *************** *** 759,766 **** colorspec = sprintf ("lc rgb \"#%02x%02x%02x\"", round (255*color)); endif ! withclause{data_idx} = sprintf ("with %s %s %s %s", ! style, pt, ps, colorspec); else if (isequal (color, [0,0,0])) typ = -1; --- 762,769 ---- colorspec = sprintf ("lc rgb \"#%02x%02x%02x\"", round (255*color)); endif ! withclause{data_idx} = sprintf ("with %s %s %s %s %s", ! style, pt, lt, ps, colorspec); else if (isequal (color, [0,0,0])) typ = -1; *************** *** 785,791 **** style, pt, ps, typ); endif ! if (! isempty (zcol)) if (! isnan (xcol) && ! isnan (ycol) && ! isnan (zcol)) data{data_idx} = [[xcol; xcol(1)], [ycol; ycol(1)], ... [zcol; zcol(1)]]'; --- 788,794 ---- style, pt, ps, typ); endif ! if (nd == 3) if (! isnan (xcol) && ! isnan (ycol) && ! isnan (zcol)) data{data_idx} = [[xcol; xcol(1)], [ycol; ycol(1)], ... [zcol; zcol(1)]]'; *************** *** 805,811 **** endfor case "surface" - nd = 3; view_map = true; if (! (strncmp (obj.edgecolor, "none", 4) && strncmp (obj.facecolor, "none", 4))) --- 808,813 ---- *************** *** 823,833 **** endif usingclause{data_idx} = ""; if (have_newer_gnuplot || isnan (typ)) ! withclause{data_idx} = sprintf ("with %s linestyle %d", ! style, data_idx); else ! withclause{data_idx} = sprintf ("with %s linetype %d %s", ! style, typ, with); endif xdat = obj.xdata; --- 825,835 ---- endif usingclause{data_idx} = ""; if (have_newer_gnuplot || isnan (typ)) ! withclause{data_idx} = sprintf ("with pm3d linestyle %d", ! data_idx); else ! withclause{data_idx} = sprintf ("with pm3d linetype %d %s", ! typ, with); endif xdat = obj.xdata; *************** *** 873,883 **** data{data_idx} = zz.'; endif usingclause{data_idx} = "using ($1):($2):($3):($4)"; ! ! fputs (plot_stream, "unset parametric;\n"); ! fputs (plot_stream, "set style data lines;\n"); ! fputs (plot_stream, "set surface;\n"); ! fputs (plot_stream, "unset contour;\n"); ## Interpolation does not work for flat surfaces (e.g. pcolor) ## and color mapping --> currently set empty. --- 875,881 ---- data{data_idx} = zz.'; endif usingclause{data_idx} = "using ($1):($2):($3):($4)"; ! ## fputs (plot_stream, "unset parametric;\n"); ## Interpolation does not work for flat surfaces (e.g. pcolor) ## and color mapping --> currently set empty. *************** *** 891,905 **** || (isnumeric (obj.facecolor) && all (obj.facecolor == 1))); if (strncmp (obj.facecolor, "none", 4)) if (isnan (hidden_removal)) ! hidden_removal = false; endif - else - hidden_removal = true; endif ! ! if (flat_interp_face ! || (flat_interp_edge && facecolor_none_or_white)) withclause{data_idx} = "with line palette"; endif --- 889,902 ---- || (isnumeric (obj.facecolor) && all (obj.facecolor == 1))); if (strncmp (obj.facecolor, "none", 4)) + hidden_removal = false; + else if (isnan (hidden_removal)) ! hidden_removal = true; endif endif ! ! if (flat_interp_edge && facecolor_none_or_white) withclause{data_idx} = "with line palette"; endif *************** *** 909,930 **** dord = ""; endif ! if (facecolor_none_or_white) ! ## Ensure faces aren't drawn ! fprintf (plot_stream, "unset pm3d;\n"); ! elseif (flat_interp_face && strncmp (obj.edgecolor, "flat", 4)) ! fprintf (plot_stream, "set pm3d at s %s %s corners2color c3;\n", interp_str, dord); ! else if (strncmp (obj.edgecolor, "none", 4)) ! fprintf (plot_stream, "set pm3d at s %s corners2color c3;\n", interp_str, dord); else edgecol = obj.edgecolor; if (ischar (obj.edgecolor)) edgecol = [0,0,0]; endif ! fprintf (plot_stream, "set pm3d at s hidden3d %d %s %s corners2color c3;\n", data_idx, interp_str, dord); if (have_newer_gnuplot) --- 906,924 ---- dord = ""; endif ! if (flat_interp_face && strncmp (obj.edgecolor, "flat", 4)) ! fprintf (plot_stream, "set pm3d explicit at s %s %s corners2color c3;\n", interp_str, dord); ! elseif (!facecolor_none_or_white) if (strncmp (obj.edgecolor, "none", 4)) ! fprintf (plot_stream, "set pm3d explicit at s %s corners2color c3;\n", interp_str, dord); else edgecol = obj.edgecolor; if (ischar (obj.edgecolor)) edgecol = [0,0,0]; endif ! fprintf (plot_stream, "set pm3d explicit at s hidden3d %d %s %s corners2color c3;\n", data_idx, interp_str, dord); if (have_newer_gnuplot) *************** *** 1063,1070 **** if (nd == 3) fputs (plot_stream, "set border 895;\n"); else ! fputs (plot_stream, "set border 3;\n"); ! fputs (plot_stream, "set xtics nomirror; set ytics nomirror;\n"); endif endif --- 1057,1081 ---- if (nd == 3) fputs (plot_stream, "set border 895;\n"); else ! if (strcmpi (axis_obj.yaxislocation, "right")) ! fputs (plot_stream, "unset ytics; set y2tics nomirror\n"); ! if (strcmpi (axis_obj.xaxislocation, "top")) ! fputs (plot_stream, "unset xtics; set x2tics nomirror\n"); ! fputs (plot_stream, "set border 12;\n"); ! else ! fputs (plot_stream, "unset x2tics; set xtics nomirror\n"); ! fputs (plot_stream, "set border 9;\n"); ! endif ! else ! fputs (plot_stream, "unset y2tics; set ytics nomirror\n"); ! if (strcmpi (axis_obj.xaxislocation, "top")) ! fputs (plot_stream, "unset xtics; set x2tics nomirror\n"); ! fputs (plot_stream, "set border 6;\n"); ! else ! fputs (plot_stream, "unset x2tics; set xtics nomirror\n"); ! fputs (plot_stream, "set border 3;\n"); ! endif ! endif endif endif *************** *** 1389,1394 **** --- 1400,1423 ---- endfunction + function nd = __calc_dimensions__ (obj) + kids = obj.children; + nd = 2; + for i = 1:length (kids) + obj = get (kids(i)); + switch (obj.type) + case {"image", "text"} + ## ignore as they + case {"line", "patch"} + if (! isempty (obj.zdata)) + nd = 3; + endif + case "surface" + nd = 3; + endswitch + endfor + endfunction + function __gnuplot_write_data__ (plot_stream, data, nd, parametric, cdata) ## DATA is already transposed. *************** *** 1447,1478 **** function do_tics (obj, plot_stream, ymirror, mono) if (strcmpi (obj.xaxislocation, "top")) do_tics_1 (obj.xtickmode, obj.xtick, obj.xticklabelmode, obj.xticklabel, ! obj.xcolor, "x2", plot_stream, true, mono); do_tics_1 ("manual", [], obj.xticklabelmode, obj.xticklabel, ! obj.xcolor, "x", plot_stream, true, mono); else do_tics_1 (obj.xtickmode, obj.xtick, obj.xticklabelmode, obj.xticklabel, ! obj.xcolor, "x", plot_stream, true, mono); do_tics_1 ("manual", [], obj.xticklabelmode, obj.xticklabel, ! obj.xcolor, "x2", plot_stream, true, mono); endif if (strcmpi (obj.yaxislocation, "right")) do_tics_1 (obj.ytickmode, obj.ytick, obj.yticklabelmode, obj.yticklabel, ! obj.ycolor, "y2", plot_stream, ymirror, mono); do_tics_1 ("manual", [], obj.yticklabelmode, obj.yticklabel, ! obj.ycolor, "y", plot_stream, ymirror, mono); else do_tics_1 (obj.ytickmode, obj.ytick, obj.yticklabelmode, obj.yticklabel, ! obj.ycolor, "y", plot_stream, ymirror, mono); do_tics_1 ("manual", [], obj.yticklabelmode, obj.yticklabel, ! obj.ycolor, "y2", plot_stream, ymirror, mono); endif do_tics_1 (obj.ztickmode, obj.ztick, obj.zticklabelmode, obj.zticklabel, ! obj.zcolor, "z", plot_stream, true, mono); endfunction function do_tics_1 (ticmode, tics, labelmode, labels, color, ax, ! plot_stream, mirror, mono) colorspec = get_text_colorspec (color, mono); if (strcmpi (ticmode, "manual")) if (isempty (tics)) --- 1476,1517 ---- function do_tics (obj, plot_stream, ymirror, mono) if (strcmpi (obj.xaxislocation, "top")) do_tics_1 (obj.xtickmode, obj.xtick, obj.xticklabelmode, obj.xticklabel, ! obj.xcolor, "x2", plot_stream, true, mono, "border"); ! do_tics_1 ("manual", [], obj.xticklabelmode, obj.xticklabel, ! obj.xcolor, "x", plot_stream, true, mono, "border"); ! elseif (strcmpi (obj.xaxislocation, "zero")) ! do_tics_1 (obj.xtickmode, obj.xtick, obj.xticklabelmode, obj.xticklabel, ! obj.xcolor, "x", plot_stream, true, mono, "axis"); do_tics_1 ("manual", [], obj.xticklabelmode, obj.xticklabel, ! obj.xcolor, "x2", plot_stream, true, mono, "axis"); else do_tics_1 (obj.xtickmode, obj.xtick, obj.xticklabelmode, obj.xticklabel, ! obj.xcolor, "x", plot_stream, true, mono, "border"); do_tics_1 ("manual", [], obj.xticklabelmode, obj.xticklabel, ! obj.xcolor, "x2", plot_stream, true, mono, "border"); endif if (strcmpi (obj.yaxislocation, "right")) do_tics_1 (obj.ytickmode, obj.ytick, obj.yticklabelmode, obj.yticklabel, ! obj.ycolor, "y2", plot_stream, ymirror, mono, "border"); ! do_tics_1 ("manual", [], obj.yticklabelmode, obj.yticklabel, ! obj.ycolor, "y", plot_stream, ymirror, mono, "border"); ! elseif (strcmpi (obj.xaxislocation, "zero")) ! do_tics_1 (obj.ytickmode, obj.ytick, obj.yticklabelmode, obj.yticklabel, ! obj.ycolor, "y", plot_stream, ymirror, mono, "axis"); do_tics_1 ("manual", [], obj.yticklabelmode, obj.yticklabel, ! obj.ycolor, "y2", plot_stream, ymirror, mono, "axis"); else do_tics_1 (obj.ytickmode, obj.ytick, obj.yticklabelmode, obj.yticklabel, ! obj.ycolor, "y", plot_stream, ymirror, mono, "border"); do_tics_1 ("manual", [], obj.yticklabelmode, obj.yticklabel, ! obj.ycolor, "y2", plot_stream, ymirror, mono, "border"); endif do_tics_1 (obj.ztickmode, obj.ztick, obj.zticklabelmode, obj.zticklabel, ! obj.zcolor, "z", plot_stream, true, mono, "border"); endfunction function do_tics_1 (ticmode, tics, labelmode, labels, color, ax, ! plot_stream, mirror, mono, axispos) colorspec = get_text_colorspec (color, mono); if (strcmpi (ticmode, "manual")) if (isempty (tics)) *************** *** 1487,1495 **** nlabels = numel (labels); fprintf (plot_stream, "set format %s \"%%s\";\n", ax); if (mirror) ! fprintf (plot_stream, "set %stics (", ax); else ! fprintf (plot_stream, "set %stics nomirror (", ax); endif labels = regexprep(labels, "%", "%%"); for i = 1:ntics --- 1526,1534 ---- nlabels = numel (labels); fprintf (plot_stream, "set format %s \"%%s\";\n", ax); if (mirror) ! fprintf (plot_stream, "set %stics %s (", ax, axispos); else ! fprintf (plot_stream, "set %stics %s nomirror (", ax, axispos); endif labels = regexprep(labels, "%", "%%"); for i = 1:ntics *************** *** 1508,1516 **** else fprintf (plot_stream, "set format %s \"%%g\";\n", ax); if (mirror) ! fprintf (plot_stream, "set %stics (", ax); else ! fprintf (plot_stream, "set %stics nomirror (", ax); endif fprintf (plot_stream, " %g,", tics(1:end-1)); fprintf (plot_stream, " %g);\n", tics(end)); --- 1547,1555 ---- else fprintf (plot_stream, "set format %s \"%%g\";\n", ax); if (mirror) ! fprintf (plot_stream, "set %stics %s (", ax, axispos ); else ! fprintf (plot_stream, "set %stics %s nomirror (", ax, axispos); endif fprintf (plot_stream, " %g,", tics(1:end-1)); fprintf (plot_stream, " %g);\n", tics(end)); *************** *** 1518,1526 **** else fprintf (plot_stream, "set format %s \"%%g\";\n", ax); if (mirror) ! fprintf (plot_stream, "set %stics %s;\n", ax, colorspec); else ! fprintf (plot_stream, "set %stics nomirror %s;\n", ax, colorspec); endif endif endfunction --- 1557,1566 ---- else fprintf (plot_stream, "set format %s \"%%g\";\n", ax); if (mirror) ! fprintf (plot_stream, "set %stics %s %s;\n", ax, axispos, colorspec); else ! fprintf (plot_stream, "set %stics %s nomirror %s;\n", ax, ! axispos, colorspec); endif endif endfunction diff -cNr octave-2.9.19/scripts/plot/compass.m octave-3.0.0/scripts/plot/compass.m *** octave-2.9.19/scripts/plot/compass.m Wed Dec 31 19:00:00 1969 --- octave-3.0.0/scripts/plot/compass.m Tue Dec 18 16:34:26 2007 *************** *** 0 **** --- 1,118 ---- + ## Copyright (C) 2007 David Bateman + ## + ## This file is part of Octave. + ## + ## Octave is free software; you can redistribute it and/or modify it + ## under the terms of the GNU General Public License as published by + ## the Free Software Foundation; either version 3 of the License, or (at + ## your option) any later version. + ## + ## Octave is distributed in the hope that it will be useful, but + ## WITHOUT ANY WARRANTY; without even the implied warranty of + ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + ## General Public License for more details. + ## + ## You should have received a copy of the GNU General Public License + ## along with Octave; see the file COPYING. If not, see + ## . + + ## -*- texinfo -*- + ## @deftypefn {Function File} {} compass (@var{u}, @var{v}) + ## @deftypefnx {Function File} {} compass (@var{z}) + ## @deftypefnx {Function File} {} compass (@dots{}, @var{style}) + ## @deftypefnx {Function File} {} compass (@var{h}, @dots{}) + ## @deftypefnx {Function File} {@var{h} =} compass (@dots{}) + ## + ## Plot the @code{(@var{u}, @var{v})} components of a vector field emanating + ## from the origin of a polar polt. If a single complex argument @var{z} is + ## given, then @code{@var{u} = real (@var{z})} and @code{@var{v} = imag + ## (@var{z})}. + ## + ## The style to use for the plot can be defined with a line style @var{style} + ## in a similar manner to the line styles used with the @code{plot} command. + ## + ## The optional return value @var{h} provides a list of handles to the + ## the parts of the vector field (body, arrow and marker). + ## + ## @example + ## @group + ## a = toeplitz([1;randn(9,1)],[1,randn(1,9)]); + ## compass (eig (a)) + ## @end group + ## @end example + ## + ## @seealso{plot, polar, quiver, feather} + ## @end deftypefn + + function retval = compass (varargin) + + [h, varargin, nargin] = __plt_get_axis_arg__ ("compass", varargin{:}); + + arrowsize = 0.25; + firstnonnumeric = Inf; + for i = 1:nargin + if (! isnumeric (varargin{i})) + firstnonnumeric = i; + break; + endif + endfor + + if (nargin < 2 || firstnonnumeric < 2) + ioff = 2; + z = varargin {1} (:) .'; + u = real (z); + v = imag (z); + else + ioff = 3; + u = varargin {1} (:) .'; + v = varargin {2} (:) .'; + endif + + line_spec = "b-"; + while (ioff <= nargin) + arg = varargin{ioff++}; + if ((isstr (arg) || iscell (arg)) && ! have_line_spec) + [linespec, valid] = __pltopt__ ("compass", arg, false); + if (valid) + line_spec = arg; + break; + else + error ("compass: invalid linespec"); + endif + else + error ("compass: unrecognized argument"); + endif + endwhile + + ## Matlab draws compass plots, with the arrow head as one continous + ## line, and each arrow separately. This is completely different than + ## quiver and quite ugly. + n = length (u); + xend = u; + xtmp = u .* (1 - arrowsize); + yend = v; + ytmp = v .* (1 - arrowsize); + x = [zeros(1, n); xend; xtmp - v * arrowsize / 3; xend; ... + xtmp + v * arrowsize / 3]; + y = [zeros(1, n); yend; ytmp + u * arrowsize / 3; yend; ... + ytmp - u * arrowsize / 3]; + [r, p] = cart2pol (x, y); + + oldh = gca (); + unwind_protect + axes (h); + newplot (); + hlist = polar (h, r, p, line_spec); + unwind_protect_cleanup + axes (oldh); + end_unwind_protect + + if (nargout > 0) + retval = hlist; + endif + + endfunction + + %!demo + %! a = toeplitz([1;randn(9,1)],[1,randn(1,9)]); + %! compass (eig (a)) diff -cNr octave-2.9.19/scripts/plot/contour.m octave-3.0.0/scripts/plot/contour.m *** octave-2.9.19/scripts/plot/contour.m Mon Dec 3 22:03:55 2007 --- octave-3.0.0/scripts/plot/contour.m Fri Dec 21 12:45:16 2007 *************** *** 18,28 **** ## . ## -*- texinfo -*- ! ## @deftypefn {Function File} {@var{c} =} contour (@var{z}) ! ## @deftypefnx {Function File} {@var{c} =} contour (@var{z}, @var{vn}) ! ## @deftypefnx {Function File} {@var{c} =} contour (@var{x}, @var{y}, @var{z}) ! ## @deftypefnx {Function File} {@var{c} =} contour (@var{x}, @var{y}, @var{z}, @var{vn}) ! ## @deftypefnx {Function File} {@var{c} =} contour (@var{h}, @dots{}) ## @deftypefnx {Function File} {[@var{c}, @var{h}] =} contour (@dots{}) ## Plot level curves (contour lines) of the matrix @var{z}, using the ## contour matrix @var{c} computed by @code{contourc} from the same --- 18,29 ---- ## . ## -*- texinfo -*- ! ## @deftypefn {Function File} {} contour (@var{z}) ! ## @deftypefnx {Function File} {} contour (@var{z}, @var{vn}) ! ## @deftypefnx {Function File} {} contour (@var{x}, @var{y}, @var{z}) ! ## @deftypefnx {Function File} {} contour (@var{x}, @var{y}, @var{z}, @var{vn}) ! ## @deftypefnx {Function File} {} contour (@dots{}, @var{style}) ! ## @deftypefnx {Function File} {} contour (@var{h}, @dots{}) ## @deftypefnx {Function File} {[@var{c}, @var{h}] =} contour (@dots{}) ## Plot level curves (contour lines) of the matrix @var{z}, using the ## contour matrix @var{c} computed by @code{contourc} from the same *************** *** 38,50 **** ## @end group ## @end example ## ## The optional input and output argument @var{h} allows an axis handle to ## be passed to @code{contour} and the handles to the contour objects to be ## returned. ## @seealso{contourc, patch, plot} ## @end deftypefn ! ## Author: shaia function [c, h] = contour (varargin) --- 39,55 ---- ## @end group ## @end example ## + ## The style to use for the plot can be defined with a line style @var{style} + ## in a similar manner to the line styles used with the @code{plot} command. + ## Any markers defined by @var{style} are ignored. + ## ## The optional input and output argument @var{h} allows an axis handle to ## be passed to @code{contour} and the handles to the contour objects to be ## returned. ## @seealso{contourc, patch, plot} ## @end deftypefn ! ## Author: Shai Ayal function [c, h] = contour (varargin) *************** *** 69,71 **** --- 74,82 ---- %!demo %! [x, y, z] = peaks (); %! contour (x, y, z); + + %!demo + %! [theta, r] = meshgrid (linspace (0, 2*pi, 64), linspace(0,1,64)); + %! [X, Y] = pol2cart (theta, r); + %! Z = sin(2*theta).*(1-r); + %! contour(X, Y, abs(Z), 10) diff -cNr octave-2.9.19/scripts/plot/contour3.m octave-3.0.0/scripts/plot/contour3.m *** octave-2.9.19/scripts/plot/contour3.m Mon Dec 3 22:03:55 2007 --- octave-3.0.0/scripts/plot/contour3.m Fri Dec 14 12:42:55 2007 *************** *** 17,27 **** ## . ## -*- texinfo -*- ! ## @deftypefn {Function File} {@var{c} =} contour3 (@var{z}) ! ## @deftypefnx {Function File} {@var{c} =} contour3 (@var{z}, @var{vn}) ! ## @deftypefnx {Function File} {@var{c} =} contour3 (@var{x}, @var{y}, @var{z}) ! ## @deftypefnx {Function File} {@var{c} =} contour3 (@var{x}, @var{y}, @var{z}, @var{vn}) ! ## @deftypefnx {Function File} {@var{c} =} contour3 (@var{h}, @dots{}) ## @deftypefnx {Function File} {[@var{c}, @var{h}] =} contour3 (@dots{}) ## Plot level curves (contour lines) of the matrix @var{z}, using the ## contour matrix @var{c} computed by @code{contourc} from the same --- 17,28 ---- ## . ## -*- texinfo -*- ! ## @deftypefn {Function File} {} contour3 (@var{z}) ! ## @deftypefnx {Function File} {} contour3 (@var{z}, @var{vn}) ! ## @deftypefnx {Function File} {} contour3 (@var{x}, @var{y}, @var{z}) ! ## @deftypefnx {Function File} {} contour3 (@var{x}, @var{y}, @var{z}, @var{vn}) ! ## @deftypefnx {Function File} {} contour3 (@dots{}, @var{style}) ! ## @deftypefnx {Function File} {} contour3 (@var{h}, @dots{}) ## @deftypefnx {Function File} {[@var{c}, @var{h}] =} contour3 (@dots{}) ## Plot level curves (contour lines) of the matrix @var{z}, using the ## contour matrix @var{c} computed by @code{contourc} from the same *************** *** 38,43 **** --- 39,48 ---- ## @end group ## @end example ## + ## The style to use for the plot can be defined with a line style @var{style} + ## in a similar manner to the line styles used with the @code{plot} command. + ## Any markers defined by @var{style} are ignored. + ## ## The optional input and output argument @var{h} allows an axis handle to ## be passed to @code{contour} and the handles to the contour objects to be ## returned. diff -cNr octave-2.9.19/scripts/plot/contourc.m octave-3.0.0/scripts/plot/contourc.m *** octave-2.9.19/scripts/plot/contourc.m Mon Dec 3 22:03:55 2007 --- octave-3.0.0/scripts/plot/contourc.m Wed Dec 19 16:39:02 2007 *************** *** 55,74 **** ## @seealso{contour} ## @end deftypefn ! ## Author: shaia function [c, lev] = contourc (varargin) if (nargin == 1) vn = 10; z = varargin{1}; ! x = 1:size(z,2); ! y = 1:size(z,1); elseif (nargin == 2) vn = varargin{2}; z = varargin{1}; ! x = 1:size(z,2); ! y = 1:size(z,1); elseif (nargin == 3) vn = 10; x = varargin{1}; --- 55,76 ---- ## @seealso{contour} ## @end deftypefn ! ## Author: Shai Ayal function [c, lev] = contourc (varargin) if (nargin == 1) vn = 10; z = varargin{1}; ! [nr, nc] = size (z); ! x = 1:nc; ! y = 1:nr; elseif (nargin == 2) vn = varargin{2}; z = varargin{1}; ! [nr, nc] = size (z); ! x = 1:nc; ! y = 1:nr; elseif (nargin == 3) vn = 10; x = varargin{1}; *************** *** 89,113 **** vv = unique (sort (vn)); endif ! ## Vectorize the x,y vectors, assuming they are output from meshgrid. ! if (! isvector (x)) ! x = x(1,:); ! endif ! ! if (! isvector (y)) ! y = y(:,1); ! endif ! ! ## Make everyone the right dimensions. ! if (size (x, 2) == 1) ! x = x'; ! endif ! if (size (y, 2) == 1) ! y = y'; endif ! ! ## Now call __contourc__ for the real work... ! c = __contourc__ (x, y, z, vv); if (nargout == 2) lev = vv; endif --- 91,132 ---- vv = unique (sort (vn)); endif ! if (isvector (x) && isvector (y)) ! c = __contourc__ (x(:)', y(:)', z, vv); ! else ! ## Indexes x,y for the purpose of __contourc__. ! ii = 1:size (z,2); ! jj = 1:size (z,1); ! ! ## Now call __contourc__ for the real work... ! c = __contourc__ (ii, jj, z, vv); ! ! ## Map the contour lines from index space (i,j) back ! ## to the original grid (x,y) ! i = 1; ! ! while (i < size (c,2)) ! clen = c(2, i); ! ind = i + [1 : clen]; ! ! ci = c(1, ind); ! cj = c(2,ind); ! ! ## due to rounding errors some elements of ci and cj ! ## can fall out of the range of ii and jj and interp2 would ! ## return NA for those values. ! ## The permitted range is enforced here: ! ! ci = max (ci, 1); ci = min (ci, size (z, 2)); ! cj = max (cj, 1); cj = min (cj, size (z, 1)); ! ! c(1, ind) = interp2 (ii, jj, x, ci, cj); ! c(2, ind) = interp2 (ii, jj, y, ci, cj); ! ! i = i + clen + 1; ! endwhile endif ! if (nargout == 2) lev = vv; endif diff -cNr octave-2.9.19/scripts/plot/contourf.m octave-3.0.0/scripts/plot/contourf.m *** octave-2.9.19/scripts/plot/contourf.m Mon Dec 3 22:03:55 2007 --- octave-3.0.0/scripts/plot/contourf.m Fri Dec 21 12:45:16 2007 *************** *** 55,61 **** ## @end deftypefn ## Author: Kai Habel ! ## Author: shaia function varargout = contourf (varargin) --- 55,61 ---- ## @end deftypefn ## Author: Kai Habel ! ## Author: Shai Ayal function varargout = contourf (varargin) *************** *** 258,260 **** --- 258,266 ---- %!demo %! [x, y, z] = peaks (50); %! contourf (x, y, z, -7:9) + + %!demo + %! [theta, r] = meshgrid (linspace (0, 2*pi, 64), linspace(0,1,64)); + %! [X, Y] = pol2cart (theta, r); + %! Z = sin(2*theta).*(1-r); + %! contourf(X, Y, abs(Z), 10) diff -cNr octave-2.9.19/scripts/plot/ellipsoid.m octave-3.0.0/scripts/plot/ellipsoid.m *** octave-2.9.19/scripts/plot/ellipsoid.m Wed Dec 31 19:00:00 1969 --- octave-3.0.0/scripts/plot/ellipsoid.m Wed Dec 12 11:47:07 2007 *************** *** 0 **** --- 1,73 ---- + ## Copyright (C) 2007 Sylvain Pelissier + ## + ## This file is part of Octave. + ## + ## Octave is free software; you can redistribute it and/or modify it + ## under the terms of the GNU General Public License as published by + ## the Free Software Foundation; either version 3 of the License, or (at + ## your option) any later version. + ## + ## Octave is distributed in the hope that it will be useful, but + ## WITHOUT ANY WARRANTY; without even the implied warranty of + ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + ## General Public License for more details. + ## + ## You should have received a copy of the GNU General Public License + ## along with Octave; see the file COPYING. If not, see + ## . + + ## -*- texinfo -*- + ## @deftypefn {Function File} {[@var{x}, @var{y}, @var{z}] =} ellipsoid (@var{xc},@var{yc}, @var{zc}, @var{xr}, @var{yr}, @var{zr}, @var{n}) + ## @deftypefnx {Function File} {} ellipsoid (@var{h}, @dots{}) + ## Generate three matrices in @code{meshgrid} format that define an + ## ellipsoid. Called with no return arguments, @code{ellipsoid} calls + ## directly @code{surf (@var{x}, @var{y}, @var{z})}. If an axes handle + ## is passed as the first argument, the the surface is plotted to this + ## set of axes. + ## @seealso{sphere} + ## @end deftypefn + + ## Author: Sylvain Pelissier + + function [xx, yy, zz] = ellipsoid (varargin) + + [h, varargin, nargin] = __plt_get_axis_arg__ ((nargout > 0), "ellipsoid", + varargin{:}); + + if (nargin != 6 && nargin != 7) + print_usage (); + endif + + xc = varargin{1}; + yc = varargin{2}; + zc = varargin{3}; + xr = varargin{4}; + yr = varargin{5}; + zr = varargin{6}; + + if (nargin == 5) + n = 20; + else + n = varargin{7}; + endif + + theta = linspace (0, 2 * pi, n + 1); + phi = linspace (-pi / 2, pi / 2, n + 1); + [theta, phi] = meshgrid (theta, phi); + + x = xr .* cos (phi) .* cos (theta) + xc; + y = yr .* cos (phi) .* sin (theta) + yc; + z = zr .* sin (phi) + zc; + + if (nargout > 0) + xx = x; + yy = y; + zz = z; + else + surf (h, x, y, z); + endif + + endfunction + + %!demo + %! ellipsoid (0, 0, 1, 2, 3, 4, 20); diff -cNr octave-2.9.19/scripts/plot/feather.m octave-3.0.0/scripts/plot/feather.m *** octave-2.9.19/scripts/plot/feather.m Wed Dec 31 19:00:00 1969 --- octave-3.0.0/scripts/plot/feather.m Tue Dec 18 16:34:26 2007 *************** *** 0 **** --- 1,117 ---- + ## Copyright (C) 2007 David Bateman + ## + ## This file is part of Octave. + ## + ## Octave is free software; you can redistribute it and/or modify it + ## under the terms of the GNU General Public License as published by + ## the Free Software Foundation; either version 3 of the License, or (at + ## your option) any later version. + ## + ## Octave is distributed in the hope that it will be useful, but + ## WITHOUT ANY WARRANTY; without even the implied warranty of + ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + ## General Public License for more details. + ## + ## You should have received a copy of the GNU General Public License + ## along with Octave; see the file COPYING. If not, see + ## . + + ## -*- texinfo -*- + ## @deftypefn {Function File} {} feather (@var{u}, @var{v}) + ## @deftypefnx {Function File} {} feather (@var{z}) + ## @deftypefnx {Function File} {} feather (@dots{}, @var{style}) + ## @deftypefnx {Function File} {} feather (@var{h}, @dots{}) + ## @deftypefnx {Function File} {@var{h} =} feather (@dots{}) + ## + ## Plot the @code{(@var{u}, @var{v})} components of a vector field emanating + ## from equidistant points on the x-axis. If a single complex argument + ## @var{z} is given, then @code{@var{u} = real (@var{z})} and + ## @code{@var{v} = imag (@var{z})}. + ## + ## The style to use for the plot can be defined with a line style @var{style} + ## in a similar manner to the line styles used with the @code{plot} command. + ## + ## The optional return value @var{h} provides a list of handles to the + ## the parts of the vector field (body, arrow and marker). + ## + ## @example + ## @group + ## phi = [0 : 15 : 360] * pi / 180; + ## feather (sin (phi), cos (phi)) + ## @end group + ## @end example + ## + ## @seealso{plot, quiver, compass} + ## @end deftypefn + + function retval = feather (varargin) + + [h, varargin, nargin] = __plt_get_axis_arg__ ("feather", varargin{:}); + + arrowsize = 0.25; + firstnonnumeric = Inf; + for i = 1:nargin + if (! isnumeric (varargin{i})) + firstnonnumeric = i; + break; + endif + endfor + + if (nargin < 2 || firstnonnumeric < 2) + ioff = 2; + z = varargin {1} (:) .'; + u = real (z); + v = imag (z); + else + ioff = 3; + u = varargin {1} (:) .'; + v = varargin {2} (:) .'; + endif + + line_spec = "b-"; + while (ioff <= nargin) + arg = varargin{ioff++}; + if ((isstr (arg) || iscell (arg)) && ! have_line_spec) + [linespec, valid] = __pltopt__ ("feather", arg, false); + if (valid) + line_spec = arg; + break; + else + error ("feather: invalid linespec"); + endif + else + error ("feather: unrecognized argument"); + endif + endwhile + + ## Matlab draws feather plots, with the arrow head as one continous + ## line, and each arrow separately. This is completely different than + ## quiver and quite ugly. + n = length (u); + xend = [1 : n] + u; + xtmp = [1 : n] + u .* (1 - arrowsize); + yend = v; + ytmp = v .* (1 - arrowsize); + x = [[1 : n]; xend; xtmp - v * arrowsize; xend; ... + xtmp + v * arrowsize]; + y = [zeros(1, n); yend; ytmp + u * arrowsize / 3; yend; ... + ytmp - u * arrowsize / 3]; + + oldh = gca (); + unwind_protect + axes (h); + newplot (); + hlist = plot (h, x, y, line_spec, [1, n], [0, 0], line_spec); + unwind_protect_cleanup + axes (oldh); + end_unwind_protect + + if (nargout > 0) + retval = hlist; + endif + + endfunction + + %!demo + %! phi = [0 : 15 : 360] * pi / 180; + %! feather (sin (phi), cos (phi)) diff -cNr octave-2.9.19/scripts/plot/pie.m octave-3.0.0/scripts/plot/pie.m *** octave-2.9.19/scripts/plot/pie.m Thu Nov 29 14:07:29 2007 --- octave-3.0.0/scripts/plot/pie.m Wed Dec 12 17:36:15 2007 *************** *** 77,102 **** len = length (x); while (iarg <= nargin) arg = varargin{iarg++}; if (iscell (arg)) labels = arg; if (! size_equal (x, labels)) error ("pie: mismatch in number of labels and data"); endif elseif (isnumeric (arg)) explode = arg; if (! size_equal (x, explode)) error ("pie: mismatch in number of elements in explode and data"); endif endif endwhile ! if (! exist ("explode", "var")) explode = zeros (size (x)); endif ! if (! exist ("labels", "var")) xp = round (100 * x ./ sum (x)); for i = 1:len labels{i} = sprintf ("%d%%", xp(i)); --- 77,107 ---- len = length (x); + have_explode = false; + have_labels = false; + while (iarg <= nargin) arg = varargin{iarg++}; if (iscell (arg)) labels = arg; + have_labels = true; if (! size_equal (x, labels)) error ("pie: mismatch in number of labels and data"); endif elseif (isnumeric (arg)) explode = arg; + have_explode = true; if (! size_equal (x, explode)) error ("pie: mismatch in number of elements in explode and data"); endif endif endwhile ! if (! have_explode) explode = zeros (size (x)); endif ! if (! have_labels) xp = round (100 * x ./ sum (x)); for i = 1:len labels{i} = sprintf ("%d%%", xp(i)); diff -cNr octave-2.9.19/scripts/plot/plotyy.m octave-3.0.0/scripts/plot/plotyy.m *** octave-2.9.19/scripts/plot/plotyy.m Mon Dec 3 22:03:55 2007 --- octave-3.0.0/scripts/plot/plotyy.m Thu Dec 13 12:48:59 2007 *************** *** 131,137 **** %! x = 0:0.1:2*pi; %! y1 = sin (x); %! y2 = exp (x - 1); ! %! ax = plotyy (x, y1, x - 1, y2, @@plot, @@semilogy); %! xlabel ("X"); %! ylabel (ax(1), "Axis 1"); %! ylabel (ax(2), "Axis 2"); --- 131,137 ---- %! x = 0:0.1:2*pi; %! y1 = sin (x); %! y2 = exp (x - 1); ! %! ax = plotyy (x, y1, x - 1, y2, @plot, @semilogy); %! xlabel ("X"); %! ylabel (ax(1), "Axis 1"); %! ylabel (ax(2), "Axis 2"); diff -cNr octave-2.9.19/scripts/plot/polar.m octave-3.0.0/scripts/plot/polar.m *** octave-2.9.19/scripts/plot/polar.m Thu Nov 29 14:07:29 2007 --- octave-3.0.0/scripts/plot/polar.m Mon Dec 17 22:48:04 2007 *************** *** 30,63 **** function retval = polar (varargin) ! [h, varargin] = __plt_get_axis_arg__ ("polar", varargin{:}); oldh = gca (); unwind_protect axes (h); newplot (); - nargs = numel (varargin); - if (nargs == 3) if (! ischar (varargin{3})) error ("polar: third argument must be a string"); endif tmp = __plr2__ (h, varargin{:}); ! elseif (nargin == 2) if (ischar (varargin{2})) tmp = __plr1__ (h, varargin{:}); else fmt = ""; tmp = __plr2__ (h, varargin{:}, fmt); endif ! elseif (nargin == 1) fmt = ""; tmp = __plr1__ (h, varargin{:}, fmt); else print_usage (); endif if (nargout > 0) retval = tmp; endif --- 30,77 ---- function retval = polar (varargin) ! [h, varargin, nargs] = __plt_get_axis_arg__ ("polar", varargin{:}); oldh = gca (); unwind_protect axes (h); newplot (); if (nargs == 3) if (! ischar (varargin{3})) error ("polar: third argument must be a string"); endif tmp = __plr2__ (h, varargin{:}); ! maxr = max (varargin {2} (:)); ! elseif (nargs == 2) if (ischar (varargin{2})) tmp = __plr1__ (h, varargin{:}); + if (iscomplex(varargin{1})) + maxr = max (imag(varargin{1})(:)); + else + maxr = max (varargin{1}(:)); + endif else fmt = ""; tmp = __plr2__ (h, varargin{:}, fmt); + maxr = max (varargin {2} (:)); endif ! elseif (nargs == 1) fmt = ""; tmp = __plr1__ (h, varargin{:}, fmt); + if (iscomplex(varargin{1})) + maxr = max (imag(varargin{1})(:)); + else + maxr = max (varargin{1}(:)); + endif else print_usage (); endif + set (h, "xlim", [-maxr, maxr], "ylim", [-maxr, maxr], + "xaxislocation", "zero", "yaxislocation", "zero", + "dataaspectratio", [1, 1, 1]); + if (nargout > 0) retval = tmp; endif diff -cNr octave-2.9.19/scripts/plot/rose.m octave-3.0.0/scripts/plot/rose.m *** octave-2.9.19/scripts/plot/rose.m Wed Dec 31 19:00:00 1969 --- octave-3.0.0/scripts/plot/rose.m Tue Dec 18 16:34:26 2007 *************** *** 0 **** --- 1,107 ---- + ## Copyright (C) 2007 David Bateman + ## + ## This file is part of Octave. + ## + ## Octave is free software; you can redistribute it and/or modify it + ## under the terms of the GNU General Public License as published by + ## the Free Software Foundation; either version 3 of the License, or (at + ## your option) any later version. + ## + ## Octave is distributed in the hope that it will be useful, but + ## WITHOUT ANY WARRANTY; without even the implied warranty of + ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + ## General Public License for more details. + ## + ## You should have received a copy of the GNU General Public License + ## along with Octave; see the file COPYING. If not, see + ## . + + ## -*- texinfo -*- + ## @deftypefn {Function File} {} rose (@var{th}, @var{r}) + ## @deftypefnx {Function File} {} rose (@var{h}, @dots{}) + ## @deftypefnx {Function File} {@var{h} =} compass (@dots{}) + ## @deftypefnx {Function File} {[@var{r}, @var{th}] =} compass (@dots{}) + ## + ## Plot an angular histogram. With one vector argument @var{th}, plots the + ## histogram with 20 angular bins. If @var{th} is a matrix, then each column + ## of @var{th} produces a separate histogram. + ## + ## If @var{r} is given and is a scalar, then the histogram is produced with + ## @var{r} bins. If @var{r} is a vector, then the center of each bin are + ## defined by the values of @var{r}. + ## + ## The optional return value @var{h} provides a list of handles to the + ## the parts of the vector field (body, arrow and marker). + ## + ## If two output arguments are requested, then rather than plotting the + ## histogram, the polar vectors necessary to plot the histogram are + ## returned. + # + ## @example + ## [r, t] = rose ([2*randn(1e5,1), pi + 2 * randn(1e5,1)]); + ## polar (r, t); + ## @end example + ## + ## + ## @seealso{plot, compass, polar, hist} + ## @end deftypefn + + function [thout, rout] = rose (varargin) + + [h, varargin, nargin] = __plt_get_axis_arg__ ((nargout > 1), "rose", + varargin{:}); + + if (nargin < 1) + print_usage (); + endif + + ## Force theta to [0,2*pi] range + th = varargin {1}; + th = atan2 (sin (th), cos (th)) + pi; + + if (nargin > 1) + x = varargin {2}; + if (isscalar (x)) + x = [0.5/x : 1/x : 1] * 2 * pi; + else + ## Force theta to [0,2*pi] range + x = atan2 (sin (x), cos (x)) + pi; + endif + else + x = [1/40 : 1/20 : 1] * 2 * pi; + endif + + [nn, xx] = hist (th, x); + xx = xx(:).'; + if (isvector (nn)) + nn = nn (:); + endif + x1 = xx(1:end-1) + diff (xx, 1) / 2; + x1 = [x1 ; x1; x1; x1](:); + th = [0; 0; x1; 2*pi ; 2*pi]; + r = zeros (4 * size (nn, 1), size (nn, 2)); + r(2:4:end, :) = nn; + r(3:4:end, :) = nn; + + if (nargout < 2) + oldh = gca (); + unwind_protect + axes (h); + newplot (); + hlist = polar (h, th, r); + unwind_protect_cleanup + axes (oldh); + end_unwind_protect + + if (nargout > 0) + thout = hlist; + endif + else + thout = th; + rout = r; + endif + + endfunction + + %!demo + %! rose ([2*randn(1e5,1), pi + 2 * randn(1e5,1)]) diff -cNr octave-2.9.19/src/ChangeLog octave-3.0.0/src/ChangeLog *** octave-2.9.19/src/ChangeLog Tue Dec 11 17:18:50 2007 --- octave-3.0.0/src/ChangeLog Fri Dec 21 12:46:03 2007 *************** *** 1,3 **** --- 1,32 ---- + 2007-12-21 John W. Eaton + + Version 3.0.0 released. + + * version.h (OCTAVE_VERSION): Now 3.0.0. + (OCTAVE_API_VERSION): Now api-v32. + (OCTAVE_RELEASE_DATE): Now 2007-12-21. + + 2007-12-19 Thomas Kasper + + * OPERATORS/op-scm-cs.cc (DEFBINOP (pow)): Extract complex value + from second arg. + + 2007-12-12 David Bateman + + * DLD-FUNCTIONS/sparse.cc (Fsparse): Check for scalar arguments + for 2 argument version. + + 2007-12-12 John W. Eaton + + * graphics.h.in (class axes) Add the layer property. + * graphics.cc (class axes) Ditto. + + * graphics.cc (gh_manager::get_handle): Use ceil instead of trunc. + + 2007-12-11 John W. Eaton + + * version.h (OCTAVE_VERSION): Now 2.9.19+. + 2007-12-11 John W. Eaton * version.h (OCTAVE_VERSION): Now 2.9.19. diff -cNr octave-2.9.19/src/DLD-FUNCTIONS/sparse.cc octave-3.0.0/src/DLD-FUNCTIONS/sparse.cc *** octave-2.9.19/src/DLD-FUNCTIONS/sparse.cc Tue Dec 11 12:03:33 2007 --- octave-3.0.0/src/DLD-FUNCTIONS/sparse.cc Wed Dec 12 14:14:24 2007 *************** *** 66,75 **** Create a sparse matrix from the full matrix @var{a}.\n\ is forced back to a full matrix is resulting matrix is sparse\n\ \n\ - @deftypefnx {Loadable Function} {@var{s} =} sparse (@var{a}, 1)\n\ - Create a sparse matrix and convert it back to a full matrix.\n\ - is forced back to a full matrix is resulting matrix is sparse\n\ - \n\ @deftypefnx {Loadable Function} {@var{s} =} sparse (@var{i}, @var{j}, @var{sv}, @var{m}, @var{n}, @var{nzmax})\n\ Create a sparse matrix given integer index vectors @var{i} and @var{j},\n\ a 1-by-@code{nnz} vector of real of complex values @var{sv}, overall\n\ --- 66,71 ---- *************** *** 184,202 **** octave_idx_type m = 1, n = 1; if (nargin == 2) { ! m = args(0).int_value(); ! n = args(1).int_value(); ! if (error_state) return retval; ! if (use_complex) ! retval = new octave_sparse_complex_matrix ! (SparseComplexMatrix (m, n)); ! else if (use_bool) ! retval = new octave_sparse_bool_matrix ! (SparseBoolMatrix (m, n)); else ! retval = new octave_sparse_matrix ! (SparseMatrix (m, n)); } else { --- 180,203 ---- octave_idx_type m = 1, n = 1; if (nargin == 2) { ! if (args(0).numel () == 1 && args(1).numel () == 1) ! { ! m = args(0).int_value(); ! n = args(1).int_value(); ! if (error_state) return retval; ! if (use_complex) ! retval = new octave_sparse_complex_matrix ! (SparseComplexMatrix (m, n)); ! else if (use_bool) ! retval = new octave_sparse_bool_matrix ! (SparseBoolMatrix (m, n)); ! else ! retval = new octave_sparse_matrix ! (SparseMatrix (m, n)); ! } else ! error ("sparse: expecting scalar values"); } else { diff -cNr octave-2.9.19/src/DOCSTRINGS octave-3.0.0/src/DOCSTRINGS *** octave-2.9.19/src/DOCSTRINGS Tue Dec 11 18:04:42 2007 --- octave-3.0.0/src/DOCSTRINGS Thu Dec 20 16:12:22 2007 *************** *** 7964,7973 **** Create a sparse matrix from the full matrix @var{a}. is forced back to a full matrix is resulting matrix is sparse - @deftypefnx {Loadable Function} {@var{s} =} sparse (@var{a}, 1) - Create a sparse matrix and convert it back to a full matrix. - is forced back to a full matrix is resulting matrix is sparse - @deftypefnx {Loadable Function} {@var{s} =} sparse (@var{i}, @var{j}, @var{sv}, @var{m}, @var{n}, @var{nzmax}) Create a sparse matrix given integer index vectors @var{i} and @var{j}, a 1-by-@code{nnz} vector of real of complex values @var{sv}, overall --- 7964,7969 ---- diff -cNr octave-2.9.19/src/OPERATORS/op-scm-cs.cc octave-3.0.0/src/OPERATORS/op-scm-cs.cc *** octave-2.9.19/src/OPERATORS/op-scm-cs.cc Fri Oct 12 17:27:36 2007 --- octave-3.0.0/src/OPERATORS/op-scm-cs.cc Wed Dec 19 11:57:21 2007 *************** *** 68,74 **** { CAST_BINOP_ARGS (const octave_sparse_complex_matrix&, const octave_complex&); ! return xpow (v1.complex_matrix_value (), v2.scalar_value ()); } DEFBINOP (ldiv, sparse_complex_matrix, complex) --- 68,74 ---- { CAST_BINOP_ARGS (const octave_sparse_complex_matrix&, const octave_complex&); ! return xpow (v1.complex_matrix_value (), v2.complex_value ()); } DEFBINOP (ldiv, sparse_complex_matrix, complex) diff -cNr octave-2.9.19/src/graphics.cc octave-3.0.0/src/graphics.cc *** octave-2.9.19/src/graphics.cc Tue Dec 11 16:21:33 2007 --- octave-3.0.0/src/graphics.cc Fri Dec 14 12:43:34 2007 *************** *** 460,466 **** retval = graphics_handle (next_handle); ! next_handle = trunc (next_handle) - 1.0 - (rand () + 1.0) / maxrand; } } --- 460,466 ---- retval = graphics_handle (next_handle); ! next_handle = ceil (next_handle) - 1.0 - (rand () + 1.0) / maxrand; } } *************** *** 1098,1103 **** --- 1098,1104 ---- colororder (default_colororder ()), dataaspectratio (Matrix (1, 3, 1.0)), dataaspectratiomode ("auto"), + layer (radio_values ("{bottom}|top")), xlim (), ylim (), zlim (), *************** *** 1263,1268 **** --- 1264,1271 ---- set_dataaspectratio (val); else if (name.compare ("dataaspectratiomode")) set_dataaspectratiomode (val); + else if (name.compare ("layer")) + set_layer (val); else if (name.compare ("xlim")) set_xlim (val); else if (name.compare ("ylim")) *************** *** 1380,1385 **** --- 1383,1389 ---- colororder = default_colororder (); dataaspectratio = Matrix (1, 3, 1.0); dataaspectratiomode = "auto"; + layer = radio_property (radio_values ("{bottom}|top")); Matrix tlim (1, 2, 0.0); tlim(1) = 1; *************** *** 1512,1517 **** --- 1516,1522 ---- m.assign ("colororder", colororder); m.assign ("dataaspectratio", dataaspectratio); m.assign ("dataaspectratiomode", dataaspectratiomode); + m.assign ("layer", layer); m.assign ("xlim", xlim); m.assign ("ylim", ylim); m.assign ("zlim", zlim); *************** *** 1596,1601 **** --- 1601,1608 ---- retval = dataaspectratio; else if (name.compare ("dataaspectratiomode")) retval = dataaspectratiomode; + else if (name.compare ("layer")) + retval = layer; else if (name.compare ("xlim")) retval = xlim; else if (name.compare ("ylim")) *************** *** 1736,1741 **** --- 1743,1749 ---- m["colororder"] = default_colororder (); m["dataaspectratio"] = Matrix (1, 3, 1.0); m["dataaspectratiomode"] = "auto"; + m["layer"] = radio_property (radio_values ("{bottom}|top")); Matrix tlim (1, 2, 0.0); tlim(1) = 1; *************** *** 2697,2703 **** retval = facecolor; else if (name.compare ("facealpha")) retval = facealpha; ! else if (name.compare ("egdecolor")) retval = edgecolor; else if (name.compare ("linestyle")) retval = linestyle; --- 2705,2711 ---- retval = facecolor; else if (name.compare ("facealpha")) retval = facealpha; ! else if (name.compare ("edgecolor")) retval = edgecolor; else if (name.compare ("linestyle")) retval = linestyle; diff -cNr octave-2.9.19/src/graphics.h octave-3.0.0/src/graphics.h *** octave-2.9.19/src/graphics.h Tue Dec 11 17:37:05 2007 --- octave-3.0.0/src/graphics.h Thu Dec 20 15:45:08 2007 *************** *** 1469,1474 **** --- 1469,1475 ---- octave_value colororder; octave_value dataaspectratio; octave_value dataaspectratiomode; + radio_property layer; octave_value xlim; octave_value ylim; octave_value zlim; *************** *** 1528,1533 **** --- 1529,1535 ---- octave_value get_colororder (void) const { return colororder; } octave_value get_dataaspectratio (void) const { return dataaspectratio; } octave_value get_dataaspectratiomode (void) const { return dataaspectratiomode; } + radio_property get_layer (void) const { return layer; } octave_value get_xlim (void) const { return xlim; } octave_value get_ylim (void) const { return ylim; } octave_value get_zlim (void) const { return zlim; } *************** *** 1651,1656 **** --- 1653,1674 ---- } } + void set_layer (const radio_property& val) + { + if (! error_state) + { + layer = val; + mark_modified (); + } + } + + void set_layer (const octave_value& val) + { + radio_property tmp (layer); + tmp = val; + set_layer (tmp); + }; + void set_xlim (const octave_value& val) { if (! error_state) diff -cNr octave-2.9.19/src/graphics.h.in octave-3.0.0/src/graphics.h.in *** octave-2.9.19/src/graphics.h.in Tue Dec 11 11:52:56 2007 --- octave-3.0.0/src/graphics.h.in Wed Dec 12 13:44:35 2007 *************** *** 1360,1365 **** --- 1360,1366 ---- octave_value colororder octave_value dataaspectratio m octave_value dataaspectratiomode + radio_property layer a octave_value xlim m octave_value ylim m octave_value zlim m diff -cNr octave-2.9.19/src/version.h octave-3.0.0/src/version.h *** octave-2.9.19/src/version.h Tue Dec 11 17:18:19 2007 --- octave-3.0.0/src/version.h Thu Dec 20 15:30:37 2007 *************** *** 24,34 **** #if !defined (octave_version_h) #define octave_version_h 1 ! #define OCTAVE_VERSION "2.9.19" ! #define OCTAVE_API_VERSION "api-v31" ! #define OCTAVE_RELEASE_DATE "2007-12-11" #define OCTAVE_COPYRIGHT "Copyright (C) 2007 John W. Eaton and others." --- 24,34 ---- #if !defined (octave_version_h) #define octave_version_h 1 ! #define OCTAVE_VERSION "3.0.0" ! #define OCTAVE_API_VERSION "api-v32" ! #define OCTAVE_RELEASE_DATE "2007-12-21" #define OCTAVE_COPYRIGHT "Copyright (C) 2007 John W. Eaton and others." diff -cNr octave-2.9.19/test/ChangeLog octave-3.0.0/test/ChangeLog *** octave-2.9.19/test/ChangeLog Tue Dec 11 12:03:33 2007 --- octave-3.0.0/test/ChangeLog Fri Dec 21 12:46:17 2007 *************** *** 1,3 **** --- 1,12 ---- + 2007-12-21 John W. Eaton + + Version 3.0.0 released. + + 2007-12-18 David Bateman + + * build_sparse_tests.sh: Add tests for indexing like a([1,1],:), + a(:,[1,1]) and sparse(42)([1,1]). + 2007-12-11 David Bateman * build_sparse_tests.sh: Drop argument to Fsparse to force mutation. diff -cNr octave-2.9.19/test/build_sparse_tests.sh octave-3.0.0/test/build_sparse_tests.sh *** octave-2.9.19/test/build_sparse_tests.sh Tue Dec 11 12:03:33 2007 --- octave-3.0.0/test/build_sparse_tests.sh Wed Dec 19 16:27:23 2007 *************** *** 790,795 **** --- 790,802 ---- # ======================================================= # sparse selection tests + gen_scalar_select_tests () { + cat >>$TESTS <>$TESTS <> $TESTS gen_select_tests PATCH_EOF