diff --git a/docs/index.html b/docs/index.html index 7a61cd0..a785c4c 100644 --- a/docs/index.html +++ b/docs/index.html @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ -My TiddlyZettelKasten - -— Say something clever about it here - +My TiddlyZettelKasten — Say something clever about it here @@ -227,6 +224,8 @@ Error message and password prompt
  • $:/config/bimlas/locator/fields/parent
  • +
  • $:/config/bj/Calendar.json
  • +
  • $:/config/codemirror/keyMap
  • $:/config/codemirror/theme
  • @@ -241,16 +240,52 @@ Error message and password prompt
  • $:/config/flibbles/relink/fields/bibliography
  • +
  • $:/config/flibbles/relink/fields/condition
  • +
  • $:/config/flibbles/relink/fields/description
  • $:/config/flibbles/relink/fields/memberof
  • +
  • $:/config/flibbles/relink/fields/participants
  • + +
  • $:/config/flibbles/relink/fields/ri-date-goal
  • + +
  • $:/config/flibbles/relink/fields/ri-date-resolved
  • + +
  • $:/config/flibbles/relink/fields/ri-date-summary
  • + +
  • $:/config/flibbles/relink/fields/ri-date-with
  • + +
  • $:/config/flibbles/relink/fields/ri-source
  • +
  • $:/config/flibbles/relink/fields/spouse
  • $:/config/flibbles/relink/fields/universe
  • $:/config/flibbles/relink/macros/expando/tiddler
  • +
  • $:/config/flibbles/relink/macros/fnote/note
  • + +
  • $:/config/flibbles/relink/macros/jsub/subpart
  • + +
  • $:/config/flibbles/relink/macros/stretch-links/filter
  • + +
  • $:/config/flibbles/relink/macros/stretch-template-links/filter
  • + +
  • $:/config/flibbles/relink/macros/stretch-template-links/largeTemplate
  • + +
  • $:/config/flibbles/relink/macros/stretch-template-links/smallTemplate
  • + +
  • $:/config/flibbles/relink/macros/stretch-template/largeTemplate
  • + +
  • $:/config/flibbles/relink/macros/stretch-template/smallTemplate
  • + +
  • $:/config/flibbles/relink/macros/stretch-template/tiddler
  • + +
  • $:/config/flibbles/relink/macros/stretch/tiddler
  • + +
  • $:/config/flibbles/relink/macros/summarize/tiddler
  • +
  • $:/config/Manager/Filter
  • $:/config/Manager/Show
  • @@ -261,6 +296,8 @@ Error message and password prompt
  • $:/config/Manager/Tag
  • +
  • $:/config/Navigation/UpdateAddressBar
  • +
  • $:/config/NewJournal/Title
  • $:/config/PageControlButtons/Visibility/$:/core/ui/Buttons/advanced-search
  • @@ -291,6 +328,8 @@ Error message and password prompt
  • $:/config/PageControlButtons/Visibility/$:/plugins/aaldrich/tables/button
  • +
  • $:/config/PageControlButtons/Visibility/$:/sib/Buttons/NewDate
  • +
  • $:/config/PageControlButtons/Visibility/$:/sib/Buttons/NewSource
  • $:/config/PageControlButtons/Visibility/$:/sib/Buttons/ReadingInbox
  • @@ -319,6 +358,8 @@ Error message and password prompt
  • $:/config/Plugins/Disabled/$:/plugins/sobjornstad/3click2edit
  • +
  • $:/config/Plugins/Disabled/$:/plugins/sycom/leaflet
  • +
  • $:/config/Plugins/Disabled/$:/plugins/telmiger/details
  • $:/config/Plugins/Disabled/$:/plugins/TheDiveO/FontAwesome
  • @@ -357,7 +398,9 @@ Error message and password prompt
  • $:/config/sib/TopBarHeight
  • -
  • $:/config/SyncFilter
  • +
  • $:/config/sobjornstad/AccessCode
  • + +
  • $:/config/sobjornstad/UserEmail
  • $:/config/TiddlerInfo/Mode
  • @@ -425,6 +468,8 @@ Error message and password prompt
  • $:/config/zettelkasten/FeatureFlags/GisTools
  • +
  • $:/config/zettelkasten/FeatureFlags/MarkStaleUpdated
  • +
  • $:/config/zettelkasten/FeatureFlags/MediaRating
  • $:/config/zettelkasten/FeatureFlags/OpenTopBar
  • @@ -467,14 +512,20 @@ Error message and password prompt
  • $:/core/ui/EditorToolbar/transcludify
  • +
  • $:/core/ui/MoreSideBar/Recent
  • +
  • $:/core/ui/SideBar/Open
  • $:/core/ui/SideBarSegments/tabs
  • $:/core/ui/ViewTemplate/subtitle
  • +
  • $:/core/ui/ViewTemplate/title
  • +
  • $:/DefaultTiddlers
  • +
  • $:/Import
  • +
  • $:/inmysocks/macros/day-diff.js
  • $:/isEncrypted
  • @@ -491,6 +542,8 @@ Error message and password prompt
  • $:/plugins/bimlas/locator/edit-template/locator-references
  • +
  • $:/plugins/bj/Calendar
  • +
  • $:/plugins/flibbles/relink
  • $:/plugins/frd/simplecalendar/CalendarConfigDefault
  • @@ -517,6 +570,8 @@ Error message and password prompt
  • $:/plugins/sobjornstad/TiddlyStretch/macros/stretch
  • +
  • $:/plugins/sycom/leaflet
  • +
  • $:/plugins/telmiger/details
  • $:/plugins/telmiger/details/colours.css
  • @@ -559,6 +614,8 @@ Error message and password prompt
  • $:/plugins/tobibeer/preview/template
  • +
  • $:/sib/Buttons/Checkpoint
  • +
  • $:/sib/Buttons/CopyPublicZettelkastenLink
  • $:/sib/Buttons/CopyTitleReference
  • @@ -571,6 +628,8 @@ Error message and password prompt
  • $:/sib/Buttons/Tools
  • +
  • $:/sib/CheckpointDropdown
  • +
  • $:/sib/Documentation
  • $:/sib/Documentation/Macros
  • @@ -637,6 +696,8 @@ Error message and password prompt
  • $:/sib/indite/ViewTemplate
  • +
  • $:/sib/js/dateadd.js
  • +
  • $:/sib/js/excise-private-chunk.js
  • $:/sib/js/ListSubscriptionsWidget
  • @@ -647,6 +708,8 @@ Error message and password prompt
  • $:/sib/js/thirdparty/TiddlyTools/Time/action-timeout.js
  • +
  • $:/sib/Macros/_delta-interest
  • +
  • $:/sib/Macros/cb
  • $:/sib/Macros/check-item
  • @@ -661,6 +724,10 @@ Error message and password prompt
  • $:/sib/Macros/fnote
  • +
  • $:/sib/Macros/iex
  • + +
  • $:/sib/Macros/jsub
  • +
  • $:/sib/Macros/privateperson
  • $:/sib/Macros/rt
  • @@ -671,6 +738,8 @@ Error message and password prompt
  • $:/sib/Macros/subreddit
  • +
  • $:/sib/Macros/summarize
  • +
  • $:/sib/MediaRating/average
  • $:/sib/MediaRating/classic
  • @@ -703,8 +772,12 @@ Error message and password prompt
  • $:/sib/refexplorer/Footnotes
  • +
  • $:/sib/refexplorer/GlobalJournalSubtiddlerFilter
  • +
  • $:/sib/refexplorer/Ideas
  • +
  • $:/sib/refexplorer/Journal
  • +
  • $:/sib/refexplorer/LinkGraph
  • $:/sib/refexplorer/LinkTypeTemplate
  • @@ -715,6 +788,8 @@ Error message and password prompt
  • $:/sib/refexplorer/ReferenceExplorer
  • +
  • $:/sib/refexplorer/RT
  • +
  • $:/sib/refexplorer/Sinks
  • $:/sib/refexplorer/Sources
  • @@ -739,6 +814,8 @@ Error message and password prompt
  • $:/sib/SideBar/InfoLinks
  • +
  • $:/sib/SideBar/Journal
  • +
  • $:/sib/SideBar/Write
  • $:/sib/SideBar/Write/Stub
  • @@ -765,12 +842,24 @@ Error message and password prompt
  • $:/sib/styles/Subtitle
  • +
  • $:/sib/Templates/Automatic/CheckpointList
  • +
  • $:/sib/Templates/Automatic/Clock
  • +
  • $:/sib/Templates/Automatic/Date
  • + +
  • $:/sib/Templates/Automatic/Event
  • + +
  • $:/sib/Templates/Automatic/FrozenTiddlerEditWarning
  • + +
  • $:/sib/Templates/Automatic/JournalNavigation
  • +
  • $:/sib/Templates/Automatic/MacroDescription
  • $:/sib/Templates/Automatic/MissingTiddlerCreationNotification
  • +
  • $:/sib/Templates/Automatic/MissingTiddlerQuickCreate
  • +
  • $:/sib/Templates/Automatic/OpenTopBar
  • $:/sib/Templates/Automatic/PrivateChunkParentNotice
  • @@ -783,6 +872,8 @@ Error message and password prompt
  • $:/sib/Templates/Automatic/ReaderActions
  • +
  • $:/sib/Templates/Automatic/RomanticInterest
  • +
  • $:/sib/Templates/Automatic/Source
  • $:/sib/Templates/Automatic/SpoilerBanner
  • @@ -791,10 +882,14 @@ Error message and password prompt
  • $:/sib/Templates/Automatic/Subtiddler
  • +
  • $:/sib/Templates/Automatic/TiddlerTypeIcon
  • +
  • $:/sib/Templates/Automatic/TypeTagChecker
  • $:/sib/Templates/Automatic/Untitled
  • +
  • $:/sib/Templates/Automatic/UpdateStatus
  • +
  • $:/sib/Templates/Automatic/ViewTemplateDescription
  • $:/sib/Templates/Export/SabbaticalUpdateCabCrosspost
  • @@ -817,6 +912,12 @@ Error message and password prompt
  • $:/sib/Templates/Topical/Build2020SessionDetails
  • +
  • $:/sib/Templates/Topical/DateSummaryStretch
  • + +
  • $:/sib/Templates/Topical/JournalPersonPlaceExplorer
  • + +
  • $:/sib/Templates/Topical/JournalSubtiddlerStretch
  • +
  • $:/sib/Templates/Topical/MaudWikiImport
  • $:/sib/Templates/Topical/MinnesotaStateParkInfo
  • @@ -829,6 +930,8 @@ Error message and password prompt
  • $:/sib/Templates/Topical/ReadingList/SmallTemplate
  • +
  • $:/sib/Templates/Topical/RiStatusLine
  • +
  • $:/sib/Templates/Topical/SabbaticalUpdates/DateNavigation
  • $:/sib/Templates/Topical/SabbaticalUpdates/ReadOnZettelkasten
  • @@ -919,18 +1022,6 @@ Error message and password prompt
  • $:/themes/tiddlywiki/vanilla/sticky
  • -
  • $:/todolist/data/base/archive
  • - -
  • $:/todolist/data/base/done
  • - -
  • $:/todolist/data/base/priority
  • - -
  • $:/todolist/data/base/state
  • - -
  • $:/todolist/data/base/status
  • - -
  • $:/todolist/data/base/tasks
  • -
  • Attachment
  • Bibliography
  • @@ -951,6 +1042,8 @@ Error message and password prompt
  • Journal
  • +
  • JournalCalendar
  • +
  • Meta
  • NeedsAttention
  • @@ -979,6 +1072,8 @@ Error message and password prompt
  • PublicHomepage
  • +
  • RecentIdeas
  • +
  • ReferenceExplorer
  • Sink
  • @@ -993,6 +1088,8 @@ Error message and password prompt
  • Tool
  • +
  • UpdateStatuses
  • +
  • ZettelkastenCardType
  • @@ -1010,6 +1107,7 @@ Error message and password prompt @@ -1580,6 +1727,7 @@ if(typeof(exports) === "undefined") { // Export functionality as a module exports.bootprefix = _bootprefix; } +//# sourceURL=$:/boot/bootprefix.js @@ -1654,6 +1802,26 @@ $tw.utils.isArrayEqual = function(array1,array2) { }); }; +/* +Add an entry to a sorted array if it doesn't already exist, while maintaining the sort order +*/ +$tw.utils.insertSortedArray = function(array,value) { + var low = 0, high = array.length - 1, mid, cmp; + while(low <= high) { + mid = (low + high) >> 1; + cmp = value.localeCompare(array[mid]); + if(cmp > 0) { + low = mid + 1; + } else if(cmp < 0) { + high = mid - 1; + } else { + return array; + } + } + array.splice(low,0,value); + return array; +}; + /* Push entries onto an array, removing them first if they already exist in the array array: array to modify (assumed to be free of duplicates) @@ -1842,6 +2010,28 @@ $tw.utils.deepDefaults = function(object /*, sourceObjectList */) { return object; }; +/* +Convert a URIComponent encoded string to a string safely +*/ +$tw.utils.decodeURIComponentSafe = function(s) { + var v = s; + try { + v = decodeURIComponent(s); + } catch(e) {} + return v; +}; + +/* +Convert a URI encoded string to a string safely +*/ +$tw.utils.decodeURISafe = function(s) { + var v = s; + try { + v = decodeURI(s); + } catch(e) {} + return v; +}; + /* Convert "&" to &, " " to nbsp, "<" to <, ">" to > and """ to " */ @@ -1857,7 +2047,7 @@ $tw.utils.getLocationHash = function() { var idx = href.indexOf('#'); if(idx === -1) { return "#"; - } else if(idx < href.length-1 && href[idx+1] === '#') { + } else if(href.substr(idx + 1,1) === "#" || href.substr(idx + 1,3) === "%23") { // Special case: ignore location hash if it itself starts with a # return "#"; } else { @@ -1919,7 +2109,7 @@ $tw.utils.stringifyList = function(value) { var result = new Array(value.length); for(var t=0, l=value.length; t diff --git a/tzk/editions/tzk/plugins/3click2edit/$__plugins_danielo515_2click2edit_ClickListener.js b/tzk/editions/tzk/plugins/3click2edit/_system/plugins/danielo515/2click2edit/ClickListener.js similarity index 100% rename from tzk/editions/tzk/plugins/3click2edit/$__plugins_danielo515_2click2edit_ClickListener.js rename to tzk/editions/tzk/plugins/3click2edit/_system/plugins/danielo515/2click2edit/ClickListener.js diff --git a/tzk/editions/tzk/plugins/3click2edit/$__plugins_danielo515_2click2edit_ClickListener.js.meta b/tzk/editions/tzk/plugins/3click2edit/_system/plugins/danielo515/2click2edit/ClickListener.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/3click2edit/$__plugins_danielo515_2click2edit_ClickListener.js.meta rename to tzk/editions/tzk/plugins/3click2edit/_system/plugins/danielo515/2click2edit/ClickListener.js.meta diff --git a/tzk/editions/tzk/plugins/3click2edit/$__plugins_danielo515_2click2edit_readme.tid b/tzk/editions/tzk/plugins/3click2edit/_system/plugins/danielo515/2click2edit/readme.tid similarity index 100% rename from tzk/editions/tzk/plugins/3click2edit/$__plugins_danielo515_2click2edit_readme.tid rename to tzk/editions/tzk/plugins/3click2edit/_system/plugins/danielo515/2click2edit/readme.tid diff --git a/tzk/editions/tzk/plugins/3click2edit/$__plugins_danielo515_2click2edit_ui_ViewTemplate.tid b/tzk/editions/tzk/plugins/3click2edit/_system/plugins/danielo515/2click2edit/ui/ViewTemplate.tid similarity index 100% rename from tzk/editions/tzk/plugins/3click2edit/$__plugins_danielo515_2click2edit_ui_ViewTemplate.tid rename to tzk/editions/tzk/plugins/3click2edit/_system/plugins/danielo515/2click2edit/ui/ViewTemplate.tid diff --git a/tzk/editions/tzk/plugins/Calendar/_system/config/bj/Calendar.json b/tzk/editions/tzk/plugins/Calendar/_system/config/bj/Calendar.json new file mode 100644 index 0000000..e5aa00c --- /dev/null +++ b/tzk/editions/tzk/plugins/Calendar/_system/config/bj/Calendar.json @@ -0,0 +1,31 @@ + +{ + "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" + } +} diff --git a/tzk/editions/tzk/plugins/Calendar/_system/config/bj/Calendar.json.meta b/tzk/editions/tzk/plugins/Calendar/_system/config/bj/Calendar.json.meta new file mode 100644 index 0000000..a027355 --- /dev/null +++ b/tzk/editions/tzk/plugins/Calendar/_system/config/bj/Calendar.json.meta @@ -0,0 +1,3 @@ +module-type: library +title: $:/config/bj/Calendar.json +type: application/json \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/Calendar/_system/core/modules/widgets/macrorefresh.js b/tzk/editions/tzk/plugins/Calendar/_system/core/modules/widgets/macrorefresh.js new file mode 100644 index 0000000..1de88a2 --- /dev/null +++ b/tzk/editions/tzk/plugins/Calendar/_system/core/modules/widgets/macrorefresh.js @@ -0,0 +1,96 @@ +/*\ +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; + +})(); diff --git a/tzk/editions/tzk/plugins/Calendar/_system/core/modules/widgets/macrorefresh.js.meta b/tzk/editions/tzk/plugins/Calendar/_system/core/modules/widgets/macrorefresh.js.meta new file mode 100644 index 0000000..2e92b4a --- /dev/null +++ b/tzk/editions/tzk/plugins/Calendar/_system/core/modules/widgets/macrorefresh.js.meta @@ -0,0 +1,3 @@ +module-type: widget +title: $:/core/modules/widgets/macrorefresh.js +type: application/javascript \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/Calendar/_system/macros/bj/Calendar/diary.js b/tzk/editions/tzk/plugins/Calendar/_system/macros/bj/Calendar/diary.js new file mode 100644 index 0000000..3decd74 --- /dev/null +++ b/tzk/editions/tzk/plugins/Calendar/_system/macros/bj/Calendar/diary.js @@ -0,0 +1,37 @@ +/*\ +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; +})(); diff --git a/tzk/editions/tzk/plugins/Calendar/_system/macros/bj/Calendar/diary.js.meta b/tzk/editions/tzk/plugins/Calendar/_system/macros/bj/Calendar/diary.js.meta new file mode 100644 index 0000000..8bec6bb --- /dev/null +++ b/tzk/editions/tzk/plugins/Calendar/_system/macros/bj/Calendar/diary.js.meta @@ -0,0 +1,3 @@ +module-type: global +title: $:/macros/bj/Calendar/diary.js +type: application/javascript \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/Calendar/_system/macros/bj/Calendar/journalfmt.js b/tzk/editions/tzk/plugins/Calendar/_system/macros/bj/Calendar/journalfmt.js new file mode 100644 index 0000000..4665e46 --- /dev/null +++ b/tzk/editions/tzk/plugins/Calendar/_system/macros/bj/Calendar/journalfmt.js @@ -0,0 +1,37 @@ +/*\ +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; +})(); diff --git a/tzk/editions/tzk/plugins/Calendar/_system/macros/bj/Calendar/journalfmt.js.meta b/tzk/editions/tzk/plugins/Calendar/_system/macros/bj/Calendar/journalfmt.js.meta new file mode 100644 index 0000000..1550681 --- /dev/null +++ b/tzk/editions/tzk/plugins/Calendar/_system/macros/bj/Calendar/journalfmt.js.meta @@ -0,0 +1,3 @@ +module-type: global +title: $:/macros/bj/Calendar/journalfmt.js +type: application/javascript \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/Calendar/_system/macros/bj/Calendar/journalslinked.js b/tzk/editions/tzk/plugins/Calendar/_system/macros/bj/Calendar/journalslinked.js new file mode 100644 index 0000000..1584d7d --- /dev/null +++ b/tzk/editions/tzk/plugins/Calendar/_system/macros/bj/Calendar/journalslinked.js @@ -0,0 +1,37 @@ +/*\ +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; +})(); diff --git a/tzk/editions/tzk/plugins/Calendar/_system/macros/bj/Calendar/journalslinked.js.meta b/tzk/editions/tzk/plugins/Calendar/_system/macros/bj/Calendar/journalslinked.js.meta new file mode 100644 index 0000000..ddb5914 --- /dev/null +++ b/tzk/editions/tzk/plugins/Calendar/_system/macros/bj/Calendar/journalslinked.js.meta @@ -0,0 +1,3 @@ +module-type: global +title: $:/macros/bj/Calendar/journalslinked.js +type: application/javascript \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/Calendar/_system/macros/buggyj/Calendar/base.js b/tzk/editions/tzk/plugins/Calendar/_system/macros/buggyj/Calendar/base.js new file mode 100644 index 0000000..67ec94a --- /dev/null +++ b/tzk/editions/tzk/plugins/Calendar/_system/macros/buggyj/Calendar/base.js @@ -0,0 +1,140 @@ +/*\ +title: $:/macros/buggyj/Calendar/base.js +type: application/javascript +module-type: macro + +<> +<> - year 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 = "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='
    '+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'; + +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> +<> - year 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"/>'; +} + +})(); diff --git a/tzk/editions/tzk/plugins/Calendar/_system/macros/buggyj/Calendar/entry.js.meta b/tzk/editions/tzk/plugins/Calendar/_system/macros/buggyj/Calendar/entry.js.meta new file mode 100644 index 0000000..df0b16d --- /dev/null +++ b/tzk/editions/tzk/plugins/Calendar/_system/macros/buggyj/Calendar/entry.js.meta @@ -0,0 +1,3 @@ +module-type: macro +title: $:/macros/buggyj/Calendar/entry.js +type: application/javascript \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/Calendar/_system/macros/buggyj/Calendar/entry2.js b/tzk/editions/tzk/plugins/Calendar/_system/macros/buggyj/Calendar/entry2.js new file mode 100644 index 0000000..65a2ed7 --- /dev/null +++ b/tzk/editions/tzk/plugins/Calendar/_system/macros/buggyj/Calendar/entry2.js @@ -0,0 +1,39 @@ +/*\ +title: $:/macros/buggyj/Calendar/entry2.js +type: application/javascript +module-type: macro + +<> +<> - year 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 = "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"/>'+ ''; +} + +})(); diff --git a/tzk/editions/tzk/plugins/Calendar/_system/macros/buggyj/Calendar/entry2.js.meta b/tzk/editions/tzk/plugins/Calendar/_system/macros/buggyj/Calendar/entry2.js.meta new file mode 100644 index 0000000..0330638 --- /dev/null +++ b/tzk/editions/tzk/plugins/Calendar/_system/macros/buggyj/Calendar/entry2.js.meta @@ -0,0 +1,3 @@ +module-type: macro +title: $:/macros/buggyj/Calendar/entry2.js +type: application/javascript \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/Calendar/_system/macros/buggyj/Calendar/ifnew.js b/tzk/editions/tzk/plugins/Calendar/_system/macros/buggyj/Calendar/ifnew.js new file mode 100644 index 0000000..d95f29b --- /dev/null +++ b/tzk/editions/tzk/plugins/Calendar/_system/macros/buggyj/Calendar/ifnew.js @@ -0,0 +1,87 @@ +/*\ +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; + +})(); diff --git a/tzk/editions/tzk/plugins/Calendar/_system/macros/buggyj/Calendar/ifnew.js.meta b/tzk/editions/tzk/plugins/Calendar/_system/macros/buggyj/Calendar/ifnew.js.meta new file mode 100644 index 0000000..9dc76d8 --- /dev/null +++ b/tzk/editions/tzk/plugins/Calendar/_system/macros/buggyj/Calendar/ifnew.js.meta @@ -0,0 +1,3 @@ +module-type: widget +title: $:/macros/buggyj/Calendar/ifnew.js +type: application/javascript \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/Calendar/_system/macros/buggyj/Calendar/refresh.js b/tzk/editions/tzk/plugins/Calendar/_system/macros/buggyj/Calendar/refresh.js new file mode 100644 index 0000000..e4af052 --- /dev/null +++ b/tzk/editions/tzk/plugins/Calendar/_system/macros/buggyj/Calendar/refresh.js @@ -0,0 +1,105 @@ +/*\ +title: $:/macros/buggyj/Calendar/refresh.js +type: application/javascript +module-type: macro + +<> +<> - year 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 = "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 + <$button set="$:/temp/plugins/bj/Calendar" setTo="Year">Year + <> + +<$reveal state="$:/temp/plugins/bj/Calendar" text="Year" type="match"> + <$button set="$:/temp/plugins/bj/Calendar" setTo="Month">Month +<> + diff --git a/tzk/editions/tzk/plugins/Calendar/plugin.info b/tzk/editions/tzk/plugins/Calendar/plugin.info new file mode 100644 index 0000000..15a6a4e --- /dev/null +++ b/tzk/editions/tzk/plugins/Calendar/plugin.info @@ -0,0 +1,11 @@ +{ + "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" +} \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_fonts_Font Awesome 5 Free Brands.css b/tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/fonts/Font Awesome 5 Free Brands.css similarity index 100% rename from tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_fonts_Font Awesome 5 Free Brands.css rename to tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/fonts/Font Awesome 5 Free Brands.css diff --git a/tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_fonts_Font Awesome 5 Free Brands.css.meta b/tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/fonts/Font Awesome 5 Free Brands.css.meta similarity index 100% rename from tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_fonts_Font Awesome 5 Free Brands.css.meta rename to tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/fonts/Font Awesome 5 Free Brands.css.meta diff --git a/tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_fonts_Font Awesome 5 Free Regular.css b/tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/fonts/Font Awesome 5 Free Regular.css similarity index 100% rename from tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_fonts_Font Awesome 5 Free Regular.css rename to tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/fonts/Font Awesome 5 Free Regular.css diff --git a/tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_fonts_Font Awesome 5 Free Regular.css.meta b/tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/fonts/Font Awesome 5 Free Regular.css.meta similarity index 100% rename from tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_fonts_Font Awesome 5 Free Regular.css.meta rename to tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/fonts/Font Awesome 5 Free Regular.css.meta diff --git a/tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_fonts_Font Awesome 5 Free Solid.css b/tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/fonts/Font Awesome 5 Free Solid.css similarity index 100% rename from tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_fonts_Font Awesome 5 Free Solid.css rename to tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/fonts/Font Awesome 5 Free Solid.css diff --git a/tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_fonts_Font Awesome 5 Free Solid.css.meta b/tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/fonts/Font Awesome 5 Free Solid.css.meta similarity index 100% rename from tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_fonts_Font Awesome 5 Free Solid.css.meta rename to tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/fonts/Font Awesome 5 Free Solid.css.meta diff --git a/tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_history.tid b/tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/history.tid similarity index 100% rename from tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_history.tid rename to tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/history.tid diff --git a/tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_icon.tid b/tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/icon.tid similarity index 100% rename from tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_icon.tid rename to tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/icon.tid diff --git a/tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_license.tid b/tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/license.tid similarity index 100% rename from tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_license.tid rename to tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/license.tid diff --git a/tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_macros_css settings.tid b/tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/macros/css settings.tid similarity index 100% rename from tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_macros_css settings.tid rename to tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/macros/css settings.tid diff --git a/tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_macros_fa.tid b/tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/macros/fa.tid similarity index 100% rename from tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_macros_fa.tid rename to tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/macros/fa.tid diff --git a/tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_macros_fa_doc.tid b/tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/macros/fa/doc.tid similarity index 100% rename from tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_macros_fa_doc.tid rename to tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/macros/fa/doc.tid diff --git a/tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_macros_global-macros.tid b/tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/macros/global-macros.tid similarity index 100% rename from tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_macros_global-macros.tid rename to tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/macros/global-macros.tid diff --git a/tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_readme.tid b/tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/readme.tid similarity index 100% rename from tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_readme.tid rename to tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/readme.tid diff --git a/tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_styles_extlinks.tid b/tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/styles/extlinks.tid similarity index 100% rename from tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_styles_extlinks.tid rename to tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/styles/extlinks.tid diff --git a/tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_styles_extlinks_FontAwesome.tid b/tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/styles/extlinks/FontAwesome.tid similarity index 100% rename from tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_styles_extlinks_FontAwesome.tid rename to tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/styles/extlinks/FontAwesome.tid diff --git a/tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_styles_extlinks_GitHub.tid b/tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/styles/extlinks/GitHub.tid similarity index 100% rename from tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_styles_extlinks_GitHub.tid rename to tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/styles/extlinks/GitHub.tid diff --git a/tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_styles_extlinks_Wikipedia.tid b/tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/styles/extlinks/Wikipedia.tid similarity index 100% rename from tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_styles_extlinks_Wikipedia.tid rename to tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/styles/extlinks/Wikipedia.tid diff --git a/tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_styles_extlinks_doctypes.tid b/tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/styles/extlinks/doctypes.tid similarity index 100% rename from tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_styles_extlinks_doctypes.tid rename to tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/styles/extlinks/doctypes.tid diff --git a/tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_styles_fontawesome 5.css b/tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/styles/fontawesome 5.css similarity index 100% rename from tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_styles_fontawesome 5.css rename to tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/styles/fontawesome 5.css diff --git a/tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_styles_fontawesome 5.css.meta b/tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/styles/fontawesome 5.css.meta similarity index 100% rename from tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_styles_fontawesome 5.css.meta rename to tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/styles/fontawesome 5.css.meta diff --git a/tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_styles_tiddlylinks_system.tid b/tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/styles/tiddlylinks/system.tid similarity index 100% rename from tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_styles_tiddlylinks_system.tid rename to tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/styles/tiddlylinks/system.tid diff --git a/tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_ui_ControlPanel_FontAwesome.tid b/tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/ui/ControlPanel/FontAwesome.tid similarity index 100% rename from tzk/editions/tzk/plugins/FontAwesome/$__plugins_TheDiveO_FontAwesome_ui_ControlPanel_FontAwesome.tid rename to tzk/editions/tzk/plugins/FontAwesome/_system/plugins/TheDiveO/FontAwesome/ui/ControlPanel/FontAwesome.tid diff --git a/tzk/editions/tzk/plugins/FontAwesome/plugin.info b/tzk/editions/tzk/plugins/FontAwesome/plugin.info index d46ce99..8c799f8 100644 --- a/tzk/editions/tzk/plugins/FontAwesome/plugin.info +++ b/tzk/editions/tzk/plugins/FontAwesome/plugin.info @@ -9,5 +9,6 @@ "plugin-type": "plugin", "source": "https://github.com/TheDiveO/TW5FontAwesome", "title": "$:/plugins/TheDiveO/FontAwesome", - "version": "1.2.18" + "version": "1.2.18", + "dependents": "" } \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/TiddlyRemember/$__config_ShortcutInfo_remembercz.tid b/tzk/editions/tzk/plugins/TiddlyRemember/_system/config/ShortcutInfo/remembercz.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyRemember/$__config_ShortcutInfo_remembercz.tid rename to tzk/editions/tzk/plugins/TiddlyRemember/_system/config/ShortcutInfo/remembercz.tid diff --git a/tzk/editions/tzk/plugins/TiddlyRemember/$__config_ShortcutInfo_rememberq.tid b/tzk/editions/tzk/plugins/TiddlyRemember/_system/config/ShortcutInfo/rememberq.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyRemember/$__config_ShortcutInfo_rememberq.tid rename to tzk/editions/tzk/plugins/TiddlyRemember/_system/config/ShortcutInfo/rememberq.tid diff --git a/tzk/editions/tzk/plugins/TiddlyRemember/$__config_TiddlyRemember_DeckMapping.tid b/tzk/editions/tzk/plugins/TiddlyRemember/_system/config/TiddlyRemember/DeckMapping.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyRemember/$__config_TiddlyRemember_DeckMapping.tid rename to tzk/editions/tzk/plugins/TiddlyRemember/_system/config/TiddlyRemember/DeckMapping.tid diff --git a/tzk/editions/tzk/plugins/TiddlyRemember/$__config_TiddlyRemember_DefaultClasses.tid b/tzk/editions/tzk/plugins/TiddlyRemember/_system/config/TiddlyRemember/DefaultClasses.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyRemember/$__config_TiddlyRemember_DefaultClasses.tid rename to tzk/editions/tzk/plugins/TiddlyRemember/_system/config/TiddlyRemember/DefaultClasses.tid diff --git a/tzk/editions/tzk/plugins/TiddlyRemember/$__config_TiddlyRemember_IdPrefix.tid b/tzk/editions/tzk/plugins/TiddlyRemember/_system/config/TiddlyRemember/IdPrefix.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyRemember/$__config_TiddlyRemember_IdPrefix.tid rename to tzk/editions/tzk/plugins/TiddlyRemember/_system/config/TiddlyRemember/IdPrefix.tid diff --git a/tzk/editions/tzk/plugins/TiddlyRemember/$__config_TiddlyRemember_TagMapping.tid b/tzk/editions/tzk/plugins/TiddlyRemember/_system/config/TiddlyRemember/TagMapping.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyRemember/$__config_TiddlyRemember_TagMapping.tid rename to tzk/editions/tzk/plugins/TiddlyRemember/_system/config/TiddlyRemember/TagMapping.tid diff --git a/tzk/editions/tzk/plugins/TiddlyRemember/$__config_TiddlyRemember_snippets_remembercz.tid b/tzk/editions/tzk/plugins/TiddlyRemember/_system/config/TiddlyRemember/snippets/remembercz.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyRemember/$__config_TiddlyRemember_snippets_remembercz.tid rename to tzk/editions/tzk/plugins/TiddlyRemember/_system/config/TiddlyRemember/snippets/remembercz.tid diff --git a/tzk/editions/tzk/plugins/TiddlyRemember/$__config_TiddlyRemember_snippets_rememberq.tid b/tzk/editions/tzk/plugins/TiddlyRemember/_system/config/TiddlyRemember/snippets/rememberq.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyRemember/$__config_TiddlyRemember_snippets_rememberq.tid rename to tzk/editions/tzk/plugins/TiddlyRemember/_system/config/TiddlyRemember/snippets/rememberq.tid diff --git a/tzk/editions/tzk/plugins/TiddlyRemember/$__config_shortcuts_remembercz.tid b/tzk/editions/tzk/plugins/TiddlyRemember/_system/config/shortcuts/remembercz.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyRemember/$__config_shortcuts_remembercz.tid rename to tzk/editions/tzk/plugins/TiddlyRemember/_system/config/shortcuts/remembercz.tid diff --git a/tzk/editions/tzk/plugins/TiddlyRemember/$__config_shortcuts_rememberq.tid b/tzk/editions/tzk/plugins/TiddlyRemember/_system/config/shortcuts/rememberq.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyRemember/$__config_shortcuts_rememberq.tid rename to tzk/editions/tzk/plugins/TiddlyRemember/_system/config/shortcuts/rememberq.tid diff --git a/tzk/editions/tzk/plugins/TiddlyRemember/$__plugins_sobjornstad_TiddlyRemember_icons_lightbulb-black.svg b/tzk/editions/tzk/plugins/TiddlyRemember/_system/plugins/sobjornstad/TiddlyRemember/icons/lightbulb-black.svg similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyRemember/$__plugins_sobjornstad_TiddlyRemember_icons_lightbulb-black.svg rename to tzk/editions/tzk/plugins/TiddlyRemember/_system/plugins/sobjornstad/TiddlyRemember/icons/lightbulb-black.svg diff --git a/tzk/editions/tzk/plugins/TiddlyRemember/$__plugins_sobjornstad_TiddlyRemember_icons_lightbulb-black.svg.meta b/tzk/editions/tzk/plugins/TiddlyRemember/_system/plugins/sobjornstad/TiddlyRemember/icons/lightbulb-black.svg.meta similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyRemember/$__plugins_sobjornstad_TiddlyRemember_icons_lightbulb-black.svg.meta rename to tzk/editions/tzk/plugins/TiddlyRemember/_system/plugins/sobjornstad/TiddlyRemember/icons/lightbulb-black.svg.meta diff --git a/tzk/editions/tzk/plugins/TiddlyRemember/$__plugins_sobjornstad_TiddlyRemember_icons_lightbulb-white.svg b/tzk/editions/tzk/plugins/TiddlyRemember/_system/plugins/sobjornstad/TiddlyRemember/icons/lightbulb-white.svg similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyRemember/$__plugins_sobjornstad_TiddlyRemember_icons_lightbulb-white.svg rename to tzk/editions/tzk/plugins/TiddlyRemember/_system/plugins/sobjornstad/TiddlyRemember/icons/lightbulb-white.svg diff --git a/tzk/editions/tzk/plugins/TiddlyRemember/$__plugins_sobjornstad_TiddlyRemember_icons_lightbulb-white.svg.meta b/tzk/editions/tzk/plugins/TiddlyRemember/_system/plugins/sobjornstad/TiddlyRemember/icons/lightbulb-white.svg.meta similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyRemember/$__plugins_sobjornstad_TiddlyRemember_icons_lightbulb-white.svg.meta rename to tzk/editions/tzk/plugins/TiddlyRemember/_system/plugins/sobjornstad/TiddlyRemember/icons/lightbulb-white.svg.meta diff --git a/tzk/editions/tzk/plugins/TiddlyRemember/$__plugins_sobjornstad_TiddlyRemember_license.txt b/tzk/editions/tzk/plugins/TiddlyRemember/_system/plugins/sobjornstad/TiddlyRemember/license.txt similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyRemember/$__plugins_sobjornstad_TiddlyRemember_license.txt rename to tzk/editions/tzk/plugins/TiddlyRemember/_system/plugins/sobjornstad/TiddlyRemember/license.txt diff --git a/tzk/editions/tzk/plugins/TiddlyRemember/$__plugins_sobjornstad_TiddlyRemember_license.txt.meta b/tzk/editions/tzk/plugins/TiddlyRemember/_system/plugins/sobjornstad/TiddlyRemember/license.txt.meta similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyRemember/$__plugins_sobjornstad_TiddlyRemember_license.txt.meta rename to tzk/editions/tzk/plugins/TiddlyRemember/_system/plugins/sobjornstad/TiddlyRemember/license.txt.meta diff --git a/tzk/editions/tzk/plugins/TiddlyRemember/$__plugins_sobjornstad_TiddlyRemember_macros_insert-snippet.tid b/tzk/editions/tzk/plugins/TiddlyRemember/_system/plugins/sobjornstad/TiddlyRemember/macros/insert-snippet.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyRemember/$__plugins_sobjornstad_TiddlyRemember_macros_insert-snippet.tid rename to tzk/editions/tzk/plugins/TiddlyRemember/_system/plugins/sobjornstad/TiddlyRemember/macros/insert-snippet.tid diff --git a/tzk/editions/tzk/plugins/TiddlyRemember/$__plugins_sobjornstad_TiddlyRemember_macros_remember.tid b/tzk/editions/tzk/plugins/TiddlyRemember/_system/plugins/sobjornstad/TiddlyRemember/macros/remember.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyRemember/$__plugins_sobjornstad_TiddlyRemember_macros_remember.tid rename to tzk/editions/tzk/plugins/TiddlyRemember/_system/plugins/sobjornstad/TiddlyRemember/macros/remember.tid diff --git a/tzk/editions/tzk/plugins/TiddlyRemember/$__plugins_sobjornstad_TiddlyRemember_readme.tid b/tzk/editions/tzk/plugins/TiddlyRemember/_system/plugins/sobjornstad/TiddlyRemember/readme.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyRemember/$__plugins_sobjornstad_TiddlyRemember_readme.tid rename to tzk/editions/tzk/plugins/TiddlyRemember/_system/plugins/sobjornstad/TiddlyRemember/readme.tid diff --git a/tzk/editions/tzk/plugins/TiddlyRemember/$__plugins_sobjornstad_TiddlyRemember_stylesheets_remember.tid b/tzk/editions/tzk/plugins/TiddlyRemember/_system/plugins/sobjornstad/TiddlyRemember/stylesheets/remember.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyRemember/$__plugins_sobjornstad_TiddlyRemember_stylesheets_remember.tid rename to tzk/editions/tzk/plugins/TiddlyRemember/_system/plugins/sobjornstad/TiddlyRemember/stylesheets/remember.tid diff --git a/tzk/editions/tzk/plugins/TiddlyRemember/$__plugins_sobjornstad_TiddlyRemember_templates_AnkiDecks.tid b/tzk/editions/tzk/plugins/TiddlyRemember/_system/plugins/sobjornstad/TiddlyRemember/templates/AnkiDecks.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyRemember/$__plugins_sobjornstad_TiddlyRemember_templates_AnkiDecks.tid rename to tzk/editions/tzk/plugins/TiddlyRemember/_system/plugins/sobjornstad/TiddlyRemember/templates/AnkiDecks.tid diff --git a/tzk/editions/tzk/plugins/TiddlyRemember/$__plugins_sobjornstad_TiddlyRemember_templates_AnkiTags.tid b/tzk/editions/tzk/plugins/TiddlyRemember/_system/plugins/sobjornstad/TiddlyRemember/templates/AnkiTags.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyRemember/$__plugins_sobjornstad_TiddlyRemember_templates_AnkiTags.tid rename to tzk/editions/tzk/plugins/TiddlyRemember/_system/plugins/sobjornstad/TiddlyRemember/templates/AnkiTags.tid diff --git a/tzk/editions/tzk/plugins/TiddlyRemember/$__plugins_sobjornstad_TiddlyRemember_templates_TiddlyRememberParseable.tid b/tzk/editions/tzk/plugins/TiddlyRemember/_system/plugins/sobjornstad/TiddlyRemember/templates/TiddlyRememberParseable.tid similarity index 93% rename from tzk/editions/tzk/plugins/TiddlyRemember/$__plugins_sobjornstad_TiddlyRemember_templates_TiddlyRememberParseable.tid rename to tzk/editions/tzk/plugins/TiddlyRemember/_system/plugins/sobjornstad/TiddlyRemember/templates/TiddlyRememberParseable.tid index 534ee0d..599382f 100644 --- a/tzk/editions/tzk/plugins/TiddlyRemember/$__plugins_sobjornstad_TiddlyRemember_templates_TiddlyRememberParseable.tid +++ b/tzk/editions/tzk/plugins/TiddlyRemember/_system/plugins/sobjornstad/TiddlyRemember/templates/TiddlyRememberParseable.tid @@ -8,7 +8,7 @@ type: text/vnd.tiddlywiki <$set name="tr-rendering" value="yes"> -1.3.3 +1.3.4 {{||$:/plugins/sobjornstad/TiddlyRemember/templates/AnkiDecks}} {{||$:/plugins/sobjornstad/TiddlyRemember/templates/AnkiTags}} diff --git a/tzk/editions/tzk/plugins/TiddlyRemember/$__plugins_sobjornstad_TiddlyRemember_toolbar_remembercz.tid b/tzk/editions/tzk/plugins/TiddlyRemember/_system/plugins/sobjornstad/TiddlyRemember/toolbar/remembercz.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyRemember/$__plugins_sobjornstad_TiddlyRemember_toolbar_remembercz.tid rename to tzk/editions/tzk/plugins/TiddlyRemember/_system/plugins/sobjornstad/TiddlyRemember/toolbar/remembercz.tid diff --git a/tzk/editions/tzk/plugins/TiddlyRemember/$__plugins_sobjornstad_TiddlyRemember_toolbar_rememberq.tid b/tzk/editions/tzk/plugins/TiddlyRemember/_system/plugins/sobjornstad/TiddlyRemember/toolbar/rememberq.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyRemember/$__plugins_sobjornstad_TiddlyRemember_toolbar_rememberq.tid rename to tzk/editions/tzk/plugins/TiddlyRemember/_system/plugins/sobjornstad/TiddlyRemember/toolbar/rememberq.tid diff --git a/tzk/editions/tzk/plugins/TiddlyRemember/plugin.info b/tzk/editions/tzk/plugins/TiddlyRemember/plugin.info index 2198229..1562dd1 100644 --- a/tzk/editions/tzk/plugins/TiddlyRemember/plugin.info +++ b/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.3", + "version": "1.3.4", "core-version": ">=5.1.21", "source": "https://github.com/sobjornstad/TiddlyRemember", "list": "readme license", diff --git a/tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_TiddlyStretch Macros.tid b/tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/TiddlyStretch Macros.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_TiddlyStretch Macros.tid rename to tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/TiddlyStretch Macros.tid diff --git a/tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_doc_EmptyMessage.tid b/tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/doc/EmptyMessage.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_doc_EmptyMessage.tid rename to tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/doc/EmptyMessage.tid diff --git a/tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_doc_Filter.tid b/tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/doc/Filter.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_doc_Filter.tid rename to tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/doc/Filter.tid diff --git a/tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_doc_LargeField.tid b/tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/doc/LargeField.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_doc_LargeField.tid rename to tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/doc/LargeField.tid diff --git a/tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_doc_LargeMode.tid b/tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/doc/LargeMode.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_doc_LargeMode.tid rename to tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/doc/LargeMode.tid diff --git a/tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_doc_LargeTemplate.tid b/tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/doc/LargeTemplate.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_doc_LargeTemplate.tid rename to tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/doc/LargeTemplate.tid diff --git a/tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_doc_Macro.tid b/tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/doc/Macro.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_doc_Macro.tid rename to tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/doc/Macro.tid diff --git a/tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_doc_MacroInfoTemplate.tid b/tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/doc/MacroInfoTemplate.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_doc_MacroInfoTemplate.tid rename to tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/doc/MacroInfoTemplate.tid diff --git a/tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_doc_ParameterListingTemplate.tid b/tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/doc/ParameterListingTemplate.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_doc_ParameterListingTemplate.tid rename to tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/doc/ParameterListingTemplate.tid diff --git a/tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_doc_ParametersTemplate.tid b/tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/doc/ParametersTemplate.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_doc_ParametersTemplate.tid rename to tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/doc/ParametersTemplate.tid diff --git a/tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_doc_SmallField.tid b/tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/doc/SmallField.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_doc_SmallField.tid rename to tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/doc/SmallField.tid diff --git a/tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_doc_SmallMode.tid b/tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/doc/SmallMode.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_doc_SmallMode.tid rename to tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/doc/SmallMode.tid diff --git a/tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_doc_SmallTemplate.tid b/tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/doc/SmallTemplate.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_doc_SmallTemplate.tid rename to tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/doc/SmallTemplate.tid diff --git a/tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_doc_Tiddler.tid b/tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/doc/Tiddler.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_doc_Tiddler.tid rename to tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/doc/Tiddler.tid diff --git a/tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_doc_st_Identity.tid b/tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/doc/st/Identity.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_doc_st_Identity.tid rename to tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/doc/st/Identity.tid diff --git a/tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_doc_st_MacroSummary.tid b/tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/doc/st/MacroSummary.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_doc_st_MacroSummary.tid rename to tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/doc/st/MacroSummary.tid diff --git a/tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_doc_stretch-links.tid b/tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/doc/stretch-links.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_doc_stretch-links.tid rename to tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/doc/stretch-links.tid diff --git a/tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_doc_stretch-template-links.tid b/tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/doc/stretch-template-links.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_doc_stretch-template-links.tid rename to tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/doc/stretch-template-links.tid diff --git a/tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_doc_stretch-template.tid b/tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/doc/stretch-template.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_doc_stretch-template.tid rename to tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/doc/stretch-template.tid diff --git a/tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_doc_stretch.tid b/tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/doc/stretch.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_doc_stretch.tid rename to tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/doc/stretch.tid diff --git a/tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_license.txt b/tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/license.txt similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_license.txt rename to tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/license.txt diff --git a/tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_license.txt.meta b/tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/license.txt.meta similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_license.txt.meta rename to tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/license.txt.meta diff --git a/tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_macros_stretch.tid b/tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/macros/stretch.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_macros_stretch.tid rename to tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/macros/stretch.tid diff --git a/tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_readme.tid b/tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/readme.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_readme.tid rename to tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/readme.tid diff --git a/tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_styles_stretch.tid b/tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/styles/stretch.tid similarity index 100% rename from tzk/editions/tzk/plugins/TiddlyStretch/$__plugins_sobjornstad_TiddlyStretch_styles_stretch.tid rename to tzk/editions/tzk/plugins/TiddlyStretch/_system/plugins/sobjornstad/TiddlyStretch/styles/stretch.tid diff --git a/tzk/editions/tzk/plugins/appear/$__plugins_tobibeer_appear_defaults_button-class.tid b/tzk/editions/tzk/plugins/appear/_system/plugins/tobibeer/appear/defaults/button-class.tid similarity index 100% rename from tzk/editions/tzk/plugins/appear/$__plugins_tobibeer_appear_defaults_button-class.tid rename to tzk/editions/tzk/plugins/appear/_system/plugins/tobibeer/appear/defaults/button-class.tid diff --git a/tzk/editions/tzk/plugins/appear/$__plugins_tobibeer_appear_defaults_default-state.tid b/tzk/editions/tzk/plugins/appear/_system/plugins/tobibeer/appear/defaults/default-state.tid similarity index 100% rename from tzk/editions/tzk/plugins/appear/$__plugins_tobibeer_appear_defaults_default-state.tid rename to tzk/editions/tzk/plugins/appear/_system/plugins/tobibeer/appear/defaults/default-state.tid diff --git a/tzk/editions/tzk/plugins/appear/$__plugins_tobibeer_appear_defaults_keep.tid b/tzk/editions/tzk/plugins/appear/_system/plugins/tobibeer/appear/defaults/keep.tid similarity index 100% rename from tzk/editions/tzk/plugins/appear/$__plugins_tobibeer_appear_defaults_keep.tid rename to tzk/editions/tzk/plugins/appear/_system/plugins/tobibeer/appear/defaults/keep.tid diff --git a/tzk/editions/tzk/plugins/appear/$__plugins_tobibeer_appear_defaults_mode.tid b/tzk/editions/tzk/plugins/appear/_system/plugins/tobibeer/appear/defaults/mode.tid similarity index 100% rename from tzk/editions/tzk/plugins/appear/$__plugins_tobibeer_appear_defaults_mode.tid rename to tzk/editions/tzk/plugins/appear/_system/plugins/tobibeer/appear/defaults/mode.tid diff --git a/tzk/editions/tzk/plugins/appear/$__plugins_tobibeer_appear_defaults_show.tid b/tzk/editions/tzk/plugins/appear/_system/plugins/tobibeer/appear/defaults/show.tid similarity index 100% rename from tzk/editions/tzk/plugins/appear/$__plugins_tobibeer_appear_defaults_show.tid rename to tzk/editions/tzk/plugins/appear/_system/plugins/tobibeer/appear/defaults/show.tid diff --git a/tzk/editions/tzk/plugins/appear/$__plugins_tobibeer_appear_popup.js b/tzk/editions/tzk/plugins/appear/_system/plugins/tobibeer/appear/popup.js similarity index 100% rename from tzk/editions/tzk/plugins/appear/$__plugins_tobibeer_appear_popup.js rename to tzk/editions/tzk/plugins/appear/_system/plugins/tobibeer/appear/popup.js diff --git a/tzk/editions/tzk/plugins/appear/$__plugins_tobibeer_appear_popup.js.meta b/tzk/editions/tzk/plugins/appear/_system/plugins/tobibeer/appear/popup.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/appear/$__plugins_tobibeer_appear_popup.js.meta rename to tzk/editions/tzk/plugins/appear/_system/plugins/tobibeer/appear/popup.js.meta diff --git a/tzk/editions/tzk/plugins/appear/$__plugins_tobibeer_appear_readme.tid b/tzk/editions/tzk/plugins/appear/_system/plugins/tobibeer/appear/readme.tid similarity index 100% rename from tzk/editions/tzk/plugins/appear/$__plugins_tobibeer_appear_readme.tid rename to tzk/editions/tzk/plugins/appear/_system/plugins/tobibeer/appear/readme.tid diff --git a/tzk/editions/tzk/plugins/appear/$__plugins_tobibeer_appear_styles.tid b/tzk/editions/tzk/plugins/appear/_system/plugins/tobibeer/appear/styles.tid similarity index 100% rename from tzk/editions/tzk/plugins/appear/$__plugins_tobibeer_appear_styles.tid rename to tzk/editions/tzk/plugins/appear/_system/plugins/tobibeer/appear/styles.tid diff --git a/tzk/editions/tzk/plugins/appear/$__plugins_tobibeer_appear_widget.js b/tzk/editions/tzk/plugins/appear/_system/plugins/tobibeer/appear/widget.js similarity index 100% rename from tzk/editions/tzk/plugins/appear/$__plugins_tobibeer_appear_widget.js rename to tzk/editions/tzk/plugins/appear/_system/plugins/tobibeer/appear/widget.js diff --git a/tzk/editions/tzk/plugins/appear/$__plugins_tobibeer_appear_widget.js.meta b/tzk/editions/tzk/plugins/appear/_system/plugins/tobibeer/appear/widget.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/appear/$__plugins_tobibeer_appear_widget.js.meta rename to tzk/editions/tzk/plugins/appear/_system/plugins/tobibeer/appear/widget.js.meta diff --git a/tzk/editions/tzk/plugins/cmplus/$__config_codemirror_autocomplete b/tzk/editions/tzk/plugins/cmplus/_system/config/codemirror/autocomplete similarity index 100% rename from tzk/editions/tzk/plugins/cmplus/$__config_codemirror_autocomplete rename to tzk/editions/tzk/plugins/cmplus/_system/config/codemirror/autocomplete diff --git a/tzk/editions/tzk/plugins/cmplus/$__config_codemirror_autocomplete.meta b/tzk/editions/tzk/plugins/cmplus/_system/config/codemirror/autocomplete.meta similarity index 100% rename from tzk/editions/tzk/plugins/cmplus/$__config_codemirror_autocomplete.meta rename to tzk/editions/tzk/plugins/cmplus/_system/config/codemirror/autocomplete.meta diff --git a/tzk/editions/tzk/plugins/cmplus/$__plugins_adithyab_cmplus_macros.tid b/tzk/editions/tzk/plugins/cmplus/_system/plugins/adithyab/cmplus/macros.tid similarity index 100% rename from tzk/editions/tzk/plugins/cmplus/$__plugins_adithyab_cmplus_macros.tid rename to tzk/editions/tzk/plugins/cmplus/_system/plugins/adithyab/cmplus/macros.tid diff --git a/tzk/editions/tzk/plugins/cmplus/$__plugins_adithyab_cmplus_readme.tid b/tzk/editions/tzk/plugins/cmplus/_system/plugins/adithyab/cmplus/readme.tid similarity index 100% rename from tzk/editions/tzk/plugins/cmplus/$__plugins_adithyab_cmplus_readme.tid rename to tzk/editions/tzk/plugins/cmplus/_system/plugins/adithyab/cmplus/readme.tid diff --git a/tzk/editions/tzk/plugins/cmplus/$__plugins_adithyab_cmplus_settings b/tzk/editions/tzk/plugins/cmplus/_system/plugins/adithyab/cmplus/settings similarity index 100% rename from tzk/editions/tzk/plugins/cmplus/$__plugins_adithyab_cmplus_settings rename to tzk/editions/tzk/plugins/cmplus/_system/plugins/adithyab/cmplus/settings diff --git a/tzk/editions/tzk/plugins/cmplus/$__plugins_adithyab_cmplus_settings.meta b/tzk/editions/tzk/plugins/cmplus/_system/plugins/adithyab/cmplus/settings.meta similarity index 100% rename from tzk/editions/tzk/plugins/cmplus/$__plugins_adithyab_cmplus_settings.meta rename to tzk/editions/tzk/plugins/cmplus/_system/plugins/adithyab/cmplus/settings.meta diff --git a/tzk/editions/tzk/plugins/cmplus/$__plugins_tiddlywiki_codemirror_addon_hint_anyword-hint.js b/tzk/editions/tzk/plugins/cmplus/_system/plugins/tiddlywiki/codemirror/addon/hint/anyword-hint.js similarity index 100% rename from tzk/editions/tzk/plugins/cmplus/$__plugins_tiddlywiki_codemirror_addon_hint_anyword-hint.js rename to tzk/editions/tzk/plugins/cmplus/_system/plugins/tiddlywiki/codemirror/addon/hint/anyword-hint.js diff --git a/tzk/editions/tzk/plugins/cmplus/$__plugins_tiddlywiki_codemirror_addon_hint_anyword-hint.js.meta b/tzk/editions/tzk/plugins/cmplus/_system/plugins/tiddlywiki/codemirror/addon/hint/anyword-hint.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/cmplus/$__plugins_tiddlywiki_codemirror_addon_hint_anyword-hint.js.meta rename to tzk/editions/tzk/plugins/cmplus/_system/plugins/tiddlywiki/codemirror/addon/hint/anyword-hint.js.meta diff --git a/tzk/editions/tzk/plugins/cmplus/$__plugins_tiddlywiki_codemirror_addon_hint_show-hint.css b/tzk/editions/tzk/plugins/cmplus/_system/plugins/tiddlywiki/codemirror/addon/hint/show-hint.css similarity index 100% rename from tzk/editions/tzk/plugins/cmplus/$__plugins_tiddlywiki_codemirror_addon_hint_show-hint.css rename to tzk/editions/tzk/plugins/cmplus/_system/plugins/tiddlywiki/codemirror/addon/hint/show-hint.css diff --git a/tzk/editions/tzk/plugins/cmplus/$__plugins_tiddlywiki_codemirror_addon_hint_show-hint.css.meta b/tzk/editions/tzk/plugins/cmplus/_system/plugins/tiddlywiki/codemirror/addon/hint/show-hint.css.meta similarity index 100% rename from tzk/editions/tzk/plugins/cmplus/$__plugins_tiddlywiki_codemirror_addon_hint_show-hint.css.meta rename to tzk/editions/tzk/plugins/cmplus/_system/plugins/tiddlywiki/codemirror/addon/hint/show-hint.css.meta diff --git a/tzk/editions/tzk/plugins/cmplus/$__plugins_tiddlywiki_codemirror_addon_hint_show-hint.js b/tzk/editions/tzk/plugins/cmplus/_system/plugins/tiddlywiki/codemirror/addon/hint/show-hint.js similarity index 100% rename from tzk/editions/tzk/plugins/cmplus/$__plugins_tiddlywiki_codemirror_addon_hint_show-hint.js rename to tzk/editions/tzk/plugins/cmplus/_system/plugins/tiddlywiki/codemirror/addon/hint/show-hint.js diff --git a/tzk/editions/tzk/plugins/cmplus/$__plugins_tiddlywiki_codemirror_addon_hint_show-hint.js.meta b/tzk/editions/tzk/plugins/cmplus/_system/plugins/tiddlywiki/codemirror/addon/hint/show-hint.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/cmplus/$__plugins_tiddlywiki_codemirror_addon_hint_show-hint.js.meta rename to tzk/editions/tzk/plugins/cmplus/_system/plugins/tiddlywiki/codemirror/addon/hint/show-hint.js.meta diff --git a/tzk/editions/tzk/plugins/cmplus/$__plugins_tiddlywiki_codemirror_mode_tw5_tw5.css.tid b/tzk/editions/tzk/plugins/cmplus/_system/plugins/tiddlywiki/codemirror/mode/tw5/tw5.css.tid similarity index 100% rename from tzk/editions/tzk/plugins/cmplus/$__plugins_tiddlywiki_codemirror_mode_tw5_tw5.css.tid rename to tzk/editions/tzk/plugins/cmplus/_system/plugins/tiddlywiki/codemirror/mode/tw5/tw5.css.tid diff --git a/tzk/editions/tzk/plugins/cmplus/$__plugins_tiddlywiki_codemirror_mode_tw5_tw5.js b/tzk/editions/tzk/plugins/cmplus/_system/plugins/tiddlywiki/codemirror/mode/tw5/tw5.js similarity index 100% rename from tzk/editions/tzk/plugins/cmplus/$__plugins_tiddlywiki_codemirror_mode_tw5_tw5.js rename to tzk/editions/tzk/plugins/cmplus/_system/plugins/tiddlywiki/codemirror/mode/tw5/tw5.js diff --git a/tzk/editions/tzk/plugins/cmplus/$__plugins_tiddlywiki_codemirror_mode_tw5_tw5.js.meta b/tzk/editions/tzk/plugins/cmplus/_system/plugins/tiddlywiki/codemirror/mode/tw5/tw5.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/cmplus/$__plugins_tiddlywiki_codemirror_mode_tw5_tw5.js.meta rename to tzk/editions/tzk/plugins/cmplus/_system/plugins/tiddlywiki/codemirror/mode/tw5/tw5.js.meta diff --git a/tzk/editions/tzk/plugins/datepicker/$__plugins_kixam_datepicker_icon.tid b/tzk/editions/tzk/plugins/datepicker/_system/plugins/kixam/datepicker/icon.tid similarity index 100% rename from tzk/editions/tzk/plugins/datepicker/$__plugins_kixam_datepicker_icon.tid rename to tzk/editions/tzk/plugins/datepicker/_system/plugins/kixam/datepicker/icon.tid diff --git a/tzk/editions/tzk/plugins/datepicker/$__plugins_kixam_datepicker_license.tid b/tzk/editions/tzk/plugins/datepicker/_system/plugins/kixam/datepicker/license.tid similarity index 100% rename from tzk/editions/tzk/plugins/datepicker/$__plugins_kixam_datepicker_license.tid rename to tzk/editions/tzk/plugins/datepicker/_system/plugins/kixam/datepicker/license.tid diff --git a/tzk/editions/tzk/plugins/datepicker/$__plugins_kixam_datepicker_pikaday.css b/tzk/editions/tzk/plugins/datepicker/_system/plugins/kixam/datepicker/pikaday.css similarity index 100% rename from tzk/editions/tzk/plugins/datepicker/$__plugins_kixam_datepicker_pikaday.css rename to tzk/editions/tzk/plugins/datepicker/_system/plugins/kixam/datepicker/pikaday.css diff --git a/tzk/editions/tzk/plugins/datepicker/$__plugins_kixam_datepicker_pikaday.css.meta b/tzk/editions/tzk/plugins/datepicker/_system/plugins/kixam/datepicker/pikaday.css.meta similarity index 100% rename from tzk/editions/tzk/plugins/datepicker/$__plugins_kixam_datepicker_pikaday.css.meta rename to tzk/editions/tzk/plugins/datepicker/_system/plugins/kixam/datepicker/pikaday.css.meta diff --git a/tzk/editions/tzk/plugins/datepicker/$__plugins_kixam_datepicker_pikaday.js b/tzk/editions/tzk/plugins/datepicker/_system/plugins/kixam/datepicker/pikaday.js similarity index 100% rename from tzk/editions/tzk/plugins/datepicker/$__plugins_kixam_datepicker_pikaday.js rename to tzk/editions/tzk/plugins/datepicker/_system/plugins/kixam/datepicker/pikaday.js diff --git a/tzk/editions/tzk/plugins/datepicker/$__plugins_kixam_datepicker_pikaday.js.meta b/tzk/editions/tzk/plugins/datepicker/_system/plugins/kixam/datepicker/pikaday.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/datepicker/$__plugins_kixam_datepicker_pikaday.js.meta rename to tzk/editions/tzk/plugins/datepicker/_system/plugins/kixam/datepicker/pikaday.js.meta diff --git a/tzk/editions/tzk/plugins/datepicker/$__plugins_kixam_datepicker_readme.tid b/tzk/editions/tzk/plugins/datepicker/_system/plugins/kixam/datepicker/readme.tid similarity index 100% rename from tzk/editions/tzk/plugins/datepicker/$__plugins_kixam_datepicker_readme.tid rename to tzk/editions/tzk/plugins/datepicker/_system/plugins/kixam/datepicker/readme.tid diff --git a/tzk/editions/tzk/plugins/datepicker/$__plugins_kixam_datepicker_usage.tid b/tzk/editions/tzk/plugins/datepicker/_system/plugins/kixam/datepicker/usage.tid similarity index 100% rename from tzk/editions/tzk/plugins/datepicker/$__plugins_kixam_datepicker_usage.tid rename to tzk/editions/tzk/plugins/datepicker/_system/plugins/kixam/datepicker/usage.tid diff --git a/tzk/editions/tzk/plugins/datepicker/$__plugins_kixam_datepicker_widget.datepicker.js b/tzk/editions/tzk/plugins/datepicker/_system/plugins/kixam/datepicker/widget.datepicker.js similarity index 100% rename from tzk/editions/tzk/plugins/datepicker/$__plugins_kixam_datepicker_widget.datepicker.js rename to tzk/editions/tzk/plugins/datepicker/_system/plugins/kixam/datepicker/widget.datepicker.js diff --git a/tzk/editions/tzk/plugins/datepicker/$__plugins_kixam_datepicker_widget.datepicker.js.meta b/tzk/editions/tzk/plugins/datepicker/_system/plugins/kixam/datepicker/widget.datepicker.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/datepicker/$__plugins_kixam_datepicker_widget.datepicker.js.meta rename to tzk/editions/tzk/plugins/datepicker/_system/plugins/kixam/datepicker/widget.datepicker.js.meta diff --git a/tzk/editions/tzk/plugins/details/$__plugins_telmiger_details_accordion.tid b/tzk/editions/tzk/plugins/details/_system/plugins/telmiger/details/accordion.tid similarity index 100% rename from tzk/editions/tzk/plugins/details/$__plugins_telmiger_details_accordion.tid rename to tzk/editions/tzk/plugins/details/_system/plugins/telmiger/details/accordion.tid diff --git a/tzk/editions/tzk/plugins/details/$__plugins_telmiger_details_colours.css.tid b/tzk/editions/tzk/plugins/details/_system/plugins/telmiger/details/colours.css.tid similarity index 100% rename from tzk/editions/tzk/plugins/details/$__plugins_telmiger_details_colours.css.tid rename to tzk/editions/tzk/plugins/details/_system/plugins/telmiger/details/colours.css.tid diff --git a/tzk/editions/tzk/plugins/details/$__plugins_telmiger_details_details.css.tid b/tzk/editions/tzk/plugins/details/_system/plugins/telmiger/details/details.css.tid similarity index 100% rename from tzk/editions/tzk/plugins/details/$__plugins_telmiger_details_details.css.tid rename to tzk/editions/tzk/plugins/details/_system/plugins/telmiger/details/details.css.tid diff --git a/tzk/editions/tzk/plugins/details/$__plugins_telmiger_details_details.js b/tzk/editions/tzk/plugins/details/_system/plugins/telmiger/details/details.js similarity index 100% rename from tzk/editions/tzk/plugins/details/$__plugins_telmiger_details_details.js rename to tzk/editions/tzk/plugins/details/_system/plugins/telmiger/details/details.js diff --git a/tzk/editions/tzk/plugins/details/$__plugins_telmiger_details_details.js.meta b/tzk/editions/tzk/plugins/details/_system/plugins/telmiger/details/details.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/details/$__plugins_telmiger_details_details.js.meta rename to tzk/editions/tzk/plugins/details/_system/plugins/telmiger/details/details.js.meta diff --git a/tzk/editions/tzk/plugins/details/$__plugins_telmiger_details_icon.tid b/tzk/editions/tzk/plugins/details/_system/plugins/telmiger/details/icon.tid similarity index 100% rename from tzk/editions/tzk/plugins/details/$__plugins_telmiger_details_icon.tid rename to tzk/editions/tzk/plugins/details/_system/plugins/telmiger/details/icon.tid diff --git a/tzk/editions/tzk/plugins/details/$__plugins_telmiger_details_license.tid b/tzk/editions/tzk/plugins/details/_system/plugins/telmiger/details/license.tid similarity index 100% rename from tzk/editions/tzk/plugins/details/$__plugins_telmiger_details_license.tid rename to tzk/editions/tzk/plugins/details/_system/plugins/telmiger/details/license.tid diff --git a/tzk/editions/tzk/plugins/details/$__plugins_telmiger_details_readme.tid b/tzk/editions/tzk/plugins/details/_system/plugins/telmiger/details/readme.tid similarity index 100% rename from tzk/editions/tzk/plugins/details/$__plugins_telmiger_details_readme.tid rename to tzk/editions/tzk/plugins/details/_system/plugins/telmiger/details/readme.tid diff --git a/tzk/editions/tzk/plugins/leaflet/GeoTiddler.tid b/tzk/editions/tzk/plugins/leaflet/GeoTiddler.tid new file mode 100644 index 0000000..ad5ae24 --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/GeoTiddler.tid @@ -0,0 +1,22 @@ +created: 20151130173416239 +modified: 20170115153450584 +title: GeoTiddler +type: text/vnd.tiddlywiki + +[[GeoTiddler]]s are tiddlers containing geographical data. [[geoSyntax|$:/plugins/sycom/leaflet/geoSyntax]] lists the available objects. [[geoJson|https://en.wikipedia.org/wiki/GeoJSON]] data are also accepted. You may specify a color for all objects displayed through `color` field. + +!! tiddler with geo TiddlerFields +You can upgrade your tiddler by putting some geo metadata ([[wgs 84 coordinates|https://en.wikipedia.org/wiki/World_Geodetic_System#WGS84]]) in it's TiddlerFields. See [[geoSyntax|$:/plugins/sycom/leaflet/geoSyntax]] for the list of object types you can draw. Popup will show the first part of the tiddler. If the tiddler contains a leafmap widget, it will be rendered as `text/plain` in order to avoid crash... + +!! geoJSON tiddler +You can define a geoJson tiddler like [[tiddlyWikiFrCommunity|$:/plugins/sycom/leaflet/example/tiddlyWikiFrCommunity]] and then display the data by calling it. Just put your geoJson data in the body and declare the tiddler as application/json. Any `application/json` tiddler called will be considered as geoJson. The popups will show + +* a title +** the `name` or the `title` attribute in properties if exists, +** if not, the firsts attributes of properties until they are 8 characters long +* a description +** the `description` attribute in properties if exists, +** if not, the data stored in each feature as a bulleted list. + +!! tiddler grouping [[GeoTiddler]]s +You can use `tiddlers` or `filter` as TiddlerFields to make a group of tiddlers. You can apply some styling options to all the group using `style`, `color` or `marker` TiddlerFields and then call the tiddler in your map to render all those tiddler at the same time. This will be a good way to make thematic maps indeed... diff --git a/tzk/editions/tzk/plugins/leaflet/_system/ext/modules/widgets/geolocation-widget.js b/tzk/editions/tzk/plugins/leaflet/_system/ext/modules/widgets/geolocation-widget.js new file mode 100644 index 0000000..775acf7 --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_system/ext/modules/widgets/geolocation-widget.js @@ -0,0 +1,130 @@ +/*\ +title: $:/ext/modules/wigets/geolocation-widget.js +type: application/javascript +module-type: widget + +Geolocation widget + +\*/ +(function() { + /*jslint node: true, browser: true */ + /*global $tw: false */ + "use strict"; + var Widget = require("$:/core/modules/widgets/widget.js").widget; + var GeolocationWidget = function(parseTreeNode, options) { + this.initialise(parseTreeNode, options); + }; + + /* Inherit from the base widget class */ + GeolocationWidget.prototype = new Widget(); + + /* Compute the internal state of the widget */ + GeolocationWidget.prototype.execute = function() { + // Get attributes + this.target = this.getAttribute("target") || this.getVariable("currentTiddler"); + this.icon = this.getAttribute("icon") || "$:/core/images/globe"; + this.text = this.getAttribute("text") || undefined; + this.accuracy = this.getAttribute("accuracy"); + this.type = this.getAttribute("type") || "point"; + // Make child widgets + this.makeChildWidgets(); + }; + + /* Render this widget into the DOM */ + GeolocationWidget.prototype.render = function(parent, nextSibling) { + var self = this; + // Remember parent + this.parentDomNode = parent; + // Compute attributes and execute state + this.computeAttributes(); + this.execute(); + // Create element + var tag = "button"; + if (this.buttonTag && $tw.config.htmlUnsafeElements.indexOf(this.buttonTag) === -1) { + tag = this.buttonTag; + } + var domNode = this.document.createElement(tag); + // Add a click event handler + domNode.addEventListener("click", function(event) { + if (navigator.geolocation) { + navigator.geolocation.getCurrentPosition( + // success callback + function(position) { + /* to replace by field populating (point(s) polyline(s) or polygon(s)) */ + /* default : if tiddler has point field, will create a points field to store new data; + if tiddler has points field, will add a new point to the tiddler field; */ + var target = self.target; + var accuracy = self.accuracy; + var type = self.type; + var newPoint = position.coords.latitude + "," + position.coords.longitude; + /* check if tiddler has a geofield */ + var track = ""; + if (!$tw.wiki.getTiddler(target)) $tw.wiki.setText(target, "text", null, "", null); + var flds = $tw.wiki.getTiddler(target).fields + if (flds.points) { + track = flds.points; + $tw.wiki.setText(target, "points", null, track + " " + newPoint, null); + infoLocation("new point " + newPoint + " added to " + target); + + } else { + if (flds.point && flds.point !== null) { + track = flds.point; + $tw.wiki.setText(target, "points", null, track + " " + newPoint, null); + $tw.wiki.setText(target, "point", null, null, null); + infoLocation("new point " + newPoint + " added to " + target); + } else { + $tw.wiki.setText(target, "point", null, newPoint, null); + infoLocation("new point " + newPoint + " added to " + target); + } + } + }, + // error callback + function(error) { + noLocation(error.message + ". You may not are connected via httpS://") + } + ); + } else { + noLocation("position disabled or not supported by your browser"); + } + }, false); + /* dress up button */ + var buttonContent; + // if text parameter, will use it for the button + if (self.text) { + buttonContent = self.text; + } else { + // if not, looking for an icon + /* !todo: ?question: should the icon depend on "type" parameter? */ + buttonContent = $tw.wiki.getTiddler(self.icon).fields.text; + } + domNode.innerHTML = buttonContent; + // Insert element + parent.insertBefore(domNode, nextSibling); + this.renderChildren(domNode, null); + this.domNodes.push(domNode); + }; + + function noLocation(message) { + /* !todo: ?question: replace by "modal" alert? */ + // create or update a temporary message tiddler + $tw.wiki.setText("$:/temp/noLocationMessage", "text", null, "geolocation access denied: " + message, null); + // displays it in modal + $tw.modal.display("$:/temp/noLocationMessage"); + } + + function infoLocation(message) { + // create or update a temporary message tiddler + $tw.wiki.setText("$:/temp/viewLocationMessage", "text", null, message, null); + // displays it in modal + $tw.notifier.display("$:/temp/viewLocationMessage"); + } + /* + We don't allow actions to propagate because we trigger actions ourselves + */ + GeolocationWidget.prototype.allowActionPropagation = function() { + return false; + }; + + exports.geoloc = GeolocationWidget; + +})(); \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/leaflet/_system/ext/modules/widgets/geolocation-widget.js.meta b/tzk/editions/tzk/plugins/leaflet/_system/ext/modules/widgets/geolocation-widget.js.meta new file mode 100644 index 0000000..c60611a --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_system/ext/modules/widgets/geolocation-widget.js.meta @@ -0,0 +1,3 @@ +module-type: widget +title: $:/ext/modules/widgets/geolocation-widget.js +type: application/javascript \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/devDiary.tid b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/devDiary.tid new file mode 100644 index 0000000..0c2bf60 --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/devDiary.tid @@ -0,0 +1,61 @@ +created: 20151110173416000 +modified: 20180531171500000 +title: $:/plugins/sycom/leaflet/devDiary +type: text/vnd.tiddlywiki + +Some notes about coding this plugin. Might be useful to others... + +* 20180602 +** added a template that will display a map of embeded object for tiddlers containing one of the geoTiddlers fiels. +** updtated leaflet and marker-cluster to 1.3.1 - the easy way. Just replaced with new version and no deprecation at all \o/ ! +* 20180531 +** converting all `.svg.tid` files to `.svg` + `.svg.meta` pairs. Will allow git client to make svg viewable in web interface. Also compressed SVG as much as possible with great https://jakearchibald.github.io/svgomg/ tool. +** tweak : for svg embedding local TiddlyWiki colors (eg `$primary$`), forced type to `text/vnd.tiddlywiki` to preserve them. +* 20170317 +** lot of work around cluster size, cluster color when using filter. Cluster size depends on point % for the cluster, clusterRadius and zoom. +* 20170311 +** added styling options and also the grouping tiddler capabilities. Discovered that direct styling in SVG ''does not always'' [[overwrite css styling|http://stackoverflow.com/questions/24293880/svg-why-does-external-css-override-inline-style-for-text]]. +* 20170129 +** adding some markers. And it's possible to create yours. +* 20170115 +** darling birthday edit. Clustering by tiddler is on track. Will have to look for clustering direct passing object through widget. +* 20161111 +** armistice edit! can now disable clustering or set clustering distance. Bug #9 fixed. may be cluster size will be too big for big databases +* 20161106 +** color parameter is partially implemented. Note that direct styling like `fill` in svg element wont take on class styling through css... +* 20161104 +** after many attemps, managed to include tiddler excerpt in popups for mapping geoTiddler. Had to include an escape rule for tiddler containing a leafmap widget. No larsen, but a big bug (map number probably). +** also managed to give the marker the color of the primary color. Note for later there is probably a bug if primary color is defined with `<>` macro. +* 20161102 +** ok, when importing some library, don't forget to use `require()` in order to conclude. Silly guy. Still some polishing needed, but clustering know works... +* 20161101 +** fighting with markercluster capabilities. At this point seems I can add the script but the MarkerClusterGroup class is not recognized when called... +* 20161031 +** gave up inserting external layers.svg in stylesheet. Issues with `<$text />` and `{{ }}`... Created svg in a separate tiddler for the record but inserting directly an "escaped" version in [[mapCss.css|$:/plugins/sycom/leaflet/mapCssTweaks.css.tid]] +* 20161030 +** working on different markers. Not so good at designing them though ;-) Putted default leaflet svg marker. Using Inkscape to edit svg easily and SVGO extension in atom to compress them. First attempt to put layers icon as svg. Issues... +* 20161029 +** trying to put svg marker instead of png ones. Will be better for changing colors, content... using data:image/svg+xml. Svg has to bring xmlns ~~and xmlns:xlink~~ with it in order to work... +* 20161025 +** after big fight, managed to call images as embeded through css without writing full base64 code. Had to add `html` to the "rules only" list at the beginning of the css code +* 20161024 +** geojson implemented. Will need to add cluster soon. Some question about geojson attributes to create the popup... +* 20161021 +** updated leaflet.js to 1.0.1 moved base64 image to mapCss.css in order to avoid problems when updating leaflet. +** Updated tileLayer list. min/max checked for this time. Detect if tile id is wrong to alert user and display osm instead. +* 20160314 +** corrected caption errors for example and roadmap. Have to write an install process in demo site (gh-page) since writing this in plugin is nonsense. +* 20151124 +** wondering the best way to release plugin code in gitlab (or github). Can't be a fork of TiddlyWiki. Don't want to lose .git history. +** ok I'm dumb. All is written in the dev TiddlyWiki : http://tiddlywiki.com/dev/#Developing%20p lugins%20using%20Node.js%20and%20GitHub . Lost .git history since cuting tree is bad. But history was still short... +* 20151123 +** not able to use directly tiddler stored images as css background. +** decided to use base64 form in css. Not so elegant as I wished, but works. +* 20151121 +** fighting with parameters : not imported from widget with `this.getAttribute()` +** solved by adding the parameter computation before : `this.computeAttributes();` +* 20151115 +** some problems to declare leaflet.js library : fail during build since there is no window, no document. +** solved by creating the tiddlywiki.files importer. +* 20151110 +** starting some tests. Inspiration from d3plugin (also creating widget and importing library) diff --git a/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/example.tid b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/example.tid new file mode 100644 index 0000000..cff88e3 --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/example.tid @@ -0,0 +1,13 @@ +caption: Example +title: $:/plugins/sycom/leaflet/example +type: text/vnd.tiddlywiki + +Different ways to use the [[leaflet plugin|$:/plugins/sycom/leaflet]] + +{{$:/plugins/sycom/leaflet/example/leaflet_with_geotiddler}} + +{{$:/plugins/sycom/leaflet/example/leaflet_with_geojsontiddler}} + +{{$:/plugins/sycom/leaflet/example/leaflet_with_non-tiddler_geo_data}} + +{{$:/plugins/sycom/leaflet/example/leaflet_with_filter}} diff --git a/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/example/leaflet_with_filter.tid b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/example/leaflet_with_filter.tid new file mode 100644 index 0000000..bac414a --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/example/leaflet_with_filter.tid @@ -0,0 +1,13 @@ +created: 20151211173500000 +modified: 20170317163500000 +title: $:/plugins/sycom/leaflet/example/leaflet_with_filter + +!! a map of a filter +this one displays all tiddlers tagged with <> (there's a //all shadow// tweak, since they are shadowed). There is also one cluster per tiddler. Some colors are set from within each tiddler with `color` field. + +``` +<$leafmap tile='toner' + places='{"filter":"[all[shadows]tag[example]]"}' clusterType='tiddler'/> +``` +<$leafmap tile='toner' + places='{"filter":"[all[shadows]tag[example]]"}' clusterType='tiddler'/> diff --git a/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/example/leaflet_with_geojsontiddler.tid b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/example/leaflet_with_geojsontiddler.tid new file mode 100644 index 0000000..19cb81a --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/example/leaflet_with_geojsontiddler.tid @@ -0,0 +1,24 @@ +created: 20161025150936935 +modified: 20170318235936935 +tags: example leaflet +title: $:/plugins/sycom/leaflet/example/leaflet_with_geojsontiddler + +!! a map of a geoJson tiddler +This one displays [[tiddlyWikiFrCommunity|$:/plugins/sycom/leaflet/example/tiddlyWikiFrCommunity]] (that has a color field set to red), which is an almost direct geojson data extraction from the umap [[Utilisateurs du forum TiddlyWiki FR|https://umap.openstreetmap.fr/fr/map/tiddlywikifr_65983#6/46.995/2.549]]. `color` is set to orange, `marker` to pin. Cluster distance is default (80) on the first, set to 30 on the second. + +``` +<$leafmap tileControl + places='{"tiddler":"$:/plugins/sycom/leaflet/example/tiddlyWikiFrCommunity"}' + style='{"color":"orange"}' + marker='pin'/> +<$leafmap tileControl cluster="30" + places='{"tiddler":"$:/plugins/sycom/leaflet/example/tiddlyWikiFrCommunity"}' + marker='pin'/> +``` +<$leafmap tileControl + places='{"tiddler":"$:/plugins/sycom/leaflet/example/tiddlyWikiFrCommunity"}' + style='{"color":"orange"}' + marker='pin'/> +<$leafmap tileControl cluster="30" + places='{"tiddler":"$:/plugins/sycom/leaflet/example/tiddlyWikiFrCommunity"}' + marker='pin'/> diff --git a/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/example/leaflet_with_geotiddler.tid b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/example/leaflet_with_geotiddler.tid new file mode 100644 index 0000000..b13c871 --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/example/leaflet_with_geotiddler.tid @@ -0,0 +1,16 @@ +created: 20151207090936935 +modified: 20161025222038568 +tags: example leaflet +title: $:/plugins/sycom/leaflet/example/leaflet_with_geotiddler + +!! a map of a GeoTiddler +this one displays the tiddler [[placeTiddler|$:/plugins/sycom/leaflet/example/placeTiddler]]. Note the tileControl attribute that enables map background selection. As the tiddler has its `color` field set to pink, objects are rendered pink. The cat is know a panther ;-). The tiddler also have a `style` field to define dash and thickness of the stroke... + +``` +<$leafmap + tileControl + places='{"tiddler":"$:/plugins/sycom/leaflet/example/placeTiddler"}'/> +``` +<$leafmap + tileControl + places='{"tiddler":"$:/plugins/sycom/leaflet/example/placeTiddler"}'/> diff --git a/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/example/leaflet_with_non-tiddler_geo_data.tid b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/example/leaflet_with_non-tiddler_geo_data.tid new file mode 100644 index 0000000..42883c7 --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/example/leaflet_with_non-tiddler_geo_data.tid @@ -0,0 +1,21 @@ +created: 20151207090936935 +modified: 20151211172038568 +point: 6.5,19.72 +tags: example leaflet +title: $:/plugins/sycom/leaflet/example/leaflet_with_non-tiddler_geo_data + +!! a map with data on the go +very useful for fast mapping. All objects that might be embedded in GeoTiddler can be used here. Let's display a map with satellite imagery and + +* a ''point'' at `6.5,19.72` +* a ''polyline'' at `6.4,19.7 6.6,19.74` + +note this tiddler is also a geoTiddler with one point at `6.5,19.72` + +``` +<$leafmap tile='sat' + places='{"point":"6.5,19.72","polyline":"6.4,19.7 6.6,19.74"}'/> +``` + +<$leafmap tile='sat' + places='{"point":"6.5,19.72","polyline":"6.4,19.7 6.6,19.74"}'/> diff --git a/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/example/placeTiddler.tid b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/example/placeTiddler.tid new file mode 100644 index 0000000..94a2f97 --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/example/placeTiddler.tid @@ -0,0 +1,23 @@ +color: #ff80c0 +created: 20151119173416000 +modified: 20151211173153114 +points: 52.799933,-2.589812 52.799959,-2.590939 +polygon: 52.800608,-2.591668 52.800225,-2.591829 52.799849,-2.591937 52.799603,-2.591990 52.799427,-2.591990 52.799187,-2.591894 52.798863,-2.591550 52.798727,-2.591357 52.798662,-2.591121 52.798636,-2.590853 52.798655,-2.590542 52.798668,-2.590467 52.798701,-2.590359 52.798649,-2.590113 52.798623,-2.589920 52.798610,-2.589716 52.798636,-2.589437 52.798694,-2.589136 52.798850,-2.588975 52.799051,-2.588793 52.799311,-2.588707 52.799525,-2.588707 52.799726,-2.588772 52.800018,-2.588857 52.800290,-2.588911 52.800511,-2.589040 52.800731,-2.589126 52.800816,-2.589211 52.800413,-2.589812 52.800446,-2.590166 52.800452,-2.590520 52.800433,-2.590810 52.800426,-2.591068 52.800751,-2.591550 52.800621,-2.591679 +polylines: 52.799382,-2.590059 52.799641,-2.588321|52.799330,-2.590048 52.799447,-2.588342|52.799265,-2.590059 52.799181,-2.588342|52.799486,-2.590724 52.799706,-2.592301|52.799414,-2.590767 52.799525,-2.592366|52.799356,-2.590714 52.799278,-2.592355 +style: {"dashArray":"6, 10","weight":"8"} +tags: example leaflet geometry +title: $:/plugins/sycom/leaflet/example/placeTiddler +type: text/vnd.tiddlywiki + +This tiddler contains + +* a two `points` list : 52.799933,-2.589812 52.799959,-2.590939 +* a `polygon` : 52.800608,-2.591668 52.800225,-2.591829 52.799849 (...) +* a `polyline`s list : 52.799382,-2.590059 52.799641,-2.588321|52.799330,-2.590048 52.799447,-2.588342|52.799265,(...) + +It has also some styling informations + +* `color` is set to pink +* `style` defines a dashed 8px thick line + +go to edit mode to see the full data fields diff --git a/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/example/tiddlyWikiFrCommunity.json b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/example/tiddlyWikiFrCommunity.json new file mode 100644 index 0000000..005bb24 --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/example/tiddlyWikiFrCommunity.json @@ -0,0 +1 @@ +{"type":"FeatureCollection","features":[{"type":"Feature","properties":{"name":"Aknar","description":"","url":""},"geometry":{"type":"Point","coordinates":[1.4442090000000007,43.604652]}},{"type":"Feature","properties":{"name":"CdriC","description":"","url":""},"geometry":{"type":"Point","coordinates":[-0.563166,47.478419]}},{"type":"Feature","properties":{"name":"Disanv Parean","description":"","url":""},"geometry":{"type":"Point","coordinates":[-0.4072784,49.1846226]}},{"type":"Feature","properties":{"name":"Emmanuel","description":"","url":""},"geometry":{"type":"Point","coordinates":[2.3522219000000177,48.85661400000001]}},{"type":"Feature","properties":{"name":"Escrivant","description":"","url":""},"geometry":{"type":"Point","coordinates":[2.3868,48.871958]}},{"type":"Feature","properties":{"name":"Fab13n","description":"","url":""},"geometry":{"type":"Point","coordinates":[5.5867,45.1184]}},{"type":"Feature","properties":{"name":"Fabio","description":"","url":""},"geometry":{"type":"Point","coordinates":[1.916515000000004,47.8664401]}},{"type":"Feature","properties":{"name":"Florent","description":"","url":""},"geometry":{"type":"Point","coordinates":[0.156237,45.648377]}},{"type":"Feature","properties":{"name":"François","description":"","url":""},"geometry":{"type":"Point","coordinates":[1.478413899999964,43.543794]}},{"type":"Feature","properties":{"name":"Gub","description":"","url":""},"geometry":{"type":"Point","coordinates":[1.4442090000000007,43.604652]}},{"type":"Feature","properties":{"name":"jargenty","description":"","url":""},"geometry":{"type":"Point","coordinates":[1.321621999999934,43.514707]}},{"type":"Feature","properties":{"name":"Jérôme","description":"","url":""},"geometry":{"type":"Point","coordinates":[-2.429759,47.328003]}},{"type":"Feature","properties":{"name":"Joël","description":"","url":""},"geometry":{"type":"Point","coordinates":[4.740042686462402,46.10446454226022]}},{"type":"Feature","properties":{"name":"Johanne","description":"","url":""},"geometry":{"type":"Point","coordinates":[-74.09016960000002,45.65189590000001]}},{"type":"Feature","properties":{"name":"Lakemp","description":"","url":""},"geometry":{"type":"Point","coordinates":[2.19249,48.59338]}},{"type":"Feature","properties":{"name":"LauDai","description":"","url":""},"geometry":{"type":"Point","coordinates":[1.4750973000000158,43.5664556]}},{"type":"Feature","properties":{"name":"LongSlowBakery","description":"","url":""},"geometry":{"type":"Point","coordinates":[-2.4834849999999733,52.903552]}},{"type":"Feature","properties":{"name":"Lucivam","description":"","url":""},"geometry":{"type":"Point","coordinates":[4.390278,45.434722]}},{"type":"Feature","properties":{"name":"m4dz","description":"","url":""},"geometry":{"type":"Point","coordinates":[2.3522219000000177,48.85661400000001]}},{"type":"Feature","properties":{"name":"Matthias","description":"","url":""},"geometry":{"type":"Point","coordinates":[-0.560016,47.470006]}},{"type":"Feature","properties":{"name":"Michel","description":"","url":""},"geometry":{"type":"Point","coordinates":[7.261953199999994,43.7101728]}},{"type":"Feature","properties":{"name":"Mikabi","description":"","url":""},"geometry":{"type":"Point","coordinates":[1.44,43.604652]}},{"type":"Feature","properties":{"name":"Nico","description":"","url":""},"geometry":{"type":"Point","coordinates":[2.2569674000000077,48.9899655]}},{"type":"Feature","properties":{"name":"Nicolas","description":"","url":""},"geometry":{"type":"Point","coordinates":[6.8411643,46.9425711]}},{"type":"Feature","properties":{"name":"pariswiki","description":"","url":""},"geometry":{"type":"Point","coordinates":[2.29,48.8]}},{"type":"Feature","properties":{"name":"Phil","description":"","url":""},"geometry":{"type":"Point","coordinates":[3.98337,50.36155]}},{"type":"Feature","properties":{"name":"Piwig","description":"","url":""},"geometry":{"type":"Point","coordinates":[-1.677793,48.117266]}},{"type":"Feature","properties":{"name":"Ploum","description":"","url":""},"geometry":{"type":"Point","coordinates":[0.1995560000000296,48.00611000000001]}},{"type":"Feature","properties":{"name":"Scapharnaum","description":"","url":""},"geometry":{"type":"Point","coordinates":[7.74553,48.58392]}},{"type":"Feature","properties":{"name":"Solaine","description":"","url":""},"geometry":{"type":"Point","coordinates":[8.227512,46.818188]}},{"type":"Feature","properties":{"name":"Sylvain Comte","description":"Créateur du leaflet map plugin","url":"http://sylvain.comte.online.fr"},"geometry":{"type":"Point","coordinates":[1.08954,49.43584]}},{"type":"Feature","properties":{"name":"Sylvain Naudin","description":"Admin du forum","url":"http://sylvain.naud.in"},"geometry":{"type":"Point","coordinates":[-0.155689,45.471894]}},{"type":"Feature","properties":{"name":"Thierry","description":"","url":""},"geometry":{"type":"Point","coordinates":[0.3333,46.5833]}},{"type":"Feature","properties":{"name":"Thomas Elmiger","description":"","url":""},"geometry":{"type":"Point","coordinates":[8.541694,47.376887]}},{"type":"Feature","properties":{"name":"Vincent","description":"","url":""},"geometry":{"type":"Point","coordinates":[5.2788245000000416,50.5500944]}},{"type":"Feature","properties":{"name":"Yan","description":"","url":""},"geometry":{"type":"Point","coordinates":[2.0517,46.22475]}}]} diff --git a/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/example/tiddlyWikiFrCommunity.json.meta b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/example/tiddlyWikiFrCommunity.json.meta new file mode 100644 index 0000000..f4d2781 --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/example/tiddlyWikiFrCommunity.json.meta @@ -0,0 +1,7 @@ +color: #dd0000 +created: 20161025143416000 +modified: 20180602193416000 +source: https://umap.openstreetmap.fr/fr/map/tiddlywikifr_65983 +tags: example leaflet geojson +title: $:/plugins/sycom/leaflet/example/tiddlyWikiFrCommunity +type: application/json \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/geoSyntax.tid b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/geoSyntax.tid new file mode 100644 index 0000000..c0cb04f --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/geoSyntax.tid @@ -0,0 +1,31 @@ +caption: geoSyntax +created: 20151119173416239 +modified: 20151211173250584 +title: $:/plugins/sycom/leaflet/geoSyntax +type: text/vnd.tiddlywiki + +Geographical objects can be stored + +* in a GeoTiddler by creating a ''//type// : // pattern//'' metadata field pair in any tiddler or by storing geoJson data in it and setting your tiddler to `application/JSON` type. Call it in the widget with ''places'' attribute : `places='{"tiddler":"title of your tiddler"}'` +* in several [[GeoTiddlers|GeoTiddler]]. Call them in the widget with ''places'' attribute +** via a space separated list of [[GeoTiddlers|GeoTiddler]] : `places='{"tiddlers":"tiddler1 tiddler2 tiddler3"}'` +** via a [[filter|http://tiddlywiki.com/#Filters]] selection of [[GeoTiddlers|GeoTiddler]] : `places='{"filter":"[[your filter]]"}'` +* straight in the widget with ''places'' attribute : `places='{"object type":"coordinates pattern"}'` + +!! Everything might be a GeoTiddler + +In a very much tiddlywiki way, a tiddler may also refer to a list or a selection of tiddlers using `tiddlers` or `filter` metadata fields. You may add styling informations to all refered tiddler with `style`, `color` or `marker` metadata fields. Calling this tiddler with `<$leafmap />` will render all refered tiddlers. + +!! Tool for creating shapes +As not everyone has a GIS in his head, And the plugin does not implement yet any tool for creating geo shapes, there is (very basic) tool for that : [ext[Draw for TiddlyWiki leaflet plugin|http://sycom.github.io/TiddlyWiki-Plugins/leafletDraw.html]] + +!! Geographical objects you can display on your map + +| !type | !description | !pattern | +|''point'' |a unique point defined by a comma separated latitude,longitude pair |`y,x` | +|''points''|a points collection defined by a space separated ''point'' definition list |`y1,x1 y2,x2 y3,x3 ...` | +|''polygon''|a closed surfacic place defined like an //ordered// ''points'' collection just above |`y1,x1 y2,x2 y3,x3 ...` | +|''polygons''|a polygons collection defined by a pipe (`|`) separated list of ''polygon'' definitions |`y1,x1 y2,x2 y3,x3|y4,x4 y5...` | +|''polyline''|an open path place defined like the ''polygon'' just above |`y1,x1 y2,x2 y3,x3 ...` | +|''polylines''|a polylines collection defined by a pipe (`|`) separated list of ''polyline'' definitions |`y1,x1 y2,x2 y3,x3|y4,x4 y5...` | +|''geojson''|a [[geojson|http://geojson.org/]] object. If set through a tiddler field, please crunch it to one single line|see [[rfc7946|https://tools.ietf.org/html/rfc7946]]| diff --git a/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/icon.tid b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/icon.tid new file mode 100644 index 0000000..771edbe --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/icon.tid @@ -0,0 +1,9 @@ +tags: $:/tags/Image +title: $:/plugins/sycom/leaflet/icon + + + + + + + diff --git a/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/images/layers.svg b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/images/layers.svg new file mode 100644 index 0000000..f292fa3 --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/images/layers.svg @@ -0,0 +1,2 @@ + + diff --git a/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/images/layers.svg.meta b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/images/layers.svg.meta new file mode 100644 index 0000000..1b884f0 --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/images/layers.svg.meta @@ -0,0 +1,5 @@ +created: 20161028202401905 +modified: 20180531154011600 +tags: $:/tags/Image +title: $:/plugins/sycom/leaflet/images/layers.svg +type: image/svg+xml \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/images/marker.svg.tid b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/images/marker.svg.tid new file mode 100644 index 0000000..af60798 --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/images/marker.svg.tid @@ -0,0 +1,9 @@ +caption: marker +created: 20161028202401905 +marker_dim: 25 40 12.5 40 +modified: 20180531124011600 +tags: $:/tags/Image +title: $:/plugins/sycom/leaflet/images/marker.svg +type: text/vnd.tiddlywiki + + diff --git a/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/images/markershadow.svg b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/images/markershadow.svg new file mode 100644 index 0000000..20cb4b4 --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/images/markershadow.svg @@ -0,0 +1 @@ + diff --git a/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/images/markershadow.svg.meta b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/images/markershadow.svg.meta new file mode 100644 index 0000000..592d044 --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/images/markershadow.svg.meta @@ -0,0 +1,6 @@ +created: 20161028202401905 +marker_dim: 50 40 0 40 +modified: 20180531155500000 +tags: $:/tags/Image +title: $:/plugins/sycom/leaflet/images/markershadow.svg +type: image/svg+xml \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/images/pin.svg.tid b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/images/pin.svg.tid new file mode 100644 index 0000000..152a5ee --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/images/pin.svg.tid @@ -0,0 +1,9 @@ +caption: pin +created: 20161028202401905 +marker_dim: 20 35 10 35 +modified: 20180531154500000 +tags: $:/tags/Image +title: $:/plugins/sycom/leaflet/images/pin.svg +type: text/vnd.tiddlywiki + + diff --git a/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/images/pinshadow.svg b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/images/pinshadow.svg new file mode 100644 index 0000000..37d46c0 --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/images/pinshadow.svg @@ -0,0 +1 @@ + diff --git a/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/images/pinshadow.svg.meta b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/images/pinshadow.svg.meta new file mode 100644 index 0000000..4776ad8 --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/images/pinshadow.svg.meta @@ -0,0 +1,6 @@ +created: 20170129162401910 +marker_dim: 15 15 5 7 +modified: 20180531155000000 +tags: $:/tags/Image +title: $:/plugins/sycom/leaflet/images/pinshadow.svg +type: image/svg+xml \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/images/point.svg.tid b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/images/point.svg.tid new file mode 100644 index 0000000..2b4ff61 --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/images/point.svg.tid @@ -0,0 +1,9 @@ +caption: point +created: 20170129162401905 +marker_dim: 15 15 7.5 7.5 +modified: 20180531165500000 +tags: $:/tags/Image +title: $:/plugins/sycom/leaflet/images/point.svg +type: text/vnd.tiddlywiki + + diff --git a/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/images/pointshadow.svg b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/images/pointshadow.svg new file mode 100644 index 0000000..cbfa01e --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/images/pointshadow.svg @@ -0,0 +1 @@ + diff --git a/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/images/pointshadow.svg.meta b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/images/pointshadow.svg.meta new file mode 100644 index 0000000..022a10a --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/images/pointshadow.svg.meta @@ -0,0 +1,6 @@ +created: 20170129162401910 +marker_dim: 15 15 0 12 +modified: 20180531165600000 +tags: $:/tags/Image +title: $:/plugins/sycom/leaflet/images/pointshadow.svg +type: image/svg+xml \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/lib/leaflet-markercluster.css b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/lib/leaflet-markercluster.css new file mode 100644 index 0000000..c60d71b --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/lib/leaflet-markercluster.css @@ -0,0 +1,14 @@ +.leaflet-cluster-anim .leaflet-marker-icon, .leaflet-cluster-anim .leaflet-marker-shadow { + -webkit-transition: -webkit-transform 0.3s ease-out, opacity 0.3s ease-in; + -moz-transition: -moz-transform 0.3s ease-out, opacity 0.3s ease-in; + -o-transition: -o-transform 0.3s ease-out, opacity 0.3s ease-in; + transition: transform 0.3s ease-out, opacity 0.3s ease-in; +} + +.leaflet-cluster-spider-leg { + /* stroke-dashoffset (duration and function) should match with leaflet-marker-icon transform in order to track it exactly */ + -webkit-transition: -webkit-stroke-dashoffset 0.3s ease-out, -webkit-stroke-opacity 0.3s ease-in; + -moz-transition: -moz-stroke-dashoffset 0.3s ease-out, -moz-stroke-opacity 0.3s ease-in; + -o-transition: -o-stroke-dashoffset 0.3s ease-out, -o-stroke-opacity 0.3s ease-in; + transition: stroke-dashoffset 0.3s ease-out, stroke-opacity 0.3s ease-in; +} diff --git a/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/lib/leaflet-markercluster.css.meta b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/lib/leaflet-markercluster.css.meta new file mode 100644 index 0000000..cc0f958 --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/lib/leaflet-markercluster.css.meta @@ -0,0 +1,3 @@ +tags: $:/tags/Stylesheet +title: $:/plugins/sycom/leaflet/lib/leaflet-markercluster.css +type: text/css \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/lib/leaflet-markercluster.js b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/lib/leaflet-markercluster.js new file mode 100644 index 0000000..082c62f --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/lib/leaflet-markercluster.js @@ -0,0 +1,5 @@ +if($tw.browser){ +!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports):"function"==typeof define&&define.amd?define(["exports"],t):t((e.Leaflet=e.Leaflet||{},e.Leaflet.markercluster=e.Leaflet.markercluster||{}))}(this,function(e){"use strict";var t=L.MarkerClusterGroup=L.FeatureGroup.extend({options:{maxClusterRadius:80,iconCreateFunction:null,clusterPane:L.Marker.prototype.options.pane,spiderfyOnMaxZoom:!0,showCoverageOnHover:!0,zoomToBoundsOnClick:!0,singleMarkerMode:!1,disableClusteringAtZoom:null,removeOutsideVisibleBounds:!0,animate:!0,animateAddingMarkers:!1,spiderfyDistanceMultiplier:1,spiderLegPolylineOptions:{weight:1.5,color:"#222",opacity:.5},chunkedLoading:!1,chunkInterval:200,chunkDelay:50,chunkProgress:null,polygonOptions:{}},initialize:function(e){L.Util.setOptions(this,e),this.options.iconCreateFunction||(this.options.iconCreateFunction=this._defaultIconCreateFunction),this._featureGroup=L.featureGroup(),this._featureGroup.addEventParent(this),this._nonPointGroup=L.featureGroup(),this._nonPointGroup.addEventParent(this),this._inZoomAnimation=0,this._needsClustering=[],this._needsRemoving=[],this._currentShownBounds=null,this._queue=[],this._childMarkerEventHandlers={dragstart:this._childMarkerDragStart,move:this._childMarkerMoved,dragend:this._childMarkerDragEnd};var t=L.DomUtil.TRANSITION&&this.options.animate;L.extend(this,t?this._withAnimation:this._noAnimation),this._markerCluster=t?L.MarkerCluster:L.MarkerClusterNonAnimated},addLayer:function(e){if(e instanceof L.LayerGroup)return this.addLayers([e]);if(!e.getLatLng)return this._nonPointGroup.addLayer(e),this.fire("layeradd",{layer:e}),this;if(!this._map)return this._needsClustering.push(e),this.fire("layeradd",{layer:e}),this;if(this.hasLayer(e))return this;this._unspiderfy&&this._unspiderfy(),this._addLayer(e,this._maxZoom),this.fire("layeradd",{layer:e}),this._topClusterLevel._recalculateBounds(),this._refreshClustersIcons();var t=e,i=this._zoom;if(e.__parent)for(;t.__parent._zoom>=i;)t=t.__parent;return this._currentShownBounds.contains(t.getLatLng())&&(this.options.animateAddingMarkers?this._animationAddLayer(e,t):this._animationAddLayerNonAnimated(e,t)),this},removeLayer:function(e){return e instanceof L.LayerGroup?this.removeLayers([e]):e.getLatLng?this._map?e.__parent?(this._unspiderfy&&(this._unspiderfy(),this._unspiderfyLayer(e)),this._removeLayer(e,!0),this.fire("layerremove",{layer:e}),this._topClusterLevel._recalculateBounds(),this._refreshClustersIcons(),e.off(this._childMarkerEventHandlers,this),this._featureGroup.hasLayer(e)&&(this._featureGroup.removeLayer(e),e.clusterShow&&e.clusterShow()),this):this:(!this._arraySplice(this._needsClustering,e)&&this.hasLayer(e)&&this._needsRemoving.push({layer:e,latlng:e._latlng}),this.fire("layerremove",{layer:e}),this):(this._nonPointGroup.removeLayer(e),this.fire("layerremove",{layer:e}),this)},addLayers:function(e,t){if(!L.Util.isArray(e))return this.addLayer(e);var i,n=this._featureGroup,r=this._nonPointGroup,s=this.options.chunkedLoading,o=this.options.chunkInterval,a=this.options.chunkProgress,h=e.length,l=0,u=!0;if(this._map){var _=(new Date).getTime(),d=L.bind(function(){for(var c=(new Date).getTime();h>l;l++){if(s&&0===l%200){var p=(new Date).getTime()-c;if(p>o)break}if(i=e[l],i instanceof L.LayerGroup)u&&(e=e.slice(),u=!1),this._extractNonGroupLayers(i,e),h=e.length;else if(i.getLatLng){if(!this.hasLayer(i)&&(this._addLayer(i,this._maxZoom),t||this.fire("layeradd",{layer:i}),i.__parent&&2===i.__parent.getChildCount())){var f=i.__parent.getAllChildMarkers(),m=f[0]===i?f[1]:f[0];n.removeLayer(m)}}else r.addLayer(i),t||this.fire("layeradd",{layer:i})}a&&a(l,h,(new Date).getTime()-_),l===h?(this._topClusterLevel._recalculateBounds(),this._refreshClustersIcons(),this._topClusterLevel._recursivelyAddChildrenToMap(null,this._zoom,this._currentShownBounds)):setTimeout(d,this.options.chunkDelay)},this);d()}else for(var c=this._needsClustering;h>l;l++)i=e[l],i instanceof L.LayerGroup?(u&&(e=e.slice(),u=!1),this._extractNonGroupLayers(i,e),h=e.length):i.getLatLng?this.hasLayer(i)||c.push(i):r.addLayer(i);return this},removeLayers:function(e){var t,i,n=e.length,r=this._featureGroup,s=this._nonPointGroup,o=!0;if(!this._map){for(t=0;n>t;t++)i=e[t],i instanceof L.LayerGroup?(o&&(e=e.slice(),o=!1),this._extractNonGroupLayers(i,e),n=e.length):(this._arraySplice(this._needsClustering,i),s.removeLayer(i),this.hasLayer(i)&&this._needsRemoving.push({layer:i,latlng:i._latlng}),this.fire("layerremove",{layer:i}));return this}if(this._unspiderfy){this._unspiderfy();var a=e.slice(),h=n;for(t=0;h>t;t++)i=a[t],i instanceof L.LayerGroup?(this._extractNonGroupLayers(i,a),h=a.length):this._unspiderfyLayer(i)}for(t=0;n>t;t++)i=e[t],i instanceof L.LayerGroup?(o&&(e=e.slice(),o=!1),this._extractNonGroupLayers(i,e),n=e.length):i.__parent?(this._removeLayer(i,!0,!0),this.fire("layerremove",{layer:i}),r.hasLayer(i)&&(r.removeLayer(i),i.clusterShow&&i.clusterShow())):(s.removeLayer(i),this.fire("layerremove",{layer:i}));return this._topClusterLevel._recalculateBounds(),this._refreshClustersIcons(),this._topClusterLevel._recursivelyAddChildrenToMap(null,this._zoom,this._currentShownBounds),this},clearLayers:function(){return this._map||(this._needsClustering=[],delete this._gridClusters,delete this._gridUnclustered),this._noanimationUnspiderfy&&this._noanimationUnspiderfy(),this._featureGroup.clearLayers(),this._nonPointGroup.clearLayers(),this.eachLayer(function(e){e.off(this._childMarkerEventHandlers,this),delete e.__parent},this),this._map&&this._generateInitialClusters(),this},getBounds:function(){var e=new L.LatLngBounds;this._topClusterLevel&&e.extend(this._topClusterLevel._bounds);for(var t=this._needsClustering.length-1;t>=0;t--)e.extend(this._needsClustering[t].getLatLng());return e.extend(this._nonPointGroup.getBounds()),e},eachLayer:function(e,t){var i,n,r,s=this._needsClustering.slice(),o=this._needsRemoving;for(this._topClusterLevel&&this._topClusterLevel.getAllChildMarkers(s),n=s.length-1;n>=0;n--){for(i=!0,r=o.length-1;r>=0;r--)if(o[r].layer===s[n]){i=!1;break}i&&e.call(t,s[n])}this._nonPointGroup.eachLayer(e,t)},getLayers:function(){var e=[];return this.eachLayer(function(t){e.push(t)}),e},getLayer:function(e){var t=null;return e=parseInt(e,10),this.eachLayer(function(i){L.stamp(i)===e&&(t=i)}),t},hasLayer:function(e){if(!e)return!1;var t,i=this._needsClustering;for(t=i.length-1;t>=0;t--)if(i[t]===e)return!0;for(i=this._needsRemoving,t=i.length-1;t>=0;t--)if(i[t].layer===e)return!1;return!(!e.__parent||e.__parent._group!==this)||this._nonPointGroup.hasLayer(e)},zoomToShowLayer:function(e,t){"function"!=typeof t&&(t=function(){});var i=function(){!e._icon&&!e.__parent._icon||this._inZoomAnimation||(this._map.off("moveend",i,this),this.off("animationend",i,this),e._icon?t():e.__parent._icon&&(this.once("spiderfied",t,this),e.__parent.spiderfy()))};e._icon&&this._map.getBounds().contains(e.getLatLng())?t():e.__parent._zoomt;t++)n=this._needsRemoving[t],n.newlatlng=n.layer._latlng,n.layer._latlng=n.latlng;for(t=0,i=this._needsRemoving.length;i>t;t++)n=this._needsRemoving[t],this._removeLayer(n.layer,!0),n.layer._latlng=n.newlatlng;this._needsRemoving=[],this._zoom=Math.round(this._map._zoom),this._currentShownBounds=this._getExpandedVisibleBounds(),this._map.on("zoomend",this._zoomEnd,this),this._map.on("moveend",this._moveEnd,this),this._spiderfierOnAdd&&this._spiderfierOnAdd(),this._bindEvents(),i=this._needsClustering,this._needsClustering=[],this.addLayers(i,!0)},onRemove:function(e){e.off("zoomend",this._zoomEnd,this),e.off("moveend",this._moveEnd,this),this._unbindEvents(),this._map._mapPane.className=this._map._mapPane.className.replace(" leaflet-cluster-anim",""),this._spiderfierOnRemove&&this._spiderfierOnRemove(),delete this._maxLat,this._hideCoverage(),this._featureGroup.remove(),this._nonPointGroup.remove(),this._featureGroup.clearLayers(),this._map=null},getVisibleParent:function(e){for(var t=e;t&&!t._icon;)t=t.__parent;return t||null},_arraySplice:function(e,t){for(var i=e.length-1;i>=0;i--)if(e[i]===t)return e.splice(i,1),!0},_removeFromGridUnclustered:function(e,t){for(var i=this._map,n=this._gridUnclustered,r=Math.floor(this._map.getMinZoom());t>=r&&n[t].removeObject(e,i.project(e.getLatLng(),t));t--);},_childMarkerDragStart:function(e){e.target.__dragStart=e.target._latlng},_childMarkerMoved:function(e){if(!this._ignoreMove&&!e.target.__dragStart){var t=e.target._popup&&e.target._popup.isOpen();this._moveChild(e.target,e.oldLatLng,e.latlng),t&&e.target.openPopup()}},_moveChild:function(e,t,i){e._latlng=t,this.removeLayer(e),e._latlng=i,this.addLayer(e)},_childMarkerDragEnd:function(e){e.target.__dragStart&&this._moveChild(e.target,e.target.__dragStart,e.target._latlng),delete e.target.__dragStart},_removeLayer:function(e,t,i){var n=this._gridClusters,r=this._gridUnclustered,s=this._featureGroup,o=this._map,a=Math.floor(this._map.getMinZoom());t&&this._removeFromGridUnclustered(e,this._maxZoom);var h,l=e.__parent,u=l._markers;for(this._arraySplice(u,e);l&&(l._childCount--,l._boundsNeedUpdate=!0,!(l._zoomt?"small":100>t?"medium":"large",new L.DivIcon({html:"
    "+t+"
    ",className:"marker-cluster"+i,iconSize:new L.Point(40,40)})},_bindEvents:function(){var e=this._map,t=this.options.spiderfyOnMaxZoom,i=this.options.showCoverageOnHover,n=this.options.zoomToBoundsOnClick;(t||n)&&this.on("clusterclick",this._zoomOrSpiderfy,this),i&&(this.on("clustermouseover",this._showCoverage,this),this.on("clustermouseout",this._hideCoverage,this),e.on("zoomend",this._hideCoverage,this))},_zoomOrSpiderfy:function(e){for(var t=e.layer,i=t;1===i._childClusters.length;)i=i._childClusters[0];i._zoom===this._maxZoom&&i._childCount===t._childCount&&this.options.spiderfyOnMaxZoom?t.spiderfy():this.options.zoomToBoundsOnClick&&t.zoomToBounds(),e.originalEvent&&13===e.originalEvent.keyCode&&this._map._container.focus()},_showCoverage:function(e){var t=this._map;this._inZoomAnimation||(this._shownPolygon&&t.removeLayer(this._shownPolygon),e.layer.getChildCount()>2&&e.layer!==this._spiderfied&&(this._shownPolygon=new L.Polygon(e.layer.getConvexHull(),this.options.polygonOptions),t.addLayer(this._shownPolygon)))},_hideCoverage:function(){this._shownPolygon&&(this._map.removeLayer(this._shownPolygon),this._shownPolygon=null)},_unbindEvents:function(){var e=this.options.spiderfyOnMaxZoom,t=this.options.showCoverageOnHover,i=this.options.zoomToBoundsOnClick,n=this._map;(e||i)&&this.off("clusterclick",this._zoomOrSpiderfy,this),t&&(this.off("clustermouseover",this._showCoverage,this),this.off("clustermouseout",this._hideCoverage,this),n.off("zoomend",this._hideCoverage,this))},_zoomEnd:function(){this._map&&(this._mergeSplitClusters(),this._zoom=Math.round(this._map._zoom),this._currentShownBounds=this._getExpandedVisibleBounds())},_moveEnd:function(){if(!this._inZoomAnimation){var e=this._getExpandedVisibleBounds();this._topClusterLevel._recursivelyRemoveChildrenFromMap(this._currentShownBounds,Math.floor(this._map.getMinZoom()),this._zoom,e),this._topClusterLevel._recursivelyAddChildrenToMap(null,Math.round(this._map._zoom),e),this._currentShownBounds=e}},_generateInitialClusters:function(){var e=Math.ceil(this._map.getMaxZoom()),t=Math.floor(this._map.getMinZoom()),i=this.options.maxClusterRadius,n=i;"function"!=typeof i&&(n=function(){return i}),null!==this.options.disableClusteringAtZoom&&(e=this.options.disableClusteringAtZoom-1),this._maxZoom=e,this._gridClusters={},this._gridUnclustered={};for(var r=e;r>=t;r--)this._gridClusters[r]=new L.DistanceGrid(n(r)),this._gridUnclustered[r]=new L.DistanceGrid(n(r));this._topClusterLevel=new this._markerCluster(this,t-1)},_addLayer:function(e,t){var i,n,r=this._gridClusters,s=this._gridUnclustered,o=Math.floor(this._map.getMinZoom());for(this.options.singleMarkerMode&&this._overrideMarkerIcon(e),e.on(this._childMarkerEventHandlers,this);t>=o;t--){i=this._map.project(e.getLatLng(),t);var a=r[t].getNearObject(i);if(a)return a._addChild(e),e.__parent=a,void 0;if(a=s[t].getNearObject(i)){var h=a.__parent;h&&this._removeLayer(a,!1);var l=new this._markerCluster(this,t,a,e);r[t].addObject(l,this._map.project(l._cLatLng,t)),a.__parent=l,e.__parent=l;var u=l;for(n=t-1;n>h._zoom;n--)u=new this._markerCluster(this,n,u),r[n].addObject(u,this._map.project(a.getLatLng(),n));return h._addChild(u),this._removeFromGridUnclustered(a,t),void 0}s[t].addObject(e,i)}this._topClusterLevel._addChild(e),e.__parent=this._topClusterLevel},_refreshClustersIcons:function(){this._featureGroup.eachLayer(function(e){e instanceof L.MarkerCluster&&e._iconNeedsUpdate&&e._updateIcon()})},_enqueue:function(e){this._queue.push(e),this._queueTimeout||(this._queueTimeout=setTimeout(L.bind(this._processQueue,this),300))},_processQueue:function(){for(var e=0;ee?(this._animationStart(),this._animationZoomOut(this._zoom,e)):this._moveEnd()},_getExpandedVisibleBounds:function(){return this.options.removeOutsideVisibleBounds?L.Browser.mobile?this._checkBoundsMaxLat(this._map.getBounds()):this._checkBoundsMaxLat(this._map.getBounds().pad(1)):this._mapBoundsInfinite},_checkBoundsMaxLat:function(e){var t=this._maxLat;return void 0!==t&&(e.getNorth()>=t&&(e._northEast.lat=1/0),e.getSouth()<=-t&&(e._southWest.lat=-1/0)),e},_animationAddLayerNonAnimated:function(e,t){if(t===e)this._featureGroup.addLayer(e);else if(2===t._childCount){t._addToMap();var i=t.getAllChildMarkers();this._featureGroup.removeLayer(i[0]),this._featureGroup.removeLayer(i[1])}else t._updateIcon()},_extractNonGroupLayers:function(e,t){var i,n=e.getLayers(),r=0;for(t=t||[];r=0;i--)o=h[i],n.contains(o._latlng)||r.removeLayer(o)}),this._forceLayout(),this._topClusterLevel._recursivelyBecomeVisible(n,t),r.eachLayer(function(e){e instanceof L.MarkerCluster||!e._icon||e.clusterShow()}),this._topClusterLevel._recursively(n,e,t,function(e){e._recursivelyRestoreChildPositions(t)}),this._ignoreMove=!1,this._enqueue(function(){this._topClusterLevel._recursively(n,e,s,function(e){r.removeLayer(e),e.clusterShow()}),this._animationEnd()})},_animationZoomOut:function(e,t){this._animationZoomOutSingle(this._topClusterLevel,e-1,t),this._topClusterLevel._recursivelyAddChildrenToMap(null,t,this._getExpandedVisibleBounds()),this._topClusterLevel._recursivelyRemoveChildrenFromMap(this._currentShownBounds,Math.floor(this._map.getMinZoom()),e,this._getExpandedVisibleBounds())},_animationAddLayer:function(e,t){var i=this,n=this._featureGroup;n.addLayer(e),t!==e&&(t._childCount>2?(t._updateIcon(),this._forceLayout(),this._animationStart(),e._setPos(this._map.latLngToLayerPoint(t.getLatLng())),e.clusterHide(),this._enqueue(function(){n.removeLayer(e),e.clusterShow(),i._animationEnd()})):(this._forceLayout(),i._animationStart(),i._animationZoomOutSingle(t,this._map.getMaxZoom(),this._zoom)))}},_animationZoomOutSingle:function(e,t,i){var n=this._getExpandedVisibleBounds(),r=Math.floor(this._map.getMinZoom());e._recursivelyAnimateChildrenInAndAddSelfToMap(n,r,t+1,i);var s=this;this._forceLayout(),e._recursivelyBecomeVisible(n,i),this._enqueue(function(){if(1===e._childCount){var o=e._markers[0];this._ignoreMove=!0,o.setLatLng(o.getLatLng()),this._ignoreMove=!1,o.clusterShow&&o.clusterShow()}else e._recursively(n,i,r,function(e){e._recursivelyRemoveChildrenFromMap(n,r,t+1)});s._animationEnd()})},_animationEnd:function(){this._map&&(this._map._mapPane.className=this._map._mapPane.className.replace(" leaflet-cluster-anim","")),this._inZoomAnimation--,this.fire("animationend")},_forceLayout:function(){L.Util.falseFn(document.body.offsetWidth)}}),L.markerClusterGroup=function(e){return new L.MarkerClusterGroup(e)};var i=L.MarkerCluster=L.Marker.extend({options:L.Icon.prototype.options,initialize:function(e,t,i,n){L.Marker.prototype.initialize.call(this,i?i._cLatLng||i.getLatLng():new L.LatLng(0,0),{icon:this,pane:e.options.clusterPane}),this._group=e,this._zoom=t,this._markers=[],this._childClusters=[],this._childCount=0,this._iconNeedsUpdate=!0,this._boundsNeedUpdate=!0,this._bounds=new L.LatLngBounds,i&&this._addChild(i),n&&this._addChild(n)},getAllChildMarkers:function(e){e=e||[];for(var t=this._childClusters.length-1;t>=0;t--)this._childClusters[t].getAllChildMarkers(e);for(var i=this._markers.length-1;i>=0;i--)e.push(this._markers[i]);return e},getChildCount:function(){return this._childCount},zoomToBounds:function(e){for(var t,i=this._childClusters.slice(),n=this._group._map,r=n.getBoundsZoom(this._bounds),s=this._zoom+1,o=n.getZoom();i.length>0&&r>s;){s++;var a=[];for(t=0;ts?this._group._map.setView(this._latlng,s):o>=r?this._group._map.setView(this._latlng,o+1):this._group._map.fitBounds(this._bounds,e)},getBounds:function(){var e=new L.LatLngBounds;return e.extend(this._bounds),e},_updateIcon:function(){this._iconNeedsUpdate=!0,this._icon&&this.setIcon(this)},createIcon:function(){return this._iconNeedsUpdate&&(this._iconObj=this._group.options.iconCreateFunction(this),this._iconNeedsUpdate=!1),this._iconObj.createIcon()},createShadow:function(){return this._iconObj.createShadow()},_addChild:function(e,t){this._iconNeedsUpdate=!0,this._boundsNeedUpdate=!0,this._setClusterCenter(e),e instanceof L.MarkerCluster?(t||(this._childClusters.push(e),e.__parent=this),this._childCount+=e._childCount):(t||this._markers.push(e),this._childCount++),this.__parent&&this.__parent._addChild(e,!0)},_setClusterCenter:function(e){this._cLatLng||(this._cLatLng=e._cLatLng||e._latlng)},_resetBounds:function(){var e=this._bounds;e._southWest&&(e._southWest.lat=1/0,e._southWest.lng=1/0),e._northEast&&(e._northEast.lat=-1/0,e._northEast.lng=-1/0)},_recalculateBounds:function(){var e,t,i,n,r=this._markers,s=this._childClusters,o=0,a=0,h=this._childCount;if(0!==h){for(this._resetBounds(),e=0;e=0;i--)n=r[i],n._icon&&(n._setPos(t),n.clusterHide())},function(e){var i,n,r=e._childClusters;for(i=r.length-1;i>=0;i--)n=r[i],n._icon&&(n._setPos(t),n.clusterHide())})},_recursivelyAnimateChildrenInAndAddSelfToMap:function(e,t,i,n){this._recursively(e,n,t,function(r){r._recursivelyAnimateChildrenIn(e,r._group._map.latLngToLayerPoint(r.getLatLng()).round(),i),r._isSingleParent()&&i-1===n?(r.clusterShow(),r._recursivelyRemoveChildrenFromMap(e,t,i)):r.clusterHide(),r._addToMap()})},_recursivelyBecomeVisible:function(e,t){this._recursively(e,this._group._map.getMinZoom(),t,null,function(e){e.clusterShow()})},_recursivelyAddChildrenToMap:function(e,t,i){this._recursively(i,this._group._map.getMinZoom()-1,t,function(n){if(t!==n._zoom)for(var r=n._markers.length-1;r>=0;r--){var s=n._markers[r];i.contains(s._latlng)&&(e&&(s._backupLatlng=s.getLatLng(),s.setLatLng(e),s.clusterHide&&s.clusterHide()),n._group._featureGroup.addLayer(s))}},function(t){t._addToMap(e)})},_recursivelyRestoreChildPositions:function(e){for(var t=this._markers.length-1;t>=0;t--){var i=this._markers[t];i._backupLatlng&&(i.setLatLng(i._backupLatlng),delete i._backupLatlng)}if(e-1===this._zoom)for(var n=this._childClusters.length-1;n>=0;n--)this._childClusters[n]._restorePosition();else for(var r=this._childClusters.length-1;r>=0;r--)this._childClusters[r]._recursivelyRestoreChildPositions(e)},_restorePosition:function(){this._backupLatlng&&(this.setLatLng(this._backupLatlng),delete this._backupLatlng)},_recursivelyRemoveChildrenFromMap:function(e,t,i,n){var r,s;this._recursively(e,t-1,i-1,function(e){for(s=e._markers.length-1;s>=0;s--)r=e._markers[s],n&&n.contains(r._latlng)||(e._group._featureGroup.removeLayer(r),r.clusterShow&&r.clusterShow())},function(e){for(s=e._childClusters.length-1;s>=0;s--)r=e._childClusters[s],n&&n.contains(r._latlng)||(e._group._featureGroup.removeLayer(r),r.clusterShow&&r.clusterShow())})},_recursively:function(e,t,i,n,r){var s,o,a=this._childClusters,h=this._zoom;if(h>=t&&(n&&n(this),r&&h===i&&r(this)),t>h||i>h)for(s=a.length-1;s>=0;s--)o=a[s],e.intersects(o._bounds)&&o._recursively(e,t,i,n,r)},_isSingleParent:function(){return this._childClusters.length>0&&this._childClusters[0]._childCount===this._childCount}});L.Marker.include({clusterHide:function(){return this.options.opacityWhenUnclustered=this.options.opacity||1,this.setOpacity(0)},clusterShow:function(){var e=this.setOpacity(this.options.opacity||this.options.opacityWhenUnclustered);return delete this.options.opacityWhenUnclustered,e}}),L.DistanceGrid=function(e){this._cellSize=e,this._sqCellSize=e*e,this._grid={},this._objectPoint={}},L.DistanceGrid.prototype={addObject:function(e,t){var i=this._getCoord(t.x),n=this._getCoord(t.y),r=this._grid,s=r[n]=r[n]||{},o=s[i]=s[i]||[],a=L.Util.stamp(e);this._objectPoint[a]=t,o.push(e)},updateObject:function(e,t){this.removeObject(e),this.addObject(e,t)},removeObject:function(e,t){var i,n,r=this._getCoord(t.x),s=this._getCoord(t.y),o=this._grid,a=o[s]=o[s]||{},h=a[r]=a[r]||[];for(delete this._objectPoint[L.Util.stamp(e)],i=0,n=h.length;n>i;i++)if(h[i]===e)return h.splice(i,1),1===n&&delete a[r],!0},eachObject:function(e,t){var i,n,r,s,o,a,h,l=this._grid;for(i in l){o=l[i];for(n in o)for(a=o[n],r=0,s=a.length;s>r;r++)h=e.call(t,a[r]),h&&(r--,s--)}},getNearObject:function(e){var t,i,n,r,s,o,a,h,l=this._getCoord(e.x),u=this._getCoord(e.y),_=this._objectPoint,d=this._sqCellSize,c=null;for(t=u-1;u+1>=t;t++)if(r=this._grid[t])for(i=l-1;l+1>=i;i++)if(s=r[i])for(n=0,o=s.length;o>n;n++)a=s[n],h=this._sqDist(_[L.Util.stamp(a)],e),(d>h||d>=h&&null===c)&&(d=h,c=a);return c},_getCoord:function(e){var t=Math.floor(e/this._cellSize);return isFinite(t)?t:e},_sqDist:function(e,t){var i=t.x-e.x,n=t.y-e.y;return i*i+n*n}},function(){L.QuickHull={getDistant:function(e,t){var i=t[1].lat-t[0].lat,n=t[0].lng-t[1].lng;return n*(e.lat-t[0].lat)+i*(e.lng-t[0].lng)},findMostDistantPointFromBaseLine:function(e,t){var i,n,r,s=0,o=null,a=[];for(i=t.length-1;i>=0;i--)n=t[i],r=this.getDistant(n,e),r>0&&(a.push(n),r>s&&(s=r,o=n));return{maxPoint:o,newPoints:a}},buildConvexHull:function(e,t){var i=[],n=this.findMostDistantPointFromBaseLine(e,t);return n.maxPoint?(i=i.concat(this.buildConvexHull([e[0],n.maxPoint],n.newPoints)),i=i.concat(this.buildConvexHull([n.maxPoint,e[1]],n.newPoints))):[e[0]]},getConvexHull:function(e){var t,i=!1,n=!1,r=!1,s=!1,o=null,a=null,h=null,l=null,u=null,_=null;for(t=e.length-1;t>=0;t--){var d=e[t];(i===!1||d.lat>i)&&(o=d,i=d.lat),(n===!1||d.latr)&&(h=d,r=d.lng),(s===!1||d.lng=0;t--)e=i[t].getLatLng(),n.push(e);return L.QuickHull.getConvexHull(n)}}),L.MarkerCluster.include({_2PI:2*Math.PI,_circleFootSeparation:25,_circleStartAngle:0,_spiralFootSeparation:28,_spiralLengthStart:11,_spiralLengthFactor:5,_circleSpiralSwitchover:9,spiderfy:function(){if(this._group._spiderfied!==this&&!this._group._inZoomAnimation){var e,t=this.getAllChildMarkers(),i=this._group,n=i._map,r=n.latLngToLayerPoint(this._latlng);this._group._unspiderfy(),this._group._spiderfied=this,t.length>=this._circleSpiralSwitchover?e=this._generatePointsSpiral(t.length,r):(r.y+=10,e=this._generatePointsCircle(t.length,r)),this._animationSpiderfy(t,e)}},unspiderfy:function(e){this._group._inZoomAnimation||(this._animationUnspiderfy(e),this._group._spiderfied=null)},_generatePointsCircle:function(e,t){var i,n,r=this._group.options.spiderfyDistanceMultiplier*this._circleFootSeparation*(2+e),s=r/this._2PI,o=this._2PI/e,a=[];for(s=Math.max(s,35),a.length=e,i=0;e>i;i++)n=this._circleStartAngle+i*o,a[i]=new L.Point(t.x+s*Math.cos(n),t.y+s*Math.sin(n))._round();return a},_generatePointsSpiral:function(e,t){var i,n=this._group.options.spiderfyDistanceMultiplier,r=n*this._spiralLengthStart,s=n*this._spiralFootSeparation,o=n*this._spiralLengthFactor*this._2PI,a=0,h=[];for(h.length=e,i=e;i>=0;i--)e>i&&(h[i]=new L.Point(t.x+r*Math.cos(a),t.y+r*Math.sin(a))._round()),a+=s/r+5e-4*i,r+=o/a;return h},_noanimationUnspiderfy:function(){var e,t,i=this._group,n=i._map,r=i._featureGroup,s=this.getAllChildMarkers();for(i._ignoreMove=!0,this.setOpacity(1),t=s.length-1;t>=0;t--)e=s[t],r.removeLayer(e),e._preSpiderfyLatlng&&(e.setLatLng(e._preSpiderfyLatlng),delete e._preSpiderfyLatlng),e.setZIndexOffset&&e.setZIndexOffset(0),e._spiderLeg&&(n.removeLayer(e._spiderLeg),delete e._spiderLeg);i.fire("unspiderfied",{cluster:this,markers:s}),i._ignoreMove=!1,i._spiderfied=null}}),L.MarkerClusterNonAnimated=L.MarkerCluster.extend({_animationSpiderfy:function(e,t){var i,n,r,s,o=this._group,a=o._map,h=o._featureGroup,l=this._group.options.spiderLegPolylineOptions;for(o._ignoreMove=!0,i=0;i=0;i--)a=u.layerPointToLatLng(t[i]),n=e[i],n._preSpiderfyLatlng=n._latlng,n.setLatLng(a),n.clusterShow&&n.clusterShow(),p&&(r=n._spiderLeg,s=r._path,s.style.strokeDashoffset=0,r.setStyle({opacity:m}));this.setOpacity(.3),l._ignoreMove=!1,setTimeout(function(){l._animationEnd(),l.fire("spiderfied",{cluster:h,markers:e})},200)},_animationUnspiderfy:function(e){var t,i,n,r,s,o,a=this,h=this._group,l=h._map,u=h._featureGroup,_=e?l._latLngToNewLayerPoint(this._latlng,e.zoom,e.center):l.latLngToLayerPoint(this._latlng),d=this.getAllChildMarkers(),c=L.Path.SVG;for(h._ignoreMove=!0,h._animationStart(),this.setOpacity(1),i=d.length-1;i>=0;i--)t=d[i],t._preSpiderfyLatlng&&(t.closePopup(),t.setLatLng(t._preSpiderfyLatlng),delete t._preSpiderfyLatlng,o=!0,t._setPos&&(t._setPos(_),o=!1),t.clusterHide&&(t.clusterHide(),o=!1),o&&u.removeLayer(t),c&&(n=t._spiderLeg,r=n._path,s=r.getTotalLength()+.1,r.style.strokeDashoffset=s,n.setStyle({opacity:0})));h._ignoreMove=!1,setTimeout(function(){var e=0;for(i=d.length-1;i>=0;i--)t=d[i],t._spiderLeg&&e++;for(i=d.length-1;i>=0;i--)t=d[i],t._spiderLeg&&(t.clusterShow&&t.clusterShow(),t.setZIndexOffset&&t.setZIndexOffset(0),e>1&&u.removeLayer(t),l.removeLayer(t._spiderLeg),delete t._spiderLeg);h._animationEnd(),h.fire("unspiderfied",{cluster:a,markers:d})},200)}}),L.MarkerClusterGroup.include({_spiderfied:null,unspiderfy:function(){this._unspiderfy.apply(this,arguments)},_spiderfierOnAdd:function(){this._map.on("click",this._unspiderfyWrapper,this),this._map.options.zoomAnimation&&this._map.on("zoomstart",this._unspiderfyZoomStart,this),this._map.on("zoomend",this._noanimationUnspiderfy,this),L.Browser.touch||this._map.getRenderer(this)},_spiderfierOnRemove:function(){this._map.off("click",this._unspiderfyWrapper,this),this._map.off("zoomstart",this._unspiderfyZoomStart,this),this._map.off("zoomanim",this._unspiderfyZoomAnim,this),this._map.off("zoomend",this._noanimationUnspiderfy,this),this._noanimationUnspiderfy() +},_unspiderfyZoomStart:function(){this._map&&this._map.on("zoomanim",this._unspiderfyZoomAnim,this)},_unspiderfyZoomAnim:function(e){L.DomUtil.hasClass(this._map._mapPane,"leaflet-touching")||(this._map.off("zoomanim",this._unspiderfyZoomAnim,this),this._unspiderfy(e))},_unspiderfyWrapper:function(){this._unspiderfy()},_unspiderfy:function(e){this._spiderfied&&this._spiderfied.unspiderfy(e)},_noanimationUnspiderfy:function(){this._spiderfied&&this._spiderfied._noanimationUnspiderfy()},_unspiderfyLayer:function(e){e._spiderLeg&&(this._featureGroup.removeLayer(e),e.clusterShow&&e.clusterShow(),e.setZIndexOffset&&e.setZIndexOffset(0),this._map.removeLayer(e._spiderLeg),delete e._spiderLeg)}}),L.MarkerClusterGroup.include({refreshClusters:function(e){return e?e instanceof L.MarkerClusterGroup?e=e._topClusterLevel.getAllChildMarkers():e instanceof L.LayerGroup?e=e._layers:e instanceof L.MarkerCluster?e=e.getAllChildMarkers():e instanceof L.Marker&&(e=[e]):e=this._topClusterLevel.getAllChildMarkers(),this._flagParentsIconsNeedUpdate(e),this._refreshClustersIcons(),this.options.singleMarkerMode&&this._refreshSingleMarkerModeMarkers(e),this},_flagParentsIconsNeedUpdate:function(e){var t,i;for(t in e)for(i=e[t].__parent;i;)i._iconNeedsUpdate=!0,i=i.__parent},_refreshSingleMarkerModeMarkers:function(e){var t,i;for(t in e)i=e[t],this.hasLayer(i)&&i.setIcon(this._overrideMarkerIcon(i))}}),L.Marker.include({refreshIconOptions:function(e,t){var i=this.options.icon;return L.setOptions(i,e),this.setIcon(i),t&&this.__parent&&this.__parent._group.refreshClusters(this),this}}),e.MarkerClusterGroup=t,e.MarkerCluster=i}); +//# sourceMappingURL=leaflet.markercluster.js.map +} diff --git a/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/lib/leaflet-markercluster.js.meta b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/lib/leaflet-markercluster.js.meta new file mode 100644 index 0000000..74bb183 --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/lib/leaflet-markercluster.js.meta @@ -0,0 +1,3 @@ +module-type: library +title: $:/plugins/sycom/leaflet/lib/leaflet-markercluster.js +type: application/javascript \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/lib/leaflet.css b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/lib/leaflet.css new file mode 100644 index 0000000..d1b47a1 --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/lib/leaflet.css @@ -0,0 +1,636 @@ +/* required styles */ + +.leaflet-pane, +.leaflet-tile, +.leaflet-marker-icon, +.leaflet-marker-shadow, +.leaflet-tile-container, +.leaflet-pane > svg, +.leaflet-pane > canvas, +.leaflet-zoom-box, +.leaflet-image-layer, +.leaflet-layer { + position: absolute; + left: 0; + top: 0; + } +.leaflet-container { + overflow: hidden; + } +.leaflet-tile, +.leaflet-marker-icon, +.leaflet-marker-shadow { + -webkit-user-select: none; + -moz-user-select: none; + user-select: none; + -webkit-user-drag: none; + } +/* Safari renders non-retina tile on retina better with this, but Chrome is worse */ +.leaflet-safari .leaflet-tile { + image-rendering: -webkit-optimize-contrast; + } +/* hack that prevents hw layers "stretching" when loading new tiles */ +.leaflet-safari .leaflet-tile-container { + width: 1600px; + height: 1600px; + -webkit-transform-origin: 0 0; + } +.leaflet-marker-icon, +.leaflet-marker-shadow { + display: block; + } +/* .leaflet-container svg: reset svg max-width decleration shipped in Joomla! (joomla.org) 3.x */ +/* .leaflet-container img: map is broken in FF if you have max-width: 100% on tiles */ +.leaflet-container .leaflet-overlay-pane svg, +.leaflet-container .leaflet-marker-pane img, +.leaflet-container .leaflet-shadow-pane img, +.leaflet-container .leaflet-tile-pane img, +.leaflet-container img.leaflet-image-layer { + max-width: none !important; + max-height: none !important; + } + +.leaflet-container.leaflet-touch-zoom { + -ms-touch-action: pan-x pan-y; + touch-action: pan-x pan-y; + } +.leaflet-container.leaflet-touch-drag { + -ms-touch-action: pinch-zoom; + /* Fallback for FF which doesn't support pinch-zoom */ + touch-action: none; + touch-action: pinch-zoom; +} +.leaflet-container.leaflet-touch-drag.leaflet-touch-zoom { + -ms-touch-action: none; + touch-action: none; +} +.leaflet-container { + -webkit-tap-highlight-color: transparent; +} +.leaflet-container a { + -webkit-tap-highlight-color: rgba(51, 181, 229, 0.4); +} +.leaflet-tile { + filter: inherit; + visibility: hidden; + } +.leaflet-tile-loaded { + visibility: inherit; + } +.leaflet-zoom-box { + width: 0; + height: 0; + -moz-box-sizing: border-box; + box-sizing: border-box; + z-index: 800; + } +/* workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=888319 */ +.leaflet-overlay-pane svg { + -moz-user-select: none; + } + +.leaflet-pane { z-index: 400; } + +.leaflet-tile-pane { z-index: 200; } +.leaflet-overlay-pane { z-index: 400; } +.leaflet-shadow-pane { z-index: 500; } +.leaflet-marker-pane { z-index: 600; } +.leaflet-tooltip-pane { z-index: 650; } +.leaflet-popup-pane { z-index: 700; } + +.leaflet-map-pane canvas { z-index: 100; } +.leaflet-map-pane svg { z-index: 200; } + +.leaflet-vml-shape { + width: 1px; + height: 1px; + } +.lvml { + behavior: url(#default#VML); + display: inline-block; + position: absolute; + } + + +/* control positioning */ + +.leaflet-control { + position: relative; + z-index: 800; + pointer-events: visiblePainted; /* IE 9-10 doesn't have auto */ + pointer-events: auto; + } +.leaflet-top, +.leaflet-bottom { + position: absolute; + z-index: 1000; + pointer-events: none; + } +.leaflet-top { + top: 0; + } +.leaflet-right { + right: 0; + } +.leaflet-bottom { + bottom: 0; + } +.leaflet-left { + left: 0; + } +.leaflet-control { + float: left; + clear: both; + } +.leaflet-right .leaflet-control { + float: right; + } +.leaflet-top .leaflet-control { + margin-top: 10px; + } +.leaflet-bottom .leaflet-control { + margin-bottom: 10px; + } +.leaflet-left .leaflet-control { + margin-left: 10px; + } +.leaflet-right .leaflet-control { + margin-right: 10px; + } + + +/* zoom and fade animations */ + +.leaflet-fade-anim .leaflet-tile { + will-change: opacity; + } +.leaflet-fade-anim .leaflet-popup { + opacity: 0; + -webkit-transition: opacity 0.2s linear; + -moz-transition: opacity 0.2s linear; + -o-transition: opacity 0.2s linear; + transition: opacity 0.2s linear; + } +.leaflet-fade-anim .leaflet-map-pane .leaflet-popup { + opacity: 1; + } +.leaflet-zoom-animated { + -webkit-transform-origin: 0 0; + -ms-transform-origin: 0 0; + transform-origin: 0 0; + } +.leaflet-zoom-anim .leaflet-zoom-animated { + will-change: transform; + } +.leaflet-zoom-anim .leaflet-zoom-animated { + -webkit-transition: -webkit-transform 0.25s cubic-bezier(0,0,0.25,1); + -moz-transition: -moz-transform 0.25s cubic-bezier(0,0,0.25,1); + -o-transition: -o-transform 0.25s cubic-bezier(0,0,0.25,1); + transition: transform 0.25s cubic-bezier(0,0,0.25,1); + } +.leaflet-zoom-anim .leaflet-tile, +.leaflet-pan-anim .leaflet-tile { + -webkit-transition: none; + -moz-transition: none; + -o-transition: none; + transition: none; + } + +.leaflet-zoom-anim .leaflet-zoom-hide { + visibility: hidden; + } + + +/* cursors */ + +.leaflet-interactive { + cursor: pointer; + } +.leaflet-grab { + cursor: -webkit-grab; + cursor: -moz-grab; + } +.leaflet-crosshair, +.leaflet-crosshair .leaflet-interactive { + cursor: crosshair; + } +.leaflet-popup-pane, +.leaflet-control { + cursor: auto; + } +.leaflet-dragging .leaflet-grab, +.leaflet-dragging .leaflet-grab .leaflet-interactive, +.leaflet-dragging .leaflet-marker-draggable { + cursor: move; + cursor: -webkit-grabbing; + cursor: -moz-grabbing; + } + +/* marker & overlays interactivity */ +.leaflet-marker-icon, +.leaflet-marker-shadow, +.leaflet-image-layer, +.leaflet-pane > svg path, +.leaflet-tile-container { + pointer-events: none; + } + +.leaflet-marker-icon.leaflet-interactive, +.leaflet-image-layer.leaflet-interactive, +.leaflet-pane > svg path.leaflet-interactive { + pointer-events: visiblePainted; /* IE 9-10 doesn't have auto */ + pointer-events: auto; + } + +/* visual tweaks */ + +.leaflet-container { + background: #ddd; + outline: 0; + } +.leaflet-container a { + color: #0078A8; + } +.leaflet-container a.leaflet-active { + outline: 2px solid orange; + } +.leaflet-zoom-box { + border: 2px dotted #38f; + background: rgba(255,255,255,0.5); + } + + +/* general typography */ +.leaflet-container { + font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif; + } + + +/* general toolbar styles */ + +.leaflet-bar { + box-shadow: 0 1px 5px rgba(0,0,0,0.65); + border-radius: 4px; + } +.leaflet-bar a, +.leaflet-bar a:hover { + background-color: #fff; + border-bottom: 1px solid #ccc; + width: 26px; + height: 26px; + line-height: 26px; + display: block; + text-align: center; + text-decoration: none; + color: black; + } +.leaflet-bar a, +.leaflet-control-layers-toggle { + background-position: 50% 50%; + background-repeat: no-repeat; + display: block; + } +.leaflet-bar a:hover { + background-color: #f4f4f4; + } +.leaflet-bar a:first-child { + border-top-left-radius: 4px; + border-top-right-radius: 4px; + } +.leaflet-bar a:last-child { + border-bottom-left-radius: 4px; + border-bottom-right-radius: 4px; + border-bottom: none; + } +.leaflet-bar a.leaflet-disabled { + cursor: default; + background-color: #f4f4f4; + color: #bbb; + } + +.leaflet-touch .leaflet-bar a { + width: 30px; + height: 30px; + line-height: 30px; + } +.leaflet-touch .leaflet-bar a:first-child { + border-top-left-radius: 2px; + border-top-right-radius: 2px; + } +.leaflet-touch .leaflet-bar a:last-child { + border-bottom-left-radius: 2px; + border-bottom-right-radius: 2px; + } + +/* zoom control */ + +.leaflet-control-zoom-in, +.leaflet-control-zoom-out { + font: bold 18px 'Lucida Console', Monaco, monospace; + text-indent: 1px; + } + +.leaflet-touch .leaflet-control-zoom-in, .leaflet-touch .leaflet-control-zoom-out { + font-size: 22px; + } + + +/* layers control */ + +.leaflet-control-layers { + box-shadow: 0 1px 5px rgba(0,0,0,0.4); + background: #fff; + border-radius: 5px; + } +.leaflet-control-layers-toggle { + background-image: url(images/layers.png); + width: 36px; + height: 36px; + } +.leaflet-retina .leaflet-control-layers-toggle { + background-image: url(images/layers-2x.png); + background-size: 26px 26px; + } +.leaflet-touch .leaflet-control-layers-toggle { + width: 44px; + height: 44px; + } +.leaflet-control-layers .leaflet-control-layers-list, +.leaflet-control-layers-expanded .leaflet-control-layers-toggle { + display: none; + } +.leaflet-control-layers-expanded .leaflet-control-layers-list { + display: block; + position: relative; + } +.leaflet-control-layers-expanded { + padding: 6px 10px 6px 6px; + color: #333; + background: #fff; + } +.leaflet-control-layers-scrollbar { + overflow-y: scroll; + overflow-x: hidden; + padding-right: 5px; + } +.leaflet-control-layers-selector { + margin-top: 2px; + position: relative; + top: 1px; + } +.leaflet-control-layers label { + display: block; + } +.leaflet-control-layers-separator { + height: 0; + border-top: 1px solid #ddd; + margin: 5px -10px 5px -6px; + } + +/* Default icon URLs */ +.leaflet-default-icon-path { + background-image: url(images/marker-icon.png); + } + + +/* attribution and scale controls */ + +.leaflet-container .leaflet-control-attribution { + background: #fff; + background: rgba(255, 255, 255, 0.7); + margin: 0; + } +.leaflet-control-attribution, +.leaflet-control-scale-line { + padding: 0 5px; + color: #333; + } +.leaflet-control-attribution a { + text-decoration: none; + } +.leaflet-control-attribution a:hover { + text-decoration: underline; + } +.leaflet-container .leaflet-control-attribution, +.leaflet-container .leaflet-control-scale { + font-size: 11px; + } +.leaflet-left .leaflet-control-scale { + margin-left: 5px; + } +.leaflet-bottom .leaflet-control-scale { + margin-bottom: 5px; + } +.leaflet-control-scale-line { + border: 2px solid #777; + border-top: none; + line-height: 1.1; + padding: 2px 5px 1px; + font-size: 11px; + white-space: nowrap; + overflow: hidden; + -moz-box-sizing: border-box; + box-sizing: border-box; + + background: #fff; + background: rgba(255, 255, 255, 0.5); + } +.leaflet-control-scale-line:not(:first-child) { + border-top: 2px solid #777; + border-bottom: none; + margin-top: -2px; + } +.leaflet-control-scale-line:not(:first-child):not(:last-child) { + border-bottom: 2px solid #777; + } + +.leaflet-touch .leaflet-control-attribution, +.leaflet-touch .leaflet-control-layers, +.leaflet-touch .leaflet-bar { + box-shadow: none; + } +.leaflet-touch .leaflet-control-layers, +.leaflet-touch .leaflet-bar { + border: 2px solid rgba(0,0,0,0.2); + background-clip: padding-box; + } + + +/* popup */ + +.leaflet-popup { + position: absolute; + text-align: center; + margin-bottom: 20px; + } +.leaflet-popup-content-wrapper { + padding: 1px; + text-align: left; + border-radius: 12px; + } +.leaflet-popup-content { + margin: 13px 19px; + line-height: 1.4; + } +.leaflet-popup-content p { + margin: 18px 0; + } +.leaflet-popup-tip-container { + width: 40px; + height: 20px; + position: absolute; + left: 50%; + margin-left: -20px; + overflow: hidden; + pointer-events: none; + } +.leaflet-popup-tip { + width: 17px; + height: 17px; + padding: 1px; + + margin: -10px auto 0; + + -webkit-transform: rotate(45deg); + -moz-transform: rotate(45deg); + -ms-transform: rotate(45deg); + -o-transform: rotate(45deg); + transform: rotate(45deg); + } +.leaflet-popup-content-wrapper, +.leaflet-popup-tip { + background: white; + color: #333; + box-shadow: 0 3px 14px rgba(0,0,0,0.4); + } +.leaflet-container a.leaflet-popup-close-button { + position: absolute; + top: 0; + right: 0; + padding: 4px 4px 0 0; + border: none; + text-align: center; + width: 18px; + height: 14px; + font: 16px/14px Tahoma, Verdana, sans-serif; + color: #c3c3c3; + text-decoration: none; + font-weight: bold; + background: transparent; + } +.leaflet-container a.leaflet-popup-close-button:hover { + color: #999; + } +.leaflet-popup-scrolled { + overflow: auto; + border-bottom: 1px solid #ddd; + border-top: 1px solid #ddd; + } + +.leaflet-oldie .leaflet-popup-content-wrapper { + zoom: 1; + } +.leaflet-oldie .leaflet-popup-tip { + width: 24px; + margin: 0 auto; + + -ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)"; + filter: progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678); + } +.leaflet-oldie .leaflet-popup-tip-container { + margin-top: -1px; + } + +.leaflet-oldie .leaflet-control-zoom, +.leaflet-oldie .leaflet-control-layers, +.leaflet-oldie .leaflet-popup-content-wrapper, +.leaflet-oldie .leaflet-popup-tip { + border: 1px solid #999; + } + + +/* div icon */ + +.leaflet-div-icon { + background: #fff; + border: 1px solid #666; + } + + +/* Tooltip */ +/* Base styles for the element that has a tooltip */ +.leaflet-tooltip { + position: absolute; + padding: 6px; + background-color: #fff; + border: 1px solid #fff; + border-radius: 3px; + color: #222; + white-space: nowrap; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + pointer-events: none; + box-shadow: 0 1px 3px rgba(0,0,0,0.4); + } +.leaflet-tooltip.leaflet-clickable { + cursor: pointer; + pointer-events: auto; + } +.leaflet-tooltip-top:before, +.leaflet-tooltip-bottom:before, +.leaflet-tooltip-left:before, +.leaflet-tooltip-right:before { + position: absolute; + pointer-events: none; + border: 6px solid transparent; + background: transparent; + content: ""; + } + +/* Directions */ + +.leaflet-tooltip-bottom { + margin-top: 6px; +} +.leaflet-tooltip-top { + margin-top: -6px; +} +.leaflet-tooltip-bottom:before, +.leaflet-tooltip-top:before { + left: 50%; + margin-left: -6px; + } +.leaflet-tooltip-top:before { + bottom: 0; + margin-bottom: -12px; + border-top-color: #fff; + } +.leaflet-tooltip-bottom:before { + top: 0; + margin-top: -12px; + margin-left: -6px; + border-bottom-color: #fff; + } +.leaflet-tooltip-left { + margin-left: -6px; +} +.leaflet-tooltip-right { + margin-left: 6px; +} +.leaflet-tooltip-left:before, +.leaflet-tooltip-right:before { + top: 50%; + margin-top: -6px; + } +.leaflet-tooltip-left:before { + right: 0; + margin-right: -12px; + border-left-color: #fff; + } +.leaflet-tooltip-right:before { + left: 0; + margin-left: -12px; + border-right-color: #fff; + } diff --git a/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/lib/leaflet.css.meta b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/lib/leaflet.css.meta new file mode 100644 index 0000000..33073eb --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/lib/leaflet.css.meta @@ -0,0 +1,3 @@ +tags: $:/tags/Stylesheet +title: $:/plugins/sycom/leaflet/lib/leaflet.css +type: text/css \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/lib/leaflet.js b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/lib/leaflet.js new file mode 100644 index 0000000..a02ad01 --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/lib/leaflet.js @@ -0,0 +1,8 @@ +var L;if($tw.browser){ +/* @preserve + * Leaflet 1.3.1, a JS library for interactive maps. http://leafletjs.com + * (c) 2010-2017 Vladimir Agafonkin, (c) 2010-2011 CloudMade + */ +!function(t,i){"object"==typeof exports&&"undefined"!=typeof module?i(exports):"function"==typeof define&&define.amd?define(["exports"],i):i(t.L={})}(this,function(t){"use strict";function i(t){var i,e,n,o;for(e=1,n=arguments.length;e=0}function A(t,i,e,n){return"touchstart"===i?O(t,e,n):"touchmove"===i?W(t,e,n):"touchend"===i&&H(t,e,n),this}function B(t,i,e){var n=t["_leaflet_"+i+e];return"touchstart"===i?t.removeEventListener(Qi,n,!1):"touchmove"===i?t.removeEventListener(te,n,!1):"touchend"===i&&(t.removeEventListener(ie,n,!1),t.removeEventListener(ee,n,!1)),this}function O(t,i,n){var o=e(function(t){if("mouse"!==t.pointerType&&t.MSPOINTER_TYPE_MOUSE&&t.pointerType!==t.MSPOINTER_TYPE_MOUSE){if(!(ne.indexOf(t.target.tagName)<0))return;$(t)}j(t,i)});t["_leaflet_touchstart"+n]=o,t.addEventListener(Qi,o,!1),se||(document.documentElement.addEventListener(Qi,R,!0),document.documentElement.addEventListener(te,D,!0),document.documentElement.addEventListener(ie,N,!0),document.documentElement.addEventListener(ee,N,!0),se=!0)}function R(t){oe[t.pointerId]=t,re++}function D(t){oe[t.pointerId]&&(oe[t.pointerId]=t)}function N(t){delete oe[t.pointerId],re--}function j(t,i){t.touches=[];for(var e in oe)t.touches.push(oe[e]);t.changedTouches=[t],i(t)}function W(t,i,e){var n=function(t){(t.pointerType!==t.MSPOINTER_TYPE_MOUSE&&"mouse"!==t.pointerType||0!==t.buttons)&&j(t,i)};t["_leaflet_touchmove"+e]=n,t.addEventListener(te,n,!1)}function H(t,i,e){var n=function(t){j(t,i)};t["_leaflet_touchend"+e]=n,t.addEventListener(ie,n,!1),t.addEventListener(ee,n,!1)}function F(t,i,e){function n(t){var i;if(Ui){if(!Pi||"mouse"===t.pointerType)return;i=re}else i=t.touches.length;if(!(i>1)){var e=Date.now(),n=e-(s||e);r=t.touches?t.touches[0]:t,a=n>0&&n<=h,s=e}}function o(t){if(a&&!r.cancelBubble){if(Ui){if(!Pi||"mouse"===t.pointerType)return;var e,n,o={};for(n in r)e=r[n],o[n]=e&&e.bind?e.bind(r):e;r=o}r.type="dblclick",i(r),s=null}}var s,r,a=!1,h=250;return t[ue+ae+e]=n,t[ue+he+e]=o,t[ue+"dblclick"+e]=i,t.addEventListener(ae,n,!1),t.addEventListener(he,o,!1),t.addEventListener("dblclick",i,!1),this}function U(t,i){var e=t[ue+ae+i],n=t[ue+he+i],o=t[ue+"dblclick"+i];return t.removeEventListener(ae,e,!1),t.removeEventListener(he,n,!1),Pi||t.removeEventListener("dblclick",o,!1),this}function V(t,i,e,n){if("object"==typeof i)for(var o in i)G(t,o,i[o],e);else for(var s=0,r=(i=u(i)).length;s100&&n<500||t.target._simulatedClick&&!t._simulated?Q(t):(pi=e,i(t))}function rt(t){return"string"==typeof t?document.getElementById(t):t}function at(t,i){var e=t.style[i]||t.currentStyle&&t.currentStyle[i];if((!e||"auto"===e)&&document.defaultView){var n=document.defaultView.getComputedStyle(t,null);e=n?n[i]:null}return"auto"===e?null:e}function ht(t,i,e){var n=document.createElement(t);return n.className=i||"",e&&e.appendChild(n),n}function ut(t){var i=t.parentNode;i&&i.removeChild(t)}function lt(t){for(;t.firstChild;)t.removeChild(t.firstChild)}function ct(t){var i=t.parentNode;i.lastChild!==t&&i.appendChild(t)}function _t(t){var i=t.parentNode;i.firstChild!==t&&i.insertBefore(t,i.firstChild)}function dt(t,i){if(void 0!==t.classList)return t.classList.contains(i);var e=gt(t);return e.length>0&&new RegExp("(^|\\s)"+i+"(\\s|$)").test(e)}function pt(t,i){if(void 0!==t.classList)for(var e=u(i),n=0,o=e.length;nh&&(s=r,h=a);h>e&&(i[s]=1,Et(t,i,e,n,s),Et(t,i,e,s,o))}function kt(t,i){for(var e=[t[0]],n=1,o=0,s=t.length;ni&&(e.push(t[n]),o=n);return oi.max.x&&(e|=2),t.yi.max.y&&(e|=8),e}function Ot(t,i){var e=i.x-t.x,n=i.y-t.y;return e*e+n*n}function Rt(t,i,e,n){var o,s=i.x,r=i.y,a=e.x-s,h=e.y-r,u=a*a+h*h;return u>0&&((o=((t.x-s)*a+(t.y-r)*h)/u)>1?(s=e.x,r=e.y):o>0&&(s+=a*o,r+=h*o)),a=t.x-s,h=t.y-r,n?a*a+h*h:new x(s,r)}function Dt(t){return!ei(t[0])||"object"!=typeof t[0][0]&&void 0!==t[0][0]}function Nt(t){return console.warn("Deprecated use of _flat, please use L.LineUtil.isFlat instead."),Dt(t)}function jt(t,i,e){var n,o,s,r,a,h,u,l,c,_=[1,4,2,8];for(o=0,u=t.length;o0?Math.floor(t):Math.ceil(t)};x.prototype={clone:function(){return new x(this.x,this.y)},add:function(t){return this.clone()._add(w(t))},_add:function(t){return this.x+=t.x,this.y+=t.y,this},subtract:function(t){return this.clone()._subtract(w(t))},_subtract:function(t){return this.x-=t.x,this.y-=t.y,this},divideBy:function(t){return this.clone()._divideBy(t)},_divideBy:function(t){return this.x/=t,this.y/=t,this},multiplyBy:function(t){return this.clone()._multiplyBy(t)},_multiplyBy:function(t){return this.x*=t,this.y*=t,this},scaleBy:function(t){return new x(this.x*t.x,this.y*t.y)},unscaleBy:function(t){return new x(this.x/t.x,this.y/t.y)},round:function(){return this.clone()._round()},_round:function(){return this.x=Math.round(this.x),this.y=Math.round(this.y),this},floor:function(){return this.clone()._floor()},_floor:function(){return this.x=Math.floor(this.x),this.y=Math.floor(this.y),this},ceil:function(){return this.clone()._ceil()},_ceil:function(){return this.x=Math.ceil(this.x),this.y=Math.ceil(this.y),this},trunc:function(){return this.clone()._trunc()},_trunc:function(){return this.x=li(this.x),this.y=li(this.y),this},distanceTo:function(t){var i=(t=w(t)).x-this.x,e=t.y-this.y;return Math.sqrt(i*i+e*e)},equals:function(t){return(t=w(t)).x===this.x&&t.y===this.y},contains:function(t){return t=w(t),Math.abs(t.x)<=Math.abs(this.x)&&Math.abs(t.y)<=Math.abs(this.y)},toString:function(){return"Point("+a(this.x)+", "+a(this.y)+")"}},P.prototype={extend:function(t){return t=w(t),this.min||this.max?(this.min.x=Math.min(t.x,this.min.x),this.max.x=Math.max(t.x,this.max.x),this.min.y=Math.min(t.y,this.min.y),this.max.y=Math.max(t.y,this.max.y)):(this.min=t.clone(),this.max=t.clone()),this},getCenter:function(t){return new x((this.min.x+this.max.x)/2,(this.min.y+this.max.y)/2,t)},getBottomLeft:function(){return new x(this.min.x,this.max.y)},getTopRight:function(){return new x(this.max.x,this.min.y)},getTopLeft:function(){return this.min},getBottomRight:function(){return this.max},getSize:function(){return this.max.subtract(this.min)},contains:function(t){var i,e;return(t="number"==typeof t[0]||t instanceof x?w(t):b(t))instanceof P?(i=t.min,e=t.max):i=e=t,i.x>=this.min.x&&e.x<=this.max.x&&i.y>=this.min.y&&e.y<=this.max.y},intersects:function(t){t=b(t);var i=this.min,e=this.max,n=t.min,o=t.max,s=o.x>=i.x&&n.x<=e.x,r=o.y>=i.y&&n.y<=e.y;return s&&r},overlaps:function(t){t=b(t);var i=this.min,e=this.max,n=t.min,o=t.max,s=o.x>i.x&&n.xi.y&&n.y=n.lat&&e.lat<=o.lat&&i.lng>=n.lng&&e.lng<=o.lng},intersects:function(t){t=z(t);var i=this._southWest,e=this._northEast,n=t.getSouthWest(),o=t.getNorthEast(),s=o.lat>=i.lat&&n.lat<=e.lat,r=o.lng>=i.lng&&n.lng<=e.lng;return s&&r},overlaps:function(t){t=z(t);var i=this._southWest,e=this._northEast,n=t.getSouthWest(),o=t.getNorthEast(),s=o.lat>i.lat&&n.lati.lng&&n.lng1,Yi=!!document.createElement("canvas").getContext,Xi=!(!document.createElementNS||!E("svg").createSVGRect),Ji=!Xi&&function(){try{var t=document.createElement("div");t.innerHTML='';var i=t.firstChild;return i.style.behavior="url(#default#VML)",i&&"object"==typeof i.adj}catch(t){return!1}}(),$i=(Object.freeze||Object)({ie:wi,ielt9:Li,edge:Pi,webkit:bi,android:Ti,android23:zi,androidStock:Ci,opera:Zi,chrome:Si,gecko:Ei,safari:ki,phantom:Ii,opera12:Ai,win:Bi,ie3d:Oi,webkit3d:Ri,gecko3d:Di,any3d:Ni,mobile:ji,mobileWebkit:Wi,mobileWebkit3d:Hi,msPointer:Fi,pointer:Ui,touch:Vi,mobileOpera:qi,mobileGecko:Gi,retina:Ki,canvas:Yi,svg:Xi,vml:Ji}),Qi=Fi?"MSPointerDown":"pointerdown",te=Fi?"MSPointerMove":"pointermove",ie=Fi?"MSPointerUp":"pointerup",ee=Fi?"MSPointerCancel":"pointercancel",ne=["INPUT","SELECT","OPTION"],oe={},se=!1,re=0,ae=Fi?"MSPointerDown":Ui?"pointerdown":"touchstart",he=Fi?"MSPointerUp":Ui?"pointerup":"touchend",ue="_leaflet_",le="_leaflet_events",ce=Bi&&Si?2*window.devicePixelRatio:Ei?window.devicePixelRatio:1,_e={},de=(Object.freeze||Object)({on:V,off:q,stopPropagation:Y,disableScrollPropagation:X,disableClickPropagation:J,preventDefault:$,stop:Q,getMousePosition:tt,getWheelDelta:it,fakeStop:et,skipped:nt,isExternalTarget:ot,addListener:V,removeListener:q}),pe=xt(["transform","WebkitTransform","OTransform","MozTransform","msTransform"]),me=xt(["webkitTransition","transition","OTransition","MozTransition","msTransition"]),fe="webkitTransition"===me||"OTransition"===me?me+"End":"transitionend";if("onselectstart"in document)mi=function(){V(window,"selectstart",$)},fi=function(){q(window,"selectstart",$)};else{var ge=xt(["userSelect","WebkitUserSelect","OUserSelect","MozUserSelect","msUserSelect"]);mi=function(){if(ge){var t=document.documentElement.style;gi=t[ge],t[ge]="none"}},fi=function(){ge&&(document.documentElement.style[ge]=gi,gi=void 0)}}var ve,ye,xe=(Object.freeze||Object)({TRANSFORM:pe,TRANSITION:me,TRANSITION_END:fe,get:rt,getStyle:at,create:ht,remove:ut,empty:lt,toFront:ct,toBack:_t,hasClass:dt,addClass:pt,removeClass:mt,setClass:ft,getClass:gt,setOpacity:vt,testProp:xt,setTransform:wt,setPosition:Lt,getPosition:Pt,disableTextSelection:mi,enableTextSelection:fi,disableImageDrag:bt,enableImageDrag:Tt,preventOutline:zt,restoreOutline:Mt}),we=ui.extend({run:function(t,i,e,n){this.stop(),this._el=t,this._inProgress=!0,this._duration=e||.25,this._easeOutPower=1/Math.max(n||.5,.2),this._startPos=Pt(t),this._offset=i.subtract(this._startPos),this._startTime=+new Date,this.fire("start"),this._animate()},stop:function(){this._inProgress&&(this._step(!0),this._complete())},_animate:function(){this._animId=f(this._animate,this),this._step()},_step:function(t){var i=+new Date-this._startTime,e=1e3*this._duration;ithis.options.maxZoom)?this.setZoom(t):this},panInsideBounds:function(t,i){this._enforcingBounds=!0;var e=this.getCenter(),n=this._limitCenter(e,this._zoom,z(t));return e.equals(n)||this.panTo(n,i),this._enforcingBounds=!1,this},invalidateSize:function(t){if(!this._loaded)return this;t=i({animate:!1,pan:!0},!0===t?{animate:!0}:t);var n=this.getSize();this._sizeChanged=!0,this._lastCenter=null;var o=this.getSize(),s=n.divideBy(2).round(),r=o.divideBy(2).round(),a=s.subtract(r);return a.x||a.y?(t.animate&&t.pan?this.panBy(a):(t.pan&&this._rawPanBy(a),this.fire("move"),t.debounceMoveend?(clearTimeout(this._sizeTimer),this._sizeTimer=setTimeout(e(this.fire,this,"moveend"),200)):this.fire("moveend")),this.fire("resize",{oldSize:n,newSize:o})):this},stop:function(){return this.setZoom(this._limitZoom(this._zoom)),this.options.zoomSnap||this.fire("viewreset"),this._stop()},locate:function(t){if(t=this._locateOptions=i({timeout:1e4,watch:!1},t),!("geolocation"in navigator))return this._handleGeolocationError({code:0,message:"Geolocation not supported."}),this;var n=e(this._handleGeolocationResponse,this),o=e(this._handleGeolocationError,this);return t.watch?this._locationWatchId=navigator.geolocation.watchPosition(n,o,t):navigator.geolocation.getCurrentPosition(n,o,t),this},stopLocate:function(){return navigator.geolocation&&navigator.geolocation.clearWatch&&navigator.geolocation.clearWatch(this._locationWatchId),this._locateOptions&&(this._locateOptions.setView=!1),this},_handleGeolocationError:function(t){var i=t.code,e=t.message||(1===i?"permission denied":2===i?"position unavailable":"timeout");this._locateOptions.setView&&!this._loaded&&this.fitWorld(),this.fire("locationerror",{code:i,message:"Geolocation error: "+e+"."})},_handleGeolocationResponse:function(t){var i=new M(t.coords.latitude,t.coords.longitude),e=i.toBounds(t.coords.accuracy),n=this._locateOptions;if(n.setView){var o=this.getBoundsZoom(e);this.setView(i,n.maxZoom?Math.min(o,n.maxZoom):o)}var s={latlng:i,bounds:e,timestamp:t.timestamp};for(var r in t.coords)"number"==typeof t.coords[r]&&(s[r]=t.coords[r]);this.fire("locationfound",s)},addHandler:function(t,i){if(!i)return this;var e=this[t]=new i(this);return this._handlers.push(e),this.options[t]&&e.enable(),this},remove:function(){if(this._initEvents(!0),this._containerId!==this._container._leaflet_id)throw new Error("Map container is being reused by another instance");try{delete this._container._leaflet_id,delete this._containerId}catch(t){this._container._leaflet_id=void 0,this._containerId=void 0}void 0!==this._locationWatchId&&this.stopLocate(),this._stop(),ut(this._mapPane),this._clearControlPos&&this._clearControlPos(),this._clearHandlers(),this._loaded&&this.fire("unload");var t;for(t in this._layers)this._layers[t].remove();for(t in this._panes)ut(this._panes[t]);return this._layers=[],this._panes=[],delete this._mapPane,delete this._renderer,this},createPane:function(t,i){var e=ht("div","leaflet-pane"+(t?" leaflet-"+t.replace("Pane","")+"-pane":""),i||this._mapPane);return t&&(this._panes[t]=e),e},getCenter:function(){return this._checkIfLoaded(),this._lastCenter&&!this._moved()?this._lastCenter:this.layerPointToLatLng(this._getCenterLayerPoint())},getZoom:function(){return this._zoom},getBounds:function(){var t=this.getPixelBounds();return new T(this.unproject(t.getBottomLeft()),this.unproject(t.getTopRight()))},getMinZoom:function(){return void 0===this.options.minZoom?this._layersMinZoom||0:this.options.minZoom},getMaxZoom:function(){return void 0===this.options.maxZoom?void 0===this._layersMaxZoom?1/0:this._layersMaxZoom:this.options.maxZoom},getBoundsZoom:function(t,i,e){t=z(t),e=w(e||[0,0]);var n=this.getZoom()||0,o=this.getMinZoom(),s=this.getMaxZoom(),r=t.getNorthWest(),a=t.getSouthEast(),h=this.getSize().subtract(e),u=b(this.project(a,n),this.project(r,n)).getSize(),l=Ni?this.options.zoomSnap:1,c=h.x/u.x,_=h.y/u.y,d=i?Math.max(c,_):Math.min(c,_);return n=this.getScaleZoom(d,n),l&&(n=Math.round(n/(l/100))*(l/100),n=i?Math.ceil(n/l)*l:Math.floor(n/l)*l),Math.max(o,Math.min(s,n))},getSize:function(){return this._size&&!this._sizeChanged||(this._size=new x(this._container.clientWidth||0,this._container.clientHeight||0),this._sizeChanged=!1),this._size.clone()},getPixelBounds:function(t,i){var e=this._getTopLeftPoint(t,i);return new P(e,e.add(this.getSize()))},getPixelOrigin:function(){return this._checkIfLoaded(),this._pixelOrigin},getPixelWorldBounds:function(t){return this.options.crs.getProjectedBounds(void 0===t?this.getZoom():t)},getPane:function(t){return"string"==typeof t?this._panes[t]:t},getPanes:function(){return this._panes},getContainer:function(){return this._container},getZoomScale:function(t,i){var e=this.options.crs;return i=void 0===i?this._zoom:i,e.scale(t)/e.scale(i)},getScaleZoom:function(t,i){var e=this.options.crs;i=void 0===i?this._zoom:i;var n=e.zoom(t*e.scale(i));return isNaN(n)?1/0:n},project:function(t,i){return i=void 0===i?this._zoom:i,this.options.crs.latLngToPoint(C(t),i)},unproject:function(t,i){return i=void 0===i?this._zoom:i,this.options.crs.pointToLatLng(w(t),i)},layerPointToLatLng:function(t){var i=w(t).add(this.getPixelOrigin());return this.unproject(i)},latLngToLayerPoint:function(t){return this.project(C(t))._round()._subtract(this.getPixelOrigin())},wrapLatLng:function(t){return this.options.crs.wrapLatLng(C(t))},wrapLatLngBounds:function(t){return this.options.crs.wrapLatLngBounds(z(t))},distance:function(t,i){return this.options.crs.distance(C(t),C(i))},containerPointToLayerPoint:function(t){return w(t).subtract(this._getMapPanePos())},layerPointToContainerPoint:function(t){return w(t).add(this._getMapPanePos())},containerPointToLatLng:function(t){var i=this.containerPointToLayerPoint(w(t));return this.layerPointToLatLng(i)},latLngToContainerPoint:function(t){return this.layerPointToContainerPoint(this.latLngToLayerPoint(C(t)))},mouseEventToContainerPoint:function(t){return tt(t,this._container)},mouseEventToLayerPoint:function(t){return this.containerPointToLayerPoint(this.mouseEventToContainerPoint(t))},mouseEventToLatLng:function(t){return this.layerPointToLatLng(this.mouseEventToLayerPoint(t))},_initContainer:function(t){var i=this._container=rt(t);if(!i)throw new Error("Map container not found.");if(i._leaflet_id)throw new Error("Map container is already initialized.");V(i,"scroll",this._onScroll,this),this._containerId=n(i)},_initLayout:function(){var t=this._container;this._fadeAnimated=this.options.fadeAnimation&&Ni,pt(t,"leaflet-container"+(Vi?" leaflet-touch":"")+(Ki?" leaflet-retina":"")+(Li?" leaflet-oldie":"")+(ki?" leaflet-safari":"")+(this._fadeAnimated?" leaflet-fade-anim":""));var i=at(t,"position");"absolute"!==i&&"relative"!==i&&"fixed"!==i&&(t.style.position="relative"),this._initPanes(),this._initControlPos&&this._initControlPos()},_initPanes:function(){var t=this._panes={};this._paneRenderers={},this._mapPane=this.createPane("mapPane",this._container),Lt(this._mapPane,new x(0,0)),this.createPane("tilePane"),this.createPane("shadowPane"),this.createPane("overlayPane"),this.createPane("markerPane"),this.createPane("tooltipPane"),this.createPane("popupPane"),this.options.markerZoomAnimation||(pt(t.markerPane,"leaflet-zoom-hide"),pt(t.shadowPane,"leaflet-zoom-hide"))},_resetView:function(t,i){Lt(this._mapPane,new x(0,0));var e=!this._loaded;this._loaded=!0,i=this._limitZoom(i),this.fire("viewprereset");var n=this._zoom!==i;this._moveStart(n,!1)._move(t,i)._moveEnd(n),this.fire("viewreset"),e&&this.fire("load")},_moveStart:function(t,i){return t&&this.fire("zoomstart"),i||this.fire("movestart"),this},_move:function(t,i,e){void 0===i&&(i=this._zoom);var n=this._zoom!==i;return this._zoom=i,this._lastCenter=t,this._pixelOrigin=this._getNewPixelOrigin(t),(n||e&&e.pinch)&&this.fire("zoom",e),this.fire("move",e)},_moveEnd:function(t){return t&&this.fire("zoomend"),this.fire("moveend")},_stop:function(){return g(this._flyToFrame),this._panAnim&&this._panAnim.stop(),this},_rawPanBy:function(t){Lt(this._mapPane,this._getMapPanePos().subtract(t))},_getZoomSpan:function(){return this.getMaxZoom()-this.getMinZoom()},_panInsideMaxBounds:function(){this._enforcingBounds||this.panInsideBounds(this.options.maxBounds)},_checkIfLoaded:function(){if(!this._loaded)throw new Error("Set map center and zoom first.")},_initEvents:function(t){this._targets={},this._targets[n(this._container)]=this;var i=t?q:V;i(this._container,"click dblclick mousedown mouseup mouseover mouseout mousemove contextmenu keypress",this._handleDOMEvent,this),this.options.trackResize&&i(window,"resize",this._onResize,this),Ni&&this.options.transform3DLimit&&(t?this.off:this.on).call(this,"moveend",this._onMoveEnd)},_onResize:function(){g(this._resizeRequest),this._resizeRequest=f(function(){this.invalidateSize({debounceMoveend:!0})},this)},_onScroll:function(){this._container.scrollTop=0,this._container.scrollLeft=0},_onMoveEnd:function(){var t=this._getMapPanePos();Math.max(Math.abs(t.x),Math.abs(t.y))>=this.options.transform3DLimit&&this._resetView(this.getCenter(),this.getZoom())},_findEventTargets:function(t,i){for(var e,o=[],s="mouseout"===i||"mouseover"===i,r=t.target||t.srcElement,a=!1;r;){if((e=this._targets[n(r)])&&("click"===i||"preclick"===i)&&!t._simulated&&this._draggableMoved(e)){a=!0;break}if(e&&e.listens(i,!0)){if(s&&!ot(r,t))break;if(o.push(e),s)break}if(r===this._container)break;r=r.parentNode}return o.length||a||s||!ot(r,t)||(o=[this]),o},_handleDOMEvent:function(t){if(this._loaded&&!nt(t)){var i=t.type;"mousedown"!==i&&"keypress"!==i||zt(t.target||t.srcElement),this._fireDOMEvent(t,i)}},_mouseEvents:["click","dblclick","mouseover","mouseout","contextmenu"],_fireDOMEvent:function(t,e,n){if("click"===t.type){var o=i({},t);o.type="preclick",this._fireDOMEvent(o,o.type,n)}if(!t._stopped&&(n=(n||[]).concat(this._findEventTargets(t,e))).length){var s=n[0];"contextmenu"===e&&s.listens(e,!0)&&$(t);var r={originalEvent:t};if("keypress"!==t.type){var a=s.getLatLng&&(!s._radius||s._radius<=10);r.containerPoint=a?this.latLngToContainerPoint(s.getLatLng()):this.mouseEventToContainerPoint(t),r.layerPoint=this.containerPointToLayerPoint(r.containerPoint),r.latlng=a?s.getLatLng():this.layerPointToLatLng(r.layerPoint)}for(var h=0;h0?Math.round(t-i)/2:Math.max(0,Math.ceil(t))-Math.max(0,Math.floor(i))},_limitZoom:function(t){var i=this.getMinZoom(),e=this.getMaxZoom(),n=Ni?this.options.zoomSnap:1;return n&&(t=Math.round(t/n)*n),Math.max(i,Math.min(e,t))},_onPanTransitionStep:function(){this.fire("move")},_onPanTransitionEnd:function(){mt(this._mapPane,"leaflet-pan-anim"),this.fire("moveend")},_tryAnimatedPan:function(t,i){var e=this._getCenterOffset(t)._trunc();return!(!0!==(i&&i.animate)&&!this.getSize().contains(e))&&(this.panBy(e,i),!0)},_createAnimProxy:function(){var t=this._proxy=ht("div","leaflet-proxy leaflet-zoom-animated");this._panes.mapPane.appendChild(t),this.on("zoomanim",function(t){var i=pe,e=this._proxy.style[i];wt(this._proxy,this.project(t.center,t.zoom),this.getZoomScale(t.zoom,1)),e===this._proxy.style[i]&&this._animatingZoom&&this._onZoomTransitionEnd()},this),this.on("load moveend",function(){var t=this.getCenter(),i=this.getZoom();wt(this._proxy,this.project(t,i),this.getZoomScale(i,1))},this),this._on("unload",this._destroyAnimProxy,this)},_destroyAnimProxy:function(){ut(this._proxy),delete this._proxy},_catchTransitionEnd:function(t){this._animatingZoom&&t.propertyName.indexOf("transform")>=0&&this._onZoomTransitionEnd()},_nothingToAnimate:function(){return!this._container.getElementsByClassName("leaflet-zoom-animated").length},_tryAnimatedZoom:function(t,i,e){if(this._animatingZoom)return!0;if(e=e||{},!this._zoomAnimated||!1===e.animate||this._nothingToAnimate()||Math.abs(i-this._zoom)>this.options.zoomAnimationThreshold)return!1;var n=this.getZoomScale(i),o=this._getCenterOffset(t)._divideBy(1-1/n);return!(!0!==e.animate&&!this.getSize().contains(o))&&(f(function(){this._moveStart(!0,!1)._animateZoom(t,i,!0)},this),!0)},_animateZoom:function(t,i,n,o){this._mapPane&&(n&&(this._animatingZoom=!0,this._animateToCenter=t,this._animateToZoom=i,pt(this._mapPane,"leaflet-zoom-anim")),this.fire("zoomanim",{center:t,zoom:i,noUpdate:o}),setTimeout(e(this._onZoomTransitionEnd,this),250))},_onZoomTransitionEnd:function(){this._animatingZoom&&(this._mapPane&&mt(this._mapPane,"leaflet-zoom-anim"),this._animatingZoom=!1,this._move(this._animateToCenter,this._animateToZoom),f(function(){this._moveEnd(!0)},this))}}),Pe=v.extend({options:{position:"topright"},initialize:function(t){l(this,t)},getPosition:function(){return this.options.position},setPosition:function(t){var i=this._map;return i&&i.removeControl(this),this.options.position=t,i&&i.addControl(this),this},getContainer:function(){return this._container},addTo:function(t){this.remove(),this._map=t;var i=this._container=this.onAdd(t),e=this.getPosition(),n=t._controlCorners[e];return pt(i,"leaflet-control"),-1!==e.indexOf("bottom")?n.insertBefore(i,n.firstChild):n.appendChild(i),this},remove:function(){return this._map?(ut(this._container),this.onRemove&&this.onRemove(this._map),this._map=null,this):this},_refocusOnMap:function(t){this._map&&t&&t.screenX>0&&t.screenY>0&&this._map.getContainer().focus()}}),be=function(t){return new Pe(t)};Le.include({addControl:function(t){return t.addTo(this),this},removeControl:function(t){return t.remove(),this},_initControlPos:function(){function t(t,o){var s=e+t+" "+e+o;i[t+o]=ht("div",s,n)}var i=this._controlCorners={},e="leaflet-",n=this._controlContainer=ht("div",e+"control-container",this._container);t("top","left"),t("top","right"),t("bottom","left"),t("bottom","right")},_clearControlPos:function(){for(var t in this._controlCorners)ut(this._controlCorners[t]);ut(this._controlContainer),delete this._controlCorners,delete this._controlContainer}});var Te=Pe.extend({options:{collapsed:!0,position:"topright",autoZIndex:!0,hideSingleBase:!1,sortLayers:!1,sortFunction:function(t,i,e,n){return e1,this._baseLayersList.style.display=t?"":"none"),this._separator.style.display=i&&t?"":"none",this},_onLayerChange:function(t){this._handlingClick||this._update();var i=this._getLayer(n(t.target)),e=i.overlay?"add"===t.type?"overlayadd":"overlayremove":"add"===t.type?"baselayerchange":null;e&&this._map.fire(e,i)},_createRadioElement:function(t,i){var e='",n=document.createElement("div");return n.innerHTML=e,n.firstChild},_addItem:function(t){var i,e=document.createElement("label"),o=this._map.hasLayer(t.layer);t.overlay?((i=document.createElement("input")).type="checkbox",i.className="leaflet-control-layers-selector",i.defaultChecked=o):i=this._createRadioElement("leaflet-base-layers",o),this._layerControlInputs.push(i),i.layerId=n(t.layer),V(i,"click",this._onInputClick,this);var s=document.createElement("span");s.innerHTML=" "+t.name;var r=document.createElement("div");return e.appendChild(r),r.appendChild(i),r.appendChild(s),(t.overlay?this._overlaysList:this._baseLayersList).appendChild(e),this._checkDisabledLayers(),e},_onInputClick:function(){var t,i,e=this._layerControlInputs,n=[],o=[];this._handlingClick=!0;for(var s=e.length-1;s>=0;s--)t=e[s],i=this._getLayer(t.layerId).layer,t.checked?n.push(i):t.checked||o.push(i);for(s=0;s=0;o--)t=e[o],i=this._getLayer(t.layerId).layer,t.disabled=void 0!==i.options.minZoom&&ni.options.maxZoom},_expandIfNotCollapsed:function(){return this._map&&!this.options.collapsed&&this.expand(),this},_expand:function(){return this.expand()},_collapse:function(){return this.collapse()}}),ze=Pe.extend({options:{position:"topleft",zoomInText:"+",zoomInTitle:"Zoom in",zoomOutText:"−",zoomOutTitle:"Zoom out"},onAdd:function(t){var i="leaflet-control-zoom",e=ht("div",i+" leaflet-bar"),n=this.options;return this._zoomInButton=this._createButton(n.zoomInText,n.zoomInTitle,i+"-in",e,this._zoomIn),this._zoomOutButton=this._createButton(n.zoomOutText,n.zoomOutTitle,i+"-out",e,this._zoomOut),this._updateDisabled(),t.on("zoomend zoomlevelschange",this._updateDisabled,this),e},onRemove:function(t){t.off("zoomend zoomlevelschange",this._updateDisabled,this)},disable:function(){return this._disabled=!0,this._updateDisabled(),this},enable:function(){return this._disabled=!1,this._updateDisabled(),this},_zoomIn:function(t){!this._disabled&&this._map._zoomthis._map.getMinZoom()&&this._map.zoomOut(this._map.options.zoomDelta*(t.shiftKey?3:1))},_createButton:function(t,i,e,n,o){var s=ht("a",e,n);return s.innerHTML=t,s.href="#",s.title=i,s.setAttribute("role","button"),s.setAttribute("aria-label",i),J(s),V(s,"click",Q),V(s,"click",o,this),V(s,"click",this._refocusOnMap,this),s},_updateDisabled:function(){var t=this._map,i="leaflet-disabled";mt(this._zoomInButton,i),mt(this._zoomOutButton,i),(this._disabled||t._zoom===t.getMinZoom())&&pt(this._zoomOutButton,i),(this._disabled||t._zoom===t.getMaxZoom())&&pt(this._zoomInButton,i)}});Le.mergeOptions({zoomControl:!0}),Le.addInitHook(function(){this.options.zoomControl&&(this.zoomControl=new ze,this.addControl(this.zoomControl))});var Me=Pe.extend({options:{position:"bottomleft",maxWidth:100,metric:!0,imperial:!0},onAdd:function(t){var i=ht("div","leaflet-control-scale"),e=this.options;return this._addScales(e,"leaflet-control-scale-line",i),t.on(e.updateWhenIdle?"moveend":"move",this._update,this),t.whenReady(this._update,this),i},onRemove:function(t){t.off(this.options.updateWhenIdle?"moveend":"move",this._update,this)},_addScales:function(t,i,e){t.metric&&(this._mScale=ht("div",i,e)),t.imperial&&(this._iScale=ht("div",i,e))},_update:function(){var t=this._map,i=t.getSize().y/2,e=t.distance(t.containerPointToLatLng([0,i]),t.containerPointToLatLng([this.options.maxWidth,i]));this._updateScales(e)},_updateScales:function(t){this.options.metric&&t&&this._updateMetric(t),this.options.imperial&&t&&this._updateImperial(t)},_updateMetric:function(t){var i=this._getRoundNum(t),e=i<1e3?i+" m":i/1e3+" km";this._updateScale(this._mScale,e,i/t)},_updateImperial:function(t){var i,e,n,o=3.2808399*t;o>5280?(i=o/5280,e=this._getRoundNum(i),this._updateScale(this._iScale,e+" mi",e/i)):(n=this._getRoundNum(o),this._updateScale(this._iScale,n+" ft",n/o))},_updateScale:function(t,i,e){t.style.width=Math.round(this.options.maxWidth*e)+"px",t.innerHTML=i},_getRoundNum:function(t){var i=Math.pow(10,(Math.floor(t)+"").length-1),e=t/i;return e=e>=10?10:e>=5?5:e>=3?3:e>=2?2:1,i*e}}),Ce=Pe.extend({options:{position:"bottomright",prefix:'Leaflet'},initialize:function(t){l(this,t),this._attributions={}},onAdd:function(t){t.attributionControl=this,this._container=ht("div","leaflet-control-attribution"),J(this._container);for(var i in t._layers)t._layers[i].getAttribution&&this.addAttribution(t._layers[i].getAttribution());return this._update(),this._container},setPrefix:function(t){return this.options.prefix=t,this._update(),this},addAttribution:function(t){return t?(this._attributions[t]||(this._attributions[t]=0),this._attributions[t]++,this._update(),this):this},removeAttribution:function(t){return t?(this._attributions[t]&&(this._attributions[t]--,this._update()),this):this},_update:function(){if(this._map){var t=[];for(var i in this._attributions)this._attributions[i]&&t.push(i);var e=[];this.options.prefix&&e.push(this.options.prefix),t.length&&e.push(t.join(", ")),this._container.innerHTML=e.join(" | ")}}});Le.mergeOptions({attributionControl:!0}),Le.addInitHook(function(){this.options.attributionControl&&(new Ce).addTo(this)});Pe.Layers=Te,Pe.Zoom=ze,Pe.Scale=Me,Pe.Attribution=Ce,be.layers=function(t,i,e){return new Te(t,i,e)},be.zoom=function(t){return new ze(t)},be.scale=function(t){return new Me(t)},be.attribution=function(t){return new Ce(t)};var Ze=v.extend({initialize:function(t){this._map=t},enable:function(){return this._enabled?this:(this._enabled=!0,this.addHooks(),this)},disable:function(){return this._enabled?(this._enabled=!1,this.removeHooks(),this):this},enabled:function(){return!!this._enabled}});Ze.addTo=function(t,i){return t.addHandler(i,this),this};var Se,Ee={Events:hi},ke=Vi?"touchstart mousedown":"mousedown",Ie={mousedown:"mouseup",touchstart:"touchend",pointerdown:"touchend",MSPointerDown:"touchend"},Ae={mousedown:"mousemove",touchstart:"touchmove",pointerdown:"touchmove",MSPointerDown:"touchmove"},Be=ui.extend({options:{clickTolerance:3},initialize:function(t,i,e,n){l(this,n),this._element=t,this._dragStartTarget=i||t,this._preventOutline=e},enable:function(){this._enabled||(V(this._dragStartTarget,ke,this._onDown,this),this._enabled=!0)},disable:function(){this._enabled&&(Be._dragging===this&&this.finishDrag(),q(this._dragStartTarget,ke,this._onDown,this),this._enabled=!1,this._moved=!1)},_onDown:function(t){if(!t._simulated&&this._enabled&&(this._moved=!1,!dt(this._element,"leaflet-zoom-anim")&&!(Be._dragging||t.shiftKey||1!==t.which&&1!==t.button&&!t.touches||(Be._dragging=this,this._preventOutline&&zt(this._element),bt(),mi(),this._moving)))){this.fire("down");var i=t.touches?t.touches[0]:t;this._startPoint=new x(i.clientX,i.clientY),V(document,Ae[t.type],this._onMove,this),V(document,Ie[t.type],this._onUp,this)}},_onMove:function(t){if(!t._simulated&&this._enabled)if(t.touches&&t.touches.length>1)this._moved=!0;else{var i=t.touches&&1===t.touches.length?t.touches[0]:t,e=new x(i.clientX,i.clientY).subtract(this._startPoint);(e.x||e.y)&&(Math.abs(e.x)+Math.abs(e.y)1e-7;h++)i=s*Math.sin(a),i=Math.pow((1-i)/(1+i),s/2),a+=u=Math.PI/2-2*Math.atan(r*i)-a;return new M(a*e,t.x*e/n)}},je=(Object.freeze||Object)({LonLat:De,Mercator:Ne,SphericalMercator:di}),We=i({},_i,{code:"EPSG:3395",projection:Ne,transformation:function(){var t=.5/(Math.PI*Ne.R);return S(t,.5,-t,.5)}()}),He=i({},_i,{code:"EPSG:4326",projection:De,transformation:S(1/180,1,-1/180,.5)}),Fe=i({},ci,{projection:De,transformation:S(1,0,-1,0),scale:function(t){return Math.pow(2,t)},zoom:function(t){return Math.log(t)/Math.LN2},distance:function(t,i){var e=i.lng-t.lng,n=i.lat-t.lat;return Math.sqrt(e*e+n*n)},infinite:!0});ci.Earth=_i,ci.EPSG3395=We,ci.EPSG3857=vi,ci.EPSG900913=yi,ci.EPSG4326=He,ci.Simple=Fe;var Ue=ui.extend({options:{pane:"overlayPane",attribution:null,bubblingMouseEvents:!0},addTo:function(t){return t.addLayer(this),this},remove:function(){return this.removeFrom(this._map||this._mapToAdd)},removeFrom:function(t){return t&&t.removeLayer(this),this},getPane:function(t){return this._map.getPane(t?this.options[t]||t:this.options.pane)},addInteractiveTarget:function(t){return this._map._targets[n(t)]=this,this},removeInteractiveTarget:function(t){return delete this._map._targets[n(t)],this},getAttribution:function(){return this.options.attribution},_layerAdd:function(t){var i=t.target;if(i.hasLayer(this)){if(this._map=i,this._zoomAnimated=i._zoomAnimated,this.getEvents){var e=this.getEvents();i.on(e,this),this.once("remove",function(){i.off(e,this)},this)}this.onAdd(i),this.getAttribution&&i.attributionControl&&i.attributionControl.addAttribution(this.getAttribution()),this.fire("add"),i.fire("layeradd",{layer:this})}}});Le.include({addLayer:function(t){if(!t._layerAdd)throw new Error("The provided object is not a Layer.");var i=n(t);return this._layers[i]?this:(this._layers[i]=t,t._mapToAdd=this,t.beforeAdd&&t.beforeAdd(this),this.whenReady(t._layerAdd,t),this)},removeLayer:function(t){var i=n(t);return this._layers[i]?(this._loaded&&t.onRemove(this),t.getAttribution&&this.attributionControl&&this.attributionControl.removeAttribution(t.getAttribution()),delete this._layers[i],this._loaded&&(this.fire("layerremove",{layer:t}),t.fire("remove")),t._map=t._mapToAdd=null,this):this},hasLayer:function(t){return!!t&&n(t)in this._layers},eachLayer:function(t,i){for(var e in this._layers)t.call(i,this._layers[e]);return this},_addLayers:function(t){for(var i=0,e=(t=t?ei(t)?t:[t]:[]).length;ithis._layersMaxZoom&&this.setZoom(this._layersMaxZoom),void 0===this.options.minZoom&&this._layersMinZoom&&this.getZoom()i)return r=(n-i)/e,this._map.layerPointToLatLng([s.x-r*(s.x-o.x),s.y-r*(s.y-o.y)])},getBounds:function(){return this._bounds},addLatLng:function(t,i){return i=i||this._defaultShape(),t=C(t),i.push(t),this._bounds.extend(t),this.redraw()},_setLatLngs:function(t){this._bounds=new T,this._latlngs=this._convertLatLngs(t)},_defaultShape:function(){return Dt(this._latlngs)?this._latlngs:this._latlngs[0]},_convertLatLngs:function(t){for(var i=[],e=Dt(t),n=0,o=t.length;n=2&&i[0]instanceof M&&i[0].equals(i[e-1])&&i.pop(),i},_setLatLngs:function(t){tn.prototype._setLatLngs.call(this,t),Dt(this._latlngs)&&(this._latlngs=[this._latlngs])},_defaultShape:function(){return Dt(this._latlngs[0])?this._latlngs[0]:this._latlngs[0][0]},_clipPoints:function(){var t=this._renderer._bounds,i=this.options.weight,e=new x(i,i);if(t=new P(t.min.subtract(e),t.max.add(e)),this._parts=[],this._pxBounds&&this._pxBounds.intersects(t))if(this.options.noClip)this._parts=this._rings;else for(var n,o=0,s=this._rings.length;ot.y!=n.y>t.y&&t.x<(n.x-e.x)*(t.y-e.y)/(n.y-e.y)+e.x&&(u=!u);return u||tn.prototype._containsPoint.call(this,t,!0)}}),nn=qe.extend({initialize:function(t,i){l(this,i),this._layers={},t&&this.addData(t)},addData:function(t){var i,e,n,o=ei(t)?t:t.features;if(o){for(i=0,e=o.length;i0?o:[i.src]}else{ei(this._url)||(this._url=[this._url]),i.autoplay=!!this.options.autoplay,i.loop=!!this.options.loop;for(var a=0;ao?(i.height=o+"px",pt(t,"leaflet-popup-scrolled")):mt(t,"leaflet-popup-scrolled"),this._containerWidth=this._container.offsetWidth},_animateZoom:function(t){var i=this._map._latLngToNewLayerPoint(this._latlng,t.zoom,t.center),e=this._getAnchor();Lt(this._container,i.add(e))},_adjustPan:function(){if(!(!this.options.autoPan||this._map._panAnim&&this._map._panAnim._inProgress)){var t=this._map,i=parseInt(at(this._container,"marginBottom"),10)||0,e=this._container.offsetHeight+i,n=this._containerWidth,o=new x(this._containerLeft,-e-this._containerBottom);o._add(Pt(this._container));var s=t.layerPointToContainerPoint(o),r=w(this.options.autoPanPadding),a=w(this.options.autoPanPaddingTopLeft||r),h=w(this.options.autoPanPaddingBottomRight||r),u=t.getSize(),l=0,c=0;s.x+n+h.x>u.x&&(l=s.x+n-u.x+h.x),s.x-l-a.x<0&&(l=s.x-a.x),s.y+e+h.y>u.y&&(c=s.y+e-u.y+h.y),s.y-c-a.y<0&&(c=s.y-a.y),(l||c)&&t.fire("autopanstart").panBy([l,c])}},_onCloseButtonClick:function(t){this._close(),Q(t)},_getAnchor:function(){return w(this._source&&this._source._getPopupAnchor?this._source._getPopupAnchor():[0,0])}});Le.mergeOptions({closePopupOnClick:!0}),Le.include({openPopup:function(t,i,e){return t instanceof un||(t=new un(e).setContent(t)),i&&t.setLatLng(i),this.hasLayer(t)?this:(this._popup&&this._popup.options.autoClose&&this.closePopup(),this._popup=t,this.addLayer(t))},closePopup:function(t){return t&&t!==this._popup||(t=this._popup,this._popup=null),t&&this.removeLayer(t),this}}),Ue.include({bindPopup:function(t,i){return t instanceof un?(l(t,i),this._popup=t,t._source=this):(this._popup&&!i||(this._popup=new un(i,this)),this._popup.setContent(t)),this._popupHandlersAdded||(this.on({click:this._openPopup,keypress:this._onKeyPress,remove:this.closePopup,move:this._movePopup}),this._popupHandlersAdded=!0),this},unbindPopup:function(){return this._popup&&(this.off({click:this._openPopup,keypress:this._onKeyPress,remove:this.closePopup,move:this._movePopup}),this._popupHandlersAdded=!1,this._popup=null),this},openPopup:function(t,i){if(t instanceof Ue||(i=t,t=this),t instanceof qe)for(var e in this._layers){t=this._layers[e];break}return i||(i=t.getCenter?t.getCenter():t.getLatLng()),this._popup&&this._map&&(this._popup._source=t,this._popup.update(),this._map.openPopup(this._popup,i)),this},closePopup:function(){return this._popup&&this._popup._close(),this},togglePopup:function(t){return this._popup&&(this._popup._map?this.closePopup():this.openPopup(t)),this},isPopupOpen:function(){return!!this._popup&&this._popup.isOpen()},setPopupContent:function(t){return this._popup&&this._popup.setContent(t),this},getPopup:function(){return this._popup},_openPopup:function(t){var i=t.layer||t.target;this._popup&&this._map&&(Q(t),i instanceof Je?this.openPopup(t.layer||t.target,t.latlng):this._map.hasLayer(this._popup)&&this._popup._source===i?this.closePopup():this.openPopup(i,t.latlng))},_movePopup:function(t){this._popup.setLatLng(t.latlng)},_onKeyPress:function(t){13===t.originalEvent.keyCode&&this._openPopup(t)}});var ln=hn.extend({options:{pane:"tooltipPane",offset:[0,0],direction:"auto",permanent:!1,sticky:!1,interactive:!1,opacity:.9},onAdd:function(t){hn.prototype.onAdd.call(this,t),this.setOpacity(this.options.opacity),t.fire("tooltipopen",{tooltip:this}),this._source&&this._source.fire("tooltipopen",{tooltip:this},!0)},onRemove:function(t){hn.prototype.onRemove.call(this,t),t.fire("tooltipclose",{tooltip:this}),this._source&&this._source.fire("tooltipclose",{tooltip:this},!0)},getEvents:function(){var t=hn.prototype.getEvents.call(this);return Vi&&!this.options.permanent&&(t.preclick=this._close),t},_close:function(){this._map&&this._map.closeTooltip(this)},_initLayout:function(){var t="leaflet-tooltip "+(this.options.className||"")+" leaflet-zoom-"+(this._zoomAnimated?"animated":"hide");this._contentNode=this._container=ht("div",t)},_updateLayout:function(){},_adjustPan:function(){},_setPosition:function(t){var i=this._map,e=this._container,n=i.latLngToContainerPoint(i.getCenter()),o=i.layerPointToContainerPoint(t),s=this.options.direction,r=e.offsetWidth,a=e.offsetHeight,h=w(this.options.offset),u=this._getAnchor();"top"===s?t=t.add(w(-r/2+h.x,-a+h.y+u.y,!0)):"bottom"===s?t=t.subtract(w(r/2-h.x,-h.y,!0)):"center"===s?t=t.subtract(w(r/2+h.x,a/2-u.y+h.y,!0)):"right"===s||"auto"===s&&o.xthis.options.maxZoom||en&&this._retainParent(o,s,r,n))},_retainChildren:function(t,i,e,n){for(var o=2*t;o<2*t+2;o++)for(var s=2*i;s<2*i+2;s++){var r=new x(o,s);r.z=e+1;var a=this._tileCoordsToKey(r),h=this._tiles[a];h&&h.active?h.retain=!0:(h&&h.loaded&&(h.retain=!0),e+1this.options.maxZoom||void 0!==this.options.minZoom&&o1)this._setView(t,e);else{for(var c=o.min.y;c<=o.max.y;c++)for(var _=o.min.x;_<=o.max.x;_++){var d=new x(_,c);if(d.z=this._tileZoom,this._isValidTile(d)){var p=this._tiles[this._tileCoordsToKey(d)];p?p.current=!0:r.push(d)}}if(r.sort(function(t,i){return t.distanceTo(s)-i.distanceTo(s)}),0!==r.length){this._loading||(this._loading=!0,this.fire("loading"));var m=document.createDocumentFragment();for(_=0;_e.max.x)||!i.wrapLat&&(t.ye.max.y))return!1}if(!this.options.bounds)return!0;var n=this._tileCoordsToBounds(t);return z(this.options.bounds).overlaps(n)},_keyToBounds:function(t){return this._tileCoordsToBounds(this._keyToTileCoords(t))},_tileCoordsToNwSe:function(t){var i=this._map,e=this.getTileSize(),n=t.scaleBy(e),o=n.add(e);return[i.unproject(n,t.z),i.unproject(o,t.z)]},_tileCoordsToBounds:function(t){var i=this._tileCoordsToNwSe(t),e=new T(i[0],i[1]);return this.options.noWrap||(e=this._map.wrapLatLngBounds(e)),e},_tileCoordsToKey:function(t){return t.x+":"+t.y+":"+t.z},_keyToTileCoords:function(t){var i=t.split(":"),e=new x(+i[0],+i[1]);return e.z=+i[2],e},_removeTile:function(t){var i=this._tiles[t];i&&(Ci||i.el.setAttribute("src",ni),ut(i.el),delete this._tiles[t],this.fire("tileunload",{tile:i.el,coords:this._keyToTileCoords(t)}))},_initTile:function(t){pt(t,"leaflet-tile");var i=this.getTileSize();t.style.width=i.x+"px",t.style.height=i.y+"px",t.onselectstart=r,t.onmousemove=r,Li&&this.options.opacity<1&&vt(t,this.options.opacity),Ti&&!zi&&(t.style.WebkitBackfaceVisibility="hidden")},_addTile:function(t,i){var n=this._getTilePos(t),o=this._tileCoordsToKey(t),s=this.createTile(this._wrapCoords(t),e(this._tileReady,this,t));this._initTile(s),this.createTile.length<2&&f(e(this._tileReady,this,t,null,s)),Lt(s,n),this._tiles[o]={el:s,coords:t,current:!0},i.appendChild(s),this.fire("tileloadstart",{tile:s,coords:t})},_tileReady:function(t,i,n){if(this._map){i&&this.fire("tileerror",{error:i,tile:n,coords:t});var o=this._tileCoordsToKey(t);(n=this._tiles[o])&&(n.loaded=+new Date,this._map._fadeAnimated?(vt(n.el,0),g(this._fadeFrame),this._fadeFrame=f(this._updateOpacity,this)):(n.active=!0,this._pruneTiles()),i||(pt(n.el,"leaflet-tile-loaded"),this.fire("tileload",{tile:n.el,coords:t})),this._noTilesToLoad()&&(this._loading=!1,this.fire("load"),Li||!this._map._fadeAnimated?f(this._pruneTiles,this):setTimeout(e(this._pruneTiles,this),250)))}},_getTilePos:function(t){return t.scaleBy(this.getTileSize()).subtract(this._level.origin)},_wrapCoords:function(t){var i=new x(this._wrapX?s(t.x,this._wrapX):t.x,this._wrapY?s(t.y,this._wrapY):t.y);return i.z=t.z,i},_pxBoundsToTileRange:function(t){var i=this.getTileSize();return new P(t.min.unscaleBy(i).floor(),t.max.unscaleBy(i).ceil().subtract([1,1]))},_noTilesToLoad:function(){for(var t in this._tiles)if(!this._tiles[t].loaded)return!1;return!0}}),dn=_n.extend({options:{minZoom:0,maxZoom:18,subdomains:"abc",errorTileUrl:"",zoomOffset:0,tms:!1,zoomReverse:!1,detectRetina:!1,crossOrigin:!1},initialize:function(t,i){this._url=t,(i=l(this,i)).detectRetina&&Ki&&i.maxZoom>0&&(i.tileSize=Math.floor(i.tileSize/2),i.zoomReverse?(i.zoomOffset--,i.minZoom++):(i.zoomOffset++,i.maxZoom--),i.minZoom=Math.max(0,i.minZoom)),"string"==typeof i.subdomains&&(i.subdomains=i.subdomains.split("")),Ti||this.on("tileunload",this._onTileRemove)},setUrl:function(t,i){return this._url=t,i||this.redraw(),this},createTile:function(t,i){var n=document.createElement("img");return V(n,"load",e(this._tileOnLoad,this,i,n)),V(n,"error",e(this._tileOnError,this,i,n)),this.options.crossOrigin&&(n.crossOrigin=""),n.alt="",n.setAttribute("role","presentation"),n.src=this.getTileUrl(t),n},getTileUrl:function(t){var e={r:Ki?"@2x":"",s:this._getSubdomain(t),x:t.x,y:t.y,z:this._getZoomForUrl()};if(this._map&&!this._map.options.crs.infinite){var n=this._globalTileRange.max.y-t.y;this.options.tms&&(e.y=n),e["-y"]=n}return _(this._url,i(e,this.options))},_tileOnLoad:function(t,i){Li?setTimeout(e(t,this,null,i),0):t(null,i)},_tileOnError:function(t,i,e){var n=this.options.errorTileUrl;n&&i.getAttribute("src")!==n&&(i.src=n),t(e,i)},_onTileRemove:function(t){t.tile.onload=null},_getZoomForUrl:function(){var t=this._tileZoom,i=this.options.maxZoom,e=this.options.zoomReverse,n=this.options.zoomOffset;return e&&(t=i-t),t+n},_getSubdomain:function(t){var i=Math.abs(t.x+t.y)%this.options.subdomains.length;return this.options.subdomains[i]},_abortLoading:function(){var t,i;for(t in this._tiles)this._tiles[t].coords.z!==this._tileZoom&&((i=this._tiles[t].el).onload=r,i.onerror=r,i.complete||(i.src=ni,ut(i),delete this._tiles[t]))}}),pn=dn.extend({defaultWmsParams:{service:"WMS",request:"GetMap",layers:"",styles:"",format:"image/jpeg",transparent:!1,version:"1.1.1"},options:{crs:null,uppercase:!1},initialize:function(t,e){this._url=t;var n=i({},this.defaultWmsParams);for(var o in e)o in this.options||(n[o]=e[o]);var s=(e=l(this,e)).detectRetina&&Ki?2:1,r=this.getTileSize();n.width=r.x*s,n.height=r.y*s,this.wmsParams=n},onAdd:function(t){this._crs=this.options.crs||t.options.crs,this._wmsVersion=parseFloat(this.wmsParams.version);var i=this._wmsVersion>=1.3?"crs":"srs";this.wmsParams[i]=this._crs.code,dn.prototype.onAdd.call(this,t)},getTileUrl:function(t){var i=this._tileCoordsToNwSe(t),e=this._crs,n=b(e.project(i[0]),e.project(i[1])),o=n.min,s=n.max,r=(this._wmsVersion>=1.3&&this._crs===He?[o.y,o.x,s.y,s.x]:[o.x,o.y,s.x,s.y]).join(","),a=L.TileLayer.prototype.getTileUrl.call(this,t);return a+c(this.wmsParams,a,this.options.uppercase)+(this.options.uppercase?"&BBOX=":"&bbox=")+r},setParams:function(t,e){return i(this.wmsParams,t),e||this.redraw(),this}});dn.WMS=pn,Yt.wms=function(t,i){return new pn(t,i)};var mn=Ue.extend({options:{padding:.1,tolerance:0},initialize:function(t){l(this,t),n(this),this._layers=this._layers||{}},onAdd:function(){this._container||(this._initContainer(),this._zoomAnimated&&pt(this._container,"leaflet-zoom-animated")),this.getPane().appendChild(this._container),this._update(),this.on("update",this._updatePaths,this)},onRemove:function(){this.off("update",this._updatePaths,this),this._destroyContainer()},getEvents:function(){var t={viewreset:this._reset,zoom:this._onZoom,moveend:this._update,zoomend:this._onZoomEnd};return this._zoomAnimated&&(t.zoomanim=this._onAnimZoom),t},_onAnimZoom:function(t){this._updateTransform(t.center,t.zoom)},_onZoom:function(){this._updateTransform(this._map.getCenter(),this._map.getZoom())},_updateTransform:function(t,i){var e=this._map.getZoomScale(i,this._zoom),n=Pt(this._container),o=this._map.getSize().multiplyBy(.5+this.options.padding),s=this._map.project(this._center,i),r=this._map.project(t,i).subtract(s),a=o.multiplyBy(-e).add(n).add(o).subtract(r);Ni?wt(this._container,a,e):Lt(this._container,a)},_reset:function(){this._update(),this._updateTransform(this._center,this._zoom);for(var t in this._layers)this._layers[t]._reset()},_onZoomEnd:function(){for(var t in this._layers)this._layers[t]._project()},_updatePaths:function(){for(var t in this._layers)this._layers[t]._update()},_update:function(){var t=this.options.padding,i=this._map.getSize(),e=this._map.containerPointToLayerPoint(i.multiplyBy(-t)).round();this._bounds=new P(e,e.add(i.multiplyBy(1+2*t)).round()),this._center=this._map.getCenter(),this._zoom=this._map.getZoom()}}),fn=mn.extend({getEvents:function(){var t=mn.prototype.getEvents.call(this);return t.viewprereset=this._onViewPreReset,t},_onViewPreReset:function(){this._postponeUpdatePaths=!0},onAdd:function(){mn.prototype.onAdd.call(this),this._draw()},_initContainer:function(){var t=this._container=document.createElement("canvas");V(t,"mousemove",o(this._onMouseMove,32,this),this),V(t,"click dblclick mousedown mouseup contextmenu",this._onClick,this),V(t,"mouseout",this._handleMouseOut,this),this._ctx=t.getContext("2d")},_destroyContainer:function(){delete this._ctx,ut(this._container),q(this._container),delete this._container},_updatePaths:function(){if(!this._postponeUpdatePaths){this._redrawBounds=null;for(var t in this._layers)this._layers[t]._update();this._redraw()}},_update:function(){if(!this._map._animatingZoom||!this._bounds){this._drawnLayers={},mn.prototype._update.call(this);var t=this._bounds,i=this._container,e=t.getSize(),n=Ki?2:1;Lt(i,t.min),i.width=n*e.x,i.height=n*e.y,i.style.width=e.x+"px",i.style.height=e.y+"px",Ki&&this._ctx.scale(2,2),this._ctx.translate(-t.min.x,-t.min.y),this.fire("update")}},_reset:function(){mn.prototype._reset.call(this),this._postponeUpdatePaths&&(this._postponeUpdatePaths=!1,this._updatePaths())},_initPath:function(t){this._updateDashArray(t),this._layers[n(t)]=t;var i=t._order={layer:t,prev:this._drawLast,next:null};this._drawLast&&(this._drawLast.next=i),this._drawLast=i,this._drawFirst=this._drawFirst||this._drawLast},_addPath:function(t){this._requestRedraw(t)},_removePath:function(t){var i=t._order,e=i.next,n=i.prev;e?e.prev=n:this._drawLast=n,n?n.next=e:this._drawFirst=e,delete t._order,delete this._layers[L.stamp(t)],this._requestRedraw(t)},_updatePath:function(t){this._extendRedrawBounds(t),t._project(),t._update(),this._requestRedraw(t)},_updateStyle:function(t){this._updateDashArray(t),this._requestRedraw(t)},_updateDashArray:function(t){if(t.options.dashArray){var i,e=t.options.dashArray.split(","),n=[];for(i=0;i')}}catch(t){return function(t){return document.createElement("<"+t+' xmlns="urn:schemas-microsoft.com:vml" class="lvml">')}}}(),vn={_initContainer:function(){this._container=ht("div","leaflet-vml-container")},_update:function(){this._map._animatingZoom||(mn.prototype._update.call(this),this.fire("update"))},_initPath:function(t){var i=t._container=gn("shape");pt(i,"leaflet-vml-shape "+(this.options.className||"")),i.coordsize="1 1",t._path=gn("path"),i.appendChild(t._path),this._updateStyle(t),this._layers[n(t)]=t},_addPath:function(t){var i=t._container;this._container.appendChild(i),t.options.interactive&&t.addInteractiveTarget(i)},_removePath:function(t){var i=t._container;ut(i),t.removeInteractiveTarget(i),delete this._layers[n(t)]},_updateStyle:function(t){var i=t._stroke,e=t._fill,n=t.options,o=t._container;o.stroked=!!n.stroke,o.filled=!!n.fill,n.stroke?(i||(i=t._stroke=gn("stroke")),o.appendChild(i),i.weight=n.weight+"px",i.color=n.color,i.opacity=n.opacity,n.dashArray?i.dashStyle=ei(n.dashArray)?n.dashArray.join(" "):n.dashArray.replace(/( *, *)/g," "):i.dashStyle="",i.endcap=n.lineCap.replace("butt","flat"),i.joinstyle=n.lineJoin):i&&(o.removeChild(i),t._stroke=null),n.fill?(e||(e=t._fill=gn("fill")),o.appendChild(e),e.color=n.fillColor||n.color,e.opacity=n.fillOpacity):e&&(o.removeChild(e),t._fill=null)},_updateCircle:function(t){var i=t._point.round(),e=Math.round(t._radius),n=Math.round(t._radiusY||e);this._setPath(t,t._empty()?"M0 0":"AL "+i.x+","+i.y+" "+e+","+n+" 0,23592600")},_setPath:function(t,i){t._path.v=i},_bringToFront:function(t){ct(t._container)},_bringToBack:function(t){_t(t._container)}},yn=Ji?gn:E,xn=mn.extend({getEvents:function(){var t=mn.prototype.getEvents.call(this);return t.zoomstart=this._onZoomStart,t},_initContainer:function(){this._container=yn("svg"),this._container.setAttribute("pointer-events","none"),this._rootGroup=yn("g"),this._container.appendChild(this._rootGroup)},_destroyContainer:function(){ut(this._container),q(this._container),delete this._container,delete this._rootGroup,delete this._svgSize},_onZoomStart:function(){this._update()},_update:function(){if(!this._map._animatingZoom||!this._bounds){mn.prototype._update.call(this);var t=this._bounds,i=t.getSize(),e=this._container;this._svgSize&&this._svgSize.equals(i)||(this._svgSize=i,e.setAttribute("width",i.x),e.setAttribute("height",i.y)),Lt(e,t.min),e.setAttribute("viewBox",[t.min.x,t.min.y,i.x,i.y].join(" ")),this.fire("update")}},_initPath:function(t){var i=t._path=yn("path");t.options.className&&pt(i,t.options.className),t.options.interactive&&pt(i,"leaflet-interactive"),this._updateStyle(t),this._layers[n(t)]=t},_addPath:function(t){this._rootGroup||this._initContainer(),this._rootGroup.appendChild(t._path),t.addInteractiveTarget(t._path)},_removePath:function(t){ut(t._path),t.removeInteractiveTarget(t._path),delete this._layers[n(t)]},_updatePath:function(t){t._project(),t._update()},_updateStyle:function(t){var i=t._path,e=t.options;i&&(e.stroke?(i.setAttribute("stroke",e.color),i.setAttribute("stroke-opacity",e.opacity),i.setAttribute("stroke-width",e.weight),i.setAttribute("stroke-linecap",e.lineCap),i.setAttribute("stroke-linejoin",e.lineJoin),e.dashArray?i.setAttribute("stroke-dasharray",e.dashArray):i.removeAttribute("stroke-dasharray"),e.dashOffset?i.setAttribute("stroke-dashoffset",e.dashOffset):i.removeAttribute("stroke-dashoffset")):i.setAttribute("stroke","none"),e.fill?(i.setAttribute("fill",e.fillColor||e.color),i.setAttribute("fill-opacity",e.fillOpacity),i.setAttribute("fill-rule",e.fillRule||"evenodd")):i.setAttribute("fill","none"))},_updatePoly:function(t,i){this._setPath(t,k(t._parts,i))},_updateCircle:function(t){var i=t._point,e=Math.max(Math.round(t._radius),1),n="a"+e+","+(Math.max(Math.round(t._radiusY),1)||e)+" 0 1,0 ",o=t._empty()?"M0 0":"M"+(i.x-e)+","+i.y+n+2*e+",0 "+n+2*-e+",0 ";this._setPath(t,o)},_setPath:function(t,i){t._path.setAttribute("d",i)},_bringToFront:function(t){ct(t._path)},_bringToBack:function(t){_t(t._path)}});Ji&&xn.include(vn),Le.include({getRenderer:function(t){var i=t.options.renderer||this._getPaneRenderer(t.options.pane)||this.options.renderer||this._renderer;return i||(i=this._renderer=this.options.preferCanvas&&Xt()||Jt()),this.hasLayer(i)||this.addLayer(i),i},_getPaneRenderer:function(t){if("overlayPane"===t||void 0===t)return!1;var i=this._paneRenderers[t];return void 0===i&&(i=xn&&Jt({pane:t})||fn&&Xt({pane:t}),this._paneRenderers[t]=i),i}});var wn=en.extend({initialize:function(t,i){en.prototype.initialize.call(this,this._boundsToLatLngs(t),i)},setBounds:function(t){return this.setLatLngs(this._boundsToLatLngs(t))},_boundsToLatLngs:function(t){return t=z(t),[t.getSouthWest(),t.getNorthWest(),t.getNorthEast(),t.getSouthEast()]}});xn.create=yn,xn.pointsToPath=k,nn.geometryToLayer=Wt,nn.coordsToLatLng=Ht,nn.coordsToLatLngs=Ft,nn.latLngToCoords=Ut,nn.latLngsToCoords=Vt,nn.getFeature=qt,nn.asFeature=Gt,Le.mergeOptions({boxZoom:!0});var Ln=Ze.extend({initialize:function(t){this._map=t,this._container=t._container,this._pane=t._panes.overlayPane,this._resetStateTimeout=0,t.on("unload",this._destroy,this)},addHooks:function(){V(this._container,"mousedown",this._onMouseDown,this)},removeHooks:function(){q(this._container,"mousedown",this._onMouseDown,this)},moved:function(){return this._moved},_destroy:function(){ut(this._pane),delete this._pane},_resetState:function(){this._resetStateTimeout=0,this._moved=!1},_clearDeferredResetState:function(){0!==this._resetStateTimeout&&(clearTimeout(this._resetStateTimeout),this._resetStateTimeout=0)},_onMouseDown:function(t){if(!t.shiftKey||1!==t.which&&1!==t.button)return!1;this._clearDeferredResetState(),this._resetState(),mi(),bt(),this._startPoint=this._map.mouseEventToContainerPoint(t),V(document,{contextmenu:Q,mousemove:this._onMouseMove,mouseup:this._onMouseUp,keydown:this._onKeyDown},this)},_onMouseMove:function(t){this._moved||(this._moved=!0,this._box=ht("div","leaflet-zoom-box",this._container),pt(this._container,"leaflet-crosshair"),this._map.fire("boxzoomstart")),this._point=this._map.mouseEventToContainerPoint(t);var i=new P(this._point,this._startPoint),e=i.getSize();Lt(this._box,i.min),this._box.style.width=e.x+"px",this._box.style.height=e.y+"px"},_finish:function(){this._moved&&(ut(this._box),mt(this._container,"leaflet-crosshair")),fi(),Tt(),q(document,{contextmenu:Q,mousemove:this._onMouseMove,mouseup:this._onMouseUp,keydown:this._onKeyDown},this)},_onMouseUp:function(t){if((1===t.which||1===t.button)&&(this._finish(),this._moved)){this._clearDeferredResetState(),this._resetStateTimeout=setTimeout(e(this._resetState,this),0);var i=new T(this._map.containerPointToLatLng(this._startPoint),this._map.containerPointToLatLng(this._point));this._map.fitBounds(i).fire("boxzoomend",{boxZoomBounds:i})}},_onKeyDown:function(t){27===t.keyCode&&this._finish()}});Le.addInitHook("addHandler","boxZoom",Ln),Le.mergeOptions({doubleClickZoom:!0});var Pn=Ze.extend({addHooks:function(){this._map.on("dblclick",this._onDoubleClick,this)},removeHooks:function(){this._map.off("dblclick",this._onDoubleClick,this)},_onDoubleClick:function(t){var i=this._map,e=i.getZoom(),n=i.options.zoomDelta,o=t.originalEvent.shiftKey?e-n:e+n;"center"===i.options.doubleClickZoom?i.setZoom(o):i.setZoomAround(t.containerPoint,o)}});Le.addInitHook("addHandler","doubleClickZoom",Pn),Le.mergeOptions({dragging:!0,inertia:!zi,inertiaDeceleration:3400,inertiaMaxSpeed:1/0,easeLinearity:.2,worldCopyJump:!1,maxBoundsViscosity:0});var bn=Ze.extend({addHooks:function(){if(!this._draggable){var t=this._map;this._draggable=new Be(t._mapPane,t._container),this._draggable.on({dragstart:this._onDragStart,drag:this._onDrag,dragend:this._onDragEnd},this),this._draggable.on("predrag",this._onPreDragLimit,this),t.options.worldCopyJump&&(this._draggable.on("predrag",this._onPreDragWrap,this),t.on("zoomend",this._onZoomEnd,this),t.whenReady(this._onZoomEnd,this))}pt(this._map._container,"leaflet-grab leaflet-touch-drag"),this._draggable.enable(),this._positions=[],this._times=[]},removeHooks:function(){mt(this._map._container,"leaflet-grab"),mt(this._map._container,"leaflet-touch-drag"),this._draggable.disable()},moved:function(){return this._draggable&&this._draggable._moved},moving:function(){return this._draggable&&this._draggable._moving},_onDragStart:function(){var t=this._map;if(t._stop(),this._map.options.maxBounds&&this._map.options.maxBoundsViscosity){var i=z(this._map.options.maxBounds);this._offsetLimit=b(this._map.latLngToContainerPoint(i.getNorthWest()).multiplyBy(-1),this._map.latLngToContainerPoint(i.getSouthEast()).multiplyBy(-1).add(this._map.getSize())),this._viscosity=Math.min(1,Math.max(0,this._map.options.maxBoundsViscosity))}else this._offsetLimit=null;t.fire("movestart").fire("dragstart"),t.options.inertia&&(this._positions=[],this._times=[])},_onDrag:function(t){if(this._map.options.inertia){var i=this._lastTime=+new Date,e=this._lastPos=this._draggable._absPos||this._draggable._newPos;this._positions.push(e),this._times.push(i),this._prunePositions(i)}this._map.fire("move",t).fire("drag",t)},_prunePositions:function(t){for(;this._positions.length>1&&t-this._times[0]>50;)this._positions.shift(),this._times.shift()},_onZoomEnd:function(){var t=this._map.getSize().divideBy(2),i=this._map.latLngToLayerPoint([0,0]);this._initialWorldOffset=i.subtract(t).x,this._worldWidth=this._map.getPixelWorldBounds().getSize().x},_viscousLimit:function(t,i){return t-(t-i)*this._viscosity},_onPreDragLimit:function(){if(this._viscosity&&this._offsetLimit){var t=this._draggable._newPos.subtract(this._draggable._startPos),i=this._offsetLimit;t.xi.max.x&&(t.x=this._viscousLimit(t.x,i.max.x)),t.y>i.max.y&&(t.y=this._viscousLimit(t.y,i.max.y)),this._draggable._newPos=this._draggable._startPos.add(t)}},_onPreDragWrap:function(){var t=this._worldWidth,i=Math.round(t/2),e=this._initialWorldOffset,n=this._draggable._newPos.x,o=(n-i+e)%t+i-e,s=(n+i+e)%t-i-e,r=Math.abs(o+e)0?s:-s))-i;this._delta=0,this._startTime=null,r&&("center"===t.options.scrollWheelZoom?t.setZoom(i+r):t.setZoomAround(this._lastMousePos,i+r))}});Le.addInitHook("addHandler","scrollWheelZoom",zn),Le.mergeOptions({tap:!0,tapTolerance:15});var Mn=Ze.extend({addHooks:function(){V(this._map._container,"touchstart",this._onDown,this)},removeHooks:function(){q(this._map._container,"touchstart",this._onDown,this)},_onDown:function(t){if(t.touches){if($(t),this._fireClick=!0,t.touches.length>1)return this._fireClick=!1,void clearTimeout(this._holdTimeout);var i=t.touches[0],n=i.target;this._startPos=this._newPos=new x(i.clientX,i.clientY),n.tagName&&"a"===n.tagName.toLowerCase()&&pt(n,"leaflet-active"),this._holdTimeout=setTimeout(e(function(){this._isTapValid()&&(this._fireClick=!1,this._onUp(),this._simulateEvent("contextmenu",i))},this),1e3),this._simulateEvent("mousedown",i),V(document,{touchmove:this._onMove,touchend:this._onUp},this)}},_onUp:function(t){if(clearTimeout(this._holdTimeout),q(document,{touchmove:this._onMove,touchend:this._onUp},this),this._fireClick&&t&&t.changedTouches){var i=t.changedTouches[0],e=i.target;e&&e.tagName&&"a"===e.tagName.toLowerCase()&&mt(e,"leaflet-active"),this._simulateEvent("mouseup",i),this._isTapValid()&&this._simulateEvent("click",i)}},_isTapValid:function(){return this._newPos.distanceTo(this._startPos)<=this._map.options.tapTolerance},_onMove:function(t){var i=t.touches[0];this._newPos=new x(i.clientX,i.clientY),this._simulateEvent("mousemove",i)},_simulateEvent:function(t,i){var e=document.createEvent("MouseEvents");e._simulated=!0,i.target._simulatedClick=!0,e.initMouseEvent(t,!0,!0,window,1,i.screenX,i.screenY,i.clientX,i.clientY,!1,!1,!1,!1,0,null),i.target.dispatchEvent(e)}});Vi&&!Ui&&Le.addInitHook("addHandler","tap",Mn),Le.mergeOptions({touchZoom:Vi&&!zi,bounceAtZoomLimits:!0});var Cn=Ze.extend({addHooks:function(){pt(this._map._container,"leaflet-touch-zoom"),V(this._map._container,"touchstart",this._onTouchStart,this)},removeHooks:function(){mt(this._map._container,"leaflet-touch-zoom"),q(this._map._container,"touchstart",this._onTouchStart,this)},_onTouchStart:function(t){var i=this._map;if(t.touches&&2===t.touches.length&&!i._animatingZoom&&!this._zooming){var e=i.mouseEventToContainerPoint(t.touches[0]),n=i.mouseEventToContainerPoint(t.touches[1]);this._centerPoint=i.getSize()._divideBy(2),this._startLatLng=i.containerPointToLatLng(this._centerPoint),"center"!==i.options.touchZoom&&(this._pinchStartLatLng=i.containerPointToLatLng(e.add(n)._divideBy(2))),this._startDist=e.distanceTo(n),this._startZoom=i.getZoom(),this._moved=!1,this._zooming=!0,i._stop(),V(document,"touchmove",this._onTouchMove,this),V(document,"touchend",this._onTouchEnd,this),$(t)}},_onTouchMove:function(t){if(t.touches&&2===t.touches.length&&this._zooming){var i=this._map,n=i.mouseEventToContainerPoint(t.touches[0]),o=i.mouseEventToContainerPoint(t.touches[1]),s=n.distanceTo(o)/this._startDist;if(this._zoom=i.getScaleZoom(s,this._startZoom),!i.options.bounceAtZoomLimits&&(this._zoomi.getMaxZoom()&&s>1)&&(this._zoom=i._limitZoom(this._zoom)),"center"===i.options.touchZoom){if(this._center=this._startLatLng,1===s)return}else{var r=n._add(o)._divideBy(2)._subtract(this._centerPoint);if(1===s&&0===r.x&&0===r.y)return;this._center=i.unproject(i.project(this._pinchStartLatLng,this._zoom).subtract(r),this._zoom)}this._moved||(i._moveStart(!0,!1),this._moved=!0),g(this._animRequest);var a=e(i._move,i,this._center,this._zoom,{pinch:!0,round:!1});this._animRequest=f(a,this,!0),$(t)}},_onTouchEnd:function(){this._moved&&this._zooming?(this._zooming=!1,g(this._animRequest),q(document,"touchmove",this._onTouchMove),q(document,"touchend",this._onTouchEnd),this._map.options.zoomAnimation?this._map._animateZoom(this._center,this._map._limitZoom(this._zoom),!0,this._map.options.zoomSnap):this._map._resetView(this._center,this._map._limitZoom(this._zoom))):this._zooming=!1}});Le.addInitHook("addHandler","touchZoom",Cn),Le.BoxZoom=Ln,Le.DoubleClickZoom=Pn,Le.Drag=bn,Le.Keyboard=Tn,Le.ScrollWheelZoom=zn,Le.Tap=Mn,Le.TouchZoom=Cn;var Zn=window.L;window.L=t,Object.freeze=$t,t.version="1.3.1",t.noConflict=function(){return window.L=Zn,this},t.Control=Pe,t.control=be,t.Browser=$i,t.Evented=ui,t.Mixin=Ee,t.Util=ai,t.Class=v,t.Handler=Ze,t.extend=i,t.bind=e,t.stamp=n,t.setOptions=l,t.DomEvent=de,t.DomUtil=xe,t.PosAnimation=we,t.Draggable=Be,t.LineUtil=Oe,t.PolyUtil=Re,t.Point=x,t.point=w,t.Bounds=P,t.bounds=b,t.Transformation=Z,t.transformation=S,t.Projection=je,t.LatLng=M,t.latLng=C,t.LatLngBounds=T,t.latLngBounds=z,t.CRS=ci,t.GeoJSON=nn,t.geoJSON=Kt,t.geoJson=sn,t.Layer=Ue,t.LayerGroup=Ve,t.layerGroup=function(t,i){return new Ve(t,i)},t.FeatureGroup=qe,t.featureGroup=function(t){return new qe(t)},t.ImageOverlay=rn,t.imageOverlay=function(t,i,e){return new rn(t,i,e)},t.VideoOverlay=an,t.videoOverlay=function(t,i,e){return new an(t,i,e)},t.DivOverlay=hn,t.Popup=un,t.popup=function(t,i){return new un(t,i)},t.Tooltip=ln,t.tooltip=function(t,i){return new ln(t,i)},t.Icon=Ge,t.icon=function(t){return new Ge(t)},t.DivIcon=cn,t.divIcon=function(t){return new cn(t)},t.Marker=Xe,t.marker=function(t,i){return new Xe(t,i)},t.TileLayer=dn,t.tileLayer=Yt,t.GridLayer=_n,t.gridLayer=function(t){return new _n(t)},t.SVG=xn,t.svg=Jt,t.Renderer=mn,t.Canvas=fn,t.canvas=Xt,t.Path=Je,t.CircleMarker=$e,t.circleMarker=function(t,i){return new $e(t,i)},t.Circle=Qe,t.circle=function(t,i,e){return new Qe(t,i,e)},t.Polyline=tn,t.polyline=function(t,i){return new tn(t,i)},t.Polygon=en,t.polygon=function(t,i){return new en(t,i)},t.Rectangle=wn,t.rectangle=function(t,i){return new wn(t,i)},t.Map=Le,t.map=function(t,i){return new Le(t,i)}}); +} +exports.L = L; diff --git a/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/lib/leaflet.js.meta b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/lib/leaflet.js.meta new file mode 100644 index 0000000..b1b9b5a --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/lib/leaflet.js.meta @@ -0,0 +1,3 @@ +module-type: library +title: $:/plugins/sycom/leaflet/lib/leaflet.js +type: application/javascript \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/lib/tileLayers.json b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/lib/tileLayers.json new file mode 100644 index 0000000..3809565 --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/lib/tileLayers.json @@ -0,0 +1,82 @@ +[ + { + "id": "osmfr", + "nom": "OSM France", + "url": "http://{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png", + "attrib": "fond par OSM, licence CC BY SA. Données ©Contributeurs OSM, licence ODbL.", + "zMin": 1, + "zMax": 20 + }, + { + "id": "osm", + "nom": "OpenStreetMap", + "url": "http://{s}.tile.osm.org/{z}/{x}/{y}.png", + "attrib": "Map tiles by ©OSM, licence CC BY SA. Data by ©OSM contributors, licence ODbL.", + "zMin": 1, + "zMax": 20 + }, + { + "id": "osmbw", + "nom": "OSM N&B", + "url": "http://www.toolserver.org/tiles/bw-mapnik/{z}/{x}/{y}.png", + "attrib": "Tiles hosted by wikimedia labs. Data by ©OSM contributors, licence ODbL.", + "zMin": 1, + "zMax": 20 + }, + { + "id": "sat", + "nom": "Satellite Esri", + "url": "http://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}", + "attrib": "©Map tiles by Esri — Source: Esri, i-cubed, USDA, USGS, AEX, GeoEye, Getmapping, Aerogrid, IGN, IGP, UPR-EGP, and the GIS User Community", + "zMin": 1, + "zMax": 20 + }, + { + "id": "natgeo", + "nom": "National Geog.", + "url": "http://server.arcgisonline.com/ArcGIS/rest/services/NatGeo_World_Map/MapServer/tile/{z}/{y}/{x}", + "attrib": "©Map tiles by Esri — National Geographic, Esri, DeLorme, NAVTEQ, UNEP-WCMC, USGS, NASA, ESA, METI, NRCAN, GEBCO, NOAA, iPC", + "zMin": 1, + "zMax": 12 + }, + { + "id": "toner", + "nom": "Black Ink", + "url": "http://{s}.tile.stamen.com/toner/{z}/{x}/{y}.png", + "attrib": "Map tiles by Stamen Design, licence CC BY 3.0. Data by ©OSM contributors, licence ODbL.", + "zMin": 1, + "zMax": 20 + }, + { + "id": "water", + "nom": "Water painting", + "url": "http://{s}.tile.stamen.com/watercolor/{z}/{x}/{y}.png", + "attrib": "Map tiles by Stamen Design, licence CC BY 3.0. Data by ©OSM contributors, licence ODbL.", + "zMin": 1, + "zMax": 20 + }, + { + "id": "thunder", + "nom": "Thunderforest", + "url": "http://{s}.tile.thunderforest.com/landscape/{z}/{x}/{y}.png", + "attrib": "Map tiles by Thunderforest. Data by ©OSM contributors, licence ODbL.", + "zMin": 1, + "zMax": 20 + }, + { + "id": "dark", + "nom": "Dark Matter", + "url": "http://{s}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}.png", + "attrib": "©Map tiles by CartoDB, under CC BY 3.0. Data by ©OSM contributors, licence ODbL.", + "zMin": 1, + "zMax": 20 + }, + { + "id": "positron", + "nom": "Positron", + "url": "http://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png", + "attrib": "©Map tiles by CartoDB, under CC BY 3.0. Data by ©OSM contributors, licence ODbL.", + "zMin": 1, + "zMax": 20 + } +] diff --git a/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/lib/tileLayers.json.meta b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/lib/tileLayers.json.meta new file mode 100644 index 0000000..d030402 --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/lib/tileLayers.json.meta @@ -0,0 +1,2 @@ +title: $:/plugins/sycom/leaflet/lib/tileLayers.json +type: application/json \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/mapCssTweaks.css.tid b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/mapCssTweaks.css.tid new file mode 100644 index 0000000..fb24dec --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/mapCssTweaks.css.tid @@ -0,0 +1,50 @@ +created: 20161028202401905 +modified: 20161111151011600 +tags: $:/tags/Stylesheet +title: $:/plugins/sycom/leaflet/mapCssTweaks.css.tid + +\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline html + +/* add some styling tweaks to leaflet */ +.leaflet-right { + max-width:50% +} +.leaflet-popup-content h6 { + font-size:.7rem; + margin:0 0 .2rem 0 +} + +.leaflet-control-attribution { + height:1.5em; +} +.leaflet-control-attribution:hover { + height:auto; +} + +.leaflet-top, .leaflet-bottom { + z-index:999; +} + +/* solve conflict between tw and leaflet */ +.leaflet-zoom-animated {max-width: initial !important} + +/* solve background image problem for layer control */ +.leaflet-control-layers-toggle { + background-image: url('data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20height%3D%2226%22%20width%3D%2226%22%3E%3Cpath%20d%3D%22M.032%2017.056l13-8%2013%208-13%208-13-8%22%20fill%3D%22%23b9b9b9%22/%3E%3Cpath%20d%3D%22M.032%2017.056l-.032.93%2013%208%2013-8%20.032-.93-13%208z%22%20fill%3D%22%23737373%22/%3E%3Cpath%20d%3D%22M0%2013.076l13-8%2013%208-13%208-13-8%22%20fill%3D%22%23cdcdcd%22/%3E%3Cpath%20d%3D%22M0%2013.076v.91l13%208%2013-8v-.91l-13%208z%22%20fill%3D%22%23737373%22/%3E%3Cpath%20d%3D%22M0%208.986l13-8%2013%208-13%208-13-8%22%20fill-opacity%3D%22.585%22%20stroke%3D%22%23797979%22%20stroke-width%3D%22.1%22%20fill%3D%22%23e9e9e9%22/%3E%3Cpath%20d%3D%22M0%208.986v1l13%208%2013-8v-1l-13%208z%22%20fill%3D%22%23737373%22/%3E%3C/svg%3E') !important +} + +/* default polygon stylin */ +.polyline {fill:none} +.leaflet-popup-content ul {padding:0 1em} + +/* some styling for clusters */ +.marker-cluster div { + min-width:16px;min-height:16px; + border-radius:50%;border:none; + vertical-align:middle;text-align:center;font-weight:bold + } +.marker-cluster div div{width:100%;height:100%} +.marker-cluster div span {display:block;text-shadow:0px 0px 6px #ffffff} + +path.leaflet-clickable {fill:<>;fill-opacity: 0.5;stroke:<>} +.leaflet-marker-colored {fill:<>} diff --git a/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/mapWidget.tid.js b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/mapWidget.tid.js new file mode 100644 index 0000000..04216a8 --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/mapWidget.tid.js @@ -0,0 +1,737 @@ +/*\ +created: 20151028202401905 +modified: 20170318234011605 +title: $:/plugins/sycom/leaflet/mapWidget.tid +type: application/javascript +module-type: widget + +A widget for displaying leaflet map in TiddlyWiki + +\*/ + +(function() { + /* ----------------------- */ + /*jslint node: true, browser: true */ + /*global $tw: false */ + "use strict"; + var Widget = require("$:/core/modules/widgets/widget.js").widget, + L = require("$:/plugins/sycom/leaflet/lib/leaflet.js"), + markerClusterGroup = require("$:/plugins/sycom/leaflet/lib/leaflet-markercluster.js"); + + var mapWidget = function(parseTreeNode, options) { + this.initialise(parseTreeNode, options); + }; + + // global vars + var Map = [], // map collection + map = 0, // map order number + tn = 0, // tiddler number + fCluster = [], // the clusters + Colour = [], // the colors + clusterRadius = [], // cluster radii + clusterType = [], // clustering for whole map or for each tiddler + lfltDefBounds = [ + [52.75, -2.55], + [52.85, -2.65] + ], // default bounds when nothing given + bounds, // global bounds for map ?todo one per map? + iter = [], // iteration indicator to avoid infinite loops + setting = {}; // the map's settings + + /* Inherit from the base widget class */ + mapWidget.prototype = new Widget(); + + /* Render this widget into the DOM */ + mapWidget.prototype.render = function(parent, nextSibling) { + bounds = null; + // Compute our attributes + this.computeAttributes(); + // Get the base settings for rendering : width / height (default : 100% / 500px) + // !todo : make a settings tidller in order to let user set it for the whole wiki (may be inspired from roadtree) + // !todo what happens if windows is resized? + var width = this.getAttribute("width", "100%"), + height = this.getAttribute("height", "420px"); + // creating the div container + var div = this.document.createElement("div"); + div.setAttribute("id", "lfltMap-" + map); + div.setAttribute("style", "width:" + width + ";height:" + height); + // Save the parent dom node + this.parentDomNode = parent; + // Compute our attributes + // this.computeAttributes(); + // create the container + parent.insertBefore(div, nextSibling); + this.domNodes.push(div); + // Create the map + this.createMap(); + // Execute our logic + this.execute(); + // increment map number indicator + map += 1; + }; + + /* Create the map for the widget */ + mapWidget.prototype.createMap = function(parent, nextSibling) { + // create the leaflet and push it to #lfltMap + Map[map] = L.map('lfltMap-' + map); + // Install base tile layer (if none provided, default is "osm") + // get tilelayers from JSON + var fonds = JSON.parse(this.wiki.getTiddlerText("$:/plugins/sycom/leaflet/lib/tileLayers.json")); + // create tile layers list object from json list + var Tiles = []; // leaflet tile layers + var tiles = {}; // tile identifier for control + // look for tile parameter + setting.tile = this.getAttribute("tile", "osm"); + setting.marker = this.getAttribute("marker", null); + // create tile layer list + for (var i in fonds) { + if (i == setting.tile || fonds[i].id == setting.tile) { + setting.tile = fonds[i].id; + } + var couche = new L.TileLayer(fonds[i].url, { + attribution: fonds[i].attrib, + minZoom: fonds[i].zMin, + maxZoom: fonds[i].zMax, + unloadInvisibleTiles: true + }); + Tiles[fonds[i].id] = couche; + tiles[fonds[i].nom] = couche; + } + // if user entered a wrong tile id + if (Tiles[setting.tile] === undefined) { + setting.tile = "osm"; + $tw.utils.error("Seems you entered a wrong tile id, displayed osm instead. Please refer to plugin documentation to avoid this - error : " + error); + } + Tiles[setting.tile].addTo(Map[map]); + // install tile layer control if needed + setting.tileControl = this.getAttribute("tileControl"); + if (setting.tileControl) { + var tControl = L.control.layers(tiles); + tControl.addTo(Map[map]); + } + /* !todo to come next (will have to implement leaflet.draw extension) + // look for draw parameter + setting.drawControl = this.getAttribute("drawControl"); + if (setting.drawControl) { + // Initialize the FeatureGroup to store editable layers + var drawnItems = new L.FeatureGroup(); + Map[map].addLayer(drawnItems); + // Initialize the draw control and pass it the FeatureGroup of editable layers + var drawControl = new L.Control.Draw({ + edit: { + featureGroup: drawnItems + } + } + ); + Map[map].addControl(drawControl); + } +*/ + }; + + /* Compute the internal state of the widget */ + mapWidget.prototype.execute = function() { + // getting wiki primary color + // check if you defined a tiddler name for palette but no tiddler with that + if(this.wiki.getTiddlerData(this.wiki.getTiddlerText("$:/palette"))) Colour.wiki = this.wiki.getTiddlerData(this.wiki.getTiddlerText("$:/palette")).primary; + // switch back to basic blue + else Colour.wiki = "#5778d8"; + + // switch back to basic tiddlywiki blue if primary is defined from another color + /* notes to upgrade this process + if primaire is <> set to default gray + if primaire.match("<<") primaire="#555"; */ + if (Colour.wiki.match(/" + flds.title + ""; + var content = ""; + if (flds.text !== "") { + // if tiddler contains a widget, avoid html rendering + if (flds.text.match(/<\$leafmap/)) { + content += "
    " + flds.text + "
    "; + } + // else render + else { + content += obj.wiki.renderTiddler("text/html", tid).substring(0, 420); + } + } + // adding a link to the tiddler + content += "
    (...)"; + popup += content; + + // map recursively (!!! danger !!!) + mapPlaces(obj, + flds, + feature, + fCluster["t" + tn], + popup, + cl, + mark, + st + ); + feature.addTo(feat); + } + /* +// check if anything was rendered before binding popup + if (wasRendered == 0) console.log("tw-leaflet-map-plugin > non geotiddler was listed and not rendered : " + flds.title); + // add the layer to the feature + feature.addLayer(subFeat); + feature.addTo(Map[map]); // layer.addTo(Map[map]); + } */ + // get layer bounds for automatic zoom + extBounds(feature); + tn++; + } + // it tiddler rendered two many times for same map. Stoping and error launch + else $tw.utils.error("tiddler [[" + tid + "]] was rendered more than 4242 times in this map. Please double check circular dependencies..."); + } + + // map a tiddler collection + function mapTiddlers(obj, list, feat, clust, pop, col, mark, style) { + var Tids = list.split(" "); + for (var td in Tids) { + mapTiddler(obj, Tids[td], feat, clust, pop, col, mark, style); + } + } + + // map tiddlers with a filter + function mapFilter(obj, filter, feat, clust, pop, col, mark, style) { + try { + var Tids = obj.wiki.filterTiddlers(filter); + for (var td in Tids) { + mapTiddler(obj, Tids[td], feat, clust, pop, col, mark, style); + } + } catch (error) { + $tw.utils.error("sorry there was something wrong when trying to map your filter. error : " + error); + } + } + + // icon url creator + function iconUrl(col, tid, m) { + var icone = escape($tw.wiki.renderTiddler("text/html", tid).replace("$primary$", setColor(col, m)).replace("

    ", "").replace("

    ", "")); + return ('data:image/svg+xml;charset=UTF-8,' + icone); + } + + // create marker + // ?todo only if there are points to display; + function lfltIcon(col, tid, m) { + // checking if marker is defined. Fallback to default + if(tid === undefined || tid === null) tid = "$:/plugins/sycom/leaflet/images/marker.svg"; + else tid = "$:/plugins/sycom/leaflet/images/" + tid + ".svg"; + if($tw.wiki.getTiddler(tid) === undefined) tid = "$:/plugins/sycom/leaflet/images/marker.svg"; + // !todo create shadow from icon by transform matrix? + var shad = tid.split(".svg")[0] + "shadow.svg", + shadowUrl = 'data:image/svg+xml;charset=UTF-8,' + escape($tw.wiki.getTiddlerText(shad)); + // get dimensions in tiddler + var MarkDim = $tw.wiki.getTiddler(tid).fields.marker_dim.split(" "); + var ShadDim = $tw.wiki.getTiddler(shad).fields.marker_dim.split(" "); + var theIcon = L.icon({ + iconUrl: iconUrl(col, tid, m), + iconRetinaUrl: iconUrl(col, tid, m), + iconSize: [MarkDim[0], MarkDim[1]], + iconAnchor: [MarkDim[2], MarkDim[3]], + popupAnchor: [0, -MarkDim[3]], + shadowUrl: shadowUrl, + shadowRetinaUrl: shadowUrl, + shadowSize: [ShadDim[0], ShadDim[1]], + shadowAnchor: [ShadDim[2], ShadDim[3]] + }); + return theIcon; + } + + // set color with fallback to map color or wiki... + function setColor(col, m) { + if(m === undefined) m = map; + if (col === undefined || col === null) col = Colour[m]; + if (col === undefined || col === null) col = Colour.wiki; + return col; + } + + // set style with fallback to map color or wiki... + function checkStyle(sty, col) { + if (col === undefined || col === null) { + if(sty.color === undefined) sty.color = setColor(col, map); + if(sty.fillColor === undefined) sty.fillColor = setColor(col, map); + } + else { + sty.color = col; + sty.fillColor = col; + } + return sty; + } + + // coordinate error message + function displayError(objectType, error) { + $tw.utils.error("there was an error when mapping a " + objectType + " - error : " + error); + } + + // adjust bounds to layer + function extBounds(feat) { + try { + if (bounds) { + bounds.extend(feat.getBounds()); + } else { + if (feat.getBounds()._northEast) { + bounds = feat.getBounds(); + } + } + } catch (error) { + $tw.utils.error("there was an error when trying to zoom on bounds. error : " + error); + } + } + + // cluster icon creation + function createCluster(clust) { + // getting back map number + var m = this.name.split("Cluster")[1], + t = this.name.split("Cluster")[2], + zC = Map[m].getZoom(), + z0,cTot,cCol,cOpa; + // checking object density mean for the map + if (t === undefined) { + if (fCluster[m].z0 === undefined) fCluster[m].z0 = zC; + z0 = fCluster[m].z0; + if (fCluster[m].count === undefined) fCluster[m].count = 1; + cTot = fCluster[m].count; + cCol = setColor(Colour[m],m); + cOpa = 0.85 + } + else { + if (fCluster["t" + t].z0 === undefined) fCluster["t" + t].z0 = zC; + z0 = fCluster["t" + t].z0; + if (fCluster["t" + t].count === undefined) fCluster["t" + t].count = 1; + cTot = fCluster["t" + t].count; + cCol = setColor(Colour["t" + t],m); + cOpa = 0.65 + } + // cluster icon size will be based on item number and zoom + // !todo: use density to get a more "local" percentage before calculating size + var cC = clust.getChildCount(), + cS = 20 * Math.log(clusterRadius[m]) * (1 + Math.log(cTot)/Math.max(cTot * Math.pow(2,zC-z0),Math.log(cTot))) * (1 - 1 / ((Math.log(cTot) / cTot) * Math.pow(2,zC-z0) * cC + 1)); + if (cS < 34) cS = 34; + var cF; // font size of cluster text + if (cC > 9999) cF = cS / 3; + else {if (cC > 999) cF = cS / 3.5; + else cF = cS / 2} + if (cF < 12) cF = 12; + // creating icon. Checking tiddler or whole clustering before + return new L.DivIcon({ + html: '

    ' + cC + "
    ", + className: "marker-cluster marker-cluster-" + cC, + iconSize: new L.Point(cS, cS) + }); + } + + // popup function for Json + function jsonPop(feat) { + // extracting data to create popup (all non-null data!) + var Prop = feat.properties, + jsontitle = "", + jsondesc = "", + jsonhtml = ""; + // testing if properties title or name exists + if (Prop.name) jsontitle += Prop.name + " "; + if (Prop.title) jsontitle += Prop.title + " "; + if (Prop.description) jsondesc += Prop.description + ""; + // populating other data + // if we got a title + if (jsontitle !== "") { + jsonhtml += "

    " + jsontitle + "

    "; + // if we got a description let's give it + if (jsondesc !== "") jsonhtml += jsondesc; + else { + jsonhtml+= "
      "; + for (var p in Prop) { + if (Prop[p] !== null && Prop[p] !== "" && p != "name" && p != "title") jsonhtml += "
    • " + p + " : " + Prop[p] + "
    • "; + } + jsonhtml += "
    "; + } + } + // if we have no title, giving one with first fields + else { + // in case we've got a description. Stop after title + if (jsondesc !== "") { + for (var pr in Prop) { + // if title is really to short (as an id), taking next field + if (jsontitle.length < 8) jsontitle += Prop[pr] + " "; + else break; + } + jsonhtml = "

    " + jsontitle + "

    " + jsonhtml; + } + else { + for (var po in Prop) { + // if title is really to short (as an id), taking next field + if (jsontitle.length < 4) jsontitle += Prop[po] + " "; + else { + if (Prop[po] !== null && Prop[po] !== "") jsonhtml += "
  • " + po + " : " + Prop[po] + "
  • "; + } + } + jsonhtml = "

    " + jsontitle + "

      " + jsonhtml + "
    "; + } + } + return jsonhtml; + } + + exports.leafmap = mapWidget; + +})(); +/* +MISC NOTES for later +JSON.parse(tiddler.fields.text); +var jsonData = this.wiki.getTiddlerAsJson(this.to), +*/ diff --git a/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/mapWidget.tid.js.meta b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/mapWidget.tid.js.meta new file mode 100644 index 0000000..001f6d3 --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/mapWidget.tid.js.meta @@ -0,0 +1,5 @@ +created: 20151028202401905 +modified: 20170318234011605 +module-type: widget +title: $:/plugins/sycom/leaflet/mapWidget.tid +type: application/javascript \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/markers.tid b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/markers.tid new file mode 100644 index 0000000..5d00c26 --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/markers.tid @@ -0,0 +1,25 @@ +caption: Markers +created: 20170129172401910 +modified: 20170129172401910 +title: $:/plugins/sycom/leaflet/markers +type: text/vnd.tiddlywiki + +markers are used to display point(s) related informations. Default marker is [[marker|$:/plugins/sycom/leaflet/images/marker.svg]]. + +!! Available markers + +for now, available markers are those + +<$list filter='[all[shadows]has[marker_dim]has[caption]]'><$tiddler tiddler={{!!title}}><$transclude/>
    <$link to={{!!title}}>{{!!caption}}
    + +!! Create your own markers + +Have a look at existing ones above for inspiration and hack. Markers are svg pieces with some mandatory tweaks : + +* a marker is based upon ''two'' tiddlers, one for the marker and one for the shadow +* add a `caption` field to the marker tiddler (not for the shadow svg). +* the `title` of your marker tiddler will be `$:/plugins/sycom/leaflet/images/`''caption''`.svg` +* and the `title` of the marker shadow tiddler will be `$:/plugins/sycom/leaflet/images/`''caption''`shadow.svg` +* a `marker_dim` field wich defines //width// //height// //x-anchor// //y-anchors//. Please check that your //width// and //height// value are the same as in `` +* don't forget to add `xmlns` attribute : ` + <$leafmap places='{"tiddler":" "}' height='240px'/> + diff --git a/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/tileLayers.tid b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/tileLayers.tid new file mode 100644 index 0000000..e5b7bf4 --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/tileLayers.tid @@ -0,0 +1,23 @@ +caption: tileLayers +created: 20151119173416239 +modified: 20161020222250584 +title: $:/plugins/sycom/leaflet/tileLayers +type: text/vnd.tiddlywiki + +tileLayers are the //background// of the leaflet map. They will not be available offline and will not display at every zoom level. + +!! Available tile layers + +edit [[tileLayers.json|$:/plugins/sycom/leaflet/lib/tileLayers.json]] if you want to add / remove tile layers. + +| !id | !description | !zoom min/max | +|''osm'' |[[OpenStreetMap|http://openstreetmap.org]] classic tile layer | 1/20 | +|''osmfr'' |[[OpenStreetMap|http://openstreetmap.org]] with //baguette// smell | 1/20 | +|''osmbw'' |Black and White version of [[OpenStreetMap|http://openstreetmap.org]] tiles by Wikimedia labs | 1/20 | +|''sat'' |Satellite photographic layer provided by Esri | 1/18 | +|''natgeo'' |National Geographic style layer provided by Esri| 1/12 | +|''toner'' |Black and white styled OpenStreetMap data provided by [[Stamen|http://stamen.com]] | 1/20 | +|''water'' |Watercolor styled OpenStreetMap data provided by [[Stamen|http://stamen.com]] | 1/20 | +|''thunder'' |Pale styled OpenStreetMap data provided by [[Thunderforest|http://thunderforest.com]] | 1/20 | +|''dark'' |"Dark Matter" styled OpenStreetMap data provided by [[CartoDB|https://cartodb.com/basemaps]] | 1/20 | +|''positron'' |"Positron" styled OpenStreetMap data provided by [[CartoDB|https://cartodb.com/basemaps]] | 1/20 | diff --git a/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/usage.tid b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/usage.tid new file mode 100644 index 0000000..72aff49 --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_system/plugins/sycom/leaflet/usage.tid @@ -0,0 +1,26 @@ +caption: Usage +created: 20151119173416239 +modified: 20170129153650584 +title: $:/plugins/sycom/leaflet/usage +type: text/vnd.tiddlywiki + +The widget is called by using `<$leafmap />`. You may specify some options : + +!!! widget attributes +|!Attribute |!Description |!Default | +|''width'' |the width of the map (px or tiddler %)| `100%`| +|''height''|the height of the map (px only)| `420px`| + +!!! leaflet map attributes +|!Attribute |!Description |!Default | +|''places'' |a json object with the geographical data you want to display. Can be stored in tiddlers as metadata fields. See [[geoSyntax|$:/plugins/sycom/leaflet/geoSyntax]] for more informations || +|''style'' |a json object containing styling information for your polygons and polylines objects in the map. Will overwrite GeoTiddler style if exists. Refer to [[leaflet documentation|http://leafletjs.com/reference-1.0.3.html#path]] for all options| `{ }`| +|''color'' |a color for drawing that will apply to all objects in the map. Will also overwrite GeoTiddler color attributes and //style// (if defined) colors| `<>`| +|''marker''|the name of the marker you want for points. See [[markers|$:/plugins/sycom/leaflet/markers]] for more informations| `marker`| +|''tile'' |the //id// or the //number// of the tile layer you want to use. See [[tileLayers|$:/plugins/sycom/leaflet/tileLayers]] for more informations | `osm`| +|''cluster''|set the clustering distance between points. also can disable clustering with no value or `0` or `""`| `80`| +|''clusterType''|set if points are clustered for whole map (`map`) or for each tiddler (`tiddler`) displayed.| `map`| +|''tileControl'' |''if present'' add a control to select the tile layer you want || +|''lat'' |map center latitude. Will overwrite places auto-centering | `52.8`| +|''long'' |map center longitude. Will overwrite places auto-centering | `-2.6`| +|''zoom'' |zoom level as defined by leaflet : int value between `0` (world map) and `20` (ant view) | | diff --git a/tzk/editions/tzk/plugins/leaflet/_usr_local_lib_node_modules_tiddlywiki_plugins_sycom_leaflet_example_tiddlyWikiFrCommunity.old b/tzk/editions/tzk/plugins/leaflet/_usr_local_lib_node_modules_tiddlywiki_plugins_sycom_leaflet_example_tiddlyWikiFrCommunity.old new file mode 100644 index 0000000..3a65f1f --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_usr_local_lib_node_modules_tiddlywiki_plugins_sycom_leaflet_example_tiddlyWikiFrCommunity.old @@ -0,0 +1,8 @@ +created: 20161025143416000 +modified: 20170317143416000 +title: $:/plugins/sycom/leaflet/example/tiddlyWikiFrCommunity +type: application/json +tags: example leaflet geojson +color: #dd0000 + +{"type":"FeatureCollection","features":[{"type":"Feature","properties":{"name":"Aknar","description":"","url":""},"geometry":{"type":"Point","coordinates":[1.4442090000000007,43.604652]}},{"type":"Feature","properties":{"name":"CdriC","description":"","url":""},"geometry":{"type":"Point","coordinates":[-0.563166,47.478419]}},{"type":"Feature","properties":{"name":"Disanv Parean","description":"","url":""},"geometry":{"type":"Point","coordinates":[-0.4072784,49.1846226]}},{"type":"Feature","properties":{"name":"Fab13n","description":"","url":""},"geometry":{"type":"Point","coordinates":[5.5867,45.1184]}},{"type":"Feature","properties":{"name":"Fabio","description":"","url":""},"geometry":{"type":"Point","coordinates":[1.916515000000004,47.8664401]}},{"type":"Feature","properties":{"name":"Florent V.","description":"","url":""},"geometry":{"type":"Point","coordinates":[0.156237,45.648377]}},{"type":"Feature","properties":{"name":"Joël","description":"","url":""},"geometry":{"type":"Point","coordinates":[4.740042686462402,46.10446454226022]}},{"type":"Feature","properties":{"name":"Johanne","description":"","url":""},"geometry":{"type":"Point","coordinates":[-74.09016960000002,45.65189590000001]}},{"type":"Feature","properties":{"name":"Lakemp","description":"","url":""},"geometry":{"type":"Point","coordinates":[2.19249,48.59338]}},{"type":"Feature","properties":{"name":"LauDai","description":"","url":""},"geometry":{"type":"Point","coordinates":[1.4750973000000158,43.5664556]}},{"type":"Feature","properties":{"name":"Lucivam","description":"","url":""},"geometry":{"type":"Point","coordinates":[4.390278,45.434722]}},{"type":"Feature","properties":{"name":"Mikabi","description":"","url":""},"geometry":{"type":"Point","coordinates":[1.44,43.604652]}},{"type":"Feature","properties":{"name":"Nico","description":"","url":""},"geometry":{"type":"Point","coordinates":[2.2569674000000077,48.9899655]}},{"type":"Feature","properties":{"name":"Nicolas Friedli","description":"","url":""},"geometry":{"type":"Point","coordinates":[6.8411643,46.9425711]}},{"type":"Feature","properties":{"name":"Phil","description":"","url":""},"geometry":{"type":"Point","coordinates":[3.98337,50.36155]}},{"type":"Feature","properties":{"name":"Piwig","description":"","url":""},"geometry":{"type":"Point","coordinates":[-1.677793,48.117266]}},{"type":"Feature","properties":{"name":"Sylvain Comte","description":"Créateur du leaflet map plugin","url":"http://sylvain.comte.online.fr"},"geometry":{"type":"Point","coordinates":[1.08954,49.43584]}},{"type":"Feature","properties":{"name":"Sylvain Naudin","description":"Admin du forum","url":"http://sylvain.naud.in"},"geometry":{"type":"Point","coordinates":[-0.155689,45.471894]}},{"type":"Feature","properties":{"name":"Thierry Pasquier","description":"","url":""},"geometry":{"type":"Point","coordinates":[0.3333,46.5833]}},{"type":"Feature","properties":{"name":"Vincent Delcros","description":"","url":""},"geometry":{"type":"Point","coordinates":[5.2788245000000416,50.5500944]}}]} diff --git a/tzk/editions/tzk/plugins/leaflet/_usr_local_lib_node_modules_tiddlywiki_plugins_sycom_leaflet_example_tiddlyWikiFrCommunity.old.meta b/tzk/editions/tzk/plugins/leaflet/_usr_local_lib_node_modules_tiddlywiki_plugins_sycom_leaflet_example_tiddlyWikiFrCommunity.old.meta new file mode 100644 index 0000000..4966d62 --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/_usr_local_lib_node_modules_tiddlywiki_plugins_sycom_leaflet_example_tiddlyWikiFrCommunity.old.meta @@ -0,0 +1,2 @@ +title: /usr/local/lib/node_modules/tiddlywiki/plugins/sycom/leaflet/example/tiddlyWikiFrCommunity.old +type: .old \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/leaflet/geoLocationWidget.tid b/tzk/editions/tzk/plugins/leaflet/geoLocationWidget.tid new file mode 100644 index 0000000..771f650 --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/geoLocationWidget.tid @@ -0,0 +1,35 @@ +author: Sylvain Comte +caption: action-createtiddler +created: 20180906130958091 +modified: 20180906132645752 +tags: Widgets +title: geoLocationWidget +type: text/vnd.tiddlywiki + +! Introduction +The ''geolocation'' widget is used to collect geographic position of the browser running the wiki. For now position will be added the //point// (or //points// if there is more than one point) field of the target tiddler. Those fields may then be used with the [[Leaflet Map Plugin|https://sycom.github.io/TiddlyWiki-Plugins/#Leaflet%20plugin]], or whatever tool using geographic coordinates. + +* The widget is not dependant from Leaflet Map Plugin (but is bundled in it). You may install it alone +* The widget will only work on //https// website, due to security limitation of the geolocation implemented in browsers + +! Content and Attributes +The [[geolocation widget|$:/ext/modules/widgets/geolocation-widget.js]] will create a button to collect your browser's position. Any content within it is ignored. + +| !Attribute | !Description | !Default | +|target |The tiddler (title) in which data will be stored |//current tiddler// | +|icon |The title of the icon used to dress up the button|$:/core/images/globe | +|text |The text displayed in the button (will overwrite the icon)|`undefined` | + +More options will come later (//accuracy//, //object type//...). + +! Examples + +``` +<$geoloc target="Geolocation Store" /> +``` + +<$geoloc target="Geolocation Store" /> + +! Source +The ''geolocation widget'' is developped aside Leaflet Map Plugin. Source code can be found on the same repository : https://framagit.org/sycom/TiddlyWiki-Plugins/tree/master/ext/modules/widget/geolocation + diff --git a/tzk/editions/tzk/plugins/leaflet/plugin.info b/tzk/editions/tzk/plugins/leaflet/plugin.info new file mode 100644 index 0000000..9908dd1 --- /dev/null +++ b/tzk/editions/tzk/plugins/leaflet/plugin.info @@ -0,0 +1,11 @@ +{ + "author": "Sylvain Comte", + "core-version": ">=5.0.0", + "dependents": "", + "description": "Leaflet maps", + "list": "readme usage geoSyntax tileLayers markers example", + "plugin-type": "plugin", + "source": "https://framagit.org/sycom/TiddlyWiki-Plugins", + "title": "$:/plugins/sycom/leaflet", + "version": "0.8.6" +} \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/locator/$__config_bimlas_locator_fields_LINKS-IN-TEXT.tid b/tzk/editions/tzk/plugins/locator/_system/config/bimlas/locator/fields/LINKS-IN-TEXT.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__config_bimlas_locator_fields_LINKS-IN-TEXT.tid rename to tzk/editions/tzk/plugins/locator/_system/config/bimlas/locator/fields/LINKS-IN-TEXT.tid diff --git a/tzk/editions/tzk/plugins/locator/$__config_bimlas_locator_fields_bag.tid b/tzk/editions/tzk/plugins/locator/_system/config/bimlas/locator/fields/bag.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__config_bimlas_locator_fields_bag.tid rename to tzk/editions/tzk/plugins/locator/_system/config/bimlas/locator/fields/bag.tid diff --git a/tzk/editions/tzk/plugins/locator/$__config_bimlas_locator_fields_caption.tid b/tzk/editions/tzk/plugins/locator/_system/config/bimlas/locator/fields/caption.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__config_bimlas_locator_fields_caption.tid rename to tzk/editions/tzk/plugins/locator/_system/config/bimlas/locator/fields/caption.tid diff --git a/tzk/editions/tzk/plugins/locator/$__config_bimlas_locator_fields_color.tid b/tzk/editions/tzk/plugins/locator/_system/config/bimlas/locator/fields/color.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__config_bimlas_locator_fields_color.tid rename to tzk/editions/tzk/plugins/locator/_system/config/bimlas/locator/fields/color.tid diff --git a/tzk/editions/tzk/plugins/locator/$__config_bimlas_locator_fields_created.tid b/tzk/editions/tzk/plugins/locator/_system/config/bimlas/locator/fields/created.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__config_bimlas_locator_fields_created.tid rename to tzk/editions/tzk/plugins/locator/_system/config/bimlas/locator/fields/created.tid diff --git a/tzk/editions/tzk/plugins/locator/$__config_bimlas_locator_fields_draft.of.tid b/tzk/editions/tzk/plugins/locator/_system/config/bimlas/locator/fields/draft.of.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__config_bimlas_locator_fields_draft.of.tid rename to tzk/editions/tzk/plugins/locator/_system/config/bimlas/locator/fields/draft.of.tid diff --git a/tzk/editions/tzk/plugins/locator/$__config_bimlas_locator_fields_draft.title.tid b/tzk/editions/tzk/plugins/locator/_system/config/bimlas/locator/fields/draft.title.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__config_bimlas_locator_fields_draft.title.tid rename to tzk/editions/tzk/plugins/locator/_system/config/bimlas/locator/fields/draft.title.tid diff --git a/tzk/editions/tzk/plugins/locator/$__config_bimlas_locator_fields_icon.tid b/tzk/editions/tzk/plugins/locator/_system/config/bimlas/locator/fields/icon.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__config_bimlas_locator_fields_icon.tid rename to tzk/editions/tzk/plugins/locator/_system/config/bimlas/locator/fields/icon.tid diff --git a/tzk/editions/tzk/plugins/locator/$__config_bimlas_locator_fields_list-after.tid b/tzk/editions/tzk/plugins/locator/_system/config/bimlas/locator/fields/list-after.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__config_bimlas_locator_fields_list-after.tid rename to tzk/editions/tzk/plugins/locator/_system/config/bimlas/locator/fields/list-after.tid diff --git a/tzk/editions/tzk/plugins/locator/$__config_bimlas_locator_fields_list-before.tid b/tzk/editions/tzk/plugins/locator/_system/config/bimlas/locator/fields/list-before.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__config_bimlas_locator_fields_list-before.tid rename to tzk/editions/tzk/plugins/locator/_system/config/bimlas/locator/fields/list-before.tid diff --git a/tzk/editions/tzk/plugins/locator/$__config_bimlas_locator_fields_list.tid b/tzk/editions/tzk/plugins/locator/_system/config/bimlas/locator/fields/list.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__config_bimlas_locator_fields_list.tid rename to tzk/editions/tzk/plugins/locator/_system/config/bimlas/locator/fields/list.tid diff --git a/tzk/editions/tzk/plugins/locator/$__config_bimlas_locator_fields_modified.tid b/tzk/editions/tzk/plugins/locator/_system/config/bimlas/locator/fields/modified.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__config_bimlas_locator_fields_modified.tid rename to tzk/editions/tzk/plugins/locator/_system/config/bimlas/locator/fields/modified.tid diff --git a/tzk/editions/tzk/plugins/locator/$__config_bimlas_locator_fields_revision.tid b/tzk/editions/tzk/plugins/locator/_system/config/bimlas/locator/fields/revision.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__config_bimlas_locator_fields_revision.tid rename to tzk/editions/tzk/plugins/locator/_system/config/bimlas/locator/fields/revision.tid diff --git a/tzk/editions/tzk/plugins/locator/$__config_bimlas_locator_fields_tags.tid b/tzk/editions/tzk/plugins/locator/_system/config/bimlas/locator/fields/tags.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__config_bimlas_locator_fields_tags.tid rename to tzk/editions/tzk/plugins/locator/_system/config/bimlas/locator/fields/tags.tid diff --git a/tzk/editions/tzk/plugins/locator/$__config_bimlas_locator_fields_text.tid b/tzk/editions/tzk/plugins/locator/_system/config/bimlas/locator/fields/text.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__config_bimlas_locator_fields_text.tid rename to tzk/editions/tzk/plugins/locator/_system/config/bimlas/locator/fields/text.tid diff --git a/tzk/editions/tzk/plugins/locator/$__config_bimlas_locator_fields_title.tid b/tzk/editions/tzk/plugins/locator/_system/config/bimlas/locator/fields/title.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__config_bimlas_locator_fields_title.tid rename to tzk/editions/tzk/plugins/locator/_system/config/bimlas/locator/fields/title.tid diff --git a/tzk/editions/tzk/plugins/locator/$__config_bimlas_locator_fields_type.tid b/tzk/editions/tzk/plugins/locator/_system/config/bimlas/locator/fields/type.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__config_bimlas_locator_fields_type.tid rename to tzk/editions/tzk/plugins/locator/_system/config/bimlas/locator/fields/type.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_README_CHANGELOG.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/README/CHANGELOG.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_README_CHANGELOG.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/README/CHANGELOG.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_README_LICENSE.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/README/LICENSE.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_README_LICENSE.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/README/LICENSE.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_README_README.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/README/README.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_README_README.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/README/README.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_README_TIPS.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/README/TIPS.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_README_TIPS.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/README/TIPS.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_README_macros.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/README/macros.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_README_macros.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/README/macros.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_actions_add-field-value.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/actions/add-field-value.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_actions_add-field-value.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/actions/add-field-value.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_actions_add-to-history.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/actions/add-to-history.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_actions_add-to-history.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/actions/add-to-history.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_actions_move-to-another-context.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/actions/move-to-another-context.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_actions_move-to-another-context.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/actions/move-to-another-context.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_actions_remove-field-value.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/actions/remove-field-value.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_actions_remove-field-value.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/actions/remove-field-value.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_actions_remove-filters.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/actions/remove-filters.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_actions_remove-filters.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/actions/remove-filters.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_buttons_clear-search-input.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/buttons/clear-search-input.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_buttons_clear-search-input.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/buttons/clear-search-input.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_buttons_collapse-history.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/buttons/collapse-history.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_buttons_collapse-history.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/buttons/collapse-history.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_buttons_context-arrow.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/buttons/context-arrow.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_buttons_context-arrow.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/buttons/context-arrow.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_buttons_copy-filter-to-advanced-search.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/buttons/copy-filter-to-advanced-search.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_buttons_copy-filter-to-advanced-search.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/buttons/copy-filter-to-advanced-search.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_buttons_create-new-tiddler.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/buttons/create-new-tiddler.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_buttons_create-new-tiddler.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/buttons/create-new-tiddler.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_buttons_go-down-to-context.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/buttons/go-down-to-context.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_buttons_go-down-to-context.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/buttons/go-down-to-context.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_buttons_go-up-to-context.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/buttons/go-up-to-context.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_buttons_go-up-to-context.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/buttons/go-up-to-context.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_buttons_open-field-settings.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/buttons/open-field-settings.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_buttons_open-field-settings.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/buttons/open-field-settings.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_buttons_remove-filters-of-current-field.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/buttons/remove-filters-of-current-field.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_buttons_remove-filters-of-current-field.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/buttons/remove-filters-of-current-field.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_buttons_remove-filters.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/buttons/remove-filters.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_buttons_remove-filters.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/buttons/remove-filters.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_buttons_search-in-context.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/buttons/search-in-context.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_buttons_search-in-context.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/buttons/search-in-context.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_buttons_toggle-context-settings.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/buttons/toggle-context-settings.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_buttons_toggle-context-settings.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/buttons/toggle-context-settings.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_edit-template_locator-references.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/edit-template/locator-references.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_edit-template_locator-references.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/edit-template/locator-references.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_field-templates_color.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/field-templates/color.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_field-templates_color.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/field-templates/color.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_field-templates_edit-fields-plus-transclusion.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/field-templates/edit-fields-plus-transclusion.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_field-templates_edit-fields-plus-transclusion.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/field-templates/edit-fields-plus-transclusion.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_field-templates_edit-fields.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/field-templates/edit-fields.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_field-templates_edit-fields.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/field-templates/edit-fields.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_field-templates_fields-plus-transclusion.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/field-templates/fields-plus-transclusion.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_field-templates_fields-plus-transclusion.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/field-templates/fields-plus-transclusion.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_field-templates_fields.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/field-templates/fields.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_field-templates_fields.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/field-templates/fields.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_field-templates_icon.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/field-templates/icon.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_field-templates_icon.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/field-templates/icon.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_field-templates_link.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/field-templates/link.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_field-templates_link.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/field-templates/link.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_field-templates_tag.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/field-templates/tag.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_field-templates_tag.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/field-templates/tag.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_field-templates_text.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/field-templates/text.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_field-templates_text.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/field-templates/text.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_field-templates_transclusion.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/field-templates/transclusion.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_field-templates_transclusion.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/field-templates/transclusion.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_macros_css-classes.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/macros/css-classes.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_macros_css-classes.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/macros/css-classes.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_macros_filters.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/macros/filters.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_macros_filters.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/macros/filters.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_macros_javascript-filters.js b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/macros/javascript-filters.js similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_macros_javascript-filters.js rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/macros/javascript-filters.js diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_macros_javascript-filters.js.meta b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/macros/javascript-filters.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_macros_javascript-filters.js.meta rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/macros/javascript-filters.js.meta diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_macros_locator-fields.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/macros/locator-fields.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_macros_locator-fields.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/macros/locator-fields.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_macros_locator-search.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/macros/locator-search.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_macros_locator-search.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/macros/locator-search.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_macros_locator-view.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/macros/locator-view.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_macros_locator-view.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/macros/locator-view.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_macros_template-macros.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/macros/template-macros.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_macros_template-macros.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/macros/template-macros.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_settings_settings.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/settings/settings.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_settings_settings.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/settings/settings.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_stylesheet.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/stylesheet.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_stylesheet.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/stylesheet.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_templates_context-item.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/templates/context-item.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_templates_context-item.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/templates/context-item.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_templates_context-settings.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/templates/context-settings.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_templates_context-settings.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/templates/context-settings.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_templates_field-names.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/templates/field-names.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_templates_field-names.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/templates/field-names.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_templates_field-value-template.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/templates/field-value-template.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_templates_field-value-template.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/templates/field-value-template.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_templates_field-values.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/templates/field-values.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_templates_field-values.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/templates/field-values.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_templates_fields-filter.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/templates/fields-filter.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_templates_fields-filter.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/templates/fields-filter.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_templates_history-item.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/templates/history-item.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_templates_history-item.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/templates/history-item.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_templates_history.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/templates/history.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_templates_history.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/templates/history.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_templates_list-of-context-items.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/templates/list-of-context-items.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_templates_list-of-context-items.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/templates/list-of-context-items.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_templates_list-of-links-in-text.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/templates/list-of-links-in-text.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_templates_list-of-links-in-text.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/templates/list-of-links-in-text.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_templates_search-toolbar.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/templates/search-toolbar.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_templates_search-toolbar.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/templates/search-toolbar.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_templates_view-toolbar.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/templates/view-toolbar.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_templates_view-toolbar.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/templates/view-toolbar.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_viewtemplate_field-list.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/viewtemplate/field-list.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_viewtemplate_field-list.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/viewtemplate/field-list.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_viewtemplate_fields-info.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/viewtemplate/fields-info.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_viewtemplate_fields-info.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/viewtemplate/fields-info.tid diff --git a/tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_viewtemplate_open-in-sidebar.tid b/tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/viewtemplate/open-in-sidebar.tid similarity index 100% rename from tzk/editions/tzk/plugins/locator/$__plugins_bimlas_locator_viewtemplate_open-in-sidebar.tid rename to tzk/editions/tzk/plugins/locator/_system/plugins/bimlas/locator/viewtemplate/open-in-sidebar.tid diff --git a/tzk/editions/tzk/plugins/moment/$__plugins_kixam_moment_icon.tid b/tzk/editions/tzk/plugins/moment/_system/plugins/kixam/moment/icon.tid similarity index 100% rename from tzk/editions/tzk/plugins/moment/$__plugins_kixam_moment_icon.tid rename to tzk/editions/tzk/plugins/moment/_system/plugins/kixam/moment/icon.tid diff --git a/tzk/editions/tzk/plugins/moment/$__plugins_kixam_moment_license.tid b/tzk/editions/tzk/plugins/moment/_system/plugins/kixam/moment/license.tid similarity index 100% rename from tzk/editions/tzk/plugins/moment/$__plugins_kixam_moment_license.tid rename to tzk/editions/tzk/plugins/moment/_system/plugins/kixam/moment/license.tid diff --git a/tzk/editions/tzk/plugins/moment/$__plugins_kixam_moment_moment.js b/tzk/editions/tzk/plugins/moment/_system/plugins/kixam/moment/moment.js similarity index 100% rename from tzk/editions/tzk/plugins/moment/$__plugins_kixam_moment_moment.js rename to tzk/editions/tzk/plugins/moment/_system/plugins/kixam/moment/moment.js diff --git a/tzk/editions/tzk/plugins/moment/$__plugins_kixam_moment_moment.js.meta b/tzk/editions/tzk/plugins/moment/_system/plugins/kixam/moment/moment.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/moment/$__plugins_kixam_moment_moment.js.meta rename to tzk/editions/tzk/plugins/moment/_system/plugins/kixam/moment/moment.js.meta diff --git a/tzk/editions/tzk/plugins/moment/$__plugins_kixam_moment_readme.tid b/tzk/editions/tzk/plugins/moment/_system/plugins/kixam/moment/readme.tid similarity index 100% rename from tzk/editions/tzk/plugins/moment/$__plugins_kixam_moment_readme.tid rename to tzk/editions/tzk/plugins/moment/_system/plugins/kixam/moment/readme.tid diff --git a/tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_config.tid b/tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/config.tid similarity index 100% rename from tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_config.tid rename to tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/config.tid diff --git a/tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_defaults_class.tid b/tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/defaults/class.tid similarity index 100% rename from tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_defaults_class.tid rename to tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/defaults/class.tid diff --git a/tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_defaults_delay.tid b/tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/defaults/delay.tid similarity index 100% rename from tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_defaults_delay.tid rename to tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/defaults/delay.tid diff --git a/tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_defaults_exclude.tid b/tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/defaults/exclude.tid similarity index 100% rename from tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_defaults_exclude.tid rename to tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/defaults/exclude.tid diff --git a/tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_defaults_keys.tid b/tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/defaults/keys.tid similarity index 100% rename from tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_defaults_keys.tid rename to tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/defaults/keys.tid diff --git a/tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_defaults_not.tid b/tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/defaults/not.tid similarity index 100% rename from tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_defaults_not.tid rename to tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/defaults/not.tid diff --git a/tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_defaults_template.tid b/tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/defaults/template.tid similarity index 100% rename from tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_defaults_template.tid rename to tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/defaults/template.tid diff --git a/tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_keyboard.js b/tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/keyboard.js similarity index 100% rename from tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_keyboard.js rename to tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/keyboard.js diff --git a/tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_keyboard.js.meta b/tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/keyboard.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_keyboard.js.meta rename to tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/keyboard.js.meta diff --git a/tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_lingo_class.tid b/tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/lingo/class.tid similarity index 100% rename from tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_lingo_class.tid rename to tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/lingo/class.tid diff --git a/tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_lingo_delay.tid b/tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/lingo/delay.tid similarity index 100% rename from tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_lingo_delay.tid rename to tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/lingo/delay.tid diff --git a/tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_lingo_exclude.tid b/tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/lingo/exclude.tid similarity index 100% rename from tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_lingo_exclude.tid rename to tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/lingo/exclude.tid diff --git a/tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_lingo_keys.tid b/tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/lingo/keys.tid similarity index 100% rename from tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_lingo_keys.tid rename to tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/lingo/keys.tid diff --git a/tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_lingo_not.tid b/tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/lingo/not.tid similarity index 100% rename from tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_lingo_not.tid rename to tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/lingo/not.tid diff --git a/tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_lingo_open.tid b/tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/lingo/open.tid similarity index 100% rename from tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_lingo_open.tid rename to tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/lingo/open.tid diff --git a/tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_lingo_template.tid b/tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/lingo/template.tid similarity index 100% rename from tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_lingo_template.tid rename to tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/lingo/template.tid diff --git a/tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_link.js b/tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/link.js similarity index 100% rename from tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_link.js rename to tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/link.js diff --git a/tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_link.js.meta b/tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/link.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_link.js.meta rename to tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/link.js.meta diff --git a/tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_popups.tid b/tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/popups.tid similarity index 100% rename from tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_popups.tid rename to tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/popups.tid diff --git a/tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_readme.tid b/tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/readme.tid similarity index 100% rename from tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_readme.tid rename to tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/readme.tid diff --git a/tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_styles.tid b/tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/styles.tid similarity index 100% rename from tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_styles.tid rename to tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/styles.tid diff --git a/tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_template.tid b/tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/template.tid similarity index 100% rename from tzk/editions/tzk/plugins/preview/$__plugins_tobibeer_preview_template.tid rename to tzk/editions/tzk/plugins/preview/_system/plugins/tobibeer/preview/template.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_timeline_subfilter.tid b/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_timeline_subfilter.tid deleted file mode 100644 index ff32402..0000000 --- a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_timeline_subfilter.tid +++ /dev/null @@ -1,3 +0,0 @@ -title: $:/config/flibbles/relink/macros/timeline/subfilter - -filter \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_fieldtypes_filter.js b/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_fieldtypes_filter.js deleted file mode 100644 index 6e04015..0000000 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_fieldtypes_filter.js +++ /dev/null @@ -1,442 +0,0 @@ -/*\ -This specifies logic for updating filters to reflect title changes. -\*/ - -var refHandler = require("$:/plugins/flibbles/relink/js/fieldtypes/reference"); -var Rebuilder = require("$:/plugins/flibbles/relink/js/utils/rebuilder"); - -exports.name = "filter"; - -exports.report = function(filter, callback, options) { - // I cheat here for now. Relink handles reporting too in cases where - // fromTitle is undefined. toTitle is the callback in those cases. - exports.relink(filter, undefined, callback, options); -}; - -/**Returns undefined if no change was made. - */ -exports.relink = function(filter, fromTitle, toTitle, options) { - var relinker = new Rebuilder(filter), - p = 0, // Current position in the filter string - match, noPrecedingWordBarrier, - wordBarrierRequired=false; - var whitespaceRegExp = /\s+/mg, - operandRegExp = /((?:\+|\-|~|=|\:\w+)?)(?:(\[)|(?:"([^"]*)")|(?:'([^']*)')|([^\s\[\]]+))/mg, - blurbs = []; - while(p < filter.length) { - // Skip any whitespace - whitespaceRegExp.lastIndex = p; - match = whitespaceRegExp.exec(filter); - noPrecedingWordBarrier = false; - if(match && match.index === p) { - p = p + match[0].length; - } else if (p != 0) { - if (wordBarrierRequired) { - relinker.add(' ', p, p); - wordBarrierRequired = false; - } else { - noPrecedingWordBarrier = true; - } - } - // Match the start of the operation - if(p < filter.length) { - var val; - operandRegExp.lastIndex = p; - match = operandRegExp.exec(filter); - if(!match || match.index !== p) { - // It's a bad filter - return undefined; - } - if(match[1]) { // prefix - p += match[1].length; - } - if(match[2]) { // Opening square bracket - // We check if this is a standalone title, - // like `[[MyTitle]]`. We treat those like - // `"MyTitle"` or `MyTitle`. Not like a run. - var standaloneTitle = /\[\[([^\]]+)\]\]/g; - standaloneTitle.lastIndex = p; - var alone = standaloneTitle.exec(filter); - if (!alone || alone.index != p) { - if (fromTitle === undefined) { - // toTitle is a callback method in this case. - p =reportFilterOperation(filter, function(title, blurb){ - if (match[1]) { - blurbs.push([title, match[1] + (blurb || '')]); - } else { - blurbs.push([title, blurb]); - } - },p,options.settings,options); - } else { - p =relinkFilterOperation(relinker,fromTitle,toTitle,filter,p,options.settings,options); - } - // It's a legit run - if (p === undefined) { - // The filter is malformed - // We do nothing. - return undefined; - } - continue; - } - bracketTitle = alone[1]; - operandRegExp.lastIndex = standaloneTitle.lastIndex; - val = alone[1]; - } else { - // standalone Double quoted string, single - // quoted string, or noquote ahead. - val = match[3] || match[4] || match[5]; - } - // From here on, we're dealing with a standalone title - // expression. like `"MyTitle"` or `[[MyTitle]]` - // We're much more flexible about relinking these. - var preference = undefined; - if (match[3]) { - preference = '"'; - } else if (match[4]) { - preference = "'"; - } else if (match[5]) { - preference = ''; - } - if (fromTitle === undefined) { - // Report it - blurbs.push([val, match[1]]); - } else if (val === fromTitle) { - // Relink it - var entry = {name: "title"}; - var newVal = wrapTitle(toTitle, preference); - if (newVal === undefined || (options.inBraces && newVal.indexOf('}}}') >= 0)) { - if (!options.placeholder) { - relinker.impossible = true; - p = operandRegExp.lastIndex; - continue; - } - - newVal = "[<"+options.placeholder.getPlaceholderFor(toTitle)+">]"; - } - if (newVal[0] != '[') { - // not bracket enclosed - // this requires whitespace - // arnound it - if (noPrecedingWordBarrier && !match[1]) { - relinker.add(' ', p, p); - } - wordBarrierRequired = true; - } - entry.output = toTitle; - entry.operator = {operator: "title"}; - entry.quotation = preference; - if (entry.impossible) { - relinker.impossible = true; - } - relinker.add(newVal,p,operandRegExp.lastIndex); - } - p = operandRegExp.lastIndex; - } - } - if (fromTitle === undefined) { - // We delay the blurb calls until now in case it's a malformed - // filter string. We don't want to report some, only to find out - // it's bad. - for (var i = 0; i < blurbs.length; i++) { - toTitle(blurbs[i][0], blurbs[i][1]); - } - } - if (relinker.changed() || relinker.impossible) { - return {output: relinker.results(), impossible: relinker.impossible }; - } - return undefined; -}; - -/* Same as this.relink, except this has the added constraint that the return - * value must be able to be wrapped in curly braces. (i.e. '{{{...}}}') - */ -exports.relinkInBraces = function(filter, fromTitle, toTitle, options) { - var braceOptions = $tw.utils.extend({inBraces: true}, options); - var entry = this.relink(filter, fromTitle, toTitle, braceOptions); - if (entry && entry.output && !canBeInBraces(entry.output)) { - // It was possible, but it won't fit in braces, so we must give up - delete entry.output; - entry.impossible = true; - } - return entry; -}; - -function wrapTitle(value, preference) { - var choices = { - "": function(v) {return /^[^\s\[\]]*[^\s\[\]\}]$/.test(v); }, - "[": canBePrettyOperand, - "'": function(v) {return v.indexOf("'") < 0; }, - '"': function(v) {return v.indexOf('"') < 0; } - }; - var wrappers = { - "": function(v) {return v; }, - "[": function(v) {return "[["+v+"]]"; }, - "'": function(v) {return "'"+v+"'"; }, - '"': function(v) {return '"'+v+'"'; } - }; - if (choices[preference]) { - if (choices[preference](value)) { - return wrappers[preference](value); - } - } - for (var quote in choices) { - if (choices[quote](value)) { - return wrappers[quote](value); - } - } - // No quotes will work on this - return undefined; -} - -function relinkFilterOperation(relinker, fromTitle, toTitle, filterString, p, context, options) { - var nextBracketPos, operator; - // Skip the starting square bracket - if(filterString.charAt(p++) !== "[") { - // Missing [ in filter expression - return undefined; - } - // Process each operator in turn - operator = parseOperator(filterString, p); - do { - var entry = undefined, type; - if (operator === undefined) { - return undefined; - } - p = operator.opStart; - switch (operator.bracket) { - case "{": // Curly brackets - type = "indirect"; - nextBracketPos = filterString.indexOf("}",p); - var operand = filterString.substring(p,nextBracketPos); - // We've got a live reference. relink or report - entry = refHandler.relinkInBraces(operand, fromTitle, toTitle, options); - if (entry && entry.output) { - // We don't check the context. - // All indirect operands convert. - relinker.add(entry.output,p,nextBracketPos); - } - break; - case "[": // Square brackets - type = "string"; - nextBracketPos = filterString.indexOf("]",p); - var operand = filterString.substring(p,nextBracketPos); - // Check if this is a relevant operator - var handler = fieldType(context, operator); - if (!handler) { - // This operator isn't managed. Bye. - break; - } - entry = handler.relink(operand, fromTitle, toTitle, options); - if (!entry || !entry.output) { - // The fromTitle wasn't in the operand. - break; - } - var wrapped; - if (!canBePrettyOperand(entry.output) || (options.inBraces && entry.output.indexOf('}}}') >= 0)) { - if (!options.placeholder) { - delete entry.output; - entry.impossible = true; - break; - } - var ph = options.placeholder.getPlaceholderFor(entry.output, handler.name); - wrapped = "<"+ph+">"; - } else { - wrapped = "["+entry.output+"]"; - } - relinker.add(wrapped, p-1, nextBracketPos+1); - break; - case "<": // Angle brackets - nextBracketPos = filterString.indexOf(">",p); - break; - case "/": // regexp brackets - var rex = /^((?:[^\\\/]*|\\.)*)\/(?:\(([mygi]+)\))?/g, - rexMatch = rex.exec(filterString.substring(p)); - if(rexMatch) { - nextBracketPos = p + rex.lastIndex - 1; - } - else { - // Unterminated regular expression - return undefined; - } - break; - } - if (entry) { - if (entry.impossible) { - relinker.impossible = true; - } - } - - if(nextBracketPos === -1) { - // Missing closing bracket in filter expression - return undefined; - } - p = nextBracketPos + 1; - // Check for multiple operands - switch (filterString.charAt(p)) { - case ',': - p++; - if(/^[\[\{<\/]/.test(filterString.substring(p))) { - operator.bracket = filterString.charAt(p); - operator.opStart = p + 1; - operator.index++; - } else { - return undefined; - } - continue; - default: - operator = parseOperator(filterString, p); - continue; - case ']': - } - break; - } while(true); - // Skip the ending square bracket - if(filterString.charAt(p++) !== "]") { - // Missing ] in filter expression - return undefined; - } - // Return the parsing position - return p; -} - -function reportFilterOperation(filterString, callback, p, context, options) { - var nextBracketPos, operator; - // Skip the starting square bracket - if(filterString.charAt(p++) !== "[") { - // Missing [ in filter expression - return undefined; - } - operator = parseOperator(filterString, p); - // Process each operator in turn - do { - if (operator === undefined) { - return undefined; - } - p = operator.opStart; - switch (operator.bracket) { - case "{": // Curly brackets - nextBracketPos = filterString.indexOf("}",p); - var operand = filterString.substring(p,nextBracketPos); - // Just report it - refHandler.report(operand, function(title, blurb) { - callback(title, operatorBlurb(operator, '{' + (blurb || '') + '}')); - }, options); - break; - case "[": // Square brackets - nextBracketPos = filterString.indexOf("]",p); - var operand = filterString.substring(p,nextBracketPos); - // Check if this is a relevant operator - var handler = fieldType(context, operator); - if (!handler) { - // This operator isn't managed. Bye. - break; - } - // We just have to report it. Nothing more. - handler.report(operand, function(title, blurb) { - callback(title, operatorBlurb(operator, '[' + (blurb || '') + ']')); - }, options); - break; - - case "<": // Angle brackets - nextBracketPos = filterString.indexOf(">",p); - break; - case "/": // regexp brackets - var rex = /^((?:[^\\\/]*|\\.)*)\/(?:\(([mygi]+)\))?/g, - rexMatch = rex.exec(filterString.substring(p)); - if(rexMatch) { - nextBracketPos = p + rex.lastIndex - 1; - } - else { - // Unterminated regular expression - return undefined; - } - break; - } - - if(nextBracketPos === -1) { - // Missing closing bracket in filter expression - return undefined; - } - p = nextBracketPos + 1; - // Check for multiple operands - switch (filterString.charAt(p)) { - case ',': - p++; - if(/^[\[\{<\/]/.test(filterString.substring(p))) { - operator.bracket = filterString.charAt(p); - operator.opStart = p + 1; - operator.index++; - } else { - return undefined; - } - continue; - default: - operator = parseOperator(filterString, p); - continue; - case ']': - } - break; - } while(true); - // Skip the ending square bracket - if(filterString.charAt(p++) !== "]") { - // Missing ] in filter expression - return undefined; - } - // Return the parsing position - return p; -} - -function parseOperator(filterString, p) { - var nextBracketPos, operator = {index: 1}; - // Check for an operator prefix - if(filterString.charAt(p) === "!") { - operator.prefix = "!"; - p++; - } - // Get the operator name - nextBracketPos = filterString.substring(p).search(/[\[\{<\/]/); - if(nextBracketPos === -1) { - // Missing [ in filter expression - return undefined; - } - nextBracketPos += p; - operator.bracket = filterString.charAt(nextBracketPos); - operator.operator = filterString.substring(p,nextBracketPos); - - // Any suffix? - var colon = operator.operator.indexOf(':'); - if(colon > -1) { - operator.suffix = operator.operator.substring(colon + 1); - operator.operator = operator.operator.substring(0,colon) || "field"; - } - // Empty operator means: title - else if(operator.operator === "") { - operator.operator = "title"; - operator.default = true; - } - operator.opStart = nextBracketPos + 1; - return operator; -}; - -function operatorBlurb(operator, enquotedOperand) { - var suffix = operator.suffix ? (':' + operator.suffix) : ''; - // commas to indicate which number operand - suffix += (new Array(operator.index)).join(','); - var op = operator.default ? '' : operator.operator; - return '[' + (operator.prefix || '') + op + suffix + enquotedOperand + ']'; -}; - -// Returns the relinker needed for a given operator, or returns undefined. -function fieldType(context, operator) { - return (operator.suffix && - context.getOperator(operator.operator + ':' + operator.suffix, operator.index)) || - context.getOperator(operator.operator, operator.index); -}; - -function canBePrettyOperand(value) { - return value.indexOf(']') < 0; -}; - -function canBeInBraces(value) { - return value.indexOf("}}}") < 0 && value.substr(value.length-2) !== '}}'; -}; diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_html.js b/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_html.js deleted file mode 100644 index 56ef61e..0000000 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_html.js +++ /dev/null @@ -1,251 +0,0 @@ -/*\ -module-type: relinkwikitextrule - -Handles replacement in attributes of widgets and html elements -This is configurable to select exactly which attributes of which elements -should be changed. - -<$link to="TiddlerTitle" /> - -\*/ - -var utils = require("./utils.js"); -var Rebuilder = require("$:/plugins/flibbles/relink/js/utils/rebuilder"); -var relinkUtils = require('$:/plugins/flibbles/relink/js/utils.js'); -var refHandler = relinkUtils.getType('reference'); -var filterHandler = relinkUtils.getType('filter'); -var ImportContext = relinkUtils.getContext('import'); -var macrocall = require("./macrocall.js"); - -exports.name = "html"; - -exports.report = function(text, callback, options) { - var managedElement = this.parser.context.getAttribute(this.nextTag.tag); - var importFilterAttr; - var element = this.nextTag.tag; - for (var attributeName in this.nextTag.attributes) { - var attr = this.nextTag.attributes[attributeName]; - var nextEql = text.indexOf('=', attr.start); - // This is the rare case of changing tiddler - // "true" to something else when "true" is - // implicit, like <$link to /> We ignore those. - if (nextEql < 0 || nextEql > attr.end) { - continue; - } - if (this.nextTag.tag === "$importvariables" && attributeName === "filter") { - importFilterAttr = attr; - } - var oldLength, quotedValue = undefined, entry; - if (attr.type === "string") { - var handler = getAttributeHandler(this.parser.context, this.nextTag, attributeName, options); - if (!handler) { - // We don't manage this attribute. Bye. - continue; - } - handler.report(attr.value, function(title, blurb) { - if (blurb) { - callback(title, '<' + element + ' ' + attributeName + '="' + blurb + '" />'); - } else { - callback(title, '<' + element + ' ' + attributeName + ' />'); - } - }, options); - } else if (attr.type === "indirect") { - entry = refHandler.report(attr.textReference, function(title, blurb) { - callback(title, '<' + element + ' ' + attributeName + '={{' + (blurb || '') + '}} />'); - }, options); - } else if (attr.type === "filtered") { - entry = filterHandler.report(attr.filter, function(title, blurb) { - callback(title, '<' + element + ' ' + attributeName + '={{{' + blurb + '}}} />'); - }, options); - } else if (attr.type === "macro") { - var macro = attr.value; - entry = macrocall.reportAttribute(this.parser, macro, function(title, blurb) { - callback(title, '<' + element + ' ' + attributeName + '=' + blurb + ' />'); - }, options); - } - if (quotedValue === undefined) { - continue; - } - if (this.nextTag.tag === "$importvariables" && attributeName === "filter") { - // If this is an import variable filter, we gotta - // remember this new value when we import lower down. - importFilterAttr = quotedValue; - } - } - if (importFilterAttr) { - processImportFilter(this.parser, importFilterAttr, options); - } - this.parse(); -}; - -exports.relink = function(text, fromTitle, toTitle, options) { - var managedElement = this.parser.context.getAttribute(this.nextTag.tag), - builder = new Rebuilder(text, this.nextTag.start); - var importFilterAttr; - var widgetEntry = {}; - widgetEntry.attributes = Object.create(null); - widgetEntry.element = this.nextTag.tag; - for (var attributeName in this.nextTag.attributes) { - var attr = this.nextTag.attributes[attributeName]; - var nextEql = text.indexOf('=', attr.start); - // This is the rare case of changing tiddler - // "true" to something else when "true" is - // implicit, like <$link to /> We ignore those. - if (nextEql < 0 || nextEql > attr.end) { - continue; - } - if (this.nextTag.tag === "$importvariables" && attributeName === "filter") { - importFilterAttr = attr; - } - var oldLength, quotedValue = undefined, entry; - var nestedOptions = Object.create(options); - nestedOptions.settings = this.parser.context; - switch (attr.type) { - case 'string': - var handler = getAttributeHandler(this.parser.context, this.nextTag, attributeName, options); - if (!handler) { - // We don't manage this attribute. Bye. - continue; - } - entry = handler.relink(attr.value, fromTitle, toTitle, nestedOptions); - if (entry === undefined) { - continue; - } - if (entry.output) { - var quote = utils.determineQuote(text, attr); - oldLength = attr.value.length + (quote.length * 2); - quotedValue = utils.wrapAttributeValue(entry.output,quote); - if (quotedValue === undefined) { - // The value was unquotable. We need to make - // a macro in order to replace it. - if (!options.placeholder) { - // but we can't... - entry.impossible = true; - } else { - var value = options.placeholder.getPlaceholderFor(entry.output,handler.name) - quotedValue = "<<"+value+">>"; - } - } - } - break; - case 'indirect': - entry = refHandler.relinkInBraces(attr.textReference, fromTitle, toTitle, options); - if (entry === undefined) { - continue; - } - if (entry.output) { - // +4 for '{{' and '}}' - oldLength = attr.textReference.length + 4; - quotedValue = "{{"+entry.output+"}}"; - } - break; - case 'filtered': - entry = filterHandler.relinkInBraces(attr.filter, fromTitle, toTitle, options); - if (entry === undefined) { - continue; - } - if (entry.output) { - // +6 for '{{{' and '}}}' - oldLength = attr.filter.length + 6; - quotedValue = "{{{"+ entry.output +"}}}"; - } - break; - case 'macro': - var macro = attr.value; - entry = macrocall.relinkAttribute(this.parser, macro, text, fromTitle, toTitle, options); - if (entry === undefined) { - continue; - } - if (entry.output) { - // already includes '<<' and '>>' - oldLength = macro.end-macro.start; - quotedValue = entry.output; - } - } - if (entry.impossible) { - widgetEntry.impossible = true; - } - if (quotedValue === undefined) { - continue; - } - if (this.nextTag.tag === "$importvariables" && attributeName === "filter") { - // If this is an import variable filter, we gotta - // remember this new value when we import lower down. - importFilterAttr = quotedValue; - } - // We count backwards from the end to preserve whitespace - var valueStart = attr.end - oldLength; - builder.add(quotedValue, valueStart, attr.end); - } - if (importFilterAttr) { - processImportFilter(this.parser, importFilterAttr, options); - } - var tag = this.parse()[0]; - if (tag.children) { - for (var i = 0; i < tag.children.length; i++) { - var child = tag.children[i]; - if (child.output) { - builder.add(child.output, child.start, child.end); - } - if (child.impossible) { - widgetEntry.impossible = true; - } - } - } - if (builder.changed() || widgetEntry.impossible) { - widgetEntry.output = builder.results(this.parser.pos); - return widgetEntry; - } - return undefined; -}; - -/** Returns the field handler for the given attribute of the given widget. - * If this returns undefined, it means we don't handle it. So skip. - */ -function getAttributeHandler(context, widget, attributeName, options) { - if (widget.tag === "$macrocall") { - var nameAttr = widget.attributes["$name"]; - if (nameAttr) { - var macro = context.getMacro(nameAttr.value); - if (macro) { - return macro[attributeName]; - } - } - } else { - var element = context.getAttribute(widget.tag); - if (element) { - return element[attributeName]; - } - } - return undefined; -}; - -function computeAttribute(context, attribute, options) { - var value; - if(attribute.type === "filtered") { - var parentWidget = context.widget; - value = options.wiki.filterTiddlers(attribute.filter,parentWidget)[0] || ""; - } else if(attribute.type === "indirect") { - var parentWidget = context.widget; - value = options.wiki.getTextReference(attribute.textReference,"",parentWidget.variables.currentTiddler.value); - } else if(attribute.type === "macro") { - var parentWidget = context.widget; - value = parentWidget.getVariable(attribute.value.name,{params: attribute.value.params}); - } else { // String attribute - value = attribute.value; - } - return value; -}; - -// This processes a <$importvariables> filter attribute and adds any new -// variables to our parser. -function processImportFilter(parser, importAttribute, options) { - if (typeof importAttribute === "string") { - // It was changed. Reparse it. It'll be a quoted - // attribute value. Add a dummy attribute name. - importAttribute = $tw.utils.parseAttribute("p="+importAttribute, 0) - } - var context = parser.context; - var importFilter = computeAttribute(context, importAttribute, options); - parser.context = new ImportContext(options.wiki, context, importFilter); -}; diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_macrocall.js b/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_macrocall.js deleted file mode 100644 index d5af779..0000000 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_macrocall.js +++ /dev/null @@ -1,353 +0,0 @@ -/*\ -module-type: relinkwikitextrule - -Handles macro calls. - -<> - -\*/ - -var utils = require("./utils.js"); -var Rebuilder = require("$:/plugins/flibbles/relink/js/utils/rebuilder"); -var EntryNode = require('$:/plugins/flibbles/relink/js/utils/entry'); - -exports.name = ["macrocallinline", "macrocallblock"]; - -// Error thrown when a macro's definition is needed, but can't be found. -function CannotFindMacroDef() {}; -CannotFindMacroDef.prototype.impossible = true; -CannotFindMacroDef.prototype.name = "macroparam"; -// Failed relinks due to missing definitions aren't reported for now. -// I may want to do something special later on. -CannotFindMacroDef.prototype.report = function() { return []; }; - -exports.report = function(text, callback, options) { - var macroInfo = getInfoFromRule(this); - this.parser.pos = macroInfo.end; - this.reportAttribute(this.parser, macroInfo, callback, options); -}; - -exports.relink = function(text, fromTitle, toTitle, options) { - var macroInfo = getInfoFromRule(this); - var managedMacro = this.parser.context.getMacro(macroInfo.name); - this.parser.pos = macroInfo.end; - if (!managedMacro) { - // We don't manage this macro. Bye. - return undefined; - } - var mayBeWidget = this.parser.context.allowWidgets(); - var names = getParamNames(this.parser, macroInfo.name, macroInfo.params, options); - if (names === undefined) { - // Needed the definition, and couldn't find it. So if a single - // parameter needs to placeholder, just fail. - mayBeWidget = false; - } - var entry = relinkMacroInvocation(this.parser, macroInfo, text, fromTitle, toTitle, mayBeWidget, options); - if (entry && entry.output) { - entry.output = macroToString(entry.output, text, names, options); - } - return entry; -}; - -/** Relinks macros that occur as attributes, like <$element attr=<<...>> /> - * Processes the same, except it can't downgrade into a widget if the title - * is complicated. - */ -exports.relinkAttribute = function(parser, macro, text, fromTitle, toTitle, options) { - var entry = relinkMacroInvocation(parser, macro, text, fromTitle, toTitle, false, options); - if (entry && entry.output) { - entry.output = macroToStringMacro(entry.output, text, options); - } - return entry; -}; - -/** As in, report a macrocall invocation that is an html attribute. */ -exports.reportAttribute = function(parser, macro, callback, options) { - var managedMacro = parser.context.getMacro(macro.name); - if (!managedMacro) { - // We don't manage this macro. Bye. - return undefined; - } - for (var managedArg in managedMacro) { - var index; - try { - index = getParamIndexWithinMacrocall(parser, macro.name, managedArg, macro.params, options); - } catch (e) { - continue; - } - if (index < 0) { - // The argument was not supplied. Move on to next. - continue; - } - var param = macro.params[index]; - var handler = managedMacro[managedArg]; - var nestedOptions = Object.create(options); - nestedOptions.settings = parser.context; - var entry = handler.report(param.value, function(title, blurb) { - var rtn = managedArg; - if (blurb) { - rtn += ': "' + blurb + '"'; - } - callback(title, '<<' + macro.name + ' ' + rtn + '>>'); - }, nestedOptions); - } -}; - -/**Processes the given macro, - * macro: {name:, params:, start:, end:} - * each parameters: {name:, end:, value:} - * Macro invocation returned is the same, but relinked, and may have new keys: - * parameters: {type: macro, start:, newValue: (quoted replacement value)} - * Output of the returned entry isn't a string, but a macro object. It needs - * to be converted. - */ -function relinkMacroInvocation(parser, macro, text, fromTitle, toTitle, mayBeWidget, options) { - var managedMacro = parser.context.getMacro(macro.name); - var modified = false; - if (!managedMacro) { - // We don't manage this macro. Bye. - return undefined; - } - var outMacro = $tw.utils.extend({}, macro); - var macroEntry = {}; - outMacro.params = macro.params.slice(); - for (var managedArg in managedMacro) { - var index; - try { - index = getParamIndexWithinMacrocall(parser, macro.name, managedArg, macro.params, options); - } catch (e) { - if (e instanceof CannotFindMacroDef) { - macroEntry.impossible = true; - continue; - } - } - if (index < 0) { - // this arg either was not supplied, or we can't find - // the definition, so we can't tie it to an anonymous - // argument. Either way, move on to the next. - continue; - } - var param = macro.params[index]; - var handler = managedMacro[managedArg]; - var nestedOptions = Object.create(options); - nestedOptions.settings = parser.context; - var entry = handler.relink(param.value, fromTitle, toTitle, nestedOptions); - if (entry === undefined) { - continue; - } - // Macro parameters can only be string parameters, not - // indirect, or macro, or filtered - if (entry.impossible) { - macroEntry.impossible = true; - } - if (!entry.output) { - continue; - } - var quote = utils.determineQuote(text, param); - var quoted = utils.wrapParameterValue(entry.output, quote); - var newParam = $tw.utils.extend({}, param); - if (quoted === undefined) { - if (!mayBeWidget || !options.placeholder) { - macroEntry.impossible = true; - continue; - } - var ph = options.placeholder.getPlaceholderFor(entry.output,handler.name); - newParam.newValue = "<<"+ph+">>"; - newParam.type = "macro"; - } else { - newParam.start = newParam.end - (newParam.value.length + (quote.length*2)); - newParam.value = entry.output; - newParam.newValue = quoted; - } - outMacro.params[index] = newParam; - modified = true; - } - if (modified || macroEntry.impossible) { - if (modified) { - macroEntry.output = outMacro; - } - return macroEntry; - } - return undefined; -}; - -function getInfoFromRule(rule) { - // Get all the details of the match - var macroInfo = rule.nextCall; - if (!macroInfo) { - // rule.match is used "; - } else { - return macroToStringMacro(macro, text, options); - } -}; - -function macroToStringMacro(macro, text, options) { - var builder = new Rebuilder(text, macro.start); - for (var i = 0; i < macro.params.length; i++) { - var param = macro.params[i]; - if (param.newValue) { - builder.add(param.newValue, param.start, param.end); - } - } - return builder.results(macro.end); -}; - -/** Returns -1 if param definitely isn't in macrocall. - */ -function getParamIndexWithinMacrocall(parser, macroName, param, params, options) { - var index, i, anonsExist = false; - for (i = 0; i < params.length; i++) { - var name = params[i].name; - if (name === param) { - return i; - } - if (name === undefined) { - anonsExist = true; - } - } - if (!anonsExist) { - // If no anonymous parameters are present, and we didn't find - // it among the named ones, it must not be there. - return -1; - } - var expectedIndex = indexOfParameterDef(parser, macroName, param, options); - // We've got to skip over all the named parameter instances. - if (expectedIndex >= 0) { - var anonI = 0; - for (i = 0; i < params.length; i++) { - if (params[i].name === undefined) { - if (anonI === expectedIndex) { - return i; - } - anonI++; - } else { - var indexOfOther = indexOfParameterDef(parser, macroName, params[i].name, options); - if (indexOfOther < expectedIndex) { - anonI++; - } - } - } - } - return -1; -}; - -// Looks up the definition of a macro, and figures out what the expected index -// is for the given parameter. -function indexOfParameterDef(parser, macroName, paramName, options) { - var def = parser.context.getMacroDefinition(macroName); - if (def === undefined) { - throw new CannotFindMacroDef(); - } - var params = def.params || []; - for (var i = 0; i < params.length; i++) { - if (params[i].name === paramName) { - return i; - } - } - return -1; -}; - -function getParamNames(parser, macroName, params, options) { - var used = Object.create(null); - var rtn = new Array(params.length); - var anonsExist = false; - var i; - for (i = 0; i < params.length; i++) { - var name = params[i].name; - if (name) { - rtn[i] = name; - used[name] = true; - } else { - anonsExist = true; - } - } - if (anonsExist) { - var def = parser.context.getMacroDefinition(macroName); - if (def === undefined) { - // If there are anonymous parameters, and we can't - // find the definition, then we can't hope to create - // a widget. - return undefined; - } - var defParams = def.params || []; - var defPtr = 0; - for (i = 0; i < params.length; i++) { - if (rtn[i] === undefined) { - while(defPtr < defParams.length && used[defParams[defPtr].name]) { - defPtr++; - } - if (defPtr >= defParams.length) { - break; - } - rtn[i] = defParams[defPtr].name; - used[defParams[defPtr].name] = true; - } - } - } - return rtn; -}; - -function parseParams(paramString, pos) { - var params = [], - reParam = /\s*(?:([A-Za-z0-9\-_]+)\s*:)?(?:\s*(?:"""([\s\S]*?)"""|"([^"]*)"|'([^']*)'|\[\[([^\]]*)\]\]|([^"'\s]+)))/mg, - paramMatch = reParam.exec(paramString); - while(paramMatch) { - // Process this parameter - var paramInfo = { }; - // We need to find the group match that isn't undefined. - for (var i = 2; i <= 6; i++) { - if (paramMatch[i] !== undefined) { - paramInfo.value = paramMatch[i]; - break; - } - } - if(paramMatch[1]) { - paramInfo.name = paramMatch[1]; - } - //paramInfo.start = pos; - paramInfo.end = reParam.lastIndex + pos; - params.push(paramInfo); - // Find the next match - paramMatch = reParam.exec(paramString); - } - return params; -}; diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_ui_stylesheet.css.meta b/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_ui_stylesheet.css.meta deleted file mode 100644 index f90c81f..0000000 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_ui_stylesheet.css.meta +++ /dev/null @@ -1,3 +0,0 @@ -tags: $:/tags/Stylesheet -title: $:/plugins/flibbles/relink/ui/stylesheet.css -type: text/css \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/config/DefaultColourMappings/relink-impossible.tid b/tzk/editions/tzk/plugins/relink/_system/config/DefaultColourMappings/relink-impossible.tid new file mode 100644 index 0000000..50a4f5e --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/DefaultColourMappings/relink-impossible.tid @@ -0,0 +1,3 @@ +title: $:/config/DefaultColourMappings/relink-impossible + +<> \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_PluginLibrary.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/PluginLibrary.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_PluginLibrary.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/PluginLibrary.tid diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-deletefield/$tiddler.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-deletefield/$tiddler.tid new file mode 100644 index 0000000..5fcbe9e --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-deletefield/$tiddler.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/attributes/$action-deletefield/$tiddler + +filter \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-deletetiddler/$filter.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-deletetiddler/$filter.tid new file mode 100644 index 0000000..64d12e9 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-deletetiddler/$filter.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/attributes/$action-deletetiddler/$filter + +filter \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-deletetiddler/$tiddler.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-deletetiddler/$tiddler.tid new file mode 100644 index 0000000..c571117 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-deletetiddler/$tiddler.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/attributes/$action-deletetiddler/$tiddler + +title \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-listops/$filter.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-listops/$filter.tid new file mode 100644 index 0000000..11ee350 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-listops/$filter.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/attributes/$action-listops/$filter + +filter \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-listops/$tiddler.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-listops/$tiddler.tid new file mode 100644 index 0000000..bd01519 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-listops/$tiddler.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/attributes/$action-listops/$tiddler + +title \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-log/$$filter.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-log/$$filter.tid new file mode 100644 index 0000000..1191e70 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-log/$$filter.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/attributes/$action-log/$$filter + +filter \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-navigate/$to.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-navigate/$to.tid new file mode 100644 index 0000000..b89c139 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-navigate/$to.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/attributes/$action-navigate/$to + +title \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-popup/$state.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-popup/$state.tid new file mode 100644 index 0000000..99a46d9 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-popup/$state.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/attributes/$action-popup/$state + +title \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-sendmessage/$names.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-sendmessage/$names.tid new file mode 100644 index 0000000..94d4ba3 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-sendmessage/$names.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/attributes/$action-sendmessage/$names + +filter \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-sendmessage/$values.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-sendmessage/$values.tid new file mode 100644 index 0000000..1d428eb --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-sendmessage/$values.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/attributes/$action-sendmessage/$values + +filter \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-setfield/$tiddler.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-setfield/$tiddler.tid new file mode 100644 index 0000000..70787e3 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-setfield/$tiddler.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/attributes/$action-setfield/$tiddler + +title \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-setmultiplefields/$fields.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-setmultiplefields/$fields.tid new file mode 100644 index 0000000..8ee8a0d --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-setmultiplefields/$fields.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/attributes/$action-setmultiplefields/$fields + +filter \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-setmultiplefields/$indexes.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-setmultiplefields/$indexes.tid new file mode 100644 index 0000000..4739d30 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-setmultiplefields/$indexes.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/attributes/$action-setmultiplefields/$indexes + +filter \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-setmultiplefields/$tiddler.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-setmultiplefields/$tiddler.tid new file mode 100644 index 0000000..3eb56f1 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-setmultiplefields/$tiddler.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/attributes/$action-setmultiplefields/$tiddler + +title \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-setmultiplefields/$values.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-setmultiplefields/$values.tid new file mode 100644 index 0000000..5b0c63b --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$action-setmultiplefields/$values.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/attributes/$action-setmultiplefields/$values + +filter \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$button/actions.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$button/actions.tid new file mode 100644 index 0000000..5c4fc59 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$button/actions.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/attributes/$button/actions + +wikitext \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$button_set.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$button/set.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$button_set.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$button/set.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$button_setTo.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$button/setTo.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$button_setTo.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$button/setTo.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$button_to.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$button/to.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$button_to.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$button/to.tid diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$checkbox/actions.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$checkbox/actions.tid new file mode 100644 index 0000000..bae4122 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$checkbox/actions.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/attributes/$checkbox/actions + +wikitext \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$checkbox/checkactions.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$checkbox/checkactions.tid new file mode 100644 index 0000000..c5f2165 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$checkbox/checkactions.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/attributes/$checkbox/checkactions + +wikitext \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$checkbox_tag.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$checkbox/tag.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$checkbox_tag.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$checkbox/tag.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$checkbox_tiddler.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$checkbox/tiddler.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$checkbox_tiddler.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$checkbox/tiddler.tid diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$checkbox/uncheckactions.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$checkbox/uncheckactions.tid new file mode 100644 index 0000000..26fa3c0 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$checkbox/uncheckactions.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/attributes/$checkbox/uncheckactions + +wikitext \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$count_filter.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$count/filter.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$count_filter.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$count/filter.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$draggable_filter.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$draggable/filter.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$draggable_filter.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$draggable/filter.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$draggable_tiddler.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$draggable/tiddler.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$draggable_tiddler.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$draggable/tiddler.tid diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$droppable/actions.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$droppable/actions.tid new file mode 100644 index 0000000..151c845 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$droppable/actions.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/attributes/$droppable/actions + +wikitext \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$dropzone/actions.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$dropzone/actions.tid new file mode 100644 index 0000000..8b0906b --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$dropzone/actions.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/attributes/$dropzone/actions + +wikitext \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$edit-bitmap_tiddler.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$edit-bitmap/tiddler.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$edit-bitmap_tiddler.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$edit-bitmap/tiddler.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$edit-text_tiddler.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$edit-text/tiddler.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$edit-text_tiddler.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$edit-text/tiddler.tid diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$edit/inputActions.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$edit/inputActions.tid new file mode 100644 index 0000000..bbcaf07 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$edit/inputActions.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/attributes/$edit/inputActions + +wikitext \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$edit/refreshTitle.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$edit/refreshTitle.tid new file mode 100644 index 0000000..42b9f07 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$edit/refreshTitle.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/attributes/$edit/refreshTitle + +title \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$edit_tiddler.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$edit/tiddler.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$edit_tiddler.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$edit/tiddler.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$encrypt_filter.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$encrypt/filter.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$encrypt_filter.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$encrypt/filter.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$fieldmangler_tiddler.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$fieldmangler/tiddler.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$fieldmangler_tiddler.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$fieldmangler/tiddler.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$fields_tiddler.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$fields/tiddler.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$fields_tiddler.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$fields/tiddler.tid diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$genesis/$names.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$genesis/$names.tid new file mode 100644 index 0000000..e902849 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$genesis/$names.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/attributes/$genesis/$names + +filter \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$genesis/$values.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$genesis/$values.tid new file mode 100644 index 0000000..272e5a9 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$genesis/$values.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/attributes/$genesis/$values + +filter \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$image_source.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$image/source.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$image_source.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$image/source.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$importvariables_filter.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$importvariables/filter.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$importvariables_filter.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$importvariables/filter.tid diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$jsontiddler/tiddler.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$jsontiddler/tiddler.tid new file mode 100644 index 0000000..f13a6b4 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$jsontiddler/tiddler.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/attributes/$jsontiddler/tiddler + +title \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$keyboard/actions.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$keyboard/actions.tid new file mode 100644 index 0000000..316d234 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$keyboard/actions.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/attributes/$keyboard/actions + +wikitext \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$link_to.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$link/to.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$link_to.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$link/to.tid diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$link/tooltip.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$link/tooltip.tid new file mode 100644 index 0000000..fbc97c3 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$link/tooltip.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/attributes/$link/tooltip + +wikitext \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$linkcatcher/actions.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$linkcatcher/actions.tid new file mode 100644 index 0000000..5fabc9e --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$linkcatcher/actions.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/attributes/$linkcatcher/actions + +wikitext \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$linkcatcher_set.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$linkcatcher/set.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$linkcatcher_set.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$linkcatcher/set.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$linkcatcher_to.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$linkcatcher/to.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$linkcatcher_to.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$linkcatcher/to.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$list_editTemplate.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$list/editTemplate.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$list_editTemplate.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$list/editTemplate.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$list_emptyMessage.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$list/emptyMessage.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$list_emptyMessage.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$list/emptyMessage.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$list_filter.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$list/filter.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$list_filter.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$list/filter.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$list_history.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$list/history.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$list_history.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$list/history.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$list_template.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$list/template.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$list_template.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$list/template.tid diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$log/$$filter.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$log/$$filter.tid new file mode 100644 index 0000000..3d741d2 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$log/$$filter.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/attributes/$log/$$filter + +filter \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$messagecatcher/actions.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$messagecatcher/actions.tid new file mode 100644 index 0000000..890e08e --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$messagecatcher/actions.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/attributes/$messagecatcher/actions + +wikitext \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$navigator_history.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$navigator/history.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$navigator_history.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$navigator/history.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$navigator_story.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$navigator/story.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$navigator_story.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$navigator/story.tid diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$radio/actions.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$radio/actions.tid new file mode 100644 index 0000000..0b59f73 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$radio/actions.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/attributes/$radio/actions + +wikitext \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$radio_tiddler.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$radio/tiddler.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$radio_tiddler.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$radio/tiddler.tid diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$range/actions.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$range/actions.tid new file mode 100644 index 0000000..5254dd0 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$range/actions.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/attributes/$range/actions + +wikitext \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$range/actionsStart.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$range/actionsStart.tid new file mode 100644 index 0000000..88d6407 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$range/actionsStart.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/attributes/$range/actionsStart + +wikitext \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$range/actionsStop.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$range/actionsStop.tid new file mode 100644 index 0000000..396d3f7 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$range/actionsStop.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/attributes/$range/actionsStop + +wikitext \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$range_tiddler.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$range/tiddler.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$range_tiddler.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$range/tiddler.tid diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$reveal/state.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$reveal/state.tid new file mode 100644 index 0000000..523bfa3 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$reveal/state.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/attributes/$reveal/state + +reference \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$reveal_stateTitle.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$reveal/stateTitle.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$reveal_stateTitle.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$reveal/stateTitle.tid diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$select/actions.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$select/actions.tid new file mode 100644 index 0000000..4ad2522 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$select/actions.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/attributes/$select/actions + +wikitext \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$select_tiddler.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$select/tiddler.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$select_tiddler.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$select/tiddler.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$set_filter.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$set/filter.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$set_filter.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$set/filter.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$set_subtiddler.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$set/subtiddler.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$set_subtiddler.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$set/subtiddler.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$set_tiddler.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$set/tiddler.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$set_tiddler.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$set/tiddler.tid diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$setmultiplevariables/$names.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$setmultiplevariables/$names.tid new file mode 100644 index 0000000..66173d7 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$setmultiplevariables/$names.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/attributes/$setmultiplevariables/$names + +filter \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$setmultiplevariables/$values.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$setmultiplevariables/$values.tid new file mode 100644 index 0000000..d011729 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$setmultiplevariables/$values.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/attributes/$setmultiplevariables/$values + +filter \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$setvariable_filter.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$setvariable/filter.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$setvariable_filter.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$setvariable/filter.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$setvariable_subtiddler.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$setvariable/subtiddler.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$setvariable_subtiddler.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$setvariable/subtiddler.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$setvariable_tiddler.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$setvariable/tiddler.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$setvariable_tiddler.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$setvariable/tiddler.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$tiddler_tiddler.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$tiddler/tiddler.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$tiddler_tiddler.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$tiddler/tiddler.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$transclude_subtiddler.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$transclude/subtiddler.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$transclude_subtiddler.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$transclude/subtiddler.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$transclude_tiddler.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$transclude/tiddler.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$transclude_tiddler.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$transclude/tiddler.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$view_subtiddler.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$view/subtiddler.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$view_subtiddler.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$view/subtiddler.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$view_tiddler.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$view/tiddler.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_attributes_$view_tiddler.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$view/tiddler.tid diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$wikify/text.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$wikify/text.tid new file mode 100644 index 0000000..cbdeb3d --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/attributes/$wikify/text.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/attributes/$wikify/text + +wikitext \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/fieldattributes/$action-createtiddler.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/fieldattributes/$action-createtiddler.tid new file mode 100644 index 0000000..fa90ab0 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/fieldattributes/$action-createtiddler.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/fieldattributes/$action-createtiddler + +([^$].*) \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/fieldattributes/$action-deletefield.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/fieldattributes/$action-deletefield.tid new file mode 100644 index 0000000..33cf270 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/fieldattributes/$action-deletefield.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/fieldattributes/$action-deletefield + +([^$].*) \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/fieldattributes/$action-setfield.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/fieldattributes/$action-setfield.tid new file mode 100644 index 0000000..8ad7ec4 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/fieldattributes/$action-setfield.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/fieldattributes/$action-setfield + +([^$].*) \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/fieldattributes/$jsontiddler.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/fieldattributes/$jsontiddler.tid new file mode 100644 index 0000000..5f9f5d0 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/fieldattributes/$jsontiddler.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/fieldattributes/$jsontiddler + +\$(.*) \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_fields_caption.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/fields/caption.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_fields_caption.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/fields/caption.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_fields_filter.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/fields/filter.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_fields_filter.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/fields/filter.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_fields_list-after.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/fields/list-after.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_fields_list-after.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/fields/list-after.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_fields_list-before.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/fields/list-before.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_fields_list-before.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/fields/list-before.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_fields_list.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/fields/list.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_fields_list.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/fields/list.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_fields_tags.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/fields/tags.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_fields_tags.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/fields/tags.tid diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/colour-picker/actions.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/colour-picker/actions.tid new file mode 100644 index 0000000..d128819 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/colour-picker/actions.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/macros/colour-picker/actions + +wikitext \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_csvtiddlers_filter.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/csvtiddlers/filter.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_csvtiddlers_filter.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/csvtiddlers/filter.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_datauri_title.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/datauri/title.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_datauri_title.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/datauri/title.tid diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/image-picker/actions.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/image-picker/actions.tid new file mode 100644 index 0000000..147a163 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/image-picker/actions.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/macros/image-picker/actions + +wikitext \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_jsontiddler_title.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/jsontiddler/title.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_jsontiddler_title.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/jsontiddler/title.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_jsontiddlers_filter.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/jsontiddlers/filter.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_jsontiddlers_filter.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/jsontiddlers/filter.tid diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/keyboard-driven-input/configTiddlerFilter.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/keyboard-driven-input/configTiddlerFilter.tid new file mode 100644 index 0000000..69c2358 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/keyboard-driven-input/configTiddlerFilter.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/macros/keyboard-driven-input/configTiddlerFilter + +filter \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/keyboard-driven-input/inputAcceptActions.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/keyboard-driven-input/inputAcceptActions.tid new file mode 100644 index 0000000..2be78d3 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/keyboard-driven-input/inputAcceptActions.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/macros/keyboard-driven-input/inputAcceptActions + +wikitext \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/keyboard-driven-input/inputAcceptVariantActions.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/keyboard-driven-input/inputAcceptVariantActions.tid new file mode 100644 index 0000000..0c5dd72 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/keyboard-driven-input/inputAcceptVariantActions.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/macros/keyboard-driven-input/inputAcceptVariantActions + +wikitext \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/keyboard-driven-input/inputCancelActions.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/keyboard-driven-input/inputCancelActions.tid new file mode 100644 index 0000000..eda51b3 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/keyboard-driven-input/inputCancelActions.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/macros/keyboard-driven-input/inputCancelActions + +wikitext \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/keyboard-driven-input/selectionStateTitle.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/keyboard-driven-input/selectionStateTitle.tid new file mode 100644 index 0000000..e436306 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/keyboard-driven-input/selectionStateTitle.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/macros/keyboard-driven-input/selectionStateTitle + +title \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/keyboard-driven-input/storeTitle.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/keyboard-driven-input/storeTitle.tid new file mode 100644 index 0000000..50fca13 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/keyboard-driven-input/storeTitle.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/macros/keyboard-driven-input/storeTitle + +title \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/keyboard-driven-input/tiddler.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/keyboard-driven-input/tiddler.tid new file mode 100644 index 0000000..d9168a3 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/keyboard-driven-input/tiddler.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/macros/keyboard-driven-input/tiddler + +title \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_list-links-draggable_itemTemplate.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/list-links-draggable/itemTemplate.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_list-links-draggable_itemTemplate.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/list-links-draggable/itemTemplate.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_list-links-draggable_tiddler.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/list-links-draggable/tiddler.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_list-links-draggable_tiddler.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/list-links-draggable/tiddler.tid diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/list-links/emptyMessage.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/list-links/emptyMessage.tid new file mode 100644 index 0000000..1ca5fbe --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/list-links/emptyMessage.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/macros/list-links/emptyMessage + +wikitext \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_list-links_filter.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/list-links/filter.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_list-links_filter.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/list-links/filter.tid diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/list-tagged-draggable/emptyMessage.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/list-tagged-draggable/emptyMessage.tid new file mode 100644 index 0000000..b90efab --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/list-tagged-draggable/emptyMessage.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/macros/list-tagged-draggable/emptyMessage + +wikitext \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_list-tagged-draggable_itemTemplate.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/list-tagged-draggable/itemTemplate.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_list-tagged-draggable_itemTemplate.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/list-tagged-draggable/itemTemplate.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_list-tagged-draggable_tag.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/list-tagged-draggable/tag.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_list-tagged-draggable_tag.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/list-tagged-draggable/tag.tid diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/list-thumbnails/filter.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/list-thumbnails/filter.tid new file mode 100644 index 0000000..aba62a7 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/list-thumbnails/filter.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/macros/list-thumbnails/filter + +filter \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/tabs/actions.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/tabs/actions.tid new file mode 100644 index 0000000..582d4d8 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/tabs/actions.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/macros/tabs/actions + +wikitext \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_tabs_buttonTemplate.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/tabs/buttonTemplate.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_tabs_buttonTemplate.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/tabs/buttonTemplate.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_tabs_default.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/tabs/default.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_tabs_default.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/tabs/default.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_tabs_tabsList.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/tabs/tabsList.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_tabs_tabsList.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/tabs/tabsList.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_tabs_template.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/tabs/template.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_tabs_template.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/tabs/template.tid diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/tag-picker/actions.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/tag-picker/actions.tid new file mode 100644 index 0000000..93fe881 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/tag-picker/actions.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/macros/tag-picker/actions + +wikitext \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/tag-pill/actions.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/tag-pill/actions.tid new file mode 100644 index 0000000..25fa28e --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/tag-pill/actions.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/macros/tag-pill/actions + +wikitext \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_tag-pill_tag.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/tag-pill/tag.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_tag-pill_tag.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/tag-pill/tag.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_tag_tag.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/tag/tag.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_tag_tag.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/tag/tag.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_toc-expandable_exclude.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/toc-expandable/exclude.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_toc-expandable_exclude.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/toc-expandable/exclude.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_toc-expandable_itemClassFilter.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/toc-expandable/itemClassFilter.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_toc-expandable_itemClassFilter.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/toc-expandable/itemClassFilter.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_toc-expandable_tag.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/toc-expandable/tag.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_toc-expandable_tag.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/toc-expandable/tag.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_toc-selective-expandable_exclude.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/toc-selective-expandable/exclude.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_toc-selective-expandable_exclude.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/toc-selective-expandable/exclude.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_toc-selective-expandable_itemClassFilter.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/toc-selective-expandable/itemClassFilter.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_toc-selective-expandable_itemClassFilter.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/toc-selective-expandable/itemClassFilter.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_toc-selective-expandable_tag.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/toc-selective-expandable/tag.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_toc-selective-expandable_tag.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/toc-selective-expandable/tag.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_toc-tabbed-external-nav_missingText.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/toc-tabbed-external-nav/missingText.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_toc-tabbed-external-nav_missingText.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/toc-tabbed-external-nav/missingText.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_toc-tabbed-external-nav_selectedTiddler.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/toc-tabbed-external-nav/selectedTiddler.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_toc-tabbed-external-nav_selectedTiddler.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/toc-tabbed-external-nav/selectedTiddler.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_toc-tabbed-external-nav_tag.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/toc-tabbed-external-nav/tag.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_toc-tabbed-external-nav_tag.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/toc-tabbed-external-nav/tag.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_toc-tabbed-external-nav_template.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/toc-tabbed-external-nav/template.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_toc-tabbed-external-nav_template.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/toc-tabbed-external-nav/template.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_toc-tabbed-external-nav_unselectedText.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/toc-tabbed-external-nav/unselectedText.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_toc-tabbed-external-nav_unselectedText.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/toc-tabbed-external-nav/unselectedText.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_toc-tabbed-internal-nav_missingText.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/toc-tabbed-internal-nav/missingText.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_toc-tabbed-internal-nav_missingText.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/toc-tabbed-internal-nav/missingText.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_toc-tabbed-internal-nav_selectedTiddler.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/toc-tabbed-internal-nav/selectedTiddler.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_toc-tabbed-internal-nav_selectedTiddler.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/toc-tabbed-internal-nav/selectedTiddler.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_toc-tabbed-internal-nav_tag.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/toc-tabbed-internal-nav/tag.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_toc-tabbed-internal-nav_tag.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/toc-tabbed-internal-nav/tag.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_toc-tabbed-internal-nav_template.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/toc-tabbed-internal-nav/template.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_toc-tabbed-internal-nav_template.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/toc-tabbed-internal-nav/template.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_toc-tabbed-internal-nav_unselectedText.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/toc-tabbed-internal-nav/unselectedText.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_toc-tabbed-internal-nav_unselectedText.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/toc-tabbed-internal-nav/unselectedText.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_toc_itemClassFilter.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/toc/itemClassFilter.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_toc_itemClassFilter.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/toc/itemClassFilter.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_toc_tag.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/toc/tag.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_macros_toc_tag.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/macros/toc/tag.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_operators_field_title.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/operators/field_title.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_operators_field_title.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/operators/field_title.tid diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/operators/filter.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/operators/filter.tid new file mode 100644 index 0000000..37674ce --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/operators/filter.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/operators/filter + +filter \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_operators_list.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/operators/list.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_operators_list.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/operators/list.tid diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/operators/relink_report.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/operators/relink_report.tid new file mode 100644 index 0000000..e29cc5f --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/operators/relink_report.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/operators/relink:report + +title \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/operators/subfilter.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/operators/subfilter.tid new file mode 100644 index 0000000..7583401 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/operators/subfilter.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/operators/subfilter + +filter \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_operators_tag.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/operators/tag.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_operators_tag.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/operators/tag.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_operators_title.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/operators/title.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_operators_title.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/operators/title.tid diff --git a/tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_settings_default-type.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/settings/default-type.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__config_flibbles_relink_settings_default-type.tid rename to tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/settings/default-type.tid diff --git a/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/touch-modify.tid b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/touch-modify.tid new file mode 100644 index 0000000..56fb2be --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/config/flibbles/relink/touch-modify.tid @@ -0,0 +1,3 @@ +title: $:/config/flibbles/relink/touch-modify + +yes \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__core_ui_EditTemplate_title.tid b/tzk/editions/tzk/plugins/relink/_system/core/ui/EditTemplate/title.tid similarity index 83% rename from tzk/editions/tzk/plugins/relink/$__core_ui_EditTemplate_title.tid rename to tzk/editions/tzk/plugins/relink/_system/core/ui/EditTemplate/title.tid index 679da1f..bbd78d0 100644 --- a/tzk/editions/tzk/plugins/relink/$__core_ui_EditTemplate_title.tid +++ b/tzk/editions/tzk/plugins/relink/_system/core/ui/EditTemplate/title.tid @@ -1,6 +1,7 @@ tags: $:/tags/EditTemplate title: $:/core/ui/EditTemplate/title +\whitespace trim <$edit-text field="draft.title" class="tc-titlebar tc-edit-texteditor" focus="true" tabindex={{$:/config/EditTabIndex}}/> <$reveal state="!!draft.title" type="nomatch" text={{!!draft.of}} tag="div"> @@ -11,7 +12,7 @@ title: $:/core/ui/EditTemplate/title
    -{{$:/core/images/warning}} {{$:/language/EditTemplate/Title/BadCharacterWarning}} +{{$:/core/images/warning}} {{$:/language/EditTemplate/Title/BadCharacterWarning}}
    @@ -23,7 +24,7 @@ title: $:/core/ui/EditTemplate/title
    -{{$:/core/images/warning}} {{$:/language/EditTemplate/Title/Exists/Prompt}} +{{$:/core/images/warning}} {{$:/language/EditTemplate/Title/Exists/Prompt}}
    @@ -33,7 +34,7 @@ title: $:/core/ui/EditTemplate/title <$vars fromTitle={{!!draft.of}} toTitle={{!!draft.title}}> -<$checkbox tiddler="$:/config/RelinkOnRename" field="text" checked="yes" unchecked="no" default="no"> {{$:/language/EditTemplate/Title/Relink/Prompt}} +<$checkbox tiddler="$:/config/RelinkOnRename" field="text" checked="yes" unchecked="no" default="no"> {{$:/language/EditTemplate/Title/Relink/Prompt}} <$tiddler tiddler=<> > @@ -47,12 +48,16 @@ title: $:/core/ui/EditTemplate/title value="EditTemplate/Title/Impossibles/Prompt" emptyValue="EditTemplate/Title/References/Prompt" > <$reveal type="nomatch" state=<> text="show"> -<$button set=<> setTo="show" class="tc-btn-invisible">{{$:/core/images/right-arrow}} +<$button set=<> setTo="show" class="tc-btn-invisible"> +{{$:/core/images/right-arrow}} + <$macrocall $name=lingo title=<> /> <$reveal type="match" state=<> text="show"> -<$button set=<> setTo="hide" class="tc-btn-invisible">{{$:/core/images/down-arrow}} +<$button set=<> setTo="hide" class="tc-btn-invisible"> +{{$:/core/images/down-arrow}} + <$macrocall $name=lingo title=<> /> diff --git a/tzk/editions/tzk/plugins/relink/_system/language/Docs/PaletteColours/relink-impossible.tid b/tzk/editions/tzk/plugins/relink/_system/language/Docs/PaletteColours/relink-impossible.tid new file mode 100644 index 0000000..7aac861 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/language/Docs/PaletteColours/relink-impossible.tid @@ -0,0 +1,3 @@ +title: $:/language/Docs/PaletteColours/relink-impossible + +Relink link impossible \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__language_EditTemplate_Title_Impossibles_Prompt.tid b/tzk/editions/tzk/plugins/relink/_system/language/EditTemplate/Title/Impossibles/Prompt.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__language_EditTemplate_Title_Impossibles_Prompt.tid rename to tzk/editions/tzk/plugins/relink/_system/language/EditTemplate/Title/Impossibles/Prompt.tid diff --git a/tzk/editions/tzk/plugins/relink/$__language_EditTemplate_Title_References_Prompt.tid b/tzk/editions/tzk/plugins/relink/_system/language/EditTemplate/Title/References/Prompt.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__language_EditTemplate_Title_References_Prompt.tid rename to tzk/editions/tzk/plugins/relink/_system/language/EditTemplate/Title/References/Prompt.tid diff --git a/tzk/editions/tzk/plugins/relink/$__language_EditTemplate_Title_Relink_Prompt.tid b/tzk/editions/tzk/plugins/relink/_system/language/EditTemplate/Title/Relink/Prompt.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__language_EditTemplate_Title_Relink_Prompt.tid rename to tzk/editions/tzk/plugins/relink/_system/language/EditTemplate/Title/Relink/Prompt.tid diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/Filters/Missing.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/Filters/Missing.tid new file mode 100644 index 0000000..fc9e772 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/Filters/Missing.tid @@ -0,0 +1,4 @@ +description: {{$:/plugins/flibbles/relink/language/Filters/Missing}} +filter: [all[]!is[system]relink:references[]!is[tiddler]!is[shadow]!prefix[$:/tags/]sort[title]] -[[]] +tags: $:/tags/Filter +title: $:/plugins/flibbles/relink/Filters/Missing \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/Filters/Orphans.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/Filters/Orphans.tid new file mode 100644 index 0000000..ab62db8 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/Filters/Orphans.tid @@ -0,0 +1,4 @@ +description: {{$:/plugins/flibbles/relink/language/Filters/Orphans}} +filter: [relink:orphans[]!is[system]sort[title]] +tags: $:/tags/Filter +title: $:/plugins/flibbles/relink/Filters/Orphans \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_configuration.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/configuration.tid similarity index 93% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_configuration.tid rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/configuration.tid index 9b26b4c..eb1520d 100644 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_configuration.tid +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/configuration.tid @@ -1,5 +1,6 @@ title: $:/plugins/flibbles/relink/configuration +\whitespace trim
    <>
    diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_bulkops.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/bulkops.js similarity index 87% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_bulkops.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/bulkops.js index 1290fd7..0775e7a 100644 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_bulkops.js +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/bulkops.js @@ -21,6 +21,8 @@ exports.synchronous = true; // load-modules is when wikimethods are applied in // ``$:/core/modules/startup/load-modules.js`` exports.after = ['load-modules']; +// We come before commands because they may do renaming, or jasmine testing +exports.before = ['commands']; exports.startup = function() { $tw.Wiki.prototype.relinkTiddler = relinkTiddler; @@ -42,7 +44,7 @@ function relinkTiddler(fromTitle, toTitle, options) { for (var field in entries) { var entry = entries[field]; fails = fails || entry.impossible; - if (entry.output) { + if (entry.output !== undefined) { changes[field] = entry.output; update = true; } @@ -55,7 +57,8 @@ function relinkTiddler(fromTitle, toTitle, options) { console.log("Renaming '"+fromTitle+"' to '"+toTitle+"' in '" + title + "'"); var tiddler = this.getTiddler(title); - var newTiddler = new $tw.Tiddler(tiddler,changes,this.getModificationFields()) + var modifyField = utils.touchModifyField(this) ? this.getModificationFields() : undefined; + var newTiddler = new $tw.Tiddler(tiddler,changes,modifyField) newTiddler = $tw.hooks.invokeHook("th-relinking-tiddler",newTiddler,tiddler); this.addTiddler(newTiddler); // If the title changed, we need to perform a nested rename diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_bulkops.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/bulkops.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_bulkops.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/bulkops.js.meta diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_contexts_context.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/contexts/context.js similarity index 92% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_contexts_context.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/contexts/context.js index d801107..4343c59 100644 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_contexts_context.js +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/contexts/context.js @@ -31,6 +31,10 @@ Context.prototype.getAttributes = function() { return this.parent.getAttributes(); }; +Context.prototype.getConfig = function(category) { + return this.parent.getConfig(category); +}; + Context.prototype.getMacro = function(macroName) { return this.parent.getMacro(macroName); }; diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_contexts_context.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/contexts/context.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_contexts_context.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/contexts/context.js.meta diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_contexts_import.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/contexts/import.js similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_contexts_import.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/contexts/import.js diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_contexts_import.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/contexts/import.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_contexts_import.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/contexts/import.js.meta diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_contexts_tiddler.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/contexts/tiddler.js similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_contexts_tiddler.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/contexts/tiddler.js diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_contexts_tiddler.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/contexts/tiddler.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_contexts_tiddler.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/contexts/tiddler.js.meta diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_contexts_variable.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/contexts/variable.js similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_contexts_variable.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/contexts/variable.js diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_contexts_variable.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/contexts/variable.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_contexts_variable.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/contexts/variable.js.meta diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_contexts_whitelist.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/contexts/whitelist.js similarity index 67% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_contexts_whitelist.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/contexts/whitelist.js index d33b983..d7ea10d 100644 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_contexts_whitelist.js +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/contexts/whitelist.js @@ -10,6 +10,17 @@ var Context = require('./context').context; var prefix = "$:/config/flibbles/relink/"; +/**Factories define methods that create settings given config tiddlers. + * for factory method 'example', it will be called once for each: + * "$:/config/flibbles/relink/example/..." tiddler that exists. + * the argument "key" will be set to the contents of "..." + * + * The reason I build relink settings in this convoluted way is to minimize + * the number of times tiddlywiki has to run through EVERY tiddler looking + * for relink config tiddlers. + */ +var settingsGenerators = utils.getModulesByTypeAsHashmap('relinksetting', 'name'); + function WhitelistContext(wiki) { build(this, wiki); }; @@ -40,6 +51,10 @@ WhitelistContext.prototype.getFields = function() { return this.fields; }; +WhitelistContext.prototype.getConfig = function(category) { + return this[category]; +}; + WhitelistContext.prototype.getOperator = function(operatorName, operandIndex) { var op = this.operators[operatorName]; return op && op[operandIndex || 1]; @@ -82,68 +97,18 @@ WhitelistContext.prototype.hasImports = function(value) { return false; }; -/**Factories define methods that create settings given config tiddlers. - * for factory method 'example', it will be called once for each: - * "$:/config/flibbles/relink/example/..." tiddler that exists. - * the argument "key" will be set to the contents of "..." - * - * The reason I build relink settings in this convoluted way is to minimize - * the number of times tiddlywiki has to run through EVERY tiddler looking - * for relink config tiddlers. - * - * Also, by exporting "factories", anyone who extends relink can patch in - * their own factory methods to create settings that are generated exactly - * once per rename. - */ -var factories = { - attributes: function(attributes, data, key) { - var elem = root(key); - var attr = key.substr(elem.length+1); - attributes[elem] = attributes[elem] || Object.create(null); - attributes[elem][attr] = data; - }, - fields: function(fields, data, name) { - fields[name] = data; - }, - macros: function(macros, data, key) { - // We take the last index, not the first, because macro - // parameters can't have slashes, but macroNames can. - var name = dir(key); - var arg = key.substr(name.length+1); - macros[name] = macros[name] || Object.create(null); - macros[name][arg] = data; - }, - operators: function(operators, data, key) { - // We take the last index, not the first, because the operator - // may have a slash to indicate parameter number - var pair = key.split('/'); - var name = pair[0]; - data.key = key; - operators[name] = operators[name] || Object.create(null); - operators[name][pair[1] || 1] = data; - } -}; - function build(settings, wiki) { - for (var name in factories) { + for (var name in settingsGenerators) { settings[name] = Object.create(null); } wiki.eachShadowPlusTiddlers(function(tiddler, title) { if (title.substr(0, prefix.length) === prefix) { var remainder = title.substr(prefix.length); var category = root(remainder); - var factory = factories[category]; + var factory = settingsGenerators[category]; if (factory) { var name = remainder.substr(category.length+1); - var data = utils.getType(tiddler.fields.text.trim()); - if (data) { - data.source = title; - // Secret feature. You can access a config tiddler's - // fields from inside the fieldtype handler. Cool - // tricks can be done with this. - data.fields = tiddler.fields; - factory(settings[category], data, name); - } + factory.generate(settings[category], tiddler, name, wiki); } } }); @@ -158,15 +123,6 @@ function root(string) { } }; -/* Returns all but the last bit of a path. path/to/tiddler -> path/to - */ -function dir(string) { - var index = string.lastIndexOf('/'); - if (index >= 0) { - return string.substr(0, index); - } -} - /* Turns {dir: {file1: 'value1', file2: 'value2'}} * into {dir/file1: 'value1', dir/file2: 'value2'} */ diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_contexts_whitelist.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/contexts/whitelist.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_contexts_whitelist.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/contexts/whitelist.js.meta diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_contexts_widget.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/contexts/widget.js similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_contexts_widget.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/contexts/widget.js diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_contexts_widget.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/contexts/widget.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_contexts_widget.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/contexts/widget.js.meta diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_contexts_wikitext.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/contexts/wikitext.js similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_contexts_wikitext.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/contexts/wikitext.js diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_contexts_wikitext.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/contexts/wikitext.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_contexts_wikitext.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/contexts/wikitext.js.meta diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/fieldtypes/filter.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/fieldtypes/filter.js new file mode 100644 index 0000000..a4038c9 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/fieldtypes/filter.js @@ -0,0 +1,265 @@ +/*\ + +This specifies logic for updating filters to reflect title changes. + +\*/ + +var refHandler = require("$:/plugins/flibbles/relink/js/fieldtypes/reference"); +var Rebuilder = require("$:/plugins/flibbles/relink/js/utils/rebuilder"); +var utils = require('$:/plugins/flibbles/relink/js/utils.js'); +var filterRelinkers = utils.getModulesByTypeAsHashmap('relinkfilter', 'name'); + +exports.name = "filter"; + +exports.report = function(filter, callback, options) { + if (filter) { + try { + var parseTree = options.wiki.parseFilter(filter); + } catch (e) { + // It must have been malformed. Return without doing anything. + return; + } + for (var module in filterRelinkers) { + filterRelinkers[module].report(parseTree, callback, options); + } + } +}; + +/**Returns undefined if no change was made. + */ +exports.relink = function(filter, fromTitle, toTitle, options) { + var changed = false; + var results = {}; + var parseTree; + if (filter) { + try { + parseTree = options.wiki.parseFilter(filter); + } catch (e) { + // It must have been malformed. Return without doing anything. + return; + } + for (var module in filterRelinkers) { + var entry = filterRelinkers[module].relink(parseTree, fromTitle, toTitle, options); + if (entry) { + if (entry.changed) { + changed = true; + } + if (entry.impossible) { + results.impossible = true; + } + } + } + } + if (changed) { + builder = assembleFilterString(parseTree, filter, options); + results.output = builder.results(); + results.impossible = results.impossible || builder.impossible; + return results; + } + if (results.impossible) { + return results; + } + return undefined +}; + +function assembleFilterString(parseTree, oldFilter, options) { + var relinker = new Rebuilder(oldFilter), + wordBarrierRequired = false, + p = 0; + for (var i = 0; i < parseTree.length; i++) { + var start = $tw.utils.skipWhiteSpace(oldFilter, p); + if (start !== p) { + // There's some breathing room between this run and the last. + // We'll never need to insert space. + wordBarrierRequired = false; + p = start; + } + var run = parseTree[i]; + if (run.prefix) { + if (wordBarrierRequired) { + relinker.add(' ', p, p); + wordBarrierRequired = false; + } + p += run.prefix.length; + } + if (oldFilter[p] !== '[' + || (oldFilter[p+1] === '[' && run.operators.length === 1)) { + // It's a string title + var text = run.operators[0].operands[0].text, + end, + old; + switch (oldFilter[p]) { + case "'": + case '"': + // p + 1 to skip the first quote + // indexOf() + 1 to skip the last + end = oldFilter.indexOf(oldFilter[p], p+1) + 1; + old = oldFilter.substring(p+1, end-1); + break; + case '[': + end = oldFilter.indexOf(']', p); + old = oldFilter.substring(p+2, end); + // +2 to get past the ']]' + end += 2; + break; + default: + end = skipWord(oldFilter, p); + old = oldFilter.substring(p, end); + } + if (old !== text) { + var wrapped = wrapTitle(text, oldFilter[p] !== "[" ? oldFilter[p] : '', options); + if (wrapped !== undefined) { + // This is a no-quote title. If breathing room is required, + // add it. Also, we may need breathing room after it. + if (wordBarrierRequired && wrapped[0] !== "[") { + relinker.add(' ', p, p); + } + relinker.add(wrapped, p, end); + wordBarrierRequired = wrapped === text; + } else if (options.placeholder) { + var ph = options.placeholder.getPlaceholderFor(text); + relinker.add('[<' + ph + '>]', p, end); + } else { + relinker.impossible = true; + } + } else { + if (wordBarrierRequired && oldFilter[p] !== "[") { + relinker.add(' ', p, p); + } + wordBarrierRequired = oldFilter.indexOf(text) === p; + } + p = end; + } else { + wordBarrierRequired = false; + p++; + for (var j = 0; j < run.operators.length; j++) { + var operator = run.operators[j]; + var start = p; + for (var index = 0; index < operator.operands.length; index++) { + var operand = operator.operands[index], + skip = false; + end, + wrapped; + if (operand.indirect) { + p = oldFilter.indexOf('{', p); + end = oldFilter.indexOf('}', p+1); + wrapped = '{' + operand.text + '}'; + } else if (operand.variable) { + p = oldFilter.indexOf('<', p); + end = oldFilter.indexOf('>', p+1); + wrapped = '<' + operand.text + '>'; + } else if (operator.regexp) { + p = oldFilter.indexOf('/', p); + end = oldFilter.indexOf('/', p+1); + skip = true; + } else { + p = oldFilter.indexOf('[', p); + end = oldFilter.indexOf(']', p+1); + if (!canBePrettyOperand(operand.text) || (options.inBraces && operand.text.indexOf('}}}') >= 0)) { + if (options.placeholder) { + var ph = options.placeholder.getPlaceholderFor(operand.text, operand.handler); + wrapped = '<' + ph + '>'; + } else { + skip = true; + relinker.impossible = true; + } + } else { + wrapped = '[' + operand.text + ']'; + } + } + end++; // skip the closing brace + if (index === 0) { + // If this is the first operand, let's first recreate the operator signature in case it was changed at all. + relinker.add(operatorSignature(operator, oldFilter, start), start, p); + } + if (!skip) { + relinker.add(wrapped, p, end); + } + p = end; + } + } + p++; // Skip the closing brace; + } + } + return relinker; +}; + +function operatorSignature(operator, oldText, start) { + // If it's a title operand, try to determine if it was a shorthand. + var prefix = operator.prefix || ''; + var signature = prefix + ((operator.operator === 'title' && oldText[start + prefix.length] !== 't')? '': operator.operator); + if (operator.suffix) { + signature += ':' + operator.suffix; + } + return signature; +} + +function skipWord(source,pos) { + var c; + while(true) { + c = source.charAt(pos); + if((c !== "") && (c !== " ") && (c !== "\f") && (c !== "\n") + && (c !== "\r") && (c !== "\t") + && (c !== "\v")&& (c !== "\u00a0") // Ignores obscure unicode spaces + && (c !== "[") && (c !== "]")) { // Ignore brackets + pos++; + } else { + return pos; + } + } +}; + +/* Same as this.relink, except this has the added constraint that the return + * value must be able to be wrapped in curly braces. (i.e. '{{{...}}}') + */ +exports.relinkInBraces = function(filter, fromTitle, toTitle, options) { + var braceOptions = $tw.utils.extend({inBraces: true}, options); + var entry = this.relink(filter, fromTitle, toTitle, braceOptions); + if (entry && entry.output && !canBeInBraces(entry.output)) { + // It was possible, but it won't fit in braces, so we must give up + delete entry.output; + entry.impossible = true; + } + return entry; +}; + +function wrapTitle(value, preference, options) { + var choices = { + "": function(v) {return /^[^\s\[\]\}\+\-\~\=\:][^\s\[\]]*[^\s\[\]\}]$/.test(v); }, + "[": canBePrettyOperand, + "'": function(v) {return v.indexOf("'") < 0; }, + '"': function(v) {return v.indexOf('"') < 0; } + }; + var wrappers = { + "": function(v) {return v; }, + "[": function(v) {return "[["+v+"]]"; }, + "'": function(v) {return "'"+v+"'"; }, + '"': function(v) {return '"'+v+'"'; } + }; + if (options.inBraces && value.indexOf('}}}') >= 0) { + // In this particular case, it can't be wrapped in this filter, + // even if it would have worked within the context of the filter itself + return undefined; + } + if (!choices[preference]) { + preference = ''; + } + if (choices[preference](value)) { + return wrappers[preference](value); + } + for (var quote in choices) { + if (choices[quote](value)) { + return wrappers[quote](value); + } + } + // No quotes will work on this + return undefined; +} + +function canBePrettyOperand(value) { + return value.indexOf(']') < 0; +}; + +function canBeInBraces(value) { + return value.indexOf("}}}") < 0 && value.substr(value.length-2) !== '}}'; +}; diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_fieldtypes_filter.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/fieldtypes/filter.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_fieldtypes_filter.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/fieldtypes/filter.js.meta diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/fieldtypes/filter/operators.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/fieldtypes/filter/operators.js new file mode 100644 index 0000000..3f11034 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/fieldtypes/filter/operators.js @@ -0,0 +1,146 @@ +/*\ + +Handles reporting of filter operators. + +\*/ + +var refHandler = require("$:/plugins/flibbles/relink/js/fieldtypes/reference"); +var titleHandler = require("$:/plugins/flibbles/relink/js/fieldtypes/title"); +var macrocall = require("$:/plugins/flibbles/relink/js/utils/macrocall.js"); + +exports.name = "operators"; + +exports.report = function(filterParseTree, callback, options) { + for (var i = 0; i < filterParseTree.length; i++) { + var run = filterParseTree[i]; + for (var j = 0; j < run.operators.length; j++) { + var operator = run.operators[j]; + for (var index = 1; index <= operator.operands.length; index++) { + var operand = operator.operands[index-1]; + var display = operator.operator === 'title'? '': operator.operator; + if (operator.suffix) { + display += ':' + operator.suffix; + } + // Now add any commas if this is a later operand + for (var x = 1; x < index; x++) { + display += ','; + } + if (operand.indirect) { + refHandler.report(operand.text, function(title, blurb) { + callback(title, (run.prefix || '') + '[' + (operator.prefix || '') + display + '{' + (blurb || '') + '}]'); + }, options); + } else if (operand.variable) { + var macro = $tw.utils.parseMacroInvocation("<<"+operand.text+">>", 0); + macrocall.report(options.settings, macro, function(title, blurb) { + callback(title, (run.prefix || '') + '[' + (operator.prefix || '') + display + '<' + blurb + '>]'); + }, options); + continue; + } else if (operand.text) { + var handler = fieldType(options.settings, operator, index, options) + if (handler) { + handler.report(operand.text, function(title, blurb) { + if (blurb || !standaloneTitleRun(run)) { + callback(title, (run.prefix || '') + '[' + (operator.prefix || '') + display + '[' + (blurb || '') + ']]'); + } else { + callback(title, run.prefix); + } + }, options); + } + } + } + } + } +}; + +exports.relink = function(filterParseTree, fromTitle, toTitle, options) { + var output = {}; + for (var i = 0; i < filterParseTree.length; i++) { + var run = filterParseTree[i]; + for (var j = 0; j < run.operators.length; j++) { + var operator = run.operators[j]; + for (var index = 1; index <= operator.operands.length; index++) { + var operand = operator.operands[index-1], + entry = undefined; + if (operand.indirect) { + entry = refHandler.relinkInBraces(operand.text, fromTitle, toTitle, options); + } else if (operand.variable) { + entry = relinkMacro(options.settings, operand.text, fromTitle, toTitle, options); + } else if (operand.text) { + var handler = fieldType(options.settings, operator, index, options) + if (handler) { + entry = handler.relink(operand.text, fromTitle, toTitle, options); + if (entry && entry.output) { + operand.handler = handler.name; + } + } + } + if (entry) { + if (entry.output) { + output.changed = true; + operand.text = entry.output; + } + if (entry.impossible) { + output.impossible = true; + } + } + } + } + } + return output; +}; + +// Returns the relinker needed for a given operator, or returns undefined. +// This method should really be broken into three modules called relinkfilteroperator +function fieldType(context, operator, index, options) { + var op = operator.operator, + suffix = operator.suffix, + rtn = (suffix && context.getOperator(op + ':' + suffix, index)) + || context.getOperator(op, index); + if (!rtn && op === 'contains' && index == 1) { + // The 'contains' operator gets special handling + suffix = suffix || 'list'; + var handler = context.getFields()[suffix]; + if (handler && (handler.name === 'list' || handler.name === 'filter')) { + // Contains uses the title handler, but only if it's + // searching a 'list' or 'filter' field. + return titleHandler; + } + + } + if (!rtn && index == 1) { + // maybe it's a field operator? + rtn = (op === 'field' && context.getFields()[suffix]) + || (!suffix && !options.wiki.getFilterOperators()[op] && context.getFields()[op]); + } + return rtn; +}; + +function standaloneTitleRun(run) { + if (run.operators.length == 1) { + var op = run.operators[0]; + return op.operator === 'title' + && !op.prefix + && !op.suffix; + } + return false; +}; + +// Takes care of relinking a macro, as well as putting it back together. +function relinkMacro(context, text, fromTitle, toTitle, options) { + text = "<<" + text + ">>"; + var macro = $tw.utils.parseMacroInvocation(text, 0); + var entry = macrocall.relink(context, macro, text, fromTitle, toTitle, false, options); + if (entry && entry.output) { + var string = macrocall.reassemble(entry.output, text, options); + // We remove the surrounding brackets. + string = string.substring(2, string.length-2); + // And we make sure that no brackets remain + if (string.indexOf(">") >= 0) { + delete entry.output; + entry.impossible = true; + } else { + entry.output = string; + } + } + return entry; +}; diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/fieldtypes/filter/operators.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/fieldtypes/filter/operators.js.meta new file mode 100644 index 0000000..72a7555 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/fieldtypes/filter/operators.js.meta @@ -0,0 +1,3 @@ +module-type: relinkfilter +title: $:/plugins/flibbles/relink/js/fieldtypes/filter/operators.js +type: application/javascript \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_fieldtypes_list.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/fieldtypes/list.js similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_fieldtypes_list.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/fieldtypes/list.js diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_fieldtypes_list.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/fieldtypes/list.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_fieldtypes_list.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/fieldtypes/list.js.meta diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_fieldtypes_reference.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/fieldtypes/reference.js similarity index 57% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_fieldtypes_reference.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/fieldtypes/reference.js index eb987fc..40ee949 100644 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_fieldtypes_reference.js +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/fieldtypes/reference.js @@ -7,20 +7,16 @@ tiddlerTitle!!field tiddlerTitle##propertyIndex \*/ +var utils = require('$:/plugins/flibbles/relink/js/utils.js'); +var referenceOperators = utils.getModulesByTypeAsHashmap('relinkreference', 'name'); + exports.name = "reference"; exports.report = function(value, callback, options) { if (value) { - var reference = $tw.utils.parseTextReference(value), - title = reference.title, - blurb; - if (title) { - if (reference.field) { - blurb = '!!' + reference.field; - } else if (reference.index) { - blurb = '##' + reference.index; - } - callback(title, blurb); + var reference = $tw.utils.parseTextReference(value); + for (var operator in referenceOperators) { + referenceOperators[operator].report(reference, callback, options); } } }; @@ -28,15 +24,32 @@ exports.report = function(value, callback, options) { exports.relink = function(value, fromTitle, toTitle, options) { var entry; if (value) { + var impossible = false; + var modified = false; var reference = $tw.utils.parseTextReference(value); - if (reference.title === fromTitle) { - if (!exports.canBePretty(toTitle)) { - entry = {impossible: true}; - } else { - reference.title = toTitle; - entry = {output: exports.toString(reference)}; + for (var operator in referenceOperators) { + var result = referenceOperators[operator].relink(reference, fromTitle, toTitle, options); + if (result) { + if (result.impossible) { + impossible = true; + } + if (result.output) { + modified = true; + reference = result.output; + } } } + if (modified) { + if (exports.canBePretty(reference.title)) { + entry = {output: exports.toString(reference)}; + } else { + impossible = true; + } + } + if (impossible) { + entry = entry || {}; + entry.impossible = true; + } } return entry; }; @@ -46,7 +59,7 @@ exports.relink = function(value, fromTitle, toTitle, options) { */ exports.relinkInBraces = function(value, fromTitle, toTitle, options) { var log = this.relink(value, fromTitle, toTitle, options); - if (log && log.output && toTitle.indexOf("}") >= 0) { + if (log && log.output && log.output.indexOf("}") >= 0) { delete log.output; log.impossible = true; } diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_fieldtypes_reference.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/fieldtypes/reference.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_fieldtypes_reference.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/fieldtypes/reference.js.meta diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/fieldtypes/reference/title.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/fieldtypes/reference/title.js new file mode 100644 index 0000000..c3bc852 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/fieldtypes/reference/title.js @@ -0,0 +1,28 @@ +/*\ + +This handles the title inside of references. + +\*/ + +exports.name = 'title'; + +exports.report = function(reference, callback, options) { + var title = reference.title; + if (title) { + if (reference.field) { + callback(title, '!!' + reference.field); + } else if (reference.index) { + callback(title, '##' + reference.index); + } else { + callback(title); + } + } +}; + +exports.relink = function(reference, fromTitle, toTitle, options) { + if ($tw.utils.trim(reference.title) === fromTitle) { + // preserve user's whitespace + reference.title = reference.title.replace(fromTitle, toTitle); + return {output: reference}; + } +}; diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/fieldtypes/reference/title.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/fieldtypes/reference/title.js.meta new file mode 100644 index 0000000..6f9effd --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/fieldtypes/reference/title.js.meta @@ -0,0 +1,3 @@ +module-type: relinkreference +title: $:/plugins/flibbles/relink/js/fieldtypes/reference/title.js +type: application/javascript \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_fieldtypes_title.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/fieldtypes/title.js similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_fieldtypes_title.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/fieldtypes/title.js diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_fieldtypes_title.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/fieldtypes/title.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_fieldtypes_title.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/fieldtypes/title.js.meta diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_fieldtypes_wikitext.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/fieldtypes/wikitext.js similarity index 97% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_fieldtypes_wikitext.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/fieldtypes/wikitext.js index 26089d5..431cf53 100644 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_fieldtypes_wikitext.js +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/fieldtypes/wikitext.js @@ -108,8 +108,8 @@ WikiWalker.prototype.parseInlineRunTerminated = function(terminatorRegExp,option }; -WikiWalker.prototype.parseBlock = function(terminatorRegExp) { - var terminatorRegExp = /(\r?\n\r?\n)/mg; +WikiWalker.prototype.parseBlock = function(terminatorRegExpString) { + var terminatorRegExp = terminatorRegExpString ? new RegExp("(" + terminatorRegExpString + "|\\r?\\n\\r?\\n)","mg") : /(\r?\n\r?\n)/mg; this.skipWhitespace(); if (this.pos >= this.sourceLength) { return []; diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_fieldtypes_wikitext.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/fieldtypes/wikitext.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_fieldtypes_wikitext.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/fieldtypes/wikitext.js.meta diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_filteroperators_all_relinkable.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/filteroperators/all_relinkable.js similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_filteroperators_all_relinkable.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/filteroperators/all_relinkable.js diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_filteroperators_all_relinkable.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/filteroperators/all_relinkable.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_filteroperators_all_relinkable.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/filteroperators/all_relinkable.js.meta diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/filteroperators/orphans.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/filteroperators/orphans.js new file mode 100644 index 0000000..535e127 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/filteroperators/orphans.js @@ -0,0 +1,19 @@ +/*\ +module-type: relinkfilteroperator + +Filter function for [relink:orphans[]]. +Returns all tiddlers which are not referenced in any way + +\*/ + +(function() { + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +exports.orphans = function(source,prefix,options) { + return options.wiki.getRelinkOrphans(); +}; + +})(); diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/filteroperators/orphans.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/filteroperators/orphans.js.meta new file mode 100644 index 0000000..9bc423f --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/filteroperators/orphans.js.meta @@ -0,0 +1,3 @@ +module-type: relinkfilteroperator +title: $:/plugins/flibbles/relink/js/filteroperators/orphans.js +type: application/javascript \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_filteroperators_references.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/filteroperators/references.js similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_filteroperators_references.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/filteroperators/references.js diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_filteroperators_references.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/filteroperators/references.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_filteroperators_references.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/filteroperators/references.js.meta diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_filteroperators_relink.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/filteroperators/relink.js similarity index 92% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_filteroperators_relink.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/filteroperators/relink.js index 0da4387..4bc96d3 100644 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_filteroperators_relink.js +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/filteroperators/relink.js @@ -32,7 +32,7 @@ exports.relink = function(source,operator,options) { newOperator.suffix = suffixPair[1]; return relinkFilterOperator(source, newOperator, options); } else { - return [language.getString("Error/RelinkFilterOperator", options)]; + return [language.getString("text/plain", "Error/RelinkFilterOperator", options)]; } }; diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_filteroperators_relink.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/filteroperators/relink.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_filteroperators_relink.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/filteroperators/relink.js.meta diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_filteroperators_report.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/filteroperators/report.js similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_filteroperators_report.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/filteroperators/report.js diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_filteroperators_report.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/filteroperators/report.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_filteroperators_report.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/filteroperators/report.js.meta diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_filteroperators_signatures.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/filteroperators/signatures.js similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_filteroperators_signatures.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/filteroperators/signatures.js diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_filteroperators_signatures.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/filteroperators/signatures.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_filteroperators_signatures.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/filteroperators/signatures.js.meta diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_filteroperators_splitafter.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/filteroperators/splitafter.js similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_filteroperators_splitafter.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/filteroperators/splitafter.js diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_filteroperators_splitafter.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/filteroperators/splitafter.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_filteroperators_splitafter.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/filteroperators/splitafter.js.meta diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_filteroperators_wouldchange.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/filteroperators/wouldchange.js similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_filteroperators_wouldchange.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/filteroperators/wouldchange.js diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_filteroperators_wouldchange.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/filteroperators/wouldchange.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_filteroperators_wouldchange.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/filteroperators/wouldchange.js.meta diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_indexer.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/indexer.js similarity index 65% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_indexer.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/indexer.js index 8c50e55..5a74d04 100644 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_indexer.js +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/indexer.js @@ -24,7 +24,7 @@ Indexer.prototype.rebuild = function() { this.backIndex = null; this.contexts = Object.create(null); this.changedTiddlers = undefined; - this.lastRelinkFrom = undefined; + this.lastRelinks = Object.create(null); }; Indexer.prototype.update = function(updateDescriptor) { @@ -60,20 +60,41 @@ Indexer.prototype.reverseLookup = function(title) { Indexer.prototype.relinkLookup = function(fromTitle, toTitle, options) { this._upkeep(); var shortlist = undefined; - if (this.lastRelinkFrom === fromTitle) { - if (this.lastRelinkTo === toTitle) { + var lastRelink = this.lastRelinks[fromTitle]; + if (lastRelink) { + if (lastRelink.to === toTitle) { // We need to reintroduce the relink cache, where temporary info // was stored. - options.cache = this.lastRelinkCache; - return this.lastRelinkResult; + options.cache = lastRelink.cache; + return lastRelink.results; } - shortlist = Object.keys(this.lastRelinkResult); + shortlist = buildShortlist(lastRelink); } - this.lastRelinkResult = utils.getRelinkResults(this.wiki, fromTitle, toTitle, this.context, shortlist, options); - this.lastRelinkTo = toTitle; - this.lastRelinkFrom = fromTitle; - this.lastRelinkCache = options.cache; - return this.lastRelinkResult; + var results = utils.getRelinkResults(this.wiki, fromTitle, toTitle, this.context, shortlist, options); + if (Object.keys(this.lastRelinks).length > 3) { + // The cache got a little large. wipe it clean. + this.lastRelinks = Object.create(null); + } + this.lastRelinks[fromTitle] = { + from: fromTitle, + results: results, + to: toTitle, + cache: options.cache, + maybeRelevant: Object.create(null)}; + return results; +}; + +// Returns all tiddlers that don't have anything referencing it. +Indexer.prototype.orphans = function() { + this._upkeep(); + var results = []; + for (var title in this.index) { + if (!this.backIndex[title] + || Object.keys(this.backIndex[title]).length === 0) { + results.push(title); + } + } + return results; }; Indexer.prototype._upkeep = function() { @@ -97,7 +118,7 @@ Indexer.prototype._upkeep = function() { if (tiddlerContext.changed(this.changedTiddlers)) { this._purge(title); this._populate(title); - this._dropResults(title); + this._decacheRelink(title); // Wipe this change, so we don't risk updating it twice. this.changedTiddlers[title] = undefined; } @@ -107,7 +128,7 @@ Indexer.prototype._upkeep = function() { if (change && change.modified) { this._purge(title); this._populate(title); - this._dropResults(title); + this._decacheRelink(title); } } this.changedTiddlers = undefined; @@ -123,17 +144,22 @@ Indexer.prototype._purge = function(title) { }; // This drops the cached relink results if unsanctioned tiddlers were changed -Indexer.prototype._dropResults = function(title) { +Indexer.prototype._decacheRelink = function(title) { var tiddler = this.wiki.getTiddler(title); - if (title !== this.lastRelinkFrom - && title !== this.lastRelinkTo - && (!tiddler + for (var from in this.lastRelinks) { + var lastRelink = this.lastRelinks[from]; + if (title !== from + && title !== lastRelink.to + && (!tiddler || !$tw.utils.hop(tiddler.fields, 'draft.of') // is a draft - || tiddler.fields['draft.of'] !== this.lastRelinkFrom // draft of target - || references(this.index[title], this.lastRelinkFrom))) { // draft references target - // This is not the draft of the last relinked title, - // so our cached results should be wiped. - this.lastRelinkFrom = undefined; + || tiddler.fields['draft.of'] !== from// draft of target + || references(this.index[title], from))) { // draft references target + // This is not the draft of the last relinked title, + // so our cached results should be wiped. + lastRelink.maybeRelevant[title] = true; + // Force this cached relink to partially refresh when it comes time + lastRelink.to = undefined; + } } }; @@ -141,6 +167,18 @@ function references(list, item) { return list !== undefined && list[item]; }; +// Compiles a short list of tiddlers we need to check for a rename. +// This list will be much faster to relink again. +function buildShortlist(lastRelink) { + var shortlist = Object.keys(lastRelink.results); + for (var title in lastRelink.maybeRelevant) { + if (lastRelink.results[title] === undefined) { + shortlist.push(title); + } + } + return shortlist; +}; + Indexer.prototype._populate = function(title) { // Fetch the report for a title, and populate the indexes with result var tiddlerContext = new TiddlerContext(this.wiki, this.context, title); diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_indexer.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/indexer.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_indexer.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/indexer.js.meta diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_language.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/language.js similarity index 66% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_language.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/language.js index a55aa6d..292ad9d 100644 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_language.js +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/language.js @@ -5,18 +5,22 @@ This handles all logging and alerts Relink emits. \*/ -exports.getString = function(title, options) { +exports.getString = function(outputType, title, options) { title = "$:/plugins/flibbles/relink/language/" + title; - return options.wiki.renderTiddler("text/plain", title, options); + return options.wiki.renderTiddler(outputType, title, options); }; var logger; -exports.reportFailures = function(failureList, options) { +exports.warn = function(string, options) { if (!logger) { logger = new $tw.utils.Logger("Relinker"); } - var alertString = this.getString("Error/ReportFailedRelinks", options) + logger.alert(string); +}; + +exports.reportFailures = function(failureList, options) { + var alertString = this.getString("text/html", "Error/ReportFailedRelinks", options) var alreadyReported = Object.create(null); var reportList = []; $tw.utils.each(failureList, function(f) { @@ -31,5 +35,5 @@ exports.reportFailures = function(failureList, options) { alreadyReported[f] = true; } }); - logger.alert(alertString + "\n" + reportList.join("")); + this.warn(alertString + "\n" + reportList.join("")); }; diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_language.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/language.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_language.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/language.js.meta diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_mangler.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/mangler.js similarity index 96% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_mangler.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/mangler.js index 63cd54d..67622d6 100644 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_mangler.js +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/mangler.js @@ -35,7 +35,7 @@ RelinkManglerWidget.prototype.handleAddFieldEvent = function(event) { // Can't handle it. return true; } - var trimmedName = param.field.toLowerCase().trim(); + var trimmedName = param.field.trim(); if (!trimmedName) { // Still can't handle it, but don't warn. return true; @@ -70,6 +70,7 @@ RelinkManglerWidget.prototype.handleAddParameterEvent = function(event) { if (param && param.macro && param.parameter) { if (/\s/.test(param.macro.trim())) { this.alert(language.getString( + "text/plain", "Error/InvalidMacroName", { variables: {macroName: param.macro}, wiki: this.wiki @@ -77,6 +78,7 @@ RelinkManglerWidget.prototype.handleAddParameterEvent = function(event) { )); } else if (/[ \/]/.test(param.parameter.trim())) { this.alert(language.getString( + "text/plain", "Error/InvalidParameterName", { variables: {parameterName: param.parameter}, wiki: this.wiki @@ -94,6 +96,7 @@ RelinkManglerWidget.prototype.handleAddAttributeEvent = function(event) { if (param && param.element && param.attribute) { if (/[ \/]/.test(param.element.trim())) { this.alert(language.getString( + "text/plain", "Error/InvalidElementName", { variables: {elementName: param.element}, wiki: this.wiki @@ -101,6 +104,7 @@ RelinkManglerWidget.prototype.handleAddAttributeEvent = function(event) { )); } else if (/[ \/]/.test(param.attribute.trim())) { this.alert(language.getString( + "text/plain", "Error/InvalidAttributeName", { variables: {attributeName: param.attribute}, wiki: this.wiki diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_mangler.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/mangler.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_mangler.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/mangler.js.meta diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_fields.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/fields.js similarity index 72% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_fields.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/fields.js index 7752a23..54587b7 100644 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_fields.js +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/fields.js @@ -16,6 +16,12 @@ exports.report = function(tiddler, callback, options) { $tw.utils.each(fields, function(handler, field) { var input = tiddler.fields[field]; if (input) { + if (field === 'list' && tiddler.fields['plugin-type']) { + // We have a built-in exception here. plugins use their list + // field differently. There's a whole mechanism for what + // they actually point to, but let's not bother with that now + return; + } handler.report(input, function(title, blurb) { if (blurb) { callback(title, field + ': ' + blurb); @@ -32,6 +38,10 @@ exports.relink = function(tiddler, fromTitle, toTitle, changes, options) { $tw.utils.each(fields, function(handler, field) { var input = tiddler.fields[field]; if (input) { + if (field === 'list' && tiddler.fields['plugin-type']) { + // Same deal as above. Skip. + return; + } var entry = handler.relink(input, fromTitle, toTitle, options); if (entry !== undefined) { changes[field] = entry; diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_fields.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/fields.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_fields.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/fields.js.meta diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text.js similarity index 60% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text.js index d1bc06e..73b1d8d 100644 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text.js +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text.js @@ -14,7 +14,10 @@ var utils = require('$:/plugins/flibbles/relink/js/utils.js'); exports.name = 'text'; -var textOperators = utils.getModulesByTypeAsHashmap('relinktextoperator', 'type'); +var textOperators = utils.getModulesByTypeAsHashmap('relinktext', 'type'); + +// These are deprecated. Don't use them. +var oldTextOperators = utils.getModulesByTypeAsHashmap('relinktextoperator', 'type'); // $:/DefaultTiddlers is a tiddler which has type "text/vnd.tiddlywiki", // but it lies. It doesn't contain wikitext. It contains a filter, so @@ -29,7 +32,10 @@ exports.report = function(tiddler, callback, options) { if (fields.text) { var type = exceptions[fields.title] || fields.type || defaultOperator; if (textOperators[type]) { - var entry = textOperators[type].report(tiddler, callback, options); + textOperators[type].report(tiddler.fields.text, callback, options); + } else if (oldTextOperators[type]) { + // For the deprecated text operators + oldTextOperators[type].report(tiddler, callback, options); } } }; @@ -37,12 +43,16 @@ exports.report = function(tiddler, callback, options) { exports.relink = function(tiddler, fromTitle, toTitle, changes, options) { var fields = tiddler.fields; if (fields.text) { - var type = exceptions[fields.title] || fields.type || defaultOperator; + var type = exceptions[fields.title] || fields.type || defaultOperator, + entry; if (textOperators[type]) { - var entry = textOperators[type].relink(tiddler, fromTitle, toTitle, options); - if (entry) { - changes.text = entry; - } + entry = textOperators[type].relink(tiddler.fields.text, fromTitle, toTitle, options); + } else if (oldTextOperators[type]) { + // For the deprecated text operators + entry = oldTextOperators[type].relink(tiddler, fromTitle, toTitle, options); + } + if (entry) { + changes.text = entry; } } }; diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text.js.meta diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_filtertext.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/filtertext.js similarity index 51% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_filtertext.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/filtertext.js index 1793a76..f47590a 100644 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_filtertext.js +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/filtertext.js @@ -13,10 +13,5 @@ var filterHandler = require("$:/plugins/flibbles/relink/js/utils").getType('filt exports.type = 'text/x-tiddler-filter'; -exports.report = function(tiddler, callback, options) { - return filterHandler.report(tiddler.fields.text, callback, options); -}; - -exports.relink = function(tiddler, fromTitle, toTitle, options) { - return filterHandler.relink(tiddler.fields.text, fromTitle, toTitle, options) -}; +exports.report = filterHandler.report; +exports.relink = filterHandler.relink; diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_filtertext.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/filtertext.js.meta similarity index 54% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_filtertext.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/filtertext.js.meta index fcb74e1..90a0e1d 100644 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_filtertext.js.meta +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/filtertext.js.meta @@ -1,3 +1,3 @@ -module-type: relinktextoperator +module-type: relinktext title: $:/plugins/flibbles/relink/js/relinkoperations/text/filtertext.js type: application/javascript \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/listtext.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/listtext.js new file mode 100644 index 0000000..0eec53f --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/listtext.js @@ -0,0 +1,16 @@ +/*\ + +This relinks tiddlers which contain a tiddler list as their body. + +\*/ + +/*jslint node: false, browser: true */ +/*global $tw: false */ +"use strict"; + +var listHandler = require("$:/plugins/flibbles/relink/js/utils").getType('list'); + +exports.type = 'text/x-tiddler-list'; + +exports.report = listHandler.report; +exports.relink = listHandler.relink; diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/listtext.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/listtext.js.meta new file mode 100644 index 0000000..023988e --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/listtext.js.meta @@ -0,0 +1,3 @@ +module-type: relinktext +title: $:/plugins/flibbles/relink/js/relinkoperations/text/listtext.js +type: application/javascript \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/referencetext.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/referencetext.js new file mode 100644 index 0000000..db00a37 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/referencetext.js @@ -0,0 +1,16 @@ +/*\ + +This relinks tiddlers which contain a tiddler reference as their body. + +\*/ + +/*jslint node: false, browser: true */ +/*global $tw: false */ +"use strict"; + +var refHandler = require("$:/plugins/flibbles/relink/js/utils").getType('reference'); + +exports.type = 'text/x-tiddler-reference'; + +exports.report = refHandler.report; +exports.relink = refHandler.relink; diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/referencetext.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/referencetext.js.meta new file mode 100644 index 0000000..bbc58f4 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/referencetext.js.meta @@ -0,0 +1,3 @@ +module-type: relinktext +title: $:/plugins/flibbles/relink/js/relinkoperations/text/referencetext.js +type: application/javascript \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/titletext.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/titletext.js new file mode 100644 index 0000000..c871e52 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/titletext.js @@ -0,0 +1,16 @@ +/*\ + +This relinks tiddlers which contain a single title as their body. + +\*/ + +/*jslint node: false, browser: true */ +/*global $tw: false */ +"use strict"; + +var titleHandler = require("$:/plugins/flibbles/relink/js/utils").getType('title'); + +exports.type = 'text/x-tiddler-title'; + +exports.report = titleHandler.report; +exports.relink = titleHandler.relink; diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/titletext.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/titletext.js.meta new file mode 100644 index 0000000..5ebbbd8 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/titletext.js.meta @@ -0,0 +1,3 @@ +module-type: relinktext +title: $:/plugins/flibbles/relink/js/relinkoperations/text/titletext.js +type: application/javascript \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext.js similarity index 66% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext.js index 9feaa9b..9511543 100644 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext.js +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext.js @@ -1,6 +1,6 @@ /*\ -Checks for fromTitle in a tiddler's text. If found, sees if it's relevant, +Checks for fromTitle in text. If found, sees if it's relevant, and tries to swap it out if it is. \*/ @@ -14,15 +14,13 @@ var wikitextHandler = require('$:/plugins/flibbles/relink/js/utils.js').getType( exports.type = 'text/vnd.tiddlywiki'; -exports.report = function(tiddler, callback, options) { - wikitextHandler.report(tiddler.fields.text, callback, options); -}; +exports.report = wikitextHandler.report; -exports.relink = function(tiddler, fromTitle, toTitle, options) { +exports.relink = function(text, fromTitle, toTitle, options) { var placeholder = new Placeholder(); var currentOptions = Object.create(options); currentOptions.placeholder = placeholder; - var entry = wikitextHandler.relink(tiddler.fields.text, fromTitle, toTitle, currentOptions); + var entry = wikitextHandler.relink(text, fromTitle, toTitle, currentOptions); if (entry && entry.output) { // If there's output, we've also got to prepend any macros // that the placeholder defined. diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext.js.meta similarity index 54% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext.js.meta index daa9f18..585522b 100644 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext.js.meta +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext.js.meta @@ -1,3 +1,3 @@ -module-type: relinktextoperator +module-type: relinktext title: $:/plugins/flibbles/relink/js/relinkoperations/text/wikitext.js type: application/javascript \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_code.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/code.js similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_code.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/code.js diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_code.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/code.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_code.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/code.js.meta diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_comment.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/comment.js similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_comment.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/comment.js diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_comment.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/comment.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_comment.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/comment.js.meta diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_filteredtransclude.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/filteredtransclude.js similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_filteredtransclude.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/filteredtransclude.js diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_filteredtransclude.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/filteredtransclude.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_filteredtransclude.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/filteredtransclude.js.meta diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/html.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/html.js new file mode 100644 index 0000000..bc63501 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/html.js @@ -0,0 +1,131 @@ +/*\ +module-type: relinkwikitextrule + +Handles replacement in attributes of widgets and html elements +This is configurable to select exactly which attributes of which elements +should be changed. + +<$link to="TiddlerTitle" /> + +\*/ + +var utils = require("./utils.js"); +var Rebuilder = require("$:/plugins/flibbles/relink/js/utils/rebuilder"); +var relinkUtils = require('$:/plugins/flibbles/relink/js/utils.js'); +var htmlOperators = relinkUtils.getModulesByTypeAsHashmap('relinkhtml', 'name'); + +exports.name = "html"; + +exports.report = function(text, callback, options) { + var element = this.nextTag.tag; + var nestedOptions = Object.create(options); + nestedOptions.settings = this.parser.context; + for (var operator in htmlOperators) { + htmlOperators[operator].report(this.nextTag, this.parser, function(title, blurb) { + callback(title, '<' + blurb + ' />'); + }, nestedOptions); + } + this.parse(); +}; + +exports.relink = function(text, fromTitle, toTitle, options) { + var widgetEntry = {}; + widgetEntry.attributes = Object.create(null); + widgetEntry.element = this.nextTag.tag; + var elem = this.nextTag; + var changed = false; + var nestedOptions = Object.create(options); + nestedOptions.settings = this.parser.context; + for (var operator in htmlOperators) { + var entry = htmlOperators[operator].relink(this.nextTag, this.parser, fromTitle, toTitle, nestedOptions); + if (entry) { + if (entry.output) { + changed = true; + } + if (entry.impossible) { + widgetEntry.impossible = true; + } + } + } + var tag = this.parse()[0]; + if (tag.children) { + for (var i = 0; i < tag.children.length; i++) { + var child = tag.children[i]; + if (child.output) { + changed = true; + } + if (child.impossible) { + widgetEntry.impossible = true; + } + } + } + if (changed) { + var builder = new Rebuilder(text, elem.start); + for (var attributeName in elem.attributes) { + var attr = elem.attributes[attributeName]; + var quotedValue; + switch (attr.type) { + case 'string': + if (attr.valueless) { + continue; + } + var quote = relinkUtils.determineQuote(text, attr); + quotedValue = utils.wrapAttributeValue(attr.value, quote) + if (quotedValue === undefined) { + // The value was unquotable. We need to make + // a macro in order to replace it. + if (!options.placeholder) { + // but we can't... + widgetEntry.impossible = true; + continue; + } else { + var value = options.placeholder.getPlaceholderFor(attr.value,attr.handler) + quotedValue = "<<"+value+">>"; + } + } + break; + case 'indirect': + quotedValue = "{{" + attr.textReference + "}}"; + break; + case 'filtered': + quotedValue = "{{{" + attr.filter + "}}}"; + break; + case 'macro': + if (attr.output) { + quotedValue = attr.output; + } else { + quotedValue = undefined; + } + // Else If output isn't set, this wasn't ever changed + break; + } + var ptr = attr.start; + ptr = $tw.utils.skipWhiteSpace(text, ptr); + if (attributeName !== attr.name) { + // Ooh, the attribute name changed + builder.add(attr.name, ptr, ptr + attributeName.length); + } + if (quotedValue) { + // We have a new attribute value + ptr += attributeName.length; + ptr = $tw.utils.skipWhiteSpace(text, ptr); + ptr++; // For the equals + ptr = $tw.utils.skipWhiteSpace(text, ptr); + builder.add(quotedValue, ptr, attr.end); + } + } + if (tag.children) { + for (var i = 0; i < tag.children.length; i++) { + var child = tag.children[i]; + if (child.output) { + builder.add(child.output, child.start, child.end); + } + } + } + widgetEntry.output = builder.results(this.parser.pos); + } + if (widgetEntry.output || widgetEntry.impossible) { + return widgetEntry; + } + return undefined; +}; diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_html.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/html.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_html.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/html.js.meta diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/html/attributes.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/html/attributes.js new file mode 100644 index 0000000..b5a5f88 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/html/attributes.js @@ -0,0 +1,124 @@ +/*\ + +Handles all element attribute values. Most widget relinking happens here. + +\*/ + +var relinkUtils = require('$:/plugins/flibbles/relink/js/utils.js'); +var refHandler = relinkUtils.getType('reference'); +var filterHandler = relinkUtils.getType('filter'); +var macrocall = require("$:/plugins/flibbles/relink/js/utils/macrocall.js"); +var attributeOperators = relinkUtils.getModulesByTypeAsHashmap('relinkhtmlattributes', 'name'); + +exports.name = "attributes"; + +exports.report = function(element, parser, callback, options) { + for (var attributeName in element.attributes) { + var attr = element.attributes[attributeName]; + var nextEql = parser.source.indexOf('=', attr.start); + // This is the rare case of changing tiddler + // "true" to something else when "true" is + // implicit, like <$link to /> We ignore those. + if (nextEql < 0 || nextEql > attr.end) { + continue; + } + var entry; + switch (attr.type) { + case "string": + for (var operatorName in attributeOperators) { + var operator = attributeOperators[operatorName]; + var handler = operator.getHandler(element, attr, options); + if (handler) { + handler.report(attr.value, function(title, blurb) { + if (operator.formBlurb) { + callback(title, operator.formBlurb(element, attr, blurb, options)); + } else if (blurb) { + callback(title, element.tag + ' ' + attributeName + '="' + blurb + '"'); + } else { + callback(title, element.tag + ' ' + attributeName); + } + }, options); + break; + } + } + break; + case "indirect": + entry = refHandler.report(attr.textReference, function(title, blurb) { + callback(title, element.tag + ' ' + attributeName + '={{' + (blurb || '') + '}}'); + }, options); + break; + case "filtered": + entry = filterHandler.report(attr.filter, function(title, blurb) { + callback(title, element.tag + ' ' + attributeName + '={{{' + blurb + '}}}'); + }, options); + break; + case "macro": + var macro = attr.value; + entry = macrocall.report(options.settings, macro, function(title, blurb) { + callback(title, element.tag + ' ' + attributeName + '=<<' + blurb + '>>'); + }, options); + break; + } + } +}; + +exports.relink = function(element, parser, fromTitle, toTitle, options) { + var changed = undefined, impossible = undefined; + for (var attributeName in element.attributes) { + var attr = element.attributes[attributeName]; + var nextEql = parser.source.indexOf('=', attr.start); + // This is the rare case of changing tiddler + // "true" to something else when "true" is + // implicit, like <$link to /> We ignore those. + if (nextEql < 0 || nextEql > attr.end) { + attr.valueless = true; + continue; + } + var entry; + switch (attr.type) { + case 'string': + for (var operatorName in attributeOperators) { + var operator = attributeOperators[operatorName]; + var handler = operator.getHandler(element, attr, options); + if (handler) { + entry = handler.relink(attr.value, fromTitle, toTitle, options); + if (entry && entry.output) { + attr.value = entry.output; + attr.handler = handler.name; + changed = true; + } + break; + } + } + break; + case 'indirect': + entry = refHandler.relinkInBraces(attr.textReference, fromTitle, toTitle, options); + if (entry && entry.output) { + attr.textReference = entry.output; + changed = true; + } + break; + case 'filtered': + entry = filterHandler.relinkInBraces(attr.filter, fromTitle, toTitle, options); + if (entry && entry.output) { + attr.filter = entry.output; + changed = true; + } + break; + case 'macro': + var macro = attr.value; + entry = macrocall.relink(options.settings, macro, parser.source, fromTitle, toTitle, false, options); + if (entry && entry.output) { + attr.output = macrocall.reassemble(entry.output, parser.source, options); + attr.value = entry.output; + changed = true; + } + } + if (entry && entry.impossible) { + impossible = true; + } + } + if (changed || impossible) { + return {output: changed, impossible: impossible}; + } +}; diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/html/attributes.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/html/attributes.js.meta new file mode 100644 index 0000000..9b918eb --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/html/attributes.js.meta @@ -0,0 +1,3 @@ +module-type: relinkhtml +title: $:/plugins/flibbles/relink/js/relinkoperations/text/wikitext/html/attributes.js +type: application/javascript \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/html/attributes/fields.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/html/attributes/fields.js new file mode 100644 index 0000000..276cd75 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/html/attributes/fields.js @@ -0,0 +1,17 @@ +/*\ +Handles replacement in widgets which allow arbitrary attributes that +correspond to tiddler fields. + +\*/ + +exports.name = "fields"; + +exports.getHandler = function(element, attribute, options) { + var regexp = options.settings.getConfig("fieldattributes")[element.tag]; + if (regexp) { + var results = regexp.exec(attribute.name); + if (results && results[0] === attribute.name) { + return options.settings.getFields()[results[1]]; + } + } +}; diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/html/attributes/fields.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/html/attributes/fields.js.meta new file mode 100644 index 0000000..b050d69 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/html/attributes/fields.js.meta @@ -0,0 +1,3 @@ +module-type: relinkhtmlattributes +title: $:/plugins/flibbles/relink/js/relinkoperations/text/wikitext/html/attributes/fields.js +type: application/javascript \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/html/attributes/macrocall.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/html/attributes/macrocall.js new file mode 100644 index 0000000..78fe87a --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/html/attributes/macrocall.js @@ -0,0 +1,26 @@ +/*\ + +Handles replacement in $macrocall widgets + +\*/ + +exports.name = "macrocall"; + +exports.getHandler = function(element, attribute, options) { + if (element.tag === "$macrocall") { + var nameAttr = element.attributes["$name"]; + if (nameAttr) { + var setting = options.settings.getMacro(nameAttr.value); + return setting && setting[attribute.name]; + } + } +}; + +exports.formBlurb = function(element, attribute, blurb, options) { + var nameAttr = element.attributes["$name"]; + var newBlurb = '<' + nameAttr.value + ' ' + attribute.name; + if (blurb) { + newBlurb += '="' + blurb + '"'; + } + return newBlurb; +}; diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/html/attributes/macrocall.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/html/attributes/macrocall.js.meta new file mode 100644 index 0000000..fc40391 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/html/attributes/macrocall.js.meta @@ -0,0 +1,3 @@ +module-type: relinkhtmlattributes +title: $:/plugins/flibbles/relink/js/relinkoperations/text/wikitext/html/attributes/macrocall.js +type: application/javascript \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/html/attributes/whitelist.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/html/attributes/whitelist.js new file mode 100644 index 0000000..e15f879 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/html/attributes/whitelist.js @@ -0,0 +1,12 @@ +/*\ + +Handles replacement of widget attributes that are specified in the whitelist. + +\*/ + +exports.name = "whitelist"; + +exports.getHandler = function(element, attribute, options) { + var setting = options.settings.getAttribute(element.tag); + return setting && setting[attribute.name]; +}; diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/html/attributes/whitelist.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/html/attributes/whitelist.js.meta new file mode 100644 index 0000000..25b266f --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/html/attributes/whitelist.js.meta @@ -0,0 +1,3 @@ +module-type: relinkhtmlattributes +title: $:/plugins/flibbles/relink/js/relinkoperations/text/wikitext/html/attributes/whitelist.js +type: application/javascript \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/html/importvariables.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/html/importvariables.js new file mode 100644 index 0000000..ffca82b --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/html/importvariables.js @@ -0,0 +1,59 @@ +/*\ + +Handles state updating required for $importvariables widgets + +\*/ + +var relinkUtils = require('$:/plugins/flibbles/relink/js/utils.js'); +var ImportContext = relinkUtils.getContext('import'); + +exports.name = "importvariables"; + +exports.report = function(element, parser, callback, options) { + if (element.tag === "$importvariables") { + processImport(element, parser, options); + } +}; + +exports.relink = function(element, parser, fromTitle, toTitle, options) { + if (element.tag === "$importvariables") { + processImport(element, parser, options); + } +}; + +function processImport(element, parser, options) { + var importFilterAttr = element.attributes.filter; + if (importFilterAttr) { + processImportFilter(parser, importFilterAttr, options); + } +}; + +// This processes a <$importvariables> filter attribute and adds any new +// variables to our parser. +function processImportFilter(parser, importAttribute, options) { + if (typeof importAttribute === "string") { + // It was changed. Reparse it. It'll be a quoted + // attribute value. Add a dummy attribute name. + importAttribute = $tw.utils.parseAttribute("p="+importAttribute, 0) + } + var context = parser.context; + var importFilter = computeAttribute(context, importAttribute, options); + parser.context = new ImportContext(options.wiki, context, importFilter); +}; + +function computeAttribute(context, attribute, options) { + var value; + if(attribute.type === "filtered") { + var parentWidget = context.widget; + value = options.wiki.filterTiddlers(attribute.filter,parentWidget)[0] || ""; + } else if(attribute.type === "indirect") { + var parentWidget = context.widget; + value = options.wiki.getTextReference(attribute.textReference,"",parentWidget.variables.currentTiddler.value); + } else if(attribute.type === "macro") { + var parentWidget = context.widget; + value = parentWidget.getVariable(attribute.value.name,{params: attribute.value.params}); + } else { // String attribute + value = attribute.value; + } + return value; +}; diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/html/importvariables.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/html/importvariables.js.meta new file mode 100644 index 0000000..c0adc00 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/html/importvariables.js.meta @@ -0,0 +1,3 @@ +module-type: relinkhtml +title: $:/plugins/flibbles/relink/js/relinkoperations/text/wikitext/html/importvariables.js +type: application/javascript \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_image.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/image.js similarity index 97% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_image.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/image.js index 2b72c3b..ea497d4 100644 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_image.js +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/image.js @@ -14,6 +14,7 @@ var refHandler = require("$:/plugins/flibbles/relink/js/fieldtypes/reference"); var filterHandler = require("$:/plugins/flibbles/relink/js/utils").getType('filter'); var macrocall = require("./macrocall.js"); var utils = require("./utils.js"); +var relinkUtils = require('$:/plugins/flibbles/relink/js/utils.js'); exports.name = "image"; @@ -131,7 +132,7 @@ function reportAttribute(parser, attribute, callback, options) { ptr = text.indexOf('=', ptr); if (attribute.type === "string") { ptr = text.indexOf(attribute.value, ptr) - var quote = utils.determineQuote(text, attribute); + var quote = relinkUtils.determineQuote(text, attribute); // ignore first quote. We already passed it end = ptr + quote.length + attribute.value.length; } else if (attribute.type === "indirect") { @@ -166,7 +167,7 @@ function relinkAttribute(parser, attribute, builder, fromTitle, toTitle, options ptr = text.indexOf('=', ptr); if (attribute.type === "string") { ptr = text.indexOf(attribute.value, ptr) - var quote = utils.determineQuote(text, attribute); + var quote = relinkUtils.determineQuote(text, attribute); // ignore first quote. We already passed it end = ptr + quote.length + attribute.value.length; } else if (attribute.type === "indirect") { diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_image.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/image.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_image.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/image.js.meta diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_import.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/import.js similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_import.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/import.js diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_import.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/import.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_import.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/import.js.meta diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/macrocall.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/macrocall.js new file mode 100644 index 0000000..7248dd2 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/macrocall.js @@ -0,0 +1,181 @@ +/*\ +module-type: relinkwikitextrule + +Handles macro calls. + +<> + +\*/ + +var utils = require("./utils.js"); +var relinkUtils = require('$:/plugins/flibbles/relink/js/utils.js'); +var macrocall = require('$:/plugins/flibbles/relink/js/utils/macrocall.js'); +var Rebuilder = require("$:/plugins/flibbles/relink/js/utils/rebuilder"); +var EntryNode = require('$:/plugins/flibbles/relink/js/utils/entry'); + +exports.name = ["macrocallinline", "macrocallblock"]; + +exports.report = function(text, callback, options) { + var macroInfo = getInfoFromRule(this); + this.parser.pos = macroInfo.end; + this.reportAttribute(this.parser, macroInfo, callback, options); +}; + +exports.relink = function(text, fromTitle, toTitle, options) { + var macroInfo = getInfoFromRule(this); + var managedMacro = this.parser.context.getMacro(macroInfo.name); + this.parser.pos = macroInfo.end; + if (!managedMacro) { + // We don't manage this macro. Bye. + return undefined; + } + var mayBeWidget = this.parser.context.allowWidgets(); + var names = getParamNames(this.parser, macroInfo.name, macroInfo.params, options); + if (names === undefined) { + // Needed the definition, and couldn't find it. So if a single + // parameter needs to placeholder, just fail. + mayBeWidget = false; + } + var entry = macrocall.relink(this.parser.context, macroInfo, text, fromTitle, toTitle, mayBeWidget, options); + if (entry && entry.output) { + entry.output = macroToString(entry.output, text, names, options); + } + return entry; +}; + +/** Relinks macros that occur as attributes, like <$element attr=<<...>> /> + * Processes the same, except it can't downgrade into a widget if the title + * is complicated. + * Kept for backward compatibility reasons + */ +exports.relinkAttribute = function(parser, macro, text, fromTitle, toTitle, options) { + var entry = macrocall.relink(parser.context, macro, text, fromTitle, toTitle, false, options); + if (entry && entry.output) { + entry.output = macrocall.reassemble(entry.output, text, options); + } + return entry; +}; + +/** As in, report a macrocall invocation that is an html attribute. + * Kept for backward compatibility reasons + */ +exports.reportAttribute = function(parser, macro, callback, options) { + macrocall.report(parser.context, macro, function(title, blurb) { + callback(title, "<<" + blurb + ">>"); + }, options); +}; + +function getInfoFromRule(rule) { + // Get all the details of the match + var macroInfo = rule.nextCall; + if (!macroInfo) { + // rule.match is used "; + } else { + return macrocall.reassemble(macro, text, options); + } +}; + +function getParamNames(parser, macroName, params, options) { + var used = Object.create(null); + var rtn = new Array(params.length); + var anonsExist = false; + var i; + for (i = 0; i < params.length; i++) { + var name = params[i].name; + if (name) { + rtn[i] = name; + used[name] = true; + } else { + anonsExist = true; + } + } + if (anonsExist) { + var def = parser.context.getMacroDefinition(macroName); + if (def === undefined) { + // If there are anonymous parameters, and we can't + // find the definition, then we can't hope to create + // a widget. + return undefined; + } + var defParams = def.params || []; + var defPtr = 0; + for (i = 0; i < params.length; i++) { + if (rtn[i] === undefined) { + while(defPtr < defParams.length && used[defParams[defPtr].name]) { + defPtr++; + } + if (defPtr >= defParams.length) { + break; + } + rtn[i] = defParams[defPtr].name; + used[defParams[defPtr].name] = true; + } + } + } + return rtn; +}; + +function parseParams(paramString, pos) { + var params = [], + reParam = /\s*(?:([A-Za-z0-9\-_]+)\s*:)?(?:\s*(?:"""([\s\S]*?)"""|"([^"]*)"|'([^']*)'|\[\[([^\]]*)\]\]|([^"'\s]+)))/mg, + paramMatch = reParam.exec(paramString); + while(paramMatch) { + // Process this parameter + var paramInfo = { }; + // We need to find the group match that isn't undefined. + for (var i = 2; i <= 6; i++) { + if (paramMatch[i] !== undefined) { + paramInfo.value = paramMatch[i]; + break; + } + } + if(paramMatch[1]) { + paramInfo.name = paramMatch[1]; + } + //paramInfo.start = pos; + paramInfo.end = reParam.lastIndex + pos; + params.push(paramInfo); + // Find the next match + paramMatch = reParam.exec(paramString); + } + return params; +}; diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_macrocall.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/macrocall.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_macrocall.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/macrocall.js.meta diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_macrodef.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/macrodef.js similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_macrodef.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/macrodef.js diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_macrodef.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/macrodef.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_macrodef.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/macrodef.js.meta diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_prettylink.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/prettylink.js similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_prettylink.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/prettylink.js diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_prettylink.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/prettylink.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_prettylink.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/prettylink.js.meta diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/quoteblock.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/quoteblock.js new file mode 100644 index 0000000..4a5567d --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/quoteblock.js @@ -0,0 +1,85 @@ +/*\ +module-type: relinkwikitextrule + +Handles the quote blocks, as in: + +<<< +... +<<< + +\*/ + +var Rebuilder = require("$:/plugins/flibbles/relink/js/utils/rebuilder"); + +exports.name = "quoteblock"; + +exports.type = {block: true}; + +exports.report = function(text, callback, options) { + var reEndString = "^" + this.match[1] + "(?!<)"; + this.parser.pos = this.matchRegExp.lastIndex; + + this.parser.parseClasses(); + this.parser.skipWhitespace({treatNewlinesAsNonWhitespace: true}); + + // Parse the optional cite + reportCite(this.parser, this.match[1]); + // Now parse the body of the quote + this.parser.parseBlocks(reEndString); + if (this.match) { + // Now parse the closing cite + reportCite(this.parser, this.match[1]); + } +}; + +exports.relink = function(text, fromTitle, toTitle, options) { + var reEndString = "^" + this.match[1] + "(?!<)"; + var builder = new Rebuilder(text, this.parser.pos); + var entry; + this.parser.pos = this.matchRegExp.lastIndex; + + this.parser.parseClasses(); + this.parser.skipWhitespace({treatNewlinesAsNonWhitespace: true}); + + // Parse the optional cite + mergeRelinks(builder, this.parser.parseInlineRun(/(\r?\n)/mg)); + // Now parse the body of the quote + mergeRelinks(builder, this.parser.parseBlocks(reEndString)); + // Now parse the closing cite + mergeRelinks(builder, this.parser.parseInlineRun(/(\r?\n)/mg)); + + if (builder.changed() || builder.impossible) { + entry = {}; + entry.output = builder.results(this.parser.pos); + if (builder.impossible) { + entry.impossible = true; + } + } + return entry; +}; + +function reportCite(parser, delimeter) { + var callback = parser.callback; + try { + parser.callback = function(title, blurb) { + return callback(title, delimeter + " " + blurb); + }; + parser.parseInlineRun(/(\r?\n)/mg); + } finally { + parser.callback = callback; + } +}; + +function mergeRelinks(builder, output) { + if (output.length > 0) { + for (var i = 0; i < output.length; i++) { + var o = output[i]; + if (o.output) { + builder.add(o.output, o.start, o.end); + } + if (o.impossible) { + builder.impossible = true; + } + } + } +}; diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/quoteblock.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/quoteblock.js.meta new file mode 100644 index 0000000..b4c8e40 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/quoteblock.js.meta @@ -0,0 +1,3 @@ +module-type: relinkwikitextrule +title: $:/plugins/flibbles/relink/js/relinkoperations/text/wikitext/quoteblock.js +type: application/javascript \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_relink.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/relink.js similarity index 97% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_relink.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/relink.js index 0666516..af5d098 100644 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_relink.js +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/relink.js @@ -35,7 +35,7 @@ exports.parse = function() { this.interpretSettings(function(macro, parameter, type) { macroName = macro; if (type && !utils.getType(type)) { - error = language.getString("Error/UnrecognizedType", + error = language.getString("text/plain", "Error/UnrecognizedType", {variables: {type: type}, wiki: self.parser.wiki}); } macroParams[parameter] = type; diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_relink.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/relink.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_relink.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/relink.js.meta diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_rules.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/rules.js similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_rules.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/rules.js diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_rules.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/rules.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_rules.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/rules.js.meta diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_syslink.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/syslink.js similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_syslink.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/syslink.js diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_syslink.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/syslink.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_syslink.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/syslink.js.meta diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/table.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/table.js new file mode 100644 index 0000000..cf4b324 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/table.js @@ -0,0 +1,175 @@ +/*\ +module-type: relinkwikitextrule + +Handles tables. Or rather handles the cells inside the tables, since tables +themselves aren't relinked. + +\*/ + +var Rebuilder = require("$:/plugins/flibbles/relink/js/utils/rebuilder"); + +exports.name = "table"; + +exports.types = {block: true}; + +exports.report = function(text, callback, options) { + var rowRegExp = /^\|([^\n]*)\|([fhck]?)\r?(?:\n|$)/mg, + rowTermRegExp = /(\|(?:[fhck]?)\r?(?:\n|$))/mg; + // Match the row + rowRegExp.lastIndex = this.parser.pos; + var rowMatch = rowRegExp.exec(this.parser.source); + while(rowMatch && rowMatch.index === this.parser.pos) { + var rowType = rowMatch[2]; + // Check if it is a class assignment + if(rowType === "k") { + this.parser.pos = rowMatch.index + rowMatch[0].length; + } else if(rowType === "c") { + // Is this a caption row? + // If so, move past the opening `|` of the row + this.parser.pos++; + // Parse the caption + var oldCallback = this.parser.callback; + this.parser.callback = function(title, blurb) { + callback(title, '|' + blurb + '|c'); + }; + try { + this.parser.parseInlineRun(rowTermRegExp,{eatTerminator: true}); + } finally { + this.parser.callback = oldCallback; + } + } else { + // Process the row + processRow.call(this, rowType, callback); + this.parser.pos = rowMatch.index + rowMatch[0].length; + } + rowMatch = rowRegExp.exec(this.parser.source); + } +}; + +exports.relink = function(text, fromTitle, toTitle, options) { + var rowRegExp = /^\|([^\n]*)\|([fhck]?)\r?(?:\n|$)/mg, + rowTermRegExp = /(\|(?:[fhck]?)\r?(?:\n|$))/mg, + builder = new Rebuilder(text, this.parser.pos), + impossible = false, + output, + entry; + // Match the row + rowRegExp.lastIndex = this.parser.pos; + var rowMatch = rowRegExp.exec(this.parser.source); + while(rowMatch && rowMatch.index === this.parser.pos) { + var rowType = rowMatch[2]; + // Check if it is a class assignment + if(rowType === "k") { + this.parser.pos = rowMatch.index + rowMatch[0].length; + } else { + // Is this a caption row? + if(rowType === "c") { + // If so, move past the opening `|` of the row + this.parser.pos++; + // Parse the caption + output = this.parser.parseInlineRun(rowTermRegExp,{eatTerminator: true}); + } else { + // Process the row + output = processRow.call(this); + this.parser.pos = rowMatch.index + rowMatch[0].length; + } + if (output.length > 0) { + for (var i = 0; i < output.length; i++) { + var o = output[i]; + if (o.output) { + builder.add(o.output, o.start, o.end); + } + if (o.impossible) { + impossible = true; + } + } + } + } + rowMatch = rowRegExp.exec(this.parser.source); + } + if (builder.changed() || impossible) { + entry = {} + entry.output = builder.results(this.parser.pos); + if (impossible) { + entry.impossible = true; + } + } + return entry; +}; + +var processRow = function(rowType, callback) { + var cellRegExp = /(?:\|([^\n\|]*)\|)|(\|[fhck]?\r?(?:\n|$))/mg, + cellTermRegExp = /((?:\x20*)\|)/mg, + children = []; + // Match a single cell + cellRegExp.lastIndex = this.parser.pos; + var cellMatch = cellRegExp.exec(this.parser.source); + while(cellMatch && cellMatch.index === this.parser.pos) { + if(cellMatch[2]) { + // End of row + this.parser.pos = cellRegExp.lastIndex - 1; + break; + } + switch (cellMatch[1]) { + case '~': + case '>': + case '<': + // Move to just before the `|` terminating the cell + this.parser.pos = cellRegExp.lastIndex - 1; + break; + default: + // For ordinary cells, step beyond the opening `|` + this.parser.pos++; + // Look for a space at the start of the cell + var spaceLeft = false; + var prefix = '|'; + var suffix = '|'; + if(this.parser.source.substr(this.parser.pos).search(/^\^([^\^]|\^\^)/) === 0) { + prefix += '^'; + this.parser.pos++; + } else if(this.parser.source.substr(this.parser.pos).search(/^,([^,]|,,)/) === 0) { + prefix += ','; + this.parser.pos++; + } + var chr = this.parser.source.substr(this.parser.pos,1); + while(chr === " ") { + spaceLeft = true; + this.parser.pos++; + chr = this.parser.source.substr(this.parser.pos,1); + } + if (spaceLeft) { + prefix += ' '; + } + // Check whether this is a heading cell + if(chr === "!") { + this.parser.pos++; + prefix += '!'; + } + // Parse the cell + var oldCallback = this.parser.callback; + var reports = []; + this.parser.callback = function(title, blurb) { + reports.push(title, blurb); + }; + try { + var output = this.parser.parseInlineRun(cellTermRegExp,{eatTerminator: true}); + if (output.length > 0) { + children.push(output[0]); + } + if(this.parser.source.substr(this.parser.pos - 2,1) === " ") { // spaceRight + suffix = ' |'; + } + for (var i = 0; i < reports.length; i += 2) { + callback(reports[i], prefix + reports[i+1] + suffix + rowType); + } + } finally { + this.parser.callback = oldCallback; + } + // Move back to the closing `|` + this.parser.pos--; + } + cellRegExp.lastIndex = this.parser.pos; + cellMatch = cellRegExp.exec(this.parser.source); + } + return children; +}; diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/table.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/table.js.meta new file mode 100644 index 0000000..e95b80f --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/table.js.meta @@ -0,0 +1,3 @@ +module-type: relinkwikitextrule +title: $:/plugins/flibbles/relink/js/relinkoperations/text/wikitext/table.js +type: application/javascript \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_transclude.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/transclude.js similarity index 70% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_transclude.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/transclude.js index da39573..a5c861a 100644 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_transclude.js +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/transclude.js @@ -12,6 +12,8 @@ This renames both the tiddler and the template field. var refHandler = require("$:/plugins/flibbles/relink/js/fieldtypes/reference"); var utils = require("./utils.js"); +var relinkUtils = require('$:/plugins/flibbles/relink/js/utils.js'); +var referenceOperators = relinkUtils.getModulesByTypeAsHashmap('relinkreference', 'name'); exports.name = ['transcludeinline', 'transcludeblock']; @@ -20,17 +22,14 @@ exports.report = function(text, callback, options) { refString = $tw.utils.trim(m[1]), ref = parseTextReference(refString); template = $tw.utils.trim(m[2]); - if (ref.title) { - var suffix = ''; - if (ref.index) { - suffix = '##' + ref.index; - } else if (ref.field) { - suffix = '!!' + ref.field; - } - if (template) { - suffix = suffix + '||' + template; - } - callback(ref.title, '{{' + suffix + '}}') + for (var operator in referenceOperators) { + referenceOperators[operator].report(ref, function(title, blurb) { + blurb = blurb || ""; + if (template) { + blurb += '||' + template; + } + callback(title, "{{" + blurb + "}}"); + }, options); } if (template) { callback(template, '{{' + refString + '||}}'); @@ -43,12 +42,20 @@ exports.relink = function(text, fromTitle, toTitle, options) { reference = parseTextReference(m[1]), template = m[2], entry = undefined, + impossible = false, modified = false; this.parser.pos = this.matchRegExp.lastIndex; - if ($tw.utils.trim(reference.title) === fromTitle) { - // preserve user's whitespace - reference.title = reference.title.replace(fromTitle, toTitle); - modified = true; + for (var operator in referenceOperators) { + var result = referenceOperators[operator].relink(reference, fromTitle, toTitle, options); + if (result !== undefined) { + if (result.impossible) { + impossible = true; + } + if (result.output) { + reference = result.output; + modified = true + } + } } if ($tw.utils.trim(template) === fromTitle) { template = template.replace(fromTitle, toTitle); @@ -62,9 +69,13 @@ exports.relink = function(text, fromTitle, toTitle, options) { // the block and inline filter wikitext rule. entry = {output: output + utils.getEndingNewline(m[0])}; } else { - entry = {impossible: true} + impossible = true; } } + if (impossible) { + entry = entry || {}; + entry.impossible = true; + } return entry; }; @@ -101,10 +112,16 @@ exports.makeTransclude = function(parser, reference, template) { } else { rtn = widget; } - } else if (!canBePrettyTitle(reference.title)) { + } else if (!canBePrettyTitle(reference.title) || !canBePrettyField(reference.field)) { // This block and the next account for the 1%... - var reducedRef = {field: reference.field, index: reference.index}; - rtn = utils.makeWidget(parser, '$tiddler', {tiddler: $tw.utils.trim(reference.title)}, prettyTransclude(reducedRef, template)); + var transclude; + if (canBePrettyField(reference.field)) { + var reducedRef = {field: reference.field, index: reference.index}; + transclude = prettyTransclude(reducedRef, template); + } else { + transclude = utils.makeWidget(parser, "$transclude", {tiddler: $tw.utils.trim(reference.title), field: reference.field}); + } + rtn = utils.makeWidget(parser, '$tiddler', {tiddler: $tw.utils.trim(reference.title)}, transclude); } else { // This block takes care of 99% of all cases rtn = prettyTransclude(reference, template); @@ -116,6 +133,10 @@ function canBePrettyTitle(value) { return refHandler.canBePretty(value) && canBePrettyTemplate(value); }; +function canBePrettyField(value) { + return !/[\|\}\{]/.test(value); +}; + function canBePrettyTemplate(value) { return !value || (value.indexOf('}') < 0 && value.indexOf('{') < 0 && value.indexOf('|') < 0); }; diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_transclude.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/transclude.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_transclude.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/transclude.js.meta diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/typedblock.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/typedblock.js new file mode 100644 index 0000000..617eff3 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/typedblock.js @@ -0,0 +1,90 @@ +/*\ +module-type: relinkwikitextrule + +Handles the typeed blocks, as in: + +$$$text/vnd.tiddlywiki>text/html +... +$$$ + +\*/ + +var utils = require('$:/plugins/flibbles/relink/js/utils.js'); +var Rebuilder = require("$:/plugins/flibbles/relink/js/utils/rebuilder"); +var language = require('$:/plugins/flibbles/relink/js/language.js'); + +exports.name = "typedblock"; + +exports.types = {block: true}; + +var textOperators; +var oldTextOperators; + +function getTextOperator(type, options) { + var operator; + if (textOperators === undefined) { + textOperators = utils.getModulesByTypeAsHashmap('relinktext', 'type'); + oldTextOperators = utils.getModulesByTypeAsHashmap('relinktextoperator', 'type'); + } + operator = textOperators[type]; + if (operator) { + return operator; + } + var info = $tw.utils.getFileExtensionInfo(type); + if (info && textOperators[info.type]) { + return textOperators[info.type]; + } + var old = oldTextOperators[type] || (info && oldTextOperators[info.type]); + if (old) { + var vars = Object.create(options); + vars.variables = {type: old.type, keyword: type}; + var warnString = language.getString("text/html", "Warning/OldRelinkTextOperator", vars) + language.warn(warnString); + oldTextOperators[type] = undefined; + } +}; + +function getText() { + var reEnd = /\r?\n\$\$\$\r?(?:\n|$)/mg; + // Move past the match + this.parser.pos = this.matchRegExp.lastIndex; + // Look for the end of the block + reEnd.lastIndex = this.parser.pos; + var match = reEnd.exec(this.parser.source), + text; + // Process the block + if(match) { + text = this.parser.source.substring(this.parser.pos,match.index); + this.parser.pos = match.index + match[0].length; + } else { + text = this.parser.source.substr(this.parser.pos); + this.parser.pos = this.parser.sourceLength; + } + return text; +}; + +exports.report = function(text, callback, options) { + var innerText = getText.call(this), + operator = getTextOperator(this.match[1], options); + if (operator) { + return operator.report(innerText, callback, options); + } +}; + +exports.relink = function(text, fromTitle, toTitle, options) { + var start = this.parser.pos, + innerStart = this.matchRegExp.lastIndex, + innerText = getText.call(this), + operator = getTextOperator(this.match[1], options); + if (operator) { + var innerOptions = Object.create(options); + innerOptions.settings = this.parser.context; + var results = operator.relink(innerText, fromTitle, toTitle, innerOptions); + if (results && results.output) { + var builder = new Rebuilder(text, start); + builder.add(results.output, innerStart, innerStart + innerText.length); + results.output = builder.results(this.parser.pos); + } + return results; + } +}; diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/typedblock.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/typedblock.js.meta new file mode 100644 index 0000000..c8ed8f2 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/typedblock.js.meta @@ -0,0 +1,3 @@ +module-type: relinkwikitextrule +title: $:/plugins/flibbles/relink/js/relinkoperations/text/wikitext/typedblock.js +type: application/javascript \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_utils.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/utils.js similarity index 78% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_utils.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/utils.js index dea6395..3e52cfb 100644 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_utils.js +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/utils.js @@ -135,33 +135,6 @@ exports.wrapAttributeValue = function(value, preference) { return undefined; }; -/**Like wrapAttribute value, except for macro parameters, not attributes. - * - * These are more permissive. Allows brackets, - * and slashes and '<' in unquoted values. - */ -exports.wrapParameterValue = function(value, preference) { - var whitelist = ["", "'", '"', '[[', '"""']; - var choices = { - "": function(v) {return !/([\s>"'=])/.test(v); }, - "'": function(v) {return v.indexOf("'") < 0; }, - '"': function(v) {return v.indexOf('"') < 0; }, - "[[": canBePrettyOperand, - '"""': function(v) {return v.indexOf('"""') < 0 && v[v.length-1] != '"';} - }; - if (choices[preference] && choices[preference](value)) { - return wrap(value, preference); - } - for (var i = 0; i < whitelist.length; i++) { - var quote = whitelist[i]; - if (choices[quote](value)) { - return wrap(value, quote); - } - } - // No quotes will work on this - return undefined; -}; - function wrap(value, wrapper) { var wrappers = { "": function(v) {return v; }, @@ -182,29 +155,6 @@ function canBePrettyOperand(value) { return value.indexOf(']') < 0; }; -/**Given some text, and a param or attribute within that text, this returns - * what type of quotation that attribute is using. - * - * param: An object in the form {end:, ...} - */ -exports.determineQuote = function(text, param) { - var pos = param.end-1; - if (text[pos] === "'") { - return "'"; - } - if (text[pos] === '"') { - if (text.substr(pos-2, 3) === '"""') { - return '"""'; - } else { - return '"'; - } - } - if (text.substr(pos-1,2) === ']]' && text.substr((pos-param.value.length)-3, 2) === '[[') { - return "[["; - } - return ''; -}; - // Finds the newline at the end of a string and returns it. Empty string if // none exists. exports.getEndingNewline = function(string) { diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_utils.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/utils.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_utils.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/utils.js.meta diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_wikilink.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/wikilink.js similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_wikilink.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/wikilink.js diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_wikilink.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/wikilink.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_relinkoperations_text_wikitext_wikilink.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/relinkoperations/text/wikitext/wikilink.js.meta diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_settings.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/settings.js similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_settings.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/settings.js diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_settings.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/settings.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_settings.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/settings.js.meta diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/settings/attributes.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/settings/attributes.js new file mode 100644 index 0000000..9bc5062 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/settings/attributes.js @@ -0,0 +1,34 @@ +/*\ + +Factory method for creating the attributes whitelist cache. + +\*/ + +var utils = require('../utils'); + +exports.name = "attributes"; + +exports.generate = function(attributes, tiddler, key) { + var data = utils.getType(tiddler.fields.text.trim()); + if (data) { + data.source = tiddler.fields.title; + // Secret feature. You can access a config tiddler's + // fields from inside the fieldtype handler. Cool + // tricks can be done with this. + data.fields = tiddler.fields; + var elem = root(key); + var attr = key.substr(elem.length+1); + attributes[elem] = attributes[elem] || Object.create(null); + attributes[elem][attr] = data; + } +}; + +/* Returns first bit of a path. path/to/tiddler -> path + */ +function root(string) { + var index = string.indexOf('/'); + if (index >= 0) { + return string.substr(0, index); + } +}; + diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/settings/attributes.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/settings/attributes.js.meta new file mode 100644 index 0000000..5ee294c --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/settings/attributes.js.meta @@ -0,0 +1,3 @@ +module-type: relinksetting +title: $:/plugins/flibbles/relink/js/settings/attributes.js +type: application/javascript \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/settings/fields.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/settings/fields.js new file mode 100644 index 0000000..929a057 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/settings/fields.js @@ -0,0 +1,21 @@ +/*\ + +Factory method for creating the fields whitelist cache. + +\*/ + +var utils = require('../utils'); + +exports.name = "fields"; + +exports.generate = function(fields, tiddler, name) { + var data = utils.getType(tiddler.fields.text.trim()); + if (data) { + data.source = tiddler.fields.title; + // Secret feature. You can access a config tiddler's + // fields from inside the fieldtype handler. Cool + // tricks can be done with this. + data.fields = tiddler.fields; + fields[name] = data; + } +}; diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/settings/fields.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/settings/fields.js.meta new file mode 100644 index 0000000..c669815 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/settings/fields.js.meta @@ -0,0 +1,3 @@ +module-type: relinksetting +title: $:/plugins/flibbles/relink/js/settings/fields.js +type: application/javascript \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/settings/fieldwidgets.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/settings/fieldwidgets.js new file mode 100644 index 0000000..34b05c3 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/settings/fieldwidgets.js @@ -0,0 +1,11 @@ +/*\ + +Factory method for creating the fieldattributes regexp cache. + +\*/ + +exports.name = "fieldattributes"; + +exports.generate = function(fieldattributes, tiddler, key) { + fieldattributes[key] = new RegExp(tiddler.fields.text.trim()); +}; diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/settings/fieldwidgets.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/settings/fieldwidgets.js.meta new file mode 100644 index 0000000..907d0f1 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/settings/fieldwidgets.js.meta @@ -0,0 +1,3 @@ +module-type: relinksetting +title: $:/plugins/flibbles/relink/js/settings/fieldwidgets.js +type: application/javascript \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/settings/macros.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/settings/macros.js new file mode 100644 index 0000000..b53ad88 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/settings/macros.js @@ -0,0 +1,36 @@ +/*\ + +Factory method for creating the macros whitelist cache. + +\*/ + +var utils = require('../utils'); + +exports.name = "macros"; + +exports.generate = function(macros, tiddler, key) { + var data = utils.getType(tiddler.fields.text.trim()); + if (data) { + data.source = tiddler.fields.title; + // Secret feature. You can access a config tiddler's + // fields from inside the fieldtype handler. Cool + // tricks can be done with this. + data.fields = tiddler.fields; + // We take the last index, not the first, because macro + // parameters can't have slashes, but macroNames can. + var name = dir(key); + var arg = key.substr(name.length+1); + macros[name] = macros[name] || Object.create(null); + macros[name][arg] = data; + } +}; + +/* Returns all but the last bit of a path. path/to/tiddler -> path/to + */ +function dir(string) { + var index = string.lastIndexOf('/'); + if (index >= 0) { + return string.substr(0, index); + } +} + diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/settings/macros.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/settings/macros.js.meta new file mode 100644 index 0000000..79a997c --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/settings/macros.js.meta @@ -0,0 +1,3 @@ +module-type: relinksetting +title: $:/plugins/flibbles/relink/js/settings/macros.js +type: application/javascript \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/settings/operators.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/settings/operators.js new file mode 100644 index 0000000..f692a64 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/settings/operators.js @@ -0,0 +1,25 @@ +/*\ + +Factory method for creating the operators whitelist cache. + +\*/ + +var utils = require('../utils'); + +exports.name = "operators"; + +exports.generate = function(operators, tiddler, key) { + var data = utils.getType(tiddler.fields.text.trim()); + if (data) { + data.source = tiddler.fields.title; + // Secret feature. You can access a config tiddler's + // fields from inside the fieldtype handler. Cool + // tricks can be done with this. + data.fields = tiddler.fields; + var pair = key.split('/'); + var name = pair[0]; + data.key = key; + operators[name] = operators[name] || Object.create(null); + operators[name][pair[1] || 1] = data; + } +}; diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/settings/operators.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/settings/operators.js.meta new file mode 100644 index 0000000..30b3a4c --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/settings/operators.js.meta @@ -0,0 +1,3 @@ +module-type: relinksetting +title: $:/plugins/flibbles/relink/js/settings/operators.js +type: application/javascript \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_utils.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/utils.js similarity index 83% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_utils.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/utils.js index 502c7a2..4bfb940 100644 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_utils.js +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/utils.js @@ -21,6 +21,7 @@ exports.getModulesByTypeAsHashmap = function(moduleType, nameField) { results[entry] = { relink: module[entry], report: function() {}}; + results[entry][nameField] = entry; } } }); @@ -36,7 +37,7 @@ exports.getTiddlerRelinkReferences = function(wiki, title, context) { for (var relinker in getRelinkOperators()) { getRelinkOperators()[relinker].report(tiddler, function(title, blurb) { references[title] = references[title] || []; - references[title].push(blurb); + references[title].push(blurb || ''); }, options); } } catch (e) { @@ -58,14 +59,14 @@ exports.getRelinkResults = function(wiki, fromTitle, toTitle, context, tiddlerLi fromTitle = (fromTitle || "").trim(); toTitle = (toTitle || "").trim(); var changeList = Object.create(null); - if(fromTitle && toTitle) { + if(fromTitle && toTitle !== undefined) { if (tiddlerList === undefined) { tiddlerList = wiki.getRelinkableTitles(); } for (var i = 0; i < tiddlerList.length; i++) { var title = tiddlerList[i]; var tiddler = wiki.getTiddler(title); - if(tiddler && !tiddler.fields["plugin-type"]) { + if(tiddler) { try { var entries = Object.create(null), operators = getRelinkOperators(); @@ -76,7 +77,13 @@ exports.getRelinkResults = function(wiki, fromTitle, toTitle, context, tiddlerLi for (var field in entries) { // So long as there is one key, // add it to the change list. - changeList[title] = entries; + if (tiddler.fields["plugin-type"]) { + // We never change plugins, even if they have links + changeList[title] = {}; + changeList[title][field] = {impossible: true}; + } else { + changeList[title] = entries; + } break; } } catch (e) { @@ -153,6 +160,34 @@ exports.getDefaultType = function(wiki) { return fieldTypes[defaultType] ? defaultType : "title"; }; +exports.touchModifyField = function(wiki) { + var tiddler = wiki.getTiddler("$:/config/flibbles/relink/touch-modify"); + return tiddler && tiddler.fields.text.trim() === "yes"; +}; + +/**Given some text, and a param or attribute within that text, this returns + * what type of quotation that attribute is using. + * + * param: An object in the form {end:, ...} + */ +exports.determineQuote = function(text, param) { + var pos = param.end-1; + if (text[pos] === "'") { + return "'"; + } + if (text[pos] === '"') { + if (text.substr(pos-2, 3) === '"""') { + return '"""'; + } else { + return '"'; + } + } + if (text.substr(pos-1,2) === ']]' && text.substr((pos-param.value.length)-3, 2) === '[[') { + return "[["; + } + return ''; +}; + var fieldTypes; function getFieldTypes() { diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_utils.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/utils.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_utils.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/utils.js.meta diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_utils_backupIndexer.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/utils/backupIndexer.js similarity index 87% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_utils_backupIndexer.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/utils/backupIndexer.js index ab72b3f..e4ee362 100644 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_utils_backupIndexer.js +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/utils/backupIndexer.js @@ -52,6 +52,22 @@ BackupIndexer.prototype.relinkLookup = function(fromTitle, toTitle, options) { return cache.lastRelink; }; +BackupIndexer.prototype.orphans = function() { + var index = getCache(this.wiki).lookup; + var results = []; + for (var title in index) { + var found = false; + for (var anything in this.reverseLookup(title)) { + found = true; + break; + } + if (!found) { + results.push(title); + } + } + return results; +}; + function getCache(wiki) { return wiki.getGlobalCache('relink', function() { var tiddlerList = wiki.getRelinkableTitles(); diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_utils_backupIndexer.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/utils/backupIndexer.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_utils_backupIndexer.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/utils/backupIndexer.js.meta diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_utils_entry.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/utils/entry.js similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_utils_entry.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/utils/entry.js diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_utils_entry.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/utils/entry.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_utils_entry.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/utils/entry.js.meta diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/utils/macrocall.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/utils/macrocall.js new file mode 100644 index 0000000..2f3f4a7 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/utils/macrocall.js @@ -0,0 +1,262 @@ +/*\ + +Methods for reporting and relinking macros. Behaves much like a fieldtype, except that it's not. + +\*/ + +var utils = require('$:/plugins/flibbles/relink/js/utils.js'); +var Rebuilder = require("$:/plugins/flibbles/relink/js/utils/rebuilder"); + +// Error thrown when a macro's definition is needed, but can't be found. +function CannotFindMacroDef() {}; +CannotFindMacroDef.prototype.impossible = true; +CannotFindMacroDef.prototype.name = "macroparam"; +// Failed relinks due to missing definitions aren't reported for now. +// I may want to do something special later on. +CannotFindMacroDef.prototype.report = function() { return []; }; + +/** As in, report a macrocall invocation that is an html attribute. + * macro: must be a macro object.*/ +exports.report = function(context, macro, callback, options) { + var managedMacro = context.getMacro(macro.name); + if (!managedMacro) { + // We don't manage this macro. Bye. + return undefined; + } + for (var managedArg in managedMacro) { + var index; + try { + index = getParamIndexWithinMacrocall(context, macro.name, managedArg, macro.params, options); + } catch (e) { + continue; + } + if (index < 0) { + // The argument was not supplied. Move on to next. + continue; + } + var param = macro.params[index]; + var handler = managedMacro[managedArg]; + var nestedOptions = Object.create(options); + nestedOptions.settings = context; + var entry = handler.report(param.value, function(title, blurb) { + var rtn = managedArg; + if (blurb) { + rtn += ': "' + blurb + '"'; + } + callback(title, macro.name + ' ' + rtn); + }, nestedOptions); + } +}; + +/**Processes the given macro, + * macro: {name:, params:, start:, end:} + * each parameters: {name:, end:, value:} + * Macro invocation returned is the same, but relinked, and may have new keys: + * parameters: {type: macro, start:, newValue: (quoted replacement value)} + * Output of the returned entry isn't a string, but a macro object. It needs + * to be converted. + */ +exports.relink = function(context, macro, text, fromTitle, toTitle, mayBeWidget, options) { + var managedMacro = context.getMacro(macro.name); + var modified = false; + if (!managedMacro) { + // We don't manage this macro. Bye. + return undefined; + } + var outMacro = $tw.utils.extend({}, macro); + var macroEntry = {}; + outMacro.params = macro.params.slice(); + for (var managedArg in managedMacro) { + var index; + try { + index = getParamIndexWithinMacrocall(context, macro.name, managedArg, macro.params, options); + } catch (e) { + if (e instanceof CannotFindMacroDef) { + macroEntry.impossible = true; + continue; + } + } + if (index < 0) { + // this arg either was not supplied, or we can't find + // the definition, so we can't tie it to an anonymous + // argument. Either way, move on to the next. + continue; + } + var param = macro.params[index]; + var handler = managedMacro[managedArg]; + var nestedOptions = Object.create(options); + nestedOptions.settings = context; + var entry = handler.relink(param.value, fromTitle, toTitle, nestedOptions); + if (entry === undefined) { + continue; + } + // Macro parameters can only be string parameters, not + // indirect, or macro, or filtered + if (entry.impossible) { + macroEntry.impossible = true; + } + if (!entry.output) { + continue; + } + var quote = utils.determineQuote(text, param); + var quoted = wrapParameterValue(entry.output, quote); + var newParam = $tw.utils.extend({}, param); + if (quoted === undefined) { + if (!mayBeWidget || !options.placeholder) { + macroEntry.impossible = true; + continue; + } + var ph = options.placeholder.getPlaceholderFor(entry.output,handler.name); + newParam.newValue = "<<"+ph+">>"; + newParam.type = "macro"; + } else { + newParam.start = newParam.end - (newParam.value.length + (quote.length*2)); + newParam.value = entry.output; + newParam.newValue = quoted; + } + outMacro.params[index] = newParam; + modified = true; + } + if (modified || macroEntry.impossible) { + if (modified) { + macroEntry.output = outMacro; + } + return macroEntry; + } + return undefined; +}; + +/**Converts the macro object into a string, includes the <<..>>. + * The text is the old text the macro was formed from. It's used to preserve + * whitespace. + */ +exports.reassemble = function(macro, text, options) { + var builder = new Rebuilder(text, macro.start); + for (var i = 0; i < macro.params.length; i++) { + var param = macro.params[i]; + if (param.newValue) { + builder.add(param.newValue, param.start, param.end); + } + } + return builder.results(macro.end); +}; + + +/** Returns -1 if param definitely isn't in macrocall. + */ +function getParamIndexWithinMacrocall(context, macroName, param, params, options) { + var index, i, anonsExist = false; + for (i = 0; i < params.length; i++) { + var name = params[i].name; + if (name === param) { + return i; + } + if (name === undefined) { + anonsExist = true; + } + } + if (!anonsExist) { + // If no anonymous parameters are present, and we didn't find + // it among the named ones, it must not be there. + return -1; + } + var expectedIndex = indexOfParameterDef(context, macroName, param, options); + // We've got to skip over all the named parameter instances. + if (expectedIndex >= 0) { + var anonI = 0; + for (i = 0; i < params.length; i++) { + if (params[i].name === undefined) { + if (anonI === expectedIndex) { + return i; + } + anonI++; + } else { + var indexOfOther = indexOfParameterDef(context, macroName, params[i].name, options); + if (indexOfOther < expectedIndex) { + anonI++; + } + } + } + } + return -1; +}; + +// Looks up the definition of a macro, and figures out what the expected index +// is for the given parameter. +function indexOfParameterDef(context, macroName, paramName, options) { + var def = context.getMacroDefinition(macroName); + if (def === undefined) { + throw new CannotFindMacroDef(); + } + var params = def.params || []; + for (var i = 0; i < params.length; i++) { + if (params[i].name === paramName) { + return i; + } + } + return -1; +}; + +// Looks up the definition of a macro, and figures out what the expected index +// is for the given parameter. +function indexOfParameterDef(context, macroName, paramName, options) { + var def = context.getMacroDefinition(macroName); + if (def === undefined) { + throw new CannotFindMacroDef(); + } + var params = def.params || []; + for (var i = 0; i < params.length; i++) { + if (params[i].name === paramName) { + return i; + } + } + return -1; +}; + +/**Like wrapAttribute value, except for macro parameters, not attributes. + * + * These are more permissive. Allows brackets, + * and slashes and '<' in unquoted values. + */ +function wrapParameterValue(value, preference) { + var whitelist = ["", "'", '"', '[[', '"""']; + var choices = { + "": function(v) {return !/([\s>"'=])/.test(v); }, + "'": function(v) {return v.indexOf("'") < 0; }, + '"': function(v) {return v.indexOf('"') < 0; }, + "[[": canBePrettyOperand, + '"""': function(v) {return v.indexOf('"""') < 0 && v[v.length-1] != '"';} + }; + if (choices[preference] && choices[preference](value)) { + return wrap(value, preference); + } + for (var i = 0; i < whitelist.length; i++) { + var quote = whitelist[i]; + if (choices[quote](value)) { + return wrap(value, quote); + } + } + // No quotes will work on this + return undefined; +}; + +function canBePrettyOperand(value) { + return value.indexOf(']') < 0; +}; + + +function wrap(value, wrapper) { + var wrappers = { + "": function(v) {return v; }, + "'": function(v) {return "'"+v+"'"; }, + '"': function(v) {return '"'+v+'"'; }, + '"""': function(v) {return '"""'+v+'"""'; }, + "[[": function(v) {return "[["+v+"]]"; } + }; + var chosen = wrappers[wrapper]; + if (chosen) { + return chosen(value); + } else { + return undefined; + } +}; diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/utils/macrocall.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/utils/macrocall.js.meta new file mode 100644 index 0000000..8765140 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/utils/macrocall.js.meta @@ -0,0 +1,3 @@ +module-type: library +title: $:/plugins/flibbles/relink/js/utils/macrocall.js +type: application/javascript \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_utils_placeholder.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/utils/placeholder.js similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_utils_placeholder.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/utils/placeholder.js diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_utils_placeholder.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/utils/placeholder.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_utils_placeholder.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/utils/placeholder.js.meta diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_utils_rebuilder.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/utils/rebuilder.js similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_utils_rebuilder.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/utils/rebuilder.js diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_utils_rebuilder.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/utils/rebuilder.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_utils_rebuilder.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/utils/rebuilder.js.meta diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_wikimethods.js b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/wikimethods.js similarity index 88% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_wikimethods.js rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/wikimethods.js index d07bbb8..bec8c11 100644 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_wikimethods.js +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/wikimethods.js @@ -27,3 +27,7 @@ exports.getRelinkableTitles = function() { } })(); }; + +exports.getRelinkOrphans = function() { + return utils.getIndexer(this).orphans(); +}; diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_wikimethods.js.meta b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/wikimethods.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_js_wikimethods.js.meta rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/js/wikimethods.js.meta diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Buttons_Delete_Hint.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Buttons/Delete/Hint.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Buttons_Delete_Hint.tid rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Buttons/Delete/Hint.tid diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Buttons_LinkToInline_Hint.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Buttons/LinkToInline/Hint.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Buttons_LinkToInline_Hint.tid rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Buttons/LinkToInline/Hint.tid diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Buttons_NewAttribute_Caption.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Buttons/NewAttribute/Caption.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Buttons_NewAttribute_Caption.tid rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Buttons/NewAttribute/Caption.tid diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Buttons_NewAttribute_Hint.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Buttons/NewAttribute/Hint.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Buttons_NewAttribute_Hint.tid rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Buttons/NewAttribute/Hint.tid diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Buttons_NewField_Caption.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Buttons/NewField/Caption.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Buttons_NewField_Caption.tid rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Buttons/NewField/Caption.tid diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Buttons_NewField_Hint.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Buttons/NewField/Hint.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Buttons_NewField_Hint.tid rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Buttons/NewField/Hint.tid diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Buttons_NewOperator_Caption.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Buttons/NewOperator/Caption.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Buttons_NewOperator_Caption.tid rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Buttons/NewOperator/Caption.tid diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Buttons_NewOperator_Hint.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Buttons/NewOperator/Hint.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Buttons_NewOperator_Hint.tid rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Buttons/NewOperator/Hint.tid diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Buttons_NewParameter_Caption.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Buttons/NewParameter/Caption.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Buttons_NewParameter_Caption.tid rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Buttons/NewParameter/Caption.tid diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Buttons_NewParameter_Hint.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Buttons/NewParameter/Hint.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Buttons_NewParameter_Hint.tid rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Buttons/NewParameter/Hint.tid diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Error_InvalidAttributeName.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Error/InvalidAttributeName.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Error_InvalidAttributeName.tid rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Error/InvalidAttributeName.tid diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Error_InvalidElementName.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Error/InvalidElementName.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Error_InvalidElementName.tid rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Error/InvalidElementName.tid diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Error_InvalidMacroName.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Error/InvalidMacroName.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Error_InvalidMacroName.tid rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Error/InvalidMacroName.tid diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Error_InvalidParameterName.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Error/InvalidParameterName.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Error_InvalidParameterName.tid rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Error/InvalidParameterName.tid diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Error_RelinkFilterOperator.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Error/RelinkFilterOperator.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Error_RelinkFilterOperator.tid rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Error/RelinkFilterOperator.tid diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Error_ReportFailedRelinks.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Error/ReportFailedRelinks.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Error_ReportFailedRelinks.tid rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Error/ReportFailedRelinks.tid diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Error_UnrecognizedType.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Error/UnrecognizedType.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Error_UnrecognizedType.tid rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Error/UnrecognizedType.tid diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Filters/Missing.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Filters/Missing.tid new file mode 100644 index 0000000..6efc4a4 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Filters/Missing.tid @@ -0,0 +1,3 @@ +title: $:/plugins/flibbles/relink/language/Filters/Missing + +//Relink// Missing tiddlers \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Filters/Orphans.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Filters/Orphans.tid new file mode 100644 index 0000000..6ec60f7 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Filters/Orphans.tid @@ -0,0 +1,3 @@ +title: $:/plugins/flibbles/relink/language/Filters/Orphans + +//Relink// Orphans tiddlers \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Help_Attributes.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Help/Attributes.tid similarity index 56% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Help_Attributes.tid rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Help/Attributes.tid index e4ec62a..fc0af3e 100644 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Help_Attributes.tid +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Help/Attributes.tid @@ -1,3 +1,3 @@ title: $:/plugins/flibbles/relink/language/Help/Attributes -See the Attributes documentation page for details. \ No newline at end of file +See the Attributes documentation page for details. \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Help_Fields.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Help/Fields.tid similarity index 58% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Help_Fields.tid rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Help/Fields.tid index d17ffc9..dacb443 100644 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Help_Fields.tid +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Help/Fields.tid @@ -1,3 +1,3 @@ title: $:/plugins/flibbles/relink/language/Help/Fields -See the Fields documentation page for details. \ No newline at end of file +See the Fields documentation page for details. \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Help_Macros.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Help/Macros.tid similarity index 58% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Help_Macros.tid rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Help/Macros.tid index 3171eb2..69d28ae 100644 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Help_Macros.tid +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Help/Macros.tid @@ -1,3 +1,3 @@ title: $:/plugins/flibbles/relink/language/Help/Macros -See the Macros documentation page for details. \ No newline at end of file +See the Macros documentation page for details. \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Help_Operators.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Help/Operators.tid similarity index 57% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Help_Operators.tid rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Help/Operators.tid index f42f402..b731b8d 100644 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_Help_Operators.tid +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Help/Operators.tid @@ -1,3 +1,3 @@ title: $:/plugins/flibbles/relink/language/Help/Operators -See the Operators documentation page for details. \ No newline at end of file +See the Operators documentation page for details. \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/SideBar/Missing/Caption.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/SideBar/Missing/Caption.tid new file mode 100644 index 0000000..6d569dc --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/SideBar/Missing/Caption.tid @@ -0,0 +1,3 @@ +title: $:/plugins/flibbles/relink/language/SideBar/Missing/Caption + +//Relink//
    Missing \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/SideBar/Orphans/Caption.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/SideBar/Orphans/Caption.tid new file mode 100644 index 0000000..63f0775 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/SideBar/Orphans/Caption.tid @@ -0,0 +1,3 @@ +title: $:/plugins/flibbles/relink/language/SideBar/Orphans/Caption + +//Relink//
    Orphans \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_TiddlerInfo_References_Caption.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/TiddlerInfo/References/Caption.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_TiddlerInfo_References_Caption.tid rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/TiddlerInfo/References/Caption.tid diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_TiddlerInfo_References_Description.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/TiddlerInfo/References/Description.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_TiddlerInfo_References_Description.tid rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/TiddlerInfo/References/Description.tid diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_TiddlerInfo_References_Empty.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/TiddlerInfo/References/Empty.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_TiddlerInfo_References_Empty.tid rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/TiddlerInfo/References/Empty.tid diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Warning/OldRelinkTextOperator.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Warning/OldRelinkTextOperator.tid new file mode 100644 index 0000000..4fbe1f7 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/Warning/OldRelinkTextOperator.tid @@ -0,0 +1,3 @@ +title: $:/plugins/flibbles/relink/language/Warning/OldRelinkTextOperator + +Relink cannot parse your $$$<> wikitext until you migrate your "<>" relink module from the deprecated ''relinktextoperator'' module-type to ''relinktext''.

    See the online documentation for details. \ No newline at end of file diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_ui_Attributes_Caption.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/ui/Attributes/Caption.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_ui_Attributes_Caption.tid rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/ui/Attributes/Caption.tid diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_ui_Fields_Caption.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/ui/Fields/Caption.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_ui_Fields_Caption.tid rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/ui/Fields/Caption.tid diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_ui_Macros_Caption.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/ui/Macros/Caption.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_ui_Macros_Caption.tid rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/ui/Macros/Caption.tid diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_ui_Operators_Caption.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/ui/Operators/Caption.tid similarity index 100% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_language_ui_Operators_Caption.tid rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/language/ui/Operators/Caption.tid diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_license.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/license.tid similarity index 53% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_license.tid rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/license.tid index df22736..764aea3 100644 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_license.tid +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/license.tid @@ -1,6 +1,6 @@ title: $:/plugins/flibbles/relink/license type: text/vnd.tiddlywiki -Relink Plugin Copyright (c) 2019-<> Cameron Fischer +Relink Plugin Copyright (c) 2019-<> Cameron Fischer [[BSD 3-Clause License|https://raw.githubusercontent.com/flibbles/tw5-relink/master/LICENSE]] diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_readme.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/readme.tid similarity index 73% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_readme.tid rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/readme.tid index c78aa58..6c09441 100644 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_readme.tid +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/readme.tid @@ -8,4 +8,4 @@ It's already configured to update tiddler titles for all core widgets, filters, and fields, but the whitelists can be customized for each of this in the configuration panel. -See the tw5-relink website for more details and examples. +See the tw5-relink website for more details and examples. diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_ui_ListItemTemplate.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/ui/ListItemTemplate.tid similarity index 94% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_ui_ListItemTemplate.tid rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/ui/ListItemTemplate.tid index 4b9027a..832fbb8 100644 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_ui_ListItemTemplate.tid +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/ui/ListItemTemplate.tid @@ -1,5 +1,6 @@ title: $:/plugins/flibbles/relink/ui/ListItemTemplate +\whitespace trim <$set name="classes" filter="[relink:impossible]" diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/ui/ListItemWithBlurbTemplate.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/ui/ListItemWithBlurbTemplate.tid new file mode 100644 index 0000000..6479b01 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/ui/ListItemWithBlurbTemplate.tid @@ -0,0 +1,4 @@ +title: $:/plugins/flibbles/relink/ui/ListItemWithBlurbTemplate + +
    <$link />
    +<$list variable=blurb filter="[relink:report]"> diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/ui/MissingTemplate.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/ui/MissingTemplate.tid new file mode 100644 index 0000000..5f38521 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/ui/MissingTemplate.tid @@ -0,0 +1,17 @@ +title: $:/plugins/flibbles/relink/ui/MissingTemplate + +\whitespace trim +<$set name="missingTiddler" value=<> > +
    +<$button popup=<> class="tc-btn-invisible tc-missing-tiddler-label"> +<$view field="title" format="text" /> + +<$reveal state=<> type="popup" position="below" animate="yes"> +
    +<$transclude tiddler="$:/core/ui/ListItemTemplate"/> +
    +<$list filter="[all[current]relink:backreferences[]sort[title]]" template="$:/plugins/flibbles/relink/ui/ListItemWithBlurbTemplate"/> +
    + +
    + diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/ui/MoreSideBar/Missing.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/ui/MoreSideBar/Missing.tid new file mode 100644 index 0000000..b8d87d6 --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/ui/MoreSideBar/Missing.tid @@ -0,0 +1,5 @@ +caption: {{$:/plugins/flibbles/relink/language/SideBar/Missing/Caption}} +tags: $:/tags/MoreSideBar +title: $:/plugins/flibbles/relink/ui/MoreSideBar/Missing + +<$list filter={{$:/plugins/flibbles/relink/Filters/Missing!!filter}} template="$:/plugins/flibbles/relink/ui/MissingTemplate" /> diff --git a/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/ui/MoreSideBar/Orphans.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/ui/MoreSideBar/Orphans.tid new file mode 100644 index 0000000..f59df4f --- /dev/null +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/ui/MoreSideBar/Orphans.tid @@ -0,0 +1,5 @@ +caption: {{$:/plugins/flibbles/relink/language/SideBar/Orphans/Caption}} +tags: $:/tags/MoreSideBar +title: $:/plugins/flibbles/relink/ui/MoreSideBar/Orphans + +<$list filter={{$:/plugins/flibbles/relink/Filters/Orphans!!filter}} template="$:/core/ui/ListItemTemplate" /> diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_ui_TiddlerInfo_References.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/ui/TiddlerInfo/References.tid similarity index 97% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_ui_TiddlerInfo_References.tid rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/ui/TiddlerInfo/References.tid index 622b4b1..2c03d47 100644 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_ui_TiddlerInfo_References.tid +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/ui/TiddlerInfo/References.tid @@ -4,11 +4,10 @@ title: $:/plugins/flibbles/relink/ui/TiddlerInfo/References \define lingo-base() $:/plugins/flibbles/relink/language/TiddlerInfo/ \define filter() [all[current]relink:backreferences[]!title[$:/StoryList]!prefix[$:/temp/]sort[title]] +\whitespace trim <$list filter="[subfilterfirst[]]"> - <> - <$list filter=<> emptyMessage=<> variable="listItem" template="$:/plugins/flibbles/relink/ui/TiddlerInfo/ReferencesTemplate" /> diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_ui_TiddlerInfo_ReferencesTemplate.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/ui/TiddlerInfo/ReferencesTemplate.tid similarity index 95% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_ui_TiddlerInfo_ReferencesTemplate.tid rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/ui/TiddlerInfo/ReferencesTemplate.tid index 7a14a91..cab5477 100644 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_ui_TiddlerInfo_ReferencesTemplate.tid +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/ui/TiddlerInfo/ReferencesTemplate.tid @@ -1,5 +1,6 @@ title: $:/plugins/flibbles/relink/ui/TiddlerInfo/ReferencesTemplate +\whitespace trim @@ -34,25 +35,23 @@ title: $:/plugins/flibbles/relink/ui/components/tables \end \define tables(category, list-row-macro, header-list) +\whitespace trim <$vars column-count={{{[enlist<__header-list__>] [[DeleteColumn]] +[count[]]}}}> - <$list variable="header" filter="[enlist<__header-list__>butlast[]]"> - <<.make-table Custom "" yes>> <$list filter="[plugin-type[plugin]![$:/core]![$:/plugins/flibbles/relink]]"> -<$set name="subtitle" value={{!!description}} emptyValue={{!!title}} > +<$set name="subtitle" filter="[all[current]has[description]]" value="''{{!!name}}'': <$text text={{!!description}}/>" emptyValue="''{{!!name}}''" > <$macrocall $name=".make-table" title=<> plugin=<> /> - <<.make-table Core "$:/plugins/flibbles/relink">> diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_ui_configuration_Attributes.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/ui/configuration/Attributes.tid similarity index 91% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_ui_configuration_Attributes.tid rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/ui/configuration/Attributes.tid index 1789c59..a9dab2a 100644 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_ui_configuration_Attributes.tid +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/ui/configuration/Attributes.tid @@ -9,29 +9,32 @@ title: $:/plugins/flibbles/relink/ui/configuration/Attributes \define attribute-name-tiddler() $:/state/flibbles/relink/attribute-name \define row() -<$set name="element" - filter="[splitbefore[/]removesuffix[/]]"> +\whitespace trim +<$set name='element' + value={{{[splitbefore[/]removesuffix[/]]}}}> <$set name="attribute" - filter="[removeprefixremoveprefix[/]]"> + value={{{[removeprefixremoveprefix[/]]}}}> <$text text=<> /> <$text text=<> /> \end \define body() - -{{$:/plugins/flibbles/relink/language/Help/Attributes}} +\whitespace trim Add a new attribute: + <$edit-text tiddler=<> tag="input" default="" placeholder="widget/element" /> + <$edit-text tiddler=<> tag="input" default="" placeholder="attribute" /> + <$reveal type="nomatch" text="" state=<> > <$reveal type="nomatch" text="" state=<> > <$relinkmangler> @@ -59,7 +62,6 @@ title: $:/plugins/flibbles/relink/ui/configuration/Attributes <$text text={{$(lingo-base)$NewAttribute/Caption}}/> - <$macrocall $name=tables category="attributes" @@ -67,4 +69,6 @@ title: $:/plugins/flibbles/relink/ui/configuration/Attributes list-row-macro="row" /> \end +{{$:/plugins/flibbles/relink/language/Help/Attributes}} + <> diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_ui_configuration_Fields.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/ui/configuration/Fields.tid similarity index 94% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_ui_configuration_Fields.tid rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/ui/configuration/Fields.tid index fe51919..63b1fe9 100644 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_ui_configuration_Fields.tid +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/ui/configuration/Fields.tid @@ -9,16 +9,18 @@ title: $:/plugins/flibbles/relink/ui/configuration/Fields \define row() <$text text=<> /> \end + \define body() +\whitespace trim -{{$:/plugins/flibbles/relink/language/Help/Fields}} - -Add a new field: +Add a new field: + <$edit-text tiddler=<> tag="input" default="" placeholder="field name" /> + <$reveal type="nomatch" text="" state=<> > <$relinkmangler> <$button @@ -37,8 +39,6 @@ title: $:/plugins/flibbles/relink/ui/configuration/Fields <$text text={{$(lingo-base)$NewField/Caption}}/> - - <$macrocall $name=tables category="fields" @@ -46,4 +46,6 @@ title: $:/plugins/flibbles/relink/ui/configuration/Fields list-row-macro="row" /> \end +{{$:/plugins/flibbles/relink/language/Help/Fields}} + <> diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_ui_configuration_Macros.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/ui/configuration/Macros.tid similarity index 91% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_ui_configuration_Macros.tid rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/ui/configuration/Macros.tid index 5e44828..31470e7 100644 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_ui_configuration_Macros.tid +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/ui/configuration/Macros.tid @@ -9,29 +9,33 @@ title: $:/plugins/flibbles/relink/ui/configuration/Macros \define parameter-name-tiddler() $:/state/flibbles/relink/parameter-name \define row() +\whitespace trim <$set name="parameter" - filter="[relink:splitafter[/]]"> -<$set name="macro" - filter="[removesuffixremovesuffix[/]]"> + value={{{[relink:splitafter[/]]}}}> +<$set name='macro' + value={{{[removesuffixremovesuffix[/]]}}}> <$text text=<> /> <$text text=<> /> \end -\define body() -{{$:/plugins/flibbles/relink/language/Help/Macros}} +\define body() +\whitespace trim Add a new macro parameter: + <$edit-text tiddler=<> tag="input" default="" placeholder="macro" /> + <$edit-text tiddler=<> tag="input" default="" placeholder="parameter" /> + <$reveal type="nomatch" text="" state=<> > <$reveal type="nomatch" text="" state=<> > <$relinkmangler> @@ -59,8 +63,6 @@ title: $:/plugins/flibbles/relink/ui/configuration/Macros <$text text={{$(lingo-base)$NewParameter/Caption}}/> - - <$macrocall $name=tables category="macros" @@ -68,4 +70,6 @@ title: $:/plugins/flibbles/relink/ui/configuration/Macros list-row-macro="row" /> \end +{{$:/plugins/flibbles/relink/language/Help/Macros}} + <> diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_ui_configuration_Operators.tid b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/ui/configuration/Operators.tid similarity index 94% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_ui_configuration_Operators.tid rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/ui/configuration/Operators.tid index f9cacb9..4b80e25 100644 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_ui_configuration_Operators.tid +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/ui/configuration/Operators.tid @@ -9,16 +9,18 @@ title: $:/plugins/flibbles/relink/ui/configuration/Operators \define row() <$text text=<> /> \end + \define body() +\whitespace trim -{{$:/plugins/flibbles/relink/language/Help/Operators}} - -Add a new filter operator: +Add a new filter operator: + <$edit-text tiddler=<> tag="input" default="" placeholder="operator name" /> + <$reveal type="nomatch" text="" state=<>> <$relinkmangler> <$button @@ -37,7 +39,6 @@ title: $:/plugins/flibbles/relink/ui/configuration/Operators <$text text={{$(lingo-base)$NewOperator/Caption}}/> - <$macrocall $name=tables category="operators" @@ -45,4 +46,6 @@ title: $:/plugins/flibbles/relink/ui/configuration/Operators list-row-macro="row" /> \end +{{$:/plugins/flibbles/relink/language/Help/Operators}} + <> diff --git a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_ui_stylesheet.css b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/ui/stylesheet.css.tid similarity index 82% rename from tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_ui_stylesheet.css rename to tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/ui/stylesheet.css.tid index 466e041..17a3fa4 100644 --- a/tzk/editions/tzk/plugins/relink/$__plugins_flibbles_relink_ui_stylesheet.css +++ b/tzk/editions/tzk/plugins/relink/_system/plugins/flibbles/relink/ui/stylesheet.css.tid @@ -1,3 +1,6 @@ +tags: $:/tags/Stylesheet +title: $:/plugins/flibbles/relink/ui/stylesheet.css + .tc-relink-references { } @@ -53,5 +56,9 @@ } .tc-relink-impossible a.tc-tiddlylink { - color: red; + color: <>; +} + +.tc-relink-menu-missing-blurb { + margin-left: 30pt; } diff --git a/tzk/editions/tzk/plugins/relink/plugin.info b/tzk/editions/tzk/plugins/relink/plugin.info index e82052c..8d040be 100644 --- a/tzk/editions/tzk/plugins/relink/plugin.info +++ b/tzk/editions/tzk/plugins/relink/plugin.info @@ -3,7 +3,7 @@ "title": "$:/plugins/flibbles/relink", "description": "Flexibility when relinking renamed tiddlers", "author": "Flibbles", - "version": "2.0.0", + "version": "2.3.1", "core-version": ">=5.1.22", "source": "https://github.com/flibbles/tw5-relink", "demo": "http://flibbles.github.io/tw5-relink/", diff --git a/tzk/editions/tzk/plugins/shuffle/$__plugins_mklauber_shuffle_readme.tid b/tzk/editions/tzk/plugins/shuffle/_system/plugins/mklauber/shuffle/readme.tid similarity index 100% rename from tzk/editions/tzk/plugins/shuffle/$__plugins_mklauber_shuffle_readme.tid rename to tzk/editions/tzk/plugins/shuffle/_system/plugins/mklauber/shuffle/readme.tid diff --git a/tzk/editions/tzk/plugins/shuffle/$__plugins_mklauber_shuffle_seedrandom.js b/tzk/editions/tzk/plugins/shuffle/_system/plugins/mklauber/shuffle/seedrandom.js similarity index 100% rename from tzk/editions/tzk/plugins/shuffle/$__plugins_mklauber_shuffle_seedrandom.js rename to tzk/editions/tzk/plugins/shuffle/_system/plugins/mklauber/shuffle/seedrandom.js diff --git a/tzk/editions/tzk/plugins/shuffle/$__plugins_mklauber_shuffle_seedrandom.js.meta b/tzk/editions/tzk/plugins/shuffle/_system/plugins/mklauber/shuffle/seedrandom.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/shuffle/$__plugins_mklauber_shuffle_seedrandom.js.meta rename to tzk/editions/tzk/plugins/shuffle/_system/plugins/mklauber/shuffle/seedrandom.js.meta diff --git a/tzk/editions/tzk/plugins/shuffle/$__plugins_mklauber_shuffle_shuffle.js b/tzk/editions/tzk/plugins/shuffle/_system/plugins/mklauber/shuffle/shuffle.js similarity index 100% rename from tzk/editions/tzk/plugins/shuffle/$__plugins_mklauber_shuffle_shuffle.js rename to tzk/editions/tzk/plugins/shuffle/_system/plugins/mklauber/shuffle/shuffle.js diff --git a/tzk/editions/tzk/plugins/shuffle/$__plugins_mklauber_shuffle_shuffle.js.meta b/tzk/editions/tzk/plugins/shuffle/_system/plugins/mklauber/shuffle/shuffle.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/shuffle/$__plugins_mklauber_shuffle_shuffle.js.meta rename to tzk/editions/tzk/plugins/shuffle/_system/plugins/mklauber/shuffle/shuffle.js.meta diff --git a/tzk/editions/tzk/plugins/shuffle/$__plugins_mklauber_shuffle_startup.js b/tzk/editions/tzk/plugins/shuffle/_system/plugins/mklauber/shuffle/startup.js similarity index 100% rename from tzk/editions/tzk/plugins/shuffle/$__plugins_mklauber_shuffle_startup.js rename to tzk/editions/tzk/plugins/shuffle/_system/plugins/mklauber/shuffle/startup.js diff --git a/tzk/editions/tzk/plugins/shuffle/$__plugins_mklauber_shuffle_startup.js.meta b/tzk/editions/tzk/plugins/shuffle/_system/plugins/mklauber/shuffle/startup.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/shuffle/$__plugins_mklauber_shuffle_startup.js.meta rename to tzk/editions/tzk/plugins/shuffle/_system/plugins/mklauber/shuffle/startup.js.meta diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_button.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/button.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_button.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/button.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_button_image.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/button/image.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_button_image.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/button/image.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_defaults b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/defaults similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_defaults rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/defaults diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_defaults.meta b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/defaults.meta similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_defaults.meta rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/defaults.meta diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_editor_navigation.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/editor/navigation.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_editor_navigation.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/editor/navigation.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_editor_open.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/editor/open.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_editor_open.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/editor/open.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_editor_templates.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/editor/templates.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_editor_templates.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/editor/templates.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_editor_view.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/editor/view.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_editor_view.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/editor/view.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_macro.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/macro.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_macro.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/macro.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_pagination.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/pagination.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_pagination.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/pagination.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_readme.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/readme.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_readme.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/readme.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_style_dark.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/style/dark.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_style_dark.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/style/dark.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_style_default.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/style/default.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_style_default.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/style/default.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_style_invisible.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/style/invisible.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_style_invisible.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/style/invisible.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_style_standard.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/style/standard.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_style_standard.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/style/standard.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_style_tight.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/style/tight.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_style_tight.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/style/tight.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_body_anything.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/body/anything.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_body_anything.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/body/anything.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_body_button.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/body/button.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_body_button.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/body/button.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_body_checkbox.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/body/checkbox.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_body_checkbox.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/body/checkbox.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_body_date.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/body/date.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_body_date.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/body/date.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_body_default.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/body/default.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_body_default.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/body/default.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_body_delete.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/body/delete.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_body_delete.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/body/delete.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_body_edit-input.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/body/edit-input.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_body_edit-input.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/body/edit-input.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_body_edit-textarea.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/body/edit-textarea.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_body_edit-textarea.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/body/edit-textarea.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_body_edit.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/body/edit.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_body_edit.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/body/edit.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_body_expand-many.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/body/expand-many.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_body_expand-many.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/body/expand-many.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_body_expand-one.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/body/expand-one.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_body_expand-one.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/body/expand-one.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_body_index.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/body/index.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_body_index.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/body/index.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_body_radio.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/body/radio.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_body_radio.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/body/radio.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_body_tags.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/body/tags.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_body_tags.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/body/tags.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_body_title.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/body/title.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_body_title.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/body/title.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_expand_edit.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/expand/edit.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_expand_edit.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/expand/edit.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_expand_transclude.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/expand/transclude.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_expand_transclude.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/expand/transclude.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_footer_default.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/footer/default.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_footer_default.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/footer/default.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_footer_disabled.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/footer/disabled.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_footer_disabled.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/footer/disabled.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_footer_empty.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/footer/empty.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_footer_empty.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/footer/empty.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_header_button.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/header/button.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_header_button.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/header/button.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_header_checkbox.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/header/checkbox.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_header_checkbox.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/header/checkbox.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_header_default.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/header/default.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_header_default.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/header/default.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_header_delete.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/header/delete.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_header_delete.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/header/delete.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_header_disabled.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/header/disabled.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_header_disabled.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/header/disabled.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_header_empty.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/header/empty.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_header_empty.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/header/empty.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_header_expand.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/header/expand.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_header_expand.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/header/expand.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_pagination_default.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/pagination/default.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_template_pagination_default.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/template/pagination/default.tid diff --git a/tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_view.tid b/tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/view.tid similarity index 100% rename from tzk/editions/tzk/plugins/tables/$__plugins_aaldrich_tables_view.tid rename to tzk/editions/tzk/plugins/tables/_system/plugins/aaldrich/tables/view.tid diff --git a/tzk/editions/tzk/plugins/tidgraph/$__plugins_ihm_templates_collapse.tid b/tzk/editions/tzk/plugins/tidgraph/_system/plugins/ihm/templates/collapse.tid similarity index 100% rename from tzk/editions/tzk/plugins/tidgraph/$__plugins_ihm_templates_collapse.tid rename to tzk/editions/tzk/plugins/tidgraph/_system/plugins/ihm/templates/collapse.tid diff --git a/tzk/editions/tzk/plugins/tidgraph/$__plugins_ihm_templates_expand.tid b/tzk/editions/tzk/plugins/tidgraph/_system/plugins/ihm/templates/expand.tid similarity index 100% rename from tzk/editions/tzk/plugins/tidgraph/$__plugins_ihm_templates_expand.tid rename to tzk/editions/tzk/plugins/tidgraph/_system/plugins/ihm/templates/expand.tid diff --git a/tzk/editions/tzk/plugins/tidgraph/$__plugins_ihm_tidgraph_changelog.tid b/tzk/editions/tzk/plugins/tidgraph/_system/plugins/ihm/tidgraph/changelog.tid similarity index 100% rename from tzk/editions/tzk/plugins/tidgraph/$__plugins_ihm_tidgraph_changelog.tid rename to tzk/editions/tzk/plugins/tidgraph/_system/plugins/ihm/tidgraph/changelog.tid diff --git a/tzk/editions/tzk/plugins/tidgraph/$__plugins_ihm_tidgraph_documentation.tid b/tzk/editions/tzk/plugins/tidgraph/_system/plugins/ihm/tidgraph/documentation.tid similarity index 100% rename from tzk/editions/tzk/plugins/tidgraph/$__plugins_ihm_tidgraph_documentation.tid rename to tzk/editions/tzk/plugins/tidgraph/_system/plugins/ihm/tidgraph/documentation.tid diff --git a/tzk/editions/tzk/plugins/tidgraph/$__plugins_ihm_tidgraph_readme.tid b/tzk/editions/tzk/plugins/tidgraph/_system/plugins/ihm/tidgraph/readme.tid similarity index 100% rename from tzk/editions/tzk/plugins/tidgraph/$__plugins_ihm_tidgraph_readme.tid rename to tzk/editions/tzk/plugins/tidgraph/_system/plugins/ihm/tidgraph/readme.tid diff --git a/tzk/editions/tzk/plugins/tidgraph/$__plugins_ihm_tidgraph_stylesheet.css b/tzk/editions/tzk/plugins/tidgraph/_system/plugins/ihm/tidgraph/stylesheet.css similarity index 100% rename from tzk/editions/tzk/plugins/tidgraph/$__plugins_ihm_tidgraph_stylesheet.css rename to tzk/editions/tzk/plugins/tidgraph/_system/plugins/ihm/tidgraph/stylesheet.css diff --git a/tzk/editions/tzk/plugins/tidgraph/$__plugins_ihm_tidgraph_stylesheet.css.meta b/tzk/editions/tzk/plugins/tidgraph/_system/plugins/ihm/tidgraph/stylesheet.css.meta similarity index 100% rename from tzk/editions/tzk/plugins/tidgraph/$__plugins_ihm_tidgraph_stylesheet.css.meta rename to tzk/editions/tzk/plugins/tidgraph/_system/plugins/ihm/tidgraph/stylesheet.css.meta diff --git a/tzk/editions/tzk/plugins/tidgraph/$__plugins_ihm_tidgraph_tidgraph.png b/tzk/editions/tzk/plugins/tidgraph/_system/plugins/ihm/tidgraph/tidgraph.png similarity index 100% rename from tzk/editions/tzk/plugins/tidgraph/$__plugins_ihm_tidgraph_tidgraph.png rename to tzk/editions/tzk/plugins/tidgraph/_system/plugins/ihm/tidgraph/tidgraph.png diff --git a/tzk/editions/tzk/plugins/tidgraph/$__plugins_ihm_tidgraph_tidgraph.png.meta b/tzk/editions/tzk/plugins/tidgraph/_system/plugins/ihm/tidgraph/tidgraph.png.meta similarity index 100% rename from tzk/editions/tzk/plugins/tidgraph/$__plugins_ihm_tidgraph_tidgraph.png.meta rename to tzk/editions/tzk/plugins/tidgraph/_system/plugins/ihm/tidgraph/tidgraph.png.meta diff --git a/tzk/editions/tzk/plugins/tidgraph/$__plugins_ihm_tidgraph_utils.js b/tzk/editions/tzk/plugins/tidgraph/_system/plugins/ihm/tidgraph/utils.js similarity index 100% rename from tzk/editions/tzk/plugins/tidgraph/$__plugins_ihm_tidgraph_utils.js rename to tzk/editions/tzk/plugins/tidgraph/_system/plugins/ihm/tidgraph/utils.js diff --git a/tzk/editions/tzk/plugins/tidgraph/$__plugins_ihm_tidgraph_utils.js.meta b/tzk/editions/tzk/plugins/tidgraph/_system/plugins/ihm/tidgraph/utils.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/tidgraph/$__plugins_ihm_tidgraph_utils.js.meta rename to tzk/editions/tzk/plugins/tidgraph/_system/plugins/ihm/tidgraph/utils.js.meta diff --git a/tzk/editions/tzk/plugins/tidgraph/$__plugins_ihm_widgets_tidgraph.js b/tzk/editions/tzk/plugins/tidgraph/_system/plugins/ihm/widgets/tidgraph.js similarity index 100% rename from tzk/editions/tzk/plugins/tidgraph/$__plugins_ihm_widgets_tidgraph.js rename to tzk/editions/tzk/plugins/tidgraph/_system/plugins/ihm/widgets/tidgraph.js diff --git a/tzk/editions/tzk/plugins/tidgraph/$__plugins_ihm_widgets_tidgraph.js.meta b/tzk/editions/tzk/plugins/tidgraph/_system/plugins/ihm/widgets/tidgraph.js.meta similarity index 100% rename from tzk/editions/tzk/plugins/tidgraph/$__plugins_ihm_widgets_tidgraph.js.meta rename to tzk/editions/tzk/plugins/tidgraph/_system/plugins/ihm/widgets/tidgraph.js.meta diff --git a/tzk/editions/tzk/tiddlers/$__config_SyncFilter.tid b/tzk/editions/tzk/tiddlers/$__config_SyncFilter.tid deleted file mode 100644 index 46cb75b..0000000 --- a/tzk/editions/tzk/tiddlers/$__config_SyncFilter.tid +++ /dev/null @@ -1,6 +0,0 @@ -created: 20200528020409590 -modified: 20200528020441073 -title: $:/config/SyncFilter -type: text/vnd.tiddlywiki - -[is[tiddler]] -[[$:/HistoryList]] -[[$:/Import]] -[[$:/isEncrypted]] -[prefix[$:/status/]] -[prefix[$:/state/]] -[prefix[$:/temp/]] -[[$:/StoryList]] \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__config_flibbles_relink_fields_description.tid b/tzk/editions/tzk/tiddlers/$__config_flibbles_relink_fields_description.tid deleted file mode 100644 index e8372eb..0000000 --- a/tzk/editions/tzk/tiddlers/$__config_flibbles_relink_fields_description.tid +++ /dev/null @@ -1,6 +0,0 @@ -created: 20200517132308563 -modified: 20200517132308152 -title: $:/config/flibbles/relink/fields/description -type: text/vnd.tiddlywiki - -wikitext \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__tags_ViewTemplate.tid b/tzk/editions/tzk/tiddlers/$__tags_ViewTemplate.tid deleted file mode 100644 index 92be8eb..0000000 --- a/tzk/editions/tzk/tiddlers/$__tags_ViewTemplate.tid +++ /dev/null @@ -1,7 +0,0 @@ -created: 20201129183705439 -creator: soren -list: $:/core/ui/ViewTemplate/title $:/core/ui/ViewTemplate/unfold $:/core/ui/ViewTemplate/subtitle $:/sib/EpistemicStatus/Display $:/sib/MediaRating/Display $:/core/ui/ViewTemplate/tags $:/core/ui/ViewTemplate/classic $:/sib/Templates/Automatic/Subtiddler $:/sib/Templates/Automatic/TypeTagChecker $:/sib/Templates/Automatic/SpoilerBanner $:/sib/Templates/Automatic/Untitled $:/sib/Templates/Automatic/PrivateChunkParentNotice $:/sib/Templates/Automatic/Source $:/sib/Templates/Topical/MinnesotaStateParkInfo $:/sib/Templates/Automatic/MacroDescription $:/core/ui/ViewTemplate/body $:/sib/indite/ViewTemplate $:/sib/Reviewer/SchedulableTemplate $:/sib/gis/MappingTools $:/sib/Templates/Topical/SabbaticalUpdates/DateNavigation $:/sib/Templates/Automatic/Publicity/ViewerPublicLine $:/core/ui/ViewTemplate/import $:/core/ui/ViewTemplate/plugin $:/plugins/danielo515/2click2edit/ui/ViewTemplate $:/sib/refexplorer/ReferenceExplorer $:/sib/Templates/Automatic/ViewTemplateDescription $:/sib/Templates/Automatic/ReaderActions -modified: 20211120171147065 -modifier: soren -title: $:/tags/ViewTemplate -type: text/vnd.tiddlywiki \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__todolist_data_base_archive.json b/tzk/editions/tzk/tiddlers/$__todolist_data_base_archive.json deleted file mode 100644 index dae06a0..0000000 --- a/tzk/editions/tzk/tiddlers/$__todolist_data_base_archive.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "20200411132349135": "Identify and populate fields for Sources", - "20200411132355040": "Try to add pictures for more people", - "20200411132404648": "Identify a way to keep track of the characters in works of fiction (universe field or something?)", - "20200427032342224": "Journals should be easily splittable into sections with /'s (and slotted that way in the folder) -- have to think about order.", - "20200427032347386": "Readjust bucketing in filesystem", - "20200427033916350": "Journal section in the ReferenceExplorer", - "20200520144155787": "Look into keyboard shortcuts" -} \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__todolist_data_base_archive.json.meta b/tzk/editions/tzk/tiddlers/$__todolist_data_base_archive.json.meta deleted file mode 100644 index 139188a..0000000 --- a/tzk/editions/tzk/tiddlers/$__todolist_data_base_archive.json.meta +++ /dev/null @@ -1,4 +0,0 @@ -created: 20200612234035819 -modified: 20200612234036052 -title: $:/todolist/data/base/archive -type: application/json \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__todolist_data_base_done.json b/tzk/editions/tzk/tiddlers/$__todolist_data_base_done.json deleted file mode 100644 index 9e26dfe..0000000 --- a/tzk/editions/tzk/tiddlers/$__todolist_data_base_done.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__todolist_data_base_done.json.meta b/tzk/editions/tzk/tiddlers/$__todolist_data_base_done.json.meta deleted file mode 100644 index f0568fa..0000000 --- a/tzk/editions/tzk/tiddlers/$__todolist_data_base_done.json.meta +++ /dev/null @@ -1,6 +0,0 @@ -created: 20200416123626170 -creator: soren -modified: 20200612234035835 -modifier: soren -title: $:/todolist/data/base/done -type: application/json \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__todolist_data_base_priority.json b/tzk/editions/tzk/tiddlers/$__todolist_data_base_priority.json deleted file mode 100644 index 9b106cc..0000000 --- a/tzk/editions/tzk/tiddlers/$__todolist_data_base_priority.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "20200411132349135": "none", - "20200411132355040": "none", - "20200411132404648": "none", - "20200423024915852": "yellow", - "20200427032342224": "limegreen", - "20200427032347386": "none", - "20200427033916350": "limegreen", - "20200428184308637": "none", - "20200519141610053": "none", - "20200520144155787": "none", - "20200831174643357": "none" -} \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__todolist_data_base_priority.json.meta b/tzk/editions/tzk/tiddlers/$__todolist_data_base_priority.json.meta deleted file mode 100644 index 8640a0e..0000000 --- a/tzk/editions/tzk/tiddlers/$__todolist_data_base_priority.json.meta +++ /dev/null @@ -1,6 +0,0 @@ -created: 20200411132343915 -creator: soren -modified: 20200831174646077 -modifier: soren -title: $:/todolist/data/base/priority -type: application/json \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__todolist_data_base_state.json b/tzk/editions/tzk/tiddlers/$__todolist_data_base_state.json deleted file mode 100644 index 26eb698..0000000 --- a/tzk/editions/tzk/tiddlers/$__todolist_data_base_state.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "itemtext": "", - "option": "yes", - "timestamp": "show", - "editview": "view", - "markall": "no" -} \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__todolist_data_base_state.json.meta b/tzk/editions/tzk/tiddlers/$__todolist_data_base_state.json.meta deleted file mode 100644 index f4da3dc..0000000 --- a/tzk/editions/tzk/tiddlers/$__todolist_data_base_state.json.meta +++ /dev/null @@ -1,6 +0,0 @@ -created: 20200411132340008 -creator: soren -modified: 20200913151437409 -modifier: soren -title: $:/todolist/data/base/state -type: application/json \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__todolist_data_base_status.json b/tzk/editions/tzk/tiddlers/$__todolist_data_base_status.json deleted file mode 100644 index e273428..0000000 --- a/tzk/editions/tzk/tiddlers/$__todolist_data_base_status.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "20200423024915852": "undone", - "20200428184308637": "undone", - "20200519141610053": "undone", - "20200831174643357": "undone" -} \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__todolist_data_base_status.json.meta b/tzk/editions/tzk/tiddlers/$__todolist_data_base_status.json.meta deleted file mode 100644 index ddcfe2e..0000000 --- a/tzk/editions/tzk/tiddlers/$__todolist_data_base_status.json.meta +++ /dev/null @@ -1,6 +0,0 @@ -created: 20200411132343915 -creator: soren -modified: 20200831174646171 -modifier: soren -title: $:/todolist/data/base/status -type: application/json \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__todolist_data_base_tasks.json b/tzk/editions/tzk/tiddlers/$__todolist_data_base_tasks.json deleted file mode 100644 index 99ee66d..0000000 --- a/tzk/editions/tzk/tiddlers/$__todolist_data_base_tasks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "20200423024915852": "Fix the fact that rich relationships are missing from the \"All\" ReferenceExplorer view", - "20200428184308637": "Create maintenance tool for naming conventions (no 'Vs', only 'Versus'; PAO names)", - "20200519141610053": "Public ZK should use zoomin view; also can we not render backgrounded tiddlers to improve performance?", - "20200831174643357": "Possibility of a nopub macro for little snippets of things that can't be publicized; would need to regex-replace out of the source prior to publish" -} \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__todolist_data_base_tasks.json.meta b/tzk/editions/tzk/tiddlers/$__todolist_data_base_tasks.json.meta deleted file mode 100644 index 4640bed..0000000 --- a/tzk/editions/tzk/tiddlers/$__todolist_data_base_tasks.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -created: 20200411132343915 -creator: soren -list: 20200831174643357 20200519141610053 20200423024915852 20200428184308637 -modified: 20200831174646196 -modifier: soren -title: $:/todolist/data/base/tasks -type: application/json \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/Class.tid b/tzk/editions/tzk/tiddlers/Class.tid index 797ea2d..5c89f17 100644 --- a/tzk/editions/tzk/tiddlers/Class.tid +++ b/tzk/editions/tzk/tiddlers/Class.tid @@ -3,7 +3,7 @@ color: #ff0000 created: 20200312153108522 creator: soren icon: $:/core/images/tag-button -modified: 20210825155749259 +modified: 20230405211410333 modifier: soren tags: Meta Public title: Class diff --git a/tzk/editions/tzk/tiddlers/JournalCalendar.tid b/tzk/editions/tzk/tiddlers/JournalCalendar.tid new file mode 100644 index 0000000..707857b --- /dev/null +++ b/tzk/editions/tzk/tiddlers/JournalCalendar.tid @@ -0,0 +1,15 @@ +created: 20230909122659267 +modified: 20230909123609042 +tags: Index +title: JournalCalendar +type: text/vnd.tiddlywiki + +
    + <> +
    + + \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/PAO.tid b/tzk/editions/tzk/tiddlers/PAO.tid index 8b0cec7..c9cc56e 100644 --- a/tzk/editions/tzk/tiddlers/PAO.tid +++ b/tzk/editions/tzk/tiddlers/PAO.tid @@ -3,7 +3,7 @@ color: #ff0000 created: 20200115231447676 creator: soren icon: $:/core/images/tag-button -modified: 20210827234120899 +modified: 20230406024908885 modifier: soren refexplorer-hide: true tags: Meta Public @@ -16,7 +16,7 @@ type: text/vnd.tiddlywiki Tiddler type, the name of which stands for “''P''erson, ''A''nimal, or ''O''rganization.” -See $:/sib/Tools/PaoList for a list of all PAOs, and $:/sib/Tools/MissingPeople to find PAOs that have been referenced but not had a tiddler created. +See $:/sib/Tools/MissingPeople to find PAOs that have been referenced but not had a tiddler created. !! Linking @@ -27,7 +27,7 @@ Sources should be connected to their authors by linking to the author or authors !! Naming conventions -In addition to being tagged `PAO`, PAOs should have names which begin with `Mr`, `Ms`, or `The`. The first two indicate a person/animal and indicate gender (my intention is to use `Mx` for non-binary people, but I haven't needed it yet). `The` is used for organizations. Note that the titles of tiddlers which do not represent organizations should consequently not begin with //The// to avoid confusion; see OurNamingConventions. +In addition to being tagged `PAO`, PAOs should have names which begin with `Mr`, `Ms`, `Mx`, or `The`. The first three indicate a person/animal and indicate gender (`Mx` is for non-binary people or people of unidentified gender). `The` is used for organizations. Note that the titles of tiddlers which do not represent organizations should consequently not begin with //The// to avoid confusion; see OurNamingConventions. !! Tags and fields diff --git a/tzk/editions/tzk/tiddlers/PublicHomepage.tid b/tzk/editions/tzk/tiddlers/PublicHomepage.tid index 8293055..efff99f 100644 --- a/tzk/editions/tzk/tiddlers/PublicHomepage.tid +++ b/tzk/editions/tzk/tiddlers/PublicHomepage.tid @@ -1,7 +1,7 @@ created: 20200507143136944 creator: soren list: PublicHomepage/Navigating PublicHomepage/Organization [[PublicHomepage/Points of Interest]] [[PublicHomepage/No Warranty]] PublicHomepage/Copyright PublicHomepage/Contact [[PublicHomepage/Video Tour]] -modified: 20211007181213586 +modified: 20221202000932702 modifier: soren tags: Public Meta title: PublicHomepage diff --git a/tzk/editions/tzk/tiddlers/RecentIdeas.tid b/tzk/editions/tzk/tiddlers/RecentIdeas.tid new file mode 100644 index 0000000..905e69d --- /dev/null +++ b/tzk/editions/tzk/tiddlers/RecentIdeas.tid @@ -0,0 +1,34 @@ +created: 20220909162241485 +creator: soren +modified: 20221201234637583 +modifier: soren +tags: Tool Public +title: RecentIdeas +type: text/vnd.tiddlywiki + +See 100 published Ideas most recently:  +<$radio tiddler="$:/temp/RecentListSortField" value="created"> Created  +<$radio tiddler="$:/temp/RecentListSortField" value="modified"> Updated + +<$list filter="[{$:/temp/RecentListSortField}!is[blank]]" variable=_ emptyMessage="//Please select a sort field above.//"> + + + + + + + <$list filter="[tag[Idea]tag[Public]!search:title[/]!tag[Software]!sort{$:/temp/RecentListSortField}limit[100]]"> + + + + + + +
    CreatedIdeaTags
    <$view format="date" template="YYYY/0MM/0DD" field={{$:/temp/RecentListSortField}}/><$link /><$list filter="[{!!description}!is[blank]]" variable=_>: {{!!description}}<$list filter="[all[current]tags[]sort[]]"><$macrocall $name="tag-pill" tag=<>/>
    + + + \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/UpdateStatuses.tid b/tzk/editions/tzk/tiddlers/UpdateStatuses.tid new file mode 100644 index 0000000..445e774 --- /dev/null +++ b/tzk/editions/tzk/tiddlers/UpdateStatuses.tid @@ -0,0 +1,19 @@ +created: 20230407015234920 +creator: soren +description: Update statuses give a vague idea of how reliably a tiddler represents my current thinking. +modified: 20230407030031171 +modifier: soren +tags: Meta Public +title: UpdateStatuses +type: text/vnd.tiddlywiki + +Each tiddler has an ''update status'' which aims to give a rough idea of whether you can rely on the information in that tiddler to be aligned with my current thinking. See DocumentationStates for inspiration. + +For now update statuses are something of an experiment and apply only to idea tiddlers; I may expand the system if it works well. + +; maintained +: The tiddler describes an idea, opinion, etc., that can change over time, and has been touched within the preceding 6 months. It's probably not wildly out of date. +; stale +: The tiddler is of a type that can be maintained, but: (a) it hasn't been edited or explicitly marked as still relevant for 6 months; or (b) it contains a TODO or is tagged NeedsAttention. A stale tiddler is not necessarily out of date with my current thinking -- in fact, it usually isn't -- but it's worth recognizing that some time has gone past and things may have changed. +; frozen +: The tiddler is intended as a record of my thinking at a point in time, and thus cannot go out of date. Tag a tiddler [[Frozen]] to give it this status. \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__DefaultTiddlers.tid b/tzk/editions/tzk/tiddlers/_system/DefaultTiddlers.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__DefaultTiddlers.tid rename to tzk/editions/tzk/tiddlers/_system/DefaultTiddlers.tid diff --git a/tzk/editions/tzk/tiddlers/_system/HistoryList.json b/tzk/editions/tzk/tiddlers/_system/HistoryList.json new file mode 100644 index 0000000..ed44e8b --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/HistoryList.json @@ -0,0 +1,5 @@ +[ + { + "title": "GettingStarted" + } +] \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/_system/HistoryList.json.meta b/tzk/editions/tzk/tiddlers/_system/HistoryList.json.meta new file mode 100644 index 0000000..f818ab4 --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/HistoryList.json.meta @@ -0,0 +1,5 @@ +created: 20230416171729512 +current-tiddler: GettingStarted +modified: 20230416171729512 +title: $:/HistoryList +type: application/json \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/_system/Import.tid b/tzk/editions/tzk/tiddlers/_system/Import.tid new file mode 100644 index 0000000..d52d2f4 --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/Import.tid @@ -0,0 +1,8 @@ +modified: 20231014151713182 +status: complete +title: $:/Import +type: text/vnd.tiddlywiki + +The following tiddlers were imported: + +# [[wwcm.pdf]] \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__SiteSubtitle.tid b/tzk/editions/tzk/tiddlers/_system/SiteSubtitle.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__SiteSubtitle.tid rename to tzk/editions/tzk/tiddlers/_system/SiteSubtitle.tid diff --git a/tzk/editions/tzk/tiddlers/$__SiteTitle.tid b/tzk/editions/tzk/tiddlers/_system/SiteTitle.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__SiteTitle.tid rename to tzk/editions/tzk/tiddlers/_system/SiteTitle.tid diff --git a/tzk/editions/tzk/tiddlers/$__StoryList.tid b/tzk/editions/tzk/tiddlers/_system/StoryList.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__StoryList.tid rename to tzk/editions/tzk/tiddlers/_system/StoryList.tid diff --git a/tzk/editions/tzk/tiddlers/$__TagSaver.tid b/tzk/editions/tzk/tiddlers/_system/TagSaver.tid similarity index 83% rename from tzk/editions/tzk/tiddlers/$__TagSaver.tid rename to tzk/editions/tzk/tiddlers/_system/TagSaver.tid index 2cccae0..fe8e6ef 100644 --- a/tzk/editions/tzk/tiddlers/$__TagSaver.tid +++ b/tzk/editions/tzk/tiddlers/_system/TagSaver.tid @@ -1,8 +1,8 @@ created: 20210827213731043 creator: soren -modified: 20210828132716711 +modified: 20231016023752916 modifier: soren -tags: Attachment Bibliography Class Conversation Idea Image Index Journal Meta Notes PAO Place Publication Sink Source Tool PrivateChunk Public NeedsAttention NeedsExcision Stub +tags: Attachment Bibliography Class Conversation Idea Image Index Journal Meta Notes PAO Place Publication Sink Source Tool PrivateChunk Public NeedsAttention NeedsExcision Stub $:/TagSaver Wide Frozen title: $:/TagSaver type: text/vnd.tiddlywiki diff --git a/tzk/editions/tzk/tiddlers/$__config_AnimationDuration.tid b/tzk/editions/tzk/tiddlers/_system/config/AnimationDuration.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_AnimationDuration.tid rename to tzk/editions/tzk/tiddlers/_system/config/AnimationDuration.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_DefaultSidebarTab.tid b/tzk/editions/tzk/tiddlers/_system/config/DefaultSidebarTab.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_DefaultSidebarTab.tid rename to tzk/editions/tzk/tiddlers/_system/config/DefaultSidebarTab.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_DownloadSaver_AutoSave.tid b/tzk/editions/tzk/tiddlers/_system/config/DownloadSaver/AutoSave.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_DownloadSaver_AutoSave.tid rename to tzk/editions/tzk/tiddlers/_system/config/DownloadSaver/AutoSave.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_EditTabIndex.tid b/tzk/editions/tzk/tiddlers/_system/config/EditTabIndex.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_EditTabIndex.tid rename to tzk/editions/tzk/tiddlers/_system/config/EditTabIndex.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_EditorToolbarButtons_Visibility_$__core_ui_EditorToolbar_do-thing.tid b/tzk/editions/tzk/tiddlers/_system/config/EditorToolbarButtons/Visibility/$_/core/ui/EditorToolbar/do-thing.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_EditorToolbarButtons_Visibility_$__core_ui_EditorToolbar_do-thing.tid rename to tzk/editions/tzk/tiddlers/_system/config/EditorToolbarButtons/Visibility/$_/core/ui/EditorToolbar/do-thing.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_Manager_Filter.tid b/tzk/editions/tzk/tiddlers/_system/config/Manager/Filter.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_Manager_Filter.tid rename to tzk/editions/tzk/tiddlers/_system/config/Manager/Filter.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_Manager_Show.tid b/tzk/editions/tzk/tiddlers/_system/config/Manager/Show.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_Manager_Show.tid rename to tzk/editions/tzk/tiddlers/_system/config/Manager/Show.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_Manager_Sort.tid b/tzk/editions/tzk/tiddlers/_system/config/Manager/Sort.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_Manager_Sort.tid rename to tzk/editions/tzk/tiddlers/_system/config/Manager/Sort.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_Manager_System.tid b/tzk/editions/tzk/tiddlers/_system/config/Manager/System.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_Manager_System.tid rename to tzk/editions/tzk/tiddlers/_system/config/Manager/System.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_Manager_Tag.tid b/tzk/editions/tzk/tiddlers/_system/config/Manager/Tag.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_Manager_Tag.tid rename to tzk/editions/tzk/tiddlers/_system/config/Manager/Tag.tid diff --git a/tzk/editions/tzk/tiddlers/_system/config/Navigation/UpdateAddressBar.tid b/tzk/editions/tzk/tiddlers/_system/config/Navigation/UpdateAddressBar.tid new file mode 100644 index 0000000..7797fac --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/config/Navigation/UpdateAddressBar.tid @@ -0,0 +1,8 @@ +created: 20230416140641682 +creator: soren +modified: 20230416140641711 +modifier: soren +title: $:/config/Navigation/UpdateAddressBar +type: text/vnd.tiddlywiki + +permaview \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__config_NewJournal_Title.tid b/tzk/editions/tzk/tiddlers/_system/config/NewJournal/Title.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_NewJournal_Title.tid rename to tzk/editions/tzk/tiddlers/_system/config/NewJournal/Title.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_PageControlButtons_Visibility_$__core_ui_Buttons_advanced-search.tid b/tzk/editions/tzk/tiddlers/_system/config/PageControlButtons/Visibility/$_/core/ui/Buttons/advanced-search.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_PageControlButtons_Visibility_$__core_ui_Buttons_advanced-search.tid rename to tzk/editions/tzk/tiddlers/_system/config/PageControlButtons/Visibility/$_/core/ui/Buttons/advanced-search.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_PageControlButtons_Visibility_$__core_ui_Buttons_close-all.tid b/tzk/editions/tzk/tiddlers/_system/config/PageControlButtons/Visibility/$_/core/ui/Buttons/close-all.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_PageControlButtons_Visibility_$__core_ui_Buttons_close-all.tid rename to tzk/editions/tzk/tiddlers/_system/config/PageControlButtons/Visibility/$_/core/ui/Buttons/close-all.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_PageControlButtons_Visibility_$__core_ui_Buttons_control-panel.tid b/tzk/editions/tzk/tiddlers/_system/config/PageControlButtons/Visibility/$_/core/ui/Buttons/control-panel.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_PageControlButtons_Visibility_$__core_ui_Buttons_control-panel.tid rename to tzk/editions/tzk/tiddlers/_system/config/PageControlButtons/Visibility/$_/core/ui/Buttons/control-panel.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_PageControlButtons_Visibility_$__core_ui_Buttons_full-screen.tid b/tzk/editions/tzk/tiddlers/_system/config/PageControlButtons/Visibility/$_/core/ui/Buttons/full-screen.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_PageControlButtons_Visibility_$__core_ui_Buttons_full-screen.tid rename to tzk/editions/tzk/tiddlers/_system/config/PageControlButtons/Visibility/$_/core/ui/Buttons/full-screen.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_PageControlButtons_Visibility_$__core_ui_Buttons_home.tid b/tzk/editions/tzk/tiddlers/_system/config/PageControlButtons/Visibility/$_/core/ui/Buttons/home.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_PageControlButtons_Visibility_$__core_ui_Buttons_home.tid rename to tzk/editions/tzk/tiddlers/_system/config/PageControlButtons/Visibility/$_/core/ui/Buttons/home.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_PageControlButtons_Visibility_$__core_ui_Buttons_import.tid b/tzk/editions/tzk/tiddlers/_system/config/PageControlButtons/Visibility/$_/core/ui/Buttons/import.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_PageControlButtons_Visibility_$__core_ui_Buttons_import.tid rename to tzk/editions/tzk/tiddlers/_system/config/PageControlButtons/Visibility/$_/core/ui/Buttons/import.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_PageControlButtons_Visibility_$__core_ui_Buttons_more-page-actions.tid b/tzk/editions/tzk/tiddlers/_system/config/PageControlButtons/Visibility/$_/core/ui/Buttons/more-page-actions.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_PageControlButtons_Visibility_$__core_ui_Buttons_more-page-actions.tid rename to tzk/editions/tzk/tiddlers/_system/config/PageControlButtons/Visibility/$_/core/ui/Buttons/more-page-actions.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_PageControlButtons_Visibility_$__core_ui_Buttons_new-journal.tid b/tzk/editions/tzk/tiddlers/_system/config/PageControlButtons/Visibility/$_/core/ui/Buttons/new-journal.tid similarity index 80% rename from tzk/editions/tzk/tiddlers/$__config_PageControlButtons_Visibility_$__core_ui_Buttons_new-journal.tid rename to tzk/editions/tzk/tiddlers/_system/config/PageControlButtons/Visibility/$_/core/ui/Buttons/new-journal.tid index 1c1d42d..726c604 100644 --- a/tzk/editions/tzk/tiddlers/$__config_PageControlButtons_Visibility_$__core_ui_Buttons_new-journal.tid +++ b/tzk/editions/tzk/tiddlers/_system/config/PageControlButtons/Visibility/$_/core/ui/Buttons/new-journal.tid @@ -1,6 +1,6 @@ created: 20200125221848147 -modified: 20200804182421726 +modified: 20230830215242714 title: $:/config/PageControlButtons/Visibility/$:/core/ui/Buttons/new-journal type: text/vnd.tiddlywiki -hide \ No newline at end of file +show \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__config_PageControlButtons_Visibility_$__core_ui_Buttons_new-tiddler.tid b/tzk/editions/tzk/tiddlers/_system/config/PageControlButtons/Visibility/$_/core/ui/Buttons/new-tiddler.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_PageControlButtons_Visibility_$__core_ui_Buttons_new-tiddler.tid rename to tzk/editions/tzk/tiddlers/_system/config/PageControlButtons/Visibility/$_/core/ui/Buttons/new-tiddler.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_PageControlButtons_Visibility_$__core_ui_Buttons_permaview.tid b/tzk/editions/tzk/tiddlers/_system/config/PageControlButtons/Visibility/$_/core/ui/Buttons/permaview.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_PageControlButtons_Visibility_$__core_ui_Buttons_permaview.tid rename to tzk/editions/tzk/tiddlers/_system/config/PageControlButtons/Visibility/$_/core/ui/Buttons/permaview.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_PageControlButtons_Visibility_$__core_ui_Buttons_save-wiki.tid b/tzk/editions/tzk/tiddlers/_system/config/PageControlButtons/Visibility/$_/core/ui/Buttons/save-wiki.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_PageControlButtons_Visibility_$__core_ui_Buttons_save-wiki.tid rename to tzk/editions/tzk/tiddlers/_system/config/PageControlButtons/Visibility/$_/core/ui/Buttons/save-wiki.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_PageControlButtons_Visibility_$__core_ui_Buttons_tag-manager.tid b/tzk/editions/tzk/tiddlers/_system/config/PageControlButtons/Visibility/$_/core/ui/Buttons/tag-manager.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_PageControlButtons_Visibility_$__core_ui_Buttons_tag-manager.tid rename to tzk/editions/tzk/tiddlers/_system/config/PageControlButtons/Visibility/$_/core/ui/Buttons/tag-manager.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_PageControlButtons_Visibility_$__core_ui_Buttons_timestamp.tid b/tzk/editions/tzk/tiddlers/_system/config/PageControlButtons/Visibility/$_/core/ui/Buttons/timestamp.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_PageControlButtons_Visibility_$__core_ui_Buttons_timestamp.tid rename to tzk/editions/tzk/tiddlers/_system/config/PageControlButtons/Visibility/$_/core/ui/Buttons/timestamp.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_PageControlButtons_Visibility_$__plugins_aaldrich_tables_button.tid b/tzk/editions/tzk/tiddlers/_system/config/PageControlButtons/Visibility/$_/plugins/aaldrich/tables/button.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_PageControlButtons_Visibility_$__plugins_aaldrich_tables_button.tid rename to tzk/editions/tzk/tiddlers/_system/config/PageControlButtons/Visibility/$_/plugins/aaldrich/tables/button.tid diff --git a/tzk/editions/tzk/tiddlers/_system/config/PageControlButtons/Visibility/$_/sib/Buttons/NewDate.tid b/tzk/editions/tzk/tiddlers/_system/config/PageControlButtons/Visibility/$_/sib/Buttons/NewDate.tid new file mode 100644 index 0000000..1f41cd6 --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/config/PageControlButtons/Visibility/$_/sib/Buttons/NewDate.tid @@ -0,0 +1,8 @@ +created: 20230405213734859 +creator: soren +modified: 20230405213734872 +modifier: soren +title: $:/config/PageControlButtons/Visibility/$:/sib/Buttons/NewDate +type: text/vnd.tiddlywiki + +hide \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__config_PageControlButtons_Visibility_$__sib_Buttons_NewSource.tid b/tzk/editions/tzk/tiddlers/_system/config/PageControlButtons/Visibility/$_/sib/Buttons/NewSource.tid similarity index 79% rename from tzk/editions/tzk/tiddlers/$__config_PageControlButtons_Visibility_$__sib_Buttons_NewSource.tid rename to tzk/editions/tzk/tiddlers/_system/config/PageControlButtons/Visibility/$_/sib/Buttons/NewSource.tid index c51255c..0a4c446 100644 --- a/tzk/editions/tzk/tiddlers/$__config_PageControlButtons_Visibility_$__sib_Buttons_NewSource.tid +++ b/tzk/editions/tzk/tiddlers/_system/config/PageControlButtons/Visibility/$_/sib/Buttons/NewSource.tid @@ -1,6 +1,6 @@ created: 20210525001028932 -modified: 20210525000833968 +modified: 20230830215241861 title: $:/config/PageControlButtons/Visibility/$:/sib/Buttons/NewSource type: text/vnd.tiddlywiki -show \ No newline at end of file +hide \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__config_PageControlButtons_Visibility_$__sib_Buttons_ReadingInbox.tid b/tzk/editions/tzk/tiddlers/_system/config/PageControlButtons/Visibility/$_/sib/Buttons/ReadingInbox.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_PageControlButtons_Visibility_$__sib_Buttons_ReadingInbox.tid rename to tzk/editions/tzk/tiddlers/_system/config/PageControlButtons/Visibility/$_/sib/Buttons/ReadingInbox.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_PageControlButtons_Visibility_$__sib_NewSourceButton.tid b/tzk/editions/tzk/tiddlers/_system/config/PageControlButtons/Visibility/$_/sib/NewSourceButton.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_PageControlButtons_Visibility_$__sib_NewSourceButton.tid rename to tzk/editions/tzk/tiddlers/_system/config/PageControlButtons/Visibility/$_/sib/NewSourceButton.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_Performance_Instrumentation.tid b/tzk/editions/tzk/tiddlers/_system/config/Performance/Instrumentation.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_Performance_Instrumentation.tid rename to tzk/editions/tzk/tiddlers/_system/config/Performance/Instrumentation.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_Plugins_Disabled_$__plugins_MaxGyver83_tw5-keyboard-navigation.tid b/tzk/editions/tzk/tiddlers/_system/config/Plugins/Disabled/$_/plugins/MaxGyver83/tw5-keyboard-navigation.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_Plugins_Disabled_$__plugins_MaxGyver83_tw5-keyboard-navigation.tid rename to tzk/editions/tzk/tiddlers/_system/config/Plugins/Disabled/$_/plugins/MaxGyver83/tw5-keyboard-navigation.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_Plugins_Disabled_$__plugins_TheDiveO_FontAwesome.tid b/tzk/editions/tzk/tiddlers/_system/config/Plugins/Disabled/$_/plugins/TheDiveO/FontAwesome.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_Plugins_Disabled_$__plugins_TheDiveO_FontAwesome.tid rename to tzk/editions/tzk/tiddlers/_system/config/Plugins/Disabled/$_/plugins/TheDiveO/FontAwesome.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_Plugins_Disabled_$__plugins_bimlas_locator.tid b/tzk/editions/tzk/tiddlers/_system/config/Plugins/Disabled/$_/plugins/bimlas/locator.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_Plugins_Disabled_$__plugins_bimlas_locator.tid rename to tzk/editions/tzk/tiddlers/_system/config/Plugins/Disabled/$_/plugins/bimlas/locator.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_Plugins_Disabled_$__plugins_flibbles_relink.tid b/tzk/editions/tzk/tiddlers/_system/config/Plugins/Disabled/$_/plugins/flibbles/relink.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_Plugins_Disabled_$__plugins_flibbles_relink.tid rename to tzk/editions/tzk/tiddlers/_system/config/Plugins/Disabled/$_/plugins/flibbles/relink.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_Plugins_Disabled_$__plugins_frd_simplecalendar.tid b/tzk/editions/tzk/tiddlers/_system/config/Plugins/Disabled/$_/plugins/frd/simplecalendar.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_Plugins_Disabled_$__plugins_frd_simplecalendar.tid rename to tzk/editions/tzk/tiddlers/_system/config/Plugins/Disabled/$_/plugins/frd/simplecalendar.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_Plugins_Disabled_$__plugins_kantorsite_mathjax.tid b/tzk/editions/tzk/tiddlers/_system/config/Plugins/Disabled/$_/plugins/kantorsite/mathjax.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_Plugins_Disabled_$__plugins_kantorsite_mathjax.tid rename to tzk/editions/tzk/tiddlers/_system/config/Plugins/Disabled/$_/plugins/kantorsite/mathjax.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_Plugins_Disabled_$__plugins_kixam_datepicker.tid b/tzk/editions/tzk/tiddlers/_system/config/Plugins/Disabled/$_/plugins/kixam/datepicker.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_Plugins_Disabled_$__plugins_kixam_datepicker.tid rename to tzk/editions/tzk/tiddlers/_system/config/Plugins/Disabled/$_/plugins/kixam/datepicker.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_Plugins_Disabled_$__plugins_kixam_moment.tid b/tzk/editions/tzk/tiddlers/_system/config/Plugins/Disabled/$_/plugins/kixam/moment.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_Plugins_Disabled_$__plugins_kixam_moment.tid rename to tzk/editions/tzk/tiddlers/_system/config/Plugins/Disabled/$_/plugins/kixam/moment.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_Plugins_Disabled_$__plugins_kookma_refnotes.tid b/tzk/editions/tzk/tiddlers/_system/config/Plugins/Disabled/$_/plugins/kookma/refnotes.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_Plugins_Disabled_$__plugins_kookma_refnotes.tid rename to tzk/editions/tzk/tiddlers/_system/config/Plugins/Disabled/$_/plugins/kookma/refnotes.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_Plugins_Disabled_$__plugins_sk_FancyQuotes.tid b/tzk/editions/tzk/tiddlers/_system/config/Plugins/Disabled/$_/plugins/sk/FancyQuotes.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_Plugins_Disabled_$__plugins_sk_FancyQuotes.tid rename to tzk/editions/tzk/tiddlers/_system/config/Plugins/Disabled/$_/plugins/sk/FancyQuotes.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_Plugins_Disabled_$__plugins_sobjornstad_3click2edit.tid b/tzk/editions/tzk/tiddlers/_system/config/Plugins/Disabled/$_/plugins/sobjornstad/3click2edit.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_Plugins_Disabled_$__plugins_sobjornstad_3click2edit.tid rename to tzk/editions/tzk/tiddlers/_system/config/Plugins/Disabled/$_/plugins/sobjornstad/3click2edit.tid diff --git a/tzk/editions/tzk/tiddlers/_system/config/Plugins/Disabled/$_/plugins/sycom/leaflet.tid b/tzk/editions/tzk/tiddlers/_system/config/Plugins/Disabled/$_/plugins/sycom/leaflet.tid new file mode 100644 index 0000000..4243032 --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/config/Plugins/Disabled/$_/plugins/sycom/leaflet.tid @@ -0,0 +1,6 @@ +created: 20230912032419864 +modified: 20230912032419864 +title: $:/config/Plugins/Disabled/$:/plugins/sycom/leaflet +type: text/vnd.tiddlywiki + +yes \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__config_Plugins_Disabled_$__plugins_telmiger_details.tid b/tzk/editions/tzk/tiddlers/_system/config/Plugins/Disabled/$_/plugins/telmiger/details.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_Plugins_Disabled_$__plugins_telmiger_details.tid rename to tzk/editions/tzk/tiddlers/_system/config/Plugins/Disabled/$_/plugins/telmiger/details.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_Plugins_Disabled_$__plugins_tiddlywiki_codemirror-autocomplete.tid b/tzk/editions/tzk/tiddlers/_system/config/Plugins/Disabled/$_/plugins/tiddlywiki/codemirror-autocomplete.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_Plugins_Disabled_$__plugins_tiddlywiki_codemirror-autocomplete.tid rename to tzk/editions/tzk/tiddlers/_system/config/Plugins/Disabled/$_/plugins/tiddlywiki/codemirror-autocomplete.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_Plugins_Disabled_$__plugins_tiddlywiki_codemirror-closebrackets.tid b/tzk/editions/tzk/tiddlers/_system/config/Plugins/Disabled/$_/plugins/tiddlywiki/codemirror-closebrackets.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_Plugins_Disabled_$__plugins_tiddlywiki_codemirror-closebrackets.tid rename to tzk/editions/tzk/tiddlers/_system/config/Plugins/Disabled/$_/plugins/tiddlywiki/codemirror-closebrackets.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_Plugins_Disabled_$__plugins_tiddlywiki_codemirror-keymap-vim.tid b/tzk/editions/tzk/tiddlers/_system/config/Plugins/Disabled/$_/plugins/tiddlywiki/codemirror-keymap-vim.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_Plugins_Disabled_$__plugins_tiddlywiki_codemirror-keymap-vim.tid rename to tzk/editions/tzk/tiddlers/_system/config/Plugins/Disabled/$_/plugins/tiddlywiki/codemirror-keymap-vim.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_Plugins_Disabled_$__plugins_tiddlywiki_codemirror-search-replace.tid b/tzk/editions/tzk/tiddlers/_system/config/Plugins/Disabled/$_/plugins/tiddlywiki/codemirror-search-replace.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_Plugins_Disabled_$__plugins_tiddlywiki_codemirror-search-replace.tid rename to tzk/editions/tzk/tiddlers/_system/config/Plugins/Disabled/$_/plugins/tiddlywiki/codemirror-search-replace.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_Plugins_Disabled_$__plugins_tiddlywiki_highlight.tid b/tzk/editions/tzk/tiddlers/_system/config/Plugins/Disabled/$_/plugins/tiddlywiki/highlight.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_Plugins_Disabled_$__plugins_tiddlywiki_highlight.tid rename to tzk/editions/tzk/tiddlers/_system/config/Plugins/Disabled/$_/plugins/tiddlywiki/highlight.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_Plugins_Disabled_$__plugins_tiddlywiki_katex.tid b/tzk/editions/tzk/tiddlers/_system/config/Plugins/Disabled/$_/plugins/tiddlywiki/katex.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_Plugins_Disabled_$__plugins_tiddlywiki_katex.tid rename to tzk/editions/tzk/tiddlers/_system/config/Plugins/Disabled/$_/plugins/tiddlywiki/katex.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_PublicContactInfo b/tzk/editions/tzk/tiddlers/_system/config/PublicContactInfo similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_PublicContactInfo rename to tzk/editions/tzk/tiddlers/_system/config/PublicContactInfo diff --git a/tzk/editions/tzk/tiddlers/$__config_PublicContactInfo.meta b/tzk/editions/tzk/tiddlers/_system/config/PublicContactInfo.meta similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_PublicContactInfo.meta rename to tzk/editions/tzk/tiddlers/_system/config/PublicContactInfo.meta diff --git a/tzk/editions/tzk/tiddlers/$__config_RelinkOnRename.tid b/tzk/editions/tzk/tiddlers/_system/config/RelinkOnRename.tid similarity index 79% rename from tzk/editions/tzk/tiddlers/$__config_RelinkOnRename.tid rename to tzk/editions/tzk/tiddlers/_system/config/RelinkOnRename.tid index b1d7a36..5d1388a 100644 --- a/tzk/editions/tzk/tiddlers/$__config_RelinkOnRename.tid +++ b/tzk/editions/tzk/tiddlers/_system/config/RelinkOnRename.tid @@ -1,8 +1,8 @@ created: 20200121230518238 creator: soren -modified: 20220622234624323 +modified: 20230824171419722 modifier: soren title: $:/config/RelinkOnRename type: text/vnd.tiddlywiki -no \ No newline at end of file +yes \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__config_ShortcutInfo_excise-private-chunk.tid b/tzk/editions/tzk/tiddlers/_system/config/ShortcutInfo/excise-private-chunk.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_ShortcutInfo_excise-private-chunk.tid rename to tzk/editions/tzk/tiddlers/_system/config/ShortcutInfo/excise-private-chunk.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_TiddlerInfo_Mode.tid b/tzk/editions/tzk/tiddlers/_system/config/TiddlerInfo/Mode.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_TiddlerInfo_Mode.tid rename to tzk/editions/tzk/tiddlers/_system/config/TiddlerInfo/Mode.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_Tiddlers_TitleLinks.tid b/tzk/editions/tzk/tiddlers/_system/config/Tiddlers/TitleLinks.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_Tiddlers_TitleLinks.tid rename to tzk/editions/tzk/tiddlers/_system/config/Tiddlers/TitleLinks.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_TiddlyRemember_TagMapping.tid b/tzk/editions/tzk/tiddlers/_system/config/TiddlyRemember/TagMapping.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_TiddlyRemember_TagMapping.tid rename to tzk/editions/tzk/tiddlers/_system/config/TiddlyRemember/TagMapping.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_TimestampDisable.tid b/tzk/editions/tzk/tiddlers/_system/config/TimestampDisable.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_TimestampDisable.tid rename to tzk/editions/tzk/tiddlers/_system/config/TimestampDisable.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_Toolbar_ButtonClass.tid b/tzk/editions/tzk/tiddlers/_system/config/Toolbar/ButtonClass.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_Toolbar_ButtonClass.tid rename to tzk/editions/tzk/tiddlers/_system/config/Toolbar/ButtonClass.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_Toolbar_Text.tid b/tzk/editions/tzk/tiddlers/_system/config/Toolbar/Text.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_Toolbar_Text.tid rename to tzk/editions/tzk/tiddlers/_system/config/Toolbar/Text.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_ViewToolbarButtons_Visibility_$__core_ui_Buttons_clone.tid b/tzk/editions/tzk/tiddlers/_system/config/ViewToolbarButtons/Visibility/$_/core/ui/Buttons/clone.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_ViewToolbarButtons_Visibility_$__core_ui_Buttons_clone.tid rename to tzk/editions/tzk/tiddlers/_system/config/ViewToolbarButtons/Visibility/$_/core/ui/Buttons/clone.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_ViewToolbarButtons_Visibility_$__core_ui_Buttons_close-others.tid b/tzk/editions/tzk/tiddlers/_system/config/ViewToolbarButtons/Visibility/$_/core/ui/Buttons/close-others.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_ViewToolbarButtons_Visibility_$__core_ui_Buttons_close-others.tid rename to tzk/editions/tzk/tiddlers/_system/config/ViewToolbarButtons/Visibility/$_/core/ui/Buttons/close-others.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_ViewToolbarButtons_Visibility_$__core_ui_Buttons_edit.tid b/tzk/editions/tzk/tiddlers/_system/config/ViewToolbarButtons/Visibility/$_/core/ui/Buttons/edit.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_ViewToolbarButtons_Visibility_$__core_ui_Buttons_edit.tid rename to tzk/editions/tzk/tiddlers/_system/config/ViewToolbarButtons/Visibility/$_/core/ui/Buttons/edit.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_ViewToolbarButtons_Visibility_$__core_ui_Buttons_export-tiddler.tid b/tzk/editions/tzk/tiddlers/_system/config/ViewToolbarButtons/Visibility/$_/core/ui/Buttons/export-tiddler.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_ViewToolbarButtons_Visibility_$__core_ui_Buttons_export-tiddler.tid rename to tzk/editions/tzk/tiddlers/_system/config/ViewToolbarButtons/Visibility/$_/core/ui/Buttons/export-tiddler.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_ViewToolbarButtons_Visibility_$__core_ui_Buttons_fold-bar.tid b/tzk/editions/tzk/tiddlers/_system/config/ViewToolbarButtons/Visibility/$_/core/ui/Buttons/fold-bar.tid similarity index 67% rename from tzk/editions/tzk/tiddlers/$__config_ViewToolbarButtons_Visibility_$__core_ui_Buttons_fold-bar.tid rename to tzk/editions/tzk/tiddlers/_system/config/ViewToolbarButtons/Visibility/$_/core/ui/Buttons/fold-bar.tid index 557d96d..ca70235 100644 --- a/tzk/editions/tzk/tiddlers/$__config_ViewToolbarButtons_Visibility_$__core_ui_Buttons_fold-bar.tid +++ b/tzk/editions/tzk/tiddlers/_system/config/ViewToolbarButtons/Visibility/$_/core/ui/Buttons/fold-bar.tid @@ -1,6 +1,8 @@ created: 20200125183503813 -modified: 20200125183510102 +creator: soren +modified: 20230416140938773 +modifier: soren title: $:/config/ViewToolbarButtons/Visibility/$:/core/ui/Buttons/fold-bar type: text/vnd.tiddlywiki -show \ No newline at end of file +hide \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__config_ViewToolbarButtons_Visibility_$__core_ui_Buttons_info.tid b/tzk/editions/tzk/tiddlers/_system/config/ViewToolbarButtons/Visibility/$_/core/ui/Buttons/info.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_ViewToolbarButtons_Visibility_$__core_ui_Buttons_info.tid rename to tzk/editions/tzk/tiddlers/_system/config/ViewToolbarButtons/Visibility/$_/core/ui/Buttons/info.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_ViewToolbarButtons_Visibility_$__core_ui_Buttons_new-here.tid b/tzk/editions/tzk/tiddlers/_system/config/ViewToolbarButtons/Visibility/$_/core/ui/Buttons/new-here.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_ViewToolbarButtons_Visibility_$__core_ui_Buttons_new-here.tid rename to tzk/editions/tzk/tiddlers/_system/config/ViewToolbarButtons/Visibility/$_/core/ui/Buttons/new-here.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_ViewToolbarButtons_Visibility_$__core_ui_Buttons_new-journal-here.tid b/tzk/editions/tzk/tiddlers/_system/config/ViewToolbarButtons/Visibility/$_/core/ui/Buttons/new-journal-here.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_ViewToolbarButtons_Visibility_$__core_ui_Buttons_new-journal-here.tid rename to tzk/editions/tzk/tiddlers/_system/config/ViewToolbarButtons/Visibility/$_/core/ui/Buttons/new-journal-here.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_ViewToolbarButtons_Visibility_$__core_ui_Buttons_permalink.tid b/tzk/editions/tzk/tiddlers/_system/config/ViewToolbarButtons/Visibility/$_/core/ui/Buttons/permalink.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_ViewToolbarButtons_Visibility_$__core_ui_Buttons_permalink.tid rename to tzk/editions/tzk/tiddlers/_system/config/ViewToolbarButtons/Visibility/$_/core/ui/Buttons/permalink.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_ViewToolbarButtons_Visibility_$__plugins_bimlas_locator_viewtemplate_open-in-sidebar.tid b/tzk/editions/tzk/tiddlers/_system/config/ViewToolbarButtons/Visibility/$_/plugins/bimlas/locator/viewtemplate/open-in-sidebar.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_ViewToolbarButtons_Visibility_$__plugins_bimlas_locator_viewtemplate_open-in-sidebar.tid rename to tzk/editions/tzk/tiddlers/_system/config/ViewToolbarButtons/Visibility/$_/plugins/bimlas/locator/viewtemplate/open-in-sidebar.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_ViewToolbarButtons_Visibility_$__sib_Buttons_CopyPublicZettelkastenLink.tid b/tzk/editions/tzk/tiddlers/_system/config/ViewToolbarButtons/Visibility/$_/sib/Buttons/CopyPublicZettelkastenLink.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_ViewToolbarButtons_Visibility_$__sib_Buttons_CopyPublicZettelkastenLink.tid rename to tzk/editions/tzk/tiddlers/_system/config/ViewToolbarButtons/Visibility/$_/sib/Buttons/CopyPublicZettelkastenLink.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_ViewToolbarButtons_Visibility_$__sib_Buttons_CopyTitleReference.tid b/tzk/editions/tzk/tiddlers/_system/config/ViewToolbarButtons/Visibility/$_/sib/Buttons/CopyTitleReference.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_ViewToolbarButtons_Visibility_$__sib_Buttons_CopyTitleReference.tid rename to tzk/editions/tzk/tiddlers/_system/config/ViewToolbarButtons/Visibility/$_/sib/Buttons/CopyTitleReference.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_ViewToolbarButtons_Visibility_$__sib_CopyPublicZettelkastenLink.tid b/tzk/editions/tzk/tiddlers/_system/config/ViewToolbarButtons/Visibility/$_/sib/CopyPublicZettelkastenLink.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_ViewToolbarButtons_Visibility_$__sib_CopyPublicZettelkastenLink.tid rename to tzk/editions/tzk/tiddlers/_system/config/ViewToolbarButtons/Visibility/$_/sib/CopyPublicZettelkastenLink.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_ViewToolbarButtons_Visibility_$__sib_CopyTitleReference.tid b/tzk/editions/tzk/tiddlers/_system/config/ViewToolbarButtons/Visibility/$_/sib/CopyTitleReference.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_ViewToolbarButtons_Visibility_$__sib_CopyTitleReference.tid rename to tzk/editions/tzk/tiddlers/_system/config/ViewToolbarButtons/Visibility/$_/sib/CopyTitleReference.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_ViewToolbarButtons_Visibility_DoCopyTitleReference.tid b/tzk/editions/tzk/tiddlers/_system/config/ViewToolbarButtons/Visibility/DoCopyTitleReference.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_ViewToolbarButtons_Visibility_DoCopyTitleReference.tid rename to tzk/editions/tzk/tiddlers/_system/config/ViewToolbarButtons/Visibility/DoCopyTitleReference.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_WikiParserRules_Inline_dash.tid b/tzk/editions/tzk/tiddlers/_system/config/WikiParserRules/Inline/dash.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_WikiParserRules_Inline_dash.tid rename to tzk/editions/tzk/tiddlers/_system/config/WikiParserRules/Inline/dash.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_bimlas_locator_fields_parent.tid b/tzk/editions/tzk/tiddlers/_system/config/bimlas/locator/fields/parent.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_bimlas_locator_fields_parent.tid rename to tzk/editions/tzk/tiddlers/_system/config/bimlas/locator/fields/parent.tid diff --git a/tzk/editions/tzk/tiddlers/_system/config/bj/Calendar.json b/tzk/editions/tzk/tiddlers/_system/config/bj/Calendar.json new file mode 100644 index 0000000..a976a3d --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/config/bj/Calendar.json @@ -0,0 +1,40 @@ + +{ + "journals":{ + "lastDayOfWeek":"6", + "formatter":"$:/macros/bj/Calendar/journalslinked.js", + "titlebold":"yes", + "highlightThisDay":"no", + "highlightThisDate":"yes", + "highlightLinks": "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" + }, + "event":{ + "lastDayOfWeek": "6", + "formatter":"$:/macros/bj/Calendar/journalslinked.js", + "titlebold":"yes", + "highlightThisDay":"no", + "highlightThisDate":"no", + "highlightLinks": "yes" + } +} diff --git a/tzk/editions/tzk/tiddlers/_system/config/bj/Calendar.json.meta b/tzk/editions/tzk/tiddlers/_system/config/bj/Calendar.json.meta new file mode 100644 index 0000000..209d7bd --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/config/bj/Calendar.json.meta @@ -0,0 +1,5 @@ +created: 20230911043804069 +modified: 20230911044646164 +module-type: library +title: $:/config/bj/Calendar.json +type: application/json \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__config_codemirror_keyMap b/tzk/editions/tzk/tiddlers/_system/config/codemirror/keyMap similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_codemirror_keyMap rename to tzk/editions/tzk/tiddlers/_system/config/codemirror/keyMap diff --git a/tzk/editions/tzk/tiddlers/$__config_codemirror_keyMap.meta b/tzk/editions/tzk/tiddlers/_system/config/codemirror/keyMap.meta similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_codemirror_keyMap.meta rename to tzk/editions/tzk/tiddlers/_system/config/codemirror/keyMap.meta diff --git a/tzk/editions/tzk/tiddlers/$__config_codemirror_theme b/tzk/editions/tzk/tiddlers/_system/config/codemirror/theme similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_codemirror_theme rename to tzk/editions/tzk/tiddlers/_system/config/codemirror/theme diff --git a/tzk/editions/tzk/tiddlers/$__config_codemirror_theme.meta b/tzk/editions/tzk/tiddlers/_system/config/codemirror/theme.meta similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_codemirror_theme.meta rename to tzk/editions/tzk/tiddlers/_system/config/codemirror/theme.meta diff --git a/tzk/editions/tzk/tiddlers/$__config_flibbles_relink_fields_bibliography.tid b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/fields/bibliography.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_flibbles_relink_fields_bibliography.tid rename to tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/fields/bibliography.tid diff --git a/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/fields/condition.tid b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/fields/condition.tid new file mode 100644 index 0000000..272a3db --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/fields/condition.tid @@ -0,0 +1,8 @@ +created: 20230416230240335 +creator: soren +modified: 20230416230240335 +modifier: soren +title: $:/config/flibbles/relink/fields/condition +type: text/vnd.tiddlywiki + +filter \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/fields/description.tid b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/fields/description.tid new file mode 100644 index 0000000..313389f --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/fields/description.tid @@ -0,0 +1,8 @@ +created: 20230416032019969 +creator: soren +modified: 20230416032020019 +modifier: soren +title: $:/config/flibbles/relink/fields/description +type: text/vnd.tiddlywiki + +wikitext \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__config_flibbles_relink_fields_memberof.tid b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/fields/memberof.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_flibbles_relink_fields_memberof.tid rename to tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/fields/memberof.tid diff --git a/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/fields/participants.tid b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/fields/participants.tid new file mode 100644 index 0000000..fbe4544 --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/fields/participants.tid @@ -0,0 +1,8 @@ +created: 20230416161312959 +creator: soren +modified: 20230416161312972 +modifier: soren +title: $:/config/flibbles/relink/fields/participants +type: text/vnd.tiddlywiki + +list \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/fields/ri-date-goal.tid b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/fields/ri-date-goal.tid new file mode 100644 index 0000000..a671d8a --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/fields/ri-date-goal.tid @@ -0,0 +1,8 @@ +created: 20230416161451487 +creator: soren +modified: 20230416161451507 +modifier: soren +title: $:/config/flibbles/relink/fields/ri-date-goal +type: text/vnd.tiddlywiki + +wikitext \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/fields/ri-date-resolved.tid b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/fields/ri-date-resolved.tid new file mode 100644 index 0000000..c409bd1 --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/fields/ri-date-resolved.tid @@ -0,0 +1,6 @@ +created: 20230416163236173 +modified: 20230416163236173 +title: $:/config/flibbles/relink/fields/ri-date-resolved +type: text/vnd.tiddlywiki + +title \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/fields/ri-date-summary.tid b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/fields/ri-date-summary.tid new file mode 100644 index 0000000..709de92 --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/fields/ri-date-summary.tid @@ -0,0 +1,8 @@ +created: 20230416160903141 +creator: soren +modified: 20230416160903198 +modifier: soren +title: $:/config/flibbles/relink/fields/ri-date-summary +type: text/vnd.tiddlywiki + +wikitext \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/fields/ri-date-with.tid b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/fields/ri-date-with.tid new file mode 100644 index 0000000..f3a87be --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/fields/ri-date-with.tid @@ -0,0 +1,6 @@ +created: 20230416160850588 +modified: 20230416160850588 +title: $:/config/flibbles/relink/fields/ri-date-with +type: text/vnd.tiddlywiki + +title \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/fields/ri-source.tid b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/fields/ri-source.tid new file mode 100644 index 0000000..e77f2c2 --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/fields/ri-source.tid @@ -0,0 +1,6 @@ +created: 20230416163217732 +modified: 20230416163217732 +title: $:/config/flibbles/relink/fields/ri-source +type: text/vnd.tiddlywiki + +title \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__config_flibbles_relink_fields_spouse.tid b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/fields/spouse.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_flibbles_relink_fields_spouse.tid rename to tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/fields/spouse.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_flibbles_relink_fields_universe.tid b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/fields/universe.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_flibbles_relink_fields_universe.tid rename to tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/fields/universe.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_flibbles_relink_macros_expando_tiddler.tid b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/macros/expando/tiddler.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_flibbles_relink_macros_expando_tiddler.tid rename to tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/macros/expando/tiddler.tid diff --git a/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/macros/fnote/note.tid b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/macros/fnote/note.tid new file mode 100644 index 0000000..fe7358f --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/macros/fnote/note.tid @@ -0,0 +1,8 @@ +created: 20230416032133685 +creator: soren +modified: 20230416032133700 +modifier: soren +title: $:/config/flibbles/relink/macros/fnote/note +type: text/vnd.tiddlywiki + +wikitext \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/macros/jsub/subpart.tid b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/macros/jsub/subpart.tid new file mode 100644 index 0000000..4a6d27a --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/macros/jsub/subpart.tid @@ -0,0 +1,4 @@ +title: $:/config/flibbles/relink/macros/jsub/subpart +type: text/vnd.tiddlywiki + +title \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/macros/stretch-links/filter.tid b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/macros/stretch-links/filter.tid new file mode 100644 index 0000000..080f603 --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/macros/stretch-links/filter.tid @@ -0,0 +1,8 @@ +created: 20230416032315718 +creator: soren +modified: 20230416032315742 +modifier: soren +title: $:/config/flibbles/relink/macros/stretch-links/filter +type: text/vnd.tiddlywiki + +filter \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/macros/stretch-template-links/filter.tid b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/macros/stretch-template-links/filter.tid new file mode 100644 index 0000000..92cfae7 --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/macros/stretch-template-links/filter.tid @@ -0,0 +1,8 @@ +created: 20230416032340074 +creator: soren +modified: 20230416032340140 +modifier: soren +title: $:/config/flibbles/relink/macros/stretch-template-links/filter +type: text/vnd.tiddlywiki + +filter \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/macros/stretch-template-links/largeTemplate.tid b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/macros/stretch-template-links/largeTemplate.tid new file mode 100644 index 0000000..548c694 --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/macros/stretch-template-links/largeTemplate.tid @@ -0,0 +1,6 @@ +created: 20230416032357059 +modified: 20230416032357059 +title: $:/config/flibbles/relink/macros/stretch-template-links/largeTemplate +type: text/vnd.tiddlywiki + +title \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/macros/stretch-template-links/smallTemplate.tid b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/macros/stretch-template-links/smallTemplate.tid new file mode 100644 index 0000000..90a6f84 --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/macros/stretch-template-links/smallTemplate.tid @@ -0,0 +1,6 @@ +created: 20230416032349164 +modified: 20230416032349164 +title: $:/config/flibbles/relink/macros/stretch-template-links/smallTemplate +type: text/vnd.tiddlywiki + +title \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/macros/stretch-template/largeTemplate.tid b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/macros/stretch-template/largeTemplate.tid new file mode 100644 index 0000000..6803023 --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/macros/stretch-template/largeTemplate.tid @@ -0,0 +1,6 @@ +created: 20230416032415204 +modified: 20230416032415204 +title: $:/config/flibbles/relink/macros/stretch-template/largeTemplate +type: text/vnd.tiddlywiki + +title \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/macros/stretch-template/smallTemplate.tid b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/macros/stretch-template/smallTemplate.tid new file mode 100644 index 0000000..0a30170 --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/macros/stretch-template/smallTemplate.tid @@ -0,0 +1,6 @@ +created: 20230416032411205 +modified: 20230416032411205 +title: $:/config/flibbles/relink/macros/stretch-template/smallTemplate +type: text/vnd.tiddlywiki + +title \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/macros/stretch-template/tiddler.tid b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/macros/stretch-template/tiddler.tid new file mode 100644 index 0000000..9b17c49 --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/macros/stretch-template/tiddler.tid @@ -0,0 +1,6 @@ +created: 20230416032402844 +modified: 20230416032402844 +title: $:/config/flibbles/relink/macros/stretch-template/tiddler +type: text/vnd.tiddlywiki + +title \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/macros/stretch/tiddler.tid b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/macros/stretch/tiddler.tid new file mode 100644 index 0000000..02dc1a0 --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/macros/stretch/tiddler.tid @@ -0,0 +1,6 @@ +created: 20230416032300108 +modified: 20230416032300108 +title: $:/config/flibbles/relink/macros/stretch/tiddler +type: text/vnd.tiddlywiki + +title \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/macros/summarize/tiddler.tid b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/macros/summarize/tiddler.tid new file mode 100644 index 0000000..ff0933f --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/config/flibbles/relink/macros/summarize/tiddler.tid @@ -0,0 +1,6 @@ +created: 20230416032212822 +modified: 20230416032212822 +title: $:/config/flibbles/relink/macros/summarize/tiddler +type: text/vnd.tiddlywiki + +title \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__config_shortcuts-mac_save-tiddler.tid b/tzk/editions/tzk/tiddlers/_system/config/shortcuts-mac/save-tiddler.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_shortcuts-mac_save-tiddler.tid rename to tzk/editions/tzk/tiddlers/_system/config/shortcuts-mac/save-tiddler.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_shortcuts-not-mac_save-tiddler.tid b/tzk/editions/tzk/tiddlers/_system/config/shortcuts-not-mac/save-tiddler.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_shortcuts-not-mac_save-tiddler.tid rename to tzk/editions/tzk/tiddlers/_system/config/shortcuts-not-mac/save-tiddler.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_shortcuts_cancel-edit-tiddler.tid b/tzk/editions/tzk/tiddlers/_system/config/shortcuts/cancel-edit-tiddler.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_shortcuts_cancel-edit-tiddler.tid rename to tzk/editions/tzk/tiddlers/_system/config/shortcuts/cancel-edit-tiddler.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_shortcuts_excise-private-chunk.tid b/tzk/editions/tzk/tiddlers/_system/config/shortcuts/excise-private-chunk.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_shortcuts_excise-private-chunk.tid rename to tzk/editions/tzk/tiddlers/_system/config/shortcuts/excise-private-chunk.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_shortcuts_save-tiddler.tid b/tzk/editions/tzk/tiddlers/_system/config/shortcuts/save-tiddler.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_shortcuts_save-tiddler.tid rename to tzk/editions/tzk/tiddlers/_system/config/shortcuts/save-tiddler.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_sib_CurrentEditionPublicity.tid b/tzk/editions/tzk/tiddlers/_system/config/sib/CurrentEditionPublicity.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_sib_CurrentEditionPublicity.tid rename to tzk/editions/tzk/tiddlers/_system/config/sib/CurrentEditionPublicity.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_sib_IsPublicEdition.tid b/tzk/editions/tzk/tiddlers/_system/config/sib/IsPublicEdition.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_sib_IsPublicEdition.tid rename to tzk/editions/tzk/tiddlers/_system/config/sib/IsPublicEdition.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_sib_TopBarHeight.tid b/tzk/editions/tzk/tiddlers/_system/config/sib/TopBarHeight.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_sib_TopBarHeight.tid rename to tzk/editions/tzk/tiddlers/_system/config/sib/TopBarHeight.tid diff --git a/tzk/editions/tzk/tiddlers/_system/config/sobjornstad/AccessCode.tid b/tzk/editions/tzk/tiddlers/_system/config/sobjornstad/AccessCode.tid new file mode 100644 index 0000000..95766f6 --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/config/sobjornstad/AccessCode.tid @@ -0,0 +1,6 @@ +created: 20230324190307259 +creator: soren +modified: 20230324190310442 +modifier: soren +title: $:/config/sobjornstad/AccessCode +type: text/vnd.tiddlywiki \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/_system/config/sobjornstad/UserEmail.tid b/tzk/editions/tzk/tiddlers/_system/config/sobjornstad/UserEmail.tid new file mode 100644 index 0000000..fd33f3b --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/config/sobjornstad/UserEmail.tid @@ -0,0 +1,6 @@ +created: 20230324190306478 +creator: soren +modified: 20230324190311195 +modifier: soren +title: $:/config/sobjornstad/UserEmail +type: text/vnd.tiddlywiki \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__config_zettelkasten_Build_KillPhrases.tid b/tzk/editions/tzk/tiddlers/_system/config/zettelkasten/Build/KillPhrases.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_zettelkasten_Build_KillPhrases.tid rename to tzk/editions/tzk/tiddlers/_system/config/zettelkasten/Build/KillPhrases.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_zettelkasten_FeatureFlags_Clock.tid b/tzk/editions/tzk/tiddlers/_system/config/zettelkasten/FeatureFlags/Clock.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_zettelkasten_FeatureFlags_Clock.tid rename to tzk/editions/tzk/tiddlers/_system/config/zettelkasten/FeatureFlags/Clock.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_zettelkasten_FeatureFlags_CopyrightFooter.tid b/tzk/editions/tzk/tiddlers/_system/config/zettelkasten/FeatureFlags/CopyrightFooter.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_zettelkasten_FeatureFlags_CopyrightFooter.tid rename to tzk/editions/tzk/tiddlers/_system/config/zettelkasten/FeatureFlags/CopyrightFooter.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_zettelkasten_FeatureFlags_EditorPublicLine.tid b/tzk/editions/tzk/tiddlers/_system/config/zettelkasten/FeatureFlags/EditorPublicLine.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_zettelkasten_FeatureFlags_EditorPublicLine.tid rename to tzk/editions/tzk/tiddlers/_system/config/zettelkasten/FeatureFlags/EditorPublicLine.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_zettelkasten_FeatureFlags_EpistemicStatus.tid b/tzk/editions/tzk/tiddlers/_system/config/zettelkasten/FeatureFlags/EpistemicStatus.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_zettelkasten_FeatureFlags_EpistemicStatus.tid rename to tzk/editions/tzk/tiddlers/_system/config/zettelkasten/FeatureFlags/EpistemicStatus.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_zettelkasten_FeatureFlags_GisTools.tid b/tzk/editions/tzk/tiddlers/_system/config/zettelkasten/FeatureFlags/GisTools.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_zettelkasten_FeatureFlags_GisTools.tid rename to tzk/editions/tzk/tiddlers/_system/config/zettelkasten/FeatureFlags/GisTools.tid diff --git a/tzk/editions/tzk/tiddlers/_system/config/zettelkasten/FeatureFlags/MarkStaleUpdated.tid b/tzk/editions/tzk/tiddlers/_system/config/zettelkasten/FeatureFlags/MarkStaleUpdated.tid new file mode 100644 index 0000000..be624b5 --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/config/zettelkasten/FeatureFlags/MarkStaleUpdated.tid @@ -0,0 +1,10 @@ +caption: Stale update link +created: 20230407023028152 +creator: soren +description: Show a link on stale tiddlers allowing you to mark them as still up to date as of the current time. +modified: 20230407025143508 +modifier: soren +private: yes +tags: +title: $:/config/zettelkasten/FeatureFlags/MarkStaleUpdated +type: text/vnd.tiddlywiki \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__config_zettelkasten_FeatureFlags_MediaRating.tid b/tzk/editions/tzk/tiddlers/_system/config/zettelkasten/FeatureFlags/MediaRating.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_zettelkasten_FeatureFlags_MediaRating.tid rename to tzk/editions/tzk/tiddlers/_system/config/zettelkasten/FeatureFlags/MediaRating.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_zettelkasten_FeatureFlags_OpenTopBar.tid b/tzk/editions/tzk/tiddlers/_system/config/zettelkasten/FeatureFlags/OpenTopBar.tid similarity index 72% rename from tzk/editions/tzk/tiddlers/$__config_zettelkasten_FeatureFlags_OpenTopBar.tid rename to tzk/editions/tzk/tiddlers/_system/config/zettelkasten/FeatureFlags/OpenTopBar.tid index 786d8fc..5d23ea0 100644 --- a/tzk/editions/tzk/tiddlers/$__config_zettelkasten_FeatureFlags_OpenTopBar.tid +++ b/tzk/editions/tzk/tiddlers/_system/config/zettelkasten/FeatureFlags/OpenTopBar.tid @@ -1,7 +1,9 @@ caption: Open top bar created: 20210626233606201 +creator: soren description: Show the list of open tiddlers in a horizontal bar at the top of the screen -modified: 20210825145444520 +modified: 20230416214929742 +modifier: soren private: yes public: no tags: diff --git a/tzk/editions/tzk/tiddlers/$__config_zettelkasten_FeatureFlags_SidebarInfoLinks.tid b/tzk/editions/tzk/tiddlers/_system/config/zettelkasten/FeatureFlags/SidebarInfoLinks.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_zettelkasten_FeatureFlags_SidebarInfoLinks.tid rename to tzk/editions/tzk/tiddlers/_system/config/zettelkasten/FeatureFlags/SidebarInfoLinks.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_zettelkasten_FeatureFlags_SpoilerBanner.tid b/tzk/editions/tzk/tiddlers/_system/config/zettelkasten/FeatureFlags/SpoilerBanner.tid similarity index 85% rename from tzk/editions/tzk/tiddlers/$__config_zettelkasten_FeatureFlags_SpoilerBanner.tid rename to tzk/editions/tzk/tiddlers/_system/config/zettelkasten/FeatureFlags/SpoilerBanner.tid index 0b7156a..e7d7705 100644 --- a/tzk/editions/tzk/tiddlers/$__config_zettelkasten_FeatureFlags_SpoilerBanner.tid +++ b/tzk/editions/tzk/tiddlers/_system/config/zettelkasten/FeatureFlags/SpoilerBanner.tid @@ -2,7 +2,7 @@ caption: Spoiler banner created: 20210622003118415 creator: soren description: Display a warning banner on fiction tiddlers (any tiddler with a non-empty `universe` field) noting that we don't try to hide spoilers. -modified: 20220502164810636 +modified: 20221102031205199 modifier: soren private: no public: no diff --git a/tzk/editions/tzk/tiddlers/$__config_zettelkasten_FeatureFlags_ViewerPublicLine.tid b/tzk/editions/tzk/tiddlers/_system/config/zettelkasten/FeatureFlags/ViewerPublicLine.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_zettelkasten_FeatureFlags_ViewerPublicLine.tid rename to tzk/editions/tzk/tiddlers/_system/config/zettelkasten/FeatureFlags/ViewerPublicLine.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_zettelkasten_GettingStartedWizardCurr.tid b/tzk/editions/tzk/tiddlers/_system/config/zettelkasten/GettingStartedWizardCurr.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_zettelkasten_GettingStartedWizardCurr.tid rename to tzk/editions/tzk/tiddlers/_system/config/zettelkasten/GettingStartedWizardCurr.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_zettelkasten_SideBar_Visibility_$__core_ui_SideBar_More.tid b/tzk/editions/tzk/tiddlers/_system/config/zettelkasten/SideBar/Visibility/$_/core/ui/SideBar/More.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_zettelkasten_SideBar_Visibility_$__core_ui_SideBar_More.tid rename to tzk/editions/tzk/tiddlers/_system/config/zettelkasten/SideBar/Visibility/$_/core/ui/SideBar/More.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_zettelkasten_SideBar_Visibility_$__core_ui_SideBar_Open.tid b/tzk/editions/tzk/tiddlers/_system/config/zettelkasten/SideBar/Visibility/$_/core/ui/SideBar/Open.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_zettelkasten_SideBar_Visibility_$__core_ui_SideBar_Open.tid rename to tzk/editions/tzk/tiddlers/_system/config/zettelkasten/SideBar/Visibility/$_/core/ui/SideBar/Open.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_zettelkasten_SideBar_Visibility_$__core_ui_SideBar_Recent.tid b/tzk/editions/tzk/tiddlers/_system/config/zettelkasten/SideBar/Visibility/$_/core/ui/SideBar/Recent.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_zettelkasten_SideBar_Visibility_$__core_ui_SideBar_Recent.tid rename to tzk/editions/tzk/tiddlers/_system/config/zettelkasten/SideBar/Visibility/$_/core/ui/SideBar/Recent.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_zettelkasten_SideBar_Visibility_$__core_ui_SideBar_Tools.tid b/tzk/editions/tzk/tiddlers/_system/config/zettelkasten/SideBar/Visibility/$_/core/ui/SideBar/Tools.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_zettelkasten_SideBar_Visibility_$__core_ui_SideBar_Tools.tid rename to tzk/editions/tzk/tiddlers/_system/config/zettelkasten/SideBar/Visibility/$_/core/ui/SideBar/Tools.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_zettelkasten_SideBar_Visibility_$__sib_SideBar_Explore.tid b/tzk/editions/tzk/tiddlers/_system/config/zettelkasten/SideBar/Visibility/$_/sib/SideBar/Explore.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_zettelkasten_SideBar_Visibility_$__sib_SideBar_Explore.tid rename to tzk/editions/tzk/tiddlers/_system/config/zettelkasten/SideBar/Visibility/$_/sib/SideBar/Explore.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_zettelkasten_SideBar_Visibility_$__sib_SideBar_Write.tid b/tzk/editions/tzk/tiddlers/_system/config/zettelkasten/SideBar/Visibility/$_/sib/SideBar/Write.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_zettelkasten_SideBar_Visibility_$__sib_SideBar_Write.tid rename to tzk/editions/tzk/tiddlers/_system/config/zettelkasten/SideBar/Visibility/$_/sib/SideBar/Write.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_zettelkasten_SplashScreenMessage.tid b/tzk/editions/tzk/tiddlers/_system/config/zettelkasten/SplashScreenMessage.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_zettelkasten_SplashScreenMessage.tid rename to tzk/editions/tzk/tiddlers/_system/config/zettelkasten/SplashScreenMessage.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_zettelkasten_copyright_Content.tid b/tzk/editions/tzk/tiddlers/_system/config/zettelkasten/copyright/Content.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_zettelkasten_copyright_Content.tid rename to tzk/editions/tzk/tiddlers/_system/config/zettelkasten/copyright/Content.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_zettelkasten_copyright_InitialNotice.tid b/tzk/editions/tzk/tiddlers/_system/config/zettelkasten/copyright/InitialNotice.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_zettelkasten_copyright_InitialNotice.tid rename to tzk/editions/tzk/tiddlers/_system/config/zettelkasten/copyright/InitialNotice.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_zettelkasten_copyright_MIT.tid b/tzk/editions/tzk/tiddlers/_system/config/zettelkasten/copyright/MIT.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_zettelkasten_copyright_MIT.tid rename to tzk/editions/tzk/tiddlers/_system/config/zettelkasten/copyright/MIT.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_zettelkasten_copyright_System.tid b/tzk/editions/tzk/tiddlers/_system/config/zettelkasten/copyright/System.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_zettelkasten_copyright_System.tid rename to tzk/editions/tzk/tiddlers/_system/config/zettelkasten/copyright/System.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_zettelkasten_copyright_UserNotice.tid b/tzk/editions/tzk/tiddlers/_system/config/zettelkasten/copyright/UserNotice.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_zettelkasten_copyright_UserNotice.tid rename to tzk/editions/tzk/tiddlers/_system/config/zettelkasten/copyright/UserNotice.tid diff --git a/tzk/editions/tzk/tiddlers/$__config_zettelkasten_gis_GMapsApiKey.txt b/tzk/editions/tzk/tiddlers/_system/config/zettelkasten/gis/GMapsApiKey.txt similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_zettelkasten_gis_GMapsApiKey.txt rename to tzk/editions/tzk/tiddlers/_system/config/zettelkasten/gis/GMapsApiKey.txt diff --git a/tzk/editions/tzk/tiddlers/$__config_zettelkasten_gis_GMapsApiKey.txt.meta b/tzk/editions/tzk/tiddlers/_system/config/zettelkasten/gis/GMapsApiKey.txt.meta similarity index 100% rename from tzk/editions/tzk/tiddlers/$__config_zettelkasten_gis_GMapsApiKey.txt.meta rename to tzk/editions/tzk/tiddlers/_system/config/zettelkasten/gis/GMapsApiKey.txt.meta diff --git a/tzk/editions/tzk/tiddlers/$__core_Filters_AllTags.tid b/tzk/editions/tzk/tiddlers/_system/core/Filters/AllTags.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__core_Filters_AllTags.tid rename to tzk/editions/tzk/tiddlers/_system/core/Filters/AllTags.tid diff --git a/tzk/editions/tzk/tiddlers/$__core_macros_tag-picker.tid b/tzk/editions/tzk/tiddlers/_system/core/macros/tag-picker.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__core_macros_tag-picker.tid rename to tzk/editions/tzk/tiddlers/_system/core/macros/tag-picker.tid diff --git a/tzk/editions/tzk/tiddlers/$__core_modules_editor-operations_text_fancyquotes.js b/tzk/editions/tzk/tiddlers/_system/core/modules/editor-operations/text/fancyquotes.js similarity index 100% rename from tzk/editions/tzk/tiddlers/$__core_modules_editor-operations_text_fancyquotes.js rename to tzk/editions/tzk/tiddlers/_system/core/modules/editor-operations/text/fancyquotes.js diff --git a/tzk/editions/tzk/tiddlers/$__core_modules_editor-operations_text_fancyquotes.js.meta b/tzk/editions/tzk/tiddlers/_system/core/modules/editor-operations/text/fancyquotes.js.meta similarity index 100% rename from tzk/editions/tzk/tiddlers/$__core_modules_editor-operations_text_fancyquotes.js.meta rename to tzk/editions/tzk/tiddlers/_system/core/modules/editor-operations/text/fancyquotes.js.meta diff --git a/tzk/editions/tzk/tiddlers/$__core_templates_canonical-uri-external-image.tid b/tzk/editions/tzk/tiddlers/_system/core/templates/canonical-uri-external-image.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__core_templates_canonical-uri-external-image.tid rename to tzk/editions/tzk/tiddlers/_system/core/templates/canonical-uri-external-image.tid diff --git a/tzk/editions/tzk/tiddlers/$__core_ui_EditorToolbar_linkify.tid b/tzk/editions/tzk/tiddlers/_system/core/ui/EditorToolbar/linkify.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__core_ui_EditorToolbar_linkify.tid rename to tzk/editions/tzk/tiddlers/_system/core/ui/EditorToolbar/linkify.tid diff --git a/tzk/editions/tzk/tiddlers/$__core_ui_EditorToolbar_transcludify.tid b/tzk/editions/tzk/tiddlers/_system/core/ui/EditorToolbar/transcludify.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__core_ui_EditorToolbar_transcludify.tid rename to tzk/editions/tzk/tiddlers/_system/core/ui/EditorToolbar/transcludify.tid diff --git a/tzk/editions/tzk/tiddlers/_system/core/ui/MoreSideBar/Recent.tid b/tzk/editions/tzk/tiddlers/_system/core/ui/MoreSideBar/Recent.tid new file mode 100644 index 0000000..06d030f --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/core/ui/MoreSideBar/Recent.tid @@ -0,0 +1,14 @@ +caption: {{$:/language/SideBar/Recent/Caption}} +created: 20221201233103301 +creator: soren +modified: 20221201233146286 +modifier: soren +tags: $:/tags/MoreSideBar +title: $:/core/ui/MoreSideBar/Recent +type: text/vnd.tiddlywiki + +For a table of recently created and updated ideas and their summaries, visit RecentIdeas. + +--- + +<$macrocall $name="timeline" format={{$:/language/RecentChanges/DateFormat}}/> diff --git a/tzk/editions/tzk/tiddlers/$__core_ui_SideBar_Open.tid b/tzk/editions/tzk/tiddlers/_system/core/ui/SideBar/Open.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__core_ui_SideBar_Open.tid rename to tzk/editions/tzk/tiddlers/_system/core/ui/SideBar/Open.tid diff --git a/tzk/editions/tzk/tiddlers/$__core_ui_SideBarSegments_tabs.tid b/tzk/editions/tzk/tiddlers/_system/core/ui/SideBarSegments/tabs.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__core_ui_SideBarSegments_tabs.tid rename to tzk/editions/tzk/tiddlers/_system/core/ui/SideBarSegments/tabs.tid diff --git a/tzk/editions/tzk/tiddlers/$__core_ui_ViewTemplate_subtitle.tid b/tzk/editions/tzk/tiddlers/_system/core/ui/ViewTemplate/subtitle.tid similarity index 83% rename from tzk/editions/tzk/tiddlers/$__core_ui_ViewTemplate_subtitle.tid rename to tzk/editions/tzk/tiddlers/_system/core/ui/ViewTemplate/subtitle.tid index 7abac4c..7b47b10 100644 --- a/tzk/editions/tzk/tiddlers/$__core_ui_ViewTemplate_subtitle.tid +++ b/tzk/editions/tzk/tiddlers/_system/core/ui/ViewTemplate/subtitle.tid @@ -1,5 +1,7 @@ created: 20210611015734693 -modified: 20210611023708529 +creator: soren +modified: 20230407023355475 +modifier: soren tags: $:/tags/ViewTemplate title: $:/core/ui/ViewTemplate/subtitle type: text/vnd.tiddlywiki @@ -13,6 +15,7 @@ type: text/vnd.tiddlywiki
     Updated <$view field="modified" format="date" template={{$:/language/Tiddler/DateFormat}} /> +<$transclude tiddler="$:/sib/Templates/Automatic/UpdateStatus"/>
    <$list filter="[all[current]has[description]]">
    diff --git a/tzk/editions/tzk/tiddlers/_system/core/ui/ViewTemplate/title.tid b/tzk/editions/tzk/tiddlers/_system/core/ui/ViewTemplate/title.tid new file mode 100644 index 0000000..6103e4d --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/core/ui/ViewTemplate/title.tid @@ -0,0 +1,52 @@ +created: 20230406222633350 +creator: soren +modified: 20230407013940964 +modifier: soren +tags: $:/tags/ViewTemplate +title: $:/core/ui/ViewTemplate/title +type: text/vnd.tiddlywiki + +\whitespace trim +\define title-styles() +fill:$(foregroundColor)$; +\end +\define config-title() +$:/config/ViewToolbarButtons/Visibility/$(listItem)$ +\end +
    +
    + +<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]]" variable="listItem"><$reveal type="nomatch" state=<> text="hide"><$set name="tv-config-toolbar-class" filter="[] [encodeuricomponent[]addprefix[tc-btn-]]"><$transclude tiddler=<>/> + +<$set name="tv-wikilinks" value={{$:/config/Tiddlers/TitleLinks}}> +<$link> +<$set name="foregroundColor" value={{!!color}}> +<$list filter={{$:/sib/Templates/Automatic/TiddlerTypeIcon!!condition}}> +>> +<$transclude tiddler={{!!icon}}> + <$transclude tiddler="$:/sib/Templates/Automatic/TiddlerTypeIcon"/> + + + + + +<$list filter="[all[current]removeprefix[$:/]]"> +

    +$:/<$text text=<>/> +

    + +<$list filter="[all[current]!prefix[$:/]]"> +

    +<$view field="title"/> +

    + + + +
    + +<$reveal type="nomatch" text="" default="" state=<> class="tc-tiddler-info tc-popup-handle" animate="yes" retain="yes"> + +<$list filter="[all[shadows+tiddlers]tag[$:/tags/TiddlerInfoSegment]!has[draft.of]] [[$:/core/ui/TiddlerInfo]]" variable="listItem"><$transclude tiddler=<> mode="block"/> + + +
    \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__inmysocks_macros_day-diff.js b/tzk/editions/tzk/tiddlers/_system/inmysocks/macros/day-diff.js similarity index 100% rename from tzk/editions/tzk/tiddlers/$__inmysocks_macros_day-diff.js rename to tzk/editions/tzk/tiddlers/_system/inmysocks/macros/day-diff.js diff --git a/tzk/editions/tzk/tiddlers/$__inmysocks_macros_day-diff.js.meta b/tzk/editions/tzk/tiddlers/_system/inmysocks/macros/day-diff.js.meta similarity index 100% rename from tzk/editions/tzk/tiddlers/$__inmysocks_macros_day-diff.js.meta rename to tzk/editions/tzk/tiddlers/_system/inmysocks/macros/day-diff.js.meta diff --git a/tzk/editions/tzk/tiddlers/$__isEncrypted.tid b/tzk/editions/tzk/tiddlers/_system/isEncrypted.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__isEncrypted.tid rename to tzk/editions/tzk/tiddlers/_system/isEncrypted.tid diff --git a/tzk/editions/tzk/tiddlers/$__layout.tid b/tzk/editions/tzk/tiddlers/_system/layout.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__layout.tid rename to tzk/editions/tzk/tiddlers/_system/layout.tid diff --git a/tzk/editions/tzk/tiddlers/$__palette.tid b/tzk/editions/tzk/tiddlers/_system/palette.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__palette.tid rename to tzk/editions/tzk/tiddlers/_system/palette.tid diff --git a/tzk/editions/tzk/tiddlers/$__plugins_TheDiveO_FontAwesome_styles_extlinks_randomthoughts.tid b/tzk/editions/tzk/tiddlers/_system/plugins/TheDiveO/FontAwesome/styles/extlinks/randomthoughts.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__plugins_TheDiveO_FontAwesome_styles_extlinks_randomthoughts.tid rename to tzk/editions/tzk/tiddlers/_system/plugins/TheDiveO/FontAwesome/styles/extlinks/randomthoughts.tid diff --git a/tzk/editions/tzk/tiddlers/$__plugins_bimlas_locator_edit-template_locator-references.tid b/tzk/editions/tzk/tiddlers/_system/plugins/bimlas/locator/edit-template/locator-references.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__plugins_bimlas_locator_edit-template_locator-references.tid rename to tzk/editions/tzk/tiddlers/_system/plugins/bimlas/locator/edit-template/locator-references.tid diff --git a/tzk/editions/tzk/tiddlers/$__plugins_frd_simplecalendar_CalendarConfigDefault.json b/tzk/editions/tzk/tiddlers/_system/plugins/frd/simplecalendar/CalendarConfigDefault.json similarity index 100% rename from tzk/editions/tzk/tiddlers/$__plugins_frd_simplecalendar_CalendarConfigDefault.json rename to tzk/editions/tzk/tiddlers/_system/plugins/frd/simplecalendar/CalendarConfigDefault.json diff --git a/tzk/editions/tzk/tiddlers/$__plugins_frd_simplecalendar_CalendarConfigDefault.json.meta b/tzk/editions/tzk/tiddlers/_system/plugins/frd/simplecalendar/CalendarConfigDefault.json.meta similarity index 100% rename from tzk/editions/tzk/tiddlers/$__plugins_frd_simplecalendar_CalendarConfigDefault.json.meta rename to tzk/editions/tzk/tiddlers/_system/plugins/frd/simplecalendar/CalendarConfigDefault.json.meta diff --git a/tzk/editions/tzk/tiddlers/$__plugins_kookma_refnotes_styles_footnote-counter.css b/tzk/editions/tzk/tiddlers/_system/plugins/kookma/refnotes/styles/footnote-counter.css similarity index 100% rename from tzk/editions/tzk/tiddlers/$__plugins_kookma_refnotes_styles_footnote-counter.css rename to tzk/editions/tzk/tiddlers/_system/plugins/kookma/refnotes/styles/footnote-counter.css diff --git a/tzk/editions/tzk/tiddlers/$__plugins_kookma_refnotes_styles_footnote-counter.css.meta b/tzk/editions/tzk/tiddlers/_system/plugins/kookma/refnotes/styles/footnote-counter.css.meta similarity index 100% rename from tzk/editions/tzk/tiddlers/$__plugins_kookma_refnotes_styles_footnote-counter.css.meta rename to tzk/editions/tzk/tiddlers/_system/plugins/kookma/refnotes/styles/footnote-counter.css.meta diff --git a/tzk/editions/tzk/tiddlers/$__plugins_kookma_refnotes_ui_bibtexlibrary.tid b/tzk/editions/tzk/tiddlers/_system/plugins/kookma/refnotes/ui/bibtexlibrary.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__plugins_kookma_refnotes_ui_bibtexlibrary.tid rename to tzk/editions/tzk/tiddlers/_system/plugins/kookma/refnotes/ui/bibtexlibrary.tid diff --git a/tzk/editions/tzk/tiddlers/$__plugins_sobjornstad_TiddlyRemember_toolbar_remembercz.tid b/tzk/editions/tzk/tiddlers/_system/plugins/sobjornstad/TiddlyRemember/toolbar/remembercz.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__plugins_sobjornstad_TiddlyRemember_toolbar_remembercz.tid rename to tzk/editions/tzk/tiddlers/_system/plugins/sobjornstad/TiddlyRemember/toolbar/remembercz.tid diff --git a/tzk/editions/tzk/tiddlers/$__plugins_sobjornstad_TiddlyStretch_macros_stretch.tid b/tzk/editions/tzk/tiddlers/_system/plugins/sobjornstad/TiddlyStretch/macros/stretch.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__plugins_sobjornstad_TiddlyStretch_macros_stretch.tid rename to tzk/editions/tzk/tiddlers/_system/plugins/sobjornstad/TiddlyStretch/macros/stretch.tid diff --git a/tzk/editions/tzk/tiddlers/$__plugins_telmiger_details_colours.css.tid b/tzk/editions/tzk/tiddlers/_system/plugins/telmiger/details/colours.css.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__plugins_telmiger_details_colours.css.tid rename to tzk/editions/tzk/tiddlers/_system/plugins/telmiger/details/colours.css.tid diff --git a/tzk/editions/tzk/tiddlers/$__plugins_tiddlywiki_codemirror_addon_hint_anyword-hint.js2.js b/tzk/editions/tzk/tiddlers/_system/plugins/tiddlywiki/codemirror/addon/hint/anyword-hint.js2.js similarity index 100% rename from tzk/editions/tzk/tiddlers/$__plugins_tiddlywiki_codemirror_addon_hint_anyword-hint.js2.js rename to tzk/editions/tzk/tiddlers/_system/plugins/tiddlywiki/codemirror/addon/hint/anyword-hint.js2.js diff --git a/tzk/editions/tzk/tiddlers/$__plugins_tiddlywiki_codemirror_addon_hint_anyword-hint.js2.js.meta b/tzk/editions/tzk/tiddlers/_system/plugins/tiddlywiki/codemirror/addon/hint/anyword-hint.js2.js.meta similarity index 100% rename from tzk/editions/tzk/tiddlers/$__plugins_tiddlywiki_codemirror_addon_hint_anyword-hint.js2.js.meta rename to tzk/editions/tzk/tiddlers/_system/plugins/tiddlywiki/codemirror/addon/hint/anyword-hint.js2.js.meta diff --git a/tzk/editions/tzk/tiddlers/$__plugins_tiddlywiki_codemirror_mode_tw5_tw5.css.tid b/tzk/editions/tzk/tiddlers/_system/plugins/tiddlywiki/codemirror/mode/tw5/tw5.css.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__plugins_tiddlywiki_codemirror_mode_tw5_tw5.css.tid rename to tzk/editions/tzk/tiddlers/_system/plugins/tiddlywiki/codemirror/mode/tw5/tw5.css.tid diff --git a/tzk/editions/tzk/tiddlers/$__plugins_tiddlywiki_codemirror_mode_tw5_tw5.css2.tid b/tzk/editions/tzk/tiddlers/_system/plugins/tiddlywiki/codemirror/mode/tw5/tw5.css2.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__plugins_tiddlywiki_codemirror_mode_tw5_tw5.css2.tid rename to tzk/editions/tzk/tiddlers/_system/plugins/tiddlywiki/codemirror/mode/tw5/tw5.css2.tid diff --git a/tzk/editions/tzk/tiddlers/$__plugins_tiddlywiki_codemirror_mode_tw5_tw5.js2.js b/tzk/editions/tzk/tiddlers/_system/plugins/tiddlywiki/codemirror/mode/tw5/tw5.js2.js similarity index 100% rename from tzk/editions/tzk/tiddlers/$__plugins_tiddlywiki_codemirror_mode_tw5_tw5.js2.js rename to tzk/editions/tzk/tiddlers/_system/plugins/tiddlywiki/codemirror/mode/tw5/tw5.js2.js diff --git a/tzk/editions/tzk/tiddlers/$__plugins_tiddlywiki_codemirror_mode_tw5_tw5.js2.js.meta b/tzk/editions/tzk/tiddlers/_system/plugins/tiddlywiki/codemirror/mode/tw5/tw5.js2.js.meta similarity index 100% rename from tzk/editions/tzk/tiddlers/$__plugins_tiddlywiki_codemirror_mode_tw5_tw5.js2.js.meta rename to tzk/editions/tzk/tiddlers/_system/plugins/tiddlywiki/codemirror/mode/tw5/tw5.js2.js.meta diff --git a/tzk/editions/tzk/tiddlers/$__plugins_tobibeer_preview_defaults_delay.tid b/tzk/editions/tzk/tiddlers/_system/plugins/tobibeer/preview/defaults/delay.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__plugins_tobibeer_preview_defaults_delay.tid rename to tzk/editions/tzk/tiddlers/_system/plugins/tobibeer/preview/defaults/delay.tid diff --git a/tzk/editions/tzk/tiddlers/$__plugins_tobibeer_preview_defaults_exclude.tid b/tzk/editions/tzk/tiddlers/_system/plugins/tobibeer/preview/defaults/exclude.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__plugins_tobibeer_preview_defaults_exclude.tid rename to tzk/editions/tzk/tiddlers/_system/plugins/tobibeer/preview/defaults/exclude.tid diff --git a/tzk/editions/tzk/tiddlers/$__plugins_tobibeer_preview_defaults_keys.tid b/tzk/editions/tzk/tiddlers/_system/plugins/tobibeer/preview/defaults/keys.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__plugins_tobibeer_preview_defaults_keys.tid rename to tzk/editions/tzk/tiddlers/_system/plugins/tobibeer/preview/defaults/keys.tid diff --git a/tzk/editions/tzk/tiddlers/$__plugins_tobibeer_preview_template.tid b/tzk/editions/tzk/tiddlers/_system/plugins/tobibeer/preview/template.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__plugins_tobibeer_preview_template.tid rename to tzk/editions/tzk/tiddlers/_system/plugins/tobibeer/preview/template.tid diff --git a/tzk/editions/tzk/tiddlers/_system/sib/Buttons/Checkpoint.tid b/tzk/editions/tzk/tiddlers/_system/sib/Buttons/Checkpoint.tid new file mode 100644 index 0000000..4516ed3 --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/sib/Buttons/Checkpoint.tid @@ -0,0 +1,11 @@ +caption: Checkpoint +condition: [type[]] [type[text/vnd.tiddlywiki]] +[first[]] +created: 20230727194531822 +description: Save the current version of this tiddler so you can view it later +dropdown: $:/sib/CheckpointDropdown +icon: $:/core/images/timestamp-on +modified: 20230727194728438 +shortcuts: ((checkpoint)) +tags: $:/tags/EditorToolbar +title: $:/sib/Buttons/Checkpoint +type: text/vnd.tiddlywiki \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__sib_Buttons_CopyPublicZettelkastenLink.tid b/tzk/editions/tzk/tiddlers/_system/sib/Buttons/CopyPublicZettelkastenLink.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Buttons_CopyPublicZettelkastenLink.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Buttons/CopyPublicZettelkastenLink.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Buttons_CopyTitleReference.tid b/tzk/editions/tzk/tiddlers/_system/sib/Buttons/CopyTitleReference.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Buttons_CopyTitleReference.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Buttons/CopyTitleReference.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Buttons_NewSource.tid b/tzk/editions/tzk/tiddlers/_system/sib/Buttons/NewSource.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Buttons_NewSource.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Buttons/NewSource.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Buttons_ReadingInbox.tid b/tzk/editions/tzk/tiddlers/_system/sib/Buttons/ReadingInbox.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Buttons_ReadingInbox.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Buttons/ReadingInbox.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Buttons_Tools.tid b/tzk/editions/tzk/tiddlers/_system/sib/Buttons/Tools.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Buttons_Tools.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Buttons/Tools.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Buttons_excise-private-chunk.tid b/tzk/editions/tzk/tiddlers/_system/sib/Buttons/excise-private-chunk.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Buttons_excise-private-chunk.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Buttons/excise-private-chunk.tid diff --git a/tzk/editions/tzk/tiddlers/_system/sib/CheckpointDropdown.tid b/tzk/editions/tzk/tiddlers/_system/sib/CheckpointDropdown.tid new file mode 100644 index 0000000..21579d2 --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/sib/CheckpointDropdown.tid @@ -0,0 +1,46 @@ +created: 20230727193610360 +modified: 20230727200355557 +tags: +title: $:/sib/CheckpointDropdown +type: text/vnd.tiddlywiki + +\define lingo-base() $:/language/Buttons/Excise/ + +\define body(config-title) +\whitespace trim +''Checkpoint the current version of this tiddler'' + +Message: <$edit-text tag="input" tiddler="$config-title$/message" default="" focus="true" /> + +<$let + tid-to-duplicate={{{ [get[draft.of]] }}} + new-title={{{ [[$:/checkpoints/]addsuffixaddsuffix[/]addsuffix] }}}> + +<$list filter="""[is[tiddler]]"""> +
    + <> +
    + + +Creating checkpoint tiddler: <> + +<$button> + <$action-sendmessage + $message="tm-new-tiddler" + $param={{{ [get[draft.of]] }}} + title=<> + checkpoint-message={{$config-title$/message}} + /> + <$action-deletetiddler + $tiddler="$config-title$/message" + /> + <$action-deletetiddler + $tiddler=<> + /> + Checkpoint + + + +\end + +<$macrocall $name="body" config-title=<>/> diff --git a/tzk/editions/tzk/tiddlers/$__sib_Documentation.tid b/tzk/editions/tzk/tiddlers/_system/sib/Documentation.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Documentation.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Documentation.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Documentation_Macros.tid b/tzk/editions/tzk/tiddlers/_system/sib/Documentation/Macros.tid similarity index 73% rename from tzk/editions/tzk/tiddlers/$__sib_Documentation_Macros.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Documentation/Macros.tid index e0f6a50..06e4119 100644 --- a/tzk/editions/tzk/tiddlers/$__sib_Documentation_Macros.tid +++ b/tzk/editions/tzk/tiddlers/_system/sib/Documentation/Macros.tid @@ -1,6 +1,8 @@ caption: Macros created: 20210523143205876 -modified: 20210523144411256 +creator: soren +modified: 20230416155452545 +modifier: soren tags: title: $:/sib/Documentation/Macros type: text/vnd.tiddlywiki @@ -12,7 +14,7 @@ Click into a macro to see an example of its usage and its definition. Name Description - <$list filter="[prefix[$:/sib/Macros/]tag[$:/tags/Macro]]"> + <$list filter="[prefix[$:/sib/Macros/]tag[$:/tags/Macro]!prefix[$:/sib/Macros/_]]"> <$link to=<>><$text text={{{ [all[current]removeprefix[$:/sib/Macros/]] }}}/> {{!!description}} diff --git a/tzk/editions/tzk/tiddlers/$__sib_Documentation_ViewTemplates.tid b/tzk/editions/tzk/tiddlers/_system/sib/Documentation/ViewTemplates.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Documentation_ViewTemplates.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Documentation/ViewTemplates.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_EpistemicStatus_Display.tid b/tzk/editions/tzk/tiddlers/_system/sib/EpistemicStatus/Display.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_EpistemicStatus_Display.tid rename to tzk/editions/tzk/tiddlers/_system/sib/EpistemicStatus/Display.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_EpistemicStatus_confident.tid b/tzk/editions/tzk/tiddlers/_system/sib/EpistemicStatus/confident.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_EpistemicStatus_confident.tid rename to tzk/editions/tzk/tiddlers/_system/sib/EpistemicStatus/confident.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_EpistemicStatus_likely.tid b/tzk/editions/tzk/tiddlers/_system/sib/EpistemicStatus/likely.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_EpistemicStatus_likely.tid rename to tzk/editions/tzk/tiddlers/_system/sib/EpistemicStatus/likely.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_EpistemicStatus_mythological.tid b/tzk/editions/tzk/tiddlers/_system/sib/EpistemicStatus/mythological.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_EpistemicStatus_mythological.tid rename to tzk/editions/tzk/tiddlers/_system/sib/EpistemicStatus/mythological.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_EpistemicStatus_personal.tid b/tzk/editions/tzk/tiddlers/_system/sib/EpistemicStatus/personal.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_EpistemicStatus_personal.tid rename to tzk/editions/tzk/tiddlers/_system/sib/EpistemicStatus/personal.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_EpistemicStatus_possible.tid b/tzk/editions/tzk/tiddlers/_system/sib/EpistemicStatus/possible.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_EpistemicStatus_possible.tid rename to tzk/editions/tzk/tiddlers/_system/sib/EpistemicStatus/possible.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_EpistemicStatus_probably-wrong.tid b/tzk/editions/tzk/tiddlers/_system/sib/EpistemicStatus/probably-wrong.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_EpistemicStatus_probably-wrong.tid rename to tzk/editions/tzk/tiddlers/_system/sib/EpistemicStatus/probably-wrong.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_EpistemicStatus_unlikely.tid b/tzk/editions/tzk/tiddlers/_system/sib/EpistemicStatus/unlikely.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_EpistemicStatus_unlikely.tid rename to tzk/editions/tzk/tiddlers/_system/sib/EpistemicStatus/unlikely.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Fonts_SourceSansPro.txt b/tzk/editions/tzk/tiddlers/_system/sib/Fonts/SourceSansPro.txt similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Fonts_SourceSansPro.txt rename to tzk/editions/tzk/tiddlers/_system/sib/Fonts/SourceSansPro.txt diff --git a/tzk/editions/tzk/tiddlers/$__sib_Fonts_SourceSansPro.txt.meta b/tzk/editions/tzk/tiddlers/_system/sib/Fonts/SourceSansPro.txt.meta similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Fonts_SourceSansPro.txt.meta rename to tzk/editions/tzk/tiddlers/_system/sib/Fonts/SourceSansPro.txt.meta diff --git a/tzk/editions/tzk/tiddlers/$__sib_GettingStarted.tid b/tzk/editions/tzk/tiddlers/_system/sib/GettingStarted.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_GettingStarted.tid rename to tzk/editions/tzk/tiddlers/_system/sib/GettingStarted.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_GettingStarted_Copyright.tid b/tzk/editions/tzk/tiddlers/_system/sib/GettingStarted/Copyright.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_GettingStarted_Copyright.tid rename to tzk/editions/tzk/tiddlers/_system/sib/GettingStarted/Copyright.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_GettingStarted_NextSteps.tid b/tzk/editions/tzk/tiddlers/_system/sib/GettingStarted/NextSteps.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_GettingStarted_NextSteps.tid rename to tzk/editions/tzk/tiddlers/_system/sib/GettingStarted/NextSteps.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_GettingStarted_ReferenceExplorer.tid b/tzk/editions/tzk/tiddlers/_system/sib/GettingStarted/ReferenceExplorer.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_GettingStarted_ReferenceExplorer.tid rename to tzk/editions/tzk/tiddlers/_system/sib/GettingStarted/ReferenceExplorer.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_GettingStarted_ThingsToDo.tid b/tzk/editions/tzk/tiddlers/_system/sib/GettingStarted/ThingsToDo.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_GettingStarted_ThingsToDo.tid rename to tzk/editions/tzk/tiddlers/_system/sib/GettingStarted/ThingsToDo.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_GettingStarted_Title.tid b/tzk/editions/tzk/tiddlers/_system/sib/GettingStarted/Title.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_GettingStarted_Title.tid rename to tzk/editions/tzk/tiddlers/_system/sib/GettingStarted/Title.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_GettingStarted_Warning.tid b/tzk/editions/tzk/tiddlers/_system/sib/GettingStarted/Warning.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_GettingStarted_Warning.tid rename to tzk/editions/tzk/tiddlers/_system/sib/GettingStarted/Warning.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_GettingStarted_ZettelkastenCardTypes.tid b/tzk/editions/tzk/tiddlers/_system/sib/GettingStarted/ZettelkastenCardTypes.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_GettingStarted_ZettelkastenCardTypes.tid rename to tzk/editions/tzk/tiddlers/_system/sib/GettingStarted/ZettelkastenCardTypes.tid diff --git a/tzk/editions/tzk/tiddlers/_system/sib/Macros/_delta-interest.tid b/tzk/editions/tzk/tiddlers/_system/sib/Macros/_delta-interest.tid new file mode 100644 index 0000000..22abe4c --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/sib/Macros/_delta-interest.tid @@ -0,0 +1,22 @@ +created: 20230416155348451 +creator: soren +modified: 20230416155559272 +modifier: soren +tags: $:/tags/Macro +title: $:/sib/Macros/_delta-interest +type: text/vnd.tiddlywiki + +\define delta-interest() + <$list filter="[{!!ri-date-interest-delta}match[growing]]"> + 🡕 + + <$list filter="[{!!ri-date-interest-delta}match[waning]]"> + 🡖 + + <$list filter="[{!!ri-date-interest-delta}match[trudging]]"> + 🡒 + + <$list filter="[{!!ri-date-interest-delta}is[blank]]"> + — + +\end \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__sib_Macros_cb.tid b/tzk/editions/tzk/tiddlers/_system/sib/Macros/cb.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Macros_cb.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Macros/cb.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Macros_check-item.tid b/tzk/editions/tzk/tiddlers/_system/sib/Macros/check-item.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Macros_check-item.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Macros/check-item.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Macros_clarify.tid b/tzk/editions/tzk/tiddlers/_system/sib/Macros/clarify.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Macros_clarify.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Macros/clarify.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Macros_colorsplotch.tid b/tzk/editions/tzk/tiddlers/_system/sib/Macros/colorsplotch.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Macros_colorsplotch.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Macros/colorsplotch.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Macros_ff.tid b/tzk/editions/tzk/tiddlers/_system/sib/Macros/ff.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Macros_ff.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Macros/ff.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Macros_float-image.tid b/tzk/editions/tzk/tiddlers/_system/sib/Macros/float-image.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Macros_float-image.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Macros/float-image.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Macros_fnote.tid b/tzk/editions/tzk/tiddlers/_system/sib/Macros/fnote.tid similarity index 87% rename from tzk/editions/tzk/tiddlers/$__sib_Macros_fnote.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Macros/fnote.tid index ac11fa2..24071a0 100644 --- a/tzk/editions/tzk/tiddlers/$__sib_Macros_fnote.tid +++ b/tzk/editions/tzk/tiddlers/_system/sib/Macros/fnote.tid @@ -1,7 +1,9 @@ created: 20210719234454927 +creator: soren description: Create a footnote at the current location. Based on Refnotes (https://kookma.github.io/TW-Refnotes/), but doesn't use the plugin. example: This is my body text.<> -modified: 20210731165949531 +modified: 20230510144012471 +modifier: soren tags: $:/tags/Macro title: $:/sib/Macros/fnote type: text/vnd.tiddlywiki diff --git a/tzk/editions/tzk/tiddlers/_system/sib/Macros/iex.tid b/tzk/editions/tzk/tiddlers/_system/sib/Macros/iex.tid new file mode 100644 index 0000000..26b13d6 --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/sib/Macros/iex.tid @@ -0,0 +1,15 @@ +created: 20221230152349542 +creator: soren +description: (i)f (ex)ists: Display some content only if a tiddler exists. +example: <$macrocall $name=iex tiddler=MyTiddler content="""<>"""/> +modified: 20221230152630225 +modifier: soren +tags: $:/tags/Macro +title: $:/sib/Macros/iex +type: text/vnd.tiddlywiki + +\define iex(tiddler, content) +<$list filter="[<__tiddler__>is[tiddler]]" variable=_> + $content$ + +\end \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/_system/sib/Macros/jsub.tid b/tzk/editions/tzk/tiddlers/_system/sib/Macros/jsub.tid new file mode 100644 index 0000000..a0017ec --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/sib/Macros/jsub.tid @@ -0,0 +1,18 @@ +created: 20230405171215676 +creator: soren +description: Link a subtiddler of a journal tiddler in an expando, with the caption or title as the small text. +example: <> +modified: 20230405171926556 +modifier: soren +tags: $:/tags/Macro +title: $:/sib/Macros/jsub +type: text/vnd.tiddlywiki + +\define jsub(subpart) + <$macrocall + $name="stretch-template" + tiddler={{{ [all[current]is[draft]then{!!draft.of}elseaddsuffix[/]addsuffix<__subpart__>] }}} + smallTemplate="$:/sib/Templates/Topical/JournalSubtiddlerStretch" + largeTemplate="$:/sib/Templates/General/IdentityTemplate" + /> +\end \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__sib_Macros_privateperson.tid b/tzk/editions/tzk/tiddlers/_system/sib/Macros/privateperson.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Macros_privateperson.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Macros/privateperson.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Macros_rt.tid b/tzk/editions/tzk/tiddlers/_system/sib/Macros/rt.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Macros_rt.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Macros/rt.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Macros_speaker.tid b/tzk/editions/tzk/tiddlers/_system/sib/Macros/speaker.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Macros_speaker.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Macros/speaker.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Macros_star-rating.tid b/tzk/editions/tzk/tiddlers/_system/sib/Macros/star-rating.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Macros_star-rating.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Macros/star-rating.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Macros_subreddit.tid b/tzk/editions/tzk/tiddlers/_system/sib/Macros/subreddit.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Macros_subreddit.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Macros/subreddit.tid diff --git a/tzk/editions/tzk/tiddlers/_system/sib/Macros/summarize.tid b/tzk/editions/tzk/tiddlers/_system/sib/Macros/summarize.tid new file mode 100644 index 0000000..cff8361 --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/sib/Macros/summarize.tid @@ -0,0 +1,16 @@ +created: 20230329151407581 +creator: soren +description: Render a link to the specified /tiddler/, followed by its description (or another specified summary /field/).. +example: <> +modified: 20230525185714728 +modifier: soren +tags: $:/tags/Macro +title: $:/sib/Macros/summarize +type: text/vnd.tiddlywiki + +\define summarize(tiddler, field:"description") + <$link to=<<__tiddler__>>/>: + <$wikify name=text text={{{ [<__tiddler__>get<__field__>] }}}> + <> + +\end \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__sib_MediaRating_Display.tid b/tzk/editions/tzk/tiddlers/_system/sib/MediaRating/Display.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_MediaRating_Display.tid rename to tzk/editions/tzk/tiddlers/_system/sib/MediaRating/Display.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_MediaRating_average.tid b/tzk/editions/tzk/tiddlers/_system/sib/MediaRating/average.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_MediaRating_average.tid rename to tzk/editions/tzk/tiddlers/_system/sib/MediaRating/average.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_MediaRating_classic.tid b/tzk/editions/tzk/tiddlers/_system/sib/MediaRating/classic.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_MediaRating_classic.tid rename to tzk/editions/tzk/tiddlers/_system/sib/MediaRating/classic.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_MediaRating_distinguished.tid b/tzk/editions/tzk/tiddlers/_system/sib/MediaRating/distinguished.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_MediaRating_distinguished.tid rename to tzk/editions/tzk/tiddlers/_system/sib/MediaRating/distinguished.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_MediaRating_good.tid b/tzk/editions/tzk/tiddlers/_system/sib/MediaRating/good.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_MediaRating_good.tid rename to tzk/editions/tzk/tiddlers/_system/sib/MediaRating/good.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_MediaRating_great.tid b/tzk/editions/tzk/tiddlers/_system/sib/MediaRating/great.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_MediaRating_great.tid rename to tzk/editions/tzk/tiddlers/_system/sib/MediaRating/great.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_MediaRating_irrational.tid b/tzk/editions/tzk/tiddlers/_system/sib/MediaRating/irrational.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_MediaRating_irrational.tid rename to tzk/editions/tzk/tiddlers/_system/sib/MediaRating/irrational.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_MediaRating_poor.tid b/tzk/editions/tzk/tiddlers/_system/sib/MediaRating/poor.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_MediaRating_poor.tid rename to tzk/editions/tzk/tiddlers/_system/sib/MediaRating/poor.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_MediaRating_skimmable.tid b/tzk/editions/tzk/tiddlers/_system/sib/MediaRating/skimmable.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_MediaRating_skimmable.tid rename to tzk/editions/tzk/tiddlers/_system/sib/MediaRating/skimmable.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Overrides_CodeMirrorPopupFix.css b/tzk/editions/tzk/tiddlers/_system/sib/Overrides/CodeMirrorPopupFix.css similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Overrides_CodeMirrorPopupFix.css rename to tzk/editions/tzk/tiddlers/_system/sib/Overrides/CodeMirrorPopupFix.css diff --git a/tzk/editions/tzk/tiddlers/$__sib_Overrides_CodeMirrorPopupFix.css.meta b/tzk/editions/tzk/tiddlers/_system/sib/Overrides/CodeMirrorPopupFix.css.meta similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Overrides_CodeMirrorPopupFix.css.meta rename to tzk/editions/tzk/tiddlers/_system/sib/Overrides/CodeMirrorPopupFix.css.meta diff --git a/tzk/editions/tzk/tiddlers/$__sib_Overrides_details-background-color.tid b/tzk/editions/tzk/tiddlers/_system/sib/Overrides/details-background-color.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Overrides_details-background-color.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Overrides/details-background-color.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_RawMarkup_ClockTicker.tid b/tzk/editions/tzk/tiddlers/_system/sib/RawMarkup/ClockTicker.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_RawMarkup_ClockTicker.tid rename to tzk/editions/tzk/tiddlers/_system/sib/RawMarkup/ClockTicker.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_RawMarkup_SimpleAnalytics.html b/tzk/editions/tzk/tiddlers/_system/sib/RawMarkup/SimpleAnalytics.html similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_RawMarkup_SimpleAnalytics.html rename to tzk/editions/tzk/tiddlers/_system/sib/RawMarkup/SimpleAnalytics.html diff --git a/tzk/editions/tzk/tiddlers/$__sib_RawMarkup_SimpleAnalytics.html.meta b/tzk/editions/tzk/tiddlers/_system/sib/RawMarkup/SimpleAnalytics.html.meta similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_RawMarkup_SimpleAnalytics.html.meta rename to tzk/editions/tzk/tiddlers/_system/sib/RawMarkup/SimpleAnalytics.html.meta diff --git a/tzk/editions/tzk/tiddlers/$__sib_RawMarkup_SplashScreen.tid b/tzk/editions/tzk/tiddlers/_system/sib/RawMarkup/SplashScreen.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_RawMarkup_SplashScreen.tid rename to tzk/editions/tzk/tiddlers/_system/sib/RawMarkup/SplashScreen.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Reviewer_Dateops.tid b/tzk/editions/tzk/tiddlers/_system/sib/Reviewer/Dateops.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Reviewer_Dateops.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Reviewer/Dateops.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Reviewer_SchedulableTemplate.tid b/tzk/editions/tzk/tiddlers/_system/sib/Reviewer/SchedulableTemplate.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Reviewer_SchedulableTemplate.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Reviewer/SchedulableTemplate.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Reviewer_SchedulerMacros.tid b/tzk/editions/tzk/tiddlers/_system/sib/Reviewer/SchedulerMacros.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Reviewer_SchedulerMacros.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Reviewer/SchedulerMacros.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Reviewer_Tiddlers due for review.tid b/tzk/editions/tzk/tiddlers/_system/sib/Reviewer/Tiddlers due for review.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Reviewer_Tiddlers due for review.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Reviewer/Tiddlers due for review.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Search_Locator.tid b/tzk/editions/tzk/tiddlers/_system/sib/Search/Locator.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Search_Locator.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Search/Locator.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Search_LocatorFields.tid b/tzk/editions/tzk/tiddlers/_system/sib/Search/LocatorFields.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Search_LocatorFields.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Search/LocatorFields.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_SideBar_Explore.tid b/tzk/editions/tzk/tiddlers/_system/sib/SideBar/Explore.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_SideBar_Explore.tid rename to tzk/editions/tzk/tiddlers/_system/sib/SideBar/Explore.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_SideBar_Explore_Bibliographies.tid b/tzk/editions/tzk/tiddlers/_system/sib/SideBar/Explore/Bibliographies.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_SideBar_Explore_Bibliographies.tid rename to tzk/editions/tzk/tiddlers/_system/sib/SideBar/Explore/Bibliographies.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_SideBar_InfoLinks.tid b/tzk/editions/tzk/tiddlers/_system/sib/SideBar/InfoLinks.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_SideBar_InfoLinks.tid rename to tzk/editions/tzk/tiddlers/_system/sib/SideBar/InfoLinks.tid diff --git a/tzk/editions/tzk/tiddlers/_system/sib/SideBar/Journal.tid b/tzk/editions/tzk/tiddlers/_system/sib/SideBar/Journal.tid new file mode 100644 index 0000000..122d2d6 --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/sib/SideBar/Journal.tid @@ -0,0 +1,27 @@ +caption: Journal +created: 20230830210720848 +modified: 20230912095822070 +tags: $:/tags/MoreSideBar +title: $:/sib/SideBar/Journal +type: text/vnd.tiddlywiki + + + +\define day-journal-regexp() [0-9]{4}-[0-9]{2}-[0-9]{2} [A-Z][a-z]{2} + +Today: <$link to=<>/> + +<$let theYear=<> theMonth=<>> + <$macrocall $name=calendar year=<> month={{{ [trim:prefix[0]]}}} opts="journals" /> + + +[[More|JournalCalendar]] + +---- + +
    +<$list filter="[tag[Journal]!sort[]regexp:title]"> +
    <$link/>
    +
    {{!!description}}
    + +
    \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__sib_SideBar_Write.tid b/tzk/editions/tzk/tiddlers/_system/sib/SideBar/Write.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_SideBar_Write.tid rename to tzk/editions/tzk/tiddlers/_system/sib/SideBar/Write.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_SideBar_Write_Stub.tid b/tzk/editions/tzk/tiddlers/_system/sib/SideBar/Write/Stub.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_SideBar_Write_Stub.tid rename to tzk/editions/tzk/tiddlers/_system/sib/SideBar/Write/Stub.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Snippets_TiddlyRememberDetailsWidget.tid b/tzk/editions/tzk/tiddlers/_system/sib/Snippets/TiddlyRememberDetailsWidget.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Snippets_TiddlyRememberDetailsWidget.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Snippets/TiddlyRememberDetailsWidget.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_StorySaver_Saver.tid b/tzk/editions/tzk/tiddlers/_system/sib/StorySaver/Saver.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_StorySaver_Saver.tid rename to tzk/editions/tzk/tiddlers/_system/sib/StorySaver/Saver.tid diff --git a/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/CheckpointList.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/CheckpointList.tid new file mode 100644 index 0000000..dbf0fd7 --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/CheckpointList.tid @@ -0,0 +1,59 @@ +created: 20230727200534052 +modified: 20230727203131443 +tags: $:/tags/ViewTemplate +title: $:/sib/Templates/Automatic/CheckpointList +type: text/vnd.tiddlywiki + +\define expand-checkpoints() <$action-setfield $tiddler="$:/temp/ShowCheckpoints" $index=<> $value="yes" /> +\define contract-checkpoints() <$action-setfield $tiddler="$:/temp/ShowCheckpoints" $index=<> $value="no" /> + +<$let checkpoint-prefix={{{ [[$:/checkpoints/]addsuffixaddsuffix[/]] }}}> + <$list filter="[prefixfirst[]]" variable=_> +
    + <$reveal stateTitle="$:/temp/ShowCheckpoints" stateIndex=<> type="nomatch" text="yes"> +
    + <$let num-checkpoints={{{ [prefixcount[]] }}}> + <$button class="tc-btn-invisible tc-tiddlylink" actions=<>> + {{$:/core/images/right-arrow}} Previous checkpoints + + (<>) + +
    + + <$reveal stateTitle="$:/temp/ShowCheckpoints" stateIndex=<> type="match" text="yes"> +
    + <$button class="tc-btn-invisible tc-tiddlylink" actions=<>> + {{$:/core/images/down-arrow}} Previous checkpoints of this tiddler: +
    +
    +
      + <$list filter="[prefix!nsort[]]"> + <$let timestamp={{{ [all[current]split[/]last[]] }}}> +
    1. + <$link to=<>><>: {{!!checkpoint-message}} +
    2. + + +
    + +
    + + + + \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__sib_Templates_Automatic_Clock.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/Clock.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Templates_Automatic_Clock.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/Clock.tid diff --git a/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/Date.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/Date.tid new file mode 100644 index 0000000..9480f2c --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/Date.tid @@ -0,0 +1,71 @@ +created: 20230405220851883 +creator: soren +description: Display information about a date. +modified: 20230416155513868 +modifier: soren +tags: $:/tags/ViewTemplate +title: $:/sib/Templates/Automatic/Date +transcludedin: All tiddlers tagged <>. +type: text/vnd.tiddlywiki + +<$list filter="[all[current]tag[Date]]" variable=_> + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Person<$link to={{!!ri-date-with}}/>
    When<$link to={{{ [all[current]split[:]last[]] }}}/>
    Date # + <$vars + previousDate={{{ [tag[Date]ri-date-with{!!ri-date-with}sort[]before] }}} + nextDate={{{ [tag[Date]ri-date-with{!!ri-date-with}sort[]after] }}} + > + <$count filter="[tag[Date]ri-date-with{!!ri-date-with}sort[]compare:string:lteq]"/>/<$count filter="[tag[Date]ri-date-with{!!ri-date-with}]"/> + <$list filter="[!is[blank]]"> + <$list filter="[!is[blank]]"> + (<$link to=<>>previous, <$link to=<>>next); + + <$list filter="[is[blank]]"> + (<$link to=<>>previous); + + + <$list filter="[is[blank]]"> + <$list filter="[!is[blank]]"> + (<$link to=<>>next); + + + <$tiddler tiddler={{!!ri-date-with}}>{{||$:/sib/Templates/Topical/RiStatusLine}} + +
    Interest<>
    Goal + {{!!ri-date-goal}} + ({{!!ri-date-goal-result}}) +
    Summary{{!!ri-date-summary}}
    + + + + \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/Event.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/Event.tid new file mode 100644 index 0000000..3389b9f --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/Event.tid @@ -0,0 +1,98 @@ +created: 20230912033953383 +modified: 20230912044637875 +tags: $:/tags/ViewTemplate +title: $:/sib/Templates/Automatic/Event +type: text/vnd.tiddlywiki + +<$list filter="[all[current]tag[Event]]" variable=_> + +
    + +
    {{!!caption}}
    +
    + {{{ [{!!startdate}format:date{$:/config/NewJournal/Title}]}}} -- {{{ [{!!enddate}format:date{$:/config/NewJournal/Title}] }}} +
    + +
    + +Journal entries: + +
      + <$list filter="[tag[Journal]] :map[split[ ]first[]split[-]join[]addsuffix[1200]] +[compare:date:gteq{!!startdate}compare:date:lteq{!!enddate}] +[format:date{$:/config/NewJournal/Title}]"> +
    • <$link />
    • + +
    + +Months included: + +<$let + startyear={{{ [{!!startdate}split[]first[4]join[]] }}} + startmonth={{{ [{!!startdate}split[]first[6]last[2]join[]trim:prefix[0]]}}} + endyear={{{ [{!!enddate}split[]first[4]join[]] }}} + endmonth={{{ [{!!enddate}split[]first[6]last[2]join[]trim:prefix[0]]}}}> + + <$list filter="[range,]" variable="year"> + <$list filter="[range,]" variable="month"> + <$macrocall $name=calendar year=<> month=<> opts="event" /> + + + + +
    + +
    + +<$list filter="[all[current]has[people]]" variable=_> + + People (<$count filter={{!!people}}/>): + +
      + <$list filter={{!!people}}> +
    • <$link />
    • + +
    + + + +<$list filter="[all[current]has[places]]" variable=_> + + Places (<$count filter={{!!places}}/>): + +
      + <$list filter={{!!places}}> +
    • <$link />
    • + +
    + + + +
    + +<> + +
    + + + + diff --git a/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/FrozenTiddlerEditWarning.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/FrozenTiddlerEditWarning.tid new file mode 100644 index 0000000..820302d --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/FrozenTiddlerEditWarning.tid @@ -0,0 +1,11 @@ +created: 20230407030211378 +creator: soren +modified: 20230407031011568 +modifier: soren +tags: $:/tags/EditTemplate +title: $:/sib/Templates/Automatic/FrozenTiddlerEditWarning +type: text/vnd.tiddlywiki + +<$list filter="[all[current]tag[Frozen]]"> + This tiddler is frozen. Edits should be limited to links, metadata, and copyedits. + \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/JournalNavigation.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/JournalNavigation.tid new file mode 100644 index 0000000..c9b5ff1 --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/JournalNavigation.tid @@ -0,0 +1,30 @@ +created: 20230405164752085 +creator: soren +description: Show the previous and next journal entries. +modified: 20230822195423771 +modifier: soren +tags: $:/tags/ViewTemplate +title: $:/sib/Templates/Automatic/JournalNavigation +transcludedin: All tiddlers tagged <>. +type: text/vnd.tiddlywiki + +<$list filter="[all[current]tag[Journal]]"> + +<$vars + previousEntry={{{ [!is[system]tag[Journal]sort[]before] }}} + nextEntry={{{ [!is[system]tag[Journal]sort[]after] }}}> + +
    +
    + « Previous: <$link to=<>/> +
    +
    + Next: <$link to=<>/> » +
    +
    + + + +{{||$:/sib/Templates/Topical/JournalPersonPlaceExplorer}} + + \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__sib_Templates_Automatic_MacroDescription.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/MacroDescription.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Templates_Automatic_MacroDescription.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/MacroDescription.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Templates_Automatic_MissingTiddlerCreationNotification.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/MissingTiddlerCreationNotification.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Templates_Automatic_MissingTiddlerCreationNotification.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/MissingTiddlerCreationNotification.tid diff --git a/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/MissingTiddlerQuickCreate.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/MissingTiddlerQuickCreate.tid new file mode 100644 index 0000000..d838221 --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/MissingTiddlerQuickCreate.tid @@ -0,0 +1,19 @@ +created: 20230131043004421 +creator: soren +description: Show options to quickly create an empty tiddler with a given tag from a missing title. +modified: 20230405164922599 +modifier: soren +tags: $:/tags/ViewTemplate +title: $:/sib/Templates/Automatic/MissingTiddlerQuickCreate +transcludedin: All missing tiddlers. +type: text/vnd.tiddlywiki + +\define new-item(tag) <$action-createtiddler $basetitle=<> tags="""$tag$"""/> + +\define stub-type(type) <$button class="tc-btn-invisible" actions=<>><> + +<$list filter="[all[current]is[missing]]"> + Create stub: + <> + <> + diff --git a/tzk/editions/tzk/tiddlers/$__sib_Templates_Automatic_OpenTopBar.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/OpenTopBar.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Templates_Automatic_OpenTopBar.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/OpenTopBar.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Templates_Automatic_PrivateChunkParentNotice.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/PrivateChunkParentNotice.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Templates_Automatic_PrivateChunkParentNotice.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/PrivateChunkParentNotice.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Templates_Automatic_Publicity_EditorPublicLine.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/Publicity/EditorPublicLine.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Templates_Automatic_Publicity_EditorPublicLine.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/Publicity/EditorPublicLine.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Templates_Automatic_Publicity_LevelDisplay.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/Publicity/LevelDisplay.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Templates_Automatic_Publicity_LevelDisplay.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/Publicity/LevelDisplay.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Templates_Automatic_Publicity_ViewerPublicLine.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/Publicity/ViewerPublicLine.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Templates_Automatic_Publicity_ViewerPublicLine.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/Publicity/ViewerPublicLine.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Templates_Automatic_ReaderActions.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/ReaderActions.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Templates_Automatic_ReaderActions.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/ReaderActions.tid diff --git a/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/RomanticInterest.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/RomanticInterest.tid new file mode 100644 index 0000000..2b1ce88 --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/RomanticInterest.tid @@ -0,0 +1,53 @@ +created: 20230405210835121 +creator: soren +description: Display information about a romantic interest (dates we went on, etc.). +modified: 20230601213628950 +modifier: soren +tags: $:/tags/ViewTemplate +title: $:/sib/Templates/Automatic/RomanticInterest +transcludedin: All tiddlers tagged <>. +type: text/vnd.tiddlywiki + +<$list filter="[all[current]tag[RomanticInterest]]"> + +!! Dates + + + + + + + + + <$list filter="[contains:ri-date-with!is[draft]sort[]]" counter="counter"> + + + + + + + + +
    #WhenSummaryΔI
    <> + <$link to=<>> + <$text text={{{ [all[current]split[:]butfirst[]] }}}/> + + {{!!ri-date-summary}}<>
    + +Outcome: {{||$:/sib/Templates/Topical/RiStatusLine}} + + + + + + \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__sib_Templates_Automatic_Source.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/Source.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Templates_Automatic_Source.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/Source.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Templates_Automatic_SpoilerBanner.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/SpoilerBanner.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Templates_Automatic_SpoilerBanner.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/SpoilerBanner.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Templates_Automatic_StoryRiverFooter.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/StoryRiverFooter.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Templates_Automatic_StoryRiverFooter.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/StoryRiverFooter.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Templates_Automatic_Subtiddler.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/Subtiddler.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Templates_Automatic_Subtiddler.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/Subtiddler.tid diff --git a/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/TiddlerTypeIcon.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/TiddlerTypeIcon.tid new file mode 100644 index 0000000..eaee0af --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/TiddlerTypeIcon.tid @@ -0,0 +1,44 @@ +condition: [all[current]has[icon]]~[[$:/config/DefaultTiddlerIcon]has[text]] ~[all[current]tag[PAO]] ~[all[current]tag[Place]] ~[all[current]tag[Idea]] ~[all[current]tag[Source]] ~[all[current]tag[Sink]] ~[all[current]tag[Journal]] +created: 20230407013552037 +creator: soren +modified: 20230416155852646 +modifier: soren +tags: +title: $:/sib/Templates/Automatic/TiddlerTypeIcon +type: text/vnd.tiddlywiki + + + + +<$list filter="[all[current]regexp[^Mr]]" variable=_> + + +<$list filter="[all[current]regexp[^Ms]]" variable=_> + + +<$list filter="[all[current]regexp[^The]]" variable=_> + + + + +<$list filter="[all[current]tag[Place]]" variable=_> + + + + +<$list filter="[all[current]tag[Source]]" variable=_> + + +<$list filter="[all[current]tag[Sink]]" variable=_> + + + + +<$list filter="[all[current]tag[Idea]]" variable=_> + + + + +<$list filter="[all[current]tag[Journal]]" variable=_> + + \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__sib_Templates_Automatic_TypeTagChecker.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/TypeTagChecker.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Templates_Automatic_TypeTagChecker.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/TypeTagChecker.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Templates_Automatic_Untitled.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/Untitled.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Templates_Automatic_Untitled.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/Untitled.tid diff --git a/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/UpdateStatus.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/UpdateStatus.tid new file mode 100644 index 0000000..8dcb69f --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/UpdateStatus.tid @@ -0,0 +1,40 @@ +created: 20230407023231664 +creator: soren +modified: 20230407025933910 +modifier: soren +tags: +title: $:/sib/Templates/Automatic/UpdateStatus +type: text/vnd.tiddlywiki + +\whitespace trim + +\define mark-ok() <$action-setfield $timestamp="no" reviewed=<>/> + + +<$list filter="[all[current]tag[Idea]]"> +  +<$wikify name="stale-date" text=""" +<$macrocall $name="dateadd" basedate=<> months="-6"/> +"""> +<$vars compareAgainst={{{ [{!!modified}split[]first[8]join[]max{!!reviewed}] }}}> + ( + <$list filter="[all[current]tag[Frozen]]"> + <$link to="UpdateStatuses"> + frozen + + + <$list filter="[all[current]!tag[Frozen]]"> + <$list filter="[compare:date:lt][all[current]tag[NeedsAttention]] [all[current]links[]match[TODO]]" emptyMessage="""<$link to="UpdateStatuses">maintained""" variable=_> + <$link to="UpdateStatuses"> + stale + + <$list filter=<> variable=_> + ;  + <$button class="tc-tiddlylink tc-btn-invisible" actions=<>>reup? + + + + ) + + + \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__sib_Templates_Automatic_ViewTemplateDescription.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/ViewTemplateDescription.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Templates_Automatic_ViewTemplateDescription.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Templates/Automatic/ViewTemplateDescription.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Templates_Export_SabbaticalUpdateCabCrosspost.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Export/SabbaticalUpdateCabCrosspost.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Templates_Export_SabbaticalUpdateCabCrosspost.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Templates/Export/SabbaticalUpdateCabCrosspost.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Templates_General_IdentityTemplate.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/General/IdentityTemplate.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Templates_General_IdentityTemplate.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Templates/General/IdentityTemplate.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Templates_TableColumns_BookRating.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/TableColumns/BookRating.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Templates_TableColumns_BookRating.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Templates/TableColumns/BookRating.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Templates_TableColumns_ThanksgivingDate.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/TableColumns/ThanksgivingDate.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Templates_TableColumns_ThanksgivingDate.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Templates/TableColumns/ThanksgivingDate.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Templates_Topical_AnkiPattern.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/AnkiPattern.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Templates_Topical_AnkiPattern.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/AnkiPattern.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Templates_Topical_AnkiPattern_Common.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/AnkiPattern/Common.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Templates_Topical_AnkiPattern_Common.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/AnkiPattern/Common.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Templates_Topical_AnkiPattern_Edit.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/AnkiPattern/Edit.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Templates_Topical_AnkiPattern_Edit.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/AnkiPattern/Edit.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Templates_Topical_AnkiPattern_View.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/AnkiPattern/View.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Templates_Topical_AnkiPattern_View.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/AnkiPattern/View.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Templates_Topical_BibliographyList.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/BibliographyList.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Templates_Topical_BibliographyList.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/BibliographyList.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Templates_Topical_Build2020SessionDetails.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/Build2020SessionDetails.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Templates_Topical_Build2020SessionDetails.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/Build2020SessionDetails.tid diff --git a/tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/DateSummaryStretch.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/DateSummaryStretch.tid new file mode 100644 index 0000000..34d1b98 --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/DateSummaryStretch.tid @@ -0,0 +1,9 @@ +created: 20230405210328425 +creator: soren +modified: 20230405212531511 +modifier: soren +tags: Public +title: $:/sib/Templates/Topical/DateSummaryStretch +type: text/vnd.tiddlywiki + +<$link to=<>><$text text={{{ [all[current]split[:]butfirst[]] }}}/>: {{!!ri-date-summary}} \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/JournalPersonPlaceExplorer.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/JournalPersonPlaceExplorer.tid new file mode 100644 index 0000000..f130e6a --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/JournalPersonPlaceExplorer.tid @@ -0,0 +1,40 @@ +created: 20230822195251601 +creator: soren +modified: 20230824171626606 +modifier: soren +tags: +title: $:/sib/Templates/Topical/JournalPersonPlaceExplorer +type: text/vnd.tiddlywiki + + + + + + + + + + +
    People + <$list filter="[all[current]links[]] [prefixlinks[]] +[tag[PAO]sort[]]"> + + <$link/> + + +
    Places + <$list filter="[all[current]links[]] [prefixlinks[]] +[tag[Place]sort[]]"> + + <$link/> + + +
    + + \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/JournalSubtiddlerStretch.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/JournalSubtiddlerStretch.tid new file mode 100644 index 0000000..3f2004e --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/JournalSubtiddlerStretch.tid @@ -0,0 +1,9 @@ +created: 20230405170908983 +creator: soren +modified: 20230405171146135 +modifier: soren +tags: Public +title: $:/sib/Templates/Topical/JournalSubtiddlerStretch +type: text/vnd.tiddlywiki + +<$link to=<>><$text text={{{ [all[current]get[caption]] ~[all[current]split[/]butfirst[]join[/]] }}}/> \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__sib_Templates_Topical_MaudWikiImport.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/MaudWikiImport.tid similarity index 64% rename from tzk/editions/tzk/tiddlers/$__sib_Templates_Topical_MaudWikiImport.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/MaudWikiImport.tid index 4fbfad1..5de9486 100644 --- a/tzk/editions/tzk/tiddlers/$__sib_Templates_Topical_MaudWikiImport.tid +++ b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/MaudWikiImport.tid @@ -1,9 +1,9 @@ created: 20200115233038885 creator: soren -modified: 20210825162901788 +modified: 20221129234135365 modifier: soren tags: title: $:/sib/Templates/Topical/MaudWikiImport type: text/vnd.tiddlywiki -//This article was originally part of MaudWiki.// \ No newline at end of file +//This tiddler was originally part of MaudWiki.// \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__sib_Templates_Topical_MinnesotaStateParkInfo.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/MinnesotaStateParkInfo.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Templates_Topical_MinnesotaStateParkInfo.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/MinnesotaStateParkInfo.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Templates_Topical_PublicHomepageTab.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/PublicHomepageTab.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Templates_Topical_PublicHomepageTab.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/PublicHomepageTab.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Templates_Topical_ReadingList_LargeTemplate.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/ReadingList/LargeTemplate.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Templates_Topical_ReadingList_LargeTemplate.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/ReadingList/LargeTemplate.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Templates_Topical_ReadingList_Rating.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/ReadingList/Rating.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Templates_Topical_ReadingList_Rating.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/ReadingList/Rating.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Templates_Topical_ReadingList_SmallTemplate.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/ReadingList/SmallTemplate.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Templates_Topical_ReadingList_SmallTemplate.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/ReadingList/SmallTemplate.tid diff --git a/tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/RiStatusLine.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/RiStatusLine.tid new file mode 100644 index 0000000..7a5ac0d --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/RiStatusLine.tid @@ -0,0 +1,9 @@ +created: 20230405223858862 +creator: soren +modified: 20230405224032570 +modifier: soren +tags: +title: $:/sib/Templates/Topical/RiStatusLine +type: text/vnd.tiddlywiki + +{{!!ri-outcome}} \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__sib_Templates_Topical_SabbaticalUpdates_DateNavigation.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/SabbaticalUpdates/DateNavigation.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Templates_Topical_SabbaticalUpdates_DateNavigation.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/SabbaticalUpdates/DateNavigation.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Templates_Topical_SabbaticalUpdates_ReadOnZettelkasten.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/SabbaticalUpdates/ReadOnZettelkasten.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Templates_Topical_SabbaticalUpdates_ReadOnZettelkasten.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/SabbaticalUpdates/ReadOnZettelkasten.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Templates_Topical_TitleDescriptionStretch.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/TitleDescriptionStretch.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Templates_Topical_TitleDescriptionStretch.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/TitleDescriptionStretch.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Templates_Topical_WhoIAmTab.tid b/tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/WhoIAmTab.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Templates_Topical_WhoIAmTab.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Templates/Topical/WhoIAmTab.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Tools.tid b/tzk/editions/tzk/tiddlers/_system/sib/Tools.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Tools.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Tools.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Tools_FeatureFlags.tid b/tzk/editions/tzk/tiddlers/_system/sib/Tools/FeatureFlags.tid similarity index 74% rename from tzk/editions/tzk/tiddlers/$__sib_Tools_FeatureFlags.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Tools/FeatureFlags.tid index aba25bc..10746bb 100644 --- a/tzk/editions/tzk/tiddlers/$__sib_Tools_FeatureFlags.tid +++ b/tzk/editions/tzk/tiddlers/_system/sib/Tools/FeatureFlags.tid @@ -1,7 +1,7 @@ created: 20210622001737586 creator: soren description: Selectively hide and show interface elements or other features. -modified: 20210920155749092 +modified: 20230407023023477 modifier: soren tags: Meta Tool Public title: $:/sib/Tools/FeatureFlags @@ -10,7 +10,7 @@ type: text/vnd.tiddlywiki Feature flags allow many elements of the wiki to be selectively enabled and disabled. Feature flags may be set to different values in the private and public editions of your wiki. -To add your own feature flag, create a new tiddler under `$:/config/zettelkasten/FeatureFlags` and setting its `caption` and `description` fields to the values you'd like to see in the table below. You can then check the feature flag's value using the [[ff macro|$:/sib/Macros/ff]]; see the macro's tiddler for an example. +To add your own feature flag, create a new tiddler under `$:/config/zettelkasten/FeatureFlags` and set its `caption` and `description` fields to the values you'd like to see in the table below. You can then check the feature flag's value using the [[ff macro|$:/sib/Macros/ff]]; see the macro's tiddler for an example. diff --git a/tzk/editions/tzk/tiddlers/$__sib_Tools_LowLinkTiddlers.tid b/tzk/editions/tzk/tiddlers/_system/sib/Tools/LowLinkTiddlers.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Tools_LowLinkTiddlers.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Tools/LowLinkTiddlers.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Tools_MissingPeople.tid b/tzk/editions/tzk/tiddlers/_system/sib/Tools/MissingPeople.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Tools_MissingPeople.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Tools/MissingPeople.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Tools_PaletteBrowser.tid b/tzk/editions/tzk/tiddlers/_system/sib/Tools/PaletteBrowser.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Tools_PaletteBrowser.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Tools/PaletteBrowser.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Tools_ReadingInbox.tid b/tzk/editions/tzk/tiddlers/_system/sib/Tools/ReadingInbox.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Tools_ReadingInbox.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Tools/ReadingInbox.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Tools_RelationshipValueTool.tid b/tzk/editions/tzk/tiddlers/_system/sib/Tools/RelationshipValueTool.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Tools_RelationshipValueTool.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Tools/RelationshipValueTool.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Tools_SmartOrphanList.tid b/tzk/editions/tzk/tiddlers/_system/sib/Tools/SmartOrphanList.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Tools_SmartOrphanList.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Tools/SmartOrphanList.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Tools_SmartOrphanList_Table.tid b/tzk/editions/tzk/tiddlers/_system/sib/Tools/SmartOrphanList/Table.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Tools_SmartOrphanList_Table.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Tools/SmartOrphanList/Table.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Tools_Statistics.tid b/tzk/editions/tzk/tiddlers/_system/sib/Tools/Statistics.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Tools_Statistics.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Tools/Statistics.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Tools_TagReplace.tid b/tzk/editions/tzk/tiddlers/_system/sib/Tools/TagReplace.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Tools_TagReplace.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Tools/TagReplace.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_Tools_Tray.tid b/tzk/editions/tzk/tiddlers/_system/sib/Tools/Tray.tid similarity index 88% rename from tzk/editions/tzk/tiddlers/$__sib_Tools_Tray.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Tools/Tray.tid index 5002a40..928fd69 100644 --- a/tzk/editions/tzk/tiddlers/$__sib_Tools_Tray.tid +++ b/tzk/editions/tzk/tiddlers/_system/sib/Tools/Tray.tid @@ -3,7 +3,7 @@ created: 20210701023215046 creator: soren description: Items we're currently working on but don't need to leave open. Drag and drop a link to a tiddler to add it. list: -modified: 20220716205827340 +modified: 20230912045100622 modifier: soren tags: Meta Tool title: $:/sib/Tools/Tray diff --git a/tzk/editions/tzk/tiddlers/$__sib_Tools_Tray_Template.tid b/tzk/editions/tzk/tiddlers/_system/sib/Tools/Tray/Template.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_Tools_Tray_Template.tid rename to tzk/editions/tzk/tiddlers/_system/sib/Tools/Tray/Template.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_gis_AddInfo.tid b/tzk/editions/tzk/tiddlers/_system/sib/gis/AddInfo.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_gis_AddInfo.tid rename to tzk/editions/tzk/tiddlers/_system/sib/gis/AddInfo.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_gis_DrivingDirections.tid b/tzk/editions/tzk/tiddlers/_system/sib/gis/DrivingDirections.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_gis_DrivingDirections.tid rename to tzk/editions/tzk/tiddlers/_system/sib/gis/DrivingDirections.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_gis_Info.tid b/tzk/editions/tzk/tiddlers/_system/sib/gis/Info.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_gis_Info.tid rename to tzk/editions/tzk/tiddlers/_system/sib/gis/Info.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_gis_MappingTools.tid b/tzk/editions/tzk/tiddlers/_system/sib/gis/MappingTools.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_gis_MappingTools.tid rename to tzk/editions/tzk/tiddlers/_system/sib/gis/MappingTools.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_gis_SatelliteMap.tid b/tzk/editions/tzk/tiddlers/_system/sib/gis/SatelliteMap.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_gis_SatelliteMap.tid rename to tzk/editions/tzk/tiddlers/_system/sib/gis/SatelliteMap.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_gui_KillPhrases.tid b/tzk/editions/tzk/tiddlers/_system/sib/gui/KillPhrases.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_gui_KillPhrases.tid rename to tzk/editions/tzk/tiddlers/_system/sib/gui/KillPhrases.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_gui_SidebarTabSelector.tid b/tzk/editions/tzk/tiddlers/_system/sib/gui/SidebarTabSelector.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_gui_SidebarTabSelector.tid rename to tzk/editions/tzk/tiddlers/_system/sib/gui/SidebarTabSelector.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_indite_ChildListItemTemplate.tid b/tzk/editions/tzk/tiddlers/_system/sib/indite/ChildListItemTemplate.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_indite_ChildListItemTemplate.tid rename to tzk/editions/tzk/tiddlers/_system/sib/indite/ChildListItemTemplate.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_indite_InditeChildren.tid b/tzk/editions/tzk/tiddlers/_system/sib/indite/InditeChildren.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_indite_InditeChildren.tid rename to tzk/editions/tzk/tiddlers/_system/sib/indite/InditeChildren.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_indite_Sidebar.tid b/tzk/editions/tzk/tiddlers/_system/sib/indite/Sidebar.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_indite_Sidebar.tid rename to tzk/editions/tzk/tiddlers/_system/sib/indite/Sidebar.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_indite_Stylesheet.tid b/tzk/editions/tzk/tiddlers/_system/sib/indite/Stylesheet.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_indite_Stylesheet.tid rename to tzk/editions/tzk/tiddlers/_system/sib/indite/Stylesheet.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_indite_ViewTemplate.tid b/tzk/editions/tzk/tiddlers/_system/sib/indite/ViewTemplate.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_indite_ViewTemplate.tid rename to tzk/editions/tzk/tiddlers/_system/sib/indite/ViewTemplate.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_indite_macros.tid b/tzk/editions/tzk/tiddlers/_system/sib/indite/macros.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_indite_macros.tid rename to tzk/editions/tzk/tiddlers/_system/sib/indite/macros.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_js_ListSubscriptionsWidget.js b/tzk/editions/tzk/tiddlers/_system/sib/js/ListSubscriptionsWidget.js similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_js_ListSubscriptionsWidget.js rename to tzk/editions/tzk/tiddlers/_system/sib/js/ListSubscriptionsWidget.js diff --git a/tzk/editions/tzk/tiddlers/$__sib_js_ListSubscriptionsWidget.js.meta b/tzk/editions/tzk/tiddlers/_system/sib/js/ListSubscriptionsWidget.js.meta similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_js_ListSubscriptionsWidget.js.meta rename to tzk/editions/tzk/tiddlers/_system/sib/js/ListSubscriptionsWidget.js.meta diff --git a/tzk/editions/tzk/tiddlers/$__sib_js_SendFeedbackWidget.js b/tzk/editions/tzk/tiddlers/_system/sib/js/SendFeedbackWidget.js similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_js_SendFeedbackWidget.js rename to tzk/editions/tzk/tiddlers/_system/sib/js/SendFeedbackWidget.js diff --git a/tzk/editions/tzk/tiddlers/$__sib_js_SendFeedbackWidget.js.meta b/tzk/editions/tzk/tiddlers/_system/sib/js/SendFeedbackWidget.js.meta similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_js_SendFeedbackWidget.js.meta rename to tzk/editions/tzk/tiddlers/_system/sib/js/SendFeedbackWidget.js.meta diff --git a/tzk/editions/tzk/tiddlers/$__sib_js_SubscriptionManagementWidget.js b/tzk/editions/tzk/tiddlers/_system/sib/js/SubscriptionManagementWidget.js similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_js_SubscriptionManagementWidget.js rename to tzk/editions/tzk/tiddlers/_system/sib/js/SubscriptionManagementWidget.js diff --git a/tzk/editions/tzk/tiddlers/$__sib_js_SubscriptionManagementWidget.js.meta b/tzk/editions/tzk/tiddlers/_system/sib/js/SubscriptionManagementWidget.js.meta similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_js_SubscriptionManagementWidget.js.meta rename to tzk/editions/tzk/tiddlers/_system/sib/js/SubscriptionManagementWidget.js.meta diff --git a/tzk/editions/tzk/tiddlers/_system/sib/js/dateadd.js b/tzk/editions/tzk/tiddlers/_system/sib/js/dateadd.js new file mode 100644 index 0000000..470271d --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/sib/js/dateadd.js @@ -0,0 +1,64 @@ +/*\ +title: $:/plugins/sobjornstad/TakeAway/dateadd.js +type: application/javascript +module-type: macro + +Courtesy of stobot, adapted from Jed Carty: +https://groups.google.com/g/tiddlywiki/c/y_GjM302u60/m/u_aZ6GhEBwAJ +http://inmysocks.tiddlyspot.com/#$:/inmysocks/macros/add-time.js + +Takes a base date and adds days, months or years + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +/* +Information about this macro +*/ + +exports.name = "dateadd"; + +exports.params = [ + {name: "basedate"}, + {name: "days"}, + {name: "months"}, + {name: "years"}, + {name: "template"} +]; + +/* +Run the macro +*/ +exports.run = function(basedate, days, months, years, template) { + + //Make each date object. + + if (basedate === "") { + var newdate = new Date(); + } else { + var baseyear = basedate.substr(0,4); + var basemonth = basedate.substr(4,2); + var baseday = basedate.substr(6,2); + var newdate = new Date(Number(baseyear), Number(basemonth)-1, Number(baseday), 0, 0, 0); + } + + var new_year = Number(newdate.getFullYear())+Number(years); + var new_month = Number(newdate.getMonth())+Number(months); + var new_day = Number(newdate.getDate())+Number(days); + + var output_date = new Date(new_year, new_month, new_day, 0, 0, 0); + + var result = (output_date.getFullYear()*10000) + ((output_date.getMonth()+1)*100) + (output_date.getDate()); + + if(template === ""){ + return result; + } else { + return $tw.utils.formatDateString(output_date,template); + } +}; + +})(); \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/_system/sib/js/dateadd.js.meta b/tzk/editions/tzk/tiddlers/_system/sib/js/dateadd.js.meta new file mode 100644 index 0000000..c71d234 --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/sib/js/dateadd.js.meta @@ -0,0 +1,8 @@ +created: 20230407020448179 +creator: soren +modified: 20230407020523536 +modifier: soren +module-type: macro +tags: +title: $:/sib/js/dateadd.js +type: application/javascript \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__sib_js_excise-private-chunk.js b/tzk/editions/tzk/tiddlers/_system/sib/js/excise-private-chunk.js similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_js_excise-private-chunk.js rename to tzk/editions/tzk/tiddlers/_system/sib/js/excise-private-chunk.js diff --git a/tzk/editions/tzk/tiddlers/$__sib_js_excise-private-chunk.js.meta b/tzk/editions/tzk/tiddlers/_system/sib/js/excise-private-chunk.js.meta similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_js_excise-private-chunk.js.meta rename to tzk/editions/tzk/tiddlers/_system/sib/js/excise-private-chunk.js.meta diff --git a/tzk/editions/tzk/tiddlers/$__sib_js_thirdparty_TiddlyTools_Time_action-timeout.js b/tzk/editions/tzk/tiddlers/_system/sib/js/thirdparty/TiddlyTools/Time/action-timeout.js similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_js_thirdparty_TiddlyTools_Time_action-timeout.js rename to tzk/editions/tzk/tiddlers/_system/sib/js/thirdparty/TiddlyTools/Time/action-timeout.js diff --git a/tzk/editions/tzk/tiddlers/$__sib_js_thirdparty_TiddlyTools_Time_action-timeout.js.meta b/tzk/editions/tzk/tiddlers/_system/sib/js/thirdparty/TiddlyTools/Time/action-timeout.js.meta similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_js_thirdparty_TiddlyTools_Time_action-timeout.js.meta rename to tzk/editions/tzk/tiddlers/_system/sib/js/thirdparty/TiddlyTools/Time/action-timeout.js.meta diff --git a/tzk/editions/tzk/tiddlers/$__sib_refexplorer_All.tid b/tzk/editions/tzk/tiddlers/_system/sib/refexplorer/All.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_refexplorer_All.tid rename to tzk/editions/tzk/tiddlers/_system/sib/refexplorer/All.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_refexplorer_Footnotes.tid b/tzk/editions/tzk/tiddlers/_system/sib/refexplorer/Footnotes.tid similarity index 92% rename from tzk/editions/tzk/tiddlers/$__sib_refexplorer_Footnotes.tid rename to tzk/editions/tzk/tiddlers/_system/sib/refexplorer/Footnotes.tid index 6555a93..087d2ec 100644 --- a/tzk/editions/tzk/tiddlers/$__sib_refexplorer_Footnotes.tid +++ b/tzk/editions/tzk/tiddlers/_system/sib/refexplorer/Footnotes.tid @@ -1,7 +1,8 @@ caption: Footnotes condition: [search[fnote]] created: 20210719234943395 -modified: 20210825191857601 +creator: soren +modified: 20230822144835533 modifier: soren tags: $:/tags/ReferenceExplorerTab title: $:/sib/refexplorer/Footnotes @@ -42,7 +43,7 @@ type: text/vnd.tiddlywiki \define showfnotes(filter:"[]", title:"Empty" class:"fnote-list", emptyMessage:"") <$vars leftDelimiter="< -<$list filter="[subfilter<__filter__>search:text:literallimit[1]]" variable=null emptyMessage=<<__emptyMessage__>> > +<$list filter="[subfilter<__filter__>search:text:regexplimit[1]]" variable=null emptyMessage=<<__emptyMessage__>> > <$reveal tag="div" type="nomatch" default="Empty" text=<<__title__>> >

    $title$

    diff --git a/tzk/editions/tzk/tiddlers/_system/sib/refexplorer/GlobalJournalSubtiddlerFilter.tid b/tzk/editions/tzk/tiddlers/_system/sib/refexplorer/GlobalJournalSubtiddlerFilter.tid new file mode 100644 index 0000000..16fc652 --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/sib/refexplorer/GlobalJournalSubtiddlerFilter.tid @@ -0,0 +1,11 @@ +caption: Footnotes +condition: [search[fnote]] +created: 20230405172618948 +creator: soren +modified: 20230405212029685 +modifier: soren +tags: +title: $:/sib/refexplorer/GlobalJournalSubtiddlerFilter +type: text/vnd.tiddlywiki + +\define global-journal-subtiddler-filter() [tag[Journal]] [tag[Date]] [split[/]first[]tag[Journal]] [split[/]first[]tag[Date]] \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__sib_refexplorer_Ideas.tid b/tzk/editions/tzk/tiddlers/_system/sib/refexplorer/Ideas.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_refexplorer_Ideas.tid rename to tzk/editions/tzk/tiddlers/_system/sib/refexplorer/Ideas.tid diff --git a/tzk/editions/tzk/tiddlers/_system/sib/refexplorer/Journal.tid b/tzk/editions/tzk/tiddlers/_system/sib/refexplorer/Journal.tid new file mode 100644 index 0000000..67d38a0 --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/sib/refexplorer/Journal.tid @@ -0,0 +1,35 @@ +caption: Journal +condition: [backlinks[]] [links[]] [tagging[]] +[filter!titlesort[]] +created: 20221205033543222 +creator: soren +modified: 20230405175054303 +modifier: soren +tags: $:/tags/ReferenceExplorerTab +title: $:/sib/refexplorer/Journal +type: text/vnd.tiddlywiki + +\import [[$:/sib/refexplorer/GlobalJournalSubtiddlerFilter]] + +
    + + + + + + + + + + + <$list filter={{$:/sib/refexplorer/Journal!!condition}}> + <$vars currentRecord=<> thisTooltip={{{ [all[current]get[description]!is[blank]] ~[all[current]get[text]split[ ]first[100]join[ ]addsuffix[...]] }}}> + + + {{$:/sib/refexplorer/LinkTypeTemplate}} + + + + + + +
    Journal Explorer
    TitleTypeTagsModified
    <$link to={{!!title}} tooltip=<> style="color: white;"/><$list filter="[all[current]tags[]sort[]]"><$macrocall $name="tag-pill" tag=<>/><$view field="modified" format="date" template="YYYY-0MM-0DD 0hh:0ss"/>
    diff --git a/tzk/editions/tzk/tiddlers/$__sib_refexplorer_LinkGraph.tid b/tzk/editions/tzk/tiddlers/_system/sib/refexplorer/LinkGraph.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_refexplorer_LinkGraph.tid rename to tzk/editions/tzk/tiddlers/_system/sib/refexplorer/LinkGraph.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_refexplorer_LinkTypeTemplate.tid b/tzk/editions/tzk/tiddlers/_system/sib/refexplorer/LinkTypeTemplate.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_refexplorer_LinkTypeTemplate.tid rename to tzk/editions/tzk/tiddlers/_system/sib/refexplorer/LinkTypeTemplate.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_refexplorer_PAO.tid b/tzk/editions/tzk/tiddlers/_system/sib/refexplorer/PAO.tid similarity index 89% rename from tzk/editions/tzk/tiddlers/$__sib_refexplorer_PAO.tid rename to tzk/editions/tzk/tiddlers/_system/sib/refexplorer/PAO.tid index c35c8d5..34703e0 100644 --- a/tzk/editions/tzk/tiddlers/$__sib_refexplorer_PAO.tid +++ b/tzk/editions/tzk/tiddlers/_system/sib/refexplorer/PAO.tid @@ -1,8 +1,8 @@ caption: People -condition: [backlinks[]] [links[]] [tagging[]] +[tag[PAO]sort[]] +condition: [backlinks[]] [links[]] [tagging[]] [get[people]enlist-input[]] +[tag[PAO]sort[]] created: 20200321230153705 creator: soren -modified: 20210825191857631 +modified: 20230912034601550 modifier: soren tags: $:/tags/ReferenceExplorerTab title: $:/sib/refexplorer/PAO diff --git a/tzk/editions/tzk/tiddlers/$__sib_refexplorer_Places.tid b/tzk/editions/tzk/tiddlers/_system/sib/refexplorer/Places.tid similarity index 89% rename from tzk/editions/tzk/tiddlers/$__sib_refexplorer_Places.tid rename to tzk/editions/tzk/tiddlers/_system/sib/refexplorer/Places.tid index fdc2930..aaeff17 100644 --- a/tzk/editions/tzk/tiddlers/$__sib_refexplorer_Places.tid +++ b/tzk/editions/tzk/tiddlers/_system/sib/refexplorer/Places.tid @@ -1,8 +1,8 @@ caption: Places -condition: [backlinks[]] [links[]] [tagging[]] +[tag[Place]sort[]] +condition: [backlinks[]] [links[]] [tagging[]] [get[places]enlist-input[]] +[tag[Place]sort[]] created: 20200329145138606 creator: soren -modified: 20210825191857644 +modified: 20230912034635843 modifier: soren tags: $:/tags/ReferenceExplorerTab title: $:/sib/refexplorer/Places diff --git a/tzk/editions/tzk/tiddlers/_system/sib/refexplorer/RT.tid b/tzk/editions/tzk/tiddlers/_system/sib/refexplorer/RT.tid new file mode 100644 index 0000000..a33dea4 --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/sib/refexplorer/RT.tid @@ -0,0 +1,55 @@ +caption: RT +condition: [{$:/RtLinks}jsonextract] +created: 20230416184506246 +creator: soren +modified: 20230416230221470 +modifier: soren +tags: $:/tags/ReferenceExplorerTab +title: $:/sib/refexplorer/RT +type: text/vnd.tiddlywiki + + + + + + + + + + + + <$list filter={{$:/sib/refexplorer/RT!!condition}} variable=linksfor> + <$list filter="[jsonindexes[]]" variable="index"> + <$vars rt-id={{{ [jsonextractjsonget[id]]}}}> + + + + + + + + + +
    Random Thoughts Explorer
    IndexContentCreated
    + ] }}}><$text text=<>/> + + + <$vars linksfor={{{ [{$:/RtLinks}jsonextract] }}}> + <$codeblock code={{{ [jsonextractjsonget[text]trim[]] }}}/> + + + <$text text={{{ [jsonextractjsonget[created_date]] }}}/> +
    + + + + \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__sib_refexplorer_ReferenceExplorer.tid b/tzk/editions/tzk/tiddlers/_system/sib/refexplorer/ReferenceExplorer.tid similarity index 96% rename from tzk/editions/tzk/tiddlers/$__sib_refexplorer_ReferenceExplorer.tid rename to tzk/editions/tzk/tiddlers/_system/sib/refexplorer/ReferenceExplorer.tid index 59b5ec3..c5962f7 100644 --- a/tzk/editions/tzk/tiddlers/$__sib_refexplorer_ReferenceExplorer.tid +++ b/tzk/editions/tzk/tiddlers/_system/sib/refexplorer/ReferenceExplorer.tid @@ -1,13 +1,15 @@ created: 20200321225156394 creator: soren description: Display the Reference Explorer, a table that shows related topics, for the current tiddler. -modified: 20210920193434935 +modified: 20230405175127650 modifier: soren tags: $:/tags/ViewTemplate title: $:/sib/refexplorer/ReferenceExplorer transcludedin: All non-system tiddlers. type: text/vnd.tiddlywiki +\import [[$:/sib/refexplorer/GlobalJournalSubtiddlerFilter]] + \define ref-explorer() <$set name="tabList" value={{{ [tag[$:/tags/ReferenceExplorerTab]] :reduce[subfilter{!!condition}thenaddprefix[ ]addprefix] }}}> <$set name="myDefaultTab" value={{{ [has[refexplorer-starttab]get[refexplorer-starttab]addprefix[$:/sib/refexplorer/]] ~[enlistfirst[]] }}}> @@ -81,4 +83,4 @@ type: text/vnd.tiddlywiki - \ No newline at end of file + diff --git a/tzk/editions/tzk/tiddlers/$__sib_refexplorer_Sinks.tid b/tzk/editions/tzk/tiddlers/_system/sib/refexplorer/Sinks.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_refexplorer_Sinks.tid rename to tzk/editions/tzk/tiddlers/_system/sib/refexplorer/Sinks.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_refexplorer_Sources.tid b/tzk/editions/tzk/tiddlers/_system/sib/refexplorer/Sources.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_refexplorer_Sources.tid rename to tzk/editions/tzk/tiddlers/_system/sib/refexplorer/Sources.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_refexplorer_Subtiddlers.tid b/tzk/editions/tzk/tiddlers/_system/sib/refexplorer/Subtiddlers.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_refexplorer_Subtiddlers.tid rename to tzk/editions/tzk/tiddlers/_system/sib/refexplorer/Subtiddlers.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_styles_FourColMode.css b/tzk/editions/tzk/tiddlers/_system/sib/styles/FourColMode.css similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_styles_FourColMode.css rename to tzk/editions/tzk/tiddlers/_system/sib/styles/FourColMode.css diff --git a/tzk/editions/tzk/tiddlers/$__sib_styles_FourColMode.css.meta b/tzk/editions/tzk/tiddlers/_system/sib/styles/FourColMode.css.meta similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_styles_FourColMode.css.meta rename to tzk/editions/tzk/tiddlers/_system/sib/styles/FourColMode.css.meta diff --git a/tzk/editions/tzk/tiddlers/$__sib_styles_GeneralStyles.tid b/tzk/editions/tzk/tiddlers/_system/sib/styles/GeneralStyles.tid similarity index 89% rename from tzk/editions/tzk/tiddlers/$__sib_styles_GeneralStyles.tid rename to tzk/editions/tzk/tiddlers/_system/sib/styles/GeneralStyles.tid index 1cab74b..17fccba 100644 --- a/tzk/editions/tzk/tiddlers/$__sib_styles_GeneralStyles.tid +++ b/tzk/editions/tzk/tiddlers/_system/sib/styles/GeneralStyles.tid @@ -1,6 +1,6 @@ created: 20201121015759457 creator: soren -modified: 20210920193138900 +modified: 20230416220340477 modifier: soren tags: $:/tags/Stylesheet title: $:/sib/styles/GeneralStyles @@ -56,4 +56,9 @@ type: text/vnd.tiddlywiki margin-left: 0px; border: 1px solid rgba(0, 0, 0, 0.2); display: inline-block; +} + +.rt-fake-codeblock pre { + background-color: unset; + border: unset; } \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__sib_styles_OpenTopBar.tid b/tzk/editions/tzk/tiddlers/_system/sib/styles/OpenTopBar.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_styles_OpenTopBar.tid rename to tzk/editions/tzk/tiddlers/_system/sib/styles/OpenTopBar.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_styles_Publicity.tid b/tzk/editions/tzk/tiddlers/_system/sib/styles/Publicity.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_styles_Publicity.tid rename to tzk/editions/tzk/tiddlers/_system/sib/styles/Publicity.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_styles_ReferenceExplorer.tid b/tzk/editions/tzk/tiddlers/_system/sib/styles/ReferenceExplorer.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_styles_ReferenceExplorer.tid rename to tzk/editions/tzk/tiddlers/_system/sib/styles/ReferenceExplorer.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_styles_Subtitle.tid b/tzk/editions/tzk/tiddlers/_system/sib/styles/Subtitle.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_styles_Subtitle.tid rename to tzk/editions/tzk/tiddlers/_system/sib/styles/Subtitle.tid diff --git a/tzk/editions/tzk/tiddlers/$__sib_styles_body.tid b/tzk/editions/tzk/tiddlers/_system/sib/styles/body.tid similarity index 88% rename from tzk/editions/tzk/tiddlers/$__sib_styles_body.tid rename to tzk/editions/tzk/tiddlers/_system/sib/styles/body.tid index 709eb19..29bf4b7 100644 --- a/tzk/editions/tzk/tiddlers/$__sib_styles_body.tid +++ b/tzk/editions/tzk/tiddlers/_system/sib/styles/body.tid @@ -1,6 +1,6 @@ created: 20210615030339909 creator: soren -modified: 20210917203545404 +modified: 20230416141202623 modifier: soren tags: $:/tags/Stylesheet title: $:/sib/styles/body @@ -30,6 +30,13 @@ div[data-tiddler-title*="LifetimeReading"] { max-width: 90em; } +div[data-tags*="Wide"] div.tc-tiddler-body { + max-width: 100%; +} +div[data-tags*="Wide"] { + max-width: 75em; +} + div.tc-tiddler-preview-preview { width: 29%; } diff --git a/tzk/editions/tzk/tiddlers/$__sib_styles_footnote.tid b/tzk/editions/tzk/tiddlers/_system/sib/styles/footnote.tid similarity index 95% rename from tzk/editions/tzk/tiddlers/$__sib_styles_footnote.tid rename to tzk/editions/tzk/tiddlers/_system/sib/styles/footnote.tid index 7d36e07..fd3c048 100644 --- a/tzk/editions/tzk/tiddlers/$__sib_styles_footnote.tid +++ b/tzk/editions/tzk/tiddlers/_system/sib/styles/footnote.tid @@ -1,6 +1,6 @@ created: 20210719234124096 creator: soren -modified: 20211025140658570 +modified: 20230822142939467 modifier: soren tags: $:/tags/Stylesheet title: $:/sib/styles/footnote @@ -9,7 +9,7 @@ type: text/vnd.tiddlywiki /* Based on https://kookma.github.io/TW-Refnotes/. Copyright (c) 2019--2021 Mohammad Rahmani. -Copyright (c) 2021 Soren Bjornstad. +Copyright (c) 2021, 2023 Soren Bjornstad. 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: @@ -35,6 +35,9 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI margin-left: 0em; color: yellow; } +.refnotes-footnote.refnotes-update:after { + color: deepskyblue; +} /* tooltip class used for ref, fnote and other macros */ @@ -66,7 +69,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI /* Position the tooltip */ position: absolute; - z-index: 1; + z-index: 9999; bottom: 100%; left: 50%; margin-left: -40px; diff --git a/tzk/editions/tzk/tiddlers/$__sib_styles_hr.tid b/tzk/editions/tzk/tiddlers/_system/sib/styles/hr.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__sib_styles_hr.tid rename to tzk/editions/tzk/tiddlers/_system/sib/styles/hr.tid diff --git a/tzk/editions/tzk/tiddlers/$__status_RequireReloadDueToPluginChange.tid b/tzk/editions/tzk/tiddlers/_system/status/RequireReloadDueToPluginChange.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__status_RequireReloadDueToPluginChange.tid rename to tzk/editions/tzk/tiddlers/_system/status/RequireReloadDueToPluginChange.tid diff --git a/tzk/editions/tzk/tiddlers/$__tags_EditTemplate.tid b/tzk/editions/tzk/tiddlers/_system/tags/EditTemplate.tid similarity index 56% rename from tzk/editions/tzk/tiddlers/$__tags_EditTemplate.tid rename to tzk/editions/tzk/tiddlers/_system/tags/EditTemplate.tid index 4d415e1..d1b41b3 100644 --- a/tzk/editions/tzk/tiddlers/$__tags_EditTemplate.tid +++ b/tzk/editions/tzk/tiddlers/_system/tags/EditTemplate.tid @@ -1,5 +1,7 @@ created: 20201204132628163 -list: $:/core/ui/EditTemplate/controls $:/sib/Templates/Automatic/Publicity/EditorPublicLine $:/sib/Templates/Automatic/Publicity/LevelDisplay $:/core/ui/EditTemplate/title $:/plugins/bimlas/locator/edit-template/locator-references $:/sib/Templates/Automatic/MissingTiddlerCreationNotification $:/core/ui/EditTemplate/tags $:/core/ui/EditTemplate/shadow $:/core/ui/ViewTemplate/classic $:/core/ui/EditTemplate/body $:/core/ui/EditTemplate/type $:/core/ui/EditTemplate/fields -modified: 20210522015314483 +creator: soren +list: $:/core/ui/EditTemplate/controls $:/sib/Templates/Automatic/Publicity/EditorPublicLine $:/sib/Templates/Automatic/Publicity/LevelDisplay $:/core/ui/EditTemplate/title $:/plugins/bimlas/locator/edit-template/locator-references $:/sib/Templates/Automatic/MissingTiddlerCreationNotification $:/core/ui/EditTemplate/tags $:/sib/Templates/Automatic/FrozenTiddlerEditWarning $:/core/ui/EditTemplate/shadow $:/core/ui/ViewTemplate/classic $:/core/ui/EditTemplate/body $:/core/ui/EditTemplate/type $:/core/ui/EditTemplate/fields +modified: 20230407030929691 +modifier: soren title: $:/tags/EditTemplate type: text/vnd.tiddlywiki \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__tags_EditorToolbar.tid b/tzk/editions/tzk/tiddlers/_system/tags/EditorToolbar.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__tags_EditorToolbar.tid rename to tzk/editions/tzk/tiddlers/_system/tags/EditorToolbar.tid diff --git a/tzk/editions/tzk/tiddlers/$__tags_PageTemplate.tid b/tzk/editions/tzk/tiddlers/_system/tags/PageTemplate.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__tags_PageTemplate.tid rename to tzk/editions/tzk/tiddlers/_system/tags/PageTemplate.tid diff --git a/tzk/editions/tzk/tiddlers/$__tags_ReferenceExplorerTab.tid b/tzk/editions/tzk/tiddlers/_system/tags/ReferenceExplorerTab.tid similarity index 50% rename from tzk/editions/tzk/tiddlers/$__tags_ReferenceExplorerTab.tid rename to tzk/editions/tzk/tiddlers/_system/tags/ReferenceExplorerTab.tid index 299c8a3..fd3fc0a 100644 --- a/tzk/editions/tzk/tiddlers/$__tags_ReferenceExplorerTab.tid +++ b/tzk/editions/tzk/tiddlers/_system/tags/ReferenceExplorerTab.tid @@ -1,7 +1,7 @@ created: 20200329153524761 creator: soren -list: $:/sib/refexplorer/Ideas $:/sib/refexplorer/PAO $:/sib/refexplorer/Places $:/sib/refexplorer/Sources $:/sib/refexplorer/Sinks $:/sib/refexplorer/Indexes $:/sib/refexplorer/Subtiddlers $:/sib/refexplorer/LinkGraph $:/sib/refexplorer/Footnotes $:/sib/refexplorer/All -modified: 20210825191857696 +list: $:/sib/refexplorer/Ideas $:/sib/refexplorer/PAO $:/sib/refexplorer/Places $:/sib/refexplorer/Sources $:/sib/refexplorer/Sinks $:/sib/refexplorer/Journal $:/sib/refexplorer/RT $:/sib/refexplorer/Subtiddlers $:/sib/refexplorer/LinkGraph $:/sib/refexplorer/Footnotes $:/sib/refexplorer/All +modified: 20230416185240659 modifier: soren title: $:/tags/ReferenceExplorerTab type: text/vnd.tiddlywiki \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__tags_SideBar.tid b/tzk/editions/tzk/tiddlers/_system/tags/SideBar.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__tags_SideBar.tid rename to tzk/editions/tzk/tiddlers/_system/tags/SideBar.tid diff --git a/tzk/editions/tzk/tiddlers/$__tags_Stylesheet.tid b/tzk/editions/tzk/tiddlers/_system/tags/Stylesheet.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__tags_Stylesheet.tid rename to tzk/editions/tzk/tiddlers/_system/tags/Stylesheet.tid diff --git a/tzk/editions/tzk/tiddlers/_system/tags/ViewTemplate.tid b/tzk/editions/tzk/tiddlers/_system/tags/ViewTemplate.tid new file mode 100644 index 0000000..c753234 --- /dev/null +++ b/tzk/editions/tzk/tiddlers/_system/tags/ViewTemplate.tid @@ -0,0 +1,7 @@ +created: 20201129183705439 +creator: soren +list: $:/core/ui/ViewTemplate/title $:/core/ui/ViewTemplate/unfold $:/core/ui/ViewTemplate/subtitle $:/sib/EpistemicStatus/Display $:/sib/MediaRating/Display $:/core/ui/ViewTemplate/tags $:/core/ui/ViewTemplate/classic $:/sib/Templates/Automatic/CheckpointList $:/sib/Templates/Automatic/JournalNavigation $:/sib/Templates/Automatic/Subtiddler $:/sib/Templates/Automatic/TypeTagChecker $:/sib/Templates/Automatic/SpoilerBanner $:/sib/Templates/Automatic/Untitled $:/sib/Templates/Automatic/PrivateChunkParentNotice $:/sib/Templates/Automatic/Source $:/sib/Templates/Topical/MinnesotaStateParkInfo $:/sib/Templates/Automatic/MacroDescription $:/sib/Templates/Automatic/Date $:/core/ui/ViewTemplate/body $:/sib/Templates/Automatic/RomanticInterest $:/sib/Templates/Automatic/MissingTiddlerQuickCreate $:/sib/indite/ViewTemplate $:/sib/Reviewer/SchedulableTemplate $:/sib/Templates/Automatic/Event $:/sib/gis/MappingTools $:/sib/Templates/Topical/SabbaticalUpdates/DateNavigation $:/sib/Templates/Automatic/Publicity/ViewerPublicLine $:/plugins/danielo515/2click2edit/ui/ViewTemplate $:/sib/refexplorer/ReferenceExplorer $:/sib/Templates/Automatic/ViewTemplateDescription $:/sib/Templates/Automatic/ReaderActions $:/plugins/mklauber/aliases/footer +modified: 20230912034410071 +modifier: soren +title: $:/tags/ViewTemplate +type: text/vnd.tiddlywiki \ No newline at end of file diff --git a/tzk/editions/tzk/tiddlers/$__theme.tid b/tzk/editions/tzk/tiddlers/_system/theme.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__theme.tid rename to tzk/editions/tzk/tiddlers/_system/theme.tid diff --git a/tzk/editions/tzk/tiddlers/$__themes_tiddlywiki_vanilla_metrics_bodyfontsize.tid b/tzk/editions/tzk/tiddlers/_system/themes/tiddlywiki/vanilla/metrics/bodyfontsize.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__themes_tiddlywiki_vanilla_metrics_bodyfontsize.tid rename to tzk/editions/tzk/tiddlers/_system/themes/tiddlywiki/vanilla/metrics/bodyfontsize.tid diff --git a/tzk/editions/tzk/tiddlers/$__themes_tiddlywiki_vanilla_metrics_sidebarbreakpoint.tid b/tzk/editions/tzk/tiddlers/_system/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__themes_tiddlywiki_vanilla_metrics_sidebarbreakpoint.tid rename to tzk/editions/tzk/tiddlers/_system/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint.tid diff --git a/tzk/editions/tzk/tiddlers/$__themes_tiddlywiki_vanilla_metrics_sidebarwidth.tid b/tzk/editions/tzk/tiddlers/_system/themes/tiddlywiki/vanilla/metrics/sidebarwidth.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__themes_tiddlywiki_vanilla_metrics_sidebarwidth.tid rename to tzk/editions/tzk/tiddlers/_system/themes/tiddlywiki/vanilla/metrics/sidebarwidth.tid diff --git a/tzk/editions/tzk/tiddlers/$__themes_tiddlywiki_vanilla_metrics_storyright.tid b/tzk/editions/tzk/tiddlers/_system/themes/tiddlywiki/vanilla/metrics/storyright.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__themes_tiddlywiki_vanilla_metrics_storyright.tid rename to tzk/editions/tzk/tiddlers/_system/themes/tiddlywiki/vanilla/metrics/storyright.tid diff --git a/tzk/editions/tzk/tiddlers/$__themes_tiddlywiki_vanilla_metrics_storywidth.tid b/tzk/editions/tzk/tiddlers/_system/themes/tiddlywiki/vanilla/metrics/storywidth.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__themes_tiddlywiki_vanilla_metrics_storywidth.tid rename to tzk/editions/tzk/tiddlers/_system/themes/tiddlywiki/vanilla/metrics/storywidth.tid diff --git a/tzk/editions/tzk/tiddlers/$__themes_tiddlywiki_vanilla_metrics_tiddlerwidth.tid b/tzk/editions/tzk/tiddlers/_system/themes/tiddlywiki/vanilla/metrics/tiddlerwidth.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__themes_tiddlywiki_vanilla_metrics_tiddlerwidth.tid rename to tzk/editions/tzk/tiddlers/_system/themes/tiddlywiki/vanilla/metrics/tiddlerwidth.tid diff --git a/tzk/editions/tzk/tiddlers/$__themes_tiddlywiki_vanilla_options_sidebarlayout.tid b/tzk/editions/tzk/tiddlers/_system/themes/tiddlywiki/vanilla/options/sidebarlayout.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__themes_tiddlywiki_vanilla_options_sidebarlayout.tid rename to tzk/editions/tzk/tiddlers/_system/themes/tiddlywiki/vanilla/options/sidebarlayout.tid diff --git a/tzk/editions/tzk/tiddlers/$__themes_tiddlywiki_vanilla_options_stickytitles.tid b/tzk/editions/tzk/tiddlers/_system/themes/tiddlywiki/vanilla/options/stickytitles.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__themes_tiddlywiki_vanilla_options_stickytitles.tid rename to tzk/editions/tzk/tiddlers/_system/themes/tiddlywiki/vanilla/options/stickytitles.tid diff --git a/tzk/editions/tzk/tiddlers/$__themes_tiddlywiki_vanilla_settings_backgroundimage.tid b/tzk/editions/tzk/tiddlers/_system/themes/tiddlywiki/vanilla/settings/backgroundimage.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__themes_tiddlywiki_vanilla_settings_backgroundimage.tid rename to tzk/editions/tzk/tiddlers/_system/themes/tiddlywiki/vanilla/settings/backgroundimage.tid diff --git a/tzk/editions/tzk/tiddlers/$__themes_tiddlywiki_vanilla_settings_codefontfamily.tid b/tzk/editions/tzk/tiddlers/_system/themes/tiddlywiki/vanilla/settings/codefontfamily.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__themes_tiddlywiki_vanilla_settings_codefontfamily.tid rename to tzk/editions/tzk/tiddlers/_system/themes/tiddlywiki/vanilla/settings/codefontfamily.tid diff --git a/tzk/editions/tzk/tiddlers/$__themes_tiddlywiki_vanilla_settings_editorfontfamily.tid b/tzk/editions/tzk/tiddlers/_system/themes/tiddlywiki/vanilla/settings/editorfontfamily.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__themes_tiddlywiki_vanilla_settings_editorfontfamily.tid rename to tzk/editions/tzk/tiddlers/_system/themes/tiddlywiki/vanilla/settings/editorfontfamily.tid diff --git a/tzk/editions/tzk/tiddlers/$__themes_tiddlywiki_vanilla_settings_fontfamily.tid b/tzk/editions/tzk/tiddlers/_system/themes/tiddlywiki/vanilla/settings/fontfamily.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__themes_tiddlywiki_vanilla_settings_fontfamily.tid rename to tzk/editions/tzk/tiddlers/_system/themes/tiddlywiki/vanilla/settings/fontfamily.tid diff --git a/tzk/editions/tzk/tiddlers/$__themes_tiddlywiki_vanilla_sticky.tid b/tzk/editions/tzk/tiddlers/_system/themes/tiddlywiki/vanilla/sticky.tid similarity index 100% rename from tzk/editions/tzk/tiddlers/$__themes_tiddlywiki_vanilla_sticky.tid rename to tzk/editions/tzk/tiddlers/_system/themes/tiddlywiki/vanilla/sticky.tid diff --git a/tzk/editions/tzk/tiddlywiki.info b/tzk/editions/tzk/tiddlywiki.info index 5ddcaca..e1810f9 100644 --- a/tzk/editions/tzk/tiddlywiki.info +++ b/tzk/editions/tzk/tiddlywiki.info @@ -9,8 +9,8 @@ "tiddlywiki/katex" ], "themes": [ - "tiddlywiki/vanilla", - "tiddlywiki/snowwhite" + "tiddlywiki/snowwhite", + "tiddlywiki/vanilla" ], "description": "TiddlyZettelKasten (tzk) edition" } \ No newline at end of file