bump version

Better for people to set up their own scheme if they want one, and it
avoids tiddlers potentially being in two different places (since
FileSystemPaths isn't honored during an init/savewikifolder).

RELEASING.md

@@ -5,7 +5,7 @@
 2. Update version numbers:
    `setup.py`,
    `cli_docs/conf.py`,
-   `util.py`.
+   `tzk/util.py`.
 3. Push changes to GitHub.
    Check that RTD and GitHub Pages update as desired
    (https://tzk.readthedocs.io/en/latest/,

cli_docs/conf.py

@@ -18,9 +18,9 @@ copyright = '2021 Soren Bjornstad'
 author = 'Soren Bjornstad'
 
 # The short X.Y version
-version = "0.1.0"
+version = "0.1.1"
 # The full version, including alpha/beta/rc tags
-release = "0.1.0"
+release = "0.1.1"
 
 
 # -- General configuration ---------------------------------------------------

docs/index.html

@@ -234,8 +234,6 @@ Error message and password prompt
 
 <li>$:/config/EditTabIndex</li>
 
-<li>$:/config/FileSystemPaths</li>
-
 <li>$:/config/flibbles/relink/fields/bibliography</li>
 
 <li>$:/config/flibbles/relink/fields/description</li>
@@ -394,6 +392,8 @@ Error message and password prompt
 
 <li>$:/config/WikiParserRules/Inline/dash</li>
 
+<li>$:/config/zettelkasten/Build/KillPhrases</li>
+
 <li>$:/config/zettelkasten/copyright/Content</li>
 
 <li>$:/config/zettelkasten/copyright/InitialNotice</li>
@@ -989,17 +989,6 @@ Error message and password prompt
 <div created="20200515033855017" modified="20200515033900734" tags="" title="$:/config/EditTabIndex" type="text/vnd.tiddlywiki">
 <pre>1</pre>
 </div>
-<div created="20200427015719697" modified="20200427020204931" tags="" title="$:/config/FileSystemPaths" type="text/vnd.tiddlywiki">
-<pre>[is[system]removeprefix[$:/]addprefix[_system/]]
-[tag[Template]tag[Meta]tag[Tool]addprefix[_meta/]]
-[tag[Image]tag[Attachment]addprefix[media/]]
-[tag[Journal]addprefix[journal/]]
-[tag[Source]addprefix[source/]]
-[tag[Sink]addprefix[sink/]]
-[tag[PAO]addprefix[pao/]]
-[tag[Place]addprefix[place/]]
-[tag[Publication]tag[Class]addprefix[metasource/]]</pre>
-</div>
 <div created="20210606192417191" modified="20210606192216249" title="$:/config/flibbles/relink/fields/bibliography" type="text/vnd.tiddlywiki">
 <pre>list</pre>
 </div>
@@ -1240,6 +1229,9 @@ github: https://github.com/sobjornstad/zettelkasten-sib</pre>
 <div created="20201124030001841" modified="20201124030011884" title="$:/config/WikiParserRules/Inline/dash" type="text/vnd.tiddlywiki">
 <pre>enable</pre>
 </div>
+<div created="20210731165327653" modified="20210731173813193" title="$:/config/zettelkasten/Build/KillPhrases" type="text/vnd.tiddlywiki">
+<pre></pre>
+</div>
 <div created="20210523151041802" creator="soren" modified="20210825142618069" modifier="soren" tags="" title="$:/config/zettelkasten/copyright/Content" type="text/vnd.tiddlywiki">
 <pre>The ''text of my notes'', that is, most of the content of the wiki, is all-rights-reserved.
 You are welcome to read, learn from, and link to all notes (click the hash icon in the upper-right to copy a link to any tiddler; keep in mind that currently public notes could become private in the future, though I try to avoid doing this).
@@ -16316,7 +16308,7 @@ THE FONT SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, E
 }
 </pre>
 </div>
-<div created="20210523150144006" creator="soren" description="Guided wizard that walks you through basic settings and the most important things to know about this edition." list="$:/sib/GettingStarted/Warning $:/sib/GettingStarted/Title $:/sib/GettingStarted/Copyright $:/sib/GettingStarted/ZettelkastenCardTypes $:/sib/GettingStarted/ReferenceExplorer $:/sib/GettingStarted/ThingsToDo $:/sib/GettingStarted/NextSteps" modified="20210920203903771" modifier="soren" tags="Meta Tool" title="$:/sib/GettingStarted" tooltype="configuration" type="text/vnd.tiddlywiki">
+<div created="20210523150144006" creator="soren" description="Guided wizard that walks you through basic settings and the most important things to know about this edition." list="$:/sib/GettingStarted/Warning $:/sib/GettingStarted/Title $:/sib/GettingStarted/Copyright $:/sib/GettingStarted/ZettelkastenCardTypes $:/sib/GettingStarted/ReferenceExplorer $:/sib/GettingStarted/ThingsToDo $:/sib/GettingStarted/NextSteps" modified="20210922011910182" modifier="soren" tags="Meta Tool" title="$:/sib/GettingStarted" tooltype="configuration" type="text/vnd.tiddlywiki">
 <pre>\define go-back() &lt;$action-setfield $tiddler=&quot;$:/config/zettelkasten/GettingStartedWizardCurr&quot; text={{{ [enlist{$:/sib/GettingStarted!!list}before{$:/config/zettelkasten/GettingStartedWizardCurr}] }}}/&gt;
 \define go-forward() &lt;$action-setfield $tiddler=&quot;$:/config/zettelkasten/GettingStartedWizardCurr&quot; text={{{ [enlist{$:/sib/GettingStarted!!list}after{$:/config/zettelkasten/GettingStartedWizardCurr}] }}}/&gt;
 \define wizard-navbar()
@@ -16364,7 +16356,7 @@ tzk is primarily designed for use with Node.js and has an associated helper comm
 * Highly configurable builds, allowing you to publish different versions of your wiki -- a common use case is publishing some of your content on the web and keeping some of it private.
 * Space-efficient backups and version history with Git.
 
-Full instructions for installing and initializing the tzk command-line tool can be found on Read the Docs.
+Full instructions for installing and initializing the tzk command-line tool can be [[found on Read the Docs|https://tzk.readthedocs.io/en/latest/]].
 
 If you're familiar with command-line tools like tzk, you can get a quick start by making sure you have Git, NPM, and Python 3.6 or greater installed, then running:
 

setup.py

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

tzk/__main__.py

@@ -402,7 +402,7 @@ def launch():
     parser = argparse.ArgumentParser(
         description=f"TiddlyZettelKasten {TZK_VERSION} CLI\n"
                     f"Copyright (c) 2021 Soren Bjornstad.\n"
-                    f"MIT license; see https://github.com/sobjornstad/tzk/LICENSE for details.",
+                    f"MIT license; see https://github.com/sobjornstad/tzk/blob/master/LICENSE for details.",
         epilog="For full documentation, see https://tzk.readthedocs.io/en/latest/.",
         formatter_class=argparse.RawDescriptionHelpFormatter
     )

tzk/builders.py

@@ -188,13 +188,13 @@ def check_for_kill_phrases(kill_phrase_file: str = None) -> None:
     :param kill_phrase_file: The path from the source wiki's root directory to the
                              config tiddler containing kill phrases. In the default
                              Zettelkasten edition, this is
-                             tiddlers/_system/config/zettelkasten/Build/KillPhrases.tid;
+                             "tiddlers/$__config_zettelkasten_Build_KillPhrases.tid";
                              if you change the way paths are determined, you can give
                              a different path here.
     """
     assert 'public_wiki_folder' in build_state, "new_output_folder builder must run first"
     if kill_phrase_file is None:
-        kill_phrase_file = "tiddlers/_system/config/zettelkasten/Build/KillPhrases.tid"
+        kill_phrase_file = "tiddlers/$__config_zettelkasten_Build_KillPhrases.tid"
 
     kill_phrases = set()
     with open(kill_phrase_file) as f:

tzk/editions/tzk/tiddlers/$__config_FileSystemPaths.tid

@@ -1,15 +0,0 @@
-created: 20200427015719697
-modified: 20200427020204931
-tags: 
-title: $:/config/FileSystemPaths
-type: text/vnd.tiddlywiki
-
-[is[system]removeprefix[$:/]addprefix[_system/]]
-[tag[Template]tag[Meta]tag[Tool]addprefix[_meta/]]
-[tag[Image]tag[Attachment]addprefix[media/]]
-[tag[Journal]addprefix[journal/]]
-[tag[Source]addprefix[source/]]
-[tag[Sink]addprefix[sink/]]
-[tag[PAO]addprefix[pao/]]
-[tag[Place]addprefix[place/]]
-[tag[Publication]tag[Class]addprefix[metasource/]]

tzk/editions/tzk/tiddlers/$__config_zettelkasten_Build_KillPhrases.tid

@@ -0,0 +1,5 @@
+created: 20210731165327653
+modified: 20210731173813193
+title: $:/config/zettelkasten/Build/KillPhrases
+type: text/vnd.tiddlywiki
+

tzk/editions/tzk/tiddlers/$__sib_GettingStarted.tid

@@ -2,7 +2,7 @@ created: 20210523150144006
 creator: soren
 description: Guided wizard that walks you through basic settings and the most important things to know about this edition.
 list: $:/sib/GettingStarted/Warning $:/sib/GettingStarted/Title $:/sib/GettingStarted/Copyright $:/sib/GettingStarted/ZettelkastenCardTypes $:/sib/GettingStarted/ReferenceExplorer $:/sib/GettingStarted/ThingsToDo $:/sib/GettingStarted/NextSteps
-modified: 20210920203903771
+modified: 20210922011910182
 modifier: soren
 tags: Meta Tool
 title: $:/sib/GettingStarted
@@ -56,7 +56,7 @@ tzk is primarily designed for use with Node.js and has an associated helper comm
 * Highly configurable builds, allowing you to publish different versions of your wiki -- a common use case is publishing some of your content on the web and keeping some of it private.
 * Space-efficient backups and version history with Git.
 
-Full instructions for installing and initializing the tzk command-line tool can be found on Read the Docs.
+Full instructions for installing and initializing the tzk command-line tool can be [[found on Read the Docs|https://tzk.readthedocs.io/en/latest/]].
 
 If you're familiar with command-line tools like tzk, you can get a quick start by making sure you have Git, NPM, and Python 3.6 or greater installed, then running:
 

tzk/tw.py

@@ -122,11 +122,11 @@ def _init_tw(wiki_name: str) -> None:
 
 def _restore_plugins(wiki_name: str) -> None:
     """
-    Add the plugins from the edition's tiddlywiki.info to the new wiki's
+    Add the two plugins required for client-server operation to the existing
-    tiddlywiki.info (for some reason, this is not done automatically). Also
+    ones in the edition, sort them in order, and replace the existing plugins
-    add the two plugins required for client-server operation.
+    array in the tiddlywiki.info.
     """
-    print("tzk: Adding plugins to tiddlywiki.info...")
+    print("tzk: Configuring plugins in tiddlywiki.info...")
 
     info_path = Path.cwd() / wiki_name / "tiddlywiki.info"
     edition_path = Path(__file__).parent / "editions" / "tzk" / "tiddlywiki.info"
@@ -135,7 +135,7 @@ def _restore_plugins(wiki_name: str) -> None:
         info_data = json.load(f)
     with edition_path.open("r") as f:
         edition_data = json.load(f)
-    
+
     plugins = {"tiddlywiki/filesystem", "tiddlywiki/tiddlyweb"}
     plugins = plugins.union(edition_data['plugins'])
     info_data['plugins'] = sorted(plugins)

tzk/util.py

@@ -10,7 +10,7 @@ import sys
 from typing import Any, Callable, Dict, NoReturn
 
 
-TZK_VERSION = "0.1.0"
+TZK_VERSION = "0.1.1"
 
 
 class BuildError(Exception):