diff --git a/2bld.sh b/2bld.sh index c4bc230bf..b432c3a9d 100755 --- a/2bld.sh +++ b/2bld.sh @@ -11,7 +11,7 @@ mkdir -p tmp/tw2 node ./tiddlywiki.js \ editions/tw5.com \ --verbose \ - --savetiddler TiddlyWiki2ReadMe editions/tw2/readme.md text/html \ + --rendertiddler TiddlyWiki2ReadMe editions/tw2/readme.md text/html \ || exit 1 # cook the TiddlyWiki 2.x.x index file @@ -20,7 +20,7 @@ node ./tiddlywiki.js \ editions/tw2 \ --verbose \ --load editions/tw2/source/tiddlywiki.com/index.html.recipe \ - --savetiddler $:/core/templates/tiddlywiki2.template.html ./tmp/tw2/index.html text/plain \ + --rendertiddler $:/core/templates/tiddlywiki2.template.html ./tmp/tw2/index.html text/plain \ || exit 1 opendiff tmp/tw2/index.html editions/tw2/target/index.2.6.5.html diff --git a/bld.sh b/bld.sh index 5b63e5466..94b9092d0 100755 --- a/bld.sh +++ b/bld.sh @@ -35,12 +35,12 @@ rm $TW5_BUILD_OUTPUT/static/* node ./tiddlywiki.js \ ./editions/tw5.com \ --verbose \ - --savetiddler ReadMe ./readme.md text/html \ - --savetiddler ContributingTemplate ./contributing.md text/html \ - --savetiddler $:/core/templates/tiddlywiki5.template.html $TW5_BUILD_OUTPUT/index.html text/plain \ - --savetiddler $:/core/templates/static.template.html $TW5_BUILD_OUTPUT/static.html text/plain \ - --savetiddler $:/core/templates/static.template.css $TW5_BUILD_OUTPUT/static/static.css text/plain \ - --savetiddlers [!is[system]] $:/core/templates/static.tiddler.html $TW5_BUILD_OUTPUT/static text/plain \ + --rendertiddler ReadMe ./readme.md text/html \ + --rendertiddler ContributingTemplate ./contributing.md text/html \ + --rendertiddler $:/core/templates/tiddlywiki5.template.html $TW5_BUILD_OUTPUT/index.html text/plain \ + --rendertiddler $:/core/templates/static.template.html $TW5_BUILD_OUTPUT/static.html text/plain \ + --rendertiddler $:/core/templates/static.template.css $TW5_BUILD_OUTPUT/static/static.css text/plain \ + --rendertiddlers [!is[system]] $:/core/templates/static.tiddler.html $TW5_BUILD_OUTPUT/static text/plain \ || exit 1 # Second, encrypted.html: a version of the main file encrypted with the password "password" @@ -49,7 +49,7 @@ node ./tiddlywiki.js \ ./editions/tw5.com \ --verbose \ --password password \ - --savetiddler $:/core/templates/tiddlywiki5.template.html $TW5_BUILD_OUTPUT/encrypted.html text/plain \ + --rendertiddler $:/core/templates/tiddlywiki5.template.html $TW5_BUILD_OUTPUT/encrypted.html text/plain \ || exit 1 # Third, empty.html: empty wiki for reuse @@ -57,7 +57,7 @@ node ./tiddlywiki.js \ node ./tiddlywiki.js \ ./editions/empty \ --verbose \ - --savetiddler $:/core/templates/tiddlywiki5.template.html $TW5_BUILD_OUTPUT/empty.html text/plain \ + --rendertiddler $:/core/templates/tiddlywiki5.template.html $TW5_BUILD_OUTPUT/empty.html text/plain \ || exit 1 # Fourth, tahoelafs.html: empty wiki with plugin for Tahoe-LAFS @@ -65,7 +65,7 @@ node ./tiddlywiki.js \ node ./tiddlywiki.js \ ./editions/tahoelafs \ --verbose \ - --savetiddler $:/core/templates/tiddlywiki5.template.html $TW5_BUILD_OUTPUT/tahoelafs.html text/plain \ + --rendertiddler $:/core/templates/tiddlywiki5.template.html $TW5_BUILD_OUTPUT/tahoelafs.html text/plain \ || exit 1 # Fifth, d3demo.html: wiki to demo d3 plugin @@ -73,7 +73,7 @@ node ./tiddlywiki.js \ node ./tiddlywiki.js \ ./editions/d3demo \ --verbose \ - --savetiddler $:/core/templates/tiddlywiki5.template.html $TW5_BUILD_OUTPUT/d3demo.html text/plain \ + --rendertiddler $:/core/templates/tiddlywiki5.template.html $TW5_BUILD_OUTPUT/d3demo.html text/plain \ || exit 1 # Sixth, run the test edition to run the node.js tests and to generate test.html for tests in the browser diff --git a/core/modules/commands/savetiddler.js b/core/modules/commands/savetiddler.js index d58b71b4a..b63d9855d 100644 --- a/core/modules/commands/savetiddler.js +++ b/core/modules/commands/savetiddler.js @@ -1,9 +1,9 @@ /*\ -title: $:/core/modules/commands/savetiddler.js +title: $:/core/modules/commands/rendertiddler.js type: application/javascript module-type: command -Command to save a tiddler to a file +Command to render a tiddler and save it to a file \*/ (function(){ @@ -13,7 +13,7 @@ Command to save a tiddler to a file "use strict"; exports.info = { - name: "savetiddler", + name: "rendertiddler", synchronous: false }; diff --git a/core/modules/commands/savetiddlers.js b/core/modules/commands/savetiddlers.js index 297e06ab2..1bb1fa448 100644 --- a/core/modules/commands/savetiddlers.js +++ b/core/modules/commands/savetiddlers.js @@ -1,9 +1,9 @@ /*\ -title: $:/core/modules/commands/savetiddlers.js +title: $:/core/modules/commands/rendertiddlers.js type: application/javascript module-type: command -Command to save several tiddlers to a file +Command to render several tiddlers to a folder of files \*/ (function(){ @@ -13,7 +13,7 @@ Command to save several tiddlers to a file "use strict"; exports.info = { - name: "savetiddlers", + name: "rendertiddlers", synchronous: true }; diff --git a/editions/tw5.com/tiddlers/commands/SaveTiddlerCommand.tid b/editions/tw5.com/tiddlers/commands/SaveTiddlerCommand.tid index 2d2ddcc95..1eb321d8e 100644 --- a/editions/tw5.com/tiddlers/commands/SaveTiddlerCommand.tid +++ b/editions/tw5.com/tiddlers/commands/SaveTiddlerCommand.tid @@ -1,8 +1,8 @@ -title: SaveTiddlerCommand +title: RenderTiddlerCommand tags: docs command -Save an individual tiddler as a specified ContentType, defaults to `text/html` +Render an individual tiddler as a specified ContentType, defaults to `text/html` and save it to the specified filename ``` ---savetiddler
-
-SaveTiddlerCommand
+
+RenderTiddlerCommand
-Save an individual tiddler as a specified
+Render an individual tiddler as a specified
ContentType, defaults to
-text/html
---savetiddler <title> <filename> [<type>]
+text/html and save it to the specified filename
+--rendertiddler <title> <filename> [<type>]
-
-SaveTiddlersCommand
+
+RenderTiddlersCommand
-Save a set of tiddlers matching a filter as separate files of a specified
+Render a set of tiddlers matching a filter to separate files of a specified
ContentType (defaults to
text/html
) and extension (defaults to
.html
).
---savetiddlers <filter> <template> <pathname> [<type>] [<extension>]
+--rendertiddlers <filter> <template> <pathname> [<type>] [<extension>]
For example:
---savetiddlers [!is[system]] $:/core/templates/static.tiddler.html ./static text/plain
+--rendertiddlers [!is[system]] $:/core/templates/static.tiddler.html ./static text/plain
diff --git a/test.sh b/test.sh
index cf168ffe9..c610fd130 100755
--- a/test.sh
+++ b/test.sh
@@ -20,6 +20,6 @@ echo "Using TW5_BUILD_OUTPUT as [$TW5_BUILD_OUTPUT]"
node ./tiddlywiki.js \
./editions/test \
--verbose \
- --savetiddler $:/core/templates/tiddlywiki5.template.html $TW5_BUILD_OUTPUT/test.html text/plain \
+ --rendertiddler $:/core/templates/tiddlywiki5.template.html $TW5_BUILD_OUTPUT/test.html text/plain \
|| exit 1
diff --git a/wbld.sh b/wbld.sh
index e87e6ccaf..9d685fa16 100755
--- a/wbld.sh
+++ b/wbld.sh
@@ -15,7 +15,7 @@ mkdir -p tmp
node ./tiddlywiki.js \
editions/tw5tiddlyweb \
--verbose \
- --savetiddler $:/core/templates/tiddlywiki5.template.html tmp/tiddlyweb.html text/plain \
+ --rendertiddler $:/core/templates/tiddlywiki5.template.html tmp/tiddlyweb.html text/plain \
|| exit 1
# Prepend the type information that TiddlyWeb needs to turn the .html file into a .tid file