diff --git a/doc/1.manual/x1.htm b/doc/1.manual/x1.htm
index f1f884d1d30366112c7ae3d882786e4ccdff091e..00fa7da13d2dc85b5a8387c7d960b1b889fe5c15 100644
--- a/doc/1.manual/x1.htm
+++ b/doc/1.manual/x1.htm
@@ -73,7 +73,7 @@ To get started writing your own C extensions, refer to chapter 4 of this manual.
<P> There is a new Pd community web site,
<a href="http://www.pure-data.info/"> pure-data.info</a>, which aims to be the
central resource for Pd, from documentation and
-downloads; to forums, member pages, a patch exchange.
+downloads; to forums, member pages, and a patch exchange.
<P> There is a growing number of Pd-related projects hosted at
<A HREF="http://pure-data.sf.net">SourceForge</A>. This is open to all Pd
diff --git a/doc/1.manual/x2.htm b/doc/1.manual/x2.htm
index 9879078eb83b530a619acbf78b9116d961b73388..05b4d84b009b09c98410ad70df7f12530d0d3fec 100644
--- a/doc/1.manual/x2.htm
+++ b/doc/1.manual/x2.htm
@@ -110,7 +110,7 @@ In this case the object will be the kind that carries out addition,
and the "13" initializes the amount to add.
<P> Atoms are either numbers or <I>
-symbols </I> like "+". Anything that is not a valid number os considered a
+symbols </I> like "+". Anything that is not a valid number is considered a
symbol. Valid numbers may or may not have a decimal point (for instance, 12,
15.6, -.456), or may be
written in exponential notation (such as "4.5e6", which means "4.5 multiplied
diff --git a/doc/1.manual/x5.htm b/doc/1.manual/x5.htm
index 671d967d92d7ab90a4ce75c2c4ee87d459cac7ec..c07d48ddd02f72070615a0876fd9845be5a161bb 100644
--- a/doc/1.manual/x5.htm
+++ b/doc/1.manual/x5.htm
@@ -20,7 +20,32 @@
<H3> <A name="s2"> 5.1. release notes </A> </H3>
-<P> ------------------ 0.42.1 ---------------------------
+<P> ------------------ 0.42-5 ---------------------------
+
+<P> broken abs~ and log~ fixed
+
+<P> pd~ -ninsig 0 hang fixed
+
+<P> testtone updated and 16ch version added
+
+<P> lrshift~ bug fix
+
+<P> 32 channel limit removed for portaudio (ASIO/Windows and Mac)
+
+<P> ------------------ 0.42-4 ---------------------------
+
+<P> added -noautopatch startup argument to defeat auto-connecting to
+new objects (some folks like it and others hate it)
+
+<P> gfxstub bug fix
+
+<P> fixed crash on deleting "s" objects with no args
+
+<P> re-fixed seteuid(0 problem
+
+<P> fixed crash on "find $1" (still not useful though)
+
+<P> ------------------ 0.42.1-3 ---------------------------
<P> Bug fix on Windows(cancelling window close deactivated window).
diff --git a/doc/6.externs/makefile b/doc/6.externs/makefile
index 8a5657fea32dc41375e42c0fdcc7013b8b8aa374..5f78fb1d32161c16fce9086807cc20cf0150c51a 100644
--- a/doc/6.externs/makefile
+++ b/doc/6.externs/makefile
@@ -61,7 +61,7 @@ LINUXINCLUDE = -I../../src
.c.pd_linux:
cc $(LINUXCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c
- ld -export_dynamic -shared -o $*.pd_linux $*.o -lc -lm
+ ld -shared -o $*.pd_linux $*.o -lc -lm
strip --strip-unneeded $*.pd_linux
rm $*.o
diff --git a/extra/expr~/makefile b/extra/expr~/makefile
index 2d74ba36b8e4a7efdaf50bdcf9474115a7e10837..4c6481407e601a0afed81ac3be4b69d478b7719f 100644
--- a/extra/expr~/makefile
+++ b/extra/expr~/makefile
@@ -88,7 +88,7 @@ LINUXINCLUDE = -I../../src
$(CC) -g $(LINUXCFLAGS) $(LINUXINCLUDE) -o $*.pd_linux_o -c $*.c
expr.pd_linux: $(LINUXOBJ)
- $(CC) -export_dynamic -shared -o expr.pd_linux $(LINUXOBJ) -lc -lm
+ $(CC) -shared -o expr.pd_linux $(LINUXOBJ) -lc -lm
strip --strip-unneeded expr.pd_linux
expr~.pd_linux: expr.pd_linux
diff --git a/extra/pd~/makefile b/extra/pd~/makefile
index 492c20c289498159a80464fe8da8e1904cab91e0..d069c73dc5ae6db2521c25df751ff5c21b04cec8 100644
--- a/extra/pd~/makefile
+++ b/extra/pd~/makefile
@@ -10,6 +10,6 @@ d_ppc: pdsched.d_ppc
pdsched.pd_linux: pdsched.c
$(CC) $(LINUXCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c
- $(CC) -export_dynamic -shared -o $*.pd_linux $*.o -lc -lm
+ $(CC) -shared -o $*.pd_linux $*.o -lc -lm
strip --strip-unneeded $*.pd_linux
rm -f $*.o
diff --git a/linux/README.txt b/linux/README.txt
index 5111ee6871203bb3aceca6c378360bd5544eefaf..fb8645adccac32b966b5b553a09cd3558cdc613f 100644
--- a/linux/README.txt
+++ b/linux/README.txt
@@ -5,7 +5,11 @@ release checklist
./make-release 0.35-0 or 0.35-test11, etc
rsync -n -avzl --delete /home/msp/pd/doc/1.manual/ \
crca.ucsd.edu:public_html/Pd_documentation
+ copy README.txt to web page
+ mail release notice from ../attic/pd-release
+ git tags (to see existing tags)
+rpm building (inactive)
update rpmspec version number
as root:
rpmbuild -ba rpmspec
@@ -15,15 +19,3 @@ release checklist
/usr/src/redhat/RPMS/i386/pd-0.36-0.i386.rpm
/usr/src/redhat/RPMS/i386/pd-alsa-0.36-0.i386.rpm
copy from /usr/src/redhat/RPMS/i386 and /usr/src/redhat/SRPMS
- scp ~/pd/doc/1.manual/* felix:public_html/Pd_documentation/
- put on web page and on ftp://sdfelix.ucsd.edu/pub/msp
- copy README.txt to web page
- mail release notice from ../attic
-
-announce to:
- pd-announce@iem.kug.ac.at
- http://crca.ucsd.edu/~msp/software.html
-
-less formal:
- http://crca.ucsd.edu/~msp/Software
- http://crca.ucsd.edu/~msp/Software/pd-033TEST7-linux.tar.gz
diff --git a/src/g_editor.c b/src/g_editor.c
index 0fbce41a1b977c61f55cbb5b6978e15d41649311..c0a66d8214e3fdf03c2dbdb9ed0d69ef8fe3b2ac 100644
--- a/src/g_editor.c
+++ b/src/g_editor.c
@@ -2454,9 +2454,9 @@ bad:
(sink? class_getname(pd_class(&sink->g_pd)) : "???"));
}
-#define XTOLERANCE 4
-#define YTOLERANCE 3
-#define NHIST 15
+#define XTOLERANCE 18
+#define YTOLERANCE 17
+#define NHIST 35
/* LATER might have to speed this up */
static void canvas_tidy(t_canvas *x)
@@ -2514,10 +2514,10 @@ static void canvas_tidy(t_canvas *x)
}
}
}
- for (i = 1, besthist = 0, bestdist = 4, ip = histogram + 1;
- i < (NHIST-1); i++, ip++)
+ for (i = 2, besthist = 0, bestdist = 4, ip = histogram + 1;
+ i < (NHIST-2); i++, ip++)
{
- int hit = ip[-1] + 2 * ip[0] + ip[1];
+ int hit = ip[-2] + 2* ip[-1] + 3 * ip[0] + 2* ip[1] + ip[2];
if (hit > besthist)
{
besthist = hit;
diff --git a/src/notes.txt b/src/notes.txt
index 6c98ca0aede03770531f74d0642de4505ae8bc64..0cf0ee618b78bfaefb3b3f15b2fb3fca55addaf5 100644
--- a/src/notes.txt
+++ b/src/notes.txt
@@ -1,10 +1,6 @@
---------------- dolist --------------------
-doc:
-exp~, abs~ fixes
-pd~ -ninsig 0 bug fixed
-
compile on various versions of linux
windows:
modal dialogs confuse watchdog
diff --git a/src/s_audio_jack.c b/src/s_audio_jack.c
index f00e2f134f67d7303f1170959f29d226f7bb3200..990a7a8ccc626d8b24f36b25a3811e09c4d3692a 100644
--- a/src/s_audio_jack.c
+++ b/src/s_audio_jack.c
@@ -13,7 +13,7 @@
#define MAX_CLIENTS 100
-#define NUM_JACK_PORTS 32
+#define NUM_JACK_PORTS 128 /* seems like higher values give bad xrun problems */
#define BUF_JACK 4096
static jack_nframes_t jack_out_max;
#define JACK_OUT_MAX 64