tiddlywiki 5.3.8 → 5.4.0

package/core/modules/utils/filesystem.js

@@ -1,542 +0,0 @@
-/*\
-title: $:/core/modules/utils/filesystem.js
-type: application/javascript
-module-type: utils-node
-
-File system utilities
-
-\*/
-
-"use strict";
-
-var fs = require("fs"),
-	path = require("path");
-
-/*
-Return the subdirectories of a path
-*/
-exports.getSubdirectories = function(dirPath) {
-	if(!$tw.utils.isDirectory(dirPath)) {
-		return null;
-	}
-	var subdirs = [];
-	$tw.utils.each(fs.readdirSync(dirPath),function(item) {
-		if($tw.utils.isDirectory(path.resolve(dirPath,item))) {
-			subdirs.push(item);
-		}
-	});
-	return subdirs;
-}
-
-/*
-Recursively (and synchronously) copy a directory and all its content
-*/
-exports.copyDirectory = function(srcPath,dstPath) {
-	// Remove any trailing path separators
-	srcPath = path.resolve($tw.utils.removeTrailingSeparator(srcPath));
-	dstPath = path.resolve($tw.utils.removeTrailingSeparator(dstPath));
-	// Check that neither director is within the other
-	if(srcPath.substring(0,dstPath.length) === dstPath || dstPath.substring(0,srcPath.length) === srcPath) {
-		return "Cannot copy nested directories";
-	}
-	// Create the destination directory
-	var err = $tw.utils.createDirectory(dstPath);
-	if(err) {
-		return err;
-	}
-	// Function to copy a folder full of files
-	var copy = function(srcPath,dstPath) {
-		var srcStats = fs.lstatSync(srcPath),
-			dstExists = fs.existsSync(dstPath);
-		if(srcStats.isFile()) {
-			$tw.utils.copyFile(srcPath,dstPath);
-		} else if(srcStats.isDirectory()) {
-			var items = fs.readdirSync(srcPath);
-			for(var t=0; t<items.length; t++) {
-				var item = items[t],
-					err = copy(srcPath + path.sep + item,dstPath + path.sep + item);
-				if(err) {
-					return err;
-				}
-			}
-		}
-	};
-	copy(srcPath,dstPath);
-	return null;
-};
-
-/*
-Copy a file
-*/
-var FILE_BUFFER_LENGTH = 64 * 1024,
-	fileBuffer;
-
-exports.copyFile = function(srcPath,dstPath) {
-	// Create buffer if required
-	if(!fileBuffer) {
-		fileBuffer = Buffer.alloc(FILE_BUFFER_LENGTH);
-	}
-	// Create any directories in the destination
-	$tw.utils.createDirectory(path.dirname(dstPath));
-	// Copy the file
-	var srcFile = fs.openSync(srcPath,"r"),
-		dstFile = fs.openSync(dstPath,"w"),
-		bytesRead = 1,
-		pos = 0;
-	while (bytesRead > 0) {
-		bytesRead = fs.readSync(srcFile,fileBuffer,0,FILE_BUFFER_LENGTH,pos);
-		fs.writeSync(dstFile,fileBuffer,0,bytesRead);
-		pos += bytesRead;
-	}
-	fs.closeSync(srcFile);
-	fs.closeSync(dstFile);
-	return null;
-};
-
-/*
-Remove trailing path separator
-*/
-exports.removeTrailingSeparator = function(dirPath) {
-	var len = dirPath.length;
-	if(dirPath.charAt(len-1) === path.sep) {
-		dirPath = dirPath.substr(0,len-1);
-	}
-	return dirPath;
-};
-
-/*
-Recursively create a directory
-*/
-exports.createDirectory = function(dirPath) {
-	if(dirPath.substr(dirPath.length-1,1) !== path.sep) {
-		dirPath = dirPath + path.sep;
-	}
-	var pos = 1;
-	pos = dirPath.indexOf(path.sep,pos);
-	while(pos !== -1) {
-		var subDirPath = dirPath.substr(0,pos);
-		if(!$tw.utils.isDirectory(subDirPath)) {
-			try {
-				fs.mkdirSync(subDirPath);
-			} catch(e) {
-				return "Error creating directory '" + subDirPath + "'";
-			}
-		}
-		pos = dirPath.indexOf(path.sep,pos + 1);
-	}
-	return null;
-};
-
-/*
-Recursively create directories needed to contain a specified file
-*/
-exports.createFileDirectories = function(filePath) {
-	return $tw.utils.createDirectory(path.dirname(filePath));
-};
-
-/*
-Recursively delete a directory
-*/
-exports.deleteDirectory = function(dirPath) {
-	if(fs.existsSync(dirPath)) {
-		var entries = fs.readdirSync(dirPath);
-		for(var entryIndex=0; entryIndex<entries.length; entryIndex++) {
-			var currPath = dirPath + path.sep + entries[entryIndex];
-			if(fs.lstatSync(currPath).isDirectory()) {
-				$tw.utils.deleteDirectory(currPath);
-			} else {
-				fs.unlinkSync(currPath);
-			}
-		}
-	fs.rmdirSync(dirPath);
-	}
-	return null;
-};
-
-/*
-Check if a path identifies a directory
-*/
-exports.isDirectory = function(dirPath) {
-	return fs.existsSync(dirPath) && fs.statSync(dirPath).isDirectory();
-};
-
-/*
-Check if a path identifies a directory that is empty
-*/
-exports.isDirectoryEmpty = function(dirPath) {
-	if(!$tw.utils.isDirectory(dirPath)) {
-		return false;
-	}
-	var files = fs.readdirSync(dirPath),
-		empty = true;
-	$tw.utils.each(files,function(file,index) {
-		if(file.charAt(0) !== ".") {
-			empty = false;
-		}
-	});
-	return empty;
-};
-
-/*
-Recursively delete a tree of empty directories
-*/
-exports.deleteEmptyDirs = function(dirpath,callback) {
-	var self = this;
-	fs.readdir(dirpath,function(err,files) {
-		if(err) {
-			return callback(err);
-		}
-		if(files.length > 0) {
-			return callback(null);
-		}
-		fs.rmdir(dirpath,function(err) {
-			if(err) {
-				return callback(err);
-			}
-			self.deleteEmptyDirs(path.dirname(dirpath),callback);
-		});
-	});
-};
-
-/*
-Create a fileInfo object for saving a tiddler:
-	filepath: the absolute path to the file containing the tiddler
-	type: the type of the tiddler file on disk (NOT the type of the tiddler)
-	hasMetaFile: true if the file also has a companion .meta file
-	isEditableFile: true if the tiddler was loaded via non-standard options & marked editable
-Options include:
-	directory: absolute path of root directory to which we are saving
-	pathFilters: optional array of filters to be used to generate the base path
-	extFilters: optional array of filters to be used to generate the base path
-	wiki: optional wiki for evaluating the pathFilters,
-	fileInfo: an existing fileInfo to check against
-*/
-exports.generateTiddlerFileInfo = function(tiddler,options) {
-	var fileInfo = {}, metaExt;
-	// Propagate the isEditableFile flag
-	if(options.fileInfo && !!options.fileInfo.isEditableFile) {
-		fileInfo.isEditableFile = true;
-		fileInfo.originalpath = options.fileInfo.originalpath;
-	}
-	// Check if the tiddler has any unsafe fields that can't be expressed in a .tid or .meta file: containing control characters, or leading/trailing whitespace
-	var hasUnsafeFields = false;
-	$tw.utils.each(tiddler.getFieldStrings(),function(value,fieldName) {
-		if(fieldName !== "text") {
-			hasUnsafeFields = hasUnsafeFields || /[\x00-\x1F]/mg.test(value);
-			hasUnsafeFields = hasUnsafeFields || ($tw.utils.trim(value) !== value);
-		}
-		hasUnsafeFields = hasUnsafeFields || /:|#/mg.test(fieldName);
-	});
-	// Check for field values 
-	if(hasUnsafeFields) {
-		// Save as a JSON file
-		fileInfo.type = "application/json";
-		fileInfo.hasMetaFile = false;
-	} else {
-		// Save as a .tid or a text/binary file plus a .meta file
-		var tiddlerType = tiddler.fields.type || "text/vnd.tiddlywiki";
-		if(tiddlerType === "text/vnd.tiddlywiki" || tiddlerType === "text/vnd.tiddlywiki-multiple" || tiddler.hasField("_canonical_uri")) {
-			// Save as a .tid file
-			fileInfo.type = "application/x-tiddler";
-			fileInfo.hasMetaFile = false;
-		} else {
-			// Save as a text/binary file and a .meta file
-			fileInfo.type = tiddlerType;
-			fileInfo.hasMetaFile = true;
-		}
-		if(options.extFilters) {
-			// Check for extension overrides
-			metaExt = $tw.utils.generateTiddlerExtension(tiddler.fields.title,{
-				extFilters: options.extFilters,
-				wiki: options.wiki
-			});
-			if(metaExt) {
-				if(metaExt === ".tid") {
-					// Overriding to the .tid extension needs special handling
-					fileInfo.type = "application/x-tiddler";
-					fileInfo.hasMetaFile = false;
-				} else if (metaExt === ".json") {
-					// Overriding to the .json extension needs special handling
-					fileInfo.type = "application/json";
-					fileInfo.hasMetaFile = false;
-				} else {
-					//If the new type matches a known extention, use that MIME type's encoding
-					var extInfo = $tw.utils.getFileExtensionInfo(metaExt);
-					fileInfo.type = extInfo ? extInfo.type : null;
-					fileInfo.encoding = $tw.utils.getTypeEncoding(metaExt);
-					fileInfo.hasMetaFile = true;
-				}
-			}
-		}
-	}
-	// Take the file extension from the tiddler content type or metaExt
-	var contentTypeInfo = $tw.config.contentTypeInfo[fileInfo.type] || {extension: ""};
-	// Generate the filepath
-	fileInfo.filepath = $tw.utils.generateTiddlerFilepath(tiddler.fields.title,{
-		extension: metaExt || contentTypeInfo.extension,
-		directory: options.directory,
-		pathFilters: options.pathFilters,
-		wiki: options.wiki,
-		fileInfo: options.fileInfo
-	});
-	return fileInfo;
-};
-
-/*
-Generate the file extension for saving a tiddler
-Options include:
-	extFilters: optional array of filters to be used to generate the extention
-	wiki: optional wiki for evaluating the extFilters
-*/
-exports.generateTiddlerExtension = function(title,options) {
-	var extension;
-	// Check if any of the extFilters applies
-	if(options.extFilters && options.wiki) { 
-		$tw.utils.each(options.extFilters,function(filter) {
-			if(!extension) {
-				var source = options.wiki.makeTiddlerIterator([title]),
-					result = options.wiki.filterTiddlers(filter,null,source);
-				if(result.length > 0) {
-					extension = result[0];
-				}
-			}
-		});
-	}
-	return extension;
-};
-
-/*
-Generate the filepath for saving a tiddler
-Options include:
-	extension: file extension to be added the finished filepath
-	directory: absolute path of root directory to which we are saving
-	pathFilters: optional array of filters to be used to generate the base path
-	wiki: optional wiki for evaluating the pathFilters
-	fileInfo: an existing fileInfo object to check against
-	fileInfo.overwrite: if true, turns off filename clash numbers (defaults to false)
-*/
-exports.generateTiddlerFilepath = function(title,options) {
-	var directory = options.directory || "",
-		extension = options.extension || "",
-		originalpath = (options.fileInfo && options.fileInfo.originalpath) ? options.fileInfo.originalpath : "",
-		overwrite = options.fileInfo && options.fileInfo.overwrite || false,
-		filepath;
-	// Check if any of the pathFilters applies
-	if(options.pathFilters && options.wiki) {
-		$tw.utils.each(options.pathFilters,function(filter) {
-			if(!filepath) {
-				var source = options.wiki.makeTiddlerIterator([title]),
-					result = options.wiki.filterTiddlers(filter,null,source);
-				if(result.length > 0) {
-					filepath = result[0];
-				}
-			}
-		});
-	}
-	if(!filepath && !!originalpath) {
-		//Use the originalpath without the extension
-		var ext = path.extname(originalpath);
-		filepath = originalpath.substring(0,originalpath.length - ext.length);
-	} else if(!filepath) {
-		filepath = title;
-		// Remove any forward or backward slashes so we don't create directories
-		filepath = filepath.replace(/\/|\\/g,"_");
-	}
-	// Replace any Windows control codes
-	filepath = filepath.replace(/^(con|prn|aux|nul|com[0-9]|lpt[0-9])$/i,"_$1_");
-	// Replace any leading spaces with the same number of underscores
-	filepath = filepath.replace(/^ +/,function (u) { return u.replace(/ /g, "_")});
-	//If the path does not start with "." or ".." && a path seperator, then
-	if(!/^\.{1,2}[/\\]/g.test(filepath)) {
-		// Don't let the filename start with any dots because such files are invisible on *nix
-		filepath = filepath.replace(/^\.+/g,function (u) { return u.replace(/\./g, "_")});
-	}
-	// Replace any Unicode control codes
-	filepath = filepath.replace(/[\x00-\x1f\x80-\x9f]/g,"_");
-	// Replace any characters that can't be used in cross-platform filenames
-	filepath = $tw.utils.transliterate(filepath.replace(/<|>|~|\:|\"|\||\?|\*|\^/g,"_"));
-	// Replace any dots or spaces at the end of the extension with the same number of underscores
-	extension = extension.replace(/[\. ]+$/, function (u) { return u.replace(/[\. ]/g, "_")});
-	// Truncate the extension if it is too long
-	if(extension.length > 32) {
-		extension = extension.substr(0,32);
-	}
-	// If the filepath already ends in the extension then remove it
-	if(filepath.substring(filepath.length - extension.length) === extension) {
-		filepath = filepath.substring(0,filepath.length - extension.length);
-	}
-	// Truncate the filename if it is too long
-	if(filepath.length > 200) {
-		filepath = filepath.substr(0,200);
-	}
-	// If the resulting filename is blank (eg because the title is just punctuation)
-	if(!filepath || /^_+$/g.test(filepath)) {
-		// ...then just use the character codes of the title
-		filepath = "";
-		$tw.utils.each(title.split(""),function(char) {
-			if(filepath) {
-				filepath += "-";
-			}
-			filepath += char.charCodeAt(0).toString();
-		});
-	}
-	// Add a uniquifier if the file already exists (default)
-	var fullPath = path.resolve(directory, filepath + extension);
-	if (!overwrite) {
-		var oldPath = (options.fileInfo) ? options.fileInfo.filepath : undefined,
-		count = 0;
-		do {
-			fullPath = path.resolve(directory,filepath + (count ? "_" + count : "") + extension);
-			if(oldPath && oldPath == fullPath) break;
-			count++;
-		} while(fs.existsSync(fullPath));
-	}
-	// If the last write failed with an error, or if path does not start with:
-	//	the resolved options.directory, the resolved wikiPath directory, the wikiTiddlersPath directory, 
-	//	or the 'originalpath' directory, then $tw.utils.encodeURIComponentExtended() and resolve to options.directory.
-	var writePath = $tw.hooks.invokeHook("th-make-tiddler-path",fullPath,fullPath),
-		encode = (options.fileInfo || {writeError: false}).writeError == true;
-	if(!encode) {
-		encode = !(writePath.indexOf($tw.boot.wikiTiddlersPath) == 0 ||
-			writePath.indexOf(path.resolve(directory)) == 0 ||
-			writePath.indexOf(path.resolve($tw.boot.wikiPath)) == 0 ||
-			writePath.indexOf(path.resolve($tw.boot.wikiTiddlersPath,originalpath)) == 0 );
-		}
-	if(encode) {
-		writePath = path.resolve(directory,$tw.utils.encodeURIComponentExtended(fullPath));
-	}
-	// Return the full path to the file
-	return writePath;
-};
-
-/*
-Save a tiddler to a file described by the fileInfo:
-	filepath: the absolute path to the file containing the tiddler
-	type: the type of the tiddler file (NOT the type of the tiddler)
-	hasMetaFile: true if the file also has a companion .meta file
-*/
-exports.saveTiddlerToFile = function(tiddler,fileInfo,callback) {
-	$tw.utils.createDirectory(path.dirname(fileInfo.filepath));
-	if(fileInfo.hasMetaFile) {
-		// Save the tiddler as a separate body and meta file
-		var typeInfo = $tw.config.contentTypeInfo[tiddler.fields.type || "text/plain"] || {encoding: "utf8"};
-		fs.writeFile(fileInfo.filepath,tiddler.fields.text || "",typeInfo.encoding,function(err) {
-			if(err) {
-				return callback(err);
-			}
-			fs.writeFile(fileInfo.filepath + ".meta",tiddler.getFieldStringBlock({exclude: ["text","bag"]}),"utf8",function(err) {
-				if(err) {
-					return callback(err);
-				}
-				return callback(null,fileInfo);
-			});
-		});
-	} else {
-		// Save the tiddler as a self contained templated file
-		if(fileInfo.type === "application/x-tiddler") {
-			fs.writeFile(fileInfo.filepath,tiddler.getFieldStringBlock({exclude: ["text","bag"]}) + (!!tiddler.fields.text ? "\n\n" + tiddler.fields.text : ""),"utf8",function(err) {
-				if(err) {
-					return callback(err);
-				}
-				return callback(null,fileInfo);
-			});
-		} else {
-			fs.writeFile(fileInfo.filepath,JSON.stringify([tiddler.getFieldStrings({exclude: ["bag"]})],null,$tw.config.preferences.jsonSpaces),"utf8",function(err) {
-				if(err) {
-					return callback(err);
-				}
-				return callback(null,fileInfo);
-			});
-		}
-	}
-};
-
-/*
-Save a tiddler to a file described by the fileInfo:
-	filepath: the absolute path to the file containing the tiddler
-	type: the type of the tiddler file (NOT the type of the tiddler)
-	hasMetaFile: true if the file also has a companion .meta file
-*/
-exports.saveTiddlerToFileSync = function(tiddler,fileInfo) {
-	$tw.utils.createDirectory(path.dirname(fileInfo.filepath));
-	if(fileInfo.hasMetaFile) {
-		// Save the tiddler as a separate body and meta file
-		var typeInfo = $tw.config.contentTypeInfo[tiddler.fields.type || "text/plain"] || {encoding: "utf8"};
-		fs.writeFileSync(fileInfo.filepath,tiddler.fields.text || "",typeInfo.encoding);
-		fs.writeFileSync(fileInfo.filepath + ".meta",tiddler.getFieldStringBlock({exclude: ["text","bag"]}),"utf8");
-	} else {
-		// Save the tiddler as a self contained templated file
-		if(fileInfo.type === "application/x-tiddler") {
-			fs.writeFileSync(fileInfo.filepath,tiddler.getFieldStringBlock({exclude: ["text","bag"]}) + (!!tiddler.fields.text ? "\n\n" + tiddler.fields.text : ""),"utf8");
-		} else {
-			fs.writeFileSync(fileInfo.filepath,JSON.stringify([tiddler.getFieldStrings({exclude: ["bag"]})],null,$tw.config.preferences.jsonSpaces),"utf8");
-		}
-	}
-	return fileInfo;
-};
-
-/*
-Delete a file described by the fileInfo if it exits
-*/
-exports.deleteTiddlerFile = function(fileInfo,callback) {
-	//Only attempt to delete files that exist on disk
-	if(!fileInfo.filepath || !fs.existsSync(fileInfo.filepath)) {
-		//For some reason, the tiddler is only in memory or we can't modify the file at this path
-		$tw.syncer.displayError("Server deleteTiddlerFile task failed for filepath: "+fileInfo.filepath);
-		return callback(null,fileInfo);
-	}
-	// Delete the file
-	fs.unlink(fileInfo.filepath,function(err) {
-		if(err) {
-			return callback(err);
-		}
-		// Delete the metafile if present
-		if(fileInfo.hasMetaFile && fs.existsSync(fileInfo.filepath + ".meta")) {
-			fs.unlink(fileInfo.filepath + ".meta",function(err) {
-				if(err) {
-					return callback(err);
-				}
-				return $tw.utils.deleteEmptyDirs(path.dirname(fileInfo.filepath),function(err) {
-					if(err) {
-						return callback(err);
-					}
-					return callback(null,fileInfo);
-				});
-			});
-		} else {
-			return $tw.utils.deleteEmptyDirs(path.dirname(fileInfo.filepath),function(err) {
-				if(err) {
-					return callback(err);
-				}
-				return callback(null,fileInfo);
-			});
-		}
-	});
-};
-
-/*
-Cleanup old files on disk, by comparing the options values:
-	adaptorInfo from $tw.syncer.tiddlerInfo
-	bootInfo from $tw.boot.files
-*/
-exports.cleanupTiddlerFiles = function(options,callback) {
-	var adaptorInfo = options.adaptorInfo || {},
-	bootInfo = options.bootInfo || {},
-	title = options.title || "undefined";
-	if(adaptorInfo.filepath && bootInfo.filepath && adaptorInfo.filepath !== bootInfo.filepath) {
-		$tw.utils.deleteTiddlerFile(adaptorInfo,function(err) {
-			if(err) {
-				if ((err.code == "EPERM" || err.code == "EACCES") && err.syscall == "unlink") {
-					// Error deleting the previous file on disk, should fail gracefully
-					$tw.syncer.displayError("Server desynchronized. Error cleaning up previous file for tiddler: \""+title+"\"",err);
-					return callback(null,bootInfo);
-				} else {
-					return callback(err);
-				}
-			}
-			return callback(null,bootInfo);
-		});
-	} else {
-		return callback(null,bootInfo);
-	}
-};

package/core/modules/utils/repository.js

@@ -1,46 +0,0 @@
-/*\
-title: $:/core/modules/utils/repository.js
-type: application/javascript
-module-type: utils
-
-Utilities for working with the TiddlyWiki repository file structure
-
-\*/
-"use strict";
-
-/*
-Get an object containing all the plugins as a hashmap by title of the JSON representation of the plugin
-Options:
-
-ignoreEnvironmentVariables: defaults to false
-*/
-exports.getAllPlugins = function(options) {
-	options = options || {};
-	var fs = require("fs"),
-		path = require("path"),
-		tiddlers = {};
-	// Collect up the library plugins
-	var collectPlugins = function(folder) {
-			var pluginFolders = $tw.utils.getSubdirectories(folder) || [];
-			for(var p=0; p<pluginFolders.length; p++) {
-				if(!$tw.boot.excludeRegExp.test(pluginFolders[p])) {
-					var pluginFields = $tw.loadPluginFolder(path.resolve(folder,"./" + pluginFolders[p]));
-					if(pluginFields && pluginFields.title) {
-						tiddlers[pluginFields.title] = pluginFields;
-					}
-				}
-			}
-		},
-		collectPublisherPlugins = function(folder) {
-			var publisherFolders = $tw.utils.getSubdirectories(folder) || [];
-			for(var t=0; t<publisherFolders.length; t++) {
-				if(!$tw.boot.excludeRegExp.test(publisherFolders[t])) {
-					collectPlugins(path.resolve(folder,"./" + publisherFolders[t]));
-				}
-			}
-		};
-	$tw.utils.each($tw.getLibraryItemSearchPaths($tw.config.pluginsPath,options.ignoreEnvironmentVariables ? undefined : $tw.config.pluginsEnvVar),collectPublisherPlugins);
-	$tw.utils.each($tw.getLibraryItemSearchPaths($tw.config.themesPath,options.ignoreEnvironmentVariables ? undefined : $tw.config.themesEnvVar),collectPublisherPlugins);
-	$tw.utils.each($tw.getLibraryItemSearchPaths($tw.config.languagesPath,options.ignoreEnvironmentVariables ? undefined : $tw.config.languagesEnvVar),collectPlugins);
-	return tiddlers;
-};

package/editions/d3demo/tiddlers/CloudData.tid

@@ -1,44 +0,0 @@
-title: CloudData
-type: application/json
-
-[
-	{"text": "Tokyo/Yokohama", "size": 33.200},
-	{"text": "New York Metro", "size": 17.800},
-	{"text": "Sao Paulo", "size": 17.700},
-	{"text": "Seoul/Incheon", "size": 17.500},
-	{"text": "Mexico City", "size": 17.400},
-	{"text": "Osaka/Kobe/Kyoto", "size": 16.425},
-	{"text": "Manila", "size": 14.750},
-	{"text": "Mumbai", "size": 14.350},
-	{"text": "Delhi", "size": 14.300},
-	{"text": "Jakarta", "size": 14.250},
-	{"text": "Lagos", "size": 13.400},
-	{"text": "Kolkata", "size": 12.700},
-	{"text": "Cairo", "size": 12.200},
-	{"text": "Los Angeles", "size": 11.789},
-	{"text": "Buenos Aires", "size": 11.200},
-	{"text": "Rio de Janeiro", "size": 10.800},
-	{"text": "Moscow", "size": 10.500},
-	{"text": "Shanghai", "size": 10.000},
-	{"text": "Karachi", "size": 9.800},
-	{"text": "Paris", "size": 9.645},
-	{"text": "Istanbul", "size": 9.000},
-	{"text": "Nagoya", "size": 9.000},
-	{"text": "Beijing", "size": 8.614},
-	{"text": "Chicago", "size": 8.308},
-	{"text": "London", "size": 8.278},
-	{"text": "Shenzhen", "size": 8.000},
-	{"text": "Essen/Dusseldorf", "size": 7.350},
-	{"text": "Tehran", "size": 7.250},
-	{"text": "Bogota", "size": 7.000},
-	{"text": "Lima", "size": 7.000},
-	{"text": "Bangkok", "size": 6.500},
-	{"text": "Johannesburg/East Rand", "size": 6.000},
-	{"text": "Chennai", "size": 5.950},
-	{"text": "Taipei", "size": 5.700},
-	{"text": "Baghdad", "size": 5.500},
-	{"text": "Santiago", "size": 5.425},
-	{"text": "Bangalore", "size": 5.400},
-	{"text": "Hyderabad", "size": 5.300},
-	{"text": "St Petersburg", "size": 5.300}
-]

package/editions/d3demo/tiddlers/DefaultTiddlers.tid

@@ -1,3 +0,0 @@
-title: $:/DefaultTiddlers
-
-[[HelloThere]]

package/editions/d3demo/tiddlers/GraphData.tid

@@ -1,10 +0,0 @@
-title: GraphData
-type: application/json
-
-{
-	"layers": 4,
-	"samples": 58,
-	"data": [[{"x":0,"y":1.5465653425978438,"y0":0},{"x":1,"y":1.685317173883538,"y0":0},{"x":2,"y":1.8574362488718479,"y0":0},{"x":3,"y":1.8955971722736493,"y0":0},{"x":4,"y":1.9097577836599329,"y0":0},{"x":5,"y":1.8465434425997016,"y0":0},{"x":6,"y":1.633439930626274,"y0":0},{"x":7,"y":1.52631967808687,"y0":0},{"x":8,"y":1.254071127423236,"y0":0},{"x":9,"y":1.0827254551382322,"y0":0},{"x":10,"y":0.8638985445997883,"y0":0},{"x":11,"y":0.6413689486056139,"y0":0},{"x":12,"y":0.5413942661821705,"y0":0},{"x":13,"y":0.36278061239443893,"y0":0},{"x":14,"y":0.3256964071352306,"y0":0},{"x":15,"y":0.2137255237212198,"y0":0},{"x":16,"y":0.19963582829410498,"y0":0},{"x":17,"y":0.16830706117875752,"y0":0},{"x":18,"y":0.17206850583228236,"y0":0},{"x":19,"y":0.10830681834972318,"y0":0},{"x":20,"y":0.11873772657810025,"y0":0},{"x":21,"y":0.11084964578647072,"y0":0},{"x":22,"y":0.1484696893575204,"y0":0},{"x":23,"y":0.1867012666922508,"y0":0},{"x":24,"y":0.12949785228379762,"y0":0},{"x":25,"y":0.13160216135876143,"y0":0},{"x":26,"y":0.17191603579071696,"y0":0},{"x":27,"y":0.13015751294359376,"y0":0},{"x":28,"y":0.14401777421011913,"y0":0},{"x":29,"y":0.10201715281901944,"y0":0},{"x":30,"y":0.13096141940224687,"y0":0},{"x":31,"y":0.13007539913630495,"y0":0},{"x":32,"y":0.1548329677287279,"y0":0},{"x":33,"y":0.12825426147451768,"y0":0},{"x":34,"y":0.11173963750950311,"y0":0},{"x":35,"y":0.10009802752875707,"y0":0},{"x":36,"y":0.15986871614703402,"y0":0},{"x":37,"y":0.13176775383781347,"y0":0},{"x":38,"y":0.11931081113873895,"y0":0},{"x":39,"y":0.16285687568597873,"y0":0},{"x":40,"y":0.17962864991277508,"y0":0},{"x":41,"y":0.12206525453366346,"y0":0},{"x":42,"y":0.18058574651367965,"y0":0},{"x":43,"y":0.17203539919573813,"y0":0},{"x":44,"y":0.14411348106805236,"y0":0},{"x":45,"y":0.11210963563062251,"y0":0},{"x":46,"y":0.1381196621572599,"y0":0},{"x":47,"y":0.13853569640778007,"y0":0},{"x":48,"y":0.1413255832623691,"y0":0},{"x":49,"y":0.1174182482529442,"y0":0},{"x":50,"y":0.10530492262916305,"y0":0},{"x":51,"y":0.10311489694306446,"y0":0},{"x":52,"y":0.11639756702594588,"y0":0},{"x":53,"y":0.1319517292574534,"y0":0},{"x":54,"y":0.11580932540132466,"y0":0},{"x":55,"y":0.14951149305133773,"y0":0},{"x":56,"y":0.13733844893200403,"y0":0},{"x":57,"y":0.15683227159202287,"y0":0}],[{"x":0,"y":0.4205513236112361,"y0":1.5465653425978438},{"x":1,"y":0.5468517829897288,"y0":1.685317173883538},{"x":2,"y":0.968925897059711,"y0":1.8574362488718479},{"x":3,"y":1.4906540525791687,"y0":1.8955971722736493},{"x":4,"y":2.0955950901132407,"y0":1.9097577836599329},{"x":5,"y":2.4548437717415097,"y0":1.8465434425997016},{"x":6,"y":2.3871398992501094,"y0":1.633439930626274},{"x":7,"y":1.8956592631335767,"y0":1.52631967808687},{"x":8,"y":1.3310277640299937,"y0":1.254071127423236},{"x":9,"y":0.740004500538676,"y0":1.0827254551382322},{"x":10,"y":0.41341056933113224,"y0":0.8638985445997883},{"x":11,"y":0.25508869446689425,"y0":0.6413689486056139},{"x":12,"y":0.21465672884279616,"y0":0.5413942661821705},{"x":13,"y":0.2030322655655626,"y0":0.36278061239443893},{"x":14,"y":0.17778946560320333,"y0":0.3256964071352306},{"x":15,"y":0.13993989381581068,"y0":0.2137255237212198},{"x":16,"y":0.1509842264651427,"y0":0.19963582829410498},{"x":17,"y":0.14400590082193815,"y0":0.16830706117875752},{"x":18,"y":0.30062332723788887,"y0":0.17206850583228236},{"x":19,"y":0.47865475204719965,"y0":0.10830681834972318},{"x":20,"y":0.911871360864478,"y0":0.11873772657810025},{"x":21,"y":1.5099221362867215,"y0":0.11084964578647072},{"x":22,"y":1.9414749203225334,"y0":0.1484696893575204},{"x":23,"y":1.9571455162890212,"y0":0.1867012666922508},{"x":24,"y":1.4064503011974243,"y0":0.12949785228379762},{"x":25,"y":0.8310477425188015,"y0":0.13160216135876143},{"x":26,"y":0.4000029514079704,"y0":0.17191603579071696},{"x":27,"y":0.27666872064180015,"y0":0.13015751294359376},{"x":28,"y":0.1732079458981994,"y0":0.14401777421011913},{"x":29,"y":0.16434562900185226,"y0":0.10201715281901944},{"x":30,"y":0.10902278389939715,"y0":0.13096141940224687},{"x":31,"y":0.12130552647880047,"y0":0.13007539913630495},{"x":32,"y":0.13189499389209813,"y0":0.1548329677287279},{"x":33,"y":0.16701788078384439,"y0":0.12825426147451768},{"x":34,"y":0.19748827143641204,"y0":0.11173963750950311},{"x":35,"y":0.10048470402153871,"y0":0.10009802752875707},{"x":36,"y":0.1589328406733382,"y0":0.15986871614703402},{"x":37,"y":0.1260306214335577,"y0":0.13176775383781347},{"x":38,"y":0.12310005807202623,"y0":0.11931081113873895},{"x":39,"y":0.19081063238544746,"y0":0.16285687568597873},{"x":40,"y":0.11915995362201988,"y0":0.17962864991277508},{"x":41,"y":0.16775608610181492,"y0":0.12206525453366346},{"x":42,"y":0.11689659197281145,"y0":0.18058574651367965},{"x":43,"y":0.10478702228876778,"y0":0.17203539919573813},{"x":44,"y":0.11845520244093624,"y0":0.14411348106805236},{"x":45,"y":0.12148839301915355,"y0":0.11210963563062251},{"x":46,"y":0.10516531708389541,"y0":0.1381196621572599},{"x":47,"y":0.1443174046222646,"y0":0.13853569640778007},{"x":48,"y":0.21339332873273398,"y0":0.1413255832623691},{"x":49,"y":0.2712006000742741,"y0":0.1174182482529442},{"x":50,"y":0.5050451567911616,"y0":0.10530492262916305},{"x":51,"y":0.909821514076055,"y0":0.10311489694306446},{"x":52,"y":1.5406349016176095,"y0":0.11639756702594588},{"x":53,"y":1.9406928968291974,"y0":0.1319517292574534},{"x":54,"y":2.1437324147686923,"y0":0.11580932540132466},{"x":55,"y":1.8465368739328496,"y0":0.14951149305133773},{"x":56,"y":1.4092532224974688,"y0":0.13733844893200403},{"x":57,"y":0.8817856427333232,"y0":0.15683227159202287}],[{"x":0,"y":0.1944409988255144,"y0":1.96711666620908},{"x":1,"y":0.15033225801417882,"y0":2.2321689568732666},{"x":2,"y":0.14925294980475312,"y0":2.826362145931559},{"x":3,"y":0.13370916755531753,"y0":3.386251224852818},{"x":4,"y":0.19872840374154924,"y0":4.005352873773173},{"x":5,"y":0.13950762000676847,"y0":4.3013872143412115},{"x":6,"y":0.16267251262861193,"y0":4.020579829876383},{"x":7,"y":0.1577907670976032,"y0":3.4219789412204467},{"x":8,"y":0.21860201765439113,"y0":2.58509889145323},{"x":9,"y":0.18971610615072376,"y0":1.822729955676908},{"x":10,"y":0.3651241384995914,"y0":1.2773091139309205},{"x":11,"y":0.40364878074449406,"y0":0.8964576430725082},{"x":12,"y":0.641325222983355,"y0":0.7560509950249666},{"x":13,"y":0.7970356614298015,"y0":0.5658128779600016},{"x":14,"y":1.035079540774146,"y0":0.5034858727384339},{"x":15,"y":1.2114900571612826,"y0":0.3536654175370305},{"x":16,"y":1.2955027464964213,"y0":0.3506200547592477},{"x":17,"y":1.2704279232237192,"y0":0.3123129620006957},{"x":18,"y":1.1110482804839328,"y0":0.47269183307017126},{"x":19,"y":0.95265250419215,"y0":0.5869615703969229},{"x":20,"y":0.7625642407866274,"y0":1.0306090874425782},{"x":21,"y":0.48432505597654985,"y0":1.6207717820731922},{"x":22,"y":0.3605975129100767,"y0":2.089944609680054},{"x":23,"y":0.25079581943021645,"y0":2.143846782981272},{"x":24,"y":0.17992789872009896,"y0":1.5359481534812218},{"x":25,"y":0.15831991003627732,"y0":0.962649903877563},{"x":26,"y":0.209545591944138,"y0":0.5719189871986874},{"x":27,"y":0.1815386065993288,"y0":0.40682623358539394},{"x":28,"y":0.22451288616655046,"y0":0.3172257201083185},{"x":29,"y":0.18631048531302957,"y0":0.2663627818208717},{"x":30,"y":0.2693049686300363,"y0":0.23998420330164402},{"x":31,"y":0.4390040968595268,"y0":0.2513809256151054},{"x":32,"y":0.5561378323665368,"y0":0.28672796162082603},{"x":33,"y":0.9278805101372621,"y0":0.29527214225836207},{"x":34,"y":1.3353385179667492,"y0":0.3092279089459151},{"x":35,"y":1.7554694271042415,"y0":0.20058273155029577},{"x":36,"y":2.308524602434114,"y0":0.31880155682037226},{"x":37,"y":2.7798378587096577,"y0":0.25779837527137117},{"x":38,"y":3.0871471730848987,"y0":0.24241086921076518},{"x":39,"y":3.19362118064261,"y0":0.3536675080714262},{"x":40,"y":3.0580826674114436,"y0":0.29878860353479497},{"x":41,"y":2.8290814192483107,"y0":0.2898213406354784},{"x":42,"y":2.403204319807294,"y0":0.2974823384864911},{"x":43,"y":1.979503686260371,"y0":0.2768224214845059},{"x":44,"y":1.5386751122848177,"y0":0.2625686835089886},{"x":45,"y":1.22746871167621,"y0":0.23359802864977608},{"x":46,"y":1.0047814505063442,"y0":0.24328497924115533},{"x":47,"y":0.920231760634797,"y0":0.2828531010300447},{"x":48,"y":1.194396098267215,"y0":0.3547189119951031},{"x":49,"y":1.4579447933613743,"y0":0.38861884832721827},{"x":50,"y":1.8332767350779728,"y0":0.6103500794203246},{"x":51,"y":1.785497637913814,"y0":1.0129364110191195},{"x":52,"y":1.3961662093621368,"y0":1.6570324686435554},{"x":53,"y":0.9233138020734465,"y0":2.072644626086651},{"x":54,"y":0.535039156141422,"y0":2.259541740170017},{"x":55,"y":0.2889374100548123,"y0":1.9960483669841873},{"x":56,"y":0.1537458202547387,"y0":1.5465916714294727},{"x":57,"y":0.1883149606515614,"y0":1.038617914325346}],[{"x":0,"y":0.11051783803850412,"y0":2.1615576650345942},{"x":1,"y":0.13068661955185235,"y0":2.382501214887445},{"x":2,"y":0.1578517352230847,"y0":2.975615095736312},{"x":3,"y":0.1728128878166899,"y0":3.5199603924081355},{"x":4,"y":0.10202869654167444,"y0":4.204081277514723},{"x":5,"y":0.17840681280940773,"y0":4.44089483434798},{"x":6,"y":0.17828655322082343,"y0":4.1832523425049954},{"x":7,"y":0.19687224281951787,"y0":3.5797697083180497},{"x":8,"y":0.15308661116287114,"y0":2.803700909107621},{"x":9,"y":0.16337432491127402,"y0":2.0124460618276316},{"x":10,"y":0.19935019137337806,"y0":1.6424332524305119},{"x":11,"y":0.12992399381473663,"y0":1.3001064238170024},{"x":12,"y":0.19960449892096221,"y0":1.3973762180083216},{"x":13,"y":0.10027564393822104,"y0":1.362848539389803},{"x":14,"y":0.12569230108056217,"y0":1.53856541351258},{"x":15,"y":0.17503334458451777,"y0":1.565155474698313},{"x":16,"y":0.19269541966194062,"y0":1.646122801255669},{"x":17,"y":0.1962713932455704,"y0":1.582740885224415},{"x":18,"y":0.19479403514149154,"y0":1.583740113554104},{"x":19,"y":0.18478477013321984,"y0":1.539614074589073},{"x":20,"y":0.3903502085015326,"y0":1.7931733282292055},{"x":21,"y":2.113535902304932,"y0":2.105096838049742},{"x":22,"y":4.817339276092961,"y0":2.4505421225901305},{"x":23,"y":2.7301424058386385,"y0":2.394642602411489},{"x":24,"y":0.5160762371843461,"y0":1.7158760522013208},{"x":25,"y":0.18540916174249022,"y0":1.1209698139138404},{"x":26,"y":0.5677074867030829,"y0":0.7814645791428254},{"x":27,"y":1.1464075745324163,"y0":0.5883648401847228},{"x":28,"y":1.2876248090555846,"y0":0.541738606274869},{"x":29,"y":0.6980320380328242,"y0":0.45267326713390127},{"x":30,"y":0.24283358972081664,"y0":0.5092891719316803},{"x":31,"y":0.11682030700960003,"y0":0.6903850224746322},{"x":32,"y":0.15527601995343537,"y0":0.8428657939873628},{"x":33,"y":0.12116465080341,"y0":1.2231526523956242},{"x":34,"y":0.11856791414918837,"y0":1.6445664269126643},{"x":35,"y":0.18425266326500114,"y0":1.9560521586545372},{"x":36,"y":0.1885328239909346,"y0":2.627326159254486},{"x":37,"y":0.22762141668860758,"y0":3.0376362339810288},{"x":38,"y":0.30843369961151645,"y0":3.329558042295664},{"x":39,"y":0.5150686859947133,"y0":3.547288688714036},{"x":40,"y":0.7904080489023975,"y0":3.3568712709462387},{"x":41,"y":0.9969372223042159,"y0":3.118902759883789},{"x":42,"y":1.1835681067174746,"y0":2.700686658293785},{"x":43,"y":1.1976013965051904,"y0":2.256326107744877},{"x":44,"y":1.0675440751484562,"y0":1.8012437957938063},{"x":45,"y":0.7788761831088342,"y0":1.461066740325986},{"x":46,"y":0.5260592994869968,"y0":1.2480664297474995},{"x":47,"y":0.32297373237592664,"y0":1.2030848616648417},{"x":48,"y":0.23281612172581895,"y0":1.5491150102623181},{"x":49,"y":0.15490821516916609,"y0":1.8465636416885927},{"x":50,"y":0.19289989359183243,"y0":2.4436268144982973},{"x":51,"y":0.19691381881928033,"y0":2.7984340489329336},{"x":52,"y":0.16966840994286328,"y0":3.053198678005692},{"x":53,"y":0.10215978941475964,"y0":2.9959584281600975},{"x":54,"y":0.1131423233217642,"y0":2.7945808963114387},{"x":55,"y":0.11913954267715618,"y0":2.2849857770389996},{"x":56,"y":0.12786382707962554,"y0":1.7003374916842113},{"x":57,"y":0.1917928157522389,"y0":1.2269328749769075}]]
-}
-
-