.gitignore

@@ -5,4 +5,3 @@ venv/
 cli_docs/_build/
 dist/
 build/
-.pypi_token

.readthedocs.yaml

@@ -1,35 +0,0 @@
-# Read the Docs configuration file for Sphinx projects
-# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
-
-# Required
-version: 2
-
-# Set the OS, Python version and other tools you might need
-build:
-  os: ubuntu-22.04
-  tools:
-    python: "3.11"
-    # You can also specify other tool versions:
-    # nodejs: "20"
-    # rust: "1.70"
-    # golang: "1.20"
-
-# Build documentation in the "docs/" directory with Sphinx
-sphinx:
-  configuration: cli_docs/conf.py
-  # You can configure Sphinx to use a different builder, for instance use the dirhtml builder for simpler URLs
-  # builder: "dirhtml"
-  # Fail on all warnings to avoid broken references
-  # fail_on_warning: true
-
-# Optionally build your docs in additional formats such as PDF and ePub
-# formats:
-#    - pdf
-#    - epub
-
-# Optional but recommended, declare the Python requirements required
-# to build your documentation
-# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
-python:
-   install:
-   - requirements: cli_docs/requirements.txt

cli_docs/conf.py

@@ -6,25 +6,28 @@
 # full list see the documentation:
 # http://www.sphinx-doc.org/en/master/config
 
-import datetime
+# -- Path setup --------------------------------------------------------------
+# Instead of adding things manually to the path, we just ensure we install esc
+# in editable mode in our environment.
+
 
 # -- Project information -----------------------------------------------------
 
 project = 'tzk'
-copyright = str(datetime.date.today().year) + ' Soren Bjornstad'
+copyright = '2021 Soren Bjornstad'
 author = 'Soren Bjornstad'
 
 # The short X.Y version
-version = "0.4.0"
+version = "0.1.5"
 # The full version, including alpha/beta/rc tags
-release = "0.4.0"
+release = "0.1.5"
 
 
 # -- General configuration ---------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
 #
-needs_sphinx = '4.2.0'
+needs_sphinx = '1.8.5'
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
@@ -49,6 +52,13 @@ source_suffix = '.rst'
 # The master toctree document.
 master_doc = 'index'
 
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#
+# This is also used if you do content translation via gettext catalogs.
+# Usually you set "language" from the command line for these cases.
+language = None
+
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 # This pattern also affects html_static_path and html_extra_path.

cli_docs/requirements.txt

@@ -1,4 +0,0 @@
-# docs
-sphinx==4.2.0  # newer versions display function names in the wrong color?
-sphinx_rtd_theme==0.5.2
-Jinja2<3.1  # https://github.com/readthedocs/readthedocs.org/issues/9038

publish.sh

@@ -6,4 +6,4 @@ rm -rf build/
 rm -f dist/*
 mkdir -p dist
 python setup.py sdist bdist_wheel
-TWINE_PASSWORD=$(cat .pypi_token) twine upload --username '__token__' dist/*
+twine upload dist/*

requirements.txt

@@ -2,9 +2,8 @@
 -e .
 
 # docs
-sphinx==4.2.0  # newer versions display function names in the wrong color?
+sphinx==3.5.4  # newer versions display function names in the wrong color?
 sphinx_rtd_theme==0.5.2
-Jinja2<3.1  # https://github.com/readthedocs/readthedocs.org/issues/9038
 
 # dev tools
 build

setup.py

@@ -9,7 +9,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="tzk",
-    version="0.4.0",
+    version="0.1.5",
     author="Soren I. Bjornstad",
     author_email="zettelkasten@sorenbjornstad.com",
     description="Build tool for TiddlyWiki Zettelkasten",

tzk/__main__.py

@@ -85,12 +85,6 @@ class ListenCommand(CliCommand):
 
     @classmethod
     def setup_arguments(cls, parser: argparse.ArgumentParser) -> None:
-        parser.add_argument(
-            "--host",
-            metavar="HOST",
-            help="Host to listen on.",
-            default=str(cm().listen_host or "127.0.0.1"),
-        )
         parser.add_argument(
             "-p", "--port",
             metavar="PORT",
@@ -117,7 +111,6 @@ class ListenCommand(CliCommand):
             tw.exec(
                 [
                     ("listen",
-                    f"host={args.host}",
                     f"port={args.port}",
                     f"username={args.username}",
                     f"password={args.password}")

tzk/builders.py

@@ -13,7 +13,6 @@ information about the defined products without actually running any build steps.
 from collections.abc import Mapping
 from contextlib import contextmanager
 import functools
-import itertools
 import os
 from pathlib import Path
 import re
@@ -368,11 +367,11 @@ def _privatize_line(line: str, replacement_table: Dict[str, str],
 
     Basics:
         >>> _privatize_line("MsAlice is a test person.", {'MsAlice': 'A.'})
-        '[[A.|PrivatePerson]] is a test person.'
+        '<<privateperson "A.">> is a test person.'
 
         >>> _privatize_line("This woman, known as MsAlice, is a test person.", \
                             {'MsAlice': 'A.'})
-        'This woman, known as [[A.|PrivatePerson]], is a test person.'
+        'This woman, known as <<privateperson "A.">>, is a test person.'
 
         >>> _privatize_line("[[MsAlice]] is a test person.", {'MsAlice': 'A.'})
         '[[A.|PrivatePerson]] is a test person.'
@@ -381,12 +380,6 @@ def _privatize_line(line: str, replacement_table: Dict[str, str],
                             "sentence, that's fine too.", {'MsAlice': 'A.'})
         "When we talk about [[A.|PrivatePerson]] in the middle of a sentence, that's fine too."
 
-    Content inside a macro:
-        >>> _privatize_line('''Text with a footnote.''' \
-                            '''<<fnote "Here's my footnote about MsAlice.">>''', \
-                            {'MsAlice': 'A.'})
-        'Text with a footnote.<<fnote "Here\\'s my footnote about [[A.|PrivatePerson]].">>'
-
     Links with different text and target:
         >>> _privatize_line("We can talk about [[Alice|MsAlice]] " \
                             "with different text.", {'MsAlice': 'A.'})
@@ -395,12 +388,12 @@ def _privatize_line(line: str, replacement_table: Dict[str, str],
     Multiple replacements with different people:
         >>> _privatize_line("We can have [[MsAlice]] and MrBob talk to each other " \
                             "in the same line.", {'MsAlice': 'A.', 'MrBob': 'B.'})
-        'We can have [[A.|PrivatePerson]] and [[B.|PrivatePerson]] talk to each other in the same line.'
+        'We can have [[A.|PrivatePerson]] and <<privateperson "B.">> talk to each other in the same line.'
 
     Multiple replacements with the same person:
         >>> _privatize_line("We can have MsAlice talk to herself (MsAlice) " \
                             "in the same line.", {'MsAlice': 'A.'})
-        'We can have [[A.|PrivatePerson]] talk to herself ([[A.|PrivatePerson]]) in the same line.'
+        'We can have <<privateperson "A.">> talk to herself (<<privateperson "A.">>) in the same line.'
 
         >>> _privatize_line("Likewise [[MsAlice]] can do it with brackets " \
                             "([[MsAlice]]).", {'MsAlice': 'A.'})
@@ -408,7 +401,7 @@ def _privatize_line(line: str, replacement_table: Dict[str, str],
 
         >>> _privatize_line('We can talk about [[Alice|MsAlice]] lots of ways, ' \
                             'like MsAlice and [[MsAlice]].', {'MsAlice': 'A.'})
-        'We can talk about [[Alice|PrivatePerson]] lots of ways, like [[A.|PrivatePerson]] and [[A.|PrivatePerson]].'
+        'We can talk about [[Alice|PrivatePerson]] lots of ways, like <<privateperson "A.">> and [[A.|PrivatePerson]].'
 
     Replacements with alternate link text:
         >>> _privatize_line('We can talk about [[Alice|MsAlice]] and [[Bob|MrBob]] as well', \
@@ -484,7 +477,7 @@ def _privatize_line(line: str, replacement_table: Dict[str, str],
 
                     if not is_spurious_substring():
                         new_line = (line[0:start_idx]
-                                    + f'[[{replace_initials}|PrivatePerson]]'
+                                    + f'<<privateperson "{replace_initials}">>'
                                     + line[end_idx:])
                 elif is_bare_bracketed_link(start_idx, end_idx):
                     # link with the person as the target and text
@@ -560,8 +553,7 @@ def replace_private_people(initialer: Callable[[str], str] = None, replace_link_
     assert 'public_wiki_folder' in build_state
 
     replacement_table = _private_people_replacement_table(initialer)
-    root = (Path(build_state['public_wiki_folder']) / "tiddlers")
-    tid_files = itertools.chain(root.glob("**/*.tid"), root.glob("**/*.json"))
+    tid_files = (Path(build_state['public_wiki_folder']) / "tiddlers").glob("**/*.tid")
 
     for tiddler in tid_files:
         dirty = False

tzk/default_config.py

@@ -35,10 +35,6 @@ commit_remote = ""
 # http://localhost:8080 in your browser.
 listen_port = 8080
 
-# Host to listen on. If you specify "0.0.0.0" it will listen to all network interfaces.
-# This is useful for allowing the wiki to be exposed to the network through a container.
-listen_host = "127.0.0.1"
-
 # Uncomment if you want to require HTTP basic authentication when serving your wiki.
 # **WARNING**: this is NOT secure for use over the open Internet or all but the
 # simplest local networks, as the password is sent in the clear. For good

tzk/editions/tzk/plugins/Calendar/_system/config/bj/Calendar.json

@@ -1,31 +0,0 @@
-
-{
-	"journals":{
-		"lastDayOfWeek":"0",
-		"formatter":"$:/macros/bj/Calendar/journalfmt.js",
-		"titlebold":"no",
-		"highlightThisDay":"no",
-		"highlightThisDate":"yes"
-	},
-	"default":{
-		"lastDayOfWeek":"0",
-		"formatter":"$:/macros/bj/Calendar/journalslinked.js",
-		"titlebold":"yes",
-		"highlightThisDay":"no",
-		"highlightLinks":"yes"
-	},
-	"diary":{
-		"lastDayOfWeek":"0",
-		"formatter":"$:/macros/bj/Calendar/diary.js",
-		"titlebold":"yes",
-		"highlightThisDay":"no",
-		"highlightLinks":"yes"
-	},
-	"plain":{
-		"lastDayOfWeek":"0",
-		"formatter":"",
-		"titlebold":"yes",
-		"highlightThisDay":"yes",
-		"highlightThisDate":"no"
-	}
-}

tzk/editions/tzk/plugins/Calendar/_system/config/bj/Calendar.json.meta

@@ -1,3 +0,0 @@
-module-type: library
-title: $:/config/bj/Calendar.json
-type: application/json

tzk/editions/tzk/plugins/Calendar/_system/core/modules/widgets/macrorefresh.js

@@ -1,96 +0,0 @@
-/*\
-title: $:/core/modules/widgets/macrorefresh.js
-type: application/javascript
-module-type: widget
-
-Macrocall widget
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-var Widget = require("$:/core/modules/widgets/widget.js").widget;
-
-var MacroCallWidget = function(parseTreeNode,options) {
-	this.initialise(parseTreeNode,options);
-};
-
-/*
-Inherit from the base widget class
-*/
-MacroCallWidget.prototype = new Widget();
-
-/*
-Render this widget into the DOM
-*/
-MacroCallWidget.prototype.render = function(parent,nextSibling) {
-	this.parentDomNode = parent;
-	this.computeAttributes();
-	this.execute();
-	this.renderChildren(parent,nextSibling);
-};
-
-/*
-Compute the internal state of the widget
-*/
-MacroCallWidget.prototype.execute = function() {
-	var self = this;
-	// Get the parse type if specified
-	this.parseType = this.getAttribute("$type","text/vnd.tiddlywiki");
-	this.renderOutput = this.getAttribute("$output","text/html");
-	// Merge together the parameters specified in the parse tree with the specified attributes
-	this.params = this.parseTreeNode.params ? this.parseTreeNode.params.slice(0) : [];
-	$tw.utils.each(this.attributes,function(attribute,name) {
-		if(name.charAt(0) !== "$") {
-			self.params.push({name: name, value: attribute});			
-		}
-	});
-	// Get the macro value
-	var text = this.getVariable(this.parseTreeNode.name || this.getAttribute("$name"),{params: this.params}),
-		parseTreeNodes;
-	// Are we rendering to HTML?
-	if(this.renderOutput === "text/html") {
-		// If so we'll return the parsed macro
-		var parser = this.wiki.parseText(this.parseType,text,
-							{parseAsInline: !this.parseTreeNode.isBlock});
-		parseTreeNodes = parser ? parser.tree : [];
-	} else {
-		// Otherwise, we'll render the text
-		var plainText = this.wiki.renderText("text/plain",this.parseType,text,{parentWidget: this});
-		parseTreeNodes = [{type: "text", text: plainText}];
-	}
-	// Construct the child widgets
-	this.makeChildWidgets(parseTreeNodes);
-};
-
-/*
-Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
-*/
-MacroCallWidget.prototype.refresh = function(changedTiddlers) {
-	var changedAttributes = this.computeAttributes();
-	if($tw.utils.count(changedAttributes) > 0) {
-		// Rerender ourselves
-		this.refreshSelf();
-		return true;
-	} 
-	//else  
-	if (this.getAttribute("$refresh")) {
-		var params = this.params.slice(0);
-		params.push({name: "changedTiddlers", value: changedTiddlers});
-		if (this.getVariable(this.getAttribute("$refresh"),{params: params})) {
-					// Rerender ourselves
-			this.refreshSelf();
-			return true;
-		} 
-	//else 
-	}
-	return this.refreshChildren(changedTiddlers);
-
-};
-
-exports.macrorefresh = MacroCallWidget;
-
-})();

tzk/editions/tzk/plugins/Calendar/_system/core/modules/widgets/macrorefresh.js.meta

@@ -1,3 +0,0 @@
-module-type: widget
-title: $:/core/modules/widgets/macrorefresh.js
-type: application/javascript

tzk/editions/tzk/plugins/Calendar/_system/macros/bj/Calendar/diary.js

@@ -1,37 +0,0 @@
-/*\
-title: $:/macros/bj/Calendar/diary.js
-type: application/javascript
-module-type: global
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-/*
-Information about this macro
-calendar demo
-*/
-var Calendar=new Date();
-var createMonth= function(mnth,year,options){
-	var month=[];
-	for (var i=1;i < 1+daysInMonth(mnth,year);i++) month[i] = createDate(i,mnth,year,options);
-	return month;
-}
-function createDate(i,mnth,year,options){
-	var strong='',tiddlerDate,format = $tw.wiki.getTiddlerText("$:/config/NewJournal/Title") || "YYYY MM DD";
-	var date=(new Date(year, mnth-1, i));
-	if (options.highlightLinks=="yes") strong ='!';
-	
-	tiddlerDate = $tw.utils.formatDateString(date,format);
-   
-	if ($tw.wiki.getTiddler(tiddlerDate))return centre(strong+'[['+i+'|'+tiddlerDate+']]');
-	return  centre('[['+i+'|'+tiddlerDate+']]');
-}
-function daysInMonth(iMonth, iYear){
-		return 32 - new Date(iYear, iMonth-1, 32).getDate();
-	}
-function centre (x){ return ' '+x+' ';}
-exports.createMonth = createMonth;
-})();

tzk/editions/tzk/plugins/Calendar/_system/macros/bj/Calendar/diary.js.meta

@@ -1,3 +0,0 @@
-module-type: global
-title: $:/macros/bj/Calendar/diary.js
-type: application/javascript

tzk/editions/tzk/plugins/Calendar/_system/macros/bj/Calendar/journalfmt.js

@@ -1,37 +0,0 @@
-/*\
-title: $:/macros/bj/Calendar/journalfmt.js
-type: application/javascript
-module-type: global
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-/*
-Information about this macro
-calendar demo
-*/
-var Calendar=new Date();
-var createMonth= function(mnth,year,options){
-	var month=[];
-	for (var i=1;i < 1+daysInMonth(mnth,year);i++) month[i] = createDate(i,mnth,year,options);
-	return month;
-}
-function createDate(i,mnth,year,options){
-	var strong='',tiddlerDate;
-	var date=(new Date(year, mnth, i));
-	if (date.toDateString()===Calendar.toDateString()&&options.highlightThisDate=="yes") strong ='!';
-	tiddlerDate=date.getDate()+
-	              ' '+$tw.language.getString("Date/Long/Month/" + (date.getMonth()))+' '+date.getFullYear();
-   
-	if ($tw.wiki.getTiddler(tiddlerDate)!==undefined)  strong ='!';
-	return centre(strong+'[['+i+'|'+tiddlerDate+']]');
-}
-function daysInMonth(iMonth, iYear){
-		return 32 - new Date(iYear, iMonth, 32).getDate();
-	}
-function centre (x){ return ' '+x+' ';}
-exports.createMonth = createMonth;
-})();

tzk/editions/tzk/plugins/Calendar/_system/macros/bj/Calendar/journalfmt.js.meta

@@ -1,3 +0,0 @@
-module-type: global
-title: $:/macros/bj/Calendar/journalfmt.js
-type: application/javascript

tzk/editions/tzk/plugins/Calendar/_system/macros/bj/Calendar/journalslinked.js

@@ -1,37 +0,0 @@
-/*\
-title: $:/macros/bj/Calendar/journalslinked.js
-type: application/javascript
-module-type: global
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-/*
-Information about this macro
-calendar demo
-*/
-var Calendar=new Date();
-var createMonth= function(mnth,year,options){
-	var month=[];
-	for (var i=1;i < 1+daysInMonth(mnth,year);i++) month[i] = createDate(i,mnth,year,options);
-	return month;
-}
-function createDate(i,mnth,year,options){
-	var strong='',tiddlerDate,format = $tw.wiki.getTiddlerText("$:/config/NewJournal/Title") || "YYYY MM DD";
-	var date=(new Date(year, mnth-1, i));
-	if (options.highlightLinks=="yes") strong ='!';
-	
-	tiddlerDate = $tw.utils.formatDateString(date,format);
-   
-	if ($tw.wiki.getTiddler(tiddlerDate))return centre(strong+'[['+i+'|'+tiddlerDate+']]');
-	return i;
-}
-function daysInMonth(iMonth, iYear){
-		return 32 - new Date(iYear, iMonth-1, 32).getDate();
-	}
-function centre (x){ return ' '+x+' ';}
-exports.createMonth = createMonth;
-})();

tzk/editions/tzk/plugins/Calendar/_system/macros/bj/Calendar/journalslinked.js.meta

@@ -1,3 +0,0 @@
-module-type: global
-title: $:/macros/bj/Calendar/journalslinked.js
-type: application/javascript

tzk/editions/tzk/plugins/Calendar/_system/macros/buggyj/Calendar/base.js

@@ -1,140 +0,0 @@
-/*\
-title: $:/macros/buggyj/Calendar/base.js
-type: application/javascript
-module-type: macro
-
-<<diary year month>>
-<<diary year>> - year calendar
-<<diary>> - this month
-
-Options:$:/macros/diary/options.json
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-/*
-Information about this macro
-CAL demo
-*/
-
-exports.name = "calendarbase";
-
-exports.params = [
-	{ name: "year" },{ name: "month" },{ name: "opts" }
-];
-/*
-Run the macro
-*/
-
-exports.run = function(year, month,opts) {
-if (!opts) opts="default";
-var options = $tw.wiki.getTiddlerData("$:/config/bj/Calendar.json")[opts]||
-				{lastDayOfWeek:"6",formatter:"",titlebold:"",highlightThisDay:"",highlightThisDate:""};
-var createMonth;
-try {
-	createMonth = require(options.formatter).createMonth;
-} catch (e) {
-	createMonth= function(mnth,year){
-		var month=[];
-		for (var i=1;i < 1+daysInMonth(mnth,year);i++) month[i] = i;
-		return month;
-	}
-} 
-var boldtitle=(options.titlebold=='yes')?'!':'';
-var day_of_week = (function () { 
-	var days = [];
-	for (var i = 0; i < 7; i++) {days[i] = $tw.language.getString("Date/Short/Day/" + i); } 
-	return days;
-})();
-var month_of_year = (function () { 
-	var months = [];
-	for (var i = 1; i < 13; i++) {months[i] = $tw.language.getString("Date/Long/Month/" + i); } 
-	return months;
-})(); 
-var Calendar = new Date();
-var thisyear = Calendar.getFullYear();  //  year (xxxx)
-var thismonth = Calendar.getMonth()+1;	//  month (0-11)
-var thisday = Calendar.getDay();        //  day (0-6)
-var WEEKFIN = parseInt(options.lastDayOfWeek);               
-var MONTHS_IN_YEAR=12;					
-                           
-var lf ='\n';
-var cal='<div>'+lf+lf; 
-var ayear=thisyear;
-if (!!month) {
-	if (!!year) {
-		cal+=calendar (month,year,options);
-	} else {
-		cal+=calendar (month,thisyear,options);
-	}
-} else {
-	if (!!year) {
-			cal+=titleOfYear(year); 
-		options.seperateYearHeading = 'yes';
-		ayear=year; 
-		for(var i=0; i<MONTHS_IN_YEAR; i+=2)
-			cal+=splicetable(calendar (i+1,ayear,options),calendar (i+2,ayear,options));
-	}
-	else {
-			cal+=calendar (thismonth,thisyear,options);	
-	}
-}
-return cal+lf+lf+'</div>';
-
-function calendar (mnth,year,options){
-    var month =	createMonth(mnth,year,options);
-    var blankdays = (firstDayInMonth(mnth,year)+13-WEEKFIN)%7;
-	return titleOfMonth(mnth,year)+createWeekHeading()+
-	       formatAsMonth(month,blankdays);
-}
-function titleOfMonth(mth,year) {
-	if (!!options.seperateYearHeading ) {
-		return '|>|>|>|'+ centre(boldtitle+ month_of_year[mth]) +'|<|<|<|'+lf;
-	} else {
-		return '|>|>|>|'+ centre(boldtitle+ month_of_year[mth]  + '  ' + year) +'|<|<|<|'+lf;
-	}
-}
-
-function titleOfYear(year) {
-		return '|>|>|>|>|>|>|>|'+ centre('!'+year) +'|<|<|<|<|<|<|<|'+lf;
-}
-function centre (x){ return ' '+x+' ';}
-
-function formatAsMonth(month,blankdays){	
-	var theday,blank=['','|','||','|||','||||','|||||','||||||','|||||||'];	
-	var cal=blank[blankdays];//pad out before first day of month
-	for(var i=1; i < month.length;i++){//first '0' month element is not used
-		cal+='|'+month[i];
-		theday=(i+blankdays-1)%7;
-		if (theday == 6) cal += '|' + lf; 
-	}
-	if (theday !== 6) cal += blank[7 - theday] + lf;//pad out rest of week, if needed
-	return cal ;
-}
-function createWeekHeading(){
-		var daystitle=[],weekdays= day_of_week.slice(0);
-		// highlight today's day of week
-		if (options.highlightThisDay=='yes')weekdays[thisday] ='!'+weekdays[thisday];
-		for (var i=0;i < weekdays.length; i++) daystitle[i] =centre(weekdays[(i+1+WEEKFIN)%7]);
-		return '|'+daystitle.join('|')+'|'+lf; 
-}
-function daysInMonth(iMonth, iYear){
-		return 32 - new Date(iYear, iMonth-1, 32).getDate();
-	}
-function firstDayInMonth(iMonth, iYear){
-		return new Date(iYear, iMonth-1, 1).getDay();
-	} 
-function splicetable (a,b) {
-	var i,cal='',taba =a.split('\n'),tabb=b.split('|\n');
-	var limit=(taba.length<tabb.length)?taba.length:tabb.length;//shortest
-	for (i=0;i<limit-1;i++) 		cal+=taba[i]+tabb[i]+'|'+lf;	 
-	for (;i < taba.length-1;i++) 	cal+=taba[i]+"||||||||"+lf;
-	for (;i < tabb.length-1;i++) 	cal+="||||||||"+tabb[i]+lf;
-	return cal;
-}		   
-}  
-
-})();

tzk/editions/tzk/plugins/Calendar/_system/macros/buggyj/Calendar/base.js.meta

@@ -1,3 +0,0 @@
-module-type: macro
-title: $:/macros/buggyj/Calendar/base.js
-type: application/javascript

tzk/editions/tzk/plugins/Calendar/_system/macros/buggyj/Calendar/entry.js

@@ -1,36 +0,0 @@
-/*\
-title: $:/macros/buggyj/Calendar/entry.js
-type: application/javascript
-module-type: macro
-
-<<calendar year month>>
-<<calendar year>> - year calendar
-<<calendar>> - this month
-
-Options:$:/macros/diary/options.json
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-/*
-Information about this macro
-CAL demo
-*/
-
-exports.name = "calendar";
-
-exports.params = [
-	{ name: "year" },{ name: "month" },{ name: "opts" }
-];
-/*
-Run the macro
-*/
-
-exports.run = function(year, month,opts) {
-return '<$macrorefresh $name="calendarbase" year="'+year+'" month="'+month+'" opts="'+opts+'" $refresh="calendarrefresh"/>';
-}
-
-})();

tzk/editions/tzk/plugins/Calendar/_system/macros/buggyj/Calendar/entry.js.meta

@@ -1,3 +0,0 @@
-module-type: macro
-title: $:/macros/buggyj/Calendar/entry.js
-type: application/javascript

tzk/editions/tzk/plugins/Calendar/_system/macros/buggyj/Calendar/entry2.js

@@ -1,39 +0,0 @@
-/*\
-title: $:/macros/buggyj/Calendar/entry2.js
-type: application/javascript
-module-type: macro
-
-<<diary year month>>
-<<diary year>> - year calendar
-<<diary>> - this month
-
-Options:$:/macros/diary/options.json
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-/*
-Information about this macro
-CAL demo
-*/
-
-exports.name = "diary";
-
-exports.params = [
-	{ name: "year" },{ name: "month" },{ name: "opts" }
-];
-/*
-Run the macro
-*/
-
-exports.run = function(year, month,opts) {
-	var tags = $tw.wiki.getTiddlerText("$:/config/NewJournal/Tags");
-	if (!opts) opts = "diary";
-	return '<$ifnew fields="""{"tags":"'+tags+'"}""">' +
-	'<$macrorefresh $name="calendarbase" year="'+year+'" month="'+month+'" opts="'+opts+'" $refresh="calendarrefresh"/>'+ '</$ifnew>';
-}
-
-})();

tzk/editions/tzk/plugins/Calendar/_system/macros/buggyj/Calendar/entry2.js.meta

@@ -1,3 +0,0 @@
-module-type: macro
-title: $:/macros/buggyj/Calendar/entry2.js
-type: application/javascript

tzk/editions/tzk/plugins/Calendar/_system/macros/buggyj/Calendar/ifnew.js

@@ -1,87 +0,0 @@
-/*\
-title: $:/macros/buggyj/Calendar/ifnew.js
-type: application/javascript
-module-type: widget
-
-Linkcatcher widget
-
-ToDo - add message param to listen for other mssg and action to set other actions (link just create)
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-var Widget = require("$:/core/modules/widgets/widget.js").widget;
-
-var IfNewWidget = function(parseTreeNode,options) {
-	this.initialise(parseTreeNode,options);
-	this.addEventListeners([
-		{type: "tm-navigate", handler: "handleNavigateEvent"}
-	]);
-};
-
-/*
-Inherit from the base widget class
-*/
-IfNewWidget.prototype = new Widget();
-
-/*
-Render this widget into the DOM
-*/
-IfNewWidget.prototype.render = function(parent,nextSibling) {
-	this.parentDomNode = parent;
-	this.computeAttributes();
-	this.execute();
-	this.renderChildren(parent,nextSibling);
-};
-
-/*
-Compute the internal state of the widget
-*/
-IfNewWidget.prototype.execute = function() {
-	// Get our parameters
-	this.fields = this.getAttribute("fields");
-	this.catchMessage = this.getAttribute("message");
-	// Construct the child widgets
-	this.makeChildWidgets();
-};
-
-/*
-Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
-*/
-IfNewWidget.prototype.refresh = function(changedTiddlers) {
-	var changedAttributes = this.computeAttributes();
-	if(changedAttributes.fields || changedAttributes.message ) {
-		this.refreshSelf();
-		return true;
-	} else {
-		return this.refreshChildren(changedTiddlers);		
-	}
-};
-
-/*
-Handle a tm-navigate event
-*/
-IfNewWidget.prototype.handleNavigateEvent = function(event) {
-	var tiddler = this.wiki.getTiddler(event.navigateTo),fds;
-	if(tiddler) return true;
-	try {
-		fds=JSON.parse(this.fields);
-	} catch(e) {
-		fds={};
-	}
-	fds.title = event.navigateTo;
-	if(this.parentWidget) {
-		this.parentWidget.dispatchEvent({
-			type: "tm-new-tiddler",
-			param: fds
-		});
-	}
-	return false;
-};
-
-exports.ifnew = IfNewWidget;
-
-})();

tzk/editions/tzk/plugins/Calendar/_system/macros/buggyj/Calendar/ifnew.js.meta

@@ -1,3 +0,0 @@
-module-type: widget
-title: $:/macros/buggyj/Calendar/ifnew.js
-type: application/javascript

tzk/editions/tzk/plugins/Calendar/_system/macros/buggyj/Calendar/refresh.js

@@ -1,105 +0,0 @@
-/*\
-title: $:/macros/buggyj/Calendar/refresh.js
-type: application/javascript
-module-type: macro
-
-<<diary year month>>
-<<diary year>> - year calendar
-<<diary>> - this month
-
-Options:$:/macros/diary/options.json
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-/*
-Information about this macro
-CAL demo
-*/
-
-exports.name = "calendarrefresh";
-
-exports.params = [
-	{ name: "year" },{ name: "month" },{ name: "opts" },{name:"changedTiddlers"}
-];
- 
-// Source: http://stackoverflow.com/questions/497790
-var dates = {
-    convert:function(d) {
-        // Converts the date in d to a date-object. The input can be:
-        //   a date object: returned without modification
-        //  an array      : Interpreted as [year,month,day]. NOTE: month is 0-11.
-        //   a number     : Interpreted as number of milliseconds
-        //                  since 1 Jan 1970 (a timestamp) 
-        //   a string     : Any format supported by the javascript engine, like
-        //                  "YYYY/MM/DD", "MM/DD/YYYY", "Jan 31 2009" etc.
-        //  an object     : Interpreted as an object with year, month and date
-        //                  attributes.  **NOTE** month is 0-11.
-        return (
-            d.constructor === Date ? d :
-            d.constructor === Array ? new Date(d[0],d[1],d[2]) :
-            d.constructor === Number ? new Date(d) :
-            d.constructor === String ? new Date(d) :
-            typeof d === "object" ? new Date(d.year,d.month,d.date) :
-            NaN
-        );
-    },
-    compare:function(a,b) {
-        // Compare two dates (could be of any type supported by the convert
-        // function above) and returns:
-        //  -1 : if a < b
-        //   0 : if a = b
-        //   1 : if a > b
-        // NaN : if a or b is an illegal date
-        // NOTE: The code inside isFinite does an assignment (=).
-        return (
-            isFinite(a=this.convert(a).valueOf()) &&
-            isFinite(b=this.convert(b).valueOf()) ?
-            (a>b)-(a<b) :
-            NaN
-        );
-    },
-    inRange:function(d,start,end) {
-        // Checks if date in d is between dates in start and end.
-        // Returns a boolean or NaN:
-        //    true  : if d is between start and end (inclusive)
-        //    false : if d is before start or after end
-        //    NaN   : if one or more of the dates is illegal.
-        // NOTE: The code inside isFinite does an assignment (=).
-       return (
-            isFinite(d=this.convert(d).valueOf()) &&
-            isFinite(start=this.convert(start).valueOf()) &&
-            isFinite(end=this.convert(end).valueOf()) ?
-            start <= d && d <= end :
-            NaN
-        );
-    }
-}
-/*
-Run the macro
-*/
-
-exports.run = function(year, month,opts,changedTiddlers) {
-
-	var found = false;
-	var journaltag = "Journal";
-	
-	$tw.utils.each(changedTiddlers,function(attribute,name) {
-		if (attribute.deleted) {
-			return;
-		}
-		var tiddler = $tw.wiki.getTiddler(name);
-		var tags = (tiddler.fields.tags || []).slice(0);
-		
-		if(tags.indexOf(journaltag) != -1) {
-			found = true;	
-		}
-	});
-	if (found) return "found";
-	return ""; 
-} 
-
-})();

tzk/editions/tzk/plugins/Calendar/_system/macros/buggyj/Calendar/refresh.js.meta

@@ -1,3 +0,0 @@
-module-type: macro
-title: $:/macros/buggyj/Calendar/refresh.js
-type: application/javascript

tzk/editions/tzk/plugins/Calendar/_system/plugins/bj/Calendar/license.tid

@@ -1,22 +0,0 @@
-title: $:/plugins/bj/Calendar/license
-
-The MIT License (MIT)
-
-Copyright (c) 2014 Jeffrey Wikinson aka buggyj
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

tzk/editions/tzk/plugins/Calendar/_system/plugins/bj/Calendar/readme.tid

@@ -1,4 +0,0 @@
-title: $:/plugins/bj/Calendar/readme
-
-For documentation see the project home at
-http://bjtools.tiddlyspot.com#ExtendableCalendar

tzk/editions/tzk/plugins/Calendar/_system/plugins/bj/calendar/sidbar.tid

@@ -1,13 +0,0 @@
-caption: Calendar
-tags: $:/tags/SideBar
-title: $:/plugins/bj/calendar/sidbar
-type: text/vnd.tiddlywiki
-
-<$reveal state="$:/temp/plugins/bj/Calendar" text="Year" type="nomatch">
-  <$button set="$:/temp/plugins/bj/Calendar" setTo="Year">Year</$button>
-  <<calendar "" "">>
-</$reveal>
-<$reveal state="$:/temp/plugins/bj/Calendar" text="Year" type="match">
-  <$button set="$:/temp/plugins/bj/Calendar" setTo="Month">Month</$button>
-<<calendar 2014 "">>
-</$reveal>

tzk/editions/tzk/plugins/Calendar/plugin.info

@@ -1,11 +0,0 @@
-{
-    "author": "JeffreyWilkinson",
-    "core-version": ">=5.1.11",
-    "dependents": "",
-    "description": "calendar with date formatter addons",
-    "list": "readme license",
-    "plugin-type": "plugin",
-    "source": "https://github.com/buggyj/TW5-tools",
-    "title": "$:/plugins/bj/Calendar",
-    "version": "1.11.0"
-}

tzk/editions/tzk/plugins/FontAwesome/plugin.info

@@ -9,6 +9,5 @@
     "plugin-type": "plugin",
     "source": "https://github.com/TheDiveO/TW5FontAwesome",
     "title": "$:/plugins/TheDiveO/FontAwesome",
-    "version": "1.2.18",
-    "dependents": ""
+    "version": "1.2.18"
 }

tzk/editions/tzk/plugins/TiddlyRemember/$__plugins_sobjornstad_TiddlyRemember_templates_TiddlyRememberParseable.tid

@@ -8,7 +8,7 @@ type: text/vnd.tiddlywiki
 
 <$set name="tr-rendering" value="yes">
 
-<span id="tr-version">1.3.4</span>
+<span id="tr-version">1.3.2</span>
 
 {{||$:/plugins/sobjornstad/TiddlyRemember/templates/AnkiDecks}}
 {{||$:/plugins/sobjornstad/TiddlyRemember/templates/AnkiTags}}

tzk/editions/tzk/plugins/TiddlyRemember/plugin.info

@@ -2,7 +2,7 @@
     "title": "$:/plugins/sobjornstad/TiddlyRemember",
     "description": "TiddlyRemember: Embed Anki notes in your TiddlyWiki",
     "author": "Soren Bjornstad",
-    "version": "1.3.4",
+    "version": "1.3.2",
     "core-version": ">=5.1.21",
     "source": "https://github.com/sobjornstad/TiddlyRemember",
     "list": "readme license",