Version number update for 5.0.18-beta

This new batch file builds everything needed for a release of
TiddlyWiki.

This is the main part of fixing #823.

bin/bld.cmd

@@ -40,6 +40,15 @@ node .\tiddlywiki.js ^
 	--build favicon empty static index ^
 	|| exit 1
 
+rem dev/: developer material
+
+node .\tiddlywiki.js ^
+	.\editions\dev ^
+	--verbose ^
+	--output %TW5_BUILD_OUTPUT%\dev ^
+	--build index favicon static ^
+	|| exit 1
+
 rem upgrade.html: custom edition for handling upgrades
 
 node .\tiddlywiki.js ^
@@ -118,4 +127,4 @@ echo tiddlywiki.com > %TW5_BUILD_OUTPUT%\CNAME
 
 rem Run the test edition to run the Node.js tests and to generate test.html for tests in the browser
 
-.\test.cmd
+.\bin\test.cmd

bin/bld.sh

@@ -41,6 +41,15 @@ node ./tiddlywiki.js \
 	--build favicon empty static index \
 	|| exit 1
 
+# dev/: developer material
+
+node ./tiddlywiki.js \
+	./editions/dev \
+	--verbose \
+	--output $TW5_BUILD_OUTPUT/dev \
+	--build index favicon static \
+	|| exit 1
+
 # upgrade.html: custom edition for handling upgrades
 
 node ./tiddlywiki.js \
@@ -115,4 +124,4 @@ node ./tiddlywiki.js \
 
 # Run the test edition to run the Node.js tests and to generate test.html for tests in the browser
 
-./test.sh
+./bin/test.sh

bin/devbld.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# Build the dev wiki
+
+# Set up the build output directory
+
+if [  -z "$TW5_BUILD_OUTPUT" ]; then
+    TW5_BUILD_OUTPUT=../jermolene.github.com
+fi
+
+if [  ! -d "$TW5_BUILD_OUTPUT" ]; then
+    echo 'A valid TW5_BUILD_OUTPUT environment variable must be set'
+    exit 1
+fi
+
+echo "Using TW5_BUILD_OUTPUT as [$TW5_BUILD_OUTPUT]"
+
+# Make the CNAME file that GitHub Pages requires
+
+echo "tiddlywiki.com" > $TW5_BUILD_OUTPUT/CNAME
+
+# The tw5.com wiki
+#  index.html: the main file, including content
+
+node ./tiddlywiki.js \
+	./editions/dev \
+	--verbose \
+	--output $TW5_BUILD_OUTPUT/dev \
+	--build index favicon \
+	|| exit 1

bin/fullbld.sh

@@ -0,0 +1,227 @@
+#!/bin/bash
+
+# Perform a full build for tiddlywiki.com
+
+# Set up the build output directory
+
+if [  -z "$TW5_BUILD_OUTPUT" ]; then
+    TW5_BUILD_OUTPUT=../jermolene.github.com
+fi
+
+if [  ! -d "$TW5_BUILD_OUTPUT" ]; then
+    echo 'A valid TW5_BUILD_OUTPUT environment variable must be set'
+    exit 1
+fi
+
+echo "Using TW5_BUILD_OUTPUT as [$TW5_BUILD_OUTPUT]"
+
+# Make the CNAME file that GitHub Pages requires
+
+echo "tiddlywiki.com" > $TW5_BUILD_OUTPUT/CNAME
+
+# Delete any existing static content
+
+mkdir -p $TW5_BUILD_OUTPUT/static
+mkdir -p $TW5_BUILD_OUTPUT/dev
+mkdir -p $TW5_BUILD_OUTPUT/dev/static
+rm $TW5_BUILD_OUTPUT/static/*
+rm $TW5_BUILD_OUTPUT/dev/static/*
+
+# Redirects
+
+echo "<a href='./plugins/tiddlywiki/tw2parser/index.html'>Moved to http://tiddlywiki.com/plugins/tiddlywiki/tw2parser/index.html</a>" > $TW5_BUILD_OUTPUT/classicparserdemo.html
+echo "<a href='./plugins/tiddlywiki/codemirror/index.html'>Moved to http://tiddlywiki.com/plugins/tiddlywiki/codemirror/index.html</a>" > $TW5_BUILD_OUTPUT/codemirrordemo.html
+echo "<a href='./plugins/tiddlywiki/d3/index.html'>Moved to http://tiddlywiki.com/plugins/tiddlywiki/d3/index.html</a>" > $TW5_BUILD_OUTPUT/d3demo.html
+echo "<a href='./plugins/tiddlywiki/highlight/index.html'>Moved to http://tiddlywiki.com/plugins/tiddlywiki/highlight/index.html</a>" > $TW5_BUILD_OUTPUT/highlightdemo.html
+echo "<a href='./plugins/tiddlywiki/markdown/index.html'>Moved to http://tiddlywiki.com/plugins/tiddlywiki/markdown/index.html</a>" > $TW5_BUILD_OUTPUT/markdowndemo.html
+echo "<a href='./plugins/tiddlywiki/tahoelafs/index.html'>Moved to http://tiddlywiki.com/plugins/tiddlywiki/tahoelafs/index.html</a>" > $TW5_BUILD_OUTPUT/tahoelafs.html
+
+######################################################
+#
+# Core distribution
+#
+######################################################
+
+# /index.html			Main site
+# /favicon.ico			Favicon for main site
+# /empty.html			Empty
+# /empty.hta			For Internet Explorer
+# /static.html			Static rendering of default tiddlers
+# /alltiddlers.html		Static rendering of all tiddlers
+# /static/*				Static single tiddlers
+# /static/static.css	Static stylesheet
+# /static/favicon.ico	Favicon for static pages
+node ./tiddlywiki.js \
+	./editions/tw5.com \
+	--verbose \
+	--output . \
+	--build readmes \
+	--output $TW5_BUILD_OUTPUT \
+	--build favicon empty static index \
+	|| exit 1
+
+# /dev/index.html			Developer docs
+# /dev/favicon.ico			Favicon for dev site
+# /dev/static.html			Static rendering of default tiddlers
+# /dev/alltiddlers.html		Static rendering of all tiddlers
+# /dev/static/*				Static single tiddlers
+# /dev/static/static.css	Static stylesheet
+node ./tiddlywiki.js \
+	./editions/dev \
+	--verbose \
+	--output $TW5_BUILD_OUTPUT/dev \
+	--build index favicon static \
+	|| exit 1
+
+# /upgrade.html				Custom edition for performing upgrades
+node ./tiddlywiki.js \
+	./editions/upgrade \
+	--verbose \
+	--output $TW5_BUILD_OUTPUT \
+	--build upgrade \
+	|| exit 1
+
+# /encrypted.html			Copy of the main file encrypted with the password "password"
+node ./tiddlywiki.js \
+	./editions/tw5.com \
+	--verbose \
+	--output $TW5_BUILD_OUTPUT \
+	--build encrypted \
+	|| exit 1
+
+######################################################
+#
+# Plugin demos
+#
+######################################################
+
+# /plugins/tiddlywiki/tahoelafs/index.html	Demo wiki with Tahoe-LAFS plugin
+# /plugins/tiddlywiki/tahoelafs/empty.html	Empty wiki with Tahoe-LAFS plugin
+node ./tiddlywiki.js \
+	./editions/tahoelafs \
+	--verbose \
+	--output $TW5_BUILD_OUTPUT \
+	--rendertiddler $:/core/save/all plugins/tiddlywiki/tahoelafs/index.html text/plain \
+	--rendertiddler $:/core/save/empty plugins/tiddlywiki/tahoelafs/empty.html text/plain \
+	|| exit 1
+
+# /plugins/tiddlywiki/d3/index.html	Demo wiki with D3 plugin
+# /plugins/tiddlywiki/d3/empty.html	Empty wiki with D3 plugin
+node ./tiddlywiki.js \
+	./editions/d3demo \
+	--verbose \
+	--output $TW5_BUILD_OUTPUT \
+	--rendertiddler $:/core/save/all plugins/tiddlywiki/d3/index.html text/plain \
+	--rendertiddler $:/core/save/empty plugins/tiddlywiki/d3/empty.html text/plain \
+	|| exit 1
+
+# /plugins/tiddlywiki/codemirror/index.html	Demo wiki with codemirror plugin
+# /plugins/tiddlywiki/codemirror/empty.html	Empty wiki with codemirror plugin
+node ./tiddlywiki.js \
+	./editions/codemirrordemo \
+	--verbose \
+	--output $TW5_BUILD_OUTPUT \
+	--rendertiddler $:/core/save/all plugins/tiddlywiki/codemirror/index.html text/plain \
+	--rendertiddler $:/core/save/empty plugins/tiddlywiki/codemirror/empty.html text/plain \
+	|| exit 1
+
+# /plugins/tiddlywiki/markdown/index.html		Demo wiki with Markdown plugin
+# /plugins/tiddlywiki/markdown/empty.html		Empty wiki with Markdown plugin
+node ./tiddlywiki.js \
+	./editions/markdowndemo \
+	--verbose \
+	--output $TW5_BUILD_OUTPUT \
+	--rendertiddler $:/core/save/all plugins/tiddlywiki/markdown/index.html text/plain \
+	--rendertiddler $:/core/save/empty plugins/tiddlywiki/markdown/empty.html text/plain \
+	|| exit 1
+
+# /plugins/tiddlywiki/tw2parser/index.html		Demo wiki with tw2parser plugin
+# /plugins/tiddlywiki/tw2parser/empty.html		Empty wiki with tw2parser plugin
+node ./tiddlywiki.js \
+	./editions/classicparserdemo \
+	--verbose \
+	--output $TW5_BUILD_OUTPUT \
+	--rendertiddler $:/core/save/all plugins/tiddlywiki/tw2parser/index.html text/plain \
+	--rendertiddler $:/core/save/empty plugins/tiddlywiki/tw2parser/empty.html text/plain \
+	|| exit 1
+
+# /plugins/tiddlywiki/highlight/index.html		Demo wiki with highlight plugin
+# /plugins/tiddlywiki/highlight/empty.html		Empty wiki with highlight plugin
+node ./tiddlywiki.js \
+	./editions/highlightdemo \
+	--verbose \
+	--output $TW5_BUILD_OUTPUT \
+	--rendertiddler $:/core/save/all plugins/tiddlywiki/highlight/index.html text/plain \
+	--rendertiddler $:/core/save/empty plugins/tiddlywiki/highlight/empty.html text/plain \
+	|| exit 1
+
+######################################################
+#
+# Language editions
+#
+######################################################
+
+# /languages/de-AT/index.html		Demo wiki with de-AT language
+# /languages/de-AT/empty.html		Empty wiki with de-AT language
+node ./tiddlywiki.js \
+	./editions/de-AT \
+	--verbose \
+	--output $TW5_BUILD_OUTPUT \
+	--rendertiddler $:/core/save/all languages/de-AT/index.html text/plain \
+	--rendertiddler $:/core/save/empty languages/de-AT/empty.html text/plain \
+	|| exit 1
+
+# /languages/de-DE/index.html		Demo wiki with de-DE language
+# /languages/de-DE/empty.html		Empty wiki with de-DE language
+node ./tiddlywiki.js \
+	./editions/de-DE \
+	--verbose \
+	--output $TW5_BUILD_OUTPUT \
+	--rendertiddler $:/core/save/all languages/de-DE/index.html text/plain \
+	--rendertiddler $:/core/save/empty languages/de-DE/empty.html text/plain \
+	|| exit 1
+
+# /languages/fr-FR/index.html		Demo wiki with fr-FR language
+# /languages/fr-FR/empty.html		Empty wiki with fr-FR language
+node ./tiddlywiki.js \
+	./editions/fr-FR \
+	--verbose \
+	--output $TW5_BUILD_OUTPUT \
+	--rendertiddler $:/core/save/all languages/fr-FR/index.html text/plain \
+	--rendertiddler $:/core/save/empty languages/fr-FR/empty.html text/plain \
+	|| exit 1
+
+# /languages/zh-Hans/index.html		Demo wiki with zh-Hans language
+# /languages/zh-Hans/empty.html		Empty wiki with zh-Hans language
+node ./tiddlywiki.js \
+	./editions/zh-Hans \
+	--verbose \
+	--output $TW5_BUILD_OUTPUT \
+	--rendertiddler $:/core/save/all languages/zh-Hans/index.html text/plain \
+	--rendertiddler $:/core/save/empty languages/zh-Hans/empty.html text/plain \
+	|| exit 1
+
+# /languages/zh-Hant/index.html		Demo wiki with zh-Hant language
+# /languages/zh-Hant/empty.html		Empty wiki with zh-Hant language
+node ./tiddlywiki.js \
+	./editions/zh-Hant \
+	--verbose \
+	--output $TW5_BUILD_OUTPUT \
+	--rendertiddler $:/core/save/all languages/zh-Hant/index.html text/plain \
+	--rendertiddler $:/core/save/empty languages/zh-Hant/empty.html text/plain \
+	|| exit 1
+
+######################################################
+#
+# Tests
+#
+######################################################
+
+# /test.html			Wiki for running tests in browser
+# Also runs the serverside tests
+node ./tiddlywiki.js \
+	./editions/test \
+	--verbose \
+	--output $TW5_BUILD_OUTPUT \
+	--rendertiddler $:/core/save/all test.html text/plain \
+	|| exit 1

bin/readme.md

@@ -0,0 +1,7 @@
+<h1 class=''>Script Files</h1><p>The <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TiddlyWiki5.html'>TiddlyWiki5</a> repository contains several scripts in the <code>bin</code> folder that are used to build and deploy <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TiddlyWiki.html'>TiddlyWiki</a> (<code>.sh</code> for *nix and <code>.cmd</code> for Windows). They can serve as a useful starting point for your own scripts.</p><p>All the scripts expect to be run from the root folder of the repository.</p><h2 class=''><code>fullbld</code>: builds tw5.com</h2><p>This script builds several variants of <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TiddlyWiki5.html'>TiddlyWiki5</a> for deployment on tiddlywiki.com.</p><p>By default, files are output to a folder called <code>jermolene.github.com</code>, sibling to the <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TiddlyWiki5.html'>TiddlyWiki5</a> repo directory. For example:</p><pre><code>/TiddlyWork/ - Directory for working with TiddlyWiki5
+  |
+  +--+-- /TiddlyWiki5/ - Directory containing the TiddlyWiki5 repo from GitHub
+     |
+     +-- /jermolene.github.com/ - Directory for output files</code></pre><p>You can override the build output directory by defining the environment variable <code>TW5_BUILD_OUTPUT</code>. The easiest way to do this is to create a personal batch file to invoke <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TiddlyWiki5.html'>TiddlyWiki5</a> that first sets the environment variable and then invokes <code>fullbld</code>.</p><p><code>fullbld</code> also runs the <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TiddlyWiki5.html'>TiddlyWiki5</a> Node.js-based test suite (see <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TestingMechanism.html'>TestingMechanism</a>)</p><h2 class=''><code>serve</code>: serves tw5.com</h2><pre><code>./bin/serve.sh -h
+./bin/serve.sh [edition dir] [username] [password] [host] [port]</code></pre><p>Or:</p><pre><code>./bin/serve.cmd -h
+./bin/serve.cmd [edition dir] [username] [password] [host] [port]</code></pre><p>This script starts <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TiddlyWiki5.html'>TiddlyWiki5</a> running as an HTTP server, defaulting to the content from the <code>tw5.com-server</code> edition. By default, the Node.js serves on port 8080. If the optional <code>username</code> parameter is provided, it is used for signing edits. If the <code>password</code> is provided then HTTP basic authentication is used.</p><p>To experiment with this configuration, run the script and then visit <code>http://127.0.0.1:8080</code> in a browser.</p><p>Changes made in the browser propagate to the server over HTTP (use the browser developer console to see these requests). The server then syncs changes to the file system (and logs each change to the screen).</p><h2 class=''><code>test</code>: build and run tests</h2><p>This script runs the <code>test</code> edition of <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TiddlyWiki.html'>TiddlyWiki</a> on the server to perform the server-side tests and to build <code>test.html</code> for running the tests in the browser.</p><h2 class=''><code>lazy</code>: serves tw5.com with lazily loaded images</h2><pre><code>./bin/lazy.sh &lt;username&gt; [&lt;password&gt;]</code></pre><p>Or:</p><pre><code>./bin/lazy.cmd &lt;username&gt; [&lt;password&gt;]</code></pre><p>This script serves the <code>tw5.com-server</code> edition content with <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/LazyLoading.html'>LazyLoading</a> applied to images.</p><h2 class=''><code>wbld</code>: builds <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TiddlyWiki.html'>TiddlyWiki</a> for <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TiddlyWeb.html'>TiddlyWeb</a></h2><p>This script builds and deploys the code for <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TiddlyWiki%2520in%2520the%2520Sky%2520for%2520TiddlyWeb.html'>TiddlyWiki in the Sky for TiddlyWeb</a>. If you want to experiment with your own builds of <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TiddlyWiki5.html'>TiddlyWiki5</a> for <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TiddlyWeb.html'>TiddlyWeb</a> you could use this batch file as a base.</p><h2 class=''><code>2bld</code>: builds <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TiddlyWiki.html'>TiddlyWiki</a> 2.6.5</h2><p>This script builds <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TiddlyWiki.html'>TiddlyWiki</a> 2.6.5 from the original source and then displays the differences between them (<code>diff</code> is used for *nix, <code>fc</code> for Windows).</p><h2 class=''><code>deploy</code> &amp; <code>verbump</code>: deploy <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TiddlyWiki.html'>TiddlyWiki</a> and bump the <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TiddlyWiki.html'>TiddlyWiki</a> version number</h2><p>These scripts are concerned with releasing a new version of <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TiddlyWiki.html'>TiddlyWiki</a>. See <a class='tc-tiddlylink tc-tiddlylink-missing' href='http://tiddlywiki.com/static/Releasing%2520a%2520new%2520version%2520of%2520TiddlyWiki5.html'>Releasing a new version of TiddlyWiki5</a>.</p>

bin/serve.cmd

@@ -0,0 +1,95 @@
+:: This script allows you to serve different TiddlyWiki editions. 
+::
+:: It respects a TW_SERVE_EDITION_PATH environment variable.
+:: If this variable is set it will be used. A command line parameter will overwrite it.
+::
+:: Ensure your server tiddlywiki.info configuration contains
+:: these plugins, otherwise saving is not possible:
+::   - "tiddlywiki/tiddlyweb"
+::   - "tiddlywiki/filesystem"
+
+@echo off
+echo.
+
+:: Help Wanted!! 
+:: If you know how to improve -help and -version handling let us know
+
+if "%1" == "--help" call :help
+if "%1" == "-h" call :help
+
+if "%1" == "--version" call :version
+if "%1" == "-v" call :version
+
+if "%1" == "help" (
+	call :help
+) else (
+	call :main %1 %2 %3 %4 %5
+)
+exit 0
+
+:version
+echo TiddlyWiki serve.cmd script version 0.0.2"
+echo.
+exit 0
+goto:eof
+
+:help
+echo Serve TiddlyWiki over HTTP
+echo.
+echo Optional parameters
+echo  - %%1 .. edition directory	.. full or relative path to edition directory
+echo  - %%2 .. username 		.. for signing edits - can be empty like this: '""'
+echo  - %%3 .. password 		.. can be empty like this: '""'
+echo  - %%4 .. IP address or HOST 	.. defaults to localhost
+echo  - %%5 .. PORT			.. defaults to 8080
+echo.
+echo Example 1 .\serve .\edition\tw5.com-server username
+echo Example 2 .\serve .\edition\tw5.com-server '""' '""' localhost 9090 
+echo .. Example 2 defines: empty username, empty password
+echo.
+echo Help information
+echo  -v, --version		.. shows the script version
+echo  -h, --help, help	.. shows this help information
+echo.
+
+exit 0
+goto:eof
+
+:main
+if [%1] NEQ [] (
+	:: if there is a editions parameter .. use it.
+	set TW_SERVE_EDITION_PATH=%1
+) else (
+	if [%TW_SERVE_EDITION_PATH%] == [] (
+		echo Please provide an edition path as your first parameter or
+		echo define a valid TW_SERVE_EDITION_PATH environment variable.
+		echo.
+		echo Using default edition path 'editions\tw5.com-server' because no environment variable is set
+		echo.
+		set TW_SERVE_EDITION_PATH= editions\tw5.com-server
+	)
+)
+
+:: The editions path must exist!
+if not exist %TW_SERVE_EDITION_PATH%\nul (
+	echo The Path: "%TW_SERVE_EDITION_PATH%" does not exist
+	exit 1
+)
+
+if [%5] == [] (
+	echo Using default port 8080
+	set PORT=8080
+) else (
+	echo Using port %5
+	set PORT=%5
+)
+
+echo Using edition: %TW_SERVE_EDITION_PATH%
+echo.
+
+node .\tiddlywiki.js ^
+	%TW_SERVE_EDITION_PATH% ^
+	--verbose ^
+	--server %PORT% $:/core/save/all text/plain text/html %2 %3 %4^
+	|| exit 1
+goto:eof

bin/serve.sh

@@ -0,0 +1,124 @@
+#!/bin/bash
+#
+# This script allows you to serve different TiddlyWiki editions.
+#
+# It respects a TW_SERVE_EDITION_PATH environment variable.
+# If this variable is set it will be used. A command line parameter will overwrite it.
+#
+# Ensure your server tiddlywiki.info configuration contains
+# these plugins, otherwise saving is not possible:
+#    - "tiddlywiki/tiddlyweb"
+#    - "tiddlywiki/filesystem"
+
+# Global settings
+# set -o nounset	#exit if a variable is not set
+set -o errexit	#exit on error
+
+# Get command name and path info needed for help text
+ARG0=$(basename $0)
+#ARG0DIR=$(dirname $0)
+#[ $ARG0DIR == "." ] && ARG0DIR=$PWD
+
+# ---- helper functions ----
+version () {
+	echo "$ARG0, TiddlyWiki serve script version 0.0.2"
+	echo
+}
+
+usage() {
+	version
+	echo Usage:$'\t'$ARG0 [edition dir] [username] [password] [host] [port]
+	echo
+}
+
+help() {
+	usage
+
+	echo Optional parameters
+	echo
+	echo $'\t'\$1 .. edition directory .. full or relative path to edition directory
+	echo $'\t'\$2 .. username for signing edits - can be empty like this: \"\"
+	echo $'\t'\$3 .. password - can be empty like this: \"\"
+	echo $'\t'\$4 .. IP address or HOST name .. defaults to: localhost
+	echo $'\t'\$5 .. PORT .. defaults to: 8080
+	echo
+	echo $'\t'-v .. Version
+	echo $'\t'-h .. Help
+	echo
+	echo Example 1 ./serve ./edition/tw5.com-server username
+	echo Example 2 ./serve ./edition/tw5.com-server \"\" \"\" localhost 9090
+	echo .. Example 2 defines: empty username, empty password
+	echo
+}
+
+_log () {
+	echo
+	echo "---> $1"
+}
+
+# error handling for wrong parameters
+error() {
+    echo "$ARG0: $*" 1>&2
+    exit 1
+}
+
+# start the server
+serve () {
+	#echo 1:$1 2:$2 3:$3 4:$4 5:$5
+
+	node ./tiddlywiki.js \
+		"$1" \
+		--verbose \
+		--server "$5" $:/core/save/all text/plain text/html "$2" "$3" "$4" \
+		|| exit 1
+}
+
+check_edition_directory () {
+	# The editions directory must exist and should contain a tiddlywiki.info file
+	if [ ! -d $TW_SERVE_EDITION_PATH ]; then
+		_log "Edition directory: '$TW_SERVE_EDITION_PATH' does not exist"
+		exit 1
+	fi
+}
+
+# --------------------------------------------------
+# command line parameter handler
+while getopts vh flag
+do
+    case "$flag" in
+    (h) help; exit 0;;
+    (v) version; exit 0;;
+    (*) help
+		error
+		exit 1;;
+    esac
+done
+shift $(expr $OPTIND - 1)
+
+#----------------------------------------------------
+
+# If no edition parameter is provided, use Jeremy's defaults
+if [ $# -eq 0 ]; then
+	# check if the edition path environment variable is set. If yes use it.
+	[ -z $TW_SERVE_EDITION_PATH ] && TW_SERVE_EDITION_PATH="./editions/tw5.com-server"
+
+	# directory must exist
+	check_edition_directory
+
+	# serve the default settings.
+	serve "$TW_SERVE_EDITION_PATH" "" "" localhost 8080
+else
+	if [ -z "$5" ]; then 
+		PORT=8080 
+	else 
+		PORT=$5
+	fi
+	
+	# If the 1st parameter (edition) is set, it has priority.
+	TW_SERVE_EDITION_PATH=$1
+
+	# directory must exist
+	check_edition_directory
+
+	serve "$TW_SERVE_EDITION_PATH" "$2" "$3" "$4" $PORT
+fi

boot/boot.js

@@ -392,7 +392,14 @@ options: {flags: flags,deserializerType: deserializerType}
 */
 $tw.utils.registerFileType = function(type,encoding,extension,options) {
 	options = options || {};
-	$tw.config.fileExtensionInfo[extension] = {type: type};
+	if($tw.utils.isArray(extension)) {
+		$tw.utils.each(extension,function(extension) {
+			$tw.config.fileExtensionInfo[extension] = {type: type};
+		});
+		extension = extension[0];
+	} else {
+		$tw.config.fileExtensionInfo[extension] = {type: type};
+	}
 	$tw.config.contentTypeInfo[type] = {encoding: encoding, extension: extension, flags: options.flags || [], deserializerType: options.deserializerType || type};
 };
 
@@ -1103,7 +1110,7 @@ $tw.Wiki.prototype.processSafeMode = function() {
 	// Assemble a report tiddler
 	var titleReportTiddler = "TiddlyWiki Safe Mode",
 		report = [];
-	report.push("TiddlyWiki has been started in [[safe mode|http://tiddlywiki.com/static/SafeMode.html]]. Most customisations have been disabled by renaming the following tiddlers:")
+	report.push("TiddlyWiki has been started in [[safe mode|http://tiddlywiki.com/static/SafeMode.html]]. All plugins are temporarily disabled. Most customisations have been disabled by renaming the following tiddlers:")
 	// Delete the overrides
 	overrides.forEach(function(title) {
 		var tiddler = self.getTiddler(title),
@@ -1724,19 +1731,18 @@ $tw.boot.startup = function(options) {
 	$tw.utils.registerFileType("text/vnd.tiddlywiki2-recipe","utf8",".recipe");
 	$tw.utils.registerFileType("text/plain","utf8",".txt");
 	$tw.utils.registerFileType("text/css","utf8",".css");
-	$tw.utils.registerFileType("text/html","utf8",".html");
-	$tw.config.fileExtensionInfo[".htm"] = {type: "text/html"};
-	$tw.config.fileExtensionInfo[".hta"] = {type: "text/html"};
+	$tw.utils.registerFileType("text/html","utf8",[".html",".htm"]);
 	$tw.utils.registerFileType("application/hta","utf16le",".hta",{deserializerType:"text/html"});
 	$tw.utils.registerFileType("application/javascript","utf8",".js");
 	$tw.utils.registerFileType("application/json","utf8",".json");
 	$tw.utils.registerFileType("application/pdf","base64",".pdf",{flags:["image"]});
-	$tw.utils.registerFileType("image/jpeg","base64",".jpg",{flags:["image"]});
+	$tw.utils.registerFileType("image/jpeg","base64",[".jpg",".jpeg"],{flags:["image"]});
 	$tw.utils.registerFileType("image/png","base64",".png",{flags:["image"]});
 	$tw.utils.registerFileType("image/gif","base64",".gif",{flags:["image"]});
 	$tw.utils.registerFileType("image/svg+xml","utf8",".svg",{flags:["image"]});
 	$tw.utils.registerFileType("image/x-icon","base64",".ico",{flags:["image"]});
 	$tw.utils.registerFileType("application/font-woff","base64",".woff");
+	$tw.utils.registerFileType("text/x-markdown","utf8",[".md",".markdown"]);
 	// Create the wiki store for the app
 	$tw.wiki = new $tw.Wiki();
 	// Install built in tiddler fields modules
@@ -1752,7 +1758,7 @@ $tw.boot.startup = function(options) {
 	}
 	// Unpack plugin tiddlers
 	$tw.wiki.readPluginInfo();
-	$tw.wiki.registerPluginTiddlers("plugin");
+	$tw.wiki.registerPluginTiddlers("plugin",$tw.safeMode ? ["$:/core"] : undefined);
 	$tw.wiki.unpackPluginTiddlers();
 	// Process "safe mode"
 	if($tw.safeMode) {

contributing.md

@@ -1,3 +1,3 @@
-<h1 class=''>Contributing to <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TiddlyWiki5.html'>TiddlyWiki5</a></h1><p><a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TiddlyWiki5.html'>TiddlyWiki5</a> welcomes contributions to its code and documentation via <a class='tc-tiddlylink-external' href='https://github.com/Jermolene/TiddlyWiki5' target='_blank'>GitHub</a>. Please take a moment to read these notes to help make the process as smooth as possible.</p><h2 class=''>Coding Style</h2><p>Code contributions should follow the <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TiddlyWiki%2520Coding%2520Style%2520Guidelines.html'>TiddlyWiki Coding Style Guidelines</a>.</p><h2 class=''><a class='tc-tiddlylink tc-tiddlylink-missing' href='http://tiddlywiki.com/static/GitHub.html'>GitHub</a> Issues</h2><p>See <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/ReportingBugs.html'>ReportingBugs</a> for information about how <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TiddlyWiki.html'>TiddlyWiki</a> handles bug reports.</p><h2 class=''>Contributor License Agreement</h2><p>Like other <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/OpenSource.html'>OpenSource</a> projects, <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TiddlyWiki5.html'>TiddlyWiki5</a> needs a signed contributor license agreement from individual contributors. This is a legal agreement that allows contributors  to assert that they own the copyright of their contribution, and that they agree to license it to the <a class='tc-tiddlylink tc-tiddlylink-missing' href='http://tiddlywiki.com/static/UnaMesa.html'>UnaMesa</a> Association (the legal entity that owns <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TiddlyWiki.html'>TiddlyWiki</a> on behalf of the community).</p><ul><li>For individuals use: <a class='tc-tiddlylink-external' href='https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-individual.md' target='_blank'>licenses/CLA-individual</a></li><li>For entities use: <a class='tc-tiddlylink-external' href='https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-entity.md' target='_blank'>licenses/CLA-entity</a></li></ul><p><em>This is a first pass at a CLA for <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TiddlyWiki.html'>TiddlyWiki</a>. Please let us know if we missed something important. If we do have to make essential changes to the CLA, there is a possibility that all contributors will need to sign it again</em></p><h3 class=''>How to sign the CLA</h3><p>Create a <a class='tc-tiddlylink tc-tiddlylink-missing' href='http://tiddlywiki.com/static/GitHub.html'>GitHub</a> pull request to add your name to <code>cla-individual.md</code> or <code>cla-entity.md</code>, with the date in the format (YYYY/MM/DD).</p><p>eg: <code>Jeremy Ruston, @Jermolene, 2011/11/22</code></p><p><strong>Thank you!</strong></p><h4 class=''>Attribution</h4><p>The CLA documents used for this project were created using <a class='tc-tiddlylink-external' href='http://www.harmonyagreements.org' target='_blank'>Harmony Project Templates</a>. &quot;HA-CLA-I-LIST Version 1.0&quot; for &quot;CLA-individual&quot; and &quot;HA-CLA-E-LIST Version 1.0&quot; for &quot;CLA-entity&quot;
+<h1 class=''>Contributing to <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TiddlyWiki5.html'>TiddlyWiki5</a></h1><p>We welcome contributions to the code and documentation of <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TiddlyWiki.html'>TiddlyWiki</a> in several ways:</p><ul><li><a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/ReportingBugs.html'>ReportingBugs</a></li><li>Helping to <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/Improving%2520TiddlyWiki%2520Documentation.html'>improve our documentation</a></li><li>Contributing to the code via <a class='tc-tiddlylink-external' href='https://github.com/Jermolene/TiddlyWiki5' target='_blank'>GitHub</a><ul><li>See <a class='tc-tiddlylink-external' href='http://tiddlywiki.com/dev' target='_blank'>http://tiddlywiki.com/dev</a> for more details</li></ul></li></ul><p>There are other ways to <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/HelpingTiddlyWiki.html'>help TiddlyWiki</a> too.</p><h1 class=''>Contributor License Agreement</h1><p>Like other <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/OpenSource.html'>OpenSource</a> projects, <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TiddlyWiki5.html'>TiddlyWiki5</a> needs a signed contributor license agreement from individual contributors. This is a legal agreement that allows contributors  to assert that they own the copyright of their contribution, and that they agree to license it to the <a class='tc-tiddlylink tc-tiddlylink-missing' href='http://tiddlywiki.com/static/UnaMesa.html'>UnaMesa</a> Association (the legal entity that owns <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TiddlyWiki.html'>TiddlyWiki</a> on behalf of the community).</p><ul><li>For individuals use: <a class='tc-tiddlylink-external' href='https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-individual.md' target='_blank'>licenses/CLA-individual</a></li><li>For entities use: <a class='tc-tiddlylink-external' href='https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-entity.md' target='_blank'>licenses/CLA-entity</a></li></ul><h1 class=''>How to sign the CLA</h1><p>Create a <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/GitHub.html'>GitHub</a> pull request to add your name to <code>cla-individual.md</code> or <code>cla-entity.md</code>, with the date in the format (YYYY/MM/DD).</p><p>eg: <code>Jeremy Ruston, @Jermolene, 2011/11/22</code></p><hr><p><em>The CLA documents used for this project were created using <a class='tc-tiddlylink-external' href='http://www.harmonyagreements.org' target='_blank'>Harmony Project Templates</a>. &quot;HA-CLA-I-LIST Version 1.0&quot; for &quot;CLA-individual&quot; and &quot;HA-CLA-E-LIST Version 1.0&quot; for &quot;CLA-entity&quot;.</em>
 </p><p><em>This file was automatically generated by <a class='tc-tiddlylink tc-tiddlylink-resolves' href='http://tiddlywiki.com/static/TiddlyWiki5.html'>TiddlyWiki5</a></em>
 </p>

core/language/en-GB/ControlPanel.multids

@@ -1,53 +1,9 @@
 title: $:/language/ControlPanel/
 
 Advanced/Caption: Advanced
-Advanced/EditorTypes/Caption: Editor Types
-Advanced/EditorTypes/Editor/Caption: Editor
-Advanced/EditorTypes/Hint: These tiddlers determine which editor is used to edit specific tiddler types.
-Advanced/EditorTypes/Type/Caption: Type
 Advanced/Hint: Internal information about this TiddlyWiki
-Advanced/LoadedModules/Caption: Loaded Modules
-Advanced/LoadedModules/Hint: These are the currently loaded tiddler modules linked to their source tiddlers. Any italicised modules lack a source tiddler, typically because they were setup during the boot process.
-Advanced/Settings/Caption: Settings
-Advanced/Settings/Hint: These advanced settings let you customise the behaviour of TiddlyWiki.
-Advanced/Settings/NavigationAddressBar/Caption: Navigation Address Bar
-Advanced/Settings/NavigationAddressBar/Hint: Behaviour of the browser address bar when navigating to a tiddler:
-Advanced/Settings/NavigationAddressBar/No/Description: Do not update the address bar
-Advanced/Settings/NavigationAddressBar/Permalink/Description: Include the target tiddler
-Advanced/Settings/NavigationAddressBar/Permaview/Description: Include the target tiddler and the current story sequence
-Advanced/Settings/NavigationHistory/Caption: Navigation History
-Advanced/Settings/NavigationHistory/Hint: Update browser history when navigating to a tiddler:
-Advanced/Settings/NavigationHistory/No/Description: Do not update history
-Advanced/Settings/NavigationHistory/Yes/Description: Update history
-Advanced/Settings/ToolbarButtons/Caption: Toolbar Buttons
-Advanced/Settings/ToolbarButtons/Hint: Default toolbar button appearance:
-Advanced/Settings/ToolbarButtons/Text/Description: Include text
-Advanced/Settings/ToolbarButtons/Icons/Description: Include icon
-Advanced/TiddlerFields/Caption: Tiddler Fields
-Advanced/TiddlerFields/Hint: This is the full set of TiddlerFields in use in this wiki (including system tiddlers but excluding shadow tiddlers).
 Appearance/Caption: Appearance
 Appearance/Hint: Ways to customise the appearance of your TiddlyWiki.
-Appearance/Palette/Caption: Palette
-Appearance/Palette/Editor/Clone/Caption: clone
-Appearance/Palette/Editor/Clone/Prompt: It is recommended that you clone this shadow palette before editing it
-Appearance/Palette/Editor/Prompt/Modified: This shadow palette has been modified
-Appearance/Palette/Editor/Prompt: Editing
-Appearance/Palette/Editor/Reset/Caption: reset
-Appearance/Palette/HideEditor/Caption: hide editor
-Appearance/Palette/Prompt: Current palette:
-Appearance/Palette/ShowEditor/Caption: show editor
-Appearance/StoryView/Caption: Story View
-Appearance/StoryView/Prompt: Current view:
-Appearance/Theme/Caption: Theme
-Appearance/Theme/Prompt: Current theme:
-Appearance/Toolbars/Caption: Toolbars
-Appearance/Toolbars/Hint: Select which toolbar buttons are displayed
-Appearance/Toolbars/EditToolbar/Caption: Edit Toolbar
-Appearance/Toolbars/EditToolbar/Hint: Choose which buttons are displayed for tiddlers in edit mode
-Appearance/Toolbars/ViewToolbar/Caption: View Toolbar
-Appearance/Toolbars/ViewToolbar/Hint: Choose which buttons are displayed for tiddlers in view mode
-Appearance/Toolbars/PageControls/Caption: Page Toolbar
-Appearance/Toolbars/PageControls/Hint: Choose which buttons are displayed on the main page toolbar  
 Basics/AnimDuration/Prompt: Animation duration:
 Basics/Caption: Basics
 Basics/DefaultTiddlers/BottomHint: Use &#91;&#91;double square brackets&#93;&#93; for titles with spaces. Or you can choose to <$button set="$:/DefaultTiddlers" setTo="[list[$:/StoryList]]">retain story ordering</$button>
@@ -63,6 +19,23 @@ Basics/Tiddlers/Prompt: Number of tiddlers:
 Basics/Title/Prompt: Title of this ~TiddlyWiki:
 Basics/Username/Prompt: Username for signing edits:
 Basics/Version/Prompt: ~TiddlyWiki version:
+EditorTypes/Caption: Editor Types
+EditorTypes/Editor/Caption: Editor
+EditorTypes/Hint: These tiddlers determine which editor is used to edit specific tiddler types.
+EditorTypes/Type/Caption: Type
+Info/Caption: Info
+Info/Hint: Information about this TiddlyWiki
+LoadedModules/Caption: Loaded Modules
+LoadedModules/Hint: These are the currently loaded tiddler modules linked to their source tiddlers. Any italicised modules lack a source tiddler, typically because they were setup during the boot process.
+Palette/Caption: Palette
+Palette/Editor/Clone/Caption: clone
+Palette/Editor/Clone/Prompt: It is recommended that you clone this shadow palette before editing it
+Palette/Editor/Prompt/Modified: This shadow palette has been modified
+Palette/Editor/Prompt: Editing
+Palette/Editor/Reset/Caption: reset
+Palette/HideEditor/Caption: hide editor
+Palette/Prompt: Current palette:
+Palette/ShowEditor/Caption: show editor
 Plugins/Caption: Plugins
 Plugins/Disable/Caption: disable
 Plugins/Disable/Hint: Disable this plugin when reloading page
@@ -73,11 +46,6 @@ Plugins/Enable/Hint: Enable this plugin when reloading page
 Plugins/Language/Prompt: Languages
 Plugins/Plugin/Prompt: Plugins
 Plugins/Theme/Prompt: Themes
-Saving/AutoSave/Disabled/Button: enable
-Saving/AutoSave/Disabled/Prompt: Autosave is currently disabled
-Saving/AutoSave/Enabled/Button: disable
-Saving/AutoSave/Enabled/Prompt: Autosave is currently enabled
-Saving/AutoSave: Autosave
 Saving/Caption: Saving
 Saving/Heading: Saving
 Saving/TiddlySpot/Advanced/Heading: Advanced Settings
@@ -90,16 +58,40 @@ Saving/TiddlySpot/Password: Password
 Saving/TiddlySpot/ServerURL: Server URL
 Saving/TiddlySpot/UploadDir: Upload Directory
 Saving/TiddlySpot/UserName: Wiki Name
+Settings/AutoSave/Caption: Autosave
+Settings/AutoSave/Disabled/Description: Do not save changes automatically
+Settings/AutoSave/Enabled/Description: Save changes automatically
+Settings/AutoSave/Hint: Automatically save changes during editing
+Settings/Caption: Settings
+Settings/Hint: These settings let you customise the behaviour of TiddlyWiki.
+Settings/NavigationAddressBar/Caption: Navigation Address Bar
+Settings/NavigationAddressBar/Hint: Behaviour of the browser address bar when navigating to a tiddler:
+Settings/NavigationAddressBar/No/Description: Do not update the address bar
+Settings/NavigationAddressBar/Permalink/Description: Include the target tiddler
+Settings/NavigationAddressBar/Permaview/Description: Include the target tiddler and the current story sequence
+Settings/NavigationHistory/Caption: Navigation History
+Settings/NavigationHistory/Hint: Update browser history when navigating to a tiddler:
+Settings/NavigationHistory/No/Description: Do not update history
+Settings/NavigationHistory/Yes/Description: Update history
+Settings/ToolbarButtons/Caption: Toolbar Buttons
+Settings/ToolbarButtons/Hint: Default toolbar button appearance:
+Settings/ToolbarButtons/Icons/Description: Include icon
+Settings/ToolbarButtons/Text/Description: Include text
+StoryView/Caption: Story View
+StoryView/Prompt: Current view:
+Theme/Caption: Theme
+Theme/Prompt: Current theme:
+TiddlerFields/Caption: Tiddler Fields
+TiddlerFields/Hint: This is the full set of TiddlerFields in use in this wiki (including system tiddlers but excluding shadow tiddlers).
+Toolbars/Caption: Toolbars
+Toolbars/EditToolbar/Caption: Edit Toolbar
+Toolbars/EditToolbar/Hint: Choose which buttons are displayed for tiddlers in edit mode
+Toolbars/Hint: Select which toolbar buttons are displayed
+Toolbars/PageControls/Caption: Page Toolbar
+Toolbars/PageControls/Hint: Choose which buttons are displayed on the main page toolbar  
+Toolbars/ViewToolbar/Caption: View Toolbar
+Toolbars/ViewToolbar/Hint: Choose which buttons are displayed for tiddlers in view mode
 Tools/Caption: Tools
 Tools/Download/Full/Caption: Download full wiki
-Tools/Encryption/ChangePassword/Button: change password
-Tools/Encryption/ClearPassword/Button: clear password
-Tools/Encryption/Disabled/Prompt: This wiki is not encrypted
-Tools/Encryption/Enabled/Prompt: This wiki is encrypted
-Tools/Encryption/Heading: Encryption
-Tools/Encryption/SetPassword/Button: set password
 Tools/Export/AllAsStaticHTML/Caption: Download all tiddlers as static HTML
 Tools/Export/Heading: Export
-Tools/Import/Heading: Import
-Tools/Import/Hint: Browse for files on your computer to import their contents (the individual tiddlers within TiddlyWiki HTML files are imported separately). You can also drag and drop files directly to the browser window.
-Tools/Import/Prompt: Import:

core/language/en-GB/Help/makelibrary.tid

@@ -0,0 +1,14 @@
+title: $:/language/Help/makelibrary
+description: Construct library plugin required by upgrade process
+
+Constructs the `$:/UpgradeLibrary` tiddler for the upgrade process.
+
+The upgrade library is formatted as an ordinary plugin tiddler with the plugin type `library`. It contains a copy of each of the plugins, themes and language packs available within the TiddlyWiki5 repository.
+
+This command is intended for internal use; it is only relevant to users constructing a custom upgrade procedure.
+
+```
+--makelibrary <title>
+```
+
+The title argument defaults to `$:/UpgradeLibrary`.

core/language/en-GB/Help/server.tid

@@ -28,4 +28,10 @@ For example:
 --server 8080 $:/core/save/all text/plain text/html MyUserName passw0rd
 ```
 
+The username and password can be specified as empty strings if you need to set the hostname or pathprefix and don't want to require a password:
+
+```
+--server 8080 $:/core/save/all text/plain text/html "" "" 192.168.0.245
+```
+
 To run multiple TiddlyWiki servers at the same time you'll need to put each one on a different port.

core/language/en-GB/Misc.multids

@@ -28,7 +28,6 @@ RelativeDate/Past/Seconds: <<period>> seconds ago
 RelativeDate/Past/Years: <<period>> years ago
 SystemTiddler/Tooltip: This is a system tiddler
 TagManager/Colour/Heading: Colour
-TagManager/Count/Heading: Count
 TagManager/Icon/Heading: Icon
 TagManager/Tag/Heading: Tag
 UnsavedChangesWarning: You have unsaved changes in TiddlyWiki

core/language/en-GB/Search.multids

@@ -1,7 +1,7 @@
 title: $:/language/Search/
 
 Filter/Caption: Filter
-Filter/Hint: Search via a [[filter expression|http://tiddlywiki.com/static/TiddlerFilters.html]]
+Filter/Hint: Search via a [[filter expression|http://tiddlywiki.com/static/Filters.html]]
 Filter/Matches: //<small><$count filter={{$:/temp/advancedsearch}}/> matches</small>//
 Matches: //<small><$count filter="[!is[system]search{$:/temp/search}]"/> matches</small>//
 Shadows/Caption: Shadows

core/modules/filters.js

@@ -70,6 +70,8 @@ function parseFilterOperation(operators,filterString,p) {
 					rexMatch = rex.exec(filterString.substring(p));
 				if(rexMatch) {
 					operator.regexp = new RegExp(rexMatch[1], rexMatch[2]);
+// DEPRECATION WARNING
+console.log("WARNING: Filter",operator.operator,"has a deprecated regexp operand",operator.regexp);
 					nextBracketPos = p + rex.lastIndex - 1;
 				}
 				else {

core/modules/filters/regexp.js

@@ -0,0 +1,68 @@
+/*\
+title: $:/core/modules/filters/regexp.js
+type: application/javascript
+module-type: filteroperator
+
+Filter operator for regexp matching
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+/*
+Export our filter function
+*/
+exports.regexp = function(source,operator,options) {
+	var results = [],
+		fieldname = (operator.suffix || "title").toLowerCase(),
+		regexpString, regexp, flags = "", match,
+		getFieldString = function(tiddler,title) {
+			if(tiddler) {
+				return tiddler.getFieldString(fieldname);
+			} else if(fieldname === "title") {
+				return title;
+			} else {
+				return null;
+			}
+		};
+	// Process flags and construct regexp
+	regexpString = operator.operand;
+	match = /^\(\?([gim]+)\)/.exec(regexpString);
+	if(match) {
+		flags = match[1];
+		regexpString = regexpString.substr(match[0].length);
+	} else {
+		match = /\(\?([gim]+)\)$/.exec(regexpString);
+		if(match) {
+			flags = match[1];
+			regexpString = regexpString.substr(0,regexpString.length - match[0].length);
+		}
+	}
+	regexp = new RegExp(regexpString,flags);
+	// Process the incoming tiddlers
+	if(operator.prefix === "!") {
+		source(function(tiddler,title) {
+			var text = getFieldString(tiddler,title);
+			if(text !== null) {
+				if(!regexp.exec(text)) {
+					results.push(title);
+				}
+			}
+		});
+	} else {
+		source(function(tiddler,title) {
+			var text = getFieldString(tiddler,title);
+			if(text !== null) {
+				if(!!regexp.exec(text)) {
+					results.push(title);
+				}
+			}
+		});
+	}
+	return results;
+};
+
+})();

core/modules/macros/dumpvariables.js

@@ -0,0 +1,41 @@
+/*\
+title: $:/core/modules/macros/dumpvariables.js
+type: application/javascript
+module-type: macro
+
+Macro to dump all active variable values
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+/*
+Information about this macro
+*/
+
+exports.name = "dumpvariables";
+
+exports.params = [
+];
+
+/*
+Run the macro
+*/
+exports.run = function() {
+	var output = ["|!Variable |!Value |"],
+		variables = [], variable;
+	for(variable in this.variables) {
+		variables.push(variable);
+	}
+	variables.sort();
+	for(var index=0; index<variables.length; index++) {
+		var variable = variables[index];
+		output.push("|" + variable + " |<input size=50 value=<<" + variable + ">>/> |")
+	}
+	return output.join("\n");
+};
+
+})();

core/modules/parsers/wikiparser/rules/wikilink.js

@@ -25,7 +25,7 @@ exports.types = {inline: true};
 
 var textPrimitives = {
 	upperLetter: "[A-Z\u00c0-\u00d6\u00d8-\u00de\u0150\u0170]",
-	lowerLetter: "[a-z0-9\u00df-\u00f6\u00f8-\u00ff\u0151\u0171]",
+	lowerLetter: "[a-z\u00df-\u00f6\u00f8-\u00ff\u0151\u0171]",
 	anyLetter:   "[A-Za-z0-9\u00c0-\u00d6\u00d8-\u00de\u00df-\u00f6\u00f8-\u00ff\u0150\u0170\u0151\u0171]",
 	blockPrefixLetters:	"[A-Za-z0-9-_\u00c0-\u00d6\u00d8-\u00de\u00df-\u00f6\u00f8-\u00ff\u0150\u0170\u0151\u0171]"
 };

core/modules/utils/dom/keyboard.js

@@ -60,11 +60,12 @@ exports.parseKeyDescriptor = function(keyDescriptor) {
 };
 
 exports.checkKeyDescriptor = function(event,keyInfo) {
+	var metaKeyStatus = !!keyInfo.metaKey; // Using a temporary variable to keep JSHint happy
 	return event.keyCode === keyInfo.keyCode && 
 			event.shiftKey === keyInfo.shiftKey && 
 			event.altKey === keyInfo.altKey && 
 			event.ctrlKey === keyInfo.ctrlKey && 
-			event.metaKey === keyInfo.metaKey;	
+			event.metaKey === metaKeyStatus;	
 };
 
 })();

core/modules/widgets/browse.js

@@ -36,7 +36,9 @@ BrowseWidget.prototype.render = function(parent,nextSibling) {
 	// Create element
 	var domNode = this.document.createElement("input");
 	domNode.setAttribute("type","file");
-	domNode.setAttribute("multiple","multiple");
+	if(this.browseMultiple) {
+		domNode.setAttribute("multiple","multiple");
+	}
 	// Add a click event handler
 	domNode.addEventListener("change",function (event) {
 		self.wiki.readFiles(event.target.files,function(tiddlerFieldsArray) {
@@ -54,6 +56,7 @@ BrowseWidget.prototype.render = function(parent,nextSibling) {
 Compute the internal state of the widget
 */
 BrowseWidget.prototype.execute = function() {
+	this.browseMultiple = this.getAttribute("multiple");
 };
 
 /*

core/modules/widgets/button.js

@@ -50,8 +50,8 @@ ButtonWidget.prototype.render = function(parent,nextSibling) {
 	if(this.style) {
 		domNode.setAttribute("style",this.style);
 	}
-	if(this.title) {
-		domNode.setAttribute("title",this.title);
+	if(this.tooltip) {
+		domNode.setAttribute("title",this.tooltip);
 	}
 	if(this["aria-label"]) {
 		domNode.setAttribute("aria-label",this["aria-label"]);
@@ -141,7 +141,14 @@ ButtonWidget.prototype.execute = function() {
 	this.hover = this.getAttribute("hover");
 	this["class"] = this.getAttribute("class","");
 	this["aria-label"] = this.getAttribute("aria-label");
-	this.title = this.getAttribute("title");
+	this.tooltip = this.getAttribute("tooltip");
+// DEPRECATION WARNING
+var title = this.getAttribute("title");
+if(title) {
+	console.log("WARNING: attribute 'title' on button widget should be replaced with 'tooltip'");
+	this.tooltip = title;
+}
+
 	this.style = this.getAttribute("style");
 	this.selectedClass = this.getAttribute("selectedClass");
 	this.defaultSetValue = this.getAttribute("default");

core/modules/widgets/link.js

@@ -124,56 +124,60 @@ LinkWidget.prototype.handleClickEvent = function (event) {
 };
 
 LinkWidget.prototype.handleDragStartEvent = function(event) {
-	if(this.to) {
-		// Set the dragging class on the element being dragged
-		$tw.utils.addClass(event.target,"tc-tiddlylink-dragging");
-		// Create the drag image elements
-		this.dragImage = this.document.createElement("div");
-		this.dragImage.className = "tc-tiddler-dragger";
-		var inner = this.document.createElement("div");
-		inner.className = "tc-tiddler-dragger-inner";
-		inner.appendChild(this.document.createTextNode(this.to));
-		this.dragImage.appendChild(inner);
-		this.document.body.appendChild(this.dragImage);
-		// Astoundingly, we need to cover the dragger up: http://www.kryogenix.org/code/browser/custom-drag-image.html
-		var cover = this.document.createElement("div");
-		cover.className = "tc-tiddler-dragger-cover";
-		cover.style.left = (inner.offsetLeft - 16) + "px";
-		cover.style.top = (inner.offsetTop - 16) + "px";
-		cover.style.width = (inner.offsetWidth + 32) + "px";
-		cover.style.height = (inner.offsetHeight + 32) + "px";
-		this.dragImage.appendChild(cover);
-		// Set the data transfer properties
-		var dataTransfer = event.dataTransfer;
-		// First the image
-		dataTransfer.effectAllowed = "copy";
-		if(dataTransfer.setDragImage) {
-			dataTransfer.setDragImage(this.dragImage.firstChild,-16,-16);
+	if(event.target === this.domNodes[0]) {
+		if(this.to) {
+			// Set the dragging class on the element being dragged
+			$tw.utils.addClass(event.target,"tc-tiddlylink-dragging");
+			// Create the drag image elements
+			this.dragImage = this.document.createElement("div");
+			this.dragImage.className = "tc-tiddler-dragger";
+			var inner = this.document.createElement("div");
+			inner.className = "tc-tiddler-dragger-inner";
+			inner.appendChild(this.document.createTextNode(this.to));
+			this.dragImage.appendChild(inner);
+			this.document.body.appendChild(this.dragImage);
+			// Astoundingly, we need to cover the dragger up: http://www.kryogenix.org/code/browser/custom-drag-image.html
+			var cover = this.document.createElement("div");
+			cover.className = "tc-tiddler-dragger-cover";
+			cover.style.left = (inner.offsetLeft - 16) + "px";
+			cover.style.top = (inner.offsetTop - 16) + "px";
+			cover.style.width = (inner.offsetWidth + 32) + "px";
+			cover.style.height = (inner.offsetHeight + 32) + "px";
+			this.dragImage.appendChild(cover);
+			// Set the data transfer properties
+			var dataTransfer = event.dataTransfer;
+			// First the image
+			dataTransfer.effectAllowed = "copy";
+			if(dataTransfer.setDragImage) {
+				dataTransfer.setDragImage(this.dragImage.firstChild,-16,-16);
+			}
+			// Then the data
+			dataTransfer.clearData();
+			var jsonData = this.wiki.getTiddlerAsJson(this.to),
+				textData = this.wiki.getTiddlerText(this.to,"");
+			// IE doesn't like these content types
+			if(!$tw.browser.isIE) {
+				dataTransfer.setData("text/vnd.tiddler",jsonData);
+				dataTransfer.setData("text/plain",textData);
+				dataTransfer.setData("text/x-moz-url","data:text/vnd.tiddler," + encodeURI(jsonData));
+			}
+			dataTransfer.setData("URL","data:text/vnd.tiddler," + encodeURI(jsonData));
+			dataTransfer.setData("Text",textData);
+			event.stopPropagation();
+		} else {
+			event.preventDefault();
 		}
-		// Then the data
-		dataTransfer.clearData();
-		var jsonData = this.wiki.getTiddlerAsJson(this.to),
-			textData = this.wiki.getTiddlerText(this.to,"");
-		// IE doesn't like these content types
-		if(!$tw.browser.isIE) {
-			dataTransfer.setData("text/vnd.tiddler",jsonData);
-			dataTransfer.setData("text/plain",textData);
-			dataTransfer.setData("text/x-moz-url","data:text/vnd.tiddler," + encodeURI(jsonData));
-		}
-		dataTransfer.setData("URL","data:text/vnd.tiddler," + encodeURI(jsonData));
-		dataTransfer.setData("Text",textData);
-		event.stopPropagation();
-	} else {
-		event.preventDefault();
 	}
 };
 
 LinkWidget.prototype.handleDragEndEvent = function(event) {
-	// Remove the dragging class on the element being dragged
-	$tw.utils.removeClass(event.target,"tc-tiddlylink-dragging");
-	// Delete the drag image element
-	if(this.dragImage) {
-		this.dragImage.parentNode.removeChild(this.dragImage);
+	if(event.target === this.domNodes[0]) {
+		// Remove the dragging class on the element being dragged
+		$tw.utils.removeClass(event.target,"tc-tiddlylink-dragging");
+		// Delete the drag image element
+		if(this.dragImage) {
+			this.dragImage.parentNode.removeChild(this.dragImage);
+		}
 	}
 };
 

core/modules/widgets/radio.js

@@ -79,7 +79,7 @@ RadioWidget.prototype.setValue = function() {
 		var tiddler = this.wiki.getTiddler(this.radioTitle),
 			addition = {};
 		addition[this.radioField] = this.radioValue;
-		this.wiki.addTiddler(new $tw.Tiddler(tiddler,addition));
+		this.wiki.addTiddler(new $tw.Tiddler({title: this.radioTitle},tiddler,addition,this.wiki.getModificationFields()));
 	}
 };
 

core/modules/wiki.js

@@ -317,8 +317,18 @@ exports.sortTiddlers = function(titles,sortField,isDescending,isCaseSensitive,is
 	var self = this;
 	titles.sort(function(a,b) {
 		if(sortField !== "title") {
-			a = self.getTiddler(a).fields[sortField] || "";
-			b = self.getTiddler(b).fields[sortField] || "";
+			var tiddlerA = self.getTiddler(a),
+				tiddlerB = self.getTiddler(b);
+			if(tiddlerA) {
+				a = tiddlerA.fields[sortField] || "";
+			} else {
+				a = "";
+			}
+			if(tiddlerB) {
+				b = tiddlerB.fields[sortField] || "";
+			} else {
+				b = "";
+			}
 		}
 		if(isNumeric) {
 			a = Number(a);

core/ui/ControlPanel.tid

@@ -1,5 +1,5 @@
 title: $:/ControlPanel
 
 <div class="tc-control-panel">
-<<tabs "[all[shadows+tiddlers]tag[$:/tags/ControlPanel]!has[draft.of]]" "$:/core/ui/ControlPanel/Basics">>
+<<tabs "[all[shadows+tiddlers]tag[$:/tags/ControlPanel]!has[draft.of]]" "$:/core/ui/ControlPanel/Info">>
 </div>

core/ui/ControlPanel/Advanced.tid

@@ -1,9 +1,9 @@
 title: $:/core/ui/ControlPanel/Advanced
-tags: $:/tags/ControlPanel
+tags: $:/tags/ControlPanel/Info
 caption: {{$:/language/ControlPanel/Advanced/Caption}}
 
 {{$:/language/ControlPanel/Advanced/Hint}}
 
 <div class="tc-control-panel">
-<<tabs "[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Advanced]!has[draft.of]]" "$:/core/ui/ControlPanel/Advanced/TiddlerFields">>
+<<tabs "[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Advanced]!has[draft.of]]" "$:/core/ui/ControlPanel/TiddlerFields">>
 </div>

core/ui/ControlPanel/Advanced/LoadedModules.tid

@@ -1,8 +0,0 @@
-title: $:/core/ui/ControlPanel/Advanced/LoadedModules
-tags: $:/tags/ControlPanel/Advanced
-caption: {{$:/language/ControlPanel/Advanced/LoadedModules/Caption}}
-
-\define lingo-base() $:/language/ControlPanel/Advanced/
-<<lingo LoadedModules/Hint>>
-
-{{$:/snippets/modules}}

core/ui/ControlPanel/Advanced/Settings.tid

@@ -1,19 +0,0 @@
-title: $:/core/ui/ControlPanel/Advanced/Settings
-tags: $:/tags/ControlPanel/Advanced
-caption: {{$:/language/ControlPanel/Advanced/Settings/Caption}}
-
-\define lingo-base() $:/language/ControlPanel/Advanced/Settings/
-
-<<lingo Hint>>
-
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Advanced/Settings]]">
-
-<div style="border-top:1px solid #eee;">
-
-!! <$link><$transclude field="caption"/></$link>
-
-<$transclude/>
-
-</div>
-
-</$list>

core/ui/ControlPanel/Advanced/Settings/NavigationHistory.tid

@@ -1,10 +0,0 @@
-title: $:/core/ui/ControlPanel/Advanced/Settings/NavigationHistory
-tags: $:/tags/ControlPanel/Advanced/Settings
-caption: {{$:/language/ControlPanel/Advanced/Settings/NavigationHistory/Caption}}
-
-\define lingo-base() $:/language/ControlPanel/Advanced/Settings/NavigationHistory/
-<$link to="$:/config/Navigation/UpdateHistory"><<lingo Hint>></$link>
-
-<$radio tiddler="$:/config/Navigation/UpdateHistory" value="yes"> <<lingo Yes/Description>> </$radio>
-
-<$radio tiddler="$:/config/Navigation/UpdateHistory" value="no"> <<lingo No/Description>> </$radio>

core/ui/ControlPanel/Advanced/TiddlerFields.tid

@@ -1,9 +0,0 @@
-title: $:/core/ui/ControlPanel/Advanced/TiddlerFields
-tags: $:/tags/ControlPanel/Advanced
-caption: {{$:/language/ControlPanel/Advanced/TiddlerFields/Caption}}
-
-\define lingo-base() $:/language/ControlPanel/Advanced/
-
-<<lingo TiddlerFields/Hint>>
-
-{{$:/snippets/allfields}}

core/ui/ControlPanel/Appearance.tid

@@ -5,5 +5,5 @@ caption: {{$:/language/ControlPanel/Appearance/Caption}}
 {{$:/language/ControlPanel/Appearance/Hint}}
 
 <div class="tc-control-panel">
-<<tabs "[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Appearance]!has[draft.of]]" "$:/core/ui/ControlPanel/Appearance/Theme">>
+<<tabs "[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Appearance]!has[draft.of]]" "$:/core/ui/ControlPanel/Theme">>
 </div>

core/ui/ControlPanel/Appearance/StoryView.tid

@@ -1,5 +0,0 @@
-title: $:/core/ui/ControlPanel/Appearance/StoryView
-tags: $:/tags/ControlPanel/Appearance
-caption: {{$:/language/ControlPanel/Appearance/StoryView/Caption}}
-
-{{$:/snippets/viewswitcher}}

core/ui/ControlPanel/Appearance/Theme.tid

@@ -1,5 +0,0 @@
-title: $:/core/ui/ControlPanel/Appearance/Theme
-tags: $:/tags/ControlPanel/Appearance
-caption: {{$:/language/ControlPanel/Appearance/Theme/Caption}}
-
-{{$:/snippets/themeswitcher}}

core/ui/ControlPanel/Appearance/Toolbars.tid

@@ -1,9 +0,0 @@
-title: $:/core/ui/ControlPanel/Appearance/Toolbars
-tags: $:/tags/ControlPanel/Appearance
-caption: {{$:/language/ControlPanel/Appearance/Toolbars/Caption}}
-
-{{$:/language/ControlPanel/Appearance/Toolbars/Hint}}
-
-<div class="tc-control-panel">
-<<tabs "[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Appearance/Toolbars]!has[draft.of]]" "$:/core/ui/ControlPanel/Appearance/Toolbars/ViewToolbar" "$:/state/tabs/controlpanel/toolbars" "tc-vertical">>
-</div>

core/ui/ControlPanel/Basics.tid

@@ -1,5 +1,5 @@
 title: $:/core/ui/ControlPanel/Basics
-tags: $:/tags/ControlPanel
+tags: $:/tags/ControlPanel/Info
 caption: {{$:/language/ControlPanel/Basics/Caption}}
 
 \define lingo-base() $:/language/ControlPanel/Basics/

core/ui/ControlPanel/EditorTypes.tid

@@ -1,8 +1,8 @@
-title: $:/core/ui/ControlPanel/Advanced/EditorTypes
+title: $:/core/ui/ControlPanel/EditorTypes
 tags: $:/tags/ControlPanel/Advanced
-caption: {{$:/language/ControlPanel/Advanced/EditorTypes/Caption}}
+caption: {{$:/language/ControlPanel/EditorTypes/Caption}}
 
-\define lingo-base() $:/language/ControlPanel/Advanced/EditorTypes/
+\define lingo-base() $:/language/ControlPanel/EditorTypes/
 
 <<lingo Hint>>
 

core/ui/ControlPanel/Info.tid

@@ -0,0 +1,9 @@
+title: $:/core/ui/ControlPanel/Info
+tags: $:/tags/ControlPanel
+caption: {{$:/language/ControlPanel/Info/Caption}}
+
+{{$:/language/ControlPanel/Info/Hint}}
+
+<div class="tc-control-panel">
+<<tabs "[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Info]!has[draft.of]]" "$:/core/ui/ControlPanel/Basics">>
+</div>

core/ui/ControlPanel/LoadedModules.tid

@@ -0,0 +1,8 @@
+title: $:/core/ui/ControlPanel/LoadedModules
+tags: $:/tags/ControlPanel/Advanced
+caption: {{$:/language/ControlPanel/LoadedModules/Caption}}
+
+\define lingo-base() $:/language/ControlPanel/
+<<lingo LoadedModules/Hint>>
+
+{{$:/snippets/modules}}

core/ui/ControlPanel/Palette.tid

@@ -1,8 +1,8 @@
-title: $:/core/ui/ControlPanel/Appearance/Palette
+title: $:/core/ui/ControlPanel/Palette
 tags: $:/tags/ControlPanel/Appearance
-caption: {{$:/language/ControlPanel/Appearance/Palette/Caption}}
+caption: {{$:/language/ControlPanel/Palette/Caption}}
 
-\define lingo-base() $:/language/ControlPanel/Appearance/Palette/
+\define lingo-base() $:/language/ControlPanel/Palette/
 
 {{$:/snippets/paletteswitcher}}
 

core/ui/ControlPanel/Plugins.tid

@@ -64,12 +64,12 @@ $:/config/Plugins/Disabled/$(currentTiddler)$
 <$list filter="[all[current]] -[[$:/core]]">
 <div style="float:right;">
 <$reveal type="nomatch" state=<<plugin-disable-title>> text="yes">
-<$button set=<<plugin-disable-title>> setTo="yes" title={{$:/language/ControlPanel/Plugins/Disable/Hint}} aria-label={{$:/language/ControlPanel/Plugins/Disable/Caption}}>
+<$button set=<<plugin-disable-title>> setTo="yes" tooltip={{$:/language/ControlPanel/Plugins/Disable/Hint}} aria-label={{$:/language/ControlPanel/Plugins/Disable/Caption}}>
 <<lingo Disable/Caption>>
 </$button>
 </$reveal>
 <$reveal type="match" state=<<plugin-disable-title>> text="yes">
-<$button set=<<plugin-disable-title>> setTo="no" title={{$:/language/ControlPanel/Plugins/Enable/Hint}} aria-label={{$:/language/ControlPanel/Plugins/Enable/Caption}}>
+<$button set=<<plugin-disable-title>> setTo="no" tooltip={{$:/language/ControlPanel/Plugins/Enable/Hint}} aria-label={{$:/language/ControlPanel/Plugins/Enable/Caption}}>
 <<lingo Enable/Caption>>
 </$button>
 </$reveal>

core/ui/ControlPanel/Saving.tid

@@ -13,10 +13,6 @@ http://$(userName)$.tiddlyspot.com/backup/
 </$set>
 </$reveal>
 \end
-! <<lingo Heading>>
-
-|<<lingo AutoSave>> |{{$:/snippets/autosavestatus}} |
-
 ! <<lingo TiddlySpot/Heading>>
 
 |<<lingo TiddlySpot/UserName>> |<$edit-text tiddler="$:/UploadName" default="" tag="input"/> |

core/ui/ControlPanel/Settings.tid

@@ -0,0 +1,19 @@
+title: $:/core/ui/ControlPanel/Settings
+tags: $:/tags/ControlPanel
+caption: {{$:/language/ControlPanel/Settings/Caption}}
+
+\define lingo-base() $:/language/ControlPanel/Settings/
+
+<<lingo Hint>>
+
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Settings]]">
+
+<div style="border-top:1px solid #eee;">
+
+!! <$link><$transclude field="caption"/></$link>
+
+<$transclude/>
+
+</div>
+
+</$list>

core/ui/ControlPanel/Settings/AutoSave.tid

@@ -0,0 +1,11 @@
+title: $:/core/ui/ControlPanel/Settings/AutoSave
+tags: $:/tags/ControlPanel/Settings
+caption: {{$:/language/ControlPanel/Settings/AutoSave/Caption}}
+
+\define lingo-base() $:/language/ControlPanel/Settings/AutoSave/
+
+<$link to="$:/config/AutoSave"><<lingo Hint>></$link>
+
+<$radio tiddler="$:/config/AutoSave" value="yes"> <<lingo Enabled/Description>> </$radio>
+
+<$radio tiddler="$:/config/AutoSave" value="no"> <<lingo Disabled/Description>> </$radio>

core/ui/ControlPanel/Settings/NavigationAddressBar.tid

@@ -1,8 +1,8 @@
-title: $:/core/ui/ControlPanel/Advanced/Settings/NavigationAddressBar
-tags: $:/tags/ControlPanel/Advanced/Settings
-caption: {{$:/language/ControlPanel/Advanced/Settings/NavigationAddressBar/Caption}}
+title: $:/core/ui/ControlPanel/Settings/NavigationAddressBar
+tags: $:/tags/ControlPanel/Settings
+caption: {{$:/language/ControlPanel/Settings/NavigationAddressBar/Caption}}
 
-\define lingo-base() $:/language/ControlPanel/Advanced/Settings/NavigationAddressBar/
+\define lingo-base() $:/language/ControlPanel/Settings/NavigationAddressBar/
 
 <$link to="$:/config/Navigation/UpdateAddressBar"><<lingo Hint>></$link>
 

core/ui/ControlPanel/Settings/NavigationHistory.tid

@@ -0,0 +1,10 @@
+title: $:/core/ui/ControlPanel/Settings/NavigationHistory
+tags: $:/tags/ControlPanel/Settings
+caption: {{$:/language/ControlPanel/Settings/NavigationHistory/Caption}}
+
+\define lingo-base() $:/language/ControlPanel/Settings/NavigationHistory/
+<$link to="$:/config/Navigation/UpdateHistory"><<lingo Hint>></$link>
+
+<$radio tiddler="$:/config/Navigation/UpdateHistory" value="yes"> <<lingo Yes/Description>> </$radio>
+
+<$radio tiddler="$:/config/Navigation/UpdateHistory" value="no"> <<lingo No/Description>> </$radio>

core/ui/ControlPanel/Settings/ToolbarButtons.tid

@@ -1,8 +1,8 @@
-title: $:/core/ui/ControlPanel/Advanced/Settings/ToolbarButtons
-tags: $:/tags/ControlPanel/Advanced/Settings
-caption: {{$:/language/ControlPanel/Advanced/Settings/ToolbarButtons/Caption}}
+title: $:/core/ui/ControlPanel/Settings/ToolbarButtons
+tags: $:/tags/ControlPanel/Settings
+caption: {{$:/language/ControlPanel/Settings/ToolbarButtons/Caption}}
 
-\define lingo-base() $:/language/ControlPanel/Advanced/Settings/ToolbarButtons/
+\define lingo-base() $:/language/ControlPanel/Settings/ToolbarButtons/
 <<lingo Hint>>
 
 <$checkbox tiddler="$:/config/Toolbar/Icons" field="text" checked="yes" unchecked="no" default="yes"> <$link to="$:/config/Toolbar/Icons"><<lingo Icons/Description>></$link> </$checkbox>

core/ui/ControlPanel/StoryView.tid

@@ -0,0 +1,5 @@
+title: $:/core/ui/ControlPanel/StoryView
+tags: $:/tags/ControlPanel/Appearance
+caption: {{$:/language/ControlPanel/StoryView/Caption}}
+
+{{$:/snippets/viewswitcher}}

core/ui/ControlPanel/Theme.tid

@@ -0,0 +1,5 @@
+title: $:/core/ui/ControlPanel/Theme
+tags: $:/tags/ControlPanel/Appearance
+caption: {{$:/language/ControlPanel/Theme/Caption}}
+
+{{$:/snippets/themeswitcher}}

core/ui/ControlPanel/TiddlerFields.tid

@@ -0,0 +1,9 @@
+title: $:/core/ui/ControlPanel/TiddlerFields
+tags: $:/tags/ControlPanel/Advanced
+caption: {{$:/language/ControlPanel/TiddlerFields/Caption}}
+
+\define lingo-base() $:/language/ControlPanel/
+
+<<lingo TiddlerFields/Hint>>
+
+{{$:/snippets/allfields}}

core/ui/ControlPanel/Toolbars.tid

@@ -0,0 +1,9 @@
+title: $:/core/ui/ControlPanel/Toolbars
+tags: $:/tags/ControlPanel/Appearance
+caption: {{$:/language/ControlPanel/Toolbars/Caption}}
+
+{{$:/language/ControlPanel/Toolbars/Hint}}
+
+<div class="tc-control-panel">
+<<tabs "[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Toolbars]!has[draft.of]]" "$:/core/ui/ControlPanel/Toolbars/ViewToolbar" "$:/state/tabs/controlpanel/toolbars" "tc-vertical">>
+</div>

core/ui/ControlPanel/Toolbars/EditToolbar.tid

@@ -1,13 +1,13 @@
-title: $:/core/ui/ControlPanel/Appearance/Toolbars/EditToolbar
-tags: $:/tags/ControlPanel/Appearance/Toolbars
-caption: {{$:/language/ControlPanel/Appearance/Toolbars/EditToolbar/Caption}}
+title: $:/core/ui/ControlPanel/Toolbars/EditToolbar
+tags: $:/tags/ControlPanel/Toolbars
+caption: {{$:/language/ControlPanel/Toolbars/EditToolbar/Caption}}
 
 \define lingo-base() $:/language/TiddlerInfo/
 \define config-title()
 $:/config/EditToolbarButtons/Visibility/$(listItem)$
 \end
 
-{{$:/language/ControlPanel/Appearance/Toolbars/EditToolbar/Hint}}
+{{$:/language/ControlPanel/Toolbars/EditToolbar/Hint}}
 
 <$set name="tv-config-toolbar-icons" value="yes">
 

core/ui/ControlPanel/Toolbars/PageControls.tid

@@ -1,13 +1,13 @@
-title: $:/core/ui/ControlPanel/Appearance/Toolbars/PageControls
-tags: $:/tags/ControlPanel/Appearance/Toolbars
-caption: {{$:/language/ControlPanel/Appearance/Toolbars/PageControls/Caption}}
+title: $:/core/ui/ControlPanel/Toolbars/PageControls
+tags: $:/tags/ControlPanel/Toolbars
+caption: {{$:/language/ControlPanel/Toolbars/PageControls/Caption}}
 
 \define lingo-base() $:/language/TiddlerInfo/
 \define config-title()
 $:/config/PageControlButtons/Visibility/$(listItem)$
 \end
 
-{{$:/language/ControlPanel/Appearance/Toolbars/PageControls/Hint}}
+{{$:/language/ControlPanel/Toolbars/PageControls/Hint}}
 
 <$set name="tv-config-toolbar-icons" value="yes">
 

core/ui/ControlPanel/Toolbars/ViewToolbar.tid

@@ -1,13 +1,13 @@
-title: $:/core/ui/ControlPanel/Appearance/Toolbars/ViewToolbar
-tags: $:/tags/ControlPanel/Appearance/Toolbars
-caption: {{$:/language/ControlPanel/Appearance/Toolbars/ViewToolbar/Caption}}
+title: $:/core/ui/ControlPanel/Toolbars/ViewToolbar
+tags: $:/tags/ControlPanel/Toolbars
+caption: {{$:/language/ControlPanel/Toolbars/ViewToolbar/Caption}}
 
 \define lingo-base() $:/language/TiddlerInfo/
 \define config-title()
 $:/config/ViewToolbarButtons/Visibility/$(listItem)$
 \end
 
-{{$:/language/ControlPanel/Appearance/Toolbars/ViewToolbar/Hint}}
+{{$:/language/ControlPanel/Toolbars/ViewToolbar/Hint}}
 
 <$set name="tv-config-toolbar-icons" value="yes">
 

core/ui/ControlPanel/Tools.tid

@@ -3,16 +3,9 @@ tags: $:/tags/ControlPanel
 caption: {{$:/language/ControlPanel/Tools/Caption}}
 
 \define lingo-base() $:/language/ControlPanel/Tools/
-! <<lingo Import/Heading>>
 
-<$browse/>
-
-<<lingo Import/Hint>>
+//Note that before the end of the beta this tab will be removed, and more extensive export options made available via toolbar buttons//
 
 ! <<lingo Export/Heading>>
 
 <$button message="tm-download-file" param="$:/core/templates/alltiddlers.template.html" class="tc-btn-big-green"><<lingo Export/AllAsStaticHTML/Caption>> {{$:/core/images/save-button}}</$button>
-
-! <<lingo Encryption/Heading>>
-
-{{$:/snippets/encryptionstatus}}

core/ui/EditTemplate/tags.tid

@@ -24,11 +24,8 @@ background-color:$(backgroundColor)$;
 </div>
 
 <div class="tc-block-dropdown-wrapper">
-
 <$reveal state=<<qualify "$:/state/popup/tags-auto-complete">> type="nomatch" text="" default="">
-
 <div class="tc-block-dropdown">
-
 <$linkcatcher set="$:/temp/NewTagName" setTo="" message="tm-add-tag">
 <$list filter="[!is[shadow]tags[]search{$:/temp/NewTagName}sort[title]]">
 <$link>
@@ -40,9 +37,7 @@ background-color:$(backgroundColor)$;
 </$link>
 </$list>
 </$linkcatcher>
-
 </div>
-
 </$reveal>
 </div>
 </$fieldmangler>

core/ui/EditTemplate/type.tid

@@ -2,7 +2,9 @@ title: $:/core/ui/EditTemplate/type
 tags: $:/tags/EditTemplate
 
 \define lingo-base() $:/language/EditTemplate/
-<p><$fieldmangler><em class="tc-edit"><<lingo Type/Prompt>></em> <$edit-text field="type" tag="input" default="" placeholder={{$:/language/EditTemplate/Type/Placeholder}} focusPopup=<<qualify "$:/state/popup/type-dropdown">> class="tc-edit-typeeditor"/> <$button popup=<<qualify "$:/state/popup/type-dropdown">> class="tc-btn-invisible tc-btn-dropdown">{{$:/core/images/down-arrow}}</$button> <$button message="tm-remove-field" param="type" class="tc-btn-invisible tc-btn-icon">{{$:/core/images/delete-button}}</$button></$fieldmangler></p>
+<div class="tc-type-selector"><$fieldmangler>
+<em class="tc-edit"><<lingo Type/Prompt>></em> <$edit-text field="type" tag="input" default="" placeholder={{$:/language/EditTemplate/Type/Placeholder}} focusPopup=<<qualify "$:/state/popup/type-dropdown">> class="tc-edit-typeeditor"/> <$button popup=<<qualify "$:/state/popup/type-dropdown">> class="tc-btn-invisible tc-btn-dropdown">{{$:/core/images/down-arrow}}</$button> <$button message="tm-remove-field" param="type" class="tc-btn-invisible tc-btn-icon">{{$:/core/images/delete-button}}</$button>
+</$fieldmangler></div>
 
 <div class="tc-block-dropdown-wrapper">
 <$reveal state=<<qualify "$:/state/popup/type-dropdown">> type="nomatch" text="" default="">

core/ui/EditToolbar/cancel.tid

@@ -3,7 +3,7 @@ tags: $:/tags/EditToolbar
 caption: {{$:/core/images/cancel-button}} {{$:/language/Buttons/Cancel/Caption}}
 description: {{$:/language/Buttons/Cancel/Hint}}
 
-<$button message="tm-cancel-tiddler" title={{$:/language/Buttons/Cancel/Hint}} aria-label={{$:/language/Buttons/Cancel/Caption}} class=<<tv-config-toolbar-class>>>
+<$button message="tm-cancel-tiddler" tooltip={{$:/language/Buttons/Cancel/Hint}} aria-label={{$:/language/Buttons/Cancel/Caption}} class=<<tv-config-toolbar-class>>>
 <$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
 {{$:/core/images/cancel-button}}
 </$list>

core/ui/EditToolbar/delete.tid

@@ -3,7 +3,7 @@ tags: $:/tags/EditToolbar
 caption: {{$:/core/images/delete-button}} {{$:/language/Buttons/Delete/Caption}}
 description: {{$:/language/Buttons/Delete/Hint}}
 
-<$button message="tm-delete-tiddler" title={{$:/language/Buttons/Delete/Hint}} aria-label={{$:/language/Buttons/Delete/Caption}} class=<<tv-config-toolbar-class>>>
+<$button message="tm-delete-tiddler" tooltip={{$:/language/Buttons/Delete/Hint}} aria-label={{$:/language/Buttons/Delete/Caption}} class=<<tv-config-toolbar-class>>>
 <$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
 {{$:/core/images/delete-button}}
 </$list>

core/ui/EditToolbar/save.tid

@@ -3,7 +3,7 @@ tags: $:/tags/EditToolbar
 caption: {{$:/core/images/done-button}} {{$:/language/Buttons/Save/Caption}}
 description: {{$:/language/Buttons/Save/Hint}}
 
-<$button message="tm-save-tiddler" title={{$:/language/Buttons/Save/Hint}} aria-label={{$:/language/Buttons/Save/Caption}} class=<<tv-config-toolbar-class>>>
+<$button message="tm-save-tiddler" tooltip={{$:/language/Buttons/Save/Hint}} aria-label={{$:/language/Buttons/Save/Caption}} class=<<tv-config-toolbar-class>>>
 <$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
 {{$:/core/images/done-button}}
 </$list>

core/ui/MoreSideBar/Recent.tid

@@ -2,4 +2,4 @@ title: $:/core/ui/MoreSideBar/Recent
 tags: $:/tags/MoreSideBar
 caption: {{$:/language/SideBar/Recent/Caption}}
 
-{{$:/snippets/recentchanges}}
+<$macrocall $name="timeline" format={{$:/language/RecentChanges/DateFormat}}/>

core/ui/PageControls/closeall.tid

@@ -3,7 +3,7 @@ tags: $:/tags/PageControls
 caption: {{$:/core/images/close-all-button}} {{$:/language/Buttons/CloseAll/Caption}}
 description: {{$:/language/Buttons/CloseAll/Hint}}
 
-<$button message="tm-close-all-tiddlers" title={{$:/language/Buttons/CloseAll/Hint}} aria-label={{$:/language/Buttons/CloseAll/Caption}} class=<<tv-config-toolbar-class>>>
+<$button message="tm-close-all-tiddlers" tooltip={{$:/language/Buttons/CloseAll/Hint}} aria-label={{$:/language/Buttons/CloseAll/Caption}} class=<<tv-config-toolbar-class>>>
 <$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
 {{$:/core/images/close-all-button}}
 </$list>

core/ui/PageControls/controlpanel.tid

@@ -3,7 +3,7 @@ tags: $:/tags/PageControls
 caption: {{$:/core/images/options-button}} {{$:/language/Buttons/ControlPanel/Caption}}
 description: {{$:/language/Buttons/ControlPanel/Hint}}
 
-<$button to="$:/ControlPanel" title={{$:/language/Buttons/ControlPanel/Hint}} aria-label={{$:/language/Buttons/ControlPanel/Caption}} class=<<tv-config-toolbar-class>>>
+<$button to="$:/ControlPanel" tooltip={{$:/language/Buttons/ControlPanel/Hint}} aria-label={{$:/language/Buttons/ControlPanel/Caption}} class=<<tv-config-toolbar-class>>>
 <$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
 {{$:/core/images/options-button}}
 </$list>

core/ui/PageControls/encryption.tid

@@ -4,7 +4,7 @@ caption: {{$:/core/images/locked-padlock}} {{$:/language/Buttons/Encryption/Capt
 description: {{$:/language/Buttons/Encryption/Hint}}
 
 <$reveal type="match" state="$:/isEncrypted" text="yes">
-<$button message="tm-clear-password" title={{$:/language/Buttons/Encryption/ClearPassword/Hint}} aria-label={{$:/language/Buttons/Encryption/ClearPassword/Caption}} class=<<tv-config-toolbar-class>>>
+<$button message="tm-clear-password" tooltip={{$:/language/Buttons/Encryption/ClearPassword/Hint}} aria-label={{$:/language/Buttons/Encryption/ClearPassword/Caption}} class=<<tv-config-toolbar-class>>>
 <$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
 {{$:/core/images/locked-padlock}}
 </$list>
@@ -14,7 +14,7 @@ description: {{$:/language/Buttons/Encryption/Hint}}
 </$button>
 </$reveal>
 <$reveal type="nomatch" state="$:/isEncrypted" text="yes">
-<$button message="tm-set-password" title={{$:/language/Buttons/Encryption/SetPassword/Hint}} aria-label={{$:/language/Buttons/Encryption/SetPassword/Caption}} class=<<tv-config-toolbar-class>>>
+<$button message="tm-set-password" tooltip={{$:/language/Buttons/Encryption/SetPassword/Hint}} aria-label={{$:/language/Buttons/Encryption/SetPassword/Caption}} class=<<tv-config-toolbar-class>>>
 <$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
 {{$:/core/images/unlocked-padlock}}
 </$list>

core/ui/PageControls/full-screen.tid

@@ -3,7 +3,7 @@ tags: $:/tags/PageControls
 caption: {{$:/core/images/full-screen-button}} {{$:/language/Buttons/FullScreen/Caption}}
 description: {{$:/language/Buttons/FullScreen/Hint}}
 
-<$button message="tm-full-screen" title={{$:/language/Buttons/FullScreen/Hint}} aria-label={{$:/language/Buttons/FullScreen/Caption}} class=<<tv-config-toolbar-class>>>
+<$button message="tm-full-screen" tooltip={{$:/language/Buttons/FullScreen/Hint}} aria-label={{$:/language/Buttons/FullScreen/Caption}} class=<<tv-config-toolbar-class>>>
 <$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
 {{$:/core/images/full-screen-button}}
 </$list>

core/ui/PageControls/home.tid

@@ -3,7 +3,7 @@ tags: $:/tags/PageControls
 caption: {{$:/core/images/home-button}} {{$:/language/Buttons/Home/Caption}}
 description: {{$:/language/Buttons/Home/Hint}}
 
-<$button message="tm-home" title={{$:/language/Buttons/Home/Hint}} aria-label={{$:/language/Buttons/Home/Caption}} class=<<tv-config-toolbar-class>>>
+<$button message="tm-home" tooltip={{$:/language/Buttons/Home/Hint}} aria-label={{$:/language/Buttons/Home/Caption}} class=<<tv-config-toolbar-class>>>
 <$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
 {{$:/core/images/home-button}}
 </$list>

core/ui/PageControls/import.tid

@@ -4,7 +4,7 @@ caption: {{$:/core/images/import-button}} {{$:/language/Buttons/Import/Caption}}
 description: {{$:/language/Buttons/Import/Hint}}
 
 <div class="tc-file-input-wrapper">
-<$button title={{$:/language/Buttons/Import/Hint}} aria-label={{$:/language/Buttons/Import/Caption}} class=<<tv-config-toolbar-class>>>
+<$button tooltip={{$:/language/Buttons/Import/Hint}} aria-label={{$:/language/Buttons/Import/Caption}} class=<<tv-config-toolbar-class>>>
 <$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
 {{$:/core/images/import-button}}
 </$list>

core/ui/PageControls/language.tid

@@ -6,7 +6,7 @@ description: {{$:/language/Buttons/Language/Hint}}
 \define flag-title()
 $(languagePluginTitle)$/icon
 \end
-<$button popup=<<qualify "$:/state/popup/language">> title={{$:/language/Buttons/Language/Hint}} aria-label={{$:/language/Buttons/Language/Caption}} class=<<tv-config-toolbar-class>> selectedClass="tc-selected">
+<$button popup=<<qualify "$:/state/popup/language">> tooltip={{$:/language/Buttons/Language/Hint}} aria-label={{$:/language/Buttons/Language/Caption}} class=<<tv-config-toolbar-class>> selectedClass="tc-selected">
 <$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
 <span class="tc-image-button">
 <$set name="languagePluginTitle" value={{$:/language}}>

core/ui/PageControls/more-page-actions.tid

@@ -6,7 +6,7 @@ description: {{$:/language/Buttons/More/Hint}}
 \define config-title()
 $:/config/PageControlButtons/Visibility/$(listItem)$
 \end
-<$button popup=<<qualify "$:/state/popup/more">> title={{$:/language/Buttons/More/Hint}} aria-label={{$:/language/Buttons/More/Caption}} class=<<tv-config-toolbar-class>> selectedClass="tc-selected">
+<$button popup=<<qualify "$:/state/popup/more">> tooltip={{$:/language/Buttons/More/Hint}} aria-label={{$:/language/Buttons/More/Caption}} class=<<tv-config-toolbar-class>> selectedClass="tc-selected">
 <$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
 {{$:/core/images/down-arrow}}
 </$list>

core/ui/PageControls/newtiddler.tid

@@ -3,7 +3,7 @@ tags: $:/tags/PageControls
 caption: {{$:/core/images/new-button}} {{$:/language/Buttons/NewTiddler/Caption}}
 description: {{$:/language/Buttons/NewTiddler/Hint}}
 
-<$button message="tm-new-tiddler" title={{$:/language/Buttons/NewTiddler/Hint}} aria-label={{$:/language/Buttons/NewTiddler/Caption}} class=<<tv-config-toolbar-class>>>
+<$button message="tm-new-tiddler" tooltip={{$:/language/Buttons/NewTiddler/Hint}} aria-label={{$:/language/Buttons/NewTiddler/Caption}} class=<<tv-config-toolbar-class>>>
 <$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
 {{$:/core/images/new-button}}
 </$list>

core/ui/PageControls/refresh.tid

@@ -3,7 +3,7 @@ tags: $:/tags/PageControls
 caption: {{$:/core/images/refresh-button}} {{$:/language/Buttons/Refresh/Caption}}
 description: {{$:/language/Buttons/Refresh/Hint}}
 
-<$button message="tm-browser-refresh" title={{$:/language/Buttons/Refresh/Hint}} aria-label={{$:/language/Buttons/Refresh/Caption}} class=<<tv-config-toolbar-class>>>
+<$button message="tm-browser-refresh" tooltip={{$:/language/Buttons/Refresh/Hint}} aria-label={{$:/language/Buttons/Refresh/Caption}} class=<<tv-config-toolbar-class>>>
 <$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
 {{$:/core/images/refresh-button}}
 </$list>

core/ui/PageControls/savewiki.tid

@@ -3,7 +3,7 @@ tags: $:/tags/PageControls
 caption: {{$:/core/images/save-button}} {{$:/language/Buttons/SaveWiki/Caption}}
 description: {{$:/language/Buttons/SaveWiki/Hint}}
 
-<$button message="tm-save-wiki" param={{$:/config/SaveWikiButton/Template}} title={{$:/language/Buttons/SaveWiki/Hint}} aria-label={{$:/language/Buttons/SaveWiki/Caption}} class=<<tv-config-toolbar-class>>>
+<$button message="tm-save-wiki" param={{$:/config/SaveWikiButton/Template}} tooltip={{$:/language/Buttons/SaveWiki/Hint}} aria-label={{$:/language/Buttons/SaveWiki/Caption}} class=<<tv-config-toolbar-class>>>
 <span class="tc-dirty-indicator">
 <$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
 {{$:/core/images/save-button}}

core/ui/PageControls/storyview.tid

@@ -6,7 +6,7 @@ description: {{$:/language/Buttons/StoryView/Hint}}
 \define icon()
 $:/core/images/storyview-$(storyview)$
 \end
-<$button popup=<<qualify "$:/state/popup/storyview">> title={{$:/language/Buttons/StoryView/Hint}} aria-label={{$:/language/Buttons/StoryView/Caption}} class=<<tv-config-toolbar-class>> selectedClass="tc-selected">
+<$button popup=<<qualify "$:/state/popup/storyview">> tooltip={{$:/language/Buttons/StoryView/Hint}} aria-label={{$:/language/Buttons/StoryView/Caption}} class=<<tv-config-toolbar-class>> selectedClass="tc-selected">
 <$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
 <$set name="storyview" value={{$:/view}}>
 <$transclude tiddler=<<icon>>/>

core/ui/PageControls/tag-button.tid

@@ -3,7 +3,7 @@ tags: $:/tags/PageControls
 caption: {{$:/core/images/tag-button}} {{$:/language/Buttons/TagManager/Caption}}
 description: {{$:/language/Buttons/TagManager/Hint}}
 
-<$button to="$:/TagManager" title={{$:/language/Buttons/TagManager/Hint}} aria-label={{$:/language/Buttons/TagManager/Caption}} class=<<tv-config-toolbar-class>>>
+<$button to="$:/TagManager" tooltip={{$:/language/Buttons/TagManager/Hint}} aria-label={{$:/language/Buttons/TagManager/Caption}} class=<<tv-config-toolbar-class>>>
 <$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
 {{$:/core/images/tag-button}}
 </$list>

core/ui/PageControls/theme.tid

@@ -3,7 +3,7 @@ tags: $:/tags/PageControls
 caption: {{$:/core/images/theme-button}} {{$:/language/Buttons/Theme/Caption}}
 description: {{$:/language/Buttons/Theme/Hint}}
 
-<$button popup=<<qualify "$:/state/popup/theme">> title={{$:/language/Buttons/Theme/Hint}} aria-label={{$:/language/Buttons/Theme/Caption}} class=<<tv-config-toolbar-class>> selectedClass="tc-selected">
+<$button popup=<<qualify "$:/state/popup/theme">> tooltip={{$:/language/Buttons/Theme/Hint}} aria-label={{$:/language/Buttons/Theme/Caption}} class=<<tv-config-toolbar-class>> selectedClass="tc-selected">
 <$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
 {{$:/core/images/theme-button}}
 </$list>

core/ui/PageStylesheet.tid

@@ -2,8 +2,12 @@ title: $:/core/ui/PageStylesheet
 
 <$importvariables filter="[[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]">
 
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/stylesheet]!has[draft.of]]">
-<$transclude/>
+<!-- DEPRECATION WARNING --><$list filter="[all[shadows+tiddlers]tag[$:/tags/stylesheet]!has[draft.of]]">
+<$transclude mode="block"/>
+</$list>
+
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/Stylesheet]!has[draft.of]]">
+<$transclude mode="block"/>
 </$list>
 
 </$importvariables>

core/ui/PageTemplate/story.tid

@@ -3,6 +3,12 @@ tags: $:/tags/PageTemplate
 
 <section class="tc-story-river">
 
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/stylesheet]!has[draft.of]]">
+
+<!-- DEPRECATION WARNING -->WARNING: tag "$:/tags/stylesheet" on <$link><$view field="title"/></$link> should be replaced with "$:/tags/Stylesheet"
+
+</$list>
+
 <section class="story-backdrop">
 
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/AboveStory]!has[draft.of]]">

core/ui/SideBar/Open.tid

@@ -5,7 +5,7 @@ caption: {{$:/language/SideBar/Open/Caption}}
 \define lingo-base() $:/language/CloseAll/
 <$list filter="[list[$:/StoryList]]" history="$:/HistoryList" storyview="pop">
 
-<$button message="tm-close-tiddler" title={{$:/language/Buttons/Close/Hint}} aria-label={{$:/language/Buttons/Close/Caption}} class="tc-btn-invisible tc-btn-mini">&times;</$button> <$link to={{!!title}}><$view field="title"/></$link>
+<$button message="tm-close-tiddler" tooltip={{$:/language/Buttons/Close/Hint}} aria-label={{$:/language/Buttons/Close/Caption}} class="tc-btn-invisible tc-btn-mini">&times;</$button> <$link to={{!!title}}><$view field="title"/></$link>
 
 </$list>
 

core/ui/SideBar/Recent.tid

@@ -2,4 +2,4 @@ title: $:/core/ui/SideBar/Recent
 tags: $:/tags/SideBar
 caption: {{$:/language/SideBar/Recent/Caption}}
 
-{{$:/snippets/recentchanges}}
+<$macrocall $name="timeline" format={{$:/language/RecentChanges/DateFormat}}/>

core/ui/TagManager.tid

@@ -26,14 +26,12 @@ title: $:/TagManager
 <tbody>
 <tr>
 <th><<lingo Tag/Heading>></th>
-<th><<lingo Count/Heading>></th>
 <th><<lingo Colour/Heading>></th>
 <th><<lingo Icon/Heading>></th>
 </tr>
 <$list filter="[tags[]!is[system]sort[title]]">
 <tr>
 <td><$transclude tiddler="$:/core/ui/TagTemplate"/></td>
-<td><$count filter="[all[current]tagging[]]"/></td>
 <td><$edit-text field="color" tag="input" type="text" size="9"/> <$edit-text field="color" tag="input" type="color"/></td>
 <td><$macrocall $name="iconEditor" title={{!!title}}/></td>
 </tr>

core/ui/TopRightBar/menu.tid

@@ -2,8 +2,8 @@ title: $:/core/ui/TopBar/menu
 tags: $:/tags/TopRightBar
 
 <$reveal state="$:/state/sidebar" type="nomatch" text="no">
-<$button set="$:/state/sidebar" setTo="no" title={{$:/language/Buttons/HideSideBar/Hint}} aria-label={{$:/language/Buttons/HideSideBar/Caption}} class="tc-btn-invisible">{{$:/core/images/chevron-right}}</$button>
+<$button set="$:/state/sidebar" setTo="no" tooltip={{$:/language/Buttons/HideSideBar/Hint}} aria-label={{$:/language/Buttons/HideSideBar/Caption}} class="tc-btn-invisible">{{$:/core/images/chevron-right}}</$button>
 </$reveal>
 <$reveal state="$:/state/sidebar" type="match" text="no">
-<$button set="$:/state/sidebar" setTo="yes" title={{$:/language/Buttons/ShowSideBar/Hint}} aria-label={{$:/language/Buttons/ShowSideBar/Caption}} class="tc-btn-invisible">{{$:/core/images/chevron-left}}</$button>
+<$button set="$:/state/sidebar" setTo="yes" tooltip={{$:/language/Buttons/ShowSideBar/Hint}} aria-label={{$:/language/Buttons/ShowSideBar/Caption}} class="tc-btn-invisible">{{$:/core/images/chevron-left}}</$button>
 </$reveal>

core/ui/ViewTemplate/body.tid

@@ -3,7 +3,7 @@ tags: $:/tags/ViewTemplate
 
 <div class="tc-tiddler-body">
 
-<$list filter="[all[current]!has[plugin-type]]">
+<$list filter="[all[current]!has[plugin-type]!field:hide-body[yes]]">
 
 <$transclude>