Commit ee48b250 authored by Jonathan Wilkes's avatar Jonathan Wilkes

Merge branch 'aggraef/purr-data-about-patch'

parents 3dd4df1f a20ec302
Pipeline #783 passed with stage
in 180 minutes and 12 seconds
#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 \;;
......@@ -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, {
......
......@@ -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, {
......
......@@ -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
......
......@@ -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)
......
......@@ -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"; \
......
......@@ -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 ; \
......
......@@ -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);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment