[fityk] 01/05: Merge tag 'upstream/1.3.1'

[Stuart Prescott]

This is an automated email from the git hooks/post-receive script.

stuart pushed a commit to branch master
in repository fityk.

commit 8d5052aa14fc9006fbe76760bd2d7d31f47225ac
Merge: 177fcf8 a475003
Author: Stuart Prescott <stuart at debian.org>
Date:   Sun Jan 1 11:45:16 2017 +1100

    Merge tag 'upstream/1.3.1'
    
    Upstream version 1.3.1
    
    # gpg: Signature made Sun 01 Jan 2017 11:44:59 AEDT
    # gpg:                using RSA key BBC17EBB1396F2F7
    # gpg: Good signature from "Stuart Prescott <stuart at nanonanonano.net>"
    # gpg:                 aka "Stuart Prescott <stuart+debian at nanonanonano.net>"
    # gpg:                 aka "Stuart Prescott <stuart at debian.org>"

 .gitignore                     |    1 +
 .travis.yml                    |   11 +-
 CMakeLists.txt                 |    9 +-
 COPYING                        |   41 +-
 Makefile.am                    |   17 +-
 NEWS                           |    6 +
 TODO                           |   21 +-
 cli/gnuplot.cpp                |   14 +-
 cli/gnuplot.h                  |    4 +-
 cli/main.cpp                   |    4 +-
 configure.ac                   |   18 +-
 doc/Makefile                   |    2 +-
 doc/conf.py                    |   44 +-
 doc/data.rst                   |   15 +-
 doc/editlink.html              |   10 -
 doc/fitheme/layout.html        |   46 ++
 doc/fitheme/side.html          |   33 ++
 doc/fitheme/static/fitheme.css |  503 ++++++++++++++++++
 doc/fitheme/theme.conf         |   11 +
 doc/fityk-logo.png             |  Bin 0 -> 3925 bytes
 doc/fityk-manual.rst           |    1 -
 doc/fityk.css                  |  460 -----------------
 doc/fityk_ext.py               |   27 -
 doc/getstarted.rst             |  288 +++++++----
 doc/img/ico-osx.png            |  Bin 995 -> 359 bytes
 doc/img/mode_zoom.png          |  Bin 0 -> 671 bytes
 doc/index.rst                  |   46 +-
 doc/intro.rst                  |  113 +++--
 doc/lang.rst                   |  290 -----------
 doc/layout.html                |   39 --
 doc/model.rst                  |   19 +-
 doc/requirements.txt           |    1 +
 doc/screens.rst                |    4 +
 doc/script.rst                 |  285 ++++++++++-
 fityk.iss.in                   |    3 +-
 fityk/GAfit.h                  |    4 +-
 fityk/Makefile.am              |   37 ++
 fityk/NMfit.h                  |    4 +-
 fityk/ast.cpp                  |    8 +-
 fityk/ast.h                    |    4 +-
 fityk/bfunc.h                  |    4 +-
 fityk/common.h                 |   13 +-
 fityk/cparser.cpp              |   34 +-
 fityk/cparser.h                |    1 -
 fityk/data.cpp                 |   17 +-
 fityk/data.h                   |    9 +-
 fityk/eparser.cpp              |   37 +-
 fityk/eparser.h                |    2 +
 fityk/fit.cpp                  |    4 +-
 fityk/fit.h                    |    4 +-
 fityk/fityk.cpp                |    2 +-
 fityk/func.cpp                 |  135 +----
 fityk/func.h                   |   19 +-
 fityk/guess.h                  |    4 +-
 fityk/info.cpp                 |   15 +-
 fityk/lexer.cpp                |   10 +-
 fityk/lexer.h                  |   20 +-
 fityk/logic.cpp                |    4 +-
 fityk/logic.h                  |    4 +-
 fityk/luabridge.cpp            |   16 +
 fityk/mgr.cpp                  |   31 ++
 fityk/mgr.h                    |    5 +-
 fityk/model.cpp                |   17 +
 fityk/model.h                  |    8 +-
 fityk/numfuncs.h               |  107 +++-
 fityk/root/LICENSE             |  504 ++++++++++++++++++
 fityk/root/README.md           |    4 +
 fityk/root/background.cpp      | 1100 ++++++++++++++++++++++++++++++++++++++++
 fityk/root/background.hpp      |   45 ++
 fityk/runner.cpp               |   82 +--
 fityk/settings.h               |    4 +-
 fityk/swig/fityk.i             |    4 +
 fityk/ui.cpp                   |    2 -
 fityk/ui.h                     |    4 +-
 fityk/ui_api.cpp               |    6 +-
 fityk/ui_api.h                 |    5 +-
 fityk/view.h                   |    4 +-
 fityk/vm.cpp                   |   14 +-
 m4/ax_lua.m4                   |   20 +-
 m4/ax_pkg_swig.m4              |    6 +-
 m4/ax_python_devel.m4          |   47 +-
 release.sh                     |   20 +-
 tests/psvoigt.cpp              |    2 +
 tests/test_model.py            |    1 +
 tests/test_syntax.fit          |    6 +
 tests/test_tranform.py         |   37 ++
 wxgui/about.cpp                |    2 +-
 wxgui/app.cpp                  |    3 +-
 wxgui/app.h                    |    4 +-
 wxgui/bgm.cpp                  |    2 +-
 wxgui/ceria.cpp                |   14 +-
 wxgui/defmgr.h                 |    4 +-
 wxgui/dload.cpp                |   59 ++-
 wxgui/dload.h                  |    4 +-
 wxgui/frame.cpp                |   33 +-
 wxgui/frame.h                  |    1 +
 wxgui/inputline.cpp            |   10 +-
 wxgui/listptxt.h               |    4 +-
 wxgui/mplot.cpp                |   69 ++-
 wxgui/mplot.h                  |    2 +
 wxgui/print.h                  |    4 +-
 wxgui/recent.cpp               |    4 +-
 wxgui/setdlg.h                 |    4 +-
 wxgui/sidebar.cpp              |   53 +-
 wxgui/sidebar.h                |    5 +-
 wxgui/textpane.cpp             |    4 +-
 wxgui/uplot.h                  |    7 +-
 wxgui/xybrowser.cpp            |  121 +++--
 wxgui/xybrowser.h              |   29 +-
 109 files changed, 3726 insertions(+), 1598 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/fityk.git