swish/commit
Update for HTML cells
author | Jan Wielemaker |
---|---|
Mon May 2 16:43:30 2016 +0200 | |
committer | Jan Wielemaker |
Mon May 2 16:43:30 2016 +0200 | |
commit | 801e9128b70f9545cca1591a9b88a801e37f759c |
tree | 6b16c4adf078b731dc2ca1fc3b62318a14ec0d36 |
parent | 915f29c90f749195dab9ed41fefadaee6d071101 |
Diff style: patch stat
diff --git a/Makefile b/Makefile index 0e01c8f..2178c4b 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,10 @@ # Create a ClioPatria SWISH package from the SWISH distribution. FONTDIR=web/bower_components/bootstrap/dist/fonts -DIRS=lib/swish lib/swish/render web/icons web/help client $(FONTDIR) +DIRS=lib/swish lib/swish/render web/icons web/help client $(FONTDIR) \ + web/bower_components/codemirror/mode/htmlmixed \ + web/bower_components/codemirror/mode/css \ + web/bower_components/codemirror/mode/javascript SWISHLIB=storage.pl page.pl help.pl examples.pl config.pl gitty.pl \ highlight.pl render.pl template_hint.pl search.pl form.pl \ include.pl swish_csv.pl logging.pl trace.pl markdown.pl \ @@ -26,9 +29,13 @@ CLIENTFILES=swish-ask.sh README.md sin-table.html CLIENTS=$(addprefix client/, $(CLIENTFILES)) EXAMPLESFILES=render_c3.swinb render_graphviz.swinb EXAMPLES=$(addprefix examples/, $(EXAMPLESFILES)) +CMFILES=mode/htmlmixed/htmlmixed.js \ + mode/javascript/javascript.js \ + mode/css/css.js +CM=$(addprefix web/bower_components/codemirror/, $(CMFILES)) all: $(DIRS) $(LIBS) $(JS) $(CSS) $(ICONS) $(HELP) $(FONTS) $(CLIENTS) \ - $(EXAMPLES) + $(CM) $(EXAMPLES) $(DIRS): mkdir -p $@ @@ -63,5 +70,8 @@ examples/%: src/examples/% $(FONTDIR)/%: src/$(FONTDIR)/% rsync -u $< $@ +web/bower_components/codemirror/%: src/web/bower_components/codemirror/% + rsync -u $< $@ + clean:: rm -f $(LIBS) $(JS) $(CSS) $(ICONS) $(HELP) diff --git a/applications/swish.pl b/applications/swish.pl index 04bbb6d..3dc7d92 100644 --- a/applications/swish.pl +++ b/applications/swish.pl @@ -95,6 +95,8 @@ user:file_search_path(render, library(swish/render)). % - ping % Ping pengine status every N seconds. Updates sparkline % chart with stack usage. +% - nb_eval_script +% Evaluate scripts in HTML cells of notebooks? swish_config:config(show_beware, false). swish_config:config(tabled_results, true). @@ -102,6 +104,7 @@ swish_config:config(application, swish). swish_config:config(csv_formats, [rdf, prolog]). swish_config:config(public_access, true). swish_config:config(ping, 10). +swish_config:config(notebook, _{eval_script: true}). %% swish_config:source_alias(Alias, Options) is nondet. %