[med-svn] [praat] 02/03: Merge tag 'upstream/5.3.84'

[Rafael Laboissière]

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

rlaboiss-guest pushed a commit to branch master
in repository praat.

commit 0dacf6ab1ef454fd82951e56c1b2928d6a59d01a
Merge: 6707e0b 2472324
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Mon Sep 8 08:52:33 2014 -0300

    Merge tag 'upstream/5.3.84'
    
    Upstream version 5.3.84

 EEG/ERPTier.cpp                  |   4 +-
 EEG/ERPWindow.cpp                |   2 +-
 LPC/LPC_and_Tube.cpp             |   8 +-
 fon/AmplitudeTier.cpp            |   2 +-
 fon/Formant.cpp                  |   6 +-
 fon/FormantGrid.cpp              |   2 +-
 fon/FormantTier.cpp              |   2 +-
 fon/IntensityTierEditor.cpp      |   8 +-
 fon/Manipulation.cpp             |  10 +-
 fon/ManipulationEditor.cpp       |  82 ++++-----
 fon/Matrix.cpp                   |  84 ++++-----
 fon/MovieWindow.cpp              |  12 +-
 fon/ParamCurve.cpp               |   4 +-
 fon/Photo.cpp                    | 233 +++++++++++++------------
 fon/Photo.h                      |  29 ++++
 fon/Photo_def.h                  |  38 ----
 fon/Pitch.cpp                    |   2 +-
 fon/PitchEditor.cpp              | 126 +++++++-------
 fon/Pitch_Intensity.cpp          |   2 +-
 fon/Pitch_to_PitchTier.cpp       |   6 +-
 fon/Pitch_to_PointProcess.cpp    |   4 +-
 fon/PointEditor.cpp              |   4 +-
 fon/PointProcess_and_Sound.cpp   |   2 +-
 fon/PointProcess_def.h           |   8 +-
 fon/RealTier.cpp                 |  84 ++++-----
 fon/RealTierEditor.cpp           | 156 ++++++++---------
 fon/RealTier_def.h               |  14 +-
 fon/Sampled.cpp                  |  23 +--
 fon/Sampled.h                    |  12 +-
 fon/SampledXY.cpp                |  26 +--
 fon/SampledXY.h                  |  12 ++
 fon/SampledXY_def.h              |  11 --
 fon/Sampled_def.h                |   8 -
 fon/Sound.cpp                    |  20 +--
 fon/SoundEditor.cpp              |  20 +--
 fon/SoundEditor.h                |   5 +-
 fon/SoundRecorder.cpp            |  25 +--
 fon/Sound_and_Spectrogram.cpp    |   8 +-
 fon/Sound_to_Cochleagram.cpp     |   2 +-
 fon/Sound_to_Formant.cpp         |   4 +-
 fon/Sound_to_Intensity.cpp       |   6 +-
 fon/Sound_to_Pitch.cpp           |   2 +-
 fon/Sound_to_PointProcess.cpp    |   2 +-
 fon/SpectrogramEditor.cpp        |  52 +++---
 fon/SpectrumEditor.cpp           |  44 ++---
 fon/Spectrum_and_Spectrogram.cpp |   2 +-
 fon/Spectrum_to_Excitation.cpp   |   2 +-
 fon/TextGridEditor.cpp           | 147 ++++++++--------
 fon/TextGrid_Sound.cpp           |  49 +++++-
 fon/TimeSoundAnalysisEditor.cpp  | 363 ++++++++++++++++++++-------------------
 fon/TimeSoundAnalysisEditor.h    |   7 +-
 fon/TimeSoundEditor.cpp          | 164 +++++++++---------
 fon/TimeSoundEditor.h            |  12 +-
 fon/Vector.cpp                   |  10 +-
 fon/manual_tutorials.cpp         |  14 +-
 fon/praat_Fon.cpp                |  40 ++---
 fon/praat_Sound_init.cpp         |   8 +-
 fon/praat_TextGrid_init.cpp      |  18 ++
 gram/Network.cpp                 | 342 ++++++++++++++++++------------------
 gram/Network.h                   |  39 ++++-
 gram/Network_def.h               |  92 +++-------
 gram/OTGrammar.cpp               |  34 ++--
 gram/OTGrammar.h                 |   2 +-
 gram/praat_gram.cpp              | 126 +++++++++++---
 stat/Table_def.h                 |   2 +-
 sys/Editor.cpp                   |  38 ++--
 sys/GraphicsScreen.cpp           |   9 +-
 sys/Graphics_linesAndAreas.cpp   | 124 ++++++-------
 sys/Thing.cpp                    |  10 +-
 sys/Thing.h                      |  13 +-
 sys/melder_audio.cpp             |   2 +-
 sys/oo_CAN_WRITE_AS_ENCODING.h   |  34 ++--
 sys/oo_COPY.h                    |  50 +++---
 sys/oo_DESTROY.h                 |  42 ++---
 sys/oo_EQUAL.h                   |  64 +++----
 sys/oo_READ_BINARY.h             |  56 +++---
 sys/oo_READ_TEXT.h               |  56 +++---
 sys/oo_WRITE_BINARY.h            |  58 +++----
 sys/oo_WRITE_TEXT.h              |  56 +++---
 sys/praat.cpp                    |   3 +-
 sys/praat_version.h              |   6 +-
 81 files changed, 1730 insertions(+), 1580 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/praat.git