[med-svn] [Git][med-team/praat][master] 4 commits: New upstream version 6.3.19+dfsg
Rafael Laboissière (@rafael)
gitlab at salsa.debian.org
Tue Oct 24 19:42:02 BST 2023
Rafael Laboissière pushed to branch master at Debian Med / praat
Commits:
4bc7cec3 by Rafael Laboissière at 2023-10-24T11:51:25-03:00
New upstream version 6.3.19+dfsg
- - - - -
f3360ed9 by Rafael Laboissière at 2023-10-24T11:52:41-03:00
Update upstream source from tag 'upstream/6.3.19+dfsg'
Update to upstream version '6.3.19+dfsg'
with Debian dir 34b8c4895d3da4124071313908174df28086e61a
- - - - -
b24543c1 by Rafael Laboissière at 2023-10-24T14:36:53-03:00
New scheme for obtaining the upstream changelog
+ d/What_s_new_.html: Drop file
+ d/rules: Replace the target for getting the What_s_new_.html
file from the Praat website by a code for extracting it from file
fon/manual_whatsnew.cpp
+ d/clean: Include d/what-is-new in the list of files to remove
+ d/s/lintian-overrides: Drop override fior source-is-missing related
to d/What_s_new_.html
Gbp-Dch: Full
- - - - -
fe1a8723 by Rafael Laboissière at 2023-10-24T14:40:42-03:00
d/changelog: Add entry for release 6.3.19+dfsg-1
Gbp-Dch: Ignore
- - - - -
9 changed files:
- README.md
- − debian/What_s_new_.html
- debian/changelog
- debian/clean
- debian/rules
- debian/source/lintian-overrides
- fon/manual_whatsnew.cpp
- sys/GuiControl.cpp
- sys/praat_version.h
Changes:
=====================================
README.md
=====================================
@@ -145,9 +145,8 @@ 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 15 and choose Build or Run for the target `praat_mac`.
-You can compile with the 13.3 (i.e. the newest and standard) SDK, which will work as far back as macOS 10.11,
-which is our deployment target, and will look good even on macOS 15 Sonoma
-(Praat 6.3.18 has some graphics glitches, e.g. when scrolling the manual, if compiled with the 14.0 SDK).
+You can compile with the 14.0 SDK, which will work as far back as macOS 10.11,
+which is our deployment target, and will look good even on macOS 15 Sonoma.
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,
=====================================
debian/What_s_new_.html deleted
=====================================
@@ -1,250 +0,0 @@
-<html><head><meta name="robots" content="index,follow"><meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>What's new?</title></head><body bgcolor="#FFFFFF">
-
-<table border=0 cellpadding=0 cellspacing=0><tr><td bgcolor="#CCCC00"><table border=4 cellpadding=9><tr><td align=middle bgcolor="#000000"><font face="Palatino,Times" size=6 color="#999900"><b>
-What's new?
-</b></font></table></table>
-<p>
-Latest changes in Praat.</p>
-<p>
-<b>6.3.18</b> (8 October 2023)</p>
-<dl>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• <a href="SpeechSynthesizer.html">SpeechSynthesizer</a>: included the new version of eSpeak (development 1.52), which has 133 languages.
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• <a href="Add_to_menu___.html">Add to menu...</a>: you can now add separators, headers and indented submenus to menus in editor windows.
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Scripting: new functions <a href="_index_caseInsensitive_.html"><b><code><font size=+1>index_caseInsensitive</font></code></b></a>, <a href="_rindex_caseInsensitive_.html"><b><code><font size=+1>rindex_caseInsensitive</font></code></b></a>, <a href="_startsWith_caseInsensitive_.html"><b><code><font size=+1>startsWith_caseInsensitive</font></code></b></a>, <a href="_endsWith_caseInsensitive_.html"><b><code><font size=+1>endsWith_caseInsensitive</font></code></b></a> <a href="_fileNames_caseInsensitive-S-H_.html"><b><code><font size=+1>fileNames_caseInsensitive$#</font></code></b></a>, <a href="_folderNames_caseInsensitive-S-H_.html"><b><code><font size=+1>folderNames_caseInsensitive$#</font></code></b></a>.
-</dl>
-<p>
-<b>6.3.17</b> (10 September 2023)</p>
-<dl>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• SoundEditor: three Paste options, namely <b>Paste before selection</b> (Shift-Command-V), <b>Paste over selection</b> (Option-Command-V), and the already existing <b>Paste after selection</b> (now Command-V).
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• All editor windows: extended the old single-level Undo and Redo to a ten-level Undo and Redo.
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Scripting: the new <a href="_runSystem-S_.html"><b><code><font size=+1>runSystem$</font></code></b></a> and <a href="_runSubprocess-S_.html"><b><code><font size=+1>runSubprocess$</font></code></b></a> return the output of the system command or subprocess.
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Scripting: <a href="_runSystem_.html"><b><code><font size=+1>runSystem</font></code></b></a>, <a href="_runSystem-S_.html"><b><code><font size=+1>runSystem$</font></code></b></a>, <a href="_runSubprocess_.html"><b><code><font size=+1>runSubprocess</font></code></b></a> and <a href="_runSubprocess-S_.html"><b><code><font size=+1>runSubprocess$</font></code></b></a> report any error messages generated by the system command or subprocess.
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• PointEditor (pulses): settable <b>Period floor</b>, <b>Period ceiling</b>, <b>Maximum period factor</b> and <b>Maximum amplitude factor</b>, for jitter and shimmer measurements.
-</dl>
-<p>
-<b>6.3.16</b> (29 August 2023)</p>
-<dl>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Sound analysis areas: better visible contrast in intensity curve (green on lime).
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Windows: repaired a bug introduced in 6.3.10 (as a result of the repair mentioned there) by which the Demo window would be insensitive to arrow keys.
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• SpeechSynthesizer: repaired a bug that caused <b>Get phonemes from text...</b> to return empty text.
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Repaired a bug that caused Praat to crash when you supplied 0 for the channel number in <a href="Sound__Get_nearest_zero_crossing___.html">Sound: Get nearest zero crossing...</a>.
-</dl>
-<p>
-<b>6.3.15</b> (23 August 2023)</p>
-<dl>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• SpeechSynthesizer: improvements in <b>Get phonemes from text...</b>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Scripting: <a href="_part-H_.html"><b><code><font size=+1>part#</font></code></b></a>, <a href="_part-H-H_.html"><b><code><font size=+1>part##</font></code></b></a>, <a href="_selected-S-H_.html"><b><code><font size=+1>selected$#</font></code></b></a>.
-</dl>
-<p>
-<b>6.3.14</b> (4 August 2023)</p>
-<dl>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Repaired a bug that occurred when saving a <a href="FormantPath.html">FormantPath</a> to disk.
-</dl>
-<p>
-<b>6.3.13</b> (31 July 2023)</p>
-<dl>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Repaired a bug introduced in 6.3.12 by which a link to a file wasn’t found in external manual pages.
-</dl>
-<p>
-<b>6.3.12</b> (24 July 2023)</p>
-<dl>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Improvements in manual, including corrections on layout problems introduced in version 6.3.11.
-</dl>
-<p>
-<b>6.3.11</b> (17 July 2023)</p>
-<dl>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• VowelEditor: repaired a bug by which the VowelEditor wouldn’t start up if an incorrect marks file had previously been specified.
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Mac: use a Cherokee font that distinguishes "ka" and "wo" well.
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• OTMulti: vertical constraint names support newlines and disharmonies.
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Text windows are one tab plus 84.5 characters wide.
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Table: <b>Get all values in column...</b>.
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Undocumented alpha support for Praat notebooks.
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Formulas: <a href="_correlation_.html"><b><code><font size=+1>correlation</font></code></b></a> (<i><code><font size=+1>vec1#</font></code></i>, <i><code><font size=+1>vec2#</font></code></i>), <a href="_vertical-S_.html"><b><code><font size=+1>vertical$</font></code></b></a> (for formatting string arrays).
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Scripting: <a href="_readFile-H_.html"><b><code><font size=+1>readFile#</font></code></b></a>, <a href="_readFile-H-H_.html"><b><code><font size=+1>readFile##</font></code></b></a>.
-</dl>
-<p>
-<b>6.3.10</b> (3 May 2023)</p>
-<dl>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Windows: repaired a bug by which key strokes would no longer go to the Demo window after a pause window with no text fields was closed.
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Repaired a bug in the VowelEditor by which it would crash when starting up if fewer than 4 numbers had been set in the “Extra formant–bandwidth pairs” field.
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• FormantPathEditor improvements.
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Undocumented alpha support for Praat notebooks.
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Scripting: vector literals can be indexed.
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Better interactions between editor scripts and pause windows.
-</dl>
-<p>
-<b>6.3.09</b> (2 March 2023)</p>
-<dl>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• SpeechSynthesizer can do eSpeak’s grapheme-to-phoneme conversion in 130 languages.
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• FormantPath can now have time stretches that are not aligned to frame boundaries.
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Stabler handling of edge cases in editor scripting.
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Corrected an at least 23-year-old bug by which menu titles could not be greyed out on Windows.
-</dl>
-<p>
-<b>6.3.08</b> (10 February 2023)</p>
-<dl>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Corrected a bug introduced in 6.3.04 by which <code><font size=+1>word</font></code> and <code><font size=+1>sentence</font></code> would not work in new-style script forms.
-</dl>
-<p>
-<b>6.3.07</b> (6 February 2023)</p>
-<dl>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Corrected an old bug that caused <b>Matrix: Draw as squares</b> to crash on a 1×1 matrix.
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• NoulliGrid window: “NoulliGrid” menu.
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Scripting: faster vectors in arguments to <code><font size=+1>runScript()</font></code>.
-</dl>
-<p>
-<b>6.3.06</b> (31 January 2023)</p>
-<dl>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Corrected a bug introduced in 6.3.04 by which <code><font size=+1>optionmenu</font></code> would not work in new-style script forms.
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Scripting: <code><font size=+1>min()</font></code>, <code><font size=+1>max()</font></code>, <code><font size=+1>imin()</font></code> and <code><font size=+1>imax()</font></code> for vectors.
-</dl>
-<p>
-<b>6.3.05</b> (27 January 2023)</p>
-<dl>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Corrected a bug introduced in 6.3.04 by which some old-style forms could not be read.
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Repaired an old bug by which <code><font size=+1>chooseReadString$()</font></code> could crash on Linux.
-</dl>
-<p>
-<b>6.3.04</b> (24 January 2023)</p>
-<dl>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Playing multiple sounds with <b>Play</b> now concatenates them without breaks, and is interruptable by the Escape key.
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Renamed the remaining occurrences of <b>Preferences</b> to <b>Settings</b> (old scripts will continue to work).
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• <b>Create Polygon from values...</b>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• <b>Sound: To Sound (derivative)...</b>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Scripting: forms now look more like other commands.
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Scripting: forms can contain <code><font size=+1>infile</font></code>, <code><font size=+1>outfile</font></code>, <code><font size=+1>folder</font></code>, <code><font size=+1>realvector</font></code>, <code><font size=+1>positivevector</font></code>, <code><font size=+1>integervector</font></code> and <code><font size=+1>naturalvector</font></code> fields.
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Scripting: in forms and pause forms, you can now set the number of lines in <code><font size=+1>text</font></code>, <code><font size=+1>infile</font></code>, <code><font size=+1>outfile</font></code>, <code><font size=+1>folder</font></code>, and vector fields.
-</dl>
-<p>
-<b>6.3.03</b> (17 December 2022)</p>
-<dl>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Sound files: read Kay® Nasometer™ files (as separate channels).
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Script window: indent and exdent.
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Scripting: conserve editor environment in <code><font size=+1>runScript</font></code>.
-</dl>
-<p>
-<b>6.3.02</b> (29 November 2022)</p>
-<dl>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Linux: corrected a bug introduced in 6.2.20 by which typing Tab would not start a Sound.
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Sound window: corrected a bug introduced in 6.2.19 by which drawing selection hairs could not be switched off (or on) when painting a spectrogram to the Picture window.
-</dl>
-<p>
-<b>6.3.01</b> (21 November 2022)</p>
-<dl>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• Fixed a crash introduced in 6.3 when closing an editor window by choosing <b>Close</b> (or by typing Command-W).
-</dl>
-<h3>
-What used to be new?</h3>
-<dl>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• <a href="What_was_new_in_6_3_.html">What was new in 6.3?</a>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• <a href="What_was_new_in_6_2_.html">What was new in 6.2?</a>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• <a href="What_was_new_in_6_1_.html">What was new in 6.1?</a>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• <a href="What_was_new_in_6_0_.html">What was new in 6.0?</a>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• <a href="What_was_new_in_5_4_.html">What was new in 5.4?</a>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• <a href="What_was_new_in_5_3_.html">What was new in 5.3?</a>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• <a href="What_was_new_in_5_2_.html">What was new in 5.2?</a>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• <a href="What_was_new_in_5_1_.html">What was new in 5.1?</a>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• <a href="What_was_new_in_5_0_.html">What was new in 5.0?</a>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• <a href="What_was_new_in_4_6_.html">What was new in 4.6?</a>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• <a href="What_was_new_in_4_5_.html">What was new in 4.5?</a>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• <a href="What_was_new_in_4_4_.html">What was new in 4.4?</a>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• <a href="What_was_new_in_4_3_.html">What was new in 4.3?</a>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• <a href="What_was_new_in_4_2_.html">What was new in 4.2?</a>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• <a href="What_was_new_in_4_1_.html">What was new in 4.1?</a>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• <a href="What_was_new_in_4_0_.html">What was new in 4.0?</a>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• <a href="What_was_new_in_3_9_.html">What was new in 3.9?</a>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• <a href="What_was_new_in_3_8_.html">What was new in 3.8?</a>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• <a href="What_was_new_in_3_7_.html">What was new in 3.7?</a>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• <a href="What_was_new_in_3_6_.html">What was new in 3.6?</a>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• <a href="What_was_new_in_3_5_.html">What was new in 3.5?</a>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• <a href="What_was_new_in_3_3_.html">What was new in 3.3?</a>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• <a href="What_was_new_in_3_2_.html">What was new in 3.2?</a>
-<dd style="position:relative;left:1em;text-indent:-2em;">
-• <a href="What_was_new_in_3_1_.html">What was new in 3.1?</a>
-</dl>
-<hr>
-<address>
- <p>© Paul Boersma 1995–2023</p>
-</address>
-</body>
-</html>
=====================================
debian/changelog
=====================================
@@ -1,3 +1,17 @@
+praat (6.3.19+dfsg-1) unstable; urgency=medium
+
+ * New upstream version 6.3.19+dfsg
+ * New scheme for obtaining the upstream changelog
+ + d/What_s_new_.html: Drop file
+ + d/rules: Replace the target for getting the What_s_new_.html
+ file from the Praat website by a code for extracting it from file
+ fon/manual_whatsnew.cpp
+ + d/clean: Include d/what-is-new in the list of files to remove
+ + d/s/lintian-overrides: Drop override fior source-is-missing related
+ to d/What_s_new_.html
+
+ -- Rafael Laboissière <rafael at debian.org> Tue, 24 Oct 2023 13:16:03 -0300
+
praat (6.3.18+dfsg-2) unstable; urgency=medium
* Avoid FTBFS on i386
=====================================
debian/clean
=====================================
@@ -18,6 +18,7 @@ test/sys/kanweg.eps
makefile.defs
debian/praat.dirs
debian/praat.install
+debian/what-is-new
praat_nogui
praat.1
praat_nogui.1
=====================================
debian/rules
=====================================
@@ -26,13 +26,6 @@ endif
%:
dh $@ --with=python3
-get-upstream-changelog:
- # Get upstream changelog (in HTML format) and replace some characters
- # for correct display in the final ASCII file
- ( cd debian ; \
- wget -N http://www.fon.hum.uva.nl/praat/manual/What_s_new_.html ; \
- perl -pi -e "s/ˈ/'/g;s/ˌ/,/g;" What_s_new_.html )
-
clean:
dh clean
# Fix the lacking cleaning command for the main/ directory
@@ -67,8 +60,9 @@ override_dh_auto_build: praat.1 praat_nogui.1 praat-open-files.1
dh_auto_build
override_dh_auto_install:
- # Install the upstream changelog
- dh_installchangelogs debian/What_s_new_.html
+ # Build and install the upstream changelog
+ sed -n '/^R"~~~(/,/^)~~~"/{/^R"~~~(/!{/^)~~~"/!p}}' fon/manual_whatsnew.cpp > debian/what-is-new
+ dh_installchangelogs debian/what-is-new
dh_auto_install -- INSTALL=
ifeq (,$(filter $(DEB_HOST_ARCH),armel armhf mipsel))
=====================================
debian/source/lintian-overrides
=====================================
@@ -6,6 +6,3 @@ praat source: source-is-missing [generate/Unicode/gen-unicode-ctype.c.html]
# The desktop entry has been forwarded upstream:
# https://github.com/praat/praat/pull/2065
praat source: maintainer-desktop-entry [debian/praat-file.desktop]
-
-# The upstream ChangeLog is only available in HTML format.
-praat source: source-is-missing [debian/What_s_new_.html]
\ No newline at end of file
=====================================
fon/manual_whatsnew.cpp
=====================================
@@ -29,6 +29,10 @@ R"~~~(
Latest changes in Praat.
+##6.3.19# (20 October 2023)
+• MacOS: resolved a crash when Praat started up on macOS 12 or older
+ (worked around a bug in the Xcode linker that comes with macOS 14 Sonoma).
+
##6.3.18# (8 October 2023)
• @SpeechSynthesizer: included the new version of eSpeak (development 1.52), which has 133 languages.
• @@Add to menu...@: you can now add separators, headers and indented submenus to menus in editor windows.
=====================================
sys/GuiControl.cpp
=====================================
@@ -1,6 +1,6 @@
/* GuiControl.cpp
*
- * Copyright (C) 1993-2012,2013,2015,2017,2020,2021 Paul Boersma,
+ * Copyright (C) 1993-2012,2013,2015,2017,2020,2021,2023 Paul Boersma,
* 2008 Stefan de Koninck, 2010 Franz Brausse, 2013 Tom Naughton
*
* This code is free software; you can redistribute it and/or modify
@@ -43,7 +43,7 @@ void structGuiControl :: v_positionInForm (GuiObject widget, int left, int right
//parentHeight = parent -> d_top;
if (left < 0) left += parentWidth;
if (right <= 0) right += parentWidth;
- if (top < 0) top += parentHeight;
+ if (top < 0) top += parentHeight;
if (bottom <= 0) bottom += parentHeight;
trace (U"fixed: parent width ", parentWidth, U" height ", parentHeight);
gtk_widget_set_size_request (GTK_WIDGET (widget), right - left, bottom - top);
@@ -73,28 +73,26 @@ void structGuiControl :: v_positionInForm (GuiObject widget, int left, int right
XtVaSetValues (widget, XmNbottomAttachment, XmATTACH_FORM, XmNbottomOffset, - bottom, XmNheight, bottom - top, nullptr);
}
#elif cocoa
- NSView *superView = (NSView *) parent -> d_widget;
- NSView *widgetView = (NSView *) widget;
+ NSView *superView = (NSView *) parent -> d_widget;
+ NSView *widgetView = (NSView *) widget;
NSRect parentRect = [superView frame];
- int parentWidth = parentRect.size.width;
- int parentHeight = parentRect.size.height;
-
- NSUInteger horizMask = 0;
- if (left >= 0) {
- if (right <= 0) {
- horizMask = NSViewWidthSizable;
- }
- } else {
- horizMask = NSViewMinXMargin;
- }
-
- NSUInteger vertMask = 0;
- if (top >= 0) {
- vertMask = NSViewMinYMargin;
- if (bottom <= 0) {
- vertMask = NSViewHeightSizable;
- }
- }
+ int parentWidth = parentRect.size.width;
+ int parentHeight = parentRect.size.height;
+
+ NSUInteger horizMask = 0;
+ if (left >= 0) {
+ if (right <= 0)
+ horizMask = NSViewWidthSizable;
+ } else {
+ horizMask = NSViewMinXMargin;
+ }
+
+ NSUInteger vertMask = 0;
+ if (top >= 0) {
+ vertMask = NSViewMinYMargin;
+ if (bottom <= 0)
+ vertMask = NSViewHeightSizable;
+ }
if (left < 0) left += parentWidth;
if (right <= 0) right += parentWidth;
@@ -102,8 +100,8 @@ void structGuiControl :: v_positionInForm (GuiObject widget, int left, int right
if (bottom <= 0) bottom += parentHeight;
top = parentHeight - top; // flip
bottom = parentHeight - bottom; // flip
- int width = right - left;
- int height = top - bottom;
+ int width = right - left;
+ int height = top - bottom;
if ([widgetView isKindOfClass: [NSButton class]]) {
if (! [widgetView isKindOfClass: [NSPopUpButton class]]) {
/*
@@ -116,10 +114,11 @@ void structGuiControl :: v_positionInForm (GuiObject widget, int left, int right
height += 5;
}
}
- NSRect rect = NSMakeRect (left, bottom, width, height);
- [widgetView setAutoresizingMask: horizMask | vertMask];
- [superView addSubview: widgetView]; // parent will retain the subview...
- [widgetView setFrame: rect];
+ NSRect rect = NSMakeRect (left, bottom, width, height);
+ [widgetView setAutoresizingMask: horizMask | vertMask];
+ [superView addSubview: widgetView]; // parent will retain the subview...
+ [widgetView setFrame: rect];
+ [widgetView setClipsToBounds: true]; // 20231019: seems to be needed from SDK 14.0
[widgetView release]; // ... so we can release the item already
#endif
}
=====================================
sys/praat_version.h
=====================================
@@ -1,5 +1,5 @@
-#define PRAAT_VERSION_STR 6.3.18
-#define PRAAT_VERSION_NUM 6318
+#define PRAAT_VERSION_STR 6.3.19
+#define PRAAT_VERSION_NUM 6319
#define PRAAT_YEAR 2023
#define PRAAT_MONTH October
-#define PRAAT_DAY 8
+#define PRAAT_DAY 20
View it on GitLab: https://salsa.debian.org/med-team/praat/-/compare/0727e670999afcfe8260ecdea7e47c899df9080e...fe1a872377351366bcbb33f33317ee34c63b5da8
--
View it on GitLab: https://salsa.debian.org/med-team/praat/-/compare/0727e670999afcfe8260ecdea7e47c899df9080e...fe1a872377351366bcbb33f33317ee34c63b5da8
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/20231024/c64f1272/attachment-0001.htm>
More information about the debian-med-commit
mailing list