bump version

5065efd3 incorrectly changed to doing an rmtree of the entire target
since that was what editionify needed. Editionify should clean the
target directory, but the single HTML file build should not (it ended up
wiping my git repository from my hard drive). We might wish to revisit
this particular fix in the future since it still fails to delete removed
extimages, but this doesn't seem like a big deal.

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.2"
 # The full version, including alpha/beta/rc tags
-release = "0.1.0"
+release = "0.1.2"
 
 
 # -- 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>
@@ -1217,13 +1206,13 @@ github: https://github.com/sobjornstad/zettelkasten-sib</pre>
 <pre>hide</pre>
 </div>
 <div created="20200913200724872" modified="20201120173215063" title="$:/config/ViewToolbarButtons/Visibility/$:/core/ui/Buttons/permalink" type="text/vnd.tiddlywiki">
-<pre>hide</pre>
+<pre>show</pre>
 </div>
 <div created="20200404141629548" creator="soren" modified="20200404141630712" modifier="soren" title="$:/config/ViewToolbarButtons/Visibility/$:/plugins/bimlas/locator/viewtemplate/open-in-sidebar" type="text/vnd.tiddlywiki">
 <pre>hide</pre>
 </div>
-<div created="20210525001044166" modified="20210525000849030" title="$:/config/ViewToolbarButtons/Visibility/$:/sib/Buttons/CopyPublicZettelkastenLink" type="text/vnd.tiddlywiki">
-<pre>show</pre>
+<div created="20210525001044166" creator="soren" modified="20210922125743198" modifier="soren" title="$:/config/ViewToolbarButtons/Visibility/$:/sib/Buttons/CopyPublicZettelkastenLink" type="text/vnd.tiddlywiki">
+<pre>hide</pre>
 </div>
 <div created="20210525001045047" modified="20210525000850061" title="$:/config/ViewToolbarButtons/Visibility/$:/sib/Buttons/CopyTitleReference" type="text/vnd.tiddlywiki">
 <pre>show</pre>
@@ -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).
@@ -16051,22 +16043,38 @@ Info: CoreVersion parameter is needed for TiddlyWiki only!
     }
 }</pre>
 </div>
-<div caption="Copy public Zettelkasten link" created="20201120172611922" creator="soren" description="Copy a link to this tiddler in the public Zettelkasten" list-after="$:/core/ui/Buttons/info" modified="20210825162715432" modifier="soren" tags="$:/tags/ViewToolbar" title="$:/sib/Buttons/CopyPublicZettelkastenLink" type="text/vnd.tiddlywiki">
+<div caption="copy public link" created="20201120172611922" creator="soren" description="Copy a link to this tiddler in the public Zettelkasten" list-after="$:/core/ui/Buttons/info" modified="20210922125543768" modifier="soren" tags="$:/tags/ViewToolbar" title="$:/sib/Buttons/CopyPublicZettelkastenLink" type="text/vnd.tiddlywiki">
 <pre>\whitespace trim
 \define copier()
   https://zettelkasten.sorenbjornstad.com/#$(tidTitle)$
 \end
 
 &lt;$set name=&quot;tidTitle&quot; value={{!!title}}&gt;
-&lt;$button message=&quot;tm-copy-to-clipboard&quot; param=&lt;&lt;copier&gt;&gt; tooltip={{!!caption}} class=&lt;&lt;tv-config-toolbar-class&gt;&gt;&gt;
+&lt;$button message=&quot;tm-copy-to-clipboard&quot; param=&lt;&lt;copier&gt;&gt; tooltip={{$:/sib/Buttons/CopyPublicZettelkastenLink!!caption}} class=&lt;&lt;tv-config-toolbar-class&gt;&gt;&gt;
+	&lt;$list filter=&quot;[&lt;tv-config-toolbar-icons&gt;match[yes]]&quot;&gt;
   {{$:/core/images/permalink-button}}
+	&lt;/$list&gt;
+	&lt;$list filter=&quot;[&lt;tv-config-toolbar-text&gt;match[yes]]&quot;&gt;
+	&lt;span class=&quot;tc-btn-text&quot;&gt;
+	&lt;$text text=&quot; &quot;/&gt;
+	&lt;$text text={{$:/sib/Buttons/CopyPublicZettelkastenLink!!caption}}/&gt;
+	&lt;/span&gt;
+	&lt;/$list&gt;
 &lt;/$button&gt;
 &lt;/$set&gt;</pre>
 </div>
-<div caption="Copy tiddler title" created="20200419143537510" creator="soren" description="Copy the name of this tiddler to the clipboard" list-after="$:/core/ui/Buttons/info" modified="20210825162721583" modifier="soren" tags="$:/tags/ViewToolbar" title="$:/sib/Buttons/CopyTitleReference" type="text/vnd.tiddlywiki">
+<div caption="copy tiddler title" created="20200419143537510" creator="soren" description="Copy the name of this tiddler to the clipboard" list-after="$:/core/ui/Buttons/info" modified="20210922125723154" modifier="soren" tags="$:/tags/ViewToolbar" title="$:/sib/Buttons/CopyTitleReference" type="text/vnd.tiddlywiki">
 <pre>\whitespace trim
-&lt;$button message=&quot;tm-copy-to-clipboard&quot; param={{!!title}} tooltip={{!!caption}} class=&lt;&lt;tv-config-toolbar-class&gt;&gt;&gt;
-	&lt;i class=&quot;far fa-copy&quot; style=&quot;font-size:160%; position:relative; bottom:-4px; left:-1px;&quot;/&gt;
+&lt;$button message=&quot;tm-copy-to-clipboard&quot; param={{!!title}} tooltip={{$:/sib/Buttons/CopyTitleReference!!caption}} class=&lt;&lt;tv-config-toolbar-class&gt;&gt;&gt;
+	&lt;$list filter=&quot;[&lt;tv-config-toolbar-icons&gt;match[yes]]&quot;&gt;
+		&lt;i class=&quot;far fa-copy&quot; style=&quot;font-size:160%; position:relative; bottom:-4px; left:-1px;&quot;/&gt;
+	&lt;/$list&gt;
+	&lt;$list filter=&quot;[&lt;tv-config-toolbar-text&gt;match[yes]]&quot;&gt;
+	&lt;span class=&quot;tc-btn-text&quot;&gt;
+	&lt;$text text=&quot; &quot;/&gt;
+	&lt;$text text={{$:/sib/Buttons/CopyTitleReference!!caption}}/&gt;
+	&lt;/span&gt;
+	&lt;/$list&gt;
 &lt;/$button&gt;</pre>
 </div>
 <div caption="Excise private chunk" condition="[&lt;targetTiddler&gt;type[]] [&lt;targetTiddler&gt;type[text/vnd.tiddlywiki]] +[first[]]" created="20210522034413324" description="Create a new private chunk from the selection" icon="$:/core/images/locked-padlock" list-after="$:/core/ui/EditorToolbar/excise" modified="20210522034828757" shortcuts="((excise-private-chunk))" tags="$:/tags/EditorToolbar" title="$:/sib/Buttons/excise-private-chunk" type="text/vnd.tiddlywiki">
@@ -16316,7 +16324,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 +16372,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.2",
     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:
@@ -278,7 +278,8 @@ def compile_html_file(
                           will be placed, relative to the private wiki's root directory.
                           Default ``output/public_site``.
     :param overwrite:     If the ``output_folder`` already exists,
-                          should we overwrite it? Default True.
+                          should we overwrite any files in it with the same name?
+                          Default True.
     :param externalize_attachments: If True, update tiddlers that match
                                     the ``attachment_filter`` parameter to point to
                                     external versions of their content.
@@ -311,13 +312,10 @@ def compile_html_file(
              f"(To overwrite any files existing in the output folder, "
              f"set overwrite = True for this builder.)")
 
-    try:
-        shutil.rmtree(output_folder)
-    except FileNotFoundError:
-        pass
     shutil.copytree(
         Path(build_state['public_wiki_folder']) / "output",
         Path(output_folder),
+        dirs_exist_ok=True
     )
     info(f"Successfully copied built output to {os.path.abspath(output_folder)}.")
 

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_ViewToolbarButtons_Visibility_$__core_ui_Buttons_permalink.tid

@@ -3,4 +3,4 @@ modified: 20201120173215063
 title: $:/config/ViewToolbarButtons/Visibility/$:/core/ui/Buttons/permalink
 type: text/vnd.tiddlywiki
 
-hide
+show

tzk/editions/tzk/tiddlers/$__config_ViewToolbarButtons_Visibility_$__sib_Buttons_CopyPublicZettelkastenLink.tid

@@ -1,6 +1,8 @@
 created: 20210525001044166
-modified: 20210525000849030
+creator: soren
+modified: 20210922125743198
+modifier: soren
 title: $:/config/ViewToolbarButtons/Visibility/$:/sib/Buttons/CopyPublicZettelkastenLink
 type: text/vnd.tiddlywiki
 
-show
+hide

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_Buttons_CopyPublicZettelkastenLink.tid

@@ -1,9 +1,9 @@
-caption: Copy public Zettelkasten link
+caption: copy public link
 created: 20201120172611922
 creator: soren
 description: Copy a link to this tiddler in the public Zettelkasten
 list-after: $:/core/ui/Buttons/info
-modified: 20210825162715432
+modified: 20210922125543768
 modifier: soren
 tags: $:/tags/ViewToolbar
 title: $:/sib/Buttons/CopyPublicZettelkastenLink
@@ -15,7 +15,15 @@ type: text/vnd.tiddlywiki
 \end
 
 <$set name="tidTitle" value={{!!title}}>
-<$button message="tm-copy-to-clipboard" param=<<copier>> tooltip={{!!caption}} class=<<tv-config-toolbar-class>>>
+<$button message="tm-copy-to-clipboard" param=<<copier>> tooltip={{$:/sib/Buttons/CopyPublicZettelkastenLink!!caption}} class=<<tv-config-toolbar-class>>>
+	<$list filter="[<tv-config-toolbar-icons>match[yes]]">
   {{$:/core/images/permalink-button}}
+	</$list>
+	<$list filter="[<tv-config-toolbar-text>match[yes]]">
+	<span class="tc-btn-text">
+	<$text text=" "/>
+	<$text text={{$:/sib/Buttons/CopyPublicZettelkastenLink!!caption}}/>
+	</span>
+	</$list>
 </$button>
 </$set>

tzk/editions/tzk/tiddlers/$__sib_Buttons_CopyTitleReference.tid

@@ -1,15 +1,23 @@
-caption: Copy tiddler title
+caption: copy tiddler title
 created: 20200419143537510
 creator: soren
 description: Copy the name of this tiddler to the clipboard
 list-after: $:/core/ui/Buttons/info
-modified: 20210825162721583
+modified: 20210922125723154
 modifier: soren
 tags: $:/tags/ViewToolbar
 title: $:/sib/Buttons/CopyTitleReference
 type: text/vnd.tiddlywiki
 
 \whitespace trim
-<$button message="tm-copy-to-clipboard" param={{!!title}} tooltip={{!!caption}} class=<<tv-config-toolbar-class>>>
-	<i class="far fa-copy" style="font-size:160%; position:relative; bottom:-4px; left:-1px;"/>
+<$button message="tm-copy-to-clipboard" param={{!!title}} tooltip={{$:/sib/Buttons/CopyTitleReference!!caption}} class=<<tv-config-toolbar-class>>>
+	<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+		<i class="far fa-copy" style="font-size:160%; position:relative; bottom:-4px; left:-1px;"/>
+	</$list>
+	<$list filter="[<tv-config-toolbar-text>match[yes]]">
+	<span class="tc-btn-text">
+	<$text text=" "/>
+	<$text text={{$:/sib/Buttons/CopyTitleReference!!caption}}/>
+	</span>
+	</$list>
 </$button>

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
-    tiddlywiki.info (for some reason, this is not done automatically). Also
-    add the two plugins required for client-server operation.
+    Add the two plugins required for client-server operation to the existing
+    ones in the edition, sort them in order, and replace the existing plugins
+    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"

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.2"
 
 
 class BuildError(Exception):