[med-svn] [Git][med-team/praat][master] 5 commits: Add Forwarded URL
Rafael Laboissière (@rafael)
gitlab at salsa.debian.org
Thu Nov 4 16:19:42 GMT 2021
Rafael Laboissière pushed to branch master at Debian Med / praat
Commits:
b059bf1e by Rafael Laboissière at 2021-11-04T11:16:06-03:00
Add Forwarded URL
Gbp-Dch: Ignore
- - - - -
8ca42c5c by Rafael Laboissière at 2021-11-04T11:16:51-03:00
New upstream version 6.1.56
- - - - -
977d5ec6 by Rafael Laboissière at 2021-11-04T11:19:32-03:00
Merge tag 'upstream/6.1.56'
Upstream version 6.1.56
- - - - -
7d79bc80 by Rafael Laboissière at 2021-11-04T11:22:31-03:00
d/What_s_new_.html: Update upstream changelog
Gbp-Dch: Ignore
- - - - -
a5d15694 by Rafael Laboissière at 2021-11-04T12:04:16-03:00
d/changelog: Add entry for release 6.1.56-1
Gbp-Dch: Ignore
- - - - -
29 changed files:
- README.md
- artsynth/Artword_Speaker.cpp
- artsynth/Artword_Speaker.h
- artsynth/Artword_Speaker_to_Sound.cpp
- artsynth/Artword_Speaker_to_Sound.h
- debian/What_s_new_.html
- debian/changelog
- debian/patches/honor-cppflags.patch
- external/portaudio/Makefile
- fon/manual_Picture.cpp
- fon/manual_tutorials.cpp
- gram/OTGrammar.h
- gram/OTGrammar_ex_metrics.cpp
- gram/OTGrammar_ex_tongueRoot.cpp
- gram/OTMulti.cpp
- melder/MAT.cpp
- sys/ButtonEditor.cpp
- sys/Graphics_text.cpp
- sys/GuiDrawingArea.cpp
- sys/Interpreter.cpp
- sys/Interpreter.h
- sys/praat.cpp
- sys/praat.h
- sys/praatM.h
- sys/praatP.h
- sys/praat_script.cpp
- sys/praat_version.h
- + test/manually/record.praat
- test/sys/graphicsText.praat
Changes:
=====================================
README.md
=====================================
@@ -122,8 +122,8 @@ The code requires that your compiler supports C99 and C++17.
To compile Praat's Windows edition on a 64-bit Windows computer,
install Cygwin on that computer,
-and under Cygwin install the Devel packages x86_64-w64-mingw32 (for 64-bit targets)
-and/or i686-w64-mingw32 (for 32-bit targets).
+and under Cygwin install the Devel packages mingw64-x86_64-gcc-g++ (for 64-bit targets)
+and/or mingw64-i686-gcc-g++ (for 32-bit targets).
Move the Praat sources directory somewhere in your `/home/yourname` tree,
e.g. as `/home/yourname/praats` and/or `/home/yourname/praats32`;
the folders `fon` and `sys` should be visible within these folders.
@@ -144,8 +144,9 @@ Then type `make` to build `Praat.exe`
Extract the *praatXXXX_xcodeproj.zip* file from the [latest release](https://github.com/praat/praat/releases)
into the directory that contains `sys`, `fon`, `dwtools` and so on.
-Then open the project `praat.xcodeproj` in Xcode 12.5 and choose Build or Run for the target `praat_mac`.
-You can compile with the 11.3 SDK, which will work as far back as macOS 10.9, which is our deployment target.
+Then open the project `praat.xcodeproj` in Xcode 13.1 and choose Build or Run for the target `praat_mac`.
+You can compile with the 12.0 (i.e. the newest and standard) SDK, which will work as far back as macOS 10.9,
+which is our deployment target.
If you get an error message like “Code Signing Identity xxx does not match any valid, non-expired,
code-signing certificate in your keychain”, then select the target `praat_mac`, go to Info → Build,
@@ -243,13 +244,13 @@ or `praat-build` into a Windows or Linux terminal (or `praat-run` to build and r
Your source code folders, such as `fon` and `sys`, will reside in a folder like `/Users/yourname/Praats/src`,
where you also put `praat.xcodeproj`, as described above in 3.2.
-On Paul’s 2018 MacBook Pro with Xcode 12.2, building Praat with Command-B or Command-R,
+On Paul’s 2018 MacBook Pro with Xcode 13.1, building Praat with Command-B or Command-R,
after cleaning the build folder with Shift-Command-K,
-takes 120 seconds for the x86_64 part and 110 seconds for the ARM64 part (optimization level O3).
+takes 160 seconds for the x86_64 part and 150 seconds for the ARM64 part (optimization level O3).
### 4.2. Windows development set-up
-Under Parallels Desktop 17 or later, install Windows 10. In Windows 10, install Cygwin,
+Under Parallels Desktop 17.1 or later, install Windows 10 or Windows 11. In Windows, install Cygwin,
and create a `praats` folder, as described above in 3.1.
There are two options for your source tree: either it resides on the MacOS disk
@@ -259,10 +260,10 @@ whereas compiling Praat on the Windows disk takes only 4 minutes and 20 seconds.
So we go with installing the source tree under the Cygwin home folder, as follows.
You need to get the source from the MacOS disk, so you have to mount the MacOS disk
-from Cygwin. This is easy: in Parallels Desktop, choose `Windows 10` -> `Configure`,
+from Cygwin. This is easy: in Parallels Desktop, choose `Windows 10 or 11` -> `Configure`,
then `Options`, then `Sharing`, then `Share Mac`, and set `Share folders` to `Home folder only`
(if this scares you, then use `Custom Folders` instead).
-Your MacOS home folder (i.e. `/Users/yourname`) is now visible anywhere on Windows 10
+Your MacOS home folder (i.e. `/Users/yourname`) is now visible anywhere on Windows
as the `Z` drive (or so), and from the `Cygwin64 Terminal` you can access it as `/cygdrive/z`.
When developing Praat for Windows, you just edit your files in Xcode;
@@ -271,7 +272,8 @@ Then, just as you use Command-B and Command-R in Xcode,
you will be able to type `praat-build` (which only builds) or `praat-run` (which builds and runs)
into your `Cygwin64 Terminal`. To accomplish this,
add the following definitions into `/home/yourname/.profile` in your Cygwin home folder,
-so that the `bash` shell will automatically execute them whenever you start your `Cygwin64 Terminal`:
+so that the `bash` shell will automatically execute them whenever you start your `Cygwin64 Terminal`
+(you will need to have installed `rsync` and `make`):
# in Cygwin:~/.profile
PRAAT_SOURCES="/cygdrive/z/Praats/src"
@@ -301,19 +303,19 @@ If you also want to develop the 32-bit edition, you add to `.profile`:
### 4.3. Linux development set-up
-Under Parallels Desktop 17 or later, install Ubuntu 18.04 (or 20.04), and create
+Under Parallels Desktop 17 or later, install Ubuntu 18.04 or 20.04, and create
a folder `praats` in your home folder, as described above in 3.3.
-In Parallels Desktop, choose `Ubuntu 18.04` -> `Configure`,
+In Parallels Desktop, choose `Ubuntu 18.04 or 20.04` -> `Configure`,
then `Options`, then `Sharing`, then `Share Mac`, and set `Share folders` to `Home folder only`
(or use `Custom Folders` instead).
-Your MacOS home folder (i.e. `/Users/yourname`) is now visible on the Ubuntu 18.04 desktop
+Your MacOS home folder (i.e. `/Users/yourname`) is now visible on the Ubuntu desktop
as `Home`, and from the `Terminal` you can access it as `/media/psf/Home`.
When developing Praat for Linux, you just edit and save your files in Xcode.
You will be able to type `praat-build` (which only builds) or `praat-run` (which builds and runs)
into your `Terminal` after you add the following definitions into
-`/home/parallels/.bash_aliases` in your Ubuntu 18.04 home folder
+`/home/parallels/.bash_aliases` in your Ubuntu home folder
(this will be run automatically by `.bashrc` whenever you start a `Terminal` window,
assuming that it uses the `bash` shell):
@@ -376,17 +378,17 @@ create a folder `praatc`, and define
alias praatc="~/praatsc/praat"
alias praatc-run="praatc-build && praat"
-To test Praat for Chrome64, you can just run it on Ubuntu 18.04 by typing `praatc`,
+To test Praat for Chrome64, you can just run it on Ubuntu by typing `praatc`,
or you transfer it to a Chromebook for the real test.
### 4.4. Chromebook development set-up
Parallels Desktop 17 has no emulator for Chrome, so the choice is between
-building Praat on a Chromebook directly or building Praat on Ubuntu 18.04.
+building Praat on a Chromebook directly or building Praat on Ubuntu 18.04 or 20.04.
On a 2019 HP Chromebook with Intel processor, building Praat takes
a forbidding 27 minutes.
-So we choose to build Praat on Ubuntu 18.04 (under Parallels Desktop on the Mac),
+So we choose to build Praat on Ubuntu (under Parallels Desktop on the Mac),
because building the Intel Chrome64 edition on Ubuntu 18.04 takes only
2 minutes and 10 seconds. If you have the Linux set-up described in 4.3,
you can do this with the `bc` command.
@@ -402,10 +404,10 @@ typing your password each time. To accomplish this, type
# on Ubuntu command line
ssh-keygen
-on your Ubuntu 18.04. This gives you a file `~/.ssh/id_rsa.pub` on your Ubuntu 18.04,
+on your Ubuntu. This gives you a file `~/.ssh/id_rsa.pub` on your Ubuntu,
which contains your public `ssh` key. You should append the contents of this `id_rsa.pub`
to the file `~/.ssh/authorized_keys` on your intermediary computer. From that moment on,
-your intermediary computer will accept `rsync -e ssh` calls from your Ubuntu 18.04.
+your intermediary computer will accept `rsync -e ssh` calls from your Ubuntu.
On the intermediary computer, create a folder `~/builds`, and a folder `chrome64` inside that.
If you now define
@@ -444,7 +446,7 @@ For edits in a `cpp` file (no changes in header files), this whole cycle can be
### 4.5. Raspberry Pi development set-up
-One could perhaps create the Raspberry Pi edition by cross-compiling on Ubuntu 18.04.
+One could perhaps create the Raspberry Pi edition by cross-compiling on Ubuntu 18.04 or 20.04.
If any reader of these lines has precise instructions, we would like to know about it
(the main problem is how to install the GTK etc libraries in the Raspberry Pi toolchain,
or how to get `dpkg` under Ubuntu-buster to actually find `armhf` libraries).
=====================================
artsynth/Artword_Speaker.cpp
=====================================
@@ -1,6 +1,6 @@
/* Artword_Speaker.cpp
*
- * Copyright (C) 1992-2005,2011,2015-2017,2019,2020 Paul Boersma
+ * Copyright (C) 1992-2005,2011,2015-2017,2019-2021 Paul Boersma
*
* This code is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -19,15 +19,15 @@
#include "Art_Speaker.h"
#include "Artword_Speaker.h"
-void Artword_Speaker_draw (Artword artword, Speaker speaker, Graphics g, int numberOfSteps) {
- const double oldLineWidth = Graphics_inqLineWidth (g);
+void Artword_Speaker_draw (Artword artword, Speaker speaker, Graphics graphics, integer numberOfSteps) {
+ const double oldLineWidth = Graphics_inqLineWidth (graphics);
autoArt art = Art_create ();
- for (int i = 0; i <= numberOfSteps; i ++) {
+ for (integer i = 0; i <= numberOfSteps; i ++) {
Artword_intoArt (artword, art.get(), i * artword -> totalTime / numberOfSteps);
- Graphics_setLineWidth (g, 2 + i + i);
- Art_Speaker_draw (art.get(), speaker, g);
+ Graphics_setLineWidth (graphics, 2 + i + i);
+ Art_Speaker_draw (art.get(), speaker, graphics);
}
- Graphics_setLineWidth (g, oldLineWidth);
+ Graphics_setLineWidth (graphics, oldLineWidth);
}
void Artword_Speaker_playMovie (Artword artword, Speaker speaker, Graphics graphics) {
=====================================
artsynth/Artword_Speaker.h
=====================================
@@ -1,6 +1,6 @@
/* Artword_Speaker.h
*
- * Copyright (C) 1992-2005,2011,2016,2017,2019 Paul Boersma
+ * Copyright (C) 1992-2005,2011,2016,2017,2019,2021 Paul Boersma
*
* This code is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -20,8 +20,8 @@
#include "Speaker.h"
#include "Graphics.h"
-void Artword_Speaker_draw (Artword artword, Speaker speaker, Graphics g, int numberOfSteps);
+void Artword_Speaker_draw (Artword artword, Speaker speaker, Graphics graphics, integer numberOfSteps);
-void Artword_Speaker_playMovie (Artword artword, Speaker speaker, Graphics g);
+void Artword_Speaker_playMovie (Artword artword, Speaker speaker, Graphics graphics);
/* End of file Artword_Speaker.h */
=====================================
artsynth/Artword_Speaker_to_Sound.cpp
=====================================
@@ -1,6 +1,6 @@
/* Artword_Speaker_to_Sound.cpp
*
- * Copyright (C) 1992-2005,2007,2008,2011,2012,2015-2017,2019 Paul Boersma
+ * Copyright (C) 1992-2005,2007,2008,2011,2012,2015-2017,2019,2021 Paul Boersma
*
* This code is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -38,16 +38,16 @@
#define B91 0
autoSound Artword_Speaker_to_Sound (Artword artword, Speaker speaker,
- double fsamp, int oversampling,
- autoSound *out_w1, int iw1, autoSound *out_w2, int iw2, autoSound *out_w3, int iw3,
- autoSound *out_p1, int ip1, autoSound *out_p2, int ip2, autoSound *out_p3, int ip3,
- autoSound *out_v1, int iv1, autoSound *out_v2, int iv2, autoSound *out_v3, int iv3)
+ double fsamp, integer oversampling,
+ autoSound *out_w1, integer iw1, autoSound *out_w2, integer iw2, autoSound *out_w3, integer iw3,
+ autoSound *out_p1, integer ip1, autoSound *out_p2, integer ip2, autoSound *out_p3, integer ip3,
+ autoSound *out_v1, integer iv1, autoSound *out_v2, integer iv2, autoSound *out_v3, integer iv3)
{
try {
autoSound result = Sound_createSimple (1, artword -> totalTime, fsamp);
- integer numberOfSamples = result -> nx;
+ const integer numberOfSamples = result -> nx;
double minTract [1+78], maxTract [1+78]; // for drawing
- double Dt = 1.0 / fsamp / oversampling,
+ const double Dt = 1.0 / fsamp / oversampling,
rho0 = 1.14,
c = 353.0,
onebyc2 = 1.0 / (c * c),
@@ -64,7 +64,7 @@ autoSound Artword_Speaker_to_Sound (Artword artword, Speaker speaker,
autoMelderMonitor monitor (U"Articulatory synthesis");
Artword_intoArt (artword, art.get(), 0.0);
Art_Speaker_intoDelta (art.get(), speaker, delta.get());
- integer M = delta -> numberOfTubes;
+ const integer M = delta -> numberOfTubes;
autoSound w1, w2, w3, p1, p2, p3, v1, v2, v3;
if (iw1 > 0 && iw1 <= M) w1 = Sound_createSimple (1, artword -> totalTime, fsamp); else iw1 = 0;
if (iw2 > 0 && iw2 <= M) w2 = Sound_createSimple (1, artword -> totalTime, fsamp); else iw2 = 0;
@@ -81,9 +81,10 @@ autoSound Artword_Speaker_to_Sound (Artword artword, Speaker speaker,
maxTract [i] = -100.0;
}
totalVolume = 0.0;
- for (int m = 1; m <= M; m ++) {
+ for (integer m = 1; m <= M; m ++) {
Delta_Tube t = & delta->tubes [m];
- if (! t -> left1 && ! t -> right1) continue;
+ if (! t -> left1 && ! t -> right1)
+ continue;
t->Dx = t->Dxeq; t->dDxdt = 0.0; // 5.113 (numbers refer to equations in Boersma (1998)
t->Dy = t->Dyeq; t->dDydt = 0.0; // 5.113
t->Dz = t->Dzeq; // 5.113
@@ -102,7 +103,7 @@ autoSound Artword_Speaker_to_Sound (Artword artword, Speaker speaker,
}
//Melder_casual (U"Starting volume: ", totalVolume * 1000, U" litres.");
for (integer sample = 1; sample <= numberOfSamples; sample ++) {
- double time = (sample - 1) / fsamp;
+ const double time = (sample - 1) / fsamp;
Artword_intoArt (artword, art.get(), time);
Art_Speaker_intoDelta (art.get(), speaker, delta.get());
if (sample % MONITOR_SAMPLES == 0 && monitor.graphics()) { // because we can be in batch
@@ -110,8 +111,10 @@ autoSound Artword_Speaker_to_Sound (Artword artword, Speaker speaker,
double area [1+78];
for (int i = 1; i <= 78; i ++) {
area [i] = delta -> tubes [i]. A;
- if (area [i] < minTract [i]) minTract [i] = area [i];
- if (area [i] > maxTract [i]) maxTract [i] = area [i];
+ if (area [i] < minTract [i])
+ minTract [i] = area [i];
+ if (area [i] > maxTract [i])
+ maxTract [i] = area [i];
}
Graphics_beginMovieFrame (graphics, & Melder_WHITE);
@@ -164,8 +167,8 @@ autoSound Artword_Speaker_to_Sound (Artword artword, Speaker speaker,
Graphics_endMovieFrame (graphics, 0.0);
Melder_monitor ((double) sample / numberOfSamples, U"Articulatory synthesis: ", Melder_half (time), U" seconds");
}
- for (int n = 1; n <= oversampling; n ++) {
- for (int m = 1; m <= M; m ++) {
+ for (integer n = 1; n <= oversampling; n ++) {
+ for (integer m = 1; m <= M; m ++) {
Delta_Tube t = & delta -> tubes [m];
if (! t -> left1 && ! t -> right1)
continue;
@@ -181,7 +184,8 @@ autoSound Artword_Speaker_to_Sound (Artword artword, Speaker speaker,
#endif
/* 3-way: equal lengths. */
/* This requires left tubes to be processed before right tubes. */
- if (t->left1 && t->left1->right2) t->Dxnew = t->left1->Dxnew;
+ if (t->left1 && t->left1->right2)
+ t->Dxnew = t->left1->Dxnew;
t->Dz = t->Dzeq; /* immediate... */
t->eleft = (t->Qleft - t->Kleft) * t->V; // 5.115
t->eright = (t->Qright - t->Kright) * t->V; // 5.115
@@ -190,8 +194,8 @@ autoSound Artword_Speaker_to_Sound (Artword artword, Speaker speaker,
t->DeltaP = t->e / t->V - rho0c2; // 5.117
t->v = t->p / (rho0 + onebyc2 * t->DeltaP); // 5.118
{
- double dDy = t->Dyeq - t->Dy;
- double cubic = t->k3 * dDy * dDy;
+ const double dDy = t->Dyeq - t->Dy;
+ const double cubic = t->k3 * dDy * dDy;
Delta_Tube l1 = t->left1, l2 = t->left2, r1 = t->right1, r2 = t->right2;
tension = dDy * (t->k1 + cubic);
t->B = 2.0 * t->Brel * sqrt (t->mass * (t->k1 + 3.0 * cubic));
@@ -206,7 +210,7 @@ autoSound Artword_Speaker_to_Sound (Artword artword, Speaker speaker,
}
if (t->Dy < t->dy) {
if (t->Dy >= - t->dy) {
- double dDy = t->dy - t->Dy, dDy2 = dDy * dDy;
+ const double dDy = t->dy - t->Dy, dDy2 = dDy * dDy;
tension += dDy2 / (4.0 * t->dy) * (t->s1 + 0.5 * t->s3 * dDy2);
t->B += 2.0 * dDy / (2.0 * t->dy) *
sqrt (t->mass * (t->s1 + t->s3 * dDy2));
@@ -230,14 +234,16 @@ autoSound Artword_Speaker_to_Sound (Artword artword, Speaker speaker,
t->Ahalf = 0.5 * (t->A + t->Anew); // 5.120
t->Dxhalf = 0.5 * (t->Dxnew + t->Dx); // 5.121
t->Vnew = t->Anew * t->Dxnew; // 5.128
- { double oneByDyav = t->Dz / t->A;
- /*t->R = 12.0 * 1.86e-5 * t->parallel * t->parallel * oneByDyav * oneByDyav;*/
- if (t->Dy < 0.0)
- t->R = 12.0 * 1.86e-5 / (Dymin * Dymin + t->dy * t->dy);
- else
- t->R = 12.0 * 1.86e-5 * t->parallel * t->parallel /
- ((t->Dy + Dymin) * (t->Dy + Dymin) + t->dy * t->dy);
- t->R += 0.3 * t->parallel * oneByDyav; /* 5.23 */ }
+ {//
+ const double oneByDyav = t->Dz / t->A;
+ /*t->R = 12.0 * 1.86e-5 * t->parallel * t->parallel * oneByDyav * oneByDyav;*/
+ if (t->Dy < 0.0)
+ t->R = 12.0 * 1.86e-5 / (Dymin * Dymin + t->dy * t->dy);
+ else
+ t->R = 12.0 * 1.86e-5 * t->parallel * t->parallel /
+ ((t->Dy + Dymin) * (t->Dy + Dymin) + t->dy * t->dy);
+ t->R += 0.3 * t->parallel * oneByDyav; /* 5.23 */
+ }
t->r = (1.0 + t->R * Dt / rho0) * t->Dxhalf / t->Anew; // 5.122
t->ehalf = t->e + halfc2Dt * (t->Jleft - t->Jright); // 5.123
t->phalf = (t->p + halfDt * (t->Qleft - t->Qright) / t->Dx) / (1.0 + Dtbytworho0 * t->R); // 5.123
@@ -251,11 +257,12 @@ autoSound Artword_Speaker_to_Sound (Artword artword, Speaker speaker,
#endif
}
for (int m = 1; m <= M; m ++) { // compute Jleftnew and Qleftnew
- Delta_Tube l = & delta->tubes [m], r1 = l -> right1, r2 = l -> right2, r = r1;
- Delta_Tube l1 = l, l2 = r ? r -> left2 : nullptr;
+ const Delta_Tube l = & delta->tubes [m], r1 = l -> right1, r2 = l -> right2, r = r1;
+ const Delta_Tube l1 = l, l2 = r ? r -> left2 : nullptr;
if (! l->left1) { // closed boundary at the left side (diaphragm)?
- if (! r) continue; // tube not connected at all
- l->Jleftnew = 0; // 5.132
+ if (! r)
+ continue; // tube not connected at all
+ l->Jleftnew = 0.0; // 5.132
l->Qleftnew = (l->eleft - twoc2Dt * l->Jhalf) / l->Vnew; // 5.132
}
else // left boundary open to another tube will be handled...
@@ -264,8 +271,8 @@ autoSound Artword_Speaker_to_Sound (Artword artword, Speaker speaker,
rrad = 1.0 - c * Dt / 0.02; // radiation resistance, 5.135
onebygrad = 1.0 / (1.0 + c * Dt / 0.02); // radiation conductance, 5.135
#if NO_RADIATION_DAMPING
- rrad = 0;
- onebygrad = 0;
+ rrad = 0.0;
+ onebygrad = 0.0;
#endif
l->prightnew = ((l->Dxhalf / Dt + c * onebygrad) * l->pright +
2.0 * ((l->Qhalf - rho0c2) - (l->Qright - rho0c2) * onebygrad)) /
@@ -408,7 +415,7 @@ autoSound Artword_Speaker_to_Sound (Artword artword, Speaker speaker,
}
}
totalVolume = 0.0;
- for (int m = 1; m <= M; m ++)
+ for (integer m = 1; m <= M; m ++)
totalVolume += delta->tubes [m]. V;
//Melder_casual (U"Ending volume: ", totalVolume * 1000, U" litres.");
if (out_w1) *out_w1 = w1.move();
=====================================
artsynth/Artword_Speaker_to_Sound.h
=====================================
@@ -1,6 +1,6 @@
/* Artword_Speaker_to_Sound.h
*
- * Copyright (C) 1992-2005,2011,2015-2017 Paul Boersma
+ * Copyright (C) 1992-2005,2011,2015-2017,2021 Paul Boersma
*
* This code is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -21,9 +21,9 @@
#include "Sound.h"
autoSound Artword_Speaker_to_Sound (Artword artword, Speaker speaker,
- double samplingFrequency, int oversampling,
- autoSound *w1, int iw1, autoSound *w2, int iw2, autoSound *w3, int iw3,
- autoSound *p1, int ip1, autoSound *p2, int ip2, autoSound *p3, int ip3,
- autoSound *v1, int iv1, autoSound *v2, int iv2, autoSound *v3, int iv3);
+ double samplingFrequency, integer oversampling,
+ autoSound *w1, integer iw1, autoSound *w2, integer iw2, autoSound *w3, integer iw3,
+ autoSound *p1, integer ip1, autoSound *p2, integer ip2, autoSound *p3, integer ip3,
+ autoSound *v1, integer iv1, autoSound *v2, integer iv2, autoSound *v3, integer iv3);
/* End of file Artword_Speaker_to_Sound.h */
=====================================
debian/What_s_new_.html
=====================================
@@ -7,6 +7,14 @@ What's new?
<p>
Latest changes in Praat.</p>
<p>
+<b>6.1.56</b> (3 November 2021)</p>
+<ul>
+<li>
+ Scripting: <b>Record Sound (fixed time)...</b> should return an object ID.
+<li>
+ More phonetic symbols in EPS files.
+</ul>
+<p>
<b>6.1.55</b> (25 October 2021)</p>
<ul>
<li>
@@ -520,7 +528,7 @@ What used to be new?</h3>
</ul>
<hr>
<address>
- <p>© ppgb, October 25, 2021</p>
+ <p>© ppgb, November 3, 2021</p>
</address>
</body>
</html>
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+praat (6.1.56-1) unstable; urgency=medium
+
+ * New upstream version 6.1.56
+ * d/p/honor-cppflags.patch: New patch
+
+ -- Rafael Laboissière <rafael at debian.org> Thu, 04 Nov 2021 11:22:58 -0300
+
praat (6.1.55-1) unstable; urgency=medium
* New upstream version 6.1.55
=====================================
debian/patches/honor-cppflags.patch
=====================================
@@ -1,6 +1,6 @@
Description: Honor the value of the environment variable CPPFLAGS
Author: Rafael Laboissière <rafael at debian.org>
-Forwarded: no
+Forwarded: https://github.com/praat/praat/pull/1910
Last-Update: 2021-11-04
--- praat-6.1.55.orig/EEG/Makefile
=====================================
external/portaudio/Makefile
=====================================
@@ -1,5 +1,5 @@
# Makefile of the library "external/portaudio"
-# Paul Boersma, 19 November 2020
+# Paul Boersma, 3 November 2021
include ../../makefile.defs
@@ -21,7 +21,7 @@ clean:
libportaudio.a: $(OBJECTS)
touch libportaudio.a
rm libportaudio.a
- ar cq libportaudio.a $(OBJECTS)
+ $(AR) cq libportaudio.a $(OBJECTS)
$(RANLIB) libportaudio.a
$(OBJECTS): *.h
=====================================
fon/manual_Picture.cpp
=====================================
@@ -313,10 +313,11 @@ NORMAL (U"For most of the codes, the first letter tells you the most similar let
"The code for \\fh is an abbreviation for %fishhook.")
MAN_END
-MAN_BEGIN (U"Phonetic symbols: diacritics", U"ppgb", 20211020)
+MAN_BEGIN (U"Phonetic symbols: diacritics", U"ppgb", 20211027)
NORMAL (U"To draw phonetic diacritical symbols in the @@Picture window@ or in the @TextGridEditor, "
"make sure that you have installed the Charis SIL and/or Doulos SIL font, for instance from www.sil.org or from www.praat.org. "
- "You can either type the symbols directly (if your computer has an input method for them), or use the backslash sequences in the following list.")
+ "You can either type the symbols directly (if your computer has an input method for them), "
+ "or use the backslash sequences in the following list.")
NORMAL (U"Understrikes:")
LIST_ITEM (U"n\\|v n\\bs|v (%%combining vertical line below%): syllabic consonant")
LIST_ITEM (U"b\\0v b\\bs0v (%%combining ring below%): voiceless (e.g. lenis voiceless plosive, voiceless nasal or approximant)")
@@ -343,8 +344,10 @@ LIST_ITEM (U"\\ef\\~^ \\bsef\\bs~\\^ (%%combining tilde%): nasalized")
LIST_ITEM (U"\\ef\\v^ \\bsef\\bsv\\^ (%%combining caron%, %%háček%, %wedge): rising tone") // UNITEXT_LATIN_SMALL_LETTER_C_WITH_CARON
LIST_ITEM (U"\\ef\\^^ \\bsef\\bs\\^ \\^ (%%combining circumflex accent%): falling tone")
LIST_ITEM (U"o\\:^ o\\bs:\\^ (%%combining diaeresis%): centralized")
+LIST_ITEM (U"e\\x^ e\\bsx\\^ (%%combining x above%): mid-centralized")
LIST_ITEM (U"\\ef\\N^ \\bsef\\bsN\\^ (%%combining breve%): short")
LIST_ITEM (U"k\\lip t\\lis k\\bslip t\\bslis (%%combining double inverted breve%, %ligature): simultaneous articulation, or single segment")
+LIST_ITEM (U"a\\_ub a\\bs\\_ ub undertie (liaison, if spaces don't mean breaks in your transcription)")
NORMAL (U"In line:")
LIST_ITEM (U"\\:f \\bs:f the phonetic length sign")
LIST_ITEM (U"\\.f \\bs.f half length")
@@ -353,7 +356,8 @@ LIST_ITEM (U"\\\'2 \\bs\'2 secondary stress")
LIST_ITEM (U"\\|f \\bs|f the phonetic stroke")
LIST_ITEM (U"t\\cn t\\bscn (%%combining left angle above%, %corner): unreleased plosive")
LIST_ITEM (U"\\er\\hr \\bser\\bshr (%%combining rhotic hook%): rhotacized vowel")
-NORMAL (U"Not available in EPS files (i.e. only publishable with copy-paste or with PDF or PNG files):")
+LIST_ITEM (U"p\\ap p\\bsap apostrophe (for ejectives)")
+NORMAL (U"Superscripts:")
LIST_ITEM (U"t\\^h t\\bs\\^ h aspiration")
LIST_ITEM (U"b\\^H b\\bs\\^ H voiced aspiration (breathiness)")
LIST_ITEM (U"t\\^j t\\bs\\^ j palatalization")
@@ -365,12 +369,10 @@ LIST_ITEM (U"t\\^9 t\\bs\\^ 9 pharyngealization")
LIST_ITEM (U"t\\^l t\\bs\\^ l lateral release")
LIST_ITEM (U"t\\^n t\\bs\\^ n, p\\^m p\\bs\\^ m, k\\^N k\\bs\\^ N nasal release")
LIST_ITEM (U"t\\^s t\\bs\\^ s, k\\^x k\\bs\\^ x, p\\^f p\\bs\\^ f affrication")
-LIST_ITEM (U"\\^y \\bs\\^ y (palatalization in a deprecated American notation)")
-LIST_ITEM (U"a\\_ub a\\bs\\_ ub undertie (liaison, if spaces don't mean breaks in your transcription)")
+LIST_ITEM (U"t\\^y t\\bs\\^ y (palatalization in a deprecated American notation)")
+NORMAL (U"Digraphs:")
LIST_ITEM (U"\\ts \\bsts t\\--s ligature")
LIST_ITEM (U"\\tS \\bstS tesh ligature")
-LIST_ITEM (U"p\\ap p\\bsap apostrophe (for ejectives)")
-LIST_ITEM (U"o\\x^ o\\bsx\\^ (%%combining x above%): mid-centralized")
MAN_END
MAN_BEGIN (U"Phonetic symbols: vowels", U"ppgb", 20090804)
=====================================
fon/manual_tutorials.cpp
=====================================
@@ -22,14 +22,17 @@
void manual_tutorials_init (ManPages me);
void manual_tutorials_init (ManPages me) {
-MAN_BEGIN (U"What's new?", U"ppgb", 20211025)
+MAN_BEGIN (U"What's new?", U"ppgb", 20211103)
INTRO (U"Latest changes in Praat.")
+NORMAL (U"##6.1.56# (3 November 2021)")
+LIST_ITEM (U"• Scripting: ##Record Sound (fixed time)...# should return an object ID.")
+LIST_ITEM (U"• More phonetic symbols in EPS files.")
NORMAL (U"##6.1.55# (25 October 2021)")
LIST_ITEM (U"• TextGrid window: guard against a rare crash on Windows.")
LIST_ITEM (U"• TextGrid: Extract part: guard against producing an empty interval tier.")
LIST_ITEM (U"• Plug-ins: settings windows should not show the file name of the script.")
LIST_ITEM (U"• Scripting: clicking Cancel when browsing an Infile field should not crash.")
-LIST_ITEM (U"• Phonetic symbols: a new backslash trigraph for a mid-centralized diacritic (as in [e\\x^], namely \\bsx\\^ .")
+LIST_ITEM (U"• Phonetic symbols: a new backslash trigraph for a mid-centralized diacritic (as in [e\\x^]), namely \\bsx\\^ .")
NORMAL (U"##6.1.54# (9 October 2021)")
LIST_ITEM (U"• PowerCepstrogram: can tabulate cepstral peak prominence values.")
LIST_ITEM (U"• Mac: repaired global Escape key menu shortcut (stops sounds that play from the Objects window).")
@@ -2353,8 +2356,687 @@ LIST_ITEM (U"Hundreds of Praat users, for sending suggestions and notifying us o
MAN_END
MAN_BEGIN (U"License", U"ppgb", 20211016)
-NORMAL (U"Praat is free software distributed under the General Public License, version 3 or higher. "
- "See @Acknowledgments for details.")
+NORMAL (U"Praat is free software distributed under the @@General Public License, version 3@ or higher. "
+ "See @Acknowledgments for details on the licenses of software libraries by others "
+ "that are included in Praat.")
+MAN_END
+
+MAN_BEGIN (U"General Public License, version 3", U"ppgb", 20211026)
+NORMAL (U"This is the license under which Praat as a whole is distributed.")
+CODE (U" GNU GENERAL PUBLIC LICENSE")
+CODE (U" Version 3, 29 June 2007")
+CODE (U"")
+CODE (U" Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>")
+CODE (U" Everyone is permitted to copy and distribute verbatim copies")
+CODE (U" of this license document, but changing it is not allowed.")
+CODE (U"")
+CODE (U" Preamble")
+CODE (U"")
+CODE (U"The GNU General Public License is a free, copyleft license for "
+ "software and other kinds of works.")
+CODE (U"")
+CODE (U"The licenses for most software and other practical works are designed "
+ "to take away your freedom to share and change the works. By contrast, "
+ "the GNU General Public License is intended to guarantee your freedom to "
+ "share and change all versions of a program--to make sure it remains free "
+ "software for all its users. We, the Free Software Foundation, use the "
+ "GNU General Public License for most of our software; it applies also to "
+ "any other work released this way by its authors. You can apply it to "
+ "your programs, too.")
+CODE (U"")
+CODE (U"When we speak of free software, we are referring to freedom, not "
+ "price. Our General Public Licenses are designed to make sure that you "
+ "have the freedom to distribute copies of free software (and charge for "
+ "them if you wish), that you receive source code or can get it if you "
+ "want it, that you can change the software or use pieces of it in new "
+ "free programs, and that you know you can do these things.")
+CODE (U"")
+CODE (U"To protect your rights, we need to prevent others from denying you "
+ "these rights or asking you to surrender the rights. Therefore, you have "
+ "certain responsibilities if you distribute copies of the software, or if "
+ "you modify it: responsibilities to respect the freedom of others.")
+CODE (U"")
+CODE (U"For example, if you distribute copies of such a program, whether "
+ "gratis or for a fee, you must pass on to the recipients the same "
+ "freedoms that you received. You must make sure that they, too, receive "
+ "or can get the source code. And you must show them these terms so they "
+ "know their rights.")
+CODE (U"")
+CODE (U"Developers that use the GNU GPL protect your rights with two steps: "
+ "(1) assert copyright on the software, and (2) offer you this License "
+ "giving you legal permission to copy, distribute and/or modify it.")
+CODE (U"")
+CODE (U"For the developers' and authors' protection, the GPL clearly explains "
+ "that there is no warranty for this free software. For both users' and "
+ "authors' sake, the GPL requires that modified versions be marked as "
+ "changed, so that their problems will not be attributed erroneously to "
+ "authors of previous versions.")
+CODE (U"")
+CODE (U"Some devices are designed to deny users access to install or run "
+ "modified versions of the software inside them, although the manufacturer "
+ "can do so. This is fundamentally incompatible with the aim of "
+ "protecting users' freedom to change the software. The systematic "
+ "pattern of such abuse occurs in the area of products for individuals to "
+ "use, which is precisely where it is most unacceptable. Therefore, we "
+ "have designed this version of the GPL to prohibit the practice for those "
+ "products. If such problems arise substantially in other domains, we "
+ "stand ready to extend this provision to those domains in future versions "
+ "of the GPL, as needed to protect the freedom of users.")
+CODE (U"")
+CODE (U"Finally, every program is threatened constantly by software patents. "
+ "States should not allow patents to restrict development and use of "
+ "software on general-purpose computers, but in those that do, we wish to "
+ "avoid the special danger that patents applied to a free program could "
+ "make it effectively proprietary. To prevent this, the GPL assures that "
+ "patents cannot be used to render the program non-free.")
+CODE (U"")
+CODE (U"The precise terms and conditions for copying, distribution and "
+ "modification follow.")
+CODE (U"")
+CODE (U" TERMS AND CONDITIONS")
+CODE (U"")
+CODE (U"0. Definitions.")
+CODE (U"")
+CODE (U"\"This License\" refers to version 3 of the GNU General Public License.")
+CODE (U"")
+CODE (U"\"Copyright\" also means copyright-like laws that apply to other kinds of "
+ "works, such as semiconductor masks.")
+CODE (U"")
+CODE (U"\"The Program\" refers to any copyrightable work licensed under this "
+ "License. Each licensee is addressed as \"you\". \"Licensees\" and "
+ "\"recipients\" may be individuals or organizations.")
+CODE (U"")
+CODE (U"To \"modify\" a work means to copy from or adapt all or part of the work "
+ "in a fashion requiring copyright permission, other than the making of an "
+ "exact copy. The resulting work is called a \"modified version\" of the "
+ "earlier work or a work \"based on\" the earlier work.")
+CODE (U"")
+CODE (U"A \"covered work\" means either the unmodified Program or a work based "
+ "on the Program.")
+CODE (U"")
+CODE (U"To \"propagate\" a work means to do anything with it that, without "
+ "permission, would make you directly or secondarily liable for "
+ "infringement under applicable copyright law, except executing it on a "
+ "computer or modifying a private copy. Propagation includes copying, "
+ "distribution (with or without modification), making available to the "
+ "public, and in some countries other activities as well.")
+CODE (U"")
+CODE (U"To \"convey\" a work means any kind of propagation that enables other "
+ "parties to make or receive copies. Mere interaction with a user through "
+ "a computer network, with no transfer of a copy, is not conveying.")
+CODE (U"")
+CODE (U"An interactive user interface displays \"Appropriate Legal Notices\" "
+ "to the extent that it includes a convenient and prominently visible "
+ "feature that (1) displays an appropriate copyright notice, and (2) "
+ "tells the user that there is no warranty for the work (except to the "
+ "extent that warranties are provided), that licensees may convey the "
+ "work under this License, and how to view a copy of this License. If "
+ "the interface presents a list of user commands or options, such as a "
+ "menu, a prominent item in the list meets this criterion.")
+CODE (U"")
+CODE (U"1. Source Code.")
+CODE (U"")
+CODE (U"The \"source code\" for a work means the preferred form of the work "
+ "for making modifications to it. \"Object code\" means any non-source "
+ "form of a work.")
+CODE (U"")
+CODE (U"A \"Standard Interface\" means an interface that either is an official "
+ "standard defined by a recognized standards body, or, in the case of "
+ "interfaces specified for a particular programming language, one that "
+ "is widely used among developers working in that language.")
+CODE (U"")
+CODE (U"The \"System Libraries\" of an executable work include anything, other "
+ "than the work as a whole, that (a) is included in the normal form of "
+ "packaging a Major Component, but which is not part of that Major "
+ "Component, and (b) serves only to enable use of the work with that "
+ "Major Component, or to implement a Standard Interface for which an "
+ "implementation is available to the public in source code form. A "
+ "\"Major Component\", in this context, means a major essential component "
+ "(kernel, window system, and so on) of the specific operating system "
+ "(if any) on which the executable work runs, or a compiler used to "
+ "produce the work, or an object code interpreter used to run it.")
+CODE (U"")
+CODE (U"The \"Corresponding Source\" for a work in object code form means all "
+ "the source code needed to generate, install, and (for an executable "
+ "work) run the object code and to modify the work, including scripts to "
+ "control those activities. However, it does not include the work's "
+ "System Libraries, or general-purpose tools or generally available free "
+ "programs which are used unmodified in performing those activities but "
+ "which are not part of the work. For example, Corresponding Source "
+ "includes interface definition files associated with source files for "
+ "the work, and the source code for shared libraries and dynamically "
+ "linked subprograms that the work is specifically designed to require, "
+ "such as by intimate data communication or control flow between those "
+ "subprograms and other parts of the work.")
+CODE (U"")
+CODE (U"The Corresponding Source need not include anything that users "
+ "can regenerate automatically from other parts of the Corresponding "
+ "Source.")
+CODE (U"")
+CODE (U"The Corresponding Source for a work in source code form is that "
+ "same work.")
+CODE (U"")
+CODE (U"2. Basic Permissions.")
+CODE (U"")
+CODE (U"All rights granted under this License are granted for the term of "
+ "copyright on the Program, and are irrevocable provided the stated "
+ "conditions are met. This License explicitly affirms your unlimited "
+ "permission to run the unmodified Program. The output from running a "
+ "covered work is covered by this License only if the output, given its "
+ "content, constitutes a covered work. This License acknowledges your "
+ "rights of fair use or other equivalent, as provided by copyright law.")
+CODE (U"")
+CODE (U"You may make, run and propagate covered works that you do not "
+ "convey, without conditions so long as your license otherwise remains "
+ "in force. You may convey covered works to others for the sole purpose "
+ "of having them make modifications exclusively for you, or provide you "
+ "with facilities for running those works, provided that you comply with "
+ "the terms of this License in conveying all material for which you do "
+ "not control copyright. Those thus making or running the covered works "
+ "for you must do so exclusively on your behalf, under your direction "
+ "and control, on terms that prohibit them from making any copies of "
+ "your copyrighted material outside their relationship with you.")
+CODE (U"")
+CODE (U"Conveying under any other circumstances is permitted solely under "
+ "the conditions stated below. Sublicensing is not allowed; section 10 "
+ "makes it unnecessary.")
+CODE (U"")
+CODE (U"3. Protecting Users' Legal Rights From Anti-Circumvention Law.")
+CODE (U"")
+CODE (U"No covered work shall be deemed part of an effective technological "
+ "measure under any applicable law fulfilling obligations under article "
+ "11 of the WIPO copyright treaty adopted on 20 December 1996, or "
+ "similar laws prohibiting or restricting circumvention of such "
+ "measures.")
+CODE (U"")
+CODE (U"When you convey a covered work, you waive any legal power to forbid "
+ "circumvention of technological measures to the extent such circumvention "
+ "is effected by exercising rights under this License with respect to "
+ "the covered work, and you disclaim any intention to limit operation or "
+ "modification of the work as a means of enforcing, against the work's "
+ "users, your or third parties' legal rights to forbid circumvention of "
+ "technological measures.")
+CODE (U"")
+CODE (U"4. Conveying Verbatim Copies.")
+CODE (U"")
+CODE (U"You may convey verbatim copies of the Program's source code as you "
+ "receive it, in any medium, provided that you conspicuously and "
+ "appropriately publish on each copy an appropriate copyright notice; "
+ "keep intact all notices stating that this License and any "
+ "non-permissive terms added in accord with section 7 apply to the code; "
+ "keep intact all notices of the absence of any warranty; and give all "
+ "recipients a copy of this License along with the Program.")
+CODE (U"")
+CODE (U"You may charge any price or no price for each copy that you convey, "
+ "and you may offer support or warranty protection for a fee.")
+CODE (U"")
+CODE (U"5. Conveying Modified Source Versions.")
+CODE (U"")
+CODE (U"You may convey a work based on the Program, or the modifications to "
+ "produce it from the Program, in the form of source code under the "
+ "terms of section 4, provided that you also meet all of these conditions:")
+CODE (U"")
+CODE1 (U"a) The work must carry prominent notices stating that you modified "
+ "it, and giving a relevant date.")
+CODE (U"")
+CODE1 (U"b) The work must carry prominent notices stating that it is "
+ "released under this License and any conditions added under section "
+ "7. This requirement modifies the requirement in section 4 to "
+ "\"keep intact all notices\".")
+CODE (U"")
+CODE1 (U"c) You must license the entire work, as a whole, under this "
+ "License to anyone who comes into possession of a copy. This "
+ "License will therefore apply, along with any applicable section 7 "
+ "additional terms, to the whole of the work, and all its parts, "
+ "regardless of how they are packaged. This License gives no "
+ "permission to license the work in any other way, but it does not "
+ "invalidate such permission if you have separately received it.")
+CODE (U"")
+CODE1 (U"d) If the work has interactive user interfaces, each must display "
+ "Appropriate Legal Notices; however, if the Program has interactive "
+ "interfaces that do not display Appropriate Legal Notices, your "
+ "work need not make them do so.")
+CODE (U"")
+CODE (U"A compilation of a covered work with other separate and independent "
+ "works, which are not by their nature extensions of the covered work, "
+ "and which are not combined with it such as to form a larger program, "
+ "in or on a volume of a storage or distribution medium, is called an "
+ "\"aggregate\" if the compilation and its resulting copyright are not "
+ "used to limit the access or legal rights of the compilation's users "
+ "beyond what the individual works permit. Inclusion of a covered work "
+ "in an aggregate does not cause this License to apply to the other "
+ "parts of the aggregate.")
+CODE (U"")
+CODE (U"6. Conveying Non-Source Forms.")
+CODE (U"")
+CODE (U"You may convey a covered work in object code form under the terms "
+ "of sections 4 and 5, provided that you also convey the "
+ "machine-readable Corresponding Source under the terms of this License, "
+ "in one of these ways:")
+CODE (U"")
+CODE1 (U"a) Convey the object code in, or embodied in, a physical product "
+ "(including a physical distribution medium), accompanied by the "
+ "Corresponding Source fixed on a durable physical medium "
+ "customarily used for software interchange.")
+CODE (U"")
+CODE1 (U"b) Convey the object code in, or embodied in, a physical product "
+ "(including a physical distribution medium), accompanied by a "
+ "written offer, valid for at least three years and valid for as "
+ "long as you offer spare parts or customer support for that product "
+ "model, to give anyone who possesses the object code either (1) a "
+ "copy of the Corresponding Source for all the software in the "
+ "product that is covered by this License, on a durable physical "
+ "medium customarily used for software interchange, for a price no "
+ "more than your reasonable cost of physically performing this "
+ "conveying of source, or (2) access to copy the "
+ "Corresponding Source from a network server at no charge.")
+CODE (U"")
+CODE1 (U"c) Convey individual copies of the object code with a copy of the "
+ "written offer to provide the Corresponding Source. This "
+ "alternative is allowed only occasionally and noncommercially, and "
+ "only if you received the object code with such an offer, in accord "
+ "with subsection 6b.")
+CODE (U"")
+CODE1 (U"d) Convey the object code by offering access from a designated "
+ "place (gratis or for a charge), and offer equivalent access to the "
+ "Corresponding Source in the same way through the same place at no "
+ "further charge. You need not require recipients to copy the "
+ "Corresponding Source along with the object code. If the place to "
+ "copy the object code is a network server, the Corresponding Source "
+ "may be on a different server (operated by you or a third party) "
+ "that supports equivalent copying facilities, provided you maintain "
+ "clear directions next to the object code saying where to find the "
+ "Corresponding Source. Regardless of what server hosts the "
+ "Corresponding Source, you remain obligated to ensure that it is "
+ "available for as long as needed to satisfy these requirements.")
+CODE (U"")
+CODE1 (U"e) Convey the object code using peer-to-peer transmission, provided "
+ "you inform other peers where the object code and Corresponding "
+ "Source of the work are being offered to the general public at no "
+ "charge under subsection 6d.")
+CODE (U"")
+CODE (U"A separable portion of the object code, whose source code is excluded "
+ "from the Corresponding Source as a System Library, need not be "
+ "included in conveying the object code work.")
+CODE (U"")
+CODE (U"A \"User Product\" is either (1) a \"consumer product\", which means any "
+ "tangible personal property which is normally used for personal, family, "
+ "or household purposes, or (2) anything designed or sold for incorporation "
+ "into a dwelling. In determining whether a product is a consumer product, "
+ "doubtful cases shall be resolved in favor of coverage. For a particular "
+ "product received by a particular user, \"normally used\" refers to a "
+ "typical or common use of that class of product, regardless of the status "
+ "of the particular user or of the way in which the particular user "
+ "actually uses, or expects or is expected to use, the product. A product "
+ "is a consumer product regardless of whether the product has substantial "
+ "commercial, industrial or non-consumer uses, unless such uses represent "
+ "the only significant mode of use of the product.")
+CODE (U"")
+CODE (U"\"Installation Information\" for a User Product means any methods, "
+ "procedures, authorization keys, or other information required to install "
+ "and execute modified versions of a covered work in that User Product from "
+ "a modified version of its Corresponding Source. The information must "
+ "suffice to ensure that the continued functioning of the modified object "
+ "code is in no case prevented or interfered with solely because "
+ "modification has been made.")
+CODE (U"")
+CODE (U"If you convey an object code work under this section in, or with, or "
+ "specifically for use in, a User Product, and the conveying occurs as "
+ "part of a transaction in which the right of possession and use of the "
+ "User Product is transferred to the recipient in perpetuity or for a "
+ "fixed term (regardless of how the transaction is characterized), the "
+ "Corresponding Source conveyed under this section must be accompanied "
+ "by the Installation Information. But this requirement does not apply "
+ "if neither you nor any third party retains the ability to install "
+ "modified object code on the User Product (for example, the work has "
+ "been installed in ROM).")
+CODE (U"")
+CODE (U"The requirement to provide Installation Information does not include a "
+ "requirement to continue to provide support service, warranty, or updates "
+ "for a work that has been modified or installed by the recipient, or for "
+ "the User Product in which it has been modified or installed. Access to a "
+ "network may be denied when the modification itself materially and "
+ "adversely affects the operation of the network or violates the rules and "
+ "protocols for communication across the network.")
+CODE (U"")
+CODE (U"Corresponding Source conveyed, and Installation Information provided, "
+ "in accord with this section must be in a format that is publicly "
+ "documented (and with an implementation available to the public in "
+ "source code form), and must require no special password or key for "
+ "unpacking, reading or copying.")
+CODE (U"")
+CODE (U"7. Additional Terms.")
+CODE (U"")
+CODE (U"\"Additional permissions\" are terms that supplement the terms of this "
+ "License by making exceptions from one or more of its conditions. "
+ "Additional permissions that are applicable to the entire Program shall "
+ "be treated as though they were included in this License, to the extent "
+ "that they are valid under applicable law. If additional permissions "
+ "apply only to part of the Program, that part may be used separately "
+ "under those permissions, but the entire Program remains governed by "
+ "this License without regard to the additional permissions.")
+CODE (U"")
+CODE (U"When you convey a copy of a covered work, you may at your option "
+ "remove any additional permissions from that copy, or from any part of "
+ "it. (Additional permissions may be written to require their own "
+ "removal in certain cases when you modify the work.) You may place "
+ "additional permissions on material, added by you to a covered work, "
+ "for which you have or can give appropriate copyright permission.")
+CODE (U"")
+CODE (U"Notwithstanding any other provision of this License, for material you "
+ "add to a covered work, you may (if authorized by the copyright holders of "
+ "that material) supplement the terms of this License with terms:")
+CODE (U"")
+CODE1 (U"a) Disclaiming warranty or limiting liability differently from the "
+ "terms of sections 15 and 16 of this License; or")
+CODE (U"")
+CODE1 (U"b) Requiring preservation of specified reasonable legal notices or "
+ "author attributions in that material or in the Appropriate Legal "
+ "Notices displayed by works containing it; or")
+CODE (U"")
+CODE1 (U"c) Prohibiting misrepresentation of the origin of that material, or "
+ "requiring that modified versions of such material be marked in "
+ "reasonable ways as different from the original version; or")
+CODE (U"")
+CODE1 (U"d) Limiting the use for publicity purposes of names of licensors or "
+ "authors of the material; or")
+CODE (U"")
+CODE1 (U"e) Declining to grant rights under trademark law for use of some "
+ "trade names, trademarks, or service marks; or")
+CODE (U"")
+CODE1 (U"f) Requiring indemnification of licensors and authors of that "
+ "material by anyone who conveys the material (or modified versions of "
+ "it) with contractual assumptions of liability to the recipient, for "
+ "any liability that these contractual assumptions directly impose on "
+ "those licensors and authors.")
+CODE (U"")
+CODE (U"All other non-permissive additional terms are considered \"further "
+ "restrictions\" within the meaning of section 10. If the Program as you "
+ "received it, or any part of it, contains a notice stating that it is "
+ "governed by this License along with a term that is a further "
+ "restriction, you may remove that term. If a license document contains "
+ "a further restriction but permits relicensing or conveying under this "
+ "License, you may add to a covered work material governed by the terms "
+ "of that license document, provided that the further restriction does "
+ "not survive such relicensing or conveying.")
+CODE (U"")
+CODE (U"If you add terms to a covered work in accord with this section, you "
+ "must place, in the relevant source files, a statement of the "
+ "additional terms that apply to those files, or a notice indicating "
+ "where to find the applicable terms.")
+CODE (U"")
+CODE (U"Additional terms, permissive or non-permissive, may be stated in the "
+ "form of a separately written license, or stated as exceptions; "
+ "the above requirements apply either way.")
+CODE (U"")
+CODE (U"8. Termination.")
+CODE (U"")
+CODE (U"You may not propagate or modify a covered work except as expressly "
+ "provided under this License. Any attempt otherwise to propagate or "
+ "modify it is void, and will automatically terminate your rights under "
+ "this License (including any patent licenses granted under the third "
+ "paragraph of section 11).")
+CODE (U"")
+CODE (U"However, if you cease all violation of this License, then your "
+ "license from a particular copyright holder is reinstated (a) "
+ "provisionally, unless and until the copyright holder explicitly and "
+ "finally terminates your license, and (b) permanently, if the copyright "
+ "holder fails to notify you of the violation by some reasonable means "
+ "prior to 60 days after the cessation.")
+CODE (U"")
+CODE (U"Moreover, your license from a particular copyright holder is "
+ "reinstated permanently if the copyright holder notifies you of the "
+ "violation by some reasonable means, this is the first time you have "
+ "received notice of violation of this License (for any work) from that "
+ "copyright holder, and you cure the violation prior to 30 days after "
+ "your receipt of the notice.")
+CODE (U"")
+CODE (U"Termination of your rights under this section does not terminate the "
+ "licenses of parties who have received copies or rights from you under "
+ "this License. If your rights have been terminated and not permanently "
+ "reinstated, you do not qualify to receive new licenses for the same "
+ "material under section 10.")
+CODE (U"")
+CODE (U"9. Acceptance Not Required for Having Copies.")
+CODE (U"")
+CODE (U"You are not required to accept this License in order to receive or "
+ "run a copy of the Program. Ancillary propagation of a covered work "
+ "occurring solely as a consequence of using peer-to-peer transmission "
+ "to receive a copy likewise does not require acceptance. However, "
+ "nothing other than this License grants you permission to propagate or "
+ "modify any covered work. These actions infringe copyright if you do "
+ "not accept this License. Therefore, by modifying or propagating a "
+ "covered work, you indicate your acceptance of this License to do so.")
+CODE (U"")
+CODE (U"10. Automatic Licensing of Downstream Recipients.")
+CODE (U"")
+CODE (U"Each time you convey a covered work, the recipient automatically "
+ "receives a license from the original licensors, to run, modify and "
+ "propagate that work, subject to this License. You are not responsible "
+ "for enforcing compliance by third parties with this License.")
+CODE (U"")
+CODE (U"An \"entity transaction\" is a transaction transferring control of an "
+ "organization, or substantially all assets of one, or subdividing an "
+ "organization, or merging organizations. If propagation of a covered "
+ "work results from an entity transaction, each party to that "
+ "transaction who receives a copy of the work also receives whatever "
+ "licenses to the work the party's predecessor in interest had or could "
+ "give under the previous paragraph, plus a right to possession of the "
+ "Corresponding Source of the work from the predecessor in interest, if "
+ "the predecessor has it or can get it with reasonable efforts.")
+CODE (U"")
+CODE (U"You may not impose any further restrictions on the exercise of the "
+ "rights granted or affirmed under this License. For example, you may "
+ "not impose a license fee, royalty, or other charge for exercise of "
+ "rights granted under this License, and you may not initiate litigation "
+ "(including a cross-claim or counterclaim in a lawsuit) alleging that "
+ "any patent claim is infringed by making, using, selling, offering for "
+ "sale, or importing the Program or any portion of it.")
+CODE (U"")
+CODE (U"11. Patents.")
+CODE (U"")
+CODE (U"A \"contributor\" is a copyright holder who authorizes use under this "
+ "License of the Program or a work on which the Program is based. The "
+ "work thus licensed is called the contributor's \"contributor version\".")
+CODE (U"")
+CODE (U"A contributor's \"essential patent claims\" are all patent claims "
+ "owned or controlled by the contributor, whether already acquired or "
+ "hereafter acquired, that would be infringed by some manner, permitted "
+ "by this License, of making, using, or selling its contributor version, "
+ "but do not include claims that would be infringed only as a "
+ "consequence of further modification of the contributor version. For "
+ "purposes of this definition, \"control\" includes the right to grant "
+ "patent sublicenses in a manner consistent with the requirements of "
+ "this License.")
+CODE (U"")
+CODE (U"Each contributor grants you a non-exclusive, worldwide, royalty-free "
+ "patent license under the contributor's essential patent claims, to "
+ "make, use, sell, offer for sale, import and otherwise run, modify and "
+ "propagate the contents of its contributor version.")
+CODE (U"")
+CODE (U"In the following three paragraphs, a \"patent license\" is any express "
+ "agreement or commitment, however denominated, not to enforce a patent "
+ "(such as an express permission to practice a patent or covenant not to "
+ "sue for patent infringement). To \"grant\" such a patent license to a "
+ "party means to make such an agreement or commitment not to enforce a "
+ "patent against the party.")
+CODE (U"")
+CODE (U"If you convey a covered work, knowingly relying on a patent license, "
+ "and the Corresponding Source of the work is not available for anyone "
+ "to copy, free of charge and under the terms of this License, through a "
+ "publicly available network server or other readily accessible means, "
+ "then you must either (1) cause the Corresponding Source to be so "
+ "available, or (2) arrange to deprive yourself of the benefit of the "
+ "patent license for this particular work, or (3) arrange, in a manner "
+ "consistent with the requirements of this License, to extend the patent "
+ "license to downstream recipients. \"Knowingly relying\" means you have "
+ "actual knowledge that, but for the patent license, your conveying the "
+ "covered work in a country, or your recipient's use of the covered work "
+ "in a country, would infringe one or more identifiable patents in that "
+ "country that you have reason to believe are valid.")
+CODE (U"")
+CODE (U"If, pursuant to or in connection with a single transaction or "
+ "arrangement, you convey, or propagate by procuring conveyance of, a "
+ "covered work, and grant a patent license to some of the parties "
+ "receiving the covered work authorizing them to use, propagate, modify "
+ "or convey a specific copy of the covered work, then the patent license "
+ "you grant is automatically extended to all recipients of the covered "
+ "work and works based on it.")
+CODE (U"")
+CODE (U"A patent license is \"discriminatory\" if it does not include within "
+ "the scope of its coverage, prohibits the exercise of, or is "
+ "conditioned on the non-exercise of one or more of the rights that are "
+ "specifically granted under this License. You may not convey a covered "
+ "work if you are a party to an arrangement with a third party that is "
+ "in the business of distributing software, under which you make payment "
+ "to the third party based on the extent of your activity of conveying "
+ "the work, and under which the third party grants, to any of the "
+ "parties who would receive the covered work from you, a discriminatory "
+ "patent license (a) in connection with copies of the covered work "
+ "conveyed by you (or copies made from those copies), or (b) primarily "
+ "for and in connection with specific products or compilations that "
+ "contain the covered work, unless you entered into that arrangement, "
+ "or that patent license was granted, prior to 28 March 2007.")
+CODE (U"")
+CODE (U"Nothing in this License shall be construed as excluding or limiting "
+ "any implied license or other defenses to infringement that may "
+ "otherwise be available to you under applicable patent law.")
+CODE (U"")
+CODE (U"12. No Surrender of Others' Freedom.")
+CODE (U"")
+CODE (U"If conditions are imposed on you (whether by court order, agreement or "
+ "otherwise) that contradict the conditions of this License, they do not "
+ "excuse you from the conditions of this License. If you cannot convey a "
+ "covered work so as to satisfy simultaneously your obligations under this "
+ "License and any other pertinent obligations, then as a consequence you may "
+ "not convey it at all. For example, if you agree to terms that obligate you "
+ "to collect a royalty for further conveying from those to whom you convey "
+ "the Program, the only way you could satisfy both those terms and this "
+ "License would be to refrain entirely from conveying the Program.")
+CODE (U"")
+CODE (U"13. Use with the GNU Affero General Public License.")
+CODE (U"")
+CODE (U"Notwithstanding any other provision of this License, you have "
+ "permission to link or combine any covered work with a work licensed "
+ "under version 3 of the GNU Affero General Public License into a single "
+ "combined work, and to convey the resulting work. The terms of this "
+ "License will continue to apply to the part which is the covered work, "
+ "but the special requirements of the GNU Affero General Public License, "
+ "section 13, concerning interaction through a network will apply to the "
+ "combination as such.")
+CODE (U"")
+CODE (U"14. Revised Versions of this License.")
+CODE (U"")
+CODE (U"The Free Software Foundation may publish revised and/or new versions of "
+ "the GNU General Public License from time to time. Such new versions will "
+ "be similar in spirit to the present version, but may differ in detail to "
+ "address new problems or concerns.")
+CODE (U"")
+CODE (U"Each version is given a distinguishing version number. If the "
+ "Program specifies that a certain numbered version of the GNU General "
+ "Public License \"or any later version\" applies to it, you have the "
+ "option of following the terms and conditions either of that numbered "
+ "version or of any later version published by the Free Software "
+ "Foundation. If the Program does not specify a version number of the "
+ "GNU General Public License, you may choose any version ever published "
+ "by the Free Software Foundation.")
+CODE (U"")
+CODE (U"If the Program specifies that a proxy can decide which future "
+ "versions of the GNU General Public License can be used, that proxy's "
+ "public statement of acceptance of a version permanently authorizes you "
+ "to choose that version for the Program.")
+CODE (U"")
+CODE (U"Later license versions may give you additional or different "
+ "permissions. However, no additional obligations are imposed on any "
+ "author or copyright holder as a result of your choosing to follow a "
+ "later version.")
+CODE (U"")
+CODE (U"15. Disclaimer of Warranty.")
+CODE (U"")
+CODE (U"THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY "
+ "APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT "
+ "HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY "
+ "OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, "
+ "THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR "
+ "PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM "
+ "IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF "
+ "ALL NECESSARY SERVICING, REPAIR OR CORRECTION.")
+CODE (U"")
+CODE (U"16. Limitation of Liability.")
+CODE (U"")
+CODE (U"IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING "
+ "WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS "
+ "THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY "
+ "GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE "
+ "USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF "
+ "DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD "
+ "PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), "
+ "EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF "
+ "SUCH DAMAGES.")
+CODE (U"")
+CODE (U"17. Interpretation of Sections 15 and 16.")
+CODE (U"")
+CODE (U"If the disclaimer of warranty and limitation of liability provided "
+ "above cannot be given local legal effect according to their terms, "
+ "reviewing courts shall apply local law that most closely approximates "
+ "an absolute waiver of all civil liability in connection with the "
+ "Program, unless a warranty or assumption of liability accompanies a "
+ "copy of the Program in return for a fee.")
+CODE (U"")
+CODE (U" END OF TERMS AND CONDITIONS")
+CODE (U"")
+CODE (U" How to Apply These Terms to Your New Programs")
+CODE (U"")
+CODE (U"If you develop a new program, and you want it to be of the greatest "
+ "possible use to the public, the best way to achieve this is to make it "
+ "free software which everyone can redistribute and change under these terms.")
+CODE (U"")
+CODE (U"To do so, attach the following notices to the program. It is safest "
+ "to attach them to the start of each source file to most effectively "
+ "state the exclusion of warranty; and each file should have at least "
+ "the \"copyright\" line and a pointer to where the full notice is found.")
+CODE (U"")
+CODE1 (U"##<one line to give the program's name and a brief idea of what it does.>")
+CODE1 (U"##Copyright (C) <year> <name of author>")
+CODE (U"")
+CODE1 (U"##This program 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.")
+CODE (U"")
+CODE1 (U"##This program 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.")
+CODE (U"")
+CODE1 (U"##You should have received a copy of the GNU General Public License "
+ "along with this program. If not, see <https://www.gnu.org/licenses/>.")
+CODE (U"")
+CODE1 (U"Also add information on how to contact you by electronic and paper mail.")
+CODE (U"")
+CODE (U"If the program does terminal interaction, make it output a short "
+ "notice like this when it starts in an interactive mode:")
+CODE (U"")
+CODE1 (U"##<program> Copyright (C) <year> <name of author>")
+CODE1 (U"##This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.")
+CODE1 (U"##This is free software, and you are welcome to redistribute it")
+CODE1 (U"##under certain conditions; type `show c' for details.")
+CODE (U"")
+CODE1 (U"The hypothetical commands `show w' and `show c' should show the appropriate "
+ "parts of the General Public License. Of course, your program's commands "
+ "might be different; for a GUI interface, you would use an \"about box\".")
+CODE (U"")
+CODE (U"You should also get your employer (if you work as a programmer) or school, "
+ "if any, to sign a \"copyright disclaimer\" for the program, if necessary. "
+ "For more information on this, and how to apply and follow the GNU GPL, see "
+ "<https://www.gnu.org/licenses/>.")
+CODE (U"")
+CODE (U"The GNU General Public License does not permit incorporating your program "
+ "into proprietary programs. If your program is a subroutine library, you "
+ "may consider it more useful to permit linking proprietary applications with "
+ "the library. If this is what you want to do, use the GNU Lesser General "
+ "Public License instead of this License. But first, please read "
+ "<https://www.gnu.org/licenses/why-not-lgpl.html>.")
MAN_END
MAN_BEGIN (U"Praat menu", U"ppgb", 20161227)
=====================================
gram/OTGrammar.h
=====================================
@@ -131,8 +131,8 @@ autoOTGrammar OTGrammar_create_tongueRoot_grammar (
);
autoOTGrammar OTGrammar_create_metrics (
kOTGrammar_createMetricsGrammar_initialRanking equal_footForm_wsp,
- int trochaicityConstraint, int includeFootBimoraic, int includeFootBisyllabic,
- int includePeripheral, int nonfinalityConstraint, int overtFormsHaveSecondaryStress, int includeClashAndLapse, int includeCodas);
+ int trochaicityConstraint, bool includeFootBimoraic, bool includeFootBisyllabic,
+ bool includePeripheral, int nonfinalityConstraint, bool overtFormsHaveSecondaryStress, bool includeClashAndLapse, bool includeCodas);
/* T&S: 1, false, false, false, 1, true, false, false */
void OTGrammar_reset (OTGrammar me, double ranking);
=====================================
gram/OTGrammar_ex_metrics.cpp
=====================================
@@ -1,6 +1,6 @@
/* OTGrammar_ex_metrics.cpp
*
- * Copyright (C) 2001-2007,2009,2011,2012,2014-2020 Paul Boersma
+ * Copyright (C) 2001-2007,2009,2011,2012,2014-2021 Paul Boersma
*
* This code is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -67,7 +67,7 @@ static const conststring32 constraintNames [1+NUMBER_OF_CONSTRAINTS] = { 0,
static void addCandidate (OTGrammarTableau me, integer numberOfSyllables, int stress [],
bool footedToTheLeft [], bool footedToTheRight [], int surfaceWeightPattern [],
- int overtFormsHaveSecondaryStress)
+ bool overtFormsHaveSecondaryStress)
{
static const conststring32 syllable [] =
{ U"L", U"L1", U"L2", U"H", U"H1", U"H2", U"K", U"K1", U"K2", U"J", U"J1", U"J2" };
@@ -97,7 +97,7 @@ static void addCandidate (OTGrammarTableau me, integer numberOfSyllables, int st
static void fillSurfaceWeightPattern (OTGrammarTableau me, integer numberOfSyllables, int stress [],
bool footedToTheLeft [], bool footedToTheRight [], int underlyingWeightPattern [],
- int overtFormsHaveSecondaryStress)
+ bool overtFormsHaveSecondaryStress)
{
int surfaceWeightPattern [1+7], minSurfaceWeight [1+7], maxSurfaceWeight [1+7];
for (integer isyll = 1; isyll <= numberOfSyllables; isyll ++) {
@@ -135,7 +135,7 @@ static void fillSurfaceWeightPattern (OTGrammarTableau me, integer numberOfSylla
static void path (OTGrammarTableau me, integer numberOfSyllables, int stress [],
int startingSyllable, bool footedToTheLeft_in [], bool footedToTheRight_in [], int underlyingWeightPattern [],
- int overtFormsHaveSecondaryStress)
+ bool overtFormsHaveSecondaryStress)
{
bool footedToTheLeft [10], footedToTheRight [10];
/* Localize all arguments. */
@@ -170,7 +170,7 @@ static void path (OTGrammarTableau me, integer numberOfSyllables, int stress [],
}
static void fillOvertStressPattern (OTGrammarTableau me, integer numberOfSyllables, int stress [], int underlyingWeightPattern [],
- int overtFormsHaveSecondaryStress)
+ bool overtFormsHaveSecondaryStress)
{
bool footedToTheLeft [10], footedToTheRight [10];
for (int isyll = 1; isyll <= numberOfSyllables; isyll ++)
@@ -178,7 +178,7 @@ static void fillOvertStressPattern (OTGrammarTableau me, integer numberOfSyllabl
path (me, numberOfSyllables, stress, 1, footedToTheLeft, footedToTheRight, underlyingWeightPattern, overtFormsHaveSecondaryStress);
}
-static void fillTableau (OTGrammarTableau me, integer numberOfSyllables, int underlyingWeightPattern [], int overtFormsHaveSecondaryStress, int includeCodas) {
+static void fillTableau (OTGrammarTableau me, integer numberOfSyllables, int underlyingWeightPattern [], bool overtFormsHaveSecondaryStress, bool includeCodas) {
char32 input [100];
static int numberOfCandidates_noCodas [1+7] =
{ 0, 1, 6, 24, 88, 300, 984, 3136 };
@@ -239,20 +239,17 @@ static void computeViolationMarks (OTGrammarCandidate me) {
const char32 *lastSlash = & my output [str32len (my output.get()) - 1];
my marks = zero_INTVEC (my numberOfConstraints = NUMBER_OF_CONSTRAINTS);
/* Violations of WSP: count all H not followed by 1 or 2. */
- for (const char32 *p = firstSlash + 1; p != lastSlash; p ++) {
+ for (const char32 *p = firstSlash + 1; p != lastSlash; p ++)
if (isHeavy (p [0]) && ! isStress (p [1]))
my marks [WSP] ++;
- }
/* Violations of FtNonfinal: count all heads followed by ). */
- for (const char32 *p = firstSlash + 1; p != lastSlash; p ++) {
+ for (const char32 *p = firstSlash + 1; p != lastSlash; p ++)
if (isStress (p [0]) && p [1] == U')')
my marks [FtNonfinal] ++;
- }
/* Violations of Iambic: count all heads not followed by ). */
- for (const char32 *p = firstSlash + 1; p != lastSlash; p ++) {
+ for (const char32 *p = firstSlash + 1; p != lastSlash; p ++)
if (isStress (p [0]) && p [1] != U')')
my marks [Iambic] ++;
- }
/* Violations of Parse and Peripheral: count all syllables not between (). */
int depth = 0;
for (const char32 *p = firstSlash + 1; p != lastSlash; p ++) {
@@ -267,10 +264,9 @@ static void computeViolationMarks (OTGrammarCandidate me) {
}
}
/* Violations of FootBin: count all (L1) and (L2). */
- for (const char32 *p = firstSlash + 1; p != lastSlash; p ++) {
+ for (const char32 *p = firstSlash + 1; p != lastSlash; p ++)
if (isLight (p [0]) && p [-1] == U'(' && isStress (p [1]) && p [2] == ')')
my marks [FootBin] ++;
- }
/* Violations of WFL: count all initial / not followed by (. */
if (firstSlash [1] != '(')
my marks [WFL] = 1;
@@ -281,46 +277,37 @@ static void computeViolationMarks (OTGrammarCandidate me) {
{
char32 *p = str32chr (firstSlash, U'1');
for (; *p != U'('; p --) { }
- for (; p != firstSlash; p --) {
+ for (; p != firstSlash; p --)
if (isSyllable (p [0]))
my marks [Main_L] ++;
- }
}
/* Violations of Main_R: count syllables from foot containing X1 to right edge. */
{
char32 *p = str32chr (firstSlash, U'1');
for (; *p != U')'; p ++) { }
- for (; p != lastSlash; p ++) {
+ for (; p != lastSlash; p ++)
if (isSyllable (p [0]))
my marks [Main_R] ++;
- }
}
/* Violations of AFL: count syllables from every foot to left edge. */
- for (const char32 *p = firstSlash + 1; p != lastSlash; p ++) {
- if (p [0] == U'(') {
- for (const char32 *q = p; q != firstSlash; q --) {
+ for (const char32 *p = firstSlash + 1; p != lastSlash; p ++)
+ if (p [0] == U'(')
+ for (const char32 *q = p; q != firstSlash; q --)
if (isSyllable (q [0]))
my marks [AFL] ++;
- }
- }
- }
/* Violations of AFR: count syllables from every foot to right edge. */
- for (const char32 *p = firstSlash + 1; p != lastSlash; p ++) {
- if (p [0] == U')') {
- for (const char32 *q = p; q != lastSlash; q ++) {
+ for (const char32 *p = firstSlash + 1; p != lastSlash; p ++)
+ if (p [0] == U')')
+ for (const char32 *q = p; q != lastSlash; q ++)
if (isSyllable (q [0]))
my marks [AFR] ++;
- }
- }
- }
/* Violations of Nonfinal: count all final / preceded by ). */
if (lastSlash [-1] == U')')
my marks [Nonfinal] = 1;
/* Violations of Trochaic: count all heads not preceded by (. */
- for (const char32 *p = firstSlash + 1; p != lastSlash; p ++) {
+ for (const char32 *p = firstSlash + 1; p != lastSlash; p ++)
if (isStress (p [0]) && p [-2] != U'(')
my marks [Trochaic] ++;
- }
/* Violations of FootBimoraic: count weight between (). */
for (const char32 *p = firstSlash + 1; p != lastSlash; p ++) {
if (p [0] == U'(') {
@@ -391,15 +378,13 @@ static void computeViolationMarks (OTGrammarCandidate me) {
}
}
/* Violations of WeightByPosition: count all K. */
- for (const char32 *p = firstSlash + 1; p != lastSlash; p ++) {
+ for (const char32 *p = firstSlash + 1; p != lastSlash; p ++)
if (p [0] == U'K')
my marks [WeightByPosition] ++;
- }
/* Violations of *MoraicConsonant: count all J. */
- for (const char32 *p = firstSlash + 1; p != lastSlash; p ++) {
+ for (const char32 *p = firstSlash + 1; p != lastSlash; p ++)
if (p [0] == U'J')
my marks [MoraicConsonant] ++;
- }
}
static void replaceOutput (OTGrammarCandidate me) {
@@ -448,13 +433,13 @@ static void replaceOutput (OTGrammarCandidate me) {
autoOTGrammar OTGrammar_create_metrics (
kOTGrammar_createMetricsGrammar_initialRanking equal_footForm_wsp,
- int trochaicityConstraint, int includeFootBimoraic, int includeFootBisyllabic,
- int includePeripheral, int nonfinalityConstraint, int overtFormsHaveSecondaryStress,
- int includeClashAndLapse, int includeCodas)
+ int trochaicityConstraint, bool includeFootBimoraic, bool includeFootBisyllabic,
+ bool includePeripheral, int nonfinalityConstraint, bool overtFormsHaveSecondaryStress,
+ bool includeClashAndLapse, bool includeCodas)
{
try {
- int underlyingWeightPattern [1+7], maximumUnderlyingWeight = includeCodas ? 3 : 2;
- integer numberOfTableaus = includeCodas ? 9 + 27 + 81 + 243 + 2 : 62;
+ int underlyingWeightPattern [1+7], maximumUnderlyingWeight = ( includeCodas ? 3 : 2 );
+ const integer numberOfTableaus = ( includeCodas ? 9 + 27 + 81 + 243 + 2 : 62 );
autoOTGrammar me = Thing_new (OTGrammar);
my constraints = newvectorzero <structOTGrammarConstraint> (my numberOfConstraints = NUMBER_OF_CONSTRAINTS);
for (integer icons = 1; icons <= NUMBER_OF_CONSTRAINTS; icons ++) {
@@ -479,7 +464,7 @@ autoOTGrammar OTGrammar_create_metrics (
}
my tableaus = newvectorzero <structOTGrammarTableau> (numberOfTableaus);
for (int numberOfSyllables = 2; numberOfSyllables <= 7; numberOfSyllables ++) {
- integer numberOfUnderlyingWeightPatterns =
+ const integer numberOfUnderlyingWeightPatterns =
( numberOfSyllables > 5 ? 1 : Melder_iround (pow (maximumUnderlyingWeight, numberOfSyllables)) );
for (integer isyll = 1; isyll <= numberOfSyllables; isyll ++)
underlyingWeightPattern [isyll] = 1; // L or cv
@@ -505,11 +490,10 @@ autoOTGrammar OTGrammar_create_metrics (
}
OTGrammar_checkIndex (me.get());
OTGrammar_newDisharmonies (me.get(), 0.0);
- if (trochaicityConstraint == 1) {
+ if (trochaicityConstraint == 1)
OTGrammar_removeConstraint (me.get(), U"Trochaic");
- } else {
+ else
OTGrammar_removeConstraint (me.get(), U"FtNonfinal");
- }
if (! includeFootBimoraic)
OTGrammar_removeConstraint (me.get(), U"FtBimor");
if (! includeFootBisyllabic)
=====================================
gram/OTGrammar_ex_tongueRoot.cpp
=====================================
@@ -1,6 +1,6 @@
/* OTGrammar_ex_tongueRoot.cpp
*
- * Copyright (C) 1997-2005,2007,2009,2011-2013,2015-2020 Paul Boersma
+ * Copyright (C) 1997-2005,2007,2009,2011-2013,2015-2021 Paul Boersma
*
* This code is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -22,7 +22,6 @@ static const conststring32 vowels [] = { U"i", U"e", U"\\sw", U"\\ic", U"\\ef",
#define i 0
#define e 1
#define schwa 2
-#undef I
#define I 3
#define E 4
#define a 5
@@ -30,7 +29,7 @@ static const conststring32 vowels [] = { U"i", U"e", U"\\sw", U"\\ic", U"\\ef",
#define isrtr(v) ((v) >= I)
#define fliptr(v) (((v) + 3) % 6)
-static void countVowelViolations (const INTVEC marks, const int numberOfConstraints, const int v) {
+static void countVowelViolations (const INTVEC marks, const integer numberOfConstraints, const integer v) {
if (v == I)
marks [1] ++;
if (v == schwa)
@@ -47,7 +46,7 @@ static void countVowelViolations (const INTVEC marks, const int numberOfConstrai
}
}
-static void OTGrammarCandidate_init (OTGrammarCandidate me, int ncons, int v1, int v2) {
+static void OTGrammarCandidate_init (OTGrammarCandidate me, integer ncons, integer v1, integer v2) {
my output = Melder_dup (Melder_cat (vowels [v1], U"t", vowels [v2]));
my marks = zero_INTVEC (my numberOfConstraints = ncons);
/*
=====================================
gram/OTMulti.cpp
=====================================
@@ -901,7 +901,7 @@ static autoTable OTMulti_createHistory (OTMulti me, integer storeHistoryEvery, i
}
}
-static int OTMulti_updateHistory (OTMulti me, Table thee, integer storeHistoryEvery, integer idatum, conststring32 form1, conststring32 form2)
+static void OTMulti_updateHistory (OTMulti me, Table thee, integer storeHistoryEvery, integer idatum, conststring32 form1, conststring32 form2)
{
try {
if (idatum % storeHistoryEvery == 0) {
@@ -912,7 +912,6 @@ static int OTMulti_updateHistory (OTMulti me, Table thee, integer storeHistoryEv
for (integer icons = 1; icons <= my numberOfConstraints; icons ++)
Table_setNumericValue (thee, irow, 3 + icons, my constraints [icons]. ranking);
}
- return 1;
} catch (MelderError) {
Melder_throw (me, U": history not updated.");
}
=====================================
melder/MAT.cpp
=====================================
@@ -1,6 +1,6 @@
/* MAT.cpp
*
- * Copyright (C) 2017-2020 Paul Boersma
+ * Copyright (C) 2017-2021 Paul Boersma
*
* This code is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -22,6 +22,7 @@
#ifdef macintosh
#include <Accelerate/Accelerate.h>
+ #undef trace
#import <MetalPerformanceShaders/MetalPerformanceShaders.h>
#include <OpenCL/opencl.h>
#endif
=====================================
sys/ButtonEditor.cpp
=====================================
@@ -209,7 +209,8 @@ int structButtonEditor :: v_goToPage (conststring32 title) {
case 'a': { // toggle visibility of action
integer i = Melder_atoi (& title [1]);
Praat_Command action = praat_getAction (i);
- if (! action) return 0;
+ if (! action)
+ return 0;
if (action -> hidden)
praat_showAction (action -> class1, action -> class2, action -> class3, action -> title.get());
else
=====================================
sys/Graphics_text.cpp
=====================================
@@ -866,7 +866,8 @@ static _Graphics_widechar *theWidechar;
static char32 *charCodes;
static int initBuffer (conststring32 txt) {
try {
- integer sizeNeeded = str32len (txt) + 1;
+ constexpr integer maximumNumberOfReplacementCharactersPerCharacter = 2;
+ integer sizeNeeded = maximumNumberOfReplacementCharactersPerCharacter * str32len (txt) + 1;
if (sizeNeeded > bufferSize) {
sizeNeeded += sizeNeeded / 2 + 100;
Melder_free (theWidechar);
@@ -1444,6 +1445,87 @@ static void parseTextIntoCellsLinesRuns (Graphics me, conststring32 txt /* catta
}
out -> code = U'?'; // does this have any meaning?
Melder_assert (kar != U'\0');
+ if (my postScript) {
+ if (kar == UNICODE_LATIN_SMALL_LETTER_TS_DIGRAPH) {
+ kar = U't';
+ out -> kar = kar;
+ out -> karInfo = Longchar_getInfoFromNative (kar);
+ Melder_assert (out -> karInfo);
+ out -> rightToLeft = false;
+ kar = U's';
+ out ++;
+ * out = out [-1];
+ } else if (kar == UNICODE_LATIN_SMALL_LETTER_TESH_DIGRAPH) {
+ kar = U't';
+ out -> kar = kar;
+ out -> karInfo = Longchar_getInfoFromNative (kar);
+ Melder_assert (out -> karInfo);
+ out -> rightToLeft = false;
+ kar = UNICODE_LATIN_SMALL_LETTER_ESH;
+ out ++;
+ * out = out [-1];
+ } else if (kar == UNICODE_MODIFIER_LETTER_SMALL_H) {
+ kar = U'h';
+ out -> baseline = 34;
+ out -> size = 80;
+ } else if (kar == UNICODE_MODIFIER_LETTER_SMALL_H_WITH_HOOK) {
+ kar = UNICODE_LATIN_SMALL_LETTER_H_WITH_HOOK;
+ out -> baseline = 34;
+ out -> size = 80;
+ } else if (kar == UNICODE_MODIFIER_LETTER_SMALL_GAMMA) {
+ kar = UNICODE_LATIN_SMALL_LETTER_GAMMA;
+ out -> baseline = 34;
+ out -> size = 80;
+ } else if (kar == UNICODE_MODIFIER_LETTER_SMALL_W) {
+ kar = U'w';
+ out -> baseline = 34;
+ out -> size = 80;
+ } else if (kar == UNICODE_MODIFIER_LETTER_SMALL_TURNED_H) {
+ kar = UNICODE_LATIN_SMALL_LETTER_TURNED_H;
+ out -> baseline = 34;
+ out -> size = 80;
+ } else if (kar == UNICODE_MODIFIER_LETTER_GLOTTAL_STOP) {
+ kar = UNICODE_LATIN_LETTER_GLOTTAL_STOP;
+ out -> baseline = 34;
+ out -> size = 80;
+ } else if (kar == UNICODE_MODIFIER_LETTER_REVERSED_GLOTTAL_STOP) {
+ kar = UNICODE_LATIN_LETTER_PHARYNGEAL_VOICED_FRICATIVE;
+ out -> baseline = 34;
+ out -> size = 80;
+ } else if (kar == UNICODE_MODIFIER_LETTER_SMALL_L) {
+ kar = U'l';
+ out -> baseline = 34;
+ out -> size = 80;
+ } else if (kar == UNICODE_SUPERSCRIPT_LATIN_SMALL_LETTER_N) {
+ kar = U'n';
+ out -> baseline = 34;
+ out -> size = 80;
+ } else if (kar == UNICODE_MODIFIER_LETTER_SMALL_M) {
+ kar = U'm';
+ out -> baseline = 34;
+ out -> size = 80;
+ } else if (kar == UNICODE_MODIFIER_LETTER_SMALL_ENG) {
+ kar = UNICODE_LATIN_SMALL_LETTER_ENG;
+ out -> baseline = 34;
+ out -> size = 80;
+ } else if (kar == UNICODE_MODIFIER_LETTER_SMALL_S) {
+ kar = U's';
+ out -> baseline = 34;
+ out -> size = 80;
+ } else if (kar == UNICODE_MODIFIER_LETTER_SMALL_X) {
+ kar = U'x';
+ out -> baseline = 34;
+ out -> size = 80;
+ } else if (kar == UNICODE_MODIFIER_LETTER_SMALL_F) {
+ kar = U'f';
+ out -> baseline = 34;
+ out -> size = 80;
+ } else if (kar == UNICODE_MODIFIER_LETTER_SMALL_Y) {
+ kar = U'y';
+ out -> baseline = 34;
+ out -> size = 80;
+ }
+ }
out -> kar = kar;
out -> karInfo = Longchar_getInfoFromNative (kar);
Melder_assert (out -> karInfo);
=====================================
sys/GuiDrawingArea.cpp
=====================================
@@ -263,7 +263,7 @@ Thing_implement (GuiDrawingArea, GuiControl, 0);
event. x = x;
event. y = y;
event. phase = phase;
- Melder_casual (U": phase ", (int) phase);
+ //Melder_casual (U": phase ", (int) phase);
event. shiftKeyPressed = GetKeyState (VK_SHIFT) < 0;
event. optionKeyPressed = GetKeyState (VK_MENU) < 0;
event. commandKeyPressed = GetKeyState (VK_CONTROL) < 0;
=====================================
sys/Interpreter.cpp
=====================================
@@ -651,12 +651,12 @@ void Interpreter_getArgumentsFromString (Interpreter me, conststring32 arguments
}
}
-void Interpreter_getArgumentsFromArgs (Interpreter me, int narg, Stackel args) {
+void Interpreter_getArgumentsFromArgs (Interpreter me, integer narg, Stackel args) {
trace (narg, U" arguments");
- int size = my numberOfParameters;
+ integer size = my numberOfParameters;
while (size >= 1 && my parameters [size] [0] == U'\0')
size --; // ignore trailing fields without a variable name (button, comment)
- for (int ipar = 1; ipar <= size; ipar ++) {
+ for (integer ipar = 1; ipar <= size; ipar ++) {
mutablestring32 p = my parameters [ipar];
/*
Ignore buttons and comments again.
@@ -675,8 +675,8 @@ void Interpreter_getArgumentsFromArgs (Interpreter me, int narg, Stackel args) {
if (*p != U'\0' && p [str32len (p) - 1] == U':')
p [str32len (p) - 1] = U'\0';
}
- int iarg = 0;
- for (int ipar = 1; ipar <= size; ipar ++) {
+ integer iarg = 0;
+ for (integer ipar = 1; ipar <= size; ipar ++) {
/*
Ignore buttons and comments again. The buttons will keep their labels as "arguments".
*/
@@ -704,7 +704,7 @@ void Interpreter_getArgumentsFromArgs (Interpreter me, int narg, Stackel args) {
/*
Convert booleans and choices to numbers.
*/
- for (int ipar = 1; ipar <= size; ipar ++) {
+ for (integer ipar = 1; ipar <= size; ipar ++) {
if (my types [ipar] == Interpreter_BOOLEAN) {
mutablestring32 arg = & my arguments [ipar] [0];
if (str32equ (arg, U"1") || str32equ (arg, U"yes") || str32equ (arg, U"on") ||
@@ -719,7 +719,7 @@ void Interpreter_getArgumentsFromArgs (Interpreter me, int narg, Stackel args) {
Melder_throw (U"Unknown value \"", arg, U"\" for boolean \"", my parameters [ipar], U"\".");
}
} else if (my types [ipar] == Interpreter_CHOICE) {
- int jpar;
+ integer jpar;
mutablestring32 arg = & my arguments [ipar] [0];
for (jpar = ipar + 1; jpar <= my numberOfParameters; jpar ++) {
if (my types [jpar] != Interpreter_BUTTON && my types [jpar] != Interpreter_OPTION)
@@ -733,7 +733,7 @@ void Interpreter_getArgumentsFromArgs (Interpreter me, int narg, Stackel args) {
if (jpar > my numberOfParameters)
Melder_throw (U"Unknown value \"", arg, U"\" for choice \"", my parameters [ipar], U"\".");
} else if (my types [ipar] == Interpreter_OPTIONMENU) {
- int jpar;
+ integer jpar;
mutablestring32 arg = & my arguments [ipar] [0];
for (jpar = ipar + 1; jpar <= my numberOfParameters; jpar ++) {
if (my types [jpar] != Interpreter_OPTION && my types [jpar] != Interpreter_BUTTON)
=====================================
sys/Interpreter.h
=====================================
@@ -2,7 +2,7 @@
#define _Interpreter_h_
/* Interpreter.h
*
- * Copyright (C) 1993-2018,2020 Paul Boersma
+ * Copyright (C) 1993-2018,2020,2021 Paul Boersma
*
* This code is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -105,7 +105,7 @@ autoUiForm Interpreter_createForm (Interpreter me, GuiWindow parent, conststring
bool selectionOnly);
void Interpreter_getArgumentsFromDialog (Interpreter me, UiForm dialog);
void Interpreter_getArgumentsFromString (Interpreter me, conststring32 arguments);
-void Interpreter_getArgumentsFromArgs (Interpreter me, int nargs, Stackel args);
+void Interpreter_getArgumentsFromArgs (Interpreter me, integer nargs, Stackel args);
void Interpreter_run (Interpreter me, char32 *text); // destroys 'text'
void Interpreter_stop (Interpreter me); // can be called from any procedure called deep-down by the interpreter; will stop before next line
=====================================
sys/praat.cpp
=====================================
@@ -170,7 +170,7 @@ char32 * praat_nameOfSelected (ClassInfo klas, integer inplace) {
Melder_throw (U"No ", klas ? klas -> className : U"object", U" #", inplace, U" selected.");
else
Melder_throw (U"No ", klas ? klas -> className : U"object", U" selected.");
- return 0; // failure
+ return nullptr; // failure, but never reached anyway
}
integer praat_numberOfSelected (ClassInfo klas) {
@@ -182,7 +182,7 @@ integer praat_numberOfSelected (ClassInfo klas) {
return theCurrentPraatObjects -> numberOfSelected [readableClassId];
}
-void praat_deselect (int IOBJECT) {
+void praat_deselect (integer IOBJECT) {
if (! SELECTED)
return;
SELECTED = false;
@@ -198,12 +198,12 @@ void praat_deselect (int IOBJECT) {
}
void praat_deselectAll () {
- int IOBJECT;
+ integer IOBJECT;
WHERE (1)
praat_deselect (IOBJECT);
}
-void praat_select (int IOBJECT) {
+void praat_select (integer IOBJECT) {
if (SELECTED)
return;
SELECTED = true;
@@ -219,25 +219,25 @@ void praat_select (int IOBJECT) {
}
void praat_selectAll () {
- int IOBJECT;
+ integer IOBJECT;
WHERE (true)
praat_select (IOBJECT);
}
void praat_list_background () {
- int IOBJECT;
+ integer IOBJECT;
WHERE (SELECTED)
GuiList_deselectItem (praatList_objects, IOBJECT);
}
void praat_list_foreground () {
- int IOBJECT;
+ integer IOBJECT;
WHERE (SELECTED)
GuiList_selectItem (praatList_objects, IOBJECT);
}
autoCollection praat_getSelectedObjects () {
autoCollection thee = Collection_create ();
- int IOBJECT;
+ integer IOBJECT;
LOOP {
iam_LOOP (Daata);
thy addItem_ref (me);
@@ -245,7 +245,7 @@ autoCollection praat_getSelectedObjects () {
return thee;
}
-char32 *praat_name (int IOBJECT) { return str32chr (FULL_NAME, U' ') + 1; }
+char32 *praat_name (integer IOBJECT) { return str32chr (FULL_NAME, U' ') + 1; }
void praat_write_do (UiForm dia, conststring32 extension) {
static MelderString defaultFileName;
@@ -261,7 +261,7 @@ void praat_write_do (UiForm dia, conststring32 extension) {
Apparently, the "extension" is not a complete file name.
We are expected to prepend the "extension" with the name of a selected object.
*/
- int IOBJECT, found = 0;
+ integer IOBJECT, found = 0;
Daata data = nullptr;
WHERE (SELECTED) {
if (! data)
@@ -289,8 +289,8 @@ static void removeAllReferencesToMoribundEditor (Editor editor) {
Remove all references to this editor.
It may be editing multiple objects.
*/
- for (int iobject = 1; iobject <= theCurrentPraatObjects -> n; iobject ++)
- for (int ieditor = 0; ieditor < praat_MAXNUM_EDITORS; ieditor ++)
+ for (integer iobject = 1; iobject <= theCurrentPraatObjects -> n; iobject ++)
+ for (integer ieditor = 0; ieditor < praat_MAXNUM_EDITORS; ieditor ++)
if (theCurrentPraatObjects -> list [iobject]. editors [ieditor] == editor)
theCurrentPraatObjects -> list [iobject]. editors [ieditor] = nullptr;
if (praatP. editor == editor)
@@ -301,7 +301,7 @@ static void removeAllReferencesToMoribundEditor (Editor editor) {
Remove the "object" from the list,
killing everything that has to do with the selection.
*/
-static void praat_remove (int iobject, bool removeVisibly) {
+static void praat_remove (integer iobject, bool removeVisibly) {
Melder_assert (iobject >= 1 && iobject <= theCurrentPraatObjects -> n);
if (theCurrentPraatObjects -> list [iobject]. isBeingCreated) {
theCurrentPraatObjects -> list [iobject]. isBeingCreated = false;
@@ -315,7 +315,7 @@ static void praat_remove (int iobject, bool removeVisibly) {
/*
To prevent synchronization problems, kill editors before killing the data.
*/
- for (int ieditor = 0; ieditor < praat_MAXNUM_EDITORS; ieditor ++) {
+ for (integer ieditor = 0; ieditor < praat_MAXNUM_EDITORS; ieditor ++) {
Editor editor = theCurrentPraatObjects -> list [iobject]. editors [ieditor]; // save this one reference
if (editor) {
trace (U"remove references to editor ", ieditor);
@@ -385,7 +385,7 @@ void praat_newWithFile (autoDaata me, MelderFile file, conststring32 myName) {
Melder_throw (U"The Object Window cannot contain more than ", praat_MAXNUM_OBJECTS, U" objects. You could remove some objects.");
}
- int IOBJECT = ++ theCurrentPraatObjects -> n;
+ integer IOBJECT = ++ theCurrentPraatObjects -> n;
Melder_assert (FULL_NAME == nullptr);
theCurrentPraatObjects -> list [IOBJECT]. name = Melder_dup_f (name.string); // all right to crash if out of memory
++ theCurrentPraatObjects -> uniqueId;
@@ -428,7 +428,7 @@ void praat_new (autoDaata me,
void praat_updateSelection () {
if (theCurrentPraatObjects -> totalBeingCreated > 0) {
- int IOBJECT;
+ integer IOBJECT;
praat_deselectAll ();
WHERE (theCurrentPraatObjects -> list [IOBJECT]. isBeingCreated) {
praat_select (IOBJECT);
@@ -466,7 +466,7 @@ static void gui_cb_list_selectionChanged (Thing /* boss */, GuiList_SelectionCha
praat_show ();
}
-void praat_list_renameAndSelect (int position, conststring32 name) {
+void praat_list_renameAndSelect (integer position, conststring32 name) {
if (! theCurrentPraatApplication -> batch) {
GuiList_replaceItem (praatList_objects, name, position); // void if name equal
if (! Melder_backgrounding)
@@ -491,9 +491,9 @@ void praat_name2 (char32 *name, ClassInfo klas1, ClassInfo klas2) {
Melder_sprint (name,200, name1, U"_", name2);
}
-void praat_removeObject (int i) {
+void praat_removeObject (integer i) {
praat_remove (i, true); // dangle
- for (int j = i; j < theCurrentPraatObjects -> n; j ++)
+ for (integer j = i; j < theCurrentPraatObjects -> n; j ++)
theCurrentPraatObjects -> list [j] = std::move (theCurrentPraatObjects -> list [j + 1]); // undangle but create second references
theCurrentPraatObjects -> list [theCurrentPraatObjects -> n]. name. reset ();
theCurrentPraatObjects -> list [theCurrentPraatObjects -> n]. object = nullptr; // undangle or remove second reference
@@ -508,7 +508,7 @@ void praat_removeObject (int i) {
static void praat_exit (int exit_code) {
//Melder_setTracing (true);
- int IOBJECT;
+ integer IOBJECT;
trace (U"destroy the picture window");
praat_picture_exit ();
praat_statistics_exit (); // record total memory use across sessions
@@ -635,7 +635,7 @@ static void cb_Editor_destruction (Editor me) {
}
static void cb_Editor_dataChanged (Editor me) {
- for (int iobject = 1; iobject <= theCurrentPraatObjects -> n; iobject ++) {
+ for (integer iobject = 1; iobject <= theCurrentPraatObjects -> n; iobject ++) {
/*
Am I editing this object?
*/
@@ -668,10 +668,10 @@ static void cb_Editor_publication (Editor /* me */, autoDaata publication) {
praat_updateSelection ();
}
-void praat_installEditor (Editor editor, int IOBJECT) {
+void praat_installEditor (Editor editor, integer IOBJECT) {
if (! editor)
return;
- for (int ieditor = 0; ieditor < praat_MAXNUM_EDITORS; ieditor ++) {
+ for (integer ieditor = 0; ieditor < praat_MAXNUM_EDITORS; ieditor ++) {
if (! EDITOR [ieditor]) {
EDITOR [ieditor] = editor;
Editor_setDestructionCallback (editor, cb_Editor_destruction);
@@ -685,14 +685,14 @@ void praat_installEditor (Editor editor, int IOBJECT) {
Melder_throw (U"(praat_installEditor:) Cannot have more than ", praat_MAXNUM_EDITORS, U" editors with one object.");
}
-void praat_installEditor2 (Editor editor, int i1, int i2) {
+void praat_installEditor2 (Editor editor, integer i1, integer i2) {
if (! editor)
return;
- int ieditor1 = 0;
+ integer ieditor1 = 0;
for (; ieditor1 < praat_MAXNUM_EDITORS; ieditor1 ++)
if (! theCurrentPraatObjects -> list [i1]. editors [ieditor1])
break;
- int ieditor2 = 0;
+ integer ieditor2 = 0;
for (; ieditor2 < praat_MAXNUM_EDITORS; ieditor2 ++)
if (! theCurrentPraatObjects -> list [i2]. editors [ieditor2])
break;
@@ -707,18 +707,18 @@ void praat_installEditor2 (Editor editor, int i1, int i2) {
}
}
-void praat_installEditor3 (Editor editor, int i1, int i2, int i3) {
+void praat_installEditor3 (Editor editor, integer i1, integer i2, integer i3) {
if (! editor)
return;
- int ieditor1 = 0;
+ integer ieditor1 = 0;
for (; ieditor1 < praat_MAXNUM_EDITORS; ieditor1 ++)
if (! theCurrentPraatObjects -> list [i1]. editors [ieditor1])
break;
- int ieditor2 = 0;
+ integer ieditor2 = 0;
for (; ieditor2 < praat_MAXNUM_EDITORS; ieditor2 ++)
if (! theCurrentPraatObjects -> list [i2]. editors [ieditor2])
break;
- int ieditor3 = 0;
+ integer ieditor3 = 0;
for (; ieditor3 < praat_MAXNUM_EDITORS; ieditor3 ++)
if (! theCurrentPraatObjects -> list [i3]. editors [ieditor3])
break;
@@ -793,7 +793,7 @@ void praat_dataChanged (Daata object) {
saveError = Melder_dup_f (Melder_getError ());
Melder_clearError ();
}
- int IOBJECT;
+ integer IOBJECT;
WHERE (OBJECT == object) {
for (int ieditor = 0; ieditor < praat_MAXNUM_EDITORS; ieditor ++) {
Editor editor = EDITOR [ieditor];
@@ -1759,7 +1759,7 @@ void praat_run () {
}
Melder_assert (isdefined (0.0));
Melder_assert (isdefined (1e300));
- Melder_assert (isundef ((double) 1e320L));
+ Melder_assert (isundef (double (1e160 * 1e160)));
Melder_assert (isundef (pow (10.0, 330)));
Melder_assert (isundef (0.0 / 0.0));
Melder_assert (isundef (1.0 / 0.0));
=====================================
sys/praat.h
=====================================
@@ -176,11 +176,11 @@ typedef struct { /* Readonly */
ManPages manPages;
} structPraatApplication, *PraatApplication;
typedef struct { /* Readonly */
- int n; /* The current number of objects in the list. */
+ integer n; /* The current number of objects in the list. */
structPraat_Object list [1 + praat_MAXNUM_OBJECTS]; /* The list of objects: list [1..n]. */
- int totalSelection; /* The total number of selected objects, <= n. */
- int numberOfSelected [1 + 1000]; /* For each (readable) class. */
- int totalBeingCreated;
+ integer totalSelection; /* The total number of selected objects, <= n. */
+ integer numberOfSelected [1 + 1000]; /* For each (readable) class. */
+ integer totalBeingCreated;
integer uniqueId;
} structPraatObjects, *PraatObjects;
typedef struct { // read-only
@@ -206,7 +206,7 @@ extern structPraatPicture theForegroundPraatPicture;
extern PraatPicture theCurrentPraatPicture;
/* The global objects containing the state of the application; only reachable from interface files. */
-char32 *praat_name (int iobject);
+char32 *praat_name (integer iobject);
void praat_write_do (UiForm dia, conststring32 extension);
void praat_new (autoDaata me);
void praat_new (autoDaata me, const MelderArg& arg);
@@ -229,7 +229,7 @@ void praat_name2 (char32 *name, ClassInfo klas1, ClassInfo klas2);
#define NAME praat_name (IOBJECT)
/* Used by praat_Sybil.cpp, if you put an Editor on the screen: */
-void praat_installEditor (Editor editor, int iobject);
+void praat_installEditor (Editor editor, integer iobject);
/* This routine adds a reference to a new editor (unless it is null) to the screen object
which is in the list at position 'iobject'.
It sets the destroyCallback and dataChangedCallback as appropriate for Praat:
@@ -238,8 +238,8 @@ void praat_installEditor (Editor editor, int iobject);
the dataChangedCallback will notify an open DataEditor with the same data,
after that data will have changed.
*/
-void praat_installEditor2 (Editor editor, int iobject1, int iobject2);
-void praat_installEditor3 (Editor editor, int iobject1, int iobject2, int iobject3);
+void praat_installEditor2 (Editor editor, integer iobject1, integer iobject2);
+void praat_installEditor3 (Editor editor, integer iobject1, integer iobject2, integer iobject3);
void praat_installEditorN (Editor editor, DaataList objects);
void praat_dataChanged (Daata object);
@@ -276,7 +276,7 @@ void praat_setLogo (double width_mm, double height_mm, void (*draw) (Graphics g)
praat_removeObject (i);
praat_show (); // Needed because the selection has changed.
*/
-void praat_removeObject (int i); // i = 1..praat.n
+void praat_removeObject (integer i); // i = 1..praat.n
void praat_show (); // forces an update of the dynamic menu
void praat_updateSelection ();
/* If you require the correct selection immediately after calling praat_new. */
=====================================
sys/praatM.h
=====================================
@@ -77,7 +77,7 @@
#define FORM(proc,name,helpTitle) \
extern "C" void proc (UiForm sendingForm, integer narg, Stackel args, conststring32 sendingString, Interpreter interpreter, conststring32 invokingButtonTitle, bool isModified, void *buttonClosure); \
void proc (UiForm _sendingForm_, integer _narg_, Stackel _args_, conststring32 _sendingString_, Interpreter interpreter, conststring32 _invokingButtonTitle_, bool _isModified_, void *_buttonClosure_) { \
- int IOBJECT = 0; \
+ integer IOBJECT = 0; \
(void) IOBJECT; \
UiField _radio_ = nullptr; \
(void) _radio_; \
@@ -346,7 +346,7 @@
extern "C" void proc (UiForm, integer, Stackel, conststring32, Interpreter interpreter, conststring32, bool, void *); \
void proc (UiForm, integer, Stackel, conststring32, Interpreter interpreter, conststring32, bool, void *) { \
(void) interpreter; \
- int IOBJECT = 0; \
+ integer IOBJECT = 0; \
(void) IOBJECT; \
{ { \
try {
@@ -362,7 +362,7 @@
} else { \
try { \
MelderFile file; \
- int IOBJECT = 0; \
+ integer IOBJECT = 0; \
(void) IOBJECT; \
structMelderFile _file2 { }; /* don't move this into an inner scope, because the contents of a local variable don't persist into the outer scope */ \
if (_args_) { \
@@ -390,7 +390,7 @@
} else { \
try { \
MelderFile file; \
- int IOBJECT = 0; \
+ integer IOBJECT = 0; \
(void) IOBJECT; \
structMelderFile _file2 { }; /* don't move this into an inner scope, because the contents of a local variable don't persist into the outer scope */ \
if (_args_) { \
@@ -423,7 +423,7 @@
LOOP { if (CLASS == class##klas || Thing_isSubclass (CLASS, class##klas)) me = (klas) OBJECT; break; }
#define FIND_ONE_WITH_IOBJECT(klas) \
- klas me = nullptr; int _klas_position = 0; \
+ klas me = nullptr; integer _klas_position = 0; \
LOOP { if (CLASS == class##klas) me = (klas) OBJECT, _klas_position = IOBJECT; break; } \
IOBJECT = _klas_position;
@@ -433,7 +433,7 @@
if (me && you) break; }
#define FIND_ONE_AND_ONE_WITH_IOBJECT(klas1,klas2) \
- klas1 me = nullptr; klas2 you = nullptr; int _klas1_position = 0; \
+ klas1 me = nullptr; klas2 you = nullptr; integer _klas1_position = 0; \
LOOP { if (CLASS == class##klas1) me = (klas1) OBJECT, _klas1_position = IOBJECT; \
else if (CLASS == class##klas2) you = (klas2) OBJECT; if (me && you) break; } \
IOBJECT = _klas1_position;
@@ -464,7 +464,7 @@
else if (CLASS == class##klas3) him = (klas3) OBJECT; if (me && you && him) break; }
#define FIND_ONE_AND_ONE_AND_ONE_WITH_IOBJECT(klas1,klas2,klas3) \
- klas1 me = nullptr; klas2 you = nullptr; klas3 him = nullptr; int _klas1_position = 0;\
+ klas1 me = nullptr; klas2 you = nullptr; klas3 him = nullptr; integer _klas1_position = 0;\
LOOP { if (CLASS == class##klas1) me = (klas1) OBJECT, _klas1_position = IOBJECT; else if (CLASS == class##klas2) you = (klas2) OBJECT; \
else if (CLASS == class##klas3) him = (klas3) OBJECT; if (me && you && him) break; } \
IOBJECT = _klas1_position;
@@ -476,7 +476,7 @@
if (me && you && him && she) break; }
#define FIND_1_1_1_1_WITH_IOBJECT(klas1,klas2,klas3,klas4) \
- klas1 me = nullptr; klas2 you = nullptr; klas3 him = nullptr; klas4 she = nullptr; int _klas1_position = 0; \
+ klas1 me = nullptr; klas2 you = nullptr; klas3 him = nullptr; klas4 she = nullptr; integer _klas1_position = 0; \
LOOP { if (CLASS == class##klas1) me = (klas1) OBJECT, _klas1_position = IOBJECT; else if (CLASS == class##klas2) you = (klas2) OBJECT; \
else if (CLASS == class##klas3) him = (klas3) OBJECT; else if (CLASS == class##klas4) she = (klas4) OBJECT; \
if (me && you && him && she) break; } \
@@ -605,7 +605,7 @@
#define RECORD_ONE
#define RECORD_ONE_END(...) \
praat_new (result.move(), __VA_ARGS__); \
- END_WITH_NEW_DATA
+ CREATE_MULTIPLE_END
/*
DRAW
=====================================
sys/praatP.h
=====================================
@@ -1,6 +1,6 @@
/* praatP.h
*
- * Copyright (C) 1992-2007,2009-2020 Paul Boersma
+ * Copyright (C) 1992-2007,2009-2021 Paul Boersma
*
* This code is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -114,9 +114,9 @@ GuiMenu praat_picture_resolveMenu (conststring32 menu);
/* The following routines are a bit private (used by praat_script.cpp). */
/* If you must call them, follow them by praat_show (). */
-void praat_deselect (int i);
+void praat_deselect (integer i);
void praat_deselectAll ();
-void praat_select (int i);
+void praat_select (integer i);
void praat_selectAll ();
void praat_list_background ();
@@ -179,7 +179,7 @@ void praat_actions_writeC (bool isInHeaderFile, bool includeSaveAPI,
bool includePlayAPI, bool includeDrawAPI, bool includeHelpAPI, bool includeWindowAPI);
void praat_cleanUpName (char32 *name);
-void praat_list_renameAndSelect (int position, conststring32 name);
+void praat_list_renameAndSelect (integer position, conststring32 name);
inline struct PraatP {
int argc;
=====================================
sys/praat_script.cpp
=====================================
@@ -1,6 +1,6 @@
/* praat_script.cpp
*
- * Copyright (C) 1993-2020 Paul Boersma
+ * Copyright (C) 1993-2021 Paul Boersma
*
* This code is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -23,9 +23,9 @@
#include "UiPause.h"
#include "DemoEditor.h"
-static int praat_findObjectFromString (Interpreter interpreter, conststring32 string) {
+static integer praat_findObjectFromString (Interpreter interpreter, conststring32 string) {
try {
- int IOBJECT;
+ integer IOBJECT;
while (*string == U' ') string ++;
if (*string >= U'A' && *string <= U'Z') {
/*
@@ -70,7 +70,7 @@ static int praat_findObjectFromString (Interpreter interpreter, conststring32 st
}
Editor praat_findEditorFromString (conststring32 string) {
- int IOBJECT;
+ integer IOBJECT;
while (*string == U' ')
string ++;
if (*string >= U'A' && *string <= U'Z') {
@@ -189,7 +189,7 @@ bool praat_executeCommand (Interpreter interpreter, char32 *command) {
if (command [0] == U'\0' || command [0] == U'#' || command [0] == U'!' || command [0] == U';')
/* Skip empty lines and comments. */;
else if ((command [0] == U'.' || command [0] == U'+' || command [0] == U'-') && Melder_isAsciiUpperCaseLetter (command [1])) { // selection?
- int IOBJECT = praat_findObjectFromString (interpreter, command + 1);
+ integer IOBJECT = praat_findObjectFromString (interpreter, command + 1);
if (command [0] == '.')
praat_deselectAll ();
if (command [0] == '-')
@@ -203,17 +203,17 @@ bool praat_executeCommand (Interpreter interpreter, char32 *command) {
praat_selectAll ();
praat_show ();
} else {
- int IOBJECT = praat_findObjectFromString (interpreter, command + 7);
+ integer IOBJECT = praat_findObjectFromString (interpreter, command + 7);
praat_deselectAll ();
praat_select (IOBJECT);
praat_show ();
}
} else if (str32nequ (command, U"plus ", 5)) {
- int IOBJECT = praat_findObjectFromString (interpreter, command + 5);
+ integer IOBJECT = praat_findObjectFromString (interpreter, command + 5);
praat_select (IOBJECT);
praat_show ();
} else if (str32nequ (command, U"minus ", 6)) {
- int IOBJECT = praat_findObjectFromString (interpreter, command + 6);
+ integer IOBJECT = praat_findObjectFromString (interpreter, command + 6);
praat_deselect (IOBJECT);
praat_show ();
} else if (str32nequ (command, U"echo ", 5)) {
=====================================
sys/praat_version.h
=====================================
@@ -1,5 +1,5 @@
-#define PRAAT_VERSION_STR 6.1.55
-#define PRAAT_VERSION_NUM 6155
+#define PRAAT_VERSION_STR 6.1.56
+#define PRAAT_VERSION_NUM 6156
#define PRAAT_YEAR 2021
-#define PRAAT_MONTH October
-#define PRAAT_DAY 25
+#define PRAAT_MONTH November
+#define PRAAT_DAY 3
=====================================
test/manually/record.praat
=====================================
@@ -0,0 +1,5 @@
+# test/manually/record.praat
+# Paul Boersma 2021-11-03
+
+sound = Record Sound (fixed time): "microphone", 1, 0.5, "44100", 1
+writeInfoLine: sound
=====================================
test/sys/graphicsText.praat
=====================================
@@ -1,5 +1,5 @@
# graphicsText.praat
-# Paul Boersma 2020-11-11
+# Paul Boersma 2021-10-27
Erase all
Select outer viewport: 0, 9, 0, 9
@@ -25,16 +25,23 @@ Text: 0, "left", 93, "half", "a / b, a/b, a / b, a/b, a / b, a/b, a / b, a /b, a
Times
Text: 0, "left", 92, "half", "a / b, a/b, a / b"
Courier
-Text: 0, "left", 90, "half", "The space might be too small in: Now %%you% try."
+Text: 0, "left", 90, "half", "The space might be too small in: Now %%you% try. and/or"
Times
-Text: 0, "left", 89, "half", "The space might be too small in: Now %%you% try."
+Text: 0, "left", 89, "half", "The space might be too small in: Now %%you% try. and/or"
Text: 0, "left", 88, "half", "A lot of normal text might cause ##misalignment# misalignment misalignment of the f in: (%%false%)"
Text: 0, "left", 87, "half", "(%%false%) now at the beginning of the line"
+Text: 0, "left", 85, "half", "n\|v b\0v o\Tv o\T^ o\T( o\T) e\-v o\+v o\:v o\~v d\Nv d\Uv u\nv e\3v u\cv///"
+Text: 0, "left", 83, "half", "\gf\0^ \ef\'^ \ef\`^ \ef\-^ \ef\~^ \ef\v^ \ef\^^ o\:^ e\x^ \ef\N^ k\lip t\lis a\_ub///"
+Text: 0, "left", 81, "half", "t\^h b\^H t\^g k\^w t\^Y a\^? t\^9 t\^l t\^n p\^m k\^N t\^s k\^x p\^f t\^y///"
+Text: 0, "left", 79, "half", "\ts \tS///"
+
Save as 600-dpi PNG file: "kanweg.png"
Save as EPS file: "kanweg.eps"
+
+
width = Text width (mm): "Hello world"
assert width > 18.0 and width < 24.0 ; 'width'
appendInfoLine: "width ", width, " mm"
View it on GitLab: https://salsa.debian.org/med-team/praat/-/compare/d385b0ac50021865e6fc815cae8a9411e407fc82...a5d156943a81002587370731a35ca531408252d8
--
View it on GitLab: https://salsa.debian.org/med-team/praat/-/compare/d385b0ac50021865e6fc815cae8a9411e407fc82...a5d156943a81002587370731a35ca531408252d8
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20211104/4f1c3cd7/attachment-0001.htm>
More information about the debian-med-commit
mailing list