move melder

Makefile

@@ -1,7 +1,7 @@
 # File: Makefile
 
 # Makefile for Praat.
-# Paul Boersma, 22 October 2016
+# Paul Boersma, 11 August 2018
 
 # System-dependent definitions of CC, LIBS, ICON and MAIN_ICON should be in
 # makefile.defs, which has to be copied and renamed
@@ -20,7 +20,7 @@ all:
 	$(MAKE) -C external/portaudio
 	$(MAKE) -C external/espeak
 	$(MAKE) -C kar
-	$(MAKE) -C num
+	$(MAKE) -C melder
 	$(MAKE) -C sys
 	$(MAKE) -C dwsys
 	$(MAKE) -C stat
@@ -38,7 +38,7 @@ all:
 		FFNet/libFFNet.a gram/libgram.a EEG/libEEG.a \
 		LPC/libLPC.a dwtools/libdwtools.a \
 		fon/libfon.a stat/libstat.a dwsys/libdwsys.a \
-		sys/libsys.a num/libnum.a kar/libkar.a \
+		sys/libsys.a melder/libmelder.a sys/libsys.a kar/libkar.a \
 		external/espeak/libespeak.a \
 		external/portaudio/libportaudio.a \
 		external/flac/libflac.a external/mp3/libmp3.a \
@@ -53,7 +53,7 @@ clean:
 	$(MAKE) -C external/portaudio clean
 	$(MAKE) -C external/espeak clean
 	$(MAKE) -C kar clean
-	$(MAKE) -C num clean
+	$(MAKE) -C melder clean
 	$(MAKE) -C sys clean
 	$(MAKE) -C dwsys clean
 	$(MAKE) -C stat clean

dwsys/Makefile

@@ -16,7 +16,7 @@ OBJECTS = Collection_extensions.o Command.o \
 	NUMf2c.o NUMcblas.o NUMclapack.o NUMcomplex.o NUMfft_d.o NUMsort2.o \
 	NUMmathlib.o NUMstring.o \
 	Permutation.o Permutation_and_Index.o \
-	regularExp.o SimpleVector.o \
+	SimpleVector.o \
 	SVD.o
 
 .PHONY: all clean

dwsys/NUM2.cpp

@@ -76,7 +76,6 @@
 #include "gsl_sf_trig.h"
 #include "gsl_poly.h"
 #include "gsl_cdf.h"
-#include "tensor.h"
 
 #undef MAX
 #undef MIN

dwsys/NUM2.h

@@ -24,8 +24,7 @@
 */
 
 #include <limits.h>
-#include "melder.h"
-#include "regularExp.h"
+#include "../melder/melder.h"
 
 /* machine precision */
 #define NUMeps 2.2e-16

dwtools/DataModeler.cpp

@@ -27,7 +27,6 @@
 #include "Strings_extensions.h"
 #include "Sound_and_LPC_robust.h"
 #include "Table_extensions.h"
-#include "tensor.h"
 
 #include "oo_DESTROY.h"
 #include "DataModeler_def.h"

dwtools/praat_David_init.cpp

@@ -3838,7 +3838,7 @@ DO
 
 /**************** Ltas *******************************************/
 
-#include "UnicodeData.h"
+#include "../kar/UnicodeData.h"
 FORM (INFO_Ltas_reportSpectralTilt, U"Ltas: Report spectral tilt", nullptr) {
 	POSITIVE (fromFrequency, U"left Frequency range (Hz)", U"100.0")
 	POSITIVE (toFrequency, U"right Frequency range (Hz)", U"5000.0")

external/mp3/mp3.h

@@ -19,7 +19,7 @@
  * along with this work. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "melder.h"   // for integer
+#include "../../melder/melder.h"   // for integer
 
 /* The following function is used to identify MP3 files */
 int mp3_recognize (int nread, const char *data);

fon/Sound.cpp

@@ -25,7 +25,6 @@
 #include "Sound.h"
 #include "Sound_extensions.h"
 #include "NUM2.h"
-#include "tensor.h"
 
 #include "enums_getText.h"
 #include "Sound_enums.h"

fon/SpellingChecker.cpp

@@ -38,7 +38,7 @@
 #include "oo_DESCRIPTION.h"
 #include "SpellingChecker_def.h"
 
-#include "longchar.h"
+#include "../kar/longchar.h"
 
 Thing_implement (SpellingChecker, Daata, 0);
 

fon/TextGrid.cpp

@@ -17,7 +17,7 @@
  */
 
 #include "TextGrid.h"
-#include "longchar.h"
+#include "../kar/longchar.h"
 
 #include "oo_DESTROY.h"
 #include "TextGrid_def.h"

fon/TimeSoundEditor.cpp

@@ -19,7 +19,7 @@
 #include "NUM2.h"
 #include "TimeSoundEditor.h"
 #include "EditorM.h"
-#include "UnicodeData.h"
+#include "../kar/UnicodeData.h"
 
 #include "enums_getText.h"
 #include "TimeSoundEditor_enums.h"

fon/WordList.cpp

@@ -17,7 +17,7 @@
  */
 
 #include "WordList.h"
-#include "longchar.h"
+#include "../kar/longchar.h"
 
 #include "oo_DESTROY.h"
 #include "WordList_def.h"

fon/manual_Picture.cpp

@@ -17,7 +17,7 @@
  */
 
 #include "ManPagesM.h"
-#include "UnicodeData.h"
+#include "../kar/UnicodeData.h"
 
 static void drawOneIpaSymbol (Graphics g, double x, double y, conststring32 symbol) {
 	char32 buffer [30], *p = & buffer [0];

fon/manual_sound.cpp

@@ -19,7 +19,7 @@
 #include "ManPagesM.h"
 
 #include "Sound.h"
-#include "UnicodeData.h"
+#include "../kar/UnicodeData.h"
 
 static void draw_SoundDeepen_filter (Graphics g) {
 	try {

kar/longchar.h

@@ -18,7 +18,7 @@
  * along with this work. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "melder.h"
+#include "../melder/melder.h"
 
 /********** NON-ASCII CHARACTERS **********/
 

melder/Makefile

@@ -1,16 +1,16 @@
 # Makefile of the library "melder"
-# Paul Boersma, 10 August 2018
+# Paul Boersma, 11 August 2018
 
 include ../makefile.defs
 
-CPPFLAGS = -I ../external/gsl -I ../external/glpk -I ../kar -I ../sys -I ../dwsys
+CPPFLAGS = -I ../melder
 
 OBJECTS = melder.o complex.o melder_alloc.o \
 	melder_ftoa.o melder_console.o melder_textencoding.o melder_atof.o melder_files.o \
 	melder_vector.o melder_sort.o melder_debug.o melder_strings.o melder_token.o \
 	melder_info.o melder_error.o melder_time.o \
 	melder_audio.o melder_audiofiles.o melder_quantity.o melder_readtext.o melder_writetext.o \
-	abcio.o MelderGui.o melder_sysenv.o \
+	abcio.o MelderGui.o melder_sysenv.o regularExp.o \
 	tensor.o \
 	NUMmath.o \
 	NUMspecfunc.o NUMear.o NUMinterpol.o NUMmetrics.o NUMrandom.o NUMfilter.o NUMlinprog.o \
@@ -30,4 +30,4 @@ libmelder.a: $(OBJECTS)
 	$(AR) cq libmelder.a $(OBJECTS)
 	$(RANLIB) libmelder.a
 
-$(OBJECTS): ../external/gsl/*.h ../external/glpk/*.h ../kar/*.h ../sys/*.h ../dwsys/*.h
+$(OBJECTS): ../kar/*.h ../sys/*.h ../dwsys/*.h

melder/MelderGui.cpp

@@ -21,13 +21,13 @@
 //#include <ctype.h>
 
 #include <assert.h>
-#include "melder.h"
 #ifdef _WIN32
 	#include <windows.h>
 #endif
 
-#include "Graphics.h"
-#include "Gui.h"
+#include "melder.h"
+#include "../sys/Graphics.h"
+#include "../sys/Gui.h"
 
 /********** Exported variable. **********/
 

melder/NUMinterpol.cpp

@@ -26,7 +26,7 @@
  */
 
 #include "melder.h"
-#include "NUM2.h"
+#include "../dwsys/NUM2.h"
 #define SIGN(x,s) ((s) < 0 ? -fabs (x) : fabs(x))
 
 #define NUM_interpolate_simple_cases \

melder/NUMmath.cpp

@@ -30,7 +30,7 @@
 
 double NUMpow (double base, double exponent) { return base <= 0.0 ? 0.0 : pow (base, exponent); }
 
-#include "gsl_errno.h"
+#include "../external/gsl/gsl_errno.h"
 
 void NUMshift (double *x, double xfrom, double xto) {
 	if (*x == xfrom) *x = xto; else *x += xto - xfrom;

melder/NUMspecfunc.cpp

@@ -30,12 +30,12 @@
  */
 
 #include "melder.h"
-#include "NUM2.h"   // NUMridders
+#include "../dwsys/NUM2.h"   // NUMridders
 
-#include "gsl_errno.h"
-#include "gsl_sf_bessel.h"
-#include "gsl_sf_gamma.h"
-#include "gsl_sf_erf.h"
+#include "../external/gsl/gsl_errno.h"
+#include "../external/gsl/gsl_sf_bessel.h"
+#include "../external/gsl/gsl_sf_gamma.h"
+#include "../external/gsl/gsl_sf_erf.h"
 
 double NUMlnGamma (double x) {
 	gsl_sf_result result;

melder/abcio.cpp

@@ -37,7 +37,6 @@
 #ifdef macintosh
 	#include <TargetConditionals.h>
 #endif
-#include "abcio.h"
 
 /********** text I/O **********/
 

melder/abcio.h

@@ -18,11 +18,6 @@
  * along with this work. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "complex.h"
-#include "melder.h"
-
-#include "abcio_enums.h"
-
 /* Numeric text input and output. */
 
 int texgeti8 (MelderReadText text);

melder/melder.cpp

@@ -27,7 +27,7 @@
 	#include "macport_off.h"
 #endif
 
-#include "MelderThread.h"
+#include "../sys/MelderThread.h"
 
 #include "enums_getText.h"
 #include "melder_enums.h"
@@ -36,10 +36,9 @@
 
 /********** Exported variables. **********/
 
-//bool Melder_batch;   // don't we have a GUI?- Set once at application start-up
-//bool Melder_backgrounding;   // are we running a script?- Set and unset dynamically
-//bool Melder_asynchronous;
-//int32 Melder_systemVersion;
+bool Melder_batch;   // don't we have a GUI?- Set once at application start-up
+bool Melder_backgrounding;   // are we running a script?- Set and unset dynamically
+int32 Melder_systemVersion;
 
 static void defaultHelp (conststring32 query) {
 	Melder_flushError (U"Don't know how to find help on \"", query, U"\".");