diff --git a/pd/doc/about/about.pd b/pd/doc/about/about.pd new file mode 100644 index 0000000000000000000000000000000000000000..367d9a7cb8dbb5726aa1fcde87e46145df60e3cd --- /dev/null +++ b/pd/doc/about/about.pd @@ -0,0 +1,56 @@ +#N struct cat float x float y; +#N canvas 323 210 525 457 12; +#N canvas 367 202 450 346 version 0; +#X msg 61 51 l2ork_version; +#X obj 61 76 pdinfo; +#X obj 61 26 loadbang; +#X obj 61 101 makefilename Pd-l2ork-%s; +#X msg 61 126 label \$1; +#X obj 61 151 s \$0-about_text; +#X connect 0 0 1 0; +#X connect 1 0 3 0; +#X connect 2 0 0 0; +#X connect 3 0 4 0; +#X connect 4 0 5 0; +#X restore 18 416 pd version; +#X text 18 76 A real-time graphical programming environment for live +interactive computer music \, Pd-l2ork works on Linux \, Macintosh +OSX \, and Microsoft Windows.; +#X text 18 136 Pd is copyrighted \, but is free for you to use for +any reasonable purpose. See the file:; +#X obj 18 172 pddp/pddplink @pd_help/../manuals/Pd/License.html -text +doc/manuals/Pd/License.html; +#X text 18 197 Pd-l2ork offers a rewrite of many of Pd's core routines +for the purpose of improving editor functionality and stability. It +is distributed under the same license as Pd. For additional info see: +; +#X obj 18 265 pddp/pddplink http://l2ork.music.vt.edu/main/; +#X text 18 296 This is Purr Data \, the cross-platform \, JS-based +version of Pd-l2ork. An introduction to Purr Data can be found at: +; +#X obj 18 330 pddp/pddplink https://agraef.github.io/purr-data-intro/ +; +#X text 18 360 Reference documentation for Pd lives in:; +#X obj 18 378 pddp/pddplink @pd_help/../1.manual/index.htm -text doc/1.manual/index.htm +; +#X obj 36 21 cnv 15 432 33 empty \$0-about_text Pd-l2ork 20 12 0 18 +-261139 -1 0; +#N canvas 430 372 450 323 cat 0; +#X obj 16 180 draw sprite ./cat; +#X obj 16 21 struct cat float x float y; +#X obj 16 80 tgl 15 1 empty empty empty 17 7 0 10 -262144 -1 -1 1 1 +; +#X obj 70 125 + 1; +#X obj 16 125 f; +#X obj 70 150 mod 30; +#X floatatom 16 150 5 0 0 0 - - -, f 5; +#X obj 16 100 metro 50; +#X connect 2 0 7 0; +#X connect 3 0 5 0; +#X connect 4 0 3 0; +#X connect 4 0 6 0; +#X connect 5 0 4 1; +#X connect 6 0 0 0; +#X connect 7 0 4 0; +#X restore 454 416 pd cat; +#X scalar cat 383 82 \;; diff --git a/pd/doc/about/cat/CatChar_Walk-South_0000.png b/pd/doc/about/cat/CatChar_Walk-South_0000.png new file mode 100644 index 0000000000000000000000000000000000000000..63a70ea95e849f204f8e5ec03c4575bb09872ede Binary files /dev/null and b/pd/doc/about/cat/CatChar_Walk-South_0000.png differ diff --git a/pd/doc/about/cat/CatChar_Walk-South_0001.png b/pd/doc/about/cat/CatChar_Walk-South_0001.png new file mode 100644 index 0000000000000000000000000000000000000000..422b50281926acc2b6e21108a43f0fd7477f1164 Binary files /dev/null and b/pd/doc/about/cat/CatChar_Walk-South_0001.png differ diff --git a/pd/doc/about/cat/CatChar_Walk-South_0002.png b/pd/doc/about/cat/CatChar_Walk-South_0002.png new file mode 100644 index 0000000000000000000000000000000000000000..c250d73d32221a0084c3dc9e0d41a30f7e296566 Binary files /dev/null and b/pd/doc/about/cat/CatChar_Walk-South_0002.png differ diff --git a/pd/doc/about/cat/CatChar_Walk-South_0003.png b/pd/doc/about/cat/CatChar_Walk-South_0003.png new file mode 100644 index 0000000000000000000000000000000000000000..37490152c4c8a300d786c716996fcc030a27dc51 Binary files /dev/null and b/pd/doc/about/cat/CatChar_Walk-South_0003.png differ diff --git a/pd/doc/about/cat/CatChar_Walk-South_0004.png b/pd/doc/about/cat/CatChar_Walk-South_0004.png new file mode 100644 index 0000000000000000000000000000000000000000..90e93d0829682409d2c3d576ad790d4596ebd5f9 Binary files /dev/null and b/pd/doc/about/cat/CatChar_Walk-South_0004.png differ diff --git a/pd/doc/about/cat/CatChar_Walk-South_0005.png b/pd/doc/about/cat/CatChar_Walk-South_0005.png new file mode 100644 index 0000000000000000000000000000000000000000..d88c8d89d8ef2a858d75ea17590af392204d3e98 Binary files /dev/null and b/pd/doc/about/cat/CatChar_Walk-South_0005.png differ diff --git a/pd/doc/about/cat/CatChar_Walk-South_0006.png b/pd/doc/about/cat/CatChar_Walk-South_0006.png new file mode 100644 index 0000000000000000000000000000000000000000..dc69411b0aa30e7594bacfcbfc1240e04375dce2 Binary files /dev/null and b/pd/doc/about/cat/CatChar_Walk-South_0006.png differ diff --git a/pd/doc/about/cat/CatChar_Walk-South_0007.png b/pd/doc/about/cat/CatChar_Walk-South_0007.png new file mode 100644 index 0000000000000000000000000000000000000000..27a59538820cb87cdfb11cea239154e0158ccdef Binary files /dev/null and b/pd/doc/about/cat/CatChar_Walk-South_0007.png differ diff --git a/pd/doc/about/cat/CatChar_Walk-South_0008.png b/pd/doc/about/cat/CatChar_Walk-South_0008.png new file mode 100644 index 0000000000000000000000000000000000000000..579987b44c4fc877e897e6e280254ac7458d50b7 Binary files /dev/null and b/pd/doc/about/cat/CatChar_Walk-South_0008.png differ diff --git a/pd/doc/about/cat/CatChar_Walk-South_0009.png b/pd/doc/about/cat/CatChar_Walk-South_0009.png new file mode 100644 index 0000000000000000000000000000000000000000..e76cb48a892968de1c37d7db4e5f3e9627ccbdf1 Binary files /dev/null and b/pd/doc/about/cat/CatChar_Walk-South_0009.png differ diff --git a/pd/doc/about/cat/CatChar_Walk-South_0010.png b/pd/doc/about/cat/CatChar_Walk-South_0010.png new file mode 100644 index 0000000000000000000000000000000000000000..b74b9e80310bfda08dd283da503a0dbaa049002b Binary files /dev/null and b/pd/doc/about/cat/CatChar_Walk-South_0010.png differ diff --git a/pd/doc/about/cat/CatChar_Walk-South_0011.png b/pd/doc/about/cat/CatChar_Walk-South_0011.png new file mode 100644 index 0000000000000000000000000000000000000000..3b429dba00a3aca66e5c168b78cefb6665f33d4c Binary files /dev/null and b/pd/doc/about/cat/CatChar_Walk-South_0011.png differ diff --git a/pd/doc/about/cat/CatChar_Walk-South_0012.png b/pd/doc/about/cat/CatChar_Walk-South_0012.png new file mode 100644 index 0000000000000000000000000000000000000000..f92f6ba75c9d02dc80361cae9d30359053ef7016 Binary files /dev/null and b/pd/doc/about/cat/CatChar_Walk-South_0012.png differ diff --git a/pd/doc/about/cat/CatChar_Walk-South_0013.png b/pd/doc/about/cat/CatChar_Walk-South_0013.png new file mode 100644 index 0000000000000000000000000000000000000000..66912148b4a4f9758ecabd2f85435234f09dc743 Binary files /dev/null and b/pd/doc/about/cat/CatChar_Walk-South_0013.png differ diff --git a/pd/doc/about/cat/CatChar_Walk-South_0014.png b/pd/doc/about/cat/CatChar_Walk-South_0014.png new file mode 100644 index 0000000000000000000000000000000000000000..c2eb08b0b2dce7e073ef2be7a9c3e52e203492cd Binary files /dev/null and b/pd/doc/about/cat/CatChar_Walk-South_0014.png differ diff --git a/pd/doc/about/cat/CatChar_Walk-South_0015.png b/pd/doc/about/cat/CatChar_Walk-South_0015.png new file mode 100644 index 0000000000000000000000000000000000000000..f4d8ea8f1b12f55bcd2738d658ce71fcccc6aaf3 Binary files /dev/null and b/pd/doc/about/cat/CatChar_Walk-South_0015.png differ diff --git a/pd/doc/about/cat/CatChar_Walk-South_0016.png b/pd/doc/about/cat/CatChar_Walk-South_0016.png new file mode 100644 index 0000000000000000000000000000000000000000..afaaba75daf54bdc6a5ac4ca4dec439a90be6c9d Binary files /dev/null and b/pd/doc/about/cat/CatChar_Walk-South_0016.png differ diff --git a/pd/doc/about/cat/CatChar_Walk-South_0017.png b/pd/doc/about/cat/CatChar_Walk-South_0017.png new file mode 100644 index 0000000000000000000000000000000000000000..ce3c95bd87ff7d1a96ad434f212f1178ef0c59a2 Binary files /dev/null and b/pd/doc/about/cat/CatChar_Walk-South_0017.png differ diff --git a/pd/doc/about/cat/CatChar_Walk-South_0018.png b/pd/doc/about/cat/CatChar_Walk-South_0018.png new file mode 100644 index 0000000000000000000000000000000000000000..715d246ab5a24e7ece200ab8f7f0bb254a39ee2b Binary files /dev/null and b/pd/doc/about/cat/CatChar_Walk-South_0018.png differ diff --git a/pd/doc/about/cat/CatChar_Walk-South_0019.png b/pd/doc/about/cat/CatChar_Walk-South_0019.png new file mode 100644 index 0000000000000000000000000000000000000000..1f0ac4d7c8afc4ef47e0653cd6406197811ab294 Binary files /dev/null and b/pd/doc/about/cat/CatChar_Walk-South_0019.png differ diff --git a/pd/doc/about/cat/CatChar_Walk-South_0020.png b/pd/doc/about/cat/CatChar_Walk-South_0020.png new file mode 100644 index 0000000000000000000000000000000000000000..44d571458a5a06edc404f25dbf1cb41378d3726b Binary files /dev/null and b/pd/doc/about/cat/CatChar_Walk-South_0020.png differ diff --git a/pd/doc/about/cat/CatChar_Walk-South_0021.png b/pd/doc/about/cat/CatChar_Walk-South_0021.png new file mode 100644 index 0000000000000000000000000000000000000000..123a080f3d476d2376aa47a9d352490861ca9c98 Binary files /dev/null and b/pd/doc/about/cat/CatChar_Walk-South_0021.png differ diff --git a/pd/doc/about/cat/CatChar_Walk-South_0022.png b/pd/doc/about/cat/CatChar_Walk-South_0022.png new file mode 100644 index 0000000000000000000000000000000000000000..275d57566bad534fc6cf741dc2d3706427aa8799 Binary files /dev/null and b/pd/doc/about/cat/CatChar_Walk-South_0022.png differ diff --git a/pd/doc/about/cat/CatChar_Walk-South_0023.png b/pd/doc/about/cat/CatChar_Walk-South_0023.png new file mode 100644 index 0000000000000000000000000000000000000000..852b720f53e6c12c1f6353b8bb194f6b5d6c0694 Binary files /dev/null and b/pd/doc/about/cat/CatChar_Walk-South_0023.png differ diff --git a/pd/doc/about/cat/CatChar_Walk-South_0024.png b/pd/doc/about/cat/CatChar_Walk-South_0024.png new file mode 100644 index 0000000000000000000000000000000000000000..3eee747469ce678da7cfe9b67b25f201e076548a Binary files /dev/null and b/pd/doc/about/cat/CatChar_Walk-South_0024.png differ diff --git a/pd/doc/about/cat/CatChar_Walk-South_0025.png b/pd/doc/about/cat/CatChar_Walk-South_0025.png new file mode 100644 index 0000000000000000000000000000000000000000..1c14f039d612a88f344463fa83beb843b948baa0 Binary files /dev/null and b/pd/doc/about/cat/CatChar_Walk-South_0025.png differ diff --git a/pd/doc/about/cat/CatChar_Walk-South_0026.png b/pd/doc/about/cat/CatChar_Walk-South_0026.png new file mode 100644 index 0000000000000000000000000000000000000000..dc52cb7ce9d577900214b40bbe330636114a8d4f Binary files /dev/null and b/pd/doc/about/cat/CatChar_Walk-South_0026.png differ diff --git a/pd/doc/about/cat/CatChar_Walk-South_0027.png b/pd/doc/about/cat/CatChar_Walk-South_0027.png new file mode 100644 index 0000000000000000000000000000000000000000..e6524cf22f3dc1bc8b2ef0e45f2aba2d92e95270 Binary files /dev/null and b/pd/doc/about/cat/CatChar_Walk-South_0027.png differ diff --git a/pd/doc/about/cat/CatChar_Walk-South_0028.png b/pd/doc/about/cat/CatChar_Walk-South_0028.png new file mode 100644 index 0000000000000000000000000000000000000000..c7711ea4ae72087f9e7a774687e9802eb55efb0f Binary files /dev/null and b/pd/doc/about/cat/CatChar_Walk-South_0028.png differ diff --git a/pd/doc/about/cat/CatChar_Walk-South_0029.png b/pd/doc/about/cat/CatChar_Walk-South_0029.png new file mode 100644 index 0000000000000000000000000000000000000000..98325d6d083a77219165082243117c13c93c2936 Binary files /dev/null and b/pd/doc/about/cat/CatChar_Walk-South_0029.png differ diff --git a/pd/nw/index.js b/pd/nw/index.js index d37a60aaa538c0d5547e35f8e19ec55c4a376c68..67f65ec00f0b851f1a31b4ffd81300b452875854 100644 --- a/pd/nw/index.js +++ b/pd/nw/index.js @@ -695,7 +695,7 @@ function nw_create_pd_window_menus(gui, w) { // Help sub-entries minit(m.help.about, { click: function() { - pdgui.pd_doc_open("doc/1.manual", "1.introduction.txt"); + pdgui.pd_doc_open("doc/about", "about.pd"); } }); minit(m.help.manual, { diff --git a/pd/nw/pd_canvas.js b/pd/nw/pd_canvas.js index 45ed07df97e47bf1e4233ca7bc74bbf24653e89f..f32a0e5fb25ffc905382ed58546924780a26d17e 100644 --- a/pd/nw/pd_canvas.js +++ b/pd/nw/pd_canvas.js @@ -1525,7 +1525,7 @@ function nw_create_patch_window_menus(gui, w, name) { // Help menu minit(m.help.about, { click: function() { - pdgui.pd_doc_open("doc/1.manual", "1.introduction.txt"); + pdgui.pd_doc_open("doc/about", "about.pd"); } }); minit(m.help.manual, { diff --git a/pd/nw/pdgui.js b/pd/nw/pdgui.js index 1761ce49d3c312cc124d3bbffe372bfc235f09b9..f60f21bbbaa03b585d625b5b4afed729bd92ebe2 100644 --- a/pd/nw/pdgui.js +++ b/pd/nw/pdgui.js @@ -3449,7 +3449,7 @@ function gui_drawimage_new(obj_tag, file_path, canvasdir, flags) { } else { i = 0; } - post("no of files: " + i); + //post("no of files: " + i); if (i > 0) { img = new pd_window.Image(); // create an image in the pd_window context diff --git a/pd/src/g_template.c b/pd/src/g_template.c index 47fba711da570481f6d9ef83ece33286b85b59b8..5af435ce9262410cf92a094cabdcbd6d3216d295 100644 --- a/pd/src/g_template.c +++ b/pd/src/g_template.c @@ -7372,7 +7372,7 @@ void drawimage_size(t_drawimage *x, t_float w, t_float h) { x->x_w = w; x->x_h = h; -post("w is %g and h is %g", w, h); + //post("w is %g and h is %g", w, h); } static int drawimage_getindex(void *z, t_template *template, t_word *data) diff --git a/pd/src/makefile.in b/pd/src/makefile.in index 86e73de1e0776819e1c161be29349d4edda5d328..f59b12f730795e5f72fb7bb20f85341d0652a984 100644 --- a/pd/src/makefile.in +++ b/pd/src/makefile.in @@ -199,6 +199,7 @@ install: all done # kludge install of additional pd-l2ork data structures docs cp -rf ../doc/4.data.structures/pd-l2ork $(DESTDIR)$(pddocdir)/4.data.structures/ + cp -rf ../doc/about $(DESTDIR)$(pddocdir)/ # and now the rest for dir in $(shell ls -1 ../doc/7.stuff | grep -v CVS); do \ echo "installing 7.stuff/$$dir"; \ diff --git a/pd/src/makefile.mingw b/pd/src/makefile.mingw index 15cc0529540208c9c8745bcf8c1c7f1903801478..7fb535e18fc1b14a1b844ca0455c579ac0ccafa1 100755 --- a/pd/src/makefile.mingw +++ b/pd/src/makefile.mingw @@ -295,6 +295,7 @@ install: all install -d $(pddocdir)/4.data.structures/pd-l2ork/$$dir ; \ install -p ../doc/4.data.structures/pd-l2ork/$$dir/*.* $(pddocdir)/4.data.structures/pd-l2ork/$$dir ; \ done + cp -rf ../doc/about $(pddocdir)/ for dir in $(shell ls -1 ../doc/7.stuff | grep -v CVS); do \ echo "installing 7.stuff/$$dir"; \ install -d $(pddocdir)/7.stuff/$$dir ; \ diff --git a/pd/src/s_path.c b/pd/src/s_path.c index 8fcde1e2a819e572d6f86bfb084b45a88fdd55ab..5a2b6bdbb858abab1d7af16b29e204b9dc1bd827 100644 --- a/pd/src/s_path.c +++ b/pd/src/s_path.c @@ -163,6 +163,8 @@ void sys_expandpathelems(const char *name, char *result) else if (strstr(name, "@pd_help") != NULL) { t_namelist *path = sys_helppath; + while (path->nl_next) + path = path->nl_next; sys_path_replace(name, interim, "@pd_help", path->nl_string); //fprintf(stderr,"path->nl_string=<%s>\n", path->nl_string); }