[mathgl] 01/08: Merge tag 'upstream/2.2.1' into experimental
Dimitrios Eftaxiopoulos
eftaxiop-guest at moszumanska.debian.org
Wed Jan 29 10:41:32 UTC 2014
This is an automated email from the git hooks/post-receive script.
eftaxiop-guest pushed a commit to branch experimental
in repository mathgl.
commit d92f34aa02b61e20adc9fd8d0f7fca725015fd60
Merge: 44cbf26 7c3aa54
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date: Tue Jan 28 20:26:49 2014 +0200
Merge tag 'upstream/2.2.1' into experimental
Upstream version 2.2.1
Conflicts:
CMakeLists.txt
CMakeLists.txt | 209 ++-
ChangeLog.txt | 61 +
brush.ods | Bin 10909 -> 19306 bytes
cmake-qt4.txt | 6 +
cmake-qt5.txt | 23 +
examples/CMakeLists.txt | 14 +-
examples/fltk_example.cpp | 5 +-
examples/full_test.cpp | 125 +-
examples/glut_example.cpp | 3 +-
examples/mpi_test.cpp | 39 +
examples/qt_example.cpp | 14 +-
examples/samples.cpp | 514 ++++---
examples/wnd_samples.cpp | 52 +-
examples/wx_example.cpp | 107 +-
include/CMakeLists.txt | 1 +
include/config.h.in | 31 +-
include/mgl2/abstract.h | 108 ++
include/mgl2/addon.h | 24 +-
include/mgl2/base.h | 225 ++-
include/mgl2/base_cf.h | 35 +-
include/mgl2/canvas.h | 165 ++-
include/mgl2/canvas_cf.h | 41 +-
include/mgl2/canvas_wnd.h | 4 +-
include/mgl2/cont.h | 8 +-
include/mgl2/data.h | 137 +-
include/mgl2/data_cf.h | 94 +-
include/mgl2/datac.h | 67 +-
include/mgl2/datac_cf.h | 41 +-
include/mgl2/define.h | 111 +-
include/mgl2/eval.h | 4 +-
include/mgl2/evalc.h | 4 +-
include/mgl2/fit.h | 44 +-
include/mgl2/fltk.h | 20 +-
include/mgl2/font.h | 33 +-
include/mgl2/glut.h | 4 +-
include/mgl2/gsl.fs | 1276 +++++++++++++++++
include/mgl2/mathgl.fs | 472 +++++++
include/mgl2/mgl.fs | 608 +++++++++
include/mgl2/mgl.h | 235 ++--
include/mgl2/mgl_cf.h | 2 +-
include/mgl2/mgl_pas.pas | 1512 +++++++++++++++++++++
include/mgl2/mglplot.fs | 562 ++++++++
include/mgl2/mpi.h | 5 +-
include/mgl2/opengl.h | 25 +-
include/mgl2/other.h | 9 +-
include/mgl2/parser.h | 30 +-
include/mgl2/pde.h | 67 +
include/mgl2/plot.h | 19 +-
include/mgl2/prim.h | 4 +-
include/mgl2/qmathgl.h | 29 +-
include/mgl2/qt.h | 6 +-
include/mgl2/surf.h | 4 +-
include/mgl2/thread.h | 86 ++
include/mgl2/type.h | 10 +-
include/mgl2/vect.h | 4 +-
include/mgl2/vectors.fs | 161 +++
include/mgl2/volume.h | 4 +-
include/mgl2/window.h | 9 +-
include/mgl2/wnd.h | 9 +-
include/mgl2/wx.h | 42 +-
json/Backend.cpp | 6 +-
json/Backend.hpp | 3 +-
json/CMakeLists.txt | 25 +-
json/MainWindow.cpp | 18 +-
json/MainWindow.hpp | 4 +-
json/index.html | 2 +-
json/main.js | 38 +-
json/mathgl.Graph.js | 923 +++++++------
json/mathgl.View.js | 223 +--
json/mathgl.WebkitBackend.js | 16 +-
lang/CMakeLists.txt | 13 +-
include/mgl2/data.h => lang/data.i | 976 +++++++------
lang/mathgl.i | 18 +-
include/mgl2/mgl.h => lang/mgl.i | 2638 ++++++++++++++++++------------------
lang/sed_rules | 13 +
include/mgl2/type.h => lang/type.i | 68 +-
mathgl-2x.cbp | 19 +-
mgllab/animate.cpp | 2 +-
mgllab/data.cpp | 2 +-
mgllab/editor.cpp | 5 +-
mgllab/grid.cpp | 2 +-
mgllab/help.cpp | 2 +-
mgllab/main.cpp | 2 +-
mgllab/mathgl.cpp | 2 +-
mgllab/option.cpp | 2 +-
mgllab/setup.cpp | 2 +-
mgllab/table.cpp | 2 +-
mgllab/udav.h | 2 +-
mgllab/write.cpp | 2 +-
src/CMakeLists.txt | 19 +-
src/addon.cpp | 73 +-
src/axis.cpp | 378 +++---
src/base.cpp | 470 ++++---
src/base_cf.cpp | 63 +-
src/canvas.cpp | 579 ++++----
src/canvas_cf.cpp | 34 +-
src/complex.cpp | 613 ++++++---
src/complex_io.cpp | 221 ++-
src/cont.cpp | 360 ++---
src/crust.cpp | 240 ++--
src/data.cpp | 1413 +++++++++++--------
src/{data_new.cpp => data_ex.cpp} | 475 +++----
src/data_gr.cpp | 177 +++
src/data_io.cpp | 369 ++---
src/data_png.cpp | 101 +-
src/eval.cpp | 89 +-
src/evalc.cpp | 37 +-
src/evalp.cpp | 622 ++++-----
src/exec.cpp | 309 +++--
src/export.cpp | 84 +-
src/export_2d.cpp | 131 +-
src/export_3d.cpp | 304 +++--
src/fft.cpp | 1141 +++++++++++-----
src/fit.cpp | 282 ++--
src/font.cpp | 330 +++--
src/interp.hpp | 384 ++++++
src/mpi.cpp | 12 +-
src/obj.cpp | 6 +-
src/opengl.cpp | 170 ++-
src/other.cpp | 171 ++-
src/parser.cpp | 495 +++----
src/pde.cpp | 495 ++++---
src/pixel.cpp | 1376 ++++++++++++++-----
src/plot.cpp | 792 ++++++-----
src/prc.cpp | 2 +-
src/prc/writePRC.h | 7 -
src/prim.cpp | 228 ++--
src/surf.cpp | 319 +++--
src/tex_table.cpp | 3 +-
src/vect.cpp | 538 ++++----
src/volume.cpp | 89 +-
src/window.cpp | 3 +-
texinfo/CMakeLists.txt | 194 +--
texinfo/appendix_en.texi | 2 +
texinfo/appendix_ru.texi | 2 +
texinfo/concept_en.texi | 46 +-
texinfo/concept_ru.texi | 89 +-
texinfo/core_en.texi | 318 +++--
texinfo/core_ru.texi | 342 +++--
texinfo/data_en.texi | 132 +-
texinfo/data_ru.texi | 237 ++--
texinfo/doc_en.texi | 136 +-
texinfo/doc_ru.texi | 134 +-
texinfo/ex_mgl_en.texi | 405 ++++--
texinfo/ex_mgl_ru.texi | 419 ++++--
texinfo/example_en.texi | 481 +++++--
texinfo/example_ru.texi | 529 +++++---
texinfo/formats_en.texi | 7 +-
texinfo/formats_ru.texi | 7 +-
texinfo/index.html | 23 +-
texinfo/json.html | 12 +-
texinfo/mathgl.js | 289 ++--
texinfo/mathgl_en.texi | 75 +-
texinfo/mathgl_ru.texi | 78 +-
texinfo/mgl_en.texi | 29 +-
texinfo/mgl_ru.texi | 31 +-
texinfo/other_en.texi | 6 +-
texinfo/other_ru.texi | 6 +-
texinfo/overview_en.texi | 10 +
texinfo/overview_ru.texi | 11 +
texinfo/parse_en.texi | 26 +-
texinfo/parse_ru.texi | 242 ++--
texinfo/surf_cont_fog_g.png | Bin 30517 -> 0 bytes
texinfo/symbols_en.texi | 66 +-
texinfo/symbols_ru.texi | 70 +-
texinfo/time.texi | 112 ++
texinfo/time_big.texi | 112 ++
texinfo/title.html | 10 -
texinfo/toc_en.html | 44 -
texinfo/toc_fr.html | 45 -
texinfo/toc_ru.html | 54 -
texinfo/udav_en.texi | 6 +
texinfo/udav_ru.texi | 6 +
texinfo/version.texi | 3 +
texinfo/web_en.texi | 107 +-
texinfo/web_fr.texi | 4 +-
texinfo/web_ru.texi | 107 +-
texinfo/widget_en.texi | 178 ++-
texinfo/widget_ru.texi | 184 ++-
todo.txt | 60 +-
udav/CMakeLists.txt | 25 +-
udav/dat_pnl.cpp | 33 +-
udav/info_dlg.cpp | 2 +-
udav/mem_pnl.cpp | 10 +-
udav/newcmd_dlg.cpp | 6 +-
udav/open_dlg.cpp | 12 +-
udav/plot_pnl.cpp | 24 +-
udav/plot_pnl.h | 1 +
udav/qmglsyntax.h | 1 +
udav/setup_dlg.cpp | 1 -
udav/style_dlg.cpp | 14 +-
udav/text_pnl.cpp | 9 +-
udav/udav_wnd.cpp | 27 +-
utils/CMakeLists.txt | 16 +-
utils/make_forth.cpp | 168 +++
utils/make_pas.cpp | 473 +++++++
utils/mglcgi.cpp | 6 +-
utils/mglconv.cpp | 2 +-
utils/mglview.cpp | 2 +-
widgets/CMakeLists.txt | 75 +-
widgets/fltk.cpp | 22 +-
widgets/glut.cpp | 44 +-
widgets/qt.cpp | 95 +-
widgets/qt4/CMakeLists.txt | 72 +
widgets/qt5/CMakeLists.txt | 73 +
widgets/wx.cpp | 305 +----
206 files changed, 22383 insertions(+), 11218 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mathgl.git
More information about the debian-science-commits
mailing list